@marko/runtime-tags 6.3.10 → 6.3.11

package/dist/debug/dom.js

@@ -45,8 +45,7 @@ const knownWrongAttrs = {
 	"v-text": "${text}"
 };
 function getWrongAttrSuggestion(name) {
-	const exact = knownWrongAttrs[name];
-	if (exact) return exact;
+	if (Object.hasOwn(knownWrongAttrs, name)) return knownWrongAttrs[name];
 	const colon = name.indexOf(":");
 	if (colon > 0) {
 		const rest = name.slice(colon + 1);
@@ -799,7 +798,10 @@ function init(runtimeId = "M") {
 							branch["#StartNode"] = startVisit;
 							branch["#EndNode"] = visit.previousSibling === startVisit ? startVisit : parent.insertBefore(new Text(), visit);
 						}
-						while (i && orphanBranches[--i]["#Id"] > branchId) setParentBranch(orphanBranches.pop(), branch);
+						while (i && orphanBranches[i - 1]["#Id"] > branchId) {
+							i--;
+							setParentBranch(orphanBranches.pop(), branch);
+						}
 						while (j && deferredOwners[--j]["#Id"] > branchId) {
 							const owner = deferredOwners.pop();
 							if (owner["#ClosestBranch"] !== owner) owner["#ClosestBranch"] = branch;
@@ -1261,7 +1263,7 @@ function attrsInternal(scope, nodeAccessor, nextAttrs) {
 	for (const name in events) events[name] = 0;
 	scope["ControlledType:" + nodeAccessor] = 5;
 	scope["ControlledHandler:" + nodeAccessor] = 0;
-	switch (el.tagName) {
+	switch (nextAttrs && el.tagName) {
 		case "INPUT":
 			if ("checked" in nextAttrs || "checkedChange" in nextAttrs) {
 				_attr_input_checked(scope, nodeAccessor, nextAttrs.checked, nextAttrs.checkedChange);

package/dist/debug/dom.mjs

@@ -43,8 +43,7 @@ const knownWrongAttrs = {
 	"v-text": "${text}"
 };
 function getWrongAttrSuggestion(name) {
-	const exact = knownWrongAttrs[name];
-	if (exact) return exact;
+	if (Object.hasOwn(knownWrongAttrs, name)) return knownWrongAttrs[name];
 	const colon = name.indexOf(":");
 	if (colon > 0) {
 		const rest = name.slice(colon + 1);
@@ -797,7 +796,10 @@ function init(runtimeId = "M") {
 							branch["#StartNode"] = startVisit;
 							branch["#EndNode"] = visit.previousSibling === startVisit ? startVisit : parent.insertBefore(new Text(), visit);
 						}
-						while (i && orphanBranches[--i]["#Id"] > branchId) setParentBranch(orphanBranches.pop(), branch);
+						while (i && orphanBranches[i - 1]["#Id"] > branchId) {
+							i--;
+							setParentBranch(orphanBranches.pop(), branch);
+						}
 						while (j && deferredOwners[--j]["#Id"] > branchId) {
 							const owner = deferredOwners.pop();
 							if (owner["#ClosestBranch"] !== owner) owner["#ClosestBranch"] = branch;
@@ -1259,7 +1261,7 @@ function attrsInternal(scope, nodeAccessor, nextAttrs) {
 	for (const name in events) events[name] = 0;
 	scope["ControlledType:" + nodeAccessor] = 5;
 	scope["ControlledHandler:" + nodeAccessor] = 0;
-	switch (el.tagName) {
+	switch (nextAttrs && el.tagName) {
 		case "INPUT":
 			if ("checked" in nextAttrs || "checkedChange" in nextAttrs) {
 				_attr_input_checked(scope, nodeAccessor, nextAttrs.checked, nextAttrs.checkedChange);

package/dist/debug/html.js

@@ -45,8 +45,7 @@ const knownWrongAttrs = {
 	"v-text": "${text}"
 };
 function getWrongAttrSuggestion(name) {
-	const exact = knownWrongAttrs[name];
-	if (exact) return exact;
+	if (Object.hasOwn(knownWrongAttrs, name)) return knownWrongAttrs[name];
 	const colon = name.indexOf(":");
 	if (colon > 0) {
 		const rest = name.slice(colon + 1);
@@ -2614,7 +2613,7 @@ function _attrs(data, nodeAccessor, scopeId, tagName) {
 	let result = "";
 	let skip = /[\s/>"'=]/;
 	let events;
-	switch (tagName) {
+	switch (data && tagName) {
 		case "input":
 			assertExclusiveAttrs(data);
 			if (data.checkedChange) {
@@ -3005,7 +3004,9 @@ var ServerRendered = class {
 				boundary.onNext = NOOP$1;
 				onAbort(boundary.signal.reason);
 			} else if (write || status === 0) {
-				const html = (head = head.consume()).flushHTML();
+				head = head.consume();
+				if (boundary.signal.aborted) return;
+				const html = head.flushHTML();
 				if (html) onWrite(html);
 				if (status === 0) {
 					if (!tick) offTick(onNext);

package/dist/debug/html.mjs

@@ -43,8 +43,7 @@ const knownWrongAttrs = {
 	"v-text": "${text}"
 };
 function getWrongAttrSuggestion(name) {
-	const exact = knownWrongAttrs[name];
-	if (exact) return exact;
+	if (Object.hasOwn(knownWrongAttrs, name)) return knownWrongAttrs[name];
 	const colon = name.indexOf(":");
 	if (colon > 0) {
 		const rest = name.slice(colon + 1);
@@ -2612,7 +2611,7 @@ function _attrs(data, nodeAccessor, scopeId, tagName) {
 	let result = "";
 	let skip = /[\s/>"'=]/;
 	let events;
-	switch (tagName) {
+	switch (data && tagName) {
 		case "input":
 			assertExclusiveAttrs(data);
 			if (data.checkedChange) {
@@ -3003,7 +3002,9 @@ var ServerRendered = class {
 				boundary.onNext = NOOP$1;
 				onAbort(boundary.signal.reason);
 			} else if (write || status === 0) {
-				const html = (head = head.consume()).flushHTML();
+				head = head.consume();
+				if (boundary.signal.aborted) return;
+				const html = head.flushHTML();
 				if (html) onWrite(html);
 				if (status === 0) {
 					if (!tick) offTick(onNext);

package/dist/dom.js

@@ -508,7 +508,7 @@ function init(runtimeId = "M") {
 						for (; startVisit.previousSibling && ~visits.indexOf(startVisit = startVisit.previousSibling););
 						branch._ ??= visitScope, branch.K = branch.S = startVisit, visitType === "'" && (branch.a = startVisit);
 					} else curBranchScopes = push(curBranchScopes, branch), accessor && (visitScope[accessor] = curBranchScopes, forEach(curBranchScopes, (scope) => scope._ ??= visitScope), curBranchScopes = branchScopesStack.pop()), startVisit = branchStarts.pop(), parent !== startVisit.parentNode && parent.prepend(startVisit), branch.S = startVisit, branch.K = visit.previousSibling === startVisit ? startVisit : parent.insertBefore(new Text(), visit);
-					for (; i && orphanBranches[--i].L > branchId;) setParentBranch(orphanBranches.pop(), branch);
+					for (; i && orphanBranches[i - 1].L > branchId;) i--, setParentBranch(orphanBranches.pop(), branch);
 					for (; j && deferredOwners[--j].L > branchId;) {
 						let owner = deferredOwners.pop();
 						owner.F !== owner && (owner.F = branch);
@@ -828,7 +828,7 @@ function _attrs_partial_content(scope, nodeAccessor, nextAttrs, skip) {
 function attrsInternal(scope, nodeAccessor, nextAttrs) {
 	let el = scope[nodeAccessor], events = scope["I" + nodeAccessor], skip;
 	for (let name in events) events[name] = 0;
-	switch (scope["F" + nodeAccessor] = 5, scope["E" + nodeAccessor] = 0, el.tagName) {
+	switch (scope["F" + nodeAccessor] = 5, scope["E" + nodeAccessor] = 0, nextAttrs && el.tagName) {
 		case "INPUT":
 			"checked" in nextAttrs || "checkedChange" in nextAttrs ? (_attr_input_checked(scope, nodeAccessor, nextAttrs.checked, nextAttrs.checkedChange), skip = /^checked(?:Value)?(?:Change)?$/) : "checkedValue" in nextAttrs || "checkedValueChange" in nextAttrs ? (_attr_input_checkedValue(scope, nodeAccessor, nextAttrs.checkedValue, nextAttrs.checkedValueChange, nextAttrs.value), skip = /^(?:value|checked(?:Value)?)(?:Change)?$/) : ("value" in nextAttrs || "valueChange" in nextAttrs) && (_attr_input_value(scope, nodeAccessor, nextAttrs.value, nextAttrs.valueChange), skip = /^value(?:Change)?$/);
 			break;

package/dist/dom.mjs

@@ -507,7 +507,7 @@ function init(runtimeId = "M") {
 						for (; startVisit.previousSibling && ~visits.indexOf(startVisit = startVisit.previousSibling););
 						branch._ ??= visitScope, branch.K = branch.S = startVisit, visitType === "'" && (branch.a = startVisit);
 					} else curBranchScopes = push(curBranchScopes, branch), accessor && (visitScope[accessor] = curBranchScopes, forEach(curBranchScopes, (scope) => scope._ ??= visitScope), curBranchScopes = branchScopesStack.pop()), startVisit = branchStarts.pop(), parent !== startVisit.parentNode && parent.prepend(startVisit), branch.S = startVisit, branch.K = visit.previousSibling === startVisit ? startVisit : parent.insertBefore(new Text(), visit);
-					for (; i && orphanBranches[--i].L > branchId;) setParentBranch(orphanBranches.pop(), branch);
+					for (; i && orphanBranches[i - 1].L > branchId;) i--, setParentBranch(orphanBranches.pop(), branch);
 					for (; j && deferredOwners[--j].L > branchId;) {
 						let owner = deferredOwners.pop();
 						owner.F !== owner && (owner.F = branch);
@@ -827,7 +827,7 @@ function _attrs_partial_content(scope, nodeAccessor, nextAttrs, skip) {
 function attrsInternal(scope, nodeAccessor, nextAttrs) {
 	let el = scope[nodeAccessor], events = scope["I" + nodeAccessor], skip;
 	for (let name in events) events[name] = 0;
-	switch (scope["F" + nodeAccessor] = 5, scope["E" + nodeAccessor] = 0, el.tagName) {
+	switch (scope["F" + nodeAccessor] = 5, scope["E" + nodeAccessor] = 0, nextAttrs && el.tagName) {
 		case "INPUT":
 			"checked" in nextAttrs || "checkedChange" in nextAttrs ? (_attr_input_checked(scope, nodeAccessor, nextAttrs.checked, nextAttrs.checkedChange), skip = /^checked(?:Value)?(?:Change)?$/) : "checkedValue" in nextAttrs || "checkedValueChange" in nextAttrs ? (_attr_input_checkedValue(scope, nodeAccessor, nextAttrs.checkedValue, nextAttrs.checkedValueChange, nextAttrs.value), skip = /^(?:value|checked(?:Value)?)(?:Change)?$/) : ("value" in nextAttrs || "valueChange" in nextAttrs) && (_attr_input_value(scope, nodeAccessor, nextAttrs.value, nextAttrs.valueChange), skip = /^value(?:Change)?$/);
 			break;

package/dist/html.js

@@ -1722,7 +1722,7 @@ function _attr_nullish(name, value, attr) {
 }
 function _attrs(data, nodeAccessor, scopeId, tagName) {
 	let result = "", skip = /[\s/>"'=]/, events;
-	switch (tagName) {
+	switch (data && tagName) {
 		case "input":
 			data.checkedChange ? (result += _attr_input_checked(scopeId, nodeAccessor, data.checked, data.checkedChange, 1), skip = /^checked(?:Value)?(?:Change)?$|[\s/>"'=]/) : "checkedValue" in data || data.checkedValueChange ? (result += _attr_input_checkedValue(scopeId, nodeAccessor, data.checkedValue, data.checkedValueChange, data.value, 1), skip = /^(?:value|checked(?:Value)?)(?:Change)?$|[\s/>"'=]/) : data.valueChange && (result += _attr_input_value(scopeId, nodeAccessor, data.value, data.valueChange, 1), skip = /^value(?:Change)?$|[\s/>"'=]/);
 			break;
@@ -1960,7 +1960,8 @@ var ServerRendered = class {
 			let status = boundary.flush();
 			if (status === 2) tick || offTick(onNext), boundary.onNext = NOOP$1, onAbort(boundary.signal.reason);
 			else if (write || status === 0) {
-				let html = (head = head.consume()).flushHTML();
+				if (head = head.consume(), boundary.signal.aborted) return;
+				let html = head.flushHTML();
 				html && onWrite(html), status === 0 ? (tick || offTick(onNext), onClose()) : tick = !0;
 			} else tick && (tick = !1, queueTick(onNext));
 		};

package/dist/html.mjs

@@ -1721,7 +1721,7 @@ function _attr_nullish(name, value, attr) {
 }
 function _attrs(data, nodeAccessor, scopeId, tagName) {
 	let result = "", skip = /[\s/>"'=]/, events;
-	switch (tagName) {
+	switch (data && tagName) {
 		case "input":
 			data.checkedChange ? (result += _attr_input_checked(scopeId, nodeAccessor, data.checked, data.checkedChange, 1), skip = /^checked(?:Value)?(?:Change)?$|[\s/>"'=]/) : "checkedValue" in data || data.checkedValueChange ? (result += _attr_input_checkedValue(scopeId, nodeAccessor, data.checkedValue, data.checkedValueChange, data.value, 1), skip = /^(?:value|checked(?:Value)?)(?:Change)?$|[\s/>"'=]/) : data.valueChange && (result += _attr_input_value(scopeId, nodeAccessor, data.value, data.valueChange, 1), skip = /^value(?:Change)?$|[\s/>"'=]/);
 			break;
@@ -1959,7 +1959,8 @@ var ServerRendered = class {
 			let status = boundary.flush();
 			if (status === 2) tick || offTick(onNext), boundary.onNext = NOOP$1, onAbort(boundary.signal.reason);
 			else if (write || status === 0) {
-				let html = (head = head.consume()).flushHTML();
+				if (head = head.consume(), boundary.signal.aborted) return;
+				let html = head.flushHTML();
 				html && onWrite(html), status === 0 ? (tick || offTick(onNext), onClose()) : tick = !0;
 			} else tick && (tick = !1, queueTick(onNext));
 		};

package/dist/translator/index.js

@@ -233,8 +233,7 @@ const knownWrongAttrs = {
 	"v-text": "${text}"
 };
 function getWrongAttrSuggestion(name) {
-	const exact = knownWrongAttrs[name];
-	if (exact) return exact;
+	if (Object.hasOwn(knownWrongAttrs, name)) return knownWrongAttrs[name];
 	const colon = name.indexOf(":");
 	if (colon > 0) {
 		const rest = name.slice(colon + 1);
@@ -1156,8 +1155,8 @@ function analyzeExpressionTagName(name, extra) {
 		pending.push(path.get("consequent"));
 		if (path.node.alternate) pending.push(path.get("alternate"));
 	} else if (path.isLogicalExpression()) {
-		if (path.node.operator === "||") pending.push(path.get("left"));
-		else nullable = true;
+		if (path.node.operator === "&&") nullable = true;
+		else pending.push(path.get("left"));
 		pending.push(path.get("right"));
 	} else if (path.isAssignmentExpression()) pending.push(path.get("right"));
 	else if (path.isBinaryExpression()) type = path.node.operator !== "+" || type === void 0 || type === 0 ? 0 : 2;
@@ -1403,8 +1402,11 @@ function getCommonSection(section, other) {
 	throw new Error("No common section");
 }
 function finalizeParamSerializeReasonGroups(section) {
-	if (isReasonDynamic(section.serializeReason)) for (const [paramSection, params] of groupParamsBySection(section.serializeReason.param)) ensureParamReasonGroup(paramSection, params);
-	for (const reason of section.serializeReasons.values()) if (isReasonDynamic(reason)) for (const [paramSection, params] of groupParamsBySection(reason.param)) ensureParamReasonGroup(paramSection, params);
+	ensureReasonGroups(section.serializeReason);
+	for (const reason of section.serializeReasons.values()) ensureReasonGroups(reason);
+}
+function ensureReasonGroups(reason) {
+	if (isReasonDynamic(reason)) for (const [paramSection, params] of groupParamsBySection(reason.param)) ensureParamReasonGroup(paramSection, params);
 }
 function ensureParamReasonGroup(section, reason) {
 	const { paramReasonGroups } = section;
@@ -1872,7 +1874,7 @@ function _attrs(data, nodeAccessor, scopeId, tagName) {
 	let result = "";
 	let skip = /[\s/>"'=]/;
 	let events;
-	switch (tagName) {
+	switch (data && tagName) {
 		case "input":
 			if (data.checkedChange) {
 				result += _attr_input_checked(scopeId, nodeAccessor, data.checked, data.checkedChange, 1);
@@ -4329,7 +4331,7 @@ var native_tag_default = {
 		}
 		if (tagName === "option") assertOptionInSelectWithValue(tag);
 		const isTextOnly = isTextOnlyNativeTag(tag);
-		const seen = {};
+		const seen = Object.create(null);
 		const { attributes } = tag.node;
 		let injectNonce = isInjectNonceTag(tagName);
 		let hasDynamicAttributes = false;
@@ -4713,7 +4715,7 @@ function getRelatedControllable(tagName, attrs) {
 	}
 }
 function getUsedAttrs(tagName, tag) {
-	const seen = {};
+	const seen = Object.create(null);
 	const { attributes } = tag;
 	const maybeStaticAttrs = /* @__PURE__ */ new Set();
 	const skipProps = /* @__PURE__ */ new Set();
@@ -8193,12 +8195,14 @@ var script_default = {
 			let referencesScope = false;
 			if (isFunction) if (value.async || value.generator) referencesScope = traverseContains(value, isScopeIdentifier);
 			else if (_marko_compiler.types.isBlockStatement(value.body)) {
-				let hasDeclaration = false;
-				for (const child of value.body.body) if (_marko_compiler.types.isDeclaration(child)) {
-					hasDeclaration = true;
-					break;
+				if (!traverseContains(value.body, isReturnStatement)) {
+					let hasDeclaration = false;
+					for (const child of value.body.body) if (_marko_compiler.types.isDeclaration(child)) {
+						hasDeclaration = true;
+						break;
+					}
+					inlineBody = hasDeclaration ? value.body : value.body.body;
 				}
-				inlineBody = hasDeclaration ? value.body : value.body.body;
 			} else inlineBody = _marko_compiler.types.expressionStatement(value.body);
 			addStatement("effect", section, referencedBindings, inlineBody || _marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(value, referencesScope ? [scopeIdentifier] : [])));
 		} else addHTMLEffectCall(section, referencedBindings);
@@ -8227,6 +8231,18 @@ function isAwaitExpression(node) {
 		default: return false;
 	}
 }
+function isReturnStatement(node) {
+	switch (node.type) {
+		case "FunctionDeclaration":
+		case "FunctionExpression":
+		case "ArrowFunctionExpression":
+		case "ClassMethod":
+		case "ObjectMethod":
+		case "ClassPrivateMethod": return skip;
+		case "ReturnStatement": return true;
+		default: return false;
+	}
+}
 //#endregion
 //#region src/translator/core/server.ts
 var server_default = {
@@ -9817,6 +9833,7 @@ function getFeatureTypeFromCoreTagName(tagName) {
 		case "lifecycle":
 		case "log":
 		case "return":
+		case "show":
 		case "try": return "tags";
 		default: return;
 	}

package/package.json

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