@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.03ce984

package/dist/m365/pa/commands/connector/connector-export.js

@@ -38,127 +38,125 @@ class PaConnectorExportCommand extends PowerAppsCommand_1.default {
     alias() {
         return [commands_1.default.CONNECTOR_EXPORT];
     }
-    commandAction(logger, args, cb) {
-        const outputFolder = path.resolve(args.options.outputFolder || '.', args.options.connector);
-        const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.PowerApps/apis/${encodeURIComponent(args.options.connector)}?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environment)}%27%20and%20IsCustomApi%20eq%20%27True%27`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        let connector;
-        if (this.verbose) {
-            logger.logToStderr('Downloading connector...');
-        }
-        request_1.default
-            .get(requestOptions)
-            .then((connectorRes) => {
-            connector = connectorRes;
-            if (!connector.properties) {
-                return Promise.reject('Properties not present in the api registration information.');
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Creating output folder ${outputFolder}...`);
-            }
-            fs.mkdirSync(outputFolder);
-            const settings = {
-                apiDefinition: "apiDefinition.swagger.json",
-                apiProperties: "apiProperties.json",
-                connectorId: args.options.connector,
-                environment: args.options.environment,
-                icon: "icon.png",
-                powerAppsApiVersion: "2016-11-01",
-                powerAppsUrl: "https://api.powerapps.com"
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const outputFolder = path.resolve(args.options.outputFolder || '.', args.options.connector);
+            const requestOptions = {
+                url: `${this.resource}/providers/Microsoft.PowerApps/apis/${encodeURIComponent(args.options.connector)}?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environment)}%27%20and%20IsCustomApi%20eq%20%27True%27`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
             };
+            let connector;
             if (this.verbose) {
-                logger.logToStderr('Exporting settings...');
+                logger.logToStderr('Downloading connector...');
             }
-            fs.writeFileSync(path.join(outputFolder, 'settings.json'), JSON.stringify(settings, null, 2), 'utf8');
-            const propertiesWhitelist = [
-                "connectionParameters",
-                "iconBrandColor",
-                "capabilities",
-                "policyTemplateInstances"
-            ];
-            const apiProperties = {
-                properties: JSON.parse(JSON.stringify(connector.properties))
-            };
-            Object.keys(apiProperties.properties).forEach(k => {
-                if (propertiesWhitelist.indexOf(k) < 0) {
-                    delete apiProperties.properties[k];
+            try {
+                connector = yield request_1.default.get(requestOptions);
+                if (!connector.properties) {
+                    throw 'Properties not present in the api registration information.';
                 }
-            });
-            if (this.verbose) {
-                logger.logToStderr('Exporting API properties...');
-            }
-            fs.writeFileSync(path.join(outputFolder, 'apiProperties.json'), JSON.stringify(apiProperties, null, 2), 'utf8');
-            if (connector.properties.apiDefinitions &&
-                connector.properties.apiDefinitions.originalSwaggerUrl) {
                 if (this.verbose) {
-                    logger.logToStderr(`Downloading swagger from ${connector.properties.apiDefinitions.originalSwaggerUrl}...`);
+                    logger.logToStderr(`Creating output folder ${outputFolder}...`);
                 }
-                return request_1.default
-                    .get({
-                    url: connector.properties.apiDefinitions.originalSwaggerUrl,
-                    headers: {
-                        'x-anonymous': 'true'
+                fs.mkdirSync(outputFolder);
+                const settings = {
+                    apiDefinition: "apiDefinition.swagger.json",
+                    apiProperties: "apiProperties.json",
+                    connectorId: args.options.connector,
+                    environment: args.options.environment,
+                    icon: "icon.png",
+                    powerAppsApiVersion: "2016-11-01",
+                    powerAppsUrl: "https://api.powerapps.com"
+                };
+                if (this.verbose) {
+                    logger.logToStderr('Exporting settings...');
+                }
+                fs.writeFileSync(path.join(outputFolder, 'settings.json'), JSON.stringify(settings, null, 2), 'utf8');
+                const propertiesWhitelist = [
+                    "connectionParameters",
+                    "iconBrandColor",
+                    "capabilities",
+                    "policyTemplateInstances"
+                ];
+                const apiProperties = {
+                    properties: JSON.parse(JSON.stringify(connector.properties))
+                };
+                Object.keys(apiProperties.properties).forEach(k => {
+                    if (propertiesWhitelist.indexOf(k) < 0) {
+                        delete apiProperties.properties[k];
                     }
                 });
-            }
-            else {
-                if (this.debug) {
-                    logger.logToStderr('originalSwaggerUrl not set. Skipping');
+                if (this.verbose) {
+                    logger.logToStderr('Exporting API properties...');
                 }
-                return Promise.resolve('');
-            }
-        })
-            .then((swagger) => {
-            if (swagger && swagger.length > 0) {
-                if (this.debug) {
-                    logger.logToStderr('Downloaded swagger');
-                    logger.logToStderr(swagger);
+                fs.writeFileSync(path.join(outputFolder, 'apiProperties.json'), JSON.stringify(apiProperties, null, 2), 'utf8');
+                let swagger = '';
+                if (connector.properties.apiDefinitions &&
+                    connector.properties.apiDefinitions.originalSwaggerUrl) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Downloading swagger from ${connector.properties.apiDefinitions.originalSwaggerUrl}...`);
+                    }
+                    swagger = yield request_1.default
+                        .get({
+                        url: connector.properties.apiDefinitions.originalSwaggerUrl,
+                        headers: {
+                            'x-anonymous': 'true'
+                        }
+                    });
                 }
-                if (this.verbose) {
-                    logger.logToStderr('Exporting swagger...');
+                else {
+                    if (this.debug) {
+                        logger.logToStderr('originalSwaggerUrl not set. Skipping');
+                    }
                 }
-                fs.writeFileSync(path.join(outputFolder, 'apiDefinition.swagger.json'), swagger, 'utf8');
-            }
-            if (connector.properties.iconUri) {
-                if (this.verbose) {
-                    logger.logToStderr(`Downloading icon from ${connector.properties.iconUri}...`);
+                if (swagger && swagger.length > 0) {
+                    if (this.debug) {
+                        logger.logToStderr('Downloaded swagger');
+                        logger.logToStderr(swagger);
+                    }
+                    if (this.verbose) {
+                        logger.logToStderr('Exporting swagger...');
+                    }
+                    fs.writeFileSync(path.join(outputFolder, 'apiDefinition.swagger.json'), swagger, 'utf8');
                 }
-                return request_1.default
-                    .get({
-                    url: connector.properties.iconUri,
-                    responseType: 'arraybuffer',
-                    headers: {
-                        'x-anonymous': 'true'
+                let icon = '';
+                if (connector.properties.iconUri) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Downloading icon from ${connector.properties.iconUri}...`);
                     }
-                });
-            }
-            else {
-                if (this.debug) {
-                    logger.logToStderr('iconUri not set. Skipping');
+                    icon = yield request_1.default
+                        .get({
+                        url: connector.properties.iconUri,
+                        responseType: 'arraybuffer',
+                        headers: {
+                            'x-anonymous': 'true'
+                        }
+                    });
                 }
-                return Promise.resolve();
-            }
-        })
-            .then((icon) => {
-            if (icon) {
-                if (this.verbose) {
-                    logger.logToStderr('Exporting icon...');
+                else {
+                    if (this.debug) {
+                        logger.logToStderr('iconUri not set. Skipping');
+                    }
                 }
-                const iconBuffer = Buffer.from(icon, 'utf8');
-                fs.writeFileSync(path.join(outputFolder, 'icon.png'), iconBuffer);
-            }
-            else {
-                if (this.debug) {
-                    logger.logToStderr('No icon retrieved');
+                if (icon) {
+                    if (this.verbose) {
+                        logger.logToStderr('Exporting icon...');
+                    }
+                    const iconBuffer = Buffer.from(icon, 'utf8');
+                    fs.writeFileSync(path.join(outputFolder, 'icon.png'), iconBuffer);
                 }
+                else {
+                    if (this.debug) {
+                        logger.logToStderr('No icon retrieved');
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
 }
 _PaConnectorExportCommand_instances = new WeakSet(), _PaConnectorExportCommand_initTelemetry = function _PaConnectorExportCommand_initTelemetry() {

package/dist/m365/pa/commands/connector/connector-list.js

@@ -1,4 +1,13 @@
 "use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
@@ -28,24 +37,27 @@ class PaConnectorListCommand extends PowerAppsCommand_1.default {
     defaultProperties() {
         return ['name', 'displayName'];
     }
-    commandAction(logger, args, cb) {
-        const url = `${this.resource}/providers/Microsoft.PowerApps/apis?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environment)}%27%20and%20IsCustomApi%20eq%20%27True%27`;
-        utils_1.odata
-            .getAllItems(url)
-            .then((connectors) => {
-            if (connectors.length > 0) {
-                connectors.forEach(c => {
-                    c.displayName = c.properties.displayName;
-                });
-                logger.log(connectors);
-            }
-            else {
-                if (this.verbose) {
-                    logger.logToStderr('No custom connectors found');
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const url = `${this.resource}/providers/Microsoft.PowerApps/apis?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environment)}%27%20and%20IsCustomApi%20eq%20%27True%27`;
+            try {
+                const connectors = yield utils_1.odata.getAllItems(url);
+                if (connectors.length > 0) {
+                    connectors.forEach(c => {
+                        c.displayName = c.properties.displayName;
+                    });
+                    logger.log(connectors);
                 }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr('No custom connectors found');
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+        });
     }
 }
 _PaConnectorListCommand_instances = new WeakSet(), _PaConnectorListCommand_initOptions = function _PaConnectorListCommand_initOptions() {

package/dist/m365/pa/commands/environment/environment-get.js

@@ -1,4 +1,13 @@
 "use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
@@ -24,28 +33,31 @@ class PaEnvironmentGetCommand extends PowerAppsCommand_1.default {
     defaultProperties() {
         return ['name', 'id', 'location', 'displayName', 'provisioningState', 'environmentSku', 'azureRegionHint', 'isDefault'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving information about Microsoft Power Apps environment ${args.options.name}...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.PowerApps/environments/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            res.displayName = res.properties.displayName;
-            res.provisioningState = res.properties.provisioningState;
-            res.environmentSku = res.properties.environmentSku;
-            res.azureRegionHint = res.properties.azureRegionHint;
-            res.isDefault = res.properties.isDefault;
-            logger.log(res);
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving information about Microsoft Power Apps environment ${args.options.name}...`);
+            }
+            const requestOptions = {
+                url: `${this.resource}/providers/Microsoft.PowerApps/environments/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                res.displayName = res.properties.displayName;
+                res.provisioningState = res.properties.provisioningState;
+                res.environmentSku = res.properties.environmentSku;
+                res.azureRegionHint = res.properties.azureRegionHint;
+                res.isDefault = res.properties.isDefault;
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _PaEnvironmentGetCommand_instances = new WeakSet(), _PaEnvironmentGetCommand_initOptions = function _PaEnvironmentGetCommand_initOptions() {

package/dist/m365/pa/commands/environment/environment-list.js

@@ -1,4 +1,13 @@
 "use strict";
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
@@ -13,28 +22,31 @@ class PaEnvironmentListCommand extends PowerAppsCommand_1.default {
     defaultProperties() {
         return ['name', 'displayName'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving list of Microsoft Power Apps environments...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.PowerApps/environments?api-version=2017-08-01`,
-            headers: {
-                accept: 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (res.value.length > 0) {
-                res.value.forEach(e => {
-                    e.displayName = e.properties.displayName;
-                });
-                logger.log(res.value);
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving list of Microsoft Power Apps environments...`);
             }
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+            const requestOptions = {
+                url: `${this.resource}/providers/Microsoft.PowerApps/environments?api-version=2017-08-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                if (res.value.length > 0) {
+                    res.value.forEach(e => {
+                        e.displayName = e.properties.displayName;
+                    });
+                    logger.log(res.value);
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 module.exports = new PaEnvironmentListCommand();

package/dist/m365/pa/commands/pcf/pcf-init.js

@@ -43,42 +43,43 @@ class PaPcfInitCommand extends AnonymousCommand_1.default {
     get description() {
         return 'Creates new PowerApps component framework project';
     }
-    commandAction(logger, args, cb) {
-        try {
-            const pcfTemplatePath = path.join(__dirname, 'pcf-init', 'assets');
-            const pcfComponentTemplatePath = path.join(pcfTemplatePath, 'control', `${args.options.template.toLowerCase()}-template`);
-            const workingDirectory = process.cwd();
-            const workingDirectoryName = path.basename(workingDirectory);
-            const componentDirectory = path.join(workingDirectory, args.options.name);
-            const variables = {
-                "$namespaceplaceholder$": args.options.namespace,
-                "$controlnameplaceholder$": args.options.name,
-                "$pcfProjectName$": workingDirectoryName,
-                "pcfprojecttype": workingDirectoryName,
-                "$pcfProjectGuid$": (0, uuid_1.v4)()
-            };
-            if (this.verbose) {
-                logger.logToStderr(`name: ${args.options.name}`);
-                logger.logToStderr(`namespace: ${args.options.namespace}`);
-                logger.logToStderr(`template: ${args.options.template}`);
-                logger.logToStderr(`pcfTemplatePath: ${pcfTemplatePath}`);
-                logger.logToStderr(`pcfComponentTemplatePath: ${pcfComponentTemplatePath}`);
-                logger.logToStderr(`workingDirectory: ${workingDirectory}`);
-                logger.logToStderr(`workingDirectoryName: ${workingDirectoryName}`);
-                logger.logToStderr(`componentDirectory: ${componentDirectory}`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const pcfTemplatePath = path.join(__dirname, 'pcf-init', 'assets');
+                const pcfComponentTemplatePath = path.join(pcfTemplatePath, 'control', `${args.options.template.toLowerCase()}-template`);
+                const workingDirectory = process.cwd();
+                const workingDirectoryName = path.basename(workingDirectory);
+                const componentDirectory = path.join(workingDirectory, args.options.name);
+                const variables = {
+                    "$namespaceplaceholder$": args.options.namespace,
+                    "$controlnameplaceholder$": args.options.name,
+                    "$pcfProjectName$": workingDirectoryName,
+                    "pcfprojecttype": workingDirectoryName,
+                    "$pcfProjectGuid$": (0, uuid_1.v4)()
+                };
+                if (this.verbose) {
+                    logger.logToStderr(`name: ${args.options.name}`);
+                    logger.logToStderr(`namespace: ${args.options.namespace}`);
+                    logger.logToStderr(`template: ${args.options.template}`);
+                    logger.logToStderr(`pcfTemplatePath: ${pcfTemplatePath}`);
+                    logger.logToStderr(`pcfComponentTemplatePath: ${pcfComponentTemplatePath}`);
+                    logger.logToStderr(`workingDirectory: ${workingDirectory}`);
+                    logger.logToStderr(`workingDirectoryName: ${workingDirectoryName}`);
+                    logger.logToStderr(`componentDirectory: ${componentDirectory}`);
+                }
+                template_instantiator_1.default.instantiate(logger, pcfTemplatePath, workingDirectory, false, variables, this.verbose);
+                template_instantiator_1.default.instantiate(logger, pcfComponentTemplatePath, componentDirectory, true, variables, this.verbose);
+                if (this.verbose) {
+                    logger.logToStderr(` `);
+                }
+                logger.log(chalk.green(`The PowerApps component framework project was successfully created in '${workingDirectory}'.`));
+                logger.log(`Be sure to run '${chalk.grey('npm install')}' in this directory to install project dependencies.`);
             }
-            template_instantiator_1.default.instantiate(logger, pcfTemplatePath, workingDirectory, false, variables, this.verbose);
-            template_instantiator_1.default.instantiate(logger, pcfComponentTemplatePath, componentDirectory, true, variables, this.verbose);
-            if (this.verbose) {
-                logger.logToStderr(` `);
+            catch (err) {
+                throw new Command_1.CommandError(err);
             }
-            logger.log(chalk.green(`The PowerApps component framework project was successfully created in '${workingDirectory}'.`));
-            logger.log(`Be sure to run '${chalk.grey('npm install')}' in this directory to install project dependencies.`);
-            cb();
-        }
-        catch (err) {
-            cb(new Command_1.CommandError(err));
-        }
+        });
     }
 }
 _PaPcfInitCommand_instances = new WeakSet(), _PaPcfInitCommand_initTelemetry = function _PaPcfInitCommand_initTelemetry() {

package/dist/m365/pa/commands/solution/solution-init.js

@@ -42,55 +42,56 @@ class PaSolutionInitCommand extends AnonymousCommand_1.default {
     get description() {
         return 'Initializes a directory with a new CDS solution project';
     }
-    commandAction(logger, args, cb) {
-        try {
-            const solutionInitTemplatePath = path.join(__dirname, 'solution-init', 'assets');
-            const cdsAssetsTemplatePath = path.join(solutionInitTemplatePath, 'Other');
-            const workingDirectory = process.cwd();
-            const workingDirectoryName = path.basename(workingDirectory);
-            const cdsAssetsDirectory = path.join(workingDirectory, 'Other');
-            const cdsAssetsDirectorySolutionsFile = path.join(workingDirectory, 'Other', 'Solution.xml');
-            const publisherName = args.options.publisherName;
-            const publisherPrefix = args.options.publisherPrefix.toLocaleLowerCase();
-            const customizationOptionValuePrefix = this.generateOptionValuePrefixForPublisher(publisherPrefix);
-            const variables = {
-                "$publisherName$": publisherName,
-                "$customizationPrefix$": publisherPrefix,
-                "$customizationOptionValuePrefix$": customizationOptionValuePrefix,
-                "$cdsProjectGuid$": (0, uuid_1.v4)(),
-                "solutionprojecttype": workingDirectoryName,
-                "$solutionName$": workingDirectoryName
-            };
-            if (this.verbose) {
-                logger.logToStderr(`publisherName: ${publisherName}`);
-                logger.logToStderr(`publisherPrefix: ${publisherPrefix}`);
-                logger.logToStderr(`customizationOptionValuePrefix: ${customizationOptionValuePrefix}`);
-                logger.logToStderr(`solutionInitTemplatePath: ${solutionInitTemplatePath}`);
-                logger.logToStderr(`cdsAssetsTemplatePath: ${cdsAssetsTemplatePath}`);
-                logger.logToStderr(`workingDirectory: ${workingDirectory}`);
-                logger.logToStderr(`workingDirectoryName: ${workingDirectoryName}`);
-                logger.logToStderr(`cdsAssetsDirectory: ${cdsAssetsDirectory}`);
-                logger.logToStderr(`cdsAssetsDirectorySolutionsFile: ${cdsAssetsDirectorySolutionsFile}`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const solutionInitTemplatePath = path.join(__dirname, 'solution-init', 'assets');
+                const cdsAssetsTemplatePath = path.join(solutionInitTemplatePath, 'Other');
+                const workingDirectory = process.cwd();
+                const workingDirectoryName = path.basename(workingDirectory);
+                const cdsAssetsDirectory = path.join(workingDirectory, 'Other');
+                const cdsAssetsDirectorySolutionsFile = path.join(workingDirectory, 'Other', 'Solution.xml');
+                const publisherName = args.options.publisherName;
+                const publisherPrefix = args.options.publisherPrefix.toLocaleLowerCase();
+                const customizationOptionValuePrefix = this.generateOptionValuePrefixForPublisher(publisherPrefix);
+                const variables = {
+                    "$publisherName$": publisherName,
+                    "$customizationPrefix$": publisherPrefix,
+                    "$customizationOptionValuePrefix$": customizationOptionValuePrefix,
+                    "$cdsProjectGuid$": (0, uuid_1.v4)(),
+                    "solutionprojecttype": workingDirectoryName,
+                    "$solutionName$": workingDirectoryName
+                };
+                if (this.verbose) {
+                    logger.logToStderr(`publisherName: ${publisherName}`);
+                    logger.logToStderr(`publisherPrefix: ${publisherPrefix}`);
+                    logger.logToStderr(`customizationOptionValuePrefix: ${customizationOptionValuePrefix}`);
+                    logger.logToStderr(`solutionInitTemplatePath: ${solutionInitTemplatePath}`);
+                    logger.logToStderr(`cdsAssetsTemplatePath: ${cdsAssetsTemplatePath}`);
+                    logger.logToStderr(`workingDirectory: ${workingDirectory}`);
+                    logger.logToStderr(`workingDirectoryName: ${workingDirectoryName}`);
+                    logger.logToStderr(`cdsAssetsDirectory: ${cdsAssetsDirectory}`);
+                    logger.logToStderr(`cdsAssetsDirectorySolutionsFile: ${cdsAssetsDirectorySolutionsFile}`);
+                }
+                template_instantiator_1.default.instantiate(logger, solutionInitTemplatePath, workingDirectory, false, variables, this.verbose);
+                if (this.verbose) {
+                    logger.logToStderr(` `);
+                }
+                logger.log(chalk.green(`CDS solution project with name '${workingDirectoryName}' created successfully in current directory.`));
+                const cdsAssetsExist = fs.existsSync(cdsAssetsDirectory) && fs.existsSync(cdsAssetsDirectorySolutionsFile);
+                if (cdsAssetsExist) {
+                    logger.log(chalk.yellow(`CDS solution files already exist in the current directory. Skipping CDS solution files creation.`));
+                }
+                else {
+                    template_instantiator_1.default.instantiate(logger, cdsAssetsTemplatePath, cdsAssetsDirectory, false, variables, this.verbose);
+                    logger.log(chalk.green(`CDS solution files were successfully created for this project in the sub-directory 'Other', using solution name '${workingDirectory}', publisher name '${publisherName}', and customization prefix '${publisherPrefix}'.`));
+                    logger.log(`Please verify the publisher information and solution name found in the '${chalk.grey('Solution.xml')}' file.`);
+                }
             }
-            template_instantiator_1.default.instantiate(logger, solutionInitTemplatePath, workingDirectory, false, variables, this.verbose);
-            if (this.verbose) {
-                logger.logToStderr(` `);
+            catch (err) {
+                throw new Command_1.CommandError(err);
             }
-            logger.log(chalk.green(`CDS solution project with name '${workingDirectoryName}' created successfully in current directory.`));
-            const cdsAssetsExist = fs.existsSync(cdsAssetsDirectory) && fs.existsSync(cdsAssetsDirectorySolutionsFile);
-            if (cdsAssetsExist) {
-                logger.log(chalk.yellow(`CDS solution files already exist in the current directory. Skipping CDS solution files creation.`));
-            }
-            else {
-                template_instantiator_1.default.instantiate(logger, cdsAssetsTemplatePath, cdsAssetsDirectory, false, variables, this.verbose);
-                logger.log(chalk.green(`CDS solution files were successfully created for this project in the sub-directory 'Other', using solution name '${workingDirectory}', publisher name '${publisherName}', and customization prefix '${publisherPrefix}'.`));
-                logger.log(`Please verify the publisher information and solution name found in the '${chalk.grey('Solution.xml')}' file.`);
-            }
-            cb();
-        }
-        catch (err) {
-            cb(new Command_1.CommandError(err));
-        }
+        });
     }
     generateOptionValuePrefixForPublisher(customizationPrefix) {
         if (customizationPrefix.toLocaleLowerCase() !== "new") {