Skip to content

ci: merge staging to master#43

Merged
maxwell-aiden merged 3 commits into
masterfrom
staging
Feb 21, 2026
Merged

ci: merge staging to master#43
maxwell-aiden merged 3 commits into
masterfrom
staging

Conversation

@github-actions

@github-actions github-actions Bot commented Feb 20, 2026

Copy link
Copy Markdown

This is an automatic PR generated by the CI/CD pipeline. This will be automatically fast-forward merged if successful.

@CMCDragonkai
feat: added multiple tsconfig union target derivation
bab124b 
- TypeScript config resolution and validation (`ts.readConfigFile`, file readability checks)
- Canonical normalization pipeline:
  - `path.resolve`
  - `Set` + `.sort()` for deterministic dedupe ordering
- Multi-tsconfig union target derivation
- ESLint target glob normalization:
  - extension-bearing pattern detection
  - extensionless expansion with supported extension set
- Include/exclude/forceInclude merge behavior across multiple tsconfigs
- Cross-tsconfig overlap heuristics for ignore filtering
- Parser project alignment in ESLint runtime:
  - `@typescript-eslint/parser` project list synchronized with runtime-derived tsconfig set
- Domain engine + ESLint domain detection alignment with runtime target derivation
- Jest regression testing with temp filesystem fixtures
- ESM/Jest mocking limitations (read-only exports / non-configurable properties)

Files and Code Sections:

- `src/config.ts` (modified)
  - Why important: central canonical tsconfig list normalization for all downstream consumers.
  - Key edits:
    - added tsconfig readability validation (not just exists)
    - dedupe + deterministic sort for tsconfigPaths and forceInclude
    - fallback root tsconfig only if readable
  - Key snippet:
    ```ts
    function isReadableTsconfigPath(tsconfigPath: string): boolean {
      let stats: fs.Stats;
      try {
        stats = fs.statSync(tsconfigPath);
      } catch {
        return false;
      }

      if (!stats.isFile()) {
        return false;
      }

      const readResult = ts.readConfigFile(tsconfigPath, ts.sys.readFile);
      return readResult.error == null;
    }

    function sanitizeTsconfigPaths(rawValue: unknown, root: string): string[] {
      return dedupeAndSort(
        toStringArray(rawValue)
          .map((tsconfigPath) => path.resolve(root, tsconfigPath))
          .filter((tsconfigPath) => isReadableTsconfigPath(tsconfigPath)),
      );
    }
    ```

- `src/utils.ts` (modified heavily)
  - Why important: target derivation moved from single-tsconfig to full union; include/exclude/forceInclude correctness; parser project runtime alignment.
  - Key edits:
    - `buildPatterns` now accepts all tsconfig paths (not first entry)
    - include normalization preserves extension-bearing entries, expands only extensionless patterns
    - tsconfig-relative include/exclude rebased to cwd
    - cross-tsconfig exclude overlap handling + forceInclude ignore suppression
    - deterministic dedupe/sort for files and ignores
    - runtime `overrideConfig` injects parserOptions.project from same resolved config used for target derivation
  - Key snippets:
    ```ts
    function buildPatterns(
      tsconfigPaths: readonly string[],
      forceInclude: string[] = [],
      cwd = process.cwd(),
      forceIncludeBaseDir = cwd,
    ): { files: string[]; ignore: string[] } { ... }
    ```

    ```ts
    function hasExtensionOrGlobExtensionPattern(value: string): boolean {
      return /(^|\/)[^/]*\.[^/]*$/.test(value);
    }

    function expandExtensionlessPattern(value: string): string {
      const normalized = normalizeGlobValue(value).replace(/\/+$/, '');
      if (normalized.length === 0) return '';
      if (hasExtensionOrGlobExtensionPattern(normalized)) return normalized;
      if (!GLOB_META_PATTERN.test(normalized)) {
        return `${normalized}/**/*${ESLINT_TARGET_EXTENSION_GLOB}`;
      }
      if (normalized === '**') return `**/*${ESLINT_TARGET_EXTENSION_GLOB}`;
      if (normalized.endsWith('/**')) return `${normalized}/*${ESLINT_TARGET_EXTENSION_GLOB}`;
      return `${normalized}${ESLINT_TARGET_EXTENSION_GLOB}`;
    }
    ```

    ```ts
    const lintConfig = resolvedConfig ?? resolveLintConfig();
    const parserProjectOverride = {
      languageOptions: {
        parserOptions: {
          project: lintConfig.domains.eslint.tsconfigPaths,
        },
      },
    };

    const eslint = new ESLint({
      overrideConfigFile: configPath || defaultConfigPath,
      ...
      overrideConfig: parserProjectOverride,
    });
    ```

- `src/domains/eslint.ts` (modified)
  - Why important: ESLint domain detection now uses canonical multi-tsconfig union logic (same derivation family as run path).
  - Key edits:
    - new `resolveESLintDetectionPatterns` using `resolveLintConfig` + `utils.buildPatterns(...)`
    - default detection falls back to default roots only when no tsconfigs/files are derivable
  - Key snippet:
    ```ts
    function resolveESLintDetectionPatterns(
      eslintPatterns: readonly string[] | undefined,
    ): string[] {
      if (eslintPatterns != null && eslintPatterns.length > 0) {
        return [...eslintPatterns];
      }

      const resolvedConfig = resolveLintConfig();
      const { tsconfigPaths, forceInclude } = resolvedConfig.domains.eslint;
      if (tsconfigPaths.length === 0) return DEFAULT_ESLINT_SEARCH_ROOTS;

      const { files } = utils.buildPatterns(
        tsconfigPaths,
        forceInclude,
        process.cwd(),
        resolvedConfig.root,
      );
      if (files.length === 0) return DEFAULT_ESLINT_SEARCH_ROOTS;
      return files;
    }
    ```

- `src/configs/js.ts` (read, not modified)
  - Why important: confirmed parser project already sourced from `resolveLintConfig().domains.eslint.tsconfigPaths`; alignment then enforced at runtime via `src/utils.ts`.

- `tests/config.test.ts` (modified)
  - Why important: regression coverage for canonical normalization, deterministic sort, dedupe, missing/unreadable filtering.
  - Key changes:
    - switched from brittle mocking to real temp-file fixtures
    - added/updated tests asserting dedupe/sort and unreadable tsconfig filtering
  - Representative assertions:
    ```ts
    expect(resolved.domains.eslint.tsconfigPaths).toStrictEqual([
      path.resolve(repoRoot, 'workspace', 'packages/core', 'tsconfig.json'),
      path.resolve(repoRoot, 'workspace', 'tsconfig.json'),
    ]);
    ```

- `tests/domains/index.test.ts` (modified)
  - Why important: regression coverage for domain-level multi-tsconfig detection and buildPatterns behavior.
  - Added tests:
    - `eslint detection derives scope from canonical multi-tsconfig union`
    - `preserves extension-bearing include entries while expanding extensionless entries`
    - `exclude and forceInclude interactions are stable across multiple tsconfigs`
  - Representative assertion:
    ```ts
    expect(patterns.files).toContain('pkg-one/src/**/*.tsx');
    expect(patterns.files).toContain(
      'pkg-two/src/**/*.{js,mjs,cjs,jsx,ts,tsx,mts,cts,json}',
    );
    ```

- `tests/bin/lint.test.ts` (modified)
  - Why important: user-visible CLI stability behavior update.
  - Changes:
    - test for canonical lint script flags updated to `.resolves.toBeUndefined()` after alignment fix
    - added `default run tolerates missing configured tsconfig paths`
  - Representative snippet:
    ```ts
    await expect(
      main(['node', 'matrixai-lint', '--domain', 'eslint']),
    ).resolves.toBeUndefined();
    ```

- `plans/refactor/STATE.md` (modified)
  - Why important: milestone state/documentation update required by user.
  - Added section: `Implemented in full multi-tsconfig targeting alignment slice`, documenting guarantees and touched areas.
@github-actions

github-actions Bot commented Feb 20, 2026

Copy link
Copy Markdown
Author

Pipeline Attempt on 22229401551 for bab124b

https://github.com/MatrixAI/js-lint/actions/runs/22229401551

@CMCDragonkai
ci: fixing for windows and macos
11ff6ed 
- path normalization for platform-agnostic expectations in tests/config.test.ts and tests/domains/index.test.ts.
- canonical flags test now mocks shellcheck availability to avoid platform-dependent failure in tests/bin/lint.test.ts.
@github-actions

github-actions Bot commented Feb 21, 2026

Copy link
Copy Markdown
Author

Pipeline Attempt on 22253447733 for 11ff6ed

https://github.com/MatrixAI/js-lint/actions/runs/22253447733

CMCDragonkai
CMCDragonkai reviewed Feb 21, 2026
View reviewed changes

@CMCDragonkai CMCDragonkai left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The windows CI still doesn't capture test failures properly.

@github-actions

github-actions Bot commented Feb 21, 2026

Copy link
Copy Markdown
Author

Pipeline Attempt on 22257327221 for c3b5997

https://github.com/MatrixAI/js-lint/actions/runs/22257327221

@github-actions

github-actions Bot commented Feb 21, 2026

Copy link
Copy Markdown
Author

Pipeline Succeeded on 22257327221 for c3b5997

https://github.com/MatrixAI/js-lint/actions/runs/22257327221

@maxwell-aiden maxwell-aiden merged commit c3b5997 into master Feb 21, 2026
9 of 10 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@CMCDragonkai CMCDragonkai CMCDragonkai left review comments

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

2 participants

@CMCDragonkai @maxwell-aiden