marko 6.1.2 → 6.1.3

package/dist/translator/index.js

@@ -1364,7 +1364,7 @@ function analyzeExpressionTagName(name, extra) {
 		if (binding.kind === "module") {
 			const decl = binding.path.parent;
 			if (MARKO_FILE_REG.test(decl.source.value) && decl.specifiers.some((it) => _marko_compiler.types.isImportDefaultSpecifier(it))) {
-				const resolvedImport = (0, _marko_compiler_babel_utils.resolveTagImport)(name, decl.source.value) || decl.source.value;
+				const resolvedImport = decl.extra?.tagImport || decl.source.value;
 				if (type === void 0) {
 					type = 1;
 					tagNameImported = resolvedImport;
@@ -2159,6 +2159,7 @@ const pureDOMFunctions = new Set([
 	"_for_to",
 	"_for_until",
 	"_let",
+	"_let_change",
 	"_const"
 ]);
 function importRuntime(name) {
@@ -2167,10 +2168,7 @@ function importRuntime(name) {
 }
 function callRuntime(name, ...args) {
 	const callExpression = _marko_compiler.types.callExpression(importRuntime(name), filterArguments(args));
-	if (isOutputDOM() && pureDOMFunctions.has(name)) callExpression.leadingComments = [{
-		type: "CommentBlock",
-		value: ` @__PURE__ `
-	}];
+	if (isOutputDOM() && pureDOMFunctions.has(name)) return _marko_compiler.types.addComment(callExpression, "leading", "@__PURE__");
 	return callExpression;
 }
 function getHTMLRuntime() {
@@ -2943,7 +2941,7 @@ function initValue(binding, isLet = false) {
 	signal.build = () => {
 		const fn = getSignalFn(signal);
 		if (binding.upstreamAlias && binding.property === void 0 && binding.excludeProperties === void 0 || !signal.hasSideEffect || !signalHasStatements(signal)) return fn;
-		return callRuntime(isLet ? "_let" : "_const", getScopeAccessorLiteral(binding, true, isLet), fn);
+		return callRuntime(isLet ? signal.extraArgs ? "_let_change" : "_let" : "_const", getScopeAccessorLiteral(binding, true, isLet), fn);
 	};
 	for (const alias of binding.aliases) if (alias.type !== 6) initValue(alias);
 	for (const alias of binding.propertyAliases.values()) if (alias.type !== 6) initValue(alias);
@@ -2966,19 +2964,24 @@ function getSignalFn(signal) {
 		for (const alias of binding.aliases) {
 			const aliasSignal = getSignal(alias.section, alias);
 			if (signalHasStatements(aliasSignal)) if (alias.excludeProperties !== void 0) {
-				const props = [];
 				const aliasId = _marko_compiler.types.identifier(alias.name);
-				forEach(alias.excludeProperties, (name) => {
-					const propId = toPropertyName(name);
-					const shorthand = propId.type === "Identifier" && _marko_compiler.types.isValidIdentifier(name);
-					props.push(_marko_compiler.types.objectProperty(propId, shorthand ? propId : generateUidIdentifier(name), false, shorthand));
-				});
-				props.push(_marko_compiler.types.restElement(aliasId));
-				signal.render.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(_marko_compiler.types.arrowFunctionExpression([_marko_compiler.types.objectPattern(props)], _marko_compiler.types.callExpression(aliasSignal.identifier, [
+				let pattern;
+				if (alias.restOffset) pattern = _marko_compiler.types.arrayPattern(new Array(alias.restOffset).fill(null).concat(_marko_compiler.types.restElement(aliasId)));
+				else {
+					const props = [];
+					forEach(alias.excludeProperties, (name) => {
+						const propId = toPropertyName(name);
+						const shorthand = propId.type === "Identifier" && _marko_compiler.types.isValidIdentifier(name);
+						props.push(_marko_compiler.types.objectProperty(propId, shorthand ? propId : generateUidIdentifier(name), false, shorthand));
+					});
+					props.push(_marko_compiler.types.restElement(aliasId));
+					pattern = _marko_compiler.types.objectPattern(props);
+				}
+				signal.render.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(_marko_compiler.types.arrowFunctionExpression([pattern], _marko_compiler.types.callExpression(aliasSignal.identifier, [
 					scopeIdentifier,
 					aliasId,
 					...getTranslatedExtraArgs(aliasSignal)
-				])), [binding.nullable ? _marko_compiler.types.logicalExpression("||", createScopeReadExpression(binding), _marko_compiler.types.objectExpression([])) : createScopeReadExpression(binding)])));
+				])), [binding.nullable ? _marko_compiler.types.logicalExpression("||", createScopeReadExpression(binding), alias.restOffset ? _marko_compiler.types.arrayExpression([]) : _marko_compiler.types.objectExpression([])) : createScopeReadExpression(binding)])));
 			} else signal.render.push(_marko_compiler.types.expressionStatement(_marko_compiler.types.callExpression(aliasSignal.identifier, [
 				scopeIdentifier,
 				createScopeReadExpression(binding),
@@ -5655,6 +5658,7 @@ function createBinding(name, type, refSection, upstreamAlias, property, excludeP
 		getters: /* @__PURE__ */ new Map(),
 		propertyAliases: /* @__PURE__ */ new Map(),
 		upstreamAlias,
+		restOffset: void 0,
 		scopeOffset: void 0,
 		scopeAccessor: void 0,
 		export: void 0,
@@ -5725,7 +5729,7 @@ function trackParamsReferences(body, type) {
 		if (bodySection) bodySection.params = paramsBinding;
 		for (let i = 0; i < params.length; i++) {
 			const param = params[i];
-			if (param.type === "RestElement") createBindingsAndTrackReferences(param.argument, type, body.scope, section, paramsBinding, void 0, i > 0 ? addNumericPropertiesUntil(void 0, i - 1) : void 0);
+			if (param.type === "RestElement") createBindingsAndTrackReferences(param.argument, type, body.scope, section, paramsBinding, void 0, i > 0 ? addNumericPropertiesUntil(void 0, i) : void 0, i);
 			else if (_marko_compiler.types.isLVal(param)) createBindingsAndTrackReferences(param, type, body.scope, section, paramsBinding, i + "", void 0);
 		}
 		return paramsBinding;
@@ -5815,11 +5819,14 @@ function setReferencesScope(path) {
 	const fnRoot = getFnRoot(path);
 	if (fnRoot) (fnRoot.node.extra ??= {}).referencesScope = true;
 }
-function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAlias, property, excludeProperties) {
+function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAlias, property, excludeProperties, restOffset) {
 	switch (lVal.type) {
-		case "Identifier":
-			trackReferencesForBinding(scope.getBinding(lVal.name), (lVal.extra ??= {}).binding = createBinding(lVal.name, type, section, upstreamAlias, property, excludeProperties, lVal.loc, true));
+		case "Identifier": {
+			const binding = (lVal.extra ??= {}).binding = createBinding(lVal.name, type, section, upstreamAlias, property, excludeProperties, lVal.loc, true);
+			if (restOffset) binding.restOffset = restOffset;
+			trackReferencesForBinding(scope.getBinding(lVal.name), binding);
 			break;
+		}
 		case "ObjectPattern": {
 			const patternBinding = (property ? upstreamAlias.propertyAliases.get(property) : upstreamAlias) || ((lVal.extra ??= {}).binding = createBinding(generateUid(property || "pattern"), type, section, upstreamAlias, property, excludeProperties, lVal.loc));
 			const hasRest = lVal.properties[lVal.properties.length - 1]?.type === "RestElement";
@@ -5844,8 +5851,8 @@ function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAl
 				i++;
 				if (element) {
 					if (element.type === "RestElement") {
-						excludeProperties = i > 0 ? addNumericPropertiesUntil(excludeProperties, i - 1) : void 0;
-						createBindingsAndTrackReferences(element.argument, type, scope, section, patternBinding, property, excludeProperties);
+						excludeProperties = i > 0 ? addNumericPropertiesUntil(excludeProperties, i) : void 0;
+						createBindingsAndTrackReferences(element.argument, type, scope, section, patternBinding, property, excludeProperties, i);
 					} else if (_marko_compiler.types.isLVal(element)) createBindingsAndTrackReferences(element, type, scope, section, patternBinding, `${i}`, void 0);
 				}
 			}
@@ -5859,9 +5866,16 @@ function trackReference(referencePath, binding) {
 	while (true) {
 		const { parent } = root;
 		if (!_marko_compiler.types.isMemberExpression(parent) && !_marko_compiler.types.isOptionalMemberExpression(parent)) break;
-		const prop = getMemberExpressionPropString(parent);
+		let prop = getMemberExpressionPropString(parent);
 		if (prop === void 0) break;
-		if (reference.upstreamAlias && reference.excludeProperties !== void 0 && !propsUtil.has(reference.excludeProperties, prop)) reference = reference.upstreamAlias;
+		if (reference.upstreamAlias && reference.excludeProperties !== void 0) {
+			if (reference.restOffset) {
+				if (/^\d+$/.test(prop)) {
+					prop = `${+prop + reference.restOffset}`;
+					reference = reference.upstreamAlias;
+				}
+			} else if (!propsUtil.has(reference.excludeProperties, prop)) reference = reference.upstreamAlias;
+		}
 		if (isInvokedFunction(root.parentPath) && !isEventOrChangeHandler(prop)) break;
 		root = root.parentPath;
 		reference = getOrCreatePropertyAlias(reference, prop);
@@ -5925,8 +5939,7 @@ function finalizeReferences() {
 	for (const [expr, reads] of readsByExpression) if (isReferencedExtra(expr)) {
 		const exprBindings = resolveReferencedBindings(expr, reads, intersectionsBySection);
 		expr.referencedBindings = exprBindings.referencedBindings;
-		expr.constantBindings = exprBindings.constantBindings;
-		expr.hoistedBindings = expr.section.referencedHoists = exprBindings.hoistedBindings;
+		if (exprBindings.hoistedBindings) expr.section.referencedHoists = bindingUtil.union(expr.section.referencedHoists, exprBindings.hoistedBindings);
 		if (expr.isEffect) {
 			forEach(exprBindings.referencedBindings, (binding) => {
 				addSerializeReason(binding.section, true, binding);
@@ -5941,7 +5954,6 @@ function finalizeReferences() {
 				const fnBindings = fn === expr ? exprBindings : resolveReferencedBindingsInFunction(exprBindings.allBindings, fnReads);
 				fn.referencedBindingsInFunction = fnBindings.referencedBindings;
 				fn.constantBindingsInFunction = fnBindings.constantBindings;
-				fn.hoistedBindingsInFunction = fnBindings.hoistedBindings;
 			}
 		}
 	}
@@ -6069,10 +6081,22 @@ function finalizeReferences() {
 		finalizeParamSerializeReasonGroups(section);
 	});
 	forEachSection((section) => {
-		let intersectionIndex = 0;
-		const intersections = intersectionsBySection.get(section) || [];
 		const { id, bindings } = section;
 		const isOwnedBinding = ({ section }) => section.id === id;
+		let intersections = intersectionsBySection.get(section) || [];
+		if (intersections.length) {
+			const anchors = /* @__PURE__ */ new Map();
+			for (const intersection of intersections) for (let i = intersection.length; i--;) if (isOwnedBinding(intersection[i])) {
+				anchors.set(intersection, intersection[i]);
+				break;
+			}
+			intersections = [...intersections].sort((a, b) => {
+				const aAnchor = anchors.get(a);
+				const bAnchor = anchors.get(b);
+				return aAnchor ? bAnchor ? bindingUtil.compare(aAnchor, bAnchor) : -1 : bAnchor ? 1 : 0;
+			});
+		}
+		let intersectionIndex = 0;
 		let lastBindingIndex = 0;
 		let intersection;
 		forEach(filter(bindings, isOwnedBinding), (binding, bindingIndex) => {
@@ -6421,27 +6445,21 @@ function pruneBinding(binding) {
 function resolveReferencedBindingsInFunction(refs, reads) {
 	let referencedBindings;
 	let constantBindings;
-	let hoistedBindings;
 	if (reads) if (Array.isArray(reads)) for (const read of reads) {
 		const { getter, binding } = read;
-		if (getter) {
-			if (getter.hoisted && bindingUtil.find(refs, binding)) hoistedBindings = bindingUtil.add(hoistedBindings, binding);
-		} else if (binding.type === 6) {
+		if (getter) {} else if (binding.type === 6) {
 			if (bindingUtil.find(refs, binding)) constantBindings = bindingUtil.add(constantBindings, binding);
 		} else if (binding.type !== 0) referencedBindings = bindingUtil.add(referencedBindings, findClosestReference(read.binding, refs));
 	}
 	else {
 		const { getter, binding } = reads;
-		if (getter) {
-			if (getter.hoisted && bindingUtil.find(refs, binding)) hoistedBindings = binding;
-		} else if (binding.type === 6) {
+		if (getter) {} else if (binding.type === 6) {
 			if (bindingUtil.find(refs, binding)) constantBindings = binding;
 		} else if (binding.type !== 0) referencedBindings = findClosestReference(binding, refs);
 	}
 	return {
 		referencedBindings,
-		constantBindings,
-		hoistedBindings
+		constantBindings
 	};
 }
 function findClosestReference(from, refs) {
@@ -6538,7 +6556,7 @@ function resolveReferencedBindings(expr, reads, intersectionsBySection) {
 	}
 	if (referencedBindings && constantBindings) {
 		const intersections = intersectionsBySection.get(expr.section) || [];
-		const combined = concat(referencedBindings, constantBindings);
+		const combined = bindingUtil.union(referencedBindings, constantBindings);
 		if (!findSorted(compareIntersections, intersections, combined)) intersectionsBySection.set(expr.section, addSorted(compareIntersections, intersections, combined));
 	}
 	return {

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

@@ -3,7 +3,6 @@ import { type Many, type Opt, Sorted } from "./optional";
 import { type Section } from "./sections";
 import { type SerializeReason } from "./serialize-reasons";
 import { type Signal } from "./signals";
-declare const kIsInvoked: unique symbol;
 export declare const kBranchSerializeReason: unique symbol;
 export type Aliases = undefined | Binding | {
     [property: string]: Aliases;
@@ -39,6 +38,7 @@ export interface Binding {
     propertyAliases: Map<string, Binding>;
     excludeProperties: Opt<string>;
     upstreamAlias: Binding | undefined;
+    restOffset: number | undefined;
     scopeOffset: Binding | undefined;
     scopeAccessor: string | undefined;
     export: string | undefined;
@@ -76,8 +76,6 @@ declare module "@marko/compiler/dist/types" {
     interface NodeExtra {
         section?: Section;
         referencedBindings?: ReferencedBindings;
-        constantBindings?: ReferencedBindings;
-        hoistedBindings?: ReferencedBindings;
         downstream?: Opt<Binding>;
         binding?: Binding;
         assignment?: Binding;
@@ -87,13 +85,11 @@ declare module "@marko/compiler/dist/types" {
         isEffect?: true;
         spreadFrom?: Binding;
         merged?: NodeExtra;
-        [kIsInvoked]?: true;
     }
     interface FunctionExtra {
         referencesScope?: boolean;
         referencedBindingsInFunction?: ReferencedBindings;
         constantBindingsInFunction?: ReferencedBindings;
-        hoistedBindingsInFunction?: ReferencedBindings;
         name?: string;
         registerId?: string;
         registerReason?: SerializeReason;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.1.2",
+  "version": "6.1.3",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",