@pnp/cli-microsoft365 6.8.0-beta.62006d7 → 6.8.0-beta.85a1ca9

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

@@ -17,6 +17,7 @@ var _SpoFileCheckoutCommand_instances, _SpoFileCheckoutCommand_initTelemetry, _S
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
@@ -35,6 +36,9 @@ class SpoFileCheckoutCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFileCheckoutCommand_instances, "m", _SpoFileCheckoutCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoFileCheckoutCommand_instances, "m", _SpoFileCheckoutCommand_initOptionSets).call(this);
     }
+    getExcludedOptionsWithUrls() {
+        return ['url'];
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             let requestUrl = '';
@@ -42,7 +46,8 @@ class SpoFileCheckoutCommand extends SpoCommand_1.default {
                 requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/checkout`;
             }
             if (args.options.url) {
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.url)}')/checkout`;
+                const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/checkout`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -63,8 +68,8 @@ class SpoFileCheckoutCommand extends SpoCommand_1.default {
 _SpoFileCheckoutCommand_instances = new WeakSet(), _SpoFileCheckoutCommand_initTelemetry = function _SpoFileCheckoutCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            url: (!(!args.options.url)).toString()
+            id: typeof args.options.id !== 'undefined',
+            url: typeof args.options.url !== 'undefined'
         });
     });
 }, _SpoFileCheckoutCommand_initOptions = function _SpoFileCheckoutCommand_initOptions() {

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

@@ -38,10 +38,7 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                if (this.verbose) {
-                    logger.logToStderr(`Copying file '${args.options.sourceUrl}' to '${args.options.targetUrl}'...`);
-                }
-                const sourcePath = this.getAbsoluteUrl(args.options.webUrl, args.options.sourceUrl);
+                const sourcePath = this.getAbsoluteUrl(args.options.webUrl, urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.sourceUrl));
                 let destinationPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl) + '/';
                 if (args.options.newName) {
                     destinationPath += args.options.newName;
@@ -50,6 +47,9 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
                     // Keep the original file name
                     destinationPath += sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
                 }
+                if (this.verbose) {
+                    logger.logToStderr(`Copying file '${sourcePath}' to '${destinationPath}'...`);
+                }
                 const requestOptions = {
                     url: `${args.options.webUrl}/_api/SP.MoveCopyUtil.CopyFileByPath`,
                     headers: {

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

@@ -19,6 +19,7 @@ const fs = require("fs");
 const path = require("path");
 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");
@@ -66,7 +67,8 @@ class SpoFileGetCommand extends SpoCommand_1.default {
                 else {
                     options += '&';
                 }
-                options += `@f='${formatting_1.formatting.encodeQueryParameter(args.options.url)}'`;
+                const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                options += `@f='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}'`;
             }
             const requestOptions = {
                 url: requestUrl + options,

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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoFileListCommand_instances, _SpoFileListCommand_initTelemetry, _SpoFileListCommand_initOptions, _SpoFileListCommand_initValidators;
+var _SpoFileListCommand_instances, _SpoFileListCommand_initTelemetry, _SpoFileListCommand_initOptions, _SpoFileListCommand_initValidators, _SpoFileListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
@@ -34,6 +34,7 @@ class SpoFileListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFileListCommand_instances, "m", _SpoFileListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFileListCommand_instances, "m", _SpoFileListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFileListCommand_instances, "m", _SpoFileListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileListCommand_instances, "m", _SpoFileListCommand_initOptionSets).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -41,11 +42,15 @@ class SpoFileListCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Retrieving all files in folder '${args.options.folder}' at site '${args.options.webUrl}'${args.options.recursive ? ' (recursive)' : ''}...`);
             }
             try {
+                if (args.options.folder) {
+                    args.options.folderUrl = args.options.folder;
+                    this.warn(logger, `Option 'folder' is deprecated. Please use 'folderUrl' instead`);
+                }
                 const fieldProperties = this.formatSelectProperties(args.options.fields, args.options.output);
                 const allFiles = [];
                 const allFolders = args.options.recursive
-                    ? [...yield this.getFolders(args.options.folder, args, logger), args.options.folder]
-                    : [args.options.folder];
+                    ? [...yield this.getFolders(args.options.folderUrl, args, logger), args.options.folderUrl]
+                    : [args.options.folderUrl];
                 for (const folder of allFolders) {
                     const files = yield this.getFiles(folder, fieldProperties, args, logger);
                     files.forEach((file) => allFiles.push(file));
@@ -69,8 +74,8 @@ class SpoFileListCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Retrieving files in folder '${folderUrl}'${page > 1 ? ', page ' + page : ''}...`);
             }
             const allFiles = [];
-            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, folderUrl);
-            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl(@url)/Files?@url='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}'`;
+            const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, folderUrl);
+            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl(@url)/Files?@url='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}'`;
             const queryParams = [`$skip=${skip}`, `$top=${SpoFileListCommand.pageSize}`];
             if (fieldProperties.expandProperties.length > 0) {
                 queryParams.push(`$expand=${fieldProperties.expandProperties.join(',')}`);
@@ -152,6 +157,8 @@ class SpoFileListCommand extends SpoCommand_1.default {
 _SpoFileListCommand_instances = new WeakSet(), _SpoFileListCommand_initTelemetry = function _SpoFileListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            folder: typeof args.options.folder !== 'undefined',
+            folderUrl: typeof args.options.folderUrl !== 'undefined',
             recursive: args.options.recursive,
             fields: typeof args.options.fields !== 'undefined',
             filter: typeof args.options.filter !== 'undefined'
@@ -161,7 +168,9 @@ _SpoFileListCommand_instances = new WeakSet(), _SpoFileListCommand_initTelemetry
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folder <folder>'
+        option: '-f, --folder [folder]'
+    }, {
+        option: '-f, --folderUrl [folderUrl]'
     }, {
         option: '--fields [fields]'
     }, {
@@ -171,6 +180,8 @@ _SpoFileListCommand_instances = new WeakSet(), _SpoFileListCommand_initTelemetry
     });
 }, _SpoFileListCommand_initValidators = function _SpoFileListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+}, _SpoFileListCommand_initOptionSets = function _SpoFileListCommand_initOptionSets() {
+    this.optionSets.push({ options: ['folder', 'folderUrl'] });
 };
 SpoFileListCommand.pageSize = 5000;
 module.exports = new SpoFileListCommand();

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

@@ -40,7 +40,7 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initValidators).call(this);
     }
     getExcludedOptionsWithUrls() {
-        return ['targetUrl'];
+        return ['targetUrl', 'sourceUrl'];
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -48,6 +48,7 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
             const parsedUrl = url.parse(webUrl);
             const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
             try {
+                const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(webUrl, args.options.sourceUrl);
                 // Check if the source file exists.
                 // Called on purpose, we explicitly check if user specified file
                 // in the sourceUrl option.
@@ -55,14 +56,14 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
                 // A user might enter folder instead of file as source url by mistake
                 // then there are edge cases when deleteIfAlreadyExists flag is set
                 // the user can receive misleading error message.
-                yield this.fileExists(tenantUrl, webUrl, args.options.sourceUrl);
+                yield this.fileExists(webUrl, serverRelativePath);
                 if (args.options.deleteIfAlreadyExists) {
                     // try delete target file, if deleteIfAlreadyExists flag is set
                     const filename = args.options.sourceUrl.replace(/^.*[\\\/]/, '');
                     yield this.recycleFile(tenantUrl, args.options.targetUrl, filename, logger);
                 }
                 // all preconditions met, now create copy job
-                const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
+                const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(tenantUrl, serverRelativePath);
                 const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
                 const requestUrl = urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
                 const requestOptions = {
@@ -107,10 +108,8 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
     /**
      * Checks if a file exists on the server relative url
      */
-    fileExists(tenantUrl, webUrl, sourceUrl) {
-        const webServerRelativeUrl = webUrl.replace(tenantUrl, '');
-        const fileServerRelativeUrl = `${webServerRelativeUrl}${sourceUrl}`;
-        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(fileServerRelativeUrl)}')/`;
+    fileExists(webUrl, sourceUrl) {
+        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(sourceUrl)}')/`;
         const requestOptions = {
             url: requestUrl,
             method: 'GET',

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

@@ -18,6 +18,7 @@ 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");
@@ -28,6 +29,9 @@ class SpoFileRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes the specified file';
     }
+    alias() {
+        return [commands_1.default.PAGE_TEMPLATE_REMOVE];
+    }
     constructor() {
         super();
         _SpoFileRemoveCommand_instances.add(this);
@@ -50,18 +54,8 @@ class SpoFileRemoveCommand extends SpoCommand_1.default {
                     requestUrl = `${args.options.webUrl}/_api/web/GetFileById(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
                 }
                 else {
-                    // concatenate trailing '/' if not provided
-                    // so if the provided url is for the root site, the substr bellow will get the right value
-                    let serverRelativeSiteUrl = args.options.webUrl;
-                    if (!serverRelativeSiteUrl.endsWith('/')) {
-                        serverRelativeSiteUrl = `${serverRelativeSiteUrl}/`;
-                    }
-                    serverRelativeSiteUrl = serverRelativeSiteUrl.substr(serverRelativeSiteUrl.indexOf('/', 8));
-                    let fileUrl = args.options.url;
-                    if (!fileUrl.startsWith(serverRelativeSiteUrl)) {
-                        fileUrl = `${serverRelativeSiteUrl}${fileUrl}`;
-                    }
-                    requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(fileUrl)}')`;
+                    const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                    requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')`;
                 }
                 if (args.options.recycle) {
                     requestUrl += `/recycle()`;

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

@@ -40,9 +40,9 @@ class SpoFileRenameCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const webUrl = args.options.webUrl;
-            const originalFileServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.sourceUrl);
+            const originalFileServerRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.sourceUrl);
             try {
-                yield this.getFile(originalFileServerRelativeUrl, webUrl);
+                yield this.getFile(originalFileServerRelativePath, webUrl);
                 if (args.options.force) {
                     yield this.deleteFile(webUrl, args.options.sourceUrl, args.options.targetFileName);
                 }
@@ -53,7 +53,7 @@ class SpoFileRenameCommand extends SpoCommand_1.default {
                         }]
                 };
                 const requestOptions = {
-                    url: `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(originalFileServerRelativeUrl)}')/ListItemAllFields/ValidateUpdateListItem()`,
+                    url: `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(originalFileServerRelativePath)}')/ListItemAllFields/ValidateUpdateListItem()`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },

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

@@ -25,6 +25,7 @@ const validation_1 = require("../../../../utils/validation");
 const formatting_1 = require("../../../../utils/formatting");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 class SpoFileRoleAssignmentAddCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.FILE_ROLEASSIGNMENT_ADD;
@@ -148,7 +149,7 @@ class SpoFileRoleAssignmentAddCommand extends SpoCommand_1.default {
     getFileURL(args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (args.options.fileUrl) {
-                return args.options.fileUrl;
+                return urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
             }
             const options = {
                 webUrl: args.options.webUrl,

package/dist/m365/spo/commands/file/file-roleassignment-remove.js

@@ -55,9 +55,9 @@ class SpoFileRoleAssignmentRemoveCommand extends SpoCommand_1.default {
                     else {
                         principalId = args.options.principalId;
                     }
-                    const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, fileURL);
+                    const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, fileURL);
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields/roleassignments/removeroleassignment(principalid='${principalId}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/ListItemAllFields/roleassignments/removeroleassignment(principalid='${principalId}')`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         },
@@ -88,7 +88,7 @@ class SpoFileRoleAssignmentRemoveCommand extends SpoCommand_1.default {
     getFileURL(args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (args.options.fileUrl) {
-                return args.options.fileUrl;
+                return urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
             }
             const options = {
                 webUrl: args.options.webUrl,

package/dist/m365/spo/commands/file/file-roleinheritance-break.js

@@ -22,6 +22,7 @@ const formatting_1 = require("../../../../utils/formatting");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const SpoFileGetCommand = require("./file-get");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 class SpoFileRoleInheritanceBreakCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.FILE_ROLEINHERITANCE_BREAK;
@@ -75,7 +76,7 @@ class SpoFileRoleInheritanceBreakCommand extends SpoCommand_1.default {
     getFileURL(args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (args.options.fileUrl) {
-                return args.options.fileUrl;
+                return urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
             }
             const options = {
                 webUrl: args.options.webUrl,

package/dist/m365/spo/commands/file/file-roleinheritance-reset.js

@@ -22,6 +22,7 @@ const formatting_1 = require("../../../../utils/formatting");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const SpoFileGetCommand = require("./file-get");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 class SpoFileRoleInheritanceResetCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.FILE_ROLEINHERITANCE_RESET;
@@ -74,7 +75,7 @@ class SpoFileRoleInheritanceResetCommand extends SpoCommand_1.default {
     getFileURL(args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (args.options.fileUrl) {
-                return args.options.fileUrl;
+                return urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
             }
             const options = {
                 webUrl: args.options.webUrl,

package/dist/m365/spo/commands/file/file-sharinginfo-get.js

@@ -18,6 +18,7 @@ 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");
@@ -95,10 +96,11 @@ class SpoFileSharingInfoGetCommand extends SpoCommand_1.default {
     getNeededFileInformation(args) {
         let requestUrl = '';
         if (args.options.fileId) {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${escape(args.options.fileId)}')/?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
+            requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${args.options.fileId}')/?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
         }
         else {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(decodedUrl='${formatting_1.formatting.encodeQueryParameter(args.options.fileUrl)}')?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
+            const serverRelPath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
+            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(decodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelPath)}')?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
         }
         const requestOptions = {
             url: requestUrl,

package/dist/m365/spo/commands/file/file-version-clear.js

@@ -18,6 +18,7 @@ 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");
@@ -66,7 +67,8 @@ class SpoFileVersionClearCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             let requestUrl = `${args.options.webUrl}/_api/web/`;
             if (args.options.fileUrl) {
-                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.fileUrl)}')/versions/DeleteAll()`;
+                const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
+                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/versions/DeleteAll()`;
             }
             else {
                 requestUrl += `GetFileById('${args.options.fileId}')/versions/DeleteAll()`;

package/dist/m365/spo/commands/file/file-version-get.js

@@ -17,6 +17,7 @@ var _SpoFileVersionGetCommand_instances, _SpoFileVersionGetCommand_initTelemetry
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
@@ -54,7 +55,8 @@ class SpoFileVersionGetCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             let requestUrl = `${args.options.webUrl}/_api/web/`;
             if (args.options.fileUrl) {
-                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.fileUrl)}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;
+                const serverRelUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
+                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelUrl)}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;
             }
             else {
                 requestUrl += `GetFileById('${args.options.fileId}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;

package/dist/m365/spo/commands/file/file-version-remove.js

@@ -18,6 +18,7 @@ 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");
@@ -67,7 +68,8 @@ class SpoFileVersionRemoveCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             let requestUrl = `${args.options.webUrl}/_api/web/`;
             if (args.options.fileUrl) {
-                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.fileUrl)}')/versions/DeleteByLabel('${args.options.label}')`;
+                const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
+                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/versions/DeleteByLabel('${args.options.label}')`;
             }
             else {
                 requestUrl += `GetFileById('${args.options.fileId}')/versions/DeleteByLabel('${args.options.label}')`;

package/dist/m365/spo/commands/file/file-version-restore.js

@@ -18,6 +18,7 @@ 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");
@@ -67,7 +68,8 @@ class SpoFileVersionRestoreCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             let requestUrl = `${args.options.webUrl}/_api/web/`;
             if (args.options.fileUrl) {
-                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.fileUrl)}')/versions/RestoreByLabel('${args.options.label}')`;
+                const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
+                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/versions/RestoreByLabel('${args.options.label}')`;
             }
             else {
                 requestUrl += `GetFileById('${args.options.fileId}')/versions/RestoreByLabel('${args.options.label}')`;

package/dist/m365/spo/commands/folder/folder-copy.js

@@ -37,18 +37,18 @@ class SpoFolderCopyCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initValidators).call(this);
     }
     getExcludedOptionsWithUrls() {
-        return ['targetUrl'];
+        return ['targetUrl', 'sourceUrl'];
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const webUrl = args.options.webUrl;
             const parsedUrl = url.parse(webUrl);
             const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
-            const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
+            const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(webUrl, args.options.sourceUrl);
+            const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(tenantUrl, serverRelativePath);
             const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-            const requestUrl = urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
             const requestOptions = {
-                url: requestUrl,
+                url: urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs'),
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },

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

@@ -38,6 +38,9 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initOptionSets).call(this);
     }
+    getExcludedOptionsWithUrls() {
+        return ['url'];
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
@@ -48,8 +51,8 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
                 requestUrl += `/GetFolderById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
             }
             else if (args.options.url) {
-                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-                requestUrl += `/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+                const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                requestUrl += `/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')`;
             }
             if (args.options.withPermissions) {
                 requestUrl += `?$expand=ListItemAllFields/HasUniqueRoleAssignments,ListItemAllFields/RoleAssignments/Member,ListItemAllFields/RoleAssignments/RoleDefinitionBindings`;

package/dist/m365/spo/commands/folder/folder-move.js

@@ -37,14 +37,15 @@ class SpoFolderMoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFolderMoveCommand_instances, "m", _SpoFolderMoveCommand_initValidators).call(this);
     }
     getExcludedOptionsWithUrls() {
-        return ['targetUrl'];
+        return ['targetUrl', 'sourceUrl'];
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const webUrl = args.options.webUrl;
             const parsedUrl = url.parse(webUrl);
             const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
-            const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
+            const sourceRelUrl = urlUtil_1.urlUtil.getServerRelativePath(webUrl, args.options.sourceUrl);
+            const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(tenantUrl, sourceRelUrl);
             const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
             const requestUrl = urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
             const requestOptions = {

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

@@ -35,6 +35,9 @@ class SpoFolderRenameCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFolderRenameCommand_instances, "m", _SpoFolderRenameCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderRenameCommand_instances, "m", _SpoFolderRenameCommand_initValidators).call(this);
     }
+    getExcludedOptionsWithUrls() {
+        return ['url'];
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -45,8 +48,8 @@ class SpoFolderRenameCommand extends SpoCommand_1.default {
                 if (this.verbose) {
                     logger.logToStderr(`Renaming folder ${args.options.url} to ${args.options.name}`);
                 }
-                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-                const serverRelativeUrlWithoutOldFolder = serverRelativeUrl.substring(0, serverRelativeUrl.lastIndexOf('/'));
+                const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                const serverRelativeUrlWithoutOldFolder = serverRelativePath.substring(0, serverRelativePath.lastIndexOf('/'));
                 const renamedServerRelativeUrl = `${serverRelativeUrlWithoutOldFolder}/${args.options.name}`;
                 const requestOptions = {
                     url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,

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

@@ -53,10 +53,17 @@ class SpoListGetCommand extends SpoCommand_1.default {
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
                 requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
             }
-            let propertiesSelect = args.options.properties ? `?$select=${formatting_1.formatting.encodeQueryParameter(args.options.properties)}` : ``;
-            propertiesSelect += args.options.withPermissions ? `${args.options.properties ? '&' : '?'}$expand=HasUniqueRoleAssignments,RoleAssignments/Member,RoleAssignments/RoleDefinitionBindings` : ``;
+            const fieldsProperties = this.formatSelectProperties(args.options.properties, args.options.withPermissions);
+            const queryParams = [];
+            if (fieldsProperties.selectProperties.length > 0) {
+                queryParams.push(`$select=${fieldsProperties.selectProperties.join(',')}`);
+            }
+            if (fieldsProperties.expandProperties.length > 0) {
+                queryParams.push(`$expand=${fieldsProperties.expandProperties.join(',')}`);
+            }
+            const querystring = queryParams.length > 0 ? `?${queryParams.join('&')}` : ``;
             const requestOptions = {
-                url: requestUrl + propertiesSelect,
+                url: `${requestUrl}${querystring}`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -76,6 +83,26 @@ class SpoListGetCommand extends SpoCommand_1.default {
             }
         });
     }
+    formatSelectProperties(properties, withPermissions) {
+        const selectProperties = [];
+        let expandProperties = [];
+        if (withPermissions) {
+            expandProperties = ['HasUniqueRoleAssignments', 'RoleAssignments/Member', 'RoleAssignments/RoleDefinitionBindings'];
+        }
+        if (properties) {
+            properties.split(',').forEach((property) => {
+                const subparts = property.trim().split('/');
+                if (subparts.length > 1) {
+                    expandProperties.push(subparts[0]);
+                }
+                selectProperties.push(property.trim());
+            });
+        }
+        return {
+            selectProperties: [...new Set(selectProperties)],
+            expandProperties: [...new Set(expandProperties)]
+        };
+    }
 }
 _SpoListGetCommand_instances = new WeakSet(), _SpoListGetCommand_initTelemetry = function _SpoListGetCommand_initTelemetry() {
     this.telemetry.push((args) => {