@pnp/cli-microsoft365 6.0.0-beta.c377306 → 6.0.0-beta.c5b75e1

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoListSetCommand_instances, _SpoListSetCommand_initTelemetry, _SpoListSetCommand_initOptions, _SpoListSetCommand_initValidators, _SpoListSetCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const DraftVisibilityType_1 = require("./DraftVisibilityType");
@@ -62,28 +62,31 @@ class SpoListSetCommand extends SpoCommand_1.default {
         }
         return result;
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Updating list in site at ${args.options.webUrl}...`);
-        }
-        const requestBody = this.mapRequestBody(args.options);
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.id)}')`,
-            method: 'POST',
-            headers: {
-                'X-HTTP-Method': 'MERGE',
-                'If-Match': '*',
-                'accept': 'application/json;odata=nometadata'
-            },
-            data: requestBody,
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(() => {
-            // REST post call doesn't return anything
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Updating list in site at ${args.options.webUrl}...`);
+            }
+            const requestBody = this.mapRequestBody(args.options);
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.id)}')`,
+                method: 'POST',
+                headers: {
+                    'X-HTTP-Method': 'MERGE',
+                    'If-Match': '*',
+                    'accept': 'application/json;odata=nometadata'
+                },
+                data: requestBody,
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.post(requestOptions);
+                // REST post call doesn't return anything
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     mapRequestBody(options) {
         const requestBody = {};
@@ -497,26 +500,26 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
     });
 }, _SpoListSetCommand_initValidators = function _SpoListSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         for (let i = 0; i < SpoListSetCommand.booleanOptions.length; i++) {
             const option = SpoListSetCommand.booleanOptions[i];
             const value = args.options[option];
-            if (value && !utils_1.validation.isValidBoolean(value)) {
+            if (value && !validation_1.validation.isValidBoolean(value)) {
                 return `${value} in option ${option} is not a valid boolean value`;
             }
         }
         if (args.options.templateFeatureId &&
-            !utils_1.validation.isValidGuid(args.options.templateFeatureId)) {
+            !validation_1.validation.isValidGuid(args.options.templateFeatureId)) {
             return `${args.options.templateFeatureId} in option templateFeatureId is not a valid GUID`;
         }
         if (args.options.defaultContentApprovalWorkflowId &&
-            !utils_1.validation.isValidGuid(args.options.defaultContentApprovalWorkflowId)) {
+            !validation_1.validation.isValidGuid(args.options.defaultContentApprovalWorkflowId)) {
             return `${args.options.defaultContentApprovalWorkflowId} in option defaultContentApprovalWorkflowId is not a valid GUID`;
         }
         if (args.options.direction &&

package/dist/m365/spo/commands/list/list-sitescript-get.js

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListSiteScriptGetCommand_instances, _SpoListSiteScriptGetCommand_initTelemetry, _SpoListSiteScriptGetCommand_initOptions, _SpoListSiteScriptGetCommand_initValidators, _SpoListSiteScriptGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../../Command");
 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 SpoListSiteScriptGetCommand extends SpoCommand_1.default {
@@ -35,59 +36,57 @@ class SpoListSiteScriptGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Extracts a site script from a SharePoint list';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            const list = (args.options.listId ? args.options.listId : args.options.listTitle);
-            logger.logToStderr(`Extracting Site Script from list ${list} in site at ${args.options.webUrl}...`);
-        }
-        let requestUrl = '';
-        if (args.options.listId) {
-            if (this.debug) {
-                logger.logToStderr(`Retrieving List Url from Id '${args.options.listId}'...`);
-            }
-            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')?$expand=RootFolder`;
-        }
-        else {
-            if (this.debug) {
-                logger.logToStderr(`Retrieving List Url from Title '${args.options.listTitle}'...`);
-            }
-            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')?$expand=RootFolder`;
-        }
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((listInstance) => {
-            const listAbsoluteUrl = utils_1.urlUtil.getAbsoluteUrl(args.options.webUrl, listInstance.RootFolder.ServerRelativeUrl);
-            const requestUrl = `${args.options.webUrl}/_api/Microsoft_SharePoint_Utilities_WebTemplateExtensions_SiteScriptUtility_GetSiteScriptFromList`;
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                responseType: 'json',
-                data: {
-                    listUrl: listAbsoluteUrl
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    const list = (args.options.listId ? args.options.listId : args.options.listTitle);
+                    logger.logToStderr(`Extracting Site Script from list ${list} in site at ${args.options.webUrl}...`);
+                }
+                let requestUrl = '';
+                if (args.options.listId) {
+                    if (this.debug) {
+                        logger.logToStderr(`Retrieving List Url from Id '${args.options.listId}'...`);
+                    }
+                    requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')?$expand=RootFolder`;
+                }
+                else {
+                    if (this.debug) {
+                        logger.logToStderr(`Retrieving List Url from Title '${args.options.listTitle}'...`);
+                    }
+                    requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')?$expand=RootFolder`;
                 }
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const siteScript = res.value;
-            if (!siteScript) {
-                cb(new Command_1.CommandError(`An error has occurred, the site script could not be extracted from list '${args.options.listId || args.options.listTitle}'`));
-                return;
+                let requestOptions = {
+                    url: requestUrl,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const listInstance = yield request_1.default.get(requestOptions);
+                const listAbsoluteUrl = urlUtil_1.urlUtil.getAbsoluteUrl(args.options.webUrl, listInstance.RootFolder.ServerRelativeUrl);
+                requestUrl = `${args.options.webUrl}/_api/Microsoft_SharePoint_Utilities_WebTemplateExtensions_SiteScriptUtility_GetSiteScriptFromList`;
+                requestOptions = {
+                    url: requestUrl,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata',
+                        'content-type': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json',
+                    data: {
+                        listUrl: listAbsoluteUrl
+                    }
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const siteScript = res.value;
+                if (!siteScript) {
+                    throw `An error has occurred, the site script could not be extracted from list '${args.options.listId || args.options.listTitle}'`;
+                }
+                logger.log(siteScript);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            logger.log(siteScript);
-            cb();
-        }, (err) => {
-            this.handleRejectedODataJsonPromise(err, logger, cb);
         });
     }
 }
@@ -108,12 +107,12 @@ _SpoListSiteScriptGetCommand_instances = new WeakSet(), _SpoListSiteScriptGetCom
     });
 }, _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);
+        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`;
             }
         }

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

@@ -16,7 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoListViewAddCommand_instances, _SpoListViewAddCommand_initTelemetry, _SpoListViewAddCommand_initOptions, _SpoListViewAddCommand_initValidators, _SpoListViewAddCommand_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 SpoListViewAddCommand extends SpoCommand_1.default {
@@ -34,45 +36,48 @@ class SpoListViewAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Adds a new view to a SharePoint list.';
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: this.getRestUrl(args.options),
-            headers: {
-                'content-type': 'application/json;odata=verbose',
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json',
-            data: {
-                parameters: {
-                    Title: args.options.title,
-                    ViewFields: {
-                        results: args.options.fields.split(',')
-                    },
-                    Query: args.options.viewQuery,
-                    PersonalView: !!args.options.personal,
-                    SetAsDefaultView: !!args.options.default,
-                    Paged: !!args.options.paged,
-                    RowLimit: args.options.rowLimit ? +args.options.rowLimit : 30
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: this.getRestUrl(args.options),
+                headers: {
+                    'content-type': 'application/json;odata=verbose',
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: {
+                    parameters: {
+                        Title: args.options.title,
+                        ViewFields: {
+                            results: args.options.fields.split(',')
+                        },
+                        Query: args.options.viewQuery,
+                        PersonalView: !!args.options.personal,
+                        SetAsDefaultView: !!args.options.default,
+                        Paged: !!args.options.paged,
+                        RowLimit: args.options.rowLimit ? +args.options.rowLimit : 30
+                    }
                 }
+            };
+            try {
+                const result = yield request_1.default.post(requestOptions);
+                logger.log(result);
             }
-        };
-        request_1.default
-            .post(requestOptions)
-            .then((result) => {
-            logger.log(result);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getRestUrl(options) {
         let result = `${options.webUrl}/_api/web/`;
         if (options.listId) {
-            result += `lists(guid'${utils_1.formatting.encodeQueryParameter(options.listId)}')`;
+            result += `lists(guid'${formatting_1.formatting.encodeQueryParameter(options.listId)}')`;
         }
         else if (options.listTitle) {
-            result += `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(options.listTitle)}')`;
+            result += `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')`;
         }
         else if (options.listUrl) {
-            result += `GetList('${utils_1.formatting.encodeQueryParameter(utils_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl))}')`;
+            result += `GetList('${formatting_1.formatting.encodeQueryParameter(urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl))}')`;
         }
         result += '/views/add';
         return result;
@@ -97,11 +102,11 @@ _SpoListViewAddCommand_instances = new WeakSet(), _SpoListViewAddCommand_initTel
     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);
+        const webUrlValidation = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (webUrlValidation !== true) {
             return webUrlValidation;
         }
-        if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
         if (args.options.rowLimit !== undefined) {

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 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 validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListViewFieldAddCommand extends SpoCommand_1.default {
@@ -34,60 +35,59 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Adds the specified field to list view';
     }
-    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.id || args.options.title}...`);
-        }
-        this
-            .getField(args.options, listSelector)
-            .then((field) => {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const listSelector = args.options.listId ? `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            let viewSelector = '';
+            let currentField;
             if (this.verbose) {
-                logger.logToStderr(`Adding the field ${args.options.id || args.options.title} 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.position === '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/lists${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.position);
+                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/lists${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.id || args.options.title} to the position ${args.options.position} 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.position },
-                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.id ? `/getbyid('${encodeURIComponent(options.id)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.title)}')`;
@@ -134,22 +134,22 @@ _SpoListViewFieldAddCommand_instances = new WeakSet(), _SpoListViewFieldAddComma
     });
 }, _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);
+        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.id) {
-            if (!utils_1.validation.isValidGuid(args.options.id)) {
+            if (!validation_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 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 validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
@@ -35,52 +36,49 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes the specified field from list view';
     }
-    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.id || args.options.title}...`);
-            }
-            this
-                .getField(args.options, listSelector)
-                .then((field) => {
-                if (this.verbose) {
-                    logger.logToStderr(`Removing field ${args.options.id || args.options.title} from view ${args.options.viewId || args.options.viewTitle}...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const listSelector = args.options.listId ? `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            const removeFieldFromView = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (this.verbose) {
+                        logger.logToStderr(`Getting field ${args.options.id || args.options.title}...`);
+                    }
+                    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/lists${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
                 }
-                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.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();
-                }
-                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.id ? `/getbyid('${encodeURIComponent(options.id)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.title)}')`;
@@ -127,22 +125,22 @@ _SpoListViewFieldRemoveCommand_instances = new WeakSet(), _SpoListViewFieldRemov
     });
 }, _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);
+        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.id) {
-            if (!utils_1.validation.isValidGuid(args.options.id)) {
+            if (!validation_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.viewId} is not a valid GUID`;
             }
         }