@pnp/cli-microsoft365 12.0.0-beta.10c5833 → 12.0.0-beta.1752794

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

@@ -1,16 +1,30 @@
-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 _SpoFieldRemoveCommand_instances, _SpoFieldRemoveCommand_initTelemetry, _SpoFieldRemoveCommand_initOptions, _SpoFieldRemoveCommand_initValidators, _SpoFieldRemoveCommand_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 { urlUtil } from '../../../../utils/urlUtil.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'),
+    listTitle: z.string().optional().alias('l'),
+    listId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} is not a valid GUID`
+    }).optional(),
+    listUrl: z.string().optional(),
+    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'),
+    internalName: z.string().optional(),
+    group: z.string().optional().alias('g'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoFieldRemoveCommand extends SpoCommand {
     get name() {
         return commands.FIELD_REMOVE;
@@ -18,13 +32,18 @@ class SpoFieldRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes the specified list- or site column';
     }
-    constructor() {
-        super();
-        _SpoFieldRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFieldRemoveCommand_instances, "m", _SpoFieldRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFieldRemoveCommand_instances, "m", _SpoFieldRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFieldRemoveCommand_instances, "m", _SpoFieldRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFieldRemoveCommand_instances, "m", _SpoFieldRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.title, opts.internalName, opts.group].filter(o => o !== undefined).length === 1, {
+            error: 'Specify one of the following options: id, title, internalName, group.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'title', 'internalName', 'group']
+            }
+        });
     }
     async commandAction(logger, args) {
         let messageEnd;
@@ -117,55 +136,5 @@ class SpoFieldRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoFieldRemoveCommand_instances = new WeakSet(), _SpoFieldRemoveCommand_initTelemetry = function _SpoFieldRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            listId: typeof args.options.listId !== 'undefined',
-            listTitle: typeof args.options.listTitle !== 'undefined',
-            listUrl: typeof args.options.listUrl !== 'undefined',
-            id: typeof args.options.id !== 'undefined',
-            group: typeof args.options.group !== 'undefined',
-            title: typeof args.options.title !== 'undefined',
-            internalName: typeof args.options.internalName !== 'undefined',
-            force: (!(!args.options.force)).toString()
-        });
-    });
-}, _SpoFieldRemoveCommand_initOptions = function _SpoFieldRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-l, --listTitle [listTitle]'
-    }, {
-        option: '--listId [listId]'
-    }, {
-        option: '--listUrl [listUrl]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '--internalName [internalName]'
-    }, {
-        option: '-g, --group [group]'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoFieldRemoveCommand_initValidators = function _SpoFieldRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
-            return `${args.options.listId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _SpoFieldRemoveCommand_initOptionSets = function _SpoFieldRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title', 'internalName', 'group'] });
-};
 export default new SpoFieldRemoveCommand();
 //# sourceMappingURL=field-remove.js.map

package/dist/m365/spo/commands/field/field-set.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 _SpoFieldSetCommand_instances, _SpoFieldSetCommand_initTelemetry, _SpoFieldSetCommand_initOptions, _SpoFieldSetCommand_initValidators, _SpoFieldSetCommand_initOptionSets;
+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';
@@ -12,6 +8,23 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.object({
+    ...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'),
+    listId: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} in option listId is not a valid GUID`
+    }).optional(),
+    listTitle: z.string().optional(),
+    listUrl: z.string().optional(),
+    id: z.string().refine(id => validation.isValidGuid(id), {
+        error: e => `${e.input} in option id is not a valid GUID`
+    }).optional().alias('i'),
+    title: z.string().optional().alias('t'),
+    internalName: z.string().optional(),
+    updateExistingLists: z.boolean().optional()
+}).catchall(z.unknown());
 class SpoFieldSetCommand extends SpoCommand {
     get name() {
         return commands.FIELD_SET;
@@ -19,13 +32,21 @@ class SpoFieldSetCommand extends SpoCommand {
     get description() {
         return 'Updates existing list or site column';
     }
-    constructor() {
-        super();
-        _SpoFieldSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFieldSetCommand_instances, "m", _SpoFieldSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFieldSetCommand_instances, "m", _SpoFieldSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFieldSetCommand_instances, "m", _SpoFieldSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFieldSetCommand_instances, "m", _SpoFieldSetCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.title, opts.internalName].filter(o => o !== undefined).length === 1, {
+            error: 'Specify one of the following options: id, title, internalName.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'title', 'internalName']
+            }
+        })
+            .refine(opts => [opts.listId, opts.listTitle, opts.listUrl].filter(o => o !== undefined).length <= 1, {
+            error: 'Specify either list id or title or list url, but not multiple'
+        });
     }
     allowUnknownOptions() {
         return true;
@@ -121,58 +142,5 @@ class SpoFieldSetCommand extends SpoCommand {
         return payload;
     }
 }
-_SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry = function _SpoFieldSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            title: typeof args.options.title !== 'undefined',
-            internalName: typeof args.options.internalName !== 'undefined',
-            listId: typeof args.options.listId !== 'undefined',
-            listTitle: typeof args.options.listTitle !== 'undefined',
-            listUrl: typeof args.options.listUrl !== 'undefined',
-            updateExistingLists: !!args.options.updateExistingLists
-        });
-    });
-}, _SpoFieldSetCommand_initOptions = function _SpoFieldSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--listId [listId]'
-    }, {
-        option: '--listTitle [listTitle]'
-    }, {
-        option: '--listUrl [listUrl]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-t, --title [title]'
-    }, {
-        option: '--internalName [internalName]'
-    }, {
-        option: '--updateExistingLists'
-    });
-}, _SpoFieldSetCommand_initValidators = function _SpoFieldSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        const listOptions = [args.options.listId, args.options.listTitle, args.options.listUrl];
-        if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either list id or title or list url, but not multiple`;
-        }
-        if (args.options.listId &&
-            !validation.isValidGuid(args.options.listId)) {
-            return `${args.options.listId} in option listId is not a valid GUID`;
-        }
-        if (args.options.id &&
-            !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} in option id is not a valid GUID`;
-        }
-        return true;
-    });
-}, _SpoFieldSetCommand_initOptionSets = function _SpoFieldSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title', 'internalName'] });
-};
 export default new SpoFieldSetCommand();
 //# sourceMappingURL=field-set.js.map

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

@@ -64,9 +64,10 @@ class SpoFileGetCommand extends SpoCommand {
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
-            // Set responseType to arraybuffer, otherwise binary data will be encoded
-            // to utf8 and binary data is corrupt
-            responseType: args.options.asFile ? 'stream' : 'json'
+            // Use stream for --asFile, so binary data is piped to disk as-is and
+            // isn't encoded to utf8 (which would corrupt it). Use text for
+            // --asString. Use json for all other cases.
+            responseType: args.options.asFile ? 'stream' : args.options.asString ? 'text' : 'json'
         };
         try {
             const file = await request.get(requestOptions);

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/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