igniteui-cli 14.0.2 → 14.1.0-beta.0

package/bin/execute.js

@@ -1,16 +1,17 @@
 #!/usr/bin/env node
-var fs = require("fs");
-var inquirer = require('inquirer');
-var projectConfiguration = {};
-var resolve = require('resolve');
-var path = require('path');
+const fs = require("fs");
+const resolve = require("resolve");
+const path = require("path");
+const { hideBin } = require("yargs/helpers");
+
+const args = hideBin(process.argv);
 
 //execute -g igniteui-cli in case there is no project installed, else resolve to the local one
-resolve('igniteui-cli', { basedir: process.cwd() }, function (err, res) {
-	var cli;
+resolve("igniteui-cli", { basedir: process.cwd() }, function (err, res) {
+	let cli;
 	if (res && res.indexOf(process.cwd()) > -1) {
-		var localVersion = require(path.join(process.cwd(), 'node_modules/igniteui-cli/package.json'))['version'];
-		var globalVersion = require(path.join(__dirname, '../package.json'))['version'];
+		const localVersion = require(path.join(process.cwd(), "node_modules/igniteui-cli/package.json"))["version"];
+		const globalVersion = require(path.join(__dirname, "../package.json"))["version"];
 		if (globalVersion !== localVersion) {
 			console.log("Different igniteui-cli global and local version");
 		}
@@ -18,5 +19,5 @@ resolve('igniteui-cli', { basedir: process.cwd() }, function (err, res) {
 	} else {
 		cli = require("../lib/cli");
 	}
-	cli.run();
+	cli.run(args);
 });

package/lib/MultiTemplateComponent.js

@@ -41,3 +41,4 @@ class MultiTemplateComponent {
     }
 }
 exports.MultiTemplateComponent = MultiTemplateComponent;
+//# sourceMappingURL=MultiTemplateComponent.js.map

package/lib/PromptSession.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -8,28 +31,28 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PromptSession = void 0;
 const cli_core_1 = require("@igniteui/cli-core");
-const inquirer = require("inquirer");
-const path = require("path");
-const add_1 = require("./commands/add");
-const start_1 = require("./commands/start");
-const upgrade_1 = require("./commands/upgrade");
+const path = __importStar(require("path"));
+const add_1 = __importDefault(require("./commands/add"));
+const start_1 = __importDefault(require("./commands/start"));
+const upgrade_1 = __importDefault(require("./commands/upgrade"));
 class PromptSession extends cli_core_1.BasePromptSession {
     constructor(templateManager) {
         super(templateManager);
     }
     static chooseTerm() {
         return __awaiter(this, void 0, void 0, function* () {
-            const answers = yield inquirer.prompt({
+            const answer = yield cli_core_1.InquirerWrapper.input({
                 default: null,
                 message: "Enter a search term",
-                name: "term",
-                type: "input"
             });
-            if (answers.term) {
-                return answers.term;
+            if (answer) {
+                return answer;
             }
             else {
                 const retProm = yield this.chooseTerm();
@@ -62,6 +85,7 @@ class PromptSession extends cli_core_1.BasePromptSession {
                     name: "projectName",
                     message: "Enter a name for your project:",
                     default: cli_core_1.Util.getAvailableName(defaultProjName, true),
+                    choices: null,
                     validate: this.nameIsValid
                 });
                 const frameRes = yield this.getUserInput({
@@ -108,7 +132,7 @@ class PromptSession extends cli_core_1.BasePromptSession {
     upgradePackages() {
         return __awaiter(this, void 0, void 0, function* () {
             upgrade_1.default.templateManager = this.templateManager;
-            yield upgrade_1.default.upgrade({ skipInstall: true });
+            yield upgrade_1.default.upgrade({ skipInstall: true, _: ["upgrade"], $0: "upgrade" });
         });
     }
     /**
@@ -128,3 +152,4 @@ class PromptSession extends cli_core_1.BasePromptSession {
     }
 }
 exports.PromptSession = PromptSession;
+//# sourceMappingURL=PromptSession.js.map

package/lib/TemplateManager.js

@@ -1,9 +1,32 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TemplateManager = void 0;
 const angular_templates_1 = require("@igniteui/angular-templates");
 const cli_core_1 = require("@igniteui/cli-core");
-const path = require("path");
+const path = __importStar(require("path"));
 const AngularTemplate_1 = require("./templates/AngularTemplate");
 const IgniteUIForWebComponentsTemplate_1 = require("./templates/IgniteUIForWebComponentsTemplate");
 const jQueryTemplate_1 = require("./templates/jQueryTemplate");
@@ -52,3 +75,4 @@ class TemplateManager extends cli_core_1.BaseTemplateManager {
     }
 }
 exports.TemplateManager = TemplateManager;
+//# sourceMappingURL=TemplateManager.js.map

package/lib/cli.js

@@ -8,21 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.run = void 0;
+exports.run = run;
 const cli_core_1 = require("@igniteui/cli-core");
-const yargs = require("yargs");
-const add_1 = require("./commands/add");
-const build_1 = require("./commands/build");
-const config_1 = require("./commands/config");
-const doc_1 = require("./commands/doc");
-const generate_1 = require("./commands/generate");
-const list_1 = require("./commands/list");
-const new_1 = require("./commands/new");
-const quickstart_1 = require("./commands/quickstart");
-const start_1 = require("./commands/start");
-const test_1 = require("./commands/test");
-const upgrade_1 = require("./commands/upgrade");
+const yargs_1 = __importDefault(require("yargs"));
+const commands_1 = require("./commands");
 const PromptSession_1 = require("./PromptSession");
 const TemplateManager_1 = require("./TemplateManager");
 process.title = "Ignite UI CLI";
@@ -34,31 +27,32 @@ function logHelp() {
 }
 function run() {
     return __awaiter(this, arguments, void 0, function* (args = null) {
-        //	we are subscribing on process.exit to catch when help is executed
-        process.on("exit", logHelp);
         cli_core_1.App.initialize();
         const templateManager = new TemplateManager_1.TemplateManager();
-        new_1.default.template = templateManager;
-        new_1.default.builder.framework.choices = templateManager.getFrameworkIds();
-        add_1.default.templateManager = templateManager;
-        build_1.default.templateManager = templateManager;
-        start_1.default.templateManager = templateManager;
-        generate_1.default.templateManager = templateManager;
-        list_1.default.templateManager = templateManager;
-        upgrade_1.default.templateManager = templateManager;
-        const yargsModule = args ? yargs(args) : yargs;
-        const argv = yargsModule
-            .command(quickstart_1.default)
-            .command(new_1.default)
-            .command(add_1.default)
-            .command(build_1.default)
-            .command(start_1.default)
-            .command(generate_1.default)
-            .command(config_1.default)
-            .command(doc_1.default)
-            .command(test_1.default)
-            .command(list_1.default)
-            .command(upgrade_1.default)
+        commands_1.newCommand.addChoices(templateManager.getFrameworkIds());
+        commands_1.newCommand.templateManager = templateManager;
+        commands_1.add.templateManager = templateManager;
+        commands_1.build.templateManager = templateManager;
+        commands_1.start.templateManager = templateManager;
+        commands_1.generate.templateManager = templateManager;
+        commands_1.list.templateManager = templateManager;
+        commands_1.upgrade.templateManager = templateManager;
+        const yargsModule = args ? (0, yargs_1.default)(args) : yargs_1.default;
+        yield yargsModule
+            .scriptName("") // prevent the addition of the name of the executing script in the usage output
+            .usage("") // do not show any usage instructions before the commands list
+            .command(commands_1.quickstart)
+            .command(commands_1.newCommand)
+            .command(commands_1.add)
+            .command(commands_1.build)
+            .command(commands_1.start)
+            .command(commands_1.generate)
+            .command(commands_1.config)
+            .command(commands_1.doc)
+            .command(commands_1.test)
+            .command(commands_1.list)
+            .command(commands_1.upgrade)
+            .version(false) // disable built-in `yargs.version` to override it with our custom option
             .options({
             version: {
                 alias: "v",
@@ -67,67 +61,64 @@ function run() {
                 type: "boolean"
             }
         })
+            .options({
+            testMode: {
+                default: false,
+                type: "boolean",
+                hidden: true
+            }
+        })
+            .middleware((argv) => {
+            // invoked after parsing and before the `yargsModule.parseAsync` callback
+            const command = argv._[0];
+            if (command === commands_1.ADD_COMMAND_NAME && !commands_1.add.check(argv)) {
+                argv.skipExecution = true;
+                yargsModule.showHelp();
+            }
+        }, false // setting this to `true` is supposed to exec the middleware after parsing and before arg validation
+        // but in reality it also does not trigger the command's handler (╯°□°）╯︵ ┻━┻
+        )
             .help().alias("help", "h")
-            .argv;
-        //	unsubscribing from process.exit. If `help` was executed we should not reach here
-        process.removeListener("exit", logHelp);
-        if (argv.version) {
-            cli_core_1.Util.showVersion(__dirname + "/../ignite-ui-cli.txt");
-            return;
-        }
-        const command = argv._[0];
-        // internal testing only
-        /* istanbul ignore next */
-        cli_core_1.App.testMode = !!argv.testMode;
-        switch (command) {
-            case "new":
-                yield new_1.default.execute(argv);
-                break;
-            case "quickstart":
-                yield quickstart_1.default.execute(argv);
-                cli_core_1.Util.log("quickstart Created");
-                break;
-            case "add":
-                if (add_1.default.check(argv)) {
-                    yield add_1.default.execute(argv);
-                }
-                else {
-                    yargsModule.showHelp();
-                    return;
+            .parseAsync(args, // the args to parse to argv
+        {}, // docs say context to pass in to handlers, but nuh-uh, it's just garbage
+        (err, argv, output) => __awaiter(this, void 0, void 0, function* () {
+            // `argv._` are the positional arguments passed in to the script
+            const command = argv._[0];
+            if (err) {
+                cli_core_1.Util.error(`The ${command} command threw error - ${err.name}`, "red");
+                cli_core_1.Util.error(`Message: ${err.message}`, "red");
+                if (err.stack) {
+                    cli_core_1.Util.error(`Stack: ${err.stack}`, "red");
                 }
-                break;
-            case "g":
-            case "generate":
-                yield generate_1.default.template(argv);
-                break;
-            case "build":
-                yield build_1.default.execute(argv);
-                break;
-            case "config":
-                break;
-            case "doc":
-                yield doc_1.default.execute(argv);
-                break;
-            case "test":
-                yield test_1.default.execute(argv);
-                break;
-            case "start":
-                yield start_1.default.execute(argv);
-                break;
-            case "l":
-            case "list":
-                list_1.default.execute(argv);
-                break;
-            case "upgrade-packages":
-                yield upgrade_1.default.execute(argv);
-                break;
-            default:
+                process.exit(1);
+            }
+            const helpRequest = argv.h || argv.help;
+            if (helpRequest) {
+                logHelp();
+            }
+            if (command === commands_1.QUICKSTART_COMMAND_NAME && !helpRequest) {
+                cli_core_1.Util.log("quickstart Created");
+                return;
+            }
+            // since we are providing a custom callback to `yargsModule.parseAsync`, we need to handle the output as well
+            // ref - https://yargs.js.org/docs/#api-reference-parseargs-context-parsecallback
+            if (output) {
+                cli_core_1.Util.log(output);
+            }
+            if (argv.version) {
+                cli_core_1.Util.showVersion(__dirname + "/../ignite-ui-cli.txt");
+                return;
+            }
+            // internal testing only
+            /* istanbul ignore next */
+            cli_core_1.App.testMode = !!argv.testMode;
+            if (!helpRequest && !commands_1.ALL_COMMANDS.has(command === null || command === void 0 ? void 0 : command.toString())) {
                 cli_core_1.Util.log("Starting Step by step mode.", "green");
                 cli_core_1.Util.log("For available commands, stop this execution and use --help.", "green");
                 const prompts = new PromptSession_1.PromptSession(templateManager);
                 prompts.start();
-                break;
-        }
+            }
+        }));
     });
 }
-exports.run = run;
+//# sourceMappingURL=cli.js.map

package/lib/commands/add.d.ts

@@ -1,9 +1,3 @@
-import { AddTemplateArgs, Template } from "@igniteui/cli-core";
-import { TemplateManager } from "../TemplateManager";
-declare let command: {
-    [name: string]: any;
-    templateManager: TemplateManager;
-    execute: (argv: any) => Promise<void>;
-    addTemplate: (name: string, template: Template, options?: AddTemplateArgs) => Promise<boolean>;
-};
+import { AddCommandType } from "./types";
+declare const command: AddCommandType;
 export default command;

package/lib/commands/add.js

@@ -11,11 +11,9 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_core_1 = require("@igniteui/cli-core");
 const PromptSession_1 = require("./../PromptSession");
-let command;
-// tslint:disable:object-literal-sort-keys
-command = {
+const command = {
     command: "add [template] [name]",
-    desc: "adds template by its ID",
+    describe: "adds template by its ID",
     templateManager: null,
     builder: {
         "template": {
@@ -43,14 +41,17 @@ command = {
             global: true
         }
     },
-    check: argv => {
+    check: (argv) => {
         if ((!argv.name && argv.template) || (argv.name && !argv.template)) {
             return false;
         }
         return true;
     },
-    execute(argv) {
+    handler(argv) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (argv.skipExecution) {
+                return;
+            }
             cli_core_1.GoogleAnalytics.post({
                 t: "screenview",
                 cd: "Add"
@@ -157,3 +158,4 @@ command = {
 };
 // hint transpiler it's an ES6 module, exports without import won't do
 exports.default = command;
+//# sourceMappingURL=add.js.map

package/lib/commands/build.d.ts

@@ -1,10 +1,3 @@
-import { TemplateManager } from "../TemplateManager";
-declare let command: {
-    command: string;
-    desc: string;
-    builder: {};
-    templateManager: TemplateManager;
-    execute: (argv: any) => Promise<void>;
-    build: (argv: any) => Promise<void>;
-};
+import { BuildCommandType } from "./types";
+declare const command: BuildCommandType;
 export default command;

package/lib/commands/build.js

@@ -1,4 +1,27 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -10,15 +33,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_core_1 = require("@igniteui/cli-core");
-const fs = require("fs-extra");
-const path = require("path");
-let command;
-command = {
+const fs = __importStar(require("fs"));
+const path = __importStar(require("path"));
+const command = {
     command: "build",
-    desc: "builds the project",
-    builder: {},
+    describe: "builds the project",
+    builder: (yargs) => {
+        return yargs.usage(""); // do not show any usage instructions before the commands
+    },
     templateManager: null,
-    execute(argv) {
+    handler(argv) {
         return __awaiter(this, void 0, void 0, function* () {
             cli_core_1.GoogleAnalytics.post({
                 t: "screenview",
@@ -27,7 +51,7 @@ command = {
             command.build(argv);
         });
     },
-    build(argv) {
+    build() {
         return __awaiter(this, void 0, void 0, function* () {
             cli_core_1.Util.log("Build started.");
             yield cli_core_1.PackageManager.ensureIgniteUISource(true, command.templateManager);
@@ -52,9 +76,20 @@ command = {
                 fs.mkdirSync("./themes");
                 const source = path.join(config.project.igniteuiSource, "/css/themes/", config.project.theme.split(".")[0]);
                 const destination = path.join(config.project.sourceRoot, "themes");
-                fs.copySync(source, destination, { recursive: true });
+                cli_core_1.Util.ensureDirectoryExists(destination);
+                if (!cli_core_1.Util.isDirectory(source)) {
+                    fs.copyFileSync(source, destination);
+                    return;
+                }
+                const entries = fs.readdirSync(source, { withFileTypes: true });
+                entries.forEach((entry) => {
+                    const sourcePath = path.join(source, entry.name);
+                    const destinationPath = path.join(destination, entry.name);
+                    fs.copyFileSync(sourcePath, destinationPath);
+                });
             }
         });
     }
 };
 exports.default = command;
+//# sourceMappingURL=build.js.map

package/lib/commands/config.d.ts

@@ -1,9 +1,3 @@
-declare const command: {
-    command: string;
-    desc: string;
-    builder: (yargs: any) => void;
-    getHandler(argv: any): void;
-    setHandler(argv: any): void;
-    addHandler(argv: any): void;
-};
+import { ConfigCommandType } from "./types";
+declare const command: ConfigCommandType;
 export default command;

package/lib/commands/config.js

@@ -2,60 +2,64 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_core_1 = require("@igniteui/cli-core");
 const command = {
-    // tslint:disable:object-literal-sort-keys
     command: "config",
-    desc: "gets, sets or adds a configuration property",
-    builder: yargs => {
-        yargs.command({
+    describe: "gets, sets or adds a configuration property",
+    builder: (yargs) => {
+        return yargs
+            .command({
             command: "get <property>",
-            desc: "Gets a configuration property",
-            builder: {
-                property: {
+            describe: "Gets a configuration property",
+            builder: (yargs) => {
+                return yargs.option("property", {
                     describe: "Config property to get",
                     type: "string"
-                }
+                })
+                    .usage(""); // do not show any usage instructions before the commands list
             },
             handler: command.getHandler
-        }).command({
+        })
+            .command({
             command: "set <property> <value>",
-            desc: "Sets a configuration property",
-            builder: {
-                property: {
+            describe: "Sets a configuration property",
+            builder: (yargs) => {
+                return yargs.option("property", {
                     describe: "Config property to set",
                     type: "string"
-                },
-                value: {
+                })
+                    .option("value", {
                     describe: "New value for the property",
                     type: "string"
-                }
+                })
+                    .usage(""); // do not show any usage instructions before the commands list
             },
             handler: command.setHandler
-        }).command({
+        })
+            .command({
             command: "add <property> <value>",
-            desc: "Adds a value to an existing configuration array",
-            builder: {
-                property: {
+            describe: "Adds a value to an existing configuration array",
+            builder: (yargs) => {
+                return yargs.option("property", {
                     describe: "Config property to add to",
                     type: "string"
-                },
-                value: {
+                })
+                    .option("value", {
                     describe: "New value to add",
                     type: "string"
-                }
+                })
+                    .usage(""); // do not show any usage instructions before the commands list
             },
-            handler: argv => {
-                command.addHandler(argv);
-            }
-        }).option("global", {
+            handler: command.addHandler
+        })
+            .option("global", {
             alias: "g",
             type: "boolean",
             global: true,
             describe: "Specify if the global configuration should be used"
         })
+            .usage("") // do not show any usage instructions before the commands list
             // at least one command is required
             .demandCommand(1, "Please select command");
     },
-    // tslint:enable:object-literal-sort-keys
     getHandler(argv) {
         cli_core_1.GoogleAnalytics.post({
             t: "screenview",
@@ -159,6 +163,8 @@ const command = {
             });
         }
         cli_core_1.Util.log(`Property "${argv.property}" updated.`);
-    }
+    },
+    handler(_argv) { } // part of the CommandModule interface
 };
 exports.default = command;
+//# sourceMappingURL=config.js.map

package/lib/commands/doc.d.ts

@@ -1,5 +1,3 @@
-declare let doc: {
-    [term: string]: any;
-    execute: (argv: any) => Promise<void>;
-};
+import { DocCommandType } from "./types";
+declare const doc: DocCommandType;
 export default doc;