@platforma-sdk/block-tools 2.10.16 → 2.10.18

package/src/structure/rules/ui.ts

@@ -13,9 +13,6 @@ import {
   blockVars,
   when,
   whenFilesExist,
-  ensureField,
-  removeField,
-  pruneKeysMatching,
 } from "../engine/api";
 import { getActiveRunContext } from "../engine/builders";
 import { uiPackageJsonInitial, uiPackageJsonRules } from "./ui-package-json";
@@ -23,25 +20,16 @@ import { COLOCATED_TEST_GLOB } from "./shared/colocated-tests";
 
 export function uiRules(): void {
   scope("ui", () => {
-    // tsconfig is managed (not fixed) so node ambient types can be provided
-    // CONDITIONALLY. The body still enforces the canonical shape —
-    // `{extends, include}` with NO stray keys — and, ONLY when the ui
-    // carries co-located unit tests (`src/**/*.test.ts`), adds
-    // `compilerOptions.types: ["node"]` so tests importing `node:*`
-    // type-check under vue-tsc: provide node types, do NOT exclude the
-    // tests. A test-less ui is canonicalised to
-    // bare `{extends, include}` and stays a refresh fixpoint. The matching
-    // `@types/node` devDep is wired by the package.json rule under the same
-    // predicate.
-    managed("tsconfig.json", file("ui/tsconfig.json"), () => {
-      ensureField("extends", "@milaboratories/ts-configs/block/ui");
-      removeField("compilerOptions");
-      when(whenFilesExist(COLOCATED_TEST_GLOB), () => {
-        ensureField("compilerOptions.types", ["node"]);
-      });
-      ensureField("include", ["src/**/*"]);
-      pruneKeysMatching((k) => k !== "extends" && k !== "include" && k !== "compilerOptions");
-    });
+    // Two static end states by co-located-test presence: a test-bearing ui gets
+    // node ambient types (`.node.json`) so tests' `node:*` imports type-check
+    // under vue-tsc — `@types/node` is wired alongside by the package.json rule;
+    // a test-less ui stays bare. `fixed` (engine-owned, whole-file overwrite)
+    // not `managed`, so refresh is idempotent by construction — no key-order drift.
+    when(
+      whenFilesExist(COLOCATED_TEST_GLOB),
+      () => fixed("tsconfig.json", file("ui/tsconfig.node.json")),
+      () => fixed("tsconfig.json", file("ui/tsconfig.json")),
+    );
     fixed(".oxlintrc.json", file("ui/.oxlintrc.json"));
     // Block-local oxfmt config — the ui is oxfmt-checked (`ts-builder check
     // --target block-ui`).

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

@@ -8,6 +8,7 @@ import {
   ensureScript,
   ensureDep,
   ensureDevDeps,
+  removeDep,
   ensureWorkspaceScopeDeps,
   enforceAlphabeticalOrder,
   enforceFieldOrder,
@@ -44,7 +45,8 @@ export function workflowPackageJsonInitial(ctx: RunContext): Record<string, unkn
     devDependencies: {
       "@platforma-sdk/tengo-builder": "sdk:",
       "@platforma-sdk/test": "sdk:",
-      vitest: "catalog:",
+      // `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).
       shx: "catalog:",
     },
   };
@@ -59,15 +61,28 @@ export function workflowPackageJsonRules(): void {
   ensureScript("check", "pl-tengo check");
   // Tengo source formatter (emacs batch); no-op notice when emacs is absent.
   ensureScript("format", "/usr/bin/env emacs --script ./format.el || echo 'No emacs.'");
-  // The vitest `test` script is wired ONLY when the workflow carries
-  // co-located integration tests (`src/**/*.test.ts`, incl. `src/test/`).
-  // A test-less workflow gets no `test` task 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.)
-  when(whenFilesExist(COLOCATED_TEST_GLOB), () => {
-    ensureScript("test", "vitest run --passWithNoTests");
-  });
+  // 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.)
+  //
+  // Skipped entirely for sdk-internal (in-monorepo) blocks: they own their test
+  // wiring under the monorepo's shared infrastructure — see model-package-json.
+  when(
+    ({ ctx }) => !ctx.isSdkInternal,
+    () =>
+      when(
+        whenFilesExist(COLOCATED_TEST_GLOB),
+        () => {
+          ensureScript("test", "vitest run --passWithNoTests");
+          ensureDevDeps({ vitest: "catalog:" });
+        },
+        () => removeDep("vitest"),
+      ),
+  );
 
   ensureDep("@platforma-sdk/workflow-tengo", "sdk:");
 
@@ -80,7 +95,6 @@ export function workflowPackageJsonRules(): void {
   ensureDevDeps({
     "@platforma-sdk/tengo-builder": "sdk:",
     "@platforma-sdk/test": "sdk:",
-    vitest: "catalog:",
     shx: "catalog:",
   });
 

package/src/structure/rules/workflow.ts

@@ -11,10 +11,13 @@ import {
   tpl,
   generate,
   remove,
+  when,
+  whenFilesExist,
   blockVars,
 } from "../engine/api";
 import { getActiveRunContext } from "../engine/builders";
 import { workflowPackageJsonInitial, workflowPackageJsonRules } from "./workflow-package-json";
+import { COLOCATED_TEST_GLOB } from "./shared/colocated-tests";
 
 export function workflowRules(): void {
   scope("workflow", () => {
@@ -24,8 +27,24 @@ export function workflowRules(): void {
     fixed("tsconfig.json", file("workflow/tsconfig.json"));
     // Tengo source formatter (emacs batch); the `format` script invokes it.
     fixed("format.el", file("workflow/format.el"));
-    // scaffold (not fixed): tengo test config is author-tunable.
-    scaffold("vitest.config.mts", file("workflow/vitest.config.mts"));
+    // vitest config only when the workflow carries co-located tests
+    // (`src/**/*.test.ts`, incl. `src/test/`) — paired with the conditional
+    // `vitest` devDep + `test` script in workflow-package-json. scaffold (not
+    // fixed): author-tunable when present; a test-less workflow gets none.
+    //
+    // Skipped entirely for sdk-internal (in-monorepo) blocks: they own their
+    // test config under the monorepo's shared infrastructure (e.g. a bespoke
+    // `vitest run --coverage` + `createVitestConfig`), which the structurer
+    // must neither scaffold nor remove. See workflow-package-json.
+    when(
+      ({ ctx }) => !ctx.isSdkInternal,
+      () =>
+        when(
+          whenFilesExist(COLOCATED_TEST_GLOB),
+          () => scaffold("vitest.config.mts", file("workflow/vitest.config.mts")),
+          () => remove("vitest.config.mts"),
+        ),
+    );
     // No workflow facade (index.js / index.d.ts): the block loader resolves the
     // workflow via the `block:` components dist path (workflow/dist/.../main.plj.gz),
     // never the JS facade. It was orphaned in production — dropped. Actively

package/src/structure/templates/static/model/tsconfig.node.json

@@ -0,0 +1,7 @@
+{
+  "extends": "@milaboratories/ts-configs/block/model",
+  "compilerOptions": {
+    "types": ["node"]
+  },
+  "include": ["src/**/*"]
+}

package/src/structure/templates/static/ui/tsconfig.node.json

@@ -0,0 +1,7 @@
+{
+  "extends": "@milaboratories/ts-configs/block/ui",
+  "compilerOptions": {
+    "types": ["node"]
+  },
+  "include": ["src/**/*"]
+}