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

package/dist/m365/spo/commands/file/file-sharinglink-list.js

@@ -1,15 +1,29 @@
-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 _SpoFileSharingLinkListCommand_instances, _a, _SpoFileSharingLinkListCommand_initTelemetry, _SpoFileSharingLinkListCommand_initOptions, _SpoFileSharingLinkListCommand_initValidators, _SpoFileSharingLinkListCommand_initOptionSets, _SpoFileSharingLinkListCommand_initTypes;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import { spo } from '../../../../utils/spo.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 SharingLinkScope;
+(function (SharingLinkScope) {
+    SharingLinkScope["anonymous"] = "anonymous";
+    SharingLinkScope["users"] = "users";
+    SharingLinkScope["organization"] = "organization";
+})(SharingLinkScope || (SharingLinkScope = {}));
+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'),
+    fileId: z.guid().optional(),
+    fileUrl: z.string().optional(),
+    scope: zod.coercedEnum(SharingLinkScope).optional().alias('s')
+});
 class SpoFileSharingLinkListCommand extends SpoCommand {
     get name() {
         return commands.FILE_SHARINGLINK_LIST;
@@ -20,14 +34,18 @@ class SpoFileSharingLinkListCommand extends SpoCommand {
     defaultProperties() {
         return ['id', 'scope', 'roles', 'link'];
     }
-    constructor() {
-        super();
-        _SpoFileSharingLinkListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFileSharingLinkListCommand_instances, "m", _SpoFileSharingLinkListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFileSharingLinkListCommand_instances, "m", _SpoFileSharingLinkListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFileSharingLinkListCommand_instances, "m", _SpoFileSharingLinkListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFileSharingLinkListCommand_instances, "m", _SpoFileSharingLinkListCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpoFileSharingLinkListCommand_instances, "m", _SpoFileSharingLinkListCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.fileId, opts.fileUrl].filter(o => o !== undefined).length === 1, {
+            error: `Specify 'fileId' or 'fileUrl', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['fileId', 'fileUrl']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -60,44 +78,5 @@ class SpoFileSharingLinkListCommand extends SpoCommand {
         }
     }
 }
-_a = SpoFileSharingLinkListCommand, _SpoFileSharingLinkListCommand_instances = new WeakSet(), _SpoFileSharingLinkListCommand_initTelemetry = function _SpoFileSharingLinkListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            fileId: typeof args.options.fileId !== 'undefined',
-            fileUrl: typeof args.options.fileUrl !== 'undefined',
-            scope: typeof args.options.scope !== 'undefined'
-        });
-    });
-}, _SpoFileSharingLinkListCommand_initOptions = function _SpoFileSharingLinkListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--fileId [fileId]'
-    }, {
-        option: '--fileUrl [fileUrl]'
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: _a.allowedScopes
-    });
-}, _SpoFileSharingLinkListCommand_initValidators = function _SpoFileSharingLinkListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.fileId && !validation.isValidGuid(args.options.fileId)) {
-            return `${args.options.fileId} is not a valid GUID`;
-        }
-        if (args.options.scope && _a.allowedScopes.indexOf(args.options.scope) === -1) {
-            return `'${args.options.scope}' is not a valid scope. Allowed values are: ${_a.allowedScopes.join(',')}`;
-        }
-        return true;
-    });
-}, _SpoFileSharingLinkListCommand_initOptionSets = function _SpoFileSharingLinkListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['fileId', 'fileUrl'] });
-}, _SpoFileSharingLinkListCommand_initTypes = function _SpoFileSharingLinkListCommand_initTypes() {
-    this.types.string.push('webUrl', 'fileId', 'fileUrl', 'scope');
-};
-SpoFileSharingLinkListCommand.allowedScopes = ['anonymous', 'users', 'organization'];
 export default new SpoFileSharingLinkListCommand();
 //# sourceMappingURL=file-sharinglink-list.js.map

package/dist/m365/spo/commands/file/file-sharinglink-remove.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 _SpoFileSharingLinkRemoveCommand_instances, _SpoFileSharingLinkRemoveCommand_initTelemetry, _SpoFileSharingLinkRemoveCommand_initOptions, _SpoFileSharingLinkRemoveCommand_initValidators, _SpoFileSharingLinkRemoveCommand_initOptionSets, _SpoFileSharingLinkRemoveCommand_initTypes;
+import { z } from 'zod';
 import { cli } from '../../../../cli/cli.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    webUrl: z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, {
+        error: e => `'${e.input}' is not a valid SharePoint Online site URL.`
+    })
+        .alias('u'),
+    fileUrl: z.string().optional(),
+    fileId: z.guid().optional(),
+    id: z.string().alias('i'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoFileSharingLinkRemoveCommand extends SpoCommand {
     get name() {
         return commands.FILE_SHARINGLINK_REMOVE;
@@ -17,14 +25,18 @@ class SpoFileSharingLinkRemoveCommand extends SpoCommand {
     get description() {
         return 'Removes a specific sharing link of a file';
     }
-    constructor() {
-        super();
-        _SpoFileSharingLinkRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFileSharingLinkRemoveCommand_instances, "m", _SpoFileSharingLinkRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFileSharingLinkRemoveCommand_instances, "m", _SpoFileSharingLinkRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFileSharingLinkRemoveCommand_instances, "m", _SpoFileSharingLinkRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFileSharingLinkRemoveCommand_instances, "m", _SpoFileSharingLinkRemoveCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpoFileSharingLinkRemoveCommand_instances, "m", _SpoFileSharingLinkRemoveCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.fileUrl, opts.fileId].filter(o => o !== undefined).length === 1, {
+            error: `Specify 'fileUrl' or 'fileId', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['fileUrl', 'fileId']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeSharingLink = async () => {
@@ -57,42 +69,5 @@ class SpoFileSharingLinkRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoFileSharingLinkRemoveCommand_instances = new WeakSet(), _SpoFileSharingLinkRemoveCommand_initTelemetry = function _SpoFileSharingLinkRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            fileUrl: typeof args.options.fileUrl !== 'undefined',
-            fileId: typeof args.options.fileId !== 'undefined',
-            force: !!args.options.force
-        });
-    });
-}, _SpoFileSharingLinkRemoveCommand_initOptions = function _SpoFileSharingLinkRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--fileUrl [fileUrl]'
-    }, {
-        option: '--fileId [fileId]'
-    }, {
-        option: '-i, --id <id>'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoFileSharingLinkRemoveCommand_initValidators = function _SpoFileSharingLinkRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.fileId && !validation.isValidGuid(args.options.fileId)) {
-            return `${args.options.fileId} is not a valid GUID`;
-        }
-        return true;
-    });
-}, _SpoFileSharingLinkRemoveCommand_initOptionSets = function _SpoFileSharingLinkRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['fileUrl', 'fileId'] });
-}, _SpoFileSharingLinkRemoveCommand_initTypes = function _SpoFileSharingLinkRemoveCommand_initTypes() {
-    this.types.string.push('webUrl', 'fileUrl', 'fileId', 'id');
-    this.types.boolean.push('force');
-};
 export default new SpoFileSharingLinkRemoveCommand();
 //# sourceMappingURL=file-sharinglink-remove.js.map

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

@@ -1,14 +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 _SpoFileSharingLinkSetCommand_instances, _SpoFileSharingLinkSetCommand_initTelemetry, _SpoFileSharingLinkSetCommand_initOptions, _SpoFileSharingLinkSetCommand_initValidators, _SpoFileSharingLinkSetCommand_initOptionSets, _SpoFileSharingLinkSetCommand_initTypes;
+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';
 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(),
+    fileId: z.guid().optional(),
+    fileUrl: z.string().optional(),
+    expirationDateTime: z.string()
+        .refine(date => validation.isValidISODateTime(date) === true, {
+        error: e => `'${e.input}' is not a valid ISO date string.`
+    })
+});
 class SpoFileSharingLinkSetCommand extends SpoCommand {
     get name() {
         return commands.FILE_SHARINGLINK_SET;
@@ -16,14 +27,18 @@ class SpoFileSharingLinkSetCommand extends SpoCommand {
     get description() {
         return 'Updates a sharing link of a file';
     }
-    constructor() {
-        super();
-        _SpoFileSharingLinkSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFileSharingLinkSetCommand_instances, "m", _SpoFileSharingLinkSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFileSharingLinkSetCommand_instances, "m", _SpoFileSharingLinkSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFileSharingLinkSetCommand_instances, "m", _SpoFileSharingLinkSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFileSharingLinkSetCommand_instances, "m", _SpoFileSharingLinkSetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpoFileSharingLinkSetCommand_instances, "m", _SpoFileSharingLinkSetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.fileId, opts.fileUrl].filter(o => o !== undefined).length === 1, {
+            error: `Specify 'fileId' or 'fileUrl', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['fileId', 'fileUrl']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -49,46 +64,5 @@ class SpoFileSharingLinkSetCommand extends SpoCommand {
         }
     }
 }
-_SpoFileSharingLinkSetCommand_instances = new WeakSet(), _SpoFileSharingLinkSetCommand_initTelemetry = function _SpoFileSharingLinkSetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            fileId: typeof args.options.fileId !== 'undefined',
-            fileUrl: typeof args.options.fileUrl !== 'undefined'
-        });
-    });
-}, _SpoFileSharingLinkSetCommand_initOptions = function _SpoFileSharingLinkSetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--fileId [fileId]'
-    }, {
-        option: '--fileUrl [fileUrl]'
-    }, {
-        option: '--id <id>'
-    }, {
-        option: '--expirationDateTime <expirationDateTime>'
-    });
-}, _SpoFileSharingLinkSetCommand_initValidators = function _SpoFileSharingLinkSetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.fileId && !validation.isValidGuid(args.options.fileId)) {
-            return `${args.options.fileId} is not a valid GUID`;
-        }
-        if (!validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
-        }
-        if (!validation.isValidISODateTime(args.options.expirationDateTime)) {
-            return `'${args.options.expirationDateTime}' is not a valid ISO date string`;
-        }
-        return true;
-    });
-}, _SpoFileSharingLinkSetCommand_initOptionSets = function _SpoFileSharingLinkSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['fileId', 'fileUrl'] });
-}, _SpoFileSharingLinkSetCommand_initTypes = function _SpoFileSharingLinkSetCommand_initTypes() {
-    this.types.string.push('webUrl', 'id', 'fileId', 'fileUrl', 'expirationDateTime');
-};
 export default new SpoFileSharingLinkSetCommand();
 //# sourceMappingURL=file-sharinglink-set.js.map

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

@@ -15,7 +15,7 @@ export const options = z.strictObject({
     })
         .alias('u'),
     url: z.string().optional(),
-    id: z.uuid().optional().alias('i'),
+    id: z.guid().optional().alias('i'),
     force: z.boolean().optional().alias('f')
 });
 class SpoFileUnarchiveCommand extends SpoCommand {

package/dist/m365/spo/commands/file/file-version-clear.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 _SpoFileVersionClearCommand_instances, _SpoFileVersionClearCommand_initTelemetry, _SpoFileVersionClearCommand_initOptions, _SpoFileVersionClearCommand_initValidators, _SpoFileVersionClearCommand_initOptionSets, _SpoFileVersionClearCommand_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'),
+    fileUrl: z.string().optional(),
+    fileId: z.guid().optional().alias('i'),
+    force: z.boolean().optional().alias('f')
+});
 class SpoFileVersionClearCommand extends SpoCommand {
     get name() {
         return commands.FILE_VERSION_CLEAR;
@@ -18,14 +25,18 @@ class SpoFileVersionClearCommand extends SpoCommand {
     get description() {
         return 'Deletes all file version history of a file in a SharePoint Document library';
     }
-    constructor() {
-        super();
-        _SpoFileVersionClearCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFileVersionClearCommand_instances, "m", _SpoFileVersionClearCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFileVersionClearCommand_instances, "m", _SpoFileVersionClearCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFileVersionClearCommand_instances, "m", _SpoFileVersionClearCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFileVersionClearCommand_instances, "m", _SpoFileVersionClearCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpoFileVersionClearCommand_instances, "m", _SpoFileVersionClearCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.fileUrl, opts.fileId].filter(o => o !== undefined).length === 1, {
+            error: `Specify 'fileUrl' or 'fileId', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['fileUrl', 'fileId']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -65,36 +76,5 @@ class SpoFileVersionClearCommand extends SpoCommand {
         return request.post(requestOptions);
     }
 }
-_SpoFileVersionClearCommand_instances = new WeakSet(), _SpoFileVersionClearCommand_initTelemetry = function _SpoFileVersionClearCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            fileUrl: args.options.fileUrl,
-            fileId: args.options.fileId,
-            force: !!args.options.force
-        });
-    });
-}, _SpoFileVersionClearCommand_initOptions = function _SpoFileVersionClearCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--fileUrl [fileUrl]'
-    }, {
-        option: '-i, --fileId [fileId]'
-    }, {
-        option: '-f, --force'
-    });
-}, _SpoFileVersionClearCommand_initValidators = function _SpoFileVersionClearCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.fileId && !validation.isValidGuid(args.options.fileId)) {
-            return `${args.options.fileId} is not a valid GUID`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-}, _SpoFileVersionClearCommand_initOptionSets = function _SpoFileVersionClearCommand_initOptionSets() {
-    this.optionSets.push({ options: ['fileUrl', 'fileId'] });
-}, _SpoFileVersionClearCommand_initTypes = function _SpoFileVersionClearCommand_initTypes() {
-    this.types.string.push('webUrl', 'fileUrl', 'fileId');
-    this.types.boolean.push('force');
-};
 export default new SpoFileVersionClearCommand();
 //# sourceMappingURL=file-version-clear.js.map

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

@@ -1,15 +1,22 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoFileVersionGetCommand_instances, _SpoFileVersionGetCommand_initTelemetry, _SpoFileVersionGetCommand_initOptions, _SpoFileVersionGetCommand_initValidators, _SpoFileVersionGetCommand_initOptionSets, _SpoFileVersionGetCommand_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'),
+    label: z.string(),
+    fileUrl: z.string().optional(),
+    fileId: z.guid().optional().alias('i')
+});
 class SpoFileVersionGetCommand extends SpoCommand {
     get name() {
         return commands.FILE_VERSION_GET;
@@ -17,14 +24,18 @@ class SpoFileVersionGetCommand extends SpoCommand {
     get description() {
         return 'Gets information about a specific version of a specified file';
     }
-    constructor() {
-        super();
-        _SpoFileVersionGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFileVersionGetCommand_instances, "m", _SpoFileVersionGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFileVersionGetCommand_instances, "m", _SpoFileVersionGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFileVersionGetCommand_instances, "m", _SpoFileVersionGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFileVersionGetCommand_instances, "m", _SpoFileVersionGetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpoFileVersionGetCommand_instances, "m", _SpoFileVersionGetCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.fileUrl, opts.fileId].filter(o => o !== undefined).length === 1, {
+            error: `Specify 'fileUrl' or 'fileId', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['fileUrl', 'fileId']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -59,34 +70,5 @@ class SpoFileVersionGetCommand extends SpoCommand {
         return response;
     }
 }
-_SpoFileVersionGetCommand_instances = new WeakSet(), _SpoFileVersionGetCommand_initTelemetry = function _SpoFileVersionGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            fileUrl: args.options.fileUrl,
-            fileId: args.options.fileId
-        });
-    });
-}, _SpoFileVersionGetCommand_initOptions = function _SpoFileVersionGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--label <label>'
-    }, {
-        option: '--fileUrl [fileUrl]'
-    }, {
-        option: '-i, --fileId [fileId]'
-    });
-}, _SpoFileVersionGetCommand_initValidators = function _SpoFileVersionGetCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.fileId && !validation.isValidGuid(args.options.fileId)) {
-            return `${args.options.fileId} is not a valid GUID`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-}, _SpoFileVersionGetCommand_initOptionSets = function _SpoFileVersionGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['fileUrl', 'fileId'] });
-}, _SpoFileVersionGetCommand_initTypes = function _SpoFileVersionGetCommand_initTypes() {
-    this.types.string.push('webUrl', 'label', 'fileUrl', 'fileId');
-};
 export default new SpoFileVersionGetCommand();
 //# sourceMappingURL=file-version-get.js.map

package/dist/m365/spo/commands/file/file-version-keep.js

@@ -15,7 +15,7 @@ export const options = z.strictObject({
     })
         .alias('u'),
     fileUrl: z.string().optional(),
-    fileId: z.uuid().optional().alias('i'),
+    fileId: z.guid().optional().alias('i'),
     label: z.string()
 });
 class SpoFileVersionKeepCommand extends SpoCommand {

package/dist/m365/spo/commands/file/file-version-list.js

@@ -1,15 +1,21 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpoFileVersionListCommand_instances, _SpoFileVersionListCommand_initTelemetry, _SpoFileVersionListCommand_initOptions, _SpoFileVersionListCommand_initValidators, _SpoFileVersionListCommand_initOptionSets, _SpoFileVersionListCommand_initTypes;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.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'),
+    fileUrl: z.string().optional(),
+    fileId: z.guid().optional().alias('i')
+});
 class SpoFileVersionListCommand extends SpoCommand {
     get name() {
         return commands.FILE_VERSION_LIST;
@@ -20,14 +26,18 @@ class SpoFileVersionListCommand extends SpoCommand {
     defaultProperties() {
         return ['Created', 'ID', 'IsCurrentVersion', 'VersionLabel', 'ExpirationDate'];
     }
-    constructor() {
-        super();
-        _SpoFileVersionListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFileVersionListCommand_instances, "m", _SpoFileVersionListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFileVersionListCommand_instances, "m", _SpoFileVersionListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFileVersionListCommand_instances, "m", _SpoFileVersionListCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFileVersionListCommand_instances, "m", _SpoFileVersionListCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpoFileVersionListCommand_instances, "m", _SpoFileVersionListCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.fileUrl, opts.fileId].filter(o => o !== undefined).length === 1, {
+            error: `Specify 'fileUrl' or 'fileId', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['fileUrl', 'fileId']
+            }
+        });
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -51,32 +61,5 @@ class SpoFileVersionListCommand extends SpoCommand {
         }
     }
 }
-_SpoFileVersionListCommand_instances = new WeakSet(), _SpoFileVersionListCommand_initTelemetry = function _SpoFileVersionListCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            fileUrl: typeof args.options.fileUrl !== 'undefined',
-            fileId: typeof args.options.fileId !== 'undefined'
-        });
-    });
-}, _SpoFileVersionListCommand_initOptions = function _SpoFileVersionListCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--fileUrl [fileUrl]'
-    }, {
-        option: '-i, --fileId [fileId]'
-    });
-}, _SpoFileVersionListCommand_initValidators = function _SpoFileVersionListCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.fileId && !validation.isValidGuid(args.options.fileId)) {
-            return `${args.options.fileId} is not a valid GUID`;
-        }
-        return validation.isValidSharePointUrl(args.options.webUrl);
-    });
-}, _SpoFileVersionListCommand_initOptionSets = function _SpoFileVersionListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['fileUrl', 'fileId'] });
-}, _SpoFileVersionListCommand_initTypes = function _SpoFileVersionListCommand_initTypes() {
-    this.types.string.push('webUrl', 'fileUrl', 'fileId');
-};
 export default new SpoFileVersionListCommand();
 //# sourceMappingURL=file-version-list.js.map