Add JSON deserializer

lxsmnsyc · Mar 17, 2023 · fadee71 · fadee71
1 parent 9d686de
commit fadee71
Show file tree

Hide file tree

Showing 17 changed files with 463 additions and 91 deletions.
diff --git a/packages/seroval/src/context.ts b/packages/seroval/src/context.ts
@@ -1,5 +1,6 @@
 import { ALL_ENABLED } from './compat';
 import getIdentifier from './get-identifier';
+import { AsyncServerValue } from './types';
 
 interface IndexAssignment {
   t: 'index';
@@ -47,6 +48,8 @@ export interface SerializationContext {
   assignments: Assignment[];
   // Supported features
   features: number;
+
+  valueMap: Map<number, AsyncServerValue>;
 }
 
 export interface Options {
@@ -81,6 +84,7 @@ export function createSerializationContext(options: SerializationOptions): Seria
     refSize: 0,
     features: options.features,
     markedRefs: new Set(options.markedRefs),
+    valueMap: new Map(),
   };
 }
 

diff --git a/packages/seroval/src/index.ts b/packages/seroval/src/index.ts
@@ -8,6 +8,7 @@ import {
   createSerializationContext,
 } from './context';
 import parseAsync from './tree/async';
+import deserializeTree from './tree/deserialize';
 import serializeTree, { resolvePatches } from './tree/serialize';
 import parseSync from './tree/sync';
 import { SerovalNode } from './tree/types';
@@ -141,7 +142,11 @@ export function compileJSON(source: SerovalJSON): string {
 }
 
 export function fromJSON<T extends AsyncServerValue>(source: SerovalJSON): T {
-  return deserialize<T>(compileJSON(source));
+  const serial = createSerializationContext({
+    features: source.f,
+    markedRefs: source.m,
+  });
+  return deserializeTree(serial, source.t) as T;
 }
 
 export default serialize;
diff --git a/packages/seroval/src/quote.ts b/packages/seroval/src/quote.ts
@@ -43,3 +43,14 @@ export default function quote(str: string) {
   }
   return result;
 }
+
+export function invQuote(str: string): string {
+  return str
+    .replace(/\\"/g, '"')
+    .replace(/\\\\/g, '\\')
+    .replace(/\\x3C/g, '<')
+    .replace(/\\n/g, '\n')
+    .replace(/\\r/g, '\r')
+    .replace(/\\u2028/g, '\u2028')
+    .replace(/\\u2029/g, '\u2029');
+}
diff --git a/packages/seroval/src/tree/async.ts b/packages/seroval/src/tree/async.ts
@@ -28,7 +28,7 @@ import {
   UNDEFINED_NODE,
 } from './primitives';
 import {
-  getErrorConstructor,
+  getErrorConstructorName,
   getErrorOptions,
   getIterableOptions,
   isIterable,
@@ -95,7 +95,7 @@ async function generateArrayNode(
     t: SerovalNodeType.Array,
     i: id,
     s: undefined,
-    l: undefined,
+    l: current.length,
     c: undefined,
     m: undefined,
     d: undefined,
@@ -173,7 +173,7 @@ async function generateSetNode(
     t: SerovalNodeType.Set,
     i: id,
     s: undefined,
-    l: undefined,
+    l: len,
     c: undefined,
     m: undefined,
     d: undefined,
@@ -225,18 +225,19 @@ async function generateIterableNode(
 ): Promise<SerovalIterableNode> {
   assert(ctx.features & Feature.Symbol, 'Unsupported type "Iterable"');
   const options = getIterableOptions(current);
+  const array = Array.from(current);
   return {
     t: SerovalNodeType.Iterable,
     i: id,
     s: undefined,
-    l: undefined,
+    l: array.length,
     c: undefined,
     m: undefined,
     // Parse options first before the items
     d: options
       ? await generateProperties(ctx, options as Record<string, AsyncServerValue>)
       : undefined,
-    a: await generateNodeList(ctx, Array.from(current)),
+    a: await generateNodeList(ctx, array),
     n: undefined,
   };
 }
@@ -299,7 +300,7 @@ async function generateAggregateErrorNode(
     t: SerovalNodeType.AggregateError,
     i: id,
     s: undefined,
-    l: undefined,
+    l: current.errors.length,
     c: undefined,
     m: current.message,
     d: optionsNode,
@@ -322,7 +323,7 @@ async function generateErrorNode(
     i: id,
     s: undefined,
     l: undefined,
-    c: getErrorConstructor(current),
+    c: getErrorConstructorName(current),
     m: current.message,
     d: optionsNode,
     a: undefined,