seroval 1.3.0 → 1.3.2

package/src/core/context/parser/async.ts

@@ -75,7 +75,7 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
     for (let i = 0, len = current.length; i < len; i++) {
       // For consistency in holes
       if (i in current) {
-        nodes[i] = await this.parseTop(current[i]);
+        nodes[i] = await this.parse(current[i]);
       }
     }
     return nodes;
@@ -96,7 +96,7 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
     const valueNodes: SerovalNode[] = [];
     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]));
     }
     // Check special properties
     let symbol = Symbol.iterator;
@@ -105,7 +105,7 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
       valueNodes.push(
         createIteratorFactoryInstanceNode(
           this.parseIteratorFactory(),
-          await this.parseTop(
+          await this.parse(
             iteratorToSequence(properties as unknown as Iterable<unknown>),
           ),
         ),
@@ -117,7 +117,7 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
       valueNodes.push(
         createAsyncIteratorFactoryInstanceNode(
           this.parseAsyncIteratorFactory(),
-          await this.parseTop(
+          await this.parse(
             createStreamFromAsyncIterable(
               properties as unknown as AsyncIterable<unknown>,
             ),
@@ -159,18 +159,14 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
     id: number,
     current: object,
   ): Promise<SerovalBoxedNode> {
-    return createBoxedNode(id, await this.parseTop(current.valueOf()));
+    return createBoxedNode(id, await this.parse(current.valueOf()));
   }
 
   private async parseTypedArray(
     id: number,
     current: TypedArrayValue,
   ): Promise<SerovalTypedArrayNode> {
-    return createTypedArrayNode(
-      id,
-      current,
-      await this.parseTop(current.buffer),
-    );
+    return createTypedArrayNode(id, current, await this.parse(current.buffer));
   }
 
   private async parseBigIntTypedArray(
@@ -180,7 +176,7 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
     return createBigIntTypedArrayNode(
       id,
       current,
-      await this.parseTop(current.buffer),
+      await this.parse(current.buffer),
     );
   }
 
@@ -188,7 +184,7 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
     id: number,
     current: DataView,
   ): Promise<SerovalDataViewNode> {
-    return createDataViewNode(id, current, await this.parseTop(current.buffer));
+    return createDataViewNode(id, current, await this.parse(current.buffer));
   }
 
   private async parseError(
@@ -222,8 +218,8 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
     const keyNodes: SerovalNode[] = [];
     const valueNodes: SerovalNode[] = [];
     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);
   }
@@ -234,7 +230,7 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
   ): Promise<SerovalSetNode> {
     const items: SerovalNode[] = [];
     for (const item of current.keys()) {
-      items.push(await this.parseTop(item));
+      items.push(await this.parse(item));
     }
     return createSetNode(id, current.size, items);
   }
@@ -255,7 +251,7 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
       NIL,
       NIL,
       NIL,
-      await this.parseTop(result),
+      await this.parse(result),
       NIL,
       NIL,
     );
@@ -295,7 +291,7 @@ export default abstract class BaseAsyncParserContext 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));
               },
@@ -307,7 +303,7 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
           },
           throw: value => {
             this.markRef(id);
-            this.parseTop(value).then(
+            this.parse(value).then(
               data => {
                 sequence.push(createStreamThrowNode(id, data));
                 resolve(sequence);
@@ -321,7 +317,7 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
           },
           return: value => {
             this.markRef(id);
-            this.parseTop(value).then(
+            this.parse(value).then(
               data => {
                 sequence.push(createStreamReturnNode(id, data));
                 resolve(sequence);
@@ -348,7 +344,7 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
     }
     const currentClass = current.constructor;
     if (currentClass === OpaqueReference) {
-      return this.parseTop(
+      return this.parse(
         (current as OpaqueReference<unknown, unknown>).replacement,
       );
     }
@@ -457,7 +453,7 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
     throw new SerovalUnsupportedTypeError(current);
   }
 
-  async parseTop<T>(current: T): Promise<SerovalNode> {
+  async parse<T>(current: T): Promise<SerovalNode> {
     switch (typeof current) {
       case 'boolean':
         return current ? TRUE_NODE : FALSE_NODE;
@@ -487,9 +483,9 @@ export default abstract class BaseAsyncParserContext extends BaseParserContext {
     }
   }
 
-  async parse<T>(current: T): Promise<SerovalNode> {
+  async parseTop<T>(current: T): Promise<SerovalNode> {
     try {
-      return await this.parseTop(current);
+      return await this.parse(current);
     } catch (error) {
       throw error instanceof SerovalParserError
         ? error

package/src/core/context/parser/stream.ts

@@ -111,7 +111,7 @@ export default abstract class BaseStreamParserContext extends BaseSyncParserCont
     const valueNodes: SerovalNode[] = [];
     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]));
     }
     // Check special properties, symbols in this case
     let symbol = Symbol.iterator;
@@ -120,7 +120,7 @@ export default abstract class BaseStreamParserContext extends BaseSyncParserCont
       valueNodes.push(
         createIteratorFactoryInstanceNode(
           this.parseIteratorFactory(),
-          this.parseTop(
+          this.parse(
             iteratorToSequence(properties as unknown as Iterable<unknown>),
           ),
         ),
@@ -132,7 +132,7 @@ export default abstract class BaseStreamParserContext extends BaseSyncParserCont
       valueNodes.push(
         createAsyncIteratorFactoryInstanceNode(
           this.parseAsyncIteratorFactory(),
-          this.parseTop(
+          this.parse(
             createStreamFromAsyncIterable(
               properties as unknown as AsyncIterable<unknown>,
             ),
@@ -283,7 +283,7 @@ export default abstract class BaseStreamParserContext extends BaseSyncParserCont
 
   parseWithError<T>(current: T): SerovalNode | undefined {
     try {
-      return this.parseTop(current);
+      return this.parse(current);
     } catch (err) {
       this.onError(err);
       return NIL;

package/src/core/context/parser/sync.ts

@@ -68,7 +68,7 @@ export default abstract class BaseSyncParserContext 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;
@@ -86,7 +86,7 @@ export default abstract class BaseSyncParserContext extends BaseParserContext {
     const valueNodes: SerovalNode[] = [];
     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]));
     }
     // Check special properties, symbols in this case
     let symbol = Symbol.iterator;
@@ -95,7 +95,7 @@ export default abstract class BaseSyncParserContext extends BaseParserContext {
       valueNodes.push(
         createIteratorFactoryInstanceNode(
           this.parseIteratorFactory(),
-          this.parseTop(
+          this.parse(
             iteratorToSequence(properties as unknown as Iterable<unknown>),
           ),
         ),
@@ -107,7 +107,7 @@ export default abstract class BaseSyncParserContext extends BaseParserContext {
       valueNodes.push(
         createAsyncIteratorFactoryInstanceNode(
           this.parseAsyncIteratorFactory(),
-          this.parseTop(createStream()),
+          this.parse(createStream()),
         ),
       );
     }
@@ -142,29 +142,25 @@ export default abstract class BaseSyncParserContext extends BaseParserContext {
   }
 
   protected parseBoxed(id: number, current: object): SerovalBoxedNode {
-    return createBoxedNode(id, this.parseTop(current.valueOf()));
+    return createBoxedNode(id, this.parse(current.valueOf()));
   }
 
   protected parseTypedArray(
     id: number,
     current: TypedArrayValue,
   ): SerovalTypedArrayNode {
-    return createTypedArrayNode(id, current, this.parseTop(current.buffer));
+    return createTypedArrayNode(id, current, this.parse(current.buffer));
   }
 
   protected parseBigIntTypedArray(
     id: number,
     current: BigIntTypedArrayValue,
   ): SerovalBigIntTypedArrayNode {
-    return createBigIntTypedArrayNode(
-      id,
-      current,
-      this.parseTop(current.buffer),
-    );
+    return createBigIntTypedArrayNode(id, current, this.parse(current.buffer));
   }
 
   protected parseDataView(id: number, current: DataView): SerovalDataViewNode {
-    return createDataViewNode(id, current, this.parseTop(current.buffer));
+    return createDataViewNode(id, current, this.parse(current.buffer));
   }
 
   protected parseError(id: number, current: Error): SerovalErrorNode {
@@ -195,8 +191,8 @@ export default abstract class BaseSyncParserContext extends BaseParserContext {
     const keyNodes: SerovalNode[] = [];
     const valueNodes: SerovalNode[] = [];
     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);
   }
@@ -204,7 +200,7 @@ export default abstract class BaseSyncParserContext extends BaseParserContext {
   protected parseSet(id: number, current: Set<unknown>): SerovalSetNode {
     const items: SerovalNode[] = [];
     for (const item of current.keys()) {
-      items.push(this.parseTop(item));
+      items.push(this.parse(item));
     }
     return createSetNode(id, current.size, items);
   }
@@ -256,7 +252,7 @@ export default abstract class BaseSyncParserContext extends BaseParserContext {
     }
     const currentClass = current.constructor;
     if (currentClass === OpaqueReference) {
-      return this.parseTop(
+      return this.parse(
         (current as OpaqueReference<unknown, unknown>).replacement,
       );
     }
@@ -365,7 +361,7 @@ export default abstract class BaseSyncParserContext extends BaseParserContext {
     throw new SerovalUnsupportedTypeError(current);
   }
 
-  parseTop<T>(current: T): SerovalNode {
+  parse<T>(current: T): SerovalNode {
     switch (typeof current) {
       case 'boolean':
         return current ? TRUE_NODE : FALSE_NODE;
@@ -396,9 +392,9 @@ export default abstract class BaseSyncParserContext extends BaseParserContext {
     }
   }
 
-  parse<T>(current: T): SerovalNode {
+  parseTop<T>(current: T): SerovalNode {
     try {
-      return this.parseTop(current);
+      return this.parse(current);
     } catch (error) {
       throw error instanceof SerovalParserError
         ? error

package/src/core/context/serializer.ts

@@ -1008,6 +1008,15 @@ export default abstract class BaseSerializerContext
         ['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'],
@@ -1031,13 +1040,13 @@ export default abstract class BaseSerializerContext
             '}),t={[' +
             this.getRefParam(symbol.i) +
             ']:' +
-            this.createFunction([], 't') +
+            this.createFunction([], 't.p') +
             ',next:' +
             this.createEffectfulFunction(
               ['i', 't', 'v'],
-              'if(d===-1){return((i=c++)>=b.length)?(p.push(t=' +
+              'if(d===-1){return((i=c++)>=b.length)?(' +
                 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}',
+                '(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}',
             ) +
             '})',
         ),

package/src/core/cross/index.ts

@@ -25,7 +25,7 @@ export function crossSerialize<T>(
     disabledFeatures: options.disabledFeatures,
     refs: options.refs,
   });
-  const tree = ctx.parse(source);
+  const tree = ctx.parseTop(source);
   const serial = new CrossSerializerContext({
     plugins,
     features: ctx.features,
@@ -49,7 +49,7 @@ export async function crossSerializeAsync<T>(
     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,
@@ -71,7 +71,7 @@ export function toCrossJSON<T>(
     disabledFeatures: options.disabledFeatures,
     refs: options.refs,
   });
-  return ctx.parse(source);
+  return ctx.parseTop(source);
 }
 
 export type ToCrossJSONAsyncOptions = CrossParserContextOptions;
@@ -86,7 +86,7 @@ export async function toCrossJSONAsync<T>(
     disabledFeatures: options.disabledFeatures,
     refs: options.refs,
   });
-  return await ctx.parse(source);
+  return await ctx.parseTop(source);
 }
 
 export interface CrossSerializeStreamOptions
@@ -166,5 +166,5 @@ export function fromCrossJSON<T>(
     plugins,
     refs: options.refs,
   });
-  return ctx.deserialize(source) as T;
+  return ctx.deserializeTop(source) as T;
 }

package/src/core/tree/index.ts

@@ -1,4 +1,4 @@
-import { resolvePlugins, type PluginAccessOptions } from '../plugin';
+import { type PluginAccessOptions, resolvePlugins } from '../plugin';
 import type { SerovalNode } from '../types';
 import type { AsyncParserContextOptions } from './async';
 import AsyncParserContext from './async';
@@ -16,7 +16,7 @@ export function serialize<T>(
     plugins,
     disabledFeatures: options.disabledFeatures,
   });
-  const tree = ctx.parse(source);
+  const tree = ctx.parseTop(source);
   const serial = new VanillaSerializerContext({
     plugins,
     features: ctx.features,
@@ -34,7 +34,7 @@ export async function serializeAsync<T>(
     plugins,
     disabledFeatures: options.disabledFeatures,
   });
-  const tree = await ctx.parse(source);
+  const tree = await ctx.parseTop(source);
   const serial = new VanillaSerializerContext({
     plugins,
     features: ctx.features,
@@ -63,7 +63,7 @@ export function toJSON<T>(
     disabledFeatures: options.disabledFeatures,
   });
   return {
-    t: ctx.parse(source),
+    t: ctx.parseTop(source),
     f: ctx.features,
     m: Array.from(ctx.marked),
   };
@@ -79,7 +79,7 @@ export async function toJSONAsync<T>(
     disabledFeatures: options.disabledFeatures,
   });
   return {
-    t: await ctx.parse(source),
+    t: await ctx.parseTop(source),
     f: ctx.features,
     m: Array.from(ctx.marked),
   };
@@ -107,5 +107,5 @@ export function fromJSON<T>(
     plugins,
     markedRefs: source.m,
   });
-  return ctx.deserialize(source.t) as T;
+  return ctx.deserializeTop(source.t) as T;
 }