feat: async encapsulation

es-joy · Aug 22, 2024 · 7308737 · 7308737
1 parent fd32e4a
commit 7308737
Show file tree

Hide file tree

Showing 8 changed files with 73 additions and 95 deletions.
diff --git a/badges/coverage-badge.svg b/badges/coverage-badge.svg
diff --git a/instrumented/deepEqual.js b/instrumented/deepEqual.js
diff --git a/instrumented/demo/index-schema.js b/instrumented/demo/index-schema.js
diff --git a/instrumented/demo/index.js b/instrumented/demo/index.js
diff --git a/instrumented/demo/schema-preloaded-array.js b/instrumented/demo/schema-preloaded-array.js
diff --git a/instrumented/demo/schema-preloaded.js b/instrumented/demo/schema-preloaded.js
diff --git a/instrumented/formats/structuredCloning.js b/instrumented/formats/structuredCloning.js
diff --git a/src/formats/structuredCloning.js b/src/formats/structuredCloning.js
@@ -484,47 +484,45 @@ const canonicalTypeToAvailableTypeAndSchema = (
 
 /** @type {import('../formats.js').Format} */
 const structuredCloning = {
-  iterate (records, stateObj) {
+  async iterate (records, stateObj) {
     /* istanbul ignore if -- Just a guard */
     if (!stateObj.format) {
       stateObj.format = 'structuredCloning';
     }
-    // Todo: Replace this with async typeson?
-    // eslint-disable-next-line promise/avoid-new -- Our own API for now
-    return new Promise((resolve, reject) => {
-      const structuredCloningFixed = structuredCloningThrowing.filter(
-        (typeSpecSet) => {
-          return ![
-            // Not yet supported within JSOE
-            'imagedata',
-            'imagebitmap',
-            'cryptokey',
-            'domquad'
-          ].some((prop) => {
-            return Object.hasOwn(typeSpecSet, prop);
-          });
-        }
-      );
-      structuredCloningFixed.splice(
-        // Add after userObjects
-        1,
-        0,
-        noneditable
-      );
-      const typeson = new Typeson({
-        encapsulateObserver: encapsulateObserver(stateObj)
-      }).register(structuredCloningFixed);
-      typeson.encapsulate(records);
-      // Todo (low): We might want to run async encapsulate for
-      //   async types (and put this after Promise resolves)
-      if (stateObj.error) {
-        reject(stateObj.error);
-      } else {
-        resolve(/** @type {Required<import('../types.js').StateObject>} */ (
-          stateObj
-        ));
+
+    const structuredCloningFixed = structuredCloningThrowing.filter(
+      (typeSpecSet) => {
+        return ![
+          // Not yet supported within JSOE
+          'imagedata',
+          'imagebitmap',
+          'cryptokey',
+          'domquad'
+        ].some((prop) => {
+          return Object.hasOwn(typeSpecSet, prop);
+        });
       }
+    );
+    structuredCloningFixed.splice(
+      // Add after userObjects
+      1,
+      0,
+      noneditable
+    );
+    const typeson = new Typeson({
+      encapsulateObserver: encapsulateObserver(stateObj)
+    }).register(structuredCloningFixed);
+
+    await typeson.encapsulateAsync(records, null, {
+      throwOnBadSyncType: false
     });
+
+    if (stateObj.error) {
+      throw stateObj.error;
+    }
+    return (/** @type {Required<import('../types.js').StateObject>} */ (
+      stateObj
+    ));
   },
   getTypesAndSchemasForState (types, state) {
     if (state && types.getContextInfo('structuredCloning', state)) {