@pnp/cli-microsoft365 5.7.0-beta.b3dfced → 6.0.0-beta.37b9374

package/dist/m365/pa/commands/solution/solution-init.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 _PaSolutionInitCommand_instances, _PaSolutionInitCommand_initOptions, _PaSolutionInitCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const fs = require("fs");
@@ -15,6 +30,12 @@ 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;
     }
@@ -71,44 +92,6 @@ class PaSolutionInitCommand extends AnonymousCommand_1.default {
             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'.`;
-            }
-        }
-        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 _.`;
-            }
-        }
-        else {
-            return 'Missing required option publisherName.';
-        }
-        return true;
-    }
     generateOptionValuePrefixForPublisher(customizationPrefix) {
         if (customizationPrefix.toLocaleLowerCase() !== "new") {
             return this.generateOptionValuePrefixForPublisherInternal(this.getHashCode(customizationPrefix));
@@ -126,5 +109,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 (!utils_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,6 +27,12 @@ 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;
     }
@@ -20,7 +41,7 @@ class PaSolutionReferenceAddCommand extends AnonymousCommand_1.default {
     }
     commandAction(logger, args, cb) {
         try {
-            const referencedProjectFilePath = this.getSupportedProjectFiles(args.options.path)[0];
+            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');
@@ -33,16 +54,24 @@ class PaSolutionReferenceAddCommand extends AnonymousCommand_1.default {
             cb(new Command_1.CommandError(err));
         }
     }
-    options() {
-        const options = [
-            {
-                option: '-p, --path <path>'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+    getCdsProjectFile(rootPath) {
+        return fs.readdirSync(rootPath)
+            .filter(fn => path.extname(fn).toLowerCase() === '.cdsproj')
+            .map(entry => path.join(rootPath, entry));
     }
-    validate(args) {
+    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));
+    }
+}
+_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 +79,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 +95,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,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 _PlannerBucketAddCommand_instances, _PlannerBucketAddCommand_initTelemetry, _PlannerBucketAddCommand_initOptions, _PlannerBucketAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
@@ -8,30 +23,23 @@ 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);
+    }
     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;
@@ -75,51 +83,50 @@ 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) {
+}
+_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.planId && !args.options.planTitle) {
             return 'Specify either planId or planTitle';
         }
-        if (args.options.planId && (args.options.planName || args.options.planTitle)) {
+        if (args.options.planId && 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) {
+        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)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new PlannerBucketAddCommand();
 //# sourceMappingURL=bucket-add.js.map

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

@@ -8,37 +8,35 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 _PlannerBucketGetCommand_instances, _PlannerBucketGetCommand_initTelemetry, _PlannerBucketGetCommand_initOptions, _PlannerBucketGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
+const planner_1 = require("../../../../utils/planner");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-const Auth_1 = require("../../../../Auth");
-const planner_1 = require("../../../../utils/planner");
-const aadGroup_1 = require("../../../../utils/aadGroup");
 class PlannerBucketGetCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _PlannerBucketGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerBucketGetCommand_instances, "m", _PlannerBucketGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketGetCommand_instances, "m", _PlannerBucketGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketGetCommand_instances, "m", _PlannerBucketGetCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.BUCKET_GET;
     }
     get description() {
         return 'Gets the Microsoft Planner bucket in a plan';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.name = typeof args.options.name !== 'undefined';
-        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';
-        return telemetryProps;
-    }
     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;
@@ -110,36 +108,36 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
             .getGroupByDisplayName(ownerGroupName)
             .then(group => group.id);
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-n, --name [name]'
-            },
-            {
-                option: '--planId [planId]'
-            },
-            {
-                option: '--planName [planName]'
-            },
-            {
-                option: "--planTitle [planTitle]"
-            },
-            {
-                option: '--ownerGroupId [ownerGroupId]'
-            },
-            {
-                option: '--ownerGroupName [ownerGroupName]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_PlannerBucketGetCommand_instances = new WeakSet(), _PlannerBucketGetCommand_initTelemetry = function _PlannerBucketGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            planId: typeof args.options.planId !== 'undefined',
+            planTitle: typeof args.options.planTitle !== 'undefined',
+            ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
+            ownerGroupName: typeof args.options.ownerGroupName !== 'undefined'
+        });
+    });
+}, _PlannerBucketGetCommand_initOptions = function _PlannerBucketGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '--planId [planId]'
+    }, {
+        option: "--planTitle [planTitle]"
+    }, {
+        option: '--ownerGroupId [ownerGroupId]'
+    }, {
+        option: '--ownerGroupName [ownerGroupName]'
+    });
+}, _PlannerBucketGetCommand_initValidators = function _PlannerBucketGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id) {
-            if (args.options.planId || args.options.planName || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
+            if (args.options.planId || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
                 return 'Don\'t specify planId, planTitle, ownerGroupId or ownerGroupName when using id';
             }
             if (args.options.name) {
@@ -147,13 +145,13 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
             }
         }
         if (args.options.name) {
-            if (!args.options.planId && !args.options.planName && !args.options.planTitle) {
+            if (!args.options.planId && !args.options.planTitle) {
                 return 'Specify either planId or planTitle when using name';
             }
-            if (args.options.planId && (args.options.planName || args.options.planTitle)) {
+            if (args.options.planId && args.options.planTitle) {
                 return 'Specify either planId or planTitle when using name but not both';
             }
-            if (args.options.planName || args.options.planTitle) {
+            if (args.options.planTitle) {
                 if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
                     return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
                 }
@@ -174,7 +172,7 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
             return 'Please specify id or name';
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new PlannerBucketGetCommand();
 //# sourceMappingURL=bucket-get.js.map

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

@@ -1,35 +1,44 @@
 "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 _PlannerBucketListCommand_instances, _PlannerBucketListCommand_initTelemetry, _PlannerBucketListCommand_initOptions, _PlannerBucketListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
 const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const planner_1 = require("../../../../utils/planner");
-const Auth_1 = require("../../../../Auth");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-const aadGroup_1 = require("../../../../utils/aadGroup");
 class PlannerBucketListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _PlannerBucketListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PlannerBucketListCommand_instances, "m", _PlannerBucketListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketListCommand_instances, "m", _PlannerBucketListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PlannerBucketListCommand_instances, "m", _PlannerBucketListCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.BUCKET_LIST;
     }
     get description() {
         return 'Lists the Microsoft Planner buckets in a plan';
     }
-    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';
-        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;
@@ -59,45 +68,45 @@ class PlannerBucketListCommand extends GraphCommand_1.default {
             .getGroupByDisplayName(args.options.ownerGroupName)
             .then(group => group.id);
     }
-    options() {
-        const options = [
-            {
-                option: '--planId [planId]'
-            },
-            {
-                option: '--planName [planName]'
-            },
-            {
-                option: "--planTitle [planTitle]"
-            },
-            {
-                option: '--ownerGroupId [ownerGroupId]'
-            },
-            {
-                option: '--ownerGroupName [ownerGroupName]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!args.options.planId && !args.options.planName && !args.options.planTitle) {
+}
+_PlannerBucketListCommand_instances = new WeakSet(), _PlannerBucketListCommand_initTelemetry = function _PlannerBucketListCommand_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'
+        });
+    });
+}, _PlannerBucketListCommand_initOptions = function _PlannerBucketListCommand_initOptions() {
+    this.options.unshift({
+        option: '--planId [planId]'
+    }, {
+        option: "--planTitle [planTitle]"
+    }, {
+        option: '--ownerGroupId [ownerGroupId]'
+    }, {
+        option: '--ownerGroupName [ownerGroupName]'
+    });
+}, _PlannerBucketListCommand_initValidators = function _PlannerBucketListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!args.options.planId && !args.options.planTitle) {
             return 'Specify either planId or planTitle';
         }
-        if (args.options.planId && (args.options.planName || args.options.planTitle)) {
+        if (args.options.planId && 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) {
+        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)) {
             return `${args.options.ownerGroupId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new PlannerBucketListCommand();
 //# sourceMappingURL=bucket-list.js.map