@pnp/cli-microsoft365 6.0.0-beta.6a854fc → 6.0.0-beta.78fdd2c

package/dist/m365/spo/commands/field/field-remove.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 _SpoFieldRemoveCommand_instances, _SpoFieldRemoveCommand_initTelemetry, _SpoFieldRemoveCommand_initOptions, _SpoFieldRemoveCommand_initValidators, _SpoFieldRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -6,24 +21,25 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFieldRemoveCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFieldRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFieldRemoveCommand_instances, "m", _SpoFieldRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFieldRemoveCommand_instances, "m", _SpoFieldRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFieldRemoveCommand_instances, "m", _SpoFieldRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFieldRemoveCommand_instances, "m", _SpoFieldRemoveCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.FIELD_REMOVE;
     }
     get description() {
         return 'Removes the specified list- or site column';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.listId = typeof args.options.listId !== 'undefined';
-        telemetryProps.listTitle = typeof args.options.listTitle !== 'undefined';
-        telemetryProps.listUrl = typeof args.options.listUrl !== 'undefined';
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.group = typeof args.options.group !== 'undefined';
-        telemetryProps.fieldTitle = typeof args.options.fieldTitle !== 'undefined';
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
+        if (args.options.fieldTitle) {
+            args.options.title = args.options.fieldTitle;
+            this.warn(logger, `Option 'fieldTitle' is deprecated. Please use 'title' instead.`);
+        }
         let messageEnd;
         if (args.options.listId || args.options.listTitle) {
             messageEnd = `in list ${args.options.listId || args.options.listTitle}`;
@@ -31,16 +47,16 @@ class SpoFieldRemoveCommand extends SpoCommand_1.default {
         else {
             messageEnd = `in site ${args.options.webUrl}`;
         }
-        const removeField = (listRestUrl, fieldId, fieldTitle) => {
+        const removeField = (listRestUrl, fieldId, title) => {
             if (this.verbose) {
-                logger.logToStderr(`Removing field ${fieldId || fieldTitle} ${messageEnd}...`);
+                logger.logToStderr(`Removing field ${fieldId || title} ${messageEnd}...`);
             }
             let fieldRestUrl = '';
             if (fieldId) {
                 fieldRestUrl = `/getbyid('${utils_1.formatting.encodeQueryParameter(fieldId)}')`;
             }
             else {
-                fieldRestUrl = `/getbyinternalnameortitle('${utils_1.formatting.encodeQueryParameter(fieldTitle)}')`;
+                fieldRestUrl = `/getbyinternalnameortitle('${utils_1.formatting.encodeQueryParameter(title)}')`;
             }
             const requestOptions = {
                 url: `${args.options.webUrl}/_api/web/${listRestUrl}fields${fieldRestUrl}`,
@@ -97,7 +113,7 @@ class SpoFieldRemoveCommand extends SpoCommand_1.default {
                 }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
             }
             else {
-                removeField(listRestUrl, args.options.id, args.options.fieldTitle)
+                removeField(listRestUrl, args.options.id, args.options.title)
                     .then(() => {
                     // REST post call doesn't return anything
                     cb();
@@ -108,7 +124,7 @@ class SpoFieldRemoveCommand extends SpoCommand_1.default {
             prepareRemoval();
         }
         else {
-            const confirmMessage = `Are you sure you want to remove the ${args.options.group ? 'fields' : 'field'} ${args.options.id || args.options.fieldTitle || 'from group ' + args.options.group} ${messageEnd}?`;
+            const confirmMessage = `Are you sure you want to remove the ${args.options.group ? 'fields' : 'field'} ${args.options.id || args.options.title || 'from group ' + args.options.group} ${messageEnd}?`;
             cli_1.Cli.prompt({
                 type: 'confirm',
                 name: 'continue',
@@ -124,44 +140,45 @@ class SpoFieldRemoveCommand extends SpoCommand_1.default {
             });
         }
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-l, --listTitle [listTitle]'
-            },
-            {
-                option: '--listId [listId]'
-            },
-            {
-                option: '--listUrl [listUrl]'
-            },
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-t, --fieldTitle [fieldTitle]'
-            },
-            {
-                option: '-g, --group [group]'
-            },
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoFieldRemoveCommand_instances = new WeakSet(), _SpoFieldRemoveCommand_initTelemetry = function _SpoFieldRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            group: typeof args.options.group !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SpoFieldRemoveCommand_initOptions = function _SpoFieldRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-l, --listTitle [listTitle]'
+    }, {
+        option: '--listId [listId]'
+    }, {
+        option: '--listUrl [listUrl]'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '--fieldTitle [fieldTitle]'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-g, --group [group]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoFieldRemoveCommand_initValidators = function _SpoFieldRemoveCommand_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.id && !args.options.fieldTitle && !args.options.group) {
-            return 'Specify id, fieldTitle, or group. One is required';
-        }
         if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
@@ -169,7 +186,9 @@ class SpoFieldRemoveCommand extends SpoCommand_1.default {
             return `${args.options.listId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+}, _SpoFieldRemoveCommand_initOptionSets = function _SpoFieldRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'title', 'fieldTitle', 'group']);
+};
 module.exports = new SpoFieldRemoveCommand();
 //# sourceMappingURL=field-remove.js.map

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,22 +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.title = typeof args.options.title !== '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;
     }
@@ -121,39 +134,36 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
         }).join('');
         return payload;
     }
-    optionSets() {
-        return [
-            ['id', 'title', 'name']
-        ];
-    }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '--listId [listId]'
-            },
-            {
-                option: '--listTitle [listTitle]'
-            },
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-n, --name [name]'
-            },
-            {
-                option: '-t, --title [title]'
-            },
-            {
-                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',
+            name: typeof args.options.name !== '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: '-n, --name [name]'
+    }, {
+        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;
@@ -170,7 +180,9 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
             return `${args.options.id} in option id is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+}, _SpoFieldSetCommand_initOptionSets = function _SpoFieldSetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'title', 'name']);
+};
 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;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -11,20 +26,19 @@ 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);
+    }
     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) {
@@ -58,29 +72,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.fileUrl)).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, --fileUrl [fileUrl]'
+    }, {
+        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;
@@ -107,7 +123,7 @@ class SpoFileCheckinCommand extends SpoCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoFileCheckinCommand();
 //# sourceMappingURL=file-checkin.js.map