seroval 0.10.1 → 0.10.3

package/dist/esm/development/index.mjs

@@ -180,13 +180,6 @@ function getRefParam(ctx, index) {
   }
   return identifier;
 }
-function getRootID(ctx, current) {
-  const ref = ctx.reference.ids.get(current);
-  if (ref == null) {
-    return ctx.reference.ids.size;
-  }
-  return ref;
-}
 function createIndexedValue(ctx, current) {
   const ref = ctx.reference.ids.get(current);
   if (ref == null) {
@@ -290,26 +283,23 @@ var NAN_NODE = createConstantNode(7 /* NaN */);
 
 // src/core/keys.ts
 var REFERENCES_KEY = "__SEROVAL_REFS__";
+var GLOBAL_CONTEXT_API = "_$";
 var GLOBAL_CONTEXT_REFERENCES = "$R";
 var LOCAL_CONTEXT_PROMISE_RESOLVE = "s";
 var LOCAL_CONTEXT_PROMISE_REJECT = "f";
-var GLOBAL_CONTEXT_PROMISE_CONSTRUCTOR = "$P";
-var GLOBAL_CONTEXT_PROMISE_RESOLVE = "$Ps";
-var GLOBAL_CONTEXT_PROMISE_REJECT = "$Pf";
+var GLOBAL_CONTEXT_PROMISE_CONSTRUCTOR = "P";
+var GLOBAL_CONTEXT_PROMISE_RESOLVE = "Ps";
+var GLOBAL_CONTEXT_PROMISE_REJECT = "Pf";
 var LOCAL_CONTEXT_STREAM_CONTROLLER = "c";
-var GLOBAL_CONTEXT_STREAM_CONSTRUCTOR = "$S";
-var GLOBAL_CONTEXT_STREAM_EMIT = "$Se";
-var ROOT_REFERENCE = "t";
-var CROSS_REFERENCE_HEADER = `
-var ${GLOBAL_CONTEXT_REFERENCES}=[];
-function ${GLOBAL_CONTEXT_PROMISE_CONSTRUCTOR}(s,f,p){return (p=new Promise(function(a,b){s=a,f=b})).${LOCAL_CONTEXT_PROMISE_RESOLVE}=s,p.${LOCAL_CONTEXT_PROMISE_REJECT}=f,p}
-function $uP(i,p){delete (p=${GLOBAL_CONTEXT_REFERENCES}[i]).${LOCAL_CONTEXT_PROMISE_RESOLVE};delete p.${LOCAL_CONTEXT_PROMISE_REJECT}}
-function ${GLOBAL_CONTEXT_PROMISE_RESOLVE}(i,d){${GLOBAL_CONTEXT_REFERENCES}[i].${LOCAL_CONTEXT_PROMISE_RESOLVE}(d),$uP(i)}
-function ${GLOBAL_CONTEXT_PROMISE_REJECT}(i,d){${GLOBAL_CONTEXT_REFERENCES}[i].${LOCAL_CONTEXT_PROMISE_REJECT}(d),$uP(i)}
-function $uS(s){delete s.${LOCAL_CONTEXT_STREAM_CONTROLLER}}
-function ${GLOBAL_CONTEXT_STREAM_EMIT}(i,t,d,s,c){switch(c=(s=${GLOBAL_CONTEXT_REFERENCES}[i]).${LOCAL_CONTEXT_STREAM_CONTROLLER},t){case 0:return c.enqueue(d);case 1:return c.error(d),$uS(s);case 2:return c.close(),$uS(s)}}
-function ${GLOBAL_CONTEXT_STREAM_CONSTRUCTOR}(s,c){return(s=new ReadableStream({start:function(t){c=t}})).c=c,s}
-`;
+var GLOBAL_CONTEXT_STREAM_CONSTRUCTOR = "S";
+var GLOBAL_CONTEXT_STREAM_EMIT = "Se";
+var GLOBAL_CONTEXT_API_SCRIPT = `self.${GLOBAL_CONTEXT_API}=self.${GLOBAL_CONTEXT_API}||{${GLOBAL_CONTEXT_PROMISE_CONSTRUCTOR}:function(s,f,p){return(p=new Promise(function(a,b){s=a,f=b})).${LOCAL_CONTEXT_PROMISE_RESOLVE}=s,p.${LOCAL_CONTEXT_PROMISE_REJECT}=f,p},uP:function(p){delete p.${LOCAL_CONTEXT_PROMISE_RESOLVE};delete p.${LOCAL_CONTEXT_PROMISE_REJECT}},${GLOBAL_CONTEXT_PROMISE_RESOLVE}:function(p,d){p.${LOCAL_CONTEXT_PROMISE_RESOLVE}(d),p.value=d,this.uP(p)},${GLOBAL_CONTEXT_PROMISE_REJECT}:function(p,d){p.${LOCAL_CONTEXT_PROMISE_REJECT}(d),this.uP(p)},uS:function(s){delete s.${LOCAL_CONTEXT_STREAM_CONTROLLER}},${GLOBAL_CONTEXT_STREAM_EMIT}:function(s,t,d,c){switch(c=s.${LOCAL_CONTEXT_STREAM_CONTROLLER},t){case 0:return c.enqueue(d);case 1:return(this.uS(s),c.error(d));case 2:return(this.uS(s),c.close())}},${GLOBAL_CONTEXT_STREAM_CONSTRUCTOR}:function(s,c){return(s=new ReadableStream({start:function(x){c=x}})).${LOCAL_CONTEXT_STREAM_CONTROLLER}=c,s},}`;
+function getCrossReferenceHeader(id) {
+  if (id == null) {
+    return `self.${GLOBAL_CONTEXT_REFERENCES}=self.${GLOBAL_CONTEXT_REFERENCES}||[];`;
+  }
+  return `(self.${GLOBAL_CONTEXT_REFERENCES}=self.${GLOBAL_CONTEXT_REFERENCES}||{})["${serializeString(id)}"]=[]`;
+}
 
 // src/core/reference.ts
 var REFERENCE = /* @__PURE__ */ new Map();
@@ -2631,7 +2621,7 @@ function parseSync(ctx, current) {
 
 // src/core/tree/index.ts
 function finalize(ctx, rootID, isObject, result) {
-  if (ctx.vars.length) {
+  if (rootID != null && ctx.vars.length) {
     const patches = resolvePatches(ctx);
     let body = result;
     if (patches) {
@@ -2663,7 +2653,7 @@ function serialize(source, options) {
   const result = serializeTree(serial, tree);
   return finalize(
     serial,
-    getRootID(ctx, source),
+    tree.i,
     tree.t === 10 /* Object */,
     result
   );
@@ -2678,7 +2668,7 @@ async function serializeAsync(source, options) {
   const result = serializeTree(serial, tree);
   return finalize(
     serial,
-    getRootID(ctx, source),
+    tree.i,
     tree.t === 10 /* Object */,
     result
   );
@@ -2690,7 +2680,6 @@ function toJSON(source, options) {
   const ctx = createParserContext(options);
   return {
     t: parseSync(ctx, source),
-    r: getRootID(ctx, source),
     f: ctx.features,
     m: Array.from(ctx.reference.marked)
   };
@@ -2699,7 +2688,6 @@ async function toJSONAsync(source, options) {
   const ctx = createParserContext(options);
   return {
     t: await parseAsync(ctx, source),
-    r: getRootID(ctx, source),
     f: ctx.features,
     m: Array.from(ctx.reference.marked)
   };
@@ -2710,7 +2698,7 @@ function compileJSON(source) {
     markedRefs: source.m
   });
   const result = serializeTree(serial, source.t);
-  return finalize(serial, source.r, source.t.i === 10 /* Object */, result);
+  return finalize(serial, source.t.i, source.t.i === 10 /* Object */, result);
 }
 function fromJSON(source) {
   const serial = createDeserializerContext({
@@ -2722,6 +2710,7 @@ function fromJSON(source) {
 // src/core/cross/context.ts
 function createCrossParserContext(options = {}) {
   return {
+    scopeId: options.scopeId,
     refs: options.refs || /* @__PURE__ */ new Map(),
     features: ALL_ENABLED ^ (options.disabledFeatures || 0)
   };
@@ -2738,11 +2727,26 @@ function createCrossIndexedValue(ctx, current) {
 function createStreamingCrossParserContext(options) {
   return {
     alive: true,
+    pending: 0,
     refs: options.refs || /* @__PURE__ */ new Map(),
     features: ALL_ENABLED ^ (options.disabledFeatures || 0),
-    onParse: options.onParse
+    onParse: options.onParse,
+    onDone() {
+      if (options.onDone) {
+        options.onDone();
+      }
+    },
+    scopeId: options.scopeId
   };
 }
+function pushPendingState(ctx) {
+  ctx.pending++;
+}
+function popPendingState(ctx) {
+  if (--ctx.pending <= 0) {
+    ctx.onDone();
+  }
+}
 function createCrossSerializerContext(options) {
   return {
     stack: [],
@@ -3782,25 +3786,25 @@ function serializeWKSymbol2(node) {
   return assignIndexedValue3(node.i, SYMBOL_STRING[node.s]);
 }
 function serializePromiseResolve(ctx, node) {
-  return GLOBAL_CONTEXT_PROMISE_RESOLVE + "(" + node.i + "," + crossSerializeTree(ctx, node.f) + ")";
+  return GLOBAL_CONTEXT_API + "." + GLOBAL_CONTEXT_PROMISE_RESOLVE + "(" + getRefExpr(node.i) + "," + crossSerializeTree(ctx, node.f) + ")";
 }
 function serializePromiseReject(ctx, node) {
-  return GLOBAL_CONTEXT_PROMISE_REJECT + "(" + node.i + "," + crossSerializeTree(ctx, node.f) + ")";
+  return GLOBAL_CONTEXT_API + "." + GLOBAL_CONTEXT_PROMISE_REJECT + "(" + getRefExpr(node.i) + "," + crossSerializeTree(ctx, node.f) + ")";
 }
 function serializePromiseConstructor(node) {
-  return assignIndexedValue3(node.i, GLOBAL_CONTEXT_PROMISE_CONSTRUCTOR + "()");
+  return assignIndexedValue3(node.i, GLOBAL_CONTEXT_API + "." + GLOBAL_CONTEXT_PROMISE_CONSTRUCTOR + "()");
 }
 function serializeReadableStreamClose(node) {
-  return GLOBAL_CONTEXT_STREAM_EMIT + "(" + node.i + ",2)";
+  return GLOBAL_CONTEXT_API + "." + GLOBAL_CONTEXT_STREAM_EMIT + "(" + getRefExpr(node.i) + ",2)";
 }
 function serializeReadableStreamEnqueue(ctx, node) {
-  return GLOBAL_CONTEXT_STREAM_EMIT + "(" + node.i + ",0," + crossSerializeTree(ctx, node.f) + ")";
+  return GLOBAL_CONTEXT_API + "." + GLOBAL_CONTEXT_STREAM_EMIT + "(" + getRefExpr(node.i) + ",0," + crossSerializeTree(ctx, node.f) + ")";
 }
 function serializeReadableStreamError(ctx, node) {
-  return GLOBAL_CONTEXT_STREAM_EMIT + "(" + node.i + ",1," + crossSerializeTree(ctx, node.f) + ")";
+  return GLOBAL_CONTEXT_API + "." + GLOBAL_CONTEXT_STREAM_EMIT + "(" + getRefExpr(node.i) + ",1," + crossSerializeTree(ctx, node.f) + ")";
 }
 function serializeReadableStreamConstructor(node) {
-  return assignIndexedValue3(node.i, GLOBAL_CONTEXT_STREAM_CONSTRUCTOR + "()");
+  return assignIndexedValue3(node.i, GLOBAL_CONTEXT_API + "." + GLOBAL_CONTEXT_STREAM_CONSTRUCTOR + "()");
 }
 function crossSerializeTree(ctx, node) {
   switch (node.t) {
@@ -4087,6 +4091,7 @@ function generatePromiseNode3(ctx, id, current) {
           b: void 0,
           o: void 0
         }, false);
+        popPendingState(ctx);
       }
     },
     (data) => {
@@ -4105,9 +4110,11 @@ function generatePromiseNode3(ctx, id, current) {
           b: void 0,
           o: void 0
         }, false);
+        popPendingState(ctx);
       }
     }
   );
+  pushPendingState(ctx);
   return {
     t: 28 /* PromiseConstructor */,
     i: id,
@@ -4236,6 +4243,7 @@ function generateBoxedNode4(ctx, id, current) {
 function generateReadableStreamNode(ctx, id, current) {
   assert(ctx.features & 8192 /* WebAPI */, new UnsupportedTypeError(current));
   const reader = current.getReader();
+  pushPendingState(ctx);
   function push() {
     reader.read().then(
       (data) => {
@@ -4255,6 +4263,7 @@ function generateReadableStreamNode(ctx, id, current) {
               b: void 0,
               o: void 0
             }, false);
+            popPendingState(ctx);
           } else {
             ctx.onParse({
               t: 32 /* ReadableStreamEnqueue */,
@@ -4290,7 +4299,7 @@ function generateReadableStreamNode(ctx, id, current) {
             b: void 0,
             o: void 0
           }, false);
-          push();
+          popPendingState(ctx);
         }
       }
     );
@@ -4871,22 +4880,23 @@ function crossParseSync(ctx, current) {
 }
 
 // src/core/cross/index.ts
-function finalize2(ctx, id, result) {
+function finalize2(ctx, scopeId, id, result) {
+  if (id == null) {
+    return result;
+  }
   const patches = resolvePatches2(ctx);
-  if (patches) {
-    if (id == null) {
-      if (ctx.features & 4 /* ArrowFunction */) {
-        const params2 = "(" + ROOT_REFERENCE + ")";
-        const body2 = ROOT_REFERENCE + "=" + result + "," + patches + ROOT_REFERENCE;
-        return "(" + params2 + "=>(" + body2 + "))()";
-      }
-      const params = "(" + ROOT_REFERENCE + ")";
-      const body = ROOT_REFERENCE + "=" + result + "," + patches + ROOT_REFERENCE;
-      return "(function" + params + "{return " + body + "})()";
-    }
-    return "(" + result + "," + patches + getRefExpr(id) + ")";
+  const ref = getRefExpr(id);
+  const params = scopeId == null ? "" : GLOBAL_CONTEXT_REFERENCES;
+  const mainBody = patches ? result + "," + patches : result;
+  if (params === "") {
+    return patches ? "(" + mainBody + ref + ")" : mainBody;
+  }
+  const args = scopeId == null ? "()" : "(" + GLOBAL_CONTEXT_REFERENCES + '["' + serializeString(scopeId) + '"])';
+  const body = mainBody + (patches ? ref : "");
+  if (ctx.features & 4 /* ArrowFunction */) {
+    return "(" + params + "=>(" + body + "))" + args;
   }
-  return result;
+  return "(function(" + params + "){return " + body + "})" + args;
 }
 function crossSerialize(source, options) {
   const ctx = createCrossParserContext(options);
@@ -4897,6 +4907,7 @@ function crossSerialize(source, options) {
   const result = crossSerializeTree(serial, tree);
   return finalize2(
     serial,
+    ctx.scopeId,
     tree.i,
     result
   );
@@ -4910,12 +4921,14 @@ async function crossSerializeAsync(source, options) {
   const result = crossSerializeTree(serial, tree);
   return finalize2(
     serial,
+    ctx.scopeId,
     tree.i,
     result
   );
 }
 function crossSerializeStream(source, options) {
   const ctx = createStreamingCrossParserContext({
+    scopeId: options.scopeId,
     refs: options.refs,
     disabledFeatures: options.disabledFeatures,
     onParse(node, initial) {
@@ -4925,16 +4938,25 @@ function crossSerializeStream(source, options) {
       options.onSerialize(
         finalize2(
           serial,
+          ctx.scopeId,
           node.i,
           crossSerializeTree(serial, node)
         ),
         initial
       );
-    }
+    },
+    onDone: options.onDone
   });
   ctx.onParse(crossParseStream(ctx, source), true);
-  return () => {
+  if (ctx.pending <= 0) {
+    ctx.onDone();
     ctx.alive = false;
+  }
+  return () => {
+    if (ctx.alive) {
+      ctx.alive = false;
+      ctx.onDone();
+    }
   };
 }
 
@@ -4943,27 +4965,56 @@ var Serializer = class {
   constructor(options) {
     this.options = options;
     __publicField(this, "alive", true);
+    __publicField(this, "flushed", false);
+    __publicField(this, "done", false);
+    __publicField(this, "pending", 0);
     __publicField(this, "cleanups", []);
     __publicField(this, "refs", /* @__PURE__ */ new Map());
   }
   write(key, value) {
-    if (this.alive) {
+    if (this.alive && !this.flushed) {
+      this.pending++;
       this.cleanups.push(crossSerializeStream(value, {
+        scopeId: this.options.scopeId,
         refs: this.refs,
         disabledFeatures: this.options.disabledFeatures,
         onSerialize: (data, initial) => {
-          this.options.onData(
-            initial ? this.options.globalIdentifier + '["' + serializeString(key) + '"]=' + data : data
-          );
+          if (this.alive) {
+            this.options.onData(
+              initial ? this.options.globalIdentifier + '["' + serializeString(key) + '"]=' + data : data
+            );
+          }
+        },
+        onDone: () => {
+          if (this.alive) {
+            this.pending--;
+            if (this.pending <= 0 && this.flushed && !this.done && this.options.onDone) {
+              this.options.onDone();
+              this.done = true;
+            }
+          }
         }
       }));
     }
   }
+  flush() {
+    if (this.alive) {
+      this.flushed = true;
+      if (this.pending <= 0 && !this.done && this.options.onDone) {
+        this.options.onDone();
+        this.done = true;
+      }
+    }
+  }
   close() {
     if (this.alive) {
       for (let i = 0, len = this.cleanups.length; i < len; i++) {
         this.cleanups[i]();
       }
+      if (!this.done && this.options.onDone) {
+        this.options.onDone();
+        this.done = true;
+      }
       this.alive = false;
     }
   }
@@ -4972,8 +5023,8 @@ var Serializer = class {
 // src/index.ts
 var src_default = serialize;
 export {
-  CROSS_REFERENCE_HEADER,
   Feature,
+  GLOBAL_CONTEXT_API_SCRIPT,
   Serializer,
   compileJSON,
   createReference,
@@ -4983,6 +5034,7 @@ export {
   src_default as default,
   deserialize,
   fromJSON,
+  getCrossReferenceHeader,
   serialize,
   serializeAsync,
   toJSON,