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

package/dist/m365/spo/commands/web/web-list.js

@@ -1,13 +1,15 @@
-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 _SpoWebListCommand_instances, _SpoWebListCommand_initOptions, _SpoWebListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    url: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).alias('u')
+});
 class SpoWebListCommand extends SpoCommand {
     get name() {
         return commands.WEB_LIST;
@@ -18,11 +20,8 @@ class SpoWebListCommand extends SpoCommand {
     defaultProperties() {
         return ['Title', 'Url', 'Id'];
     }
-    constructor() {
-        super();
-        _SpoWebListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoWebListCommand_instances, "m", _SpoWebListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoWebListCommand_instances, "m", _SpoWebListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -41,12 +40,5 @@ class SpoWebListCommand extends SpoCommand {
         }
     }
 }
-_SpoWebListCommand_instances = new WeakSet(), _SpoWebListCommand_initOptions = function _SpoWebListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --url <url>'
-    });
-}, _SpoWebListCommand_initValidators = function _SpoWebListCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
-};
 export default new SpoWebListCommand();
 //# sourceMappingURL=web-list.js.map

package/dist/m365/spo/commands/web/web-reindex.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 _SpoWebReindexCommand_instances, _SpoWebReindexCommand_initOptions, _SpoWebReindexCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { SpoPropertyBagBaseCommand } from '../propertybag/propertybag-base.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    url: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).alias('u')
+});
 class SpoWebReindexCommand extends SpoCommand {
     get name() {
         return commands.WEB_REINDEX;
@@ -17,11 +19,8 @@ class SpoWebReindexCommand extends SpoCommand {
     get description() {
         return 'Requests reindexing the specified subsite';
     }
-    constructor() {
-        super();
-        _SpoWebReindexCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoWebReindexCommand_instances, "m", _SpoWebReindexCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoWebReindexCommand_instances, "m", _SpoWebReindexCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         let webIdentityResp;
@@ -94,12 +93,5 @@ class SpoWebReindexCommand extends SpoCommand {
         return;
     }
 }
-_SpoWebReindexCommand_instances = new WeakSet(), _SpoWebReindexCommand_initOptions = function _SpoWebReindexCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --url <url>'
-    });
-}, _SpoWebReindexCommand_initValidators = function _SpoWebReindexCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
-};
 export default new SpoWebReindexCommand();
 //# sourceMappingURL=web-reindex.js.map

package/dist/m365/spo/commands/web/web-remove.js

@@ -1,14 +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 _SpoWebRemoveCommand_instances, _SpoWebRemoveCommand_initTelemetry, _SpoWebRemoveCommand_initOptions, _SpoWebRemoveCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    url: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoWebRemoveCommand extends SpoCommand {
     get name() {
         return commands.WEB_REMOVE;
@@ -16,12 +19,8 @@ class SpoWebRemoveCommand extends SpoCommand {
     get description() {
         return 'Deletes specified subsite';
     }
-    constructor() {
-        super();
-        _SpoWebRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoWebRemoveCommand_instances, "m", _SpoWebRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoWebRemoveCommand_instances, "m", _SpoWebRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoWebRemoveCommand_instances, "m", _SpoWebRemoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -54,20 +53,5 @@ class SpoWebRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoWebRemoveCommand_instances = new WeakSet(), _SpoWebRemoveCommand_initTelemetry = function _SpoWebRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _SpoWebRemoveCommand_initOptions = function _SpoWebRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --url <url>'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoWebRemoveCommand_initValidators = function _SpoWebRemoveCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
-};
 export default new SpoWebRemoveCommand();
 //# sourceMappingURL=web-remove.js.map

package/dist/m365/spo/commands/web/web-retentionlabel-list.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 _SpoWebRetentionLabelListCommand_instances, _SpoWebRetentionLabelListCommand_initOptions, _SpoWebRetentionLabelListCommand_initValidators;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from "../../../../utils/odata.js";
 import { validation } from "../../../../utils/validation.js";
 import SpoCommand from "../../../base/SpoCommand.js";
 import commands from "../../commands.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')
+});
 class SpoWebRetentionLabelListCommand extends SpoCommand {
     get name() {
         return commands.WEB_RETENTIONLABEL_LIST;
@@ -19,11 +21,8 @@ class SpoWebRetentionLabelListCommand extends SpoCommand {
     defaultProperties() {
         return ['TagId', 'TagName'];
     }
-    constructor() {
-        super();
-        _SpoWebRetentionLabelListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoWebRetentionLabelListCommand_instances, "m", _SpoWebRetentionLabelListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoWebRetentionLabelListCommand_instances, "m", _SpoWebRetentionLabelListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -39,12 +38,5 @@ class SpoWebRetentionLabelListCommand extends SpoCommand {
         }
     }
 }
-_SpoWebRetentionLabelListCommand_instances = new WeakSet(), _SpoWebRetentionLabelListCommand_initOptions = function _SpoWebRetentionLabelListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    });
-}, _SpoWebRetentionLabelListCommand_initValidators = function _SpoWebRetentionLabelListCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
-};
 export default new SpoWebRetentionLabelListCommand();
 //# sourceMappingURL=web-retentionlabel-list.js.map

package/dist/m365/spo/commands/web/web-roleassignment-add.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 _SpoWebRoleAssignmentAddCommand_instances, _SpoWebRoleAssignmentAddCommand_initTelemetry, _SpoWebRoleAssignmentAddCommand_initOptions, _SpoWebRoleAssignmentAddCommand_initValidators, _SpoWebRoleAssignmentAddCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.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'),
+    principalId: z.number().optional(),
+    upn: z.string().optional(),
+    groupName: z.string().optional(),
+    entraGroupId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID for option entraGroupId.`
+    }).optional(),
+    entraGroupName: z.string().optional(),
+    roleDefinitionId: z.number().optional(),
+    roleDefinitionName: z.string().optional()
+});
 class SpoWebRoleAssignmentAddCommand extends SpoCommand {
     get name() {
         return commands.WEB_ROLEASSIGNMENT_ADD;
@@ -17,13 +28,25 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
     get description() {
         return 'Adds a role assignment to web';
     }
-    constructor() {
-        super();
-        _SpoWebRoleAssignmentAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.principalId, options.upn, options.groupName, options.entraGroupId, options.entraGroupName].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'principalId', 'upn', 'groupName', 'entraGroupId', or 'entraGroupName'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['principalId', 'upn', 'groupName', 'entraGroupId', 'entraGroupName']
+            }
+        })
+            .refine(options => [options.roleDefinitionId, options.roleDefinitionName].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'roleDefinitionId' or 'roleDefinitionName'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['roleDefinitionId', 'roleDefinitionName']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -31,7 +54,10 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
         }
         try {
             const roleDefinitionId = await this.getRoleDefinitionId(args.options, logger);
-            if (args.options.upn) {
+            if (args.options.principalId) {
+                await this.addRoleAssignment(args.options.webUrl, args.options.principalId, roleDefinitionId, logger);
+            }
+            else if (args.options.upn) {
                 const principalId = await this.getUserPrincipalId(args.options, logger);
                 await this.addRoleAssignment(args.options.webUrl, principalId, roleDefinitionId, logger);
             }
@@ -85,55 +111,5 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
         return user.Id;
     }
 }
-_SpoWebRoleAssignmentAddCommand_instances = new WeakSet(), _SpoWebRoleAssignmentAddCommand_initTelemetry = function _SpoWebRoleAssignmentAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            principalId: typeof args.options.principalId !== 'undefined',
-            upn: typeof args.options.upn !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined',
-            entraGroupId: typeof args.options.entraGroupId !== 'undefined',
-            entraGroupName: typeof args.options.entraGroupName !== 'undefined',
-            roleDefinitionId: typeof args.options.roleDefinitionId !== 'undefined',
-            roleDefinitionName: typeof args.options.roleDefinitionName !== 'undefined'
-        });
-    });
-}, _SpoWebRoleAssignmentAddCommand_initOptions = function _SpoWebRoleAssignmentAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--principalId [principalId]'
-    }, {
-        option: '--upn [upn]'
-    }, {
-        option: '--groupName [groupName]'
-    }, {
-        option: '--entraGroupId [entraGroupId]'
-    }, {
-        option: '--entraGroupName [entraGroupName]'
-    }, {
-        option: '--roleDefinitionId [roleDefinitionId]'
-    }, {
-        option: '--roleDefinitionName [roleDefinitionName]'
-    });
-}, _SpoWebRoleAssignmentAddCommand_initValidators = function _SpoWebRoleAssignmentAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.principalId && isNaN(args.options.principalId)) {
-            return `Specified principalId ${args.options.principalId} is not a number`;
-        }
-        if (args.options.roleDefinitionId && isNaN(args.options.roleDefinitionId)) {
-            return `Specified roleDefinitionId ${args.options.roleDefinitionId} is not a number`;
-        }
-        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
-            return `'${args.options.entraGroupId}' is not a valid GUID for option entraGroupId.`;
-        }
-        return true;
-    });
-}, _SpoWebRoleAssignmentAddCommand_initOptionSets = function _SpoWebRoleAssignmentAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['principalId', 'upn', 'groupName', 'entraGroupId', 'entraGroupName'] }, { options: ['roleDefinitionId', 'roleDefinitionName'] });
-};
 export default new SpoWebRoleAssignmentAddCommand();
 //# sourceMappingURL=web-roleassignment-add.js.map

package/dist/m365/spo/commands/web/web-roleassignment-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 _SpoWebRoleAssignmentRemoveCommand_instances, _SpoWebRoleAssignmentRemoveCommand_initTelemetry, _SpoWebRoleAssignmentRemoveCommand_initOptions, _SpoWebRoleAssignmentRemoveCommand_initValidators, _SpoWebRoleAssignmentRemoveCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -11,6 +7,20 @@ import commands from '../../commands.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { spo } from '../../../../utils/spo.js';
 import { cli } from '../../../../cli/cli.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'),
+    principalId: z.number().optional(),
+    upn: z.string().optional(),
+    groupName: z.string().optional(),
+    entraGroupId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID for option entraGroupId.`
+    }).optional(),
+    entraGroupName: z.string().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
     get name() {
         return commands.WEB_ROLEASSIGNMENT_REMOVE;
@@ -18,13 +28,17 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes a role assignment from web permissions';
     }
-    constructor() {
-        super();
-        _SpoWebRoleAssignmentRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(options => [options.principalId, options.upn, options.groupName, options.entraGroupId, options.entraGroupName].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'principalId', 'upn', 'groupName', 'entraGroupId', or 'entraGroupName'.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['principalId', 'upn', 'groupName', 'entraGroupId', 'entraGroupName']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -42,7 +56,10 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
             await logger.logToStderr(`Removing role assignment from web ${options.webUrl}...`);
         }
         try {
-            if (options.upn) {
+            if (options.principalId) {
+                await this.removeRoleAssignmentWithOptions(options.webUrl, options.principalId, logger);
+            }
+            else if (options.upn) {
                 const principalId = await this.getUserPrincipalId(options, logger);
                 await this.removeRoleAssignmentWithOptions(options.webUrl, principalId, logger);
             }
@@ -89,49 +106,5 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
         return user.Id;
     }
 }
-_SpoWebRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoWebRoleAssignmentRemoveCommand_initTelemetry = function _SpoWebRoleAssignmentRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            principalId: typeof args.options.principalId !== 'undefined',
-            upn: typeof args.options.upn !== 'undefined',
-            groupName: typeof args.options.groupName !== 'undefined',
-            entraGroupId: typeof args.options.entraGroupId !== 'undefined',
-            entraGroupName: typeof args.options.entraGroupName !== 'undefined',
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _SpoWebRoleAssignmentRemoveCommand_initOptions = function _SpoWebRoleAssignmentRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--principalId [principalId]'
-    }, {
-        option: '--upn [upn]'
-    }, {
-        option: '--groupName [groupName]'
-    }, {
-        option: '--entraGroupId [entraGroupId]'
-    }, {
-        option: '--entraGroupName [entraGroupName]'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoWebRoleAssignmentRemoveCommand_initValidators = function _SpoWebRoleAssignmentRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.principalId && isNaN(args.options.principalId)) {
-            return `Specified principalId ${args.options.principalId} is not a number`;
-        }
-        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
-            return `'${args.options.entraGroupId}' is not a valid GUID for option entraGroupId.`;
-        }
-        return true;
-    });
-}, _SpoWebRoleAssignmentRemoveCommand_initOptionSets = function _SpoWebRoleAssignmentRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['principalId', 'upn', 'groupName', 'entraGroupId', 'entraGroupName'] });
-};
 export default new SpoWebRoleAssignmentRemoveCommand();
 //# sourceMappingURL=web-roleassignment-remove.js.map

package/dist/m365/spo/commands/web/web-roleinheritance-break.js

@@ -1,14 +1,18 @@
-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 _SpoWebRoleInheritanceBreakCommand_instances, _SpoWebRoleInheritanceBreakCommand_initTelemetry, _SpoWebRoleInheritanceBreakCommand_initOptions, _SpoWebRoleInheritanceBreakCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.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'),
+    clearExistingPermissions: z.boolean().optional().alias('c'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoWebRoleInheritanceBreakCommand extends SpoCommand {
     get name() {
         return commands.WEB_ROLEINHERITANCE_BREAK;
@@ -16,12 +20,8 @@ class SpoWebRoleInheritanceBreakCommand extends SpoCommand {
     get description() {
         return 'Breaks role inheritance of subsite';
     }
-    constructor() {
-        super();
-        _SpoWebRoleInheritanceBreakCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoWebRoleInheritanceBreakCommand_instances, "m", _SpoWebRoleInheritanceBreakCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoWebRoleInheritanceBreakCommand_instances, "m", _SpoWebRoleInheritanceBreakCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoWebRoleInheritanceBreakCommand_instances, "m", _SpoWebRoleInheritanceBreakCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -54,29 +54,5 @@ class SpoWebRoleInheritanceBreakCommand extends SpoCommand {
         }
     }
 }
-_SpoWebRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoWebRoleInheritanceBreakCommand_initTelemetry = function _SpoWebRoleInheritanceBreakCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            clearExistingPermissions: !!args.options.clearExistingPermissions,
-            force: !!args.options.force
-        });
-    });
-}, _SpoWebRoleInheritanceBreakCommand_initOptions = function _SpoWebRoleInheritanceBreakCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-c, --clearExistingPermissions'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoWebRoleInheritanceBreakCommand_initValidators = function _SpoWebRoleInheritanceBreakCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        return true;
-    });
-};
 export default new SpoWebRoleInheritanceBreakCommand();
 //# sourceMappingURL=web-roleinheritance-break.js.map

package/dist/m365/spo/commands/web/web-roleinheritance-reset.js

@@ -1,14 +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 _SpoWebRoleInheritanceResetCommand_instances, _SpoWebRoleInheritanceResetCommand_initTelemetry, _SpoWebRoleInheritanceResetCommand_initOptions, _SpoWebRoleInheritanceResetCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.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'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoWebRoleInheritanceResetCommand extends SpoCommand {
     get name() {
         return commands.WEB_ROLEINHERITANCE_RESET;
@@ -16,12 +19,8 @@ class SpoWebRoleInheritanceResetCommand extends SpoCommand {
     get description() {
         return 'Restores role inheritance of subsite';
     }
-    constructor() {
-        super();
-        _SpoWebRoleInheritanceResetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoWebRoleInheritanceResetCommand_instances, "m", _SpoWebRoleInheritanceResetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoWebRoleInheritanceResetCommand_instances, "m", _SpoWebRoleInheritanceResetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoWebRoleInheritanceResetCommand_instances, "m", _SpoWebRoleInheritanceResetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -55,22 +54,5 @@ class SpoWebRoleInheritanceResetCommand extends SpoCommand {
         }
     }
 }
-_SpoWebRoleInheritanceResetCommand_instances = new WeakSet(), _SpoWebRoleInheritanceResetCommand_initTelemetry = function _SpoWebRoleInheritanceResetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _SpoWebRoleInheritanceResetCommand_initOptions = function _SpoWebRoleInheritanceResetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoWebRoleInheritanceResetCommand_initValidators = function _SpoWebRoleInheritanceResetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-};
 export default new SpoWebRoleInheritanceResetCommand();
 //# sourceMappingURL=web-roleinheritance-reset.js.map

package/dist/m365/spo/commands/web/web-rule-list.js

@@ -29,9 +29,6 @@ class SpoWebRuleListCommand extends SpoCommand {
     get description() {
         return 'Lists all SharePoint list alerts';
     }
-    alias() {
-        return [commands.WEB_ALERT_LIST];
-    }
     defaultProperties() {
         return ['ID', 'Title', 'UserPrincipalName'];
     }
@@ -75,7 +72,12 @@ class SpoWebRuleListCommand extends SpoCommand {
             listId = args.options.listId;
         }
         else if (args.options.listUrl || args.options.listTitle) {
-            listId = await spo.getListId(args.options.webUrl, args.options.listTitle, args.options.listUrl, logger, this.verbose);
+            try {
+                listId = await spo.getListId(args.options.webUrl, args.options.listTitle, args.options.listUrl, logger, this.verbose);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
         }
         if (listId) {
             filters.push(`List/Id eq guid'${formatting.encodeQueryParameter(listId)}'`);

package/dist/m365/spo/commands/web/web-rule-remove.js

@@ -22,9 +22,6 @@ class SpoWebRuleRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes an alert from a SharePoint list';
     }
-    alias() {
-        return [commands.WEB_ALERT_REMOVE];
-    }
     get schema() {
         return options;
     }