@pnp/cli-microsoft365 6.0.0-beta.f73c4f8 → 6.0.0-beta.fcd7567

package/dist/m365/spo/commands/list/list-sitescript-get.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 _SpoListSiteScriptGetCommand_instances, _SpoListSiteScriptGetCommand_initTelemetry, _SpoListSiteScriptGetCommand_initOptions, _SpoListSiteScriptGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
@@ -6,18 +21,19 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListSiteScriptGetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoListSiteScriptGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoListSiteScriptGetCommand_instances, "m", _SpoListSiteScriptGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoListSiteScriptGetCommand_instances, "m", _SpoListSiteScriptGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListSiteScriptGetCommand_instances, "m", _SpoListSiteScriptGetCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.LIST_SITESCRIPT_GET;
     }
     get description() {
         return 'Extracts a site script from a SharePoint list';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.listId = (!(!args.options.listId)).toString();
-        telemetryProps.listTitle = (!(!args.options.listTitle)).toString();
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         if (this.verbose) {
             const list = (args.options.listId ? args.options.listId : args.options.listTitle);
@@ -73,22 +89,24 @@ class SpoListSiteScriptGetCommand extends SpoCommand_1.default {
             this.handleRejectedODataJsonPromise(err, logger, cb);
         });
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '-l, --listId [listId]'
-            },
-            {
-                option: '-t, --listTitle [listTitle]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoListSiteScriptGetCommand_instances = new WeakSet(), _SpoListSiteScriptGetCommand_initTelemetry = function _SpoListSiteScriptGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listId: (!(!args.options.listId)).toString(),
+            listTitle: (!(!args.options.listTitle)).toString()
+        });
+    });
+}, _SpoListSiteScriptGetCommand_initOptions = function _SpoListSiteScriptGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-l, --listId [listId]'
+    }, {
+        option: '-t, --listTitle [listTitle]'
+    });
+}, _SpoListSiteScriptGetCommand_initValidators = function _SpoListSiteScriptGetCommand_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;
@@ -105,7 +123,7 @@ class SpoListSiteScriptGetCommand extends SpoCommand_1.default {
             return 'Specify listId or listTitle, one is required';
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoListSiteScriptGetCommand();
 //# sourceMappingURL=list-sitescript-get.js.map

package/dist/m365/spo/commands/list/list-view-add.js

@@ -1,30 +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 _SpoListViewAddCommand_instances, _SpoListViewAddCommand_initTelemetry, _SpoListViewAddCommand_initOptions, _SpoListViewAddCommand_initValidators, _SpoListViewAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
 const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListViewAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoListViewAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoListViewAddCommand_instances, "m", _SpoListViewAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoListViewAddCommand_instances, "m", _SpoListViewAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListViewAddCommand_instances, "m", _SpoListViewAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListViewAddCommand_instances, "m", _SpoListViewAddCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.LIST_VIEW_ADD;
     }
     get description() {
         return 'Adds a new view to a SharePoint list.';
     }
-    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.title = typeof args.options.title !== 'undefined';
-        telemetryProps.viewQuery = typeof args.options.viewQuery !== 'undefined';
-        telemetryProps.personal = !!args.options.personal;
-        telemetryProps.default = !!args.options.default;
-        telemetryProps.orderedView = !!args.options.orderedView;
-        telemetryProps.paged = !!args.options.paged;
-        telemetryProps.rowLimit = typeof args.options.rowLimit !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const requestOptions = {
             url: this.getRestUrl(args.options),
@@ -68,29 +77,26 @@ class SpoListViewAddCommand extends SpoCommand_1.default {
         result += '/views/add';
         return result;
     }
-    optionSets() {
-        return [
-            ['listId', 'listTitle', 'listUrl']
-        ];
-    }
-    options() {
-        const options = [
-            { option: '-u, --webUrl <webUrl>' },
-            { option: '--listId [listId]' },
-            { option: '--listTitle [listTitle]' },
-            { option: '--listUrl [listUrl]' },
-            { option: '--title <title>' },
-            { option: '--fields <fields>' },
-            { option: '--viewQuery [viewQuery]' },
-            { option: '--personal' },
-            { option: '--default' },
-            { option: '--paged' },
-            { option: '--rowLimit [rowLimit]' }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoListViewAddCommand_instances = new WeakSet(), _SpoListViewAddCommand_initTelemetry = function _SpoListViewAddCommand_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',
+            title: typeof args.options.title !== 'undefined',
+            viewQuery: typeof args.options.viewQuery !== 'undefined',
+            personal: !!args.options.personal,
+            default: !!args.options.default,
+            orderedView: !!args.options.orderedView,
+            paged: !!args.options.paged,
+            rowLimit: typeof args.options.rowLimit !== 'undefined'
+        });
+    });
+}, _SpoListViewAddCommand_initOptions = function _SpoListViewAddCommand_initOptions() {
+    this.options.unshift({ option: '-u, --webUrl <webUrl>' }, { option: '--listId [listId]' }, { option: '--listTitle [listTitle]' }, { option: '--listUrl [listUrl]' }, { option: '--title <title>' }, { option: '--fields <fields>' }, { option: '--viewQuery [viewQuery]' }, { option: '--personal' }, { option: '--default' }, { option: '--paged' }, { option: '--rowLimit [rowLimit]' });
+}, _SpoListViewAddCommand_initValidators = function _SpoListViewAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const webUrlValidation = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (webUrlValidation !== true) {
             return webUrlValidation;
@@ -110,7 +116,9 @@ class SpoListViewAddCommand extends SpoCommand_1.default {
             return 'Default view cannot be a personal view.';
         }
         return true;
-    }
-}
+    }));
+}, _SpoListViewAddCommand_initOptionSets = function _SpoListViewAddCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
+};
 module.exports = new SpoListViewAddCommand();
 //# sourceMappingURL=list-view-add.js.map

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

@@ -1,39 +1,50 @@
 "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 _SpoListViewFieldAddCommand_instances, _SpoListViewFieldAddCommand_initTelemetry, _SpoListViewFieldAddCommand_initOptions, _SpoListViewFieldAddCommand_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 SpoListViewFieldAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoListViewFieldAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoListViewFieldAddCommand_instances, "m", _SpoListViewFieldAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoListViewFieldAddCommand_instances, "m", _SpoListViewFieldAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListViewFieldAddCommand_instances, "m", _SpoListViewFieldAddCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.LIST_VIEW_FIELD_ADD;
     }
     get description() {
         return 'Adds the specified field to list view';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.listId = typeof args.options.listId !== 'undefined';
-        telemetryProps.listTitle = typeof args.options.listTitle !== 'undefined';
-        telemetryProps.viewId = typeof args.options.viewId !== 'undefined';
-        telemetryProps.viewTitle = typeof args.options.viewTitle !== 'undefined';
-        telemetryProps.fieldId = typeof args.options.fieldId !== 'undefined';
-        telemetryProps.fieldTitle = typeof args.options.fieldTitle !== 'undefined';
-        telemetryProps.fieldPosition = typeof args.options.fieldPosition !== 'undefined';
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const listSelector = args.options.listId ? `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
         let viewSelector = '';
         let currentField;
         if (this.verbose) {
-            logger.logToStderr(`Getting field ${args.options.fieldId || args.options.fieldTitle}...`);
+            logger.logToStderr(`Getting field ${args.options.id || args.options.title}...`);
         }
         this
             .getField(args.options, listSelector)
             .then((field) => {
             if (this.verbose) {
-                logger.logToStderr(`Adding the field ${args.options.fieldId || args.options.fieldTitle} to the view ${args.options.viewId || args.options.viewTitle}...`);
+                logger.logToStderr(`Adding the field ${args.options.id || args.options.title} to the view ${args.options.viewId || args.options.viewTitle}...`);
             }
             currentField = field;
             viewSelector = args.options.viewId ? `('${utils_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
@@ -48,7 +59,7 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
             return request_1.default.post(postRequestOptions);
         })
             .then(() => {
-            if (typeof args.options.fieldPosition === 'undefined') {
+            if (typeof args.options.position === 'undefined') {
                 if (this.debug) {
                     logger.logToStderr(`No field position.`);
                 }
@@ -56,10 +67,10 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
             }
             if (this.debug) {
                 logger.logToStderr(`moveField request...`);
-                logger.logToStderr(args.options.fieldPosition);
+                logger.logToStderr(args.options.position);
             }
             if (this.verbose) {
-                logger.logToStderr(`Moving the field ${args.options.fieldId || args.options.fieldTitle} to the position ${args.options.fieldPosition} from view ${args.options.viewId || args.options.viewTitle}...`);
+                logger.logToStderr(`Moving the field ${args.options.id || args.options.title} to the position ${args.options.position} from view ${args.options.viewId || args.options.viewTitle}...`);
             }
             const moveRequestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}/viewfields/moveviewfieldto`;
             const moveRequestOptions = {
@@ -67,7 +78,7 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
-                data: { 'field': currentField.InternalName, 'index': args.options.fieldPosition },
+                data: { 'field': currentField.InternalName, 'index': args.options.position },
                 responseType: 'json'
             };
             return request_1.default.post(moveRequestOptions);
@@ -78,7 +89,7 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
     getField(options, listSelector) {
-        const fieldSelector = options.fieldId ? `/getbyid('${encodeURIComponent(options.fieldId)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.fieldTitle)}')`;
+        const fieldSelector = options.id ? `/getbyid('${encodeURIComponent(options.id)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.title)}')`;
         const getRequestUrl = `${options.webUrl}/_api/web/lists${listSelector}/fields${fieldSelector}`;
         const requestOptions = {
             url: getRequestUrl,
@@ -89,37 +100,39 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
         };
         return request_1.default.get(requestOptions);
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '--listId [listId]'
-            },
-            {
-                option: '--listTitle [listTitle]'
-            },
-            {
-                option: '--viewId [viewId]'
-            },
-            {
-                option: '--viewTitle [viewTitle]'
-            },
-            {
-                option: '--fieldId [fieldId]'
-            },
-            {
-                option: '--fieldTitle [fieldTitle]'
-            },
-            {
-                option: '--fieldPosition [fieldPosition]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoListViewFieldAddCommand_instances = new WeakSet(), _SpoListViewFieldAddCommand_initTelemetry = function _SpoListViewFieldAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            viewId: typeof args.options.viewId !== 'undefined',
+            viewTitle: typeof args.options.viewTitle !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            position: typeof args.options.position !== 'undefined'
+        });
+    });
+}, _SpoListViewFieldAddCommand_initOptions = function _SpoListViewFieldAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--listId [listId]'
+    }, {
+        option: '--listTitle [listTitle]'
+    }, {
+        option: '--viewId [viewId]'
+    }, {
+        option: '--viewTitle [viewTitle]'
+    }, {
+        option: '--id [id]'
+    }, {
+        option: '--title [title]'
+    }, {
+        option: '--position [position]'
+    });
+}, _SpoListViewFieldAddCommand_initValidators = function _SpoListViewFieldAddCommand_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;
@@ -134,15 +147,15 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
                 return `${args.options.viewId} is not a valid GUID`;
             }
         }
-        if (args.options.fieldId) {
-            if (!utils_1.validation.isValidGuid(args.options.fieldId)) {
-                return `${args.options.fieldId} is not a valid GUID`;
+        if (args.options.id) {
+            if (!utils_1.validation.isValidGuid(args.options.id)) {
+                return `${args.options.id} is not a valid GUID`;
             }
         }
-        if (args.options.fieldPosition) {
-            const position = parseInt(args.options.fieldPosition);
+        if (args.options.position) {
+            const position = parseInt(args.options.position);
             if (isNaN(position)) {
-                return `${args.options.fieldPosition} is not a number`;
+                return `${args.options.position} is not a number`;
             }
         }
         if (args.options.listId && args.options.listTitle) {
@@ -157,14 +170,14 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
         if (!args.options.viewId && !args.options.viewTitle) {
             return 'Specify viewId or viewTitle, one is required';
         }
-        if (args.options.fieldId && args.options.fieldTitle) {
-            return 'Specify fieldId or fieldTitle, but not both';
+        if (args.options.id && args.options.title) {
+            return 'Specify id or title, but not both';
         }
-        if (!args.options.fieldId && !args.options.fieldTitle) {
-            return 'Specify fieldId or fieldTitle, one is required';
+        if (!args.options.id && !args.options.title) {
+            return 'Specify id or title, one is required';
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoListViewFieldAddCommand();
 //# sourceMappingURL=list-view-field-add.js.map

package/dist/m365/spo/commands/list/list-view-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 _SpoListViewFieldRemoveCommand_instances, _SpoListViewFieldRemoveCommand_initTelemetry, _SpoListViewFieldRemoveCommand_initOptions, _SpoListViewFieldRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -6,34 +21,30 @@ const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoListViewFieldRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoListViewFieldRemoveCommand_instances, "m", _SpoListViewFieldRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoListViewFieldRemoveCommand_instances, "m", _SpoListViewFieldRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListViewFieldRemoveCommand_instances, "m", _SpoListViewFieldRemoveCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.LIST_VIEW_FIELD_REMOVE;
     }
     get description() {
         return 'Removes the specified field from list view';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.listId = typeof args.options.listId !== 'undefined';
-        telemetryProps.listTitle = typeof args.options.listTitle !== 'undefined';
-        telemetryProps.viewId = typeof args.options.viewId !== 'undefined';
-        telemetryProps.viewTitle = typeof args.options.viewTitle !== 'undefined';
-        telemetryProps.fieldId = typeof args.options.fieldId !== 'undefined';
-        telemetryProps.fieldTitle = typeof args.options.fieldTitle !== 'undefined';
-        telemetryProps.confirm = (!(!args.options.confirm)).toString();
-        return telemetryProps;
-    }
     commandAction(logger, args, cb) {
         const listSelector = args.options.listId ? `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
         const removeFieldFromView = () => {
             if (this.verbose) {
-                logger.logToStderr(`Getting field ${args.options.fieldId || args.options.fieldTitle}...`);
+                logger.logToStderr(`Getting field ${args.options.id || args.options.title}...`);
             }
             this
                 .getField(args.options, listSelector)
                 .then((field) => {
                 if (this.verbose) {
-                    logger.logToStderr(`Removing field ${args.options.fieldId || args.options.fieldTitle} from view ${args.options.viewId || args.options.viewTitle}...`);
+                    logger.logToStderr(`Removing field ${args.options.id || args.options.title} from view ${args.options.viewId || args.options.viewTitle}...`);
                 }
                 const viewSelector = args.options.viewId ? `('${utils_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
                 const postRequestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}/viewfields/removeviewfield('${field.InternalName}')`;
@@ -59,7 +70,7 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove the field ${args.options.fieldId || args.options.fieldTitle} from the view ${args.options.viewId || args.options.viewTitle} from list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}?`
+                message: `Are you sure you want to remove the field ${args.options.id || args.options.title} from the view ${args.options.viewId || args.options.viewTitle} from list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}?`
             }, (result) => {
                 if (!result.continue) {
                     cb();
@@ -71,7 +82,7 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
         }
     }
     getField(options, listSelector) {
-        const fieldSelector = options.fieldId ? `/getbyid('${encodeURIComponent(options.fieldId)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.fieldTitle)}')`;
+        const fieldSelector = options.id ? `/getbyid('${encodeURIComponent(options.id)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.title)}')`;
         const getRequestUrl = `${options.webUrl}/_api/web/lists${listSelector}/fields${fieldSelector}`;
         const requestOptions = {
             url: getRequestUrl,
@@ -82,37 +93,39 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
         };
         return request_1.default.get(requestOptions);
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '--listId [listId]'
-            },
-            {
-                option: '--listTitle [listTitle]'
-            },
-            {
-                option: '--viewId [viewId]'
-            },
-            {
-                option: '--viewTitle [viewTitle]'
-            },
-            {
-                option: '--fieldId [fieldId]'
-            },
-            {
-                option: '--fieldTitle [fieldTitle]'
-            },
-            {
-                option: '--confirm'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoListViewFieldRemoveCommand_instances = new WeakSet(), _SpoListViewFieldRemoveCommand_initTelemetry = function _SpoListViewFieldRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            viewId: typeof args.options.viewId !== 'undefined',
+            viewTitle: typeof args.options.viewTitle !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SpoListViewFieldRemoveCommand_initOptions = function _SpoListViewFieldRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--listId [listId]'
+    }, {
+        option: '--listTitle [listTitle]'
+    }, {
+        option: '--viewId [viewId]'
+    }, {
+        option: '--viewTitle [viewTitle]'
+    }, {
+        option: '--id [id]'
+    }, {
+        option: '--title [title]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoListViewFieldRemoveCommand_initValidators = function _SpoListViewFieldRemoveCommand_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;
@@ -127,8 +140,8 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
                 return `${args.options.viewId} is not a valid GUID`;
             }
         }
-        if (args.options.fieldId) {
-            if (!utils_1.validation.isValidGuid(args.options.fieldId)) {
+        if (args.options.id) {
+            if (!utils_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.viewId} is not a valid GUID`;
             }
         }
@@ -144,14 +157,14 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
         if (!args.options.viewId && !args.options.viewTitle) {
             return 'Specify viewId or viewTitle, one is required';
         }
-        if (args.options.fieldId && args.options.fieldTitle) {
-            return 'Specify fieldId or fieldTitle, but not both';
+        if (args.options.id && args.options.title) {
+            return 'Specify id or title, but not both';
         }
-        if (!args.options.fieldId && !args.options.fieldTitle) {
-            return 'Specify fieldId or fieldTitle, one is required';
+        if (!args.options.id && !args.options.title) {
+            return 'Specify id or title, one is required';
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoListViewFieldRemoveCommand();
 //# sourceMappingURL=list-view-field-remove.js.map