marko 6.0.19 → 6.0.21

package/dist/debug/dom.js

@@ -390,7 +390,9 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 lastEffect = serialized;
               } else if (typeof serialized === "number") {
                 registeredValues[lastEffect](
-                  scopeLookup[serialized],
+                  scopeLookup[serialized] ||= {
+                    ___id: scopeId
+                  },
                   scopeLookup[serialized]
                 );
               } else {

package/dist/debug/dom.mjs

@@ -297,7 +297,9 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 lastEffect = serialized;
               } else if (typeof serialized === "number") {
                 registeredValues[lastEffect](
-                  scopeLookup[serialized],
+                  scopeLookup[serialized] ||= {
+                    ___id: scopeId
+                  },
                   scopeLookup[serialized]
                 );
               } else {

package/dist/debug/html.js

@@ -3053,7 +3053,11 @@ var ServerRendered = class {
     const head = this.#head;
     this.#head = null;
     if (!head) throw new Error("Cannot read from a consumed render result");
-    if (!head.boundary.done) throw new Error("Cannot fork in sync mode");
+    const { boundary } = head;
+    if (!boundary.done) {
+      throw new Error("Cannot consume asynchronous render with 'toString'");
+    }
+    if (boundary.signal.aborted) throw boundary.signal.reason;
     return head.consume().flushHTML();
   }
 };

package/dist/debug/html.mjs

@@ -2972,7 +2972,11 @@ var ServerRendered = class {
     const head = this.#head;
     this.#head = null;
     if (!head) throw new Error("Cannot read from a consumed render result");
-    if (!head.boundary.done) throw new Error("Cannot fork in sync mode");
+    const { boundary } = head;
+    if (!boundary.done) {
+      throw new Error("Cannot consume asynchronous render with 'toString'");
+    }
+    if (boundary.signal.aborted) throw boundary.signal.reason;
     return head.consume().flushHTML();
   }
 };

package/dist/dom.js

@@ -258,19 +258,21 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 commentPrefixLen + 1,
                 visitDataIndex ? visitDataIndex - 1 : visitText.length
               ), visitData = visitDataIndex ? visitText.slice(visitDataIndex) : "", visitToken = visitText[commentPrefixLen], visitScope = scopeLookup[scopeId] ||= {
-                m: scopeId
+                l: scopeId
               }, visitToken === "*" /* Node */ ? visitScope["j" /* Getter */ + visitData] = /* @__PURE__ */ ((node) => () => node)(visitScope[visitData] = visit.previousSibling) : branches && branches.J();
             for (let serialized of resumes = render.r || [])
               if (typeof serialized == "string")
                 lastEffect = serialized;
               else if (typeof serialized == "number")
                 registeredValues[lastEffect](
-                  scopeLookup[serialized],
+                  scopeLookup[serialized] ||= {
+                    l: scopeId
+                  },
                   scopeLookup[serialized]
                 );
               else
                 for (let scope of serialized(serializeContext))
-                  $global ? typeof scope == "number" ? lastScopeId += scope : (scopeId = ++lastScopeId, scope.$global = $global, scope.m = scopeId, scopeLookup[scopeId] !== scope && (scopeLookup[scopeId] = Object.assign(
+                  $global ? typeof scope == "number" ? lastScopeId += scope : (scopeId = ++lastScopeId, scope.$global = $global, scope.l = scopeId, scopeLookup[scopeId] !== scope && (scopeLookup[scopeId] = Object.assign(
                     scope,
                     scopeLookup[scopeId]
                   )), branches && branches.o(scope)) : ($global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId, $global.p = 1e6);
@@ -706,7 +708,7 @@ function toInsertNode(startNode, endNode) {
 // src/dom/scope.ts
 function createScope($global, closestBranch) {
   let scope = {
-    m: $global.p++,
+    l: $global.p++,
     q: 1,
     k: closestBranch,
     $global
@@ -856,7 +858,7 @@ function value(valueAccessor, fn = () => {
     (!(valueAccessor in scope) || scope[valueAccessor] !== value2) && (scope[valueAccessor] = value2, fn(scope, value2));
   };
 }
-function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "m") {
+function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "l") {
   return (scope) => {
     scope.q ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
   };
@@ -872,7 +874,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
       },
       -1,
       0,
-      firstScope.m
+      firstScope.l
     );
   };
   return ownerSignal._ = childSignal, ownerSignal;
@@ -1025,11 +1027,11 @@ function createContent(id, template, walks, setup, params, dynamicScopesAccessor
     );
   };
   return (owner) => ({
-    m: id,
+    l: id,
     C: clone,
     y: owner,
     D: setup,
-    l: params,
+    m: params,
     z: dynamicScopesAccessor
   });
 }
@@ -1115,7 +1117,7 @@ function awaitTag(nodeAccessor, renderer) {
               ),
               referenceNode.parentNode,
               referenceNode
-            ), referenceNode.remove()), renderer.l?.(awaitBranch, [data2]), tryWithPlaceholder && (placeholderShown.add(pendingEffects), !--tryWithPlaceholder.n)) {
+            ), referenceNode.remove()), renderer.m?.(awaitBranch, [data2]), tryWithPlaceholder && (placeholderShown.add(pendingEffects), !--tryWithPlaceholder.n)) {
               let placeholderBranch = tryWithPlaceholder.c;
               tryWithPlaceholder.c = 0, placeholderBranch && (placeholderBranch.h.parentNode.insertBefore(
                 tryWithPlaceholder.h.parentNode,
@@ -1156,7 +1158,7 @@ function renderCatch(scope, error) {
       tryWithCatch.a,
       tryWithCatch.b,
       createAndSetupBranch
-    ), tryWithCatch.b.l?.(
+    ), tryWithCatch.b.m?.(
       owner["d" /* ConditionalScope */ + tryWithCatch.a],
       [error]
     );
@@ -1181,7 +1183,7 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
   let childScopeAccessor = "d" /* ConditionalScope */ + nodeAccessor, rendererAccessor = "c" /* ConditionalRenderer */ + nodeAccessor;
   return enableBranches(), (scope, newRenderer, getInput) => {
     let normalizedRenderer = normalizeDynamicRenderer(newRenderer);
-    if (scope[rendererAccessor] !== (scope[rendererAccessor] = normalizedRenderer?.m || normalizedRenderer) || getContent && !(normalizedRenderer || scope[childScopeAccessor]))
+    if (scope[rendererAccessor] !== (scope[rendererAccessor] = normalizedRenderer?.l || normalizedRenderer) || getContent && !(normalizedRenderer || scope[childScopeAccessor]))
       if (setConditionalRenderer(
         scope,
         nodeAccessor,
@@ -1220,15 +1222,15 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
             childScope,
             normalizedRenderer.M[accessor]
           );
-        if (normalizedRenderer.l)
+        if (normalizedRenderer.m)
           if (inputIsArgs)
-            normalizedRenderer.l(
+            normalizedRenderer.m(
               childScope,
               normalizedRenderer._ ? args[0] : args
             );
           else {
             let inputWithContent = getContent ? { ...args, content: getContent(scope) } : args || {};
-            normalizedRenderer.l(
+            normalizedRenderer.m(
               childScope,
               normalizedRenderer._ ? inputWithContent : [inputWithContent]
             );
@@ -1268,7 +1270,7 @@ function loopTo(nodeAccessor, renderer) {
   );
 }
 function loop(nodeAccessor, renderer, forEach) {
-  let params = renderer.l;
+  let params = renderer.m;
   return enableBranches(), (scope, value2) => {
     let referenceNode = scope[nodeAccessor], oldMap = scope["m" /* LoopScopeMap */ + nodeAccessor], oldArray = oldMap ? scope["l" /* LoopScopeArray */ + nodeAccessor] || [
       ...oldMap.values()
@@ -1302,7 +1304,7 @@ function byFirstArg(name) {
 
 // src/dom/queue.ts
 var pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map(), caughtError = /* @__PURE__ */ new WeakSet(), placeholderShown = /* @__PURE__ */ new WeakSet(), pendingEffects = [], pendingScopes = [], rendering, scopeKeyOffset = 1e3;
-function queueRender(scope, signal, signalKey, value2, scopeKey = scope.m) {
+function queueRender(scope, signal, signalKey, value2, scopeKey = scope.l) {
   let key = scopeKey * scopeKeyOffset + signalKey, existingRender = signalKey >= 0 && pendingRendersLookup.get(key);
   if (existingRender)
     existingRender.I = value2;
@@ -1468,7 +1470,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
         renderer,
         renderer.y,
         document.body
-      )), renderer.l?.(branch, renderer._ ? args[0] : args);
+      )), renderer.m?.(branch, renderer._ ? args[0] : args);
     }), !existing)
       return toInsertNode(branch.h, branch.j);
   }
@@ -1507,7 +1509,7 @@ function mount(input = {}, reference, position) {
       parentNode = reference.parentNode, nextSibling = reference.nextSibling;
       break;
   }
-  let args = this.l, effects = prepareEffects(() => {
+  let args = this.m, effects = prepareEffects(() => {
     branch = createBranch(
       $global,
       this,

package/dist/dom.mjs

@@ -168,19 +168,21 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
                 commentPrefixLen + 1,
                 visitDataIndex ? visitDataIndex - 1 : visitText.length
               ), visitData = visitDataIndex ? visitText.slice(visitDataIndex) : "", visitToken = visitText[commentPrefixLen], visitScope = scopeLookup[scopeId] ||= {
-                m: scopeId
+                l: scopeId
               }, visitToken === "*" /* Node */ ? visitScope["j" /* Getter */ + visitData] = /* @__PURE__ */ ((node) => () => node)(visitScope[visitData] = visit.previousSibling) : branches && branches.J();
             for (let serialized of resumes = render.r || [])
               if (typeof serialized == "string")
                 lastEffect = serialized;
               else if (typeof serialized == "number")
                 registeredValues[lastEffect](
-                  scopeLookup[serialized],
+                  scopeLookup[serialized] ||= {
+                    l: scopeId
+                  },
                   scopeLookup[serialized]
                 );
               else
                 for (let scope of serialized(serializeContext))
-                  $global ? typeof scope == "number" ? lastScopeId += scope : (scopeId = ++lastScopeId, scope.$global = $global, scope.m = scopeId, scopeLookup[scopeId] !== scope && (scopeLookup[scopeId] = Object.assign(
+                  $global ? typeof scope == "number" ? lastScopeId += scope : (scopeId = ++lastScopeId, scope.$global = $global, scope.l = scopeId, scopeLookup[scopeId] !== scope && (scopeLookup[scopeId] = Object.assign(
                     scope,
                     scopeLookup[scopeId]
                   )), branches && branches.o(scope)) : ($global = scope || {}, $global.runtimeId = runtimeId, $global.renderId = renderId, $global.p = 1e6);
@@ -616,7 +618,7 @@ function toInsertNode(startNode, endNode) {
 // src/dom/scope.ts
 function createScope($global, closestBranch) {
   let scope = {
-    m: $global.p++,
+    l: $global.p++,
     q: 1,
     k: closestBranch,
     $global
@@ -766,7 +768,7 @@ function value(valueAccessor, fn = () => {
     (!(valueAccessor in scope) || scope[valueAccessor] !== value2) && (scope[valueAccessor] = value2, fn(scope, value2));
   };
 }
-function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "m") {
+function intersection(id, fn, defaultPending = 1, scopeIdAccessor = /* @__KEY__ */ "l") {
   return (scope) => {
     scope.q ? scope[id] === void 0 ? scope[id] = defaultPending : --scope[id] || fn(scope) : queueRender(scope, fn, id, 0, scope[scopeIdAccessor]);
   };
@@ -782,7 +784,7 @@ function loopClosure(valueAccessor, ownerLoopNodeAccessor, fn) {
       },
       -1,
       0,
-      firstScope.m
+      firstScope.l
     );
   };
   return ownerSignal._ = childSignal, ownerSignal;
@@ -935,11 +937,11 @@ function createContent(id, template, walks, setup, params, dynamicScopesAccessor
     );
   };
   return (owner) => ({
-    m: id,
+    l: id,
     C: clone,
     y: owner,
     D: setup,
-    l: params,
+    m: params,
     z: dynamicScopesAccessor
   });
 }
@@ -1025,7 +1027,7 @@ function awaitTag(nodeAccessor, renderer) {
               ),
               referenceNode.parentNode,
               referenceNode
-            ), referenceNode.remove()), renderer.l?.(awaitBranch, [data2]), tryWithPlaceholder && (placeholderShown.add(pendingEffects), !--tryWithPlaceholder.n)) {
+            ), referenceNode.remove()), renderer.m?.(awaitBranch, [data2]), tryWithPlaceholder && (placeholderShown.add(pendingEffects), !--tryWithPlaceholder.n)) {
               let placeholderBranch = tryWithPlaceholder.c;
               tryWithPlaceholder.c = 0, placeholderBranch && (placeholderBranch.h.parentNode.insertBefore(
                 tryWithPlaceholder.h.parentNode,
@@ -1066,7 +1068,7 @@ function renderCatch(scope, error) {
       tryWithCatch.a,
       tryWithCatch.b,
       createAndSetupBranch
-    ), tryWithCatch.b.l?.(
+    ), tryWithCatch.b.m?.(
       owner["d" /* ConditionalScope */ + tryWithCatch.a],
       [error]
     );
@@ -1091,7 +1093,7 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
   let childScopeAccessor = "d" /* ConditionalScope */ + nodeAccessor, rendererAccessor = "c" /* ConditionalRenderer */ + nodeAccessor;
   return enableBranches(), (scope, newRenderer, getInput) => {
     let normalizedRenderer = normalizeDynamicRenderer(newRenderer);
-    if (scope[rendererAccessor] !== (scope[rendererAccessor] = normalizedRenderer?.m || normalizedRenderer) || getContent && !(normalizedRenderer || scope[childScopeAccessor]))
+    if (scope[rendererAccessor] !== (scope[rendererAccessor] = normalizedRenderer?.l || normalizedRenderer) || getContent && !(normalizedRenderer || scope[childScopeAccessor]))
       if (setConditionalRenderer(
         scope,
         nodeAccessor,
@@ -1130,15 +1132,15 @@ var dynamicTag = function(nodeAccessor, getContent, getTagVar, inputIsArgs) {
             childScope,
             normalizedRenderer.M[accessor]
           );
-        if (normalizedRenderer.l)
+        if (normalizedRenderer.m)
           if (inputIsArgs)
-            normalizedRenderer.l(
+            normalizedRenderer.m(
               childScope,
               normalizedRenderer._ ? args[0] : args
             );
           else {
             let inputWithContent = getContent ? { ...args, content: getContent(scope) } : args || {};
-            normalizedRenderer.l(
+            normalizedRenderer.m(
               childScope,
               normalizedRenderer._ ? inputWithContent : [inputWithContent]
             );
@@ -1178,7 +1180,7 @@ function loopTo(nodeAccessor, renderer) {
   );
 }
 function loop(nodeAccessor, renderer, forEach) {
-  let params = renderer.l;
+  let params = renderer.m;
   return enableBranches(), (scope, value2) => {
     let referenceNode = scope[nodeAccessor], oldMap = scope["m" /* LoopScopeMap */ + nodeAccessor], oldArray = oldMap ? scope["l" /* LoopScopeArray */ + nodeAccessor] || [
       ...oldMap.values()
@@ -1212,7 +1214,7 @@ function byFirstArg(name) {
 
 // src/dom/queue.ts
 var pendingRenders = [], pendingRendersLookup = /* @__PURE__ */ new Map(), caughtError = /* @__PURE__ */ new WeakSet(), placeholderShown = /* @__PURE__ */ new WeakSet(), pendingEffects = [], pendingScopes = [], rendering, scopeKeyOffset = 1e3;
-function queueRender(scope, signal, signalKey, value2, scopeKey = scope.m) {
+function queueRender(scope, signal, signalKey, value2, scopeKey = scope.l) {
   let key = scopeKey * scopeKeyOffset + signalKey, existingRender = signalKey >= 0 && pendingRendersLookup.get(key);
   if (existingRender)
     existingRender.I = value2;
@@ -1378,7 +1380,7 @@ var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
         renderer,
         renderer.y,
         document.body
-      )), renderer.l?.(branch, renderer._ ? args[0] : args);
+      )), renderer.m?.(branch, renderer._ ? args[0] : args);
     }), !existing)
       return toInsertNode(branch.h, branch.j);
   }
@@ -1417,7 +1419,7 @@ function mount(input = {}, reference, position) {
       parentNode = reference.parentNode, nextSibling = reference.nextSibling;
       break;
   }
-  let args = this.l, effects = prepareEffects(() => {
+  let args = this.m, effects = prepareEffects(() => {
     branch = createBranch(
       $global,
       this,

package/dist/html.js

@@ -1967,7 +1967,10 @@ var ServerRendered = class {
   toString() {
     let head = this.#head;
     if (this.#head = null, !head) throw new Error("Cannot read from a consumed render result");
-    if (!head.boundary.done) throw new Error("Cannot fork in sync mode");
+    let { boundary } = head;
+    if (!boundary.done)
+      throw new Error("Cannot consume asynchronous render with 'toString'");
+    if (boundary.signal.aborted) throw boundary.signal.reason;
     return head.consume().flushHTML();
   }
 };

package/dist/html.mjs

@@ -1889,7 +1889,10 @@ var ServerRendered = class {
   toString() {
     let head = this.#head;
     if (this.#head = null, !head) throw new Error("Cannot read from a consumed render result");
-    if (!head.boundary.done) throw new Error("Cannot fork in sync mode");
+    let { boundary } = head;
+    if (!boundary.done)
+      throw new Error("Cannot consume asynchronous render with 'toString'");
+    if (boundary.signal.aborted) throw boundary.signal.reason;
     return head.consume().flushHTML();
   }
 };

package/dist/translator/index.js

@@ -9438,7 +9438,7 @@ var style_default = {
       } else if (import_compiler49.types.isIdentifier(node.var)) {
         (0, import_babel_utils42.getProgram)().node.body.push(
           import_compiler49.types.importDeclaration(
-            [import_compiler49.types.importDefaultSpecifier(node.var)],
+            [import_compiler49.types.importNamespaceSpecifier(node.var)],
             import_compiler49.types.stringLiteral(importPath)
           )
         );
@@ -9447,7 +9447,7 @@ var style_default = {
           import_compiler49.types.variableDeclaration("const", [
             import_compiler49.types.variableDeclarator(
               node.var,
-              (0, import_babel_utils42.importDefault)(file, importPath, "style")
+              (0, import_babel_utils42.importStar)(file, importPath, "style")
             )
           ])
         );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.19",
+  "version": "6.0.21",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -48,7 +48,7 @@
     "build": "node -r ~ts ./scripts/bundle.ts"
   },
   "dependencies": {
-    "@marko/compiler": "^5.39.19",
+    "@marko/compiler": "^5.39.21",
     "csstype": "^3.1.3",
     "magic-string": "^0.30.17"
   },