@testspectra/cli 1.1.8-rc.2 → 1.1.8-rc.20

package/dist/generator/type-generator.js

@@ -13,8 +13,11 @@ export const PLATFORM_HIERARCHY = {
  * Discovers all feature directories and shared library directories.
  * Standard discovery hierarchy:
  * 1. Nx / Monorepo Project Descriptors (`project.json`):
- *    - projectType: "library" OR tags: ["type:shared", "type:library", "scope:shared"] => Shared Library Scope (isShared: true)
- *    - projectType: "application" OR tags: ["type:e2e", "type:app"] => Feature Scope (isShared: false)
+ *    - tags: ["testspectra:shared"] => Shared Library Scope (isShared: true)
+ *    - tags: ["testspectra:e2e"] or ["testspectra:scope:<name>"] => Feature Scope (isShared: false)
+ *    - Generic Nx libraries/apps without testspectra tags are not TestSpectra scopes and recursion
+ *      continues into their subdirectories so nested e2e projects (e.g. `packages/features/auth/e2e`)
+ *      are discovered.
  * 2. Explicit User Configuration (`tsconfig.spectra.shared.json`):
  *    - Custom include path for shared testing utilities
  * 3. Dynamic Workspace Filesystem Discovery (Fallback for non-Nx / custom layouts):
@@ -48,16 +51,9 @@ export function discoverEntityScopes(cwd) {
         if (fs.existsSync(projectJsonPath)) {
             try {
                 const pObj = JSON.parse(fs.readFileSync(projectJsonPath, 'utf-8'));
-                const projectType = pObj.projectType;
                 const tags = Array.isArray(pObj.tags) ? pObj.tags : [];
-                const isSharedLib = projectType === 'library' ||
-                    tags.includes('type:shared') ||
-                    tags.includes('type:library') ||
-                    tags.includes('scope:shared');
-                const isE2eApp = projectType === 'application' ||
-                    tags.includes('type:e2e') ||
-                    tags.includes('type:app') ||
-                    tags.some((t) => t.startsWith('scope:') && t !== 'scope:shared');
+                const isSharedLib = tags.includes('testspectra:shared');
+                const isE2eApp = tags.includes('testspectra:e2e') || tags.some((t) => t.startsWith('testspectra:scope:'));
                 if (isSharedLib) {
                     if (!scopes.some((s) => s.dir === dir)) {
                         scopes.push({ name: 'shared', dir, isShared: true });
@@ -65,9 +61,9 @@ export function discoverEntityScopes(cwd) {
                     return; // Do not recurse into subdirectories of an identified project
                 }
                 else if (isE2eApp) {
-                    // Extract scope name from tags (e.g. "scope:matchers" => "matchers") or project name
-                    const scopeTag = tags.find((t) => t.startsWith('scope:') && t !== 'scope:shared');
-                    let featureName = scopeTag ? scopeTag.replace('scope:', '') : '';
+                    // Extract scope name from tags (e.g. "testspectra:scope:matchers" => "matchers") or project name
+                    const scopeTag = tags.find((t) => t.startsWith('testspectra:scope:'));
+                    let featureName = scopeTag ? scopeTag.replace('testspectra:scope:', '') : '';
                     if (!featureName && pObj.name) {
                         featureName = pObj.name.replace(/-e2e$/, '').replace(/^e2e-/, '');
                     }
@@ -329,6 +325,9 @@ export class TypeGenerator {
             const hierarchy = PLATFORM_HIERARCHY[platform];
             let content = `// Auto-generated ambient declarations for TestSpectra [${platform.toUpperCase()}]\n`;
             content += `// Managed automatically by TestSpectra Language Service Plugin.\n\n`;
+            content += `/// <reference types="@testspectra/matchers" />\n`;
+            content += `/// <reference path="./fixtures.d.ts" />\n`;
+            content += `/// <reference path="${envRefPath}" />\n\n`;
             // TestSpectra's Rust-native orchestrator worker (core/orchestrator/src/worker/bdd_runner.ts)
             // registers its own `it`/`test`/lifecycle-hook globals directly — there is no WDIO or Mocha
             // runtime involved at all (not just for component testing; this is true across every
@@ -346,9 +345,7 @@ export class TypeGenerator {
                 // — the Rust orchestrator's BDD runtime has no `expect` global at all.
                 content += `declare const expect: import('@testspectra/react').ExpectStatic;\n`;
             }
-            content += `/// <reference types="@testspectra/matchers" />\n`;
-            content += `/// <reference path="./fixtures.d.ts" />\n`;
-            content += `/// <reference path="${envRefPath}" />\n\n`;
+            content += `\n`;
             // 1. Page Objects Global Declarations
             const declaredPOMs = new Set();
             for (const poDir of poDirs) {

package/dist/index.js

@@ -41,13 +41,13 @@ export function createCliProgram() {
         .command('install [dependency]')
         .description('Install missing testing dependencies, browser drivers, and workspace packages')
         .option('-f, --force', 'Force re-installation of dependencies')
-        .addHelpText('after', `
-Examples:
-  $ spectra install                 Install all missing required dependencies automatically
-  $ spectra install chrome          Install Google Chrome for Testing & matching Chromedriver
-  $ spectra install adb             Install Google Android SDK Platform Tools (ADB)
-  $ spectra install bun             Install Bun runtime
-  $ spectra install android-driver  Install Spectra Android Native Driver & WDIO Service
+        .addHelpText('after', `
+Examples:
+  $ spectra install                 Install all missing required dependencies automatically
+  $ spectra install chrome          Install Google Chrome for Testing & matching Chromedriver
+  $ spectra install adb             Install Google Android SDK Platform Tools (ADB)
+  $ spectra install bun             Install Bun runtime
+  $ spectra install android-driver  Install Spectra Android Native Driver & WDIO Service
   $ spectra install wdio            Install WebDriverIO core packages and matchers`)
         .action(installCommand);
     program
@@ -105,10 +105,10 @@ Examples:
         .command('license [action] [key]')
         .description('Manage TestSpectra commercial license (activate, status, remove)')
         .option('--json', 'Output license details as JSON')
-        .addHelpText('after', `
-Examples:
-  $ spectra license activate <KEY>   Activate license key and auto-configure private driver registry
-  $ spectra license status           Display active license organization, plan, and expiration
+        .addHelpText('after', `
+Examples:
+  $ spectra license activate <KEY>   Activate license key and auto-configure private driver registry
+  $ spectra license status           Display active license organization, plan, and expiration
   $ spectra license remove           Remove locally activated license credentials`)
         .action(licenseCommand);
     const skills = program

package/dist/linter/__tests__/component-test-imports.test.js

@@ -14,20 +14,20 @@ const __dirname = path.dirname(__filename);
  */
 describe('Component Test (.tsx) Import Exception', () => {
     const tempDir = path.join(__dirname, '__temp_tsx_imports__');
-    const specFrontmatter = `---
-id: TC-0200
-title: Sample component test
-priority: High
-caseType: Positive
-status: automated
-coverage:
-  web: automated
----
-
-# Sample component test
-
-## Test Steps
-1. Mount the component and assert it is visible.
+    const specFrontmatter = `---
+id: TC-0200
+title: Sample component test
+priority: High
+caseType: Positive
+status: automated
+coverage:
+  web: automated
+---
+
+# Sample component test
+
+## Test Steps
+1. Mount the component and assert it is visible.
 `;
     beforeEach(() => {
         fs.mkdirSync(tempDir, { recursive: true });
@@ -39,23 +39,23 @@ coverage:
         }
     });
     it('does not flag no-manual-import for ordinary component/library imports in .test.tsx', () => {
-        fs.writeFileSync(path.join(tempDir, 'web.test.tsx'), `import { Button } from '../../src/components/Button/Button.js';
-import React from 'react';
-
-it('Sample component test', async () => {
-  await Spectra.mount(<Button label="Save" />);
-});
+        fs.writeFileSync(path.join(tempDir, 'web.test.tsx'), `import { Button } from '../../src/components/Button/Button.js';
+import React from 'react';
+
+it('Sample component test', async () => {
+  await Spectra.mount(<Button label="Save" />);
+});
 `);
         const { diagnostics } = SpecLinter.validateSpecFile(path.join(tempDir, 'spec.md'));
         const importErrors = diagnostics.filter((d) => d.code === 'testspectra/no-manual-import');
         expect(importErrors).toHaveLength(0);
     });
     it('still flags no-manual-import when a .test.tsx import resolves into page-objects/', () => {
-        fs.writeFileSync(path.join(tempDir, 'web.test.tsx'), `import ButtonComponent from '../../page-objects/ButtonComponent/web.js';
-
-it('Sample component test', async () => {
-  await ButtonComponent.root.shouldBeVisible();
-});
+        fs.writeFileSync(path.join(tempDir, 'web.test.tsx'), `import ButtonComponent from '../../page-objects/ButtonComponent/web.js';
+
+it('Sample component test', async () => {
+  await ButtonComponent.root.shouldBeVisible();
+});
 `);
         const { diagnostics } = SpecLinter.validateSpecFile(path.join(tempDir, 'spec.md'));
         const importErrors = diagnostics.filter((d) => d.code === 'testspectra/no-manual-import');
@@ -63,50 +63,50 @@ it('Sample component test', async () => {
         expect(importErrors[0].message).toContain('page-objects');
     });
     it('still flags no-manual-import when a .test.tsx import resolves into support/steps/', () => {
-        fs.writeFileSync(path.join(tempDir, 'web.test.tsx'), `import verifyButtonState from '../../support/steps/verifyButtonState/web.step.js';
-
-it('Sample component test', async () => {
-  await verifyButtonState('Save', true);
-});
+        fs.writeFileSync(path.join(tempDir, 'web.test.tsx'), `import verifyButtonState from '../../support/steps/verifyButtonState/web.step.js';
+
+it('Sample component test', async () => {
+  await verifyButtonState('Save', true);
+});
 `);
         const { diagnostics } = SpecLinter.validateSpecFile(path.join(tempDir, 'spec.md'));
         const importErrors = diagnostics.filter((d) => d.code === 'testspectra/no-manual-import');
         expect(importErrors).toHaveLength(1);
     });
     it('still flags no-manual-import when a .test.tsx import resolves into fixtures/', () => {
-        fs.writeFileSync(path.join(tempDir, 'web.test.tsx'), `import users from '../../fixtures/users.json';
-
-it('Sample component test', async () => {
-  expect(users).toBeDefined();
-});
+        fs.writeFileSync(path.join(tempDir, 'web.test.tsx'), `import users from '../../fixtures/users.json';
+
+it('Sample component test', async () => {
+  expect(users).toBeDefined();
+});
 `);
         const { diagnostics } = SpecLinter.validateSpecFile(path.join(tempDir, 'spec.md'));
         const importErrors = diagnostics.filter((d) => d.code === 'testspectra/no-manual-import');
         expect(importErrors).toHaveLength(1);
     });
     it('still enforces single-it-required and no-describe-block in .test.tsx files', () => {
-        fs.writeFileSync(path.join(tempDir, 'web.test.tsx'), `import { Button } from '../../src/components/Button/Button.js';
-
-describe('Button', () => {
-  it('Sample component test', async () => {
-    await Spectra.mount(<Button label="Save" />);
-  });
-
-  it('Another test', async () => {
-    await Spectra.mount(<Button label="Cancel" />);
-  });
-});
+        fs.writeFileSync(path.join(tempDir, 'web.test.tsx'), `import { Button } from '../../src/components/Button/Button.js';
+
+describe('Button', () => {
+  it('Sample component test', async () => {
+    await Spectra.mount(<Button label="Save" />);
+  });
+
+  it('Another test', async () => {
+    await Spectra.mount(<Button label="Cancel" />);
+  });
+});
 `);
         const { diagnostics } = SpecLinter.validateSpecFile(path.join(tempDir, 'spec.md'));
         expect(diagnostics.some((d) => d.code === 'testspectra/no-describe-block')).toBe(true);
         expect(diagnostics.some((d) => d.code === 'testspectra/single-it-required')).toBe(true);
     });
     it('still forbids all imports (unchanged behavior) in plain .test.ts E2E specs', () => {
-        fs.writeFileSync(path.join(tempDir, 'web.test.ts'), `import { LoginPage } from '../../page-objects/LoginPage/web.js';
-
-it('Sample component test', async () => {
-  await LoginPage.submitButton.click();
-});
+        fs.writeFileSync(path.join(tempDir, 'web.test.ts'), `import { LoginPage } from '../../page-objects/LoginPage/web.js';
+
+it('Sample component test', async () => {
+  await LoginPage.submitButton.click();
+});
 `);
         const { diagnostics } = SpecLinter.validateSpecFile(path.join(tempDir, 'spec.md'));
         const importErrors = diagnostics.filter((d) => d.code === 'testspectra/no-manual-import');

package/dist/linter/__tests__/shared-lib-boundary.test.js

@@ -17,16 +17,16 @@ describe('Shared Library Boundary (testspectra/no-specs-in-shared-lib)', () => {
         }
     });
     describe('findSharedLibraryRoots()', () => {
-        it('discovers parent folders of project.json files containing both scope:shared and type:shared', () => {
+        it('discovers parent folders of project.json files containing testspectra:shared', () => {
             const sharedDir1 = path.join(tempDir, 'shared', 'testing');
             const sharedDir2 = path.join(tempDir, 'libs', 'common-helpers');
             const nonSharedDir = path.join(tempDir, 'packages', 'playground', 'e2e');
             fs.mkdirSync(sharedDir1, { recursive: true });
             fs.mkdirSync(sharedDir2, { recursive: true });
             fs.mkdirSync(nonSharedDir, { recursive: true });
-            fs.writeFileSync(path.join(sharedDir1, 'project.json'), JSON.stringify({ name: 'shared-testing', tags: ['scope:shared', 'type:shared'] }));
-            fs.writeFileSync(path.join(sharedDir2, 'project.json'), JSON.stringify({ name: 'common-helpers', tags: ['scope:shared', 'type:shared'] }));
-            fs.writeFileSync(path.join(nonSharedDir, 'project.json'), JSON.stringify({ name: 'playground-e2e', tags: ['scope:playground', 'type:e2e'] }));
+            fs.writeFileSync(path.join(sharedDir1, 'project.json'), JSON.stringify({ name: 'shared-testing', tags: ['testspectra:shared'] }));
+            fs.writeFileSync(path.join(sharedDir2, 'project.json'), JSON.stringify({ name: 'common-helpers', tags: ['testspectra:shared'] }));
+            fs.writeFileSync(path.join(nonSharedDir, 'project.json'), JSON.stringify({ name: 'playground-e2e', tags: ['testspectra:e2e', 'testspectra:scope:playground'] }));
             const roots = findSharedLibraryRoots(tempDir);
             expect(roots).toHaveLength(2);
             expect(roots).toContain(sharedDir1);
@@ -35,12 +35,12 @@ describe('Shared Library Boundary (testspectra/no-specs-in-shared-lib)', () => {
         });
     });
     describe('isInsideSharedLibrary()', () => {
-        it('returns true for files inside a project tagged with scope:shared or type:shared in project.json', () => {
+        it('returns true for files inside a project tagged with testspectra:shared in project.json', () => {
             const sharedDir = path.join(tempDir, 'shared', 'testing');
             fs.mkdirSync(sharedDir, { recursive: true });
             fs.writeFileSync(path.join(sharedDir, 'project.json'), JSON.stringify({
                 name: 'shared-testing',
-                tags: ['scope:shared', 'type:shared'],
+                tags: ['testspectra:shared'],
             }));
             const stepFile = path.join(sharedDir, 'support', 'steps', 'web.step.ts');
             const specFile = path.join(sharedDir, 'specs', 'TC-001', 'spec.md');
@@ -55,7 +55,7 @@ describe('Shared Library Boundary (testspectra/no-specs-in-shared-lib)', () => {
             fs.mkdirSync(customLibDir, { recursive: true });
             fs.writeFileSync(path.join(customLibDir, 'project.json'), JSON.stringify({
                 name: 'custom-common-lib',
-                tags: ['scope:shared', 'type:shared'],
+                tags: ['testspectra:shared'],
             }));
             const actionFile = path.join(customLibDir, 'support', 'actions', 'click.action.ts');
             expect(isInsideSharedLibrary(actionFile)).toBe(true);
@@ -65,7 +65,7 @@ describe('Shared Library Boundary (testspectra/no-specs-in-shared-lib)', () => {
             fs.mkdirSync(sharedAppDir, { recursive: true });
             fs.writeFileSync(path.join(sharedAppDir, 'project.json'), JSON.stringify({
                 name: 'shared-app',
-                tags: ['scope:shared-app', 'type:e2e'],
+                tags: ['testspectra:e2e', 'testspectra:scope:shared-app'],
             }));
             const specFile = path.join(sharedAppDir, 'specs', 'TC-001', 'spec.md');
             expect(isInsideSharedLibrary(specFile)).toBe(false);
@@ -75,7 +75,7 @@ describe('Shared Library Boundary (testspectra/no-specs-in-shared-lib)', () => {
             fs.mkdirSync(featureDir, { recursive: true });
             fs.writeFileSync(path.join(featureDir, 'project.json'), JSON.stringify({
                 name: 'playground-e2e',
-                tags: ['scope:playground', 'type:e2e'],
+                tags: ['testspectra:e2e', 'testspectra:scope:playground'],
             }));
             const specFile = path.join(featureDir, 'specs', 'TC-001', 'spec.md');
             expect(isInsideSharedLibrary(specFile)).toBe(false);
@@ -91,7 +91,7 @@ describe('Shared Library Boundary (testspectra/no-specs-in-shared-lib)', () => {
             fs.mkdirSync(sharedLibDir, { recursive: true });
             fs.writeFileSync(path.join(sharedLibDir, 'project.json'), JSON.stringify({
                 name: 'shared-testing',
-                tags: ['scope:shared', 'type:shared'],
+                tags: ['testspectra:shared'],
             }));
             const sharedSpecDir = path.join(sharedLibDir, 'specs', 'TC-error');
             fs.mkdirSync(sharedSpecDir, { recursive: true });
@@ -119,7 +119,7 @@ status: draft
             fs.mkdirSync(sharedLibDir, { recursive: true });
             fs.writeFileSync(path.join(sharedLibDir, 'project.json'), JSON.stringify({
                 name: 'shared-testing',
-                tags: ['scope:shared', 'type:shared'],
+                tags: ['testspectra:shared'],
             }));
             const sharedSuiteDir = path.join(sharedLibDir, 'support');
             fs.mkdirSync(sharedSuiteDir, { recursive: true });
@@ -141,7 +141,7 @@ status: active
             fs.mkdirSync(customLibDir, { recursive: true });
             fs.writeFileSync(path.join(customLibDir, 'project.json'), JSON.stringify({
                 name: 'my-testing-utils',
-                tags: ['scope:shared', 'type:shared'],
+                tags: ['testspectra:shared'],
             }));
             const specDir = path.join(customLibDir, 'specs', 'TC-custom');
             fs.mkdirSync(specDir, { recursive: true });
@@ -169,7 +169,7 @@ status: draft
             fs.mkdirSync(featureDir, { recursive: true });
             fs.writeFileSync(path.join(featureDir, 'project.json'), JSON.stringify({
                 name: 'playground-e2e',
-                tags: ['scope:playground', 'type:e2e'],
+                tags: ['testspectra:e2e', 'testspectra:scope:playground'],
             }));
             const featureSpecDir = path.join(featureDir, 'specs', 'TC-001');
             fs.mkdirSync(featureSpecDir, { recursive: true });
@@ -195,7 +195,7 @@ status: draft
             fs.mkdirSync(sharedE2eDir, { recursive: true });
             fs.writeFileSync(path.join(sharedE2eDir, 'project.json'), JSON.stringify({
                 name: 'shared-feature-e2e',
-                tags: ['scope:shared-feature', 'type:e2e'],
+                tags: ['testspectra:e2e', 'testspectra:scope:shared-feature'],
             }));
             const specDir = path.join(sharedE2eDir, 'specs', 'TC-001');
             fs.mkdirSync(specDir, { recursive: true });
@@ -241,7 +241,7 @@ status: draft
             fs.mkdirSync(sharedLibDir, { recursive: true });
             fs.writeFileSync(path.join(sharedLibDir, 'project.json'), JSON.stringify({
                 name: 'shared-testing',
-                tags: ['scope:shared', 'type:shared'],
+                tags: ['testspectra:shared'],
             }));
             const sharedDir1 = path.join(sharedLibDir, 'specs', 'TC-001');
             const sharedDir2 = path.join(sharedLibDir, 'specs', 'TC-002');