@immense/vue-pom-generator 1.0.64 → 1.0.66

package/dist/index.mjs

@@ -1854,6 +1854,12 @@ function nodeHandlerAttributeInfo(node) {
     const n = node2;
     return typeof n.computed === "boolean" && typeof n.key === "object" && n.key !== null && typeof n.value === "object" && n.value !== null;
   };
+  const isLogicalExpressionNode = (node2) => {
+    if (!isNodeType2(node2, "LogicalExpression"))
+      return false;
+    const n = node2;
+    return typeof n.operator === "string" && typeof n.left === "object" && n.left !== null && typeof n.right === "object" && n.right !== null;
+  };
   const getLastIdentifierFromMemberChain = (node2) => {
     if (!node2)
       return null;
@@ -2024,48 +2030,66 @@ function nodeHandlerAttributeInfo(node) {
     const semanticNameHint2 = suffix ? `${toPascalCase(name)}${suffix}` : toPascalCase(name);
     return semanticNameHint2;
   };
+  const unwrapSemanticHelperCall = (candidateExpr) => {
+    if (!isCallExpressionNode(candidateExpr)) {
+      return null;
+    }
+    const calleeName = getLastIdentifierFromMemberChain(candidateExpr.callee);
+    if (calleeName !== "_unref" && calleeName !== "unref" && calleeName !== "_withModifiers" && calleeName !== "withModifiers") {
+      return null;
+    }
+    const firstArg = candidateExpr.arguments[0];
+    return typeof firstArg === "object" && firstArg !== null ? firstArg : null;
+  };
   const resolveSemanticName = (candidateExpr) => {
     if (!candidateExpr) {
       return null;
     }
+    const unwrappedHelperCandidate = unwrapSemanticHelperCall(candidateExpr);
+    if (unwrappedHelperCandidate) {
+      return resolveSemanticName(unwrappedHelperCandidate);
+    }
     const direct = getLastIdentifierFromMemberChain(candidateExpr);
     if (direct) {
       return toPascalCase(direct);
     }
+    const directCall = tryFromCallExpression(candidateExpr);
+    if (directCall) {
+      return directCall;
+    }
+    if (isAssignmentExpressionNode(candidateExpr)) {
+      const lhs = getAssignmentTargetName(candidateExpr.left);
+      if (lhs) {
+        const rhs = stableWordFromValue(candidateExpr.right);
+        return `Set${toPascalCase(lhs)}${rhs ?? ""}`;
+      }
+    }
+    if (isLogicalExpressionNode(candidateExpr) && candidateExpr.operator === "&&") {
+      return resolveSemanticName(candidateExpr.right);
+    }
     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 ?? ""}`;
-        }
-      }
       if (isBlockStatementNode(body)) {
         const stmts = body.body ?? [];
         if (stmts.length > 0) {
           const firstStmt = stmts[0];
           if (isReturnStatementNode(firstStmt)) {
-            const fromReturn = tryFromCallExpression(firstStmt.argument ?? null);
+            const fromReturn = resolveSemanticName(firstStmt.argument ?? null);
             if (fromReturn) {
               return fromReturn;
             }
           }
           if (isExpressionStatementNode(firstStmt)) {
-            const fromExpr = tryFromCallExpression(firstStmt.expression ?? null);
+            const fromExpr = resolveSemanticName(firstStmt.expression ?? null);
             if (fromExpr) {
               return fromExpr;
             }
           }
         }
       }
-      const bodyName = getLastIdentifierFromMemberChain(body);
+      const bodyName = resolveSemanticName(body);
       if (bodyName) {
-        return toPascalCase(bodyName);
+        return bodyName;
       }
     }
     return null;
@@ -5536,9 +5560,9 @@ function prepareViewObjectModelClass(componentName, dependencies, componentHiera
     members.push(...getComponentInstances(componentRefsForInstances, componentHierarchyMap, attachmentsForThisClass, widgetInstances));
     members.push(getConstructor(componentRefsForInstances, componentHierarchyMap, attachmentsForThisClass, widgetInstances, { testIdAttribute }));
   }
-  if (!isView && attachmentsForThisClass.length > 0) {
-    members.push(...getComponentInstances(/* @__PURE__ */ new Set(), componentHierarchyMap, attachmentsForThisClass));
-    members.push(getConstructor(/* @__PURE__ */ new Set(), componentHierarchyMap, attachmentsForThisClass, [], { testIdAttribute }));
+  if (!isView && (componentRefsForInstances.size > 0 || attachmentsForThisClass.length > 0)) {
+    members.push(...getComponentInstances(componentRefsForInstances, componentHierarchyMap, attachmentsForThisClass));
+    members.push(getConstructor(componentRefsForInstances, componentHierarchyMap, attachmentsForThisClass, [], { testIdAttribute }));
   }
   members.push(
     ...getAttachmentPassthroughMethods(componentName, dependencies, attachmentsForThisClass, reservedAttachmentPassthroughNames)
@@ -5582,7 +5606,7 @@ function generateViewObjectModelContent(componentName, dependencies, componentHi
   const basePageImport = path.relative(fromAbs, toAbs).replace(/\\/g, "/");
   const basePageImportNoExt = stripExtension(basePageImport).replace(/\\/g, "/");
   const basePageImportSpecifier = basePageImportNoExt.startsWith(".") ? basePageImportNoExt : `./${basePageImportNoExt}`;
-  const needsPlaywrightPageImport = prepared.isView || prepared.attachmentsForThisClass.length > 0;
+  const needsPlaywrightPageImport = prepared.isView || prepared.attachmentsForThisClass.length > 0 || prepared.componentRefsForInstances.size > 0 || prepared.widgetInstances.length > 0;
   const customPomImportSpecifiersByClass = options.customPomImportSpecifiersByClass ?? {};
   const customImports = Array.from(
     /* @__PURE__ */ new Set([