@pnp/cli-microsoft365 7.0.0-beta.86298a0 → 7.0.0-beta.9229cf8

package/dist/m365/pa/commands/pcf/pcf-init/assets/control/dataset-template/template_index.ts

@@ -1,56 +1,51 @@
-import { IInputs, IOutputs } from "./generated/ManifestTypes";
+import { IInputs, IOutputs } from "./generated/ManifestTypes.js";
 import DataSetInterfaces = ComponentFramework.PropertyHelper.DataSetApi;
 type DataSet = ComponentFramework.PropertyTypes.DataSet;
 
 export class $controlnameplaceholder$ implements ComponentFramework.StandardControl<IInputs, IOutputs> {
 
-	/**
-	 * Empty constructor.
-	 */
-	constructor()
-	{
-
-	}
-
-	/**
-	 * Used to initialize the control instance. Controls can kick off remote server calls and other initialization actions here.
-	 * Data-set values are not initialized here, use updateView.
-	 * @param context The entire property bag available to control via Context Object; It contains values as set up by the customizer mapped to property names defined in the manifest, as well as utility functions.
-	 * @param notifyOutputChanged A callback method to alert the framework that the control has new outputs ready to be retrieved asynchronously.
-	 * @param state A piece of data that persists in one session for a single user. Can be set at any point in a controls life cycle by calling 'setControlState' in the Mode interface.
-	 * @param container If a control is marked control-type='standard', it will receive an empty div element within which it can render its content.
-	 */
-	public init(context: ComponentFramework.Context<IInputs>, notifyOutputChanged: () => void, state: ComponentFramework.Dictionary, container:HTMLDivElement)
-	{
-		// Add control initialization code
-	}
-
-
-	/**
-	 * Called when any value in the property bag has changed. This includes field values, data-sets, global values such as container height and width, offline status, control metadata values such as label, visible, etc.
-	 * @param context The entire property bag available to control via Context Object; It contains values as set up by the customizer mapped to names defined in the manifest, as well as utility functions
-	 */
-	public updateView(context: ComponentFramework.Context<IInputs>): void
-	{
-		// Add code to update control view
-	}
-
-	/** 
-	 * It is called by the framework prior to a control receiving new data. 
-	 * @returns an object based on nomenclature defined in manifest, expecting object[s] for property marked as “bound” or “output”
-	 */
-	public getOutputs(): IOutputs
-	{
-		return {};
-	}
-
-	/** 
-	 * Called when the control is to be removed from the DOM tree. Controls should use this call for cleanup.
-	 * i.e. cancelling any pending remote calls, removing listeners, etc.
-	 */
-	public destroy(): void
-	{
-		// Add code to cleanup control if necessary
-	}
+  /**
+   * Empty constructor.
+   */
+  constructor() {
+
+  }
+
+  /**
+   * Used to initialize the control instance. Controls can kick off remote server calls and other initialization actions here.
+   * Data-set values are not initialized here, use updateView.
+   * @param context The entire property bag available to control via Context Object; It contains values as set up by the customizer mapped to property names defined in the manifest, as well as utility functions.
+   * @param notifyOutputChanged A callback method to alert the framework that the control has new outputs ready to be retrieved asynchronously.
+   * @param state A piece of data that persists in one session for a single user. Can be set at any point in a controls life cycle by calling 'setControlState' in the Mode interface.
+   * @param container If a control is marked control-type='standard', it will receive an empty div element within which it can render its content.
+   */
+  public init(context: ComponentFramework.Context<IInputs>, notifyOutputChanged: () => void, state: ComponentFramework.Dictionary, container: HTMLDivElement) {
+    // Add control initialization code
+  }
+
+
+  /**
+   * Called when any value in the property bag has changed. This includes field values, data-sets, global values such as container height and width, offline status, control metadata values such as label, visible, etc.
+   * @param context The entire property bag available to control via Context Object; It contains values as set up by the customizer mapped to names defined in the manifest, as well as utility functions
+   */
+  public updateView(context: ComponentFramework.Context<IInputs>): void {
+    // Add code to update control view
+  }
+
+  /** 
+   * It is called by the framework prior to a control receiving new data. 
+   * @returns an object based on nomenclature defined in manifest, expecting object[s] for property marked as “bound” or “output”
+   */
+  public getOutputs(): IOutputs {
+    return {};
+  }
+
+  /** 
+   * Called when the control is to be removed from the DOM tree. Controls should use this call for cleanup.
+   * i.e. cancelling any pending remote calls, removing listeners, etc.
+   */
+  public destroy(): void {
+    // Add code to cleanup control if necessary
+  }
 
 }

package/dist/m365/pa/commands/pcf/pcf-init/assets/control/field-template/template_index.ts

@@ -1,53 +1,48 @@
-import { IInputs, IOutputs } from "./generated/ManifestTypes";
+import { IInputs, IOutputs } from "./generated/ManifestTypes.js";
 
 export class $controlnameplaceholder$ implements ComponentFramework.StandardControl<IInputs, IOutputs> {
 
-	/**
-	 * Empty constructor.
-	 */
-	constructor()
-	{
-
-	}
-
-	/**
-	 * Used to initialize the control instance. Controls can kick off remote server calls and other initialization actions here.
-	 * Data-set values are not initialized here, use updateView.
-	 * @param context The entire property bag available to control via Context Object; It contains values as set up by the customizer mapped to property names defined in the manifest, as well as utility functions.
-	 * @param notifyOutputChanged A callback method to alert the framework that the control has new outputs ready to be retrieved asynchronously.
-	 * @param state A piece of data that persists in one session for a single user. Can be set at any point in a controls life cycle by calling 'setControlState' in the Mode interface.
-	 * @param container If a control is marked control-type='standard', it will receive an empty div element within which it can render its content.
-	 */
-	public init(context: ComponentFramework.Context<IInputs>, notifyOutputChanged: () => void, state: ComponentFramework.Dictionary, container:HTMLDivElement)
-	{
-		// Add control initialization code
-	}
-
-
-	/**
-	 * Called when any value in the property bag has changed. This includes field values, data-sets, global values such as container height and width, offline status, control metadata values such as label, visible, etc.
-	 * @param context The entire property bag available to control via Context Object; It contains values as set up by the customizer mapped to names defined in the manifest, as well as utility functions
-	 */
-	public updateView(context: ComponentFramework.Context<IInputs>): void
-	{
-		// Add code to update control view
-	}
-
-	/** 
-	 * It is called by the framework prior to a control receiving new data. 
-	 * @returns an object based on nomenclature defined in manifest, expecting object[s] for property marked as “bound” or “output”
-	 */
-	public getOutputs(): IOutputs
-	{
-		return {};
-	}
-
-	/** 
-	 * Called when the control is to be removed from the DOM tree. Controls should use this call for cleanup.
-	 * i.e. cancelling any pending remote calls, removing listeners, etc.
-	 */
-	public destroy(): void
-	{
-		// Add code to cleanup control if necessary
-	}
+  /**
+   * Empty constructor.
+   */
+  constructor() {
+
+  }
+
+  /**
+   * Used to initialize the control instance. Controls can kick off remote server calls and other initialization actions here.
+   * Data-set values are not initialized here, use updateView.
+   * @param context The entire property bag available to control via Context Object; It contains values as set up by the customizer mapped to property names defined in the manifest, as well as utility functions.
+   * @param notifyOutputChanged A callback method to alert the framework that the control has new outputs ready to be retrieved asynchronously.
+   * @param state A piece of data that persists in one session for a single user. Can be set at any point in a controls life cycle by calling 'setControlState' in the Mode interface.
+   * @param container If a control is marked control-type='standard', it will receive an empty div element within which it can render its content.
+   */
+  public init(context: ComponentFramework.Context<IInputs>, notifyOutputChanged: () => void, state: ComponentFramework.Dictionary, container: HTMLDivElement) {
+    // Add control initialization code
+  }
+
+
+  /**
+   * Called when any value in the property bag has changed. This includes field values, data-sets, global values such as container height and width, offline status, control metadata values such as label, visible, etc.
+   * @param context The entire property bag available to control via Context Object; It contains values as set up by the customizer mapped to names defined in the manifest, as well as utility functions
+   */
+  public updateView(context: ComponentFramework.Context<IInputs>): void {
+    // Add code to update control view
+  }
+
+  /** 
+   * It is called by the framework prior to a control receiving new data. 
+   * @returns an object based on nomenclature defined in manifest, expecting object[s] for property marked as “bound” or “output”
+   */
+  public getOutputs(): IOutputs {
+    return {};
+  }
+
+  /** 
+   * Called when the control is to be removed from the DOM tree. Controls should use this call for cleanup.
+   * i.e. cancelling any pending remote calls, removing listeners, etc.
+   */
+  public destroy(): void {
+    // Add code to cleanup control if necessary
+  }
 }

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

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=pcf-init-variables.js.map

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

@@ -1,36 +1,27 @@
-"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");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _PaPcfInitCommand_instances, _PaPcfInitCommand_initTelemetry, _PaPcfInitCommand_initOptions, _PaPcfInitCommand_initValidators;
-Object.defineProperty(exports, "__esModule", { value: true });
-const chalk = require("chalk");
-const fs = require("fs");
-const path = require("path");
-const uuid_1 = require("uuid");
-const validation_1 = require("../../../../utils/validation");
-const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
-const commands_1 = require("../../commands");
-const template_instantiator_1 = require("../../template-instantiator");
+import chalk from 'chalk';
+import fs from 'fs';
+import path from 'path';
+import url from 'url';
+import { v4 } from 'uuid';
+import { validation } from '../../../../utils/validation.js';
+import AnonymousCommand from "../../../base/AnonymousCommand.js";
+import commands from '../../commands.js';
+import TemplateInstantiator from "../../template-instantiator.js";
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 /*
  * Logic extracted from bolt.module.pcf.dll
  * Version: 1.0.6
  * Class: bolt.module.pcf.PcfInitVerb
  */
-class PaPcfInitCommand extends AnonymousCommand_1.default {
+class PaPcfInitCommand extends AnonymousCommand {
     get name() {
-        return commands_1.default.PCF_INIT;
+        return commands.PCF_INIT;
     }
     get description() {
         return 'Creates new PowerApps component framework project';
@@ -42,43 +33,41 @@ class PaPcfInitCommand extends AnonymousCommand_1.default {
         __classPrivateFieldGet(this, _PaPcfInitCommand_instances, "m", _PaPcfInitCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PaPcfInitCommand_instances, "m", _PaPcfInitCommand_initValidators).call(this);
     }
-    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.`);
+    async commandAction(logger, args) {
+        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$": v4()
+            };
+            if (this.verbose) {
+                await logger.logToStderr(`name: ${args.options.name}`);
+                await logger.logToStderr(`namespace: ${args.options.namespace}`);
+                await logger.logToStderr(`template: ${args.options.template}`);
+                await logger.logToStderr(`pcfTemplatePath: ${pcfTemplatePath}`);
+                await logger.logToStderr(`pcfComponentTemplatePath: ${pcfComponentTemplatePath}`);
+                await logger.logToStderr(`workingDirectory: ${workingDirectory}`);
+                await logger.logToStderr(`workingDirectoryName: ${workingDirectoryName}`);
+                await logger.logToStderr(`componentDirectory: ${componentDirectory}`);
             }
-            catch (err) {
-                throw err;
+            TemplateInstantiator.instantiate(logger, pcfTemplatePath, workingDirectory, false, variables, this.verbose);
+            TemplateInstantiator.instantiate(logger, pcfComponentTemplatePath, componentDirectory, true, variables, this.verbose);
+            if (this.verbose) {
+                await logger.logToStderr(` `);
             }
-        });
+            await logger.log(chalk.green(`The PowerApps component framework project was successfully created in '${workingDirectory}'.`));
+            await logger.log(`Be sure to run '${chalk.grey('npm install')}' in this directory to install project dependencies.`);
+        }
+        catch (err) {
+            throw err;
+        }
     }
 }
 _PaPcfInitCommand_instances = new WeakSet(), _PaPcfInitCommand_initTelemetry = function _PaPcfInitCommand_initTelemetry() {
@@ -97,24 +86,24 @@ _PaPcfInitCommand_instances = new WeakSet(), _PaPcfInitCommand_initTelemetry = f
         autocomplete: ['Field', 'Dataset']
     });
 }, _PaPcfInitCommand_initValidators = function _PaPcfInitCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+    this.validators.push(async (args) => {
         if (fs.readdirSync(process.cwd()).some(fn => path.extname(fn).toLowerCase().endsWith('proj'))) {
             return 'PowerApps component framework project creation failed. The current directory already contains a project. Please create a new directory and retry the operation.';
         }
         const workingDirectoryName = path.basename(process.cwd());
-        if (!validation_1.validation.isValidFileName(workingDirectoryName)) {
+        if (!validation.isValidFileName(workingDirectoryName)) {
             return `Empty or invalid project name '${workingDirectoryName}'`;
         }
         if (!/^(?!\d)[a-zA-Z0-9]+$/i.test(args.options.name)) {
             return `Value of 'name' is invalid. Only characters within the ranges [A - Z], [a - z] or [0 - 9] are allowed. The first character may not be a number.`;
         }
-        if (validation_1.validation.isJavaScriptReservedWord(args.options.name)) {
+        if (validation.isJavaScriptReservedWord(args.options.name)) {
             return `The value '${args.options.name}' passed for 'name' is a reserved word.`;
         }
         if (!/^(?!\.|\d)(?!.*\.$)(?!.*?\.\d)(?!.*?\.\.)[a-zA-Z0-9.]+$/i.test(args.options.namespace)) {
             return `Value of 'namespace' is invalid. Only characters within the ranges [A - Z], [a - z], [0 - 9], or '.' are allowed. The first and last character may not be the '.' character. Consecutive '.' characters are not allowed. Numbers are not allowed as the first character or immediately after a period.`;
         }
-        if (validation_1.validation.isJavaScriptReservedWord(args.options.namespace)) {
+        if (validation.isJavaScriptReservedWord(args.options.namespace)) {
             return `The value '${args.options.namespace}' passed for 'namespace' is or includes a reserved word.`;
         }
         if (args.options.namespace && args.options.name && (args.options.namespace + args.options.name).length > 75) {
@@ -125,7 +114,7 @@ _PaPcfInitCommand_instances = new WeakSet(), _PaPcfInitCommand_initTelemetry = f
             return `Template must be either 'Field' or 'Dataset', but '${args.options.template}' was provided.`;
         }
         return true;
-    }));
+    });
 };
-module.exports = new PaPcfInitCommand();
+export default new PaPcfInitCommand();
 //# sourceMappingURL=pcf-init.js.map

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

@@ -1,3 +1,2 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};
 //# sourceMappingURL=solution-init-variables.js.map

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

@@ -1,36 +1,27 @@
-"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");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _PaSolutionInitCommand_instances, _PaSolutionInitCommand_initOptions, _PaSolutionInitCommand_initValidators;
-Object.defineProperty(exports, "__esModule", { value: true });
-const chalk = require("chalk");
-const fs = require("fs");
-const path = require("path");
-const uuid_1 = require("uuid");
-const validation_1 = require("../../../../utils/validation");
-const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
-const commands_1 = require("../../commands");
-const template_instantiator_1 = require("../../template-instantiator");
+import chalk from 'chalk';
+import fs from 'fs';
+import path from 'path';
+import url from 'url';
+import { v4 } from 'uuid';
+import { validation } from '../../../../utils/validation.js';
+import AnonymousCommand from '../../../base/AnonymousCommand.js';
+import commands from '../../commands.js';
+import TemplateInstantiator from '../../template-instantiator.js';
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 /*
  * Logic extracted from bolt.module.solution.dll
  * Version: 1.0.6
  * Class: bolt.module.solution.SolutionInitVerb
  */
-class PaSolutionInitCommand extends AnonymousCommand_1.default {
+class PaSolutionInitCommand extends AnonymousCommand {
     get name() {
-        return commands_1.default.SOLUTION_INIT;
+        return commands.SOLUTION_INIT;
     }
     get description() {
         return 'Initializes a directory with a new CDS solution project';
@@ -41,56 +32,54 @@ class PaSolutionInitCommand extends AnonymousCommand_1.default {
         __classPrivateFieldGet(this, _PaSolutionInitCommand_instances, "m", _PaSolutionInitCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PaSolutionInitCommand_instances, "m", _PaSolutionInitCommand_initValidators).call(this);
     }
-    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.`);
-                }
+    async commandAction(logger, args) {
+        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$": v4(),
+                "solutionprojecttype": workingDirectoryName,
+                "$solutionName$": workingDirectoryName
+            };
+            if (this.verbose) {
+                await logger.logToStderr(`publisherName: ${publisherName}`);
+                await logger.logToStderr(`publisherPrefix: ${publisherPrefix}`);
+                await logger.logToStderr(`customizationOptionValuePrefix: ${customizationOptionValuePrefix}`);
+                await logger.logToStderr(`solutionInitTemplatePath: ${solutionInitTemplatePath}`);
+                await logger.logToStderr(`cdsAssetsTemplatePath: ${cdsAssetsTemplatePath}`);
+                await logger.logToStderr(`workingDirectory: ${workingDirectory}`);
+                await logger.logToStderr(`workingDirectoryName: ${workingDirectoryName}`);
+                await logger.logToStderr(`cdsAssetsDirectory: ${cdsAssetsDirectory}`);
+                await logger.logToStderr(`cdsAssetsDirectorySolutionsFile: ${cdsAssetsDirectorySolutionsFile}`);
+            }
+            TemplateInstantiator.instantiate(logger, solutionInitTemplatePath, workingDirectory, false, variables, this.verbose);
+            if (this.verbose) {
+                await logger.logToStderr(` `);
+            }
+            await 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) {
+                await logger.log(chalk.yellow(`CDS solution files already exist in the current directory. Skipping CDS solution files creation.`));
             }
-            catch (err) {
-                throw err;
+            else {
+                TemplateInstantiator.instantiate(logger, cdsAssetsTemplatePath, cdsAssetsDirectory, false, variables, this.verbose);
+                await 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}'.`));
+                await logger.log(`Please verify the publisher information and solution name found in the '${chalk.grey('Solution.xml')}' file.`);
             }
-        });
+        }
+        catch (err) {
+            throw err;
+        }
     }
     generateOptionValuePrefixForPublisher(customizationPrefix) {
         if (customizationPrefix.toLocaleLowerCase() !== "new") {
@@ -116,12 +105,12 @@ _PaSolutionInitCommand_instances = new WeakSet(), _PaSolutionInitCommand_initOpt
         option: '--publisherPrefix <publisherPrefix>'
     });
 }, _PaSolutionInitCommand_initValidators = function _PaSolutionInitCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+    this.validators.push(async (args) => {
         if (fs.readdirSync(process.cwd()).some(fn => path.extname(fn).toLowerCase() === '.cdsproj')) {
             return 'CDS project creation failed. The current directory already contains a project. Please create a new directory and retry the operation.';
         }
         const workingDirectoryName = path.basename(process.cwd());
-        if (!validation_1.validation.isValidFileName(workingDirectoryName)) {
+        if (!validation.isValidFileName(workingDirectoryName)) {
             return `Empty or invalid project name '${workingDirectoryName}'`;
         }
         if (args.options.publisherPrefix.length < 2 || args.options.publisherPrefix.length > 8 || !/^(?!mscrm)^([a-zA-Z])\w*$/i.test(args.options.publisherPrefix)) {
@@ -131,7 +120,7 @@ _PaSolutionInitCommand_instances = new WeakSet(), _PaSolutionInitCommand_initOpt
             return `Value of 'publisherName' is invalid. Only characters within the ranges [A-Z], [a-z], [0-9], or _ are allowed. The first character may only be in the ranges [A-Z], [a-z], or _.`;
         }
         return true;
-    }));
+    });
 };
-module.exports = new PaSolutionInitCommand();
+export default new PaSolutionInitCommand();
 //# sourceMappingURL=solution-init.js.map