@application-kit/testing 0.1.0 → 0.2.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @application-kit/testing
 
+## 0.2.0
+
+### Minor Changes
+
+- 48e6aec: Вход `/vitest` — раскладка ячеек CI по проектам vitest: `ProjectShardSequencer` (первая ячейка — проект client целиком, остальные — проект server LPT по размеру спек, чтобы объединение blob-отчётов покрытия двух трансформов оставалось точным), `parseShard` для `--shard=i/n` из argv и `assignShard`; `vitest` — optional peer этого входа.
+
 ## 0.1.0
 
 ### Minor Changes

package/README.md

@@ -1,7 +1,8 @@
 # @application-kit/testing
 
 Тестовая инфраструктура NestJS-приложений: стабы шин CQRS, логгер-накопитель, фейковый microservice-транспорт,
-сборка web-приложения для e2e и Postgres в testcontainers. Для `devDependencies` приложения, в прод не попадает.
+сборка web-приложения для e2e, Postgres в testcontainers и раскладка ячеек CI по проектам vitest (вход `/vitest`).
+Для `devDependencies` приложения, в прод не попадает.
 
 ## Установка
 
@@ -11,7 +12,7 @@ yarn add --dev @application-kit/testing
 
 Peer-зависимости: `@nestjs/common`, `@nestjs/core`, `@nestjs/cqrs`,
 `@nestjs/microservices`, `@nestjs/platform-fastify`, `@nestjs/testing`, `nestjs-pino`, `oxide.ts`, `rxjs`,
-`testcontainers`, `typeorm`. Все обязательные: подпутей и опциональных peers нет.
+`testcontainers`, `typeorm` — обязательные для корневого входа. Вход `/vitest` несёт свой optional peer `vitest`.
 
 ## Состав
 
@@ -32,3 +33,33 @@ const { dataSource } = await testDataSource({
   namingStrategy: new TypeormPluralNamingStrategy(),
 })
 ```
+
+## Вход `/vitest`: ячейки CI по проектам
+
+`vitest --shard=i/n` сам режет спеки хешем, и при двух проектах разных трансформов (`server` в `node`, `client` в
+`jsdom`) объединение blob-отчётов покрытия неточное: непокрытые файлы одна ячейка синтезирует ssr-картой, а другая даёт
+web-карту того же файла, и statements/functions задваиваются. `ProjectShardSequencer` отдаёт первой ячейке проект
+`client` целиком, остальным — проект `server` по размеру спек (LPT, одна и та же раскладка в каждой ячейке без обмена
+данными). `parseShard(process.argv)` читает `--shard=i/n` и `--shard i/n`; без флага, с одной ячейкой или с мусором в
+значении — `undefined`, то есть обычный прогон (и `--merge-reports`, и Stryker). Каталоги проекта `client` и выбор
+ячейки — у приложения:
+
+```ts
+import { parseShard, ProjectShardSequencer } from '@application-kit/testing/vitest'
+
+// Исходники, которые загружает только проект client: в ячейках server они не считаются вовсе.
+const CLIENT_SOURCES = ['src/modules/*/user-interface/client/**']
+const shard = parseShard(process.argv)
+const cell = shard === undefined ? 'all' : shard.index === 1 ? 'client' : 'server'
+
+export default defineConfig({
+  test: {
+    coverage: {
+      exclude: cell === 'server' ? CLIENT_SOURCES : [],
+      include: cell === 'client' ? CLIENT_SOURCES : ['src'],
+    },
+    projects: [serverProject, clientProject].filter((project) => cell === 'all' || project.test.name === cell),
+    sequence: { sequencer: ProjectShardSequencer },
+  },
+})
+```

package/dist/cjs/vitest/index.d.ts

@@ -0,0 +1 @@
+export * from './project-shard-sequencer.js';

package/dist/cjs/vitest/index.js

@@ -0,0 +1,17 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./project-shard-sequencer.js"), exports);

package/dist/cjs/vitest/project-shard-sequencer.d.ts

@@ -0,0 +1,15 @@
+import type { TestSpecification } from 'vitest/node';
+import { BaseSequencer } from 'vitest/node';
+export interface ShardInterface {
+    readonly count: number;
+    readonly index: number;
+}
+export interface WeightedSpecInterface {
+    readonly path: string;
+    readonly weight: number;
+}
+export declare const parseShard: (argv: readonly string[]) => ShardInterface | undefined;
+export declare const assignShard: (specs: readonly WeightedSpecInterface[], index: number, count: number) => string[];
+export declare class ProjectShardSequencer extends BaseSequencer {
+    shard(files: TestSpecification[]): Promise<TestSpecification[]>;
+}

package/dist/cjs/vitest/project-shard-sequencer.js

@@ -0,0 +1,52 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ProjectShardSequencer = exports.assignShard = exports.parseShard = void 0;
+const promises_1 = require("node:fs/promises");
+const node_1 = require("vitest/node");
+const SHARD_FLAG = '--shard';
+const shardArgument = (argv) => {
+    const position = argv.findIndex((argument) => argument === SHARD_FLAG || argument.startsWith(`${SHARD_FLAG}=`));
+    const flag = argv[position];
+    if (flag === undefined) {
+        return undefined;
+    }
+    return flag.includes('=') ? flag.slice(SHARD_FLAG.length + 1) : argv[position + 1];
+};
+const isCell = (value) => Number.isSafeInteger(value) && (value ?? 0) > 0;
+const isRange = (index, count) => count >= 2 && index <= count;
+const toShard = (value) => {
+    const [index, count] = value.split('/').map(Number);
+    return isCell(index) && isCell(count) && isRange(index, count) ? { count, index } : undefined;
+};
+const parseShard = (argv) => {
+    const value = shardArgument(argv);
+    return value === undefined ? undefined : toShard(value);
+};
+exports.parseShard = parseShard;
+const takeLightest = (weights, weight) => {
+    const lightest = weights.indexOf(Math.min(...weights));
+    weights[lightest] = (weights[lightest] ?? 0) + weight;
+    return lightest + 1;
+};
+const assignShard = (specs, index, count) => {
+    const weights = Array.from({ length: count }, () => 0);
+    const ordered = specs.toSorted((left, right) => right.weight - left.weight || left.path.localeCompare(right.path));
+    const placed = ordered.map((spec) => ({ path: spec.path, shard: takeLightest(weights, spec.weight) }));
+    return placed.filter((spec) => spec.shard === index).map((spec) => spec.path);
+};
+exports.assignShard = assignShard;
+class ProjectShardSequencer extends node_1.BaseSequencer {
+    async shard(files) {
+        const { shard } = this.ctx.config;
+        if (shard === undefined || shard.index === 1) {
+            return files;
+        }
+        const specs = await Promise.all(files.map(async (file) => {
+            const { size } = await (0, promises_1.stat)(file.moduleId);
+            return { path: file.moduleId, weight: size };
+        }));
+        const assigned = new Set((0, exports.assignShard)(specs, shard.index - 1, shard.count - 1));
+        return files.filter((file) => assigned.has(file.moduleId));
+    }
+}
+exports.ProjectShardSequencer = ProjectShardSequencer;

package/dist/esm/vitest/index.d.ts

@@ -0,0 +1 @@
+export * from './project-shard-sequencer.js';

package/dist/esm/vitest/index.js

@@ -0,0 +1 @@
+export * from './project-shard-sequencer.js';

package/dist/esm/vitest/project-shard-sequencer.d.ts

@@ -0,0 +1,15 @@
+import type { TestSpecification } from 'vitest/node';
+import { BaseSequencer } from 'vitest/node';
+export interface ShardInterface {
+    readonly count: number;
+    readonly index: number;
+}
+export interface WeightedSpecInterface {
+    readonly path: string;
+    readonly weight: number;
+}
+export declare const parseShard: (argv: readonly string[]) => ShardInterface | undefined;
+export declare const assignShard: (specs: readonly WeightedSpecInterface[], index: number, count: number) => string[];
+export declare class ProjectShardSequencer extends BaseSequencer {
+    shard(files: TestSpecification[]): Promise<TestSpecification[]>;
+}

package/dist/esm/vitest/project-shard-sequencer.js

@@ -0,0 +1,46 @@
+import { stat } from 'node:fs/promises';
+import { BaseSequencer } from 'vitest/node';
+const SHARD_FLAG = '--shard';
+const shardArgument = (argv) => {
+    const position = argv.findIndex((argument) => argument === SHARD_FLAG || argument.startsWith(`${SHARD_FLAG}=`));
+    const flag = argv[position];
+    if (flag === undefined) {
+        return undefined;
+    }
+    return flag.includes('=') ? flag.slice(SHARD_FLAG.length + 1) : argv[position + 1];
+};
+const isCell = (value) => Number.isSafeInteger(value) && (value ?? 0) > 0;
+const isRange = (index, count) => count >= 2 && index <= count;
+const toShard = (value) => {
+    const [index, count] = value.split('/').map(Number);
+    return isCell(index) && isCell(count) && isRange(index, count) ? { count, index } : undefined;
+};
+export const parseShard = (argv) => {
+    const value = shardArgument(argv);
+    return value === undefined ? undefined : toShard(value);
+};
+const takeLightest = (weights, weight) => {
+    const lightest = weights.indexOf(Math.min(...weights));
+    weights[lightest] = (weights[lightest] ?? 0) + weight;
+    return lightest + 1;
+};
+export const assignShard = (specs, index, count) => {
+    const weights = Array.from({ length: count }, () => 0);
+    const ordered = specs.toSorted((left, right) => right.weight - left.weight || left.path.localeCompare(right.path));
+    const placed = ordered.map((spec) => ({ path: spec.path, shard: takeLightest(weights, spec.weight) }));
+    return placed.filter((spec) => spec.shard === index).map((spec) => spec.path);
+};
+export class ProjectShardSequencer extends BaseSequencer {
+    async shard(files) {
+        const { shard } = this.ctx.config;
+        if (shard === undefined || shard.index === 1) {
+            return files;
+        }
+        const specs = await Promise.all(files.map(async (file) => {
+            const { size } = await stat(file.moduleId);
+            return { path: file.moduleId, weight: size };
+        }));
+        const assigned = new Set(assignShard(specs, shard.index - 1, shard.count - 1));
+        return files.filter((file) => assigned.has(file.moduleId));
+    }
+}

package/package.json

@@ -1,12 +1,13 @@
 {
   "name": "@application-kit/testing",
-  "version": "0.1.0",
-  "description": "Тестовая инфраструктура NestJS-приложений: шины CQRS, логгер, фейковый microservice, сборка web-приложения и Postgres в testcontainers",
+  "version": "0.2.0",
+  "description": "Тестовая инфраструктура NestJS-приложений: шины CQRS, логгер, фейковый microservice, сборка web-приложения, Postgres в testcontainers и раскладка ячеек CI по проектам vitest",
   "keywords": [
     "cqrs",
     "nestjs",
     "testcontainers",
-    "testing"
+    "testing",
+    "vitest"
   ],
   "homepage": "https://gitlab.com/application-kit/application-kit/-/tree/main/packages/testing",
   "bugs": "https://gitlab.com/application-kit/application-kit/-/issues",
@@ -32,7 +33,17 @@
         "default": "./dist/cjs/index.js"
       }
     },
-    "./package.json": "./package.json"
+    "./package.json": "./package.json",
+    "./vitest": {
+      "import": {
+        "types": "./dist/esm/vitest/index.d.ts",
+        "default": "./dist/esm/vitest/index.js"
+      },
+      "require": {
+        "types": "./dist/cjs/vitest/index.d.ts",
+        "default": "./dist/cjs/vitest/index.js"
+      }
+    }
   },
   "main": "./dist/cjs/index.js",
   "module": "./dist/esm/index.js",
@@ -41,7 +52,7 @@
     "dist"
   ],
   "scripts": {
-    "build": "rm -rf ./dist && node ../../scripts/barrels.mjs create ./src && tsc --project tsconfig.build.json && tsc --project tsconfig.build.cjs.json && node ../../scripts/barrels.mjs clean ./src && node ../../scripts/mark-cjs.mjs ./dist/cjs",
+    "build": "rm -rf ./dist && node ../../scripts/barrels.mjs create ./src --entry-only=vitest && tsc --project tsconfig.build.json && tsc --project tsconfig.build.cjs.json && node ../../scripts/barrels.mjs clean ./src && node ../../scripts/mark-cjs.mjs ./dist/cjs",
     "lint:tsc": "tsc --noEmit --pretty --project .",
     "test:mutation": "stryker run",
     "test:unit": "vitest run"
@@ -78,7 +89,13 @@
     "oxide.ts": "^1.1.0",
     "rxjs": "^7.8.2",
     "testcontainers": "^12.1.0",
-    "typeorm": "^1.0.0"
+    "typeorm": "^1.0.0",
+    "vitest": "^4.1.0"
+  },
+  "peerDependenciesMeta": {
+    "vitest": {
+      "optional": true
+    }
   },
   "engines": {
     "node": ">=24"