@pnp/cli-microsoft365 6.0.0-beta.ff232be → 6.1.0-beta.17b053d

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

@@ -1,7 +1,24 @@
 "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, _SpoListViewFieldAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListViewFieldAddCommand extends SpoCommand_1.default {
@@ -11,75 +28,81 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
     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;
+    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);
+        __classPrivateFieldGet(this, _SpoListViewFieldAddCommand_instances, "m", _SpoListViewFieldAddCommand_initOptionSets).call(this);
     }
-    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}...`);
-        }
-        this
-            .getField(args.options, listSelector)
-            .then((field) => {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let listSelector = '';
+            if (args.options.listId) {
+                listSelector = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+            }
+            else if (args.options.listTitle) {
+                listSelector = `lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            }
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                listSelector = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+            }
+            let viewSelector = '';
+            let currentField;
             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(`Getting field ${args.options.id || args.options.title}...`);
             }
-            currentField = field;
-            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/addviewfield('${field.InternalName}')`;
-            const postRequestOptions = {
-                url: postRequestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(postRequestOptions);
-        })
-            .then(() => {
-            if (typeof args.options.fieldPosition === 'undefined') {
+            try {
+                const field = yield this.getField(args.options, listSelector);
+                if (this.verbose) {
+                    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 ? `('${formatting_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
+                const postRequestUrl = `${args.options.webUrl}/_api/web/${listSelector}/views${viewSelector}/viewfields/addviewfield('${field.InternalName}')`;
+                const postRequestOptions = {
+                    url: postRequestUrl,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(postRequestOptions);
+                if (typeof args.options.position === 'undefined') {
+                    if (this.debug) {
+                        logger.logToStderr(`No field position.`);
+                    }
+                    return;
+                }
                 if (this.debug) {
-                    logger.logToStderr(`No field position.`);
+                    logger.logToStderr(`moveField request...`);
+                    logger.logToStderr(args.options.position);
                 }
-                return Promise.resolve();
-            }
-            if (this.debug) {
-                logger.logToStderr(`moveField request...`);
-                logger.logToStderr(args.options.fieldPosition);
+                if (this.verbose) {
+                    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/${listSelector}/views${viewSelector}/viewfields/moveviewfieldto`;
+                const moveRequestOptions = {
+                    url: moveRequestUrl,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    data: { 'field': currentField.InternalName, 'index': args.options.position },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(moveRequestOptions);
+                // REST post call doesn't return anything
             }
-            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}...`);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const moveRequestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}/viewfields/moveviewfieldto`;
-            const moveRequestOptions = {
-                url: moveRequestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                data: { 'field': currentField.InternalName, 'index': args.options.fieldPosition },
-                responseType: 'json'
-            };
-            return request_1.default.post(moveRequestOptions);
-        })
-            .then(() => {
-            // REST post call doesn't return anything
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getField(options, listSelector) {
-        const fieldSelector = options.fieldId ? `/getbyid('${encodeURIComponent(options.fieldId)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.fieldTitle)}')`;
-        const getRequestUrl = `${options.webUrl}/_api/web/lists${listSelector}/fields${fieldSelector}`;
+        const fieldSelector = options.id ? `/getbyid('${formatting_1.formatting.encodeQueryParameter(options.id)}')` : `/getbyinternalnameortitle('${formatting_1.formatting.encodeQueryParameter(options.title)}')`;
+        const getRequestUrl = `${options.webUrl}/_api/web/${listSelector}/fields${fieldSelector}`;
         const requestOptions = {
             url: getRequestUrl,
             headers: {
@@ -89,82 +112,71 @@ 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) {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+}
+_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',
+            listUrl: typeof args.options.listUrl !== '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: '--listUrl [listUrl]'
+    }, {
+        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 = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.listId) {
-            if (!utils_1.validation.isValidGuid(args.options.listId)) {
+            if (!validation_1.validation.isValidGuid(args.options.listId)) {
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
         if (args.options.viewId) {
-            if (!utils_1.validation.isValidGuid(args.options.viewId)) {
+            if (!validation_1.validation.isValidGuid(args.options.viewId)) {
                 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 (!validation_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) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
-        if (args.options.viewId && args.options.viewTitle) {
-            return 'Specify viewId or viewTitle, but not both';
-        }
-        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.fieldId && !args.options.fieldTitle) {
-            return 'Specify fieldId or fieldTitle, one is required';
-        }
         return true;
-    }
-}
+    }));
+}, _SpoListViewFieldAddCommand_initOptionSets = function _SpoListViewFieldAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['viewId', 'viewTitle'] }, { options: ['id', 'title'] });
+};
 module.exports = new SpoListViewFieldAddCommand();
 //# sourceMappingURL=list-view-field-add.js.map

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

@@ -1,8 +1,25 @@
 "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, _SpoListViewFieldRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
@@ -12,67 +29,71 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
     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;
+    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);
+        __classPrivateFieldGet(this, _SpoListViewFieldRemoveCommand_instances, "m", _SpoListViewFieldRemoveCommand_initOptionSets).call(this);
     }
-    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}...`);
-            }
-            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}...`);
-                }
-                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}')`;
-                const postRequestOptions = {
-                    url: postRequestUrl,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.post(postRequestOptions);
-            })
-                .then(() => {
-                // REST post call doesn't return anything
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeFieldFromView();
-        }
-        else {
-            cli_1.Cli.prompt({
-                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}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeFieldFromView = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (this.verbose) {
+                        logger.logToStderr(`Getting field ${args.options.id || args.options.title}...`);
+                    }
+                    let listSelector = '';
+                    if (args.options.listId) {
+                        listSelector = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                    }
+                    else if (args.options.listTitle) {
+                        listSelector = `lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                    }
+                    else if (args.options.listUrl) {
+                        const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                        listSelector = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+                    }
+                    const field = yield this.getField(args.options, listSelector);
+                    if (this.verbose) {
+                        logger.logToStderr(`Removing field ${args.options.id || args.options.title} from view ${args.options.viewId || args.options.viewTitle}...`);
+                    }
+                    const viewSelector = args.options.viewId ? `('${formatting_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
+                    const postRequestUrl = `${args.options.webUrl}/_api/web/${listSelector}/views${viewSelector}/viewfields/removeviewfield('${field.InternalName}')`;
+                    const postRequestOptions = {
+                        url: postRequestUrl,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(postRequestOptions);
+                    // REST post call doesn't return anything
                 }
-                else {
-                    removeFieldFromView();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeFieldFromView();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    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}?`
+                });
+                if (result.continue) {
+                    yield removeFieldFromView();
+                }
+            }
+        });
     }
     getField(options, listSelector) {
-        const fieldSelector = options.fieldId ? `/getbyid('${encodeURIComponent(options.fieldId)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.fieldTitle)}')`;
-        const getRequestUrl = `${options.webUrl}/_api/web/lists${listSelector}/fields${fieldSelector}`;
+        const fieldSelector = options.id ? `/getbyid('${formatting_1.formatting.encodeQueryParameter(options.id)}')` : `/getbyinternalnameortitle('${formatting_1.formatting.encodeQueryParameter(options.title)}')`;
+        const getRequestUrl = `${options.webUrl}/_api/web/${listSelector}/fields${fieldSelector}`;
         const requestOptions = {
             url: getRequestUrl,
             headers: {
@@ -82,76 +103,65 @@ 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) {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+}
+_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',
+            listUrl: typeof args.options.listUrl !== '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: '--listUrl [listUrl]'
+    }, {
+        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 = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.listId) {
-            if (!utils_1.validation.isValidGuid(args.options.listId)) {
+            if (!validation_1.validation.isValidGuid(args.options.listId)) {
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
         if (args.options.viewId) {
-            if (!utils_1.validation.isValidGuid(args.options.viewId)) {
+            if (!validation_1.validation.isValidGuid(args.options.viewId)) {
                 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 (!validation_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.viewId} is not a valid GUID`;
             }
         }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
-        if (args.options.viewId && args.options.viewTitle) {
-            return 'Specify viewId or viewTitle, but not both';
-        }
-        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.fieldId && !args.options.fieldTitle) {
-            return 'Specify fieldId or fieldTitle, one is required';
-        }
         return true;
-    }
-}
+    }));
+}, _SpoListViewFieldRemoveCommand_initOptionSets = function _SpoListViewFieldRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['viewId', 'viewTitle'] }, { options: ['id', 'title'] });
+};
 module.exports = new SpoListViewFieldRemoveCommand();
 //# sourceMappingURL=list-view-field-remove.js.map