marko 6.0.42 → 6.0.43

package/dist/debug/dom.js

@@ -273,7 +273,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
   let resumeRender;
   const initRuntime = (renders2) => {
     defineRuntime({
-      value: resumeRender = (renderId) => {
+      value: resumeRender = ((renderId) => {
         const render = resumeRender[renderId] = renders2[renderId] || renders2(renderId);
         const walk2 = render.w;
         const commentPrefixLen = render.i.length;
@@ -432,7 +432,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
           }
         };
         return render;
-      }
+      })
     });
   };
   if (renders) {
@@ -969,7 +969,7 @@ function dynamicClosure(...closureSignals) {
 }
 function dynamicClosureRead(valueAccessor, fn, getOwnerScope) {
   const childSignal = closure(valueAccessor, fn, getOwnerScope);
-  const closureSignal = (scope) => {
+  const closureSignal = ((scope) => {
     scope[closureSignal.___signalIndexAccessor] = closureSignal.___index;
     childSignal(scope);
     subscribeToScopeSet(
@@ -977,7 +977,7 @@ function dynamicClosureRead(valueAccessor, fn, getOwnerScope) {
       closureSignal.___scopeInstancesAccessor,
       scope
     );
-  };
+  });
   closureSignal.___scopeInstancesAccessor = "ClosureScopes:" /* ClosureScopes */ + valueAccessor;
   closureSignal.___signalIndexAccessor = "ClosureSignalIndex:" /* ClosureSignalIndex */ + valueAccessor;
   return closureSignal;

package/dist/debug/dom.mjs

@@ -177,7 +177,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
   let resumeRender;
   const initRuntime = (renders2) => {
     defineRuntime({
-      value: resumeRender = (renderId) => {
+      value: resumeRender = ((renderId) => {
         const render = resumeRender[renderId] = renders2[renderId] || renders2(renderId);
         const walk2 = render.w;
         const commentPrefixLen = render.i.length;
@@ -336,7 +336,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
           }
         };
         return render;
-      }
+      })
     });
   };
   if (renders) {
@@ -873,7 +873,7 @@ function dynamicClosure(...closureSignals) {
 }
 function dynamicClosureRead(valueAccessor, fn, getOwnerScope) {
   const childSignal = closure(valueAccessor, fn, getOwnerScope);
-  const closureSignal = (scope) => {
+  const closureSignal = ((scope) => {
     scope[closureSignal.___signalIndexAccessor] = closureSignal.___index;
     childSignal(scope);
     subscribeToScopeSet(
@@ -881,7 +881,7 @@ function dynamicClosureRead(valueAccessor, fn, getOwnerScope) {
       closureSignal.___scopeInstancesAccessor,
       scope
     );
-  };
+  });
   closureSignal.___scopeInstancesAccessor = "ClosureScopes:" /* ClosureScopes */ + valueAccessor;
   closureSignal.___signalIndexAccessor = "ClosureSignalIndex:" /* ClosureSignalIndex */ + valueAccessor;
   return closureSignal;

package/dist/debug/html.js

@@ -331,10 +331,10 @@ runtime.x = (op, id, node, start, placeholderCallback) => {
 // src/html/serializer.ts
 var kTouchedIterator = Symbol();
 var { hasOwnProperty } = {};
-var Generator = function* () {
-}().constructor;
-var AsyncGenerator = async function* () {
-}().constructor;
+var Generator = (function* () {
+})().constructor;
+var AsyncGenerator = (async function* () {
+})().constructor;
 patchIteratorNext(Generator.prototype);
 patchIteratorNext(AsyncGenerator.prototype);
 var REGISTRY = /* @__PURE__ */ new WeakMap();

package/dist/debug/html.mjs

@@ -247,10 +247,10 @@ runtime.x = (op, id, node, start, placeholderCallback) => {
 // src/html/serializer.ts
 var kTouchedIterator = Symbol();
 var { hasOwnProperty } = {};
-var Generator = function* () {
-}().constructor;
-var AsyncGenerator = async function* () {
-}().constructor;
+var Generator = (function* () {
+})().constructor;
+var AsyncGenerator = (async function* () {
+})().constructor;
 patchIteratorNext(Generator.prototype);
 patchIteratorNext(AsyncGenerator.prototype);
 var REGISTRY = /* @__PURE__ */ new WeakMap();

package/dist/dom.js

@@ -201,18 +201,15 @@ function stripSpacesAndPunctuation(str) {
   return str.replace(/[^\p{L}\p{N}]/gu, "");
 }
 
-// src/common/meta.ts
-var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
-
 // src/dom/resume.ts
 var registeredValues = {}, branchesEnabled;
 function enableBranches() {
   branchesEnabled = 1;
 }
-function init(runtimeId = DEFAULT_RUNTIME_ID) {
+function init(runtimeId = "M") {
   let renders = self[runtimeId], defineRuntime = (desc) => Object.defineProperty(self, runtimeId, desc), resumeRender, initRuntime = (renders2) => {
     defineRuntime({
-      value: resumeRender = (renderId) => {
+      value: resumeRender = ((renderId) => {
         let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, commentPrefixLen = render.i.length, scopeLookup = render.s = {}, serializeContext = {
           _: registeredValues
         }, branches = branchesEnabled && /* @__PURE__ */ (() => {
@@ -283,7 +280,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
             isResuming = visits.length = resumes.length = 0;
           }
         }, render;
-      }
+      })
     });
   };
   if (renders) {
@@ -631,13 +628,13 @@ function dynamicClosure(...closureSignals) {
   };
 }
 function dynamicClosureRead(valueAccessor, fn, getOwnerScope) {
-  let childSignal = closure(valueAccessor, fn, getOwnerScope), closureSignal = (scope) => {
+  let childSignal = closure(valueAccessor, fn, getOwnerScope), closureSignal = ((scope) => {
     scope[closureSignal.F] = closureSignal.L, childSignal(scope), subscribeToScopeSet(
       getOwnerScope ? getOwnerScope(scope) : scope._,
       closureSignal.E,
       scope
     );
-  };
+  });
   return closureSignal.E = "a" /* ClosureScopes */ + valueAccessor, closureSignal.F = "b" /* ClosureSignalIndex */ + valueAccessor, closureSignal;
 }
 function closure(valueAccessor, fn, getOwnerScope) {
@@ -1432,7 +1429,7 @@ function abort(ctrl) {
 }
 
 // src/common/compat-meta.ts
-var prefix = "$C_", RENDERER_REGISTER_ID = prefix + "r", SET_SCOPE_REGISTER_ID = prefix + "s", RENDER_BODY_ID = prefix + "b";
+var RENDERER_REGISTER_ID = "$C_r", SET_SCOPE_REGISTER_ID = "$C_s", RENDER_BODY_ID = "$C_b";
 
 // src/dom/compat.ts
 var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
@@ -1513,13 +1510,13 @@ function mount(input = {}, reference, position) {
   let branch, parentNode = reference, nextSibling = null, { $global } = input;
   switch ($global ? ({ $global, ...input } = input, $global = {
     q: 0,
-    runtimeId: DEFAULT_RUNTIME_ID,
-    renderId: DEFAULT_RENDER_ID,
+    runtimeId: "M",
+    renderId: "_",
     ...$global
   }) : $global = {
     q: 0,
-    runtimeId: DEFAULT_RUNTIME_ID,
-    renderId: DEFAULT_RENDER_ID
+    runtimeId: "M",
+    renderId: "_"
   }, position) {
     case "beforebegin":
       parentNode = reference.parentNode, nextSibling = reference;

package/dist/dom.mjs

@@ -108,18 +108,15 @@ function stripSpacesAndPunctuation(str) {
   return str.replace(/[^\p{L}\p{N}]/gu, "");
 }
 
-// src/common/meta.ts
-var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
-
 // src/dom/resume.ts
 var registeredValues = {}, branchesEnabled;
 function enableBranches() {
   branchesEnabled = 1;
 }
-function init(runtimeId = DEFAULT_RUNTIME_ID) {
+function init(runtimeId = "M") {
   let renders = self[runtimeId], defineRuntime = (desc) => Object.defineProperty(self, runtimeId, desc), resumeRender, initRuntime = (renders2) => {
     defineRuntime({
-      value: resumeRender = (renderId) => {
+      value: resumeRender = ((renderId) => {
         let render = resumeRender[renderId] = renders2[renderId] || renders2(renderId), walk2 = render.w, commentPrefixLen = render.i.length, scopeLookup = render.s = {}, serializeContext = {
           _: registeredValues
         }, branches = branchesEnabled && /* @__PURE__ */ (() => {
@@ -190,7 +187,7 @@ function init(runtimeId = DEFAULT_RUNTIME_ID) {
             isResuming = visits.length = resumes.length = 0;
           }
         }, render;
-      }
+      })
     });
   };
   if (renders) {
@@ -538,13 +535,13 @@ function dynamicClosure(...closureSignals) {
   };
 }
 function dynamicClosureRead(valueAccessor, fn, getOwnerScope) {
-  let childSignal = closure(valueAccessor, fn, getOwnerScope), closureSignal = (scope) => {
+  let childSignal = closure(valueAccessor, fn, getOwnerScope), closureSignal = ((scope) => {
     scope[closureSignal.F] = closureSignal.L, childSignal(scope), subscribeToScopeSet(
       getOwnerScope ? getOwnerScope(scope) : scope._,
       closureSignal.E,
       scope
     );
-  };
+  });
   return closureSignal.E = "a" /* ClosureScopes */ + valueAccessor, closureSignal.F = "b" /* ClosureSignalIndex */ + valueAccessor, closureSignal;
 }
 function closure(valueAccessor, fn, getOwnerScope) {
@@ -1339,7 +1336,7 @@ function abort(ctrl) {
 }
 
 // src/common/compat-meta.ts
-var prefix = "$C_", RENDERER_REGISTER_ID = prefix + "r", SET_SCOPE_REGISTER_ID = prefix + "s", RENDER_BODY_ID = prefix + "b";
+var RENDERER_REGISTER_ID = "$C_r", SET_SCOPE_REGISTER_ID = "$C_s", RENDER_BODY_ID = "$C_b";
 
 // src/dom/compat.ts
 var classIdToBranch = /* @__PURE__ */ new Map(), compat = {
@@ -1420,13 +1417,13 @@ function mount(input = {}, reference, position) {
   let branch, parentNode = reference, nextSibling = null, { $global } = input;
   switch ($global ? ({ $global, ...input } = input, $global = {
     q: 0,
-    runtimeId: DEFAULT_RUNTIME_ID,
-    renderId: DEFAULT_RENDER_ID,
+    runtimeId: "M",
+    renderId: "_",
     ...$global
   }) : $global = {
     q: 0,
-    runtimeId: DEFAULT_RUNTIME_ID,
-    renderId: DEFAULT_RENDER_ID
+    runtimeId: "M",
+    renderId: "_"
   }, position) {
     case "beforebegin":
       parentNode = reference.parentNode, nextSibling = reference;

package/dist/html.js

@@ -183,9 +183,9 @@ function forToBy(by, index) {
 var WALKER_RUNTIME_CODE = '(e=>(self[e]=(l,d=e+l,f=d.length,o={},n=[],s=document,t=s.createTreeWalker(s,129))=>s=self[e][l]={i:d,d:s,l:o,v:n,x(){},w(e,l,x){for(;e=t.nextNode();)s.x(l=(l=e.data)&&!l.indexOf(d)&&(o[x=l.slice(f+1)]=e,l[f]),x,e),l>"#"&&n.push(e)}},self[e]))', REORDER_RUNTIME_CODE = '(e=>{let i,l,t,r={},c=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,o,n,a,g)=>{"#"==d?(r[o]=l).i++:n==t&&i(),"T"==n.tagName&&(o=n.getAttribute(e.i))&&((a=e.l["^"+o])&&(r[o]={i:1,c(i=e.l[o]||n){for(;(t=i.previousSibling||a).remove(),a!=t;);c(i,n)}}),t=n.nextSibling,l=r[o],i=()=>{a||c(e.l[o],n),--l.i||l.c()},(d=e.j[o])&&(g=l.c,l.c=()=>g()+d(e.r)))}})';
 
 // src/html/serializer.ts
-var kTouchedIterator = Symbol(), { hasOwnProperty } = {}, Generator = function* () {
-}().constructor, AsyncGenerator = async function* () {
-}().constructor;
+var kTouchedIterator = Symbol(), { hasOwnProperty } = {}, Generator = (function* () {
+})().constructor, AsyncGenerator = (async function* () {
+})().constructor;
 patchIteratorNext(Generator.prototype);
 patchIteratorNext(AsyncGenerator.prototype);
 var REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
@@ -1851,10 +1851,7 @@ function replaceUnsafeDoubleQuoteAttrChar(match) {
 }
 
 // src/common/compat-meta.ts
-var prefix = "$C_", RENDERER_REGISTER_ID = prefix + "r", SET_SCOPE_REGISTER_ID = prefix + "s", RENDER_BODY_ID = prefix + "b";
-
-// src/common/meta.ts
-var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
+var RENDERER_REGISTER_ID = "$C_r", SET_SCOPE_REGISTER_ID = "$C_s", RENDER_BODY_ID = "$C_b";
 
 // src/html/template.ts
 var createTemplate = (templateId, renderer) => (renderer.render = render, renderer._ = renderer, registerContent(templateId, renderer));
@@ -1864,10 +1861,10 @@ function isTemplate(renderer) {
 function render(input = {}) {
   let { $global: $global2 } = input;
   $global2 ? ({ $global: $global2, ...input } = input, $global2 = {
-    runtimeId: DEFAULT_RUNTIME_ID,
-    renderId: DEFAULT_RENDER_ID,
+    runtimeId: "M",
+    renderId: "_",
     ...$global2
-  }) : $global2 = { runtimeId: DEFAULT_RUNTIME_ID, renderId: DEFAULT_RENDER_ID };
+  }) : $global2 = { runtimeId: "M", renderId: "_" };
   let head = new Chunk(
     new Boundary(new State2($global2), $global2.signal),
     null,
@@ -2114,7 +2111,7 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
   },
   render(renderer, willRerender, classAPIOut, component, input) {
     let $global2 = classAPIOut.global, state = $global2[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
-    state || ($global2.runtimeId ||= DEFAULT_RUNTIME_ID, $global2.renderId ||= $global2.componentIdPrefix || DEFAULT_RENDER_ID, $global2[K_TAGS_API_STATE] = state = new State2($global2));
+    state || ($global2.runtimeId ||= "M", $global2.renderId ||= $global2.componentIdPrefix || "_", $global2[K_TAGS_API_STATE] = state = new State2($global2));
     let boundary = new Boundary(state), head = new Chunk(
       boundary,
       null,

package/dist/html.mjs

@@ -102,9 +102,9 @@ function forToBy(by, index) {
 var WALKER_RUNTIME_CODE = '(e=>(self[e]=(l,d=e+l,f=d.length,o={},n=[],s=document,t=s.createTreeWalker(s,129))=>s=self[e][l]={i:d,d:s,l:o,v:n,x(){},w(e,l,x){for(;e=t.nextNode();)s.x(l=(l=e.data)&&!l.indexOf(d)&&(o[x=l.slice(f+1)]=e,l[f]),x,e),l>"#"&&n.push(e)}},self[e]))', REORDER_RUNTIME_CODE = '(e=>{let i,l,t,r={},c=(e,i)=>{e.replaceWith(...i.childNodes),i.remove()};e.d.head.append(e.d.querySelector("style["+e.i+"]")||""),e.j={},e.x=(d,o,n,a,g)=>{"#"==d?(r[o]=l).i++:n==t&&i(),"T"==n.tagName&&(o=n.getAttribute(e.i))&&((a=e.l["^"+o])&&(r[o]={i:1,c(i=e.l[o]||n){for(;(t=i.previousSibling||a).remove(),a!=t;);c(i,n)}}),t=n.nextSibling,l=r[o],i=()=>{a||c(e.l[o],n),--l.i||l.c()},(d=e.j[o])&&(g=l.c,l.c=()=>g()+d(e.r)))}})';
 
 // src/html/serializer.ts
-var kTouchedIterator = Symbol(), { hasOwnProperty } = {}, Generator = function* () {
-}().constructor, AsyncGenerator = async function* () {
-}().constructor;
+var kTouchedIterator = Symbol(), { hasOwnProperty } = {}, Generator = (function* () {
+})().constructor, AsyncGenerator = (async function* () {
+})().constructor;
 patchIteratorNext(Generator.prototype);
 patchIteratorNext(AsyncGenerator.prototype);
 var REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
@@ -1770,10 +1770,7 @@ function replaceUnsafeDoubleQuoteAttrChar(match) {
 }
 
 // src/common/compat-meta.ts
-var prefix = "$C_", RENDERER_REGISTER_ID = prefix + "r", SET_SCOPE_REGISTER_ID = prefix + "s", RENDER_BODY_ID = prefix + "b";
-
-// src/common/meta.ts
-var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
+var RENDERER_REGISTER_ID = "$C_r", SET_SCOPE_REGISTER_ID = "$C_s", RENDER_BODY_ID = "$C_b";
 
 // src/html/template.ts
 var createTemplate = (templateId, renderer) => (renderer.render = render, renderer._ = renderer, registerContent(templateId, renderer));
@@ -1783,10 +1780,10 @@ function isTemplate(renderer) {
 function render(input = {}) {
   let { $global: $global2 } = input;
   $global2 ? ({ $global: $global2, ...input } = input, $global2 = {
-    runtimeId: DEFAULT_RUNTIME_ID,
-    renderId: DEFAULT_RENDER_ID,
+    runtimeId: "M",
+    renderId: "_",
     ...$global2
-  }) : $global2 = { runtimeId: DEFAULT_RUNTIME_ID, renderId: DEFAULT_RENDER_ID };
+  }) : $global2 = { runtimeId: "M", renderId: "_" };
   let head = new Chunk(
     new Boundary(new State2($global2), $global2.signal),
     null,
@@ -2033,7 +2030,7 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
   },
   render(renderer, willRerender, classAPIOut, component, input) {
     let $global2 = classAPIOut.global, state = $global2[K_TAGS_API_STATE] ||= getChunk()?.boundary.state;
-    state || ($global2.runtimeId ||= DEFAULT_RUNTIME_ID, $global2.renderId ||= $global2.componentIdPrefix || DEFAULT_RENDER_ID, $global2[K_TAGS_API_STATE] = state = new State2($global2));
+    state || ($global2.runtimeId ||= "M", $global2.renderId ||= $global2.componentIdPrefix || "_", $global2[K_TAGS_API_STATE] = state = new State2($global2));
     let boundary = new Boundary(state), head = new Chunk(
       boundary,
       null,

package/dist/translator/index.js

@@ -238,10 +238,10 @@ var import_babel_utils17 = require("@marko/compiler/babel-utils");
 // src/html/serializer.ts
 var kTouchedIterator = Symbol();
 var { hasOwnProperty } = {};
-var Generator = function* () {
-}().constructor;
-var AsyncGenerator = async function* () {
-}().constructor;
+var Generator = (function* () {
+})().constructor;
+var AsyncGenerator = (async function* () {
+})().constructor;
 patchIteratorNext(Generator.prototype);
 patchIteratorNext(AsyncGenerator.prototype);
 var KNOWN_SYMBOLS = (() => {
@@ -5704,8 +5704,8 @@ var client_default = {
       hub: { file }
     } = tag;
     const rawValue = node.rawValue;
-    const code = rawValue.replace(/^client\s*/, "").trim();
-    const start = node.name.start + (rawValue.length - code.length);
+    const code = rawValue.replace(/^client\s*/, "");
+    const start = node.start + (rawValue.length - code.length);
     let body = (0, import_babel_utils19.parseStatements)(file, code, start, start + code.length);
     if (body.length === 1 && import_compiler26.types.isBlockStatement(body[0])) {
       body = body[0].body;
@@ -9594,8 +9594,8 @@ var server_default = {
       hub: { file }
     } = tag;
     const rawValue = node.rawValue;
-    const code = rawValue.replace(/^server\s*/, "").trim();
-    const start = node.name.start + (rawValue.length - code.length);
+    const code = rawValue.replace(/^server\s*/, "");
+    const start = node.start + (rawValue.length - code.length);
     let body = (0, import_babel_utils40.parseStatements)(file, code, start, start + code.length);
     if (body.length === 1 && import_compiler47.types.isBlockStatement(body[0])) {
       body = body[0].body;
@@ -9625,8 +9625,8 @@ var static_default = {
       hub: { file }
     } = tag;
     const rawValue = node.rawValue;
-    const code = rawValue.replace(/^static\s*/, "").trim();
-    const start = node.name.start + (rawValue.length - code.length);
+    const code = rawValue.replace(/^static\s*/, "");
+    const start = node.start + (rawValue.length - code.length);
     let body = (0, import_babel_utils41.parseStatements)(file, code, start, start + code.length);
     if (body.length === 1 && import_compiler48.types.isBlockStatement(body[0])) {
       body = body[0].body;

package/package.json

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