seroval 0.4.0-alpha.13 → 0.4.0-alpha.15

package/src/index.ts

@@ -4,10 +4,11 @@ import {
   SerializationContext,
   getRefParam,
   Options,
-  ParserContext,
+  createParserContext,
+  createSerializationContext,
 } from './context';
 import parseAsync from './tree/async';
-import serializeTree, { resolvePatches } from './tree/serialize';
+import SerovalSerializer, { resolvePatches } from './tree/serialize';
 import parseSync from './tree/sync';
 import { SerovalNode } from './tree/types';
 import {
@@ -41,10 +42,9 @@ function finalize(
     if (patches) {
       // Get (or create) a ref from the source
       const index = getRefParam(ctx, rootID);
-      if (result.startsWith(`${index}=`)) {
-        body = `${result},${patches}${index}`;
-      } else {
-        body = `${index}=${result},${patches}${index}`;
+      body = result + ',' + patches + index;
+      if (!result.startsWith(index + '=')) {
+        body = index + '=' + body;
       }
     }
     let params = ctx.vars.length > 1
@@ -53,14 +53,14 @@ function finalize(
     // Source is probably already assigned
     if (ctx.features & Feature.ArrowFunction) {
       params = ctx.vars.length > 1 || ctx.vars.length === 0
-        ? `(${params})`
+        ? '(' + params + ')'
         : params;
-      return `(${params}=>(${body}))()`;
+      return '(' + params + '=>(' + body + '))()';
     }
-    return `(function(${params}){return ${body}})()`;
+    return '(function(' + params + '){return ' + body + '})()';
   }
   if (isObject) {
-    return `(${result})`;
+    return '(' + result + ')';
   }
   return result;
 }
@@ -69,10 +69,10 @@ export function serialize<T extends ServerValue>(
   source: T,
   options?: Partial<Options>,
 ) {
-  const ctx = new ParserContext(options);
+  const ctx = createParserContext(options);
   const [tree, rootID, isObject] = parseSync(ctx, source);
-  const serial = new SerializationContext(ctx);
-  const result = serializeTree(serial, tree);
+  const serial = createSerializationContext(ctx);
+  const result = SerovalSerializer.serialize(serial, tree);
   return finalize(serial, rootID, isObject, result);
 }
 
@@ -80,10 +80,10 @@ export async function serializeAsync<T extends AsyncServerValue>(
   source: T,
   options?: Partial<Options>,
 ) {
-  const ctx = new ParserContext(options);
+  const ctx = createParserContext(options);
   const [tree, rootID, isObject] = await parseAsync(ctx, source);
-  const serial = new SerializationContext(ctx);
-  const result = serializeTree(serial, tree);
+  const serial = createSerializationContext(ctx);
+  const result = SerovalSerializer.serialize(serial, tree);
   return finalize(serial, rootID, isObject, result);
 }
 
@@ -92,52 +92,52 @@ export function deserialize<T extends AsyncServerValue>(source: string): T {
   return (0, eval)(source) as T;
 }
 
-type SerovalJSON = [
-  tree: SerovalNode,
-  root: number,
-  isObject: boolean,
-  feature: number,
-  markedRefs: Record<number, number>,
-];
+interface SerovalJSON {
+  t: SerovalNode,
+  r: number,
+  i: boolean,
+  f: number,
+  m: number[],
+}
 
 export function toJSON<T extends ServerValue>(
   source: T,
   options?: Partial<Options>,
 ) {
-  const ctx = new ParserContext(options);
+  const ctx = createParserContext(options);
   const [tree, root, isObject] = parseSync(ctx, source);
-  return JSON.stringify([
-    tree,
-    root,
-    isObject,
-    ctx.features,
-    ctx.markedRefs,
-  ]);
+  return JSON.stringify({
+    t: tree,
+    r: root,
+    i: isObject,
+    f: ctx.features,
+    m: Array.from(ctx.markedRefs),
+  });
 }
 
 export async function toJSONAsync<T extends AsyncServerValue>(
   source: T,
   options?: Partial<Options>,
 ) {
-  const ctx = new ParserContext(options);
+  const ctx = createParserContext(options);
   const [tree, root, isObject] = await parseAsync(ctx, source);
-  return JSON.stringify([
-    tree,
-    root,
-    isObject,
-    ctx.features,
-    ctx.markedRefs,
-  ]);
+  return JSON.stringify({
+    t: tree,
+    r: root,
+    i: isObject,
+    f: ctx.features,
+    m: Array.from(ctx.markedRefs),
+  });
 }
 
 export function compileJSON(source: string): string {
   const parsed = JSON.parse(source) as SerovalJSON;
-  const serial = new SerializationContext({
-    features: parsed[3],
-    markedRefs: parsed[4],
+  const serial = createSerializationContext({
+    features: parsed.f,
+    markedRefs: parsed.m,
   });
-  const result = serializeTree(serial, parsed[0]);
-  return finalize(serial, parsed[1], parsed[2], result);
+  const result = SerovalSerializer.serialize(serial, parsed.t);
+  return finalize(serial, parsed.r, parsed.i, result);
 }
 
 export function fromJSON<T extends AsyncServerValue>(source: string): T {

package/src/quote.ts

@@ -41,5 +41,5 @@ export default function quote(str: string) {
   } else {
     result += str.slice(lastPos);
   }
-  return `"${result}"`;
+  return '"' + result + '"';
 }

package/src/tree/async.ts

@@ -10,9 +10,14 @@ import {
   TypedArrayValue,
 } from '../types';
 import {
+  createBigIntNode,
+  createBigIntTypedArrayNode,
+  createDateNode,
+  createPrimitiveNode,
+  createReferenceNode,
+  createRegExpNode,
+  createTypedArrayNode,
   FALSE_NODE,
-  INFINITY_NODE,
-  NEG_INFINITY_NODE,
   NEG_ZERO_NODE,
   NULL_NODE,
   TRUE_NODE,
@@ -27,24 +32,16 @@ import {
 import {
   SerovalAggregateErrorNode,
   SerovalArrayNode,
-  SerovalBigIntNode,
-  SerovalBigIntTypedArrayNode,
-  SerovalDateNode,
   SerovalErrorNode,
   SerovalIterableNode,
   SerovalMapNode,
-  SerovalMapRecordNode,
   SerovalNode,
   SerovalNodeType,
   SerovalNullConstructorNode,
   SerovalObjectNode,
   SerovalObjectRecordNode,
-  SerovalPrimitiveNode,
   SerovalPromiseNode,
-  SerovalReferenceNode,
-  SerovalRegExpNode,
   SerovalSetNode,
-  SerovalTypedArrayNode,
 } from './types';
 
 type ObjectLikeNode =
@@ -59,13 +56,8 @@ type ObjectLikeValue =
   | PromiseLike<AsyncServerValue>;
 
 class AsyncParser {
-  ctx: ParserContext;
-
-  constructor(ctx: ParserContext) {
-    this.ctx = ctx;
-  }
-
-  async generateNodeList(
+  static async generateNodeList(
+    ctx: ParserContext,
     current: AsyncServerValue[],
   ) {
     const size = current.length;
@@ -78,30 +70,42 @@ class AsyncParser {
         if (isIterable(item)) {
           deferred[i] = item;
         } else {
-          nodes[i] = await this.parse(item);
+          nodes[i] = await this.parse(ctx, item);
         }
       }
     }
     for (let i = 0; i < size; i++) {
       if (i in deferred) {
-        nodes[i] = await this.parse(deferred[i]);
+        nodes[i] = await this.parse(ctx, deferred[i]);
       }
     }
     return nodes;
   }
 
-  async generateArrayNode(
+  static async generateArrayNode(
+    ctx: ParserContext,
     id: number,
     current: AsyncServerValue[],
   ): Promise<SerovalArrayNode> {
-    return new SerovalArrayNode(id, await this.generateNodeList(current));
+    return {
+      t: SerovalNodeType.Array,
+      i: id,
+      s: undefined,
+      l: undefined,
+      c: undefined,
+      m: undefined,
+      d: undefined,
+      a: await this.generateNodeList(ctx, current),
+      n: undefined,
+    };
   }
 
-  async generateMapNode(
+  static async generateMapNode(
+    ctx: ParserContext,
     id: number,
     current: Map<AsyncServerValue, AsyncServerValue>,
   ): Promise<SerovalMapNode> {
-    assert(this.ctx.features & Feature.Map, 'Unsupported type "Map"');
+    assert(ctx.features & Feature.Map, 'Unsupported type "Map"');
     const len = current.size;
     const keyNodes = new Array<SerovalNode>(len);
     const valueNodes = new Array<SerovalNode>(len);
@@ -116,23 +120,34 @@ class AsyncParser {
         deferredValue[deferredSize] = value;
         deferredSize++;
       } else {
-        keyNodes[nodeSize] = await this.parse(key);
-        valueNodes[nodeSize] = await this.parse(value);
+        keyNodes[nodeSize] = await this.parse(ctx, key);
+        valueNodes[nodeSize] = await this.parse(ctx, value);
         nodeSize++;
       }
     }
     for (let i = 0; i < deferredSize; i++) {
-      keyNodes[nodeSize + i] = await this.parse(deferredKey[i]);
-      valueNodes[nodeSize + i] = await this.parse(deferredValue[i]);
+      keyNodes[nodeSize + i] = await this.parse(ctx, deferredKey[i]);
+      valueNodes[nodeSize + i] = await this.parse(ctx, deferredValue[i]);
     }
-    return new SerovalMapNode(id, new SerovalMapRecordNode(keyNodes, valueNodes, len));
+    return {
+      t: SerovalNodeType.Map,
+      i: id,
+      s: undefined,
+      l: undefined,
+      c: undefined,
+      m: undefined,
+      d: { k: keyNodes, v: valueNodes, s: len },
+      a: undefined,
+      n: undefined,
+    };
   }
 
-  async generateSetNode(
+  static async generateSetNode(
+    ctx: ParserContext,
     id: number,
     current: Set<AsyncServerValue>,
   ): Promise<SerovalSetNode> {
-    assert(this.ctx.features & Feature.Set, 'Unsupported type "Set"');
+    assert(ctx.features & Feature.Set, 'Unsupported type "Set"');
     const len = current.size;
     const nodes = new Array<SerovalNode>(len);
     const deferred = new Array<AsyncServerValue>(len);
@@ -143,17 +158,28 @@ class AsyncParser {
       if (isIterable(item)) {
         deferred[deferredSize++] = item;
       } else {
-        nodes[nodeSize++] = await this.parse(item);
+        nodes[nodeSize++] = await this.parse(ctx, item);
       }
     }
     // Parse deferred items
     for (let i = 0; i < deferredSize; i++) {
-      nodes[nodeSize + i] = await this.parse(deferred[i]);
+      nodes[nodeSize + i] = await this.parse(ctx, deferred[i]);
     }
-    return new SerovalSetNode(id, nodes);
+    return {
+      t: SerovalNodeType.Set,
+      i: id,
+      s: undefined,
+      l: undefined,
+      c: undefined,
+      m: undefined,
+      d: undefined,
+      a: nodes,
+      n: undefined,
+    };
   }
 
-  async generateProperties(
+  static async generateProperties(
+    ctx: ParserContext,
     properties: Record<string, AsyncServerValue>,
   ): Promise<SerovalObjectRecordNode> {
     const keys = Object.keys(properties);
@@ -173,128 +199,177 @@ class AsyncParser {
         deferredSize++;
       } else {
         keyNodes[nodesSize] = key;
-        valueNodes[nodesSize] = await this.parse(item);
+        valueNodes[nodesSize] = await this.parse(ctx, item);
         nodesSize++;
       }
     }
     for (let i = 0; i < deferredSize; i++) {
       keyNodes[nodesSize + i] = deferredKeys[i];
-      valueNodes[nodesSize + i] = await this.parse(deferredValues[i]);
+      valueNodes[nodesSize + i] = await this.parse(ctx, deferredValues[i]);
     }
-    return new SerovalObjectRecordNode(keyNodes, valueNodes, size);
+    return {
+      k: keyNodes,
+      v: valueNodes,
+      s: size,
+    };
   }
 
-  async generateIterableNode(
+  static async generateIterableNode(
+    ctx: ParserContext,
     id: number,
     current: Iterable<AsyncServerValue>,
   ): Promise<SerovalIterableNode> {
-    assert(this.ctx.features & Feature.SymbolIterator, 'Unsupported type "Iterable"');
+    assert(ctx.features & Feature.SymbolIterator, 'Unsupported type "Iterable"');
     const options = getIterableOptions(current);
-    return new SerovalIterableNode(
-      id,
+    return {
+      t: SerovalNodeType.Iterable,
+      i: id,
+      s: undefined,
+      l: undefined,
+      c: undefined,
+      m: undefined,
       // Parse options first before the items
-      options
-        ? await this.generateProperties(options as Record<string, AsyncServerValue>)
+      d: options
+        ? await this.generateProperties(ctx, options as Record<string, AsyncServerValue>)
         : undefined,
-      await this.generateNodeList(Array.from(current)),
-    );
+      a: await this.generateNodeList(ctx, Array.from(current)),
+      n: undefined,
+    };
   }
 
-  async generatePromiseNode(
+  static async generatePromiseNode(
+    ctx: ParserContext,
     id: number,
     current: PromiseLike<AsyncServerValue>,
   ): Promise<SerovalPromiseNode> {
-    assert(this.ctx.features & Feature.Promise, 'Unsupported type "Promise"');
-    return current.then(async (value) => new SerovalPromiseNode(id, await this.parse(value)));
+    assert(ctx.features & Feature.Promise, 'Unsupported type "Promise"');
+    return current.then(async (value) => ({
+      t: SerovalNodeType.Promise,
+      i: id,
+      s: undefined,
+      l: undefined,
+      c: undefined,
+      m: undefined,
+      // Parse options first before the items
+      d: undefined,
+      a: undefined,
+      n: await this.parse(ctx, value),
+    }));
   }
 
-  async generateObjectNode(
+  static async generateObjectNode(
+    ctx: ParserContext,
     id: number,
     current: ObjectLikeValue,
     empty: boolean,
   ): Promise<ObjectLikeNode> {
     if (Symbol.iterator in current) {
-      return this.generateIterableNode(id, current);
+      return this.generateIterableNode(ctx, id, current);
     }
     if ('then' in current && typeof current.then === 'function') {
-      return this.generatePromiseNode(id, current as PromiseLike<AsyncServerValue>);
-    }
-    const properties = await this.generateProperties(current as Record<string, AsyncServerValue>);
-    if (empty) {
-      return new SerovalNullConstructorNode(id, properties);
+      return this.generatePromiseNode(ctx, id, current as PromiseLike<AsyncServerValue>);
     }
-    return new SerovalObjectNode(id, properties);
+    return {
+      t: empty ? SerovalNodeType.NullConstructor : SerovalNodeType.Object,
+      i: id,
+      s: undefined,
+      l: undefined,
+      c: undefined,
+      m: undefined,
+      d: await this.generateProperties(ctx, current as Record<string, AsyncServerValue>),
+      a: undefined,
+      n: undefined,
+    };
   }
 
-  async generateAggregateErrorNode(
+  static async generateAggregateErrorNode(
+    ctx: ParserContext,
     id: number,
     current: AggregateError,
   ): Promise<SerovalAggregateErrorNode> {
     const options = getErrorOptions(current);
     const optionsNode = options
-      ? await this.generateProperties(options)
+      ? await this.generateProperties(ctx, options)
       : undefined;
-    return new SerovalAggregateErrorNode(
-      id,
-      current.message,
-      optionsNode,
-      await this.parse(current.errors),
-    );
+    return {
+      t: SerovalNodeType.AggregateError,
+      i: id,
+      s: undefined,
+      l: undefined,
+      c: undefined,
+      m: current.message,
+      d: optionsNode,
+      a: undefined,
+      n: await this.parse(ctx, current.errors),
+    };
   }
 
-  async generateErrorNode(
+  static async generateErrorNode(
+    ctx: ParserContext,
     id: number,
     current: Error,
   ): Promise<SerovalErrorNode> {
     const options = getErrorOptions(current);
     const optionsNode = options
-      ? await this.generateProperties(options)
+      ? await this.generateProperties(ctx, options)
       : undefined;
-    return new SerovalErrorNode(id, getErrorConstructor(current), current.message, optionsNode);
+    return {
+      t: SerovalNodeType.Error,
+      i: id,
+      s: undefined,
+      l: undefined,
+      c: getErrorConstructor(current),
+      m: current.message,
+      d: optionsNode,
+      a: undefined,
+      n: undefined,
+    };
   }
 
-  async parse(current: AsyncServerValue): Promise<SerovalNode> {
+  static async parse(
+    ctx: ParserContext,
+    current: AsyncServerValue,
+  ): Promise<SerovalNode> {
     switch (typeof current) {
       case 'boolean':
         return current ? TRUE_NODE : FALSE_NODE;
       case 'undefined':
         return UNDEFINED_NODE;
       case 'string':
-        return new SerovalPrimitiveNode(quote(current));
+        return createPrimitiveNode(quote(current));
       case 'number':
         if (Object.is(current, -0)) {
           return NEG_ZERO_NODE;
         }
         if (Object.is(current, Infinity)) {
-          return INFINITY_NODE;
+          return createPrimitiveNode('1/0');
         }
         if (Object.is(current, -Infinity)) {
-          return NEG_INFINITY_NODE;
+          return createPrimitiveNode('-1/0');
         }
-        return new SerovalPrimitiveNode(current);
+        return createPrimitiveNode(current);
       case 'bigint':
-        assert(this.ctx.features & Feature.BigInt, 'Unsupported type "BigInt"');
-        return new SerovalBigIntNode(current);
+        return createBigIntNode(ctx, current);
       case 'object': {
         if (!current) {
           return NULL_NODE;
         }
         // Non-primitive values needs a reference ID
         // mostly because the values themselves are stateful
-        const id = createRef(this.ctx, current, true);
-        if (this.ctx.markedRefs[id]) {
-          return new SerovalReferenceNode(id);
+        const id = createRef(ctx, current, true);
+        if (ctx.markedRefs.has(id)) {
+          return createReferenceNode(id);
         }
         if (Array.isArray(current)) {
-          return this.generateArrayNode(id, current);
+          return this.generateArrayNode(ctx, id, current);
         }
         switch (current.constructor) {
           case Date:
-            return new SerovalDateNode(id, current as Date);
+            return createDateNode(id, current as Date);
           case RegExp:
-            return new SerovalRegExpNode(id, current as RegExp);
+            return createRegExpNode(id, current as RegExp);
           case Promise:
-            return this.generatePromiseNode(id, current as Promise<AsyncServerValue>);
+            return this.generatePromiseNode(ctx, id, current as Promise<AsyncServerValue>);
           case Int8Array:
           case Int16Array:
           case Int32Array:
@@ -304,28 +379,41 @@ class AsyncParser {
           case Uint8ClampedArray:
           case Float32Array:
           case Float64Array:
-            assert(this.ctx.features & Feature.TypedArray, `Unsupported value type "${current.constructor.name}"`);
-            return new SerovalTypedArrayNode(id, current as TypedArrayValue);
+            return createTypedArrayNode(ctx, id, current as TypedArrayValue);
           case BigInt64Array:
           case BigUint64Array:
-            assert(
-              this.ctx.features & (Feature.BigIntTypedArray),
-              `Unsupported value type "${current.constructor.name}"`,
-            );
-            return new SerovalBigIntTypedArrayNode(id, current as BigIntTypedArrayValue);
+            return createBigIntTypedArrayNode(ctx, id, current as BigIntTypedArrayValue);
           case Map:
-            return this.generateMapNode(id, current as Map<AsyncServerValue, AsyncServerValue>);
+            return this.generateMapNode(
+              ctx,
+              id,
+              current as Map<AsyncServerValue, AsyncServerValue>,
+            );
           case Set:
-            return this.generateSetNode(id, current as Set<AsyncServerValue>);
+            return this.generateSetNode(
+              ctx,
+              id,
+              current as Set<AsyncServerValue>,
+            );
           case Object:
-            return this.generateObjectNode(id, current as Record<string, AsyncServerValue>, false);
+            return this.generateObjectNode(
+              ctx,
+              id,
+              current as Record<string, AsyncServerValue>,
+              false,
+            );
           case undefined:
-            return this.generateObjectNode(id, current as Record<string, AsyncServerValue>, true);
+            return this.generateObjectNode(
+              ctx,
+              id,
+              current as Record<string, AsyncServerValue>,
+              true,
+            );
           case AggregateError:
-            if (this.ctx.features & Feature.AggregateError) {
-              return this.generateAggregateErrorNode(id, current as AggregateError);
+            if (ctx.features & Feature.AggregateError) {
+              return this.generateAggregateErrorNode(ctx, id, current as AggregateError);
             }
-            return this.generateErrorNode(id, current as AggregateError);
+            return this.generateErrorNode(ctx, id, current as AggregateError);
           case Error:
           case EvalError:
           case RangeError:
@@ -333,26 +421,26 @@ class AsyncParser {
           case SyntaxError:
           case TypeError:
           case URIError:
-            return this.generateErrorNode(id, current as Error);
+            return this.generateErrorNode(ctx, id, current as Error);
           default:
             break;
         }
-        if (current instanceof AggregateError && this.ctx.features & Feature.AggregateError) {
-          return this.generateAggregateErrorNode(id, current);
+        if (current instanceof AggregateError && ctx.features & Feature.AggregateError) {
+          return this.generateAggregateErrorNode(ctx, id, current);
         }
         if (current instanceof Error) {
-          return this.generateErrorNode(id, current);
+          return this.generateErrorNode(ctx, id, current);
         }
         if (current instanceof Promise) {
-          return this.generatePromiseNode(id, current);
+          return this.generatePromiseNode(ctx, id, current);
         }
         // Generator functions don't have a global constructor
         if (Symbol.iterator in current) {
-          return this.generateIterableNode(id, current);
+          return this.generateIterableNode(ctx, id, current);
         }
         // For Promise-like objects
         if ('then' in current && typeof current.then === 'function') {
-          return this.generatePromiseNode(id, current as PromiseLike<AsyncServerValue>);
+          return this.generatePromiseNode(ctx, id, current as PromiseLike<AsyncServerValue>);
         }
         throw new Error('Unsupported type');
       }
@@ -366,7 +454,7 @@ export default async function parseAsync(
   ctx: ParserContext,
   current: AsyncServerValue,
 ) {
-  const result = await new AsyncParser(ctx).parse(current);
+  const result = await AsyncParser.parse(ctx, current);
   const isObject = result.t === SerovalNodeType.Object
     || result.t === SerovalNodeType.Iterable;
   return [result, createRef(ctx, current, false), isObject] as const;