@williamthorsen/nmr 0.23.0 → 0.25.0

package/dist/esm/tiers.js

@@ -0,0 +1,35 @@
+import { readdirSync } from 'node:fs';
+import path from 'node:path';
+const TEST_DIR = '__tests__';
+const TEST_EXTENSIONS = '{ts,tsx}';
+const TEST_GLOB_PREFIX = `**/${TEST_DIR}/**`;
+const TEST_FILE_PATTERN = /\.test\.tsx?$/;
+export const ALL_TEST_PATTERNS = [`${TEST_GLOB_PREFIX}/*.test.${TEST_EXTENSIONS}`];
+export function buildTierPatterns(tier) {
+    return [`${TEST_GLOB_PREFIX}/*.${tier}.test.${TEST_EXTENSIONS}`];
+}
+export function findTestFiles(rootDir) {
+    const found = [];
+    collectTestFiles(rootDir, '', false, found);
+    return found.toSorted();
+}
+export function hasTierInfix(filePath) {
+    const tiers = TIER_NAMES;
+    return tiers.includes(path.basename(filePath).split('.').at(-3) ?? '');
+}
+export const TEST_COLLECTION_EXCLUDE = ['.git', 'coverage', 'dist', 'node_modules'];
+export const TIER_NAMES = ['unit', 'tool', 'localhost', 'remote'];
+function collectTestFiles(dir, relativeDir, inTestDir, found) {
+    const entries = readdirSync(dir, { withFileTypes: true });
+    for (const entry of entries) {
+        const relativePath = relativeDir === '' ? entry.name : `${relativeDir}/${entry.name}`;
+        if (entry.isDirectory()) {
+            if (TEST_COLLECTION_EXCLUDE.includes(entry.name))
+                continue;
+            collectTestFiles(path.join(dir, entry.name), relativePath, inTestDir || entry.name === TEST_DIR, found);
+        }
+        else if (inTestDir && TEST_FILE_PATTERN.test(entry.name)) {
+            found.push(relativePath);
+        }
+    }
+}

package/dist/esm/types.d.ts

@@ -0,0 +1,15 @@
+export interface BuildConfig {
+    extraIgnorePatterns?: string[];
+}
+export interface CheckCacheConfig {
+    enabled?: boolean;
+    excludeCommands?: string[];
+    extraCommands?: string[];
+}
+export interface NmrConfig {
+    build?: BuildConfig;
+    checkCache?: CheckCacheConfig;
+    devBin?: Record<string, string>;
+    workspaceScripts?: Record<string, string | string[]>;
+    rootScripts?: Record<string, string | string[]>;
+}

package/dist/esm/types.js

@@ -0,0 +1 @@
+export {};

package/dist/esm/vitest.d.ts

@@ -1,5 +1,7 @@
 import type { ViteUserConfig } from 'vitest/config';
 import type { InlineConfig, ProjectConfig } from 'vitest/node';
+import type { TierName } from './tiers.js';
+export type { TierName } from './tiers.js';
 export type RootTestOptions = Omit<InlineConfig, keyof ProjectConfig>;
 export type RootOverrides = Omit<ViteUserConfig, 'test'> & {
     test?: RootTestOptions;
@@ -7,9 +9,11 @@ export type RootOverrides = Omit<ViteUserConfig, 'test'> & {
 export interface VitestConfigOptions {
     root?: RootOverrides;
     project?: ProjectConfig;
+    tiers?: Partial<Record<TierName, ProjectConfig>>;
 }
 export interface RootVitestConfigOptions extends VitestConfigOptions {
     monorepoRoot: string;
 }
-export declare function defineVitestConfig(options?: VitestConfigOptions): ViteUserConfig;
-export declare function defineRootVitestConfig(options: RootVitestConfigOptions | undefined): ViteUserConfig;
+type RootConfigLayers = [...(VitestConfigOptions | undefined)[], RootVitestConfigOptions];
+export declare function defineVitestConfig(...layers: (VitestConfigOptions | undefined)[]): ViteUserConfig;
+export declare function defineRootVitestConfig(...layers: RootConfigLayers): ViteUserConfig;

package/dist/esm/vitest.js

@@ -1,37 +1,33 @@
 import path from 'node:path';
 import { defaultExclude, mergeConfig } from 'vitest/config';
+import { isObject } from "./helpers/type-guards.js";
+import { ALL_TEST_PATTERNS, buildTierPatterns, TEST_COLLECTION_EXCLUDE, TIER_NAMES } from "./tiers.js";
 import { getWorkspacePackageDirs } from "./workspace.js";
-const APP_PATTERNS = ['**/__tests__/**/*.app.test.{ts,tsx}'];
-const INTEGRATION_PATTERNS = ['**/__tests__/**/*.int.test.{ts,tsx}'];
-const ALL_TEST_PATTERNS = ['**/__tests__/**/*.test.{ts,tsx}'];
-const COVERAGE_EXCLUDE = [
-    '**/__{fixtures,mocks,tests}__/**',
-    '**/index.ts',
-    '**/mock*.{ts,tsx}',
-    '**/*.d.ts',
-    '**/*.types.ts',
-];
-const BUILD_OUTPUT_EXCLUDE = ['**/dist/**'];
+const [RESIDUAL_TIER, ...NAMED_TIERS] = TIER_NAMES;
+const TIERED_PATTERNS = NAMED_TIERS.flatMap(buildTierPatterns);
+const TIER_TIMEOUT = 30_000;
+const COVERAGE_EXCLUDE = ['**/__{fixtures,mocks,tests}__/**', '**/index.ts', '**/*.d.ts'];
+const COLLECTION_EXCLUDE = [...new Set([...defaultExclude, ...TEST_COLLECTION_EXCLUDE.map((dir) => `**/${dir}/**`)])];
 const PACKAGE_COVERAGE_INCLUDE = ['**/src/**/*.{ts,tsx}'];
-const MISSING_MONOREPO_ROOT = 'defineRootVitestConfig requires `monorepoRoot`, an absolute path to the directory holding pnpm-workspace.yaml. Pass `import.meta.dirname` from the root config.';
-export function defineVitestConfig(options = {}) {
-    return buildConfig(options, { coverageInclude: PACKAGE_COVERAGE_INCLUDE });
+const MISSING_MONOREPO_ROOT = 'defineRootVitestConfig requires `monorepoRoot`, an absolute path to the directory holding pnpm-workspace.yaml. Pass `import.meta.dirname` in the last options layer, from the root config.';
+export function defineVitestConfig(...layers) {
+    return buildConfig(layers, { coverageInclude: PACKAGE_COVERAGE_INCLUDE });
 }
-export function defineRootVitestConfig(options) {
-    if (options === undefined) {
-        throw new TypeError(MISSING_MONOREPO_ROOT);
-    }
-    const monorepoRoot = options.monorepoRoot;
+export function defineRootVitestConfig(...layers) {
+    const lastLayer = layers.at(-1);
+    const monorepoRoot = isObject(lastLayer) ? lastLayer.monorepoRoot : undefined;
     if (typeof monorepoRoot !== 'string' || !path.isAbsolute(monorepoRoot)) {
         throw new TypeError(MISSING_MONOREPO_ROOT);
     }
-    return buildConfig(options, {
+    return buildConfig(layers, {
         coverageInclude: [],
         projectExclude: getWorkspaceExcludePatterns(monorepoRoot),
         projectRoot: monorepoRoot,
     });
 }
-function buildConfig(options, { coverageInclude, projectExclude = [], projectRoot }) {
+function buildConfig(declaredLayers, { coverageInclude, projectExclude = [], projectRoot }) {
+    const layers = declaredLayers.filter((layer) => layer !== undefined);
+    assertKnownTiers(layers);
     const config = {
         test: {
             coverage: {
@@ -41,28 +37,52 @@ function buildConfig(options, { coverageInclude, projectExclude = [], projectRoo
                 provider: 'v8',
             },
             passWithNoTests: true,
-            projects: buildProjects(options.project, projectExclude, projectRoot),
+            projects: buildProjects(layers, projectExclude, projectRoot),
             silent: 'passed-only',
             watch: false,
         },
     };
-    return options.root ? mergeConfig(config, options.root) : config;
+    return layers.reduce((merged, { root }) => (root ? mergeConfig(merged, root) : merged), config);
 }
-function buildProjects(overrides, extraExclude, projectRoot) {
-    const categories = [
-        { exclude: [], include: APP_PATTERNS, name: 'app' },
-        { exclude: [], include: INTEGRATION_PATTERNS, name: 'integration' },
-        { exclude: [...APP_PATTERNS, ...INTEGRATION_PATTERNS], include: ALL_TEST_PATTERNS, name: 'unit' },
+function buildProjects(layers, extraExclude, projectRoot) {
+    const projectTiers = [
+        { exclude: TIERED_PATTERNS, include: ALL_TEST_PATTERNS, name: RESIDUAL_TIER },
+        ...NAMED_TIERS.map((tier) => ({
+            exclude: [],
+            include: buildTierPatterns(tier),
+            name: tier,
+            timeout: TIER_TIMEOUT,
+        })),
     ];
-    return categories.map(({ exclude, include, name }) => {
+    return projectTiers.map(({ exclude, include, name, timeout }) => {
         const project = {
             extends: true,
             ...(projectRoot !== undefined && { root: projectRoot }),
-            test: { exclude: [...defaultExclude, ...BUILD_OUTPUT_EXCLUDE, ...exclude, ...extraExclude], include, name },
+            test: {
+                exclude: [...COLLECTION_EXCLUDE, ...exclude, ...extraExclude],
+                include,
+                name,
+                ...(timeout !== undefined && { hookTimeout: timeout, testTimeout: timeout }),
+            },
         };
-        return overrides ? mergeConfig(project, { test: overrides }) : project;
+        return layers.reduce((merged, layer) => applyLayer(merged, layer, name), project);
     });
 }
+function applyLayer(project, layer, tier) {
+    const withProject = layer.project ? mergeConfig(project, { test: layer.project }) : project;
+    const targeted = layer.tiers?.[tier];
+    return targeted ? mergeConfig(withProject, { test: targeted }) : withProject;
+}
+function assertKnownTiers(layers) {
+    const known = TIER_NAMES;
+    for (const { tiers } of layers) {
+        for (const name of Object.keys(tiers ?? {})) {
+            if (!known.includes(name)) {
+                throw new TypeError(`Unknown tier "${name}" in \`tiers\`. Valid tiers: ${TIER_NAMES.join(', ')}.`);
+            }
+        }
+    }
+}
 function getWorkspaceExcludePatterns(monorepoRoot) {
     return getWorkspacePackageDirs(monorepoRoot)
         .map((dir) => `${path.relative(monorepoRoot, dir).split(path.sep).join('/')}/**`)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@williamthorsen/nmr",
-  "version": "0.23.0",
+  "version": "0.25.0",
   "private": false,
   "description": "Context-aware script runner for pnpm monorepos",
   "keywords": [
@@ -22,9 +22,9 @@
   "author": "William Thorsen <william@thorsen.dev> (https://github.com/williamthorsen)",
   "type": "module",
   "exports": {
-    ".": {
-      "types": "./dist/esm/index.d.ts",
-      "default": "./dist/esm/index.js"
+    "./config": {
+      "types": "./dist/esm/defineConfig.d.ts",
+      "default": "./dist/esm/defineConfig.js"
     },
     "./prettier": {
       "types": "./dist/esm/prettier.d.ts",
@@ -58,20 +58,22 @@
     "nmr-taze": "bin/nmr-taze.js"
   },
   "files": [
+    ".readyup/kits/*.js",
+    ".readyup/manifest.json",
     "AGENTS.md",
     "bin",
     "dist"
   ],
   "dependencies": {
     "glob": "13.0.6",
-    "jiti": "2.7.0",
     "prettier-plugin-sh": "0.19.0",
     "taze": "19.16.0",
     "yaml": "2.9.0",
-    "@williamthorsen/nmr-core": "0.7.3"
+    "@williamthorsen/nmr-core": "0.9.0"
   },
   "devDependencies": {
     "prettier": "3.9.6",
+    "readyup": "0.23.0",
     "tinyglobby": "0.2.17",
     "vitest": "4.1.10"
   },
@@ -95,6 +97,6 @@
     "access": "public"
   },
   "scripts": {
-    "build:post": "nmr-sync-agent-files"
+    "build:post": "nmr-sync-agent-files && rdy compile"
   }
 }

package/dist/esm/index.d.ts

@@ -1,2 +0,0 @@
-export type { NmrConfig } from './config.js';
-export { defineConfig } from './config.js';

package/dist/esm/index.js

@@ -1 +0,0 @@
-export { defineConfig } from "./config.js";