@smoothbricks/cli 0.10.3 → 0.10.4

package/README.md

@@ -231,7 +231,7 @@ candidates to downstream dependents because that would duplicate Nx's dependency
 `@smoothbricks/nx-plugin` owns transformer-aware TypeScript targets because this workspace compiles through `ttsc`.
 Configuring `@nx/js/typescript` would run `tsc`/`tsgo` directly and bypass the Typia and LMAO transformers. A package
 `tsconfig.lib.json` therefore produces the concrete `tsc-js` target from the SmoothBricks plugin. The same plugin also
-infers Bun test typechecking, non-TypeScript build-tool steps, and aggregate targets.
+infers Bun test typechecking, Cargo workspace targets, and aggregate targets.
 
 Concrete targets use `{tool}-{output}` names and describe the tool that runs and the artifact or purpose it produces:
 
@@ -242,8 +242,8 @@ Concrete targets use `{tool}-{output}` names and describe the tool that runs and
 - Test tsconfigs are validation configs, not TypeScript build-mode projects. They must use `noEmit`, must not set
   `composite: true`, and package root `tsconfig.json` must not reference `./tsconfig.test.json`. The inferred
   `typecheck-tests` target runs `ttsc --noEmit -p tsconfig.test.json` after `build` instead.
-- Non-TypeScript build steps come from explicit tool configuration. For example, a package `build.zig` must expose named
-  `b.step("name", ...)` entries; each non-reserved step becomes a `zig-name` target such as `zig-wasm`.
+- A neighboring workspace-root `Cargo.toml` provides Cargo test, lint, mutation, and benchmark targets. Workspaces with
+  `cdylib` member crates also receive the cacheable `cargo-wasm` output target.
 - `build` is an aggregate. It exists only when there is at least one concrete build target such as `tsc-js`,
   `tsdown-js`, or another tool-output target, and it depends on output-family wildcards such as `*-js`, `*-web`,
   `*-html`, `*-css`, `*-ios`, `*-android`, `*-native`, `*-napi`, `*-bun`, and `*-wasm` instead of duplicating commands.
@@ -253,16 +253,18 @@ The root `@typescript/native` dependency follows TypeScript's documented side-by
 and supplies the native compiler used by `ttsc`. Because `ttsc` resolves only the unscoped package by default, the
 managed devenv shell sets `TTSC_TSGO_BINARY` to `node_modules/@typescript/native/bin/tsc`; the GitHub setup action
 persists that absolute path through `GITHUB_ENV`. Nx and other JavaScript tooling still require the full TypeScript
-compiler API, so workspace `typescript` dependencies stay on TypeScript 6. Both dependencies and the environment binding
-are required: TypeScript 7 under the unscoped name breaks Nx API calls such as `readConfigFile`.
+compiler API, so workspace `typescript` stays on TypeScript 6. After install, setup-environment forces Bun's shared
+`.bun/node_modules/typescript` hoist onto that API package so Nx does not load `@typescript/native` (TS7) via the store
+([oven-sh/bun#33834](https://github.com/oven-sh/bun/issues/33834)). Both dependencies and the environment binding are
+required: TypeScript 7 under the unscoped name breaks Nx API calls such as `readConfigFile`.
 
 Explicit Nx target names must not contain `:`. Nx already uses colon syntax at the CLI boundary:
 `project:target:configuration`. Allowing target names like `build:wasm` makes command parsing and package-script aliases
 look like configurations, and it prevents a clean split between concrete tool-output targets and aggregate targets.
 
-Use tool-output names for concrete targets, such as `tsc-js`, `tsdown-js`, and `zig-wasm`. Use `build` and `lint` only
+Use tool-output names for concrete targets, such as `tsc-js`, `tsdown-js`, and `cargo-wasm`. Use `build` and `lint` only
 as aggregate targets. Package scripts may still use developer-friendly colon names, for example `build:wasm`, but those
-scripts should delegate to unambiguous Nx targets such as `nx run pkg:zig-wasm`.
+scripts should delegate to unambiguous Nx targets such as `nx run pkg:cargo-wasm`.
 
 ## Managed Files
 
@@ -526,12 +528,6 @@ nx lint @smoothbricks/cli
 smoo monorepo validate
 ```
 
-If validating packages with Zig build steps from outside the devenv shell, add Zig explicitly:
-
-```bash
-nix shell nixpkgs#zig -c nx run-many -t build --projects=<public-projects>
-```
-
 ## Links
 
 [are-the-types-wrong]: https://github.com/arethetypeswrong/arethetypeswrong.github.io/tree/main/packages/cli

package/dist/bun/preload.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Bun runtime preload for consumers of `@smoothbricks/cli`.
+ *
+ * Re-exports the Typia/ttsc transform preload from `@smoothbricks/validation`.
+ * External repos depend on the CLI package only — they must not need a direct
+ * `@smoothbricks/validation` dependency just to run `smoo` against source.
+ *
+ * Usage:
+ *   import '@smoothbricks/cli/bun/preload';
+ *   // or bunfig.toml: preload = ["@smoothbricks/cli/bun/preload"]
+ */
+import '@smoothbricks/validation/bun/preload';
+//# sourceMappingURL=preload.d.ts.map

package/dist/bun/preload.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"preload.d.ts","sourceRoot":"","sources":["../../src/bun/preload.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AACH,OAAO,sCAAsC,CAAC"}

package/dist/bun/preload.js

@@ -0,0 +1,12 @@
+/**
+ * Bun runtime preload for consumers of `@smoothbricks/cli`.
+ *
+ * Re-exports the Typia/ttsc transform preload from `@smoothbricks/validation`.
+ * External repos depend on the CLI package only — they must not need a direct
+ * `@smoothbricks/validation` dependency just to run `smoo` against source.
+ *
+ * Usage:
+ *   import '@smoothbricks/cli/bun/preload';
+ *   // or bunfig.toml: preload = ["@smoothbricks/cli/bun/preload"]
+ */
+import '@smoothbricks/validation/bun/preload';

package/dist/cli.js

@@ -52,9 +52,12 @@ function buildProgram() {
         const { updateManagedFiles } = await import('./monorepo/index.js');
         updateManagedFiles(await findRepoRoot());
     });
-    monorepo.command('check').action(async () => {
+    monorepo
+        .command('check')
+        .option('--warn', 'report drift as warnings (GitHub annotations) instead of failing')
+        .action(async (options) => {
         const { checkManagedFiles } = await import('./monorepo/index.js');
-        checkManagedFiles(await findRepoRoot());
+        checkManagedFiles(await findRepoRoot(), { warn: options.warn });
     });
     monorepo.command('diff').action(async () => {
         const { diffManagedFiles } = await import('./monorepo/index.js');
@@ -69,10 +72,15 @@ function buildProgram() {
     });
     monorepo
         .command('sync-bun-lockfile-versions')
-        .option('--stage', 'stage bun.lock when versions were resynced (pre-commit self-heal); quiet when clean')
+        .option('--stage', 'stage bun.lock when versions were resynced; quiet when clean')
+        .option('--mode <mode>', 'install: match package.json (CI); publish: map unpublished -next to last stable tag (pre-pack)', 'publish')
         .action(async (options) => {
         const { syncBunLockfileVersions } = await import('./monorepo/index.js');
-        syncBunLockfileVersions(await findRepoRoot(), options.stage ? { log: false, stage: true } : {});
+        const mode = options.mode === 'install' ? 'install' : 'publish';
+        syncBunLockfileVersions(await findRepoRoot(), {
+            mode,
+            ...(options.stage ? { log: false, stage: true } : {}),
+        });
     });
     monorepo
         .command('list-release-packages')

package/dist/generate/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/generate/index.ts"],"names":[],"mappings":"AAmBA,MAAM,WAAW,eAAe;IAC9B,gFAAgF;IAChF,SAAS,EAAE,MAAM,CAAC;IAClB,qDAAqD;IACrD,WAAW,EAAE,MAAM,CAAC;IACpB,oEAAoE;IACpE,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IACjC,sDAAsD;IACtD,OAAO,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC;CACpC;AAED,UAAU,aAAa;IACrB,+CAA+C;IAC/C,IAAI,EAAE,MAAM,CAAC;IACb,+BAA+B;IAC/B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAkBpD,CAAC;AAMF,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,OAAO,CAAC,IAAI,CAAC,CAyBf"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/generate/index.ts"],"names":[],"mappings":"AAmBA,MAAM,WAAW,eAAe;IAC9B,gFAAgF;IAChF,SAAS,EAAE,MAAM,CAAC;IAClB,qDAAqD;IACrD,WAAW,EAAE,MAAM,CAAC;IACpB,oEAAoE;IACpE,IAAI,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,EAAE,CAAC;IACjC,sDAAsD;IACtD,OAAO,CAAC,EAAE,SAAS,aAAa,EAAE,CAAC;CACpC;AAED,UAAU,aAAa;IACrB,+CAA+C;IAC/C,IAAI,EAAE,MAAM,CAAC;IACb,+BAA+B;IAC/B,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,eAAO,MAAM,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,eAAe,CAYpD,CAAC;AAMF,wBAAsB,QAAQ,CAC5B,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC/B,OAAO,CAAC,IAAI,CAAC,CAyBf"}

package/dist/generate/index.js

@@ -7,12 +7,6 @@ export const variants = {
         args: (name) => ['--name', name, '--variant', 'ts-lib'],
         options: [{ flag: '--public', description: 'configure for npm publication' }],
     },
-    'ts-zig': {
-        generator: 'create-package',
-        description: 'Create a TypeScript + Zig/WASM hybrid package',
-        args: (name) => ['--name', name, '--variant', 'ts-zig'],
-        options: [{ flag: '--public', description: 'configure for npm publication' }],
-    },
     'make-public': {
         generator: 'make-public',
         description: 'Promote a private package to npm publication',

package/dist/github-ci/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/github-ci/index.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,cAAc,EAAsB,MAAM,gBAAgB,CAAC;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,KAAK,WAAW,GAAG,MAAM,GAAG,UAAU,GAAG,UAAU,CAAC;AAEpD,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBtE;AAmFD,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAO3G;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,WAAW,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,GACpG,OAAO,CAAC,IAAI,CAAC,CAWf;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,WAAW,EAAE,CAAC;IACpB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,cAAc,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,oBAAoB,CAiC9G;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAwC/E;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAehF;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGlE;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAa9F;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,iBAAiB,EAAE,MAAM,GACxB,OAAO,CAAC,IAAI,CAAC,CAGf;AAgCD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,WAAW,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GACrG,OAAO,CAAC,IAAI,CAAC,CA0Bf"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/github-ci/index.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,KAAK,cAAc,EAAsB,MAAM,gBAAgB,CAAC;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAmBhD,KAAK,WAAW,GAAG,MAAM,GAAG,UAAU,GAAG,UAAU,CAAC;AAEpD,wBAAsB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAwBtE;AAmFD,wBAAgB,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,UAAU,GAAG,UAAU,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAO3G;AAED,wBAAsB,eAAe,CACnC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;IAAE,MAAM,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,WAAW,CAAC;IAAC,aAAa,CAAC,EAAE,MAAM,CAAA;CAAE,GACpG,OAAO,CAAC,IAAI,CAAC,CAWf;AAED,MAAM,WAAW,gBAAgB;IAC/B,OAAO,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,kBAAkB,CAAC,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,oBAAoB;IACnC,IAAI,EAAE,WAAW,EAAE,CAAC;IACpB,cAAc,EAAE,MAAM,EAAE,CAAC;CAC1B;AAED,wBAAgB,kBAAkB,CAAC,QAAQ,EAAE,cAAc,EAAE,EAAE,OAAO,EAAE,gBAAgB,GAAG,oBAAoB,CAiC9G;AAED,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,WAAW,EAAE,GAAG,WAAW,EAAE,CAwC/E;AAED,wBAAgB,aAAa,CAAC,GAAG,EAAE,WAAW,EAAE,aAAa,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAehF;AAED,wBAAsB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAGlE;AAED,wBAAsB,iBAAiB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAa9F;AAED,wBAAsB,oBAAoB,CACxC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,iBAAiB,EAAE,MAAM,GACxB,OAAO,CAAC,IAAI,CAAC,CAGf;AAgCD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE;IAAE,aAAa,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,WAAW,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,MAAM,CAAC,EAAE,OAAO,CAAA;CAAE,GACrG,OAAO,CAAC,IAAI,CAAC,CA0Bf"}

package/dist/github-ci/index.js

@@ -1,9 +1,30 @@
-import { existsSync } from 'node:fs';
+import { existsSync, readFileSync } from 'node:fs';
 import { appendFile, mkdtemp, realpath, rename, rm } from 'node:fs/promises';
 import { dirname, join } from 'node:path';
 import { $ } from 'bun';
+import typia from 'typia';
+import { parseStringArrayText } from '../lib/json.js';
 import { decode, run, runStatus } from '../lib/run.js';
 import { readProjectTargets } from '../nx/index.js';
+const parseGithubActionsEvent = (() => {
+    const _io0 = input => undefined === input.repository || "object" === typeof input.repository && null !== input.repository && false === Array.isArray(input.repository) && _io1(input.repository);
+    const _io1 = input => undefined === input.default_branch || "string" === typeof input.default_branch;
+    const __is = input => "object" === typeof input && null !== input && false === Array.isArray(input) && _io0(input);
+    return input => { input = JSON.parse(input); return __is(input) ? input : null; };
+})();
+const parseNxProjectDeployConfigurations = (() => {
+    const _io0 = input => undefined === input.targets || "object" === typeof input.targets && null !== input.targets && false === Array.isArray(input.targets) && _io1(input.targets);
+    const _io1 = input => undefined === input.deploy || "object" === typeof input.deploy && null !== input.deploy && false === Array.isArray(input.deploy) && _io2(input.deploy);
+    const _io2 = input => undefined === input.configurations || "object" === typeof input.configurations && null !== input.configurations && false === Array.isArray(input.configurations) && _io3(input.configurations);
+    const _io3 = input => Object.keys(input).every(key => {
+        const value = input[key];
+        if (undefined === value)
+            return true;
+        return true;
+    });
+    const __is = input => "object" === typeof input && null !== input && false === Array.isArray(input) && _io0(input);
+    return input => { input = JSON.parse(input); return __is(input) ? input : null; };
+})();
 export async function cleanupGithubCiCache(root) {
     const githubOutput = process.env.GITHUB_OUTPUT;
     const markCacheReady = async (ready) => {
@@ -233,7 +254,7 @@ export async function githubCiApplyOutputs(root, directories, expectedSourceSha)
 async function loadOutputBoundary() {
     if (import.meta.url.endsWith('/src/github-ci/index.ts')) {
         // The source self-hosting shim has no Typia transform; register it before loading manifest validators.
-        await import('@smoothbricks/validation/bun/preload');
+        await import('@smoothbricks/cli/bun/preload');
     }
     // This boundary must stay lazy because the transformed dist and source self-hosting paths initialize Typia differently.
     return import('./outputs.js');
@@ -286,7 +307,32 @@ function resolveNxSmartMode(mode) {
     if (mode === 'affected' || mode === 'run-many') {
         return mode;
     }
-    return process.env.GITHUB_EVENT_NAME === 'push' && process.env.GITHUB_REF_NAME === 'main' ? 'run-many' : 'affected';
+    const defaultBranch = eventDefaultBranch() ?? 'main';
+    if (process.env.GITHUB_EVENT_NAME === 'push') {
+        return process.env.GITHUB_REF_NAME === defaultBranch ? 'run-many' : 'affected';
+    }
+    // A PR into a NON-default branch is an integration surface (e.g. a mirror-sync
+    // review branch): its base moves outside the default-branch workflow that
+    // affected scoping is calibrated against, so under-selection can pass PR CI
+    // and only fail after merge. Validate those PRs in full.
+    if (process.env.GITHUB_EVENT_NAME === 'pull_request') {
+        const base = process.env.GITHUB_BASE_REF;
+        return base && base !== defaultBranch ? 'run-many' : 'affected';
+    }
+    return 'affected';
+}
+/** The repository default branch from the Actions event payload. */
+function eventDefaultBranch() {
+    const eventPath = process.env.GITHUB_EVENT_PATH;
+    if (!eventPath)
+        return undefined;
+    try {
+        const payload = parseGithubActionsEvent(readFileSync(eventPath, 'utf8'));
+        return payload?.repository?.default_branch || undefined;
+    }
+    catch {
+        return undefined;
+    }
 }
 async function deployProjectsWithConfiguration(root, configuration, mode) {
     const listArgs = mode === 'affected'
@@ -304,21 +350,11 @@ async function deployProjectsWithConfiguration(root, configuration, mode) {
 }
 async function deployTargetHasConfiguration(root, project, configuration) {
     const result = await $ `nx show project ${project} --json`.cwd(root).quiet();
-    const parsed = JSON.parse(decode(result.stdout));
-    const targets = recordValue(parsed)?.targets;
-    const deploy = recordValue(targets)?.deploy;
-    const configurations = recordValue(deploy)?.configurations;
-    return recordValue(configurations)?.[configuration] !== undefined;
+    const parsed = parseNxProjectDeployConfigurations(decode(result.stdout));
+    return parsed?.targets?.deploy?.configurations?.[configuration] !== undefined;
 }
 function nxProjectList(output) {
-    const parsed = JSON.parse(output);
-    return Array.isArray(parsed) ? parsed.filter((project) => typeof project === 'string') : [];
-}
-function recordValue(value) {
-    return isRecord(value) ? value : undefined;
-}
-function isRecord(value) {
-    return value !== null && typeof value === 'object' && !Array.isArray(value);
+    return parseStringArrayText(output) ?? [];
 }
 async function createGithubStatus(name, step) {
     await postGithubStatus(name, 'pending', `Running ${name}...`, step);

package/dist/github-ci/outputs.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"outputs.d.ts","sourceRoot":"","sources":["../../src/github-ci/outputs.ts"],"names":[],"mappings":"AAMA,OAAO,EAAE,KAAK,cAAc,EAAsB,MAAM,gBAAgB,CAAC;AAEzE,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,CAAC,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,mBAAmB,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,cAAc,EAAE,CAAC;CAC5B;AAWD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,WAAW,EAAE,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,wBAAwB,CAAC,CAgEnC;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,iBAAiB,EAAE,MAAM,EACzB,QAAQ,CAAC,EAAE,cAAc,EAAE,GAC1B,OAAO,CAAC,IAAI,CAAC,CAqGf;AAED,wBAAgB,qBAAqB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,MAAM,CAa7F"}
+{"version":3,"file":"outputs.d.ts","sourceRoot":"","sources":["../../src/github-ci/outputs.ts"],"names":[],"mappings":"AAKA,OAAO,EAAE,KAAK,cAAc,EAAsB,MAAM,gBAAgB,CAAC;AAEzE,MAAM,WAAW,mBAAmB;IAClC,OAAO,EAAE,MAAM,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,MAAM,EAAE,MAAM,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,wBAAwB;IACvC,OAAO,EAAE,CAAC,CAAC;IACX,SAAS,EAAE,MAAM,CAAC;IAClB,KAAK,EAAE,mBAAmB,EAAE,CAAC;CAC9B;AAED,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,cAAc,EAAE,CAAC;CAC5B;AAWD,wBAAsB,gBAAgB,CACpC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EACnB,IAAI,EAAE,WAAW,EAAE,EACnB,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,wBAAwB,CAAC,CAgEnC;AAED,wBAAsB,qBAAqB,CACzC,IAAI,EAAE,MAAM,EACZ,WAAW,EAAE,MAAM,EAAE,EACrB,iBAAiB,EAAE,MAAM,EACzB,QAAQ,CAAC,EAAE,cAAc,EAAE,GAC1B,OAAO,CAAC,IAAI,CAAC,CAqGf;AAED,wBAAgB,qBAAqB,CAAC,cAAc,EAAE,MAAM,EAAE,OAAO,EAAE,cAAc,GAAG,MAAM,CAa7F"}

package/dist/github-ci/outputs.js

@@ -4,7 +4,6 @@ import { createHash } from 'node:crypto';
 import { createReadStream } from 'node:fs';
 import { copyFile, lstat, mkdir, readdir, readFile, writeFile } from 'node:fs/promises';
 import { isAbsolute, relative, resolve, sep } from 'node:path';
-import { isRecord } from '@smoothbricks/validation';
 import typia from 'typia';
 import { readProjectTargets } from '../nx/index.js';
 const parseManifest = (() => {
@@ -636,7 +635,7 @@ function assertGitSha(value, description) {
     }
 }
 function isMissingPathError(error) {
-    return isRecord(error) && error.code === 'ENOENT';
+    return error instanceof Error && 'code' in error && error.code === 'ENOENT';
 }
 function sha256File(path) {
     return new Promise((resolveHash, reject) => {

package/dist/lib/cli-package.js

@@ -1,10 +1,10 @@
 import { fileURLToPath } from 'node:url';
-import { readJsonObject, stringProperty } from './json.js';
+import { readJsonObject } from './json.js';
 export const smoothBricksCodebasePackageName = '@smoothbricks/codebase';
 export const cliPackageVersion = readCliPackageVersion();
 function readCliPackageVersion() {
     const pkg = readJsonObject(fileURLToPath(new URL('../../package.json', import.meta.url)));
-    const version = pkg ? stringProperty(pkg, 'version') : null;
+    const version = pkg?.version;
     if (!version) {
         throw new Error('Unable to read @smoothbricks/cli package version.');
     }

package/dist/lib/json.d.ts

@@ -1,13 +1,120 @@
-import { hasOwn, hasOwnString, isRecord } from '@smoothbricks/validation';
-export { hasOwn, hasOwnString, isRecord };
-export declare function stringProperty(record: Record<string, unknown>, key: string): string | null;
-export declare function recordProperty(record: Record<string, unknown>, key: string): Record<string, unknown> | null;
-export declare function getOrCreateRecord(record: Record<string, unknown>, key: string): Record<string, unknown>;
-export declare function setStringProperty(record: Record<string, unknown>, key: string, value: string): boolean;
-export declare function setMissingStringProperty(record: Record<string, unknown>, key: string, value: string): boolean;
-export declare function requiredJsonObject(path: string): Record<string, unknown>;
-export declare function readJsonObject(path: string): Record<string, unknown> | null;
-export declare function writeJsonObject(path: string, value: Record<string, unknown>): void;
-export declare function jsonObjectText(value: Record<string, unknown>): string;
+/** String-keyed dependency / script / engine maps. */
+export type StringMap = Record<string, string>;
+export interface PackageRepository {
+    type?: string;
+    url?: string;
+    directory?: string;
+}
+export interface PackageNxConfig {
+    name?: string;
+    tags?: string[];
+    includedScripts?: string[];
+    targets?: Record<string, NxTargetConfig>;
+}
+export interface PackagePublishConfig {
+    access?: string;
+}
+export interface PackageSmooGithub {
+    pushBranches?: string[];
+}
+export interface PackageSmooConfig {
+    github?: PackageSmooGithub;
+}
+export interface PackageWorkspacesObject {
+    packages?: string[];
+}
+/**
+ * package.json shape used by smoo. Optional fields stay optional so partial
+ * manifests parse; mutation helpers create nested objects on demand.
+ */
+export interface PackageJson {
+    name?: string;
+    version?: string;
+    private?: boolean;
+    license?: string;
+    types?: string;
+    packageManager?: string;
+    files?: string[];
+    bin?: string | StringMap;
+    exports?: PackageExports;
+    workspaces?: string[] | PackageWorkspacesObject;
+    dependencies?: StringMap;
+    devDependencies?: StringMap;
+    peerDependencies?: StringMap;
+    optionalDependencies?: StringMap;
+    engines?: StringMap;
+    scripts?: StringMap;
+    publishConfig?: PackagePublishConfig;
+    repository?: string | PackageRepository;
+    nx?: PackageNxConfig;
+    smoo?: PackageSmooConfig;
+}
+/** Recursive package exports map (conditions nest arbitrarily). */
+export type PackageExports = string | PackageExportMap | null | undefined;
+export interface PackageExportMap {
+    [condition: string]: PackageExports;
+}
+export interface NxDependsOnObject {
+    target: string;
+    projects?: string | string[];
+}
+export type NxDependsOn = string | NxDependsOnObject;
+/** Nx target options are executor-specific open bags. */
+export type NxTargetOptions = Record<string, unknown>;
+export type NxInput = string | Record<string, unknown>;
+export interface NxTargetConfig {
+    executor?: string;
+    dependsOn?: NxDependsOn[];
+    outputs?: string[];
+    inputs?: NxInput[];
+    options?: NxTargetOptions;
+    configurations?: Record<string, NxTargetConfig>;
+    cache?: boolean;
+    command?: string;
+    parallelism?: boolean;
+}
+export interface NxProjectJson {
+    name?: string;
+    root?: string;
+    targets?: Record<string, NxTargetConfig>;
+}
+export interface NxJson {
+    namedInputs?: Record<string, Array<string | Record<string, unknown>> | string>;
+}
+/** Parse package.json text. Invalid JSON throws; wrong shape returns null. */
+export declare const parsePackageJsonText: (input: string) => PackageJson | null;
+/** Parse `nx show project --json` output. Invalid JSON throws; wrong shape returns null. */
+export declare const parseNxProjectJsonText: (input: string) => NxProjectJson | null;
+/** Parse nx.json text. Invalid JSON throws; wrong shape returns null. */
+export declare const parseNxJsonText: (input: string) => NxJson | null;
+/** Parse a JSON string array. Invalid JSON throws; non-arrays return null. */
+export declare const parseStringArrayText: (input: string) => string[] | null;
+export declare function readJsonObject(path: string): PackageJson | null;
+export declare function requiredJsonObject(path: string): PackageJson;
+export declare function writeJsonObject(path: string, value: object): void;
+export declare function jsonObjectText(value: object): string;
 export declare function readJson(path: string): unknown;
+export declare function isPackageJson(value: unknown): value is PackageJson;
+/** Ensure package.json.scripts exists. */
+export declare function ensureScripts(pkg: PackageJson): StringMap;
+/** Ensure package.json.dependencies (or other string-map dep field) exists. */
+export declare function ensureDependencyMap(pkg: PackageJson, key: 'dependencies' | 'devDependencies' | 'peerDependencies' | 'optionalDependencies'): StringMap;
+/** Ensure package.json.engines exists. */
+export declare function ensureEngines(pkg: PackageJson): StringMap;
+/** Ensure package.json.nx exists. */
+export declare function ensureNx(pkg: PackageJson): PackageNxConfig;
+/** Ensure package.json.nx.targets exists. */
+export declare function ensureNxTargets(nx: PackageNxConfig): Record<string, NxTargetConfig>;
+/** Ensure package.json.publishConfig exists. */
+export declare function ensurePublishConfig(pkg: PackageJson): PackagePublishConfig;
+/** Ensure package.json.repository is an object (not a string URL). */
+export declare function ensureRepositoryObject(pkg: PackageJson): PackageRepository;
+export declare function setStringProperty(record: StringMap, key: string, value: string): boolean;
+export declare function setMissingStringProperty(record: StringMap, key: string, value: string): boolean;
+export declare function setPackageStringField(pkg: PackageJson, key: 'name' | 'version' | 'license' | 'types' | 'packageManager', value: string): boolean;
+export declare function setMissingPackageStringField(pkg: PackageJson, key: 'name' | 'version' | 'license' | 'types' | 'packageManager', value: string): boolean;
+export declare function setNxName(nx: PackageNxConfig, value: string): boolean;
+export declare function setPublishAccess(publishConfig: PackagePublishConfig, value: string): boolean;
+export declare function setRepositoryField(repository: PackageRepository, key: 'type' | 'url' | 'directory', value: string): boolean;
+export declare function setMissingRepositoryField(repository: PackageRepository, key: 'type' | 'url' | 'directory', value: string): boolean;
 //# sourceMappingURL=json.d.ts.map

package/dist/lib/json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../src/lib/json.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAE1E,OAAO,EAAE,MAAM,EAAE,YAAY,EAAE,QAAQ,EAAE,CAAC;AAE1C,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAG1F;AAED,wBAAgB,cAAc,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAG3G;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAQvG;AAED,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAMtG;AAED,wBAAgB,wBAAwB,CAAC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAM7G;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAMxE;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAG3E;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAI,CAElF;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAErE;AAED,wBAAgB,QAAQ,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAK9C"}
+{"version":3,"file":"json.d.ts","sourceRoot":"","sources":["../../src/lib/json.ts"],"names":[],"mappings":"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"}