@m2c2kit/cli 0.3.33 → 0.3.34

package/dist/index.d.ts

@@ -2,7 +2,7 @@
 /**
  * The code in this file is adapted from a reference CLI implementation from
  * the Angular devkit repository:
- *   https://github.com/angular/angular-cli/blob/1c2d49ec736818d22773916d7eaafd3446275ea0/packages/angular_devkit/schematics_cli/bin/schematics.ts
+ *   https://github.com/angular/angular-cli/blob/91b9d281fc88a242aa6e5dd5495e275990d926ef/packages/angular_devkit/schematics_cli/bin/schematics.ts
  * The license for that code is as follows:
  * @license
  * Copyright Google LLC All Rights Reserved.

package/dist/index.js

@@ -3,7 +3,7 @@
 /**
  * The code in this file is adapted from a reference CLI implementation from
  * the Angular devkit repository:
- *   https://github.com/angular/angular-cli/blob/1c2d49ec736818d22773916d7eaafd3446275ea0/packages/angular_devkit/schematics_cli/bin/schematics.ts
+ *   https://github.com/angular/angular-cli/blob/91b9d281fc88a242aa6e5dd5495e275990d926ef/packages/angular_devkit/schematics_cli/bin/schematics.ts
  * The license for that code is as follows:
  * @license
  * Copyright Google LLC All Rights Reserved.
@@ -56,7 +56,7 @@ const tools_1 = require("@angular-devkit/schematics/tools");
 const ansi_colors_1 = __importDefault(require("ansi-colors"));
 const node_fs_1 = require("node:fs");
 const path = __importStar(require("node:path"));
-const yargs_parser_1 = __importStar(require("yargs-parser"));
+const node_util_1 = require("node:util");
 /**
  * Parse the name of schematic passed in argument, and return a {collection, schematic} named
  * tuple. The user can pass in `collection-name:schematic-name`, and this function will either
@@ -193,19 +193,20 @@ function _createPromptProvider() {
     };
 }
 function findUp(names, from) {
-    if (!Array.isArray(names)) {
-        names = [names];
-    }
-    const root = path.parse(from).root;
-    let currentDir = from;
-    while (currentDir && currentDir !== root) {
-        for (const name of names) {
+    const filenames = Array.isArray(names) ? names : [names];
+    let currentDir = path.resolve(from);
+    while (true) {
+        for (const name of filenames) {
             const p = path.join(currentDir, name);
             if ((0, node_fs_1.existsSync)(p)) {
                 return p;
             }
         }
-        currentDir = path.dirname(currentDir);
+        const parentDir = path.dirname(currentDir);
+        if (parentDir === currentDir) {
+            break;
+        }
+        currentDir = parentDir;
     }
     return null;
 }
@@ -227,16 +228,14 @@ function getPackageManagerName() {
 }
 // eslint-disable-next-line max-lines-per-function
 async function main({ args, stdout = process.stdout, stderr = process.stderr, }) {
-    const { cliOptions, schematicOptions, _ } = parseArgs(args);
-    // Create a separate instance to prevent unintended global changes to the color configuration
-    const colors = ansi_colors_1.default.create();
+    const { cliOptions, schematicOptions, _ } = parseOptions(args);
     /** Create the DevKit Logger used through the CLI. */
     const logger = (0, node_1.createConsoleLogger)(!!cliOptions.verbose, stdout, stderr, {
         info: (s) => s,
         debug: (s) => s,
-        warn: (s) => colors.bold.yellow(s),
-        error: (s) => colors.bold.red(s),
-        fatal: (s) => colors.bold.red(s),
+        warn: (s) => (0, node_util_1.styleText)(["bold", "yellow"], s),
+        error: (s) => (0, node_util_1.styleText)(["bold", "red"], s),
+        fatal: (s) => (0, node_util_1.styleText)(["bold", "red"], s),
     });
     if (cliOptions.help) {
         logger.info(getUsage());
@@ -246,10 +245,9 @@ async function main({ args, stdout = process.stdout, stderr = process.stderr, })
     const { collection: collectionName, schematic: schematicName } = parseSchematicName(_.shift() || null);
     const isLocalCollection = collectionName.startsWith(".") || collectionName.startsWith("/");
     /** Gather the arguments for later use. */
-    const debugPresent = cliOptions.debug !== null;
-    const debug = debugPresent ? !!cliOptions.debug : isLocalCollection;
-    const dryRunPresent = cliOptions["dry-run"] !== null;
-    const dryRun = dryRunPresent ? !!cliOptions["dry-run"] : debug;
+    const debug = cliOptions.debug ?? isLocalCollection;
+    const dryRunPresent = cliOptions["dry-run"] != null;
+    const dryRun = cliOptions["dry-run"] ?? debug;
     const force = !!cliOptions.force;
     const allowPrivate = !!cliOptions["allow-private"];
     /** Create the workflow scoped to the working directory that will be executed with this run. */
@@ -300,18 +298,18 @@ async function main({ args, stdout = process.stdout, stderr = process.stderr, })
             case "update":
                 loggingQueue.push(
                 // TODO: `as unknown` was necessary during TS 5.9 update. Figure out a long-term solution.
-                `${colors.cyan("UPDATE")} ${eventPath} (${event.content.length} bytes)`);
+                `${(0, node_util_1.styleText)(["cyan"], "UPDATE")} ${eventPath} (${event.content.length} bytes)`);
                 break;
             case "create":
                 loggingQueue.push(
                 // TODO: `as unknown` was necessary during TS 5.9 update. Figure out a long-term solution.
-                `${colors.green("CREATE")} ${eventPath} (${event.content.length} bytes)`);
+                `${(0, node_util_1.styleText)(["green"], "CREATE")} ${eventPath} (${event.content.length} bytes)`);
                 break;
             case "delete":
-                loggingQueue.push(`${colors.yellow("DELETE")} ${eventPath}`);
+                loggingQueue.push(`${(0, node_util_1.styleText)(["yellow"], "DELETE")} ${eventPath}`);
                 break;
             case "rename":
-                loggingQueue.push(`${colors.blue("RENAME")} ${eventPath} => ${removeLeadingSlash(event.to)}`);
+                loggingQueue.push(`${(0, node_util_1.styleText)(["blue"], "RENAME")} ${eventPath} => ${removeLeadingSlash(event.to)}`);
                 break;
         }
     });
@@ -403,52 +401,96 @@ ${colors.blue("Commands:")}
       --init               Create site-config.mjs file in the current directory.
 `;
 }
+const CLI_OPTION_DEFINITIONS = {
+    "allow-private": { type: "boolean" },
+    debug: { type: "boolean" },
+    "dry-run": { type: "boolean" },
+    force: { type: "boolean" },
+    help: { type: "boolean" },
+    "list-schematics": { type: "boolean" },
+    verbose: { type: "boolean" },
+    interactive: { type: "boolean", default: true },
+};
 /** Parse the command line. */
-const booleanArgs = [
-    "allow-private",
-    "debug",
-    "dry-run",
-    "force",
-    "help",
-    "list-schematics",
-    "verbose",
-    "interactive",
-];
-/** Parse the command line. */
-function parseArgs(args) {
-    const { _, ...options } = (0, yargs_parser_1.default)(args, {
-        boolean: booleanArgs,
-        default: {
-            interactive: true,
-            debug: null,
-            "dry-run": null,
-        },
-        configuration: {
-            "dot-notation": false,
-            "boolean-negation": true,
-            "strip-aliased": true,
-            "camel-case-expansion": false,
-        },
+function parseOptions(args) {
+    const { values, tokens } = (0, node_util_1.parseArgs)({
+        args,
+        strict: false,
+        tokens: true,
+        allowPositionals: true,
+        allowNegative: true,
+        options: CLI_OPTION_DEFINITIONS,
     });
-    // Camelize options as yargs will return the object in kebab-case when camel casing is disabled.
     const schematicOptions = {};
-    const cliOptions = {};
-    const isCliOptions = (key) => booleanArgs.includes(key);
-    for (const [key, value] of Object.entries(options)) {
-        if (/[A-Z]/.test(key)) {
-            throw new Error(`Unknown argument ${key}. Did you mean ${(0, yargs_parser_1.decamelize)(key)}?`);
+    const positionals = [];
+    for (let i = 0; i < tokens.length; i++) {
+        const token = tokens[i];
+        if (token.kind === "positional") {
+            positionals.push(token.value);
+            continue;
+        }
+        if (token.kind !== "option") {
+            continue;
+        }
+        const name = token.name;
+        let value = token.value ?? true;
+        // `parseArgs` already handled known boolean args and their --no- forms.
+        // Only process options not in CLI_OPTION_DEFINITIONS here.
+        if (name in CLI_OPTION_DEFINITIONS) {
+            continue;
+        }
+        if (/[A-Z]/.test(name)) {
+            throw new Error(`Unknown argument ${name}. Did you mean ${schematics_1.strings.decamelize(name).replace(/_/g, "-")}?`);
+        }
+        // Handle --no-flag for unknown options, treating it as false
+        if (name.startsWith("no-")) {
+            const realName = name.slice(3);
+            schematicOptions[schematics_1.strings.camelize(realName)] = false;
+            continue;
         }
-        if (isCliOptions(key)) {
-            cliOptions[key] = value;
+        // Handle value for unknown options
+        if (token.inlineValue === undefined) {
+            // Look ahead
+            const nextToken = tokens[i + 1];
+            if (nextToken?.kind === "positional") {
+                value = nextToken.value;
+                i++; // Consume next token
+            }
+            else {
+                value = true; // Treat as boolean if no value follows
+            }
+        }
+        if (typeof value === "string") {
+            if (!isNaN(Number(value))) {
+                // Type inference for numbers
+                value = Number(value);
+            }
+            else if (value === "true") {
+                // Type inference for booleans
+                value = true;
+            }
+            else if (value === "false") {
+                value = false;
+            }
+        }
+        const camelName = schematics_1.strings.camelize(name);
+        if (Object.prototype.hasOwnProperty.call(schematicOptions, camelName)) {
+            const existing = schematicOptions[camelName];
+            if (Array.isArray(existing)) {
+                existing.push(value);
+            }
+            else {
+                schematicOptions[camelName] = [existing, value];
+            }
         }
         else {
-            schematicOptions[(0, yargs_parser_1.camelCase)(key)] = value;
+            schematicOptions[camelName] = value;
         }
     }
     return {
-        _: _.map((v) => v.toString()),
+        _: positionals,
         schematicOptions,
-        cliOptions,
+        cliOptions: values,
     };
 }
 function isTTY() {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m2c2kit/cli",
-  "version": "0.3.33",
+  "version": "0.3.34",
   "description": "Command line interface to create new m2c2kit apps",
   "files": [
     "dist/**"
@@ -25,17 +25,17 @@
   },
   "homepage": "https://m2c2-project.github.io/m2c2kit",
   "dependencies": {
-    "@angular-devkit/core": "^20.3.8",
-    "@angular-devkit/schematics": "^20.3.8",
-    "@inquirer/prompts": "7.9.0",
-    "@m2c2kit/schematics": "0.1.33",
-    "@schematics/angular": "^20.3.8",
+    "@angular-devkit/core": "^21.1.2",
+    "@angular-devkit/schematics": "^21.1.2",
+    "@inquirer/prompts": "7.10.1",
+    "@m2c2kit/schematics": "0.1.34",
+    "@schematics/angular": "^21.1.2",
     "ansi-colors": "4.1.3",
     "yargs-parser": "22.0.0"
   },
   "devDependencies": {
     "@types/inquirer": "9.0.9",
-    "rimraf": "6.0.1",
+    "rimraf": "6.1.2",
     "typescript": "5.9.3"
   },
   "engines": {