marko 6.0.95 → 6.0.96

package/dist/translator/index.js

@@ -7967,7 +7967,12 @@ function trackReferencesForBinding(babelBinding, binding) {
   const { referencePaths, constantViolations } = babelBinding;
   for (const ref of referencePaths) {
     const refSection = getOrCreateSection(ref);
-    if (isReferenceHoisted(babelBinding.path, ref)) {
+    const markoRoot = getMarkoRoot(ref);
+    if (markoRoot?.type === "MarkoAttribute" && markoRoot.parentPath === babelBinding.path) {
+      throw ref.buildCodeFrameError(
+        `Tag variable circular references are not supported.`
+      );
+    } else if (isReferenceHoisted(babelBinding.path, ref)) {
       trackHoistedReference(ref, binding);
     } else if (binding.type !== 4 /* local */ || refSection !== binding.section) {
       trackReference(ref, binding);
@@ -8810,14 +8815,38 @@ function getReadReplacement(node) {
       replacement = import_compiler35.types.identifier(binding.name);
     }
   } else if (read) {
-    replacement = toMemberExpression(
-      import_compiler35.types.identifier(read.binding.name),
-      Array.isArray(read.props) ? read.props[0] : read.props
-    );
-    if (Array.isArray(read.props)) {
-      for (let i = 1; i < read.props.length; i++) {
-        replacement = toMemberExpression(replacement, read.props[i]);
+    const props = read.props ? Array.isArray(read.props) ? read.props.slice() : [read.props] : [];
+    let curNode = node;
+    let curBinding = read.binding;
+    let replaceMember;
+    replacement = import_compiler35.types.identifier(read.binding.name);
+    while (props.length && (curNode.type === "MemberExpression" || curNode.type === "OptionalMemberExpression")) {
+      const prop = props.pop();
+      const memberProp = getMemberExpressionPropString(curNode);
+      if (memberProp !== prop) break;
+      replaceMember = curNode;
+      curNode = curNode.object;
+    }
+    for (const prop of props) {
+      if (curBinding) {
+        curBinding = curBinding.propertyAliases.get(prop);
+      }
+      replacement = toMemberExpression(
+        replacement,
+        prop,
+        !!curBinding?.nullable
+      );
+    }
+    if (replaceMember) {
+      if (read.binding.nullable && replaceMember.object.type !== replacement.type) {
+        replaceMember.type = "OptionalMemberExpression";
+        replaceMember.optional = true;
       }
+      replaceMember.object = withPreviousLocation(
+        replacement,
+        replaceMember.object
+      );
+      replacement = void 0;
     }
   }
   return replacement && withPreviousLocation(replacement, node);
@@ -8875,7 +8904,6 @@ function findClosestReference(from, refs) {
     const closest = findClosestUpstream(from, refs);
     if (closest) return closest;
   }
-  throw new Error("Unable to resolve closest binding reference.");
 }
 function findClosestUpstream(from, to) {
   let closest = from;
@@ -8885,13 +8913,32 @@ function findClosestUpstream(from, to) {
     }
   } while (closest = closest.upstreamAlias);
 }
+function getRootBindings(reads) {
+  let rootRefs;
+  let allBindings;
+  for (const { binding } of reads) {
+    allBindings = bindingUtil.add(allBindings, binding);
+  }
+  for (const { binding } of reads) {
+    let alias = binding.upstreamAlias;
+    while (alias) {
+      if (bindingUtil.has(allBindings, alias)) break;
+      alias = alias.upstreamAlias;
+    }
+    if (!alias) {
+      rootRefs = bindingUtil.add(rootRefs, binding);
+    }
+  }
+  return rootRefs;
+}
 function resolveReferencedBindings(expr, reads, intersectionsBySection) {
   let referencedBindings;
   if (Array.isArray(reads)) {
+    const rootBindings = getRootBindings(reads);
     for (const read of reads) {
       let { binding } = read;
       if (read.node) {
-        const exprReference = (read.node.extra ??= {}).read ??= resolveExpressionReference(reads, binding, void 0);
+        const exprReference = (read.node.extra ??= {}).read ??= resolveExpressionReference(rootBindings, binding);
         ({ binding } = (read.node.extra ??= {}).read = exprReference);
       }
       referencedBindings = bindingUtil.add(referencedBindings, binding);
@@ -8920,38 +8967,29 @@ function resolveReferencedBindings(expr, reads, intersectionsBySection) {
   }
   return referencedBindings;
 }
-function resolveExpressionReference(reads, readBinding, readProps) {
-  const { upstreamAlias } = readBinding;
-  if (upstreamAlias && Array.isArray(reads)) {
-    const prop = getCanonicalProperty(readBinding);
-    const aliasProps = prop === void 0 ? readProps : push(readProps, prop);
-    for (const { binding } of reads) {
-      if (binding !== readBinding) {
-        let alias = upstreamAlias;
-        while (alias) {
-          if (binding === alias) {
-            return resolveExpressionReference(reads, alias, aliasProps);
-          }
-          alias = alias.upstreamAlias;
-        }
-      }
+function resolveExpressionReference(rootBindings, readBinding) {
+  const upstreamRoot = readBinding.upstreamAlias && findClosestReference(readBinding.upstreamAlias, rootBindings);
+  if (!upstreamRoot) {
+    return createRead(readBinding, void 0);
+  }
+  let curBinding = readBinding;
+  let props;
+  while (curBinding !== upstreamRoot) {
+    if (curBinding.property !== void 0) {
+      props = push(props, curBinding.property);
     }
+    curBinding = curBinding.upstreamAlias;
   }
-  return createRead(readBinding, readProps);
+  if (Array.isArray(props)) {
+    props.reverse();
+  }
+  return createRead(upstreamRoot, props);
 }
 function isSupersetSources(a, b) {
   if (!b.sources) return true;
   if (!a.sources) return false;
   return bindingUtil.isSuperset(a.sources.state, b.sources.state) && bindingUtil.isSuperset(a.sources.param, b.sources.param);
 }
-function getCanonicalProperty(binding) {
-  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 };
 }

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

@@ -112,7 +112,7 @@ export declare function getDebugName(binding: Binding): string;
 export declare function getDebugNames(refs: ReferencedBindings): string;
 export declare function getSectionInstancesAccessor(section: Section): string;
 export declare function getSectionInstancesAccessorLiteral(section: Section): t.StringLiteral | t.NumericLiteral | undefined;
-export declare function getReadReplacement(node: t.Identifier | t.MemberExpression | t.OptionalMemberExpression): t.Node | undefined;
+export declare function getReadReplacement(node: t.Identifier | t.MemberExpression | t.OptionalMemberExpression): t.Expression | undefined;
 export interface ReferencedExtra extends t.NodeExtra {
     section: Section;
 }

package/package.json

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