@m2c2kit/cli 0.3.10 → 0.3.12

package/dist/index.d.ts

@@ -2,15 +2,14 @@
 /**
  * The code in this file is adapted from a reference CLI implementation from
  * the Angular devkit repository:
- *   https://github.com/angular/angular-cli/blob/b674bd2c3c3e63693881ba502493bc803a820772/packages/angular_devkit/schematics_cli/bin/schematics.ts
- *
+ *   https://github.com/angular/angular-cli/blob/e1d6ee2b5cc5ee34e4e5b67aaa8c34662a315007/packages/angular_devkit/schematics_cli/bin/schematics.ts
  * The license for that code is as follows:
  *
- * The MIT License
- * Copyright (c) 2010-2023 Google LLC. http://angular.io/license
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
  */
 import "symbol-observable";
 import { ProcessOutput } from "@angular-devkit/core/node";
@@ -20,3 +19,16 @@ export interface MainOptions {
     stderr?: ProcessOutput;
 }
 export declare function main({ args, stdout, stderr, }: MainOptions): Promise<0 | 1>;
+/**
+ * This uses a dynamic import to load a module which may be ESM.
+ * CommonJS code can load ESM code via a dynamic import. Unfortunately, TypeScript
+ * will currently, unconditionally downlevel dynamic import into a require call.
+ * require calls cannot load ESM code and will result in a runtime error. To workaround
+ * this, a Function constructor is used to prevent TypeScript from changing the dynamic import.
+ * Once TypeScript provides support for keeping the dynamic import this workaround can
+ * be dropped.
+ *
+ * @param modulePath The path of the module to load.
+ * @returns A Promise that resolves to the dynamically imported module.
+ */
+export declare function loadEsmModule<T>(modulePath: string | URL): Promise<T>;

package/dist/index.js

@@ -3,15 +3,14 @@
 /**
  * The code in this file is adapted from a reference CLI implementation from
  * the Angular devkit repository:
- *   https://github.com/angular/angular-cli/blob/b674bd2c3c3e63693881ba502493bc803a820772/packages/angular_devkit/schematics_cli/bin/schematics.ts
- *
+ *   https://github.com/angular/angular-cli/blob/e1d6ee2b5cc5ee34e4e5b67aaa8c34662a315007/packages/angular_devkit/schematics_cli/bin/schematics.ts
  * The license for that code is as follows:
  *
- * The MIT License
- * Copyright (c) 2010-2023 Google LLC. http://angular.io/license
- * Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
- * The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
@@ -37,7 +36,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
     return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.main = void 0;
+exports.loadEsmModule = exports.main = void 0;
 // symbol polyfill must go first
 require("symbol-observable");
 const core_1 = require("@angular-devkit/core");
@@ -46,7 +45,6 @@ const schematics_1 = require("@angular-devkit/schematics");
 const tools_1 = require("@angular-devkit/schematics/tools");
 const ansiColors = __importStar(require("ansi-colors"));
 const fs_1 = require("fs");
-const inquirer = __importStar(require("inquirer"));
 const path = __importStar(require("path"));
 const yargs_parser_1 = __importStar(require("yargs-parser"));
 /**
@@ -88,7 +86,7 @@ function _listSchematics(workflow, collectionName, logger) {
     return 0;
 }
 function _createPromptProvider() {
-    return (definitions) => {
+    return async (definitions) => {
         const questions = definitions.map((definition) => {
             const question = {
                 name: definition.id,
@@ -147,6 +145,7 @@ function _createPromptProvider() {
                     return { ...question, type: definition.type };
             }
         });
+        const { default: inquirer } = await loadEsmModule("inquirer");
         return inquirer.prompt(questions);
     };
 }
@@ -333,7 +332,7 @@ async function main({ args, stdout = process.stdout, stderr = process.stderr, })
             logger.fatal("The Schematic workflow failed. See above.");
         }
         else if (debug && err instanceof Error) {
-            logger.fatal(`An error occured:\n${err.stack}`);
+            logger.fatal(`An error occurred:\n${err.stack}`);
         }
         else {
             logger.fatal(`Error: ${err instanceof Error ? err.message : err}`);
@@ -444,3 +443,24 @@ if (require.main === module) {
         throw e;
     });
 }
+/**
+ * Lazily compiled dynamic import loader function.
+ */
+let load;
+/**
+ * This uses a dynamic import to load a module which may be ESM.
+ * CommonJS code can load ESM code via a dynamic import. Unfortunately, TypeScript
+ * will currently, unconditionally downlevel dynamic import into a require call.
+ * require calls cannot load ESM code and will result in a runtime error. To workaround
+ * this, a Function constructor is used to prevent TypeScript from changing the dynamic import.
+ * Once TypeScript provides support for keeping the dynamic import this workaround can
+ * be dropped.
+ *
+ * @param modulePath The path of the module to load.
+ * @returns A Promise that resolves to the dynamically imported module.
+ */
+function loadEsmModule(modulePath) {
+    load ?? (load = new Function("modulePath", `return import(modulePath);`));
+    return load(modulePath);
+}
+exports.loadEsmModule = loadEsmModule;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@m2c2kit/cli",
-  "version": "0.3.10",
+  "version": "0.3.12",
   "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": "^16.1.3",
-    "@angular-devkit/schematics": "^16.1.3",
+    "@angular-devkit/core": "^17.0.6",
+    "@angular-devkit/schematics": "^17.0.6",
     "@m2c2kit/schematics": "^0.1.0",
-    "@schematics/angular": "^16.1.3",
+    "@schematics/angular": "^17.0.6",
     "ansi-colors": "4.1.3",
-    "inquirer": "8.2.4",
+    "inquirer": "9.2.12",
     "symbol-observable": "4.0.0",
     "yargs-parser": "21.1.1"
   },
   "devDependencies": {
-    "@types/inquirer": "8.2.6",
-    "rimraf": "5.0.1",
-    "typescript": "5.1.6"
+    "@types/inquirer": "9.0.7",
+    "rimraf": "5.0.5",
+    "typescript": "5.3.3"
   },
   "engines": {
     "node": ">=18"