seroval 0.5.1 → 0.7.0

package/src/tree/deserialize.ts

@@ -1,16 +1,24 @@
+/* eslint-disable prefer-spread */
 /* eslint-disable @typescript-eslint/no-use-before-define */
 import {
   SerializationContext,
 } from '../context';
-import { invQuote } from '../quote';
-import { AsyncServerValue } from '../types';
+import { deserializeString } from '../string';
+import { getReference } from './reference';
 import { getErrorConstructor, getTypedArrayConstructor } from './shared';
 import { SYMBOL_REF } from './symbols';
 import {
   SerovalAggregateErrorNode,
+  SerovalArrayBufferNode,
   SerovalArrayNode,
   SerovalBigIntTypedArrayNode,
+  SerovalBlobNode,
+  SerovalDataViewNode,
+  SerovalDateNode,
   SerovalErrorNode,
+  SerovalFileNode,
+  SerovalFormDataNode,
+  SerovalHeadersNode,
   SerovalIterableNode,
   SerovalMapNode,
   SerovalNode,
@@ -19,26 +27,36 @@ import {
   SerovalObjectNode,
   SerovalObjectRecordNode,
   SerovalPromiseNode,
+  SerovalReferenceNode,
+  SerovalRegExpNode,
   SerovalSetNode,
   SerovalTypedArrayNode,
+  SerovalURLNode,
+  SerovalURLSearchParamsNode,
 } from './types';
 
-function assignRef<T extends AsyncServerValue>(
+function assignIndexedValue<T>(
   ctx: SerializationContext,
   index: number,
   value: T,
 ) {
-  ctx.valueMap.set(index, value);
+  if (ctx.markedRefs.has(index)) {
+    ctx.valueMap.set(index, value);
+  }
   return value;
 }
 
-function deserializeNodeList(
+function deserializeArray(
   ctx: SerializationContext,
-  node: SerovalArrayNode | SerovalIterableNode | SerovalAggregateErrorNode,
-  result: AsyncServerValue[],
+  node: SerovalArrayNode,
 ) {
+  const result: unknown[] = assignIndexedValue(
+    ctx,
+    node.i,
+    new Array<unknown>(node.l),
+  );
   let item: SerovalNode;
-  for (let i = 0, len = node.a.length; i < len; i++) {
+  for (let i = 0, len = node.l; i < len; i++) {
     item = node.a[i];
     if (item) {
       result[i] = deserializeTree(ctx, item);
@@ -47,31 +65,16 @@ function deserializeNodeList(
   return result;
 }
 
-function deserializeArray(
-  ctx: SerializationContext,
-  node: SerovalArrayNode,
-) {
-  const result: AsyncServerValue[] = assignRef(
-    ctx,
-    node.i,
-    new Array<AsyncServerValue>(node.l),
-  );
-  ctx.stack.push(node.i);
-  deserializeNodeList(ctx, node, result);
-  ctx.stack.pop();
-  return result;
-}
-
 function deserializeProperties(
   ctx: SerializationContext,
   node: SerovalObjectRecordNode,
-  result: Record<string, AsyncServerValue>,
+  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[deserializeString(node.k[i])] = deserializeTree(ctx, node.v[i]);
   }
   return result;
 }
@@ -80,10 +83,12 @@ function deserializeNullConstructor(
   ctx: SerializationContext,
   node: SerovalNullConstructorNode,
 ) {
-  const result = assignRef(ctx, node.i, Object.create(null) as Record<string, AsyncServerValue>);
-  ctx.stack.push(node.i);
+  const result = assignIndexedValue(
+    ctx,
+    node.i,
+    Object.create(null) as Record<string, unknown>,
+  );
   deserializeProperties(ctx, node.d, result);
-  ctx.stack.pop();
   return result;
 }
 
@@ -91,10 +96,8 @@ function deserializeObject(
   ctx: SerializationContext,
   node: SerovalObjectNode,
 ) {
-  const result = assignRef(ctx, node.i, {} as Record<string, AsyncServerValue>);
-  ctx.stack.push(node.i);
+  const result = assignIndexedValue(ctx, node.i, {} as Record<string, unknown>);
   deserializeProperties(ctx, node.d, result);
-  ctx.stack.pop();
   return result;
 }
 
@@ -102,12 +105,10 @@ function deserializeSet(
   ctx: SerializationContext,
   node: SerovalSetNode,
 ) {
-  const result = assignRef(ctx, node.i, new Set<AsyncServerValue>());
-  ctx.stack.push(node.i);
-  for (let i = 0, len = node.a.length; i < len; i++) {
+  const result = assignIndexedValue(ctx, node.i, new Set<unknown>());
+  for (let i = 0, len = node.l; i < len; i++) {
     result.add(deserializeTree(ctx, node.a[i]));
   }
-  ctx.stack.pop();
   return result;
 }
 
@@ -115,23 +116,21 @@ function deserializeMap(
   ctx: SerializationContext,
   node: SerovalMapNode,
 ) {
-  const result = assignRef(
+  const result = assignIndexedValue(
     ctx,
     node.i,
-    new Map<AsyncServerValue, AsyncServerValue>(),
+    new Map<unknown, unknown>(),
   );
-  ctx.stack.push(node.i);
-  for (let i = 0; i < node.d.s; i++) {
+  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]),
     );
   }
-  ctx.stack.pop();
   return result;
 }
 
-type AssignableValue = AggregateError | Error | Iterable<AsyncServerValue>
+type AssignableValue = AggregateError | Error | Iterable<unknown>
 type AssignableNode = SerovalAggregateErrorNode | SerovalErrorNode | SerovalIterableNode;
 
 function deserializeDictionary<T extends AssignableValue>(
@@ -140,9 +139,7 @@ function deserializeDictionary<T extends AssignableValue>(
   result: T,
 ) {
   if (node.d) {
-    ctx.stack.push(node.i);
     const fields = deserializeProperties(ctx, node.d, {});
-    ctx.stack.pop();
     Object.assign(result, fields);
   }
   return result;
@@ -153,10 +150,11 @@ function deserializeAggregateError(
   node: SerovalAggregateErrorNode,
 ) {
   // Serialize the required arguments
-  const result = assignRef(ctx, node.i, new AggregateError([], 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
@@ -168,13 +166,13 @@ function deserializeError(
   node: SerovalErrorNode,
 ) {
   const ErrorConstructor = getErrorConstructor(node.c);
-  const result = assignRef(ctx, node.i, new ErrorConstructor(node.m));
+  const result = assignIndexedValue(ctx, node.i, new ErrorConstructor(deserializeString(node.m)));
   return deserializeDictionary(ctx, node, result);
 }
 
 interface Deferred {
-  resolve(value: AsyncServerValue): void;
-  promise: Promise<AsyncServerValue>;
+  resolve(value: unknown): void;
+  promise: Promise<unknown>;
 }
 
 function createDeferred(): Deferred {
@@ -194,26 +192,31 @@ function deserializePromise(
   node: SerovalPromiseNode,
 ) {
   const deferred = createDeferred();
-  const result = assignRef(ctx, node.i, deferred.promise);
+  const result = assignIndexedValue(ctx, node.i, deferred.promise);
   deferred.resolve(deserializeTree(ctx, node.f));
   return result;
 }
 
+function deserializeArrayBuffer(
+  ctx: SerializationContext,
+  node: SerovalArrayBufferNode,
+) {
+  const bytes = new Uint8Array(node.s);
+  const result = assignIndexedValue(ctx, node.i, bytes.buffer);
+  return result;
+}
+
 function deserializeTypedArray(
   ctx: SerializationContext,
   node: SerovalTypedArrayNode | SerovalBigIntTypedArrayNode,
 ) {
   const TypedArray = getTypedArrayConstructor(node.c);
-  const dummy = new TypedArray();
-  const result = assignRef(ctx, node.i, new TypedArray(
-    dummy.buffer,
+  const source = deserializeTree(ctx, node.f) as ArrayBuffer;
+  const result = assignIndexedValue(ctx, node.i, new TypedArray(
+    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;
 }
 
@@ -221,24 +224,131 @@ function deserializeIterable(
   ctx: SerializationContext,
   node: SerovalIterableNode,
 ) {
-  const values: AsyncServerValue[] = [];
-  deserializeNodeList(ctx, node, values);
-  const result = assignRef(ctx, node.i, {
+  const values: unknown[] = [];
+  let item: SerovalNode;
+  for (let i = 0, len = node.l; i < len; i++) {
+    item = node.a[i];
+    if (item) {
+      values[i] = deserializeTree(ctx, item);
+    }
+  }
+  const result: Iterable<unknown> = assignIndexedValue(ctx, node.i, {
     [Symbol.iterator]: () => values.values(),
   });
   return deserializeDictionary(ctx, node, result);
 }
 
+function deserializeDate(
+  ctx: SerializationContext,
+  node: SerovalDateNode,
+) {
+  return assignIndexedValue(ctx, node.i, new Date(node.s));
+}
+
+function deserializeRegExp(
+  ctx: SerializationContext,
+  node: SerovalRegExpNode,
+) {
+  return assignIndexedValue(ctx, node.i, new RegExp(node.c, node.m));
+}
+
+function deserializeURL(
+  ctx: SerializationContext,
+  node: SerovalURLNode,
+) {
+  return assignIndexedValue(ctx, node.i, new URL(deserializeString(node.s)));
+}
+
+function deserializeURLSearchParams(
+  ctx: SerializationContext,
+  node: SerovalURLSearchParamsNode,
+) {
+  return assignIndexedValue(ctx, node.i, new URLSearchParams(deserializeString(node.s)));
+}
+
+function deserializeReference(
+  ctx: SerializationContext,
+  node: SerovalReferenceNode,
+) {
+  return assignIndexedValue(ctx, node.i, getReference(deserializeString(node.s)));
+}
+
+function deserializeDataView(
+  ctx: SerializationContext,
+  node: SerovalDataViewNode,
+) {
+  const source = deserializeTree(ctx, node.f) as ArrayBuffer;
+  const result = assignIndexedValue(ctx, node.i, new DataView(
+    source,
+    node.b,
+    node.l,
+  ));
+  return result;
+}
+
+function deserializeBlob(
+  ctx: SerializationContext,
+  node: SerovalBlobNode,
+) {
+  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,
+) {
+  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,
+) {
+  const result = assignIndexedValue(ctx, node.i, new Headers());
+  for (let i = 0, len = node.d.s; i < len; i++) {
+    result.set(
+      deserializeString(node.d.k[i]),
+      deserializeTree(ctx, node.d.v[i]) as string,
+    );
+  }
+  return result;
+}
+
+function deserializeFormData(
+  ctx: SerializationContext,
+  node: SerovalFormDataNode,
+) {
+  const result = assignIndexedValue(ctx, node.i, new FormData());
+  for (let i = 0, len = node.d.s; i < len; i++) {
+    result.set(
+      deserializeString(node.d.k[i]),
+      deserializeTree(ctx, node.d.v[i]) as FormDataEntryValue,
+    );
+  }
+  return result;
+}
+
 export default function deserializeTree(
   ctx: SerializationContext,
   node: SerovalNode,
-): AsyncServerValue {
+): unknown {
   switch (node.t) {
     case SerovalNodeType.Number:
     case SerovalNodeType.Boolean:
       return node.s;
     case SerovalNodeType.String:
-      return invQuote(node.s);
+      return deserializeString(node.s);
     case SerovalNodeType.Undefined:
       return undefined;
     case SerovalNodeType.Null:
@@ -253,7 +363,7 @@ export default function deserializeTree(
       return NaN;
     case SerovalNodeType.BigInt:
       return BigInt(node.s);
-    case SerovalNodeType.Reference:
+    case SerovalNodeType.IndexedValue:
       return ctx.valueMap.get(node.i);
     case SerovalNodeType.Array:
       return deserializeArray(ctx, node);
@@ -262,16 +372,20 @@ export default function deserializeTree(
     case SerovalNodeType.NullConstructor:
       return deserializeNullConstructor(ctx, node);
     case SerovalNodeType.Date:
-      return assignRef(ctx, node.i, new Date(node.s));
+      return deserializeDate(ctx, node);
     case SerovalNodeType.RegExp:
-      return assignRef(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:
@@ -282,6 +396,20 @@ export default function deserializeTree(
       return deserializePromise(ctx, node);
     case SerovalNodeType.WKSymbol:
       return SYMBOL_REF[node.s];
+    case SerovalNodeType.URL:
+      return deserializeURL(ctx, node);
+    case SerovalNodeType.URLSearchParams:
+      return deserializeURLSearchParams(ctx, node);
+    case SerovalNodeType.Reference:
+      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);
     default:
       throw new Error('Unsupported type');
   }