@testspectra/cli 1.0.16 → 1.0.18

package/dist/types/generator.js

@@ -8,17 +8,52 @@ const PLATFORM_HIERARCHY = {
     common: ["common"],
 };
 export class TypeGenerator {
-    static getPageObjectsDir(cwd) {
+    static getPageObjectsDirs(cwd) {
+        const dirs = [];
         const p1 = path.join(cwd, "page-objects");
+        const p2 = path.join(cwd, "pageobjects");
         if (fs.existsSync(p1))
-            return p1;
-        return path.join(cwd, "pageobjects");
+            dirs.push(p1);
+        else if (fs.existsSync(p2))
+            dirs.push(p2);
+        // Look for shared directories in monorepo root
+        let cur = cwd;
+        while (cur !== path.dirname(cur)) {
+            const sharedTestingPo = path.join(cur, "shared/testing/page-objects");
+            const sharedPo = path.join(cur, "shared/page-objects");
+            if (fs.existsSync(sharedTestingPo) && !dirs.includes(sharedTestingPo))
+                dirs.push(sharedTestingPo);
+            if (fs.existsSync(sharedPo) && !dirs.includes(sharedPo))
+                dirs.push(sharedPo);
+            if (fs.existsSync(path.join(cur, "pnpm-workspace.yaml")) || fs.existsSync(path.join(cur, "nx.json")))
+                break;
+            cur = path.dirname(cur);
+        }
+        return dirs;
+    }
+    static getEntityDirs(cwd, entityType) {
+        const dirs = [];
+        const local = path.join(cwd, entityType);
+        if (fs.existsSync(local))
+            dirs.push(local);
+        let cur = cwd;
+        while (cur !== path.dirname(cur)) {
+            const sharedTesting = path.join(cur, "shared/testing", entityType);
+            const shared = path.join(cur, "shared", entityType);
+            if (fs.existsSync(sharedTesting) && !dirs.includes(sharedTesting))
+                dirs.push(sharedTesting);
+            if (fs.existsSync(shared) && !dirs.includes(shared))
+                dirs.push(shared);
+            if (fs.existsSync(path.join(cur, "pnpm-workspace.yaml")) || fs.existsSync(path.join(cur, "nx.json")))
+                break;
+            cur = path.dirname(cur);
+        }
+        return dirs;
     }
     static generateAmbientDeclarations(cwd) {
-        const poDir = this.getPageObjectsDir(cwd);
-        const actionsDir = path.join(cwd, "actions");
-        const stepsDir = path.join(cwd, "steps");
-        const fixturesDir = path.join(cwd, "fixtures");
+        const poDirs = this.getPageObjectsDirs(cwd);
+        const actionsDirs = this.getEntityDirs(cwd, "actions");
+        const stepsDirs = this.getEntityDirs(cwd, "steps");
         const platforms = ["web", "android", "ios", "mobile", "common"];
         const results = {};
         for (const platform of platforms) {
@@ -82,108 +117,148 @@ export class TypeGenerator {
             content += `  shouldHaveClass(this: Promise<WebdriverIO.Element>, className: string): Promise<WebdriverIO.Element>;\n`;
             content += `  shouldHaveAttribute(this: Promise<WebdriverIO.Element>, attributeName: string, expectedValue?: string): Promise<WebdriverIO.Element>;\n`;
             content += `}\n\n`;
-            // 1. Page Objects Global Declarations (Hierarchical)
-            // 2. Page Objects Global Declarations (Hierarchical)
-            if (fs.existsSync(poDir)) {
+            // 1. Page Objects Global Declarations (Local + Shared Hierarchical)
+            const declaredPOMs = new Set();
+            for (const poDir of poDirs) {
+                if (!fs.existsSync(poDir))
+                    continue;
                 const poEntries = fs.readdirSync(poDir, { withFileTypes: true });
                 for (const entry of poEntries) {
                     if (entry.name.startsWith("."))
                         continue;
                     if (entry.isDirectory()) {
                         const className = entry.name;
+                        if (declaredPOMs.has(className))
+                            continue;
                         const classFolder = path.join(poDir, className);
-                        // Search hierarchy
                         let matchedFile = null;
                         for (const stem of hierarchy) {
                             const cand = path.join(classFolder, `${stem}.ts`);
                             if (fs.existsSync(cand)) {
-                                matchedFile = `../../page-objects/${className}/${stem}.js`;
+                                matchedFile = path.relative(path.join(cwd, ".testspectra/types"), cand).replace(/\\/g, "/").replace(/\.ts$/, ".js");
+                                if (!matchedFile.startsWith("."))
+                                    matchedFile = `./${matchedFile}`;
                                 break;
                             }
                         }
                         if (matchedFile) {
                             content += `declare const ${className}: typeof import('${matchedFile}').default;\n`;
+                            declaredPOMs.add(className);
                         }
                     }
                     else if (entry.isFile() && entry.name.endsWith(".ts")) {
                         const className = entry.name.split(".")[0];
-                        content += `declare const ${className}: typeof import('../../page-objects/${entry.name.replace(".ts", ".js")}').default;\n`;
+                        if (declaredPOMs.has(className))
+                            continue;
+                        let rel = path.relative(path.join(cwd, ".testspectra/types"), path.join(poDir, entry.name)).replace(/\\/g, "/").replace(/\.ts$/, ".js");
+                        if (!rel.startsWith("."))
+                            rel = `./${rel}`;
+                        content += `declare const ${className}: typeof import('${rel}').default;\n`;
+                        declaredPOMs.add(className);
                     }
                 }
             }
-            // 3. Actions Global Interface (Extends built-in @testspectra/cli Spectra)
+            // 2. Actions Global Interface (Local + Shared)
             content += `\ninterface TestSpectraActions extends Omit<typeof import('@testspectra/cli').Spectra, ''> {\n`;
-            if (fs.existsSync(actionsDir)) {
+            const declaredActions = new Set();
+            for (const actionsDir of actionsDirs) {
+                if (!fs.existsSync(actionsDir))
+                    continue;
                 const actionEntries = fs.readdirSync(actionsDir, { withFileTypes: true });
                 for (const entry of actionEntries) {
                     if (entry.name.startsWith("."))
                         continue;
                     if (entry.isDirectory()) {
                         const actionName = entry.name;
+                        if (declaredActions.has(actionName))
+                            continue;
                         const actionFolder = path.join(actionsDir, actionName);
                         let matchedFile = null;
                         for (const stem of hierarchy) {
                             const cand1 = path.join(actionFolder, `${stem}.action.ts`);
                             const cand2 = path.join(actionFolder, `${stem}.ts`);
                             if (fs.existsSync(cand1)) {
-                                matchedFile = `../../actions/${actionName}/${stem}.action.js`;
+                                matchedFile = path.relative(path.join(cwd, ".testspectra/types"), cand1).replace(/\\/g, "/").replace(/\.ts$/, ".js");
                                 break;
                             }
                             else if (fs.existsSync(cand2)) {
-                                matchedFile = `../../actions/${actionName}/${stem}.js`;
+                                matchedFile = path.relative(path.join(cwd, ".testspectra/types"), cand2).replace(/\\/g, "/").replace(/\.ts$/, ".js");
                                 break;
                             }
                         }
                         if (matchedFile) {
+                            if (!matchedFile.startsWith("."))
+                                matchedFile = `./${matchedFile}`;
                             content += `  ${actionName}: (typeof import('${matchedFile}') extends { default: infer T } ? T : typeof import('${matchedFile}'));\n`;
+                            declaredActions.add(actionName);
                         }
                         else {
                             content += `  ${actionName}: (...args: any[]) => Promise<any>;\n`;
+                            declaredActions.add(actionName);
                         }
                     }
                     else if (entry.isFile() && entry.name.endsWith(".ts")) {
                         const actionName = entry.name.split(".")[0];
-                        const modPath = `../../actions/${entry.name.replace(".ts", ".js")}`;
-                        content += `  ${actionName}: (typeof import('${modPath}') extends { default: infer T } ? T : typeof import('${modPath}'));\n`;
+                        if (declaredActions.has(actionName))
+                            continue;
+                        let rel = path.relative(path.join(cwd, ".testspectra/types"), path.join(actionsDir, entry.name)).replace(/\\/g, "/").replace(/\.ts$/, ".js");
+                        if (!rel.startsWith("."))
+                            rel = `./${rel}`;
+                        content += `  ${actionName}: (typeof import('${rel}') extends { default: infer T } ? T : typeof import('${rel}'));\n`;
+                        declaredActions.add(actionName);
                     }
                 }
             }
             content += `}\n`;
             content += `declare const Spectra: TestSpectraActions;\n\n`;
-            // 4. Shared Steps Global Interface
+            // 3. Shared Steps Global Interface (Local + Shared)
             content += `interface TestSpectraSteps {\n`;
-            if (fs.existsSync(stepsDir)) {
+            const declaredSteps = new Set();
+            for (const stepsDir of stepsDirs) {
+                if (!fs.existsSync(stepsDir))
+                    continue;
                 const stepEntries = fs.readdirSync(stepsDir, { withFileTypes: true });
                 for (const entry of stepEntries) {
                     if (entry.name.startsWith("."))
                         continue;
                     if (entry.isDirectory()) {
                         const stepName = entry.name;
+                        if (declaredSteps.has(stepName))
+                            continue;
                         const stepFolder = path.join(stepsDir, stepName);
                         let matchedFile = null;
                         for (const stem of hierarchy) {
                             const cand1 = path.join(stepFolder, `${stem}.step.ts`);
                             const cand2 = path.join(stepFolder, `${stem}.ts`);
                             if (fs.existsSync(cand1)) {
-                                matchedFile = `../../steps/${stepName}/${stem}.step.js`;
+                                matchedFile = path.relative(path.join(cwd, ".testspectra/types"), cand1).replace(/\\/g, "/").replace(/\.ts$/, ".js");
                                 break;
                             }
                             else if (fs.existsSync(cand2)) {
-                                matchedFile = `../../steps/${stepName}/${stem}.js`;
+                                matchedFile = path.relative(path.join(cwd, ".testspectra/types"), cand2).replace(/\\/g, "/").replace(/\.ts$/, ".js");
                                 break;
                             }
                         }
                         if (matchedFile) {
+                            if (!matchedFile.startsWith("."))
+                                matchedFile = `./${matchedFile}`;
                             content += `  ${stepName}: (typeof import('${matchedFile}') extends { default: infer T } ? T : typeof import('${matchedFile}'));\n`;
+                            declaredSteps.add(stepName);
                         }
                         else {
                             content += `  ${stepName}: (...args: any[]) => Promise<any>;\n`;
+                            declaredSteps.add(stepName);
                         }
                     }
                     else if (entry.isFile() && entry.name.endsWith(".ts")) {
                         const stepName = entry.name.split(".")[0];
-                        const modPath = `../../steps/${entry.name.replace(".ts", ".js")}`;
-                        content += `  ${stepName}: (typeof import('${modPath}') extends { default: infer T } ? T : typeof import('${modPath}'));\n`;
+                        if (declaredSteps.has(stepName))
+                            continue;
+                        let rel = path.relative(path.join(cwd, ".testspectra/types"), path.join(stepsDir, entry.name)).replace(/\\/g, "/").replace(/\.ts$/, ".js");
+                        if (!rel.startsWith("."))
+                            rel = `./${rel}`;
+                        content += `  ${stepName}: (typeof import('${rel}') extends { default: infer T } ? T : typeof import('${rel}'));\n`;
+                        declaredSteps.add(stepName);
                     }
                 }
             }
@@ -194,18 +269,24 @@ export class TypeGenerator {
         return results;
     }
     static generateFixturesDeclaration(cwd) {
-        const fixturesDir = path.join(cwd, "fixtures");
+        const fixturesDirs = this.getEntityDirs(cwd, "fixtures");
         let content = `// Auto-generated ambient fixture declarations for TestSpectra\n`;
         content += `// Do not edit manually. Run 'spectra watch' or let the Language Service manage this.\n\n`;
         content += `interface TestSpectraFixtures {\n`;
-        if (fs.existsSync(fixturesDir)) {
+        const declaredFixtures = new Set();
+        for (const fixturesDir of fixturesDirs) {
+            if (!fs.existsSync(fixturesDir))
+                continue;
             const fixtureFiles = fs.readdirSync(fixturesDir);
             for (const file of fixtureFiles) {
                 if (file.startsWith("."))
                     continue;
                 const parsed = path.parse(file);
                 const varName = parsed.name.replace(/[^a-zA-Z0-9_$]/g, "_");
+                if (declaredFixtures.has(varName))
+                    continue;
                 content += `  readonly ${varName}: string;\n`;
+                declaredFixtures.add(varName);
             }
         }
         content += `}\n`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testspectra/cli",
-  "version": "1.0.16",
+  "version": "1.0.18",
   "description": "TestSpectra Zero-Config Cross-Platform Test Runner CLI",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/templates/nx/modules/auth/e2e/.testspectra/types/android.d.ts

@@ -64,16 +64,19 @@ interface Promise<T> {
 declare const LoginPage: typeof import('../../page-objects/LoginPage/mobile.js').default;
 declare const ProductPage: typeof import('../../page-objects/ProductPage/mobile.js').default;
 declare const SettingsPage: typeof import('../../page-objects/SettingsPage/common.js').default;
+declare const NavigationBar: typeof import('../../../../../shared/testing/page-objects/NavigationBar/common.js').default;
 
 interface TestSpectraActions extends Omit<typeof import('@testspectra/cli').Spectra, ''> {
   applyDiscount: (typeof import('../../actions/applyDiscount/mobile.action.js') extends { default: infer T } ? T : typeof import('../../actions/applyDiscount/mobile.action.js'));
   verifyOtp: (typeof import('../../actions/verifyOtp/mobile.action.js') extends { default: infer T } ? T : typeof import('../../actions/verifyOtp/mobile.action.js'));
+  dismissBanner: (typeof import('../../../../../shared/testing/actions/dismissBanner/common.action.js') extends { default: infer T } ? T : typeof import('../../../../../shared/testing/actions/dismissBanner/common.action.js'));
 }
 declare const Spectra: TestSpectraActions;
 
 interface TestSpectraSteps {
   loginUser: (typeof import('../../steps/loginUser/mobile.step.js') extends { default: infer T } ? T : typeof import('../../steps/loginUser/mobile.step.js'));
   searchProduct: (typeof import('../../steps/searchProduct/mobile.step.js') extends { default: infer T } ? T : typeof import('../../steps/searchProduct/mobile.step.js'));
+  loginAsAdmin: (typeof import('../../../../../shared/testing/steps/loginAsAdmin/common.step.js') extends { default: infer T } ? T : typeof import('../../../../../shared/testing/steps/loginAsAdmin/common.step.js'));
 }
 declare const Step: TestSpectraSteps;
 

package/templates/nx/modules/auth/e2e/.testspectra/types/common.d.ts

@@ -62,16 +62,19 @@ interface Promise<T> {
 }
 
 declare const SettingsPage: typeof import('../../page-objects/SettingsPage/common.js').default;
+declare const NavigationBar: typeof import('../../../../../shared/testing/page-objects/NavigationBar/common.js').default;
 
 interface TestSpectraActions extends Omit<typeof import('@testspectra/cli').Spectra, ''> {
   applyDiscount: (...args: any[]) => Promise<any>;
   verifyOtp: (...args: any[]) => Promise<any>;
+  dismissBanner: (typeof import('../../../../../shared/testing/actions/dismissBanner/common.action.js') extends { default: infer T } ? T : typeof import('../../../../../shared/testing/actions/dismissBanner/common.action.js'));
 }
 declare const Spectra: TestSpectraActions;
 
 interface TestSpectraSteps {
   loginUser: (...args: any[]) => Promise<any>;
   searchProduct: (...args: any[]) => Promise<any>;
+  loginAsAdmin: (typeof import('../../../../../shared/testing/steps/loginAsAdmin/common.step.js') extends { default: infer T } ? T : typeof import('../../../../../shared/testing/steps/loginAsAdmin/common.step.js'));
 }
 declare const Step: TestSpectraSteps;
 

package/templates/nx/modules/auth/e2e/.testspectra/types/fixtures.d.ts

@@ -5,5 +5,6 @@ interface TestSpectraFixtures {
   readonly couponCode: string;
   readonly searchQuery: string;
   readonly userData: string;
+  readonly appConfig: string;
 }
 declare const Fixture: TestSpectraFixtures;

package/templates/nx/modules/auth/e2e/.testspectra/types/ios.d.ts

@@ -64,16 +64,19 @@ interface Promise<T> {
 declare const LoginPage: typeof import('../../page-objects/LoginPage/mobile.js').default;
 declare const ProductPage: typeof import('../../page-objects/ProductPage/mobile.js').default;
 declare const SettingsPage: typeof import('../../page-objects/SettingsPage/common.js').default;
+declare const NavigationBar: typeof import('../../../../../shared/testing/page-objects/NavigationBar/common.js').default;
 
 interface TestSpectraActions extends Omit<typeof import('@testspectra/cli').Spectra, ''> {
   applyDiscount: (typeof import('../../actions/applyDiscount/mobile.action.js') extends { default: infer T } ? T : typeof import('../../actions/applyDiscount/mobile.action.js'));
   verifyOtp: (typeof import('../../actions/verifyOtp/mobile.action.js') extends { default: infer T } ? T : typeof import('../../actions/verifyOtp/mobile.action.js'));
+  dismissBanner: (typeof import('../../../../../shared/testing/actions/dismissBanner/common.action.js') extends { default: infer T } ? T : typeof import('../../../../../shared/testing/actions/dismissBanner/common.action.js'));
 }
 declare const Spectra: TestSpectraActions;
 
 interface TestSpectraSteps {
   loginUser: (typeof import('../../steps/loginUser/mobile.step.js') extends { default: infer T } ? T : typeof import('../../steps/loginUser/mobile.step.js'));
   searchProduct: (typeof import('../../steps/searchProduct/mobile.step.js') extends { default: infer T } ? T : typeof import('../../steps/searchProduct/mobile.step.js'));
+  loginAsAdmin: (typeof import('../../../../../shared/testing/steps/loginAsAdmin/common.step.js') extends { default: infer T } ? T : typeof import('../../../../../shared/testing/steps/loginAsAdmin/common.step.js'));
 }
 declare const Step: TestSpectraSteps;
 

package/templates/nx/modules/auth/e2e/.testspectra/types/mobile.d.ts

@@ -64,16 +64,19 @@ interface Promise<T> {
 declare const LoginPage: typeof import('../../page-objects/LoginPage/mobile.js').default;
 declare const ProductPage: typeof import('../../page-objects/ProductPage/mobile.js').default;
 declare const SettingsPage: typeof import('../../page-objects/SettingsPage/common.js').default;
+declare const NavigationBar: typeof import('../../../../../shared/testing/page-objects/NavigationBar/common.js').default;
 
 interface TestSpectraActions extends Omit<typeof import('@testspectra/cli').Spectra, ''> {
   applyDiscount: (typeof import('../../actions/applyDiscount/mobile.action.js') extends { default: infer T } ? T : typeof import('../../actions/applyDiscount/mobile.action.js'));
   verifyOtp: (typeof import('../../actions/verifyOtp/mobile.action.js') extends { default: infer T } ? T : typeof import('../../actions/verifyOtp/mobile.action.js'));
+  dismissBanner: (typeof import('../../../../../shared/testing/actions/dismissBanner/common.action.js') extends { default: infer T } ? T : typeof import('../../../../../shared/testing/actions/dismissBanner/common.action.js'));
 }
 declare const Spectra: TestSpectraActions;
 
 interface TestSpectraSteps {
   loginUser: (typeof import('../../steps/loginUser/mobile.step.js') extends { default: infer T } ? T : typeof import('../../steps/loginUser/mobile.step.js'));
   searchProduct: (typeof import('../../steps/searchProduct/mobile.step.js') extends { default: infer T } ? T : typeof import('../../steps/searchProduct/mobile.step.js'));
+  loginAsAdmin: (typeof import('../../../../../shared/testing/steps/loginAsAdmin/common.step.js') extends { default: infer T } ? T : typeof import('../../../../../shared/testing/steps/loginAsAdmin/common.step.js'));
 }
 declare const Step: TestSpectraSteps;
 

package/templates/nx/modules/auth/e2e/.testspectra/types/web.d.ts

@@ -64,16 +64,19 @@ interface Promise<T> {
 declare const LoginPage: typeof import('../../page-objects/LoginPage/web.js').default;
 declare const ProductPage: typeof import('../../page-objects/ProductPage/web.js').default;
 declare const SettingsPage: typeof import('../../page-objects/SettingsPage/common.js').default;
+declare const NavigationBar: typeof import('../../../../../shared/testing/page-objects/NavigationBar/common.js').default;
 
 interface TestSpectraActions extends Omit<typeof import('@testspectra/cli').Spectra, ''> {
   applyDiscount: (typeof import('../../actions/applyDiscount/web.action.js') extends { default: infer T } ? T : typeof import('../../actions/applyDiscount/web.action.js'));
   verifyOtp: (typeof import('../../actions/verifyOtp/web.action.js') extends { default: infer T } ? T : typeof import('../../actions/verifyOtp/web.action.js'));
+  dismissBanner: (typeof import('../../../../../shared/testing/actions/dismissBanner/common.action.js') extends { default: infer T } ? T : typeof import('../../../../../shared/testing/actions/dismissBanner/common.action.js'));
 }
 declare const Spectra: TestSpectraActions;
 
 interface TestSpectraSteps {
   loginUser: (typeof import('../../steps/loginUser/web.step.js') extends { default: infer T } ? T : typeof import('../../steps/loginUser/web.step.js'));
   searchProduct: (typeof import('../../steps/searchProduct/web.step.js') extends { default: infer T } ? T : typeof import('../../steps/searchProduct/web.step.js'));
+  loginAsAdmin: (typeof import('../../../../../shared/testing/steps/loginAsAdmin/common.step.js') extends { default: infer T } ? T : typeof import('../../../../../shared/testing/steps/loginAsAdmin/common.step.js'));
 }
 declare const Step: TestSpectraSteps;
 

package/templates/nx/modules/auth/e2e/package.json

@@ -9,6 +9,7 @@
   },
   "devDependencies": {
     "@testspectra/cli": "workspace:*",
+    "@testspectra/shared-testing": "workspace:*",
     "@types/node": "^20.14.0",
     "@wdio/globals": "^9.2.8",
     "@wdio/mocha-framework": "^9.2.8",

package/templates/nx/modules/auth/e2e/specs/Auth/TC-AUTH-01/web.test.ts

@@ -1,13 +1,19 @@
 it("should authenticate user and verify flash message across specific platforms", async () => {
+  // 1. Global Fixtures (Module Fixture + Shared Workspace Fixture)
   await browser.intercept("/api/status", "GET", Fixture.userData);
 
-  // 1. Navigation via Page Object
+  // 2. Global Shared Action from shared/testing (dismiss global banner if present)
+  await Spectra.dismissBanner();
+
+  // 3. Navigation via Module Page Object & Shared Page Object
+  await LoginPage.open();
+  await NavigationBar.goToHome();
   await LoginPage.open();
 
-  // 2. High-level business flow via Shared Step & Page Object
-  await Step.loginUser("tomsmith", "SuperSecretPassword!");
+  // 4. High-level business flow via Shared Step from shared/testing
+  await Step.loginAsAdmin();
 
-  // 3. Direct callable assertion on Page Object element
+  // 5. Direct callable assertion on Page Object element
   await LoginPage.flashAlert.shouldBeVisible();
   await LoginPage.flashAlert.shouldContainText("You logged into a secure area!");
 });