@pnp/cli-microsoft365 6.8.0 → 6.9.0-beta.148279d

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

@@ -42,7 +42,7 @@ class SpoAppPageSetCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json',
                 data: {
-                    serverRelativeUrl: `${urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, '')}/SitePages/${args.options.name}`,
+                    serverRelativeUrl: `${urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, 'SitePages')}/${args.options.name}`,
                     webPartDataAsJson: args.options.webPartData
                 }
             };

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

@@ -39,7 +39,7 @@ class SpoCommandSetSetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Updating ListView Command Set ${args.options.clientSideComponentId} to site '${args.options.webUrl}'...`);
+                logger.logToStderr(`Updating ListView Command Set ${args.options.id || args.options.title || args.options.clientSideComponentId} to site '${args.options.webUrl}'...`);
             }
             if (!args.options.scope) {
                 args.options.scope = 'All';
@@ -59,6 +59,9 @@ class SpoCommandSetSetCommand extends SpoCommand_1.default {
                 if (args.options.clientSideComponentProperties) {
                     requestBody.ClientSideComponentProperties = args.options.clientSideComponentProperties;
                 }
+                if (args.options.newClientSideComponentId) {
+                    requestBody.ClientSideComponentId = args.options.newClientSideComponentId;
+                }
                 const customAction = yield this.getCustomAction(args.options);
                 const requestOptions = {
                     url: `${args.options.webUrl}/_api/${customAction.Scope === 3 ? "Web" : "Site"}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(customAction.Id)}')`,
@@ -127,6 +130,7 @@ _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_ini
             title: typeof args.options.title !== 'undefined',
             id: typeof args.options.id !== 'undefined',
             clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
+            newClientSideComponentId: typeof args.options.newClientSideComponentId !== 'undefined',
             listType: typeof args.options.listType !== 'undefined',
             clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
             scope: typeof args.options.scope !== 'undefined',
@@ -142,6 +146,8 @@ _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_ini
         option: '-i, --id [id]'
     }, {
         option: '-c, --clientSideComponentId  [clientSideComponentId]'
+    }, {
+        option: '--newClientSideComponentId  [newClientSideComponentId]'
     }, {
         option: '--newTitle [newTitle]'
     }, {
@@ -161,6 +167,9 @@ _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_ini
         if (args.options.clientSideComponentId && !validation_1.validation.isValidGuid(args.options.clientSideComponentId)) {
             return `${args.options.clientSideComponentId} is not a valid GUID`;
         }
+        if (args.options.newClientSideComponentId && !validation_1.validation.isValidGuid(args.options.newClientSideComponentId)) {
+            return `${args.options.newClientSideComponentId} is not a valid GUID`;
+        }
         if (args.options.listType && SpoCommandSetSetCommand.listTypes.indexOf(args.options.listType) < 0) {
             return `${args.options.listType} is not a valid list type. Allowed values are ${SpoCommandSetSetCommand.listTypes.join(', ')}`;
         }
@@ -170,7 +179,7 @@ _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_ini
         if (args.options.location && SpoCommandSetSetCommand.locations.indexOf(args.options.location) < 0) {
             return `${args.options.location} is not a valid location. Allowed values are ${SpoCommandSetSetCommand.locations.join(', ')}`;
         }
-        if (!args.options.newTitle && !args.options.listType && !args.options.clientSideComponentProperties && !args.options.location) {
+        if (!args.options.newTitle && !args.options.listType && !args.options.clientSideComponentProperties && !args.options.location && !args.options.newClientSideComponentId) {
             return `Please specify option to be updated`;
         }
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);

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

@@ -91,13 +91,12 @@ class SpoContentTypeSetCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Updating content type...`);
             }
-            const payload = this.getRequestPayload(options);
             const requestOptions = {
                 url: `${options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
                     'Content-Type': 'text/xml'
                 },
-                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>${payload}</Actions><ObjectPaths><Identity Id="9" Name="fc4179a0-e0d7-5000-c38b-bc3506fbab6f|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}:contenttype:${formatting_1.formatting.escapeXml(contentTypeId)}" /></ObjectPaths></Request>`
+                data: yield this.getCsomCallXmlBody(options, siteId, webId, contentTypeId)
             };
             const res = yield request_1.default.post(requestOptions);
             const json = JSON.parse(res);
@@ -107,6 +106,13 @@ class SpoContentTypeSetCommand extends SpoCommand_1.default {
             }
         });
     }
+    getCsomCallXmlBody(options, siteId, webId, contentTypeId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const payload = this.getRequestPayload(options);
+            const list = yield this.getListId(options);
+            return `<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>${payload}</Actions><ObjectPaths><Identity Id="9" Name="fc4179a0-e0d7-5000-c38b-bc3506fbab6f|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${siteId}:web:${webId}${list}:contenttype:${formatting_1.formatting.escapeXml(contentTypeId)}" /></ObjectPaths></Request>`;
+        });
+    }
     getRequestPayload(options) {
         const excludeOptions = [
             'webUrl',
@@ -130,6 +136,9 @@ class SpoContentTypeSetCommand extends SpoCommand_1.default {
         if (options.updateChildren) {
             payload.push(`<Method Name="Update" Id="${i++}" ObjectPathId="9"><Parameters><Parameter Type="Boolean">true</Parameter></Parameters></Method>`);
         }
+        else {
+            payload.push(`<Method Name="Update" Id="${i++}" ObjectPathId="9"><Parameters><Parameter Type="Boolean">false</Parameter></Parameters></Method>`);
+        }
         return payload.join('');
     }
     getSiteId(logger, webUrl) {
@@ -164,6 +173,41 @@ class SpoContentTypeSetCommand extends SpoCommand_1.default {
             return web.Id;
         });
     }
+    getListId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!options.listId && !options.listTitle && !options.listUrl) {
+                return '';
+            }
+            let baseString = ':list:';
+            if (options.listId) {
+                return baseString += options.listId;
+            }
+            else if (options.listTitle) {
+                const requestOptions = {
+                    url: `${options.webUrl}/_api/web/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')?$select=Id`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const listResponse = yield request_1.default.get(requestOptions);
+                baseString += listResponse.Id;
+            }
+            else if (options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
+                const requestOptions = {
+                    url: `${options.webUrl}/_api/web/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')?$select=Id`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const listResponse = yield request_1.default.get(requestOptions);
+                baseString += listResponse.Id;
+            }
+            return baseString;
+        });
+    }
 }
 _SpoContentTypeSetCommand_instances = new WeakSet(), _SpoContentTypeSetCommand_initTelemetry = function _SpoContentTypeSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -204,6 +248,9 @@ _SpoContentTypeSetCommand_instances = new WeakSet(), _SpoContentTypeSetCommand_i
         if ((args.options.listId && (args.options.listTitle || args.options.listUrl)) || (args.options.listTitle && args.options.listUrl)) {
             return `Specify either listTitle, listId or listUrl.`;
         }
+        if ((args.options.listId || args.options.listTitle || args.options.listUrl) && args.options.updateChildren) {
+            return 'It is impossible to pass updateChildren when trying to update a list content type.';
+        }
         return true;
     }));
 }, _SpoContentTypeSetCommand_initTypes = function _SpoContentTypeSetCommand_initTypes() {

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

@@ -118,9 +118,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                         Size: fileSize
                     };
                     try {
-                        yield new Promise((resolve, reject) => {
-                            this.uploadFileChunks(fileUploadInfo, logger, resolve, reject);
-                        });
+                        yield this.uploadFileChunks(fileUploadInfo, logger);
                         if (this.verbose) {
                             logger.logToStderr(`Finished uploading ${fileUploadInfo.Position} bytes in ${fileChunkCount} chunks`);
                         }
@@ -243,175 +241,177 @@ class SpoFileAddCommand extends SpoCommand_1.default {
         });
     }
     listHasContentType(contentType, webUrl, listSettings, logger) {
-        if (this.verbose) {
-            logger.logToStderr(`Getting list of available content types ...`);
-        }
-        const requestOptions = {
-            url: `${webUrl}/_api/web/lists('${listSettings.Id}')/contenttypes?$select=Name,Id`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(requestOptions).then(response => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Getting list of available content types ...`);
+            }
+            const requestOptions = {
+                url: `${webUrl}/_api/web/lists('${listSettings.Id}')/contenttypes?$select=Name,Id`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
             // check if the specified content type is in the list
             for (const ct of response.value) {
                 if (ct.Id.StringValue === contentType || ct.Name === contentType) {
-                    return Promise.resolve();
+                    return;
                 }
             }
-            return Promise.reject(`Specified content type '${contentType}' doesn't exist on the target list`);
+            throw `Specified content type '${contentType}' doesn't exist on the target list`;
         });
     }
     fileCheckOut(fileName, webUrl, folder) {
-        // check if file already exists, otherwise it can't be checked out
-        const requestOptions = {
-            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            }
-        };
-        return request_1.default.get(requestOptions)
-            .then(() => {
-            // checkout the existing file
-            const requestOptions = {
+        return __awaiter(this, void 0, void 0, function* () {
+            // check if file already exists, otherwise it can't be checked out
+            const requestOptionsGetFile = {
+                url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                }
+            };
+            yield request_1.default.get(requestOptionsGetFile);
+            const requestOptionsCheckOut = {
                 url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/CheckOut()`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
                 responseType: 'json'
             };
-            return request_1.default.post(requestOptions);
+            return request_1.default.post(requestOptionsCheckOut);
         });
     }
-    uploadFileChunks(info, logger, resolve, reject) {
-        let fd = 0;
-        try {
-            fd = fs.openSync(info.FilePath, 'r');
-            let fileBuffer = Buffer.alloc(this.fileChunkSize);
-            const readCount = fs.readSync(fd, fileBuffer, 0, this.fileChunkSize, info.Position);
-            fs.closeSync(fd);
-            fd = 0;
-            const offset = info.Position;
-            info.Position += readCount;
-            const isLastChunk = info.Position >= info.Size;
-            if (isLastChunk) {
-                // trim buffer for last chunk
-                fileBuffer = fileBuffer.slice(0, readCount);
-            }
-            const requestOptions = {
-                url: `${info.WebUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(info.FolderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(info.Name)}')/${isLastChunk ? 'Finish' : 'Continue'}Upload(uploadId=guid'${info.Id}',fileOffset=${offset})`,
-                data: fileBuffer,
-                headers: {
-                    'accept': 'application/json;odata=nometadata',
-                    'content-length': readCount
-                },
-                maxBodyLength: this.fileChunkingThreshold
-            };
-            request_1.default
-                .post(requestOptions)
-                .then(() => {
-                if (this.verbose) {
-                    logger.logToStderr(`Uploaded ${info.Position} of ${info.Size} bytes (${Math.round(100 * info.Position / info.Size)}%)`);
-                }
+    uploadFileChunks(info, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let fd = 0;
+            try {
+                fd = fs.openSync(info.FilePath, 'r');
+                let fileBuffer = Buffer.alloc(this.fileChunkSize);
+                const readCount = fs.readSync(fd, fileBuffer, 0, this.fileChunkSize, info.Position);
+                fs.closeSync(fd);
+                fd = 0;
+                const offset = info.Position;
+                info.Position += readCount;
+                const isLastChunk = info.Position >= info.Size;
                 if (isLastChunk) {
-                    resolve();
+                    // trim buffer for last chunk
+                    fileBuffer = fileBuffer.slice(0, readCount);
                 }
-                else {
-                    this.uploadFileChunks(info, logger, resolve, reject);
+                const requestOptions = {
+                    url: `${info.WebUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(info.FolderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(info.Name)}')/${isLastChunk ? 'Finish' : 'Continue'}Upload(uploadId=guid'${info.Id}',fileOffset=${offset})`,
+                    data: fileBuffer,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata',
+                        'content-length': readCount
+                    },
+                    maxBodyLength: this.fileChunkingThreshold
+                };
+                try {
+                    yield request_1.default.post(requestOptions);
+                    if (this.verbose) {
+                        logger.logToStderr(`Uploaded ${info.Position} of ${info.Size} bytes (${Math.round(100 * info.Position / info.Size)}%)`);
+                    }
+                    if (isLastChunk) {
+                        return;
+                    }
+                    else {
+                        return this.uploadFileChunks(info, logger);
+                    }
+                }
+                catch (err) {
+                    if (--info.RetriesLeft > 0) {
+                        if (this.verbose) {
+                            logger.logToStderr(`Retrying to upload chunk due to error: ${err}`);
+                        }
+                        info.Position -= readCount; // rewind
+                        return this.uploadFileChunks(info, logger);
+                    }
+                    else {
+                        throw err;
+                    }
+                }
+            }
+            catch (err) {
+                if (fd) {
+                    try {
+                        fs.closeSync(fd);
+                        /* c8 ignore next */
+                    }
+                    catch (_a) { }
                 }
-            })
-                .catch((err) => {
                 if (--info.RetriesLeft > 0) {
                     if (this.verbose) {
-                        logger.logToStderr(`Retrying to upload chunk due to error: ${err}`);
+                        logger.logToStderr(`Retrying to read chunk due to error: ${err}`);
                     }
-                    info.Position -= readCount; // rewind
-                    this.uploadFileChunks(info, logger, resolve, reject);
+                    return this.uploadFileChunks(info, logger);
                 }
                 else {
-                    reject(err);
-                }
-            });
-        }
-        catch (err) {
-            if (fd) {
-                try {
-                    fs.closeSync(fd);
-                    /* c8 ignore next */
+                    throw err;
                 }
-                catch (_a) { }
             }
-            if (--info.RetriesLeft > 0) {
-                if (this.verbose) {
-                    logger.logToStderr(`Retrying to read chunk due to error: ${err}`);
-                }
-                this.uploadFileChunks(info, logger, resolve, reject);
-            }
-            else {
-                reject(err);
-            }
-        }
+        });
     }
     getFileParentList(fileName, webUrl, folder, logger) {
-        if (this.verbose) {
-            logger.logToStderr(`Getting list details in order to get its available content types afterwards...`);
-        }
-        const requestOptions = {
-            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ParentList?$Select=Id,EnableModeration,EnableVersioning,EnableMinorVersions`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Getting list details in order to get its available content types afterwards...`);
+            }
+            const requestOptions = {
+                url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ParentList?$Select=Id,EnableModeration,EnableVersioning,EnableMinorVersions`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
     }
     validateUpdateListItem(webUrl, folderPath, fileName, fieldsToUpdate, logger, checkInComment) {
-        if (this.verbose) {
-            logger.logToStderr(`Validate and update list item values for file ${fileName}`);
-        }
-        const requestBody = {
-            formValues: fieldsToUpdate,
-            bNewDocumentUpdate: true,
-            checkInComment: checkInComment || ''
-        };
-        if (this.debug) {
-            logger.logToStderr('ValidateUpdateListItem will perform the checkin ...');
-            logger.logToStderr('');
-        }
-        // update the existing file list item fields
-        const requestOptions = {
-            url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ValidateUpdateListItem()`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            data: requestBody,
-            responseType: 'json'
-        };
-        return request_1.default.post(requestOptions)
-            .then((res) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Validate and update list item values for file ${fileName}`);
+            }
+            const requestBody = {
+                formValues: fieldsToUpdate,
+                bNewDocumentUpdate: true,
+                checkInComment: checkInComment || ''
+            };
+            if (this.debug) {
+                logger.logToStderr('ValidateUpdateListItem will perform the checkin ...');
+                logger.logToStderr('');
+            }
+            // update the existing file list item fields
+            const requestOptions = {
+                url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ValidateUpdateListItem()`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                data: requestBody,
+                responseType: 'json'
+            };
+            const res = yield request_1.default.post(requestOptions);
             // check for field value update for errors
             const fieldValues = res.value;
             for (const fieldValue of fieldValues) {
                 if (fieldValue.HasException) {
-                    return Promise.reject(`Update field value error: ${JSON.stringify(fieldValues)}`);
+                    throw `Update field value error: ${JSON.stringify(fieldValues)}`;
                 }
             }
-            return Promise.resolve();
-        })
-            .catch((err) => {
-            return Promise.reject(err);
+            return;
         });
     }
     fileCheckIn(args, fileName) {
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/CheckIn(comment='${formatting_1.formatting.encodeQueryParameter(args.options.checkInComment || '')}',checkintype=0)`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.post(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/CheckIn(comment='${formatting_1.formatting.encodeQueryParameter(args.options.checkInComment || '')}',checkintype=0)`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.post(requestOptions);
+        });
     }
     mapUnknownOptionsAsFieldValue(options) {
         const result = [];

package/dist/m365/spo/commands/file/file-checkout-undo.js

@@ -0,0 +1,119 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoFileCheckoutUndoCommand_instances, _SpoFileCheckoutUndoCommand_initTelemetry, _SpoFileCheckoutUndoCommand_initOptions, _SpoFileCheckoutUndoCommand_initValidators, _SpoFileCheckoutUndoCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+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 SpoFileCheckoutUndoCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.FILE_CHECKOUT_UNDO;
+    }
+    get description() {
+        return 'Discards a checked out file';
+    }
+    constructor() {
+        super();
+        _SpoFileCheckoutUndoCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFileCheckoutUndoCommand_instances, "m", _SpoFileCheckoutUndoCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFileCheckoutUndoCommand_instances, "m", _SpoFileCheckoutUndoCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFileCheckoutUndoCommand_instances, "m", _SpoFileCheckoutUndoCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileCheckoutUndoCommand_instances, "m", _SpoFileCheckoutUndoCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const undoCheckout = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (this.verbose) {
+                        logger.logToStderr(`Undoing checkout for file ${args.options.fileId || args.options.fileUrl} on web ${args.options.webUrl}`);
+                    }
+                    let requestUrl = `${args.options.webUrl}/_api/web/`;
+                    if (args.options.fileId) {
+                        requestUrl += `getFileById('${args.options.fileId}')`;
+                    }
+                    else if (args.options.fileUrl) {
+                        const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
+                        requestUrl += `getFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')`;
+                    }
+                    requestUrl += '/undocheckout';
+                    const requestOptions = {
+                        url: requestUrl,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield undoCheckout();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to undo the checkout for file ${args.options.fileId || args.options.fileUrl} ?`
+                });
+                if (result.continue) {
+                    yield undoCheckout();
+                }
+            }
+        });
+    }
+}
+_SpoFileCheckoutUndoCommand_instances = new WeakSet(), _SpoFileCheckoutUndoCommand_initTelemetry = function _SpoFileCheckoutUndoCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            fileId: typeof args.options.fileId !== 'undefined',
+            fileUrl: typeof args.options.fileUrl !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoFileCheckoutUndoCommand_initOptions = function _SpoFileCheckoutUndoCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-f, --fileUrl [fileUrl]'
+    }, {
+        option: '-i, --fileId [fileId]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoFileCheckoutUndoCommand_initValidators = function _SpoFileCheckoutUndoCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.fileId && !validation_1.validation.isValidGuid(args.options.fileId)) {
+            return `${args.options.fileId} is not a valid GUID`;
+        }
+        return true;
+    }));
+}, _SpoFileCheckoutUndoCommand_initOptionSets = function _SpoFileCheckoutUndoCommand_initOptionSets() {
+    this.optionSets.push({ options: ['fileId', 'fileUrl'] });
+};
+module.exports = new SpoFileCheckoutUndoCommand();
+//# sourceMappingURL=file-checkout-undo.js.map

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

@@ -69,15 +69,17 @@ class SpoFileRenameCommand extends SpoCommand_1.default {
         });
     }
     getFile(originalFileServerRelativeUrl, webUrl) {
-        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(originalFileServerRelativeUrl)}')?$select=UniqueId`;
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(originalFileServerRelativeUrl)}')?$select=UniqueId`;
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
     }
     deleteFile(webUrl, sourceUrl, targetFileName) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/m365/spo/commands/file/file-retentionlabel-ensure.js

@@ -84,7 +84,7 @@ class SpoFileRetentionLabelEnsureCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json'
             };
-            return yield request_1.default.get(requestOptions);
+            return request_1.default.get(requestOptions);
         });
     }
     applyAssetId(webUrl, listId, listItemId, assetId) {
@@ -99,7 +99,7 @@ class SpoFileRetentionLabelEnsureCommand extends SpoCommand_1.default {
                 data: requestBody,
                 responseType: 'json'
             };
-            yield request_1.default.post(requestOptions);
+            return request_1.default.post(requestOptions);
         });
     }
 }