auklet 0.1.5 → 0.1.6

package/README.md

@@ -48,6 +48,7 @@ Build and dev flags:
 | `--filter <pattern>`          | `build`, `dev`                                         | Select workspace packages by package name.         |
 | `--workspace`                 | `build`, `dev`                                         | Alias for `--filter '*'`.                          |
 | `--deps`                      | `build`, `dev`                                         | Include selected packages' workspace dependencies. |
+| `--private`                   | `build`, `dev`                                         | Include private workspace packages.                |
 
 Notes:
 
@@ -57,6 +58,8 @@ Notes:
 - Workspace `build` runs each target package's own `build` script.
 - Workspace `dev` runs each target package's own `dev` script. Packages without
   a `dev` script fail fast.
+- Workspace `build` and `dev` skip private packages by default. Use `--private`
+  to include them.
 
 ### Publish
 

package/dist/cli/build.js

@@ -33,6 +33,7 @@ export async function runBuild(options) {
                 envContext: options.envContext,
                 filters: options.workspace.filters,
                 includeDependencies: options.workspace.includeDependencies,
+                includePrivate: options.workspace.includePrivate,
             });
         }
         if (options.workspace.includeDependencies) {
@@ -49,6 +50,7 @@ export async function runBuild(options) {
 const runWorkspaceBuild = async (args, options) => {
     const targets = await resolveWorkspaceBuildTargets(options.cwd, options.filters, options.envContext, {
         includeDependencies: options.includeDependencies,
+        includePrivate: options.includePrivate,
     });
     const logger = createAukletLogger();
     for (const target of targets) {

package/dist/cli/buildWorkspace.d.ts

@@ -13,6 +13,7 @@ export type WorkspaceBuildTarget = {
     packageJson: WorkspaceBuildPackageJson;
 };
 export declare function resolveWorkspaceBuildTargets(cwd: string, filters: Array<string>, envContext: AukletEnvContext, options?: {
+    includePrivate?: boolean;
     includeDependencies?: boolean;
 }): Promise<{
     packageRoot: string;

package/dist/cli/buildWorkspace.js

@@ -10,7 +10,7 @@ export async function resolveWorkspaceBuildTargets(cwd, filters, envContext, opt
         scope: 'build',
         emptyTargetMessage: '[build] no buildable workspace package found.',
         excludeRoot: true,
-        includePrivate: true,
+        includePrivate: options.includePrivate,
         readPackageJson: readBuildPackageJson,
         createTarget: (item, packageJson) => ({
             packageRoot: item.path,

package/dist/cli/dev.js

@@ -16,6 +16,7 @@ export async function runDev(options) {
                 workspaceScriptArgs: options.workspaceScriptArgs,
                 filters: options.workspace.filters,
                 includeDependencies: options.workspace.includeDependencies,
+                includePrivate: options.workspace.includePrivate,
             });
         }
         if (options.workspace.includeDependencies) {
@@ -59,6 +60,7 @@ const runWorkspaceDev = async (options) => {
     const handles = [];
     const targets = await resolveWorkspaceBuildTargets(options.cwd, options.filters, options.envContext, {
         includeDependencies: options.includeDependencies,
+        includePrivate: options.includePrivate,
     });
     const close = async () => {
         if (closed)

package/dist/cli/main.js

@@ -2,15 +2,15 @@ import fs from 'node:fs';
 import path from 'node:path';
 import { fileURLToPath } from 'node:url';
 import { cac } from 'cac';
+import { AukletEnvContext } from '#auklet/env';
 import { createAukletLogger } from '#auklet/logger';
+import { runOwnerCli, runPublishCli } from '#auklet/publish/cli';
 import { runDev } from '#auklet/cli/dev';
+import { runInspect } from '#auklet/cli/inspect';
 import { runBuildCss } from '#auklet/cli/buildCss';
+import { parseDevCommand } from '#auklet/cli/parse/dev';
 import { runBuild, runBuildJs } from '#auklet/cli/build';
-import { runInspect } from '#auklet/cli/inspect';
-import { runOwnerCli, runPublishCli } from '#auklet/publish/cli';
-import { AukletEnvContext } from '#auklet/env';
 import { parseBuildCommand, parseBuildCssCommand, parseBuildJsCommand, } from '#auklet/cli/parse/build';
-import { parseDevCommand } from '#auklet/cli/parse/dev';
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 const getPackageVersion = () => {
     const packageJson = JSON.parse(fs.readFileSync(path.resolve(__dirname, '../../package.json'), 'utf8'));
@@ -39,63 +39,180 @@ const createCommandContext = () => {
         envContext: new AukletEnvContext(cwd),
     };
 };
+const addBuildOverrideOptions = (command) => {
+    return command
+        .option('--source <dir>', 'Source directory')
+        .option('--output <dir>', 'Output directory')
+        .option('--modules [value]', 'Enable unbundled module output')
+        .option('--no-modules', 'Disable unbundled module output')
+        .option('--build.formats <formats>', 'Comma-separated cjs, esm, and/or iife formats')
+        .option('--build.target <target>', 'JavaScript target passed to tsdown')
+        .option('--build.platform <platform>', 'node, neutral, or browser')
+        .option('--build.tsconfig <file>', 'TypeScript config file');
+};
+const addWorkspaceOptions = (command) => {
+    return command
+        .option('--filter <pattern>', 'Select workspace packages by package name')
+        .option('--workspace', "Alias for --filter '*'")
+        .option('--private [value]', 'Include private workspace packages')
+        .option('--deps [value]', "Include selected packages' workspace dependencies");
+};
+const addPublishOptions = (command) => {
+    return command
+        .option('--filter <pattern>', 'Select workspace packages by package name')
+        .option('--workspace', "Alias for --filter '*'")
+        .option('--version <value>', 'Publish version or version bump')
+        .option('--dry-run [value]', 'Validate without writing git or registry state')
+        .option('--format [value]', 'Enable publish output formatter')
+        .option('--no-format', 'Disable publish output formatter')
+        .option('--git [value]', 'Create release commit and tag')
+        .option('--no-git', 'Skip release commit and tag')
+        .option('--allow-dirty [value]', 'Allow publishing from a dirty worktree')
+        .option('--ignore-scripts [value]', 'Skip publish lifecycle hooks')
+        .option('--otp <code>', 'Forward an npm 2FA one-time password')
+        .option('--token <value>', 'Set NODE_AUTH_TOKEN and NPM_TOKEN for subprocesses');
+};
+const createHelpFormatter = (cli) => {
+    return (sections) => {
+        const command = cli.matchedCommand?.name;
+        return sections.map((section) => {
+            if (section.title !== 'Options')
+                return section;
+            let body = section.body.replace(/\s+\(default: true\)/g, '');
+            if (!command) {
+                body = addHelpOptionLine(body, '  -v, --version  Print auklet version');
+            }
+            if (command === 'publish') {
+                body = addHelpOptionLine(body, '  --version <value>        Publish version or version bump');
+            }
+            if (command === 'inspect') {
+                body = addHelpOptionLine(body, '  --version <value>  Publish version or version bump');
+            }
+            return {
+                ...section,
+                body,
+            };
+        });
+    };
+};
+const addHelpOptionLine = (body, line) => {
+    if (body.includes(line.trimStart().split(/\s+/)[0]))
+        return body;
+    const helpLinePattern = /^  -h, --help/m;
+    if (!helpLinePattern.test(body))
+        return `${body}\n${line}`;
+    return body.replace(helpLinePattern, `${line}\n  -h, --help`);
+};
 async function runCli(argv) {
     const cli = cac('auk');
-    cli
-        .command('build [...args]', 'Build package JavaScript and CSS output')
+    addWorkspaceOptions(addBuildOverrideOptions(cli.command('build [...args]', 'Build package JavaScript and CSS output')))
+        .ignoreOptionDefaultValue()
         .allowUnknownOptions()
         .action(() => runCliCommand(() => {
         const context = createCommandContext();
         return runBuild(parseBuildCommand(getRawCommandArgs(argv, 'build'), context));
     }));
-    cli
-        .command('build-js [...args]', 'Build package JavaScript output with tsdown')
+    addBuildOverrideOptions(cli.command('build-js [...args]', 'Build package JavaScript output with tsdown'))
+        .ignoreOptionDefaultValue()
         .allowUnknownOptions()
         .action(() => runCliCommand(() => {
         const context = createCommandContext();
         return runBuildJs(parseBuildJsCommand(getRawCommandArgs(argv, 'build-js'), context));
     }));
-    cli
+    addBuildOverrideOptions(cli
         .command('build-css [...args]', 'Build package module CSS output')
-        .option('-w, --watch', 'Watch module CSS output')
+        .option('-w, --watch', 'Watch module CSS output'))
+        .ignoreOptionDefaultValue()
         .allowUnknownOptions()
         .action(() => runCliCommand(() => {
         const context = createCommandContext();
         return runBuildCss(parseBuildCssCommand(getRawCommandArgs(argv, 'build-css'), context));
     }));
-    cli
-        .command('dev [...args]', 'Watch package JavaScript and CSS output')
+    addWorkspaceOptions(addBuildOverrideOptions(cli.command('dev [...args]', 'Watch package JavaScript and CSS output')))
+        .ignoreOptionDefaultValue()
         .allowUnknownOptions()
         .action(() => runCliCommand(() => {
         const context = createCommandContext();
         return runDev(parseDevCommand(getRawCommandArgs(argv, 'dev'), context));
     }));
-    cli
-        .command('publish [...args]', 'Build and publish package output with pnpm')
+    addPublishOptions(cli.command('publish [...args]', 'Build and publish package output with pnpm'))
+        .ignoreOptionDefaultValue()
         .allowUnknownOptions()
         .action(() => runCliCommand(() => runPublishCli(getRawCommandArgs(argv, 'publish'))));
+    cli
+        .command('owner add <user...>', 'Add npm owners to the current package or selected packages')
+        .option('--filter <pattern>', 'Add owners to matching workspace packages')
+        .option('--package <name>', 'Add owners to explicit npm packages')
+        .option('--otp <code>', 'Forward an npm owner-management 2FA code')
+        .ignoreOptionDefaultValue()
+        .allowUnknownOptions()
+        .action(() => runCliCommand(() => runOwnerCli(getRawCommandArgs(argv, 'owner'))));
     cli
         .command('owner [...args]', 'Manage npm package owners with pnpm')
+        .usage('add <user...> [options]')
+        .option('--filter <pattern>', 'Add owners to matching workspace packages')
+        .option('--package <name>', 'Add owners to explicit npm packages')
+        .option('--otp <code>', 'Forward an npm owner-management 2FA code')
+        .ignoreOptionDefaultValue()
         .allowUnknownOptions()
         .action(() => runCliCommand(() => runOwnerCli(getRawCommandArgs(argv, 'owner'))));
+    cli
+        .command('inspect publish [...args]', 'Check publish readiness')
+        .option('--filter <pattern>', 'Select workspace packages by package name')
+        .option('--workspace', "Alias for --filter '*'")
+        .option('--version <value>', 'Publish version or version bump')
+        .option('--dry-run [value]', 'Preview dry-run publish behavior')
+        .option('--otp <code>', 'Forward an npm 2FA one-time password')
+        .option('--token <value>', 'Set NODE_AUTH_TOKEN and NPM_TOKEN for subprocesses')
+        .ignoreOptionDefaultValue()
+        .allowUnknownOptions()
+        .action(() => runCliCommand(() => runInspect(getRawCommandArgs(argv, 'inspect'))));
+    cli
+        .command('inspect pack [...args]', 'Check package entry and export files')
+        .option('--filter <pattern>', 'Select workspace packages by package name')
+        .ignoreOptionDefaultValue()
+        .allowUnknownOptions()
+        .action(() => runCliCommand(() => runInspect(getRawCommandArgs(argv, 'inspect'))));
+    addBuildOverrideOptions(cli.command('inspect css [...args]', 'Explain CSS output plans'))
+        .ignoreOptionDefaultValue()
+        .allowUnknownOptions()
+        .action(() => runCliCommand(() => runInspect(getRawCommandArgs(argv, 'inspect'))));
     cli
         .command('inspect [...args]', 'Inspect auklet plans without side effects')
+        .usage('<publish|pack|css> [...args]')
+        .option('--filter <pattern>', 'Select workspace packages by package name')
+        .option('--workspace', "Alias for --filter '*'")
+        .option('--version <value>', 'Publish version or version bump')
+        .option('--dry-run [value]', 'Preview dry-run publish behavior')
+        .option('--otp <code>', 'Forward an npm 2FA one-time password')
+        .option('--token <value>', 'Set publish auth token')
+        .option('--source <dir>', 'CSS inspect source directory')
+        .option('--output <dir>', 'CSS inspect output directory')
+        .option('--modules [value]', 'Enable CSS inspect module output')
+        .option('--no-modules', 'Disable CSS inspect module output')
+        .ignoreOptionDefaultValue()
         .allowUnknownOptions()
         .action(() => runCliCommand(() => runInspect(getRawCommandArgs(argv, 'inspect'))));
     cli
         .command('version', 'Print auklet version')
         .action(() => runCliCommand(runVersion));
-    cli.option('-v, --version', 'Print auklet version');
-    cli.help();
+    cli.command('help', 'Print auklet help').action(() => runCliCommand(async () => {
+        cli.unsetMatchedCommand();
+        cli.outputHelp();
+        return 0;
+    }));
+    cli.help(createHelpFormatter(cli));
     if (argv.length <= 2) {
         cli.outputHelp();
         process.exit(1);
     }
-    cli.parse(argv, { run: false });
-    if (!cli.matchedCommand && cli.options.version) {
+    const rawArgs = argv.slice(2);
+    if (rawArgs.length === 1 &&
+        (rawArgs[0] === '-v' || rawArgs[0] === '--version')) {
         console.log(getPackageVersion());
         process.exit(0);
     }
+    cli.parse(argv, { run: false });
     if (cli.options.help) {
         process.exit(0);
     }

package/dist/cli/parse/build.d.ts

@@ -30,6 +30,7 @@ export declare function parseBuildCommand(args: Array<string>, options: {
     workspace: {
         filters: string[];
         includeDependencies: boolean;
+        includePrivate: boolean;
     };
     overrides: AukletConfig;
     passthroughArgs: string[];

package/dist/cli/parse/dev.d.ts

@@ -10,6 +10,7 @@ export declare function parseDevCommand(args: Array<string>, options: {
     workspace: {
         filters: string[];
         includeDependencies: boolean;
+        includePrivate: boolean;
     };
     overrides: import("../..").AukletConfig;
     passthroughArgs: string[];

package/dist/cli/parse/workspace.d.ts

@@ -1,6 +1,7 @@
 import type { AukletEnvContext } from '#auklet/env';
 export type WorkspaceSelection = {
     filters: Array<string>;
+    includePrivate: boolean;
     includeDependencies: boolean;
 };
 export declare function parseWorkspaceSelectionArgs(args: Array<string>, envContext: AukletEnvContext): {
@@ -8,5 +9,6 @@ export declare function parseWorkspaceSelectionArgs(args: Array<string>, envCont
     workspace: {
         filters: string[];
         includeDependencies: boolean;
+        includePrivate: boolean;
     };
 };

package/dist/cli/parse/workspace.js

@@ -1,8 +1,9 @@
 import { resolveCliBoolean, resolveCliValue } from '#auklet/cli/parse/values';
 import { dedupe, readFlagValue, readOptionalFlagValue, } from '#auklet/cli/parse/core';
 export function parseWorkspaceSelectionArgs(args, envContext) {
-    const remainingArgs = [];
     const filters = [];
+    const remainingArgs = [];
+    let includePrivate = false;
     let includeDependencies = false;
     for (let index = 0; index < args.length; index += 1) {
         const arg = args[index];
@@ -24,12 +25,16 @@ export function parseWorkspaceSelectionArgs(args, envContext) {
             continue;
         }
         if (name === '--deps') {
-            const value = readOptionalFlagValue(args, index, inlineValue);
-            includeDependencies =
-                value === undefined
-                    ? true
-                    : resolveCliBoolean(value, { label: name, context: envContext });
-            if (inlineValue === undefined && value !== undefined)
+            const result = readWorkspaceBooleanFlag(args, index, inlineValue, name, envContext);
+            includeDependencies = result.value;
+            if (result.consumedNext)
+                index += 1;
+            continue;
+        }
+        if (name === '--private') {
+            const result = readWorkspaceBooleanFlag(args, index, inlineValue, name, envContext);
+            includePrivate = result.value;
+            if (result.consumedNext)
                 index += 1;
             continue;
         }
@@ -40,6 +45,16 @@ export function parseWorkspaceSelectionArgs(args, envContext) {
         workspace: {
             filters: dedupe(filters),
             includeDependencies,
+            includePrivate,
         },
     };
 }
+const readWorkspaceBooleanFlag = (args, index, inlineValue, name, envContext) => {
+    const value = readOptionalFlagValue(args, index, inlineValue);
+    return {
+        consumedNext: inlineValue === undefined && value !== undefined,
+        value: value === undefined
+            ? true
+            : resolveCliBoolean(value, { label: name, context: envContext }),
+    };
+};

package/dist/publish/targetResolver.js

@@ -24,8 +24,9 @@ export async function resolveOwnerPackageNames(options) {
         });
         return packages.filter((item) => !item.private).map((item) => item.name);
     }
-    if (options.packages.length)
+    if (options.packages.length) {
         return [...new Set(options.packages)];
+    }
     const packageJson = readPackageJson(options.cwd);
     if (packageJson.private) {
         throw new Error('[publish] current package is private.');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "auklet",
-  "version": "0.1.5",
+  "version": "0.1.6",
   "type": "module",
   "author": "chentao.arthur",
   "description": "Build utilities for TypeScript packages and module CSS output.",