@platforma-sdk/block-tools 2.16.9 → 2.16.11

package/dist/structure/rules/shared/colocated-tests.d.ts

@@ -1,2 +1,4 @@
 /** Glob (module-relative) for co-located unit tests in a scope's `src/`. */
 export declare const COLOCATED_TEST_GLOB = "src/**/*.test.ts";
+/** Glob (module-relative) for Tengo unit tests, run by `pl-tengo test`. */
+export declare const TENGO_TEST_GLOB = "src/**/*.test.tengo";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/block-tools",
-  "version": "2.16.9",
+  "version": "2.16.11",
   "description": "Utility to manipulate Platforma Blocks and Block Registry",
   "license": "UNLICENSED",
   "bin": {
@@ -34,14 +34,14 @@
     "undici": "~7.16.0",
     "yaml": "^2.8.0",
     "zod": "~3.25.76",
+    "@milaboratories/pl-http": "1.2.4",
     "@milaboratories/pl-model-middle-layer": "1.34.1",
     "@milaboratories/pl-model-common": "1.52.0",
-    "@milaboratories/pl-http": "1.2.4",
-    "@milaboratories/resolve-helper": "1.1.3",
-    "@milaboratories/pl-model-backend": "1.4.34",
+    "@milaboratories/pl-model-backend": "1.4.35",
+    "@platforma-sdk/package-builder-lib": "1.4.0",
     "@milaboratories/ts-helpers": "1.8.6",
     "@platforma-sdk/blocks-deps-updater": "2.2.0",
-    "@platforma-sdk/package-builder-lib": "1.4.0"
+    "@milaboratories/resolve-helper": "1.1.3"
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^16.0.1",
@@ -57,8 +57,8 @@
     "vite-plugin-dts": "^5.0.3",
     "vitest": "^4.1.3",
     "@milaboratories/build-configs": "2.0.2",
-    "@milaboratories/ts-builder": "1.7.2",
-    "@milaboratories/ts-configs": "1.4.0"
+    "@milaboratories/ts-configs": "1.4.0",
+    "@milaboratories/ts-builder": "1.7.2"
   },
   "scripts": {
     "build": "vite build",

package/src/structure/__tests__/colocated-test-wiring.test.ts

@@ -104,4 +104,63 @@ describe("co-located test wiring (real STRUCTURE)", () => {
     // (workflow tsconfig is JSON, but parseYaml reads JSON too; types:[] unchanged)
     expect(wfTs.types).toEqual([]);
   });
+
+  test("a workflow Tengo test wires `pl-tengo test` without vitest", async () => {
+    const { fs } = simulateInit({ vars: VARS, registryLookup: mockLookup });
+    fs.write("workflow/src/lib.test.tengo", `test := import(":test")\n`);
+
+    await refresh(fs);
+
+    const workflow = JSON.parse(fs.read("workflow/package.json")) as Pkg;
+    expect(workflow.scripts?.test).toBe("pl-tengo test");
+    expect(workflow.devDependencies?.vitest).toBeUndefined();
+
+    const after = fs.read("workflow/package.json");
+    await refresh(fs);
+    expect(fs.read("workflow/package.json")).toBe(after);
+  });
+
+  test("a Tengo-only workflow replaces a stale vitest script and drops the vitest devDep", async () => {
+    const { fs } = simulateInit({ vars: VARS, registryLookup: mockLookup });
+    fs.write("workflow/src/sub/deep/lib.test.tengo", `test := import(":test")\n`);
+    const stale = JSON.parse(fs.read("workflow/package.json")) as Pkg;
+    stale.scripts = { ...stale.scripts, test: "vitest run --passWithNoTests" };
+    stale.devDependencies = { ...stale.devDependencies, vitest: "catalog:" };
+    fs.write("workflow/package.json", JSON.stringify(stale, null, 2) + "\n");
+
+    await refresh(fs);
+
+    const workflow = JSON.parse(fs.read("workflow/package.json")) as Pkg;
+    expect(workflow.scripts?.test).toBe("pl-tengo test");
+    expect(workflow.devDependencies?.vitest).toBeUndefined();
+  });
+
+  test("Tengo and vitest workflow tests wire both runners and restore a drifted script", async () => {
+    const { fs } = simulateInit({ vars: VARS, registryLookup: mockLookup });
+    fs.write("workflow/src/lib.test.tengo", `test := import(":test")\n`);
+    fs.write("workflow/src/wf.test.ts", `import { test } from "vitest";\ntest("x", () => {});\n`);
+    const drifted = JSON.parse(fs.read("workflow/package.json")) as Pkg;
+    drifted.scripts = { ...drifted.scripts, test: "vitest run --passWithNoTests" };
+    fs.write("workflow/package.json", JSON.stringify(drifted, null, 2) + "\n");
+
+    await refresh(fs);
+
+    const workflow = JSON.parse(fs.read("workflow/package.json")) as Pkg;
+    expect(workflow.scripts?.test).toBe("pl-tengo test && vitest run --passWithNoTests");
+    expect(workflow.devDependencies?.vitest).toBe("catalog:");
+
+    const after = fs.read("workflow/package.json");
+    await refresh(fs);
+    expect(fs.read("workflow/package.json")).toBe(after);
+  });
+
+  test("a Tengo test template for vitest (`*.test.tpl.tengo`) does not wire `pl-tengo test`", async () => {
+    const { fs } = simulateInit({ vars: VARS, registryLookup: mockLookup });
+    fs.write("workflow/src/test/run.test.tpl.tengo", `self := import(":tpl")\n`);
+
+    await refresh(fs);
+
+    const workflow = JSON.parse(fs.read("workflow/package.json")) as Pkg;
+    expect(workflow.scripts?.test).toBeUndefined();
+  });
 });

package/src/structure/rules/shared/colocated-tests.ts

@@ -9,3 +9,6 @@
 
 /** Glob (module-relative) for co-located unit tests in a scope's `src/`. */
 export const COLOCATED_TEST_GLOB = "src/**/*.test.ts";
+
+/** Glob (module-relative) for Tengo unit tests, run by `pl-tengo test`. */
+export const TENGO_TEST_GLOB = "src/**/*.test.tengo";

package/src/structure/rules/workflow-package-json.ts

@@ -19,7 +19,7 @@ import {
 import { scopeDepMaps } from "../engine/ctx";
 import { canonicalPackageJsonOrder } from "./shared/key-order";
 import { ensureModuleVersion, INITIAL_MODULE_VERSION } from "./shared/initial-version";
-import { COLOCATED_TEST_GLOB } from "./shared/colocated-tests";
+import { COLOCATED_TEST_GLOB, TENGO_TEST_GLOB } from "./shared/colocated-tests";
 import { removeRetiredToolchainDeps } from "./shared/retired-deps";
 
 export function workflowPackageJsonInitial(ctx: RunContext): Record<string, unknown> {
@@ -38,8 +38,8 @@ export function workflowPackageJsonInitial(ctx: RunContext): Record<string, unkn
       // its input, so a command that rewrites sources inside it would change
       // the inputs turbo has already hashed.
       check: "pl-tengo imports && pl-tengo check",
-      // No `test`: the vitest `test` script is wired by the body rule ONLY
-      // when co-located test files exist (a freshly-init'd workflow has none).
+      // No `test`: the body rule wires it ONLY when Tengo or vitest test files
+      // exist (a freshly-init'd workflow has none).
       // Tengo source formatter (emacs batch). Falls back to a notice when
       // emacs is absent, so the script never hard-fails the environment.
       format: "/usr/bin/env emacs --script ./format.el || echo 'No emacs.'",
@@ -53,7 +53,7 @@ export function workflowPackageJsonInitial(ctx: RunContext): Record<string, unkn
       "@platforma-sdk/tengo-builder": "sdk:",
       "@platforma-sdk/test": "sdk:",
       // `vitest` is NOT seeded here — it's wired by the body rule only when the
-      // workflow carries co-located tests (a freshly-init'd workflow has none).
+      // workflow carries `*.test.ts` tests (a freshly-init'd workflow has none).
       shx: "catalog:",
     },
   };
@@ -73,13 +73,14 @@ export function workflowPackageJsonRules(): void {
   ensureScript("build", "shx rm -rf dist && pl-tengo build");
   ensureScript("check", "pl-tengo imports && pl-tengo check");
   ensureScript("format", "/usr/bin/env emacs --script ./format.el || echo 'No emacs.'");
-  // The vitest `test` script AND the `vitest` devDep are wired ONLY when the
-  // workflow carries co-located integration tests (`src/**/*.test.ts`, incl.
-  // `src/test/`). A test-less workflow gets neither — no `test` task, no
-  // vitest dep — and stays a refresh fixpoint. (Workflow tests type-check via
-  // the standalone workflow/tsconfig with `types: []` — they pull their types
-  // from `@platforma-sdk/test` — so no node-types wiring is needed here,
-  // unlike model/ui.)
+  // The `test` script runs `pl-tengo test` when the workflow carries Tengo unit
+  // tests (`src/**/*.test.tengo`) and vitest when it carries co-located
+  // integration tests (`src/**/*.test.ts`, incl. `src/test/`); both when it
+  // carries both. The `vitest` devDep follows the vitest tests. A test-less
+  // workflow gets no vitest dep, and an existing `test` script is left as is.
+  // (Workflow tests type-check via the standalone workflow/tsconfig with
+  // `types: []` — they pull their types from `@platforma-sdk/test` — so no
+  // node-types wiring is needed here, unlike model/ui.)
   //
   // Skipped entirely for sdk-internal (in-monorepo) blocks: they own their test
   // wiring under the monorepo's shared infrastructure — see model-package-json.
@@ -89,10 +90,17 @@ export function workflowPackageJsonRules(): void {
       when(
         whenFilesExist(COLOCATED_TEST_GLOB),
         () => {
-          ensureScript("test", "vitest run --passWithNoTests");
+          when(
+            whenFilesExist(TENGO_TEST_GLOB),
+            () => ensureScript("test", "pl-tengo test && vitest run --passWithNoTests"),
+            () => ensureScript("test", "vitest run --passWithNoTests"),
+          );
           ensureDevDeps({ vitest: "catalog:" });
         },
-        () => removeDep("vitest"),
+        () => {
+          when(whenFilesExist(TENGO_TEST_GLOB), () => ensureScript("test", "pl-tengo test"));
+          removeDep("vitest");
+        },
       ),
   );