@mxpicture/build-cli 0.2.28 → 0.2.29

package/dist/cli.common.d.ts

@@ -1,14 +1,8 @@
-import { Argument, Command } from "@commander-js/extra-typings";
-import { DepsProcessMode, DepsReplacementMode, RunRepoRootParams } from "@mxpicture/build-api/types";
-export declare const repoRootArgument: Argument<"[repoRoot]", string, undefined, undefined, undefined>;
-export declare const processModeArgument: Argument<"<mode>", undefined, undefined, undefined, DepsProcessMode>;
-export declare const replacementModeArgument: Argument<"<replacement>", undefined, undefined, undefined, DepsReplacementMode>;
-export declare const depPatternArgument: Argument<"<pattern>", undefined, undefined, undefined, undefined>;
+import { Option } from "@commander-js/extra-typings";
+import { DepsProcessMode, DepsReplacementMode } from "@mxpicture/build-api/types";
 export declare const resolveRoot: (repoRoot: string) => string;
+export declare const repoRootOption: Option<"-r, --repoRoot <root>", undefined, string, string, false, undefined>;
+export declare const processModeOption: Option<"-m, --mode <mode>", undefined, undefined, undefined, true, DepsProcessMode>;
+export declare const replacementModeOption: Option<"-n, --replacement <replacementMode>", undefined, undefined, undefined, true, DepsReplacementMode>;
+export declare const depPatternOption: Option<"-p, --pattern <pattern>", undefined, undefined, undefined, true, undefined>;
 export declare const readVersion: () => string;
-export declare const createRepoRootCommand: (p: {
-    prog: Command;
-    name: string;
-    description: string;
-    run: (params: RunRepoRootParams) => Promise<void>;
-}) => void;

package/dist/cli.common.js

@@ -1,39 +1,19 @@
-import { Argument } from "@commander-js/extra-typings";
+import { Option } from "@commander-js/extra-typings";
 import { DepsProcessMode, DepsReplacementMode, } from "@mxpicture/build-api/types";
 import { dirname, isAbsolute, resolve } from "node:path";
 import { cwd } from "node:process";
 import { fileURLToPath } from "node:url";
 import { readPackageJsonSync } from "@mxpicture/build-api/pkg";
 const __dirname = dirname(fileURLToPath(import.meta.url));
-export const repoRootArgument = new Argument("[repoRoot]", "Repo root path").default(cwd());
-// export const workspacesNameArgument = new Argument(
-//   "[workspacesName]",
-//   "Name of workspaces location",
-// ).default("packages");
-export const processModeArgument = new Argument("<mode>", "Process mode").choices(Object.values(DepsProcessMode));
-export const replacementModeArgument = new Argument("<replacement>", "Replacement mode").choices(Object.values(DepsReplacementMode));
-export const depPatternArgument = new Argument("<pattern>", "Dependency pattern");
 export const resolveRoot = (repoRoot) => isAbsolute(repoRoot) ? repoRoot : resolve(cwd(), repoRoot);
+export const repoRootOption = new Option("-r, --repoRoot <root>", "Repo root path")
+    .default(cwd())
+    .argParser(resolveRoot);
+export const processModeOption = new Option("-m, --mode <mode>", "Process mode")
+    .choices(Object.values(DepsProcessMode))
+    .makeOptionMandatory(true);
+export const replacementModeOption = new Option("-n, --replacement <replacementMode>", "Replacement mode")
+    .choices(Object.values(DepsReplacementMode))
+    .makeOptionMandatory(true);
+export const depPatternOption = new Option("-p, --pattern <pattern>", "Dependency pattern").makeOptionMandatory(true);
 export const readVersion = () => readPackageJsonSync(resolve(__dirname, "../package.json")).version;
-export const createRepoRootCommand = (p) => {
-    p.prog
-        .command(p.name)
-        .description(p.description)
-        .addArgument(repoRootArgument)
-        .action(async (repoRoot) => p.run({ repoRoot }));
-};
-// export const createPackagesCommand = (p: {
-//   prog: Command;
-//   name: string;
-//   description: string;
-//   run: (params: RunPackagesDirParams) => Promise<void>;
-// }) => {
-//   p.prog
-//     .command(p.name)
-//     .description(p.description)
-//     .addArgument(repoRootArgument)
-//     .addArgument(workspacesNameArgument)
-//     .action(async (repoRoot, workspacesName) =>
-//       p.run(packagesMap(repoRoot, workspacesName)),
-//     );
-// };

package/dist/cli.js

@@ -6,54 +6,43 @@ import { runFixDeps } from "@mxpicture/build-api/deps";
 import { runNpmPublisher } from "@mxpicture/build-api/npmPublish";
 import { consoleLogger, initLogger } from "@mxpicture/build-api/logger";
 import { runBarrel } from "@mxpicture/build-api/barrel";
-import { createRepoRootCommand, depPatternArgument, processModeArgument, readVersion, replacementModeArgument, repoRootArgument, resolveRoot, } from "./cli.common.js";
+import { depPatternOption, processModeOption, readVersion, replacementModeOption, repoRootOption, } from "./cli.common.js";
 import { runSyncPkgVersion, runUpdatePackages } from "@mxpicture/build-api/pkg";
 initLogger(consoleLogger);
 program.name("build-cli").version(readVersion()).description("Build CLI");
-createRepoRootCommand({
-    name: "cleanup",
-    description: "Cleanup e.g. node_modules and dist",
-    prog: program,
-    run: runCleanup,
-});
+program
+    .command("cleanup")
+    .description("Cleanup e.g. node_modules and dist")
+    .addOption(repoRootOption)
+    .action(runCleanup);
 program
     .command("deps")
     .description("Manipulate dependencies for deployment (publish)")
-    .addArgument(processModeArgument)
-    .addArgument(replacementModeArgument)
-    .addArgument(repoRootArgument)
-    .action(async (mode, replacement, repoRoot) => runFixDeps({
-    repoRoot: resolveRoot(repoRoot),
-    mode,
-    replacement,
-}));
-createRepoRootCommand({
-    name: "npm-publish",
-    description: "Publish to npmjs",
-    prog: program,
-    run: runNpmPublisher,
-});
-createRepoRootCommand({
-    name: "barrel",
-    description: "Create barrel files",
-    prog: program,
-    run: runBarrel,
-});
-createRepoRootCommand({
-    name: "sync-versions",
-    description: "Sync package.json versions",
-    prog: program,
-    run: runSyncPkgVersion,
-});
+    .addOption(repoRootOption)
+    .addOption(processModeOption)
+    .addOption(replacementModeOption)
+    .action(runFixDeps);
+program
+    .command("npm-publish")
+    .description("Publish to npmjs")
+    .addOption(repoRootOption)
+    .action(runNpmPublisher);
+program
+    .command("barrel")
+    .description("Create barrel files")
+    .addOption(repoRootOption)
+    .action(runBarrel);
+program
+    .command("sync-versions")
+    .description("Sync package.json versions")
+    .addOption(repoRootOption)
+    .action(runSyncPkgVersion);
 program
     .command("update-packages")
     .description("Update specific packages in whole repo")
-    .addArgument(depPatternArgument)
-    .addArgument(repoRootArgument)
-    .action(async (pattern, repoRoot) => runUpdatePackages({
-    repoRoot: resolveRoot(repoRoot),
-    pattern,
-}));
+    .addOption(depPatternOption)
+    .addOption(repoRootOption)
+    .action(runUpdatePackages);
 // program
 //   .command("extract-imports")
 //   .description("Extract Typescript Imports")

package/dist/cli.program.d.ts

@@ -0,0 +1 @@
+export {};

package/dist/cli.program.js

@@ -0,0 +1 @@
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mxpicture/build-cli",
-  "version": "0.2.28",
+  "version": "0.2.29",
   "description": "Build utilities CLI",
   "type": "module",
   "author": "MXPicture",
@@ -33,7 +33,7 @@
     "access": "public"
   },
   "dependencies": {
-    "@mxpicture/build-api": "^0.2.28",
+    "@mxpicture/build-api": "^0.2.29",
     "commander": "^14.0.3"
   },
   "devDependencies": {