@pnp/cli-microsoft365 11.12.0-beta.8589b73 → 12.0.0-beta.e4f7675

package/dist/m365/spfx/commands/project/DeployWorkflow.js

@@ -30,8 +30,8 @@ export const workflow = {
                     run: "npm ci"
                 },
                 {
-                    name: "Bundle & Package",
-                    run: "gulp bundle --ship\ngulp package-solution --ship\n"
+                    name: "Build & Package",
+                    run: "npm run build"
                 },
                 {
                     name: "CLI for Microsoft 365 Login",
@@ -140,20 +140,12 @@ export const pipeline = {
                             }
                         },
                         {
-                            task: "Gulp@0",
-                            displayName: "Gulp bundle",
-                            inputs: {
-                                gulpFile: "./gulpfile.js",
-                                targets: "bundle",
-                                arguments: "--ship"
-                            }
-                        },
-                        {
-                            task: "Gulp@0",
-                            displayName: "Gulp package",
+                            task: "Npm@1",
+                            displayName: "Build and package",
                             inputs: {
-                                targets: "package-solution",
-                                arguments: "--ship"
+                                command: "custom",
+                                verbose: false,
+                                customCommand: "run build"
                             }
                         },
                         {

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

@@ -41,8 +41,9 @@ class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
             const project = { path: this.projectRootPath };
             this.readAndParseJsonFile(path.join(this.projectRootPath, 'config', 'package-solution.json'), project, 'packageSolutionJson');
             const sppkgPath = project.packageSolutionJson?.paths?.zippedPackage;
-            this.updatePipeline(sppkgPath, pipeline, args.options);
-            this.savePipeline(pipeline);
+            const pipelineToSave = structuredClone(pipeline);
+            this.updatePipeline(sppkgPath, pipelineToSave, args.options);
+            this.savePipeline(pipelineToSave);
         }
         catch (error) {
             this.handleError(error);
@@ -108,6 +109,33 @@ class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
             if (options.skipFeatureDeployment) {
                 script.script = script.script.replace(`m365 spo app deploy `, `m365 spo app deploy --skipFeatureDeployment `);
             }
+            if (versionRequirements.heft === undefined) {
+                let steps = this.getPipelineSteps(pipeline);
+                const npmBuildScript = steps.find(step => step.task && step.displayName === 'Build and package');
+                if (npmBuildScript) {
+                    pipeline.stages[0].jobs[0].steps = steps.filter(step => step !== npmBuildScript);
+                }
+                const gulpBundleStep = {
+                    task: 'Gulp@0',
+                    displayName: 'Gulp bundle',
+                    inputs: {
+                        gulpFile: './gulpfile.js',
+                        targets: 'bundle',
+                        arguments: '--ship'
+                    }
+                };
+                const gulpPackageStep = {
+                    task: 'Gulp@0',
+                    displayName: 'Gulp package',
+                    inputs: {
+                        targets: 'package-solution',
+                        arguments: '--ship'
+                    }
+                };
+                steps = this.getPipelineSteps(pipeline);
+                const installCLIStepIndex = steps.findIndex(step => step.task === 'Npm@1' && step.displayName === 'Install CLI for Microsoft 365');
+                pipeline.stages[0].jobs[0].steps.splice(installCLIStepIndex, 0, gulpBundleStep, gulpPackageStep);
+            }
         }
     }
     assignPipelineVariables(pipeline, variableName, newVariableValue) {

package/dist/m365/spfx/commands/project/project-github-workflow-add.js

@@ -43,8 +43,9 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
             if (this.debug) {
                 await logger.logToStderr(`Adding GitHub workflow in the current SPFx project`);
             }
-            this.updateWorkflow(solutionName, sppkgPath, workflow, args.options);
-            this.saveWorkflow(workflow);
+            const workflowToSave = structuredClone(workflow);
+            this.updateWorkflow(solutionName, sppkgPath, workflowToSave, args.options);
+            this.saveWorkflow(workflowToSave);
         }
         catch (error) {
             this.handleError(error);
@@ -96,10 +97,19 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
             const deployAction = this.getDeployAction(workflow);
             deployAction.with.APP_FILE_PATH = deployAction.with.APP_FILE_PATH.replace('{{ sppkgPath }}', sppkgPath);
         }
+        if (versionRequirements.heft === undefined) {
+            const buildAndPackageStep = this.getBuildAndPackageStep(workflow);
+            buildAndPackageStep.run = `gulp bundle --ship\ngulp package-solution --ship\n`;
+            buildAndPackageStep.name = 'Bundle & Package';
+        }
     }
     assignNodeVersion(workflow, nodeVersion) {
         workflow.jobs['build-and-deploy'].env.NodeVersion = nodeVersion;
     }
+    getBuildAndPackageStep(workflow) {
+        const steps = this.getWorkFlowSteps(workflow);
+        return steps.find(step => step.run && step.name === 'Build & Package');
+    }
     getLoginAction(workflow) {
         const steps = this.getWorkFlowSteps(workflow);
         return steps.find(step => step.uses && step.uses.indexOf('action-cli-login') >= 0);

package/dist/m365/spo/commands/cdn/cdn-get.js

@@ -1,14 +1,14 @@
-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 _SpoCdnGetCommand_instances, _SpoCdnGetCommand_initTelemetry, _SpoCdnGetCommand_initOptions, _SpoCdnGetCommand_initValidators, _SpoCdnGetCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    type: z.enum(['Public', 'Private']).optional().alias('t')
+});
 class SpoCdnGetCommand extends SpoCommand {
     get name() {
         return commands.CDN_GET;
@@ -16,14 +16,8 @@ class SpoCdnGetCommand extends SpoCommand {
     get description() {
         return 'Views current status of the specified Microsoft 365 CDN';
     }
-    constructor() {
-        super();
-        _SpoCdnGetCommand_instances.add(this);
-        this.validTypes = ['Public', 'Private'];
-        __classPrivateFieldGet(this, _SpoCdnGetCommand_instances, "m", _SpoCdnGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCdnGetCommand_instances, "m", _SpoCdnGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCdnGetCommand_instances, "m", _SpoCdnGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoCdnGetCommand_instances, "m", _SpoCdnGetCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const cdnTypeString = args.options.type || 'Public';
@@ -59,26 +53,5 @@ class SpoCdnGetCommand extends SpoCommand {
         }
     }
 }
-_SpoCdnGetCommand_instances = new WeakSet(), _SpoCdnGetCommand_initTelemetry = function _SpoCdnGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            cdnType: args.options.type || 'Public'
-        });
-    });
-}, _SpoCdnGetCommand_initOptions = function _SpoCdnGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --type [type]',
-        autocomplete: this.validTypes
-    });
-}, _SpoCdnGetCommand_initValidators = function _SpoCdnGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.type && !this.validTypes.includes(args.options.type)) {
-            return `'${args.options.type}' is not a valid CDN type. Allowed values are: ${this.validTypes.join(', ')}.`;
-        }
-        return true;
-    });
-}, _SpoCdnGetCommand_initTypes = function _SpoCdnGetCommand_initTypes() {
-    this.types.string.push('type');
-};
 export default new SpoCdnGetCommand();
 //# sourceMappingURL=cdn-get.js.map

package/dist/m365/spo/commands/cdn/cdn-origin-add.js

@@ -1,15 +1,16 @@
-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 _SpoCdnOriginAddCommand_instances, _SpoCdnOriginAddCommand_initTelemetry, _SpoCdnOriginAddCommand_initOptions, _SpoCdnOriginAddCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    type: z.enum(['Public', 'Private']).optional().alias('t'),
+    origin: z.string().alias('r')
+});
 class SpoCdnOriginAddCommand extends SpoCommand {
     get name() {
         return commands.CDN_ORIGIN_ADD;
@@ -17,12 +18,8 @@ class SpoCdnOriginAddCommand extends SpoCommand {
     get description() {
         return 'Adds CDN origin to the current SharePoint Online tenant';
     }
-    constructor() {
-        super();
-        _SpoCdnOriginAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCdnOriginAddCommand_instances, "m", _SpoCdnOriginAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCdnOriginAddCommand_instances, "m", _SpoCdnOriginAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCdnOriginAddCommand_instances, "m", _SpoCdnOriginAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const cdnTypeString = args.options.type || 'Public';
@@ -53,29 +50,5 @@ class SpoCdnOriginAddCommand extends SpoCommand {
         }
     }
 }
-_SpoCdnOriginAddCommand_instances = new WeakSet(), _SpoCdnOriginAddCommand_initTelemetry = function _SpoCdnOriginAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            cdnType: args.options.type || 'Public'
-        });
-    });
-}, _SpoCdnOriginAddCommand_initOptions = function _SpoCdnOriginAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --type [type]',
-        autocomplete: ['Public', 'Private']
-    }, {
-        option: '-r, --origin <origin>'
-    });
-}, _SpoCdnOriginAddCommand_initValidators = function _SpoCdnOriginAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.type) {
-            if (args.options.type !== 'Public' &&
-                args.options.type !== 'Private') {
-                return `${args.options.type} is not a valid CDN type. Allowed values are Public|Private`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoCdnOriginAddCommand();
 //# sourceMappingURL=cdn-origin-add.js.map

package/dist/m365/spo/commands/cdn/cdn-origin-list.js

@@ -1,14 +1,14 @@
-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 _SpoCdnOriginListCommand_instances, _SpoCdnOriginListCommand_initTelemetry, _SpoCdnOriginListCommand_initOptions, _SpoCdnOriginListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    type: z.enum(['Public', 'Private']).optional().alias('t')
+});
 class SpoCdnOriginListCommand extends SpoCommand {
     get name() {
         return commands.CDN_ORIGIN_LIST;
@@ -16,12 +16,8 @@ class SpoCdnOriginListCommand extends SpoCommand {
     get description() {
         return 'Lists CDN origins settings for the current SharePoint Online tenant';
     }
-    constructor() {
-        super();
-        _SpoCdnOriginListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCdnOriginListCommand_instances, "m", _SpoCdnOriginListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCdnOriginListCommand_instances, "m", _SpoCdnOriginListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCdnOriginListCommand_instances, "m", _SpoCdnOriginListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const cdnTypeString = args.options.type || 'Public';
@@ -56,27 +52,5 @@ class SpoCdnOriginListCommand extends SpoCommand {
         }
     }
 }
-_SpoCdnOriginListCommand_instances = new WeakSet(), _SpoCdnOriginListCommand_initTelemetry = function _SpoCdnOriginListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            cdnType: args.options.type || 'Public'
-        });
-    });
-}, _SpoCdnOriginListCommand_initOptions = function _SpoCdnOriginListCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --type [type]',
-        autocomplete: ['Public', 'Private']
-    });
-}, _SpoCdnOriginListCommand_initValidators = function _SpoCdnOriginListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.type) {
-            if (args.options.type !== 'Public' &&
-                args.options.type !== 'Private') {
-                return `${args.options.type} is not a valid CDN type. Allowed values are Public|Private`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoCdnOriginListCommand();
 //# sourceMappingURL=cdn-origin-list.js.map

package/dist/m365/spo/commands/cdn/cdn-origin-remove.js

@@ -1,9 +1,5 @@
-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 _SpoCdnOriginRemoveCommand_instances, _SpoCdnOriginRemoveCommand_initTelemetry, _SpoCdnOriginRemoveCommand_initOptions, _SpoCdnOriginRemoveCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
@@ -11,6 +7,12 @@ import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    type: z.enum(['Public', 'Private']).optional().alias('t'),
+    origin: z.string().alias('r'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoCdnOriginRemoveCommand extends SpoCommand {
     get name() {
         return commands.CDN_ORIGIN_REMOVE;
@@ -18,12 +20,8 @@ class SpoCdnOriginRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes CDN origin for the current SharePoint Online tenant';
     }
-    constructor() {
-        super();
-        _SpoCdnOriginRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCdnOriginRemoveCommand_instances, "m", _SpoCdnOriginRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCdnOriginRemoveCommand_instances, "m", _SpoCdnOriginRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCdnOriginRemoveCommand_instances, "m", _SpoCdnOriginRemoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const cdnTypeString = args.options.type || 'Public';
@@ -68,32 +66,5 @@ class SpoCdnOriginRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoCdnOriginRemoveCommand_instances = new WeakSet(), _SpoCdnOriginRemoveCommand_initTelemetry = function _SpoCdnOriginRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            cdnType: args.options.type || 'Public',
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _SpoCdnOriginRemoveCommand_initOptions = function _SpoCdnOriginRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --type [type]',
-        autocomplete: ['Public', 'Private']
-    }, {
-        option: '-r, --origin <origin>'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoCdnOriginRemoveCommand_initValidators = function _SpoCdnOriginRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.type) {
-            if (args.options.type !== 'Public' &&
-                args.options.type !== 'Private') {
-                return `${args.options.type} is not a valid CDN type. Allowed values are Public|Private`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoCdnOriginRemoveCommand();
 //# sourceMappingURL=cdn-origin-remove.js.map

package/dist/m365/spo/commands/cdn/cdn-policy-list.js

@@ -1,14 +1,14 @@
-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 _SpoCdnPolicyListCommand_instances, _SpoCdnPolicyListCommand_initTelemetry, _SpoCdnPolicyListCommand_initOptions, _SpoCdnPolicyListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    cdnType: z.enum(['Public', 'Private']).optional().alias('t')
+});
 class SpoCdnPolicyListCommand extends SpoCommand {
     get name() {
         return commands.CDN_POLICY_LIST;
@@ -16,12 +16,8 @@ class SpoCdnPolicyListCommand extends SpoCommand {
     get description() {
         return 'Lists CDN policies settings for the current SharePoint Online tenant';
     }
-    constructor() {
-        super();
-        _SpoCdnPolicyListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCdnPolicyListCommand_instances, "m", _SpoCdnPolicyListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCdnPolicyListCommand_instances, "m", _SpoCdnPolicyListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCdnPolicyListCommand_instances, "m", _SpoCdnPolicyListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const cdnTypeString = args.options.cdnType || 'Public';
@@ -65,27 +61,5 @@ class SpoCdnPolicyListCommand extends SpoCommand {
         }
     }
 }
-_SpoCdnPolicyListCommand_instances = new WeakSet(), _SpoCdnPolicyListCommand_initTelemetry = function _SpoCdnPolicyListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            cdnType: args.options.cdnType || 'Public'
-        });
-    });
-}, _SpoCdnPolicyListCommand_initOptions = function _SpoCdnPolicyListCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --cdnType [cdnType]',
-        autocomplete: ['Public', 'Private']
-    });
-}, _SpoCdnPolicyListCommand_initValidators = function _SpoCdnPolicyListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.cdnType) {
-            if (args.options.cdnType !== 'Public' &&
-                args.options.cdnType !== 'Private') {
-                return `${args.options.cdnType} is not a valid CDN type. Allowed values are Public|Private`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoCdnPolicyListCommand();
 //# sourceMappingURL=cdn-policy-list.js.map

package/dist/m365/spo/commands/cdn/cdn-policy-set.js

@@ -1,15 +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 _SpoCdnPolicySetCommand_instances, _SpoCdnPolicySetCommand_initTelemetry, _SpoCdnPolicySetCommand_initOptions, _SpoCdnPolicySetCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    cdnType: z.enum(['Public', 'Private']).optional().alias('t'),
+    policy: z.enum(['IncludeFileExtensions', 'ExcludeRestrictedSiteClassifications']).alias('p'),
+    value: z.string().alias('v')
+});
 class SpoCdnPolicySetCommand extends SpoCommand {
     get name() {
         return commands.CDN_POLICY_SET;
@@ -17,12 +19,8 @@ class SpoCdnPolicySetCommand extends SpoCommand {
     get description() {
         return 'Sets CDN policy value for the current SharePoint Online tenant';
     }
-    constructor() {
-        super();
-        _SpoCdnPolicySetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoCdnPolicySetCommand_instances, "m", _SpoCdnPolicySetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCdnPolicySetCommand_instances, "m", _SpoCdnPolicySetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCdnPolicySetCommand_instances, "m", _SpoCdnPolicySetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const cdnTypeString = args.options.cdnType || 'Public';
@@ -62,38 +60,5 @@ class SpoCdnPolicySetCommand extends SpoCommand {
         }
     }
 }
-_SpoCdnPolicySetCommand_instances = new WeakSet(), _SpoCdnPolicySetCommand_initTelemetry = function _SpoCdnPolicySetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            cdnType: args.options.cdnType || 'Public',
-            policy: args.options.policy
-        });
-    });
-}, _SpoCdnPolicySetCommand_initOptions = function _SpoCdnPolicySetCommand_initOptions() {
-    this.options.unshift({
-        option: '-t, --cdnType [cdnType]',
-        autocomplete: ['Public', 'Private']
-    }, {
-        option: '-p, --policy <policy>',
-        autocomplete: ['IncludeFileExtensions', 'ExcludeRestrictedSiteClassifications']
-    }, {
-        option: '-v, --value <value>'
-    });
-}, _SpoCdnPolicySetCommand_initValidators = function _SpoCdnPolicySetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.cdnType) {
-            if (args.options.cdnType !== 'Public' &&
-                args.options.cdnType !== 'Private') {
-                return `${args.options.cdnType} is not a valid CDN type. Allowed values are Public|Private`;
-            }
-        }
-        if (!args.options.policy ||
-            (args.options.policy !== 'IncludeFileExtensions' &&
-                args.options.policy !== 'ExcludeRestrictedSiteClassifications')) {
-            return `${args.options.policy} is not a valid CDN policy. Allowed values are IncludeFileExtensions|ExcludeRestrictedSiteClassifications`;
-        }
-        return true;
-    });
-};
 export default new SpoCdnPolicySetCommand();
 //# sourceMappingURL=cdn-policy-set.js.map

package/dist/m365/spo/commands/cdn/cdn-set.js

@@ -1,14 +1,16 @@
-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 _SpoCdnSetCommand_instances, _SpoCdnSetCommand_initTelemetry, _SpoCdnSetCommand_initOptions, _SpoCdnSetCommand_initTypes, _SpoCdnSetCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    type: z.enum(['Public', 'Private', 'Both']).optional().alias('t'),
+    enabled: z.boolean().alias('e'),
+    noDefaultOrigins: z.boolean().optional()
+});
 class SpoCdnSetCommand extends SpoCommand {
     get name() {
         return commands.CDN_SET;
@@ -16,14 +18,8 @@ class SpoCdnSetCommand extends SpoCommand {
     get description() {
         return 'Enables or disables the specified Microsoft 365 CDN';
     }
-    constructor() {
-        super();
-        _SpoCdnSetCommand_instances.add(this);
-        this.validTypes = ['Public', 'Private', 'Both'];
-        __classPrivateFieldGet(this, _SpoCdnSetCommand_instances, "m", _SpoCdnSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoCdnSetCommand_instances, "m", _SpoCdnSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoCdnSetCommand_instances, "m", _SpoCdnSetCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _SpoCdnSetCommand_instances, "m", _SpoCdnSetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const cdnTypeString = args.options.type || 'Public';
@@ -99,37 +95,5 @@ class SpoCdnSetCommand extends SpoCommand {
         }
     }
 }
-_SpoCdnSetCommand_instances = new WeakSet(), _SpoCdnSetCommand_initTelemetry = function _SpoCdnSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            cdnType: args.options.type || 'Public',
-            enabled: args.options.enabled,
-            noDefaultOrigins: !!args.options.noDefaultOrigins
-        });
-    });
-}, _SpoCdnSetCommand_initOptions = function _SpoCdnSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --enabled <enabled>',
-        autocomplete: ['true', 'false']
-    }, {
-        option: '-t, --type [type]',
-        autocomplete: this.validTypes
-    }, {
-        option: '--noDefaultOrigins'
-    });
-}, _SpoCdnSetCommand_initTypes = function _SpoCdnSetCommand_initTypes() {
-    this.types.boolean.push('enabled', 'noDefaultOrigins');
-    this.types.string.push('type');
-}, _SpoCdnSetCommand_initValidators = function _SpoCdnSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.type) {
-            if (args.options.type !== 'Public' && args.options.type !== 'Both' &&
-                args.options.type !== 'Private') {
-                return `${args.options.type} is not a valid CDN type. Allowed values are ${this.validTypes.join(', ')}.`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoCdnSetCommand();
 //# sourceMappingURL=cdn-set.js.map