@testspectra/cli 1.0.44 → 1.0.46

package/dist/index.d.ts

@@ -1,8 +1,10 @@
 import { Command } from "commander";
+import { init } from "./plugin.js";
 export * from "./config/schema.js";
 export * from "./config/loader.js";
 export * from "./types/generator.js";
 export * from "@testspectra/matchers";
-export { init as initTsPlugin, default as tsPlugin } from "./plugin.js";
+export { init as initTsPlugin, init };
+export default init;
 export declare function createCliProgram(): Command;
 export declare function runCli(args?: string[]): Promise<void>;

package/dist/index.js

@@ -4,11 +4,13 @@ import { devicesCommand } from "./commands/devices.js";
 import { doctorCommand } from "./commands/doctor.js";
 import { initCommand } from "./commands/init.js";
 import { runCommand } from "./commands/run.js";
+import { init } from "./plugin.js";
 export * from "./config/schema.js";
 export * from "./config/loader.js";
 export * from "./types/generator.js";
 export * from "@testspectra/matchers";
-export { init as initTsPlugin, default as tsPlugin } from "./plugin.js";
+export { init as initTsPlugin, init };
+export default init;
 export function createCliProgram() {
     const program = new Command();
     program

package/dist/plugin.d.ts

@@ -10,6 +10,7 @@ declare function init(modules: {
     typescript: typeof ts;
 }): {
     create: (info: ts.server.PluginCreateInfo) => ts.LanguageService;
+    getExternalFiles: (project: ts.server.Project) => string[];
 };
 export default init;
 export { init };

package/dist/plugin.js

@@ -1,4 +1,34 @@
+import fs from "fs";
+import path from "path";
 import { TypeGenerator } from "./types/generator.js";
+/**
+ * Traverses upwards from `startDir` to locate the TestSpectra workspace root.
+ * Looks for indicators: `spectra.config.ts`, `.testspectra`, `pnpm-workspace.yaml`, or `nx.json`.
+ */
+function findWorkspaceRoot(startDir) {
+    let cur = path.resolve(startDir);
+    while (cur !== path.dirname(cur)) {
+        if (fs.existsSync(path.join(cur, "spectra.config.ts")) ||
+            fs.existsSync(path.join(cur, ".testspectra")) ||
+            fs.existsSync(path.join(cur, "pnpm-workspace.yaml")) ||
+            fs.existsSync(path.join(cur, "nx.json"))) {
+            return cur;
+        }
+        cur = path.dirname(cur);
+    }
+    return startDir;
+}
+function appendLog(workspaceRoot, message) {
+    try {
+        const logDir = path.join(workspaceRoot, ".testspectra", "logs");
+        if (!fs.existsSync(logDir))
+            fs.mkdirSync(logDir, { recursive: true });
+        const logFile = path.join(logDir, "plugin.log");
+        const timestamp = new Date().toISOString();
+        fs.appendFileSync(logFile, `[${timestamp}] ${message}\n`, "utf-8");
+    }
+    catch { }
+}
 /**
  * TypeScript Language Service Plugin Factory for TestSpectra.
  * Runs silently inside TSServer (VS Code, Cursor, WebStorm, Neovim, etc.).
@@ -11,31 +41,78 @@ function init(modules) {
     function create(info) {
         const project = info.project;
         const projectDir = project.getCurrentDirectory();
+        const workspaceRoot = findWorkspaceRoot(projectDir);
+        const log = (msg) => {
+            try {
+                info.project.projectService.logger.info(`[TestSpectra TS Plugin] ${msg}`);
+            }
+            catch { }
+            appendLog(workspaceRoot, msg);
+        };
+        log(`Plugin initialized on project: ${projectDir} (resolved root: ${workspaceRoot})`);
         // 1. Initial Generation on project load
         try {
-            TypeGenerator.writeDeclarationFiles(projectDir);
-            info.project.projectService.logger.info(`[TestSpectra TS Plugin] Initialized ambient declarations in ${projectDir}`);
+            TypeGenerator.writeDeclarationFiles(workspaceRoot);
+            log(`Generated ambient declarations on startup`);
         }
         catch (err) {
-            info.project.projectService.logger.info(`[TestSpectra TS Plugin] Failed initial type generation: ${err?.message}`);
+            log(`Failed initial type generation: ${err?.message}`);
         }
-        // 2. Watch for entity file changes inside TSServer
-        const watchedFolders = ["page-objects", "pageobjects", "actions", "steps", "fixtures", "hooks"];
-        // Debounce type regeneration
+        // Debounced regeneration handler
         let debounceTimer = null;
-        const triggerRegeneration = (pathChanged) => {
-            if (debounceTimer)
-                clearTimeout(debounceTimer);
-            debounceTimer = setTimeout(() => {
+        const triggerRegeneration = (reason, sync = false) => {
+            const doRegen = () => {
                 try {
-                    TypeGenerator.writeDeclarationFiles(projectDir);
-                    info.project.projectService.logger.info(`[TestSpectra TS Plugin] Regenerated ambient declarations after change in ${pathChanged}`);
+                    TypeGenerator.writeDeclarationFiles(workspaceRoot);
+                    log(`Regenerated ambient declarations (${reason})`);
                 }
                 catch (err) {
-                    info.project.projectService.logger.info(`[TestSpectra TS Plugin] Error during regeneration: ${err?.message}`);
+                    log(`Error during regeneration: ${err?.message}`);
                 }
-            }, 200);
+            };
+            if (sync) {
+                doRegen();
+            }
+            else {
+                if (debounceTimer)
+                    clearTimeout(debounceTimer);
+                debounceTimer = setTimeout(doRegen, 80);
+            }
         };
+        // 2. Active File System Watcher on the entire workspace
+        try {
+            if (fs.existsSync(workspaceRoot)) {
+                const watcher = fs.watch(workspaceRoot, { recursive: true }, (eventType, filename) => {
+                    if (!filename)
+                        return;
+                    const fn = filename.toString();
+                    // Skip internal and build directories
+                    if (fn.includes(".testspectra") ||
+                        fn.includes("node_modules") ||
+                        fn.includes(".git") ||
+                        fn.includes("dist") ||
+                        fn.includes(".nx")) {
+                        return;
+                    }
+                    // Match relevant entity files
+                    if (fn.includes("fixtures") ||
+                        fn.includes("page-objects") ||
+                        fn.includes("pageobjects") ||
+                        fn.includes("actions") ||
+                        fn.includes("steps") ||
+                        fn.includes("hooks") ||
+                        fn.includes("spectra.config")) {
+                        log(`Detected file change [${eventType}]: ${fn}`);
+                        triggerRegeneration(`fs.watch '${eventType}' on ${fn}`);
+                    }
+                });
+                watcher.on("error", () => { });
+                log(`Attached recursive fs.watch on ${workspaceRoot}`);
+            }
+        }
+        catch (err) {
+            log(`Note: Recursive fs.watch not supported or failed: ${err?.message}`);
+        }
         // 3. Proxy language service methods to detect file modifications / completions
         const proxy = Object.create(null);
         for (const k of Object.keys(info.languageService)) {
@@ -46,9 +123,9 @@ function init(modules) {
         // Intercept getCompletionsAtPosition to ensure fresh types
         const originalGetCompletions = info.languageService.getCompletionsAtPosition;
         proxy.getCompletionsAtPosition = (fileName, position, options, formattingSettings) => {
-            const isEntity = watchedFolders.some((f) => fileName.includes(f));
-            if (isEntity) {
-                triggerRegeneration(fileName);
+            const ext = path.extname(fileName);
+            if (ext === ".ts" || ext === ".tsx" || ext === ".js" || ext === ".mjs") {
+                triggerRegeneration(`completions at ${path.basename(fileName)}`, false);
             }
             return originalGetCompletions.apply(info.languageService, [
                 fileName,
@@ -57,9 +134,40 @@ function init(modules) {
                 formattingSettings,
             ]);
         };
+        // Intercept getQuickInfoAtPosition for fresh hover info
+        const originalGetQuickInfo = info.languageService.getQuickInfoAtPosition;
+        proxy.getQuickInfoAtPosition = (fileName, position) => {
+            return originalGetQuickInfo.apply(info.languageService, [fileName, position]);
+        };
         return proxy;
     }
-    return { create };
+    function getExternalFiles(project) {
+        try {
+            const workspaceRoot = findWorkspaceRoot(project.getCurrentDirectory());
+            const typesDir = path.join(workspaceRoot, ".testspectra", "types");
+            const files = [];
+            function collectDts(dir) {
+                if (!fs.existsSync(dir))
+                    return;
+                const entries = fs.readdirSync(dir, { withFileTypes: true });
+                for (const entry of entries) {
+                    const fullPath = path.join(dir, entry.name);
+                    if (entry.isDirectory()) {
+                        collectDts(fullPath);
+                    }
+                    else if (entry.isFile() && entry.name.endsWith(".d.ts")) {
+                        files.push(fullPath);
+                    }
+                }
+            }
+            collectDts(typesDir);
+            return files;
+        }
+        catch {
+            return [];
+        }
+    }
+    return { create, getExternalFiles };
 }
 export default init;
 export { init };

package/dist/types/generator.js

@@ -165,28 +165,51 @@ export class TypeGenerator {
                         const classFolder = path.join(poDir, className);
                         let matchedFile = null;
                         for (const stem of hierarchy) {
-                            const cand = path.join(classFolder, `${stem}.ts`);
-                            if (fs.existsSync(cand)) {
-                                matchedFile = path.relative(outputTypesDir, cand).replace(/\\/g, "/").replace(/\.ts$/, ".js");
-                                if (!matchedFile.startsWith("."))
-                                    matchedFile = `./${matchedFile}`;
-                                break;
+                            const candidates = [
+                                path.join(classFolder, `${stem}.ts`),
+                                path.join(classFolder, `${stem}.page.ts`),
+                                path.join(classFolder, `${stem}.po.ts`),
+                                path.join(classFolder, "index.ts"),
+                                path.join(classFolder, "common.ts"),
+                            ];
+                            for (const cand of candidates) {
+                                if (fs.existsSync(cand)) {
+                                    matchedFile = path.relative(outputTypesDir, cand).replace(/\\/g, "/").replace(/\.ts$/, ".js");
+                                    if (!matchedFile.startsWith("."))
+                                        matchedFile = `./${matchedFile}`;
+                                    break;
+                                }
                             }
+                            if (matchedFile)
+                                break;
                         }
                         if (matchedFile) {
-                            content += `declare const ${className}: typeof import('${matchedFile}').default;\n`;
+                            content += `declare const ${className}: (typeof import('${matchedFile}') extends { default: infer T } ? T : typeof import('${matchedFile}'));\n`;
                             declaredPOMs.add(className);
                         }
                     }
                     else if (entry.isFile() && entry.name.endsWith(".ts")) {
-                        const className = entry.name.split(".")[0];
+                        const parts = entry.name.split(".");
+                        const className = parts[0];
                         if (declaredPOMs.has(className))
                             continue;
-                        let rel = path.relative(outputTypesDir, 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);
+                        let isMatch = false;
+                        if (parts.length === 2) {
+                            // E.g. ProfilePage.ts (applies to all platforms)
+                            isMatch = true;
+                        }
+                        else if (parts.length > 2) {
+                            // E.g. ProfilePage.web.ts or ProfilePage.android.ts
+                            const stem = parts[1];
+                            isMatch = hierarchy.includes(stem);
+                        }
+                        if (isMatch) {
+                            let rel = path.relative(outputTypesDir, path.join(poDir, entry.name)).replace(/\\/g, "/").replace(/\.ts$/, ".js");
+                            if (!rel.startsWith("."))
+                                rel = `./${rel}`;
+                            content += `declare const ${className}: (typeof import('${rel}') extends { default: infer T } ? T : typeof import('${rel}'));\n`;
+                            declaredPOMs.add(className);
+                        }
                     }
                 }
             }
@@ -307,20 +330,31 @@ export class TypeGenerator {
         content += `// Managed automatically by TestSpectra Language Service Plugin.\n\n`;
         content += `interface TestSpectraFixtures {\n`;
         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);
+        function scanFixtureDir(dir) {
+            if (!fs.existsSync(dir))
+                return;
+            try {
+                const entries = fs.readdirSync(dir, { withFileTypes: true });
+                for (const entry of entries) {
+                    if (entry.name.startsWith("."))
+                        continue;
+                    if (entry.isDirectory()) {
+                        scanFixtureDir(path.join(dir, entry.name));
+                    }
+                    else if (entry.isFile()) {
+                        const parsed = path.parse(entry.name);
+                        const varName = parsed.name.replace(/[^a-zA-Z0-9_$]/g, "_");
+                        if (declaredFixtures.has(varName))
+                            continue;
+                        content += `  readonly ${varName}: string;\n`;
+                        declaredFixtures.add(varName);
+                    }
+                }
             }
+            catch { }
+        }
+        for (const fixturesDir of fixturesDirs) {
+            scanFixtureDir(fixturesDir);
         }
         content += `}\n`;
         content += `declare const Fixture: TestSpectraFixtures;\n`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testspectra/cli",
-  "version": "1.0.44",
+  "version": "1.0.46",
   "description": "TestSpectra Zero-Config Cross-Platform Test Runner CLI",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -21,7 +21,7 @@
   ],
   "dependencies": {
     "@clack/prompts": "^1.7.0",
-    "@testspectra/matchers": "^1.0.44",
+    "@testspectra/matchers": "^1.0.46",
     "chalk": "^5.3.0",
     "commander": "^12.1.0",
     "dotenv": "^16.4.5",

package/templates/default/package.json

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

package/templates/default/tsconfig.spectra.android.json

@@ -7,7 +7,10 @@
     "noEmit": true,
     "skipLibCheck": true,
     "strict": true,
-    "types": ["node", "@wdio/globals/types", "@wdio/mocha-framework"]
+    "types": ["node", "@wdio/globals/types", "@wdio/mocha-framework"],
+    "plugins": [
+      { "name": "@testspectra/cli" }
+    ]
   },
   "include": [
     ".testspectra/types/android.d.ts",

package/templates/default/tsconfig.spectra.ios.json

@@ -7,7 +7,10 @@
     "noEmit": true,
     "skipLibCheck": true,
     "strict": true,
-    "types": ["node", "@wdio/globals/types", "@wdio/mocha-framework"]
+    "types": ["node", "@wdio/globals/types", "@wdio/mocha-framework"],
+    "plugins": [
+      { "name": "@testspectra/cli" }
+    ]
   },
   "include": [
     ".testspectra/types/ios.d.ts",

package/templates/default/tsconfig.spectra.web.json

@@ -7,7 +7,10 @@
     "noEmit": true,
     "skipLibCheck": true,
     "strict": true,
-    "types": ["node", "@wdio/globals/types", "@wdio/mocha-framework"]
+    "types": ["node", "@wdio/globals/types", "@wdio/mocha-framework"],
+    "plugins": [
+      { "name": "@testspectra/cli" }
+    ]
   },
   "include": [
     ".testspectra/types/web.d.ts",

package/templates/nx/package.json

@@ -11,7 +11,7 @@
   },
   "devDependencies": {
     "@testspectra/cli": "workspace:*",
-    "@testspectra/matchers": "^1.0.44",
+    "@testspectra/matchers": "^1.0.46",
     "@types/node": "^20.14.0",
     "@wdio/globals": "^9.2.8",
     "@wdio/mocha-framework": "^9.2.8",

package/templates/nx/tsconfig.spectra.android.json

@@ -7,7 +7,10 @@
     "noEmit": true,
     "skipLibCheck": true,
     "strict": true,
-    "types": ["node", "@wdio/globals/types", "@wdio/mocha-framework"]
+    "types": ["node", "@wdio/globals/types", "@wdio/mocha-framework"],
+    "plugins": [
+      { "name": "@testspectra/cli" }
+    ]
   },
   "include": [
     ".testspectra/types/android.d.ts",

package/templates/nx/tsconfig.spectra.ios.json

@@ -7,7 +7,10 @@
     "noEmit": true,
     "skipLibCheck": true,
     "strict": true,
-    "types": ["node", "@wdio/globals/types", "@wdio/mocha-framework"]
+    "types": ["node", "@wdio/globals/types", "@wdio/mocha-framework"],
+    "plugins": [
+      { "name": "@testspectra/cli" }
+    ]
   },
   "include": [
     ".testspectra/types/ios.d.ts",

package/templates/nx/tsconfig.spectra.shared.json

@@ -7,7 +7,10 @@
     "noEmit": true,
     "skipLibCheck": true,
     "strict": true,
-    "types": ["node", "@wdio/globals/types", "@wdio/mocha-framework"]
+    "types": ["node", "@wdio/globals/types", "@wdio/mocha-framework"],
+    "plugins": [
+      { "name": "@testspectra/cli" }
+    ]
   },
   "include": [
     ".testspectra/types/shared/common.d.ts",

package/templates/nx/tsconfig.spectra.web.json

@@ -7,7 +7,10 @@
     "noEmit": true,
     "skipLibCheck": true,
     "strict": true,
-    "types": ["node", "@wdio/globals/types", "@wdio/mocha-framework"]
+    "types": ["node", "@wdio/globals/types", "@wdio/mocha-framework"],
+    "plugins": [
+      { "name": "@testspectra/cli" }
+    ]
   },
   "include": [
     ".testspectra/types/web.d.ts",