seroval 0.5.0 → 0.5.1

package/dist/cjs/development/index.cjs

@@ -95,35 +95,35 @@ function createSerializationContext(options) {
 function markRef(ctx, current) {
   ctx.markedRefs.add(current);
 }
-function createValidRef(ctx, index) {
-  const current = ctx.validRefs[index];
-  if (current == null) {
-    const value = ctx.refSize++;
-    ctx.validRefs[index] = value;
-    return value;
+function getRefParam(ctx, index) {
+  let actualIndex = ctx.validRefs[index];
+  if (actualIndex == null) {
+    actualIndex = ctx.refSize++;
+    ctx.validRefs[index] = actualIndex;
+  }
+  let identifier = ctx.vars[actualIndex];
+  if (identifier == null) {
+    identifier = getIdentifier(actualIndex);
+    ctx.vars[actualIndex] = identifier;
   }
-  return current;
+  return identifier;
 }
-function getRefParam(ctx, index) {
-  const actualIndex = createValidRef(ctx, index);
-  if (ctx.vars[actualIndex]) {
-    return ctx.vars[actualIndex];
+function getRootID(ctx, current) {
+  const ref = ctx.refs.get(current);
+  if (ref == null) {
+    return ctx.refs.size;
   }
-  const result = getIdentifier(actualIndex);
-  ctx.vars[actualIndex] = result;
-  return result;
+  return ref;
 }
-function createRef(ctx, current, mark) {
+function createRef(ctx, current) {
   const ref = ctx.refs.get(current);
-  if (ref != null) {
-    if (mark) {
-      markRef(ctx, ref);
-    }
-    return ref;
+  if (ref == null) {
+    const id = ctx.refs.size;
+    ctx.refs.set(current, id);
+    return id;
   }
-  const id = ctx.refs.size;
-  ctx.refs.set(current, id);
-  return id;
+  markRef(ctx, ref);
+  return ref;
 }
 
 // src/assert.ts
@@ -235,7 +235,7 @@ var TRUE_NODE = {
   m: void 0,
   d: void 0,
   a: void 0,
-  n: void 0
+  f: void 0
 };
 var FALSE_NODE = {
   t: 2 /* Boolean */,
@@ -246,7 +246,7 @@ var FALSE_NODE = {
   m: void 0,
   d: void 0,
   a: void 0,
-  n: void 0
+  f: void 0
 };
 var UNDEFINED_NODE = {
   t: 4 /* Undefined */,
@@ -257,7 +257,7 @@ var UNDEFINED_NODE = {
   m: void 0,
   d: void 0,
   a: void 0,
-  n: void 0
+  f: void 0
 };
 var NULL_NODE = {
   t: 3 /* Null */,
@@ -268,7 +268,7 @@ var NULL_NODE = {
   m: void 0,
   d: void 0,
   a: void 0,
-  n: void 0
+  f: void 0
 };
 var NEG_ZERO_NODE = {
   t: 5 /* NegativeZero */,
@@ -279,7 +279,7 @@ var NEG_ZERO_NODE = {
   m: void 0,
   d: void 0,
   a: void 0,
-  n: void 0
+  f: void 0
 };
 var INFINITY_NODE = {
   t: 6 /* Infinity */,
@@ -290,7 +290,7 @@ var INFINITY_NODE = {
   m: void 0,
   d: void 0,
   a: void 0,
-  n: void 0
+  f: void 0
 };
 var NEG_INFINITY_NODE = {
   t: 7 /* NegativeInfinity */,
@@ -301,7 +301,7 @@ var NEG_INFINITY_NODE = {
   m: void 0,
   d: void 0,
   a: void 0,
-  n: void 0
+  f: void 0
 };
 var NAN_NODE = {
   t: 8 /* NaN */,
@@ -312,7 +312,7 @@ var NAN_NODE = {
   m: void 0,
   d: void 0,
   a: void 0,
-  n: void 0
+  f: void 0
 };
 function createNumberNode(value) {
   return {
@@ -324,7 +324,7 @@ function createNumberNode(value) {
     m: void 0,
     d: void 0,
     a: void 0,
-    n: void 0
+    f: void 0
   };
 }
 function createStringNode(value) {
@@ -337,7 +337,7 @@ function createStringNode(value) {
     m: void 0,
     d: void 0,
     a: void 0,
-    n: void 0
+    f: void 0
   };
 }
 function createBigIntNode(ctx, current) {
@@ -345,13 +345,13 @@ function createBigIntNode(ctx, current) {
   return {
     t: 9 /* BigInt */,
     i: void 0,
-    s: current.toString(),
+    s: "" + current,
     l: void 0,
     c: void 0,
     m: void 0,
     d: void 0,
     a: void 0,
-    n: void 0
+    f: void 0
   };
 }
 function createReferenceNode(id) {
@@ -364,7 +364,7 @@ function createReferenceNode(id) {
     m: void 0,
     d: void 0,
     a: void 0,
-    n: void 0
+    f: void 0
   };
 }
 function createDateNode(id, current) {
@@ -376,7 +376,7 @@ function createDateNode(id, current) {
     c: void 0,
     m: void 0,
     d: void 0,
-    n: void 0,
+    f: void 0,
     a: void 0
   };
 }
@@ -390,7 +390,7 @@ function createRegExpNode(id, current) {
     m: current.flags,
     d: void 0,
     a: void 0,
-    n: void 0
+    f: void 0
   };
 }
 function createTypedArrayNode(ctx, id, current) {
@@ -399,7 +399,7 @@ function createTypedArrayNode(ctx, id, current) {
   const len = current.length;
   const values = new Array(len);
   for (let i = 0; i < len; i++) {
-    values[i] = current[i].toString();
+    values[i] = "" + current[i];
   }
   return {
     t: 22 /* TypedArray */,
@@ -410,7 +410,7 @@ function createTypedArrayNode(ctx, id, current) {
     m: void 0,
     d: void 0,
     a: void 0,
-    n: void 0
+    f: void 0
   };
 }
 var BIGINT_FLAG = 4096 /* BigIntTypedArray */ | 8 /* BigInt */;
@@ -423,7 +423,7 @@ function createBigIntTypedArrayNode(ctx, id, current) {
   const len = current.length;
   const values = new Array(len);
   for (let i = 0; i < len; i++) {
-    values[i] = current[i].toString();
+    values[i] = "" + current[i];
   }
   return {
     t: 23 /* BigIntTypedArray */,
@@ -434,7 +434,7 @@ function createBigIntTypedArrayNode(ctx, id, current) {
     m: void 0,
     d: void 0,
     a: void 0,
-    n: void 0
+    f: void 0
   };
 }
 function createWKSymbolNode(current) {
@@ -447,7 +447,7 @@ function createWKSymbolNode(current) {
     m: void 0,
     d: void 0,
     a: void 0,
-    n: void 0
+    f: void 0
   };
 }
 
@@ -622,7 +622,7 @@ async function generateArrayNode(ctx, id, current) {
     m: void 0,
     d: void 0,
     a: await generateNodeList(ctx, current),
-    n: void 0
+    f: void 0
   };
 }
 async function generateMapNode(ctx, id, current) {
@@ -658,7 +658,7 @@ async function generateMapNode(ctx, id, current) {
     m: void 0,
     d: { k: keyNodes, v: valueNodes, s: len },
     a: void 0,
-    n: void 0
+    f: void 0
   };
 }
 async function generateSetNode(ctx, id, current) {
@@ -687,7 +687,7 @@ async function generateSetNode(ctx, id, current) {
     m: void 0,
     d: void 0,
     a: nodes,
-    n: void 0
+    f: void 0
   };
 }
 async function generateProperties(ctx, properties) {
@@ -736,7 +736,7 @@ async function generateIterableNode(ctx, id, current) {
     // Parse options first before the items
     d: options ? await generateProperties(ctx, options) : void 0,
     a: await generateNodeList(ctx, array),
-    n: void 0
+    f: void 0
   };
 }
 async function generatePromiseNode(ctx, id, current) {
@@ -751,7 +751,7 @@ async function generatePromiseNode(ctx, id, current) {
     // Parse options first before the items
     d: void 0,
     a: void 0,
-    n: await parse(ctx, value)
+    f: await parse(ctx, value)
   }));
 }
 async function generateObjectNode(ctx, id, current, empty) {
@@ -770,7 +770,7 @@ async function generateObjectNode(ctx, id, current, empty) {
     m: void 0,
     d: await generateProperties(ctx, current),
     a: void 0,
-    n: void 0
+    f: void 0
   };
 }
 async function generateAggregateErrorNode(ctx, id, current) {
@@ -785,7 +785,7 @@ async function generateAggregateErrorNode(ctx, id, current) {
     m: current.message,
     d: optionsNode,
     a: await generateNodeList(ctx, current.errors),
-    n: void 0
+    f: void 0
   };
 }
 async function generateErrorNode(ctx, id, current) {
@@ -800,7 +800,7 @@ async function generateErrorNode(ctx, id, current) {
     m: current.message,
     d: optionsNode,
     a: void 0,
-    n: void 0
+    f: void 0
   };
 }
 async function parse(ctx, current) {
@@ -812,18 +812,20 @@ async function parse(ctx, current) {
     case "string":
       return createStringNode(current);
     case "number":
+      switch (current) {
+        case Infinity:
+          return INFINITY_NODE;
+        case -Infinity:
+          return NEG_INFINITY_NODE;
+        default:
+          break;
+      }
       if (current !== current) {
         return NAN_NODE;
       }
       if (Object.is(current, -0)) {
         return NEG_ZERO_NODE;
       }
-      if (Object.is(current, Infinity)) {
-        return INFINITY_NODE;
-      }
-      if (Object.is(current, -Infinity)) {
-        return NEG_INFINITY_NODE;
-      }
       return createNumberNode(current);
     case "bigint":
       return createBigIntNode(ctx, current);
@@ -831,7 +833,7 @@ async function parse(ctx, current) {
       if (!current) {
         return NULL_NODE;
       }
-      const id = createRef(ctx, current, true);
+      const id = createRef(ctx, current);
       if (ctx.markedRefs.has(id)) {
         return createReferenceNode(id);
       }
@@ -900,8 +902,11 @@ async function parse(ctx, current) {
         default:
           break;
       }
-      if (current instanceof AggregateError && ctx.features & 1 /* AggregateError */) {
-        return generateAggregateErrorNode(ctx, id, current);
+      if (current instanceof AggregateError) {
+        if (ctx.features & 1 /* AggregateError */) {
+          return generateAggregateErrorNode(ctx, id, current);
+        }
+        return generateErrorNode(ctx, id, current);
       }
       if (current instanceof Error) {
         return generateErrorNode(ctx, id, current);
@@ -928,7 +933,7 @@ async function parse(ctx, current) {
 async function parseAsync(ctx, current) {
   const result = await parse(ctx, current);
   const isObject = result.t === 16 /* Object */ || result.t === 21 /* Iterable */;
-  return [result, createRef(ctx, current, false), isObject];
+  return [result, getRootID(ctx, current), isObject];
 }
 
 // src/tree/deserialize.ts
@@ -1040,7 +1045,7 @@ function createDeferred() {
 function deserializePromise(ctx, node) {
   const deferred = createDeferred();
   const result = assignRef(ctx, node.i, deferred.promise);
-  deferred.resolve(deserializeTree(ctx, node.n));
+  deferred.resolve(deserializeTree(ctx, node.f));
   return result;
 }
 function deserializeTypedArray(ctx, node) {
@@ -1139,30 +1144,48 @@ function mergeAssignments(assignments) {
   for (let i = 1, len = assignments.length; i < len; i++) {
     item = assignments[i];
     if (item.t === prev.t) {
-      if (item.t === "index" && item.v === prev.v) {
-        current = {
-          t: "index",
-          s: item.s,
-          k: void 0,
-          v: getAssignmentExpression(current)
-        };
-      } else if (item.t === "map" && item.s === prev.s) {
-        current = {
-          t: "map",
-          s: getAssignmentExpression(current),
-          k: item.k,
-          v: item.v
-        };
-      } else if (item.t === "set" && item.s === prev.s) {
-        current = {
-          t: "set",
-          s: getAssignmentExpression(current),
-          k: void 0,
-          v: item.v
-        };
-      } else {
-        newAssignments.push(current);
-        current = item;
+      switch (item.t) {
+        case "index":
+          if (item.v === prev.v) {
+            current = {
+              t: "index",
+              s: item.s,
+              k: void 0,
+              v: getAssignmentExpression(current)
+            };
+          } else {
+            newAssignments.push(current);
+            current = item;
+          }
+          break;
+        case "map":
+          if (item.s === prev.s) {
+            current = {
+              t: "map",
+              s: getAssignmentExpression(current),
+              k: item.k,
+              v: item.v
+            };
+          } else {
+            newAssignments.push(current);
+            current = item;
+          }
+          break;
+        case "set":
+          if (item.s === prev.s) {
+            current = {
+              t: "set",
+              s: getAssignmentExpression(current),
+              k: void 0,
+              v: item.v
+            };
+          } else {
+            newAssignments.push(current);
+            current = item;
+          }
+          break;
+        default:
+          break;
       }
     } else {
       newAssignments.push(current);
@@ -1215,7 +1238,7 @@ function createMapSet(ctx, ref, key, value) {
 }
 function createArrayAssign(ctx, ref, index, value) {
   markRef(ctx, ref);
-  createAssignment(ctx, getRefParam(ctx, ref) + "[" + index.toString() + "]", value);
+  createAssignment(ctx, getRefParam(ctx, ref) + "[" + index + "]", value);
 }
 function createObjectAssign(ctx, ref, key, value) {
   markRef(ctx, ref);
@@ -1252,10 +1275,7 @@ function serializeNodeList(ctx, node) {
       isHoley = true;
     }
   }
-  if (isHoley) {
-    values += ",";
-  }
-  return "[" + values + "]";
+  return "[" + values + (isHoley ? ",]" : "]");
 }
 function serializeArray(ctx, node) {
   ctx.stack.push(node.i);
@@ -1288,11 +1308,7 @@ function serializeProperties(ctx, sourceID, node) {
         createArrayAssign(ctx, sourceID, isIdentifier ? key : '"' + quote(key) + '"', refParam);
       }
     } else {
-      if (hasPrev) {
-        result += ",";
-      }
-      result += isIdentifier ? key : '"' + quote(key) + '"';
-      result += ":" + serializeTree(ctx, val);
+      result += (hasPrev ? "," : "") + (isIdentifier ? key : '"' + quote(key) + '"') + ":" + serializeTree(ctx, val);
       hasPrev = true;
     }
   }
@@ -1343,8 +1359,7 @@ function serializeDictionary(ctx, i, d, init) {
       markRef(ctx, i);
       const assignments = serializeAssignments(ctx, i, d);
       if (assignments) {
-        const ref = getRefParam(ctx, i);
-        return "(" + assignRef2(ctx, i, init) + "," + assignments + ref + ")";
+        return "(" + assignRef2(ctx, i, init) + "," + assignments + getRefParam(ctx, i) + ")";
       }
     }
   }
@@ -1369,10 +1384,7 @@ function serializeSet(ctx, node) {
       if (isReferenceInStack(ctx, item)) {
         createSetAdd(ctx, node.i, getRefParam(ctx, item.i));
       } else {
-        if (hasPrev) {
-          result += ",";
-        }
-        result += serializeTree(ctx, item);
+        result += (hasPrev ? "," : "") + serializeTree(ctx, item);
         hasPrev = true;
       }
     }
@@ -1415,10 +1427,7 @@ function serializeMap(ctx, node) {
         createMapSet(ctx, node.i, serializeTree(ctx, key), valueRef);
         ctx.stack = parent;
       } else {
-        if (hasPrev) {
-          result += ",";
-        }
-        result += "[" + serializeTree(ctx, key) + "," + serializeTree(ctx, val) + "]";
+        result += (hasPrev ? ",[" : "[") + serializeTree(ctx, key) + "," + serializeTree(ctx, val) + "]";
         hasPrev = true;
       }
     }
@@ -1441,8 +1450,8 @@ function serializeError(ctx, node) {
 }
 function serializePromise(ctx, node) {
   let serialized;
-  if (isReferenceInStack(ctx, node.n)) {
-    const ref = getRefParam(ctx, node.n.i);
+  if (isReferenceInStack(ctx, node.f)) {
+    const ref = getRefParam(ctx, node.f.i);
     if (ctx.features & 4 /* ArrowFunction */) {
       serialized = "Promise.resolve().then(()=>" + ref + ")";
     } else {
@@ -1450,7 +1459,7 @@ function serializePromise(ctx, node) {
     }
   } else {
     ctx.stack.push(node.i);
-    const result = serializeTree(ctx, node.n);
+    const result = serializeTree(ctx, node.f);
     ctx.stack.pop();
     serialized = "Promise.resolve(" + result + ")";
   }
@@ -1458,19 +1467,11 @@ function serializePromise(ctx, node) {
 }
 function serializeTypedArray(ctx, node) {
   let result = "";
+  const isBigInt = node.t === 23 /* BigIntTypedArray */;
   for (let i = 0, len = node.s.length; i < len; i++) {
-    if (i !== 0) {
-      result += ",";
-    }
-    result += node.s[i];
-    if (node.t === 23 /* BigIntTypedArray */) {
-      result += "n";
-    }
-  }
-  let args = "[" + result + "]";
-  if (node.l !== 0) {
-    args += "," + node.l.toString();
+    result += (i !== 0 ? "," : "") + node.s[i] + (isBigInt ? "n" : "");
   }
+  const args = "[" + result + "]" + (node.l !== 0 ? "," + node.l : "");
   return assignRef2(ctx, node.i, "new " + node.c + "(" + args + ")");
 }
 function serializeIterable(ctx, node) {
@@ -1496,13 +1497,13 @@ function serializeIterable(ctx, node) {
 function serializeTree(ctx, node) {
   switch (node.t) {
     case 0 /* Number */:
-      return String(node.s);
+      return "" + node.s;
     case 1 /* String */:
       return '"' + node.s + '"';
     case 2 /* Boolean */:
       return node.s ? "!0" : "!1";
     case 4 /* Undefined */:
-      return "undefined";
+      return "void 0";
     case 3 /* Null */:
       return "null";
     case 5 /* NegativeZero */:
@@ -1582,7 +1583,7 @@ function generateArrayNode2(ctx, id, current) {
     m: void 0,
     d: void 0,
     a: generateNodeList2(ctx, current),
-    n: void 0
+    f: void 0
   };
 }
 function generateMapNode2(ctx, id, current) {
@@ -1618,7 +1619,7 @@ function generateMapNode2(ctx, id, current) {
     m: void 0,
     d: { k: keyNodes, v: valueNodes, s: len },
     a: void 0,
-    n: void 0
+    f: void 0
   };
 }
 function generateSetNode2(ctx, id, current) {
@@ -1647,7 +1648,7 @@ function generateSetNode2(ctx, id, current) {
     m: void 0,
     d: void 0,
     a: nodes,
-    n: void 0
+    f: void 0
   };
 }
 function generateProperties2(ctx, properties) {
@@ -1696,7 +1697,7 @@ function generateIterableNode2(ctx, id, current) {
     // Parse options first before the items
     d: options ? generateProperties2(ctx, options) : void 0,
     a: generateNodeList2(ctx, array),
-    n: void 0
+    f: void 0
   };
 }
 function generateObjectNode2(ctx, id, current, empty) {
@@ -1712,7 +1713,7 @@ function generateObjectNode2(ctx, id, current, empty) {
     m: void 0,
     d: generateProperties2(ctx, current),
     a: void 0,
-    n: void 0
+    f: void 0
   };
 }
 function generateAggregateErrorNode2(ctx, id, current) {
@@ -1727,7 +1728,7 @@ function generateAggregateErrorNode2(ctx, id, current) {
     m: current.message,
     d: optionsNode,
     a: generateNodeList2(ctx, current.errors),
-    n: void 0
+    f: void 0
   };
 }
 function generateErrorNode2(ctx, id, current) {
@@ -1742,7 +1743,7 @@ function generateErrorNode2(ctx, id, current) {
     m: current.message,
     d: optionsNode,
     a: void 0,
-    n: void 0
+    f: void 0
   };
 }
 function parse2(ctx, current) {
@@ -1754,18 +1755,20 @@ function parse2(ctx, current) {
     case "string":
       return createStringNode(current);
     case "number":
+      switch (current) {
+        case Infinity:
+          return INFINITY_NODE;
+        case -Infinity:
+          return NEG_INFINITY_NODE;
+        default:
+          break;
+      }
       if (current !== current) {
         return NAN_NODE;
       }
       if (Object.is(current, -0)) {
         return NEG_ZERO_NODE;
       }
-      if (Object.is(current, Infinity)) {
-        return INFINITY_NODE;
-      }
-      if (Object.is(current, -Infinity)) {
-        return NEG_INFINITY_NODE;
-      }
       return createNumberNode(current);
     case "bigint":
       return createBigIntNode(ctx, current);
@@ -1773,7 +1776,7 @@ function parse2(ctx, current) {
       if (!current) {
         return NULL_NODE;
       }
-      const id = createRef(ctx, current, true);
+      const id = createRef(ctx, current);
       if (ctx.markedRefs.has(id)) {
         return createReferenceNode(id);
       }
@@ -1822,8 +1825,11 @@ function parse2(ctx, current) {
         default:
           break;
       }
-      if (current instanceof AggregateError && ctx.features & 1 /* AggregateError */) {
-        return generateAggregateErrorNode2(ctx, id, current);
+      if (current instanceof AggregateError) {
+        if (ctx.features & 1 /* AggregateError */) {
+          return generateAggregateErrorNode2(ctx, id, current);
+        }
+        return generateErrorNode2(ctx, id, current);
       }
       if (current instanceof Error) {
         return generateErrorNode2(ctx, id, current);
@@ -1844,7 +1850,7 @@ function parse2(ctx, current) {
 function parseSync(ctx, current) {
   const result = parse2(ctx, current);
   const isObject = result.t === 16 /* Object */ || result.t === 21 /* Iterable */;
-  return [result, createRef(ctx, current, false), isObject];
+  return [result, getRootID(ctx, current), isObject];
 }
 
 // src/index.ts