marko 6.4.2 → 6.4.3

package/dist/html.mjs

@@ -267,7 +267,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 	} else {
 		let chunk = getChunk(), beforeBranch = shouldResume ? deferBranchStart(chunk) : void 0, render = () => {
 			if (renderer) try {
-				return _set_scope_reason(shouldResume && inputOrArgs !== void 0 ? CLIENT_ALL : 0), inputIsArgs ? renderer(...inputOrArgs) : renderer(content ? {
+				return _set_scope_reason(shouldResume ? CLIENT_ALL : 0), inputIsArgs ? renderer(...inputOrArgs) : renderer(content ? {
 					...inputOrArgs,
 					content
 				} : inputOrArgs);
@@ -276,7 +276,7 @@ let empty = [], rest = Symbol(), unsafeStyleAttrReg = /[\\;]/g, replaceUnsafeSty
 			}
 			else if (content) return content();
 		};
-		result = shouldResume ? withBranchId(branchId, render) : render(), rendered = _peek_scope_id() !== branchId, beforeBranch !== void 0 && (applyBranchStart(chunk, beforeBranch, rendered), _html(state.mark("]", scopeId + " " + accessor + (rendered ? " " + branchId : ""))));
+		result = shouldResume ? withBranchId(branchId, render) : render(), rendered = _peek_scope_id() !== branchId, beforeBranch !== void 0 && (applyBranchStart(chunk, beforeBranch, rendered), _html(state.mark("]", scopeId + " " + accessor + (rendered ? " " + branchId : ""))), renderer && _existing_scope(branchId));
 	}
 	return rendered ? shouldResume && writeScope(scopeId, { ["D" + accessor]: rendererKey(renderer) }) : _scope_id(), result;
 }, patchDynamicTag = /* @__PURE__ */ ((originalDynamicTag) => (patch) => {
@@ -1586,7 +1586,12 @@ function _resume_branch(scopeId) {
 }
 function _attr_content(nodeAccessor, scopeId, content, markerGuard) {
 	let shouldResume = markerGuard !== 0, render = normalizeServerRender(content), branchId = _peek_scope_id();
-	render && (shouldResume ? withBranchId(branchId, render) : render()), _peek_scope_id() === branchId ? _scope_id() : shouldResume && writeScope(scopeId, {
+	if (render) try {
+		_set_scope_reason(shouldResume ? CLIENT_ALL : 0), shouldResume ? withBranchId(branchId, render) : render();
+	} finally {
+		_set_scope_reason(void 0);
+	}
+	_peek_scope_id() === branchId ? _scope_id() : shouldResume && writeScope(scopeId, {
 		["A" + nodeAccessor]: writeScope(branchId, {}),
 		["D" + nodeAccessor]: rendererKey(render)
 	});
@@ -1794,7 +1799,7 @@ function tryBoundary(content, catchContent, branchId, renderers) {
 				chunk.catchRange = null, renderersAtSettle || catchChunk.render(clearTryRenderers, branchId);
 				let inOrder = catchChunk === catchChunk.render(catchContent, catchBoundary.reason);
 				if (boundary.aborted) return;
-				if ((bodyEnd.consumed || !inOrder) && (catchChunk.reorderStart = state.mark("*", branchId + "")), bodyEnd.consumed) catchChunk.reorderId = reorderId, state.reorder(catchChunk);
+				if ((bodyEnd.consumed || !inOrder) && (catchChunk.reorderBranch = branchId), bodyEnd.consumed) catchChunk.reorderId = reorderId, state.reorder(catchChunk);
 				else {
 					let reorder = null;
 					inOrder ? streamed && (reorder = chunk.fork(boundary, null)) : reorder = catchChunk, reorder && (reorder.reorderId = reorderId);
@@ -1940,7 +1945,7 @@ var State = class {
 	async = !1;
 	consumed = !1;
 	reorderId = null;
-	reorderStart = "";
+	reorderBranch = 0;
 	deferredReady = null;
 	heldEffects = null;
 	deferredReorder = null;
@@ -2081,15 +2086,20 @@ var State = class {
 		if (state.writeReorders) {
 			for (let reorderedChunk of state.writeReorders) {
 				needsWalk = !0, state.hasReorderRuntime || (state.hasReorderRuntime = !0, scripts = concatScripts(scripts, "(e=>{if(e.j)return;let i,l,r,t=e.p={},c=(i,l)=>e.l[i].replaceWith(...l.childNodes);e.j={},e.x=(n,a,d,o,g)=>{d==r&&i(),\"#\"==n?(t[a]=l).i++:\"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:1,r:a,c(i=e.l[\"^\"+a],f=d.cloneNode()){if(--o.i)return 1;for(;f.prepend(r=e.l[a].previousSibling||i),i!=r;);c(a,d)}}),e.v.push({data:e.i+\"*\"+l.r}),(n=e.j[a])&&(g=l.c,l.c=()=>g()||n(e.r)))}})(" + runtimePrefix + ")"));
-				let { reorderId, reorderStart } = reorderedChunk, readyReservations = [], reorderHTML = "", reorderEffects = "", effectsBoundary = reorderedChunk.boundary, reorderScripts = "", cur = reorderedChunk.boundary.aborted ? null : reorderedChunk;
+				let { reorderId, reorderBranch } = reorderedChunk, rootBranch = reorderBranch || +reorderId, readyReservations = [], reorderHTML = "", reorderEffects = "", effectsBoundary = reorderedChunk.boundary, reorderScripts = "", cur = reorderedChunk.boundary.aborted ? null : reorderedChunk;
 				for (reorderedChunk.reorderId = null; cur;) {
 					cur.markCatchRange(), cur.queueDeferredReorder(), cur.deferOwnReady();
 					let { next } = cur, readyResumeScripts = cur.flushReadyScripts(boundary, readyReservations, this.async);
-					this.deferredReady = concat(this.deferredReady, cur.takeDeferredReady()), cur.consumed = !0, reorderHTML += cur.html, this.async && cur.effects && cur.boundary !== effectsBoundary && (reorderEffects &&= (holdReorderEffects(this, effectsBoundary, reorderEffects), ""), effectsBoundary = cur.boundary), reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, concatScripts(readyResumeScripts, cur.scripts)), cur.async && (reorderHTML += state.mark("#", cur.reorderId = state.nextReorderId()), cur.reorderStart = reorderStart, (cur.boundary.pendingReorders ||= /* @__PURE__ */ new Set()).add(cur), cur.html = cur.effects = cur.scripts = cur.lastEffect = "", cur.next = null), cur = next;
+					if (this.deferredReady = concat(this.deferredReady, cur.takeDeferredReady()), cur.consumed = !0, reorderHTML += cur.html, this.async && cur.effects && cur.boundary !== effectsBoundary && (reorderEffects &&= (holdReorderEffects(this, effectsBoundary, reorderEffects), ""), effectsBoundary = cur.boundary), reorderEffects = concatEffects(reorderEffects, cur.effects), reorderScripts = concatScripts(reorderScripts, concatScripts(readyResumeScripts, cur.scripts)), cur.async) {
+						reorderHTML += state.mark("#", cur.reorderId = state.nextReorderId());
+						let holeBranch = cur.context?.[kBranchId];
+						cur.reorderBranch = holeBranch > rootBranch ? holeBranch : reorderBranch, (cur.boundary.pendingReorders ||= /* @__PURE__ */ new Set()).add(cur), cur.html = cur.effects = cur.scripts = cur.lastEffect = "", cur.next = null;
+					}
+					cur = next;
 				}
 				reorderEffects && (this.async ? holdReorderEffects(this, effectsBoundary, reorderEffects) : (needsResumeArray = !0, reorderScripts = concatScripts(reorderScripts, "_.push(\"" + reorderEffects + "\")")));
 				for (let reservation of readyReservations) reordered = concatScripts(reordered, reservation);
-				reordered = concatScripts(reordered, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}"), html += "<t hidden " + state.commentPrefix + "=" + reorderId + ">" + reorderStart + reorderHTML + "</t>";
+				reordered = concatScripts(reordered, reorderScripts && runtimePrefix + ".j" + toAccess(reorderId) + "=_=>{" + reorderScripts + "}"), html += "<t hidden " + state.commentPrefix + "=" + reorderId + ">" + (reorderBranch ? state.mark("*", reorderBranch + "") : "") + reorderHTML + "</t>";
 			}
 			state.writeReorders = null;
 		}

package/dist/translator/index.js

@@ -156,6 +156,7 @@ var accessor_prop_debug_exports = /* @__PURE__ */ __exportAll({
 	AbortScopes: () => AbortScopes$1,
 	AwaitCounter: () => AwaitCounter$1,
 	BranchAccessor: () => BranchAccessor$1,
+	BranchRenders: () => BranchRenders$1,
 	BranchScopes: () => BranchScopes$2,
 	CatchContent: () => CatchContent$1,
 	ClosestBranch: () => ClosestBranch$1,
@@ -189,6 +190,7 @@ const AbortControllers$1 = "#AbortControllers";
 const AbortScopes$1 = "#AbortScopes";
 const AwaitCounter$1 = "#AwaitCounter";
 const BranchAccessor$1 = "#BranchAccessor";
+const BranchRenders$1 = "#BranchRenders";
 const BranchScopes$2 = "#BranchScopes";
 const CatchContent$1 = "#CatchContent";
 const ClosestBranch$1 = "#ClosestBranch";
@@ -1678,6 +1680,7 @@ const pureDOMFunctions = /* @__PURE__ */ new Set([
 	"_const",
 	"_load_signal",
 	"_load_setup",
+	"_load_setup_var",
 	"_load_template",
 	"_load_visible_trigger",
 	"_load_event_trigger",
@@ -1965,6 +1968,7 @@ var accessor_prop_exports = /* @__PURE__ */ __exportAll({
 	AbortScopes: () => "B",
 	AwaitCounter: () => "O",
 	BranchAccessor: () => "C",
+	BranchRenders: () => "BR",
 	BranchScopes: () => "D",
 	CatchContent: () => "E",
 	ClosestBranch: () => "F",
@@ -4862,6 +4866,7 @@ function translateDOM$1(tag) {
 	const isLoad = !!loadConfig;
 	const tagName = getStaticTagName(node);
 	if (isLoad) {
+		if (node.var) importRuntimeFeature("dynamic-tag-var");
 		const childFileName = childFile.opts.filename;
 		const { triggers, signals, setups } = getLoadIdentifiers();
 		let triggerIdent = triggers.get(loadConfig);
@@ -4884,14 +4889,14 @@ function translateDOM$1(tag) {
 			}
 			return signalIdent;
 		}, (section, childBinding) => {
-			const setupKey = `${triggerIdent ? triggerIdent.name : ""}\0${childFileName}`;
+			const setupKey = `${triggerIdent ? triggerIdent.name : ""}\0${childFileName}${node.var ? "\0var" : ""}`;
 			let setupIdent = setups.get(setupKey);
 			if (!setupIdent) {
 				setupIdent = generateUidIdentifier(`load_${tagName}_setup`);
 				setups.set(setupKey, setupIdent);
 				const setupLoadExpr = _marko_compiler.types.arrowFunctionExpression([], dynamicImport(buildLoadSetupVirtualModule(file, childFileName, childExports)));
 				importRuntimeFeature("catch");
-				(0, _marko_compiler_babel_utils.getProgram)().node.body.push(_marko_compiler.types.variableDeclaration("let", [_marko_compiler.types.variableDeclarator(setupIdent, callRuntime("_load_setup", triggerIdent ? _marko_compiler.types.addComment(_marko_compiler.types.callExpression(triggerIdent, [setupLoadExpr]), "leading", "@__PURE__") : setupLoadExpr))]));
+				(0, _marko_compiler_babel_utils.getProgram)().node.body.push(_marko_compiler.types.variableDeclaration("let", [_marko_compiler.types.variableDeclarator(setupIdent, callRuntime(node.var ? "_load_setup_var" : "_load_setup", triggerIdent ? _marko_compiler.types.addComment(_marko_compiler.types.callExpression(triggerIdent, [setupLoadExpr]), "leading", "@__PURE__") : setupLoadExpr))]));
 			}
 			addStatement("render", section, void 0, _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(setupIdent, [
 				scopeIdentifier,
@@ -6689,16 +6694,20 @@ function getWalkedBinding(op) {
 	return typeof op === "object" && (op.kind === "node" || op.kind === "child") ? op.binding : void 0;
 }
 function getLastOwnSourceReturn(intersection, section) {
-	let returnedBy;
-	for (const binding of intersection) if (binding.section === section && binding.sources) {
-		returnedBy = reduce(binding.sources.state, lastReturnedBy, returnedBy);
-		returnedBy = reduce(binding.sources.param, lastReturnedBy, returnedBy);
-	}
-	return returnedBy;
-}
-function lastReturnedBy(last, source) {
-	const { returnedBy } = source;
-	return returnedBy && (!last || last.id < returnedBy.id) ? returnedBy : last;
+	let last;
+	const seen = /* @__PURE__ */ new Set();
+	const track = (binding) => {
+		if (binding.section === section && !seen.has(binding)) {
+			seen.add(binding);
+			const { returnedBy } = getAliasRoot(binding) || binding;
+			if (returnedBy && (!last || last.id < returnedBy.id)) last = returnedBy;
+			if (binding.derivedFrom) forEach(getValueReferences(binding.derivedFrom), track);
+			forEach(binding.sources?.state, track);
+			forEach(binding.sources?.param, track);
+		}
+	};
+	forEach(intersection, track);
+	return last;
 }
 function getIntersectionSource(intersection, section, resolved) {
 	if (!resolved.has(intersection)) {
@@ -6742,11 +6751,6 @@ function resolveBindingSources(binding) {
 			binding.sources = globalSources;
 			return;
 	}
-	if (binding.localOf) {
-		resolveBindingSources(binding.localOf);
-		binding.sources = binding.localOf.sources;
-		return;
-	}
 	const aliasRoot = getAliasRoot(binding);
 	if (aliasRoot) {
 		if (!resolvedSources.has(aliasRoot)) {
@@ -7520,7 +7524,7 @@ function getOrCreateLocalClosure(local, section) {
 	while (section.parent !== local.section) section = section.parent;
 	let closure = local.localClosures?.get(section);
 	if (!closure) {
-		closure = createBinding(local.name, 4, section, void 0, void 0, void 0, local.loc);
+		closure = createBinding(local.name, 2, section, void 0, void 0, void 0, local.loc);
 		closure.localOf = local;
 		(local.localClosures ??= /* @__PURE__ */ new Map()).set(section, closure);
 	}
@@ -11038,6 +11042,7 @@ var dynamic_tag_default = {
 		if (tag.node.extra?.tagNameUnresolved) throw tagNotFoundError(tag);
 		(0, _marko_compiler_babel_utils.assertAttributesOrArgs)(tag);
 		const { node } = tag;
+		if (node.var && node.extra.featureType === "class") throw tag.get("var").buildCodeFrameError(`The Marko 5 (class API) tag \`${getStaticTagName(node)}\` cannot [\`<return>\`](https://markojs.com/docs/reference/core-tag#return) a value, so it does not support a [tag variable](https://markojs.com/docs/reference/language#tag-variables). Remove the variable, or migrate the tag to the tags API.`);
 		const definedBodySection = node.extra?.defineBodySection;
 		if (definedBodySection) {
 			knownTagAnalyze(tag, definedBodySection);
@@ -11174,10 +11179,10 @@ var dynamic_tag_default = {
 				const bodySection = getSectionForBody(tag.get("body"));
 				const signal = getSignal(section, nodeBinding, "dynamicTag");
 				let tagVarSignal;
-				if (tag.node.var) {
+				if (tag.node.var && isTagVarResumed(tag)) {
 					const varBinding = tag.node.var.extra.binding;
 					tagVarSignal = initValue(varBinding);
-					tagVarSignal.register = isTagVarResumed(tag);
+					tagVarSignal.register = true;
 					tagVarSignal.referenced = true;
 					tagVarSignal.buildAssignment = (valueSection, value) => {
 						const changeArgs = [_marko_compiler.types.memberExpression(getScopeExpression(tagVarSignal.section, valueSection), _marko_compiler.types.stringLiteral(getAccessorPrefix().BranchScopes + getScopeAccessor(nodeBinding)), true), value];
@@ -11195,9 +11200,9 @@ var dynamic_tag_default = {
 					const argsOrInput = hasTagArgs ? _marko_compiler.types.arrayExpression(args) : args[0];
 					if (!_marko_compiler.types.isObjectExpression(argsOrInput) || argsOrInput.properties.length) signal.extraArgs = [_marko_compiler.types.arrowFunctionExpression([], statements.length ? _marko_compiler.types.blockStatement(statements.concat(_marko_compiler.types.returnStatement(argsOrInput))) : argsOrInput)];
 				}
+				enableDynamicTagVar(tag);
 				if (!isClassAPI) {
 					enableDynamicTagResume(tag);
-					enableDynamicTagVar(tag);
 					enableDynamicTagControllables(tag);
 				}
 				addValue(section, getReferencedBindings(tagExtra), signal, tagExpression);
@@ -11216,9 +11221,9 @@ function enableDynamicTagControllables(tag) {
 	}
 }
 function enableDynamicTagVar(tag) {
-	if (!tag.node.var || !isTagVarResumed(tag) || analyzeTagNameType(tag, true) === 1) return;
+	if (!tag.node.var || !isTagVarResumed(tag)) return;
 	importRuntimeFeature("dynamic-tag-var");
-	if (!tag.node.var.extra.binding.pruned) {
+	if (analyzeTagNameType(tag, true) !== 1 && !tag.node.var.extra.binding.pruned) {
 		const accessor = getScopeAccessorLiteral(tag.node.extra.nodeBinding, true);
 		if (addRuntimeOnce(`_dynamic_tag_var_resume ${accessor.value}`)) (0, _marko_compiler_babel_utils.getProgram)().node.body.push(_marko_compiler.types.expressionStatement(callRuntime("_dynamic_tag_var_resume", accessor)));
 	}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.4.2",
+  "version": "6.4.3",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",
@@ -57,7 +57,7 @@
     "magic-string": "^0.30.21"
   },
   "devDependencies": {
-    "@marko/runtime-tags": "npm:marko@6.4.2",
+    "@marko/runtime-tags": "npm:marko@6.4.3",
     "marko": "5.39.45"
   },
   "engines": {

package/tags-html.d.ts

@@ -2225,11 +2225,6 @@ declare global {
          */
         autocomplete?: AttrAutoComplete;
 
-        /**
-         * (Safari only). Controls the autocorrect behavior of the <textarea> element.
-         */
-        autocorrect?: AttrOnOff;
-
         /**
          * Specifies the visible width of the <textarea> element in terms of character width.
          * @see https://html.spec.whatwg.org/multipage/form-elements.html#attr-textarea-cols
@@ -4208,6 +4203,12 @@ declare global {
         | "sentences"
         | "words";
 
+      /**
+       * Controls whether user agents may autocorrect spelling while the user types.
+       * @see https://html.spec.whatwg.org/multipage/interaction.html#attr-autocorrect
+       */
+      autocorrect?: AttrOnOff;
+
       /**
        * Indicates whether the element should automatically get focus when the page loads.
        * @see https://html.spec.whatwg.org/multipage/interaction.html#the-autofocus-attribute