@pnp/cli-microsoft365 6.0.0-beta.4d2402f → 6.0.0-beta.4e32416

package/dist/m365/spo/commands/feature/feature-list.js

@@ -1,25 +1,42 @@
 "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 _SpoFeatureListCommand_instances, _SpoFeatureListCommand_initTelemetry, _SpoFeatureListCommand_initOptions, _SpoFeatureListCommand_initValidators;
 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 SpoFeatureListCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFeatureListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFeatureListCommand_instances, "m", _SpoFeatureListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFeatureListCommand_instances, "m", _SpoFeatureListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFeatureListCommand_instances, "m", _SpoFeatureListCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.FEATURE_LIST;
     }
     get description() {
         return 'Lists Features activated in the specified site or site collection';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.scope = args.options.scope || 'Web';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const scope = (args.options.scope) ? args.options.scope : 'Web';
         const requestOptions = {
-            url: `${args.options.url}/_api/${scope}/Features?$select=DisplayName,DefinitionId`,
+            url: `${args.options.webUrl}/_api/${scope}/Features?$select=DisplayName,DefinitionId`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -39,28 +56,30 @@ class SpoFeatureListCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '-s, --scope [scope]',
-                autocomplete: ['Site', 'Web']
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoFeatureListCommand_instances = new WeakSet(), _SpoFeatureListCommand_initTelemetry = function _SpoFeatureListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            scope: args.options.scope || 'Web'
+        });
+    });
+}, _SpoFeatureListCommand_initOptions = function _SpoFeatureListCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-s, --scope [scope]',
+        autocomplete: ['Site', 'Web']
+    });
+}, _SpoFeatureListCommand_initValidators = function _SpoFeatureListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.scope) {
             if (args.options.scope !== 'Site' &&
                 args.options.scope !== 'Web') {
                 return `${args.options.scope} is not a valid Feature scope. Allowed values are Site|Web`;
             }
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.url);
-    }
-}
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+};
 module.exports = new SpoFeatureListCommand();
 //# sourceMappingURL=feature-list.js.map

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

@@ -1,10 +1,32 @@
 "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 _SpoFieldAddCommand_instances, _SpoFieldAddCommand_initTelemetry, _SpoFieldAddCommand_initOptions, _SpoFieldAddCommand_initValidators;
 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 SpoFieldAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFieldAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFieldAddCommand_instances, "m", _SpoFieldAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFieldAddCommand_instances, "m", _SpoFieldAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFieldAddCommand_instances, "m", _SpoFieldAddCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.FIELD_ADD;
     }
@@ -69,25 +91,26 @@ class SpoFieldAddCommand extends SpoCommand_1.default {
         });
         return optionsValue;
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-l, --listTitle [listTitle]'
-            },
-            {
-                option: '-x, --xml <xml>'
-            },
-            {
-                option: '--options [options]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoFieldAddCommand_instances = new WeakSet(), _SpoFieldAddCommand_initTelemetry = function _SpoFieldAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            options: typeof args.options.options !== 'undefined'
+        });
+    });
+}, _SpoFieldAddCommand_initOptions = function _SpoFieldAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-l, --listTitle [listTitle]'
+    }, {
+        option: '-x, --xml <xml>'
+    }, {
+        option: '--options [options]'
+    });
+}, _SpoFieldAddCommand_initValidators = function _SpoFieldAddCommand_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;
@@ -104,7 +127,7 @@ class SpoFieldAddCommand extends SpoCommand_1.default {
             return optionsError;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoFieldAddCommand();
 //# sourceMappingURL=field-add.js.map

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

@@ -1,25 +1,39 @@
 "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 _SpoFieldGetCommand_instances, _SpoFieldGetCommand_initTelemetry, _SpoFieldGetCommand_initOptions, _SpoFieldGetCommand_initValidators, _SpoFieldGetCommand_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 SpoFieldGetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFieldGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFieldGetCommand_instances, "m", _SpoFieldGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFieldGetCommand_instances, "m", _SpoFieldGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFieldGetCommand_instances, "m", _SpoFieldGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFieldGetCommand_instances, "m", _SpoFieldGetCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.FIELD_GET;
     }
     get description() {
         return 'Retrieves information about 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.fieldTitle = typeof args.options.fieldTitle !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         let listRestUrl = '';
         if (args.options.listId) {
@@ -37,7 +51,7 @@ class SpoFieldGetCommand extends SpoCommand_1.default {
             fieldRestUrl = `/getbyid('${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
         }
         else {
-            fieldRestUrl = `/getbyinternalnameortitle('${utils_1.formatting.encodeQueryParameter(args.options.fieldTitle)}')`;
+            fieldRestUrl = `/getbyinternalnameortitle('${utils_1.formatting.encodeQueryParameter(args.options.title)}')`;
         }
         const requestOptions = {
             url: `${args.options.webUrl}/_api/web/${listRestUrl}fields${fieldRestUrl}`,
@@ -53,38 +67,37 @@ class SpoFieldGetCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-l, --listTitle [listTitle]'
-            },
-            {
-                option: '--listId [listId]'
-            },
-            {
-                option: '--listUrl [listUrl]'
-            },
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '--fieldTitle [fieldTitle]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoFieldGetCommand_instances = new WeakSet(), _SpoFieldGetCommand_initTelemetry = function _SpoFieldGetCommand_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',
+            title: typeof args.options.title !== 'undefined'
+        });
+    });
+}, _SpoFieldGetCommand_initOptions = function _SpoFieldGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-l, --listTitle [listTitle]'
+    }, {
+        option: '--listId [listId]'
+    }, {
+        option: '--listUrl [listUrl]'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-t, --title [title]'
+    });
+}, _SpoFieldGetCommand_initValidators = function _SpoFieldGetCommand_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) {
-            return 'Specify id or fieldTitle, one is required';
-        }
         if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
@@ -92,7 +105,9 @@ class SpoFieldGetCommand extends SpoCommand_1.default {
             return `${args.options.listId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+}, _SpoFieldGetCommand_initOptionSets = function _SpoFieldGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'title']);
+};
 module.exports = new SpoFieldGetCommand();
 //# sourceMappingURL=field-get.js.map

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

@@ -1,23 +1,38 @@
 "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 _SpoFieldListCommand_instances, _SpoFieldListCommand_initTelemetry, _SpoFieldListCommand_initOptions, _SpoFieldListCommand_initValidators;
 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 SpoFieldListCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFieldListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFieldListCommand_instances, "m", _SpoFieldListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFieldListCommand_instances, "m", _SpoFieldListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFieldListCommand_instances, "m", _SpoFieldListCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.FIELD_LIST;
     }
     get description() {
         return 'Retrieves columns for the specified list or site';
     }
-    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';
-        return telemetryProps;
-    }
     defaultProperties() {
         return ['Id', 'Title', 'Group', 'Hidden'];
     }
@@ -47,25 +62,27 @@ class SpoFieldListCommand extends SpoCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-t, --listTitle [listTitle]'
-            },
-            {
-                option: '-i, --listId [listId]'
-            },
-            {
-                option: '--listUrl [listUrl]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoFieldListCommand_instances = new WeakSet(), _SpoFieldListCommand_initTelemetry = function _SpoFieldListCommand_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'
+        });
+    });
+}, _SpoFieldListCommand_initOptions = function _SpoFieldListCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '-i, --listId [listId]'
+    }, {
+        option: '--listUrl [listUrl]'
+    });
+}, _SpoFieldListCommand_initValidators = function _SpoFieldListCommand_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;
@@ -78,7 +95,7 @@ class SpoFieldListCommand extends SpoCommand_1.default {
             return `Specify either list id or title or list url`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoFieldListCommand();
 //# sourceMappingURL=field-list.js.map

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,23 +21,20 @@ 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) {
         let messageEnd;
         if (args.options.listId || args.options.listTitle) {
@@ -31,16 +43,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 +109,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 +120,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 +136,43 @@ 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: '-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 +180,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', 'group']);
+};
 module.exports = new SpoFieldRemoveCommand();
 //# sourceMappingURL=field-remove.js.map