seroval 0.6.0 → 0.8.0

package/src/tree/constants.ts

@@ -0,0 +1,72 @@
+import type { SerovalConstantNode } from './types';
+import { SerovalConstant, SerovalNodeType } from './types';
+
+function createConstantNode(value: SerovalConstant): SerovalConstantNode {
+  return {
+    t: SerovalNodeType.Constant,
+    i: undefined,
+    s: value,
+    l: undefined,
+    c: undefined,
+    m: undefined,
+    d: undefined,
+    a: undefined,
+    f: undefined,
+    b: undefined,
+  };
+}
+
+export const TRUE_NODE = createConstantNode(SerovalConstant.True);
+export const FALSE_NODE = createConstantNode(SerovalConstant.False);
+export const UNDEFINED_NODE = createConstantNode(SerovalConstant.Undefined);
+export const NULL_NODE = createConstantNode(SerovalConstant.Null);
+export const NEG_ZERO_NODE = createConstantNode(SerovalConstant.NegativeZero);
+export const INFINITY_NODE = createConstantNode(SerovalConstant.Infinity);
+export const NEG_INFINITY_NODE = createConstantNode(SerovalConstant.NegativeInfinity);
+export const NAN_NODE = createConstantNode(SerovalConstant.NaN);
+
+export function serializeConstant(node: SerovalConstantNode): string {
+  switch (node.s) {
+    case SerovalConstant.True:
+      return '!0';
+    case SerovalConstant.False:
+      return '!1';
+    case SerovalConstant.Undefined:
+      return 'void 0';
+    case SerovalConstant.Null:
+      return 'null';
+    case SerovalConstant.NegativeZero:
+      return '-0';
+    case SerovalConstant.Infinity:
+      return '1/0';
+    case SerovalConstant.NegativeInfinity:
+      return '-1/0';
+    case SerovalConstant.NaN:
+      return 'NaN';
+    default:
+      throw new Error('invariant');
+  }
+}
+
+export function deserializeConstant(node: SerovalConstantNode): unknown {
+  switch (node.s) {
+    case SerovalConstant.True:
+      return true;
+    case SerovalConstant.False:
+      return false;
+    case SerovalConstant.Undefined:
+      return undefined;
+    case SerovalConstant.Null:
+      return null;
+    case SerovalConstant.NegativeZero:
+      return -0;
+    case SerovalConstant.Infinity:
+      return Infinity;
+    case SerovalConstant.NegativeInfinity:
+      return -Infinity;
+    case SerovalConstant.NaN:
+      return NaN;
+    default:
+      throw new Error('invariant');
+  }
+}

package/src/tree/deserialize.ts

@@ -1,153 +1,163 @@
+/* eslint-disable prefer-spread */
 /* eslint-disable @typescript-eslint/no-use-before-define */
-import {
+import type {
   SerializationContext,
 } from '../context';
-import { invQuote } from '../quote';
-import { AsyncServerValue } from '../types';
+import { deserializeString } from '../string';
+import type { BigIntTypedArrayValue, TypedArrayValue } from '../types';
+import { deserializeConstant } from './constants';
 import { getReference } from './reference';
 import { getErrorConstructor, getTypedArrayConstructor } from './shared';
 import { SYMBOL_REF } from './symbols';
-import {
+import type {
   SerovalAggregateErrorNode,
+  SerovalArrayBufferNode,
   SerovalArrayNode,
   SerovalBigIntTypedArrayNode,
+  SerovalBlobNode,
+  SerovalBoxedNode,
+  SerovalDataViewNode,
+  SerovalDateNode,
   SerovalErrorNode,
-  SerovalIterableNode,
+  SerovalFileNode,
+  SerovalFormDataNode,
+  SerovalHeadersNode,
   SerovalMapNode,
   SerovalNode,
-  SerovalNodeType,
   SerovalNullConstructorNode,
   SerovalObjectNode,
+  SerovalObjectRecordKey,
   SerovalObjectRecordNode,
   SerovalPromiseNode,
+  SerovalReferenceNode,
+  SerovalRegExpNode,
   SerovalSetNode,
   SerovalTypedArrayNode,
+  SerovalURLNode,
+  SerovalURLSearchParamsNode,
+} from './types';
+import {
+  SerovalNodeType,
+  SerovalObjectRecordSpecialKey,
 } from './types';
 
 function assignIndexedValue<T>(
   ctx: SerializationContext,
   index: number,
   value: T,
-) {
-  ctx.valueMap.set(index, value);
-  return value;
-}
-
-function deserializeNodeList(
-  ctx: SerializationContext,
-  node: SerovalArrayNode | SerovalIterableNode | SerovalAggregateErrorNode,
-  result: unknown[],
-) {
-  let item: SerovalNode;
-  for (let i = 0, len = node.a.length; i < len; i++) {
-    item = node.a[i];
-    if (item) {
-      result[i] = deserializeTree(ctx, item);
-    }
+): T {
+  if (ctx.markedRefs.has(index)) {
+    ctx.valueMap.set(index, value);
   }
-  return result;
+  return value;
 }
 
 function deserializeArray(
   ctx: SerializationContext,
   node: SerovalArrayNode,
-) {
-  const result: AsyncServerValue[] = assignIndexedValue(
+): unknown[] {
+  const len = node.l;
+  const result: unknown[] = assignIndexedValue(
     ctx,
     node.i,
-    new Array<AsyncServerValue>(node.l),
+    new Array<unknown>(len),
   );
-  ctx.stack.push(node.i);
-  deserializeNodeList(ctx, node, result);
-  ctx.stack.pop();
+  let item: SerovalNode | undefined;
+  for (let i = 0; i < len; i++) {
+    item = node.a[i];
+    if (item) {
+      result[i] = deserializeTree(ctx, item);
+    }
+  }
   return result;
 }
 
 function deserializeProperties(
   ctx: SerializationContext,
   node: SerovalObjectRecordNode,
-  result: Record<string, unknown>,
-) {
-  if (node.s === 0) {
-    return {};
-  }
-  for (let i = 0; i < node.s; i++) {
-    result[node.k[i]] = deserializeTree(ctx, node.v[i]);
+  result: Record<string | symbol, unknown>,
+): Record<string | symbol, unknown> {
+  const len = node.s;
+  if (len) {
+    let key: SerovalObjectRecordKey;
+    let value: unknown;
+    const keys = node.k;
+    const vals = node.v;
+    for (let i = 0; i < len; i++) {
+      key = keys[i];
+      value = deserializeTree(ctx, vals[i]);
+      switch (key) {
+        case SerovalObjectRecordSpecialKey.SymbolIterator: {
+          const current = value as unknown[];
+          result[Symbol.iterator] = (): IterableIterator<unknown> => current.values();
+        }
+          break;
+        default:
+          result[deserializeString(key)] = value;
+          break;
+      }
+    }
   }
   return result;
 }
 
-function deserializeNullConstructor(
+function deserializeObject(
   ctx: SerializationContext,
-  node: SerovalNullConstructorNode,
-) {
+  node: SerovalObjectNode | SerovalNullConstructorNode,
+): Record<string, unknown> {
   const result = assignIndexedValue(
     ctx,
     node.i,
-    Object.create(null) as Record<string, AsyncServerValue>,
+    (node.t === SerovalNodeType.Object
+      ? {}
+      : Object.create(null)) as Record<string, unknown>,
   );
-  ctx.stack.push(node.i);
   deserializeProperties(ctx, node.d, result);
-  ctx.stack.pop();
-  return result;
-}
-
-function deserializeObject(
-  ctx: SerializationContext,
-  node: SerovalObjectNode,
-) {
-  const result = assignIndexedValue(ctx, node.i, {} as Record<string, AsyncServerValue>);
-  ctx.stack.push(node.i);
-  deserializeProperties(ctx, node.d, result);
-  ctx.stack.pop();
   return result;
 }
 
 function deserializeSet(
   ctx: SerializationContext,
   node: SerovalSetNode,
-) {
+): Set<unknown> {
   const result = assignIndexedValue(ctx, node.i, new Set<unknown>());
-  ctx.stack.push(node.i);
-  for (let i = 0, len = node.a.length; i < len; i++) {
-    result.add(deserializeTree(ctx, node.a[i]));
+  const items = node.a;
+  for (let i = 0, len = node.l; i < len; i++) {
+    result.add(deserializeTree(ctx, items[i]));
   }
-  ctx.stack.pop();
   return result;
 }
 
 function deserializeMap(
   ctx: SerializationContext,
   node: SerovalMapNode,
-) {
+): Map<unknown, unknown> {
   const result = assignIndexedValue(
     ctx,
     node.i,
     new Map<unknown, unknown>(),
   );
-  ctx.stack.push(node.i);
-  for (let i = 0; i < node.d.s; i++) {
+  const keys = node.d.k;
+  const vals = node.d.v;
+  for (let i = 0, len = node.d.s; i < len; i++) {
     result.set(
-      deserializeTree(ctx, node.d.k[i]),
-      deserializeTree(ctx, node.d.v[i]),
+      deserializeTree(ctx, keys[i]),
+      deserializeTree(ctx, vals[i]),
     );
   }
-  ctx.stack.pop();
   return result;
 }
 
-type AssignableValue = AggregateError | Error | Iterable<AsyncServerValue>
-type AssignableNode = SerovalAggregateErrorNode | SerovalErrorNode | SerovalIterableNode;
+type AssignableValue = AggregateError | Error | Iterable<unknown>
+type AssignableNode = SerovalAggregateErrorNode | SerovalErrorNode;
 
 function deserializeDictionary<T extends AssignableValue>(
   ctx: SerializationContext,
   node: AssignableNode,
   result: T,
-) {
+): T {
   if (node.d) {
-    ctx.stack.push(node.i);
     const fields = deserializeProperties(ctx, node.d, {});
-    ctx.stack.pop();
     Object.assign(result, fields);
   }
   return result;
@@ -156,12 +166,13 @@ function deserializeDictionary<T extends AssignableValue>(
 function deserializeAggregateError(
   ctx: SerializationContext,
   node: SerovalAggregateErrorNode,
-) {
+): AggregateError {
   // Serialize the required arguments
-  const result = assignIndexedValue(ctx, node.i, new AggregateError([], invQuote(node.m)));
-  ctx.stack.push(node.i);
-  result.errors = deserializeNodeList(ctx, node, new Array<AsyncServerValue>(node.l));
-  ctx.stack.pop();
+  const result = assignIndexedValue(
+    ctx,
+    node.i,
+    new AggregateError([], deserializeString(node.m)),
+  );
   // `AggregateError` might've been extended
   // either through class or custom properties
   // Make sure to assign extra properties
@@ -171,9 +182,9 @@ function deserializeAggregateError(
 function deserializeError(
   ctx: SerializationContext,
   node: SerovalErrorNode,
-) {
+): Error {
   const ErrorConstructor = getErrorConstructor(node.c);
-  const result = assignIndexedValue(ctx, node.i, new ErrorConstructor(invQuote(node.m)));
+  const result = assignIndexedValue(ctx, node.i, new ErrorConstructor(deserializeString(node.m)));
   return deserializeDictionary(ctx, node, result);
 }
 
@@ -185,7 +196,7 @@ interface Deferred {
 function createDeferred(): Deferred {
   let resolver: Deferred['resolve'];
   return {
-    resolve(v) {
+    resolve(v): void {
       resolver(v);
     },
     promise: new Promise((res) => {
@@ -194,44 +205,153 @@ function createDeferred(): Deferred {
   };
 }
 
-function deserializePromise(
+async function deserializePromise(
   ctx: SerializationContext,
   node: SerovalPromiseNode,
-) {
+): Promise<unknown> {
   const deferred = createDeferred();
   const result = assignIndexedValue(ctx, node.i, deferred.promise);
   deferred.resolve(deserializeTree(ctx, node.f));
   return result;
 }
 
+function deserializeArrayBuffer(
+  ctx: SerializationContext,
+  node: SerovalArrayBufferNode,
+): ArrayBuffer {
+  const bytes = new Uint8Array(node.s);
+  const result = assignIndexedValue(ctx, node.i, bytes.buffer);
+  return result;
+}
+
 function deserializeTypedArray(
   ctx: SerializationContext,
   node: SerovalTypedArrayNode | SerovalBigIntTypedArrayNode,
-) {
+): TypedArrayValue | BigIntTypedArrayValue {
   const TypedArray = getTypedArrayConstructor(node.c);
-  const dummy = new TypedArray();
+  const source = deserializeTree(ctx, node.f) as ArrayBuffer;
   const result = assignIndexedValue(ctx, node.i, new TypedArray(
-    dummy.buffer,
+    source,
+    node.b,
+    node.l,
+  ));
+  return result;
+}
+
+function deserializeDate(
+  ctx: SerializationContext,
+  node: SerovalDateNode,
+): Date {
+  return assignIndexedValue(ctx, node.i, new Date(node.s));
+}
+
+function deserializeRegExp(
+  ctx: SerializationContext,
+  node: SerovalRegExpNode,
+): RegExp {
+  return assignIndexedValue(ctx, node.i, new RegExp(node.c, node.m));
+}
+
+function deserializeURL(
+  ctx: SerializationContext,
+  node: SerovalURLNode,
+): URL {
+  return assignIndexedValue(ctx, node.i, new URL(deserializeString(node.s)));
+}
+
+function deserializeURLSearchParams(
+  ctx: SerializationContext,
+  node: SerovalURLSearchParamsNode,
+): URLSearchParams {
+  return assignIndexedValue(ctx, node.i, new URLSearchParams(deserializeString(node.s)));
+}
+
+function deserializeReference(
+  ctx: SerializationContext,
+  node: SerovalReferenceNode,
+): unknown {
+  return assignIndexedValue(ctx, node.i, getReference(deserializeString(node.s)));
+}
+
+function deserializeDataView(
+  ctx: SerializationContext,
+  node: SerovalDataViewNode,
+): DataView {
+  const source = deserializeTree(ctx, node.f) as ArrayBuffer;
+  const result = assignIndexedValue(ctx, node.i, new DataView(
+    source,
+    node.b,
     node.l,
   ));
-  for (let i = 0, len = node.s.length; i < len; i++) {
-    result[i] = node.t === SerovalNodeType.BigIntTypedArray
-      ? BigInt(node.s[i])
-      : Number(node.s[i]);
+  return result;
+}
+
+function deserializeBlob(
+  ctx: SerializationContext,
+  node: SerovalBlobNode,
+): Blob {
+  const source = deserializeTree(ctx, node.f) as ArrayBuffer;
+  const result = assignIndexedValue(ctx, node.i, new Blob(
+    [source],
+    { type: deserializeString(node.c) },
+  ));
+  return result;
+}
+
+function deserializeFile(
+  ctx: SerializationContext,
+  node: SerovalFileNode,
+): File {
+  const source = deserializeTree(ctx, node.f) as ArrayBuffer;
+  const result = assignIndexedValue(ctx, node.i, new File(
+    [source],
+    deserializeString(node.m),
+    { type: deserializeString(node.c), lastModified: node.b },
+  ));
+  return result;
+}
+
+function deserializeHeaders(
+  ctx: SerializationContext,
+  node: SerovalHeadersNode,
+): Headers {
+  const result = assignIndexedValue(ctx, node.i, new Headers());
+  const keys = node.d.k;
+  const vals = node.d.v;
+  for (let i = 0, len = node.d.s; i < len; i++) {
+    result.set(
+      deserializeString(keys[i]),
+      deserializeTree(ctx, vals[i]) as string,
+    );
   }
   return result;
 }
 
-function deserializeIterable(
+function deserializeFormData(
   ctx: SerializationContext,
-  node: SerovalIterableNode,
-) {
-  const values: AsyncServerValue[] = [];
-  deserializeNodeList(ctx, node, values);
-  const result = assignIndexedValue(ctx, node.i, {
-    [Symbol.iterator]: () => values.values(),
-  });
-  return deserializeDictionary(ctx, node, result);
+  node: SerovalFormDataNode,
+): FormData {
+  const result = assignIndexedValue(ctx, node.i, new FormData());
+  const keys = node.d.k;
+  const vals = node.d.v;
+  for (let i = 0, len = node.d.s; i < len; i++) {
+    result.set(
+      deserializeString(keys[i]),
+      deserializeTree(ctx, vals[i]) as FormDataEntryValue,
+    );
+  }
+  return result;
+}
+
+function deserializeBoxed(
+  ctx: SerializationContext,
+  node: SerovalBoxedNode,
+): unknown {
+  return assignIndexedValue(
+    ctx,
+    node.i,
+    Object(deserializeTree(ctx, node.f)),
+  );
 }
 
 export default function deserializeTree(
@@ -239,23 +359,12 @@ export default function deserializeTree(
   node: SerovalNode,
 ): unknown {
   switch (node.t) {
+    case SerovalNodeType.Constant:
+      return deserializeConstant(node);
     case SerovalNodeType.Number:
-    case SerovalNodeType.Boolean:
       return node.s;
     case SerovalNodeType.String:
-      return invQuote(node.s);
-    case SerovalNodeType.Undefined:
-      return undefined;
-    case SerovalNodeType.Null:
-      return null;
-    case SerovalNodeType.NegativeZero:
-      return -0;
-    case SerovalNodeType.Infinity:
-      return Infinity;
-    case SerovalNodeType.NegativeInfinity:
-      return -Infinity;
-    case SerovalNodeType.NaN:
-      return NaN;
+      return deserializeString(node.s);
     case SerovalNodeType.BigInt:
       return BigInt(node.s);
     case SerovalNodeType.IndexedValue:
@@ -263,37 +372,48 @@ export default function deserializeTree(
     case SerovalNodeType.Array:
       return deserializeArray(ctx, node);
     case SerovalNodeType.Object:
-      return deserializeObject(ctx, node);
     case SerovalNodeType.NullConstructor:
-      return deserializeNullConstructor(ctx, node);
+      return deserializeObject(ctx, node);
     case SerovalNodeType.Date:
-      return assignIndexedValue(ctx, node.i, new Date(node.s));
+      return deserializeDate(ctx, node);
     case SerovalNodeType.RegExp:
-      return assignIndexedValue(ctx, node.i, new RegExp(node.c, node.m));
+      return deserializeRegExp(ctx, node);
     case SerovalNodeType.Set:
       return deserializeSet(ctx, node);
     case SerovalNodeType.Map:
       return deserializeMap(ctx, node);
+    case SerovalNodeType.ArrayBuffer:
+      return deserializeArrayBuffer(ctx, node);
     case SerovalNodeType.BigIntTypedArray:
     case SerovalNodeType.TypedArray:
       return deserializeTypedArray(ctx, node);
+    case SerovalNodeType.DataView:
+      return deserializeDataView(ctx, node);
     case SerovalNodeType.AggregateError:
       return deserializeAggregateError(ctx, node);
     case SerovalNodeType.Error:
       return deserializeError(ctx, node);
-    case SerovalNodeType.Iterable:
-      return deserializeIterable(ctx, node);
     case SerovalNodeType.Promise:
       return deserializePromise(ctx, node);
     case SerovalNodeType.WKSymbol:
       return SYMBOL_REF[node.s];
     case SerovalNodeType.URL:
-      return assignIndexedValue(ctx, node.i, new URL(node.s));
+      return deserializeURL(ctx, node);
     case SerovalNodeType.URLSearchParams:
-      return assignIndexedValue(ctx, node.i, new URLSearchParams(node.s));
+      return deserializeURLSearchParams(ctx, node);
     case SerovalNodeType.Reference:
-      return assignIndexedValue(ctx, node.i, getReference(invQuote(node.s)));
+      return deserializeReference(ctx, node);
+    case SerovalNodeType.Blob:
+      return deserializeBlob(ctx, node);
+    case SerovalNodeType.File:
+      return deserializeFile(ctx, node);
+    case SerovalNodeType.Headers:
+      return deserializeHeaders(ctx, node);
+    case SerovalNodeType.FormData:
+      return deserializeFormData(ctx, node);
+    case SerovalNodeType.Boxed:
+      return deserializeBoxed(ctx, node);
     default:
-      throw new Error('Unsupported type');
+      throw new Error('invariant');
   }
 }