seroval 0.10.1 → 0.10.2

package/src/core/cross/serialize.ts

@@ -59,6 +59,7 @@ import {
   REFERENCES_KEY,
   GLOBAL_CONTEXT_STREAM_CONSTRUCTOR,
   GLOBAL_CONTEXT_STREAM_EMIT,
+  GLOBAL_CONTEXT_API,
 } from '../keys';
 
 export function getRefExpr(id: number): string {
@@ -724,46 +725,46 @@ function serializePromiseResolve(
   ctx: CrossSerializerContext,
   node: SerovalPromiseResolveNode,
 ): string {
-  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: CrossSerializerContext,
   node: SerovalPromiseRejectNode,
 ): string {
-  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: SerovalPromiseConstructorNode,
 ): string {
-  return assignIndexedValue(node.i, GLOBAL_CONTEXT_PROMISE_CONSTRUCTOR + '()');
+  return assignIndexedValue(node.i, GLOBAL_CONTEXT_API + '.' + GLOBAL_CONTEXT_PROMISE_CONSTRUCTOR + '()');
 }
 
 function serializeReadableStreamClose(
   node: SerovalReadableStreamCloseNode,
 ): string {
-  return GLOBAL_CONTEXT_STREAM_EMIT + '(' + node.i + ',2)';
+  return GLOBAL_CONTEXT_API + '.' + GLOBAL_CONTEXT_STREAM_EMIT + '(' + getRefExpr(node.i) + ',2)';
 }
 
 function serializeReadableStreamEnqueue(
   ctx: CrossSerializerContext,
   node: SerovalReadableStreamEnqueueNode,
 ): string {
-  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: CrossSerializerContext,
   node: SerovalReadableStreamErrorNode,
 ): string {
-  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: SerovalReadableStreamConstructorNode,
 ): string {
-  return assignIndexedValue(node.i, GLOBAL_CONTEXT_STREAM_CONSTRUCTOR + '()');
+  return assignIndexedValue(node.i, GLOBAL_CONTEXT_API + '.' + GLOBAL_CONTEXT_STREAM_CONSTRUCTOR + '()');
 }
 
 export default function crossSerializeTree(

package/src/core/cross/stream.ts

@@ -4,7 +4,7 @@ import assert from '../assert';
 import { Feature } from '../compat';
 import type { StreamingCrossParserContext } from './context';
 import {
-  createCrossIndexedValue,
+  createCrossIndexedValue, popPendingState, pushPendingState,
 } from './context';
 import { serializeString } from '../string';
 import type {
@@ -318,6 +318,7 @@ function generatePromiseNode(
           b: undefined,
           o: undefined,
         }, false);
+        popPendingState(ctx);
       }
     },
     (data) => {
@@ -336,9 +337,11 @@ function generatePromiseNode(
           b: undefined,
           o: undefined,
         }, false);
+        popPendingState(ctx);
       }
     },
   );
+  pushPendingState(ctx);
   return {
     t: SerovalNodeType.PromiseConstructor,
     i: id,
@@ -507,6 +510,7 @@ function generateReadableStreamNode(
 ): SerovalReadableStreamConstructorNode {
   assert(ctx.features & Feature.WebAPI, new UnsupportedTypeError(current));
   const reader = current.getReader();
+  pushPendingState(ctx);
 
   function push(): void {
     reader.read().then(
@@ -527,6 +531,7 @@ function generateReadableStreamNode(
               b: undefined,
               o: undefined,
             }, false);
+            popPendingState(ctx);
           } else {
             ctx.onParse({
               t: SerovalNodeType.ReadableStreamEnqueue,
@@ -562,7 +567,7 @@ function generateReadableStreamNode(
             b: undefined,
             o: undefined,
           }, false);
-          push();
+          popPendingState(ctx);
         }
       },
     );

package/src/core/header.js

@@ -4,62 +4,58 @@
  */
 
 // Global references array. Global because we (ideally) want <script> elements to share it.
-var $R = [];
-
-// Promise constructor, used to construct deferred Promises
-function $P(success, failure, promise) {
-  promise = new Promise(function (resolve, reject) {
-    success = resolve;
-    failure = reject;
-  });
-
-  promise.s = success;
-  promise.f = failure;
-
-  return promise;
-}
-
-// This unsets the custom properties of the Promise instance
-function $uP(promise) {
-  delete promise.s;
-  delete promise.f;
-}
-
-function $Ps(referenceID, data) {
-  $R[referenceID].s(data);
-}
-
-function $Pf(referenceID, data) {
-  $R[referenceID].f(data);
-}
-
-// Unset stream
-function $uS(stream) {
-  delete stream.c;
-}
-
-function $Se(referenceID, type, data, stream, controller) {
-  stream = $R[referenceID];
-  controller = stream.c;
-  switch (type) {
-    case 0: return controller.enqueue(data);
-    case 1:
-      $uS(stream);
-      return controller.error(data);
-    case 2:
-      $uS(stream);
-      return controller.close();
-  }
-}
-
-// ReadableStream constructor
-function $S(stream, controller) {
-  stream = new ReadableStream({
-    start: function (c) {
-      controller = c;
+self._$ = self._$ || {
+  // Promise constructor, used to construct deferred Promises
+  P(success, failure, promise) {
+    promise = new Promise(function (resolve, reject) {
+      success = resolve;
+      failure = reject;
+    });
+  
+    promise.s = success;
+    promise.f = failure;
+  
+    return promise;
+  },
+  // This unsets the custom properties of the Promise instance
+  uP(promise) {
+    delete promise.s;
+    delete promise.f;
+  },
+  // Promise resolution
+  Ps(promise, data) {
+    promise.s(data);
+    promise.value = data;
+    this.uP(promise);
+  },
+  Pf(promise, data) {
+    promise.f(data);
+    this.uP(promise);
+  },
+  // Unset stream
+  uS(stream) {
+    delete stream.c;
+  },
+  Se(stream, type, data, controller) {
+    controller = stream.c;
+    switch (type) {
+      case 0: return controller.enqueue(data);
+      case 1:
+        this.uS(stream);
+        return controller.error(data);
+      case 2:
+        this.uS(stream);
+        return controller.close();
     }
-  });
-  stream.c = controller;
-
-  return stream;
-}
+  },
+  // ReadableStream constructor
+  S(stream, controller) {
+    stream = new ReadableStream({
+      start: function (c) {
+        controller = c;
+      }
+    });
+    stream.c = controller;
+    return stream;
+  },
+};

package/src/core/keys.ts

@@ -1,33 +1,41 @@
+import { serializeString } from './string';
+
 // Used for mapping isomorphic references
 export const REFERENCES_KEY = '__SEROVAL_REFS__';
 
+export const GLOBAL_CONTEXT_API = '_$';
+
 export const GLOBAL_CONTEXT_REFERENCES = '$R';
 
 export const LOCAL_CONTEXT_PROMISE_RESOLVE = 's';
 
 export const LOCAL_CONTEXT_PROMISE_REJECT = 'f';
 
-export const GLOBAL_CONTEXT_PROMISE_CONSTRUCTOR = '$P';
+export const GLOBAL_CONTEXT_PROMISE_CONSTRUCTOR = 'P';
 
-export const GLOBAL_CONTEXT_PROMISE_RESOLVE = '$Ps';
+export const GLOBAL_CONTEXT_PROMISE_RESOLVE = 'Ps';
 
-export const GLOBAL_CONTEXT_PROMISE_REJECT = '$Pf';
+export const GLOBAL_CONTEXT_PROMISE_REJECT = 'Pf';
 
 export const LOCAL_CONTEXT_STREAM_CONTROLLER = 'c';
 
-export const GLOBAL_CONTEXT_STREAM_CONSTRUCTOR = '$S';
-
-export const GLOBAL_CONTEXT_STREAM_EMIT = '$Se';
-
-export const ROOT_REFERENCE = 't';
-
-export const 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}
-`;
+export const GLOBAL_CONTEXT_STREAM_CONSTRUCTOR = 'S';
+
+export const GLOBAL_CONTEXT_STREAM_EMIT = 'Se';
+
+export const 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},`
+  + '}';
+
+export function getCrossReferenceHeader(id?: string): string {
+  if (id == null) {
+    return `self.${GLOBAL_CONTEXT_REFERENCES}=self.${GLOBAL_CONTEXT_REFERENCES}||[];`;
+  }
+  return `(self.${GLOBAL_CONTEXT_REFERENCES}=self.${GLOBAL_CONTEXT_REFERENCES}||{})["${serializeString(id)}"]=[]`;
+}

package/src/core/tree/context.ts

@@ -92,17 +92,6 @@ export function getRefParam(ctx: SerializerContext, index: number): string {
   return identifier;
 }
 
-export function getRootID<T>(
-  ctx: ParserContext,
-  current: T,
-): number {
-  const ref = ctx.reference.ids.get(current);
-  if (ref == null) {
-    return ctx.reference.ids.size;
-  }
-  return ref;
-}
-
 export function createIndexedValue<T>(
   ctx: ParserContext,
   current: T,

package/src/core/tree/index.ts

@@ -11,7 +11,6 @@ import {
   createParserContext,
   createSerializerContext,
   getRefParam,
-  getRootID,
 } from './context';
 import deserializeTree from './deserialize';
 import serializeTree, { resolvePatches } from './serialize';
@@ -19,12 +18,12 @@ import parseSync from './sync';
 
 function finalize(
   ctx: SerializerContext,
-  rootID: number,
+  rootID: number | undefined,
   isObject: boolean,
   result: string,
 ): string {
   // Shared references detected
-  if (ctx.vars.length) {
+  if (rootID != null && ctx.vars.length) {
     const patches = resolvePatches(ctx);
     let body = result;
     if (patches) {
@@ -66,7 +65,7 @@ export function serialize<T>(
   const result = serializeTree(serial, tree);
   return finalize(
     serial,
-    getRootID(ctx, source),
+    tree.i,
     tree.t === SerovalNodeType.Object,
     result,
   );
@@ -85,7 +84,7 @@ export async function serializeAsync<T>(
   const result = serializeTree(serial, tree);
   return finalize(
     serial,
-    getRootID(ctx, source),
+    tree.i,
     tree.t === SerovalNodeType.Object,
     result,
   );
@@ -98,7 +97,6 @@ export function deserialize<T>(source: string): T {
 
 export interface SerovalJSON {
   t: SerovalNode;
-  r: number;
   f: number;
   m: number[];
 }
@@ -110,7 +108,6 @@ export function toJSON<T>(
   const ctx = createParserContext(options);
   return {
     t: parseSync(ctx, source),
-    r: getRootID(ctx, source),
     f: ctx.features,
     m: Array.from(ctx.reference.marked),
   };
@@ -123,7 +120,6 @@ export async function toJSONAsync<T>(
   const ctx = createParserContext(options);
   return {
     t: await parseAsync(ctx, source),
-    r: getRootID(ctx, source),
     f: ctx.features,
     m: Array.from(ctx.reference.marked),
   };
@@ -135,7 +131,7 @@ export function compileJSON(source: SerovalJSON): string {
     markedRefs: source.m,
   });
   const result = serializeTree(serial, source.t);
-  return finalize(serial, source.r, source.t.i === SerovalNodeType.Object, result);
+  return finalize(serial, source.t.i, source.t.i === SerovalNodeType.Object, result);
 }
 
 export function fromJSON<T>(source: SerovalJSON): T {

package/src/index.ts

@@ -14,7 +14,7 @@ export { createReference } from './core/reference';
 export * from './core/tree';
 export * from './core/cross';
 
-export { CROSS_REFERENCE_HEADER } from './core/keys';
+export { GLOBAL_CONTEXT_API_SCRIPT, getCrossReferenceHeader } from './core/keys';
 
 export { default as Serializer } from './core/Serializer';