@pnp/cli-microsoft365 12.1.0-beta.79db3d9 → 12.1.0-beta.81e442d

package/dist/m365/spfx/commands/project/project-github-workflow-add.js

@@ -1,13 +1,8 @@
-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 _SpfxProjectGithubWorkflowAddCommand_instances, _a, _SpfxProjectGithubWorkflowAddCommand_initTelemetry, _SpfxProjectGithubWorkflowAddCommand_initOptions, _SpfxProjectGithubWorkflowAddCommand_initValidators;
 import fs from 'fs';
 import path from 'path';
 import yaml from 'yaml';
-import { CommandError } from '../../../../Command.js';
+import { z } from 'zod';
+import { globalOptionsZod, CommandError } from '../../../../Command.js';
 import { fsUtil } from '../../../../utils/fsUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import commands from '../../commands.js';
@@ -15,6 +10,16 @@ import { workflow } from './DeployWorkflow.js';
 import { BaseProjectCommand } from './base-project-command.js';
 import { versions } from '../SpfxCompatibilityMatrix.js';
 import { spfx } from '../../../../utils/spfx.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    name: z.string().alias('n').optional(),
+    branchName: z.string().alias('b').optional(),
+    manuallyTrigger: z.boolean().alias('m').optional(),
+    loginMethod: z.enum(['application', 'user']).alias('l').optional(),
+    scope: z.enum(['tenant', 'sitecollection']).alias('s').optional(),
+    siteUrl: z.string().alias('u').optional(),
+    skipFeatureDeployment: z.boolean().optional()
+});
 class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
     get name() {
         return commands.PROJECT_GITHUB_WORKFLOW_ADD;
@@ -22,17 +27,26 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
     get description() {
         return 'Adds a GitHub workflow for a SharePoint Framework project.';
     }
-    constructor() {
-        super();
-        _SpfxProjectGithubWorkflowAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpfxProjectGithubWorkflowAddCommand_instances, "m", _SpfxProjectGithubWorkflowAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpfxProjectGithubWorkflowAddCommand_instances, "m", _SpfxProjectGithubWorkflowAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpfxProjectGithubWorkflowAddCommand_instances, "m", _SpfxProjectGithubWorkflowAddCommand_initValidators).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => !opts.scope || opts.scope !== 'sitecollection' || opts.siteUrl, {
+            error: `siteUrl option has to be defined when scope set to sitecollection`,
+            params: {
+                customCode: 'required'
+            },
+            path: ['siteUrl']
+        })
+            .refine(opts => !opts.scope || opts.scope !== 'sitecollection' || !opts.siteUrl || validation.isValidSharePointUrl(opts.siteUrl) === true, {
+            error: issue => validation.isValidSharePointUrl(issue.input.siteUrl)
+        });
     }
     async commandAction(logger, args) {
         this.projectRootPath = this.getProjectRoot(process.cwd());
         if (this.projectRootPath === null) {
-            throw new CommandError(`Couldn't find project root folder`, _a.ERROR_NO_PROJECT_ROOT_FOLDER);
+            throw new CommandError(`Couldn't find project root folder`, SpfxProjectGithubWorkflowAddCommand.ERROR_NO_PROJECT_ROOT_FOLDER);
         }
         try {
             const project = { path: this.projectRootPath };
@@ -122,57 +136,6 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
         return workflow.jobs['build-and-deploy'].steps;
     }
 }
-_a = SpfxProjectGithubWorkflowAddCommand, _SpfxProjectGithubWorkflowAddCommand_instances = new WeakSet(), _SpfxProjectGithubWorkflowAddCommand_initTelemetry = function _SpfxProjectGithubWorkflowAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            name: typeof args.options.name !== 'undefined',
-            branchName: typeof args.options.branchName !== 'undefined',
-            manuallyTrigger: !!args.options.manuallyTrigger,
-            loginMethod: typeof args.options.loginMethod !== 'undefined',
-            scope: typeof args.options.scope !== 'undefined',
-            skipFeatureDeployment: !!args.options.skipFeatureDeployment
-        });
-    });
-}, _SpfxProjectGithubWorkflowAddCommand_initOptions = function _SpfxProjectGithubWorkflowAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --name [name]'
-    }, {
-        option: '-b, --branchName [branchName]'
-    }, {
-        option: '-m, --manuallyTrigger'
-    }, {
-        option: '-l, --loginMethod [loginMethod]',
-        autocomplete: _a.loginMethod
-    }, {
-        option: '-s, --scope [scope]',
-        autocomplete: _a.scope
-    }, {
-        option: '-u, --siteUrl [siteUrl]'
-    }, {
-        option: '--skipFeatureDeployment'
-    });
-}, _SpfxProjectGithubWorkflowAddCommand_initValidators = function _SpfxProjectGithubWorkflowAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.scope && args.options.scope === 'sitecollection') {
-            if (!args.options.siteUrl) {
-                return `siteUrl option has to be defined when scope set to ${args.options.scope}`;
-            }
-            const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.siteUrl);
-            if (isValidSharePointUrl !== true) {
-                return isValidSharePointUrl;
-            }
-        }
-        if (args.options.loginMethod && _a.loginMethod.indexOf(args.options.loginMethod) < 0) {
-            return `${args.options.loginMethod} is not a valid login method. Allowed values are ${_a.loginMethod.join(', ')}`;
-        }
-        if (args.options.scope && _a.scope.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Allowed values are ${_a.scope.join(', ')}`;
-        }
-        return true;
-    });
-};
-SpfxProjectGithubWorkflowAddCommand.loginMethod = ['application', 'user'];
-SpfxProjectGithubWorkflowAddCommand.scope = ['tenant', 'sitecollection'];
 SpfxProjectGithubWorkflowAddCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;
 export default new SpfxProjectGithubWorkflowAddCommand();
 //# sourceMappingURL=project-github-workflow-add.js.map

package/dist/m365/spfx/commands/project/project-permissions-grant.js

@@ -1,10 +1,12 @@
 import fs from 'fs';
 import path from 'path';
+import { globalOptionsZod } from '../../../../Command.js';
 import { cli } from '../../../../cli/cli.js';
 import { CommandError } from '../../../../Command.js';
 import spoServicePrincipalGrantAddCommand from '../../../spo/commands/serviceprincipal/serviceprincipal-grant-add.js';
 import commands from '../../commands.js';
 import { BaseProjectCommand } from './base-project-command.js';
+export const options = globalOptionsZod.strict();
 class SpfxProjectPermissionSGrantCommand extends BaseProjectCommand {
     get name() {
         return commands.PROJECT_PERMISSIONS_GRANT;
@@ -12,8 +14,8 @@ class SpfxProjectPermissionSGrantCommand extends BaseProjectCommand {
     get description() {
         return 'Grants API permissions defined in the current SPFx project';
     }
-    constructor() {
-        super();
+    get schema() {
+        return options;
     }
     async commandAction(logger) {
         this.projectRootPath = this.getProjectRoot(process.cwd());

package/dist/m365/spfx/commands/project/project-rename.js

@@ -1,25 +1,19 @@
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _SpfxProjectRenameCommand_instances, _SpfxProjectRenameCommand_initTelemetry, _SpfxProjectRenameCommand_initOptions;
 import fs from 'fs';
 import path from 'path';
 import { v4 } from 'uuid';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { CommandError } from '../../../../Command.js';
 import commands from '../../commands.js';
 import { BaseProjectCommand } from './base-project-command.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    newName: z.string().alias('n'),
+    generateNewId: z.boolean().optional()
+});
 class SpfxProjectRenameCommand extends BaseProjectCommand {
-    get name() {
-        return commands.PROJECT_RENAME;
-    }
-    get description() {
-        return 'Renames SharePoint Framework project';
-    }
     constructor() {
-        super();
-        _SpfxProjectRenameCommand_instances.add(this);
+        super(...arguments);
         this.generateNewId = () => {
             return v4();
         };
@@ -132,8 +126,15 @@ class SpfxProjectRenameCommand extends BaseProjectCommand {
                 }
             }
         };
-        __classPrivateFieldGet(this, _SpfxProjectRenameCommand_instances, "m", _SpfxProjectRenameCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpfxProjectRenameCommand_instances, "m", _SpfxProjectRenameCommand_initOptions).call(this);
+    }
+    get name() {
+        return commands.PROJECT_RENAME;
+    }
+    get description() {
+        return 'Renames SharePoint Framework project';
+    }
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         this.projectRootPath = this.getProjectRoot(process.cwd());
@@ -165,19 +166,6 @@ class SpfxProjectRenameCommand extends BaseProjectCommand {
         }
     }
 }
-_SpfxProjectRenameCommand_instances = new WeakSet(), _SpfxProjectRenameCommand_initTelemetry = function _SpfxProjectRenameCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            generateNewId: args.options.generateNewId
-        });
-    });
-}, _SpfxProjectRenameCommand_initOptions = function _SpfxProjectRenameCommand_initOptions() {
-    this.options.unshift({
-        option: '-n, --newName <newName>'
-    }, {
-        option: '--generateNewId'
-    });
-};
 SpfxProjectRenameCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;
 export default new SpfxProjectRenameCommand();
 //# sourceMappingURL=project-rename.js.map

package/dist/m365/spfx/commands/project/project-upgrade.js

@@ -25,9 +25,6 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
     get description() {
         return 'Upgrades SharePoint Framework project to the specified version';
     }
-    get allowedOutputs() {
-        return ['json', 'text', 'md', 'tour'];
-    }
     get schema() {
         return options;
     }

package/dist/m365/spfx/commands/spfx-doctor.js

@@ -1,15 +1,26 @@
-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 _SpfxDoctorCommand_instances, _SpfxDoctorCommand_initTelemetry, _SpfxDoctorCommand_initOptions, _SpfxDoctorCommand_initValidators;
 import child_process from 'child_process';
 import { satisfies } from 'semver';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../Command.js';
 import { CheckStatus, formatting } from '../../../utils/formatting.js';
+import { zod } from '../../../utils/zod.js';
 import commands from '../commands.js';
 import { BaseProjectCommand } from './project/base-project-command.js';
 import { SharePointVersion, versions } from './SpfxCompatibilityMatrix.js';
+const environments = {
+    sp2016: 'sp2016',
+    sp2019: 'sp2019',
+    spo: 'spo'
+};
+const spfxVersions = Object.keys(versions);
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    env: zod.coercedEnum(environments).optional().alias('e'),
+    spfxVersion: z.enum(spfxVersions, {
+        error: `The specified version is not a supported SharePoint Framework version. Supported versions are ${spfxVersions.join(', ')}`
+    }).optional().alias('v'),
+    output: z.enum(['text', 'json']).optional().alias('o')
+});
 /**
  * Where to search for the particular npm package: only in the current project,
  * in global packages or both
@@ -29,8 +40,10 @@ var HandlePromise;
     HandlePromise[HandlePromise["Continue"] = 1] = "Continue";
 })(HandlePromise || (HandlePromise = {}));
 class SpfxDoctorCommand extends BaseProjectCommand {
-    get allowedOutputs() {
-        return ['text', 'json'];
+    constructor() {
+        super(...arguments);
+        this.output = '';
+        this.resultsObject = [];
     }
     get name() {
         return commands.DOCTOR;
@@ -38,14 +51,8 @@ class SpfxDoctorCommand extends BaseProjectCommand {
     get description() {
         return 'Verifies environment configuration for using the specific version of the SharePoint Framework';
     }
-    constructor() {
-        super();
-        _SpfxDoctorCommand_instances.add(this);
-        this.output = '';
-        this.resultsObject = [];
-        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initValidators).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         if (!args.options.output) {
@@ -430,36 +437,5 @@ class SpfxDoctorCommand extends BaseProjectCommand {
         }
     }
 }
-_SpfxDoctorCommand_instances = new WeakSet(), _SpfxDoctorCommand_initTelemetry = function _SpfxDoctorCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            env: args.options.env,
-            spfxVersion: args.options.spfxVersion
-        });
-    });
-}, _SpfxDoctorCommand_initOptions = function _SpfxDoctorCommand_initOptions() {
-    this.options.unshift({
-        option: '-e, --env [env]',
-        autocomplete: ['sp2016', 'sp2019', 'spo']
-    }, {
-        option: '-v, --spfxVersion [spfxVersion]',
-        autocomplete: Object.keys(versions)
-    });
-}, _SpfxDoctorCommand_initValidators = function _SpfxDoctorCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.env) {
-            const sp = this.spVersionStringToEnum(args.options.env);
-            if (!sp) {
-                return `${args.options.env} is not a valid SharePoint version. Valid versions are sp2016, sp2019 or spo`;
-            }
-        }
-        if (args.options.spfxVersion) {
-            if (!versions[args.options.spfxVersion]) {
-                return `${args.options.spfxVersion} is not a supported SharePoint Framework version. Supported versions are ${Object.keys(versions).join(', ')}`;
-            }
-        }
-        return true;
-    });
-};
 export default new SpfxDoctorCommand();
 //# sourceMappingURL=spfx-doctor.js.map

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

@@ -1,12 +1,8 @@
-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 _SpoFileAddCommand_instances, _SpoFileAddCommand_initTelemetry, _SpoFileAddCommand_initOptions, _SpoFileAddCommand_initValidators, _SpoFileAddCommand_initTypes;
 import fs from 'fs';
 import path from 'path';
 import { v4 } from 'uuid';
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
@@ -14,7 +10,37 @@ 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'),
+    folder: z.string(),
+    path: z.string()
+        .refine(filePath => fs.existsSync(filePath), {
+        error: 'Specified path of the file to add does not exist',
+        abort: true
+    })
+        .alias('p'),
+    contentType: z.string().optional().alias('c'),
+    checkOut: z.boolean().optional(),
+    checkInComment: z.string().optional(),
+    approve: z.boolean().optional(),
+    approveComment: z.string().optional(),
+    publish: z.boolean().optional(),
+    publishComment: z.string().optional(),
+    overwrite: z.boolean().optional(),
+    fileName: z.string().optional()
+}).catchall(z.unknown());
 class SpoFileAddCommand extends SpoCommand {
+    constructor() {
+        super(...arguments);
+        this.fileChunkingThreshold = 250 * 1024 * 1024; // max 250 MB
+        this.fileChunkSize = 250 * 1024 * 1024; // max fileChunkingThreshold
+        this.fileChunkRetryAttempts = 5;
+    }
     get name() {
         return commands.FILE_ADD;
     }
@@ -24,16 +50,25 @@ class SpoFileAddCommand extends SpoCommand {
     allowUnknownOptions() {
         return true;
     }
-    constructor() {
-        super();
-        _SpoFileAddCommand_instances.add(this);
-        this.fileChunkingThreshold = 250 * 1024 * 1024; // max 250 MB
-        this.fileChunkSize = 250 * 1024 * 1024; // max fileChunkingThreshold
-        this.fileChunkRetryAttempts = 5;
-        __classPrivateFieldGet(this, _SpoFileAddCommand_instances, "m", _SpoFileAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFileAddCommand_instances, "m", _SpoFileAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFileAddCommand_instances, "m", _SpoFileAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFileAddCommand_instances, "m", _SpoFileAddCommand_initTypes).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => !opts.publishComment || opts.publish, {
+            error: '--publishComment cannot be used without --publish',
+            path: ['publish'],
+            params: {
+                customCode: 'required'
+            }
+        })
+            .refine(opts => !opts.approveComment || opts.approve, {
+            error: '--approveComment cannot be used without --approve',
+            path: ['approve'],
+            params: {
+                customCode: 'required'
+            }
+        });
     }
     async commandAction(logger, args) {
         const folderPath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.folder);
@@ -452,66 +487,5 @@ class SpoFileAddCommand extends SpoCommand {
         return result;
     }
 }
-_SpoFileAddCommand_instances = new WeakSet(), _SpoFileAddCommand_initTelemetry = function _SpoFileAddCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            contentType: typeof args.options.contentType !== 'undefined',
-            checkOut: !!args.options.checkOut,
-            checkInComment: typeof args.options.checkInComment !== 'undefined',
-            approve: !!args.options.approve,
-            approveComment: typeof args.options.approveComment !== 'undefined',
-            publish: !!args.options.publish,
-            publishComment: typeof args.options.publishComment !== 'undefined',
-            overwrite: !!args.options.overwrite,
-            fileName: typeof args.options.fileName !== 'undefined'
-        });
-    });
-}, _SpoFileAddCommand_initOptions = function _SpoFileAddCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--folder <folder>'
-    }, {
-        option: '-p, --path <path>'
-    }, {
-        option: '-c, --contentType [contentType]'
-    }, {
-        option: '--checkOut'
-    }, {
-        option: '--checkInComment [checkInComment]'
-    }, {
-        option: '--approve'
-    }, {
-        option: '--approveComment [approveComment]'
-    }, {
-        option: '--publish'
-    }, {
-        option: '--publishComment [publishComment]'
-    }, {
-        option: '--overwrite'
-    }, {
-        option: '--fileName [fileName]'
-    });
-}, _SpoFileAddCommand_initValidators = function _SpoFileAddCommand_initValidators() {
-    this.validators.push(async (args) => {
-        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
-        if (isValidSharePointUrl !== true) {
-            return isValidSharePointUrl;
-        }
-        if (args.options.path && !fs.existsSync(args.options.path)) {
-            return 'Specified path of the file to add does not exist';
-        }
-        if (args.options.publishComment && !args.options.publish) {
-            return '--publishComment cannot be used without --publish';
-        }
-        if (args.options.approveComment && !args.options.approve) {
-            return '--approveComment cannot be used without --approve';
-        }
-        return true;
-    });
-}, _SpoFileAddCommand_initTypes = function _SpoFileAddCommand_initTypes() {
-    this.types.string.push('webUrl', 'folder', 'path', 'contentType', 'checkInComment', 'approveComment', 'publishComment', 'fileName');
-    this.types.boolean.push('checkOut', 'approve', 'publish', 'overwrite');
-};
 export default new SpoFileAddCommand();
 //# sourceMappingURL=file-add.js.map

package/dist/m365/spo/commands/file/file-archive.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 SpoFileArchiveCommand extends SpoCommand {

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

@@ -1,13 +1,10 @@
-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 _SpoFileCheckinCommand_instances, _SpoFileCheckinCommand_initTelemetry, _SpoFileCheckinCommand_initOptions, _SpoFileCheckinCommand_initValidators, _SpoFileCheckinCommand_initOptionSets, _SpoFileCheckinCommand_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 { zod } from '../../../../utils/zod.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 var CheckinType;
@@ -16,6 +13,26 @@ var CheckinType;
     CheckinType[CheckinType["Major"] = 1] = "Major";
     CheckinType[CheckinType["Overwrite"] = 2] = "Overwrite";
 })(CheckinType || (CheckinType = {}));
+var CheckinTypeOption;
+(function (CheckinTypeOption) {
+    CheckinTypeOption["Minor"] = "Minor";
+    CheckinTypeOption["Major"] = "Major";
+    CheckinTypeOption["Overwrite"] = "Overwrite";
+})(CheckinTypeOption || (CheckinTypeOption = {}));
+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'),
+    type: zod.coercedEnum(CheckinTypeOption).optional().alias('t'),
+    comment: z.string()
+        .max(1023, { error: 'The length of the comment must be less than 1024 letters' })
+        .optional()
+});
 class SpoFileCheckinCommand extends SpoCommand {
     get name() {
         return commands.FILE_CHECKIN;
@@ -23,14 +40,18 @@ class SpoFileCheckinCommand extends SpoCommand {
     get description() {
         return 'Checks in specified file';
     }
-    constructor() {
-        super();
-        _SpoFileCheckinCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoFileCheckinCommand_instances, "m", _SpoFileCheckinCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoFileCheckinCommand_instances, "m", _SpoFileCheckinCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoFileCheckinCommand_instances, "m", _SpoFileCheckinCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpoFileCheckinCommand_instances, "m", _SpoFileCheckinCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _SpoFileCheckinCommand_instances, "m", _SpoFileCheckinCommand_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 'url' or 'id', but not both.`,
+            params: {
+                customCode: 'optionSet',
+                options: ['url', 'id']
+            }
+        });
     }
     getExcludedOptionsWithUrls() {
         return ['url'];
@@ -73,55 +94,5 @@ class SpoFileCheckinCommand extends SpoCommand {
         }
     }
 }
-_SpoFileCheckinCommand_instances = new WeakSet(), _SpoFileCheckinCommand_initTelemetry = function _SpoFileCheckinCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            url: typeof args.options.url !== 'undefined',
-            type: args.options.type || 'Major',
-            comment: typeof args.options.comment !== 'undefined'
-        });
-    });
-}, _SpoFileCheckinCommand_initOptions = function _SpoFileCheckinCommand_initOptions() {
-    this.options.unshift({
-        option: '-u, --webUrl <webUrl>'
-    }, {
-        option: '--url [url]'
-    }, {
-        option: '-i, --id [id]'
-    }, {
-        option: '-t, --type [type]',
-        autocomplete: ['Minor', 'Major', 'Overwrite']
-    }, {
-        option: '--comment [comment]'
-    });
-}, _SpoFileCheckinCommand_initValidators = function _SpoFileCheckinCommand_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.comment && args.options.comment.length > 1023) {
-            return 'The length of the comment must be less than 1024 letters';
-        }
-        if (args.options.type) {
-            const allowedValues = ['minor', 'major', 'overwrite'];
-            const type = args.options.type.toLowerCase();
-            if (allowedValues.indexOf(type) === -1) {
-                return 'Wrong type specified. Available values are Minor|Major|Overwrite';
-            }
-        }
-        return true;
-    });
-}, _SpoFileCheckinCommand_initOptionSets = function _SpoFileCheckinCommand_initOptionSets() {
-    this.optionSets.push({ options: ['url', 'id'] });
-}, _SpoFileCheckinCommand_initTypes = function _SpoFileCheckinCommand_initTypes() {
-    this.types.string.push('webUrl', 'url', 'id', 'type', 'comment');
-};
 export default new SpoFileCheckinCommand();
 //# sourceMappingURL=file-checkin.js.map