@pnp/cli-microsoft365 12.0.0-beta.0be7d8d → 12.0.0-beta.8dff3ac

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

@@ -1,17 +1,24 @@
-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 _SpoStorageEntityRemoveCommand_instances, _SpoStorageEntityRemoveCommand_initTelemetry, _SpoStorageEntityRemoveCommand_initOptions, _SpoStorageEntityRemoveCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
 import config from '../../../../config.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.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,
+    appCatalogUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .optional()
+        .alias('u'),
+    key: z.string().alias('k'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoStorageEntityRemoveCommand extends SpoCommand {
     get name() {
         return commands.STORAGEENTITY_REMOVE;
@@ -19,12 +26,8 @@ class SpoStorageEntityRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes tenant property stored on the specified SharePoint Online app catalog';
     }
-    constructor() {
-        super();
-        _SpoStorageEntityRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoStorageEntityRemoveCommand_instances, "m", _SpoStorageEntityRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoStorageEntityRemoveCommand_instances, "m", _SpoStorageEntityRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoStorageEntityRemoveCommand_instances, "m", _SpoStorageEntityRemoveCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -38,10 +41,17 @@ class SpoStorageEntityRemoveCommand extends SpoCommand {
         }
     }
     async removeTenantProperty(logger, args) {
-        if (this.verbose) {
-            await logger.logToStderr(`Removing tenant property ${args.options.key} from ${args.options.appCatalogUrl}...`);
-        }
         try {
+            let appCatalogUrl = args.options.appCatalogUrl;
+            if (!appCatalogUrl) {
+                appCatalogUrl = await spo.getTenantAppCatalogUrl(logger, this.debug);
+                if (!appCatalogUrl) {
+                    throw 'Tenant app catalog URL not found. Specify the URL of the app catalog site using the appCatalogUrl option.';
+                }
+            }
+            if (this.verbose) {
+                await logger.logToStderr(`Removing tenant property ${args.options.key} from ${appCatalogUrl}...`);
+            }
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             const digestInfo = await spo.getRequestDigest(spoAdminUrl);
             const requestOptions = {
@@ -49,7 +59,7 @@ class SpoStorageEntityRemoveCommand extends SpoCommand {
                 headers: {
                     'X-RequestDigest': digestInfo.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="31" ObjectPathId="30" /><ObjectPath Id="33" ObjectPathId="32" /><ObjectPath Id="35" ObjectPathId="34" /><Method Name="RemoveStorageEntity" Id="36" ObjectPathId="34"><Parameters><Parameter Type="String">${formatting.escapeXml(args.options.key)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="30" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="32" ParentId="30" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(args.options.appCatalogUrl)}</Parameter></Parameters></Method><Property Id="34" ParentId="32" Name="RootWeb" /></ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="31" ObjectPathId="30" /><ObjectPath Id="33" ObjectPathId="32" /><ObjectPath Id="35" ObjectPathId="34" /><Method Name="RemoveStorageEntity" Id="36" ObjectPathId="34"><Parameters><Parameter Type="String">${formatting.escapeXml(args.options.key)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="30" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="32" ParentId="30" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(appCatalogUrl)}</Parameter></Parameters></Method><Property Id="34" ParentId="32" Name="RootWeb" /></ObjectPaths></Request>`
             };
             const processQuery = await request.post(requestOptions);
             const json = JSON.parse(processQuery);
@@ -63,22 +73,5 @@ class SpoStorageEntityRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoStorageEntityRemoveCommand_instances = new WeakSet(), _SpoStorageEntityRemoveCommand_initTelemetry = function _SpoStorageEntityRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _SpoStorageEntityRemoveCommand_initOptions = function _SpoStorageEntityRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --appCatalogUrl <appCatalogUrl>'
-    }, {
-        option: '-k, --key <key>'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoStorageEntityRemoveCommand_initValidators = function _SpoStorageEntityRemoveCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.appCatalogUrl));
-};
 export default new SpoStorageEntityRemoveCommand();
 //# sourceMappingURL=storageentity-remove.js.map

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

@@ -1,16 +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 _SpoStorageEntitySetCommand_instances, _SpoStorageEntitySetCommand_initTelemetry, _SpoStorageEntitySetCommand_initOptions, _SpoStorageEntitySetCommand_initValidators;
+import { z } from 'zod';
 import config from '../../../../config.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.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,
+    appCatalogUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .optional()
+        .alias('u'),
+    key: z.string().alias('k'),
+    value: z.string().alias('v'),
+    description: z.string().optional().alias('d'),
+    comment: z.string().optional().alias('c')
+});
 class SpoStorageEntitySetCommand extends SpoCommand {
     get name() {
         return commands.STORAGEENTITY_SET;
@@ -18,26 +27,29 @@ class SpoStorageEntitySetCommand extends SpoCommand {
     get description() {
         return 'Sets tenant property on the specified SharePoint Online app catalog';
     }
-    constructor() {
-        super();
-        _SpoStorageEntitySetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoStorageEntitySetCommand_instances, "m", _SpoStorageEntitySetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoStorageEntitySetCommand_instances, "m", _SpoStorageEntitySetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoStorageEntitySetCommand_instances, "m", _SpoStorageEntitySetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
+            let appCatalogUrl = args.options.appCatalogUrl;
+            if (!appCatalogUrl) {
+                appCatalogUrl = await spo.getTenantAppCatalogUrl(logger, this.debug);
+                if (!appCatalogUrl) {
+                    throw 'Tenant app catalog URL not found. Specify the URL of the app catalog site using the appCatalogUrl option.';
+                }
+            }
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
             const res = await spo.getRequestDigest(spoAdminUrl);
             if (this.verbose) {
-                await logger.logToStderr(`Setting tenant property ${args.options.key} in ${args.options.appCatalogUrl}...`);
+                await logger.logToStderr(`Setting tenant property ${args.options.key} in ${appCatalogUrl}...`);
             }
             const requestOptions = {
                 url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
                     'X-RequestDigest': res.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="24" ObjectPathId="23" /><ObjectPath Id="26" ObjectPathId="25" /><ObjectPath Id="28" ObjectPathId="27" /><Method Name="SetStorageEntity" Id="29" ObjectPathId="27"><Parameters><Parameter Type="String">${formatting.escapeXml(args.options.key)}</Parameter><Parameter Type="String">${formatting.escapeXml(args.options.value)}</Parameter><Parameter Type="String">${formatting.escapeXml(args.options.description || '')}</Parameter><Parameter Type="String">${formatting.escapeXml(args.options.comment || '')}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="23" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="25" ParentId="23" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(args.options.appCatalogUrl)}</Parameter></Parameters></Method><Property Id="27" ParentId="25" Name="RootWeb" /></ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="24" ObjectPathId="23" /><ObjectPath Id="26" ObjectPathId="25" /><ObjectPath Id="28" ObjectPathId="27" /><Method Name="SetStorageEntity" Id="29" ObjectPathId="27"><Parameters><Parameter Type="String">${formatting.escapeXml(args.options.key)}</Parameter><Parameter Type="String">${formatting.escapeXml(args.options.value)}</Parameter><Parameter Type="String">${formatting.escapeXml(args.options.description || '')}</Parameter><Parameter Type="String">${formatting.escapeXml(args.options.comment || '')}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="23" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="25" ParentId="23" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(appCatalogUrl)}</Parameter></Parameters></Method><Property Id="27" ParentId="25" Name="RootWeb" /></ObjectPaths></Request>`
             };
             const processQuery = await request.post(requestOptions);
             const json = JSON.parse(processQuery);
@@ -56,27 +68,5 @@ class SpoStorageEntitySetCommand extends SpoCommand {
         }
     }
 }
-_SpoStorageEntitySetCommand_instances = new WeakSet(), _SpoStorageEntitySetCommand_initTelemetry = function _SpoStorageEntitySetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            description: (!(!args.options.description)).toString(),
-            comment: (!(!args.options.comment)).toString()
-        });
-    });
-}, _SpoStorageEntitySetCommand_initOptions = function _SpoStorageEntitySetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --appCatalogUrl <appCatalogUrl>'
-    }, {
-        option: '-k, --key <key>'
-    }, {
-        option: '-v, --value <value>'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '-c, --comment [comment]'
-    });
-}, _SpoStorageEntitySetCommand_initValidators = function _SpoStorageEntitySetCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.appCatalogUrl));
-};
 export default new SpoStorageEntitySetCommand();
 //# sourceMappingURL=storageentity-set.js.map

package/dist/m365/spo/commands/tenant/tenant-appcatalog-add.js

@@ -73,7 +73,7 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand {
             }
             const siteRemoveOptions = {
                 url: url,
-                skipRecycleBin: true,
+                permanent: true,
                 wait: true,
                 force: true,
                 verbose: this.verbose,

package/dist/m365/spo/commands/user/user-ensure.js

@@ -1,15 +1,22 @@
-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 _SpoUserEnsureCommand_instances, _SpoUserEnsureCommand_initTelemetry, _SpoUserEnsureCommand_initOptions, _SpoUserEnsureCommand_initValidators, _SpoUserEnsureCommand_initOptionSets, _SpoUserEnsureCommand_initTypes;
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { entraUser } from '../../../../utils/entraUser.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().refine(webUrl => validation.isValidSharePointUrl(webUrl) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    entraId: z.string().refine(id => validation.isValidGuid(id), { error: e => `${e.input} is not a valid GUID.` }).optional(),
+    userName: z.string().refine(userName => validation.isValidUserPrincipalName(userName), { error: e => `${e.input} is not a valid userName.` }).optional(),
+    loginName: 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()
+});
 class SpoUserEnsureCommand extends SpoCommand {
     get name() {
         return commands.USER_ENSURE;
@@ -17,14 +24,17 @@ class SpoUserEnsureCommand extends SpoCommand {
     get description() {
         return 'Ensures that a user is available on a specific site';
     }
-    constructor() {
-        super();
-        _SpoUserEnsureCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoUserEnsureCommand_instances, "m", _SpoUserEnsureCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoUserEnsureCommand_instances, "m", _SpoUserEnsureCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoUserEnsureCommand_instances, "m", _SpoUserEnsureCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoUserEnsureCommand_instances, "m", _SpoUserEnsureCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpoUserEnsureCommand_instances, "m", _SpoUserEnsureCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(opts => [opts.entraId, opts.userName, opts.loginName, opts.entraGroupId, opts.entraGroupName].filter(value => value !== undefined).length === 1, {
+            error: 'Specify one of the following options: entraId, userName, loginName, entraGroupId, entraGroupName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['entraId', 'userName', 'loginName', 'entraGroupId', 'entraGroupName']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -73,51 +83,5 @@ class SpoUserEnsureCommand extends SpoCommand {
         return entraGroup.getGroupByDisplayName(entraGroupName);
     }
 }
-_SpoUserEnsureCommand_instances = new WeakSet(), _SpoUserEnsureCommand_initTelemetry = function _SpoUserEnsureCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            entraId: typeof args.options.entraId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            loginName: typeof args.options.loginName !== 'undefined',
-            entraGroupId: typeof args.options.entraGroupId !== 'undefined',
-            entraGroupName: typeof args.options.entraGroupName !== 'undefined'
-        });
-    });
-}, _SpoUserEnsureCommand_initOptions = function _SpoUserEnsureCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--entraId [entraId]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '--loginName [loginName]'
-    }, {
-        option: '--entraGroupId [entraGroupId]'
-    }, {
-        option: '--entraGroupName [entraGroupName]'
-    });
-}, _SpoUserEnsureCommand_initValidators = function _SpoUserEnsureCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.entraId && !validation.isValidGuid(args.options.entraId)) {
-            return `${args.options.entraId} is not a valid GUID.`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid userName.`;
-        }
-        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
-            return `${args.options.entraGroupId} is not a valid GUID for option 'entraGroupId'.`;
-        }
-        return true;
-    });
-}, _SpoUserEnsureCommand_initOptionSets = function _SpoUserEnsureCommand_initOptionSets() {
-    this.optionSets.push({ options: ['entraId', 'userName', 'loginName', 'entraGroupId', 'entraGroupName'] });
-}, _SpoUserEnsureCommand_initTypes = function _SpoUserEnsureCommand_initTypes() {
-    this.types.string.push('webUrl', 'entraId', 'userName', 'loginName', 'entraGroupId', 'entraGroupName');
-};
 export default new SpoUserEnsureCommand();
 //# sourceMappingURL=user-ensure.js.map

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

@@ -1,15 +1,23 @@
-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 _SpoUserGetCommand_instances, _SpoUserGetCommand_initTelemetry, _SpoUserGetCommand_initOptions, _SpoUserGetCommand_initTypes, _SpoUserGetCommand_initValidators, _SpoUserGetCommand_initOptionSets;
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.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 { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().refine(webUrl => validation.isValidSharePointUrl(webUrl) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    id: z.number().int().positive().optional().alias('i'),
+    email: z.string().refine(email => validation.isValidUserPrincipalName(email), { error: e => `${e.input} is not a valid email.` }).optional(),
+    loginName: z.string().optional(),
+    userName: z.string().refine(userName => validation.isValidUserPrincipalName(userName), { error: e => `${e.input} is not a valid userName.` }).optional(),
+    entraGroupId: z.string().refine(id => validation.isValidGuid(id), { error: e => `${e.input} is not a valid GUID.` }).optional(),
+    entraGroupName: z.string().optional()
+});
 class SpoUserGetCommand extends SpoCommand {
     get name() {
         return commands.USER_GET;
@@ -17,14 +25,17 @@ class SpoUserGetCommand extends SpoCommand {
     get description() {
         return 'Gets a site user within specific web';
     }
-    constructor() {
-        super();
-        _SpoUserGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoUserGetCommand_instances, "m", _SpoUserGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoUserGetCommand_instances, "m", _SpoUserGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoUserGetCommand_instances, "m", _SpoUserGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoUserGetCommand_instances, "m", _SpoUserGetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpoUserGetCommand_instances, "m", _SpoUserGetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(opts => [opts.id, opts.email, opts.loginName, opts.userName, opts.entraGroupId, opts.entraGroupName].filter(value => value !== undefined).length <= 1, {
+            error: 'Specify no more than one of the following options: id, email, loginName, userName, entraGroupId, entraGroupName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'email', 'loginName', 'userName', 'entraGroupId', 'entraGroupName']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -96,56 +107,5 @@ class SpoUserGetCommand extends SpoCommand {
         return entraGroup.getGroupByDisplayName(entraGroupName);
     }
 }
-_SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry = function _SpoUserGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            email: typeof args.options.email !== 'undefined',
-            loginName: typeof args.options.loginName !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            entraGroupId: typeof args.options.entraGroupId !== 'undefined',
-            entraGroupName: typeof args.options.entraGroupName !== 'undefined'
-        });
-    });
-}, _SpoUserGetCommand_initOptions = function _SpoUserGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '--email [email]'
-    }, {
-        option: '--loginName [loginName]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '--entraGroupId [entraGroupId]'
-    }, {
-        option: '--entraGroupName [entraGroupName]'
-    });
-}, _SpoUserGetCommand_initTypes = function _SpoUserGetCommand_initTypes() {
-    this.types.string.push('webUrl', 'email', 'loginName', 'userName', 'entraGroupId', 'entraGroupName');
-}, _SpoUserGetCommand_initValidators = function _SpoUserGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidPositiveInteger(args.options.id)) {
-            return `Specified id ${args.options.id} is not a valid number.`;
-        }
-        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
-            return `${args.options.entraGroupId} is not a valid GUID.`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid userName.`;
-        }
-        if (args.options.email && !validation.isValidUserPrincipalName(args.options.email)) {
-            return `${args.options.email} is not a valid email.`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-}, _SpoUserGetCommand_initOptionSets = function _SpoUserGetCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['id', 'email', 'loginName', 'userName', 'entraGroupId', 'entraGroupName'],
-        runsWhen: (args) => args.options.id || args.options.email || args.options.loginName || args.options.userName || args.options.entraGroupId || args.options.entraGroupName
-    });
-};
 export default new SpoUserGetCommand();
 //# sourceMappingURL=user-get.js.map

package/dist/m365/spo/commands/user/user-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 _SpoUserListCommand_instances, _SpoUserListCommand_initOptions, _SpoUserListCommand_initValidators;
+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';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().refine(webUrl => validation.isValidSharePointUrl(webUrl) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).alias('u')
+});
 class SpoUserListCommand extends SpoCommand {
     get name() {
         return commands.USER_LIST;
@@ -18,11 +20,8 @@ class SpoUserListCommand extends SpoCommand {
     defaultProperties() {
         return ['Id', 'Title', 'LoginName'];
     }
-    constructor() {
-        super();
-        _SpoUserListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoUserListCommand_instances, "m", _SpoUserListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoUserListCommand_instances, "m", _SpoUserListCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -45,12 +44,5 @@ class SpoUserListCommand extends SpoCommand {
         }
     }
 }
-_SpoUserListCommand_instances = new WeakSet(), _SpoUserListCommand_initOptions = function _SpoUserListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    });
-}, _SpoUserListCommand_initValidators = function _SpoUserListCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
-};
 export default new SpoUserListCommand();
 //# sourceMappingURL=user-list.js.map

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

@@ -1,10 +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 _SpoUserRemoveCommand_instances, _SpoUserRemoveCommand_initTelemetry, _SpoUserRemoveCommand_initOptions, _SpoUserRemoveCommand_initValidators, _SpoUserRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import { spo } from '../../../../utils/spo.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
@@ -12,6 +7,20 @@ import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string().refine(webUrl => validation.isValidSharePointUrl(webUrl) === true, {
+        error: e => `${e.input} is not a valid SharePoint Online site URL.`
+    }).alias('u'),
+    id: z.number().int().positive().optional().alias('i'),
+    loginName: z.string().optional(),
+    email: z.string().refine(email => validation.isValidUserPrincipalName(email), { error: e => `${e.input} is not a valid email.` }).optional(),
+    userName: z.string().refine(userName => validation.isValidUserPrincipalName(userName), { error: e => `${e.input} is not a valid userName.` }).optional(),
+    entraGroupId: z.string().refine(id => validation.isValidGuid(id), { error: e => `${e.input} is not a valid GUID.` }).optional(),
+    entraGroupName: z.string().optional(),
+    force: z.boolean().optional().alias('f')
+});
 ;
 class SpoUserRemoveCommand extends SpoCommand {
     get name() {
@@ -20,13 +29,17 @@ class SpoUserRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes user from specific web';
     }
-    constructor() {
-        super();
-        _SpoUserRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoUserRemoveCommand_instances, "m", _SpoUserRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoUserRemoveCommand_instances, "m", _SpoUserRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoUserRemoveCommand_instances, "m", _SpoUserRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoUserRemoveCommand_instances, "m", _SpoUserRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema.refine(opts => [opts.id, opts.loginName, opts.email, opts.userName, opts.entraGroupId, opts.entraGroupName].filter(value => value !== undefined).length === 1, {
+            error: 'Specify one of the following options: id, loginName, email, userName, entraGroupId, entraGroupName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'loginName', 'email', 'userName', 'entraGroupId', 'entraGroupName']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (args.options.force) {
@@ -109,60 +122,5 @@ class SpoUserRemoveCommand extends SpoCommand {
         return options.entraGroupId ? await entraGroup.getGroupById(options.entraGroupId) : await entraGroup.getGroupByDisplayName(options.entraGroupName);
     }
 }
-_SpoUserRemoveCommand_instances = new WeakSet(), _SpoUserRemoveCommand_initTelemetry = function _SpoUserRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            loginName: typeof args.options.loginName !== 'undefined',
-            email: typeof args.options.email !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            entraGroupId: typeof args.options.entraGroupId !== 'undefined',
-            entraGroupName: typeof args.options.entraGroupName !== 'undefined',
-            force: !!args.options.force
-        });
-    });
-}, _SpoUserRemoveCommand_initOptions = function _SpoUserRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '--loginName [loginName]'
-    }, {
-        option: '--email [email]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '--entraGroupId [entraGroupId]'
-    }, {
-        option: '--entraGroupName [entraGroupName]'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoUserRemoveCommand_initValidators = function _SpoUserRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.id && isNaN(parseInt(args.options.id))) {
-            return `Specified id ${args.options.id} is not a number`;
-        }
-        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
-            return `${args.options.entraId} is not a valid GUID.`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid userName.`;
-        }
-        if (args.options.email && !validation.isValidUserPrincipalName(args.options.email)) {
-            return `${args.options.email} is not a valid email.`;
-        }
-        return true;
-    });
-}, _SpoUserRemoveCommand_initOptionSets = function _SpoUserRemoveCommand_initOptionSets() {
-    this.optionSets.push({
-        options: ['id', 'loginName', 'email', 'userName', 'entraGroupId', 'entraGroupName']
-    });
-};
 export default new SpoUserRemoveCommand();
 //# sourceMappingURL=user-remove.js.map