seroval 0.4.0-alpha.7 → 0.4.0-alpha.8

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "seroval",
   "type": "module",
-  "version": "0.4.0-alpha.7",
+  "version": "0.4.0-alpha.8",
   "files": [
     "dist",
     "src"
@@ -64,5 +64,5 @@
   "typesVersions": {
     "*": {}
   },
-  "gitHead": "30e67c013299a4e75136a9a2b41945ee54d8b6b8"
+  "gitHead": "e965d1992af3e9a86a8919de6204fe4edb7b21a2"
 }

package/src/context.ts

@@ -28,16 +28,17 @@ export type Assignment =
 
 export interface ParserContext {
   refs: Map<unknown, number>;
-  markedRefs: Set<number>;
+  markedRefs: Record<number, number>;
   features: number;
 }
 
 export interface SerializationContext {
   stack: number[];
   // Map tree refs to actual refs
-  validRefs: Map<number, number>;
+  validRefs: number[];
+  refSize: number;
   // Refs that are...referenced
-  markedRefs: Set<number>;
+  markedRefs: Record<number, number>;
   // Variables
   vars: string[];
   // Array of assignments to be done (used for recursion)
@@ -58,14 +59,14 @@ export function createParserContext(options: Partial<Options> = {}): ParserConte
   // eslint-disable-next-line prefer-object-spread
   const result = Object.assign({}, DEFAULT_OPTIONS, options || {});
   return {
-    markedRefs: new Set(),
+    markedRefs: {},
     refs: new Map(),
     features: parseTargets(result.target),
   };
 }
 
 export interface SerializationOptions {
-  markedRefs: number[] | Set<number>;
+  markedRefs: Record<number, number>;
   features: number;
 }
 
@@ -74,9 +75,10 @@ export function createSerializationContext(options: SerializationOptions): Seria
     stack: [],
     vars: [],
     assignments: [],
-    validRefs: new Map(),
+    validRefs: [],
+    refSize: 0,
     features: options.features,
-    markedRefs: new Set(options.markedRefs),
+    markedRefs: options.markedRefs,
   };
 }
 
@@ -84,7 +86,7 @@ export function createSerializationContext(options: SerializationOptions): Seria
  * Increments the number of references the referenced value has
  */
 export function markRef(ctx: ParserContext | SerializationContext, current: number) {
-  ctx.markedRefs.add(current);
+  ctx.markedRefs[current] = 1;
 }
 
 /**
@@ -97,13 +99,13 @@ function createValidRef(
   ctx: SerializationContext,
   index: number,
 ) {
-  const current = ctx.validRefs.get(index);
-  if (current != null) {
-    return current;
+  const current = ctx.validRefs[index];
+  if (current == null) {
+    const value = ctx.refSize++;
+    ctx.validRefs[index] = value;
+    return value;
   }
-  const id = ctx.validRefs.size;
-  ctx.validRefs.set(index, id);
-  return id;
+  return current;
 }
 
 /**

package/src/index.ts

@@ -106,7 +106,7 @@ type SerovalJSON = [
   root: number,
   isObject: boolean,
   feature: number,
-  markedRefs: number[],
+  markedRefs: Record<number, number>,
 ];
 
 export function toJSON<T extends ServerValue>(
@@ -120,7 +120,7 @@ export function toJSON<T extends ServerValue>(
     root,
     isObject,
     ctx.features,
-    [...ctx.markedRefs],
+    ctx.markedRefs,
   ]);
 }
 
@@ -135,7 +135,7 @@ export async function toJSONAsync<T extends AsyncServerValue>(
     root,
     isObject,
     ctx.features,
-    [...ctx.markedRefs],
+    ctx.markedRefs,
   ]);
 }
 

package/src/tree/serialize.ts

@@ -96,7 +96,7 @@ function assignRef(
   index: number,
   value: string,
 ) {
-  if (ctx.markedRefs.has(index)) {
+  if (ctx.markedRefs[index]) {
     return `${getRefParam(ctx, index)}=${value}`;
   }
   return value;