@smoothbricks/cli 0.2.0 → 0.3.0

package/README.md

@@ -44,7 +44,7 @@ smoo release version --bump <auto|patch|minor|major|prerelease> [--dry-run] [--g
 smoo release publish --bump <auto|patch|minor|major|prerelease> [--dry-run]
 smoo release retag-unpublished <tag...> [--to <ref>] [--push] [--dispatch] [--remote <remote>] [--branch <branch>] [--dry-run]
 smoo release bootstrap-npm-packages [--dry-run] [--skip-login] [--package <name...>]
-smoo release trust-publisher [--bootstrap] [--dry-run] [--otp <code>] [--skip-login]
+smoo release trust-publisher [--bootstrap] [--dry-run] [--skip-login] [--package <name...>]
 
 smoo github-ci cleanup-cache
 smoo github-ci nx-smart --target <target> --name <check-name> --step <number>
@@ -202,8 +202,8 @@ repository directory, export ordering, and source-file publish entries when thos
 `smoo monorepo list-release-packages` prints the comma-separated Nx project names for packages that are both
 `npm:public` and owned by the current repository. Release commands, trusted-publisher setup, and the managed publish
 workflow use this owned release package list instead of every public package in the workspace. smoo keeps both names in
-release metadata: Nx commands receive `projectName`, while npm publish, GitHub Releases, and release tags use the real
-package `name`.
+release metadata: Nx commands, GitHub Release tags, and git release tags use `projectName`, while npm publish checks and
+tarball validation use the real package `name`.
 
 For [GitHub Actions], `smoo monorepo list-release-packages --fail-empty --github-output "$GITHUB_OUTPUT"` appends the
 `projects=<nx-project-list>` output expected by the managed publish workflow and fails with a clear error when no owned
@@ -233,7 +233,7 @@ builds, so a package `tsconfig.lib.json` produces the concrete target `tsc-js`.
 `@smoothbricks/nx-plugin` only fills SmoothBricks convention gaps that official plugins do not provide. Today that means
 Bun test typechecking, non-TypeScript build-tool steps, and aggregate targets.
 
-Concrete targets describe the tool that runs and the artifact or purpose it produces:
+Concrete targets use `{tool}-{output}` names and describe the tool that runs and the artifact or purpose it produces:
 
 - `tsc-js` comes from the official TypeScript plugin and runs `tsc` for package JavaScript/declaration output.
 - Packages that run `bun test` must have `tsconfig.test.json`. Bun executes tests without typechecking, so smoo creates
@@ -244,17 +244,18 @@ Concrete targets describe the tool that runs and the artifact or purpose it prod
   `typecheck-tests` target runs `tsc --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`.
-- `build` is an aggregate. It exists only when there is at least one concrete build target such as `tsc-js` or another
-  tool-output target, and it depends on those targets instead of duplicating their commands.
+- `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.
 - `lint` is an aggregate validation target. It is not a formatting target.
 
 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` and `zig-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`.
+Use tool-output names for concrete targets, such as `tsc-js`, `tsdown-js`, and `zig-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`.
 
 ## Managed Files
 
@@ -356,9 +357,10 @@ Versioning:
 
 - `--bump auto` first filters owned release packages to package-local candidates, then lets [Nx Release][nx-release]
   derive the semver bump from [Conventional Commits]. A tagged package is an auto candidate only when files under its
-  package root changed since its current `name@version` release tag. An untagged package is an auto candidate only when
-  its package root has git history. Root-only changes, workflow edits, lockfile-only churn, and other workspace-global
-  changes may still affect Nx tasks, but they do not make unrelated package artifacts releasable.
+  package root changed since its current `projectName@version` release tag. An untagged package is an auto candidate
+  only when its package root has git history and its current version is stable. Root-only changes, workflow edits,
+  lockfile-only churn, untagged next-prerelease preparation commits, and other workspace-global changes may still affect
+  Nx tasks, but they do not make unrelated package artifacts releasable.
 - `--bump patch|minor|major|prerelease` forces the release specifier for the full owned release package set. Forced
   bumps intentionally bypass the package-local auto filter.
 - Release packages are discovered from `npm:public` packages whose `repository.url` exactly matches the root package.
@@ -371,8 +373,8 @@ Versioning:
   `"nx": { "name": "money" }`. This lets Nx Release understand commit scopes like `fix(money): ...` without requiring
   the npm org in every commit subject.
 - Nx project names and npm package names are different release identities. Nx project filters, workflow `projects=`
-  outputs, build/lint/test validation, and project changelog lookup use `projectName`. npm publish checks, tarball
-  validation, GitHub Release titles, and durable release tags use package `name`.
+  outputs, build/lint/test validation, project changelog lookup, GitHub Release tags, and durable git release tags use
+  `projectName`. npm publish checks and tarball validation use package `name`.
 - [Nx Release][nx-release] `preVersionCommand` is intentionally not used. smoo builds exactly the packages that still
   need npm publish immediately before packing them, while the managed workflow separately builds, lints, tests, and
   validates newly created release commits.
@@ -398,9 +400,8 @@ Versioning:
   [oven-sh/bun#18906](https://github.com/oven-sh/bun/issues/18906),
   [oven-sh/bun#20477](https://github.com/oven-sh/bun/issues/20477), and
   [oven-sh/bun#20829](https://github.com/oven-sh/bun/issues/20829).
-- Package release tags must use the npm package name and version, for example `@smoothbricks/nx-plugin@0.0.2`. smoo
-  derives release package/version pairs from that tag shape and recreates missing local tags for Nx release commits
-  before repairing remote state. Nx project names are only CLI/project-graph identifiers.
+- Package release tags must use the Nx project name and version, for example `nx-plugin@0.0.2`. smoo derives release
+  package/version pairs from that tag shape and maps project names back to npm package names before checking npm state.
 - `smoo release retag-unpublished <tag...>` is a break-glass recovery command for the case where Nx already committed a
   version bump but npm publish failed before the package version became durable. It moves exact owned release tags to
   `HEAD` by default without bumping package manifests again. It refuses to move a tag when `package@version` already
@@ -416,7 +417,7 @@ the durable record that a package version was selected for release. It only chec
 decide which tags still need work; it does not walk normal commits looking for release-shaped changes.
 
 1. Collect owned release tags from the fetched remote tag set, sorted newest-first by annotated tag `creatordate`. Only
-   tags matching owned package release names are considered, and each tag is peeled to the commit it releases.
+   tags matching owned Nx project release names are considered, and each tag is peeled to the commit it releases.
 2. Classify each owned release tag before grouping by commit. A tag needs npm repair when `package@version` is missing
    from npm, and it needs GitHub repair when the GitHub Release for that tag is missing. Tags needing neither are
    filtered out immediately.
@@ -441,6 +442,9 @@ Publishing:
 - `smoo release publish` pushes missing branch/tag refs, publishes missing npm versions, creates or updates GitHub
   Releases, and writes a GitHub Step Summary. Already published npm versions are skipped, so reruns after auth or
   network failures retry only the package versions npm does not have yet.
+- After a successful non-dry-run stable release at the branch tip, `smoo release publish` runs an untagged
+  `prerelease --preid next` version bump for the released stable packages and pushes that branch commit. This prepares
+  the codebase for the next development prerelease without creating prerelease release tags or publishing npm packages.
 - npm registry state gates publish idempotency only. It decides which already-versioned package tarballs still need to
   be published during a real release retry, not whether versioning should run or whether the workflow has a release to
   publish.
@@ -463,11 +467,11 @@ Publishing:
 - `smoo release trust-publisher` configures [npm trusted publishing][npm-trusted-publishing] for every owned release
   package. It uses the root `package.json` `repository.url` as the GitHub `owner/repo`, uses `publish.yml` as the
   trusted workflow, and runs `npm trust` through `nix shell nixpkgs#nodejs_latest` because the Lambda-pinned Node 24/npm
-  toolchain may lag the npm CLI feature. By default it runs `npm login --auth-type=web` first so npm can open a browser
-  login; pass `--skip-login` when the current npm session is already authenticated. Pass `--bootstrap` to create missing
-  npm package names first, then configure trusted publishing in the same command. npm may still require operation-level
-  2FA for `npm trust`; smoo prompts for a hidden OTP per package, or you can pass `--otp <code>` for non-interactive
-  use.
+  toolchain may lag the npm CLI feature. It does not run a separate `npm login` before trust setup; `npm trust list` and
+  `npm trust github` own authentication so npm can offer the 5-minute trust/publish challenge bypass. Pass
+  `--package <name...>` to target specific owned packages. Pass `--bootstrap` to create missing npm package names first,
+  then configure trusted publishing in the same command. With `--bootstrap`, `--skip-login` only skips the placeholder
+  publish login. Existing matching trusted publishers are skipped via `npm trust list <package> --json`.
 
 GitHub Releases:
 

package/dist/cli.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAIA,wBAAsB,MAAM,CAAC,IAAI,WAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAexE"}
+{"version":3,"file":"cli.d.ts","sourceRoot":"","sources":["../src/cli.ts"],"names":[],"mappings":"AAKA,wBAAsB,MAAM,CAAC,IAAI,WAAwB,GAAG,OAAO,CAAC,IAAI,CAAC,CAexE"}

package/dist/cli.js

@@ -1,4 +1,5 @@
 import { Command, CommanderError } from 'commander';
+import { variants } from './generate/index.js';
 import { cliPackageVersion } from './lib/cli-package.js';
 import { findRepoRoot } from './lib/run.js';
 export async function runCli(argv = process.argv.slice(2)) {
@@ -95,6 +96,21 @@ function buildProgram() {
         const { setupTestTracing } = await import('./monorepo/index.js');
         await setupTestTracing(await findRepoRoot(), options);
     });
+    // `smoo g` / `smoo generate` — subcommands are driven by the variant
+    // registry in src/generate/index.ts. To add a new variant, add an entry
+    // there; the CLI wiring below picks it up automatically.
+    const g = program.command('g').alias('generate').description('Scaffold workspace packages and components');
+    for (const [variantName, variant] of Object.entries(variants)) {
+        const sub = g.command(`${variantName} <name>`).description(variant.description);
+        for (const opt of variant.options ?? []) {
+            sub.option(opt.flag, opt.description);
+        }
+        sub.option('--dry-run', 'preview changes without writing');
+        sub.action(async (name, options) => {
+            const { generate } = await import('./generate/index.js');
+            await generate(await findRepoRoot(), variantName, name, options);
+        });
+    }
     const release = program.command('release').description('Version, publish, and create GitHub Releases');
     release.command('npm-status').action(async () => {
         const { printReleaseState } = await import('./release/index.js');
@@ -173,17 +189,17 @@ function buildProgram() {
         .description('Configure npm trusted publishing for owned release packages')
         .option('--dry-run [dryRun]', 'show npm trust changes without saving them')
         .option('--bootstrap', 'publish missing npm placeholder packages before configuring trust')
-        .option('--otp <otp>', 'npm one-time password for trust operations')
         .option('--bootstrap-otp <otp>', 'npm one-time password for placeholder publishes during --bootstrap')
-        .option('--skip-login', 'skip npm browser login before configuring trust')
+        .option('--skip-login', 'skip npm browser login before publishing placeholders during --bootstrap')
+        .option('--package <name...>', 'only configure the selected owned release package names')
         .action(async (options) => {
         const { releaseTrustPublisher } = await import('./release/index.js');
         await releaseTrustPublisher(await findRepoRoot(), {
             dryRun: booleanOption(options.dryRun),
             bootstrap: options.bootstrap === true,
-            otp: options.otp,
             bootstrapOtp: options.bootstrapOtp,
             skipLogin: options.skipLogin === true,
+            packages: options.package ?? [],
         });
     });
     const devenv = program.command('devenv').description('Manage the repository devenv shell');

package/dist/generate/index.d.ts

@@ -0,0 +1,20 @@
+export interface GenerateVariant {
+    /** Nx generator name inside @smoothbricks/nx-plugin (e.g. 'create-package'). */
+    generator: string;
+    /** One-line description shown in `smoo g --help`. */
+    description: string;
+    /** Build the generator-specific args from the positional <name>. */
+    args: (name: string) => string[];
+    /** Extra CLI flags beyond the universal --dry-run. */
+    options?: readonly VariantOption[];
+}
+interface VariantOption {
+    /** Commander flag syntax (e.g. '--public'). */
+    flag: string;
+    /** Help text for this flag. */
+    description: string;
+}
+export declare const variants: Record<string, GenerateVariant>;
+export declare function generate(root: string, variantName: string, name: string, options: Record<string, unknown>): Promise<void>;
+export {};
+//# sourceMappingURL=index.d.ts.map

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

@@ -0,0 +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"}

package/dist/generate/index.js

@@ -0,0 +1,47 @@
+import { run } from '../lib/run.js';
+const plugin = '@smoothbricks/nx-plugin';
+export const variants = {
+    'ts-lib': {
+        generator: 'create-package',
+        description: 'Create a TypeScript library package',
+        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',
+        args: (name) => ['--project', name],
+    },
+};
+// ---------------------------------------------------------------------------
+// Dispatch
+// ---------------------------------------------------------------------------
+export async function generate(root, variantName, name, options) {
+    const variant = variants[variantName];
+    if (!variant) {
+        const known = Object.keys(variants).join(', ');
+        throw new Error(`Unknown generator variant "${variantName}". Available: ${known}`);
+    }
+    const args = ['g', `${plugin}:${variant.generator}`, ...variant.args(name)];
+    for (const opt of variant.options ?? []) {
+        const key = opt.flag.replace(/^--/, '');
+        if (options[key]) {
+            args.push(opt.flag);
+        }
+    }
+    if (options.dryRun) {
+        args.push('--dry-run');
+    }
+    await run('nx', args, root);
+    // Sync TypeScript project references so the new package is immediately
+    // visible in the build graph without a manual `nx sync` step.
+    if (!options.dryRun) {
+        await run('nx', ['sync'], root);
+    }
+}

package/dist/lib/run.d.ts

@@ -1,5 +1,6 @@
 export declare function run(command: string, args: string[], cwd: string, env?: Record<string, string>): Promise<void>;
 export declare function runStatus(command: string, args: string[], cwd: string, quiet?: boolean, env?: Record<string, string>): Promise<number>;
+export declare function runInteractiveStatus(command: string, args: string[], cwd: string, env?: Record<string, string>): Promise<number>;
 export declare function runResult(command: string, args: string[], cwd: string, env?: Record<string, string>): Promise<{
     exitCode: number;
     stdout: string;

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

@@ -1 +1 @@
-{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/lib/run.ts"],"names":[],"mappings":"AAKA,wBAAsB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAKnH;AAED,wBAAsB,SAAS,CAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,EACX,KAAK,UAAQ,EACb,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED,wBAAsB,SAAS,CAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,EACX,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAY/D;AAuCD,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAMpD;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAEhD"}
+{"version":3,"file":"run.d.ts","sourceRoot":"","sources":["../../src/lib/run.ts"],"names":[],"mappings":"AAMA,wBAAsB,GAAG,CAAC,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC,CAKnH;AAED,wBAAsB,SAAS,CAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,EACX,KAAK,UAAQ,EACb,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAAC,MAAM,CAAC,CAQjB;AAED,wBAAsB,oBAAoB,CACxC,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,EACX,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAAC,MAAM,CAAC,CAiBjB;AAED,wBAAsB,SAAS,CAC7B,OAAO,EAAE,MAAM,EACf,IAAI,EAAE,MAAM,EAAE,EACd,GAAG,EAAE,MAAM,EACX,GAAG,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GAC3B,OAAO,CAAC;IAAE,QAAQ,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,MAAM,CAAA;CAAE,CAAC,CAY/D;AAuCD,wBAAsB,YAAY,IAAI,OAAO,CAAC,MAAM,CAAC,CAMpD;AAED,wBAAgB,MAAM,CAAC,KAAK,EAAE,UAAU,GAAG,MAAM,CAEhD"}

package/dist/lib/run.js

@@ -1,3 +1,4 @@
+import { spawn } from 'node:child_process';
 import { existsSync } from 'node:fs';
 import { dirname, join } from 'node:path';
 import { fileURLToPath } from 'node:url';
@@ -17,6 +18,24 @@ export async function runStatus(command, args, cwd, quiet = false, env) {
     const result = quiet ? await shell.quiet() : await shell;
     return result.exitCode;
 }
+export async function runInteractiveStatus(command, args, cwd, env) {
+    const invocation = resolveCommandInvocation(cwd, command, args);
+    return new Promise((resolve, reject) => {
+        const child = spawn(invocation.command, invocation.args, {
+            cwd,
+            env: env ? mergeEnv(env) : process.env,
+            stdio: 'inherit',
+        });
+        child.on('error', reject);
+        child.on('close', (code, signal) => {
+            if (signal) {
+                reject(new Error(`${command} ${args.join(' ')} terminated by signal ${signal}`));
+                return;
+            }
+            resolve(code ?? 1);
+        });
+    });
+}
 export async function runResult(command, args, cwd, env) {
     const invocation = resolveCommandInvocation(cwd, command, args);
     let shell = $ `${invocation.command} ${invocation.args}`.cwd(cwd).nothrow().quiet();

package/dist/lib/workspace.d.ts

@@ -8,6 +8,14 @@ export interface PackageInfo {
     packageJsonPath: string;
     json: Record<string, unknown>;
 }
+export interface WorkspacePackageManifest {
+    name: string;
+    projectName: string;
+    private: boolean;
+    path: string;
+    packageJsonPath: string;
+    json: Record<string, unknown>;
+}
 export interface PackageJson extends Record<string, unknown> {
     name?: string;
     version?: string;
@@ -31,9 +39,11 @@ export declare function isSmoothBricksCodebase(root: string): boolean;
 export declare function packageRepositoryInfo(pkg: PackageInfo): RepositoryInfo | null;
 export declare function isOwnedPackage(rootRepository: RepositoryInfo, pkg: PackageInfo): boolean;
 export declare function getWorkspacePackages(root: string): PackageInfo[];
+export declare function getWorkspacePackageManifests(root: string): WorkspacePackageManifest[];
 export declare function listPackageJsonRecords(root: string): PackageInfo[];
 export declare function getWorkspacePatterns(root: string): string[];
 export declare function readPackageJson(path: string): PackageInfo | null;
+export declare function readWorkspacePackageManifest(path: string): WorkspacePackageManifest | null;
 export declare function readPackageJsonObject(path: string): PackageJson | null;
 export declare function getNxTags(pkg: Record<string, unknown>): string[];
 export declare function repositoryInfo(pkg: Record<string, unknown>): RepositoryInfo | null;

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

@@ -1 +1 @@
-{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../src/lib/workspace.ts"],"names":[],"mappings":"AAKA,MAAM,WAAW,WAAW;IAC1B,IAAI,EAAE,MAAM,CAAC;IACb,WAAW,EAAE,MAAM,CAAC;IACpB,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,eAAe,EAAE,MAAM,CAAC;IACxB,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC/B;AAED,MAAM,WAAW,WAAY,SAAQ,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC;IAC1D,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAED,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,GAAG,EAAE,MAAM,CAAC;CACb;AAED,eAAO,MAAM,yBAAyB,0FAK5B,CAAC;AAEX,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE,CAE9D;AAED,wBAAgB,mBAAmB,CACjC,IAAI,EAAE,MAAM,EACZ,WAAW,qBAA8C,GACxD,WAAW,EAAE,CAWf;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,GAAG,IAAI,CAGtE;AAED,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI,CAG3D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAE5D;AAED,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,WAAW,GAAG,cAAc,GAAG,IAAI,CAE7E;AAED,wBAAgB,cAAc,CAAC,cAAc,EAAE,cAAc,EAAE,GAAG,EAAE,WAAW,GAAG,OAAO,CAGxF;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE,CAMhE;AAiCD,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,EAAE,CASlE;AAED,wBAAgB,oBAAoB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAG3D;AAgBD,wBAAgB,eAAe,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAiBhE;AAOD,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,GAAG,IAAI,CAGtE;AAED,wBAAgB,SAAS,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,EAAE,CAKhE;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,cAAc,GAAG,IAAI,CAalF;AAED,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,GAAG,OAAO,CAErF;AA4BD,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAEjD"}
+{"version":3,"file":"workspace.d.ts","sourceRoot":"","sources":["../../src/lib/workspace.ts"],"names":[],"mappings":"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"}

package/dist/lib/workspace.js

@@ -46,10 +46,48 @@ export function getWorkspacePackages(root) {
     }
     return getWorkspacePackagesForPatterns(root, getWorkspacePatternsFromPackageJson(rootPackage.json));
 }
+export function getWorkspacePackageManifests(root) {
+    const rootPackage = readPackageJsonObject(join(root, 'package.json'));
+    if (!rootPackage) {
+        throw new Error('package.json not found or invalid');
+    }
+    return getWorkspacePackageManifestsForPatterns(root, getWorkspacePatternsFromPackageJson(rootPackage));
+}
 function getWorkspacePackagesForPatterns(root, workspacePatterns) {
     const packages = [];
+    for (const pkgPath of listWorkspacePackageJsonPaths(root, workspacePatterns)) {
+        const pkg = readPackageJson(pkgPath);
+        if (!pkg?.name || !pkg.version) {
+            continue;
+        }
+        packages.push({
+            name: pkg.name,
+            projectName: pkg.projectName,
+            version: pkg.version,
+            private: pkg.private,
+            tags: pkg.tags,
+            path: relative(root, dirname(pkgPath)),
+            packageJsonPath: pkg.packageJsonPath,
+            json: pkg.json,
+        });
+    }
+    return packages.sort((a, b) => a.name.localeCompare(b.name));
+}
+function getWorkspacePackageManifestsForPatterns(root, workspacePatterns) {
+    const manifests = [];
+    for (const pkgPath of listWorkspacePackageJsonPaths(root, workspacePatterns)) {
+        const pkg = readWorkspacePackageManifest(pkgPath);
+        if (pkg) {
+            manifests.push(pkg);
+        }
+    }
+    return manifests.sort((a, b) => a.name.localeCompare(b.name));
+}
+function listWorkspacePackageJsonPaths(root, workspacePatterns) {
+    const paths = [];
     for (const pattern of workspacePatterns) {
         if (!pattern.endsWith('/*')) {
+            paths.push(join(root, pattern, 'package.json'));
             continue;
         }
         const parent = join(root, pattern.slice(0, -2));
@@ -57,24 +95,10 @@ function getWorkspacePackagesForPatterns(root, workspacePatterns) {
             continue;
         }
         for (const entry of readdirSync(parent)) {
-            const pkgPath = join(parent, entry, 'package.json');
-            const pkg = readPackageJson(pkgPath);
-            if (!pkg?.name || !pkg.version) {
-                continue;
-            }
-            packages.push({
-                name: pkg.name,
-                projectName: pkg.projectName,
-                version: pkg.version,
-                private: pkg.private,
-                tags: pkg.tags,
-                path: relative(root, dirname(pkgPath)),
-                packageJsonPath: pkg.packageJsonPath,
-                json: pkg.json,
-            });
+            paths.push(join(parent, entry, 'package.json'));
         }
     }
-    return packages.sort((a, b) => a.name.localeCompare(b.name));
+    return paths;
 }
 export function listPackageJsonRecords(root) {
     const rootPackage = readPackageJson(join(root, 'package.json'));
@@ -121,6 +145,21 @@ export function readPackageJson(path) {
         json: parsed,
     };
 }
+export function readWorkspacePackageManifest(path) {
+    const parsed = readPackageJsonObject(path);
+    if (!isRecord(parsed) || !hasOwnString(parsed, 'name')) {
+        return null;
+    }
+    const privateValue = hasOwn(parsed, 'private') && typeof parsed.private === 'boolean' ? parsed.private : false;
+    return {
+        name: parsed.name,
+        projectName: packageNxProjectName(parsed),
+        private: privateValue,
+        path: dirname(path),
+        packageJsonPath: path,
+        json: parsed,
+    };
+}
 function packageNxProjectName(pkg) {
     const nx = isRecord(pkg.nx) ? pkg.nx : null;
     return (nx ? stringProperty(nx, 'name') : null) ?? stringProperty(pkg, 'name') ?? '';

package/dist/monorepo/lockfile.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lockfile.d.ts","sourceRoot":"","sources":["../../src/monorepo/lockfile.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,8BAA8B;IAC7C,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,8BAAmC,GAAG,MAAM,CA0C1G;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA6BhE"}
+{"version":3,"file":"lockfile.d.ts","sourceRoot":"","sources":["../../src/monorepo/lockfile.ts"],"names":[],"mappings":"AAIA,MAAM,WAAW,8BAA8B;IAC7C,GAAG,CAAC,EAAE,OAAO,CAAC;CACf;AAWD,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,8BAAmC,GAAG,MAAM,CA0C1G;AAED,wBAAgB,2BAA2B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA6BhE"}

package/dist/monorepo/lockfile.js

@@ -1,6 +1,15 @@
 import { existsSync, readFileSync, writeFileSync } from 'node:fs';
 import { join } from 'node:path';
 import { escapeRegex, getWorkspacePackages } from '../lib/workspace.js';
+// Temporary Bun workaround. Delete this sync function, validateBunLockfileVersions,
+// the `smoo monorepo sync-bun-lockfile-versions` command, and the matching Nx
+// versionActions hook once supported Bun versions stop leaving workspace package
+// versions stale in bun.lock after manifest bumps. Until then, `bun pm pack`
+// rewrites `workspace:*` dependencies using those stale lockfile versions instead
+// of the current package.json versions. Track removal against:
+// - https://github.com/oven-sh/bun/issues/18906
+// - https://github.com/oven-sh/bun/issues/20477
+// - https://github.com/oven-sh/bun/issues/20829
 export function syncBunLockfileVersions(root, options = {}) {
     const log = options.log ?? true;
     const lockfilePath = join(root, 'bun.lock');

package/dist/monorepo/package-policy.d.ts

@@ -1,17 +1,12 @@
-export interface WorkspaceDependencyDefaultOptions {
-    resolvedTargetsByProject?: ReadonlyMap<string, ReadonlySet<string> | ResolvedProjectTargets>;
-}
-export interface ResolvedProjectTargets {
-    targets: ReadonlySet<string>;
-    buildDependsOn?: readonly string[];
-}
-export declare const SMOO_NX_VERSION_ACTIONS = "@smoothbricks/cli/nx-version-actions";
-export declare const SMOO_NX_RELEASE_TAG_PATTERN = "{projectName}@{version}";
+import { type PackageTargetPolicyOptions, type ResolvedProjectTargets } from '@smoothbricks/nx-plugin/package-target-policy';
+import { SMOO_NX_RELEASE_TAG_PATTERN, SMOO_NX_VERSION_ACTIONS } from '@smoothbricks/nx-plugin/release-config-policy';
+export type { PackageTargetPolicyOptions as WorkspaceDependencyDefaultOptions, ResolvedProjectTargets };
+export { SMOO_NX_RELEASE_TAG_PATTERN, SMOO_NX_VERSION_ACTIONS };
 export declare function applyFixableMonorepoDefaults(root: string): void;
 export declare function applyRootScriptDefaults(root: string): void;
 export declare function applyNxPluginDefaults(root: string): void;
 export declare function applyPublicPackageDefaults(root: string): void;
-export declare function applyWorkspaceDependencyDefaults(root: string, options?: WorkspaceDependencyDefaultOptions): void;
+export declare function applyWorkspaceDependencyDefaults(root: string, options?: PackageTargetPolicyOptions): void;
 export declare function applyNxReleaseDefaults(root: string): void;
 export declare function applyNxProjectNameDefaults(root: string): void;
 export declare function listValidCommitScopes(root: string): ReadonlySet<string>;
@@ -21,11 +16,5 @@ export declare function validateNxReleaseConfig(root: string): number;
 export declare function validateNxProjectNames(root: string): number;
 export declare function validatePublicTags(root: string): number;
 export declare function validatePublicPackageMetadata(root: string): number;
-export declare function validateWorkspaceDependencies(root: string, options?: WorkspaceDependencyDefaultOptions): number;
-export declare function applyPackageScriptPolicy(pkg: Record<string, unknown>, _packagePath: string, workspaceNames: ReadonlySet<string>, options?: {
-    resolvedTargets?: ReadonlySet<string>;
-}): boolean;
-export declare function validatePackageScriptPolicy(pkg: Record<string, unknown>, packagePath: string, workspaceNames: ReadonlySet<string>, options?: {
-    resolvedTargets?: ReadonlySet<string>;
-}): number;
+export declare function validateWorkspaceDependencies(root: string, options?: PackageTargetPolicyOptions): number;
 //# sourceMappingURL=package-policy.d.ts.map

package/dist/monorepo/package-policy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"package-policy.d.ts","sourceRoot":"","sources":["../../src/monorepo/package-policy.ts"],"names":[],"mappings":"AAyBA,MAAM,WAAW,iCAAiC;IAChD,wBAAwB,CAAC,EAAE,WAAW,CAAC,MAAM,EAAE,WAAW,CAAC,MAAM,CAAC,GAAG,sBAAsB,CAAC,CAAC;CAC9F;AAED,MAAM,WAAW,sBAAsB;IACrC,OAAO,EAAE,WAAW,CAAC,MAAM,CAAC,CAAC;IAC7B,cAAc,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;CACpC;AAED,eAAO,MAAM,uBAAuB,yCAAyC,CAAC;AAC9E,eAAO,MAAM,2BAA2B,4BAA4B,CAAC;AAoBrE,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAI/D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAuB1D;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAwBxD;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAuC7D;AAED,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,iCAAsC,GAAG,IAAI,CAqBpH;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAqCzD;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAmB7D;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAEvE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAezD;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAsC9D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAmF5D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAyB3D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAcvD;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA0DlE;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,iCAAsC,GAAG,MAAM,CA+BnH;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,YAAY,EAAE,MAAM,EACpB,cAAc,EAAE,WAAW,CAAC,MAAM,CAAC,EACnC,OAAO,GAAE;IAAE,eAAe,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAAO,GACtD,OAAO,CAkET;AAED,wBAAgB,2BAA2B,CACzC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,WAAW,EAAE,MAAM,EACnB,cAAc,EAAE,WAAW,CAAC,MAAM,CAAC,EACnC,OAAO,GAAE;IAAE,eAAe,CAAC,EAAE,WAAW,CAAC,MAAM,CAAC,CAAA;CAAO,GACtD,MAAM,CAgFR"}
+{"version":3,"file":"package-policy.d.ts","sourceRoot":"","sources":["../../src/monorepo/package-policy.ts"],"names":[],"mappings":"AAKA,OAAO,EAGL,KAAK,0BAA0B,EAC/B,KAAK,sBAAsB,EAC5B,MAAM,+CAA+C,CAAC;AACvD,OAAO,EAGL,2BAA2B,EAC3B,uBAAuB,EACxB,MAAM,+CAA+C,CAAC;AA6BvD,YAAY,EAAE,0BAA0B,IAAI,iCAAiC,EAAE,sBAAsB,EAAE,CAAC;AACxG,OAAO,EAAE,2BAA2B,EAAE,uBAAuB,EAAE,CAAC;AAUhE,wBAAgB,4BAA4B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAI/D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAuB1D;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAMxD;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAuC7D;AAED,wBAAgB,gCAAgC,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,0BAA+B,GAAG,IAAI,CAwB7G;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAMzD;AAED,wBAAgB,0BAA0B,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAoB7D;AAED,wBAAgB,qBAAqB,CAAC,IAAI,EAAE,MAAM,GAAG,WAAW,CAAC,MAAM,CAAC,CAEvE;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,EAAE,CAezD;AAED,wBAAgB,yBAAyB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAsC9D;AAED,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAW5D;AAED,wBAAgB,sBAAsB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAyB3D;AAED,wBAAgB,kBAAkB,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAcvD;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CA0DlE;AAED,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO,GAAE,0BAA+B,GAAG,MAAM,CAiC5G"}