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

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

@@ -34,7 +34,7 @@ class SpoFolderRemoveCommand extends SpoCommand {
             await this.removeFolder(logger, args.options);
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the folder ${args.options.url} 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 folder ${args.options.url} located in site ${args.options.webUrl}?` });
             if (result) {
                 await this.removeFolder(logger, args.options);
             }
@@ -46,7 +46,7 @@ class SpoFolderRemoveCommand extends SpoCommand {
         }
         const serverRelativePath = urlUtil.getServerRelativePath(options.webUrl, options.url);
         let requestUrl = `${options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')`;
-        if (options.recycle) {
+        if (!options.permanent) {
             requestUrl += `/recycle()`;
         }
         const requestOptions = {
@@ -70,7 +70,7 @@ class SpoFolderRemoveCommand extends SpoCommand {
 _SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initTelemetry = function _SpoFolderRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            recycle: !!args.options.recycle,
+            permanent: !!args.options.permanent,
             force: !!args.options.force
         });
     });
@@ -80,7 +80,7 @@ _SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initT
     }, {
         option: '--url <url>'
     }, {
-        option: '--recycle'
+        option: '--permanent'
     }, {
         option: '-f, --force'
     });
@@ -88,7 +88,7 @@ _SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initT
     this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
 }, _SpoFolderRemoveCommand_initTypes = function _SpoFolderRemoveCommand_initTypes() {
     this.types.string.push('webUrl', 'url');
-    this.types.boolean.push('recycle', 'force');
+    this.types.boolean.push('permanent', 'force');
 };
 export default new SpoFolderRemoveCommand();
 //# sourceMappingURL=folder-remove.js.map

package/dist/m365/spo/commands/folder/folder-unarchive.js

@@ -0,0 +1,90 @@
+import commands from '../../commands.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+import { validation } from '../../../../utils/validation.js';
+import { cli } from '../../../../cli/cli.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.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'),
+    url: z.string().optional(),
+    id: z.uuid().optional().alias('i'),
+    force: z.boolean().optional().alias('f')
+});
+class SpoFolderUnarchiveCommand extends SpoCommand {
+    get name() {
+        return commands.FOLDER_UNARCHIVE;
+    }
+    get description() {
+        return 'Unarchives a folder';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.url, options.id].filter(o => o !== undefined).length === 1, {
+            error: `Specify 'url' or 'id', but not both.`
+        });
+    }
+    getExcludedOptionsWithUrls() {
+        return ['url'];
+    }
+    async commandAction(logger, args) {
+        const { webUrl, url, id, force } = args.options;
+        const identifier = url || id;
+        if (!force) {
+            const result = await cli.promptForConfirmation({ message: `Reactivation could take up to 24 hours. Folders that are reactivated cannot be archived again for a period of time. Are you sure you would like to unarchive this folder?` });
+            if (!result) {
+                return;
+            }
+        }
+        try {
+            if (this.verbose) {
+                await logger.logToStderr(`Unarchiving folder ${identifier} at site ${webUrl}...`);
+            }
+            let requestUrl = `${webUrl}/_api/web`;
+            if (id) {
+                requestUrl += `/GetFolderById('${formatting.encodeQueryParameter(id)}')`;
+            }
+            else if (url) {
+                const serverRelativePath = urlUtil.getServerRelativePath(webUrl, url);
+                requestUrl += `/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')`;
+            }
+            requestUrl += '?$select=Exists,ListItemAllFields/Id,ListItemAllFields/ParentList/Id&$expand=ListItemAllFields,ListItemAllFields/ParentList';
+            const folderInfo = await request.get({
+                url: requestUrl,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            });
+            if (!folderInfo.Exists) {
+                throw `The folder '${identifier}' does not exist.`;
+            }
+            if (!folderInfo.ListItemAllFields?.ParentList) {
+                throw `The folder '${identifier}' is the root folder of a document library and cannot be unarchived. Unarchive a subfolder instead.`;
+            }
+            const requestOptions = {
+                url: `${webUrl}/_api/Lists(guid'${folderInfo.ListItemAllFields.ParentList.Id}')/items(${folderInfo.ListItemAllFields.Id})/UnArchive`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new SpoFolderUnarchiveCommand();
+//# sourceMappingURL=folder-unarchive.js.map

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

@@ -1,7 +1,9 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod.strict();
 class SpoHideDefaultThemesGetCommand extends SpoCommand {
     get name() {
         return commands.HIDEDEFAULTTHEMES_GET;
@@ -9,6 +11,9 @@ class SpoHideDefaultThemesGetCommand extends SpoCommand {
     get description() {
         return 'Gets the current value of the HideDefaultThemes setting';
     }
+    get schema() {
+        return options;
+    }
     async commandAction(logger) {
         try {
             const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);

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

@@ -1,13 +1,13 @@
-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 _SpoHideDefaultThemesSetCommand_instances, _SpoHideDefaultThemesSetCommand_initTelemetry, _SpoHideDefaultThemesSetCommand_initOptions, _SpoHideDefaultThemesSetCommand_initTypes;
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { z } from 'zod';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    hideDefaultThemes: z.enum(['true', 'false']).transform(val => val === 'true')
+});
 class SpoHideDefaultThemesSetCommand extends SpoCommand {
     get name() {
         return commands.HIDEDEFAULTTHEMES_SET;
@@ -15,12 +15,8 @@ class SpoHideDefaultThemesSetCommand extends SpoCommand {
     get description() {
         return 'Sets the value of the HideDefaultThemes setting';
     }
-    constructor() {
-        super();
-        _SpoHideDefaultThemesSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHideDefaultThemesSetCommand_instances, "m", _SpoHideDefaultThemesSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoHideDefaultThemesSetCommand_instances, "m", _SpoHideDefaultThemesSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoHideDefaultThemesSetCommand_instances, "m", _SpoHideDefaultThemesSetCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -45,19 +41,5 @@ class SpoHideDefaultThemesSetCommand extends SpoCommand {
         }
     }
 }
-_SpoHideDefaultThemesSetCommand_instances = new WeakSet(), _SpoHideDefaultThemesSetCommand_initTelemetry = function _SpoHideDefaultThemesSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            hideDefaultThemes: args.options.hideDefaultThemes
-        });
-    });
-}, _SpoHideDefaultThemesSetCommand_initOptions = function _SpoHideDefaultThemesSetCommand_initOptions() {
-    this.options.unshift({
-        option: '--hideDefaultThemes <hideDefaultThemes>',
-        autocomplete: ['true', 'false']
-    });
-}, _SpoHideDefaultThemesSetCommand_initTypes = function _SpoHideDefaultThemesSetCommand_initTypes() {
-    this.types.boolean.push('hideDefaultThemes');
-};
 export default new SpoHideDefaultThemesSetCommand();
 //# sourceMappingURL=hidedefaultthemes-set.js.map

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

@@ -1,7 +1,9 @@
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = globalOptionsZod.strict();
 class SpoHomeSiteListCommand extends SpoCommand {
     get name() {
         return commands.HOMESITE_LIST;
@@ -9,6 +11,9 @@ class SpoHomeSiteListCommand extends SpoCommand {
     get description() {
         return 'Lists all home sites';
     }
+    get schema() {
+        return options;
+    }
     defaultProperties() {
         return ['Url', 'Title'];
     }

package/dist/m365/spo/commands/hubsite/hubsite-connect.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 _SpoHubSiteConnectCommand_instances, _SpoHubSiteConnectCommand_initTelemetry, _SpoHubSiteConnectCommand_initOptions, _SpoHubSiteConnectCommand_initOptionSets, _SpoHubSiteConnectCommand_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';
@@ -11,6 +7,23 @@ import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { cli } from '../../../../cli/cli.js';
 import { formatting } from '../../../../utils/formatting.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`
+    }).optional().alias('i'),
+    title: z.string().optional().alias('t'),
+    url: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    }).optional().alias('u'),
+    parentId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID`
+    }).optional(),
+    parentTitle: z.string().optional(),
+    parentUrl: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    }).optional()
+});
 class SpoHubSiteConnectCommand extends SpoCommand {
     get name() {
         return commands.HUBSITE_CONNECT;
@@ -18,13 +31,25 @@ class SpoHubSiteConnectCommand extends SpoCommand {
     get description() {
         return 'Connects a hub site to a parent hub site';
     }
-    constructor() {
-        super();
-        _SpoHubSiteConnectCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.title, opts.url].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'id', 'title', or 'url', but not multiple.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'title', 'url']
+            }
+        })
+            .refine(opts => [opts.parentId, opts.parentTitle, opts.parentUrl].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'parentId', 'parentTitle', or 'parentUrl', but not multiple.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['parentId', 'parentTitle', 'parentUrl']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -84,55 +109,5 @@ class SpoHubSiteConnectCommand extends SpoCommand {
         return filteredHubSites[0];
     }
 }
-_SpoHubSiteConnectCommand_instances = new WeakSet(), _SpoHubSiteConnectCommand_initTelemetry = function _SpoHubSiteConnectCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            title: typeof args.options.title !== 'undefined',
-            url: typeof args.options.url !== 'undefined',
-            parentId: typeof args.options.parentId !== 'undefined',
-            parentTitle: typeof args.options.parentTitle !== 'undefined',
-            parentUrl: typeof args.options.parentUrl !== 'undefined'
-        });
-    });
-}, _SpoHubSiteConnectCommand_initOptions = function _SpoHubSiteConnectCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '-u, --url [url]'
-    }, {
-        option: '--parentId [parentId]'
-    }, {
-        option: '--parentTitle [parentTitle]'
-    }, {
-        option: '--parentUrl [parentUrl]'
-    });
-}, _SpoHubSiteConnectCommand_initOptionSets = function _SpoHubSiteConnectCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title', 'url'] }, { options: ['parentId', 'parentTitle', 'parentUrl'] });
-}, _SpoHubSiteConnectCommand_initValidators = function _SpoHubSiteConnectCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `'${args.options.id}' is not a valid GUID`;
-        }
-        if (args.options.parentId && !validation.isValidGuid(args.options.parentId)) {
-            return `'${args.options.parentId}' is not a valid GUID`;
-        }
-        if (args.options.url) {
-            const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.url);
-            if (isValidSharePointUrl !== true) {
-                return isValidSharePointUrl;
-            }
-        }
-        if (args.options.parentUrl) {
-            const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.parentUrl);
-            if (isValidSharePointUrl !== true) {
-                return isValidSharePointUrl;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoHubSiteConnectCommand();
 //# sourceMappingURL=hubsite-connect.js.map

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

@@ -1,13 +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 _SpoHubSiteDataGetCommand_instances, _SpoHubSiteDataGetCommand_initTelemetry, _SpoHubSiteDataGetCommand_initOptions, _SpoHubSiteDataGetCommand_initValidators;
+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';
 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'),
+    forceRefresh: z.boolean().optional()
+});
 class SpoHubSiteDataGetCommand extends SpoCommand {
     get name() {
         return commands.HUBSITE_DATA_GET;
@@ -15,12 +18,8 @@ class SpoHubSiteDataGetCommand extends SpoCommand {
     get description() {
         return 'Gets hub site data for the specified site';
     }
-    constructor() {
-        super();
-        _SpoHubSiteDataGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHubSiteDataGetCommand_instances, "m", _SpoHubSiteDataGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteDataGetCommand_instances, "m", _SpoHubSiteDataGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteDataGetCommand_instances, "m", _SpoHubSiteDataGetCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -50,20 +49,5 @@ class SpoHubSiteDataGetCommand extends SpoCommand {
         }
     }
 }
-_SpoHubSiteDataGetCommand_instances = new WeakSet(), _SpoHubSiteDataGetCommand_initTelemetry = function _SpoHubSiteDataGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            forceRefresh: args.options.forceRefresh === true
-        });
-    });
-}, _SpoHubSiteDataGetCommand_initOptions = function _SpoHubSiteDataGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--forceRefresh'
-    });
-}, _SpoHubSiteDataGetCommand_initValidators = function _SpoHubSiteDataGetCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
-};
 export default new SpoHubSiteDataGetCommand();
 //# sourceMappingURL=hubsite-data-get.js.map

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

@@ -1,16 +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 _SpoHubSiteDisconnectCommand_instances, _SpoHubSiteDisconnectCommand_initTelemetry, _SpoHubSiteDisconnectCommand_initOptions, _SpoHubSiteDisconnectCommand_initOptionSets, _SpoHubSiteDisconnectCommand_initValidators;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.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`
+    }).optional().alias('i'),
+    title: z.string().optional().alias('t'),
+    url: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    }).optional().alias('u'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoHubSiteDisconnectCommand extends SpoCommand {
     get name() {
         return commands.HUBSITE_DISCONNECT;
@@ -18,13 +25,18 @@ class SpoHubSiteDisconnectCommand extends SpoCommand {
     get description() {
         return 'Disconnects a hub site from its parent hub site';
     }
-    constructor() {
-        super();
-        _SpoHubSiteDisconnectCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHubSiteDisconnectCommand_instances, "m", _SpoHubSiteDisconnectCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteDisconnectCommand_instances, "m", _SpoHubSiteDisconnectCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteDisconnectCommand_instances, "m", _SpoHubSiteDisconnectCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteDisconnectCommand_instances, "m", _SpoHubSiteDisconnectCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.title, opts.url].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'id', 'title', or 'url', but not multiple.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'title', 'url']
+            }
+        });
     }
     async commandAction(logger, args) {
         const disconnectHubSite = async () => {
@@ -94,39 +106,5 @@ class SpoHubSiteDisconnectCommand extends SpoCommand {
         return filteredHubSites[0];
     }
 }
-_SpoHubSiteDisconnectCommand_instances = new WeakSet(), _SpoHubSiteDisconnectCommand_initTelemetry = function _SpoHubSiteDisconnectCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            title: typeof args.options.title !== 'undefined',
-            url: typeof args.options.url !== 'undefined'
-        });
-    });
-}, _SpoHubSiteDisconnectCommand_initOptions = function _SpoHubSiteDisconnectCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --id [id]'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '-u, --url [url]'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoHubSiteDisconnectCommand_initOptionSets = function _SpoHubSiteDisconnectCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title', 'url'] });
-}, _SpoHubSiteDisconnectCommand_initValidators = function _SpoHubSiteDisconnectCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `'${args.options.id}' is not a valid GUID`;
-        }
-        if (args.options.url) {
-            const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.url);
-            if (isValidSharePointUrl !== true) {
-                return isValidSharePointUrl;
-            }
-        }
-        return true;
-    });
-};
 export default new SpoHubSiteDisconnectCommand();
 //# sourceMappingURL=hubsite-disconnect.js.map

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

@@ -1,10 +1,6 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoHubSiteGetCommand_instances, _SpoHubSiteGetCommand_initTelemetry, _SpoHubSiteGetCommand_initOptions, _SpoHubSiteGetCommand_initValidators, _SpoHubSiteGetCommand_initOptionSets;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
@@ -12,6 +8,17 @@ import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import spoListItemListCommand from '../listitem/listitem-list.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`
+    }).optional().alias('i'),
+    title: z.string().optional().alias('t'),
+    url: z.string().refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    }).optional().alias('u'),
+    withAssociatedSites: z.boolean().optional()
+});
 class SpoHubSiteGetCommand extends SpoCommand {
     get name() {
         return commands.HUBSITE_GET;
@@ -19,13 +26,18 @@ class SpoHubSiteGetCommand extends SpoCommand {
     get description() {
         return 'Gets information about the specified hub site';
     }
-    constructor() {
-        super();
-        _SpoHubSiteGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHubSiteGetCommand_instances, "m", _SpoHubSiteGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteGetCommand_instances, "m", _SpoHubSiteGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteGetCommand_instances, "m", _SpoHubSiteGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteGetCommand_instances, "m", _SpoHubSiteGetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.title, opts.url].filter(x => x !== undefined).length === 1, {
+            error: `Specify either 'id', 'title', or 'url', but not multiple.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'title', 'url']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -94,29 +106,5 @@ class SpoHubSiteGetCommand extends SpoCommand {
         return hubSites[0];
     }
 }
-_SpoHubSiteGetCommand_instances = new WeakSet(), _SpoHubSiteGetCommand_initTelemetry = function _SpoHubSiteGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            title: typeof args.options.title !== 'undefined',
-            url: typeof args.options.url !== 'undefined',
-            withAssociatedSites: args.options.withAssociatedSites === true
-        });
-    });
-}, _SpoHubSiteGetCommand_initOptions = function _SpoHubSiteGetCommand_initOptions() {
-    this.options.unshift({ option: '-i, --id [id]' }, { option: '-t, --title [title]' }, { option: '-u, --url [url]' }, { option: '--withAssociatedSites' });
-}, _SpoHubSiteGetCommand_initValidators = function _SpoHubSiteGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.url) {
-            return validation.isValidSharePointUrl(args.options.url);
-        }
-        return true;
-    });
-}, _SpoHubSiteGetCommand_initOptionSets = function _SpoHubSiteGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title', 'url'] });
-};
 export default new SpoHubSiteGetCommand();
 //# sourceMappingURL=hubsite-get.js.map

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

@@ -1,15 +1,19 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoHubSiteListCommand_instances, _SpoHubSiteListCommand_initTelemetry, _SpoHubSiteListCommand_initOptions;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import { spo } from '../../../../utils/spo.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    withAssociatedSites: z.boolean().optional()
+});
 class SpoHubSiteListCommand extends SpoCommand {
+    constructor() {
+        super(...arguments);
+        this.batchSize = 30;
+    }
     get name() {
         return commands.HUBSITE_LIST;
     }
@@ -19,13 +23,8 @@ class SpoHubSiteListCommand extends SpoCommand {
     defaultProperties() {
         return ['ID', 'SiteUrl', 'Title'];
     }
-    constructor() {
-        super();
-        _SpoHubSiteListCommand_instances.add(this);
-        this.batchSize = 30;
-        this.batchSize = 30;
-        __classPrivateFieldGet(this, _SpoHubSiteListCommand_instances, "m", _SpoHubSiteListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteListCommand_instances, "m", _SpoHubSiteListCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -101,16 +100,5 @@ class SpoHubSiteListCommand extends SpoCommand {
         }
     }
 }
-_SpoHubSiteListCommand_instances = new WeakSet(), _SpoHubSiteListCommand_initTelemetry = function _SpoHubSiteListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            withAssociatedSites: args.options.withAssociatedSites === true
-        });
-    });
-}, _SpoHubSiteListCommand_initOptions = function _SpoHubSiteListCommand_initOptions() {
-    this.options.unshift({
-        option: '--withAssociatedSites'
-    });
-};
 export default new SpoHubSiteListCommand();
 //# sourceMappingURL=hubsite-list.js.map