@pnp/cli-microsoft365 12.1.0-beta.dbc076e → 12.1.0-beta.f55735f

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

@@ -1,15 +1,34 @@
-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 _SpoFileCopyCommand_instances, _SpoFileCopyCommand_initTelemetry, _SpoFileCopyCommand_initOptions, _SpoFileCopyCommand_initValidators, _SpoFileCopyCommand_initOptionSets, _SpoFileCopyCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { CreateFileCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
+import { zod } from '../../../../utils/zod.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+var NameConflictBehavior;
+(function (NameConflictBehavior) {
+    NameConflictBehavior["fail"] = "fail";
+    NameConflictBehavior["replace"] = "replace";
+    NameConflictBehavior["rename"] = "rename";
+})(NameConflictBehavior || (NameConflictBehavior = {}));
+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.guid().optional().alias('i'),
+    targetUrl: z.string().alias('t'),
+    newName: z.string().optional(),
+    nameConflictBehavior: zod.coercedEnum(NameConflictBehavior).optional(),
+    bypassSharedLock: z.boolean().optional(),
+    ignoreVersionHistory: z.boolean().optional(),
+    skipWait: z.boolean().optional()
+});
 class SpoFileCopyCommand extends SpoCommand {
     get name() {
         return commands.FILE_COPY;
@@ -17,15 +36,18 @@ class SpoFileCopyCommand extends SpoCommand {
     get description() {
         return 'Copies a file to another location';
     }
-    constructor() {
-        super();
-        _SpoFileCopyCommand_instances.add(this);
-        this.nameConflictBehaviorOptions = ['fail', 'replace', 'rename'];
-        __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_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 'sourceUrl' or 'sourceId', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['sourceUrl', 'sourceId']
+            }
+        });
     }
     getExcludedOptionsWithUrls() {
         return ['targetUrl', 'sourceUrl'];
@@ -111,58 +133,5 @@ class SpoFileCopyCommand extends SpoCommand {
         return urlUtil.removeTrailingSlashes(result);
     }
 }
-_SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry = function _SpoFileCopyCommand_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',
-            ignoreVersionHistory: !!args.options.ignoreVersionHistory,
-            bypassSharedLock: !!args.options.bypassSharedLock,
-            skipWait: !!args.options.skipWait
-        });
-    });
-}, _SpoFileCopyCommand_initOptions = function _SpoFileCopyCommand_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: '--bypassSharedLock'
-    }, {
-        option: '--ignoreVersionHistory'
-    }, {
-        option: '--skipWait'
-    });
-}, _SpoFileCopyCommand_initValidators = function _SpoFileCopyCommand_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.includes(args.options.nameConflictBehavior.toLowerCase())) {
-            return `${args.options.nameConflictBehavior} is not a valid nameConflictBehavior value. Allowed values: ${this.nameConflictBehaviorOptions.join(', ')}.`;
-        }
-        return true;
-    });
-}, _SpoFileCopyCommand_initOptionSets = function _SpoFileCopyCommand_initOptionSets() {
-    this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
-}, _SpoFileCopyCommand_initTypes = function _SpoFileCopyCommand_initTypes() {
-    this.types.string.push('webUrl', 'sourceUrl', 'sourceId', 'targetUrl', 'newName', 'nameConflictBehavior');
-    this.types.boolean.push('bypassSharedLock', 'ignoreVersionHistory', 'skipWait');
-};
 export default new SpoFileCopyCommand();
 //# sourceMappingURL=file-copy.js.map

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

@@ -1,17 +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 _SpoFileGetCommand_instances, _SpoFileGetCommand_initTelemetry, _SpoFileGetCommand_initOptions, _SpoFileGetCommand_initValidators, _SpoFileGetCommand_initOptionSets, _SpoFileGetCommand_initTypes;
 import fs from 'fs';
 import path from 'path';
+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'),
+    url: z.string().optional(),
+    id: z.guid().optional().alias('i'),
+    asString: z.boolean().optional(),
+    asListItem: z.boolean().optional(),
+    asFile: z.boolean().optional(),
+    path: z.string()
+        .refine(p => fs.existsSync(path.dirname(p)), {
+        error: 'Specified path where to save the file does not exits'
+    })
+        .optional()
+        .alias('p'),
+    withPermissions: z.boolean().optional()
+});
 class SpoFileGetCommand extends SpoCommand {
     get name() {
         return commands.FILE_GET;
@@ -19,14 +35,28 @@ class SpoFileGetCommand extends SpoCommand {
     get description() {
         return 'Gets information about the specified file';
     }
-    constructor() {
-        super();
-        _SpoFileGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFileGetCommand_instances, "m", _SpoFileGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFileGetCommand_instances, "m", _SpoFileGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFileGetCommand_instances, "m", _SpoFileGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFileGetCommand_instances, "m", _SpoFileGetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpoFileGetCommand_instances, "m", _SpoFileGetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.url].filter(o => o !== undefined).length === 1, {
+            error: `Specify 'id' or 'url', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'url']
+            }
+        })
+            .refine(opts => !opts.asFile || !!opts.path, {
+            error: 'The path should be specified when the --asFile option is used',
+            path: ['path'],
+            params: {
+                customCode: 'required'
+            }
+        })
+            .refine(opts => [opts.asFile, opts.asListItem, opts.asString].filter(o => o === true).length <= 1, {
+            error: 'Specify to retrieve the file either as file, list item or string but not multiple'
+        });
     }
     getExcludedOptionsWithUrls() {
         return ['url'];
@@ -117,70 +147,5 @@ class SpoFileGetCommand extends SpoCommand {
         }
     }
 }
-_SpoFileGetCommand_instances = new WeakSet(), _SpoFileGetCommand_initTelemetry = function _SpoFileGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            url: typeof args.options.url !== 'undefined',
-            asString: !!args.options.asString,
-            asListItem: !!args.options.asListItem,
-            asFile: !!args.options.asFile,
-            path: typeof args.options.path !== 'undefined',
-            withPermissions: !!args.options.withPermissions
-        });
-    });
-}, _SpoFileGetCommand_initOptions = function _SpoFileGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--url [url]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '--asString'
-    }, {
-        option: '--asListItem'
-    }, {
-        option: '--asFile'
-    }, {
-        option: '-p, --path [path]'
-    }, {
-        option: '--withPermissions'
-    });
-}, _SpoFileGetCommand_initValidators = function _SpoFileGetCommand_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`;
-            }
-        }
-        if (args.options.asFile && !args.options.path) {
-            return 'The path should be specified when the --asFile option is used';
-        }
-        if (args.options.path && !fs.existsSync(path.dirname(args.options.path))) {
-            return 'Specified path where to save the file does not exits';
-        }
-        if (args.options.asFile) {
-            if (args.options.asListItem || args.options.asString) {
-                return 'Specify to retrieve the file either as file, list item or string but not multiple';
-            }
-        }
-        if (args.options.asListItem) {
-            if (args.options.asFile || args.options.asString) {
-                return 'Specify to retrieve the file either as file, list item or string but not multiple';
-            }
-        }
-        return true;
-    });
-}, _SpoFileGetCommand_initOptionSets = function _SpoFileGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'url'] });
-}, _SpoFileGetCommand_initTypes = function _SpoFileGetCommand_initTypes() {
-    this.types.string.push('webUrl', 'url', 'id', 'path');
-    this.types.boolean.push('asString', 'asListItem', 'asFile', 'withPermissions');
-};
 export default new SpoFileGetCommand();
 //# sourceMappingURL=file-get.js.map

package/dist/m365/spo/commands/file/file-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 _SpoFileListCommand_instances, _SpoFileListCommand_initTelemetry, _SpoFileListCommand_initOptions, _SpoFileListCommand_initValidators, _SpoFileListCommand_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'),
+    folderUrl: z.string().alias('f'),
+    fields: z.string().optional(),
+    filter: z.string().optional(),
+    recursive: z.boolean().optional().alias('r')
+});
 class SpoFileListCommand extends SpoCommand {
     get name() {
         return commands.FILE_LIST;
@@ -17,13 +25,8 @@ class SpoFileListCommand extends SpoCommand {
     get description() {
         return 'Lists all available files in the specified folder and site';
     }
-    constructor() {
-        super();
-        _SpoFileListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFileListCommand_instances, "m", _SpoFileListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFileListCommand_instances, "m", _SpoFileListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFileListCommand_instances, "m", _SpoFileListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFileListCommand_instances, "m", _SpoFileListCommand_initTypes).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -133,32 +136,6 @@ class SpoFileListCommand extends SpoCommand {
         };
     }
 }
-_SpoFileListCommand_instances = new WeakSet(), _SpoFileListCommand_initTelemetry = function _SpoFileListCommand_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'
-        });
-    });
-}, _SpoFileListCommand_initOptions = function _SpoFileListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-f, --folderUrl <folderUrl>'
-    }, {
-        option: '--fields [fields]'
-    }, {
-        option: '--filter [filter]'
-    }, {
-        option: '-r, --recursive'
-    });
-}, _SpoFileListCommand_initValidators = function _SpoFileListCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
-}, _SpoFileListCommand_initTypes = function _SpoFileListCommand_initTypes() {
-    this.types.string.push('webUrl', 'folderUrl', 'fields', 'filter');
-    this.types.boolean.push('recursive');
-};
 SpoFileListCommand.pageSize = 5000;
 export default new SpoFileListCommand();
 //# sourceMappingURL=file-list.js.map

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

@@ -1,15 +1,27 @@
-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 _SpoFileMoveCommand_instances, _SpoFileMoveCommand_initTelemetry, _SpoFileMoveCommand_initOptions, _SpoFileMoveCommand_initValidators, _SpoFileMoveCommand_initOptionSets, _SpoFileMoveCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { CreateFileCopyJobsNameConflictBehavior, 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';
+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.guid().optional().alias('i'),
+    targetUrl: z.string().alias('t'),
+    newName: z.string().optional(),
+    nameConflictBehavior: z.enum(['fail', 'replace', 'rename']).optional(),
+    withItemPermissions: z.boolean().optional(),
+    bypassSharedLock: z.boolean().optional(),
+    skipWait: z.boolean().optional()
+});
 class SpoFileMoveCommand extends SpoCommand {
     get name() {
         return commands.FILE_MOVE;
@@ -17,15 +29,18 @@ class SpoFileMoveCommand extends SpoCommand {
     get description() {
         return 'Moves a file to another location';
     }
-    constructor() {
-        super();
-        _SpoFileMoveCommand_instances.add(this);
-        this.nameConflictBehaviorOptions = ['fail', 'replace', 'rename'];
-        __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_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 'sourceUrl' or 'sourceId', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['sourceUrl', 'sourceId']
+            }
+        });
     }
     getExcludedOptionsWithUrls() {
         return ['targetUrl', 'sourceUrl'];
@@ -111,58 +126,5 @@ class SpoFileMoveCommand extends SpoCommand {
         return urlUtil.removeTrailingSlashes(result);
     }
 }
-_SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry = function _SpoFileMoveCommand_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',
-            withItemPermissions: !!args.options.withItemPermissions,
-            bypassSharedLock: !!args.options.bypassSharedLock,
-            skipWait: !!args.options.skipWait
-        });
-    });
-}, _SpoFileMoveCommand_initOptions = function _SpoFileMoveCommand_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: '--withItemPermissions'
-    }, {
-        option: '--bypassSharedLock'
-    }, {
-        option: '--skipWait'
-    });
-}, _SpoFileMoveCommand_initValidators = function _SpoFileMoveCommand_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;
-    });
-}, _SpoFileMoveCommand_initOptionSets = function _SpoFileMoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
-}, _SpoFileMoveCommand_initTypes = function _SpoFileMoveCommand_initTypes() {
-    this.types.string.push('webUrl', 'sourceUrl', 'sourceId', 'targetUrl', 'newName', 'nameConflictBehavior');
-    this.types.boolean.push('withItemPermissions', 'bypassSharedLock', 'skipWait');
-};
 export default new SpoFileMoveCommand();
 //# sourceMappingURL=file-move.js.map

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

@@ -1,16 +1,25 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoFileRemoveCommand_instances, _SpoFileRemoveCommand_initTelemetry, _SpoFileRemoveCommand_initOptions, _SpoFileRemoveCommand_initValidators, _SpoFileRemoveCommand_initOptionSets, _SpoFileRemoveCommand_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'),
+    id: z.guid().optional().alias('i'),
+    url: z.string().optional(),
+    permanent: z.boolean().optional(),
+    bypassSharedLock: z.boolean().optional(),
+    force: z.boolean().optional().alias('f')
+});
 class SpoFileRemoveCommand extends SpoCommand {
     get name() {
         return commands.FILE_REMOVE;
@@ -21,14 +30,18 @@ class SpoFileRemoveCommand extends SpoCommand {
     alias() {
         return [commands.PAGE_TEMPLATE_REMOVE];
     }
-    constructor() {
-        super();
-        _SpoFileRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFileRemoveCommand_instances, "m", _SpoFileRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFileRemoveCommand_instances, "m", _SpoFileRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFileRemoveCommand_instances, "m", _SpoFileRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFileRemoveCommand_instances, "m", _SpoFileRemoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpoFileRemoveCommand_instances, "m", _SpoFileRemoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.url].filter(o => o !== undefined).length === 1, {
+            error: `Specify 'id' or 'url', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'url']
+            }
+        });
     }
     getExcludedOptionsWithUrls() {
         return ['url'];
@@ -80,47 +93,5 @@ class SpoFileRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelemetry = function _SpoFileRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            url: typeof args.options.url !== 'undefined',
-            permanent: !!args.options.permanent,
-            bypassSharedLock: !!args.options.bypassSharedLock,
-            force: !!args.options.force
-        });
-    });
-}, _SpoFileRemoveCommand_initOptions = function _SpoFileRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '--url [url]'
-    }, {
-        option: '--permanent'
-    }, {
-        option: '--bypassSharedLock'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoFileRemoveCommand_initValidators = function _SpoFileRemoveCommand_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`;
-        }
-        return true;
-    });
-}, _SpoFileRemoveCommand_initOptionSets = function _SpoFileRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'url'] });
-}, _SpoFileRemoveCommand_initTypes = function _SpoFileRemoveCommand_initTypes() {
-    this.types.string.push('webUrl', 'id', 'url');
-    this.types.boolean.push('permanent', 'bypassSharedLock', 'force');
-};
 export default new SpoFileRemoveCommand();
 //# sourceMappingURL=file-remove.js.map