@pnp/cli-microsoft365 5.8.0-beta.f956c5d → 5.9.0-beta.005c47a

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

@@ -16,7 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFieldAddCommand_instances, _SpoFieldAddCommand_initTelemetry, _SpoFieldAddCommand_initOptions, _SpoFieldAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFieldAddCommand extends SpoCommand_1.default {
@@ -33,30 +35,31 @@ class SpoFieldAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Adds a new list or site column using the CAML field definition';
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getRequestDigest(args.options.webUrl)
-            .then((res) => {
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/${(args.options.listTitle ? `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/` : '')}fields/CreateFieldAsXml`,
-                headers: {
-                    'X-RequestDigest': res.FormDigestValue,
-                    accept: 'application/json;odata=nometadata'
-                },
-                data: {
-                    parameters: {
-                        SchemaXml: args.options.xml,
-                        Options: this.getOptions(args.options.options)
-                    }
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_api/web/${(args.options.listTitle ? `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/` : '')}fields/CreateFieldAsXml`,
+                    headers: {
+                        'X-RequestDigest': reqDigest.FormDigestValue,
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    data: {
+                        parameters: {
+                            SchemaXml: args.options.xml,
+                            Options: this.getOptions(args.options.options)
+                        }
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getOptions(options) {
         let optionsValue = 0;
@@ -111,7 +114,7 @@ _SpoFieldAddCommand_instances = new WeakSet(), _SpoFieldAddCommand_initTelemetry
     });
 }, _SpoFieldAddCommand_initValidators = function _SpoFieldAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -16,7 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFieldGetCommand_instances, _SpoFieldGetCommand_initTelemetry, _SpoFieldGetCommand_initOptions, _SpoFieldGetCommand_initValidators, _SpoFieldGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const 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 SpoFieldGetCommand extends SpoCommand_1.default {
@@ -34,42 +36,45 @@ class SpoFieldGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Retrieves information about the specified list- or site column';
     }
-    commandAction(logger, args, cb) {
-        if (args.options.fieldTitle) {
-            args.options.title = args.options.fieldTitle;
-            this.warn(logger, `Option 'fieldTitle' is deprecated. Please use 'title' instead.`);
-        }
-        let listRestUrl = '';
-        if (args.options.listId) {
-            listRestUrl = `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
-        }
-        else if (args.options.listTitle) {
-            listRestUrl = `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
-        }
-        else if (args.options.listUrl) {
-            const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-            listRestUrl = `GetList('${utils_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
-        }
-        let fieldRestUrl = '';
-        if (args.options.id) {
-            fieldRestUrl = `/getbyid('${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
-        }
-        else {
-            fieldRestUrl = `/getbyinternalnameortitle('${utils_1.formatting.encodeQueryParameter(args.options.title)}')`;
-        }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/${listRestUrl}fields${fieldRestUrl}`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.fieldTitle) {
+                args.options.title = args.options.fieldTitle;
+                this.warn(logger, `Option 'fieldTitle' is deprecated. Please use 'title' instead.`);
+            }
+            let listRestUrl = '';
+            if (args.options.listId) {
+                listRestUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+            }
+            else if (args.options.listTitle) {
+                listRestUrl = `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);
+                listRestUrl = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
+            }
+            let fieldRestUrl = '';
+            if (args.options.id) {
+                fieldRestUrl = `/getbyid('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
+            }
+            else {
+                fieldRestUrl = `/getbyinternalnameortitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`;
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/${listRestUrl}fields${fieldRestUrl}`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoFieldGetCommand_instances = new WeakSet(), _SpoFieldGetCommand_initTelemetry = function _SpoFieldGetCommand_initTelemetry() {
@@ -100,14 +105,14 @@ _SpoFieldGetCommand_instances = new WeakSet(), _SpoFieldGetCommand_initTelemetry
     });
 }, _SpoFieldGetCommand_initValidators = function _SpoFieldGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        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} is not a valid GUID`;
         }
         return true;

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

@@ -16,7 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFieldListCommand_instances, _SpoFieldListCommand_initTelemetry, _SpoFieldListCommand_initOptions, _SpoFieldListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const 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 SpoFieldListCommand extends SpoCommand_1.default {
@@ -36,31 +38,34 @@ class SpoFieldListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Id', 'Title', 'Group', 'Hidden'];
     }
-    commandAction(logger, args, cb) {
-        let listUrl = '';
-        if (args.options.listId) {
-            listUrl = `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
-        }
-        else if (args.options.listTitle) {
-            listUrl = `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
-        }
-        else if (args.options.listUrl) {
-            const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-            listUrl = `GetList('${utils_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
-        }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/${listUrl}fields`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let listUrl = '';
+            if (args.options.listId) {
+                listUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+            }
+            else if (args.options.listTitle) {
+                listUrl = `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);
+                listUrl = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/${listUrl}fields`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoFieldListCommand_instances = new WeakSet(), _SpoFieldListCommand_initTelemetry = function _SpoFieldListCommand_initTelemetry() {
@@ -83,11 +88,11 @@ _SpoFieldListCommand_instances = new WeakSet(), _SpoFieldListCommand_initTelemet
     });
 }, _SpoFieldListCommand_initValidators = function _SpoFieldListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        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} is not a valid GUID`;
         }
         const listOptions = [args.options.listId, args.options.listTitle, args.options.listUrl];

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

@@ -15,9 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFieldRemoveCommand_instances, _SpoFieldRemoveCommand_initTelemetry, _SpoFieldRemoveCommand_initOptions, _SpoFieldRemoveCommand_initValidators, _SpoFieldRemoveCommand_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 SpoFieldRemoveCommand extends SpoCommand_1.default {
@@ -35,110 +37,107 @@ class SpoFieldRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes the specified list- or site column';
     }
-    commandAction(logger, args, cb) {
-        if (args.options.fieldTitle) {
-            args.options.title = args.options.fieldTitle;
-            this.warn(logger, `Option 'fieldTitle' is deprecated. Please use 'title' instead.`);
-        }
-        let messageEnd;
-        if (args.options.listId || args.options.listTitle) {
-            messageEnd = `in list ${args.options.listId || args.options.listTitle}`;
-        }
-        else {
-            messageEnd = `in site ${args.options.webUrl}`;
-        }
-        const removeField = (listRestUrl, fieldId, title) => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing field ${fieldId || title} ${messageEnd}...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.fieldTitle) {
+                args.options.title = args.options.fieldTitle;
+                this.warn(logger, `Option 'fieldTitle' is deprecated. Please use 'title' instead.`);
             }
-            let fieldRestUrl = '';
-            if (fieldId) {
-                fieldRestUrl = `/getbyid('${utils_1.formatting.encodeQueryParameter(fieldId)}')`;
+            let messageEnd;
+            if (args.options.listId || args.options.listTitle) {
+                messageEnd = `in list ${args.options.listId || args.options.listTitle}`;
             }
             else {
-                fieldRestUrl = `/getbyinternalnameortitle('${utils_1.formatting.encodeQueryParameter(title)}')`;
-            }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/${listRestUrl}fields${fieldRestUrl}`,
-                method: 'POST',
-                headers: {
-                    'X-HTTP-Method': 'DELETE',
-                    'If-Match': '*',
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        };
-        const prepareRemoval = () => {
-            let listRestUrl = '';
-            if (args.options.listId) {
-                listRestUrl = `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+                messageEnd = `in site ${args.options.webUrl}`;
             }
-            else if (args.options.listTitle) {
-                listRestUrl = `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
-            }
-            else if (args.options.listUrl) {
-                const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                listRestUrl = `GetList('${utils_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
-            }
-            if (args.options.group) {
+            const removeField = (listRestUrl, fieldId, title) => __awaiter(this, void 0, void 0, function* () {
                 if (this.verbose) {
-                    logger.logToStderr(`Retrieving fields assigned to group ${args.options.group}...`);
+                    logger.logToStderr(`Removing field ${fieldId || title} ${messageEnd}...`);
+                }
+                let fieldRestUrl = '';
+                if (fieldId) {
+                    fieldRestUrl = `/getbyid('${formatting_1.formatting.encodeQueryParameter(fieldId)}')`;
+                }
+                else {
+                    fieldRestUrl = `/getbyinternalnameortitle('${formatting_1.formatting.encodeQueryParameter(title)}')`;
                 }
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/${listRestUrl}fields`,
+                    url: `${args.options.webUrl}/_api/web/${listRestUrl}fields${fieldRestUrl}`,
+                    method: 'POST',
                     headers: {
-                        accept: 'application/json;odata=nometadata'
+                        'X-HTTP-Method': 'DELETE',
+                        'If-Match': '*',
+                        'accept': 'application/json;odata=nometadata'
                     },
                     responseType: 'json'
                 };
-                request_1.default
-                    .get(requestOptions)
-                    .then((res) => {
-                    const filteredResults = res.value.filter((field) => field.Group === args.options.group);
+                yield request_1.default.post(requestOptions);
+            });
+            const prepareRemoval = () => __awaiter(this, void 0, void 0, function* () {
+                let listRestUrl = '';
+                if (args.options.listId) {
+                    listRestUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+                }
+                else if (args.options.listTitle) {
+                    listRestUrl = `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);
+                    listRestUrl = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
+                }
+                if (args.options.group) {
                     if (this.verbose) {
-                        logger.logToStderr(`${filteredResults.length} matches found...`);
+                        logger.logToStderr(`Retrieving fields assigned to group ${args.options.group}...`);
                     }
-                    const promises = [];
-                    for (let index = 0; index < filteredResults.length; index++) {
-                        promises.push(removeField(listRestUrl, filteredResults[index].Id, undefined));
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/${listRestUrl}fields`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    try {
+                        const res = yield request_1.default.get(requestOptions);
+                        const filteredResults = res.value.filter((field) => field.Group === args.options.group);
+                        if (this.verbose) {
+                            logger.logToStderr(`${filteredResults.length} matches found...`);
+                        }
+                        const promises = [];
+                        for (let index = 0; index < filteredResults.length; index++) {
+                            promises.push(removeField(listRestUrl, filteredResults[index].Id, undefined));
+                        }
+                        yield Promise.all(promises);
+                    }
+                    catch (err) {
+                        this.handleRejectedODataJsonPromise(err);
                     }
-                    Promise.all(promises).then(() => {
-                        cb();
-                    })
-                        .catch((err) => {
-                        this.handleRejectedODataJsonPromise(err, logger, cb);
-                    });
-                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-            }
-            else {
-                removeField(listRestUrl, args.options.id, args.options.title)
-                    .then(() => {
-                    // REST post call doesn't return anything
-                    cb();
-                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-            }
-        };
-        if (args.options.confirm) {
-            prepareRemoval();
-        }
-        else {
-            const confirmMessage = `Are you sure you want to remove the ${args.options.group ? 'fields' : 'field'} ${args.options.id || args.options.title || 'from group ' + args.options.group} ${messageEnd}?`;
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: confirmMessage
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
                 }
                 else {
-                    prepareRemoval();
+                    try {
+                        yield removeField(listRestUrl, args.options.id, args.options.title);
+                        // REST post call doesn't return anything
+                    }
+                    catch (err) {
+                        this.handleRejectedODataJsonPromise(err);
+                    }
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield prepareRemoval();
+            }
+            else {
+                const confirmMessage = `Are you sure you want to remove the ${args.options.group ? 'fields' : 'field'} ${args.options.id || args.options.title || 'from group ' + args.options.group} ${messageEnd}?`;
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: confirmMessage
+                });
+                if (result.continue) {
+                    yield prepareRemoval();
+                }
+            }
+        });
     }
 }
 _SpoFieldRemoveCommand_instances = new WeakSet(), _SpoFieldRemoveCommand_initTelemetry = function _SpoFieldRemoveCommand_initTelemetry() {
@@ -175,14 +174,14 @@ _SpoFieldRemoveCommand_instances = new WeakSet(), _SpoFieldRemoveCommand_initTel
     });
 }, _SpoFieldRemoveCommand_initValidators = function _SpoFieldRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        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} is not a valid GUID`;
         }
         return true;