@pnp/cli-microsoft365 6.0.0-beta.6a854fc → 6.0.0-beta.7a78ebe

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

@@ -1,11 +1,26 @@
 "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 Command_1 = require("../../../../Command");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 const template_instantiator_1 = require("../../template-instantiator");
@@ -15,99 +30,68 @@ const template_instantiator_1 = require("../../template-instantiator");
  * Class: bolt.module.solution.SolutionInitVerb
  */
 class PaSolutionInitCommand extends AnonymousCommand_1.default {
+    constructor() {
+        super();
+        _PaSolutionInitCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaSolutionInitCommand_instances, "m", _PaSolutionInitCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaSolutionInitCommand_instances, "m", _PaSolutionInitCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.SOLUTION_INIT;
     }
     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}`);
-            }
-            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.`);
-            }
-            cb();
-        }
-        catch (err) {
-            cb(new Command_1.CommandError(err));
-        }
-    }
-    options() {
-        const options = [
-            {
-                option: '--publisherName <publisherName>'
-            },
-            {
-                option: '--publisherPrefix <publisherPrefix>'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(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 (!utils_1.validation.isValidFileName(workingDirectoryName)) {
-            return `Empty or invalid project name '${workingDirectoryName}'`;
-        }
-        if (args.options.publisherPrefix) {
-            if (args.options.publisherPrefix.length < 2 || args.options.publisherPrefix.length > 8 || !/^(?!mscrm)^([a-zA-Z])\w*$/i.test(args.options.publisherPrefix)) {
-                return `Value of 'publisherPrefix' is invalid. The prefix must be 2 to 8 characters long, can only consist of alpha-numerics, must start with a letter, and cannot start with 'mscrm'.`;
+    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.`);
+                }
             }
-        }
-        else {
-            return 'Missing required option publisherPrefix.';
-        }
-        if (args.options.publisherName) {
-            if (!/^([a-zA-Z_])\w*$/i.test(args.options.publisherName)) {
-                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 _.`;
+            catch (err) {
+                throw new Command_1.CommandError(err);
             }
-        }
-        else {
-            return 'Missing required option publisherName.';
-        }
-        return true;
+        });
     }
     generateOptionValuePrefixForPublisher(customizationPrefix) {
         if (customizationPrefix.toLocaleLowerCase() !== "new") {
@@ -126,5 +110,29 @@ class PaSolutionInitCommand extends AnonymousCommand_1.default {
         return h;
     }
 }
+_PaSolutionInitCommand_instances = new WeakSet(), _PaSolutionInitCommand_initOptions = function _PaSolutionInitCommand_initOptions() {
+    this.options.unshift({
+        option: '--publisherName <publisherName>'
+    }, {
+        option: '--publisherPrefix <publisherPrefix>'
+    });
+}, _PaSolutionInitCommand_initValidators = function _PaSolutionInitCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        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)) {
+            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)) {
+            return `Value of 'publisherPrefix' is invalid. The prefix must be 2 to 8 characters long, can only consist of alpha-numerics, must start with a letter, and cannot start with 'mscrm'.`;
+        }
+        if (!/^([a-zA-Z_])\w*$/i.test(args.options.publisherName)) {
+            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();
 //# sourceMappingURL=solution-init.js.map

package/dist/m365/pa/commands/solution/solution-reference-add.js

@@ -1,4 +1,19 @@
 "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 _PaSolutionReferenceAddCommand_instances, _PaSolutionReferenceAddCommand_initOptions, _PaSolutionReferenceAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
@@ -12,37 +27,52 @@ const commands_1 = require("../../commands");
  * Class: bolt.module.solution.verbs.SolutionAddReferenceVerb
  */
 class PaSolutionReferenceAddCommand extends AnonymousCommand_1.default {
+    constructor() {
+        super();
+        _PaSolutionReferenceAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaSolutionReferenceAddCommand_instances, "m", _PaSolutionReferenceAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaSolutionReferenceAddCommand_instances, "m", _PaSolutionReferenceAddCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.SOLUTION_REFERENCE_ADD;
     }
     get description() {
         return 'Adds a project reference to the solution in the current directory';
     }
-    commandAction(logger, args, cb) {
-        try {
-            const referencedProjectFilePath = this.getSupportedProjectFiles(args.options.path)[0];
-            const relativeReferencedProjectFilePath = path.relative(process.cwd(), referencedProjectFilePath);
-            const cdsProjectFilePath = this.getCdsProjectFile(process.cwd())[0];
-            const cdsProjectFileContent = fs.readFileSync(cdsProjectFilePath, 'utf8');
-            const cdsProjectMutator = new cds_project_mutator_1.default(cdsProjectFileContent);
-            cdsProjectMutator.addProjectReference(relativeReferencedProjectFilePath);
-            fs.writeFileSync(cdsProjectFilePath, cdsProjectMutator.cdsProjectDocument);
-            cb();
-        }
-        catch (err) {
-            cb(new Command_1.CommandError(err));
-        }
-    }
-    options() {
-        const options = [
-            {
-                option: '-p, --path <path>'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const referencedProjectFilePath = this.getSupportedProjectFiles(args.options.projectPath)[0];
+                const relativeReferencedProjectFilePath = path.relative(process.cwd(), referencedProjectFilePath);
+                const cdsProjectFilePath = this.getCdsProjectFile(process.cwd())[0];
+                const cdsProjectFileContent = fs.readFileSync(cdsProjectFilePath, 'utf8');
+                const cdsProjectMutator = new cds_project_mutator_1.default(cdsProjectFileContent);
+                cdsProjectMutator.addProjectReference(relativeReferencedProjectFilePath);
+                fs.writeFileSync(cdsProjectFilePath, cdsProjectMutator.cdsProjectDocument);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+            catch (err) {
+                throw new Command_1.CommandError(err);
+            }
+        });
+    }
+    getCdsProjectFile(rootPath) {
+        return fs.readdirSync(rootPath)
+            .filter(fn => path.extname(fn).toLowerCase() === '.cdsproj')
+            .map(entry => path.join(rootPath, entry));
+    }
+    getSupportedProjectFiles(rootPath) {
+        return fs.readdirSync(rootPath).filter(fn => {
+            const ext = path.extname(fn).toLowerCase();
+            return ext === '.pcfproj' || ext === '.csproj';
+        }).map(entry => path.join(rootPath, entry));
     }
-    validate(args) {
+}
+_PaSolutionReferenceAddCommand_instances = new WeakSet(), _PaSolutionReferenceAddCommand_initOptions = function _PaSolutionReferenceAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-p, --projectPath <projectPath>'
+    });
+}, _PaSolutionReferenceAddCommand_initValidators = function _PaSolutionReferenceAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const existingCdsProjects = this.getCdsProjectFile(process.cwd());
         if (existingCdsProjects.length === 0) {
             return 'CDS solution project file with extension cdsproj was not found in the current directory.';
@@ -50,18 +80,15 @@ class PaSolutionReferenceAddCommand extends AnonymousCommand_1.default {
         if (existingCdsProjects.length > 1) {
             return 'Multiple CDS solution project files with extension cdsproj were found in the current directory.';
         }
-        if (!args.options.path) {
-            return 'Missing required option path.';
-        }
-        if (!fs.existsSync(args.options.path)) {
-            return `Path ${args.options.path} is not a valid path.`;
+        if (!fs.existsSync(args.options.projectPath)) {
+            return `Path ${args.options.projectPath} is not a valid path.`;
         }
-        const existingSupportedProjects = this.getSupportedProjectFiles(args.options.path);
+        const existingSupportedProjects = this.getSupportedProjectFiles(args.options.projectPath);
         if (existingSupportedProjects.length === 0) {
-            return `No supported project type found in path ${args.options.path}.`;
+            return `No supported project type found in path ${args.options.projectPath}.`;
         }
         if (existingSupportedProjects.length !== 1) {
-            return `More than one supported project type found in path ${args.options.path}.`;
+            return `More than one supported project type found in path ${args.options.projectPath}.`;
         }
         const cdsProjectName = path.parse(path.basename(existingCdsProjects[0])).name;
         const pcfProjectName = path.parse(path.basename(existingSupportedProjects[0])).name;
@@ -69,18 +96,7 @@ class PaSolutionReferenceAddCommand extends AnonymousCommand_1.default {
             return `Not able to add reference to a project with same name as CDS project with name: ${pcfProjectName}.`;
         }
         return true;
-    }
-    getCdsProjectFile(rootPath) {
-        return fs.readdirSync(rootPath)
-            .filter(fn => path.extname(fn).toLowerCase() === '.cdsproj')
-            .map(entry => path.join(rootPath, entry));
-    }
-    getSupportedProjectFiles(rootPath) {
-        return fs.readdirSync(rootPath).filter(fn => {
-            const ext = path.extname(fn).toLowerCase();
-            return ext === '.pcfproj' || ext === '.csproj';
-        }).map(entry => path.join(rootPath, entry));
-    }
-}
+    }));
+};
 module.exports = new PaSolutionReferenceAddCommand();
 //# sourceMappingURL=solution-reference-add.js.map

package/dist/m365/planner/commands/bucket/bucket-add.js

@@ -1,62 +1,73 @@
 "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 _PlannerBucketAddCommand_instances, _PlannerBucketAddCommand_initTelemetry, _PlannerBucketAddCommand_initOptions, _PlannerBucketAddCommand_initValidators, _PlannerBucketAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PlannerBucketAddCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _PlannerBucketAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketAddCommand_instances, "m", _PlannerBucketAddCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.BUCKET_ADD;
     }
     get description() {
         return 'Adds a new Microsoft Planner bucket';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.planId = typeof args.options.planId !== 'undefined';
-        telemetryProps.planName = typeof args.options.planName !== 'undefined';
-        telemetryProps.planTitle = typeof args.options.planTitle !== 'undefined';
-        telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
-        telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
-        telemetryProps.orderHint = typeof args.options.orderHint !== 'undefined';
-        return telemetryProps;
-    }
     defaultProperties() {
         return ['id', 'name', 'planId', 'orderHint'];
     }
-    commandAction(logger, args, cb) {
-        if (args.options.planName) {
-            args.options.planTitle = args.options.planName;
-            this.warn(logger, `Option 'planName' is deprecated. Please use 'planTitle' instead`);
-        }
-        if (utils_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
-            this.handleError('This command does not support application permissions.', logger, cb);
-            return;
-        }
-        this
-            .getPlanId(args)
-            .then((planId) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/planner/buckets`,
-                headers: {
-                    'accept': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json',
-                data: {
-                    name: args.options.name,
-                    planId: planId,
-                    orderHint: args.options.orderHint
-                }
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+                this.handleError('This command does not support application permissions.');
+                return;
+            }
+            try {
+                const planId = yield this.getPlanId(args);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/planner/buckets`,
+                    headers: {
+                        'accept': 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: {
+                        name: args.options.name,
+                        planId: planId,
+                        orderHint: args.options.orderHint
+                    }
+                };
+                const response = yield request_1.default.post(requestOptions);
+                logger.log(response);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getPlanId(args) {
         if (args.options.planId) {
@@ -75,51 +86,46 @@ class PlannerBucketAddCommand extends GraphCommand_1.default {
             .getGroupByDisplayName(args.options.ownerGroupName)
             .then(group => group.id);
     }
-    options() {
-        const options = [
-            {
-                option: '-n, --name <name>'
-            },
-            {
-                option: "--planId [planId]"
-            },
-            {
-                option: "--planName [planName]"
-            },
-            {
-                option: "--planTitle [planTitle]"
-            },
-            {
-                option: "--ownerGroupId [ownerGroupId]"
-            },
-            {
-                option: "--ownerGroupName [ownerGroupName]"
-            },
-            {
-                option: "--orderHint [orderHint]"
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!args.options.planId && !args.options.planName && !args.options.planTitle) {
-            return 'Specify either planId or planTitle';
-        }
-        if (args.options.planId && (args.options.planName || args.options.planTitle)) {
-            return 'Specify either planId or planTitle but not both';
-        }
-        if ((args.options.planName || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+}
+_PlannerBucketAddCommand_instances = new WeakSet(), _PlannerBucketAddCommand_initTelemetry = function _PlannerBucketAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            planId: typeof args.options.planId !== 'undefined',
+            planTitle: typeof args.options.planTitle !== 'undefined',
+            ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
+            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
+            orderHint: typeof args.options.orderHint !== 'undefined'
+        });
+    });
+}, _PlannerBucketAddCommand_initOptions = function _PlannerBucketAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name <name>'
+    }, {
+        option: "--planId [planId]"
+    }, {
+        option: "--planTitle [planTitle]"
+    }, {
+        option: "--ownerGroupId [ownerGroupId]"
+    }, {
+        option: "--ownerGroupName [ownerGroupName]"
+    }, {
+        option: "--orderHint [orderHint]"
+    });
+}, _PlannerBucketAddCommand_initValidators = function _PlannerBucketAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.planTitle && !args.options.ownerGroupId && !args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
         }
-        if ((args.options.planName || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
+        if (args.options.planTitle && args.options.ownerGroupId && args.options.ownerGroupName) {
             return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
         }
-        if (args.options.ownerGroupId && !utils_1.validation.isValidGuid(args.options.ownerGroupId)) {
+        if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+}, _PlannerBucketAddCommand_initOptionSets = function _PlannerBucketAddCommand_initOptionSets() {
+    this.optionSets.push(['planId', 'planTitle']);
+};
 module.exports = new PlannerBucketAddCommand();
 //# sourceMappingURL=bucket-add.js.map