@pnp/cli-microsoft365 12.0.0-beta.feb621e → 12.1.0-beta.0c2915d

package/dist/m365/spo/commands/folder/folder-add.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 _SpoFolderAddCommand_instances, _SpoFolderAddCommand_initTelemetry, _SpoFolderAddCommand_initOptions, _SpoFolderAddCommand_initValidators, _SpoFolderAddCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
@@ -11,6 +7,21 @@ import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { FolderColorValues } from './FolderColor.js';
+const folderColorValues = [...Object.keys(FolderColorValues), ...Object.values(FolderColorValues)];
+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'),
+    parentFolderUrl: z.string().alias('p'),
+    name: z.string().alias('n'),
+    color: z.enum(folderColorValues, {
+        error: e => `'${e.input}' is not a valid value for option 'color'. Allowed values are ${Object.keys(FolderColorValues).join(', ')}, ${Object.values(FolderColorValues).join(', ')}.`
+    }).optional(),
+    ensureParentFolders: z.boolean().optional()
+});
 class SpoFolderAddCommand extends SpoCommand {
     get name() {
         return commands.FOLDER_ADD;
@@ -18,13 +29,8 @@ class SpoFolderAddCommand extends SpoCommand {
     get description() {
         return 'Creates a folder within a parent folder';
     }
-    constructor() {
-        super();
-        _SpoFolderAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFolderAddCommand_instances, "m", _SpoFolderAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFolderAddCommand_instances, "m", _SpoFolderAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFolderAddCommand_instances, "m", _SpoFolderAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFolderAddCommand_instances, "m", _SpoFolderAddCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         try {
@@ -98,40 +104,5 @@ class SpoFolderAddCommand extends SpoCommand {
         return response;
     }
 }
-_SpoFolderAddCommand_instances = new WeakSet(), _SpoFolderAddCommand_initTelemetry = function _SpoFolderAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            color: typeof args.options.color !== 'undefined',
-            ensureParentFolders: !!args.options.ensureParentFolders
-        });
-    });
-}, _SpoFolderAddCommand_initOptions = function _SpoFolderAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-p, --parentFolderUrl <parentFolderUrl>'
-    }, {
-        option: '-n, --name <name>'
-    }, {
-        option: '--color [color]',
-        autocomplete: Object.keys(FolderColorValues)
-    }, {
-        option: '--ensureParentFolders'
-    });
-}, _SpoFolderAddCommand_initValidators = function _SpoFolderAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.color && !Object.entries(FolderColorValues).flat().includes(args.options.color)) {
-            return `'${args.options.color}' is not a valid value for option 'color'. Allowed values are ${Object.keys(FolderColorValues).join(', ')}, ${Object.values(FolderColorValues).join(', ')}.`;
-        }
-        return true;
-    });
-}, _SpoFolderAddCommand_initTypes = function _SpoFolderAddCommand_initTypes() {
-    this.types.string.push('webUrl', 'parentFolderUrl', 'name', 'color');
-    this.types.boolean.push('ensureParentFolders');
-};
 export default new SpoFolderAddCommand();
 //# sourceMappingURL=folder-add.js.map

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

@@ -1,15 +1,33 @@
-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 _SpoFolderCopyCommand_instances, _SpoFolderCopyCommand_initTelemetry, _SpoFolderCopyCommand_initOptions, _SpoFolderCopyCommand_initValidators, _SpoFolderCopyCommand_initOptionSets, _SpoFolderCopyCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { CreateFolderCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+const nameConflictBehaviorOptions = ['fail', 'rename'];
+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'),
+    sourceUrl: z.string().optional().alias('s'),
+    sourceId: z.string()
+        .refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID for sourceId.`
+    })
+        .optional()
+        .alias('i'),
+    targetUrl: z.string().alias('t'),
+    newName: z.string().optional(),
+    nameConflictBehavior: z.enum(nameConflictBehaviorOptions, {
+        error: e => `'${e.input}' is not a valid value for nameConflictBehavior. Allowed values are: ${nameConflictBehaviorOptions.join(', ')}.`
+    }).optional(),
+    skipWait: z.boolean().optional()
+});
 class SpoFolderCopyCommand extends SpoCommand {
     get name() {
         return commands.FOLDER_COPY;
@@ -17,15 +35,18 @@ class SpoFolderCopyCommand extends SpoCommand {
     get description() {
         return 'Copies a folder to another location';
     }
-    constructor() {
-        super();
-        _SpoFolderCopyCommand_instances.add(this);
-        this.nameConflictBehaviorOptions = ['fail', 'rename'];
-        __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.sourceUrl, opts.sourceId].filter(o => o !== undefined).length === 1, {
+            error: `Specify either 'sourceUrl' or 'sourceId', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['sourceUrl', 'sourceId']
+            }
+        });
     }
     getExcludedOptionsWithUrls() {
         return ['targetUrl', 'sourceUrl'];
@@ -102,52 +123,5 @@ class SpoFolderCopyCommand extends SpoCommand {
         return urlUtil.removeTrailingSlashes(result);
     }
 }
-_SpoFolderCopyCommand_instances = new WeakSet(), _SpoFolderCopyCommand_initTelemetry = function _SpoFolderCopyCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            sourceUrl: typeof args.options.sourceUrl !== 'undefined',
-            sourceId: typeof args.options.sourceId !== 'undefined',
-            newName: typeof args.options.newName !== 'undefined',
-            nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined',
-            skipWait: !!args.options.skipWait
-        });
-    });
-}, _SpoFolderCopyCommand_initOptions = function _SpoFolderCopyCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-s, --sourceUrl [sourceUrl]'
-    }, {
-        option: '-i, --sourceId [sourceId]'
-    }, {
-        option: '-t, --targetUrl <targetUrl>'
-    }, {
-        option: '--newName [newName]'
-    }, {
-        option: '--nameConflictBehavior [nameConflictBehavior]',
-        autocomplete: this.nameConflictBehaviorOptions
-    }, {
-        option: '--skipWait'
-    });
-}, _SpoFolderCopyCommand_initValidators = function _SpoFolderCopyCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.sourceId && !validation.isValidGuid(args.options.sourceId)) {
-            return `'${args.options.sourceId}' is not a valid GUID for sourceId.`;
-        }
-        if (args.options.nameConflictBehavior && this.nameConflictBehaviorOptions.indexOf(args.options.nameConflictBehavior) === -1) {
-            return `'${args.options.nameConflictBehavior}' is not a valid value for nameConflictBehavior. Allowed values are: ${this.nameConflictBehaviorOptions.join(', ')}.`;
-        }
-        return true;
-    });
-}, _SpoFolderCopyCommand_initOptionSets = function _SpoFolderCopyCommand_initOptionSets() {
-    this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
-}, _SpoFolderCopyCommand_initTypes = function _SpoFolderCopyCommand_initTypes() {
-    this.types.string.push('webUrl', 'sourceUrl', 'sourceId', 'targetUrl', 'newName', 'nameConflictBehavior');
-    this.types.boolean.push('skipWait');
-};
 export default new SpoFolderCopyCommand();
 //# sourceMappingURL=folder-copy.js.map

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

@@ -1,10 +1,5 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoFolderGetCommand_instances, _SpoFolderGetCommand_initTelemetry, _SpoFolderGetCommand_initOptions, _SpoFolderGetCommand_initValidators, _SpoFolderGetCommand_initOptionSets, _SpoFolderGetCommand_initTypes;
-import { CommandError } from '../../../../Command.js';
+import { z } from 'zod';
+import { CommandError, globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
@@ -12,6 +7,22 @@ import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { ListPrincipalType } from '../list/ListPrincipalType.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.string()
+        .refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID.`
+    })
+        .optional()
+        .alias('i'),
+    withPermissions: z.boolean().optional()
+});
 class SpoFolderGetCommand extends SpoCommand {
     get name() {
         return commands.FOLDER_GET;
@@ -19,14 +30,18 @@ class SpoFolderGetCommand extends SpoCommand {
     get description() {
         return 'Gets information about the specified folder';
     }
-    constructor() {
-        super();
-        _SpoFolderGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.url, opts.id].filter(o => o !== undefined).length === 1, {
+            error: `Specify either 'url' or 'id', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['url', 'id']
+            }
+        });
     }
     getExcludedOptionsWithUrls() {
         return ['url'];
@@ -75,41 +90,5 @@ class SpoFolderGetCommand extends SpoCommand {
         }
     }
 }
-_SpoFolderGetCommand_instances = new WeakSet(), _SpoFolderGetCommand_initTelemetry = function _SpoFolderGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            url: typeof args.options.url !== 'undefined',
-            withPermissions: typeof args.options.withPermissions !== 'undefined'
-        });
-    });
-}, _SpoFolderGetCommand_initOptions = function _SpoFolderGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--url [url]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '--withPermissions'
-    });
-}, _SpoFolderGetCommand_initValidators = function _SpoFolderGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.id) {
-            if (!validation.isValidGuid(args.options.id)) {
-                return `${args.options.id} is not a valid GUID`;
-            }
-        }
-        return true;
-    });
-}, _SpoFolderGetCommand_initOptionSets = function _SpoFolderGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['url', 'id'] });
-}, _SpoFolderGetCommand_initTypes = function _SpoFolderGetCommand_initTypes() {
-    this.types.string.push('webUrl', 'url', 'id');
-};
 export default new SpoFolderGetCommand();
 //# sourceMappingURL=folder-get.js.map

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

@@ -1,15 +1,23 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoFolderListCommand_instances, _SpoFolderListCommand_initTelemetry, _SpoFolderListCommand_initOptions, _SpoFolderListCommand_initValidators, _SpoFolderListCommand_initTypes;
+import { z } from 'zod';
+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'),
+    parentFolderUrl: z.string().alias('p'),
+    fields: z.string().optional(),
+    filter: z.string().optional(),
+    recursive: z.boolean().optional().alias('r')
+});
 class SpoFolderListCommand extends SpoCommand {
     get name() {
         return commands.FOLDER_LIST;
@@ -20,13 +28,8 @@ class SpoFolderListCommand extends SpoCommand {
     defaultProperties() {
         return ['Name', 'ServerRelativeUrl'];
     }
-    constructor() {
-        super();
-        _SpoFolderListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFolderListCommand_instances, "m", _SpoFolderListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFolderListCommand_instances, "m", _SpoFolderListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFolderListCommand_instances, "m", _SpoFolderListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFolderListCommand_instances, "m", _SpoFolderListCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -104,32 +107,6 @@ class SpoFolderListCommand extends SpoCommand {
         };
     }
 }
-_SpoFolderListCommand_instances = new WeakSet(), _SpoFolderListCommand_initTelemetry = function _SpoFolderListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            recursive: !!args.options.recursive,
-            fields: typeof args.options.fields !== 'undefined',
-            filter: typeof args.options.filter !== 'undefined'
-        });
-    });
-}, _SpoFolderListCommand_initOptions = function _SpoFolderListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-p, --parentFolderUrl <parentFolderUrl>'
-    }, {
-        option: '--fields [fields]'
-    }, {
-        option: '--filter [filter]'
-    }, {
-        option: '-r, --recursive'
-    });
-}, _SpoFolderListCommand_initValidators = function _SpoFolderListCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
-}, _SpoFolderListCommand_initTypes = function _SpoFolderListCommand_initTypes() {
-    this.types.string.push('webUrl', 'parentFolderUrl', 'fields', 'filter');
-    this.types.boolean.push('recursive');
-};
 SpoFolderListCommand.pageSize = 5000;
 export default new SpoFolderListCommand();
 //# sourceMappingURL=folder-list.js.map

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

@@ -1,15 +1,33 @@
-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 _SpoFolderMoveCommand_instances, _SpoFolderMoveCommand_initTelemetry, _SpoFolderMoveCommand_initOptions, _SpoFolderMoveCommand_initValidators, _SpoFolderMoveCommand_initOptionSets, _SpoFolderMoveCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { CreateFolderCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+const nameConflictBehaviorOptions = ['fail', 'rename'];
+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'),
+    sourceUrl: z.string().optional().alias('s'),
+    sourceId: z.string()
+        .refine(id => validation.isValidGuid(id), {
+        error: e => `'${e.input}' is not a valid GUID for sourceId.`
+    })
+        .optional()
+        .alias('i'),
+    targetUrl: z.string().alias('t'),
+    newName: z.string().optional(),
+    nameConflictBehavior: z.enum(nameConflictBehaviorOptions, {
+        error: e => `'${e.input}' is not a valid value for nameConflictBehavior. Allowed values are: ${nameConflictBehaviorOptions.join(', ')}.`
+    }).optional(),
+    skipWait: z.boolean().optional()
+});
 class SpoFolderMoveCommand extends SpoCommand {
     get name() {
         return commands.FOLDER_MOVE;
@@ -17,15 +35,18 @@ class SpoFolderMoveCommand extends SpoCommand {
     get description() {
         return 'Moves a folder to another location';
     }
-    constructor() {
-        super();
-        _SpoFolderMoveCommand_instances.add(this);
-        this.nameConflictBehaviorOptions = ['fail', 'rename'];
-        __classPrivateFieldGet(this, _SpoFolderMoveCommand_instances, "m", _SpoFolderMoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFolderMoveCommand_instances, "m", _SpoFolderMoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFolderMoveCommand_instances, "m", _SpoFolderMoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFolderMoveCommand_instances, "m", _SpoFolderMoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpoFolderMoveCommand_instances, "m", _SpoFolderMoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.sourceUrl, opts.sourceId].filter(o => o !== undefined).length === 1, {
+            error: `Specify either 'sourceUrl' or 'sourceId', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['sourceUrl', 'sourceId']
+            }
+        });
     }
     getExcludedOptionsWithUrls() {
         return ['targetUrl', 'sourceUrl'];
@@ -102,52 +123,5 @@ class SpoFolderMoveCommand extends SpoCommand {
         return urlUtil.removeTrailingSlashes(result);
     }
 }
-_SpoFolderMoveCommand_instances = new WeakSet(), _SpoFolderMoveCommand_initTelemetry = function _SpoFolderMoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            sourceUrl: typeof args.options.sourceUrl !== 'undefined',
-            sourceId: typeof args.options.sourceId !== 'undefined',
-            newName: typeof args.options.newName !== 'undefined',
-            nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined',
-            skipWait: !!args.options.skipWait
-        });
-    });
-}, _SpoFolderMoveCommand_initOptions = function _SpoFolderMoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-s, --sourceUrl [sourceUrl]'
-    }, {
-        option: '-i, --sourceId [sourceId]'
-    }, {
-        option: '-t, --targetUrl <targetUrl>'
-    }, {
-        option: '--newName [newName]'
-    }, {
-        option: '--nameConflictBehavior [nameConflictBehavior]',
-        autocomplete: this.nameConflictBehaviorOptions
-    }, {
-        option: '--skipWait'
-    });
-}, _SpoFolderMoveCommand_initValidators = function _SpoFolderMoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.sourceId && !validation.isValidGuid(args.options.sourceId)) {
-            return `'${args.options.sourceId}' is not a valid GUID for sourceId.`;
-        }
-        if (args.options.nameConflictBehavior && this.nameConflictBehaviorOptions.indexOf(args.options.nameConflictBehavior) === -1) {
-            return `'${args.options.nameConflictBehavior}' is not a valid value for nameConflictBehavior. Allowed values are: ${this.nameConflictBehaviorOptions.join(', ')}.`;
-        }
-        return true;
-    });
-}, _SpoFolderMoveCommand_initOptionSets = function _SpoFolderMoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
-}, _SpoFolderMoveCommand_initTypes = function _SpoFolderMoveCommand_initTypes() {
-    this.types.string.push('webUrl', 'sourceUrl', 'sourceId', 'targetUrl', 'newName', 'nameConflictBehavior');
-    this.types.boolean.push('skipWait');
-};
 export default new SpoFolderMoveCommand();
 //# sourceMappingURL=folder-move.js.map

package/dist/m365/spo/commands/folder/folder-remove.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 _SpoFolderRemoveCommand_instances, _SpoFolderRemoveCommand_initTelemetry, _SpoFolderRemoveCommand_initOptions, _SpoFolderRemoveCommand_initValidators, _SpoFolderRemoveCommand_initTypes;
+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'),
+    url: z.string(),
+    permanent: z.boolean().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class SpoFolderRemoveCommand extends SpoCommand {
     get name() {
         return commands.FOLDER_REMOVE;
@@ -18,13 +25,8 @@ class SpoFolderRemoveCommand extends SpoCommand {
     get description() {
         return 'Deletes the specified folder';
     }
-    constructor() {
-        super();
-        _SpoFolderRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFolderRemoveCommand_instances, "m", _SpoFolderRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFolderRemoveCommand_instances, "m", _SpoFolderRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFolderRemoveCommand_instances, "m", _SpoFolderRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFolderRemoveCommand_instances, "m", _SpoFolderRemoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     getExcludedOptionsWithUrls() {
         return ['url'];
@@ -67,28 +69,5 @@ class SpoFolderRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initTelemetry = function _SpoFolderRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            permanent: !!args.options.permanent,
-            force: !!args.options.force
-        });
-    });
-}, _SpoFolderRemoveCommand_initOptions = function _SpoFolderRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--url <url>'
-    }, {
-        option: '--permanent'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoFolderRemoveCommand_initValidators = function _SpoFolderRemoveCommand_initValidators() {
-    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('permanent', 'force');
-};
 export default new SpoFolderRemoveCommand();
 //# sourceMappingURL=folder-remove.js.map