@testspectra/cli 1.0.45 → 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

@@ -18,6 +18,17 @@ function findWorkspaceRoot(startDir) {
     }
     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.).
@@ -36,11 +47,13 @@ function init(modules) {
                 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(workspaceRoot);
-            log(`Initialized ambient declarations in workspace root: ${workspaceRoot}`);
+            log(`Generated ambient declarations on startup`);
         }
         catch (err) {
             log(`Failed initial type generation: ${err?.message}`);
@@ -89,10 +102,12 @@ function init(modules) {
                         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) {
@@ -126,7 +141,33 @@ function init(modules) {
         };
         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);
+                        }
                     }
                 }
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testspectra/cli",
-  "version": "1.0.45",
+  "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.45",
+    "@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.45",
+    "@testspectra/matchers": "^1.0.46",
     "@types/node": "^20.14.0",
     "@wdio/globals": "^9.2.8",
     "@wdio/mocha-framework": "^9.2.8",

package/templates/nx/package.json

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