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

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

package/dist/m365/spo/commands/page/page-column-get.js

@@ -1,14 +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 _SpoPageColumnGetCommand_instances, _SpoPageColumnGetCommand_initOptions, _SpoPageColumnGetCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { Page } 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'),
+    pageName: z.string().alias('n'),
+    section: z.number().alias('s'),
+    column: z.number().alias('c')
+});
 class SpoPageColumnGetCommand extends SpoCommand {
     get name() {
         return commands.PAGE_COLUMN_GET;
@@ -16,11 +23,8 @@ class SpoPageColumnGetCommand extends SpoCommand {
     get description() {
         return 'Gets information about a specific column of a modern page';
     }
-    constructor() {
-        super();
-        _SpoPageColumnGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoPageColumnGetCommand_instances, "m", _SpoPageColumnGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoPageColumnGetCommand_instances, "m", _SpoPageColumnGetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -48,26 +52,5 @@ class SpoPageColumnGetCommand extends SpoCommand {
         }
     }
 }
-_SpoPageColumnGetCommand_instances = new WeakSet(), _SpoPageColumnGetCommand_initOptions = function _SpoPageColumnGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-n, --pageName <pageName>'
-    }, {
-        option: '-s, --section <section>'
-    }, {
-        option: '-c, --column <column>'
-    });
-}, _SpoPageColumnGetCommand_initValidators = function _SpoPageColumnGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (isNaN(args.options.section)) {
-            return `${args.options.section} is not a number`;
-        }
-        if (isNaN(args.options.column)) {
-            return `${args.options.column} is not a number`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-};
 export default new SpoPageColumnGetCommand();
 //# sourceMappingURL=page-column-get.js.map

package/dist/m365/spo/commands/page/page-column-list.js

@@ -1,14 +1,20 @@
-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 _SpoPageColumnListCommand_instances, _SpoPageColumnListCommand_initOptions, _SpoPageColumnListCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { Page } 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'),
+    pageName: z.string().alias('n'),
+    section: z.number().alias('s')
+});
 class SpoPageColumnListCommand extends SpoCommand {
     get name() {
         return commands.PAGE_COLUMN_LIST;
@@ -16,11 +22,8 @@ class SpoPageColumnListCommand extends SpoCommand {
     get description() {
         return 'Lists columns in the specific section of a modern page';
     }
-    constructor() {
-        super();
-        _SpoPageColumnListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoPageColumnListCommand_instances, "m", _SpoPageColumnListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoPageColumnListCommand_instances, "m", _SpoPageColumnListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -40,21 +43,5 @@ class SpoPageColumnListCommand extends SpoCommand {
         }
     }
 }
-_SpoPageColumnListCommand_instances = new WeakSet(), _SpoPageColumnListCommand_initOptions = function _SpoPageColumnListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-n, --pageName <pageName>'
-    }, {
-        option: '-s, --section <sectionId>'
-    });
-}, _SpoPageColumnListCommand_initValidators = function _SpoPageColumnListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (isNaN(args.options.section)) {
-            return `${args.options.section} is not a number`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-};
 export default new SpoPageColumnListCommand();
 //# sourceMappingURL=page-column-list.js.map

package/dist/m365/spo/commands/page/page-control-get.js

@@ -1,15 +1,25 @@
-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 _SpoPageControlGetCommand_instances, _SpoPageControlGetCommand_initOptions, _SpoPageControlGetCommand_initValidators;
+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';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { getControlTypeDisplayName } from './pageMethods.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'),
+    pageName: z.string().alias('n'),
+    id: z.string()
+        .refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} is not a valid GUID`
+    })
+        .alias('i')
+});
 class SpoPageControlGetCommand extends SpoCommand {
     get name() {
         return commands.PAGE_CONTROL_GET;
@@ -17,11 +27,8 @@ class SpoPageControlGetCommand extends SpoCommand {
     get description() {
         return 'Gets information about the specific control on a modern page';
     }
-    constructor() {
-        super();
-        _SpoPageControlGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoPageControlGetCommand_instances, "m", _SpoPageControlGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoPageControlGetCommand_instances, "m", _SpoPageControlGetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         let pageName = args.options.pageName;
@@ -63,21 +70,5 @@ class SpoPageControlGetCommand extends SpoCommand {
         }
     }
 }
-_SpoPageControlGetCommand_instances = new WeakSet(), _SpoPageControlGetCommand_initOptions = function _SpoPageControlGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-n, --pageName <pageName>'
-    }, {
-        option: '-u, --webUrl <webUrl>'
-    });
-}, _SpoPageControlGetCommand_initValidators = function _SpoPageControlGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-};
 export default new SpoPageControlGetCommand();
 //# sourceMappingURL=page-control-get.js.map

package/dist/m365/spo/commands/page/page-control-list.js

@@ -1,15 +1,20 @@
-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 _SpoPageControlListCommand_instances, _SpoPageControlListCommand_initOptions, _SpoPageControlListCommand_initValidators;
+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';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { getControlTypeDisplayName } from './pageMethods.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'),
+    pageName: z.string().alias('n')
+});
 class SpoPageControlListCommand extends SpoCommand {
     get name() {
         return commands.PAGE_CONTROL_LIST;
@@ -20,11 +25,8 @@ class SpoPageControlListCommand extends SpoCommand {
     defaultProperties() {
         return ['id', 'type', 'title'];
     }
-    constructor() {
-        super();
-        _SpoPageControlListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoPageControlListCommand_instances, "m", _SpoPageControlListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoPageControlListCommand_instances, "m", _SpoPageControlListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         let pageName = args.options.pageName;
@@ -60,14 +62,5 @@ class SpoPageControlListCommand extends SpoCommand {
         }
     }
 }
-_SpoPageControlListCommand_instances = new WeakSet(), _SpoPageControlListCommand_initOptions = function _SpoPageControlListCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --pageName <pageName>'
-    }, {
-        option: '-u, --webUrl <webUrl>'
-    });
-}, _SpoPageControlListCommand_initValidators = function _SpoPageControlListCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
-};
 export default new SpoPageControlListCommand();
 //# sourceMappingURL=page-control-list.js.map

package/dist/m365/spo/commands/page/page-control-remove.js

@@ -16,7 +16,7 @@ export const options = z.strictObject({
     })
         .alias('u'),
     pageName: z.string().alias('n'),
-    id: z.uuid().alias('i'),
+    id: z.guid().alias('i'),
     draft: z.boolean().optional(),
     force: z.boolean().optional().alias('f')
 });