@pnp/cli-microsoft365 6.0.0-beta.566a6b8 → 6.0.0-beta.636d726

package/dist/m365/spo/commands/list/list-label-set.js

@@ -16,7 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoListLabelSetCommand_instances, _SpoListLabelSetCommand_initTelemetry, _SpoListLabelSetCommand_initOptions, _SpoListLabelSetCommand_initValidators, _SpoListLabelSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListLabelSetCommand extends SpoCommand_1.default {
@@ -40,15 +42,15 @@ class SpoListLabelSetCommand extends SpoCommand_1.default {
                 let listRestUrl = '';
                 let listServerRelativeUrl = '';
                 if (args.options.listUrl) {
-                    const listServerRelativeUrlFromPath = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                    const listServerRelativeUrlFromPath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                     listServerRelativeUrl = listServerRelativeUrlFromPath;
                 }
                 else {
                     if (args.options.listId) {
-                        listRestUrl = `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+                        listRestUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
                     }
                     else {
-                        listRestUrl = `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
+                        listRestUrl = `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
                     }
                     const requestOptions = {
                         url: `${args.options.webUrl}/_api/web/${listRestUrl}?$expand=RootFolder&$select=RootFolder`,
@@ -60,7 +62,7 @@ class SpoListLabelSetCommand extends SpoCommand_1.default {
                     const listInstance = yield request_1.default.get(requestOptions);
                     listServerRelativeUrl = listInstance.RootFolder.ServerRelativeUrl;
                 }
-                const listAbsoluteUrl = utils_1.urlUtil.getAbsoluteUrl(args.options.webUrl, listServerRelativeUrl);
+                const listAbsoluteUrl = urlUtil_1.urlUtil.getAbsoluteUrl(args.options.webUrl, listServerRelativeUrl);
                 const requestUrl = `${args.options.webUrl}/_api/SP_CompliancePolicy_SPPolicyStoreProxy_SetListComplianceTag`;
                 const requestOptions = {
                     url: requestUrl,
@@ -115,10 +117,10 @@ _SpoListLabelSetCommand_instances = new WeakSet(), _SpoListLabelSetCommand_initT
     });
 }, _SpoListLabelSetCommand_initValidators = function _SpoListLabelSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoListLabelSetCommand_initOptionSets = function _SpoListLabelSetCommand_initOptionSets() {
     this.optionSets.push(['listId', 'listTitle', 'listUrl']);

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoListListCommand_instances, _SpoListListCommand_initOptions, _SpoListListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListListCommand extends SpoCommand_1.default {
@@ -66,7 +66,7 @@ _SpoListListCommand_instances = new WeakSet(), _SpoListListCommand_initOptions =
         option: '-u, --webUrl <webUrl>'
     });
 }, _SpoListListCommand_initValidators = function _SpoListListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new SpoListListCommand();
 //# sourceMappingURL=list-list.js.map

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListRemoveCommand_instances, _SpoListRemoveCommand_initTelemetry, _SpoListRemoveCommand_initOptions, _SpoListRemoveCommand_initValidators, _SpoListRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListRemoveCommand extends SpoCommand_1.default {
@@ -43,10 +44,10 @@ class SpoListRemoveCommand extends SpoCommand_1.default {
                 }
                 let requestUrl = '';
                 if (args.options.id) {
-                    requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
+                    requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
                 }
                 else {
-                    requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.title)}')`;
+                    requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`;
                 }
                 const requestOptions = {
                     url: requestUrl,
@@ -69,7 +70,7 @@ class SpoListRemoveCommand extends SpoCommand_1.default {
                 yield removeList();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -102,12 +103,12 @@ _SpoListRemoveCommand_instances = new WeakSet(), _SpoListRemoveCommand_initTelem
     });
 }, _SpoListRemoveCommand_initValidators = function _SpoListRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.id &&
-            !utils_1.validation.isValidGuid(args.options.id)) {
+            !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -15,9 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListRoleAssignmentAddCommand_instances, _SpoListRoleAssignmentAddCommand_initTelemetry, _SpoListRoleAssignmentAddCommand_initOptions, _SpoListRoleAssignmentAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const SpoUserGetCommand = require("../user/user-get");
@@ -45,26 +47,26 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
             try {
                 let requestUrl = `${args.options.webUrl}/_api/web/`;
                 if (args.options.listId) {
-                    requestUrl += `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+                    requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
                 }
                 else if (args.options.listTitle) {
-                    requestUrl += `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
+                    requestUrl += `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
                 }
                 else if (args.options.listUrl) {
-                    const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                    requestUrl += `GetList('${utils_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                    requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
                 }
-                args.options.roleDefinitionId = yield this.GetRoleDefinitionId(args.options);
+                args.options.roleDefinitionId = yield this.getRoleDefinitionId(args.options);
                 if (args.options.upn) {
-                    args.options.principalId = yield this.GetUserPrincipalId(args.options);
-                    yield this.AddRoleAssignment(requestUrl, logger, args.options);
+                    args.options.principalId = yield this.getUserPrincipalId(args.options);
+                    yield this.addRoleAssignment(requestUrl, logger, args.options);
                 }
                 else if (args.options.groupName) {
-                    args.options.principalId = yield this.GetGroupPrincipalId(args.options);
-                    this.AddRoleAssignment(requestUrl, logger, args.options);
+                    args.options.principalId = yield this.getGroupPrincipalId(args.options);
+                    yield this.addRoleAssignment(requestUrl, logger, args.options);
                 }
                 else {
-                    yield this.AddRoleAssignment(requestUrl, logger, args.options);
+                    yield this.addRoleAssignment(requestUrl, logger, args.options);
                 }
             }
             catch (err) {
@@ -72,7 +74,7 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
             }
         });
     }
-    AddRoleAssignment(requestUrl, logger, options) {
+    addRoleAssignment(requestUrl, logger, options) {
         const requestOptions = {
             url: `${requestUrl}roleassignments/addroleassignment(principalid='${options.principalId}',roledefid='${options.roleDefinitionId}')`,
             method: 'POST',
@@ -87,7 +89,7 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
             .then(_ => Promise.resolve())
             .catch((err) => Promise.reject(err));
     }
-    GetRoleDefinitionId(options) {
+    getRoleDefinitionId(options) {
         if (!options.roleDefinitionName) {
             return Promise.resolve(options.roleDefinitionId);
         }
@@ -97,7 +99,7 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(SpoRoleDefinitionListCommand, { options: Object.assign(Object.assign({}, roleDefinitionListCommandOptions), { _: [] }) })
+        return Cli_1.Cli.executeCommandWithOutput(SpoRoleDefinitionListCommand, { options: Object.assign(Object.assign({}, roleDefinitionListCommandOptions), { _: [] }) })
             .then((output) => {
             const getRoleDefinitionListOutput = JSON.parse(output.stdout);
             const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
@@ -106,7 +108,7 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
             return Promise.reject(err);
         });
     }
-    GetGroupPrincipalId(options) {
+    getGroupPrincipalId(options) {
         const groupGetCommandOptions = {
             webUrl: options.webUrl,
             name: options.groupName,
@@ -114,7 +116,7 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) })
+        return Cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) })
             .then((output) => {
             const getGroupOutput = JSON.parse(output.stdout);
             return Promise.resolve(getGroupOutput.Id);
@@ -122,7 +124,7 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
             return Promise.reject(err);
         });
     }
-    GetUserPrincipalId(options) {
+    getUserPrincipalId(options) {
         const userGetCommandOptions = {
             webUrl: options.webUrl,
             email: options.upn,
@@ -131,7 +133,7 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) })
+        return Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) })
             .then((output) => {
             const getUserOutput = JSON.parse(output.stdout);
             return Promise.resolve(getUserOutput.Id);
@@ -175,11 +177,11 @@ _SpoListRoleAssignmentAddCommand_instances = new WeakSet(), _SpoListRoleAssignme
     });
 }, _SpoListRoleAssignmentAddCommand_initValidators = function _SpoListRoleAssignmentAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         if (args.options.principalId && isNaN(args.options.principalId)) {

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

@@ -15,9 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListRoleAssignmentRemoveCommand_instances, _SpoListRoleAssignmentRemoveCommand_initTelemetry, _SpoListRoleAssignmentRemoveCommand_initOptions, _SpoListRoleAssignmentRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const SpoUserGetCommand = require("../user/user-get");
@@ -45,25 +47,25 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand_1.default {
                 try {
                     let requestUrl = `${args.options.webUrl}/_api/web/`;
                     if (args.options.listId) {
-                        requestUrl += `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+                        requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
                     }
                     else if (args.options.listTitle) {
-                        requestUrl += `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
+                        requestUrl += `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
                     }
                     else if (args.options.listUrl) {
-                        const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                        requestUrl += `GetList('${utils_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
+                        const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                        requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
                     }
                     if (args.options.upn) {
-                        args.options.principalId = yield this.GetUserPrincipalId(args.options);
-                        yield this.RemoveRoleAssignment(requestUrl, logger, args.options);
+                        args.options.principalId = yield this.getUserPrincipalId(args.options);
+                        yield this.removeRoleAssignment(requestUrl, logger, args.options);
                     }
                     else if (args.options.groupName) {
-                        args.options.principalId = yield this.GetGroupPrincipalId(args.options);
-                        yield this.RemoveRoleAssignment(requestUrl, logger, args.options);
+                        args.options.principalId = yield this.getGroupPrincipalId(args.options);
+                        yield this.removeRoleAssignment(requestUrl, logger, args.options);
                     }
                     else {
-                        yield this.RemoveRoleAssignment(requestUrl, logger, args.options);
+                        yield this.removeRoleAssignment(requestUrl, logger, args.options);
                     }
                 }
                 catch (err) {
@@ -74,7 +76,7 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand_1.default {
                 yield removeRoleAssignment();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -86,7 +88,7 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             }
         });
     }
-    RemoveRoleAssignment(requestUrl, logger, options) {
+    removeRoleAssignment(requestUrl, logger, options) {
         const requestOptions = {
             url: `${requestUrl}roleassignments/removeroleassignment(principalid='${options.principalId}')`,
             method: 'POST',
@@ -101,7 +103,7 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             .then(_ => Promise.resolve())
             .catch((err) => Promise.reject(err));
     }
-    GetGroupPrincipalId(options) {
+    getGroupPrincipalId(options) {
         const groupGetCommandOptions = {
             webUrl: options.webUrl,
             name: options.groupName,
@@ -109,7 +111,7 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) })
+        return Cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) })
             .then((output) => {
             const getGroupOutput = JSON.parse(output.stdout);
             return Promise.resolve(getGroupOutput.Id);
@@ -117,7 +119,7 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             return Promise.reject(err);
         });
     }
-    GetUserPrincipalId(options) {
+    getUserPrincipalId(options) {
         const userGetCommandOptions = {
             webUrl: options.webUrl,
             email: options.upn,
@@ -126,7 +128,7 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) })
+        return Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) })
             .then((output) => {
             const getUserOutput = JSON.parse(output.stdout);
             return Promise.resolve(getUserOutput.Id);
@@ -167,11 +169,11 @@ _SpoListRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListRoleAssig
     });
 }, _SpoListRoleAssignmentRemoveCommand_initValidators = function _SpoListRoleAssignmentRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         if (args.options.principalId && isNaN(args.options.principalId)) {

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

@@ -15,9 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListRoleInheritanceBreakCommand_instances, _SpoListRoleInheritanceBreakCommand_initTelemetry, _SpoListRoleInheritanceBreakCommand_initOptions, _SpoListRoleInheritanceBreakCommand_initValidators, _SpoListRoleInheritanceBreakCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListRoleInheritanceBreakCommand extends SpoCommand_1.default {
@@ -43,19 +45,23 @@ class SpoListRoleInheritanceBreakCommand extends SpoCommand_1.default {
             }
             const breakListRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    let requestUrl = `${args.options.webUrl}/_api/web/lists`;
+                    let requestUrl = `${args.options.webUrl}/_api/web/`;
                     if (args.options.listId) {
-                        requestUrl += `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                        requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
                     }
-                    else {
-                        requestUrl += `/getbytitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                    else if (args.options.listTitle) {
+                        requestUrl += `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
+                    }
+                    else if (args.options.listUrl) {
+                        const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                        requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
                     }
                     let keepExistingPermissions = true;
                     if (args.options.clearExistingPermissions) {
                         keepExistingPermissions = !args.options.clearExistingPermissions;
                     }
                     const requestOptions = {
-                        url: `${requestUrl}/breakroleinheritance(${keepExistingPermissions})`,
+                        url: `${requestUrl}breakroleinheritance(${keepExistingPermissions})`,
                         method: 'POST',
                         headers: {
                             'accept': 'application/json;odata=nometadata',
@@ -73,7 +79,7 @@ class SpoListRoleInheritanceBreakCommand extends SpoCommand_1.default {
                 yield breakListRoleInheritance();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -91,6 +97,7 @@ _SpoListRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListRoleInher
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             clearExistingPermissions: args.options.clearExistingPermissions === true,
             confirm: (!(!args.options.confirm)).toString()
         });
@@ -102,6 +109,8 @@ _SpoListRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListRoleInher
         option: '-i, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-c, --clearExistingPermissions'
     }, {
@@ -109,17 +118,17 @@ _SpoListRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListRoleInher
     });
 }, _SpoListRoleInheritanceBreakCommand_initValidators = function _SpoListRoleInheritanceBreakCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         return true;
     }));
 }, _SpoListRoleInheritanceBreakCommand_initOptionSets = function _SpoListRoleInheritanceBreakCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListRoleInheritanceBreakCommand();
 //# sourceMappingURL=list-roleinheritance-break.js.map

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

@@ -15,9 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListRoleInheritanceResetCommand_instances, _SpoListRoleInheritanceResetCommand_initTelemetry, _SpoListRoleInheritanceResetCommand_initOptions, _SpoListRoleInheritanceResetCommand_initValidators, _SpoListRoleInheritanceResetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListRoleInheritanceResetCommand extends SpoCommand_1.default {
@@ -43,15 +45,19 @@ class SpoListRoleInheritanceResetCommand extends SpoCommand_1.default {
             }
             const resetListRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    let requestUrl = `${args.options.webUrl}/_api/web/lists`;
+                    let requestUrl = `${args.options.webUrl}/_api/web/`;
                     if (args.options.listId) {
-                        requestUrl += `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                        requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
                     }
-                    else {
-                        requestUrl += `/getbytitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                    else if (args.options.listTitle) {
+                        requestUrl += `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
+                    }
+                    else if (args.options.listUrl) {
+                        const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                        requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
                     }
                     const requestOptions = {
-                        url: `${requestUrl}/resetroleinheritance`,
+                        url: `${requestUrl}resetroleinheritance`,
                         method: 'POST',
                         headers: {
                             'accept': 'application/json;odata=nometadata',
@@ -69,7 +75,7 @@ class SpoListRoleInheritanceResetCommand extends SpoCommand_1.default {
                 yield resetListRoleInheritance();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -87,6 +93,7 @@ _SpoListRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListRoleInher
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             confirm: (!(!args.options.confirm)).toString()
         });
     });
@@ -97,22 +104,24 @@ _SpoListRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListRoleInher
         option: '-i, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '--confirm'
     });
 }, _SpoListRoleInheritanceResetCommand_initValidators = function _SpoListRoleInheritanceResetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         return true;
     }));
 }, _SpoListRoleInheritanceResetCommand_initOptionSets = function _SpoListRoleInheritanceResetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListRoleInheritanceResetCommand();
 //# sourceMappingURL=list-roleinheritance-reset.js.map

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoListSetCommand_instances, _SpoListSetCommand_initTelemetry, _SpoListSetCommand_initOptions, _SpoListSetCommand_initValidators, _SpoListSetCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const DraftVisibilityType_1 = require("./DraftVisibilityType");
@@ -500,26 +500,26 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
     });
 }, _SpoListSetCommand_initValidators = function _SpoListSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         for (let i = 0; i < SpoListSetCommand.booleanOptions.length; i++) {
             const option = SpoListSetCommand.booleanOptions[i];
             const value = args.options[option];
-            if (value && !utils_1.validation.isValidBoolean(value)) {
+            if (value && !validation_1.validation.isValidBoolean(value)) {
                 return `${value} in option ${option} is not a valid boolean value`;
             }
         }
         if (args.options.templateFeatureId &&
-            !utils_1.validation.isValidGuid(args.options.templateFeatureId)) {
+            !validation_1.validation.isValidGuid(args.options.templateFeatureId)) {
             return `${args.options.templateFeatureId} in option templateFeatureId is not a valid GUID`;
         }
         if (args.options.defaultContentApprovalWorkflowId &&
-            !utils_1.validation.isValidGuid(args.options.defaultContentApprovalWorkflowId)) {
+            !validation_1.validation.isValidGuid(args.options.defaultContentApprovalWorkflowId)) {
             return `${args.options.defaultContentApprovalWorkflowId} in option defaultContentApprovalWorkflowId is not a valid GUID`;
         }
         if (args.options.direction &&

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

@@ -16,7 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoListSiteScriptGetCommand_instances, _SpoListSiteScriptGetCommand_initTelemetry, _SpoListSiteScriptGetCommand_initOptions, _SpoListSiteScriptGetCommand_initValidators, _SpoListSiteScriptGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListSiteScriptGetCommand extends SpoCommand_1.default {
@@ -46,13 +48,13 @@ class SpoListSiteScriptGetCommand extends SpoCommand_1.default {
                     if (this.debug) {
                         logger.logToStderr(`Retrieving List Url from Id '${args.options.listId}'...`);
                     }
-                    requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')?$expand=RootFolder`;
+                    requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')?$expand=RootFolder`;
                 }
                 else {
                     if (this.debug) {
                         logger.logToStderr(`Retrieving List Url from Title '${args.options.listTitle}'...`);
                     }
-                    requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')?$expand=RootFolder`;
+                    requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')?$expand=RootFolder`;
                 }
                 let requestOptions = {
                     url: requestUrl,
@@ -62,7 +64,7 @@ class SpoListSiteScriptGetCommand extends SpoCommand_1.default {
                     responseType: 'json'
                 };
                 const listInstance = yield request_1.default.get(requestOptions);
-                const listAbsoluteUrl = utils_1.urlUtil.getAbsoluteUrl(args.options.webUrl, listInstance.RootFolder.ServerRelativeUrl);
+                const listAbsoluteUrl = urlUtil_1.urlUtil.getAbsoluteUrl(args.options.webUrl, listInstance.RootFolder.ServerRelativeUrl);
                 requestUrl = `${args.options.webUrl}/_api/Microsoft_SharePoint_Utilities_WebTemplateExtensions_SiteScriptUtility_GetSiteScriptFromList`;
                 requestOptions = {
                     url: requestUrl,
@@ -105,12 +107,12 @@ _SpoListSiteScriptGetCommand_instances = new WeakSet(), _SpoListSiteScriptGetCom
     });
 }, _SpoListSiteScriptGetCommand_initValidators = function _SpoListSiteScriptGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.listId) {
-            if (!utils_1.validation.isValidGuid(args.options.listId)) {
+            if (!validation_1.validation.isValidGuid(args.options.listId)) {
                 return `${args.options.listId} is not a valid GUID`;
             }
         }