seroval 0.4.0-alpha.9 → 0.4.1

package/src/index.ts

@@ -1,5 +1,4 @@
 /* eslint-disable no-await-in-loop */
-import { isPrimitive } from './checks';
 import { Feature } from './compat';
 import {
   SerializationContext,
@@ -10,7 +9,6 @@ import {
 } from './context';
 import parseAsync from './tree/async';
 import serializeTree, { resolvePatches } from './tree/serialize';
-import { serializePrimitive } from './tree/shared';
 import parseSync from './tree/sync';
 import { SerovalNode } from './tree/types';
 import {
@@ -29,6 +27,7 @@ export {
   CommonServerValue,
   SemiPrimitiveValue,
   ErrorValue,
+  Feature,
 };
 
 function finalize(
@@ -44,10 +43,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
@@ -56,14 +54,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;
 }
@@ -73,9 +71,6 @@ export function serialize<T extends ServerValue>(
   options?: Partial<Options>,
 ) {
   const ctx = createParserContext(options);
-  if (isPrimitive(source)) {
-    return String(serializePrimitive(source));
-  }
   const [tree, rootID, isObject] = parseSync(ctx, source);
   const serial = createSerializationContext(ctx);
   const result = serializeTree(serial, tree);
@@ -87,9 +82,6 @@ export async function serializeAsync<T extends AsyncServerValue>(
   options?: Partial<Options>,
 ) {
   const ctx = createParserContext(options);
-  if (isPrimitive(source)) {
-    return String(serializePrimitive(source));
-  }
   const [tree, rootID, isObject] = await parseAsync(ctx, source);
   const serial = createSerializationContext(ctx);
   const result = serializeTree(serial, tree);
@@ -101,55 +93,54 @@ 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>,
-];
+export interface SerovalJSON {
+  t: SerovalNode,
+  r: number,
+  i: boolean,
+  f: number,
+  m: number[],
+}
 
 export function toJSON<T extends ServerValue>(
   source: T,
   options?: Partial<Options>,
-) {
+): SerovalJSON {
   const ctx = createParserContext(options);
   const [tree, root, isObject] = parseSync(ctx, source);
-  return JSON.stringify([
-    tree,
-    root,
-    isObject,
-    ctx.features,
-    ctx.markedRefs,
-  ]);
+  return {
+    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>,
-) {
+): Promise<SerovalJSON> {
   const ctx = createParserContext(options);
   const [tree, root, isObject] = await parseAsync(ctx, source);
-  return JSON.stringify([
-    tree,
-    root,
-    isObject,
-    ctx.features,
-    ctx.markedRefs,
-  ]);
+  return {
+    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;
+export function compileJSON(source: SerovalJSON): string {
   const serial = createSerializationContext({
-    features: parsed[3],
-    markedRefs: parsed[4],
+    features: source.f,
+    markedRefs: source.m,
   });
-  const result = serializeTree(serial, parsed[0]);
-  return finalize(serial, parsed[1], parsed[2], result);
+  const result = serializeTree(serial, source.t);
+  return finalize(serial, source.r, source.i, result);
 }
 
-export function fromJSON<T extends AsyncServerValue>(source: string): T {
+export function fromJSON<T extends AsyncServerValue>(source: SerovalJSON): T {
   return deserialize<T>(compileJSON(source));
 }
 

package/src/quote.ts

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