@es-joy/jsoe 0.21.0 → 0.23.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@es-joy/jsoe",
-  "version": "0.21.0",
+  "version": "0.23.0",
   "type": "module",
   "types": "./dist/index.d.ts",
   "main": "./src/index.js",
@@ -26,7 +26,7 @@
   },
   "dependencies": {
     "@brettz9/node-static": "^0.1.1",
-    "jamilih": "0.59.2",
+    "jamilih": "0.60.0",
     "sceditor": "3.2.0",
     "typeson-registry": "11.0.0",
     "zod": "^3.23.8",
@@ -35,12 +35,13 @@
   "devDependencies": {
     "@babel/core": "^7.25.2",
     "@babel/plugin-transform-modules-commonjs": "^7.24.8",
-    "@babel/preset-env": "^7.25.3",
+    "@babel/preset-env": "^7.25.4",
     "@babel/register": "^7.24.6",
     "@cypress/code-coverage": "^3.12.45",
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-commonjs": "^26.0.1",
     "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-terser": "^0.4.4",
     "@types/jsdom": "^21.1.7",
     "@types/node": "^22.5.0",
     "axe-core": "^4.10.0",

package/rollup.config.js

@@ -2,7 +2,7 @@ import builtins from 'rollup-plugin-node-builtins';
 import {nodeResolve} from '@rollup/plugin-node-resolve';
 import commonjs from '@rollup/plugin-commonjs';
 // import babel from 'rollup-plugin-babel';
-// import {terser} from 'rollup-plugin-terser';
+import terser from '@rollup/plugin-terser';
 import istanbul from 'rollup-plugin-istanbul';
 import noOp from 'rollup-plugin-no-op';
 
@@ -15,6 +15,13 @@ export default [{
     format: 'es'
   },
   plugins: [
+    terser({
+      /* eslint-disable camelcase -- API */
+      // Needed for Typeson's `Undefined` and other constructor detection
+      keep_fnames: true,
+      keep_classnames: true // Keep in case implementing above as classes
+      /* eslint-enable camelcase -- API */
+    }),
     nodeResolve(),
     commonjs()
   ]
@@ -76,13 +83,13 @@ export default [{
   },
   plugins: [
     /*
-        babel(),
-        terser({
-            // Needed for Typeson's `Undefined` and other constructor detection
-            keep_fnames: true,
-            keep_classnames: true // Keep in case implementing above as classes
-        }),
-        */
+      babel(),
+      terser({
+          // Needed for Typeson's `Undefined` and other constructor detection
+          keep_fnames: true,
+          keep_classnames: true // Keep in case implementing above as classes
+      }),
+      */
     builtins(),
     nodeResolve(),
     commonjs({

package/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)) {