@m2c2kit/cli 0.3.15 → 0.3.16

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/1f9278fa8cb8cdaf7775962165c042b9f382a89b/packages/angular_devkit/schematics_cli/bin/schematics.ts
+ *   https://github.com/angular/angular-cli/blob/f5c250ab48e22c5aff31d8ebd35fb9a88e380fd7/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

@@ -1,10 +1,9 @@
 #!/usr/bin/env node
 "use strict";
-/* eslint-disable no-case-declarations */
 /**
  * The code in this file is adapted from a reference CLI implementation from
  * the Angular devkit repository:
- *   https://github.com/angular/angular-cli/blob/1f9278fa8cb8cdaf7775962165c042b9f382a89b/packages/angular_devkit/schematics_cli/bin/schematics.ts
+ *   https://github.com/angular/angular-cli/blob/f5c250ab48e22c5aff31d8ebd35fb9a88e380fd7/packages/angular_devkit/schematics_cli/bin/schematics.ts
  * The license for that code is as follows:
  * @license
  * Copyright Google LLC All Rights Reserved.
@@ -39,7 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.main = void 0;
+exports.main = main;
 // symbol polyfill must go first
 require("symbol-observable");
 const node_1 = require("@angular-devkit/core/node");
@@ -76,6 +75,9 @@ function parseSchematicName(str) {
     }
     return { collection, schematic };
 }
+function removeLeadingSlash(value) {
+    return value[0] === "/" ? value.slice(1) : value;
+}
 function _listSchematics(workflow, collectionName, logger) {
     try {
         const collection = workflow.engine.createCollection(collectionName);
@@ -105,8 +107,10 @@ function _createPromptProvider() {
                     if (!definition.items?.length) {
                         continue;
                     }
-                    const choices = definition.items?.map((item) => {
-                        return typeof item == "string"
+                    answers[definition.id] = await (definition.multiselect ? prompts.checkbox : prompts.select)({
+                        message: definition.message,
+                        default: definition.default,
+                        choices: definition.items.map((item) => typeof item == "string"
                             ? {
                                 name: item,
                                 value: item,
@@ -114,15 +118,10 @@ function _createPromptProvider() {
                             : {
                                 name: item.label,
                                 value: item.value,
-                            };
-                    });
-                    answers[definition.id] = await (definition.multiselect ? prompts.checkbox : prompts.select)({
-                        message: definition.message,
-                        default: definition.default,
-                        choices,
+                            }),
                     });
                     break;
-                case "input":
+                case "input": {
                     let finalValue;
                     answers[definition.id] = await prompts.input({
                         message: definition.message,
@@ -162,6 +161,7 @@ function _createPromptProvider() {
                         answers[definition.id] = finalValue;
                     }
                     break;
+                }
             }
         }
         return answers;
@@ -266,16 +266,11 @@ async function main({ args, stdout = process.stdout, stderr = process.stderr, })
     workflow.reporter.subscribe((event) => {
         nothingDone = false;
         // Strip leading slash to prevent confusion.
-        const eventPath = event.path.startsWith("/")
-            ? event.path.slice(1)
-            : event.path;
+        const eventPath = removeLeadingSlash(event.path);
         switch (event.kind) {
             case "error":
                 error = true;
-                const desc = event.description == "alreadyExist"
-                    ? "already exists"
-                    : "does not exist";
-                logger.error(`ERROR! ${eventPath} ${desc}.`);
+                logger.error(`ERROR! ${eventPath} ${event.description == "alreadyExist" ? "already exists" : "does not exist"}.`);
                 break;
             case "update":
                 loggingQueue.push(`${colors.cyan("UPDATE")} ${eventPath} (${event.content.length} bytes)`);
@@ -287,10 +282,7 @@ async function main({ args, stdout = process.stdout, stderr = process.stderr, })
                 loggingQueue.push(`${colors.yellow("DELETE")} ${eventPath}`);
                 break;
             case "rename":
-                const eventToPath = event.to.startsWith("/")
-                    ? event.to.slice(1)
-                    : event.to;
-                loggingQueue.push(`${colors.blue("RENAME")} ${eventPath} => ${eventToPath}`);
+                loggingQueue.push(`${colors.blue("RENAME")} ${eventPath} => ${removeLeadingSlash(event.to)}`);
                 break;
         }
     });
@@ -356,7 +348,6 @@ async function main({ args, stdout = process.stdout, stderr = process.stderr, })
         return 1;
     }
 }
-exports.main = main;
 /**
  * Get usage of the CLI tool.
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m2c2kit/cli",
-  "version": "0.3.15",
+  "version": "0.3.16",
   "description": "Command line interface to create new m2c2kit apps",
   "files": [
     "dist/**"
@@ -25,19 +25,19 @@
   },
   "homepage": "https://m2c2-project.github.io/m2c2kit",
   "dependencies": {
-    "@angular-devkit/core": "^18.0.4",
-    "@angular-devkit/schematics": "^18.0.4",
-    "@inquirer/prompts": "5.0.0",
-    "@m2c2kit/schematics": "^0.1.13",
-    "@schematics/angular": "^18.0.4",
+    "@angular-devkit/core": "^18.1.0",
+    "@angular-devkit/schematics": "^18.1.0",
+    "@inquirer/prompts": "5.1.3",
+    "@m2c2kit/schematics": "0.1.16",
+    "@schematics/angular": "^18.1.0",
     "ansi-colors": "4.1.3",
     "symbol-observable": "4.0.0",
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
     "@types/inquirer": "9.0.7",
-    "rimraf": "5.0.7",
-    "typescript": "5.4.5"
+    "rimraf": "6.0.1",
+    "typescript": "5.5.3"
   },
   "engines": {
     "node": ">=18"