@thinkwise/testwise 0.2.0-beta.22 → 0.2.4

package/dist/artifact-builder/SubjectComponentGenerator.js

@@ -59,18 +59,35 @@ export class SubjectComponentGenerator {
             this.removeLocatorInterface(componentFile);
             this.addComponentImports(componentFile, componentName);
             this.setSubjectExtendsComponent(componentFile, componentName);
+            if (componentName === 'Grid') {
+                this.transformGridInterface(componentFile);
+            }
             const interfaceMatches = componentFile.content.match(/export interface (\w+) extends/);
             if (interfaceMatches) {
                 const mainInterface = interfaceMatches[1];
                 const matchingProperties = this.getPropertyNamesFromInterface(componentFile, mainInterface);
                 let propertyDeclarations = '';
                 let assignments = '';
+                let gridGetters = '';
                 if (matchingProperties?.[1]) {
                     const propertyLines = this.convertStringsToArray(matchingProperties[1]);
-                    propertyDeclarations = this.generatePropertyDeclarations(propertyLines);
-                    assignments = this.getPropertyInitializations(propertyLines, componentName);
+                    if (componentName === 'Grid') {
+                        gridGetters = this.generateGridGetters(propertyLines, componentName);
+                    }
+                    else {
+                        propertyDeclarations = this.generatePropertyDeclarations(propertyLines, componentName);
+                        if (componentName === 'Form')
+                            this.transformLookupTypes(componentFile);
+                        assignments = this.getPropertyInitializations(propertyLines, componentName);
+                        this.addLookupImportIfRequired(componentFile);
+                    }
                 }
-                componentFile.content += `\nexport class ${mainInterface}Component extends ${componentName} implements ${mainInterface} {\n${propertyDeclarations}\n\n  constructor(page: Page, context: Locator | null = null) {\n    super(page, context);\n${assignments}\n  }\n}\n`;
+                const classBody = componentName === 'Grid'
+                    ? `\nexport class ${mainInterface}Component extends ${componentName} implements ${mainInterface} {\n\n` +
+                        `  constructor(page: Page, context: Locator | null = null) {\n    super(page, context);\n  }\n\n${gridGetters}}\n`
+                    : `\nexport class ${mainInterface}Component extends ${componentName} implements ${mainInterface} {\n${propertyDeclarations}\n\n` +
+                        `  constructor(page: Page, context: Locator | null = null) {\n    super(page, context);\n${assignments}\n  }\n}\n`;
+                componentFile.content += classBody;
             }
             const subjectMatch = componentDirPath.match(/subjects[/](\w+)[/]/);
             const subjectName = subjectMatch ? subjectMatch[1] : null;
@@ -86,6 +103,22 @@ export class SubjectComponentGenerator {
             }
         }
     }
+    transformGridInterface(componentFile) {
+        const interfaceRegex = /export interface \w+ extends Grid \{([\s\S]*?)\}/g;
+        componentFile.content = componentFile.content.replace(interfaceRegex, (match, body) => {
+            const transformedBody = body.replace(/(\w+)\s*:\s*Locator(?:\[\])?;/g, 'readonly $1: Promise<Locator[]>;');
+            return match.replace(body, transformedBody);
+        });
+    }
+    generateGridGetters(propertyLines, componentName) {
+        return propertyLines
+            .map((line) => {
+            const property = line.replace('readonly', '').split(':')[0].trim();
+            const pageLocatorString = this._selectorBuilder.getPageLocatorString(property, componentName);
+            return `  get ${property}(): Promise<Locator[]> {\n    return this.${pageLocatorString}.all();\n  }\n`;
+        })
+            .join('\n');
+    }
     getSubjectFolderPath(formattedSubjectName) {
         return path.resolve(this._currentDirname, `../../${SubjectComponentGenerator.SUBJECTS_RELATIVE_PATH}/${formattedSubjectName}/Components/`);
     }
@@ -99,18 +132,41 @@ export class SubjectComponentGenerator {
             .map((line) => {
             const property = line.split(':')[0].replace(/\?$/, '').trim();
             const pageLocatorString = this._selectorBuilder.getPageLocatorString(property, componentName);
+            if (componentName === 'Form' && property.endsWith('Lookup')) {
+                return `    this.${property} = createLookupDropdown(${pageLocatorString});`;
+            }
             return `    this.${property} = ${pageLocatorString};`;
         })
             .join('\n');
     }
-    generatePropertyDeclarations(propertiesToConvert) {
+    addLookupImportIfRequired(componentFile) {
+        const lookupType = 'ILookupDropdown';
+        const lookupImport = "import { createLookupDropdown, type ILookupDropdown } from '../../../../controls/LookupDropdown.js';";
+        if (componentFile.content.includes(lookupType) && !componentFile.content.includes(lookupImport)) {
+            componentFile.content = `${lookupImport}\n${componentFile.content}`;
+        }
+    }
+    generatePropertyDeclarations(propertiesToConvert, componentName) {
         return propertiesToConvert
             .map((line) => {
             const property = line.replace(/^\s+/, '').split(':')[0].replace(/\?$/, '').trim();
-            return `  ${property}!: Locator;`;
+            if (componentName === 'Form' && property.endsWith('Lookup')) {
+                return `  ${property}: ILookupDropdown;`;
+            }
+            return `  ${property}: Locator;`;
         })
             .join('\n');
     }
+    transformLookupTypes(componentFile) {
+        const interfaceRegex = /export interface \w+ extends Form \{([\s\S]*?)\}/g;
+        componentFile.content = componentFile.content.replace(interfaceRegex, (match, interfaceBody) => {
+            const propertyRegex = /(\w+Lookup)\s*:\s*Locator;/g;
+            const updatedBody = interfaceBody.replace(propertyRegex, (_propMatch, propName) => {
+                return `${propName}: ILookupDropdown;`;
+            });
+            return match.replace(interfaceBody, updatedBody);
+        });
+    }
     convertStringsToArray(content) {
         return content
             .split('\n')

package/dist/artifact-builder/SubjectComponentGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"SubjectComponentGenerator.js","sourceRoot":"","sources":["../../artifact-builder/SubjectComponentGenerator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SubjectComponentGenerator.js","sourceRoot":"","sources":["../../artifact-builder/SubjectComponentGenerator.ts"],"names":[],"mappings":"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"}

package/dist/artifact-builder/SubjectGenerator.js

@@ -56,7 +56,7 @@ export class SubjectGenerator {
         const subjectFolderName = this._namingHandler.formatPascalCaseName(subject.subject);
         const subjectFolderPath = this.getSubjectFolderRelativePath(subjectFolderName);
         const subjectClass = {
-            content: `import type { Page } from '@playwright/test';\nimport { SubjectPageBase } from '../../index.js';\n`,
+            content: `import type { Page } from '@playwright/test';\nimport { SubjectPageBase } from '../../SubjectPageBase.js';\n`,
             name: this._namingHandler.generateSubjectClassName(subject)
         };
         const componentDictionary = this.getAllComponentsFromInterface(screenFileContent, screenInterfaceName, subject);

package/dist/artifact-builder/SubjectGenerator.js.map

@@ -1 +1 @@
-{"version":3,"file":"SubjectGenerator.js","sourceRoot":"","sources":["../../artifact-builder/SubjectGenerator.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SubjectGenerator.js","sourceRoot":"","sources":["../../artifact-builder/SubjectGenerator.ts"],"names":[],"mappings":"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"}

package/dist/artifact-builder/SubjectRegistration.d.ts

@@ -1,21 +1,21 @@
 export declare class SubjectRegistration {
-    private static readonly SUBJECTS_RELATIVE_PATH;
     private static readonly IMPORT_MATCH_REGEX;
     private readonly _currentFilename;
     private readonly _currentDirname;
     private readonly _subjectTypePath;
-    private readonly _subjectBuilderPath;
     constructor();
     run(): void;
     private registerGeneratedSubjectsAsSubjectTypes;
-    private registerGeneratedSubjectsUnderPageGet;
     private removeExistingSubjectTypeDefinition;
     private setSubjectTypeContent;
     private removeAllImportsFromSubjectIndex;
-    private getSubjectTypesImportsAndExports;
-    private getAllSubjects;
-    private addSubjectBuilderSubjectDefinition;
-    private removeSubjectBuilderSubjectDefinition;
-    private addSubjectBuilderImports;
-    private removeSubjectBuilderImports;
+    private buildSubjectTypeExport;
+    private addPathRecordsToContent;
+    private buildPathRecordsString;
+    private getAllSubjectDetails;
+}
+export interface SubjectDetail {
+    subject: string;
+    variant?: string;
+    screen: 'Main' | 'Popup' | 'Zoom' | 'Detail';
 }

package/dist/artifact-builder/SubjectRegistration.js

@@ -2,34 +2,31 @@ import * as fs from 'node:fs';
 import * as path from 'node:path';
 import { dirname } from 'node:path';
 import { fileURLToPath } from 'node:url';
+import * as prettier from 'prettier';
 export class SubjectRegistration {
     constructor() {
         this._currentFilename = fileURLToPath(import.meta.url);
         this._currentDirname = dirname(this._currentFilename);
         this._subjectTypePath = path.resolve(this._currentDirname, '../../page-extensions/SubjectRegistry.ts');
-        this._subjectBuilderPath = path.resolve(this._currentDirname, '../../page-extensions/SubjectProvider.ts');
     }
     run() {
-        this.registerGeneratedSubjectsAsSubjectTypes();
-        this.registerGeneratedSubjectsUnderPageGet();
+        const subjectDetails = this.getAllSubjectDetails();
+        this.registerGeneratedSubjectsAsSubjectTypes(subjectDetails);
     }
-    registerGeneratedSubjectsAsSubjectTypes() {
-        const subjectList = this.getAllSubjects();
-        const subjectTypeImportsAndExports = this.getSubjectTypesImportsAndExports(subjectList);
+    async registerGeneratedSubjectsAsSubjectTypes(subjectDetails) {
+        const subjectTypeImportsAndExports = this.buildSubjectTypeExport(subjectDetails);
         const subject = { content: this.setSubjectTypeContent() };
         this.removeExistingSubjectTypeDefinition(subject);
         this.removeAllImportsFromSubjectIndex(subject);
         subject.content = subjectTypeImportsAndExports + subject.content;
-        fs.writeFileSync(this._subjectTypePath, subject.content, 'utf-8');
-    }
-    registerGeneratedSubjectsUnderPageGet() {
-        const subjectNames = this.getAllSubjects();
-        const subjectBuilder = { content: fs.readFileSync(this._subjectBuilderPath, 'utf-8') };
-        this.removeSubjectBuilderImports(subjectBuilder);
-        this.removeSubjectBuilderSubjectDefinition(subjectBuilder);
-        this.addSubjectBuilderImports(subjectNames, subjectBuilder);
-        this.addSubjectBuilderSubjectDefinition(subjectNames, subjectBuilder);
-        fs.writeFileSync(this._subjectBuilderPath, subjectBuilder.content, 'utf-8');
+        subject.content = this.addPathRecordsToContent(subject.content, subjectDetails);
+        const formattedContent = await prettier.format(subject.content, {
+            parser: 'typescript',
+            singleQuote: true,
+            semi: true,
+            trailingComma: 'all'
+        });
+        fs.writeFileSync(this._subjectTypePath, formattedContent, 'utf-8');
     }
     removeExistingSubjectTypeDefinition(subject) {
         const subjectDefinitionMatchRegex = /export\s+type\s+SubjectType\s*=\s*{[^}]*};?/m;
@@ -45,51 +42,63 @@ export class SubjectRegistration {
             subject.content = subject.content.replace(SubjectRegistration.IMPORT_MATCH_REGEX, '');
         }
     }
-    getSubjectTypesImportsAndExports(subjectList) {
-        const importLine = `import type { ${subjectList.join(', ')} } from '../${SubjectRegistration.SUBJECTS_RELATIVE_PATH}/index.js';`;
-        const subjectTypeEntries = subjectList.map((name) => `  ${name}: typeof ${name};`).join('\n    ');
-        const newSubjectTypes = `${importLine}
-
-  export type SubjectType = {
+    buildSubjectTypeExport(subjectDetails) {
+        const subjectTypeEntries = subjectDetails
+            .map((details) => `  ${details.subject}${details.variant ?? ''}${details.screen}: ` +
+            `Promise<import('../test-artifacts/subjects/${details.subject}/index.js').${details.subject}${details.variant ?? ''}${details.screen}>;`)
+            .join('\n    ');
+        const newSubjectTypes = `export type SubjectType = {
   ${subjectTypeEntries}
   };
   `;
         return newSubjectTypes;
     }
-    getAllSubjects() {
+    addPathRecordsToContent(content, subjectDetails) {
+        const pathRecordsString = this.buildPathRecordsString(subjectDetails);
+        const stringToMatch = "none: ''";
+        return content.replace(stringToMatch, `\n${pathRecordsString}\n    `);
+    }
+    buildPathRecordsString(subjectDetails) {
+        return subjectDetails
+            .map((details) => `  ${details.subject}${details.variant ?? ''}${details.screen}: ` +
+            `'../test-artifacts/subjects/${details.subject}/index.js',`)
+            .join('\n    ');
+    }
+    getAllSubjectDetails() {
         const subjectsDir = path.resolve(this._currentDirname, '../../test-artifacts/subjects');
         const subjectFolders = fs.readdirSync(subjectsDir).filter((file) => {
             return fs.statSync(path.join(subjectsDir, file)).isDirectory();
         });
-        const subjectNames = [];
+        const subjectDetails = [];
+        const seenFullNames = new Set();
         subjectFolders.forEach((folder) => {
             const folderPath = path.join(subjectsDir, folder);
-            const tsFiles = fs.readdirSync(folderPath).filter((file) => file.endsWith('.ts'));
+            const tsFiles = fs.readdirSync(folderPath).filter((file) => file.endsWith('.ts') && file !== 'index.ts');
             tsFiles.forEach((tsFile) => {
                 const classContent = fs.readFileSync(path.join(folderPath, tsFile), 'utf-8');
                 const classMatches = classContent.matchAll(/export\s+class\s+(\w+)/g);
                 for (const match of classMatches) {
-                    subjectNames.push(match[1]);
+                    const className = match[1];
+                    const pattern = new RegExp(`^(${folder})(.*)(Main|Popup|Zoom|Detail)$`);
+                    const variantMatch = className.match(pattern);
+                    if (variantMatch) {
+                        const fullName = variantMatch[0];
+                        if (!seenFullNames.has(fullName)) {
+                            const variant = variantMatch[2] || '';
+                            const screen = variantMatch[3];
+                            subjectDetails.push({
+                                subject: folder,
+                                variant: variant,
+                                screen: screen
+                            });
+                            seenFullNames.add(fullName);
+                        }
+                    }
                 }
             });
         });
-        return subjectNames;
-    }
-    addSubjectBuilderSubjectDefinition(subjectNames, subjectBuilder) {
-        const pageSubjectDefinition = `page.subject = {\n${subjectNames.map((name) => `    ${name},`).join('\n')}\n};\n`;
-        subjectBuilder.content = subjectBuilder.content.replace(/(\/\/ page\.subject definition goes here\n)/, `$1        ${pageSubjectDefinition}        `);
-    }
-    removeSubjectBuilderSubjectDefinition(subjectBuilder) {
-        subjectBuilder.content = subjectBuilder.content.replace(/page\.subject\s*=\s*{[\s\S]*?};\s*/m, '');
-    }
-    addSubjectBuilderImports(subjectNames, subjectBuilder) {
-        const importLine = `import { ${subjectNames.join(', ')} } from '../${SubjectRegistration.SUBJECTS_RELATIVE_PATH}/index.js';`;
-        subjectBuilder.content = subjectBuilder.content.replace(/(import type { Test } from '\.\.\/types\/Test\.js';)/, `$1\n${importLine}`);
-    }
-    removeSubjectBuilderImports(subjectBuilder) {
-        subjectBuilder.content = subjectBuilder.content.replace(SubjectRegistration.IMPORT_MATCH_REGEX, '');
+        return subjectDetails;
     }
 }
-SubjectRegistration.SUBJECTS_RELATIVE_PATH = 'test-artifacts/subjects';
 SubjectRegistration.IMPORT_MATCH_REGEX = /import .*'\.\.\/test-artifacts\/subjects\/index\.js';\n?/g;
 //# sourceMappingURL=SubjectRegistration.js.map

package/dist/artifact-builder/SubjectRegistration.js.map

@@ -1 +1 @@
-{"version":3,"file":"SubjectRegistration.js","sourceRoot":"","sources":["../../artifact-builder/SubjectRegistration.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"SubjectRegistration.js","sourceRoot":"","sources":["../../artifact-builder/SubjectRegistration.ts"],"names":[],"mappings":"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"}

package/dist/artifact-builder/helpers/DataRetriever.js

@@ -16,7 +16,7 @@ export class DataRetriever {
     getRegisteredSubjects() {
         const registeredSubjectsPath = path.join(this._consumerRootDirectory, 'seed-data/registeredSubjects.json');
         if (!fs.existsSync(registeredSubjectsPath)) {
-            console.error(`Seed data file not found at: ${registeredSubjectsPath}`);
+            console.info(`Seed data file not found at: ${registeredSubjectsPath}`);
             return null;
         }
         const json = fs.readFileSync(registeredSubjectsPath, 'utf-8');
@@ -34,7 +34,8 @@ export class DataRetriever {
     getScreensToBuild() {
         const screensToBuildPath = path.join(this._consumerRootDirectory, 'seed-data/screensToBuild.json');
         if (!fs.existsSync(screensToBuildPath)) {
-            console.info(`screensToBuild.json not found at: ${screensToBuildPath}. Using all screens as fallback.`);
+            console.info(`screensToBuild.json not found.`);
+            return [];
         }
         const json = fs.readFileSync(screensToBuildPath, 'utf-8');
         return JSON.parse(json);

package/dist/artifact-builder/helpers/DataRetriever.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataRetriever.js","sourceRoot":"","sources":["../../../artifact-builder/helpers/DataRetriever.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAI7D,MAAM,OAAO,aAAa;IAA1B;QACU,2BAAsB,GAAW,IAAI,YAAY,EAAE,CAAC,wBAAwB,EAAE,CAAC;IAwDzF,CAAC;IAtDQ,mBAAmB;QACxB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,yBAAyB,CAAC,CAAC;QACnF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,OAAO,CAAC,KAAK,CAAC,gCAAgC,QAAQ,EAAE,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChD,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAA0B,CAAC;IACxD,CAAC;IAEM,qBAAqB;QAC1B,MAAM,sBAAsB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,mCAAmC,CAAC,CAAC;QAC3G,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE,CAAC;YAC3C,OAAO,CAAC,KAAK,CAAC,gCAAgC,sBAAsB,EAAE,CAAC,CAAC;YACxE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;QAC9D,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAqC,CAAC;IAC9E,CAAC;IAEM,kBAAkB;QACvB,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,gCAAgC,CAAC,CAAC;QACrG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACxC,OAAO,CAAC,IAAI,CAAC,sCAAsC,mBAAmB,mCAAmC,CAAC,CAAC;YAE3G,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACpC,CAAC;QAED,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAA0B,CAAC;IACxD,CAAC;IAEM,iBAAiB;QACtB,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,+BAA+B,CAAC,CAAC;QACnG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACvC,OAAO,CAAC,IAAI,CAAC,qCAAqC,kBAAkB,kCAAkC,CAAC,CAAC;QAC1G,CAAC;QAED,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAa,CAAC;IACtC,CAAC;IAEM,oBAAoB;QACzB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAC;IAC7D,CAAC;IAEO,UAAU,CAAC,IAAY;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAEO,qBAAqB,CAAC,IAAY;QACxC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CACF"}
+{"version":3,"file":"DataRetriever.js","sourceRoot":"","sources":["../../../artifact-builder/helpers/DataRetriever.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,SAAS,CAAC;AAC9B,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAI7D,MAAM,OAAO,aAAa;IAA1B;QACU,2BAAsB,GAAW,IAAI,YAAY,EAAE,CAAC,wBAAwB,EAAE,CAAC;IA2DzF,CAAC;IAzDQ,mBAAmB;QACxB,MAAM,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,yBAAyB,CAAC,CAAC;QACnF,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,CAAC;YAC7B,OAAO,CAAC,KAAK,CAAC,gCAAgC,QAAQ,EAAE,CAAC,CAAC;QAC5D,CAAC;QAED,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAC;QAChD,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAA0B,CAAC;IACxD,CAAC;IAEM,qBAAqB;QAC1B,MAAM,sBAAsB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,mCAAmC,CAAC,CAAC;QAE3G,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,sBAAsB,CAAC,EAAE,CAAC;YAC3C,OAAO,CAAC,IAAI,CAAC,gCAAgC,sBAAsB,EAAE,CAAC,CAAC;YAEvE,OAAO,IAAI,CAAC;QACd,CAAC;QAED,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,sBAAsB,EAAE,OAAO,CAAC,CAAC;QAC9D,OAAO,IAAI,CAAC,qBAAqB,CAAC,IAAI,CAAqC,CAAC;IAC9E,CAAC;IAEM,kBAAkB;QACvB,MAAM,mBAAmB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,gCAAgC,CAAC,CAAC;QACrG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAE,CAAC;YACxC,OAAO,CAAC,IAAI,CAAC,sCAAsC,mBAAmB,mCAAmC,CAAC,CAAC;YAE3G,OAAO,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACpC,CAAC;QAED,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,mBAAmB,EAAE,OAAO,CAAC,CAAC;QAC3D,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,CAA0B,CAAC;IACxD,CAAC;IAEM,iBAAiB;QACtB,MAAM,kBAAkB,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,+BAA+B,CAAC,CAAC;QACnG,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,kBAAkB,CAAC,EAAE,CAAC;YACvC,OAAO,CAAC,IAAI,CAAC,gCAAgC,CAAC,CAAC;YAC/C,OAAO,EAAE,CAAC;QACZ,CAAC;QAED,MAAM,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,kBAAkB,EAAE,OAAO,CAAC,CAAC;QAC1D,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAa,CAAC;IACtC,CAAC;IAEM,oBAAoB;QACzB,OAAO,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,sBAAsB,EAAE,WAAW,CAAC,CAAC;IAC7D,CAAC;IAEO,UAAU,CAAC,IAAY;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;IAEO,qBAAqB,CAAC,IAAY;QACxC,OAAO,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;IAC1B,CAAC;CACF"}

package/dist/artifact-builder/helpers/NamingHandler.d.ts

@@ -3,7 +3,7 @@ import type { ScreenComponents, SubjectComponents } from '../../types/Components
 export declare class NamingHandler {
     getDefaultElementSuffixFromComponentType(componentType: SubjectComponents): KnownElementTypes;
     getElementSuffixFromControlTypeAndComponentType(controlType: string, componentType: SubjectComponents): string;
-    getIdFromElementName(elementName: string): string;
+    getIdFromElementName(elementName: string, componentType: SubjectComponents, controlType: string): string;
     getComponentTypeFromFileName(fileName: string): SubjectComponents;
     getElementTypeFromElementName(elementName: string): string;
     getSubjectFromFileName(fileName: string): string;
@@ -13,6 +13,7 @@ export declare class NamingHandler {
     formatPropertyName(name: string): string;
     generateScreenInterfaceName(screentypeId: string): string;
     snakeToPascalCase(value: string): string;
+    pascalToSnakeCase(value: string): string;
     getComponentIdFromName(componentName: string, componentType: ScreenComponents): string;
     capitalizeFirstLetter(value: string): string;
     getTabParentFromComponentName(componentName: string): string;

package/dist/artifact-builder/helpers/NamingHandler.js

@@ -35,15 +35,15 @@ export class NamingHandler {
         const componentMapping = controlTypeMappingMatrix[componentType];
         return (componentMapping[controlType] || this.getDefaultElementSuffixFromComponentType(componentType)).toLowerCase();
     }
-    getIdFromElementName(elementName) {
-        return (elementName
-            // Remove the suffix at the end
-            .replace(/([A-Z][a-z0-9]*)$/, '')
-            // Convert to kebab-case
+    getIdFromElementName(elementName, componentType, controlType) {
+        const elementSuffixToRemove = this.getElementSuffixFromControlTypeAndComponentType(controlType, componentType);
+        const snakeCaseElementName = this.pascalToSnakeCase(elementName);
+        return snakeCaseElementName
+            .replace(new RegExp(`${elementSuffixToRemove}$`, 'i'), '')
             .replace(/([a-z])([A-Z])/g, '$1-$2')
             .toLowerCase()
-            // Replace underscores with hyphens
-            .replace(/_/g, '-'));
+            .replace(/_/g, '-')
+            .replace(/-+$/g, '');
     }
     getComponentTypeFromFileName(fileName) {
         // ToDo: use this
@@ -58,16 +58,15 @@ export class NamingHandler {
         throw new Error(`Unknown component type in file name: ${fileName}`);
     }
     getElementTypeFromElementName(elementName) {
-        // Get the suffix at the end of the element name
-        const match = elementName.match(/([A-Z][a-z0-9]*)$/);
-        // verify that match is a known element type
-        if (match) {
-            const elementType = match[1].toLowerCase();
-            if (Object.values(KnownElementTypes).includes(elementType)) {
-                return elementType;
+        const snakeCaseElementName = this.pascalToSnakeCase(elementName);
+        const parts = snakeCaseElementName.split('_');
+        for (let i = parts.length - 1; i > 0; i--) {
+            const candidate = parts.slice(i).join('_');
+            if (Object.values(KnownElementTypes).includes(candidate)) {
+                return candidate;
             }
         }
-        throw new Error(`Could not extract element type from element name: ${elementName}`);
+        throw new Error(`No KnownElementType match found for a partial suffix of "${elementName}"`);
     }
     getSubjectFromFileName(fileName) {
         return fileName.replace(/([A-Z][a-z0-9]*)$/, '');
@@ -111,6 +110,12 @@ export class NamingHandler {
             .map((part) => part.charAt(0).toUpperCase() + part.slice(1))
             .join('');
     }
+    pascalToSnakeCase(value) {
+        return value
+            .replace(/([A-Z]+)([A-Z][a-z])/g, '$1_$2')
+            .replace(/([a-z\d])([A-Z])/g, '$1_$2')
+            .toLowerCase();
+    }
     getComponentIdFromName(componentName, componentType) {
         if (componentType === 'ActionBar' || componentType === 'CustomActionBar') {
             const capitalizedComponentName = this.capitalizeFirstLetter(componentName);

package/dist/artifact-builder/helpers/NamingHandler.js.map

@@ -1 +1 @@
-{"version":3,"file":"NamingHandler.js","sourceRoot":"","sources":["../../../artifact-builder/helpers/NamingHandler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,WAAW,CAAC;AAClC,OAAO,EAAE,iBAAiB,EAAE,MAAM,6BAA6B,CAAC;AAGhE,MAAM,OAAO,aAAa;IACjB,wCAAwC,CAAC,aAAgC;QAC9E,MAAM,kBAAkB,GAAiD;YACvE,IAAI,EAAE,iBAAiB,CAAC,KAAK;YAC7B,IAAI,EAAE,iBAAiB,CAAC,MAAM;SAC/B,CAAC;QAEF,OAAO,kBAAkB,CAAC,aAAa,CAAC,CAAC;IAC3C,CAAC;IAEM,+CAA+C,CACpD,WAAmB,EACnB,aAAgC;QAEhC,WAAW,GAAG,WAAW,CAAC,WAAW,EAAE,CAAC;QAExC,MAAM,iBAAiB,GAAsB,IAAI,CAAC,wCAAwC,CAAC,MAAM,CAAC,CAAC;QACnG,MAAM,iBAAiB,GAAsB,IAAI,CAAC,wCAAwC,CAAC,MAAM,CAAC,CAAC;QAEnG,MAAM,wBAAwB,GAAiE;YAC7F,IAAI,EAAE;gBACJ,KAAK,EAAE,iBAAiB;gBACxB,YAAY,EAAE,iBAAiB;gBAC/B,sBAAsB,EAAE,iBAAiB;gBACzC,eAAe,EAAE,iBAAiB,CAAC,MAAM;gBACzC,QAAQ,EAAE,iBAAiB,CAAC,QAAQ;gBACpC,SAAS,EAAE,iBAAiB,CAAC,QAAQ;gBACrC,KAAK,EAAE,iBAAiB,CAAC,QAAQ;aAClC;YACD,IAAI,EAAE;gBACJ,KAAK,EAAE,iBAAiB;gBACxB,YAAY,EAAE,iBAAiB;gBAC/B,sBAAsB,EAAE,iBAAiB;gBACzC,eAAe,EAAE,iBAAiB;gBAClC,QAAQ,EAAE,iBAAiB;gBAC3B,SAAS,EAAE,iBAAiB;gBAC5B,KAAK,EAAE,iBAAiB;aACzB;SACF,CAAC;QAEF,MAAM,gBAAgB,GAAG,wBAAwB,CAAC,aAAa,CAAC,CAAC;QACjE,OAAO,CACL,gBAAgB,CAAC,WAAW,CAAC,IAAI,IAAI,CAAC,wCAAwC,CAAC,aAAa,CAAC,CAC9F,CAAC,WAAW,EAAE,CAAC;IAClB,CAAC;IAEM,oBAAoB,CAAC,WAAmB;QAC7C,OAAO,CACL,WAAW;YACT,+BAA+B;aAC9B,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC;YACjC,wBAAwB;aACvB,OAAO,CAAC,iBAAiB,EAAE,OAAO,CAAC;aACnC,WAAW,EAAE;YACd,mCAAmC;aAClC,OAAO,CAAC,IAAI,EAAE,GAAG,CAAC,CACtB,CAAC;IACJ,CAAC;IAEM,4BAA4B,CAAC,QAAgB;QAClD,iBAAiB;QACjB,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QACvD,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,aAAa,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;YAC/B,IAAI,aAAa,KAAK,MAAM;gBAAE,OAAO,MAAM,CAAC;YAC5C,IAAI,aAAa,KAAK,MAAM;gBAAE,OAAO,MAAM,CAAC;QAC9C,CAAC;QACD,MAAM,IAAI,KAAK,CAAC,wCAAwC,QAAQ,EAAE,CAAC,CAAC;IACtE,CAAC;IAEM,6BAA6B,CAAC,WAAmB;QACtD,gDAAgD;QAChD,MAAM,KAAK,GAAG,WAAW,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QAErD,4CAA4C;QAC5C,IAAI,KAAK,EAAE,CAAC;YACV,MAAM,WAAW,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC;YAC3C,IAAI,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC,QAAQ,CAAC,WAAgC,CAAC,EAAE,CAAC;gBAChF,OAAO,WAAW,CAAC;YACrB,CAAC;QACH,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,qDAAqD,WAAW,EAAE,CAAC,CAAC;IACtF,CAAC;IAEM,sBAAsB,CAAC,QAAgB;QAC5C,OAAO,QAAQ,CAAC,OAAO,CAAC,mBAAmB,EAAE,EAAE,CAAC,CAAC;IACnD,CAAC;IAEM,6BAA6B,CAAC,IAAY;QAC/C,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QAC5F,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAChE,OAAO,QAAQ,CAAC;IAClB,CAAC;IAEM,oBAAoB,CAAC,IAAY;QACtC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACxB,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACtD,CAAC;QAED,OAAO,IAAI;aACR,WAAW,EAAE;aACb,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAC3D,IAAI,CAAC,EAAE,CAAC,CAAC;IACd,CAAC;IAEM,iBAAiB,CAAC,WAAmB;QAC1C,WAAW,CAAC,OAAO,CAAC,WAAW,EAAE,CAAC,CAAS,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC;QACpE,OAAO,WAAW,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,WAAW,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACpE,CAAC;IAEM,kBAAkB,CAAC,IAAY;QACpC,OAAO,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACtD,CAAC;IAEM,2BAA2B,CAAC,YAAoB;QACrD,OAAO,IAAI,YAAY;aACpB,WAAW,EAAE;aACb,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAC3D,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC;IAChB,CAAC;IAEM,iBAAiB,CAAC,KAAa;QACpC,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QACxD,CAAC;QAED,OAAO,KAAK;aACT,WAAW,EAAE;aACb,KAAK,CAAC,GAAG,CAAC;aACV,GAAG,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;aAC3D,IAAI,CAAC,EAAE,CAAC,CAAC;IACd,CAAC;IAEM,sBAAsB,CAAC,aAAqB,EAAE,aAA+B;QAClF,IAAI,aAAa,KAAK,WAAW,IAAI,aAAa,KAAK,iBAAiB,EAAE,CAAC;YACzE,MAAM,wBAAwB,GAAG,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC;YAC3E,OAAO,wBAAwB,CAAC,OAAO,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC;QACjE,CAAC;QAED,IAAI,aAAa,KAAK,UAAU,EAAE,CAAC;YACjC,MAAM,WAAW,GAAG,aAAa,CAAC,WAAW,EAAE,CAAC;YAEhD,IAAI,eAAe,CAAC,IAAI,CAAC,WAAW,CAAC,EAAE,CAAC;gBACtC,OAAO,WAAW,CAAC;YACrB,CAAC;YAED,OAAO,WAAW,CAAC,OAAO,CAAC,UAAU,EAAE,WAAW,CAAC,CAAC;QACtD,CAAC;QAED,IAAI,aAAa,KAAK,KAAK,EAAE,CAAC;YAC5B,OAAO,IAAI,CAAC,qBAAqB,CAAC,aAAa,CAAC,CAAC;QACnD,CAAC;QAED,OAAO,aAAa,CAAC;IACvB,CAAC;IAEM,qBAAqB,CAAC,KAAa;QACxC,OAAO,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,WAAW,EAAE,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC;IAEM,6BAA6B,CAAC,aAAqB;QACxD,MAAM,KAAK,GAAG,aAAa,CAAC,KAAK,CAAC,qBAAqB,CAAC,CAAC;QACzD,IAAI,KAAK,EAAE,CAAC;YACV,OAAO,KAAK,CAAC,CAAC,CAAC,CAAC;QAClB,CAAC;QAED,MAAM,IAAI,KAAK,CAAC,qDAAqD,aAAa,EAAE,CAAC,CAAC;IACxF,CAAC;IAEM,wBAAwB,CAAC,OAAyE;QACvG,MAAM,uBAAuB,GAAG,OAAO,CAAC,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC;QACnH,MAAM,SAAS,GAAG,GAAG,uBAAuB,IAAI,OAAO,CAAC,kBAAkB,EAAE,CAAC;QAC7E,OAAO,IAAI,CAAC,oBAAoB,CAAC,SAAS,CAAC,CAAC;IAC9C,CAAC;CACF"}
+{"version":3,"file":"NamingHandler.js","sourceRoot":"","sources":["../../../artifact-builder/helpers/NamingHandler.ts"],"names":[],"mappings":"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"}

package/dist/components/BaseComponentObjects.d.ts

@@ -2,5 +2,6 @@ import type { Locator, Page } from '@playwright/test';
 import type { IComponentObjects } from '../interfaces/IComponentObjects.js';
 export declare abstract class BaseComponentObjects implements IComponentObjects {
     context: Locator;
+    mainHeader: Locator;
     constructor(page: Page, context?: Locator | null);
 }

package/dist/components/BaseComponentObjects.js

@@ -1,6 +1,8 @@
 export class BaseComponentObjects {
     constructor(page, context = null) {
-        this.context = context ? context : page.locator('body');
+        this.mainHeader = page.locator('main header');
+        const body = page.locator('body');
+        this.context = context ? context : body;
     }
 }
 //# sourceMappingURL=BaseComponentObjects.js.map

package/dist/components/BaseComponentObjects.js.map

@@ -1 +1 @@
-{"version":3,"file":"BaseComponentObjects.js","sourceRoot":"","sources":["../../components/BaseComponentObjects.ts"],"names":[],"mappings":"AAGA,MAAM,OAAgB,oBAAoB;IAGxC,YAAY,IAAU,EAAE,UAA0B,IAAI;QACpD,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;IAC1D,CAAC;CACF"}
+{"version":3,"file":"BaseComponentObjects.js","sourceRoot":"","sources":["../../components/BaseComponentObjects.ts"],"names":[],"mappings":"AAGA,MAAM,OAAgB,oBAAoB;IAIxC,YAAY,IAAU,EAAE,UAA0B,IAAI;QACpD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;QAC9C,MAAM,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;QAClC,IAAI,CAAC,OAAO,GAAG,OAAO,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,IAAI,CAAC;IAC1C,CAAC;CACF"}

package/dist/components/action-bar/ActionBar.d.ts

@@ -46,7 +46,7 @@ declare class ActionBarActions {
 export declare class ActionBar extends ActionBarActions {
     private _actionBarObjects;
     private _overflowMenu;
-    constructor(page: Page, actionbarContext?: Locator | null);
+    constructor(page: Page, actionBarContext?: Locator | null);
     openOverflowMenu: () => Promise<void>;
     overflowMenu: {
         getFilterButton: () => Locator;

package/dist/components/action-bar/ActionBar.js

@@ -48,8 +48,8 @@ class ActionBarActions {
     }
 }
 export class ActionBar extends ActionBarActions {
-    constructor(page, actionbarContext = null) {
-        super(page, actionbarContext);
+    constructor(page, actionBarContext = null) {
+        super(page, actionBarContext);
         this.openOverflowMenu = async () => {
             await this._actionBarObjects.overflowMenuButton().click();
         };
@@ -76,7 +76,7 @@ export class ActionBar extends ActionBarActions {
             getCollapseAllButton: () => wrapWithOverflowOpen(this, () => this._overflowMenu.getCollapseAllButton()),
             getExpandAllButton: () => wrapWithOverflowOpen(this, () => this._overflowMenu.getExpandAllButton())
         };
-        this._actionBarObjects = new ActionBarObjects(page, actionbarContext);
+        this._actionBarObjects = new ActionBarObjects(page, actionBarContext);
         this._overflowMenu = new ActionBarOverflow(page);
     }
 }