@platforma-sdk/block-tools 2.10.17 → 2.10.18

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

@@ -38,7 +38,7 @@ export function rootPackageJsonInitial(_ctx: RunContext): Record<string, unknown
       // refresh → format flow); kept for compatibility.
       "update-sdk": "block-tools structure refresh --update-deps-only",
       update:
-        "block-tools structure refresh --update-deps-only && pnpm i && block-tools structure refresh && pnpm fmt",
+        "block-tools structure refresh --update-deps-only && pnpm i && block-tools structure refresh && pnpm i && pnpm fmt",
     },
     peerDependencies: {
       oxlint: "*",
@@ -79,12 +79,14 @@ export function rootPackageJsonRules(): void {
   // Deprecated in favour of `update`; kept for compatibility.
   ensureScript("update-sdk", "block-tools structure refresh --update-deps-only");
   // Full SDK-update flow: bump catalog (deps-only) → install → re-apply
-  // structure against the freshly-pulled deps → format the result, wrapped
-  // as one script. `pnpm fmt` (turbo run fmt) leaves the tree oxfmt-clean
-  // after the structural rewrite so a follow-up `pnpm check` passes.
+  // structure against the freshly-pulled deps → install AGAIN (the structural
+  // pass can add new devDeps — e.g. ts-builder/oxlint/oxfmt on a first
+  // migration — that `pnpm fmt` then needs on PATH) → format. Wrapped as one
+  // script. `pnpm fmt` (turbo run fmt) leaves the tree oxfmt-clean after the
+  // structural rewrite so a follow-up `pnpm check` passes.
   ensureScript(
     "update",
-    "block-tools structure refresh --update-deps-only && pnpm i && block-tools structure refresh && pnpm fmt",
+    "block-tools structure refresh --update-deps-only && pnpm i && block-tools structure refresh && pnpm i && pnpm fmt",
   );
 
   ensureDevDeps({

package/src/structure/rules/root-pnpm-workspace.ts

@@ -18,8 +18,8 @@
 // npm-latest for the SDK families) lives in the separate `onInitOrUpdate`
 // frame (`rootCatalogBumpRules`), which fires on init + update-deps only.
 
-import { ensureWorkspaceModulePaths, type RunContext } from "../engine/api";
-import { matchesBumpPattern } from "../engine/registry-client";
+import { ensureWorkspaceModulePaths, ensureCatalogAbsent, type RunContext } from "../engine/api";
+import { matchesBumpPattern, type DerivedCatalogPin } from "../engine/registry-client";
 
 /** SDK packages that live in the catalog (membership only — no versions).
  *  Init fetches npm latest for each; refresh leaves them as the lockfile has
@@ -62,14 +62,23 @@ export const INFRA_CATALOG_FLOOR: Record<string, string> = {
   shx: "~0.4.0",
   "@changesets/cli": "~2.29.8",
   vitest: "~4.0.18",
-  // The seeded ui depends on `vue` (catalog:). `@platforma-sdk/ui-vue` pins
-  // vue as an EXACT regular dependency (not a peer), so the block must pin the
-  // SAME exact version — a floated `~` lets the ui resolve a newer 3.5.x than
-  // ui-vue's, yielding two vue instances and a SdkPluginV3-vs-Plugin type
-  // clash in `main.ts`. Keep this in lockstep with ui-vue's vue pin.
-  vue: "3.5.24",
 };
 
+/** Catalog entries whose exact version is DERIVED from the version another
+ *  package declares for them (see `pinCatalogToDependencyOf`). Resolved on
+ *  init + update-deps and OVERWRITES the on-disk entry.
+ *
+ *  `vue`: the seeded ui depends on `vue` (catalog:). `@platforma-sdk/ui-vue`
+ *  pins vue as an EXACT regular dependency (not a peer), so the block must
+ *  pin the SAME exact version — a floated `~` lets the ui resolve a newer
+ *  3.5.x than ui-vue's, yielding two vue instances and a SdkPluginV3-vs-Plugin
+ *  type clash in `main.ts`. Deriving the pin from ui-vue's declared dep keeps
+ *  the block in lockstep with whatever vue ui-vue's npm-latest pins, with no
+ *  hand-maintained version here. */
+export const DERIVED_CATALOG_PINS: readonly DerivedCatalogPin[] = [
+  { entry: "vue", of: "@platforma-sdk/ui-vue" },
+];
+
 /** Catalog name of the python runenv. Added to a block's catalog only when
  *  the block carries a software module. Pinned to an EXACT version — updating
  *  the python runenv is an explicit author decision, never automatic. */
@@ -100,4 +109,11 @@ export function rootPnpmWorkspaceInitial(ctx: RunContext): Record<string, unknow
 
 export function rootPnpmWorkspaceRules(): void {
   ensureWorkspaceModulePaths();
+  // vite/tsup/vue-tsc-era catalog entries: the canonical toolchain (ts-builder
+  // owns vue-tsc; ts-builder + rolldown replace vite/tsup) does not use them.
+  // Drop the orphaned catalog keys — paired with the per-package `removeDep`
+  // so a migrated block sheds both the dep and its catalog entry.
+  ensureCatalogAbsent("vite");
+  ensureCatalogAbsent("tsup");
+  ensureCatalogAbsent("vue-tsc");
 }

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

@@ -16,6 +16,7 @@ import {
   ensurePeerDeps,
   ensureWorkspaceScopeDeps,
   removeDep,
+  removeScript,
   enforceAlphabeticalOrder,
   enforceFieldOrder,
   when,
@@ -38,8 +39,6 @@ export function uiPackageJsonInitial(ctx: RunContext): Record<string, unknown> {
       watch: "ts-builder build --target block-ui --watch",
       build: "ts-builder build --target block-ui",
       check: "ts-builder check --target block-ui",
-      // No `test`: the vitest `test` script is wired by the body rule ONLY
-      // when co-located test files exist (a freshly-init'd ui has none).
     },
     dependencies: {
       "@platforma-sdk/ui-vue": "sdk:",
@@ -51,7 +50,6 @@ export function uiPackageJsonInitial(ctx: RunContext): Record<string, unknown> {
     devDependencies: {
       "@milaboratories/ts-builder": "sdk:",
       "@milaboratories/ts-configs": "sdk:",
-      vitest: "catalog:",
     },
     peerDependencies: {
       typescript: "*",
@@ -77,7 +75,6 @@ export function uiPackageJsonRules(): void {
   ensureDevDeps({
     "@milaboratories/ts-builder": "sdk:",
     "@milaboratories/ts-configs": "sdk:",
-    vitest: "catalog:",
   });
 
   // `vue-tsc` is owned by `ts-builder` (which runs it internally for
@@ -87,6 +84,11 @@ export function uiPackageJsonRules(): void {
   // up type-checking under a different vue-tsc than the toolchain intends.
   removeDep("vue-tsc");
 
+  // vite-era artefacts: the canonical ui builds + dev-serves via ts-builder,
+  // so a legacy `vite` dep and the `preview` (vite preview) script are dropped.
+  removeDep("vite");
+  removeScript("preview");
+
   // The ui builds with `--target block-ui` (types: []), so by default it
   // carries no browser/vitest/node ambient types — only the `typescript`
   // peer for IDE type resolution. Drop any stray `@types/node` a legacy
@@ -97,15 +99,27 @@ export function uiPackageJsonRules(): void {
   removeDep("@types/node");
 
   // ...but a ui WITH co-located unit tests (`src/**/*.test.ts`) needs the
-  // vitest `test` script AND node ambient types: re-add `@types/node` as a
-  // devDep so `types: ["node"]` in ui/tsconfig (wired under the same
-  // predicate) resolves the tests' `node:*` imports. A test-less ui keeps
-  // the lean default (no test script, no @types/node) and stays a fixpoint.
-  // Runs AFTER removeDep so the dev dep is not stripped.
-  when(whenFilesExist(COLOCATED_TEST_GLOB), () => {
-    ensureScript("test", "vitest run --passWithNoTests");
-    ensureDevDep("@types/node", "*");
-  });
+  // vitest `test` script, the `vitest` devDep, AND node ambient types: re-add
+  // `@types/node` as a devDep so `types: ["node"]` in ui/tsconfig (wired under
+  // the same predicate) resolves the tests' `node:*` imports. A test-less ui
+  // keeps the lean default (no test script, no vitest, no @types/node) and
+  // stays a fixpoint. Runs AFTER removeDep so the dev deps are not stripped.
+  //
+  // 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");
+          ensureDevDep("vitest", "catalog:");
+          ensureDevDep("@types/node", "*");
+        },
+        () => removeDep("vitest"),
+      ),
+  );
 
   enforceAlphabeticalOrder("dependencies");
   enforceAlphabeticalOrder("devDependencies");

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