marko 6.0.20 → 6.0.22

package/dist/debug/html.js

@@ -1618,19 +1618,13 @@ function nextRefAccess(state) {
   return "_." + nextId(state);
 }
 function nextId(state) {
-  const encodeChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789";
-  const encodeLen = encodeChars.length;
-  const encodeStartLen = encodeLen - 11;
-  let index = state.ids++;
-  let mod = index % encodeStartLen;
-  let id = encodeChars[mod];
-  index = (index - mod) / encodeStartLen;
-  while (index > 0) {
-    mod = index % encodeLen;
-    id += encodeChars[mod];
-    index = (index - mod) / encodeLen;
-  }
-  return id;
+  const c = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789";
+  let n = state.ids++;
+  let r = c[n % 53];
+  for (n = n / 53 | 0; n; n >>>= 6) {
+    r += c[n & 63];
+  }
+  return r;
 }
 function hasSymbolIterator(value) {
   return Symbol.iterator in value;
@@ -2211,19 +2205,13 @@ var State2 = class {
     }
   }
   nextReorderId() {
-    const encodeChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789";
-    const encodeLen = encodeChars.length;
-    const encodeStartLen = encodeLen - 10;
-    let index = this.reorderId++;
-    let mod = index % encodeStartLen;
-    let id = encodeChars[mod];
-    index = (index - mod) / encodeStartLen;
-    while (index > 0) {
-      mod = index % encodeLen;
-      id += encodeChars[mod];
-      index = (index - mod) / encodeLen;
-    }
-    return id;
+    const c = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789";
+    let n = this.reorderId++;
+    let r = c[n % 54];
+    for (n = n / 54 | 0; n; n >>>= 6) {
+      r += c[n & 63];
+    }
+    return r;
   }
   mark(code, str) {
     return "<!--" + this.commentPrefix + code + str + "-->";
@@ -3053,7 +3041,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

@@ -1537,19 +1537,13 @@ function nextRefAccess(state) {
   return "_." + nextId(state);
 }
 function nextId(state) {
-  const encodeChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789";
-  const encodeLen = encodeChars.length;
-  const encodeStartLen = encodeLen - 11;
-  let index = state.ids++;
-  let mod = index % encodeStartLen;
-  let id = encodeChars[mod];
-  index = (index - mod) / encodeStartLen;
-  while (index > 0) {
-    mod = index % encodeLen;
-    id += encodeChars[mod];
-    index = (index - mod) / encodeLen;
-  }
-  return id;
+  const c = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789";
+  let n = state.ids++;
+  let r = c[n % 53];
+  for (n = n / 53 | 0; n; n >>>= 6) {
+    r += c[n & 63];
+  }
+  return r;
 }
 function hasSymbolIterator(value) {
   return Symbol.iterator in value;
@@ -2130,19 +2124,13 @@ var State2 = class {
     }
   }
   nextReorderId() {
-    const encodeChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789";
-    const encodeLen = encodeChars.length;
-    const encodeStartLen = encodeLen - 10;
-    let index = this.reorderId++;
-    let mod = index % encodeStartLen;
-    let id = encodeChars[mod];
-    index = (index - mod) / encodeStartLen;
-    while (index > 0) {
-      mod = index % encodeLen;
-      id += encodeChars[mod];
-      index = (index - mod) / encodeLen;
-    }
-    return id;
+    const c = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789";
+    let n = this.reorderId++;
+    let r = c[n % 54];
+    for (n = n / 54 | 0; n; n >>>= 6) {
+      r += c[n & 63];
+    }
+    return r;
   }
   mark(code, str) {
     return "<!--" + this.commentPrefix + code + str + "-->";
@@ -2972,7 +2960,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/html.js

@@ -1037,10 +1037,10 @@ function nextRefAccess(state) {
   return "_." + nextId(state);
 }
 function nextId(state) {
-  let encodeChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789", encodeLen = encodeChars.length, encodeStartLen = encodeLen - 11, index = state.ids++, mod = index % encodeStartLen, id = encodeChars[mod];
-  for (index = (index - mod) / encodeStartLen; index > 0; )
-    mod = index % encodeLen, id += encodeChars[mod], index = (index - mod) / encodeLen;
-  return id;
+  let c = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789", n = state.ids++, r = c[n % 53];
+  for (n = n / 53 | 0; n; n >>>= 6)
+    r += c[n & 63];
+  return r;
 }
 function hasSymbolIterator(value) {
   return Symbol.iterator in value;
@@ -1424,10 +1424,10 @@ var State2 = class {
     this.writeReorders ? this.writeReorders.push(chunk) : (this.needsMainRuntime = !0, this.writeReorders = [chunk]);
   }
   nextReorderId() {
-    let encodeChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789", encodeLen = encodeChars.length, encodeStartLen = encodeLen - 10, index = this.reorderId++, mod = index % encodeStartLen, id = encodeChars[mod];
-    for (index = (index - mod) / encodeStartLen; index > 0; )
-      mod = index % encodeLen, id += encodeChars[mod], index = (index - mod) / encodeLen;
-    return id;
+    let c = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789", n = this.reorderId++, r = c[n % 54];
+    for (n = n / 54 | 0; n; n >>>= 6)
+      r += c[n & 63];
+    return r;
   }
   mark(code, str) {
     return "<!--" + this.commentPrefix + code + str + "-->";
@@ -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

@@ -959,10 +959,10 @@ function nextRefAccess(state) {
   return "_." + nextId(state);
 }
 function nextId(state) {
-  let encodeChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789", encodeLen = encodeChars.length, encodeStartLen = encodeLen - 11, index = state.ids++, mod = index % encodeStartLen, id = encodeChars[mod];
-  for (index = (index - mod) / encodeStartLen; index > 0; )
-    mod = index % encodeLen, id += encodeChars[mod], index = (index - mod) / encodeLen;
-  return id;
+  let c = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789", n = state.ids++, r = c[n % 53];
+  for (n = n / 53 | 0; n; n >>>= 6)
+    r += c[n & 63];
+  return r;
 }
 function hasSymbolIterator(value) {
   return Symbol.iterator in value;
@@ -1346,10 +1346,10 @@ var State2 = class {
     this.writeReorders ? this.writeReorders.push(chunk) : (this.needsMainRuntime = !0, this.writeReorders = [chunk]);
   }
   nextReorderId() {
-    let encodeChars = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789", encodeLen = encodeChars.length, encodeStartLen = encodeLen - 10, index = this.reorderId++, mod = index % encodeStartLen, id = encodeChars[mod];
-    for (index = (index - mod) / encodeStartLen; index > 0; )
-      mod = index % encodeLen, id += encodeChars[mod], index = (index - mod) / encodeLen;
-    return id;
+    let c = "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ$_0123456789", n = this.reorderId++, r = c[n % 54];
+    for (n = n / 54 | 0; n; n >>>= 6)
+      r += c[n & 63];
+    return r;
   }
   mark(code, str) {
     return "<!--" + this.commentPrefix + code + str + "-->";
@@ -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.20",
+  "version": "6.0.22",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -48,7 +48,7 @@
     "build": "node -r ~ts ./scripts/bundle.ts"
   },
   "dependencies": {
-    "@marko/compiler": "^5.39.20",
+    "@marko/compiler": "^5.39.22",
     "csstype": "^3.1.3",
     "magic-string": "^0.30.17"
   },