@pnp/cli-microsoft365 6.0.0-beta.09b5216 → 6.0.0-beta.0b0fb88

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

@@ -1,4 +1,19 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoFieldSetCommand_instances, _SpoFieldSetCommand_initTelemetry, _SpoFieldSetCommand_initOptions, _SpoFieldSetCommand_initValidators, _SpoFieldSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
@@ -7,21 +22,20 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFieldSetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFieldSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFieldSetCommand_instances, "m", _SpoFieldSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFieldSetCommand_instances, "m", _SpoFieldSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFieldSetCommand_instances, "m", _SpoFieldSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFieldSetCommand_instances, "m", _SpoFieldSetCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.FIELD_SET;
     }
     get description() {
         return 'Updates existing list or site column';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.name = typeof args.options.name !== 'undefined';
-        telemetryProps.listId = typeof args.options.listId !== 'undefined';
-        telemetryProps.listTitle = typeof args.options.listTitle !== 'undefined';
-        telemetryProps.updateExistingLists = !!args.options.updateExistingLists;
-        return telemetryProps;
-    }
     allowUnknownOptions() {
         return true;
     }
@@ -61,7 +75,7 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
             // retrieve column CSOM object id
             const fieldQuery = args.options.id ?
                 `<Method Id="663" ParentId="7" Name="GetById"><Parameters><Parameter Type="Guid">${utils_1.formatting.escapeXml(args.options.id)}</Parameter></Parameters></Method>` :
-                `<Method Id="663" ParentId="7" Name="GetByInternalNameOrTitle"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name)}</Parameter></Parameters></Method>`;
+                `<Method Id="663" ParentId="7" Name="GetByInternalNameOrTitle"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.title)}</Parameter></Parameters></Method>`;
             const requestOptions = {
                 url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
@@ -104,7 +118,7 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
             'listId',
             'listTitle',
             'id',
-            'name',
+            'title',
             'updateExistingLists',
             'debug',
             'verbose',
@@ -116,31 +130,33 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
         }).join('');
         return payload;
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '--listId [listId]'
-            },
-            {
-                option: '--listTitle [listTitle]'
-            },
-            {
-                option: '-i|--id [id]'
-            },
-            {
-                option: '-n|--name [name]'
-            },
-            {
-                option: '--updateExistingLists'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry = function _SpoFieldSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            updateExistingLists: !!args.options.updateExistingLists
+        });
+    });
+}, _SpoFieldSetCommand_initOptions = function _SpoFieldSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--listId [listId]'
+    }, {
+        option: '--listTitle [listTitle]'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '--updateExistingLists'
+    });
+}, _SpoFieldSetCommand_initValidators = function _SpoFieldSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
@@ -152,18 +168,14 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
             !utils_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        if (!args.options.id && !args.options.name) {
-            return `Specify id or name`;
-        }
-        if (args.options.id && args.options.name) {
-            return `Specify viewId or viewTitle but not both`;
-        }
         if (args.options.id &&
             !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} in option id is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+}, _SpoFieldSetCommand_initOptionSets = function _SpoFieldSetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'title']);
+};
 module.exports = new SpoFieldSetCommand();
 //# sourceMappingURL=field-set.js.map

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

@@ -1,4 +1,19 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
@@ -9,10 +24,14 @@ const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFileAddCommand extends SpoCommand_1.default {
     constructor() {
-        super(...arguments);
+        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);
     }
     get name() {
         return commands_1.default.FILE_ADD;
@@ -23,17 +42,6 @@ class SpoFileAddCommand extends SpoCommand_1.default {
     allowUnknownOptions() {
         return true;
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.contentType = (!(!args.options.contentType)).toString();
-        telemetryProps.checkOut = args.options.checkOut || false;
-        telemetryProps.checkInComment = (!(!args.options.checkInComment)).toString();
-        telemetryProps.approve = args.options.approve || false;
-        telemetryProps.approveComment = (!(!args.options.approveComment)).toString();
-        telemetryProps.publish = args.options.publish || false;
-        telemetryProps.publishComment = (!(!args.options.publishComment)).toString();
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const folderPath = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folder);
         const fullPath = path.resolve(args.options.path);
@@ -252,58 +260,6 @@ class SpoFileAddCommand extends SpoCommand_1.default {
             }
         });
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-f, --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]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        const isValidSharePointUrl = utils_1.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;
-    }
     listHasContentType(contentType, webUrl, listSettings, logger) {
         if (this.verbose) {
             logger.logToStderr(`Getting list of available content types ...`);
@@ -506,5 +462,57 @@ class SpoFileAddCommand extends SpoCommand_1.default {
         return result;
     }
 }
+_SpoFileAddCommand_instances = new WeakSet(), _SpoFileAddCommand_initTelemetry = function _SpoFileAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            contentType: (!(!args.options.contentType)).toString(),
+            checkOut: args.options.checkOut || false,
+            checkInComment: (!(!args.options.checkInComment)).toString(),
+            approve: args.options.approve || false,
+            approveComment: (!(!args.options.approveComment)).toString(),
+            publish: args.options.publish || false,
+            publishComment: (!(!args.options.publishComment)).toString()
+        });
+    });
+}, _SpoFileAddCommand_initOptions = function _SpoFileAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-f, --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]'
+    });
+}, _SpoFileAddCommand_initValidators = function _SpoFileAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = utils_1.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;
+    }));
+};
 module.exports = new SpoFileAddCommand();
 //# sourceMappingURL=file-add.js.map

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

@@ -1,4 +1,19 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -11,20 +26,20 @@ var CheckinType;
     CheckinType[CheckinType["Overwrite"] = 2] = "Overwrite";
 })(CheckinType || (CheckinType = {}));
 class SpoFileCheckinCommand extends SpoCommand_1.default {
+    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);
+    }
     get name() {
         return commands_1.default.FILE_CHECKIN;
     }
     get description() {
         return 'Checks in specified file';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = (!(!args.options.id)).toString();
-        telemetryProps.url = (!(!args.options.fileUrl)).toString();
-        telemetryProps.type = args.options.type || 'Major';
-        telemetryProps.comment = typeof args.options.comment !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let type = CheckinType.Major;
         if (args.options.type) {
@@ -44,8 +59,8 @@ class SpoFileCheckinCommand extends SpoCommand_1.default {
         if (args.options.id) {
             requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${encodeURIComponent(args.options.id)}')/checkin(comment='${comment}',checkintype=${type})`;
         }
-        if (args.options.fileUrl) {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(args.options.fileUrl)}')/checkin(comment='${comment}',checkintype=${type})`;
+        if (args.options.url) {
+            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(args.options.url)}')/checkin(comment='${comment}',checkintype=${type})`;
         }
         const requestOptions = {
             url: requestUrl,
@@ -58,29 +73,31 @@ class SpoFileCheckinCommand extends SpoCommand_1.default {
             .post(requestOptions)
             .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-f, --fileUrl [fileUrl]'
-            },
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-t, --type [type]',
-                autocomplete: ['Minor', 'Major', 'Overwrite']
-            },
-            {
-                option: '--comment [comment]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoFileCheckinCommand_instances = new WeakSet(), _SpoFileCheckinCommand_initTelemetry = function _SpoFileCheckinCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: (!(!args.options.id)).toString(),
+            url: (!(!args.options.url)).toString(),
+            type: args.options.type || 'Major',
+            comment: typeof args.options.comment !== 'undefined'
+        });
+    });
+}, _SpoFileCheckinCommand_initOptions = function _SpoFileCheckinCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-f, --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((args) => __awaiter(this, void 0, void 0, function* () {
         const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
@@ -90,12 +107,6 @@ class SpoFileCheckinCommand extends SpoCommand_1.default {
                 return `${args.options.id} is not a valid GUID`;
             }
         }
-        if (args.options.id && args.options.fileUrl) {
-            return 'Specify either fileUrl or id but not both';
-        }
-        if (!args.options.id && !args.options.fileUrl) {
-            return 'Specify fileUrl or id, one is required';
-        }
         if (args.options.comment && args.options.comment.length > 1023) {
             return 'The length of the comment must be less than 1024 letters';
         }
@@ -107,7 +118,9 @@ class SpoFileCheckinCommand extends SpoCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+}, _SpoFileCheckinCommand_initOptionSets = function _SpoFileCheckinCommand_initOptionSets() {
+    this.optionSets.push(['url', 'id']);
+};
 module.exports = new SpoFileCheckinCommand();
 //# sourceMappingURL=file-checkin.js.map

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

@@ -1,29 +1,46 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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 _SpoFileCheckoutCommand_instances, _SpoFileCheckoutCommand_initTelemetry, _SpoFileCheckoutCommand_initOptions, _SpoFileCheckoutCommand_initValidators, _SpoFileCheckoutCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFileCheckoutCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFileCheckoutCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFileCheckoutCommand_instances, "m", _SpoFileCheckoutCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFileCheckoutCommand_instances, "m", _SpoFileCheckoutCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFileCheckoutCommand_instances, "m", _SpoFileCheckoutCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileCheckoutCommand_instances, "m", _SpoFileCheckoutCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.FILE_CHECKOUT;
     }
     get description() {
         return 'Checks out specified file';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = (!(!args.options.id)).toString();
-        telemetryProps.fileUrl = (!(!args.options.fileUrl)).toString();
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let requestUrl = '';
         if (args.options.id) {
             requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${encodeURIComponent(args.options.id)}')/checkout`;
         }
-        if (args.options.fileUrl) {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(args.options.fileUrl)}')/checkout`;
+        if (args.options.url) {
+            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(args.options.url)}')/checkout`;
         }
         const requestOptions = {
             url: requestUrl,
@@ -36,22 +53,24 @@ class SpoFileCheckoutCommand extends SpoCommand_1.default {
             .post(requestOptions)
             .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-f, --fileUrl [fileUrl]'
-            },
-            {
-                option: '-i, --id [id]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoFileCheckoutCommand_instances = new WeakSet(), _SpoFileCheckoutCommand_initTelemetry = function _SpoFileCheckoutCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: (!(!args.options.id)).toString(),
+            url: (!(!args.options.url)).toString()
+        });
+    });
+}, _SpoFileCheckoutCommand_initOptions = function _SpoFileCheckoutCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-f, --url [url]'
+    }, {
+        option: '-i, --id [id]'
+    });
+}, _SpoFileCheckoutCommand_initValidators = function _SpoFileCheckoutCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
@@ -61,14 +80,10 @@ class SpoFileCheckoutCommand extends SpoCommand_1.default {
                 return `${args.options.id} is not a valid GUID`;
             }
         }
-        if (args.options.id && args.options.fileUrl) {
-            return 'Specify either id or fileUrl but not both';
-        }
-        if (!args.options.id && !args.options.fileUrl) {
-            return 'Specify id or fileUrl, one is required';
-        }
         return true;
-    }
-}
+    }));
+}, _SpoFileCheckoutCommand_initOptionSets = function _SpoFileCheckoutCommand_initOptionSets() {
+    this.optionSets.push(['id', 'url']);
+};
 module.exports = new SpoFileCheckoutCommand();
 //# sourceMappingURL=file-checkout.js.map