@immense/vue-pom-generator 1.0.43 → 1.0.44

package/dist/index.mjs

@@ -3671,6 +3671,26 @@ function generateAggregatedCSharpFiles(componentHierarchyMap, outDir, options =
     "    protected IPage Page { get; }",
     `    protected ILocator LocatorByTestId(string testId) => Page.Locator($"[${testIdAttribute}=\\"{testId}\\"]");`,
     "    protected ILocator LocatorWithinTestIdByLabel(string rootTestId, string label, bool exact = true) => LocatorByTestId(rootTestId).GetByLabel(label, new() { Exact = exact });",
+    "    protected async Task<ILocator> ResolveEditableLocatorAsync(ILocator locator)",
+    "    {",
+    '        var isEditable = await locator.EvaluateAsync<bool>(@"el => {',
+    "            if (!el || !(el instanceof HTMLElement)) return false;",
+    "            const tagName = el.tagName.toLowerCase();",
+    "            return tagName === 'input' || tagName === 'textarea' || tagName === 'select' || el.isContentEditable;",
+    '        }");',
+    "        if (isEditable)",
+    "        {",
+    "            return locator;",
+    "        }",
+    "",
+    `        var descendant = locator.Locator("input, textarea, select, [contenteditable=''], [contenteditable='true'], [contenteditable]:not([contenteditable='false'])").First;`,
+    "        if (await descendant.CountAsync() > 0)",
+    "        {",
+    "            return descendant;",
+    "        }",
+    "",
+    "        return locator;",
+    "    }",
     "    protected async Task ClickWithinTestIdByLabelAsync(string rootTestId, string label, bool exact = true)",
     "    {",
     "        await LocatorWithinTestIdByLabel(rootTestId, label, exact).ClickAsync();",
@@ -3772,7 +3792,8 @@ function generateAggregatedCSharpFiles(componentHierarchyMap, outDir, options =
       const callSuffix = pom.formattedDataTestId.includes("${") ? `(${args})` : "";
       const emitActionCall = (locatorAccess) => {
         if (pom.nativeRole === "input") {
-          chunks.push(`        await ${locatorAccess}.FillAsync(text);`);
+          chunks.push(`        var editableLocator = await ResolveEditableLocatorAsync(${locatorAccess});`);
+          chunks.push("        await editableLocator.FillAsync(text);");
         } else if (pom.nativeRole === "select") {
           chunks.push(`        await ${locatorAccess}.SelectOptionAsync(value);`);
         } else if (pom.nativeRole === "vselect") {
@@ -3800,7 +3821,8 @@ function generateAggregatedCSharpFiles(componentHierarchyMap, outDir, options =
           chunks.push("                if (await locator.CountAsync() > 0)");
           chunks.push("                {");
           if (pom.nativeRole === "input") {
-            chunks.push("                    await locator.FillAsync(text);");
+            chunks.push("                    var editableLocator = await ResolveEditableLocatorAsync(locator);");
+            chunks.push("                    await editableLocator.FillAsync(text);");
           } else if (pom.nativeRole === "select") {
             chunks.push("                    await locator.SelectOptionAsync(value);");
           } else {
@@ -4024,7 +4046,8 @@ function generateViewObjectModelContent(componentName, dependencies, componentHi
     if (!Object.prototype.hasOwnProperty.call(customPomClassIdentifierMap, a.className))
       return false;
     const scope = a.attachTo ?? "views";
-    const scopeOk = isView ? scope === "views" || scope === "both" : scope === "components" || scope === "both";
+    const scopeMatchesBoth = scope === "both" || scope === "pagesAndComponents";
+    const scopeOk = isView ? scope === "views" || scopeMatchesBoth : scope === "components" || scopeMatchesBoth;
     if (!scopeOk)
       return false;
     return a.attachWhenUsesComponents.some((c) => hasChildComponent(c));