@pnp/cli-microsoft365 12.1.0-beta.79db3d9 → 12.1.0-beta.81e442d

package/dist/m365/entra/commands/app/app-set.js

@@ -1,15 +1,27 @@
-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 _EntraAppSetCommand_instances, _a, _EntraAppSetCommand_initTelemetry, _EntraAppSetCommand_initOptions, _EntraAppSetCommand_initValidators, _EntraAppSetCommand_initOptionSets, _EntraAppSetCommand_initTypes;
 import fs from 'fs';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
+import { entraApp } from '../../../../utils/entraApp.js';
+import { optionsUtils } from '../../../../utils/optionsUtils.js';
+import { zod } from '../../../../utils/zod.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { optionsUtils } from '../../../../utils/optionsUtils.js';
-import { entraApp } from '../../../../utils/entraApp.js';
+const aadApplicationPlatform = ['spa', 'web', 'publicClient'];
+export const options = z.looseObject({
+    ...globalOptionsZod.shape,
+    appId: z.guid().optional(),
+    objectId: z.guid().optional(),
+    name: z.string().optional().alias('n'),
+    uris: z.string().optional().alias('u'),
+    redirectUris: z.string().optional().alias('r'),
+    certificateFile: z.string().optional(),
+    certificateBase64Encoded: z.string().optional(),
+    certificateDisplayName: z.string().optional(),
+    platform: z.enum(aadApplicationPlatform).optional(),
+    redirectUrisToRemove: z.string().optional(),
+    allowPublicClientFlows: z.boolean().optional()
+});
 class EntraAppSetCommand extends GraphCommand {
     get name() {
         return commands.APP_SET;
@@ -20,14 +32,30 @@ class EntraAppSetCommand extends GraphCommand {
     allowUnknownOptions() {
         return true;
     }
-    constructor() {
-        super();
-        _EntraAppSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraAppSetCommand_instances, "m", _EntraAppSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraAppSetCommand_instances, "m", _EntraAppSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraAppSetCommand_instances, "m", _EntraAppSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraAppSetCommand_instances, "m", _EntraAppSetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraAppSetCommand_instances, "m", _EntraAppSetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.appId, options.objectId, options.name].filter(o => o !== undefined).length === 1, {
+            error: 'Specify either appId, objectId, or name',
+            params: {
+                customCode: 'optionSet',
+                options: ['appId', 'objectId', 'name']
+            }
+        })
+            .refine(options => !options.redirectUris || !!options.platform, {
+            error: 'When you specify redirectUris you also need to specify platform'
+        })
+            .refine(options => !(options.certificateFile && options.certificateBase64Encoded), {
+            error: 'Specify either certificateFile or certificateBase64Encoded but not both'
+        })
+            .refine(options => !options.certificateDisplayName || !!options.certificateFile || !!options.certificateBase64Encoded, {
+            error: 'When you specify certificateDisplayName you also need to specify certificateFile or certificateBase64Encoded'
+        })
+            .refine(options => !options.certificateFile || fs.existsSync(options.certificateFile), {
+            error: 'Certificate file not found'
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -55,12 +83,12 @@ class EntraAppSetCommand extends GraphCommand {
             return app.id;
         }
         else {
-            const app = await entraApp.getAppRegistrationByAppName(name, ["id"]);
+            const app = await entraApp.getAppRegistrationByAppName(name, ['id']);
             return app.id;
         }
     }
     async updateUnknownOptions(args, objectId) {
-        const unknownOptions = optionsUtils.getUnknownOptions(args.options, this.options);
+        const unknownOptions = optionsUtils.getUnknownOptions(args.options, zod.schemaToOptions(this.schema));
         if (Object.keys(unknownOptions).length > 0) {
             const requestBody = {};
             optionsUtils.addUnknownOptionsToPayload(requestBody, unknownOptions);
@@ -263,56 +291,5 @@ class EntraAppSetCommand extends GraphCommand {
         return request.patch(requestOptions);
     }
 }
-_a = EntraAppSetCommand, _EntraAppSetCommand_instances = new WeakSet(), _EntraAppSetCommand_initTelemetry = function _EntraAppSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            appId: typeof args.options.appId !== 'undefined',
-            objectId: typeof args.options.objectId !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
-            platform: typeof args.options.platform !== 'undefined',
-            redirectUris: typeof args.options.redirectUris !== 'undefined',
-            redirectUrisToRemove: typeof args.options.redirectUrisToRemove !== 'undefined',
-            uris: typeof args.options.uris !== 'undefined',
-            certificateFile: typeof args.options.certificateFile !== 'undefined',
-            certificateBase64Encoded: typeof args.options.certificateBase64Encoded !== 'undefined',
-            certificateDisplayName: typeof args.options.certificateDisplayName !== 'undefined',
-            allowPublicClientFlows: typeof args.options.allowPublicClientFlows !== 'undefined'
-        });
-        this.trackUnknownOptions(this.telemetryProperties, args.options);
-    });
-}, _EntraAppSetCommand_initOptions = function _EntraAppSetCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '-n, --name [name]' }, { option: '-u, --uris [uris]' }, { option: '-r, --redirectUris [redirectUris]' }, { option: '--certificateFile [certificateFile]' }, { option: '--certificateBase64Encoded [certificateBase64Encoded]' }, { option: '--certificateDisplayName [certificateDisplayName]' }, {
-        option: '--platform [platform]',
-        autocomplete: _a.aadApplicationPlatform
-    }, { option: '--redirectUrisToRemove [redirectUrisToRemove]' }, {
-        option: '--allowPublicClientFlows [allowPublicClientFlows]',
-        autocomplete: ['true', 'false']
-    });
-}, _EntraAppSetCommand_initValidators = function _EntraAppSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.certificateFile && args.options.certificateBase64Encoded) {
-            return 'Specify either certificateFile or certificateBase64Encoded but not both';
-        }
-        if (args.options.certificateDisplayName && !args.options.certificateFile && !args.options.certificateBase64Encoded) {
-            return 'When you specify certificateDisplayName you also need to specify certificateFile or certificateBase64Encoded';
-        }
-        if (args.options.certificateFile && !fs.existsSync(args.options.certificateFile)) {
-            return 'Certificate file not found';
-        }
-        if (args.options.redirectUris && !args.options.platform) {
-            return `When you specify redirectUris you also need to specify platform`;
-        }
-        if (args.options.platform &&
-            _a.aadApplicationPlatform.indexOf(args.options.platform) < 0) {
-            return `${args.options.platform} is not a valid value for platform. Allowed values are ${_a.aadApplicationPlatform.join(', ')}`;
-        }
-        return true;
-    });
-}, _EntraAppSetCommand_initOptionSets = function _EntraAppSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'objectId', 'name'] });
-}, _EntraAppSetCommand_initTypes = function _EntraAppSetCommand_initTypes() {
-    this.types.boolean.push('allowPublicClientFlows');
-};
-EntraAppSetCommand.aadApplicationPlatform = ['spa', 'web', 'publicClient'];
 export default new EntraAppSetCommand();
 //# sourceMappingURL=app-set.js.map

package/dist/m365/spfx/commands/package/package-generate.js

@@ -1,19 +1,31 @@
-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, _a, _SpfxPackageGenerateCommand_initTelemetry, _SpfxPackageGenerateCommand_initOptions, _SpfxPackageGenerateCommand_initValidators;
 import AdmZip from 'adm-zip';
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
 import url from 'url';
 import { v4 } from 'uuid';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { fsUtil } from '../../../../utils/fsUtil.js';
 import AnonymousCommand from '../../../base/AnonymousCommand.js';
 import commands from '../../commands.js';
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webPartTitle: z.string().alias('t'),
+    webPartDescription: z.string().alias('d'),
+    name: z.string().alias('n'),
+    html: z.string(),
+    enableForTeams: z.enum(['tab', 'personalApp', 'all']).optional(),
+    exposePageContextGlobally: z.boolean().optional(),
+    exposeTeamsContextGlobally: z.boolean().optional(),
+    allowTenantWideDeployment: z.boolean().optional(),
+    developerName: z.string().optional(),
+    developerPrivacyUrl: z.string().optional(),
+    developerTermsOfUseUrl: z.string().optional(),
+    developerWebsiteUrl: z.string().optional(),
+    developerMpnId: z.string().optional()
+});
 class SpfxPackageGenerateCommand extends AnonymousCommand {
     get name() {
         return commands.PACKAGE_GENERATE;
@@ -21,12 +33,8 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
     get description() {
         return 'Generates SharePoint Framework solution package with a no-framework web part rendering the specified HTML snippet';
     }
-    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 schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const supportedHosts = ['SharePointWebPart'];
@@ -37,7 +45,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
             supportedHosts.push('TeamsPersonalApp');
         }
         const tokens = {
-            clientSideAssetsFeatureId: _a.generateNewId(),
+            clientSideAssetsFeatureId: SpfxPackageGenerateCommand.generateNewId(),
             developerName: args.options.developerName || 'Contoso',
             developerWebsiteUrl: args.options.developerWebsiteUrl || 'https://contoso.com/my-app',
             developerPrivacyUrl: args.options.developerPrivacyUrl || 'https://contoso.com/privacy',
@@ -46,18 +54,18 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
             exposePageContextGlobally: args.options.exposePageContextGlobally ? '!0' : '!1',
             exposeTeamsContextGlobally: args.options.exposeTeamsContextGlobally ? '!0' : '!1',
             html: args.options.html.replace(/"/g, '\\"').replace(/\r\n/g, ' ').replace(/\n/g, ' '),
-            packageName: _a.getSafePackageName(args.options.webPartTitle),
-            productId: _a.generateNewId(),
+            packageName: SpfxPackageGenerateCommand.getSafePackageName(args.options.webPartTitle),
+            productId: SpfxPackageGenerateCommand.generateNewId(),
             skipFeatureDeployment: (args.options.allowTenantWideDeployment === true).toString(),
             supportedHosts: JSON.stringify(supportedHosts).replace(/"/g, '"'),
-            webPartId: _a.generateNewId(),
+            webPartId: SpfxPackageGenerateCommand.generateNewId(),
             webPartFeatureName: `${args.options.webPartTitle} Feature`,
             webPartFeatureDescription: `A feature which activates the Client-Side WebPart named ${args.options.webPartTitle}`,
-            webPartAlias: _a.getWebPartAlias(args.options.webPartTitle),
+            webPartAlias: SpfxPackageGenerateCommand.getWebPartAlias(args.options.webPartTitle),
             webPartName: args.options.webPartTitle,
-            webPartSafeName: _a.getSafeWebPartName(args.options.webPartTitle),
+            webPartSafeName: SpfxPackageGenerateCommand.getSafeWebPartName(args.options.webPartTitle),
             webPartDescription: args.options.webPartDescription,
-            webPartModule: _a.getSafePackageName(args.options.webPartTitle)
+            webPartModule: SpfxPackageGenerateCommand.getSafePackageName(args.options.webPartTitle)
         };
         let tmpDir = undefined;
         let error;
@@ -73,7 +81,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
                 await logger.log('Copying files...');
             }
             const src = path.join(__dirname, 'package-generate', 'assets');
-            fsUtil.copyRecursiveSync(src, tmpDir, s => _a.replaceTokens(s, tokens));
+            fsUtil.copyRecursiveSync(src, tmpDir, s => SpfxPackageGenerateCommand.replaceTokens(s, tokens));
             const files = fsUtil.readdirR(tmpDir);
             if (this.verbose) {
                 await logger.log('Processing files...');
@@ -82,7 +90,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
                 if (this.debug) {
                     await logger.log(`Processing ${filePath}...`);
                 }
-                if (!_a.isBinaryFile(filePath)) {
+                if (!SpfxPackageGenerateCommand.isBinaryFile(filePath)) {
                     if (this.verbose) {
                         await logger.log('Replacing tokens...');
                     }
@@ -91,7 +99,7 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
                         await logger.log('Before:');
                         await logger.log(fileContents);
                     }
-                    fileContents = _a.replaceTokens(fileContents, tokens);
+                    fileContents = SpfxPackageGenerateCommand.replaceTokens(fileContents, tokens);
                     if (this.debug) {
                         await logger.log('After:');
                         await logger.log(fileContents);
@@ -172,35 +180,6 @@ class SpfxPackageGenerateCommand extends AnonymousCommand {
         return 'AutoWP' + webPartName.replace(/[^a-zA-Z0-9]/g, '').substring(0, 40);
     }
 }
-_a = SpfxPackageGenerateCommand, _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, --name <name>' }, { option: '--html <html>' }, {
-        option: '--enableForTeams [enableForTeams]',
-        autocomplete: _a.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(async (args) => {
-        if (args.options.enableForTeams &&
-            _a.enableForTeamsOptions.indexOf(args.options.enableForTeams) < 0) {
-            return `${args.options.enableForTeams} is not a valid value for enableForTeams. Allowed values are: ${_a.enableForTeamsOptions.join(', ')}`;
-        }
-        return true;
-    });
-};
-SpfxPackageGenerateCommand.enableForTeamsOptions = ['tab', 'personalApp', 'all'];
 SpfxPackageGenerateCommand.generateNewId = () => {
     return v4();
 };

package/dist/m365/spfx/commands/project/project-azuredevops-pipeline-add.js

@@ -1,13 +1,8 @@
-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 _SpfxProjectAzureDevOpsPipelineAddCommand_instances, _a, _SpfxProjectAzureDevOpsPipelineAddCommand_initTelemetry, _SpfxProjectAzureDevOpsPipelineAddCommand_initOptions, _SpfxProjectAzureDevOpsPipelineAddCommand_initValidators;
 import fs from 'fs';
 import path from 'path';
 import yaml from 'yaml';
-import { CommandError } from '../../../../Command.js';
+import { z } from 'zod';
+import { globalOptionsZod, CommandError } from '../../../../Command.js';
 import commands from '../../commands.js';
 import { BaseProjectCommand } from './base-project-command.js';
 import { validation } from '../../../../utils/validation.js';
@@ -15,6 +10,15 @@ import { pipeline } from './DeployWorkflow.js';
 import { fsUtil } from '../../../../utils/fsUtil.js';
 import { versions } from '../SpfxCompatibilityMatrix.js';
 import { spfx } from '../../../../utils/spfx.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string().alias('n').optional(),
+    branchName: z.string().alias('b').optional(),
+    loginMethod: z.enum(['application', 'user']).alias('l').optional(),
+    scope: z.enum(['tenant', 'sitecollection']).alias('s').optional(),
+    siteUrl: z.string().alias('u').optional(),
+    skipFeatureDeployment: z.boolean().optional()
+});
 class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
     get name() {
         return commands.PROJECT_AZUREDEVOPS_PIPELINE_ADD;
@@ -22,17 +26,26 @@ class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
     get description() {
         return 'Adds a Azure DevOps Pipeline for a SharePoint Framework project.';
     }
-    constructor() {
-        super();
-        _SpfxProjectAzureDevOpsPipelineAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpfxProjectAzureDevOpsPipelineAddCommand_instances, "m", _SpfxProjectAzureDevOpsPipelineAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpfxProjectAzureDevOpsPipelineAddCommand_instances, "m", _SpfxProjectAzureDevOpsPipelineAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpfxProjectAzureDevOpsPipelineAddCommand_instances, "m", _SpfxProjectAzureDevOpsPipelineAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => !opts.scope || opts.scope !== 'sitecollection' || opts.siteUrl, {
+            error: `siteUrl option has to be defined when scope set to sitecollection`,
+            params: {
+                customCode: 'required'
+            },
+            path: ['siteUrl']
+        })
+            .refine(opts => !opts.scope || opts.scope !== 'sitecollection' || !opts.siteUrl || validation.isValidSharePointUrl(opts.siteUrl) === true, {
+            error: issue => validation.isValidSharePointUrl(issue.input.siteUrl)
+        });
     }
     async commandAction(logger, args) {
         this.projectRootPath = this.getProjectRoot(process.cwd());
         if (this.projectRootPath === null) {
-            throw new CommandError(`Couldn't find project root folder`, _a.ERROR_NO_PROJECT_ROOT_FOLDER);
+            throw new CommandError(`Couldn't find project root folder`, SpfxProjectAzureDevOpsPipelineAddCommand.ERROR_NO_PROJECT_ROOT_FOLDER);
         }
         if (this.debug) {
             await logger.logToStderr(`Adding Azure DevOps pipeline in the current SPFx project`);
@@ -152,54 +165,6 @@ class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
         return pipeline.stages[0].jobs[0].steps;
     }
 }
-_a = SpfxProjectAzureDevOpsPipelineAddCommand, _SpfxProjectAzureDevOpsPipelineAddCommand_instances = new WeakSet(), _SpfxProjectAzureDevOpsPipelineAddCommand_initTelemetry = function _SpfxProjectAzureDevOpsPipelineAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            name: typeof args.options.name !== 'undefined',
-            branchName: typeof args.options.branchName !== 'undefined',
-            loginMethod: typeof args.options.loginMethod !== 'undefined',
-            scope: typeof args.options.scope !== 'undefined',
-            skipFeatureDeployment: !!args.options.skipFeatureDeployment
-        });
-    });
-}, _SpfxProjectAzureDevOpsPipelineAddCommand_initOptions = function _SpfxProjectAzureDevOpsPipelineAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name [name]'
-    }, {
-        option: '-b, --branchName [branchName]'
-    }, {
-        option: '-l, --loginMethod [loginMethod]',
-        autocomplete: _a.loginMethod
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: _a.scope
-    }, {
-        option: '-u, --siteUrl [siteUrl]'
-    }, {
-        option: '--skipFeatureDeployment'
-    });
-}, _SpfxProjectAzureDevOpsPipelineAddCommand_initValidators = function _SpfxProjectAzureDevOpsPipelineAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.scope && args.options.scope === 'sitecollection') {
-            if (!args.options.siteUrl) {
-                return `siteUrl option has to be defined when scope set to ${args.options.scope}`;
-            }
-            const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.siteUrl);
-            if (isValidSharePointUrl !== true) {
-                return isValidSharePointUrl;
-            }
-        }
-        if (args.options.loginMethod && _a.loginMethod.indexOf(args.options.loginMethod) < 0) {
-            return `${args.options.loginMethod} is not a valid login method. Allowed values are ${_a.loginMethod.join(', ')}`;
-        }
-        if (args.options.scope && _a.scope.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Allowed values are ${_a.scope.join(', ')}`;
-        }
-        return true;
-    });
-};
-SpfxProjectAzureDevOpsPipelineAddCommand.loginMethod = ['application', 'user'];
-SpfxProjectAzureDevOpsPipelineAddCommand.scope = ['tenant', 'sitecollection'];
 SpfxProjectAzureDevOpsPipelineAddCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;
 export default new SpfxProjectAzureDevOpsPipelineAddCommand();
 //# sourceMappingURL=project-azuredevops-pipeline-add.js.map

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

@@ -1,31 +1,21 @@
-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, _a, _SpfxProjectDoctorCommand_initTelemetry, _SpfxProjectDoctorCommand_initOptions, _SpfxProjectDoctorCommand_initValidators;
 import fs from 'fs';
 import os from 'os';
 import path from 'path';
-import { CommandError } from '../../../../Command.js';
+import { z } from 'zod';
+import { CommandError, globalOptionsZod } from '../../../../Command.js';
 import { packageManager } from '../../../../utils/packageManager.js';
 import commands from '../../commands.js';
 import { BaseProjectCommand } from './base-project-command.js';
 import { rules as genericRules } from './project-doctor/generic-rules.js';
 import { FN017001_MISC_npm_dedupe } from './project-upgrade/rules/FN017001_MISC_npm_dedupe.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    packageManager: z.enum(['npm', 'pnpm', 'yarn']).optional(),
+    output: z.enum(['json', 'text', 'md', 'tour']).optional().alias('o')
+});
 class SpfxProjectDoctorCommand extends BaseProjectCommand {
-    get allowedOutputs() {
-        return ['json', 'text', 'md', 'tour'];
-    }
-    get name() {
-        return commands.PROJECT_DOCTOR;
-    }
-    get description() {
-        return 'Validates correctness of a SharePoint Framework project';
-    }
     constructor() {
-        super();
-        _SpfxProjectDoctorCommand_instances.add(this);
+        super(...arguments);
         this.allFindings = [];
         this.packageManager = 'npm';
         this.supportedVersions = [
@@ -82,14 +72,20 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
             '1.24.0',
             '1.24.1'
         ];
-        __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.PROJECT_DOCTOR;
+    }
+    get description() {
+        return 'Validates correctness of a SharePoint Framework project';
+    }
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         this.projectRootPath = this.getProjectRoot(process.cwd());
         if (this.projectRootPath === null) {
-            throw new CommandError(`Couldn't find project root folder`, _a.ERROR_NO_PROJECT_ROOT_FOLDER);
+            throw new CommandError(`Couldn't find project root folder`, SpfxProjectDoctorCommand.ERROR_NO_PROJECT_ROOT_FOLDER);
         }
         this.packageManager = args.options.packageManager || 'npm';
         if (this.verbose) {
@@ -102,10 +98,10 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
         }
         project.version = this.getProjectVersion();
         if (!project.version) {
-            throw new CommandError(`Unable to determine the version of the current SharePoint Framework project`, _a.ERROR_NO_VERSION);
+            throw new CommandError(`Unable to determine the version of the current SharePoint Framework project`, SpfxProjectDoctorCommand.ERROR_NO_VERSION);
         }
         if (!this.supportedVersions.includes(project.version)) {
-            throw new CommandError(`CLI for Microsoft 365 doesn't support validating projects built using SharePoint Framework v${project.version}`, _a.ERROR_UNSUPPORTED_VERSION);
+            throw new CommandError(`CLI for Microsoft 365 doesn't support validating projects built using SharePoint Framework v${project.version}`, SpfxProjectDoctorCommand.ERROR_UNSUPPORTED_VERSION);
         }
         if (this.verbose) {
             await logger.logToStderr(`Project built using SPFx v${project.version}`);
@@ -348,33 +344,6 @@ ${f.resolution}
         };
     }
 }
-_a = SpfxProjectDoctorCommand, _SpfxProjectDoctorCommand_instances = new WeakSet(), _SpfxProjectDoctorCommand_initTelemetry = function _SpfxProjectDoctorCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            packageManager: args.options.packageManager || 'npm'
-        });
-    });
-}, _SpfxProjectDoctorCommand_initOptions = function _SpfxProjectDoctorCommand_initOptions() {
-    this.options.forEach(o => {
-        if (o.option.indexOf('--output') > -1) {
-            o.autocomplete = this.allowedOutputs;
-        }
-    });
-    this.options.unshift({
-        option: '--packageManager [packageManager]',
-        autocomplete: _a.packageManagers
-    });
-}, _SpfxProjectDoctorCommand_initValidators = function _SpfxProjectDoctorCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.packageManager) {
-            if (_a.packageManagers.indexOf(args.options.packageManager) < 0) {
-                return `${args.options.packageManager} is not a supported package manager. Supported package managers are ${_a.packageManagers.join(', ')}`;
-            }
-        }
-        return true;
-    });
-};
-SpfxProjectDoctorCommand.packageManagers = ['npm', 'pnpm', 'yarn'];
 SpfxProjectDoctorCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;
 SpfxProjectDoctorCommand.ERROR_NO_VERSION = 3;
 SpfxProjectDoctorCommand.ERROR_UNSUPPORTED_VERSION = 4;

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

@@ -1,28 +1,17 @@
-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;
 import os from 'os';
 import path from 'path';
-import { CommandError } from '../../../../Command.js';
+import { z } from 'zod';
+import { CommandError, globalOptionsZod } from '../../../../Command.js';
 import commands from '../../commands.js';
 import { BaseProjectCommand } from './base-project-command.js';
 import rules from './project-externalize/DefaultRules.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    output: z.enum(['json', 'text', 'md']).optional().alias('o')
+});
 class SpfxProjectExternalizeCommand extends BaseProjectCommand {
-    get allowedOutputs() {
-        return ['json', 'text', 'md'];
-    }
-    get name() {
-        return commands.PROJECT_EXTERNALIZE;
-    }
-    get description() {
-        return 'Externalizes SharePoint Framework project dependencies';
-    }
     constructor() {
-        super();
-        _SpfxProjectExternalizeCommand_instances.add(this);
+        super(...arguments);
         this.supportedVersions = [
             '1.0.0',
             '1.0.1',
@@ -49,7 +38,15 @@ class SpfxProjectExternalizeCommand extends BaseProjectCommand {
         ];
         this.allFindings = [];
         this.allEditSuggestions = [];
-        __classPrivateFieldGet(this, _SpfxProjectExternalizeCommand_instances, "m", _SpfxProjectExternalizeCommand_initOptions).call(this);
+    }
+    get name() {
+        return commands.PROJECT_EXTERNALIZE;
+    }
+    get description() {
+        return 'Externalizes SharePoint Framework project dependencies';
+    }
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.output !== 'json' || this.verbose) {
@@ -178,13 +175,6 @@ class SpfxProjectExternalizeCommand extends BaseProjectCommand {
         return s.join('').trim();
     }
 }
-_SpfxProjectExternalizeCommand_instances = new WeakSet(), _SpfxProjectExternalizeCommand_initOptions = function _SpfxProjectExternalizeCommand_initOptions() {
-    this.options.forEach(o => {
-        if (o.option.indexOf('--output') > -1) {
-            o.autocomplete = this.allowedOutputs;
-        }
-    });
-};
 SpfxProjectExternalizeCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;
 SpfxProjectExternalizeCommand.ERROR_NO_VERSION = 3;
 SpfxProjectExternalizeCommand.ERROR_UNSUPPORTED_VERSION = 2;