seroval 1.3.0 → 1.3.2

package/dist/cjs/development/index.cjs

@@ -1461,7 +1461,7 @@ var BaseAsyncParserContext = class extends BaseParserContext {
     const nodes = [];
     for (let i = 0, len = current.length; i < len; i++) {
       if (i in current) {
-        nodes[i] = await this.parseTop(current[i]);
+        nodes[i] = await this.parse(current[i]);
       }
     }
     return nodes;
@@ -1475,7 +1475,7 @@ var BaseAsyncParserContext = class extends BaseParserContext {
     const valueNodes = [];
     for (let i = 0, len = entries.length; i < len; i++) {
       keyNodes.push(serializeString(entries[i][0]));
-      valueNodes.push(await this.parseTop(entries[i][1]));
+      valueNodes.push(await this.parse(entries[i][1]));
     }
     let symbol = Symbol.iterator;
     if (symbol in properties) {
@@ -1483,7 +1483,7 @@ var BaseAsyncParserContext = class extends BaseParserContext {
       valueNodes.push(
         createIteratorFactoryInstanceNode(
           this.parseIteratorFactory(),
-          await this.parseTop(
+          await this.parse(
             iteratorToSequence(properties)
           )
         )
@@ -1495,7 +1495,7 @@ var BaseAsyncParserContext = class extends BaseParserContext {
       valueNodes.push(
         createAsyncIteratorFactoryInstanceNode(
           this.parseAsyncIteratorFactory(),
-          await this.parseTop(
+          await this.parse(
             createStreamFromAsyncIterable(
               properties
             )
@@ -1528,24 +1528,20 @@ var BaseAsyncParserContext = class extends BaseParserContext {
     );
   }
   async parseBoxed(id, current) {
-    return createBoxedNode(id, await this.parseTop(current.valueOf()));
+    return createBoxedNode(id, await this.parse(current.valueOf()));
   }
   async parseTypedArray(id, current) {
-    return createTypedArrayNode(
-      id,
-      current,
-      await this.parseTop(current.buffer)
-    );
+    return createTypedArrayNode(id, current, await this.parse(current.buffer));
   }
   async parseBigIntTypedArray(id, current) {
     return createBigIntTypedArrayNode(
       id,
       current,
-      await this.parseTop(current.buffer)
+      await this.parse(current.buffer)
     );
   }
   async parseDataView(id, current) {
-    return createDataViewNode(id, current, await this.parseTop(current.buffer));
+    return createDataViewNode(id, current, await this.parse(current.buffer));
   }
   async parseError(id, current) {
     const options = getErrorOptions(current, this.features);
@@ -1567,15 +1563,15 @@ var BaseAsyncParserContext = class extends BaseParserContext {
     const keyNodes = [];
     const valueNodes = [];
     for (const [key, value] of current.entries()) {
-      keyNodes.push(await this.parseTop(key));
-      valueNodes.push(await this.parseTop(value));
+      keyNodes.push(await this.parse(key));
+      valueNodes.push(await this.parse(value));
     }
     return this.createMapNode(id, keyNodes, valueNodes, current.size);
   }
   async parseSet(id, current) {
     const items = [];
     for (const item of current.keys()) {
-      items.push(await this.parseTop(item));
+      items.push(await this.parse(item));
     }
     return createSetNode(id, current.size, items);
   }
@@ -1591,7 +1587,7 @@ var BaseAsyncParserContext = class extends BaseParserContext {
       NIL,
       NIL,
       NIL,
-      await this.parseTop(result),
+      await this.parse(result),
       NIL,
       NIL
     );
@@ -1623,7 +1619,7 @@ var BaseAsyncParserContext = class extends BaseParserContext {
         const cleanup = current.on({
           next: (value) => {
             this.markRef(id);
-            this.parseTop(value).then(
+            this.parse(value).then(
               (data) => {
                 sequence.push(createStreamNextNode(id, data));
               },
@@ -1635,7 +1631,7 @@ var BaseAsyncParserContext = class extends BaseParserContext {
           },
           throw: (value) => {
             this.markRef(id);
-            this.parseTop(value).then(
+            this.parse(value).then(
               (data) => {
                 sequence.push(createStreamThrowNode(id, data));
                 resolve(sequence);
@@ -1649,7 +1645,7 @@ var BaseAsyncParserContext = class extends BaseParserContext {
           },
           return: (value) => {
             this.markRef(id);
-            this.parseTop(value).then(
+            this.parse(value).then(
               (data) => {
                 sequence.push(createStreamReturnNode(id, data));
                 resolve(sequence);
@@ -1675,7 +1671,7 @@ var BaseAsyncParserContext = class extends BaseParserContext {
     }
     const currentClass = current.constructor;
     if (currentClass === OpaqueReference) {
-      return this.parseTop(
+      return this.parse(
         current.replacement
       );
     }
@@ -1772,7 +1768,7 @@ var BaseAsyncParserContext = class extends BaseParserContext {
     }
     throw new SerovalUnsupportedTypeError(current);
   }
-  async parseTop(current) {
+  async parse(current) {
     switch (typeof current) {
       case "boolean":
         return current ? TRUE_NODE : FALSE_NODE;
@@ -1799,9 +1795,9 @@ var BaseAsyncParserContext = class extends BaseParserContext {
         throw new SerovalUnsupportedTypeError(current);
     }
   }
-  async parse(current) {
+  async parseTop(current) {
     try {
-      return await this.parseTop(current);
+      return await this.parse(current);
     } catch (error) {
       throw error instanceof SerovalParserError ? error : new SerovalParserError(error);
     }
@@ -2014,7 +2010,10 @@ var BaseDeserializerContext = class {
     throw new SerovalMissingPluginError(node.c);
   }
   deserializePromiseConstructor(node) {
-    return this.assignIndexedValue(node.i, createDeferred()).promise;
+    return this.assignIndexedValue(
+      node.i,
+      this.assignIndexedValue(node.s, createDeferred()).promise
+    );
   }
   deserializePromiseResolve(node) {
     const deferred = this.refs.get(node.i);
@@ -2074,83 +2073,86 @@ var BaseDeserializerContext = class {
     this.deserialize(node.a[1]);
     return void 0;
   }
-  deserialize(node) {
+  deserializeTop(node) {
     try {
-      switch (node.t) {
-        case 2 /* Constant */:
-          return CONSTANT_VAL[node.s];
-        case 0 /* Number */:
-          return node.s;
-        case 1 /* String */:
-          return deserializeString(node.s);
-        case 3 /* BigInt */:
-          return BigInt(node.s);
-        case 4 /* IndexedValue */:
-          return this.refs.get(node.i);
-        case 18 /* Reference */:
-          return this.deserializeReference(node);
-        case 9 /* Array */:
-          return this.deserializeArray(node);
-        case 10 /* Object */:
-        case 11 /* NullConstructor */:
-          return this.deserializeObject(node);
-        case 5 /* Date */:
-          return this.deserializeDate(node);
-        case 6 /* RegExp */:
-          return this.deserializeRegExp(node);
-        case 7 /* Set */:
-          return this.deserializeSet(node);
-        case 8 /* Map */:
-          return this.deserializeMap(node);
-        case 19 /* ArrayBuffer */:
-          return this.deserializeArrayBuffer(node);
-        case 16 /* BigIntTypedArray */:
-        case 15 /* TypedArray */:
-          return this.deserializeTypedArray(node);
-        case 20 /* DataView */:
-          return this.deserializeDataView(node);
-        case 14 /* AggregateError */:
-          return this.deserializeAggregateError(node);
-        case 13 /* Error */:
-          return this.deserializeError(node);
-        case 12 /* Promise */:
-          return this.deserializePromise(node);
-        case 17 /* WKSymbol */:
-          return SYMBOL_REF[node.s];
-        case 21 /* Boxed */:
-          return this.deserializeBoxed(node);
-        case 25 /* Plugin */:
-          return this.deserializePlugin(node);
-        case 22 /* PromiseConstructor */:
-          return this.deserializePromiseConstructor(node);
-        case 23 /* PromiseSuccess */:
-          return this.deserializePromiseResolve(node);
-        case 24 /* PromiseFailure */:
-          return this.deserializePromiseReject(node);
-        case 28 /* IteratorFactoryInstance */:
-          return this.deserializeIteratorFactoryInstance(node);
-        case 30 /* AsyncIteratorFactoryInstance */:
-          return this.deserializeAsyncIteratorFactoryInstance(node);
-        case 31 /* StreamConstructor */:
-          return this.deserializeStreamConstructor(node);
-        case 32 /* StreamNext */:
-          return this.deserializeStreamNext(node);
-        case 33 /* StreamThrow */:
-          return this.deserializeStreamThrow(node);
-        case 34 /* StreamReturn */:
-          return this.deserializeStreamReturn(node);
-        case 27 /* IteratorFactory */:
-          return this.deserializeIteratorFactory(node);
-        case 29 /* AsyncIteratorFactory */:
-          return this.deserializeAsyncIteratorFactory(node);
-        // case SerovalNodeType.SpecialReference:
-        default:
-          throw new SerovalUnsupportedNodeError(node);
-      }
+      return this.deserialize(node);
     } catch (error) {
       throw new SerovalDeserializationError(error);
     }
   }
+  deserialize(node) {
+    switch (node.t) {
+      case 2 /* Constant */:
+        return CONSTANT_VAL[node.s];
+      case 0 /* Number */:
+        return node.s;
+      case 1 /* String */:
+        return deserializeString(node.s);
+      case 3 /* BigInt */:
+        return BigInt(node.s);
+      case 4 /* IndexedValue */:
+        return this.refs.get(node.i);
+      case 18 /* Reference */:
+        return this.deserializeReference(node);
+      case 9 /* Array */:
+        return this.deserializeArray(node);
+      case 10 /* Object */:
+      case 11 /* NullConstructor */:
+        return this.deserializeObject(node);
+      case 5 /* Date */:
+        return this.deserializeDate(node);
+      case 6 /* RegExp */:
+        return this.deserializeRegExp(node);
+      case 7 /* Set */:
+        return this.deserializeSet(node);
+      case 8 /* Map */:
+        return this.deserializeMap(node);
+      case 19 /* ArrayBuffer */:
+        return this.deserializeArrayBuffer(node);
+      case 16 /* BigIntTypedArray */:
+      case 15 /* TypedArray */:
+        return this.deserializeTypedArray(node);
+      case 20 /* DataView */:
+        return this.deserializeDataView(node);
+      case 14 /* AggregateError */:
+        return this.deserializeAggregateError(node);
+      case 13 /* Error */:
+        return this.deserializeError(node);
+      case 12 /* Promise */:
+        return this.deserializePromise(node);
+      case 17 /* WKSymbol */:
+        return SYMBOL_REF[node.s];
+      case 21 /* Boxed */:
+        return this.deserializeBoxed(node);
+      case 25 /* Plugin */:
+        return this.deserializePlugin(node);
+      case 22 /* PromiseConstructor */:
+        return this.deserializePromiseConstructor(node);
+      case 23 /* PromiseSuccess */:
+        return this.deserializePromiseResolve(node);
+      case 24 /* PromiseFailure */:
+        return this.deserializePromiseReject(node);
+      case 28 /* IteratorFactoryInstance */:
+        return this.deserializeIteratorFactoryInstance(node);
+      case 30 /* AsyncIteratorFactoryInstance */:
+        return this.deserializeAsyncIteratorFactoryInstance(node);
+      case 31 /* StreamConstructor */:
+        return this.deserializeStreamConstructor(node);
+      case 32 /* StreamNext */:
+        return this.deserializeStreamNext(node);
+      case 33 /* StreamThrow */:
+        return this.deserializeStreamThrow(node);
+      case 34 /* StreamReturn */:
+        return this.deserializeStreamReturn(node);
+      case 27 /* IteratorFactory */:
+        return this.deserializeIteratorFactory(node);
+      case 29 /* AsyncIteratorFactory */:
+        return this.deserializeAsyncIteratorFactory(node);
+      // case SerovalNodeType.SpecialReference:
+      default:
+        throw new SerovalUnsupportedNodeError(node);
+    }
+  }
 };
 
 // src/core/cross/deserializer.ts
@@ -2813,6 +2815,15 @@ var BaseSerializerContext = class {
         ["s"],
         this.createFunction(
           ["b", "c", "p", "d", "e", "t", "f"],
+          /**
+           * b = resolved values
+           * c = b size
+           * p = pending promises
+           * d = index where the resolved value stops
+           * e = if the last value is a throw
+           * t = placeholder variable
+           * f = finalize
+           */
           "(b=[],c=0,p=[],d=-1,e=!1,f=" + this.createEffectfulFunction(
             ["i", "l"],
             "for(i=0,l=p.length;i<l;i++)p[i].s({done:!0,value:void 0})"
@@ -2825,9 +2836,9 @@ var BaseSerializerContext = class {
           ) + ",return:" + this.createEffectfulFunction(
             ["v", "t"],
             "if(t=p.shift())t.s({done:!0,value:v});f(),d=b.length,b.push(v)"
-          ) + "}),t={[" + this.getRefParam(symbol.i) + "]:" + this.createFunction([], "t") + ",next:" + this.createEffectfulFunction(
+          ) + "}),t={[" + this.getRefParam(symbol.i) + "]:" + this.createFunction([], "t.p") + ",next:" + this.createEffectfulFunction(
             ["i", "t", "v"],
-            "if(d===-1){return((i=c++)>=b.length)?(p.push(t=" + this.getRefParam(promise.i) + "()),t):{done:!1,value:b[i]}}if(c>d)return{done:!0,value:void 0};if(v=b[i=c++],i!==d)return{done:!1,value:v};if(e)throw v;return{done:!0,value:v}"
+            "if(d===-1){return((i=c++)>=b.length)?(" + this.getRefParam(promise.i) + "(t={p:0,s:0,f:0}),p.push(t),t.p):{done:!1,value:b[i]}}if(c>d)return{done:!0,value:void 0};if(v=b[i=c++],i!==d)return{done:!1,value:v};if(e)throw v;return{done:!0,value:v}"
           ) + "})"
         )
       )
@@ -2985,7 +2996,7 @@ var BaseSyncParserContext = class extends BaseParserContext {
     const nodes = [];
     for (let i = 0, len = current.length; i < len; i++) {
       if (i in current) {
-        nodes[i] = this.parseTop(current[i]);
+        nodes[i] = this.parse(current[i]);
       }
     }
     return nodes;
@@ -2999,7 +3010,7 @@ var BaseSyncParserContext = class extends BaseParserContext {
     const valueNodes = [];
     for (let i = 0, len = entries.length; i < len; i++) {
       keyNodes.push(serializeString(entries[i][0]));
-      valueNodes.push(this.parseTop(entries[i][1]));
+      valueNodes.push(this.parse(entries[i][1]));
     }
     let symbol = Symbol.iterator;
     if (symbol in properties) {
@@ -3007,7 +3018,7 @@ var BaseSyncParserContext = class extends BaseParserContext {
       valueNodes.push(
         createIteratorFactoryInstanceNode(
           this.parseIteratorFactory(),
-          this.parseTop(
+          this.parse(
             iteratorToSequence(properties)
           )
         )
@@ -3019,7 +3030,7 @@ var BaseSyncParserContext = class extends BaseParserContext {
       valueNodes.push(
         createAsyncIteratorFactoryInstanceNode(
           this.parseAsyncIteratorFactory(),
-          this.parseTop(createStream())
+          this.parse(createStream())
         )
       );
     }
@@ -3048,20 +3059,16 @@ var BaseSyncParserContext = class extends BaseParserContext {
     );
   }
   parseBoxed(id, current) {
-    return createBoxedNode(id, this.parseTop(current.valueOf()));
+    return createBoxedNode(id, this.parse(current.valueOf()));
   }
   parseTypedArray(id, current) {
-    return createTypedArrayNode(id, current, this.parseTop(current.buffer));
+    return createTypedArrayNode(id, current, this.parse(current.buffer));
   }
   parseBigIntTypedArray(id, current) {
-    return createBigIntTypedArrayNode(
-      id,
-      current,
-      this.parseTop(current.buffer)
-    );
+    return createBigIntTypedArrayNode(id, current, this.parse(current.buffer));
   }
   parseDataView(id, current) {
-    return createDataViewNode(id, current, this.parseTop(current.buffer));
+    return createDataViewNode(id, current, this.parse(current.buffer));
   }
   parseError(id, current) {
     const options = getErrorOptions(current, this.features);
@@ -3083,15 +3090,15 @@ var BaseSyncParserContext = class extends BaseParserContext {
     const keyNodes = [];
     const valueNodes = [];
     for (const [key, value] of current.entries()) {
-      keyNodes.push(this.parseTop(key));
-      valueNodes.push(this.parseTop(value));
+      keyNodes.push(this.parse(key));
+      valueNodes.push(this.parse(value));
     }
     return this.createMapNode(id, keyNodes, valueNodes, current.size);
   }
   parseSet(id, current) {
     const items = [];
     for (const item of current.keys()) {
-      items.push(this.parseTop(item));
+      items.push(this.parse(item));
     }
     return createSetNode(id, current.size, items);
   }
@@ -3133,7 +3140,7 @@ var BaseSyncParserContext = class extends BaseParserContext {
     }
     const currentClass = current.constructor;
     if (currentClass === OpaqueReference) {
-      return this.parseTop(
+      return this.parse(
         current.replacement
       );
     }
@@ -3230,7 +3237,7 @@ var BaseSyncParserContext = class extends BaseParserContext {
     }
     throw new SerovalUnsupportedTypeError(current);
   }
-  parseTop(current) {
+  parse(current) {
     switch (typeof current) {
       case "boolean":
         return current ? TRUE_NODE : FALSE_NODE;
@@ -3258,9 +3265,9 @@ var BaseSyncParserContext = class extends BaseParserContext {
         throw new SerovalUnsupportedTypeError(current);
     }
   }
-  parse(current) {
+  parseTop(current) {
     try {
-      return this.parseTop(current);
+      return this.parse(current);
     } catch (error) {
       throw error instanceof SerovalParserError ? error : new SerovalParserError(error);
     }
@@ -3326,7 +3333,7 @@ var BaseStreamParserContext = class extends BaseSyncParserContext {
     const valueNodes = [];
     for (let i = 0, len = entries.length; i < len; i++) {
       keyNodes.push(serializeString(entries[i][0]));
-      valueNodes.push(this.parseTop(entries[i][1]));
+      valueNodes.push(this.parse(entries[i][1]));
     }
     let symbol = Symbol.iterator;
     if (symbol in properties) {
@@ -3334,7 +3341,7 @@ var BaseStreamParserContext = class extends BaseSyncParserContext {
       valueNodes.push(
         createIteratorFactoryInstanceNode(
           this.parseIteratorFactory(),
-          this.parseTop(
+          this.parse(
             iteratorToSequence(properties)
           )
         )
@@ -3346,7 +3353,7 @@ var BaseStreamParserContext = class extends BaseSyncParserContext {
       valueNodes.push(
         createAsyncIteratorFactoryInstanceNode(
           this.parseAsyncIteratorFactory(),
-          this.parseTop(
+          this.parse(
             createStreamFromAsyncIterable(
               properties
             )
@@ -3485,7 +3492,7 @@ var BaseStreamParserContext = class extends BaseSyncParserContext {
   }
   parseWithError(current) {
     try {
-      return this.parseTop(current);
+      return this.parse(current);
     } catch (err) {
       this.onError(err);
       return NIL;
@@ -3543,7 +3550,7 @@ function crossSerialize(source, options = {}) {
     disabledFeatures: options.disabledFeatures,
     refs: options.refs
   });
-  const tree = ctx.parse(source);
+  const tree = ctx.parseTop(source);
   const serial = new CrossSerializerContext({
     plugins,
     features: ctx.features,
@@ -3559,7 +3566,7 @@ async function crossSerializeAsync(source, options = {}) {
     disabledFeatures: options.disabledFeatures,
     refs: options.refs
   });
-  const tree = await ctx.parse(source);
+  const tree = await ctx.parseTop(source);
   const serial = new CrossSerializerContext({
     plugins,
     features: ctx.features,
@@ -3575,7 +3582,7 @@ function toCrossJSON(source, options = {}) {
     disabledFeatures: options.disabledFeatures,
     refs: options.refs
   });
-  return ctx.parse(source);
+  return ctx.parseTop(source);
 }
 async function toCrossJSONAsync(source, options = {}) {
   const plugins = resolvePlugins(options.plugins);
@@ -3584,7 +3591,7 @@ async function toCrossJSONAsync(source, options = {}) {
     disabledFeatures: options.disabledFeatures,
     refs: options.refs
   });
-  return await ctx.parse(source);
+  return await ctx.parseTop(source);
 }
 function crossSerializeStream(source, options) {
   const plugins = resolvePlugins(options.plugins);
@@ -3635,7 +3642,7 @@ function fromCrossJSON(source, options) {
     plugins,
     refs: options.refs
   });
-  return ctx.deserialize(source);
+  return ctx.deserializeTop(source);
 }
 
 // src/core/tree/async.ts
@@ -3763,7 +3770,7 @@ function serialize(source, options = {}) {
     plugins,
     disabledFeatures: options.disabledFeatures
   });
-  const tree = ctx.parse(source);
+  const tree = ctx.parseTop(source);
   const serial = new VanillaSerializerContext({
     plugins,
     features: ctx.features,
@@ -3777,7 +3784,7 @@ async function serializeAsync(source, options = {}) {
     plugins,
     disabledFeatures: options.disabledFeatures
   });
-  const tree = await ctx.parse(source);
+  const tree = await ctx.parseTop(source);
   const serial = new VanillaSerializerContext({
     plugins,
     features: ctx.features,
@@ -3795,7 +3802,7 @@ function toJSON(source, options = {}) {
     disabledFeatures: options.disabledFeatures
   });
   return {
-    t: ctx.parse(source),
+    t: ctx.parseTop(source),
     f: ctx.features,
     m: Array.from(ctx.marked)
   };
@@ -3807,7 +3814,7 @@ async function toJSONAsync(source, options = {}) {
     disabledFeatures: options.disabledFeatures
   });
   return {
-    t: await ctx.parse(source),
+    t: await ctx.parseTop(source),
     f: ctx.features,
     m: Array.from(ctx.marked)
   };
@@ -3827,7 +3834,7 @@ function fromJSON(source, options = {}) {
     plugins,
     markedRefs: source.m
   });
-  return ctx.deserialize(source.t);
+  return ctx.deserializeTop(source.t);
 }
 
 // src/core/Serializer.ts