@pnp/cli-microsoft365 12.0.0-beta.e4f7675 → 12.0.0-beta.feb621e

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

@@ -1,16 +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 _SpoHubSiteSetCommand_instances, _SpoHubSiteSetCommand_initTelemetry, _SpoHubSiteSetCommand_initOptions, _SpoHubSiteSetCommand_initValidators, _SpoHubSiteSetCommand_initTypes;
+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,
+    id: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} is not a valid GUID`
+    }).alias('i'),
+    title: z.string().optional().alias('t'),
+    description: z.string().optional().alias('d'),
+    logoUrl: z.string().optional().alias('l')
+});
 class SpoHubSiteSetCommand extends SpoCommand {
     get name() {
         return commands.HUBSITE_SET;
@@ -18,13 +23,14 @@ class SpoHubSiteSetCommand extends SpoCommand {
     get description() {
         return 'Updates properties of the specified hub site';
     }
-    constructor() {
-        super();
-        _SpoHubSiteSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHubSiteSetCommand_instances, "m", _SpoHubSiteSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteSetCommand_instances, "m", _SpoHubSiteSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteSetCommand_instances, "m", _SpoHubSiteSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteSetCommand_instances, "m", _SpoHubSiteSetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => opts.title !== undefined || opts.description !== undefined || opts.logoUrl !== undefined, {
+            error: 'Specify title, description or logoUrl to update'
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -62,38 +68,5 @@ class SpoHubSiteSetCommand extends SpoCommand {
         }
     }
 }
-_SpoHubSiteSetCommand_instances = new WeakSet(), _SpoHubSiteSetCommand_initTelemetry = function _SpoHubSiteSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            title: typeof args.options.title === 'string',
-            description: typeof args.options.description === 'string',
-            logoUrl: typeof args.options.logoUrl === 'string'
-        });
-    });
-}, _SpoHubSiteSetCommand_initOptions = function _SpoHubSiteSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '-d, --description [description]'
-    }, {
-        option: '-l, --logoUrl [logoUrl]'
-    });
-}, _SpoHubSiteSetCommand_initValidators = function _SpoHubSiteSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (!args.options.title &&
-            !args.options.description &&
-            !args.options.logoUrl) {
-            return 'Specify title, description or logoUrl to update';
-        }
-        return true;
-    });
-}, _SpoHubSiteSetCommand_initTypes = function _SpoHubSiteSetCommand_initTypes() {
-    this.types.string.push('t', 'title', 'd', 'description', 'l', 'logoUrl');
-};
 export default new SpoHubSiteSetCommand();
 //# sourceMappingURL=hubsite-set.js.map

package/dist/m365/spo/commands/hubsite/hubsite-unregister.js

@@ -1,15 +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 _SpoHubSiteUnregisterCommand_instances, _SpoHubSiteUnregisterCommand_initTelemetry, _SpoHubSiteUnregisterCommand_initOptions, _SpoHubSiteUnregisterCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+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';
+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 SpoHubSiteUnregisterCommand extends SpoCommand {
     get name() {
         return commands.HUBSITE_UNREGISTER;
@@ -17,12 +20,8 @@ class SpoHubSiteUnregisterCommand extends SpoCommand {
     get description() {
         return 'Unregisters the specified site collection as a hub site';
     }
-    constructor() {
-        super();
-        _SpoHubSiteUnregisterCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHubSiteUnregisterCommand_instances, "m", _SpoHubSiteUnregisterCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteUnregisterCommand_instances, "m", _SpoHubSiteUnregisterCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteUnregisterCommand_instances, "m", _SpoHubSiteUnregisterCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         const unregisterHubSite = async () => {
@@ -56,20 +55,5 @@ class SpoHubSiteUnregisterCommand extends SpoCommand {
         }
     }
 }
-_SpoHubSiteUnregisterCommand_instances = new WeakSet(), _SpoHubSiteUnregisterCommand_initTelemetry = function _SpoHubSiteUnregisterCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            force: args.options.force || false
-        });
-    });
-}, _SpoHubSiteUnregisterCommand_initOptions = function _SpoHubSiteUnregisterCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --url <url>'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoHubSiteUnregisterCommand_initValidators = function _SpoHubSiteUnregisterCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
-};
 export default new SpoHubSiteUnregisterCommand();
 //# sourceMappingURL=hubsite-unregister.js.map

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

@@ -38,7 +38,7 @@ class SpoListRemoveCommand extends SpoCommand {
             else {
                 requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting.encodeQueryParameter(args.options.title)}')`;
             }
-            if (args.options.recycle) {
+            if (!args.options.permanent) {
                 requestUrl += `/recycle`;
             }
             const requestOptions = {
@@ -75,7 +75,7 @@ _SpoListRemoveCommand_instances = new WeakSet(), _SpoListRemoveCommand_initTelem
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined',
             force: !!args.options.force,
-            recycle: !!args.options.recycle
+            permanent: !!args.options.permanent
         });
     });
 }, _SpoListRemoveCommand_initOptions = function _SpoListRemoveCommand_initOptions() {
@@ -86,7 +86,7 @@ _SpoListRemoveCommand_instances = new WeakSet(), _SpoListRemoveCommand_initTelem
     }, {
         option: '-t, --title [title]'
     }, {
-        option: '--recycle'
+        option: '--permanent'
     }, {
         option: '-f, --force'
     });
@@ -106,7 +106,7 @@ _SpoListRemoveCommand_instances = new WeakSet(), _SpoListRemoveCommand_initTelem
     this.optionSets.push({ options: ['id', 'title'] });
 }, _SpoListRemoveCommand_initTypes = function _SpoListRemoveCommand_initTypes() {
     this.types.string.push('id', 'title', 'webUrl');
-    this.types.boolean.push('force', 'recycle');
+    this.types.boolean.push('force', 'permanent');
 };
 export default new SpoListRemoveCommand();
 //# sourceMappingURL=list-remove.js.map

package/dist/m365/spo/commands/listitem/listitem-batch-remove.js

@@ -56,7 +56,7 @@ class SpoListItemBatchRemoveCommand extends SpoCommand {
             await removeListItems();
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the list items from list ${args.options.listId || args.options.listTitle || args.options.listUrl} located in site ${args.options.webUrl}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to ${args.options.permanent ? 'permanently remove' : 'recycle'} the list items from list ${args.options.listId || args.options.listTitle || args.options.listUrl} located in site ${args.options.webUrl}?` });
             if (result) {
                 await removeListItems();
             }
@@ -142,7 +142,7 @@ class SpoListItemBatchRemoveCommand extends SpoCommand {
             requestUrl += `GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
         }
         requestUrl += `/items(${item})`;
-        if (options.recycle) {
+        if (!options.permanent) {
             requestUrl += '/recycle()';
         }
         return requestUrl;
@@ -156,7 +156,7 @@ _SpoListItemBatchRemoveCommand_instances = new WeakSet(), _SpoListItemBatchRemov
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
-            recycle: !!args.options.recycle,
+            permanent: !!args.options.permanent,
             force: !!args.options.force
         });
     });
@@ -174,7 +174,7 @@ _SpoListItemBatchRemoveCommand_instances = new WeakSet(), _SpoListItemBatchRemov
     }, {
         option: '-i, --ids [ids]'
     }, {
-        option: '-r, --recycle'
+        option: '--permanent'
     }, {
         option: '-f, --force'
     });
@@ -213,6 +213,7 @@ _SpoListItemBatchRemoveCommand_instances = new WeakSet(), _SpoListItemBatchRemov
     });
 }, _SpoListItemBatchRemoveCommand_initTypes = function _SpoListItemBatchRemoveCommand_initTypes() {
     this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl', 'ids', 'filePath');
+    this.types.boolean.push('permanent', 'force');
 }, _SpoListItemBatchRemoveCommand_initOptionSets = function _SpoListItemBatchRemoveCommand_initOptionSets() {
     this.optionSets.push({
         options: ['listId', 'listTitle', 'listUrl']

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

@@ -11,9 +11,6 @@ import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 class SpoListItemGetCommand extends SpoCommand {
-    allowUnknownOptions() {
-        return true;
-    }
     get name() {
         return commands.LISTITEM_GET;
     }
@@ -30,12 +27,6 @@ class SpoListItemGetCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoListItemGetCommand_instances, "m", _SpoListItemGetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        if (args.options.properties) {
-            await this.warn(logger, `Option 'properties' is deprecated. Please use 'fields' instead.`);
-            if (!args.options.fields) {
-                args.options.fields = args.options.properties;
-            }
-        }
         let requestUrl = `${args.options.webUrl}/_api/web`;
         if (args.options.listId) {
             requestUrl += `/lists(guid'${formatting.encodeQueryParameter(args.options.listId)}')`;
@@ -109,8 +100,6 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
         option: '--listUrl [listUrl]'
     }, {
         option: '--fields [fields]'
-    }, {
-        option: '-p, --properties [properties]'
     }, {
         option: '--withPermissions'
     });
@@ -135,7 +124,7 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
         return true;
     });
 }, _SpoListItemGetCommand_initTypes = function _SpoListItemGetCommand_initTypes() {
-    this.types.string.push('webUrl', 'listId', 'listTitle', 'id', 'uniqueId', 'fields', 'properties');
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'id', 'uniqueId', 'fields');
 }, _SpoListItemGetCommand_initOptionSets = function _SpoListItemGetCommand_initOptionSets() {
     this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['id', 'uniqueId'] });
 };

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

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoListItemRemoveCommand_instances, _SpoListItemRemoveCommand_initTelemetry, _SpoListItemRemoveCommand_initOptions, _SpoListItemRemoveCommand_initValidators, _SpoListItemRemoveCommand_initOptionSets;
+var _SpoListItemRemoveCommand_instances, _SpoListItemRemoveCommand_initTelemetry, _SpoListItemRemoveCommand_initOptions, _SpoListItemRemoveCommand_initValidators, _SpoListItemRemoveCommand_initOptionSets, _SpoListItemRemoveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -25,6 +25,7 @@ class SpoListItemRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoListItemRemoveCommand_instances, "m", _SpoListItemRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListItemRemoveCommand_instances, "m", _SpoListItemRemoveCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListItemRemoveCommand_instances, "m", _SpoListItemRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoListItemRemoveCommand_instances, "m", _SpoListItemRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const removeListItem = async () => {
@@ -43,7 +44,7 @@ class SpoListItemRemoveCommand extends SpoCommand {
                 requestUrl += `/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
             }
             requestUrl += `/items(${args.options.id})`;
-            if (args.options.recycle) {
+            if (!args.options.permanent) {
                 requestUrl += `/recycle()`;
             }
             const requestOptions = {
@@ -68,7 +69,7 @@ class SpoListItemRemoveCommand extends SpoCommand {
             await removeListItem();
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the list item ${args.options.id} from list ${args.options.listId || args.options.listTitle || args.options.listUrl} located in site ${args.options.webUrl}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to ${args.options.permanent ? 'permanently remove' : 'recycle'} the list item ${args.options.id} from list ${args.options.listId || args.options.listTitle || args.options.listUrl} located in site ${args.options.webUrl}?` });
             if (result) {
                 await removeListItem();
             }
@@ -81,7 +82,7 @@ _SpoListItemRemoveCommand_instances = new WeakSet(), _SpoListItemRemoveCommand_i
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
-            recycle: !!args.options.recycle,
+            permanent: !!args.options.permanent,
             force: !!args.options.force
         });
     });
@@ -97,7 +98,7 @@ _SpoListItemRemoveCommand_instances = new WeakSet(), _SpoListItemRemoveCommand_i
     }, {
         option: '--listUrl [listUrl]'
     }, {
-        option: '--recycle'
+        option: '--permanent'
     }, {
         option: '-f, --force'
     });
@@ -119,6 +120,8 @@ _SpoListItemRemoveCommand_instances = new WeakSet(), _SpoListItemRemoveCommand_i
     });
 }, _SpoListItemRemoveCommand_initOptionSets = function _SpoListItemRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
+}, _SpoListItemRemoveCommand_initTypes = function _SpoListItemRemoveCommand_initTypes() {
+    this.types.boolean.push('permanent', 'force');
 };
 export default new SpoListItemRemoveCommand();
 //# sourceMappingURL=listitem-remove.js.map

package/dist/m365/spo/commands/navigation/navigation-node-list.js

@@ -1,6 +1,6 @@
 import { globalOptionsZod } from '../../../../Command.js';
 import { z } from 'zod';
-import { odata } from '../../../../utils/odata.js';
+import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
@@ -21,7 +21,7 @@ class SpoNavigationNodeListCommand extends SpoCommand {
         return 'Lists nodes from the specified site navigation';
     }
     defaultProperties() {
-        return ['Id', 'Title', 'Url'];
+        return ['Key', 'Title', 'SimpleUrl'];
     }
     get schema() {
         return options;
@@ -31,8 +31,10 @@ class SpoNavigationNodeListCommand extends SpoCommand {
             await logger.logToStderr(`Retrieving navigation nodes...`);
         }
         try {
-            const res = await odata.getAllItems(`${args.options.webUrl}/_api/web/navigation/${args.options.location.toLowerCase()}?$expand=Children,Children/Children,Children/Children/Children`);
-            await logger.log(res);
+            const menuState = args.options.location === 'TopNavigationBar'
+                ? await spo.getTopNavigationMenuState(args.options.webUrl)
+                : await spo.getQuickLaunchMenuState(args.options.webUrl);
+            await logger.log(menuState.Nodes);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -58,12 +58,12 @@ class SpoPageRemoveCommand extends SpoCommand {
             if (args.options.bypassSharedLock) {
                 requestOptions.headers.Prefer = 'bypass-shared-lock';
             }
-            if (args.options.recycle) {
-                requestOptions.url += '/Recycle';
-                await request.post(requestOptions);
+            if (args.options.permanent) {
+                await request.delete(requestOptions);
             }
             else {
-                await request.delete(requestOptions);
+                requestOptions.url += '/Recycle';
+                await request.post(requestOptions);
             }
         }
         catch (err) {
@@ -75,7 +75,7 @@ _SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initTelem
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             force: !!args.options.force,
-            recycle: !!args.options.recycle,
+            permanent: !!args.options.permanent,
             bypassSharedLock: !!args.options.bypassSharedLock
         });
     });
@@ -85,7 +85,7 @@ _SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initTelem
     }, {
         option: '-n, --name <name>'
     }, {
-        option: '--recycle'
+        option: '--permanent'
     }, {
         option: '--bypassSharedLock'
     }, {
@@ -95,7 +95,7 @@ _SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initTelem
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
 }, _SpoPageRemoveCommand_initTypes = function _SpoPageRemoveCommand_initTypes() {
     this.types.string.push('name', 'webUrl');
-    this.types.boolean.push('force', 'bypassSharedLock', 'recycle');
+    this.types.boolean.push('force', 'bypassSharedLock', 'permanent');
 };
 export default new SpoPageRemoveCommand();
 //# sourceMappingURL=page-remove.js.map

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

@@ -71,7 +71,7 @@ class SpoSiteRemoveCommand extends SpoCommand {
                 }
                 if (isGroupSite) {
                     await this.deleteGroupifiedSite(logger, siteUrl);
-                    if (options.skipRecycleBin) {
+                    if (options.permanent) {
                         let isGroupInRecycleBin = await this.isGroupInEntraRecycleBin(logger, siteDetails.GroupId);
                         let amountOfPolls = 0;
                         while (!isGroupInRecycleBin && amountOfPolls < 20) {
@@ -87,7 +87,7 @@ class SpoSiteRemoveCommand extends SpoCommand {
                 else {
                     await this.deleteNonGroupSite(logger, siteUrl);
                 }
-                if (options.skipRecycleBin) {
+                if (options.permanent) {
                     await this.deleteSiteFromSharePointRecycleBin(logger, siteUrl);
                 }
             }
@@ -191,7 +191,7 @@ class SpoSiteRemoveCommand extends SpoCommand {
 _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelemetry = function _SpoSiteRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            skipRecycleBin: !!args.options.skipRecycleBin,
+            permanent: !!args.options.permanent,
             fromRecycleBin: !!args.options.fromRecycleBin,
             force: !!args.options.force
         });
@@ -200,7 +200,7 @@ _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelem
     this.options.unshift({
         option: '-u, --url <url>'
     }, {
-        option: '--skipRecycleBin'
+        option: '--permanent'
     }, {
         option: '--fromRecycleBin'
     }, {
@@ -217,14 +217,14 @@ _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelem
         if (rootUrl.toLowerCase() === urlUtil.removeTrailingSlashes(args.options.url.toLowerCase())) {
             return `The root site cannot be deleted.`;
         }
-        if (args.options.fromRecycleBin && args.options.skipRecycleBin) {
-            return 'Specify either fromRecycleBin or skipRecycleBin, but not both.';
+        if (args.options.fromRecycleBin && args.options.permanent) {
+            return 'Specify either fromRecycleBin or permanent, but not both.';
         }
         return true;
     });
 }, _SpoSiteRemoveCommand_initTypes = function _SpoSiteRemoveCommand_initTypes() {
     this.types.string.push('url');
-    this.types.boolean.push('skipRecycleBin', 'fromRecycleBin', 'force');
+    this.types.boolean.push('permanent', 'fromRecycleBin', 'force');
 };
 export default new SpoSiteRemoveCommand();
 //# sourceMappingURL=site-remove.js.map

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

@@ -1,6 +1,8 @@
 import auth from '../../../Auth.js';
+import { globalOptionsZod } from '../../../Command.js';
 import SpoCommand from '../../base/SpoCommand.js';
 import commands from '../commands.js';
+export const options = globalOptionsZod.strict();
 class SpoGetCommand extends SpoCommand {
     get name() {
         return commands.GET;
@@ -8,6 +10,9 @@ class SpoGetCommand extends SpoCommand {
     get description() {
         return 'Gets the context URL for the root SharePoint site collection and SharePoint tenant admin site';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         const spoContext = {
             SpoUrl: auth.connection.spoUrl ? auth.connection.spoUrl : ''

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

@@ -1,14 +1,16 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoSetCommand_instances, _SpoSetCommand_initOptions, _SpoSetCommand_initValidators, _SpoSetCommand_initTypes;
 import auth from '../../../Auth.js';
+import { globalOptionsZod } from '../../../Command.js';
 import { urlUtil } from '../../../utils/urlUtil.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,
+    url: z.string().alias('u').refine(url => validation.isValidSharePointUrl(url) === true, {
+        message: 'Specify a valid SharePoint URL'
+    })
+});
 class SpoSetCommand extends SpoCommand {
     get name() {
         return commands.SET;
@@ -16,12 +18,8 @@ class SpoSetCommand extends SpoCommand {
     get description() {
         return 'Sets the URL of the root SharePoint site collection for use in SPO commands';
     }
-    constructor() {
-        super();
-        _SpoSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoSetCommand_instances, "m", _SpoSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoSetCommand_instances, "m", _SpoSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoSetCommand_instances, "m", _SpoSetCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         auth.connection.spoUrl = urlUtil.removeTrailingSlashes(args.options.url);
@@ -33,14 +31,5 @@ class SpoSetCommand extends SpoCommand {
         }
     }
 }
-_SpoSetCommand_instances = new WeakSet(), _SpoSetCommand_initOptions = function _SpoSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --url <url>'
-    });
-}, _SpoSetCommand_initValidators = function _SpoSetCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
-}, _SpoSetCommand_initTypes = function _SpoSetCommand_initTypes() {
-    this.types.string.push('url');
-};
 export default new SpoSetCommand();
 //# sourceMappingURL=spo-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