@immense/vue-pom-generator 1.0.62 → 1.0.63

package/RELEASE_NOTES.md

@@ -1,28 +1,18 @@
-● I'll examine the commits to generate accurate release notes.
-
-● Based on the commit details, here are the release notes for v1.0.62:
-
-  ---
-
+● ```markdown
   ## Highlights
 
-  - Fixed handler name preservation after Vue compiler transformations
-  - Improved fallback logic to extract semantic names from author-written source code
-  - Enhanced test coverage for handler attribute parsing edge cases
+  - Fixed nested component POMs not being properly attached to their parent views
+  - Added comprehensive test coverage for nested component POM attachment
 
   ## Changes
 
-  **Bug Fixes**
-  - Preserve original handler names when Vue compiler rewrites expressions during compilation
-  - Extract semantic names from author source (`loc.content`) rather than transformed source when
-  they differ
-  - Add fallback expression parsing to handle cases where Vue's transformation breaks Babel AST
-  parsing
+  ### Bug Fixes
+  - Resolved issue where nested component POMs were not correctly associated with view classes
+  during generation
+  - Improved POM attachment logic in class generation module
 
-  **Testing**
-  - Added 38 new test cases for handler attribute transformation scenarios
-  - Improved coverage for `utils.ts` edge cases with 36 additional tests
-  - Fixed missing `SimpleExpressionNode` import in test files
+  ### Testing
+  - Added 54 lines of test coverage for class generation including nested component scenarios
 
   ## Breaking Changes
 
@@ -30,10 +20,11 @@
 
   ## Pull Requests Included
 
-  None (direct commits to main)
+  None (direct commit to main)
 
   ## Testing
 
-  All changes include comprehensive test coverage. Added 75+ new test cases covering handler
-  attribute parsing, Vue compiler transformations, and semantic name extraction edge cases.
+  Tests added to validate nested component POM attachment behavior. Run test suite with `npm
+  test`.
+  ```
 

package/class-generation/index.ts

@@ -24,7 +24,6 @@ import {
   isParameterizedPomPattern,
   orderPomPatternParameters,
   toCSharpPomPatternExpression,
-  toTypeScriptPomPatternExpression,
   uniquePomStringPatterns,
   type PomStringPattern,
 } from "../pom-patterns";
@@ -1604,14 +1603,57 @@ function prepareViewObjectModelClass(
     testIdAttribute,
   } = options;
 
+  const normalizeTrackedComponentRef = (value: string): string => {
+    return value.endsWith(".vue") ? value.slice(0, -4) : value;
+  };
+
+  const resolveTrackedComponentRef = (value: string): string | null => {
+    const normalizedValue = normalizeTrackedComponentRef(value);
+    if (componentHierarchyMap.has(value)) {
+      return value;
+    }
+    if (componentHierarchyMap.has(normalizedValue)) {
+      return normalizedValue;
+    }
+
+    let match: string | null = 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 = new Set<string>();
+  for (const ref of rawComponentRefsForInstances) {
+    componentRefsForInstances.add(resolveTrackedComponentRef(ref) ?? normalizeTrackedComponentRef(ref));
+  }
+
   const hasChildComponent = (needle: string) => {
-    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;
@@ -1648,10 +1690,6 @@ function prepareViewObjectModelClass(
     ? 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)
@@ -1964,7 +2002,7 @@ function sliceNodeSource(source: string, node: { start?: number | null; end?: nu
 
 function getTypeAnnotationSource(
   source: string,
-  node: { typeAnnotation?: unknown },
+  node: { typeAnnotation?: object | null },
 ): string | undefined {
   const rawTypeAnnotation = node.typeAnnotation;
   if (!rawTypeAnnotation || typeof rawTypeAnnotation !== "object" || !("type" in rawTypeAnnotation) || rawTypeAnnotation.type !== "TSTypeAnnotation" || !("typeAnnotation" in rawTypeAnnotation)) {

package/dist/class-generation/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../class-generation/index.ts"],"names":[],"mappings":"AAUA,OAAO,EAAkC,oCAAoC,EAAE,MAAM,sBAAsB,CAAC;AAyC5G,OAAO,EACL,sBAAsB,EAOvB,MAAM,UAAU,CAAC;AAQlB,OAAO,EAAE,oCAAoC,EAAE,CAAC;AA2ChD,UAAU,SAAS;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAID,UAAU,mBAAmB;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,QAAQ,CAAC,EAAE,OAAO,GAAG,YAAY,GAAG,MAAM,GAAG,oBAAoB,CAAC;IAClE,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AASD,MAAM,MAAM,yBAAyB,GAAG,YAAY,GAAG,OAAO,CAAC;AAqW/D,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;;;;;;;;;OAeG;IACH,gBAAgB,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAE1D;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gFAAgF;IAChF,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;;;;;;OAOG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhD;;;;;OAKG;IACH,oCAAoC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;IAEzD;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,mBAAmB,EAAE,CAAC;IAE7C,yEAAyE;IACzE,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,uDAAuD;IACvD,aAAa,CAAC,EAAE,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC,CAAC;IAEvC;;;;;OAKG;IACH,yBAAyB,CAAC,EAAE,yBAAyB,CAAC;IAEtD,6BAA6B;IAC7B,MAAM,CAAC,EAAE;QACP,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IAEF,6EAA6E;IAC7E,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAElC,2FAA2F;IAC3F,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,mDAAmD;IACnD,UAAU,CAAC,EAAE,YAAY,GAAG,MAAM,CAAC;IAEnC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAEtB,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAClD;AAsCD,wBAAsB,aAAa,CACjC,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,EAC1D,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,iBAAiB,EAAE,MAAM,EACzB,OAAO,GAAE,oBAAyB,iBAoGnC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../class-generation/index.ts"],"names":[],"mappings":"AAUA,OAAO,EAAkC,oCAAoC,EAAE,MAAM,sBAAsB,CAAC;AAwC5G,OAAO,EACL,sBAAsB,EAOvB,MAAM,UAAU,CAAC;AAQlB,OAAO,EAAE,oCAAoC,EAAE,CAAC;AA2ChD,UAAU,SAAS;IACjB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAID,UAAU,mBAAmB;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,YAAY,EAAE,MAAM,CAAC;IACrB,wBAAwB,EAAE,MAAM,EAAE,CAAC;IACnC,QAAQ,CAAC,EAAE,OAAO,GAAG,YAAY,GAAG,MAAM,GAAG,oBAAoB,CAAC;IAClE,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AASD,MAAM,MAAM,yBAAyB,GAAG,YAAY,GAAG,OAAO,CAAC;AAqW/D,MAAM,WAAW,oBAAoB;IACnC;;;;OAIG;IACH,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;;;;;;;;;OAeG;IACH,gBAAgB,CAAC,EAAE,OAAO,GAAG,MAAM,GAAG;QAAE,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IAE1D;;;OAGG;IACH,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB;;;OAGG;IACH,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gFAAgF;IAChF,mBAAmB,CAAC,EAAE,OAAO,CAAC;IAE9B;;;;;;;OAOG;IACH,sBAAsB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAEhD;;;;;OAKG;IACH,oCAAoC,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC;IAEzD;;;;OAIG;IACH,oBAAoB,CAAC,EAAE,mBAAmB,EAAE,CAAC;IAE7C,yEAAyE;IACzE,eAAe,CAAC,EAAE,MAAM,CAAC;IAEzB,uDAAuD;IACvD,aAAa,CAAC,EAAE,KAAK,CAAC,IAAI,GAAG,QAAQ,CAAC,CAAC;IAEvC;;;;;OAKG;IACH,yBAAyB,CAAC,EAAE,yBAAyB,CAAC;IAEtD,6BAA6B;IAC7B,MAAM,CAAC,EAAE;QACP,SAAS,CAAC,EAAE,MAAM,CAAC;KACpB,CAAC;IAEF,6EAA6E;IAC7E,uBAAuB,CAAC,EAAE,OAAO,CAAC;IAElC,2FAA2F;IAC3F,WAAW,CAAC,EAAE,MAAM,CAAC;IAErB,mDAAmD;IACnD,UAAU,CAAC,EAAE,YAAY,GAAG,MAAM,CAAC;IAEnC,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,UAAU,CAAC,EAAE,MAAM,EAAE,CAAC;IAEtB,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CAClD;AAsCD,wBAAsB,aAAa,CACjC,qBAAqB,EAAE,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,EAC1D,eAAe,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EACpC,iBAAiB,EAAE,MAAM,EACzB,OAAO,GAAE,oBAAyB,iBAoGnC"}

package/dist/index.cjs

@@ -5493,14 +5493,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;
@@ -5524,7 +5561,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(