marko 6.0.33 → 6.0.35

package/dist/translator/index.js

@@ -897,6 +897,9 @@ var Sorted = class {
       }
     }
   }
+  has(data, item) {
+    return this.findIndex(data, item) !== -1;
+  }
   findIndex(data, item) {
     if (data) {
       if (Array.isArray(data)) {
@@ -2990,7 +2993,7 @@ var return_default = {
 var import_compiler18 = require("@marko/compiler");
 function getDeclaredBindingExpression(binding) {
   const canonicalBinding = getCanonicalBinding(binding);
-  if (canonicalBinding.declared || !canonicalBinding.upstreamAlias) {
+  if (canonicalBinding.declared || !canonicalBinding.upstreamAlias || canonicalBinding.excludeProperties !== void 0) {
     return import_compiler18.types.identifier(canonicalBinding.name);
   } else if (canonicalBinding.property !== void 0) {
     return toMemberExpression(
@@ -3148,7 +3151,7 @@ function initValue(binding, runtimeHelper = "value") {
   signal.build = () => {
     const fn = getSignalFn(signal);
     const isParamBinding = !binding.upstreamAlias && (binding.type === 3 /* param */ || binding.type === 4 /* local */ || binding.type === 2 /* input */);
-    const isNakedAlias = binding.upstreamAlias && !binding.property;
+    const isNakedAlias = binding.upstreamAlias && binding.property === void 0 && binding.excludeProperties === void 0;
     const needsGuard = !isNakedAlias && (binding.closureSections || binding.downstreamExpressions.size || fn.type === "ArrowFunctionExpression" && fn.body.body.length > 0);
     const needsCache = needsGuard || signal.intersection;
     const needsMarks = isParamBinding || signal.intersection;
@@ -3191,15 +3194,48 @@ function getSignalFn(signal) {
     for (const alias of binding.aliases) {
       const aliasSignal = getSignal(alias.section, alias);
       if (aliasSignal.render.length || aliasSignal.values.length || aliasSignal.effect.length) {
-        signal.render.push(
-          import_compiler20.types.expressionStatement(
-            import_compiler20.types.callExpression(aliasSignal.identifier, [
-              scopeIdentifier,
-              import_compiler20.types.identifier(binding.name),
-              ...getTranslatedExtraArgs(aliasSignal)
-            ])
-          )
-        );
+        if (alias.excludeProperties !== void 0) {
+          const props = [];
+          const aliasId = import_compiler20.types.identifier(alias.name);
+          forEach(alias.excludeProperties, (name2) => {
+            const propId = toPropertyName(name2);
+            const shorthand = propId.type === "Identifier";
+            props.push(
+              import_compiler20.types.objectProperty(
+                propId,
+                propId.type === "Identifier" ? propId : import_compiler20.types.objectPattern([]),
+                false,
+                shorthand
+              )
+            );
+          });
+          props.push(import_compiler20.types.restElement(aliasId));
+          signal.render.push(
+            import_compiler20.types.expressionStatement(
+              import_compiler20.types.callExpression(
+                import_compiler20.types.arrowFunctionExpression(
+                  [import_compiler20.types.objectPattern(props)],
+                  import_compiler20.types.callExpression(aliasSignal.identifier, [
+                    scopeIdentifier,
+                    aliasId,
+                    ...getTranslatedExtraArgs(aliasSignal)
+                  ])
+                ),
+                [import_compiler20.types.identifier(binding.name)]
+              )
+            )
+          );
+        } else {
+          signal.render.push(
+            import_compiler20.types.expressionStatement(
+              import_compiler20.types.callExpression(aliasSignal.identifier, [
+                scopeIdentifier,
+                import_compiler20.types.identifier(binding.name),
+                ...getTranslatedExtraArgs(aliasSignal)
+              ])
+            )
+          );
+        }
       }
     }
     for (const [key, alias] of binding.propertyAliases) {
@@ -3221,7 +3257,7 @@ function getSignalFn(signal) {
   }
   for (const value of signal.values) {
     const valSignal = value.signal;
-    if (!valSignal.referencedBindings || Array.isArray(valSignal.referencedBindings) || !valSignal.referencedBindings.upstreamAlias || valSignal.referencedBindings.property || valSignal.effect.length || valSignal.render.length || valSignal.values.length) {
+    if (!valSignal.referencedBindings || Array.isArray(valSignal.referencedBindings) || !valSignal.referencedBindings.upstreamAlias || valSignal.referencedBindings.property !== void 0 || valSignal.referencedBindings.excludeProperties !== void 0 || valSignal.effect.length || valSignal.render.length || valSignal.values.length) {
       signal.render.push(
         import_compiler20.types.expressionStatement(
           import_compiler20.types.callExpression(value.signal.identifier, [
@@ -3315,7 +3351,7 @@ function getSignalFn(signal) {
           for (; i--; ) {
             const param = params[i];
             const arg = args[i];
-            if (arg.type !== "Identifier" || param.name !== arg.name) {
+            if (arg.type !== "Identifier" || param.type !== "Identifier" || param.name !== arg.name) {
               break;
             }
           }
@@ -3346,7 +3382,7 @@ function getTranslatedExtraArgs(signal) {
 function subscribe(references, subscriber) {
   if (references) {
     forEach(references, (binding) => {
-      const source = binding.property === void 0 && binding.upstreamAlias || binding;
+      const source = binding.property === void 0 && binding.excludeProperties === void 0 && binding.upstreamAlias || binding;
       const providerSignal = getSignal(subscriber.section, source);
       providerSignal.intersection = push(
         providerSignal.intersection,
@@ -3521,7 +3557,7 @@ function writeSignals(section) {
       // It's possible for aliases to render nothing
       // if they're only consumed in effects/closures.
       // This ignores writing out those signals in that case.
-      signal.referencedBindings && !Array.isArray(signal.referencedBindings) && signal.referencedBindings.upstreamAlias && !signal.referencedBindings.property && import_compiler20.types.isFunction(value) && import_compiler20.types.isBlockStatement(value.body) && !value.body.body.length
+      signal.referencedBindings && !Array.isArray(signal.referencedBindings) && signal.referencedBindings.upstreamAlias && signal.referencedBindings.property === void 0 && signal.referencedBindings.excludeProperties === void 0 && import_compiler20.types.isFunction(value) && import_compiler20.types.isBlockStatement(value.body) && !value.body.body.length
     ) {
       return;
     }
@@ -4395,7 +4431,7 @@ var kIsInvoked = Symbol("hoist is invoked");
 var kBranchSerializeReason = Symbol("branch serialize reason");
 var [getBindings] = createProgramState(() => /* @__PURE__ */ new Set());
 var [getNextBindingId, setNextBindingId] = createProgramState(() => 0);
-function createBinding(name2, type, section, upstreamAlias, property, loc = null, declared = false) {
+function createBinding(name2, type, section, upstreamAlias, property, excludeProperties, loc = null, declared = false) {
   const id = getNextBindingId();
   const binding = {
     id,
@@ -4407,7 +4443,7 @@ function createBinding(name2, type, section, upstreamAlias, property, loc = null
     declared,
     closureSections: void 0,
     assignmentSections: void 0,
-    excludeProperties: void 0,
+    excludeProperties,
     sources: void 0,
     aliases: /* @__PURE__ */ new Set(),
     hoists: /* @__PURE__ */ new Map(),
@@ -4416,7 +4452,7 @@ function createBinding(name2, type, section, upstreamAlias, property, loc = null
     downstreamExpressions: /* @__PURE__ */ new Set(),
     scopeOffset: void 0,
     export: void 0,
-    nullable: true
+    nullable: excludeProperties === void 0
   };
   if (property) {
     if (declared) upstreamAlias.nullable = false;
@@ -4438,15 +4474,20 @@ function createBinding(name2, type, section, upstreamAlias, property, loc = null
 function trackVarReferences(tag, type, upstreamAlias) {
   const tagVar = tag.node.var;
   if (tagVar) {
-    const canonicalUpstreamAlias = getCanonicalBinding(upstreamAlias);
+    let canonicalUpstreamAlias = getCanonicalBinding(upstreamAlias);
     if (canonicalUpstreamAlias) {
+      const { excludeProperties } = canonicalUpstreamAlias;
+      if (excludeProperties !== void 0) {
+        canonicalUpstreamAlias = canonicalUpstreamAlias.upstreamAlias;
+      }
       createBindingsAndTrackReferences(
         tagVar,
         canonicalUpstreamAlias.type,
         tag.scope,
         canonicalUpstreamAlias.section,
         canonicalUpstreamAlias,
-        void 0
+        void 0,
+        excludeProperties
       );
       return canonicalUpstreamAlias;
     }
@@ -4456,6 +4497,7 @@ function trackVarReferences(tag, type, upstreamAlias) {
       tag.scope,
       getOrCreateSection(tag),
       void 0,
+      void 0,
       void 0
     );
     return tagVar.extra?.binding;
@@ -4481,14 +4523,28 @@ function trackParamsReferences(body, type, upstreamAlias) {
     ));
     section.params = paramsBinding;
     for (let i = 0; i < params.length; i++) {
-      createBindingsAndTrackReferences(
-        params[i],
-        type,
-        body.scope,
-        section,
-        paramsBinding,
-        i + ""
-      );
+      const param = params[i];
+      if (param.type === "RestElement") {
+        createBindingsAndTrackReferences(
+          param.argument,
+          type,
+          body.scope,
+          section,
+          paramsBinding,
+          void 0,
+          addNumericPropertiesUntil(void 0, i - 1)
+        );
+      } else {
+        createBindingsAndTrackReferences(
+          param,
+          type,
+          body.scope,
+          section,
+          paramsBinding,
+          i + "",
+          void 0
+        );
+      }
     }
     return paramsBinding;
   }
@@ -4508,6 +4564,7 @@ function trackHoistedReference(referencePath, binding) {
         hoistSection,
         void 0,
         void 0,
+        void 0,
         binding.loc,
         true
       )
@@ -4572,6 +4629,7 @@ function trackAssignment(assignment, binding) {
           binding.section,
           binding.upstreamAlias,
           changePropName,
+          void 0,
           id.node.loc,
           true
         );
@@ -4593,7 +4651,7 @@ function setReferencesScope(path5) {
     (fnRoot.node.extra ??= {}).referencesScope = true;
   }
 }
-function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAlias, property) {
+function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAlias, property, excludeProperties) {
   switch (lVal.type) {
     case "Identifier":
       trackReferencesForBinding(
@@ -4604,6 +4662,7 @@ function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAl
           section,
           upstreamAlias,
           property,
+          excludeProperties,
           lVal.loc,
           true
         )
@@ -4616,8 +4675,10 @@ function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAl
         section,
         upstreamAlias,
         property,
+        excludeProperties,
         lVal.loc
       ));
+      const hasRest = lVal.properties[lVal.properties.length - 1]?.type === "RestElement";
       for (const prop of lVal.properties) {
         if (prop.type === "RestElement") {
           createBindingsAndTrackReferences(
@@ -4626,7 +4687,8 @@ function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAl
             scope,
             section,
             patternBinding,
-            property
+            property,
+            excludeProperties
           );
         } else {
           let key;
@@ -4637,13 +4699,17 @@ function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAl
           } else {
             throw new Error("computed keys not supported in object pattern");
           }
+          if (hasRest) {
+            excludeProperties = propsUtil.add(excludeProperties, key);
+          }
           createBindingsAndTrackReferences(
             prop.value,
             type,
             scope,
             section,
             patternBinding,
-            key
+            key,
+            void 0
           );
         }
       }
@@ -4656,6 +4722,7 @@ function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAl
         section,
         upstreamAlias,
         property,
+        excludeProperties,
         lVal.loc
       ));
       let i = -1;
@@ -4663,13 +4730,18 @@ function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAl
         i++;
         if (element) {
           if (element.type === "RestElement") {
+            excludeProperties = addNumericPropertiesUntil(
+              excludeProperties,
+              i - 1
+            );
             createBindingsAndTrackReferences(
               element.argument,
               type,
               scope,
               section,
               patternBinding,
-              property
+              property,
+              excludeProperties
             );
           } else {
             createBindingsAndTrackReferences(
@@ -4678,7 +4750,8 @@ function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAl
               scope,
               section,
               patternBinding,
-              `${i}`
+              `${i}`,
+              void 0
             );
           }
         }
@@ -4692,7 +4765,8 @@ function createBindingsAndTrackReferences(lVal, type, scope, section, upstreamAl
         scope,
         section,
         upstreamAlias,
-        property
+        property,
+        void 0
       );
       break;
   }
@@ -4706,6 +4780,9 @@ function trackReference(referencePath, binding) {
     if (!import_compiler24.types.isMemberExpression(parent)) break;
     const 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.propertyAliases.has(prop)) {
       root = root.parentPath;
       reference = reference.propertyAliases.get(prop);
@@ -5166,6 +5243,9 @@ function mergeSources(a, b) {
 var bindingUtil = new Sorted(function compareBindings(a, b) {
   return a === b ? 0 : a.section.id - b.section.id || a.type !== b.type && (a.type === 0 /* dom */ || b.type === 0 /* dom */) ? a.type - b.type || a.id - b.id : a.id - b.id;
 });
+var propsUtil = new Sorted(function compareProps(a, b) {
+  return a < b ? -1 : a > b ? 1 : 0;
+});
 var [getReadsByExpression] = createProgramState(
   () => /* @__PURE__ */ new Map()
 );
@@ -5201,7 +5281,11 @@ function dropReferences(node) {
   }
 }
 function getCanonicalBinding(binding) {
-  return binding && (binding.property ? binding : binding.upstreamAlias || binding);
+  const alias = binding?.upstreamAlias;
+  if (alias && binding.property === void 0 && binding.excludeProperties === void 0) {
+    return alias;
+  }
+  return binding;
 }
 function getAllTagReferenceNodes(tag, referenceNodes = []) {
   if (tag.arguments) {
@@ -5245,7 +5329,7 @@ function getScopeAccessor(binding, includeId) {
 function getDebugScopeAccess(binding) {
   let root = binding;
   let access = "";
-  while (!(root.loc || root.declared) && root.upstreamAlias) {
+  while (!(root.loc || root.declared) && root.upstreamAlias && root.excludeProperties === void 0) {
     if (root.property !== void 0) {
       access = toAccess(root.property) + access;
     }
@@ -5400,7 +5484,12 @@ function isSupersetSources(a, b) {
   return bindingUtil.isSuperset(a.sources.state, b.sources.state) && bindingUtil.isSuperset(a.sources.input, b.sources.input);
 }
 function getCanonicalProperty(binding) {
-  return binding.property ?? binding.upstreamAlias?.property;
+  if (binding.property !== void 0) {
+    return binding.property;
+  }
+  if (binding.upstreamAlias && binding.excludeProperties === void 0) {
+    return binding.upstreamAlias.property;
+  }
 }
 function createRead(binding, props) {
   return { binding, props };
@@ -5428,6 +5517,13 @@ function isAssignedBindingExtra(extra) {
 function isRegisteredFnExtra(extra) {
   return isReferencedExtra(extra) && extra.registerId !== void 0;
 }
+function addNumericPropertiesUntil(props, len) {
+  let result = props;
+  for (let i = len; i--; ) {
+    result = propsUtil.add(result, i + "");
+  }
+  return result;
+}
 
 // src/translator/core/await.ts
 var kDOMBinding = Symbol("await tag dom binding");

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

@@ -8,6 +8,7 @@ export declare class Sorted<T> {
     add<U extends NonNullable<T>>(data: Opt<U>, item: U): OneMany<U>;
     union<U extends NonNullable<T>>(a: Opt<U>, b: Opt<U>): Opt<U>;
     find<U extends NonNullable<T>>(data: Opt<U>, item: U): U | undefined;
+    has<U extends NonNullable<T>>(data: Opt<U>, item: U): boolean;
     findIndex<U extends NonNullable<T>>(data: Opt<U>, item: U): number;
     isSuperset<U extends NonNullable<T>>(superset: Opt<U>, subset: Opt<U>): boolean;
 }

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

@@ -32,7 +32,7 @@ export interface Binding {
     hoists: Map<Section, Binding>;
     property: string | undefined;
     propertyAliases: Map<string, Binding>;
-    excludeProperties: undefined | string[];
+    excludeProperties: Opt<string>;
     upstreamAlias: Binding | undefined;
     downstreamExpressions: Set<ReferencedExtra>;
     scopeOffset: Binding | undefined;
@@ -70,7 +70,7 @@ declare module "@marko/compiler/dist/types" {
     interface FunctionExpressionExtra extends FunctionExtra {
     }
 }
-export declare function createBinding(name: string, type: Binding["type"], section: Section, upstreamAlias?: Binding["upstreamAlias"], property?: string, loc?: t.SourceLocation | null, declared?: boolean): Binding;
+export declare function createBinding(name: string, type: Binding["type"], section: Section, upstreamAlias?: Binding["upstreamAlias"], property?: string, excludeProperties?: Opt<string>, loc?: t.SourceLocation | null, declared?: boolean): Binding;
 export declare function trackVarReferences(tag: t.NodePath<t.MarkoTag>, type: BindingType, upstreamAlias?: Binding["upstreamAlias"]): Binding | undefined;
 export declare function trackParamsReferences(body: t.NodePath<t.MarkoTagBody | t.Program>, type: BindingType, upstreamAlias?: Binding["upstreamAlias"]): Binding | undefined;
 export declare function trackHoistedReference(referencePath: t.NodePath<t.Identifier>, binding: Binding): void;

package/package.json

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