@pnp/cli-microsoft365 6.0.0-beta.c561c1f → 6.0.0-beta.c5ce305

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

@@ -15,10 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFieldSetCommand_instances, _SpoFieldSetCommand_initTelemetry, _SpoFieldSetCommand_initOptions, _SpoFieldSetCommand_initValidators, _SpoFieldSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 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 SpoFieldSetCommand extends SpoCommand_1.default {
@@ -39,81 +40,73 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
     allowUnknownOptions() {
         return true;
     }
-    commandAction(logger, args, cb) {
-        if (args.options.name) {
-            this.warn(logger, `Option 'name' is deprecated. Please use 'title' instead.`);
-        }
-        let requestDigest = '';
-        utils_1.spo
-            .getRequestDigest(args.options.webUrl)
-            .then((res) => {
-            requestDigest = res.FormDigestValue;
-            if (!args.options.listId && !args.options.listTitle) {
-                return Promise.resolve(undefined);
-            }
-            const listQuery = args.options.listId ?
-                `<Method Id="663" ParentId="7" Name="GetById"><Parameters><Parameter Type="Guid">${utils_1.formatting.escapeXml(args.options.listId)}</Parameter></Parameters></Method>` :
-                `<Method Id="663" ParentId="7" Name="GetByTitle"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.listTitle)}</Parameter></Parameters></Method>`;
-            const requestOptions = {
-                url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': requestDigest
-                },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="664" ObjectPathId="663" /><Query Id="665" ObjectPathId="663"><Query SelectAllProperties="false"><Properties /></Query></Query></Actions><ObjectPaths>${listQuery}<Property Id="7" ParentId="5" Name="Lists" /><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            // by default retrieve the column from the site
-            let fieldsParentIdentity = '<Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" />';
-            if (res) {
-                const json = JSON.parse(res);
-                const response = json[0];
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
+                const requestDigest = reqDigest.FormDigestValue;
+                let list = undefined;
+                if (args.options.listId || args.options.listTitle) {
+                    const listQuery = args.options.listId ?
+                        `<Method Id="663" ParentId="7" Name="GetById"><Parameters><Parameter Type="Guid">${formatting_1.formatting.escapeXml(args.options.listId)}</Parameter></Parameters></Method>` :
+                        `<Method Id="663" ParentId="7" Name="GetByTitle"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.listTitle)}</Parameter></Parameters></Method>`;
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                        headers: {
+                            'X-RequestDigest': requestDigest
+                        },
+                        data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="664" ObjectPathId="663" /><Query Id="665" ObjectPathId="663"><Query SelectAllProperties="false"><Properties /></Query></Query></Actions><ObjectPaths>${listQuery}<Property Id="7" ParentId="5" Name="Lists" /><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`
+                    };
+                    list = yield request_1.default.post(requestOptions);
+                }
+                // by default retrieve the column from the site
+                let fieldsParentIdentity = '<Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" />';
+                if (list) {
+                    const json = JSON.parse(list);
+                    const response = json[0];
+                    if (response.ErrorInfo) {
+                        throw response.ErrorInfo.ErrorMessage;
+                    }
+                    const result = json[json.length - 1];
+                    fieldsParentIdentity = `<Identity Id="5" Name="${result._ObjectIdentity_}" />`;
+                }
+                // retrieve column CSOM object id
+                const fieldQuery = args.options.id ?
+                    `<Method Id="663" ParentId="7" Name="GetById"><Parameters><Parameter Type="Guid">${formatting_1.formatting.escapeXml(args.options.id)}</Parameter></Parameters></Method>` :
+                    `<Method Id="663" ParentId="7" Name="GetByInternalNameOrTitle"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.name || args.options.title)}</Parameter></Parameters></Method>`;
+                let requestOptions = {
+                    url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': requestDigest
+                    },
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="664" ObjectPathId="663" /><Query Id="665" ObjectPathId="663"><Query SelectAllProperties="false"><Properties /></Query></Query></Actions><ObjectPaths>${fieldQuery}<Property Id="7" ParentId="5" Name="Fields" />${fieldsParentIdentity}</ObjectPaths></Request>`
+                };
+                const field = yield request_1.default.post(requestOptions);
+                let json = JSON.parse(field);
+                let response = json[0];
                 if (response.ErrorInfo) {
-                    return Promise.reject(response.ErrorInfo.ErrorMessage);
+                    throw response.ErrorInfo.ErrorMessage;
                 }
                 const result = json[json.length - 1];
-                fieldsParentIdentity = `<Identity Id="5" Name="${result._ObjectIdentity_}" />`;
-            }
-            // retrieve column CSOM object id
-            const fieldQuery = args.options.id ?
-                `<Method Id="663" ParentId="7" Name="GetById"><Parameters><Parameter Type="Guid">${utils_1.formatting.escapeXml(args.options.id)}</Parameter></Parameters></Method>` :
-                `<Method Id="663" ParentId="7" Name="GetByInternalNameOrTitle"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name || args.options.title)}</Parameter></Parameters></Method>`;
-            const requestOptions = {
-                url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': requestDigest
-                },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="664" ObjectPathId="663" /><Query Id="665" ObjectPathId="663"><Query SelectAllProperties="false"><Properties /></Query></Query></Actions><ObjectPaths>${fieldQuery}<Property Id="7" ParentId="5" Name="Fields" />${fieldsParentIdentity}</ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                return Promise.reject(response.ErrorInfo.ErrorMessage);
+                const fieldId = result._ObjectIdentity_;
+                requestOptions = {
+                    url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': requestDigest
+                    },
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${this.getPayload(args.options)}<Method Name="UpdateAndPushChanges" Id="9000" ObjectPathId="663"><Parameters><Parameter Type="Boolean">${args.options.updateExistingLists ? 'true' : 'false'}</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="663" Name="${fieldId}" /></ObjectPaths></Request>`
+                };
+                const res = yield request_1.default.post(requestOptions);
+                json = JSON.parse(res);
+                response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
             }
-            const result = json[json.length - 1];
-            const fieldId = result._ObjectIdentity_;
-            const requestOptions = {
-                url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': requestDigest
-                },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${this.getPayload(args.options)}<Method Name="UpdateAndPushChanges" Id="9000" ObjectPathId="663"><Parameters><Parameter Type="Boolean">${args.options.updateExistingLists ? 'true' : 'false'}</Parameter></Parameters></Method></Actions><ObjectPaths><Identity Id="663" Name="${fieldId}" /></ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-                return;
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
     getPayload(options) {
         const excludeOptions = [
@@ -121,7 +114,6 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
             'listId',
             'listTitle',
             'id',
-            'name',
             'title',
             'updateExistingLists',
             'debug',
@@ -130,7 +122,7 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
         ];
         let i = 667;
         const payload = Object.keys(options).map(key => {
-            return excludeOptions.indexOf(key) === -1 ? `<SetProperty Id="${i++}" ObjectPathId="663" Name="${key}"><Parameter Type="String">${utils_1.formatting.escapeXml(options[key])}</Parameter></SetProperty>` : '';
+            return excludeOptions.indexOf(key) === -1 ? `<SetProperty Id="${i++}" ObjectPathId="663" Name="${key}"><Parameter Type="String">${formatting_1.formatting.escapeXml(options[key])}</Parameter></SetProperty>` : '';
         }).join('');
         return payload;
     }
@@ -140,7 +132,6 @@ _SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined',
-            name: typeof args.options.name !== 'undefined',
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             updateExistingLists: !!args.options.updateExistingLists
@@ -155,8 +146,6 @@ _SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry
         option: '--listTitle [listTitle]'
     }, {
         option: '-i, --id [id]'
-    }, {
-        option: '-n, --name [name]'
     }, {
         option: '-t, --title [title]'
     }, {
@@ -164,7 +153,7 @@ _SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry
     });
 }, _SpoFieldSetCommand_initValidators = function _SpoFieldSetCommand_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;
         }
@@ -172,17 +161,17 @@ _SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry
             return `Specify listId or listTitle but not both`;
         }
         if (args.options.listId &&
-            !utils_1.validation.isValidGuid(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.id &&
-            !utils_1.validation.isValidGuid(args.options.id)) {
+            !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} in option id is not a valid GUID`;
         }
         return true;
     }));
 }, _SpoFieldSetCommand_initOptionSets = function _SpoFieldSetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title', 'name']);
+    this.optionSets.push(['id', 'title']);
 };
 module.exports = new SpoFieldSetCommand();
 //# sourceMappingURL=field-set.js.map

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

@@ -19,7 +19,10 @@ const fs = require("fs");
 const path = require("path");
 const uuid_1 = require("uuid");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const fsUtil_1 = require("../../../../utils/fsUtil");
+const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFileAddCommand extends SpoCommand_1.default {
@@ -42,73 +45,66 @@ class SpoFileAddCommand extends SpoCommand_1.default {
     allowUnknownOptions() {
         return true;
     }
-    commandAction(logger, args, cb) {
-        const folderPath = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folder);
-        const fullPath = path.resolve(args.options.path);
-        const fileName = utils_1.fsUtil.getSafeFileName(path.basename(fullPath));
-        let isCheckedOut = false;
-        let listSettings;
-        if (this.debug) {
-            logger.logToStderr(`folder path: ${folderPath}...`);
-        }
-        if (this.debug) {
-            logger.logToStderr('Check if the specified folder exists.');
-            logger.logToStderr('');
-        }
-        if (this.debug) {
-            logger.logToStderr(`file name: ${fileName}...`);
-        }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            }
-        };
-        request_1.default.get(requestOptions).catch(() => {
-            // folder does not exist so will attempt to create the folder tree
-            return utils_1.spo.ensureFolder(args.options.webUrl, folderPath, logger, this.debug);
-        })
-            .then(() => {
-            if (args.options.checkOut) {
-                return this.fileCheckOut(fileName, args.options.webUrl, folderPath)
-                    .then(() => {
-                    // flag the file is checkedOut by the command
-                    // so in case of command failure we can try check it in
-                    isCheckedOut = true;
-                    return Promise.resolve();
-                })
-                    .catch((err) => {
-                    return Promise.reject(err);
-                });
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const folderPath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folder);
+            const fullPath = path.resolve(args.options.path);
+            const fileName = fsUtil_1.fsUtil.getSafeFileName(path.basename(fullPath));
+            let isCheckedOut = false;
+            let listSettings;
+            if (this.debug) {
+                logger.logToStderr(`folder path: ${folderPath}...`);
             }
-            return Promise.resolve();
-        })
-            .then(() => {
-            if (this.verbose) {
-                logger.logToStderr(`Upload file to site ${args.options.webUrl}...`);
+            if (this.debug) {
+                logger.logToStderr('Check if the specified folder exists.');
+                logger.logToStderr('');
             }
-            const fileStats = fs.statSync(fullPath);
-            const fileSize = fileStats.size;
             if (this.debug) {
-                logger.logToStderr(`File size is ${fileSize} bytes`);
+                logger.logToStderr(`file name: ${fileName}...`);
             }
-            // only up to 250 MB are allowed in a single request
-            if (fileSize > this.fileChunkingThreshold) {
-                const fileChunkCount = Math.ceil(fileSize / this.fileChunkSize);
+            try {
+                try {
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')`,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        }
+                    };
+                    yield request_1.default.get(requestOptions);
+                }
+                catch (err) {
+                    // folder does not exist so will attempt to create the folder tree
+                    yield spo_1.spo.ensureFolder(args.options.webUrl, folderPath, logger, this.debug);
+                }
+                if (args.options.checkOut) {
+                    yield this.fileCheckOut(fileName, args.options.webUrl, folderPath);
+                    // flag the file is checkedOut by the command
+                    // so in case of command failure we can try check it in
+                    isCheckedOut = true;
+                }
                 if (this.verbose) {
-                    logger.logToStderr(`Uploading ${fileSize} bytes in ${fileChunkCount} chunks...`);
+                    logger.logToStderr(`Upload file to site ${args.options.webUrl}...`);
                 }
-                // initiate chunked upload session
-                const uploadId = (0, uuid_1.v4)();
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files/GetByPathOrAddStub(DecodedUrl='${encodeURIComponent(fileName)}')/StartUpload(uploadId=guid'${uploadId}')`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
+                const fileStats = fs.statSync(fullPath);
+                const fileSize = fileStats.size;
+                if (this.debug) {
+                    logger.logToStderr(`File size is ${fileSize} bytes`);
+                }
+                // only up to 250 MB are allowed in a single request
+                if (fileSize > this.fileChunkingThreshold) {
+                    const fileChunkCount = Math.ceil(fileSize / this.fileChunkSize);
+                    if (this.verbose) {
+                        logger.logToStderr(`Uploading ${fileSize} bytes in ${fileChunkCount} chunks...`);
                     }
-                };
-                return request_1.default
-                    .post(requestOptions)
-                    .then(() => {
+                    // initiate chunked upload session
+                    const uploadId = (0, uuid_1.v4)();
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files/GetByPathOrAddStub(DecodedUrl='${encodeURIComponent(fileName)}')/StartUpload(uploadId=guid'${uploadId}')`,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        }
+                    };
+                    yield request_1.default.post(requestOptions);
                     // session started successfully, now upload our file chunks
                     const fileUploadInfo = {
                         Name: fileName,
@@ -120,16 +116,15 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                         Position: 0,
                         Size: fileSize
                     };
-                    return new Promise((resolve, reject) => {
-                        this.uploadFileChunks(fileUploadInfo, logger, resolve, reject);
-                    })
-                        .then(() => {
+                    try {
+                        yield new Promise((resolve, reject) => {
+                            this.uploadFileChunks(fileUploadInfo, logger, resolve, reject);
+                        });
                         if (this.verbose) {
                             logger.logToStderr(`Finished uploading ${fileUploadInfo.Position} bytes in ${fileChunkCount} chunks`);
                         }
-                        return Promise.resolve();
-                    })
-                        .catch((err) => {
+                    }
+                    catch (err) {
                         if (this.verbose) {
                             logger.logToStderr('Cancelling upload session due to error...');
                         }
@@ -139,124 +134,110 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                                 'accept': 'application/json;odata=nometadata'
                             }
                         };
-                        return request_1.default
-                            .post(requestOptions)
-                            .then(() => {
-                            return Promise.reject(err); // original error
-                        })
-                            .catch((err_) => {
+                        try {
+                            yield request_1.default.post(requestOptions);
+                            throw err;
+                        }
+                        catch (err) {
                             if (this.debug) {
-                                logger.logToStderr(`Failed to cancel upload session: ${err_}`);
+                                logger.logToStderr(`Failed to cancel upload session: ${err}`);
                             }
-                            return Promise.reject(err); // original error
-                        });
-                    });
-                });
-            }
-            // upload small file in a single request
-            const fileBody = fs.readFileSync(fullPath);
-            const bodyLength = fileBody.byteLength;
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files/Add(url='${encodeURIComponent(fileName)}', overwrite=true)`,
-                data: fileBody,
-                headers: {
-                    'accept': 'application/json;odata=nometadata',
-                    'content-length': bodyLength
-                },
-                maxBodyLength: this.fileChunkingThreshold
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(() => {
-            if (args.options.contentType || args.options.publish || args.options.approve) {
-                return this.getFileParentList(fileName, args.options.webUrl, folderPath, logger)
-                    .then((listSettingsResp) => {
-                    listSettings = listSettingsResp;
+                            throw err;
+                        }
+                    }
+                }
+                else {
+                    // upload small file in a single request
+                    const fileBody = fs.readFileSync(fullPath);
+                    const bodyLength = fileBody.byteLength;
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files/Add(url='${encodeURIComponent(fileName)}', overwrite=true)`,
+                        data: fileBody,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata',
+                            'content-length': bodyLength
+                        },
+                        maxBodyLength: this.fileChunkingThreshold
+                    };
+                    yield request_1.default.post(requestOptions);
+                }
+                if (args.options.contentType || args.options.publish || args.options.approve) {
+                    listSettings = yield this.getFileParentList(fileName, args.options.webUrl, folderPath, logger);
                     if (args.options.contentType) {
-                        return this.listHasContentType(args.options.contentType, args.options.webUrl, listSettings, logger);
+                        yield this.listHasContentType(args.options.contentType, args.options.webUrl, listSettings, logger);
                     }
-                    return Promise.resolve();
-                });
-            }
-            return Promise.resolve();
-        })
-            .then(() => {
-            // check if there are unknown options
-            // and map them as fields to update
-            const fieldsToUpdate = this.mapUnknownOptionsAsFieldValue(args.options);
-            if (args.options.contentType) {
-                fieldsToUpdate.push({
-                    FieldName: 'ContentType',
-                    FieldValue: args.options.contentType
-                });
-            }
-            if (fieldsToUpdate.length > 0) {
-                // perform list item update and checkin
-                return this.validateUpdateListItem(args.options.webUrl, folderPath, fileName, fieldsToUpdate, logger, args.options.checkInComment);
-            }
-            else if (isCheckedOut) {
-                // perform checkin
-                return this.fileCheckIn(args, fileName);
-            }
-            return Promise.resolve();
-        })
-            .then(() => {
-            // approve and publish cannot be used together
-            // when approve is used it will automatically publish the file
-            // so then no need to publish afterwards
-            if (args.options.approve) {
-                if (this.verbose) {
-                    logger.logToStderr(`Approve file ${fileName}`);
                 }
-                // approve the existing file with given comment
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files('${encodeURIComponent(fileName)}')/approve(comment='${encodeURIComponent(args.options.approveComment || '')}')`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.post(requestOptions);
-            }
-            else if (args.options.publish) {
-                if (listSettings.EnableModeration && listSettings.EnableMinorVersions) {
-                    return Promise.reject('The file cannot be published without approval. Moderation for this list is enabled. Use the --approve option instead of --publish to approve and publish the file');
+                // check if there are unknown options
+                // and map them as fields to update
+                const fieldsToUpdate = this.mapUnknownOptionsAsFieldValue(args.options);
+                if (args.options.contentType) {
+                    fieldsToUpdate.push({
+                        FieldName: 'ContentType',
+                        FieldValue: args.options.contentType
+                    });
                 }
-                if (this.verbose) {
-                    logger.logToStderr(`Publish file ${fileName}`);
+                if (fieldsToUpdate.length > 0) {
+                    // perform list item update and checkin
+                    yield this.validateUpdateListItem(args.options.webUrl, folderPath, fileName, fieldsToUpdate, logger, args.options.checkInComment);
                 }
-                // publish the existing file with given comment
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files('${encodeURIComponent(fileName)}')/publish(comment='${encodeURIComponent(args.options.publishComment || '')}')`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.post(requestOptions);
-            }
-            return Promise.resolve();
-        })
-            .then(_ => cb(), (err) => {
-            if (isCheckedOut) {
-                // in a case the command has done checkout
-                // then have to rollback the checkout
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files('${encodeURIComponent(fileName)}')/UndoCheckOut()`
-                };
-                request_1.default.post(requestOptions)
-                    .then(_ => this.handleRejectedODataJsonPromise(err, logger, cb))
-                    .catch(checkoutError => {
+                else if (isCheckedOut) {
+                    // perform checkin
+                    yield this.fileCheckIn(args, fileName);
+                }
+                // approve and publish cannot be used together
+                // when approve is used it will automatically publish the file
+                // so then no need to publish afterwards
+                if (args.options.approve) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Approve file ${fileName}`);
+                    }
+                    // approve the existing file with given comment
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files('${encodeURIComponent(fileName)}')/approve(comment='${encodeURIComponent(args.options.approveComment || '')}')`,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
+                }
+                else if (args.options.publish) {
+                    if (listSettings.EnableModeration && listSettings.EnableMinorVersions) {
+                        throw 'The file cannot be published without approval. Moderation for this list is enabled. Use the --approve option instead of --publish to approve and publish the file';
+                    }
                     if (this.verbose) {
-                        logger.logToStderr('Could not rollback file checkout');
-                        logger.logToStderr(checkoutError);
-                        logger.logToStderr('');
+                        logger.logToStderr(`Publish file ${fileName}`);
                     }
-                    this.handleRejectedODataJsonPromise(err, logger, cb);
-                });
+                    // publish the existing file with given comment
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files('${encodeURIComponent(fileName)}')/publish(comment='${encodeURIComponent(args.options.publishComment || '')}')`,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
+                }
             }
-            else {
-                this.handleRejectedODataJsonPromise(err, logger, cb);
+            catch (err) {
+                if (isCheckedOut) {
+                    // in a case the command has done checkout
+                    // then have to rollback the checkout
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(folderPath)}')/Files('${encodeURIComponent(fileName)}')/UndoCheckOut()`
+                    };
+                    try {
+                        yield request_1.default.post(requestOptions);
+                    }
+                    catch (err) {
+                        if (this.verbose) {
+                            logger.logToStderr('Could not rollback file checkout');
+                            logger.logToStderr(err);
+                            logger.logToStderr('');
+                        }
+                    }
+                }
+                this.handleRejectedODataJsonPromise(err);
             }
         });
     }
@@ -498,7 +479,7 @@ _SpoFileAddCommand_instances = new WeakSet(), _SpoFileAddCommand_initTelemetry =
     });
 }, _SpoFileAddCommand_initValidators = function _SpoFileAddCommand_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;
         }