marko 6.0.0-next.3.24 → 6.0.0-next.3.26

package/dist/translator/index.js

@@ -966,38 +966,13 @@ function createSectionState(key, init) {
 // src/translator/util/tag-name-type.ts
 var import_compiler5 = require("@marko/compiler");
 var import_babel_utils6 = require("@marko/compiler/babel-utils");
-
-// src/translator/util/with-previous-location.ts
-function withPreviousLocation(newNode, originalNode) {
-  newNode.start = originalNode.start;
-  newNode.loc = originalNode.loc;
-  newNode.end = originalNode.end;
-  return newNode;
-}
-
-// src/translator/util/tag-name-type.ts
 var MARKO_FILE_REG = /^<.*>$|\.marko$/;
-var TAG_NAME_IDENTIFIER_REG = /^[A-Z][a-zA-Z0-9_$]*$/;
 function analyzeTagNameType(tag) {
   const extra = tag.node.extra ??= {};
   if (extra.tagNameType === void 0) {
     const name2 = tag.get("name");
     if (name2.isStringLiteral()) {
       extra.tagNameType = name2.node.value[0] === "@" ? 3 /* AttributeTag */ : (0, import_babel_utils6.isNativeTag)(tag) ? 0 /* NativeTag */ : 1 /* CustomTag */;
-      if (extra.tagNameType === 1 /* CustomTag */) {
-        const bindingName = name2.node.value;
-        const bindingIdentifier = tag.scope.getBinding(bindingName)?.identifier;
-        if (bindingIdentifier && TAG_NAME_IDENTIFIER_REG.test(bindingIdentifier.name)) {
-          const tagIdentifier = withPreviousLocation(
-            import_compiler5.types.identifier(bindingName),
-            name2.node
-          );
-          tagIdentifier.extra = {
-            referencedBindings: bindingIdentifier.extra?.binding
-          };
-          analyzeExpressionTagName(name2.replaceWith(tagIdentifier)[0], extra);
-        }
-      }
       extra.tagNameNullable = extra.tagNameNullable = false;
     } else {
       analyzeExpressionTagName(name2, extra);
@@ -2045,7 +2020,7 @@ function getSignal(section, referencedBindings, name2 = generateSignalName(refer
           buildSignalIntersections(signal)
         );
       };
-    } else if (referencedBindings.section !== section) {
+    } else if (referencedBindings.section !== section && bindingUtil.find(section.closures, referencedBindings)) {
       getSignal(referencedBindings.section, referencedBindings).closures.set(
         section,
         signal
@@ -2066,7 +2041,6 @@ function getSignal(section, referencedBindings, name2 = generateSignalName(refer
         const intersection = buildSignalIntersections(signal);
         return isDynamicClosure ? callRuntime(
           "dynamicClosure",
-          getScopeAccessorLiteral(referencedBindings),
           render,
           isImmediateOwner ? null : import_compiler17.types.arrowFunctionExpression([scopeIdentifier], ownerScope),
           intersection
@@ -3219,6 +3193,14 @@ function isFunctionExpression(path5) {
   }
 }
 
+// src/translator/util/with-previous-location.ts
+function withPreviousLocation(newNode, originalNode) {
+  newNode.start = originalNode.start;
+  newNode.loc = originalNode.loc;
+  newNode.end = originalNode.end;
+  return newNode;
+}
+
 // src/translator/util/references.ts
 var [getBindings] = createProgramState(() => /* @__PURE__ */ new Set());
 var [getNextBindingId, setNextBindingId] = createProgramState(() => 0);
@@ -9199,28 +9181,42 @@ var dynamic_tag_default = {
 };
 
 // src/translator/visitors/tag/index.ts
+var TAG_NAME_IDENTIFIER_REG = /^[A-Z][a-zA-Z0-9_$]*$/;
 var tag_default = {
   transform: {
     enter(tag) {
-      const attrs2 = tag.get("attributes");
-      for (let i = 0; i < attrs2.length; i++) {
-        const attr2 = attrs2[i];
-        if (import_compiler53.types.isMarkoAttribute(attr2.node) && attr2.node.bound) {
-          attr2.node.bound = false;
+      const { node } = tag;
+      const { name: name2, attributes } = tag.node;
+      let crawl = false;
+      if (import_compiler53.types.isStringLiteral(name2)) {
+        const tagName = name2.value;
+        if (tag.scope.getBinding(tagName) && TAG_NAME_IDENTIFIER_REG.test(tagName)) {
+          node.name = withPreviousLocation(import_compiler53.types.identifier(tagName), name2);
+          crawl = true;
+        }
+      }
+      for (let i = 0; i < attributes.length; i++) {
+        const attr2 = attributes[i];
+        if (import_compiler53.types.isMarkoAttribute(attr2) && attr2.bound) {
+          attr2.bound = false;
           const changeValue = getChangeHandler(tag, attr2);
           if (changeValue === null) {
-            throw attr2.buildCodeFrameError(
+            throw tag.hub.buildError(
+              attr2,
               "Attributes may only be bound to identifiers or member expressions"
             );
           }
-          tag.node.attributes.splice(
-            i + 1,
+          attributes.splice(
+            ++i,
             0,
-            import_compiler53.types.markoAttribute(attr2.node.name + "Change", changeValue)
+            import_compiler53.types.markoAttribute(attr2.name + "Change", changeValue)
           );
-          tag.scope.crawl();
+          crawl = true;
         }
       }
+      if (crawl) {
+        tag.scope.crawl();
+      }
     }
   },
   analyze: {
@@ -9334,29 +9330,27 @@ var tag_default = {
   }
 };
 function getChangeHandler(tag, attr2) {
-  if (import_compiler53.types.isIdentifier(attr2.node.value)) {
-    const valueId = tag.scope.generateUidIdentifier(
-      "new_" + attr2.node.value.name
-    );
+  if (import_compiler53.types.isIdentifier(attr2.value)) {
+    const valueId = tag.scope.generateUidIdentifier("new_" + attr2.value.name);
     return import_compiler53.types.arrowFunctionExpression(
       [valueId],
       import_compiler53.types.blockStatement([
         import_compiler53.types.expressionStatement(
-          import_compiler53.types.assignmentExpression("=", import_compiler53.types.cloneNode(attr2.node.value), valueId)
+          import_compiler53.types.assignmentExpression("=", import_compiler53.types.cloneNode(attr2.value), valueId)
         )
       ])
     );
-  } else if (import_compiler53.types.isMemberExpression(attr2.node.value)) {
-    const prop = attr2.node.value.property;
+  } else if (import_compiler53.types.isMemberExpression(attr2.value)) {
+    const prop = attr2.value.property;
     if (import_compiler53.types.isPrivateName(prop)) return null;
     if (import_compiler53.types.isIdentifier(prop)) {
       return import_compiler53.types.memberExpression(
-        import_compiler53.types.cloneNode(attr2.node.value.object),
+        import_compiler53.types.cloneNode(attr2.value.object),
         import_compiler53.types.identifier(prop.name + "Change")
       );
     } else {
       return import_compiler53.types.memberExpression(
-        import_compiler53.types.cloneNode(attr2.node.value.object),
+        import_compiler53.types.cloneNode(attr2.value.object),
         import_compiler53.types.binaryExpression("+", import_compiler53.types.cloneNode(prop), import_compiler53.types.stringLiteral("Change")),
         true
       );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "marko",
-  "version": "6.0.0-next.3.24",
+  "version": "6.0.0-next.3.26",
   "description": "Optimized runtime for Marko templates.",
   "keywords": [
     "api",