@immense/vue-pom-generator 1.0.61 → 1.0.63

package/dist/index.mjs

@@ -1761,11 +1761,12 @@ function nodeHandlerAttributeInfo(node) {
     return null;
   }
   const exp = handlerDirective.exp;
-  const source = getVueExpressionSource(exp, "content", "compiled");
-  if (!source) {
+  const transformedSource = getVueExpressionSource(exp, "content", "compiled");
+  const authorSource = getVueExpressionSource(exp, "loc", "content", "compiled");
+  if (!authorSource) {
     return null;
   }
-  const mergeKey = `handler:expr:${source}`;
+  const mergeKey = `handler:expr:${authorSource}`;
   const expr = tryGetDirectiveBabelAst(handlerDirective, {
     preferredViews: ["content", "compiled"],
     plugins: ["typescript", "jsx"],
@@ -1773,9 +1774,7 @@ function nodeHandlerAttributeInfo(node) {
     // That is fine for Vue codegen, but our semantic-name extraction needs a normal Babel parse tree.
     preferExistingAst: false
   });
-  if (!expr) {
-    return null;
-  }
+  const fallbackExpr = transformedSource !== authorSource ? tryParseBabelExpressionFromSource(authorSource, ["typescript", "jsx"]) : null;
   const isNodeType2 = (node2, type) => {
     return node2 !== null && node2.type === type;
   };
@@ -2011,59 +2010,73 @@ function nodeHandlerAttributeInfo(node) {
     const limited = parts.slice(0, 2);
     return limited.map((p) => `${toPascalCase(p.key)}${p.value}`).join("");
   };
-  const direct = getLastIdentifierFromMemberChain(expr);
-  if (direct) {
-    return { semanticNameHint: toPascalCase(direct), mergeKey };
-  }
-  if (isArrowFunctionExpressionNode(expr)) {
-    const body = expr.body;
-    const tryFromCallExpression = (call) => {
-      const resolvedCall = isAwaitExpressionNode(call) ? call.argument : call;
-      if (!isCallExpressionNode(resolvedCall)) {
-        return null;
-      }
-      const name = getLastIdentifierFromMemberChain(resolvedCall.callee);
-      if (!name) {
-        return null;
+  const tryFromCallExpression = (call) => {
+    const resolvedCall = isAwaitExpressionNode(call) ? call.argument : call;
+    if (!isCallExpressionNode(resolvedCall)) {
+      return null;
+    }
+    const name = getLastIdentifierFromMemberChain(resolvedCall.callee);
+    if (!name) {
+      return null;
+    }
+    const suffix = getStableSuffixFromCall(resolvedCall);
+    const semanticNameHint2 = suffix ? `${toPascalCase(name)}${suffix}` : toPascalCase(name);
+    return semanticNameHint2;
+  };
+  const resolveSemanticName = (candidateExpr) => {
+    if (!candidateExpr) {
+      return null;
+    }
+    const direct = getLastIdentifierFromMemberChain(candidateExpr);
+    if (direct) {
+      return toPascalCase(direct);
+    }
+    if (isArrowFunctionExpressionNode(candidateExpr)) {
+      const body = candidateExpr.body;
+      const directCall = tryFromCallExpression(body);
+      if (directCall) {
+        return directCall;
+      }
+      if (isAssignmentExpressionNode(body)) {
+        const lhs = getAssignmentTargetName(body.left);
+        if (lhs) {
+          const rhs = stableWordFromValue(body.right);
+          return `Set${toPascalCase(lhs)}${rhs ?? ""}`;
+        }
       }
-      const suffix = getStableSuffixFromCall(resolvedCall);
-      const semanticNameHint = suffix ? `${toPascalCase(name)}${suffix}` : toPascalCase(name);
-      return semanticNameHint;
-    };
-    const directCall = tryFromCallExpression(body);
-    if (directCall) {
-      return { semanticNameHint: directCall, mergeKey };
-    }
-    if (isAssignmentExpressionNode(body)) {
-      const lhs = getAssignmentTargetName(body.left);
-      if (lhs) {
-        const rhs = stableWordFromValue(body.right);
-        const semanticNameHint = `Set${toPascalCase(lhs)}${rhs ?? ""}`;
-        return { semanticNameHint, mergeKey };
-      }
-    }
-    if (isBlockStatementNode(body)) {
-      const stmts = body.body ?? [];
-      if (stmts.length > 0) {
-        const firstStmt = stmts[0];
-        if (isReturnStatementNode(firstStmt)) {
-          const fromReturn = tryFromCallExpression(firstStmt.argument ?? null);
-          if (fromReturn) {
-            return { semanticNameHint: fromReturn, mergeKey };
+      if (isBlockStatementNode(body)) {
+        const stmts = body.body ?? [];
+        if (stmts.length > 0) {
+          const firstStmt = stmts[0];
+          if (isReturnStatementNode(firstStmt)) {
+            const fromReturn = tryFromCallExpression(firstStmt.argument ?? null);
+            if (fromReturn) {
+              return fromReturn;
+            }
           }
-        }
-        if (isExpressionStatementNode(firstStmt)) {
-          const fromExpr = tryFromCallExpression(firstStmt.expression ?? null);
-          if (fromExpr) {
-            return { semanticNameHint: fromExpr, mergeKey };
+          if (isExpressionStatementNode(firstStmt)) {
+            const fromExpr = tryFromCallExpression(firstStmt.expression ?? null);
+            if (fromExpr) {
+              return fromExpr;
+            }
           }
         }
       }
+      const bodyName = getLastIdentifierFromMemberChain(body);
+      if (bodyName) {
+        return toPascalCase(bodyName);
+      }
     }
-    const bodyName = getLastIdentifierFromMemberChain(body);
-    if (bodyName) {
-      return { semanticNameHint: toPascalCase(bodyName), mergeKey };
-    }
+    return null;
+  };
+  const isVueRefValueAccess = (candidate) => {
+    return isMemberExpressionNode(candidate) && candidate.computed === false && isIdentifierNode2(candidate.property) && candidate.property.name === "value";
+  };
+  const transformedSemanticName = resolveSemanticName(expr);
+  const fallbackSemanticName = resolveSemanticName(fallbackExpr);
+  const semanticNameHint = fallbackSemanticName && transformedSource !== authorSource && isVueRefValueAccess(expr) ? fallbackSemanticName : transformedSemanticName ?? fallbackSemanticName;
+  if (semanticNameHint) {
+    return { semanticNameHint, mergeKey };
   }
   return null;
 }
@@ -5439,14 +5452,51 @@ function prepareViewObjectModelClass(componentName, dependencies, componentHiera
     customPomAttachments = [],
     testIdAttribute
   } = options;
+  const normalizeTrackedComponentRef = (value) => {
+    return value.endsWith(".vue") ? value.slice(0, -4) : value;
+  };
+  const resolveTrackedComponentRef = (value) => {
+    const normalizedValue = normalizeTrackedComponentRef(value);
+    if (componentHierarchyMap.has(value)) {
+      return value;
+    }
+    if (componentHierarchyMap.has(normalizedValue)) {
+      return normalizedValue;
+    }
+    let match = null;
+    for (const [candidateName, candidateDeps] of componentHierarchyMap.entries()) {
+      const normalizedCandidate = normalizeTrackedComponentRef(candidateName);
+      const candidateBaseName = path.parse(candidateDeps.filePath).name;
+      if (normalizedCandidate !== normalizedValue && candidateBaseName !== normalizedValue) {
+        continue;
+      }
+      if (match && match !== candidateName) {
+        return null;
+      }
+      match = candidateName;
+    }
+    return match;
+  };
+  const rawComponentRefsForInstances = isView ? usedComponentSet?.size ? usedComponentSet : childrenComponentSet : childrenComponentSet;
+  const componentRefsForInstances = /* @__PURE__ */ new Set();
+  for (const ref of rawComponentRefsForInstances) {
+    componentRefsForInstances.add(resolveTrackedComponentRef(ref) ?? normalizeTrackedComponentRef(ref));
+  }
   const hasChildComponent = (needle) => {
-    const haystack = usedComponentSet?.size ? usedComponentSet : childrenComponentSet;
-    for (const child of haystack) {
-      if (child === needle)
+    const normalizedNeedle = normalizeTrackedComponentRef(needle);
+    for (const child of rawComponentRefsForInstances) {
+      const resolvedChild = resolveTrackedComponentRef(child);
+      if (normalizeTrackedComponentRef(child) === normalizedNeedle)
         return true;
-      if (child === `${needle}.vue`)
+      if (resolvedChild && normalizeTrackedComponentRef(resolvedChild) === normalizedNeedle)
         return true;
-      if (child.endsWith(".vue") && child.slice(0, -4) === needle)
+      if (resolvedChild) {
+        const resolvedDeps = componentHierarchyMap.get(resolvedChild);
+        if (resolvedDeps && path.parse(resolvedDeps.filePath).name === normalizedNeedle) {
+          return true;
+        }
+      }
+      if (child === `${needle}.vue`)
         return true;
     }
     return false;
@@ -5470,7 +5520,6 @@ function prepareViewObjectModelClass(componentName, dependencies, componentHiera
     methodSignatures: a.flatten ? customPomMethodSignaturesByClass.get(a.className) ?? /* @__PURE__ */ new Map() : /* @__PURE__ */ new Map()
   }));
   const widgetInstances = isView ? getWidgetInstancesForView(componentName, dependencies.dataTestIdSet, customPomAvailableClassIdentifiers) : [];
-  const componentRefsForInstances = isView ? usedComponentSet?.size ? usedComponentSet : childrenComponentSet : childrenComponentSet;
   const className = toPascalCaseLocal(componentName);
   const childInstancePropertyNames = Array.from(componentRefsForInstances).filter((child) => componentHierarchyMap.has(child) && componentHierarchyMap.get(child)?.dataTestIdSet.size).map((child) => child.split(".vue")[0]);
   const blockedViewPassthroughMethodNames = new Set(