@pnp/cli-microsoft365 12.1.0-beta.0c2915d → 12.1.0-beta.81e442d

package/dist/m365/spfx/commands/project/project-github-workflow-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 _SpfxProjectGithubWorkflowAddCommand_instances, _a, _SpfxProjectGithubWorkflowAddCommand_initTelemetry, _SpfxProjectGithubWorkflowAddCommand_initOptions, _SpfxProjectGithubWorkflowAddCommand_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 { fsUtil } from '../../../../utils/fsUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import commands from '../../commands.js';
@@ -15,6 +10,16 @@ import { workflow } from './DeployWorkflow.js';
 import { BaseProjectCommand } from './base-project-command.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(),
+    manuallyTrigger: z.boolean().alias('m').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 SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
     get name() {
         return commands.PROJECT_GITHUB_WORKFLOW_ADD;
@@ -22,17 +27,26 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
     get description() {
         return 'Adds a GitHub workflow for a SharePoint Framework project.';
     }
-    constructor() {
-        super();
-        _SpfxProjectGithubWorkflowAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpfxProjectGithubWorkflowAddCommand_instances, "m", _SpfxProjectGithubWorkflowAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpfxProjectGithubWorkflowAddCommand_instances, "m", _SpfxProjectGithubWorkflowAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpfxProjectGithubWorkflowAddCommand_instances, "m", _SpfxProjectGithubWorkflowAddCommand_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`, SpfxProjectGithubWorkflowAddCommand.ERROR_NO_PROJECT_ROOT_FOLDER);
         }
         try {
             const project = { path: this.projectRootPath };
@@ -122,57 +136,6 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
         return workflow.jobs['build-and-deploy'].steps;
     }
 }
-_a = SpfxProjectGithubWorkflowAddCommand, _SpfxProjectGithubWorkflowAddCommand_instances = new WeakSet(), _SpfxProjectGithubWorkflowAddCommand_initTelemetry = function _SpfxProjectGithubWorkflowAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            name: typeof args.options.name !== 'undefined',
-            branchName: typeof args.options.branchName !== 'undefined',
-            manuallyTrigger: !!args.options.manuallyTrigger,
-            loginMethod: typeof args.options.loginMethod !== 'undefined',
-            scope: typeof args.options.scope !== 'undefined',
-            skipFeatureDeployment: !!args.options.skipFeatureDeployment
-        });
-    });
-}, _SpfxProjectGithubWorkflowAddCommand_initOptions = function _SpfxProjectGithubWorkflowAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name [name]'
-    }, {
-        option: '-b, --branchName [branchName]'
-    }, {
-        option: '-m, --manuallyTrigger'
-    }, {
-        option: '-l, --loginMethod [loginMethod]',
-        autocomplete: _a.loginMethod
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: _a.scope
-    }, {
-        option: '-u, --siteUrl [siteUrl]'
-    }, {
-        option: '--skipFeatureDeployment'
-    });
-}, _SpfxProjectGithubWorkflowAddCommand_initValidators = function _SpfxProjectGithubWorkflowAddCommand_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;
-    });
-};
-SpfxProjectGithubWorkflowAddCommand.loginMethod = ['application', 'user'];
-SpfxProjectGithubWorkflowAddCommand.scope = ['tenant', 'sitecollection'];
 SpfxProjectGithubWorkflowAddCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;
 export default new SpfxProjectGithubWorkflowAddCommand();
 //# sourceMappingURL=project-github-workflow-add.js.map

package/dist/m365/spfx/commands/project/project-permissions-grant.js

@@ -1,10 +1,12 @@
 import fs from 'fs';
 import path from 'path';
+import { globalOptionsZod } from '../../../../Command.js';
 import { cli } from '../../../../cli/cli.js';
 import { CommandError } from '../../../../Command.js';
 import spoServicePrincipalGrantAddCommand from '../../../spo/commands/serviceprincipal/serviceprincipal-grant-add.js';
 import commands from '../../commands.js';
 import { BaseProjectCommand } from './base-project-command.js';
+export const options = globalOptionsZod.strict();
 class SpfxProjectPermissionSGrantCommand extends BaseProjectCommand {
     get name() {
         return commands.PROJECT_PERMISSIONS_GRANT;
@@ -12,8 +14,8 @@ class SpfxProjectPermissionSGrantCommand extends BaseProjectCommand {
     get description() {
         return 'Grants API permissions defined in the current SPFx project';
     }
-    constructor() {
-        super();
+    get schema() {
+        return options;
     }
     async commandAction(logger) {
         this.projectRootPath = this.getProjectRoot(process.cwd());

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

@@ -1,25 +1,19 @@
-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;
 import fs from 'fs';
 import path from 'path';
 import { v4 } from 'uuid';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { CommandError } from '../../../../Command.js';
 import commands from '../../commands.js';
 import { BaseProjectCommand } from './base-project-command.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    newName: z.string().alias('n'),
+    generateNewId: z.boolean().optional()
+});
 class SpfxProjectRenameCommand extends BaseProjectCommand {
-    get name() {
-        return commands.PROJECT_RENAME;
-    }
-    get description() {
-        return 'Renames SharePoint Framework project';
-    }
     constructor() {
-        super();
-        _SpfxProjectRenameCommand_instances.add(this);
+        super(...arguments);
         this.generateNewId = () => {
             return v4();
         };
@@ -132,8 +126,15 @@ class SpfxProjectRenameCommand extends BaseProjectCommand {
                 }
             }
         };
-        __classPrivateFieldGet(this, _SpfxProjectRenameCommand_instances, "m", _SpfxProjectRenameCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpfxProjectRenameCommand_instances, "m", _SpfxProjectRenameCommand_initOptions).call(this);
+    }
+    get name() {
+        return commands.PROJECT_RENAME;
+    }
+    get description() {
+        return 'Renames SharePoint Framework project';
+    }
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         this.projectRootPath = this.getProjectRoot(process.cwd());
@@ -165,19 +166,6 @@ class SpfxProjectRenameCommand extends BaseProjectCommand {
         }
     }
 }
-_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;
 export default new SpfxProjectRenameCommand();
 //# sourceMappingURL=project-rename.js.map

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

@@ -25,9 +25,6 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
     get description() {
         return 'Upgrades SharePoint Framework project to the specified version';
     }
-    get allowedOutputs() {
-        return ['json', 'text', 'md', 'tour'];
-    }
     get schema() {
         return options;
     }

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

@@ -1,15 +1,26 @@
-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;
 import child_process from 'child_process';
 import { satisfies } from 'semver';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../Command.js';
 import { CheckStatus, formatting } from '../../../utils/formatting.js';
+import { zod } from '../../../utils/zod.js';
 import commands from '../commands.js';
 import { BaseProjectCommand } from './project/base-project-command.js';
 import { SharePointVersion, versions } from './SpfxCompatibilityMatrix.js';
+const environments = {
+    sp2016: 'sp2016',
+    sp2019: 'sp2019',
+    spo: 'spo'
+};
+const spfxVersions = Object.keys(versions);
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    env: zod.coercedEnum(environments).optional().alias('e'),
+    spfxVersion: z.enum(spfxVersions, {
+        error: `The specified version is not a supported SharePoint Framework version. Supported versions are ${spfxVersions.join(', ')}`
+    }).optional().alias('v'),
+    output: z.enum(['text', 'json']).optional().alias('o')
+});
 /**
  * Where to search for the particular npm package: only in the current project,
  * in global packages or both
@@ -29,8 +40,10 @@ var HandlePromise;
     HandlePromise[HandlePromise["Continue"] = 1] = "Continue";
 })(HandlePromise || (HandlePromise = {}));
 class SpfxDoctorCommand extends BaseProjectCommand {
-    get allowedOutputs() {
-        return ['text', 'json'];
+    constructor() {
+        super(...arguments);
+        this.output = '';
+        this.resultsObject = [];
     }
     get name() {
         return commands.DOCTOR;
@@ -38,14 +51,8 @@ class SpfxDoctorCommand extends BaseProjectCommand {
     get description() {
         return 'Verifies environment configuration for using the specific version of the SharePoint Framework';
     }
-    constructor() {
-        super();
-        _SpfxDoctorCommand_instances.add(this);
-        this.output = '';
-        this.resultsObject = [];
-        __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);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (!args.options.output) {
@@ -430,36 +437,5 @@ class SpfxDoctorCommand extends BaseProjectCommand {
         }
     }
 }
-_SpfxDoctorCommand_instances = new WeakSet(), _SpfxDoctorCommand_initTelemetry = function _SpfxDoctorCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            env: args.options.env,
-            spfxVersion: args.options.spfxVersion
-        });
-    });
-}, _SpfxDoctorCommand_initOptions = function _SpfxDoctorCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --env [env]',
-        autocomplete: ['sp2016', 'sp2019', 'spo']
-    }, {
-        option: '-v, --spfxVersion [spfxVersion]',
-        autocomplete: Object.keys(versions)
-    });
-}, _SpfxDoctorCommand_initValidators = function _SpfxDoctorCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.env) {
-            const sp = this.spVersionStringToEnum(args.options.env);
-            if (!sp) {
-                return `${args.options.env} is not a valid SharePoint version. Valid versions are sp2016, sp2019 or spo`;
-            }
-        }
-        if (args.options.spfxVersion) {
-            if (!versions[args.options.spfxVersion]) {
-                return `${args.options.spfxVersion} is not a supported SharePoint Framework version. Supported versions are ${Object.keys(versions).join(', ')}`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpfxDoctorCommand();
 //# sourceMappingURL=spfx-doctor.js.map

package/dist/m365/spo/commands/page/page-add.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 _SpoPageAddCommand_instances, _SpoPageAddCommand_initTelemetry, _SpoPageAddCommand_initOptions, _SpoPageAddCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
@@ -12,6 +8,22 @@ import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { Page, supportedPageLayouts, supportedPromoteAs } from './Page.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    name: z.string().alias('n'),
+    title: z.string().optional().alias('t'),
+    layoutType: z.enum(supportedPageLayouts).optional().alias('l'),
+    promoteAs: z.enum(supportedPromoteAs).optional().alias('p'),
+    commentsEnabled: z.boolean().optional(),
+    publish: z.boolean().optional(),
+    publishMessage: z.string().optional(),
+    description: z.string().optional()
+});
 class SpoPageAddCommand extends SpoCommand {
     get name() {
         return commands.PAGE_ADD;
@@ -19,12 +31,19 @@ class SpoPageAddCommand extends SpoCommand {
     get description() {
         return 'Creates modern page';
     }
-    constructor() {
-        super();
-        _SpoPageAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoPageAddCommand_instances, "m", _SpoPageAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoPageAddCommand_instances, "m", _SpoPageAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoPageAddCommand_instances, "m", _SpoPageAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => opts.promoteAs !== 'HomePage' || opts.layoutType === 'Home', {
+            error: 'You can only promote home pages as site home page',
+            path: ['promoteAs']
+        })
+            .refine(opts => opts.promoteAs !== 'NewsPage' || !opts.layoutType || opts.layoutType === 'Article', {
+            error: 'You can only promote article pages as news article',
+            path: ['promoteAs']
+        });
     }
     async commandAction(logger, args) {
         let pageName = args.options.name;
@@ -207,61 +226,5 @@ class SpoPageAddCommand extends SpoCommand {
         }
     }
 }
-_SpoPageAddCommand_instances = new WeakSet(), _SpoPageAddCommand_initTelemetry = function _SpoPageAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            layoutType: args.options.layoutType,
-            promoteAs: args.options.promoteAs,
-            commentsEnabled: args.options.commentsEnabled || false,
-            publish: args.options.publish || false,
-            publishMessage: typeof args.options.publishMessage !== 'undefined',
-            description: typeof args.options.description !== 'undefined'
-        });
-    });
-}, _SpoPageAddCommand_initOptions = function _SpoPageAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name <name>'
-    }, {
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '-l, --layoutType [layoutType]',
-        autocomplete: supportedPageLayouts
-    }, {
-        option: '-p, --promoteAs [promoteAs]',
-        autocomplete: supportedPromoteAs
-    }, {
-        option: '--commentsEnabled'
-    }, {
-        option: '--publish'
-    }, {
-        option: '--publishMessage [publishMessage]'
-    }, {
-        option: '--description [description]'
-    });
-}, _SpoPageAddCommand_initValidators = function _SpoPageAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.layoutType &&
-            supportedPageLayouts.indexOf(args.options.layoutType) < 0) {
-            return `${args.options.layoutType} is not a valid option for layoutType. Allowed values ${supportedPageLayouts.join(', ')}`;
-        }
-        if (args.options.promoteAs &&
-            supportedPromoteAs.indexOf(args.options.promoteAs) < 0) {
-            return `${args.options.promoteAs} is not a valid option for promoteAs. Allowed values ${supportedPromoteAs.join(', ')}`;
-        }
-        if (args.options.promoteAs === 'HomePage' && args.options.layoutType !== 'Home') {
-            return 'You can only promote home pages as site home page';
-        }
-        if (args.options.promoteAs === 'NewsPage' && args.options.layoutType && args.options.layoutType !== 'Article') {
-            return 'You can only promote article pages as news article';
-        }
-        return true;
-    });
-};
 export default new SpoPageAddCommand();
 //# sourceMappingURL=page-add.js.map

package/dist/m365/spo/commands/page/page-clientsidewebpart-add.js

@@ -1,10 +1,6 @@
-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 _SpoPageClientSideWebPartAddCommand_instances, _SpoPageClientSideWebPartAddCommand_initTelemetry, _SpoPageClientSideWebPartAddCommand_initOptions, _SpoPageClientSideWebPartAddCommand_initValidators, _SpoPageClientSideWebPartAddCommand_initOptionSets;
 import { v4 } from 'uuid';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -12,6 +8,55 @@ import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { StandardWebPartUtils } from '../../StandardWebPartTypes.js';
 import { Page } from './Page.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    pageName: z.string().alias('n'),
+    webUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    standardWebPart: z.string()
+        .refine(webPart => StandardWebPartUtils.isValidStandardWebPartType(webPart), {
+        error: e => `${e.input} is not a valid standard web part type`
+    })
+        .optional(),
+    webPartData: z.string()
+        .refine(data => {
+        try {
+            JSON.parse(data);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }, {
+        error: 'Specified webPartData is not a valid JSON string.'
+    })
+        .optional(),
+    webPartId: z.string()
+        .refine(id => validation.isValidGuid(id), {
+        error: e => `The webPartId '${e.input}' is not a valid GUID`
+    })
+        .optional(),
+    webPartProperties: z.string()
+        .refine(properties => {
+        try {
+            JSON.parse(properties);
+            return true;
+        }
+        catch {
+            return false;
+        }
+    }, {
+        error: 'Specified webPartProperties is not a valid JSON string.'
+    })
+        .optional(),
+    section: z.number().int().min(1, { error: 'The value of parameter section must be 1 or higher' }).optional(),
+    column: z.number().int().min(1, { error: 'The value of parameter column must be 1 or higher' }).optional(),
+    order: z.number().optional(),
+    verticalSection: z.boolean().optional()
+});
 class SpoPageClientSideWebPartAddCommand extends SpoCommand {
     get name() {
         return commands.PAGE_CLIENTSIDEWEBPART_ADD;
@@ -19,13 +64,27 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand {
     get description() {
         return 'Adds a client-side web part to a modern page';
     }
-    constructor() {
-        super();
-        _SpoPageClientSideWebPartAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoPageClientSideWebPartAddCommand_instances, "m", _SpoPageClientSideWebPartAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoPageClientSideWebPartAddCommand_instances, "m", _SpoPageClientSideWebPartAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoPageClientSideWebPartAddCommand_instances, "m", _SpoPageClientSideWebPartAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoPageClientSideWebPartAddCommand_instances, "m", _SpoPageClientSideWebPartAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.standardWebPart, opts.webPartId].filter(o => o !== undefined).length === 1, {
+            error: 'Specify one of the following options: standardWebPart, webPartId.',
+            params: {
+                customCode: 'optionSet',
+                options: ['standardWebPart', 'webPartId']
+            }
+        })
+            .refine(opts => !(opts.webPartProperties && opts.webPartData), {
+            error: 'Specify webPartProperties or webPartData but not both'
+        })
+            .refine(opts => !(opts.section && opts.verticalSection), {
+            error: 'Specify section or verticalSection but not both'
+        })
+            .refine(opts => !(opts.column && opts.verticalSection), {
+            error: 'Use column in combination with section, not with verticalSection'
+        });
     }
     async commandAction(logger, args) {
         let canvasContent;
@@ -228,13 +287,8 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand {
                 await logger.logToStderr(args.options.webPartProperties);
                 await logger.logToStderr('');
             }
-            try {
-                const properties = JSON.parse(args.options.webPartProperties);
-                webPart.webPartData.properties = this.extend(webPart.webPartData.properties, properties);
-            }
-            catch {
-                // Do nothing
-            }
+            const properties = JSON.parse(args.options.webPartProperties) ?? {};
+            webPart.webPartData.properties = this.extend(webPart.webPartData.properties, properties);
         }
         if (args.options.webPartData) {
             if (this.debug) {
@@ -332,86 +386,5 @@ class SpoPageClientSideWebPartAddCommand extends SpoCommand {
         }, target);
     }
 }
-_SpoPageClientSideWebPartAddCommand_instances = new WeakSet(), _SpoPageClientSideWebPartAddCommand_initTelemetry = function _SpoPageClientSideWebPartAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            standardWebPart: args.options.standardWebPart,
-            webPartData: typeof args.options.webPartData !== 'undefined',
-            webPartId: typeof args.options.webPartId !== 'undefined',
-            webPartProperties: typeof args.options.webPartProperties !== 'undefined',
-            section: typeof args.options.section !== 'undefined',
-            column: typeof args.options.column !== 'undefined',
-            order: typeof args.options.order !== 'undefined',
-            verticalSection: !!args.options.verticalSection
-        });
-    });
-}, _SpoPageClientSideWebPartAddCommand_initOptions = function _SpoPageClientSideWebPartAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-n, --pageName <pageName>'
-    }, {
-        option: '--standardWebPart [standardWebPart]'
-    }, {
-        option: '--webPartId [webPartId]'
-    }, {
-        option: '--webPartProperties [webPartProperties]'
-    }, {
-        option: '--webPartData [webPartData]'
-    }, {
-        option: '--section [section]'
-    }, {
-        option: '--column [column]'
-    }, {
-        option: '--order [order]'
-    }, {
-        option: '--verticalSection'
-    });
-}, _SpoPageClientSideWebPartAddCommand_initValidators = function _SpoPageClientSideWebPartAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.webPartId && !validation.isValidGuid(args.options.webPartId)) {
-            return `The webPartId '${args.options.webPartId}' is not a valid GUID`;
-        }
-        if (args.options.standardWebPart && !StandardWebPartUtils.isValidStandardWebPartType(args.options.standardWebPart)) {
-            return `${args.options.standardWebPart} is not a valid standard web part type`;
-        }
-        if (args.options.webPartProperties && args.options.webPartData) {
-            return 'Specify webPartProperties or webPartData but not both';
-        }
-        if (args.options.webPartProperties) {
-            try {
-                JSON.parse(args.options.webPartProperties);
-            }
-            catch (e) {
-                return `Specified webPartProperties is not a valid JSON string. Input: ${args.options
-                    .webPartProperties}. Error: ${e}`;
-            }
-        }
-        if (args.options.webPartData) {
-            try {
-                JSON.parse(args.options.webPartData);
-            }
-            catch (e) {
-                return `Specified webPartData is not a valid JSON string. Input: ${args.options
-                    .webPartData}. Error: ${e}`;
-            }
-        }
-        if (args.options.section && (!Number.isInteger(args.options.section) || args.options.section < 1)) {
-            return 'The value of parameter section must be 1 or higher';
-        }
-        if (args.options.column && (!Number.isInteger(args.options.column) || args.options.column < 1)) {
-            return 'The value of parameter column must be 1 or higher';
-        }
-        if (args.options.section && args.options.verticalSection) {
-            return 'Specify section or verticalSection but not both';
-        }
-        if (args.options.column && args.options.verticalSection) {
-            return 'Use column in combination with section, not with verticalSection';
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-}, _SpoPageClientSideWebPartAddCommand_initOptionSets = function _SpoPageClientSideWebPartAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['standardWebPart', 'webPartId'] });
-};
 export default new SpoPageClientSideWebPartAddCommand();
 //# sourceMappingURL=page-clientsidewebpart-add.js.map