@marko/runtime-tags 6.0.172 → 6.1.0

package/dist/debug/html.js

@@ -176,7 +176,7 @@ function forStepBy(by, index) {
 	return index;
 }
 //#endregion
-//#region src/html/inlined-runtimes.ts
+//#region src/html/inlined-runtimes.debug.ts
 const WALKER_RUNTIME_CODE = `((runtimeId) => (self[runtimeId] || (self[runtimeId] = (
   renderId,
   prefix = runtimeId + renderId,
@@ -270,7 +270,7 @@ const REORDER_RUNTIME_CODE = `((runtime) => {
 })`;
 //#endregion
 //#region src/html/serializer.ts
-const kTouchedIterator = Symbol();
+const kTouchedIterator = Symbol.for("marko.touchedIterator");
 const { hasOwnProperty } = {};
 const Generator = (function* () {})().constructor;
 const AsyncGenerator = (async function* () {})().constructor;
@@ -1402,11 +1402,13 @@ function isWord(char) {
 	return char >= "a" && char <= "z" || char >= "A" && char <= "Z" || char === "_" || char === "$";
 }
 function patchIteratorNext(proto) {
+	if (proto.next[kTouchedIterator]) return;
 	const { next } = proto;
 	proto.next = function(value) {
 		this[kTouchedIterator] = 1;
 		return next.call(this, value);
 	};
+	proto.next[kTouchedIterator] = true;
 }
 function compareRegisteredReferences(a, b) {
 	return a.registered.instanceId - b.registered.instanceId;
@@ -2216,7 +2218,7 @@ function getFilteredGlobals($global) {
 	return filtered;
 }
 function _subscribe(subscribers, scope) {
-	$chunk.boundary.state.serializer.writeCall(scope, subscribers, "add");
+	if (subscribers) $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add");
 	return referenceScope(scope);
 }
 //#endregion

package/dist/debug/html.mjs

@@ -174,7 +174,7 @@ function forStepBy(by, index) {
 	return index;
 }
 //#endregion
-//#region src/html/inlined-runtimes.ts
+//#region src/html/inlined-runtimes.debug.ts
 const WALKER_RUNTIME_CODE = `((runtimeId) => (self[runtimeId] || (self[runtimeId] = (
   renderId,
   prefix = runtimeId + renderId,
@@ -268,7 +268,7 @@ const REORDER_RUNTIME_CODE = `((runtime) => {
 })`;
 //#endregion
 //#region src/html/serializer.ts
-const kTouchedIterator = Symbol();
+const kTouchedIterator = Symbol.for("marko.touchedIterator");
 const { hasOwnProperty } = {};
 const Generator = (function* () {})().constructor;
 const AsyncGenerator = (async function* () {})().constructor;
@@ -1400,11 +1400,13 @@ function isWord(char) {
 	return char >= "a" && char <= "z" || char >= "A" && char <= "Z" || char === "_" || char === "$";
 }
 function patchIteratorNext(proto) {
+	if (proto.next[kTouchedIterator]) return;
 	const { next } = proto;
 	proto.next = function(value) {
 		this[kTouchedIterator] = 1;
 		return next.call(this, value);
 	};
+	proto.next[kTouchedIterator] = true;
 }
 function compareRegisteredReferences(a, b) {
 	return a.registered.instanceId - b.registered.instanceId;
@@ -2214,7 +2216,7 @@ function getFilteredGlobals($global) {
 	return filtered;
 }
 function _subscribe(subscribers, scope) {
-	$chunk.boundary.state.serializer.writeCall(scope, subscribers, "add");
+	if (subscribers) $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add");
 	return referenceScope(scope);
 }
 //#endregion

package/dist/html/inlined-runtimes.d.ts

@@ -1,2 +1,2 @@
-export declare const WALKER_RUNTIME_CODE: string;
-export declare const REORDER_RUNTIME_CODE: string;
+export declare const WALKER_RUNTIME_CODE = "(e=>(self[e]||(self[e]=(l,f=e+l,s=f.length,a={},d=[],t=document,n=t.createTreeWalker(t,129))=>t=self[e][l]={i:f,d:t,l:a,v:d,x(){},w(e,l,r){for(;e=n.nextNode();)t.x(l=(l=e.data)&&!l.indexOf(f)&&(a[r=l.slice(s+1)]=e,l[s]),r,e),l>\"#\"&&d.push(e)}}),self[e]))";
+export declare const REORDER_RUNTIME_CODE = "(e=>{if(e.j)return;let i,l,r,t=e.p={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.d.head.append(e.d.querySelector(\"style[\"+e.i+\"]\")||\"\"),e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),\"#\"==n?(t[a]=l).i++:\"!\"==n?e.l[a]&&t[a]&&(r=d.nextSibling,i=()=>t[a].c()):\"T\"==d.tagName&&(a=d.getAttribute(e.i))&&(r=d.nextSibling,i=()=>{d.remove(),o||c(a,d),l.c()},l=t[a]||(o=t[a]={i:e.l[a]?1:2,c(i=e.l[\"^\"+a]){if(--o.i)return 1;for(;(r=e.l[a].previousSibling||i).remove(),i!=r;);c(a,d)}}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})";

package/dist/html/inlined-runtimes.debug.d.ts

@@ -0,0 +1,2 @@
+export declare const WALKER_RUNTIME_CODE = "((runtimeId) => (self[runtimeId] || (self[runtimeId] = (\n  renderId,\n  prefix = runtimeId + renderId,\n  prefixLen = prefix.length,\n  lookup = {},\n  visits = [],\n  doc = document,\n  walker = doc.createTreeWalker(\n    doc,\n    129 /* NodeFilter.SHOW_COMMENT | NodeFilter.SHOW_ELEMENT */,\n  ),\n) =>\n  doc = (self[runtimeId][renderId] = {\n    i: prefix,\n    d: doc,\n    l: lookup,\n    v: visits,\n    x() {},\n    w(node, op, id) {\n      while ((node = walker.nextNode())) {\n        doc.x(\n          (op =\n            (op = node.data) &&\n            !op.indexOf(prefix) &&\n            ((lookup[(id = op.slice(prefixLen + 1))] = node), op[prefixLen])),\n          id,\n          node,\n        );\n\n        if (op > \"#\") {\n          visits.push(node);\n        }\n      }\n    },\n  })\n), self[runtimeId]))";
+export declare const REORDER_RUNTIME_CODE = "((runtime) => {\n  if (runtime.j) return;\n  let onNextSibling,\n    placeholder,\n    nextSibling,\n    placeholders = runtime.p = {},\n    replace = (id, container) => runtime.l[id].replaceWith(...container.childNodes);\n  runtime.d.head.append(\n    runtime.d.querySelector(\"style[\" + runtime.i + \"]\") || \"\"\n  );\n  runtime.j = {};\n  runtime.x = (op, id, node, placeholderRoot, placeholderCb) => {\n    if (node == nextSibling) {\n      onNextSibling();\n    }\n\n    if (op == \"#\") {\n      (placeholders[id] = placeholder).i++;\n    } else if (op == \"!\") {\n      if (runtime.l[id] && placeholders[id]) {\n        nextSibling = node.nextSibling;\n        onNextSibling = () => placeholders[id].c();\n      }\n    } else if (node.tagName == \"T\" && (id = node.getAttribute(runtime.i))) {\n      nextSibling = node.nextSibling;\n      onNextSibling = () => {\n        node.remove();\n        placeholderRoot || replace(id, node);\n        placeholder.c();\n      };\n      placeholder =\n        placeholders[id] ||\n        (placeholderRoot = placeholders[id] =\n          {\n            i: runtime.l[id] ? 1 : 2,\n            c(start = runtime.l[\"^\" + id]) {\n              if (--placeholderRoot.i) return 1;\n              for (\n                ;\n                (nextSibling =\n                  runtime.l[id].previousSibling || start).remove(),\n                  start != nextSibling;\n\n              );\n              replace(id, node);\n            },\n          });\n      // repurpose \"op\" for callbacks ...carefully\n      if ((op = runtime.j[id])) {\n        placeholderCb = placeholder.c;\n        placeholder.c = () => placeholderCb() || op(runtime.r);\n      }\n    }\n  };\n})";

package/dist/html/writer.d.ts

@@ -145,4 +145,4 @@ export declare function _trailers(html: string): void;
 type QueueCallback = (ticked: true) => void;
 export declare function queueTick(cb: QueueCallback): void;
 export declare function offTick(cb: QueueCallback): void;
-export declare function _subscribe(subscribers: Set<ScopeInternals>, scope: ScopeInternals): ScopeInternals;
+export declare function _subscribe(subscribers: Set<ScopeInternals> | undefined, scope: ScopeInternals): ScopeInternals;

package/dist/html.js

@@ -4,7 +4,7 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	else if (Array.isArray(val)) for (let v of val) part = toDelimitedString(v, delimiter, stringify), part && (str += sep + part, sep = delimiter);
 	else for (let name in val) part = stringify(name, val[name]), part && (str += sep + part, sep = delimiter);
 	return str;
-}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<\/script/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str, unsafeStyleReg = /<\/style/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, kTouchedIterator = Symbol(), { hasOwnProperty } = {}, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
+}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<\/script/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str, unsafeStyleReg = /<\/style/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty } = {}, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
 	let KNOWN_SYMBOLS = /* @__PURE__ */ new Map();
 	for (let name of Object.getOwnPropertyNames(Symbol)) {
 		let symbol = Symbol[name];
@@ -973,10 +973,11 @@ function isWord(char) {
 	return char >= "a" && char <= "z" || char >= "A" && char <= "Z" || char === "_" || char === "$";
 }
 function patchIteratorNext(proto) {
+	if (proto.next[kTouchedIterator]) return;
 	let { next } = proto;
 	proto.next = function(value) {
 		return this[kTouchedIterator] = 1, next.call(this, value);
-	};
+	}, proto.next[kTouchedIterator] = !0;
 }
 function compareRegisteredReferences(a, b) {
 	return a.registered.instanceId - b.registered.instanceId;
@@ -1463,7 +1464,7 @@ function getFilteredGlobals($global) {
 	return filtered;
 }
 function _subscribe(subscribers, scope) {
-	return $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add"), referenceScope(scope);
+	return subscribers && $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add"), referenceScope(scope);
 }
 //#endregion
 //#region src/html/attrs.ts

package/dist/html.mjs

@@ -4,7 +4,7 @@ let empty = [], rest = Symbol(), toDelimitedString = function toDelimitedString(
 	else if (Array.isArray(val)) for (let v of val) part = toDelimitedString(v, delimiter, stringify), part && (str += sep + part, sep = delimiter);
 	else for (let name in val) part = stringify(name, val[name]), part && (str += sep + part, sep = delimiter);
 	return str;
-}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<\/script/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str, unsafeStyleReg = /<\/style/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, kTouchedIterator = Symbol(), { hasOwnProperty } = {}, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
+}, unsafeXMLReg = /[<&]/g, replaceUnsafeXML = (c) => c === "&" ? "&amp;" : "&lt;", escapeXMLStr = (str) => unsafeXMLReg.test(str) ? str.replace(unsafeXMLReg, replaceUnsafeXML) : str, unsafeScriptReg = /<\/script/gi, escapeScriptStr = (str) => unsafeScriptReg.test(str) ? str.replace(unsafeScriptReg, "\\x3C/script") : str, unsafeStyleReg = /<\/style/gi, escapeStyleStr = (str) => unsafeStyleReg.test(str) ? str.replace(unsafeStyleReg, "\\3C/style") : str, unsafeCommentReg = />/g, escapeCommentStr = (str) => unsafeCommentReg.test(str) ? str.replace(unsafeCommentReg, "&gt;") : str, kTouchedIterator = Symbol.for("marko.touchedIterator"), { hasOwnProperty } = {}, Generator = (function* () {})().constructor, AsyncGenerator = (async function* () {})().constructor, REGISTRY = /* @__PURE__ */ new WeakMap(), KNOWN_SYMBOLS = (() => {
 	let KNOWN_SYMBOLS = /* @__PURE__ */ new Map();
 	for (let name of Object.getOwnPropertyNames(Symbol)) {
 		let symbol = Symbol[name];
@@ -972,10 +972,11 @@ function isWord(char) {
 	return char >= "a" && char <= "z" || char >= "A" && char <= "Z" || char === "_" || char === "$";
 }
 function patchIteratorNext(proto) {
+	if (proto.next[kTouchedIterator]) return;
 	let { next } = proto;
 	proto.next = function(value) {
 		return this[kTouchedIterator] = 1, next.call(this, value);
-	};
+	}, proto.next[kTouchedIterator] = !0;
 }
 function compareRegisteredReferences(a, b) {
 	return a.registered.instanceId - b.registered.instanceId;
@@ -1462,7 +1463,7 @@ function getFilteredGlobals($global) {
 	return filtered;
 }
 function _subscribe(subscribers, scope) {
-	return $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add"), referenceScope(scope);
+	return subscribers && $chunk.boundary.state.serializer.writeCall(scope, subscribers, "add"), referenceScope(scope);
 }
 //#endregion
 //#region src/html/attrs.ts

package/dist/translator/index.js

@@ -248,7 +248,7 @@ function normalizeDynamicRenderer(value) {
 const decodeAccessor = (num) => (num + (num < 26 ? 10 : num < 962 ? 334 : 11998)).toString(36);
 //#endregion
 //#region src/html/serializer.ts
-const kTouchedIterator = Symbol();
+const kTouchedIterator = Symbol.for("marko.touchedIterator");
 const { hasOwnProperty } = {};
 const Generator = (function* () {})().constructor;
 const AsyncGenerator = (async function* () {})().constructor;
@@ -496,11 +496,13 @@ function toAccess(accessor) {
 	return start === "\"" || start >= "0" && start <= "9" ? "[" + accessor + "]" : "." + accessor;
 }
 function patchIteratorNext(proto) {
+	if (proto.next[kTouchedIterator]) return;
 	const { next } = proto;
 	proto.next = function(value) {
 		this[kTouchedIterator] = 1;
 		return next.call(this, value);
 	};
+	proto.next[kTouchedIterator] = true;
 }
 //#endregion
 //#region src/translator/util/get-compile-stage.ts
@@ -2132,24 +2134,6 @@ let _dynamic_tag = (scopeId, accessor, tag, inputOrArgs, content, inputIsArgs, s
 	};
 })(_dynamic_tag);
 //#endregion
-//#region src/translator/util/to-property-name.ts
-function isValidPropertyIdentifier(name) {
-	return /^[a-z_$][a-z0-9_$]*$/i.test(name);
-}
-function toPropertyName(name) {
-	if (isValidPropertyIdentifier(name)) return _marko_compiler.types.identifier(name);
-	else if (/^(?:0|[1-9][0-9]*)$/.test(name)) return _marko_compiler.types.numericLiteral(parseInt(name, 10));
-	return _marko_compiler.types.stringLiteral(name);
-}
-function toObjectProperty(name, value) {
-	return _marko_compiler.types.objectProperty(toPropertyName(name), value);
-}
-function toMemberExpression(object, key, optional) {
-	const prop = toPropertyName(key);
-	const computed = prop.type !== "Identifier";
-	return optional ? _marko_compiler.types.optionalMemberExpression(object, prop, computed, true) : _marko_compiler.types.memberExpression(object, prop, computed);
-}
-//#endregion
 //#region src/translator/util/runtime.ts
 const pureDOMFunctions = new Set([
 	"_await_promise",
@@ -2175,7 +2159,7 @@ const pureDOMFunctions = new Set([
 ]);
 function importRuntime(name) {
 	const { output } = getMarkoOpts();
-	return toMemberExpression((0, _marko_compiler_babel_utils.importStar)((0, _marko_compiler_babel_utils.getFile)(), getRuntimePath(output), "_"), name);
+	return (0, _marko_compiler_babel_utils.importNamed)((0, _marko_compiler_babel_utils.getFile)(), getRuntimePath(output), name);
 }
 function callRuntime(name, ...args) {
 	const callExpression = _marko_compiler.types.callExpression(importRuntime(name), filterArguments(args));
@@ -2769,6 +2753,24 @@ function forEachIdentifierPath(nodePath, cb) {
 	}
 }
 //#endregion
+//#region src/translator/util/to-property-name.ts
+function isValidPropertyIdentifier(name) {
+	return /^[a-z_$][a-z0-9_$]*$/i.test(name);
+}
+function toPropertyName(name) {
+	if (isValidPropertyIdentifier(name)) return _marko_compiler.types.identifier(name);
+	else if (/^(?:0|[1-9][0-9]*)$/.test(name)) return _marko_compiler.types.numericLiteral(parseInt(name, 10));
+	return _marko_compiler.types.stringLiteral(name);
+}
+function toObjectProperty(name, value) {
+	return _marko_compiler.types.objectProperty(toPropertyName(name), value);
+}
+function toMemberExpression(object, key, optional) {
+	const prop = toPropertyName(key);
+	const computed = prop.type !== "Identifier";
+	return optional ? _marko_compiler.types.optionalMemberExpression(object, prop, computed, true) : _marko_compiler.types.memberExpression(object, prop, computed);
+}
+//#endregion
 //#region src/translator/util/get-declared-binding-expression.ts
 function getDeclaredBindingExpression(binding) {
 	const canonicalBinding = getCanonicalBinding(binding);
@@ -3202,6 +3204,7 @@ function writeHTMLResumeStatements(path) {
 	const body = path.node.body;
 	const allSignals = Array.from(getSignals(section).values());
 	const scopeIdIdentifier = getScopeIdIdentifier(section);
+	const sectionSerializeReason = nonAnalyzedForceSerializedSection.has(section) ? true : section.serializeReason;
 	forEach(section.referencedClosures, (closure) => {
 		if (closure.sources) {
 			if (isDynamicClosure(section, closure)) {
@@ -3217,7 +3220,11 @@ function writeHTMLResumeStatements(path) {
 				if (underTryPlaceholder(section)) {
 					const reason = getSerializeReason(section);
 					if (reason) getHTMLSectionStatements(section).push(_marko_compiler.types.expressionStatement(getExprIfSerialized(section, reason, callRuntime("_script", getScopeIdIdentifier(section), _marko_compiler.types.stringLiteral(getResumeRegisterId(section, closure, "pending"))))));
-				} else addWriteScopeBuilder(section, (expr) => callRuntime("_subscribe", identifier, expr));
+				} else {
+					const closureScopesReason = getSerializeReason(closure.section, closure, getAccessorPrefix().ClosureScopes);
+					const subscribeArg = isReasonDynamic(closureScopesReason) && !isSameReason(closureScopesReason, sectionSerializeReason) ? getExprIfSerialized(closure.section, closureScopesReason, identifier) : identifier;
+					addWriteScopeBuilder(section, (expr) => callRuntime("_subscribe", subscribeArg, expr));
+				}
 			}
 		}
 	});
@@ -3229,7 +3236,6 @@ function writeHTMLResumeStatements(path) {
 	const writeScopeBuilder = getSectionWriteScopeBuilder(section);
 	const serializedLookup = getSerializedAccessors(section);
 	const serializedProperties = [];
-	const sectionSerializeReason = nonAnalyzedForceSerializedSection.has(section) ? true : section.serializeReason;
 	const ifSerialized = (reason, expr) => {
 		if (isSameReason(sectionSerializeReason, reason)) return expr;
 		return getExprIfSerialized(section, reason, expr);

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

@@ -3,7 +3,7 @@ import type { Falsy } from "../../common/types";
 import { _attr, _attr_class, _attr_style, _escape, _escape_comment, _escape_script, _escape_style, _unescaped } from "../../html";
 export type DOMRuntimeHelpers = keyof typeof import("../../dom");
 export type HTMLRuntimeHelpers = keyof typeof import("../../html");
-export declare function importRuntime(name: DOMRuntimeHelpers | HTMLRuntimeHelpers): t.MemberExpression;
+export declare function importRuntime(name: DOMRuntimeHelpers | HTMLRuntimeHelpers): t.Identifier;
 export declare function callRuntime(name: DOMRuntimeHelpers | HTMLRuntimeHelpers, ...args: Array<Parameters<typeof t.callExpression>[1][number] | Falsy>): t.CallExpression;
 export declare function getHTMLRuntime(): {
     _escape: typeof _escape;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@marko/runtime-tags",
-  "version": "6.0.172",
+  "version": "6.1.0",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",