@platforma-sdk/block-tools 2.15.2 → 2.16.0

package/dist/structure/engine/version.d.ts

@@ -1,5 +1,5 @@
 import { FileSystem } from './fs/api';
-export declare const STRUCTURE_VERSION = 2;
+export declare const STRUCTURE_VERSION = 3;
 export declare const STRUCTURE_MIN_SUPPORTED = 0;
 /** Block-relative path of the structurer metadata file. */
 export declare const STRUCTURE_META_FILE = ".structure";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@platforma-sdk/block-tools",
-  "version": "2.15.2",
+  "version": "2.16.0",
   "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-model-common": "1.49.0",
+    "@milaboratories/pl-model-backend": "1.4.26",
+    "@milaboratories/pl-http": "1.2.4",
     "@milaboratories/pl-model-middle-layer": "1.32.1",
-    "@platforma-sdk/blocks-deps-updater": "2.2.0",
-    "@milaboratories/ts-helpers": "1.8.6",
     "@milaboratories/resolve-helper": "1.1.3",
     "@platforma-sdk/package-builder-lib": "1.4.0",
-    "@milaboratories/pl-http": "1.2.4",
-    "@milaboratories/pl-model-backend": "1.4.25"
+    "@milaboratories/ts-helpers": "1.8.6",
+    "@platforma-sdk/blocks-deps-updater": "2.2.0",
+    "@milaboratories/pl-model-common": "1.49.0"
   },
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^16.0.1",
@@ -56,9 +56,9 @@
     "vite": "^8.0.6",
     "vite-plugin-dts": "^5.0.3",
     "vitest": "^4.1.3",
-    "@milaboratories/ts-builder": "1.7.2",
+    "@milaboratories/build-configs": "2.0.1",
     "@milaboratories/ts-configs": "1.4.0",
-    "@milaboratories/build-configs": "2.0.1"
+    "@milaboratories/ts-builder": "1.7.2"
   },
   "scripts": {
     "build": "vite build",

package/src/structure/__tests__/workflow-imports-check.test.ts

@@ -0,0 +1,74 @@
+// End-to-end (real STRUCTURE): the workflow `check` script drops the unused
+// tengo imports before it checks the sources, an existing block converges on
+// that script, and a second refresh changes nothing.
+//
+// `imports` belongs to `check` and not to `build`: the build task declares
+// every tracked file as its input, so a command that rewrites sources inside
+// it would change the inputs turbo has already hashed.
+
+import { describe, test, expect } from "vitest";
+import { simulateInit, defaultTemplateProvider } from "../engine/testing";
+import { run as engineRun } from "../engine/runner";
+import { discoverRunContext } from "../engine/discovery-fs";
+import { STRUCTURE } from "../structure-definition";
+import { SDK_CATALOG_PACKAGES } from "../rules/root-pnpm-workspace";
+import type { BlockVars } from "../engine/api";
+
+const VARS: BlockVars = {
+  facadeName: "@platforma-open/test-org.demo",
+  baseName: "test-org.demo",
+  npmOrg: "@platforma-open",
+  orgScope: "test-org",
+  shortName: "demo",
+};
+
+const CHECK_SCRIPT = "pl-tengo imports && pl-tengo check";
+const BUILD_SCRIPT = "shx rm -rf dist && pl-tengo build";
+
+const mockLookup = (name: string): string | undefined =>
+  SDK_CATALOG_PACKAGES.includes(name) ? "9.9.9" : undefined;
+
+type Pkg = { scripts?: Record<string, string> };
+
+function refresh(fs: ReturnType<typeof simulateInit>["fs"]) {
+  const ctx = discoverRunContext({ fs, isSdkInternal: false });
+  engineRun(STRUCTURE, fs, ctx, {
+    templates: defaultTemplateProvider(),
+    rediscover: () => discoverRunContext({ fs, isSdkInternal: false, dryRun: true }),
+  });
+}
+
+const workflowScripts = (fs: ReturnType<typeof simulateInit>["fs"]): Record<string, string> =>
+  (JSON.parse(fs.read("workflow/package.json")) as Pkg).scripts ?? {};
+
+describe("workflow imports check (real STRUCTURE)", () => {
+  test("init writes the check script, and leaves build without it", () => {
+    const { fs } = simulateInit({ vars: VARS, registryLookup: mockLookup });
+
+    const scripts = workflowScripts(fs);
+    expect(scripts.check).toBe(CHECK_SCRIPT);
+    expect(scripts.build).toBe(BUILD_SCRIPT);
+  });
+
+  test("a block with the old check script converges on the new one", () => {
+    const { fs } = simulateInit({ vars: VARS, registryLookup: mockLookup });
+
+    // A block made before the command existed.
+    const pkg = JSON.parse(fs.read("workflow/package.json")) as Pkg;
+    pkg.scripts = { ...pkg.scripts, check: "pl-tengo check" };
+    fs.write("workflow/package.json", JSON.stringify(pkg, null, 2) + "\n");
+
+    refresh(fs);
+
+    expect(workflowScripts(fs).check).toBe(CHECK_SCRIPT);
+  });
+
+  test("refresh of a canonical block changes nothing", () => {
+    const { fs } = simulateInit({ vars: VARS, registryLookup: mockLookup });
+    const before = fs.read("workflow/package.json");
+
+    refresh(fs);
+
+    expect(fs.read("workflow/package.json")).toBe(before);
+  });
+});

package/src/structure/engine/version.ts

@@ -10,7 +10,7 @@
 
 import type { FileSystem } from "./fs/api";
 
-export const STRUCTURE_VERSION = 2;
+export const STRUCTURE_VERSION = 3;
 export const STRUCTURE_MIN_SUPPORTED = 0;
 /** Block-relative path of the structurer metadata file. */
 export const STRUCTURE_META_FILE = ".structure";

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

@@ -33,7 +33,11 @@ export function workflowPackageJsonInitial(ctx: RunContext): Record<string, unkn
       // No `fmt`: the workflow is Tengo, not TS — nothing for oxlint/oxfmt
       // to process. Tengo is built and checked by pl-tengo.
       build: "shx rm -rf dist && pl-tengo build",
-      check: "pl-tengo check",
+      // `imports` drops the imports the tengo sources do not use. It belongs
+      // to `check`, not `build`: the build task declares every tracked file as
+      // 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).
       // Tengo source formatter (emacs batch). Falls back to a notice when
@@ -67,7 +71,7 @@ export function workflowPackageJsonRules(): void {
   // No `fmt` script: the workflow is Tengo, not TS — build + check run via
   // pl-tengo; `format` runs the emacs-batch Tengo formatter (no-op when absent).
   ensureScript("build", "shx rm -rf dist && pl-tengo build");
-  ensureScript("check", "pl-tengo check");
+  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.