marko 6.0.0-next.3.60 → 6.0.0-next.3.62

package/dist/html.js

@@ -1084,7 +1084,7 @@ function withContext(key, value, cb) {
   }
 }
 function setTagVar(parentScopeId, scopeOffsetAccessor, childScope, registryId) {
-  ensureScopeWithId(parentScopeId)[scopeOffsetAccessor] = nextScopeId(), childScope["/" /* TagVariable */] = register2(
+  ensureScopeWithId(parentScopeId)[scopeOffsetAccessor] = nextScopeId(), childScope.e = register2(
     {},
     registryId,
     parentScopeId
@@ -1256,7 +1256,7 @@ function fork(scopeId, accessor, promise, content) {
     $chunk.writeHTML(
       $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
     ), content(promise), writeScope(scopeId, {
-      [accessor + "!" /* ConditionalScope */]: writeScope(branchId, {})
+      ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
     }), $chunk.writeHTML(
       $chunk.boundary.state.mark(
         "]" /* BranchEnd */,
@@ -1278,7 +1278,7 @@ function fork(scopeId, accessor, promise, content) {
         ), content(value), boundary.state.serializer.writeAssign(
           writeScope(branchId, {}),
           ensureScopeWithId(scopeId),
-          accessor + "!" /* ConditionalScope */
+          "d" /* ConditionalScope */ + accessor
         ), $chunk.writeHTML(
           $chunk.boundary.state.mark(
             "]" /* BranchEnd */,
@@ -1302,11 +1302,11 @@ function tryContent(scopeId, accessor, content, input) {
     placeholderContent ? () => tryPlaceholder(content, placeholderContent) : content,
     catchContent
   ) : placeholderContent ? tryPlaceholder(content, placeholderContent) : content(), writeScope(branchId, {
-    "*": accessor,
-    "^": catchContent,
-    "%": placeholderContent
+    a: accessor,
+    b: catchContent,
+    d: placeholderContent
   }), writeScope(scopeId, {
-    [accessor + "!" /* ConditionalScope */]: getScopeById(branchId)
+    ["d" /* ConditionalScope */ + accessor]: getScopeById(branchId)
   }), $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
@@ -1703,7 +1703,7 @@ function attrs(data, nodeAccessor, scopeId, tagName) {
         break;
       default:
         isVoid(value) || (isEventHandler(name) ? (events || (events = {}, writeScope(scopeId, {
-          [nodeAccessor + "~" /* EventAttributes */]: events
+          ["i" /* EventAttributes */ + nodeAccessor]: events
         })), events[getEventHandlerName(name)] = value) : skip.test(name) || (result += nonVoidAttr(name, value)));
         break;
     }
@@ -1718,9 +1718,9 @@ function partialAttrs(data, skip, nodeAccessor, scopeId, tagName) {
 }
 function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange) {
   writeScope(scopeId, {
-    [nodeAccessor + "=" /* ControlledType */]: type,
-    [nodeAccessor + ":" /* ControlledValue */]: value,
-    [nodeAccessor + ";" /* ControlledHandler */]: valueChange
+    ["f" /* ControlledType */ + nodeAccessor]: type,
+    ["g" /* ControlledValue */ + nodeAccessor]: value,
+    ["e" /* ControlledHandler */ + nodeAccessor]: valueChange
   });
 }
 function stringAttr(name, value) {
@@ -1774,7 +1774,7 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
 function dynamicTagId(tagName) {
   let normalizedRenderer = normalizeDynamicRenderer(tagName);
-  return normalizedRenderer?.a || normalizedRenderer;
+  return normalizedRenderer?.g || normalizedRenderer;
 }
 var dynamicTagInput = (scopeId, accessor, tag, input, content) => {
   if (!tag && !content) {
@@ -1847,7 +1847,7 @@ var dynamicTagInput = (scopeId, accessor, tag, input, content) => {
   ), result;
 };
 function createContent(id, fn) {
-  return fn.a = id, fn;
+  return fn.g = id, fn;
 }
 function registerContent(id, fn, scopeId) {
   return register2(createContent(id, fn), id, scopeId);
@@ -1874,7 +1874,7 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
   writeScript,
   nextScopeId,
   isTagsAPI(fn) {
-    return !!fn.a;
+    return !!fn.g;
   },
   patchDynamicTag,
   writeSetScopeForComponent(m5c) {

package/dist/html.mjs

@@ -1003,7 +1003,7 @@ function withContext(key, value, cb) {
   }
 }
 function setTagVar(parentScopeId, scopeOffsetAccessor, childScope, registryId) {
-  ensureScopeWithId(parentScopeId)[scopeOffsetAccessor] = nextScopeId(), childScope["/" /* TagVariable */] = register2(
+  ensureScopeWithId(parentScopeId)[scopeOffsetAccessor] = nextScopeId(), childScope.e = register2(
     {},
     registryId,
     parentScopeId
@@ -1175,7 +1175,7 @@ function fork(scopeId, accessor, promise, content) {
     $chunk.writeHTML(
       $chunk.boundary.state.mark("[" /* BranchStart */, branchId + "")
     ), content(promise), writeScope(scopeId, {
-      [accessor + "!" /* ConditionalScope */]: writeScope(branchId, {})
+      ["d" /* ConditionalScope */ + accessor]: writeScope(branchId, {})
     }), $chunk.writeHTML(
       $chunk.boundary.state.mark(
         "]" /* BranchEnd */,
@@ -1197,7 +1197,7 @@ function fork(scopeId, accessor, promise, content) {
         ), content(value), boundary.state.serializer.writeAssign(
           writeScope(branchId, {}),
           ensureScopeWithId(scopeId),
-          accessor + "!" /* ConditionalScope */
+          "d" /* ConditionalScope */ + accessor
         ), $chunk.writeHTML(
           $chunk.boundary.state.mark(
             "]" /* BranchEnd */,
@@ -1221,11 +1221,11 @@ function tryContent(scopeId, accessor, content, input) {
     placeholderContent ? () => tryPlaceholder(content, placeholderContent) : content,
     catchContent
   ) : placeholderContent ? tryPlaceholder(content, placeholderContent) : content(), writeScope(branchId, {
-    "*": accessor,
-    "^": catchContent,
-    "%": placeholderContent
+    a: accessor,
+    b: catchContent,
+    d: placeholderContent
   }), writeScope(scopeId, {
-    [accessor + "!" /* ConditionalScope */]: getScopeById(branchId)
+    ["d" /* ConditionalScope */ + accessor]: getScopeById(branchId)
   }), $chunk.writeHTML(
     $chunk.boundary.state.mark(
       "]" /* BranchEnd */,
@@ -1622,7 +1622,7 @@ function attrs(data, nodeAccessor, scopeId, tagName) {
         break;
       default:
         isVoid(value) || (isEventHandler(name) ? (events || (events = {}, writeScope(scopeId, {
-          [nodeAccessor + "~" /* EventAttributes */]: events
+          ["i" /* EventAttributes */ + nodeAccessor]: events
         })), events[getEventHandlerName(name)] = value) : skip.test(name) || (result += nonVoidAttr(name, value)));
         break;
     }
@@ -1637,9 +1637,9 @@ function partialAttrs(data, skip, nodeAccessor, scopeId, tagName) {
 }
 function writeControlledScope(type, scopeId, nodeAccessor, value, valueChange) {
   writeScope(scopeId, {
-    [nodeAccessor + "=" /* ControlledType */]: type,
-    [nodeAccessor + ":" /* ControlledValue */]: value,
-    [nodeAccessor + ";" /* ControlledHandler */]: valueChange
+    ["f" /* ControlledType */ + nodeAccessor]: type,
+    ["g" /* ControlledValue */ + nodeAccessor]: value,
+    ["e" /* ControlledHandler */ + nodeAccessor]: valueChange
   });
 }
 function stringAttr(name, value) {
@@ -1693,7 +1693,7 @@ var DEFAULT_RUNTIME_ID = "M", DEFAULT_RENDER_ID = "_";
 var voidElementsReg = /^(?:area|b(?:ase|r)|col|embed|hr|i(?:mg|nput)|link|meta|param|source|track|wbr)$/;
 function dynamicTagId(tagName) {
   let normalizedRenderer = normalizeDynamicRenderer(tagName);
-  return normalizedRenderer?.a || normalizedRenderer;
+  return normalizedRenderer?.g || normalizedRenderer;
 }
 var dynamicTagInput = (scopeId, accessor, tag, input, content) => {
   if (!tag && !content) {
@@ -1766,7 +1766,7 @@ var dynamicTagInput = (scopeId, accessor, tag, input, content) => {
   ), result;
 };
 function createContent(id, fn) {
-  return fn.a = id, fn;
+  return fn.g = id, fn;
 }
 function registerContent(id, fn, scopeId) {
   return register2(createContent(id, fn), id, scopeId);
@@ -1793,7 +1793,7 @@ var K_TAGS_API_STATE = Symbol(), COMPAT_REGISTRY = /* @__PURE__ */ new WeakMap()
   writeScript,
   nextScopeId,
   isTagsAPI(fn) {
-    return !!fn.a;
+    return !!fn.g;
   },
   patchDynamicTag,
   writeSetScopeForComponent(m5c) {

package/dist/translator/index.js

@@ -112,6 +112,35 @@ var attrs_default = {
 var import_compiler23 = require("@marko/compiler");
 var import_babel_utils12 = require("@marko/compiler/babel-utils");
 
+// src/common/accessor.debug.ts
+var AccessorPrefix = /* @__PURE__ */ ((AccessorPrefix3) => {
+  AccessorPrefix3["ClosureScopes"] = "ClosureScopes:";
+  AccessorPrefix3["ClosureSignalIndex"] = "ClosureSignalIndex:";
+  AccessorPrefix3["ConditionalRenderer"] = "ConditionalRenderer:";
+  AccessorPrefix3["ConditionalScope"] = "ConditionalScope:";
+  AccessorPrefix3["ControlledHandler"] = "ControlledHandler:";
+  AccessorPrefix3["ControlledType"] = "ControlledType:";
+  AccessorPrefix3["ControlledValue"] = "ControlledValue:";
+  AccessorPrefix3["DynamicPlaceholderLastChild"] = "DynamicPlaceholderLastChild:";
+  AccessorPrefix3["EventAttributes"] = "EventAttributes:";
+  AccessorPrefix3["Getter"] = "Getter:";
+  AccessorPrefix3["LifecycleAbortController"] = "LifecycleAbortController:";
+  AccessorPrefix3["LoopScopeArray"] = "LoopScopeArray:";
+  AccessorPrefix3["LoopScopeMap"] = "LoopScopeMap:";
+  AccessorPrefix3["Promise"] = "Promise:";
+  AccessorPrefix3["TagVariableChange"] = "TagVariableChange:";
+  return AccessorPrefix3;
+})(AccessorPrefix || {});
+var AccessorProp = /* @__PURE__ */ ((AccessorProp3) => {
+  AccessorProp3["BranchAccessor"] = "#BranchAccessor";
+  AccessorProp3["CatchContent"] = "#CatchContent";
+  AccessorProp3["PlaceholderBranch"] = "#PlaceholderBranch";
+  AccessorProp3["PlaceholderContent"] = "#PlaceholderContent";
+  AccessorProp3["TagVariable"] = "#TagVariable";
+  AccessorProp3["TagVariableChange"] = "#TagVariableChange";
+  return AccessorProp3;
+})(AccessorProp || {});
+
 // src/translator/util/evaluate.ts
 var import_babel_utils2 = require("@marko/compiler/babel-utils");
 function evaluate(value) {
@@ -1397,6 +1426,43 @@ var import_babel_utils9 = require("@marko/compiler/babel-utils");
 var import_compiler11 = require("@marko/compiler");
 var import_babel_utils8 = require("@marko/compiler/babel-utils");
 
+// src/common/accessor.ts
+var AccessorPrefix2 = /* @__PURE__ */ ((AccessorPrefix3) => {
+  AccessorPrefix3["ClosureScopes"] = "a";
+  AccessorPrefix3["ClosureSignalIndex"] = "b";
+  AccessorPrefix3["ConditionalRenderer"] = "c";
+  AccessorPrefix3["ConditionalScope"] = "d";
+  AccessorPrefix3["ControlledHandler"] = "e";
+  AccessorPrefix3["ControlledType"] = "f";
+  AccessorPrefix3["ControlledValue"] = "g";
+  AccessorPrefix3["DynamicPlaceholderLastChild"] = "h";
+  AccessorPrefix3["EventAttributes"] = "i";
+  AccessorPrefix3["Getter"] = "j";
+  AccessorPrefix3["LifecycleAbortController"] = "k";
+  AccessorPrefix3["LoopScopeArray"] = "l";
+  AccessorPrefix3["LoopScopeMap"] = "m";
+  AccessorPrefix3["Promise"] = "n";
+  AccessorPrefix3["TagVariableChange"] = "o";
+  return AccessorPrefix3;
+})(AccessorPrefix2 || {});
+var AccessorProp2 = /* @__PURE__ */ ((AccessorProp3) => {
+  AccessorProp3["BranchAccessor"] = "a";
+  AccessorProp3["CatchContent"] = "b";
+  AccessorProp3["PlaceholderBranch"] = "c";
+  AccessorProp3["PlaceholderContent"] = "d";
+  AccessorProp3["TagVariable"] = "e";
+  AccessorProp3["TagVariableChange"] = "f";
+  return AccessorProp3;
+})(AccessorProp2 || {});
+
+// src/translator/util/get-accessor-char.ts
+function getAccessorPrefix() {
+  return isOptimize() ? AccessorPrefix2 : AccessorPrefix;
+}
+function getAccessorProp() {
+  return isOptimize() ? AccessorProp2 : AccessorProp;
+}
+
 // src/translator/util/get-known-attr-values.ts
 function getKnownAttrValues(tag) {
   const attrs2 = {};
@@ -1809,7 +1875,7 @@ var return_default = {
         if (attrs2.valueChange) {
           setSerializedProperty(
             section,
-            "@" /* TagVariableChange */,
+            getAccessorProp().TagVariableChange,
             attrs2.valueChange
           );
         }
@@ -2502,7 +2568,9 @@ function writeSignals(section) {
   forEach(section.hoisted, (binding) => {
     for (const hoistedBinding of binding.hoists.values()) {
       const accessors = [
-        binding.type === 0 /* dom */ ? import_compiler17.types.stringLiteral(getScopeAccessor(binding) + ">" /* Getter */) : getScopeAccessorLiteral(binding)
+        binding.type === 0 /* dom */ ? import_compiler17.types.stringLiteral(
+          getAccessorPrefix().Getter + getScopeAccessor(binding)
+        ) : getScopeAccessorLiteral(binding)
       ];
       let currentSection = section;
       while (currentSection && currentSection !== hoistedBinding.section) {
@@ -2720,13 +2788,13 @@ function writeHTMLResumeStatements(path5) {
           );
           setSerializedProperty(
             closure.section,
-            getScopeAccessor(closure) + "!" /* ClosureScopes */,
+            getAccessorPrefix().ClosureScopes + getScopeAccessor(closure),
             identifier
           );
         }
         setSerializedProperty(
           section,
-          getScopeAccessor(closure) + "(" /* ClosureSignalIndex */,
+          getAccessorPrefix().ClosureSignalIndex + getScopeAccessor(closure),
           import_compiler17.types.numericLiteral(getDynamicClosureIndex(closure, section))
         );
         addWriteScopeBuilder(
@@ -4179,7 +4247,7 @@ function getScopeAccessor(binding, includeId) {
   return binding.name + (includeId || binding.type === 0 /* dom */ ? `/${binding.id}` : "");
 }
 function getSectionInstancesAccessor(section) {
-  return section.sectionAccessor ? getScopeAccessor(section.sectionAccessor.binding) + section.sectionAccessor.suffix : section.id + "!" /* ClosureScopes */;
+  return section.sectionAccessor ? section.sectionAccessor.prefix + getScopeAccessor(section.sectionAccessor.binding) : getAccessorPrefix().ClosureScopes + section.id;
 }
 function getSectionInstancesAccessorLiteral(section) {
   const accessor = getSectionInstancesAccessor(section);
@@ -5021,7 +5089,7 @@ var native_tag_default = {
                     "nodeRef",
                     import_compiler29.types.stringLiteral(getterId),
                     import_compiler29.types.stringLiteral(
-                      getScopeAccessorLiteral(nodeRef2).value + ">" /* Getter */
+                      getAccessorPrefix().Getter + getScopeAccessorLiteral(nodeRef2).value
                     )
                   )
                 )
@@ -5049,7 +5117,7 @@ var native_tag_default = {
                     import_compiler29.types.memberExpression(
                       getScopeExpression(section, referenceSection),
                       import_compiler29.types.stringLiteral(
-                        getScopeAccessorLiteral(nodeRef2).value + ">" /* Getter */
+                        getAccessorPrefix().Getter + getScopeAccessorLiteral(nodeRef2).value
                       ),
                       true
                     )
@@ -5508,7 +5576,7 @@ var for_default = {
     mergeReferences(section, tag.node, getAllTagReferenceNodes(tag.node));
     bodySection.sectionAccessor = {
       binding: getOptimizedOnlyChildNodeRef(tag, section),
-      suffix: "(" /* LoopScopeMap */
+      prefix: getAccessorPrefix().LoopScopeMap
     };
     bodySection.upstreamExpression = tagExtra;
     bodySection.isBranch = true;
@@ -5630,7 +5698,7 @@ var for_default = {
           }
           setSerializedProperty(
             tagSection,
-            getScopeAccessor(nodeRef2) + "(" /* LoopScopeMap */,
+            getAccessorPrefix().LoopScopeMap + getScopeAccessor(nodeRef2),
             import_compiler31.types.conditionalExpression(
               import_compiler31.types.memberExpression(forScopesIdentifier, import_compiler31.types.identifier("size")),
               forScopesIdentifier,
@@ -7387,7 +7455,7 @@ var IfTag = {
           section,
           branches.length
         ),
-        suffix: "!" /* ConditionalScope */
+        prefix: getAccessorPrefix().ConditionalScope
       };
       rootExtra.singleNodeOptimization = singleNodeOptimization;
     }
@@ -7485,7 +7553,7 @@ var IfTag = {
             if (isStateful) {
               setSerializedProperty(
                 section,
-                getScopeAccessor(nodeRef2) + "(" /* ConditionalRenderer */,
+                getAccessorPrefix().ConditionalRenderer + getScopeAccessor(nodeRef2),
                 ifBranchIdentifier
               );
               const cbNode = import_compiler40.types.arrowFunctionExpression(
@@ -7519,7 +7587,7 @@ var IfTag = {
             );
             setSerializedProperty(
               section,
-              getScopeAccessor(nodeRef2) + "!" /* ConditionalScope */,
+              getAccessorPrefix().ConditionalScope + getScopeAccessor(nodeRef2),
               callRuntime("getScopeById", ifScopeIdIdentifier)
             );
           } else {
@@ -7807,7 +7875,7 @@ var let_default = {
         if (valueChangeAttr) {
           setSerializedProperty(
             section,
-            getScopeAccessor(binding) + "@" /* TagVariableChange */,
+            getAccessorPrefix().TagVariableChange + getScopeAccessor(binding),
             valueChangeAttr.value
           );
         }
@@ -9703,12 +9771,12 @@ var dynamic_tag_default = {
         }
         setSerializedProperty(
           section,
-          getScopeAccessor(nodeRef2) + "!" /* ConditionalScope */,
+          getAccessorPrefix().ConditionalScope + getScopeAccessor(nodeRef2),
           callRuntime("writeExistingScope", dynamicScopeIdentifier)
         );
         setSerializedProperty(
           section,
-          getScopeAccessor(nodeRef2) + "(" /* ConditionalRenderer */,
+          getAccessorPrefix().ConditionalRenderer + getScopeAccessor(nodeRef2),
           callRuntime(
             "dynamicTagId",
             import_compiler54.types.isIdentifier(tagExpression) ? import_compiler54.types.identifier(tagExpression.name) : tagExpression
@@ -9733,7 +9801,7 @@ var dynamic_tag_default = {
               import_compiler54.types.memberExpression(
                 getScopeExpression(tagVarSignal.section, valueSection),
                 import_compiler54.types.stringLiteral(
-                  getScopeAccessor(nodeRef2) + "!" /* ConditionalScope */
+                  getAccessorPrefix().ConditionalScope + getScopeAccessor(nodeRef2)
                 ),
                 true
               ),

package/dist/translator/util/get-accessor-char.d.ts

@@ -0,0 +1,4 @@
+import { AccessorPrefix as ProductionAccessorPrefix, AccessorProp as ProductionAccessorProp } from "../../common/accessor";
+import { AccessorPrefix as DebugAccessorPrefix, AccessorProp as DebugAccessorProp } from "../../common/accessor.debug";
+export declare function getAccessorPrefix(): typeof DebugAccessorPrefix | typeof ProductionAccessorPrefix;
+export declare function getAccessorProp(): typeof DebugAccessorProp | typeof ProductionAccessorProp;

package/dist/translator/util/sections.d.ts

@@ -16,7 +16,7 @@ export interface Section {
     parent: Section | undefined;
     sectionAccessor: {
         binding: Binding;
-        suffix: string;
+        prefix: string;
     } | undefined;
     params: undefined | Binding;
     referencedClosures: ReferencedBindings;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.0-next.3.60",
+  "version": "6.0.0-next.3.62",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",