@pnp/cli-microsoft365 5.6.0 → 5.7.0-beta.8be35f8

package/dist/m365/search/commands/externalconnection/externalconnection-get.js

@@ -1,21 +1,28 @@
 "use strict";
+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 _SearchExternalConnectionGetCommand_instances, _SearchExternalConnectionGetCommand_initTelemetry, _SearchExternalConnectionGetCommand_initOptions, _SearchExternalConnectionGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class SearchExternalConnectionGetCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _SearchExternalConnectionGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SearchExternalConnectionGetCommand_instances, "m", _SearchExternalConnectionGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SearchExternalConnectionGetCommand_instances, "m", _SearchExternalConnectionGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SearchExternalConnectionGetCommand_instances, "m", _SearchExternalConnectionGetCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.EXTERNALCONNECTION_GET;
     }
     get description() {
         return 'Get a specific external connection for use in Microsoft Search';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.name = typeof args.options.name !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let url = `${this.resource}/v1.0/external/connections`;
         if (args.options.id) {
@@ -47,23 +54,22 @@ class SearchExternalConnectionGetCommand extends GraphCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    optionSets() {
-        return [
-            ['id', 'name']
-        ];
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-n, --name [name]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
 }
+_SearchExternalConnectionGetCommand_instances = new WeakSet(), _SearchExternalConnectionGetCommand_initTelemetry = function _SearchExternalConnectionGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined'
+        });
+    });
+}, _SearchExternalConnectionGetCommand_initOptions = function _SearchExternalConnectionGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --name [name]'
+    });
+}, _SearchExternalConnectionGetCommand_initOptionSets = function _SearchExternalConnectionGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+};
 module.exports = new SearchExternalConnectionGetCommand();
 //# sourceMappingURL=externalconnection-get.js.map

package/dist/m365/spfx/commands/package/package-generate.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 _SpfxPackageGenerateCommand_instances, _SpfxPackageGenerateCommand_initTelemetry, _SpfxPackageGenerateCommand_initOptions, _SpfxPackageGenerateCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const AdmZip = require("adm-zip");
 const fs = require("fs");
@@ -9,25 +24,19 @@ const utils_1 = require("../../../../utils");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 class SpfxPackageGenerateCommand extends AnonymousCommand_1.default {
+    constructor() {
+        super();
+        _SpfxPackageGenerateCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpfxPackageGenerateCommand_instances, "m", _SpfxPackageGenerateCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpfxPackageGenerateCommand_instances, "m", _SpfxPackageGenerateCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpfxPackageGenerateCommand_instances, "m", _SpfxPackageGenerateCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.PACKAGE_GENERATE;
     }
     get description() {
         return 'Generates SharePoint Framework solution package with a no-framework web part rendering the specified HTML snippet';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.allowTenantWideDeployment = args.options.allowTenantWideDeployment === true;
-        telemetryProps.developerMpnId = typeof args.options.developerMpnId !== 'undefined';
-        telemetryProps.developerName = typeof args.options.developerName !== 'undefined';
-        telemetryProps.developerPrivacyUrl = typeof args.options.developerPrivacyUrl !== 'undefined';
-        telemetryProps.developerTermsOfUseUrl = typeof args.options.developerTermsOfUseUrl !== 'undefined';
-        telemetryProps.developerWebsiteUrl = typeof args.options.developerWebsiteUrl !== 'undefined';
-        telemetryProps.enableForTeams = args.options.enableForTeams;
-        telemetryProps.exposePageContextGlobally = args.options.exposePageContextGlobally === true;
-        telemetryProps.exposeTeamsContextGlobally = args.options.exposeTeamsContextGlobally === true;
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const supportedHosts = ['SharePointWebPart'];
         if (args.options.enableForTeams === 'tab' || args.options.enableForTeams === 'all') {
@@ -164,36 +173,35 @@ class SpfxPackageGenerateCommand extends AnonymousCommand_1.default {
     static getWebPartAlias(webPartName) {
         return 'AutoWP' + webPartName.replace(/[^a-zA-Z0-9]/g, '').substr(0, 40);
     }
-    options() {
-        const options = [
-            { option: '-t, --webPartTitle <webPartTitle>' },
-            { option: '-d, --webPartDescription <webPartDescription>' },
-            { option: '-n, --packageName <packageName>' },
-            { option: '--html <html>' },
-            {
-                option: '--enableForTeams [enableForTeams]',
-                autocomplete: SpfxPackageGenerateCommand.enableForTeamsOptions
-            },
-            { option: '--exposePageContextGlobally' },
-            { option: '--exposeTeamsContextGlobally' },
-            { option: '--allowTenantWideDeployment' },
-            { option: '--developerName [developerName]' },
-            { option: '--developerPrivacyUrl [developerPrivacyUrl]' },
-            { option: '--developerTermsOfUseUrl [developerTermsOfUseUrl]' },
-            { option: '--developerWebsiteUrl [developerWebsiteUrl]' },
-            { option: '--developerMpnId [developerMpnId]' }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpfxPackageGenerateCommand_instances = new WeakSet(), _SpfxPackageGenerateCommand_initTelemetry = function _SpfxPackageGenerateCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            allowTenantWideDeployment: args.options.allowTenantWideDeployment === true,
+            developerMpnId: typeof args.options.developerMpnId !== 'undefined',
+            developerName: typeof args.options.developerName !== 'undefined',
+            developerPrivacyUrl: typeof args.options.developerPrivacyUrl !== 'undefined',
+            developerTermsOfUseUrl: typeof args.options.developerTermsOfUseUrl !== 'undefined',
+            developerWebsiteUrl: typeof args.options.developerWebsiteUrl !== 'undefined',
+            enableForTeams: args.options.enableForTeams,
+            exposePageContextGlobally: args.options.exposePageContextGlobally === true,
+            exposeTeamsContextGlobally: args.options.exposeTeamsContextGlobally === true
+        });
+    });
+}, _SpfxPackageGenerateCommand_initOptions = function _SpfxPackageGenerateCommand_initOptions() {
+    this.options.unshift({ option: '-t, --webPartTitle <webPartTitle>' }, { option: '-d, --webPartDescription <webPartDescription>' }, { option: '-n, --packageName <packageName>' }, { option: '--html <html>' }, {
+        option: '--enableForTeams [enableForTeams]',
+        autocomplete: SpfxPackageGenerateCommand.enableForTeamsOptions
+    }, { option: '--exposePageContextGlobally' }, { option: '--exposeTeamsContextGlobally' }, { option: '--allowTenantWideDeployment' }, { option: '--developerName [developerName]' }, { option: '--developerPrivacyUrl [developerPrivacyUrl]' }, { option: '--developerTermsOfUseUrl [developerTermsOfUseUrl]' }, { option: '--developerWebsiteUrl [developerWebsiteUrl]' }, { option: '--developerMpnId [developerMpnId]' });
+}, _SpfxPackageGenerateCommand_initValidators = function _SpfxPackageGenerateCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.enableForTeams &&
             SpfxPackageGenerateCommand.enableForTeamsOptions.indexOf(args.options.enableForTeams) < 0) {
             return `${args.options.enableForTeams} is not a valid value for enableForTeams. Allowed values are: ${SpfxPackageGenerateCommand.enableForTeamsOptions.join(', ')}`;
         }
         return true;
-    }
-}
+    }));
+};
 SpfxPackageGenerateCommand.enableForTeamsOptions = ['tab', 'personalApp', 'all'];
 SpfxPackageGenerateCommand.generateNewId = () => {
     return (0, uuid_1.v4)();

package/dist/m365/spfx/commands/project/project-doctor.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 _SpfxProjectDoctorCommand_instances, _SpfxProjectDoctorCommand_initTelemetry, _SpfxProjectDoctorCommand_initOptions, _SpfxProjectDoctorCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const os = require("os");
@@ -12,6 +27,7 @@ const FN017001_MISC_npm_dedupe_1 = require("./project-upgrade/rules/FN017001_MIS
 class SpfxProjectDoctorCommand extends base_project_command_1.BaseProjectCommand {
     constructor() {
         super();
+        _SpfxProjectDoctorCommand_instances.add(this);
         this.allFindings = [];
         this.packageManager = 'npm';
         this.supportedVersions = [
@@ -47,6 +63,9 @@ class SpfxProjectDoctorCommand extends base_project_command_1.BaseProjectCommand
             '1.15.0',
             '1.15.2'
         ];
+        __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initValidators).call(this);
     }
     get name() {
         return commands_1.default.PROJECT_DOCTOR;
@@ -54,11 +73,6 @@ class SpfxProjectDoctorCommand extends base_project_command_1.BaseProjectCommand
     get description() {
         return 'Validates correctness of a SharePoint Framework project';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.packageManager = args.options.packageManager || 'npm';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         this.projectRootPath = this.getProjectRoot(process.cwd());
         if (this.projectRootPath === null) {
@@ -311,30 +325,33 @@ ${f.resolution}
             modificationTypePerFile: modificationTypePerFile
         };
     }
-    options() {
-        const options = [
-            {
-                option: '--packageManager [packageManager]',
-                autocomplete: SpfxProjectDoctorCommand.packageManagers
-            }
-        ];
-        const parentOptions = super.options();
-        parentOptions.forEach(o => {
-            if (o.option.indexOf('--output') > -1) {
-                o.autocomplete = ['json', 'text', 'md', 'tour'];
-            }
+}
+_SpfxProjectDoctorCommand_instances = new WeakSet(), _SpfxProjectDoctorCommand_initTelemetry = function _SpfxProjectDoctorCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            packageManager: args.options.packageManager || 'npm'
         });
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+    });
+}, _SpfxProjectDoctorCommand_initOptions = function _SpfxProjectDoctorCommand_initOptions() {
+    this.options.forEach(o => {
+        if (o.option.indexOf('--output') > -1) {
+            o.autocomplete = ['json', 'text', 'md', 'tour'];
+        }
+    });
+    this.options.unshift({
+        option: '--packageManager [packageManager]',
+        autocomplete: SpfxProjectDoctorCommand.packageManagers
+    });
+}, _SpfxProjectDoctorCommand_initValidators = function _SpfxProjectDoctorCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.packageManager) {
             if (SpfxProjectDoctorCommand.packageManagers.indexOf(args.options.packageManager) < 0) {
                 return `${args.options.packageManager} is not a supported package manager. Supported package managers are ${SpfxProjectDoctorCommand.packageManagers.join(', ')}`;
             }
         }
         return true;
-    }
-}
+    }));
+};
 SpfxProjectDoctorCommand.packageManagers = ['npm', 'pnpm', 'yarn'];
 SpfxProjectDoctorCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;
 SpfxProjectDoctorCommand.ERROR_NO_VERSION = 3;

package/dist/m365/spfx/commands/project/project-externalize.js

@@ -1,4 +1,10 @@
 "use strict";
+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 _SpfxProjectExternalizeCommand_instances, _SpfxProjectExternalizeCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const path = require("path");
@@ -9,6 +15,7 @@ const rules = require("./project-externalize/DefaultRules");
 class SpfxProjectExternalizeCommand extends base_project_command_1.BaseProjectCommand {
     constructor() {
         super();
+        _SpfxProjectExternalizeCommand_instances.add(this);
         this.supportedVersions = [
             '1.0.0',
             '1.0.1',
@@ -35,6 +42,7 @@ class SpfxProjectExternalizeCommand extends base_project_command_1.BaseProjectCo
         ];
         this.allFindings = [];
         this.allEditSuggestions = [];
+        __classPrivateFieldGet(this, _SpfxProjectExternalizeCommand_instances, "m", _SpfxProjectExternalizeCommand_initOptions).call(this);
     }
     get name() {
         return commands_1.default.PROJECT_EXTERNALIZE;
@@ -166,16 +174,14 @@ class SpfxProjectExternalizeCommand extends base_project_command_1.BaseProjectCo
         ];
         return s.join('').trim();
     }
-    options() {
-        const parentOptions = super.options();
-        parentOptions.forEach(o => {
-            if (o.option.indexOf('--output') > -1) {
-                o.autocomplete = ['json', 'text', 'md'];
-            }
-        });
-        return parentOptions;
-    }
 }
+_SpfxProjectExternalizeCommand_instances = new WeakSet(), _SpfxProjectExternalizeCommand_initOptions = function _SpfxProjectExternalizeCommand_initOptions() {
+    this.options.forEach(o => {
+        if (o.option.indexOf('--output') > -1) {
+            o.autocomplete = ['json', 'text', 'md'];
+        }
+    });
+};
 SpfxProjectExternalizeCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;
 SpfxProjectExternalizeCommand.ERROR_NO_VERSION = 3;
 SpfxProjectExternalizeCommand.ERROR_UNSUPPORTED_VERSION = 2;

package/dist/m365/spfx/commands/project/project-rename.js

@@ -1,4 +1,10 @@
 "use strict";
+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 _SpfxProjectRenameCommand_instances, _SpfxProjectRenameCommand_initTelemetry, _SpfxProjectRenameCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
@@ -8,7 +14,8 @@ const commands_1 = require("../../commands");
 const base_project_command_1 = require("./base-project-command");
 class SpfxProjectRenameCommand extends base_project_command_1.BaseProjectCommand {
     constructor() {
-        super(...arguments);
+        super();
+        _SpfxProjectRenameCommand_instances.add(this);
         this.generateNewId = () => {
             return (0, uuid_1.v4)();
         };
@@ -121,6 +128,8 @@ class SpfxProjectRenameCommand extends base_project_command_1.BaseProjectCommand
                 }
             }
         };
+        __classPrivateFieldGet(this, _SpfxProjectRenameCommand_instances, "m", _SpfxProjectRenameCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpfxProjectRenameCommand_instances, "m", _SpfxProjectRenameCommand_initOptions).call(this);
     }
     get name() {
         return commands_1.default.PROJECT_RENAME;
@@ -128,23 +137,6 @@ class SpfxProjectRenameCommand extends base_project_command_1.BaseProjectCommand
     get description() {
         return 'Renames SharePoint Framework project';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.generateNewId = args.options.generateNewId;
-        return telemetryProps;
-    }
-    options() {
-        const options = [
-            {
-                option: '-n, --newName <newName>'
-            },
-            {
-                option: '--generateNewId'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
     commandAction(logger, args, cb) {
         this.projectRootPath = this.getProjectRoot(process.cwd());
         if (this.projectRootPath === null) {
@@ -178,6 +170,19 @@ class SpfxProjectRenameCommand extends base_project_command_1.BaseProjectCommand
         cb();
     }
 }
+_SpfxProjectRenameCommand_instances = new WeakSet(), _SpfxProjectRenameCommand_initTelemetry = function _SpfxProjectRenameCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            generateNewId: args.options.generateNewId
+        });
+    });
+}, _SpfxProjectRenameCommand_initOptions = function _SpfxProjectRenameCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --newName <newName>'
+    }, {
+        option: '--generateNewId'
+    });
+};
 SpfxProjectRenameCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;
 module.exports = new SpfxProjectRenameCommand();
 //# sourceMappingURL=project-rename.js.map

package/dist/m365/spfx/commands/project/project-upgrade.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 _SpfxProjectUpgradeCommand_instances, _SpfxProjectUpgradeCommand_initTelemetry, _SpfxProjectUpgradeCommand_initOptions, _SpfxProjectUpgradeCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const os = require("os");
@@ -11,6 +26,7 @@ const FN017001_MISC_npm_dedupe_1 = require("./project-upgrade/rules/FN017001_MIS
 class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectCommand {
     constructor() {
         super();
+        _SpfxProjectUpgradeCommand_instances.add(this);
         this.toVersion = '';
         this.packageManager = 'npm';
         this.shell = 'bash';
@@ -48,6 +64,9 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.15.0',
             '1.15.2'
         ];
+        __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initValidators).call(this);
     }
     get name() {
         return commands_1.default.PROJECT_UPGRADE;
@@ -55,18 +74,6 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
     get description() {
         return 'Upgrades SharePoint Framework project to the specified version';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.toVersion = args.options.toVersion || this.supportedVersions[this.supportedVersions.length - 1];
-        // uncomment to support upgrading to preview releases
-        // if (prerelease(telemetryProps.toVersion) && !args.options.preview) {
-        //   telemetryProps.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        // }
-        telemetryProps.packageManager = args.options.packageManager || 'npm';
-        telemetryProps.shell = args.options.shell || 'bash';
-        telemetryProps.preview = args.options.preview;
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         this.projectRootPath = this.getProjectRoot(process.cwd());
         if (this.projectRootPath === null) {
@@ -461,32 +468,39 @@ ${f.resolution}
             modificationTypePerFile: modificationTypePerFile
         };
     }
-    options() {
-        const options = [
-            {
-                option: '-v, --toVersion [toVersion]'
-            },
-            {
-                option: '--packageManager [packageManager]',
-                autocomplete: SpfxProjectUpgradeCommand.packageManagers
-            },
-            {
-                option: '--shell [shell]',
-                autocomplete: SpfxProjectUpgradeCommand.shells
-            },
-            {
-                option: '--preview'
-            }
-        ];
-        const parentOptions = super.options();
-        parentOptions.forEach(o => {
-            if (o.option.indexOf('--output') > -1) {
-                o.autocomplete = ['json', 'text', 'md', 'tour'];
-            }
+}
+_SpfxProjectUpgradeCommand_instances = new WeakSet(), _SpfxProjectUpgradeCommand_initTelemetry = function _SpfxProjectUpgradeCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            toVersion: args.options.toVersion || this.supportedVersions[this.supportedVersions.length - 1],
+            packageManager: args.options.packageManager || 'npm',
+            shell: args.options.shell || 'bash',
+            preview: args.options.preview
         });
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+        // uncomment to support upgrading to preview releases
+        // if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
+        //   this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        // }
+    });
+}, _SpfxProjectUpgradeCommand_initOptions = function _SpfxProjectUpgradeCommand_initOptions() {
+    this.options.unshift({
+        option: '-v, --toVersion [toVersion]'
+    }, {
+        option: '--packageManager [packageManager]',
+        autocomplete: SpfxProjectUpgradeCommand.packageManagers
+    }, {
+        option: '--shell [shell]',
+        autocomplete: SpfxProjectUpgradeCommand.shells
+    }, {
+        option: '--preview'
+    });
+    this.options.forEach(o => {
+        if (o.option.indexOf('--output') > -1) {
+            o.autocomplete = ['json', 'text', 'md', 'tour'];
+        }
+    });
+}, _SpfxProjectUpgradeCommand_initValidators = function _SpfxProjectUpgradeCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.packageManager) {
             if (SpfxProjectUpgradeCommand.packageManagers.indexOf(args.options.packageManager) < 0) {
                 return `${args.options.packageManager} is not a supported package manager. Supported package managers are ${SpfxProjectUpgradeCommand.packageManagers.join(', ')}`;
@@ -498,8 +512,8 @@ ${f.resolution}
             }
         }
         return true;
-    }
-}
+    }));
+};
 SpfxProjectUpgradeCommand.packageManagers = ['npm', 'pnpm', 'yarn'];
 SpfxProjectUpgradeCommand.shells = ['bash', 'powershell', 'cmd'];
 SpfxProjectUpgradeCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;

package/dist/m365/spfx/commands/spfx-doctor.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 _SpfxDoctorCommand_instances, _SpfxDoctorCommand_initTelemetry, _SpfxDoctorCommand_initOptions, _SpfxDoctorCommand_initValidators, _SpfxDoctorCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const child_process = require("child_process");
@@ -52,7 +67,8 @@ var SharePointVersion;
 })(SharePointVersion || (SharePointVersion = {}));
 class SpfxDoctorCommand extends AnonymousCommand_1.default {
     constructor() {
-        super(...arguments);
+        super();
+        _SpfxDoctorCommand_instances.add(this);
         this.versions = {
             '1.0.0': {
                 gulp: {
@@ -400,6 +416,10 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 }
             }
         };
+        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTypes).call(this);
     }
     get name() {
         return commands_1.default.DOCTOR;
@@ -650,22 +670,20 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
         const failure = primarySupported ? '✖' : '×';
         return `${result === CheckStatus.Success ? chalk.green(success) : chalk.red(failure)} ${message}`;
     }
-    options() {
-        const options = [
-            {
-                option: '-e, --env [env]',
-                autocomplete: ['sp2016', 'sp2019', 'spo']
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    types() {
-        return {
-            string: ['e', 'env']
-        };
-    }
-    validate(args) {
+}
+_SpfxDoctorCommand_instances = new WeakSet(), _SpfxDoctorCommand_initTelemetry = function _SpfxDoctorCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            env: args.options.env
+        });
+    });
+}, _SpfxDoctorCommand_initOptions = function _SpfxDoctorCommand_initOptions() {
+    this.options.unshift({
+        option: '-e, --env [env]',
+        autocomplete: ['sp2016', 'sp2019', 'spo']
+    });
+}, _SpfxDoctorCommand_initValidators = function _SpfxDoctorCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.env) {
             const sp = this.spVersionStringToEnum(args.options.env);
             if (!sp) {
@@ -676,7 +694,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
             return `The output option only accepts the type 'text'`;
         }
         return true;
-    }
-}
+    }));
+}, _SpfxDoctorCommand_initTypes = function _SpfxDoctorCommand_initTypes() {
+    this.types.string.push('e', 'env');
+};
 module.exports = new SpfxDoctorCommand();
 //# sourceMappingURL=spfx-doctor.js.map