@pnp/cli-microsoft365 6.8.0-beta.e41be56 → 6.8.0

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) => {

package/dist/m365/spo/commands/list/list-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 _SpoListListCommand_instances, _SpoListListCommand_initOptions, _SpoListListCommand_initValidators;
+var _SpoListListCommand_instances, _SpoListListCommand_initOptions, _SpoListListCommand_initValidators, _SpoListListCommand_initTelemetry;
 Object.defineProperty(exports, "__esModule", { value: true });
 const odata_1 = require("../../../../utils/odata");
 const validation_1 = require("../../../../utils/validation");
@@ -34,6 +34,7 @@ class SpoListListCommand extends SpoCommand_1.default {
         _SpoListListCommand_instances.add(this);
         __classPrivateFieldGet(this, _SpoListListCommand_instances, "m", _SpoListListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListListCommand_instances, "m", _SpoListListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListListCommand_instances, "m", _SpoListListCommand_initTelemetry).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -41,7 +42,12 @@ class SpoListListCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Retrieving all lists in site at ${args.options.webUrl}...`);
             }
             try {
-                const listInstances = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/web/lists?$expand=RootFolder&$select=RootFolder/ServerRelativeUrl,*`);
+                const fieldProperties = this.formatSelectProperties(args.options.properties);
+                const queryParams = [`$expand=${fieldProperties.expandProperties.join(',')}`, `$select=${fieldProperties.selectProperties.join(',')}`];
+                if (args.options.filter) {
+                    queryParams.push(`$filter=${args.options.filter}`);
+                }
+                const listInstances = yield odata_1.odata.getAllItems(`${args.options.webUrl}/_api/web/lists?${queryParams.join('&')}`);
                 listInstances.forEach(l => {
                     l.Url = l.RootFolder.ServerRelativeUrl;
                 });
@@ -52,13 +58,44 @@ class SpoListListCommand extends SpoCommand_1.default {
             }
         });
     }
+    formatSelectProperties(fields) {
+        const selectProperties = ['RootFolder/ServerRelativeUrl'];
+        const expandProperties = ['RootFolder'];
+        if (!fields) {
+            selectProperties.push('*');
+        }
+        if (fields) {
+            fields.split(',').forEach((field) => {
+                const subparts = field.trim().split('/');
+                if (subparts.length > 1) {
+                    expandProperties.push(subparts[0]);
+                }
+                selectProperties.push(field.trim());
+            });
+        }
+        return {
+            selectProperties: [...new Set(selectProperties)],
+            expandProperties: [...new Set(expandProperties)]
+        };
+    }
 }
 _SpoListListCommand_instances = new WeakSet(), _SpoListListCommand_initOptions = function _SpoListListCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-p, --properties [properties]'
+    }, {
+        option: '-f, --filter [filter]'
     });
 }, _SpoListListCommand_initValidators = function _SpoListListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+}, _SpoListListCommand_initTelemetry = function _SpoListListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            properties: typeof args.options.properties !== 'undefined',
+            filter: typeof args.options.filter !== 'undefined'
+        });
+    });
 };
 module.exports = new SpoListListCommand();
 //# sourceMappingURL=list-list.js.map