@volter/tabnode 0.5.40 → 0.5.42

package/dist/assets/{runtime-worker-D73ktngT.js → runtime-worker-BBHch2BO.js}

@@ -78613,6 +78613,10 @@ function __substrateFollowAwaits(code2) {
   const insert = (at3, text) => {
     edits.push([at3, at3, text]);
   };
+  const closings = [];
+  const close2 = (at3, text) => {
+    closings.push([at3, at3, text]);
+  };
   const isFunction = (node) => node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression";
   const visit = (node, framed, parent) => {
     const leading = [];
@@ -78624,7 +78628,7 @@ function __substrateFollowAwaits(code2) {
       }
     } else if (node.type === "AwaitExpression") {
       insert(node.start, framed ? FOLLOW_RESUME_FRAMED : FOLLOW_RESUME_TAKEN);
-      insert(node.end, `${FOLLOW_MARK})`);
+      close2(node.end, `${FOLLOW_MARK})`);
     } else if (framed && node.type === "CatchClause") {
       leading.push([node.body.start + 1, FOLLOW_RESTORE]);
     } else if (framed && node.type === "TryStatement" && node.finalizer) {
@@ -78632,11 +78636,11 @@ function __substrateFollowAwaits(code2) {
     } else if (framed && node.type === "ForOfStatement" && node.await) {
       const whole = (parent == null ? void 0 : parent.type) === "LabeledStatement" ? parent : node;
       insert(whole.start, `{${FOLLOW_MARK}`);
-      insert(whole.end, `;${FOLLOW_RESTORE}${FOLLOW_MARK}}`);
+      close2(whole.end, `;${FOLLOW_RESTORE}${FOLLOW_MARK}}`);
       if (node.body.type === "BlockStatement") leading.push([node.body.start + 1, FOLLOW_RESTORE]);
       else {
         leading.push([node.body.start, `{${FOLLOW_MARK}${FOLLOW_RESTORE}`]);
-        insert(node.body.end, `${FOLLOW_MARK}}`);
+        close2(node.body.end, `${FOLLOW_MARK}}`);
       }
     }
     for (const key of Object.keys(node)) {
@@ -78650,7 +78654,7 @@ function __substrateFollowAwaits(code2) {
     for (const [at3, text] of leading) insert(at3, text);
   };
   visit(ast, false, void 0);
-  const followed = edits.length ? applyReplacements(code2, edits) : code2;
+  const followed = edits.length || closings.length ? applyReplacements(code2, [...edits, ...closings]) : code2;
   return __substrateTopLevelAwait(ast) ? `${followed}
 ${__substrateTopLevelAwaitMarker}` : followed;
 }

package/dist/index.mjs

@@ -38271,6 +38271,10 @@ function __substrateFollowAwaits(code2) {
   const insert = (at2, text) => {
     edits.push([at2, at2, text]);
   };
+  const closings = [];
+  const close2 = (at2, text) => {
+    closings.push([at2, at2, text]);
+  };
   const isFunction = (node) => node.type === "FunctionDeclaration" || node.type === "FunctionExpression" || node.type === "ArrowFunctionExpression";
   const visit = (node, framed, parent) => {
     const leading = [];
@@ -38282,7 +38286,7 @@ function __substrateFollowAwaits(code2) {
       }
     } else if (node.type === "AwaitExpression") {
       insert(node.start, framed ? FOLLOW_RESUME_FRAMED : FOLLOW_RESUME_TAKEN);
-      insert(node.end, `${FOLLOW_MARK})`);
+      close2(node.end, `${FOLLOW_MARK})`);
     } else if (framed && node.type === "CatchClause") {
       leading.push([node.body.start + 1, FOLLOW_RESTORE]);
     } else if (framed && node.type === "TryStatement" && node.finalizer) {
@@ -38290,11 +38294,11 @@ function __substrateFollowAwaits(code2) {
     } else if (framed && node.type === "ForOfStatement" && node.await) {
       const whole = (parent == null ? void 0 : parent.type) === "LabeledStatement" ? parent : node;
       insert(whole.start, `{${FOLLOW_MARK}`);
-      insert(whole.end, `;${FOLLOW_RESTORE}${FOLLOW_MARK}}`);
+      close2(whole.end, `;${FOLLOW_RESTORE}${FOLLOW_MARK}}`);
       if (node.body.type === "BlockStatement") leading.push([node.body.start + 1, FOLLOW_RESTORE]);
       else {
         leading.push([node.body.start, `{${FOLLOW_MARK}${FOLLOW_RESTORE}`]);
-        insert(node.body.end, `${FOLLOW_MARK}}`);
+        close2(node.body.end, `${FOLLOW_MARK}}`);
       }
     }
     for (const key of Object.keys(node)) {
@@ -38308,7 +38312,7 @@ function __substrateFollowAwaits(code2) {
     for (const [at2, text] of leading) insert(at2, text);
   };
   visit(ast, false, void 0);
-  const followed = edits.length ? applyReplacements(code2, edits) : code2;
+  const followed = edits.length || closings.length ? applyReplacements(code2, [...edits, ...closings]) : code2;
   return __substrateTopLevelAwait(ast) ? `${followed}
 ${__substrateTopLevelAwaitMarker}` : followed;
 }
@@ -40334,7 +40338,7 @@ class WorkerRuntime {
     this.worker = new Worker(
       new URL(
         /* @vite-ignore */
-        "/assets/runtime-worker-D73ktngT.js",
+        "/assets/runtime-worker-BBHch2BO.js",
         import.meta.url
       ),
       { type: "module" }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/tabnode",
-  "version": "0.5.40",
+  "version": "0.5.42",
   "description": "Node's own library, in a browser tab.",
   "type": "module",
   "license": "MIT",

package/src/runtime.ts

@@ -465,6 +465,12 @@ function __substrateFollowAwaits(code: string): string {
   }
   const edits: Array<[number, number, string]> = [];
   const insert = (at: number, text: string): void => { edits.push([at, at, text]); };
+  // What closes a node goes before what opens the next one at the same offset: a node that ends where another starts
+  // never holds it, so its closing lands first. `for await(x of y)await a;await b` ends the loop's body and starts the
+  // next statement's `await` at one offset, and the resume opened there landed inside the loop's brace: a SyntaxError
+  // in a 7 MB server chunk of Dub's (its web-stream pipe). Closings are kept apart and applied after, so they land first.
+  const closings: Array<[number, number, string]> = [];
+  const close = (at: number, text: string): void => { closings.push([at, at, text]); };
   const isFunction = (node: any): boolean => node.type === 'FunctionDeclaration' || node.type === 'FunctionExpression' || node.type === 'ArrowFunctionExpression';
   // `framed`: the nearest function is async and holds the frame in ASYNC_FRAME.
   const visit = (node: any, framed: boolean, parent: any): void => {
@@ -484,7 +490,7 @@ function __substrateFollowAwaits(code: string): string {
       }
     } else if (node.type === 'AwaitExpression') {
       insert(node.start, framed ? FOLLOW_RESUME_FRAMED : FOLLOW_RESUME_TAKEN);
-      insert(node.end, `${FOLLOW_MARK})`);
+      close(node.end, `${FOLLOW_MARK})`);
     } else if (framed && node.type === 'CatchClause') {
       leading.push([node.body.start + 1, FOLLOW_RESTORE]);
     } else if (framed && node.type === 'TryStatement' && node.finalizer) {
@@ -494,9 +500,9 @@ function __substrateFollowAwaits(code: string): string {
       // made later lands before it, so the body's brace closes inside.
       const whole = parent?.type === 'LabeledStatement' ? parent : node;
       insert(whole.start, `{${FOLLOW_MARK}`);
-      insert(whole.end, `;${FOLLOW_RESTORE}${FOLLOW_MARK}}`);
+      close(whole.end, `;${FOLLOW_RESTORE}${FOLLOW_MARK}}`);
       if (node.body.type === 'BlockStatement') leading.push([node.body.start + 1, FOLLOW_RESTORE]);
-      else { leading.push([node.body.start, `{${FOLLOW_MARK}${FOLLOW_RESTORE}`]); insert(node.body.end, `${FOLLOW_MARK}}`); }
+      else { leading.push([node.body.start, `{${FOLLOW_MARK}${FOLLOW_RESTORE}`]); close(node.body.end, `${FOLLOW_MARK}}`); }
     }
     for (const key of Object.keys(node)) {
       if (key === 'type' || key === 'start' || key === 'end' || key === 'loc' || key === 'range') continue;
@@ -509,7 +515,8 @@ function __substrateFollowAwaits(code: string): string {
     for (const [at, text] of leading) insert(at, text);
   };
   visit(ast, false, undefined);
-  const followed = edits.length ? applyReplacements(code, edits) : code;
+  // applyReplacements' sort is stable and lands edits at one offset in reverse of their order: closings after openings
+  const followed = edits.length || closings.length ? applyReplacements(code, [...edits, ...closings]) : code;
   return __substrateTopLevelAwait(ast) ? `${followed}\n${__substrateTopLevelAwaitMarker}` : followed;
 }