Adopt Promise.withResolvers(…).

Author: lgarron

script/lib/execPromise.js

@@ -22,16 +22,16 @@ export function killAllChildProcesses() {
  * @returns {Promise<string>}
  */
 export function execPromise(cmd) {
-  return new Promise((resolve, reject) => {
-    const childProcess = exec(cmd, {}, (error, stdout, stderr) => {
-      if (error) {
-        reject(error);
-      }
-      // console.log(stdout);
-      resolve(stdout ? stdout : stderr);
-    });
-    childProcesses.push(childProcess);
+  const { promise, resolve, reject } = Promise.withResolvers();
+  const childProcess = exec(cmd, {}, (error, stdout, stderr) => {
+    if (error) {
+      reject(error);
+    }
+    // console.log(stdout);
+    resolve(stdout ? stdout : stderr);
   });
+  childProcesses.push(childProcess);
+  return promise;
 }
 
 /**
@@ -49,23 +49,23 @@ export async function execPromiseLogged(cmd) {
  * @returns {Promise<void>}
  */
 export function spawnPromise(cmd, args) {
-  return new Promise((resolve, reject) => {
-    const childProcess = spawn(cmd, args, {
-      stdio: "inherit",
-      // stderr: "inherit", // TODO
-    }); // Output to shell.
-    childProcess.on("error", (error) => {
-      console.error(error);
-      reject();
-    });
-    childProcess.on("close", (exitCode) => {
-      exitCode === 0 ? resolve() : reject();
-    });
-    childProcess.on("exit", (exitCode) => {
-      exitCode === 0 ? resolve() : reject();
-    });
-    childProcesses.push(childProcess);
+  const { promise, resolve, reject } = Promise.withResolvers();
+  const childProcess = spawn(cmd, args, {
+    stdio: "inherit",
+    // stderr: "inherit", // TODO
+  }); // Output to shell.
+  childProcess.on("error", (error) => {
+    console.error(error);
+    reject();
+  });
+  childProcess.on("close", (exitCode) => {
+    exitCode === 0 ? resolve() : reject();
+  });
+  childProcess.on("exit", (exitCode) => {
+    exitCode === 0 ? resolve() : reject();
   });
+  childProcesses.push(childProcess);
+  return promise;
 }
 
 /**

src/cubing/twisty/views/3D/Twisty3DSceneWrapper.ts

@@ -166,7 +166,7 @@ export class Twisty3DSceneWrapper
         scene.remove(await old.twisty3DPuzzle());
       }
     }
-    this.#initialWrapperTracker.handleNewValue(twisty3DPuzzleWrapper);
+    this.#initialWrapperTracker.resolve(twisty3DPuzzleWrapper);
   }
 
   #initialWrapperTracker = new InitialValueTracker<Twisty3DPuzzleWrapper>();

src/cubing/twisty/views/InitialValueTracker.ts

@@ -1,11 +1,8 @@
 export class InitialValueTracker<T> {
-  #resolve: (t: T) => void;
-  reject: (e?: Error) => void; // TODO: AbortController?
-  promise = new Promise<T>((resolve, reject) => {
-    this.#resolve = resolve;
-    this.reject = reject;
-  });
-  handleNewValue(t: T): void {
-    this.#resolve(t);
+  resolve: (t: T) => void;
+  reject: (e?: Error) => void;
+  promise: Promise<T>;
+  constructor() {
+    Object.assign(this, Promise.withResolvers());
   }
 }

src/cubing/twisty/views/TwistyPlayer.ts

@@ -361,7 +361,7 @@ export class TwistyPlayer
         case "PG3D": {
           // TODO: Properly wire this up so we can set PG3D for the cube.
           newWrapper = new Twisty3DSceneWrapper(this.experimentalModel);
-          this.#initial3DVisualizationWrapper.handleNewValue(newWrapper);
+          this.#initial3DVisualizationWrapper.resolve(newWrapper);
           break;
         }
         default:

tsconfig.json

@@ -1,7 +1,8 @@
 {
   "compilerOptions": {
-    "target": "es2022",
+    "target": "ES2022",
     "module": "es2022",
+    "lib": ["es2024", "DOM", "DOM.Iterable"],
     "moduleResolution": "bundler",
     "declaration": true,
     "noEmit": true,