@pnp/cli-microsoft365 6.8.0-beta.c5c3c32 → 6.8.0-beta.c74eb4b

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

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

@@ -43,8 +43,8 @@ class SpoTermAddCommand extends SpoCommand_1.default {
             let term;
             let formDigest;
             try {
-                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
-                const res = yield spo_1.spo.getRequestDigest(spoAdminUrl);
+                const spoWebUrl = args.options.webUrl ? args.options.webUrl : yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield spo_1.spo.getRequestDigest(spoWebUrl);
                 formDigest = res.FormDigestValue;
                 if (this.verbose) {
                     logger.logToStderr(`Adding taxonomy term...`);
@@ -58,7 +58,7 @@ class SpoTermAddCommand extends SpoCommand_1.default {
                 const termId = args.options.id || (0, uuid_1.v4)();
                 const data = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><ObjectIdentityQuery Id="5" ObjectPathId="3" /><ObjectPath Id="7" ObjectPathId="6" /><ObjectIdentityQuery Id="8" ObjectPathId="6" /><ObjectPath Id="10" ObjectPathId="9" /><ObjectPath Id="12" ObjectPathId="11" /><ObjectIdentityQuery Id="13" ObjectPathId="11" /><ObjectPath Id="15" ObjectPathId="14" /><ObjectPath Id="17" ObjectPathId="16" /><ObjectIdentityQuery Id="18" ObjectPathId="16" /><ObjectPath Id="20" ObjectPathId="19" /><ObjectIdentityQuery Id="21" ObjectPathId="19" /><Query Id="22" ObjectPathId="19"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><StaticMethod Id="3" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="6" ParentId="3" Name="GetDefaultSiteCollectionTermStore" /><Property Id="9" ParentId="6" Name="Groups" />${termGroupQuery}<Property Id="14" ParentId="11" Name="TermSets" />${termParentQuery}<Method Id="19" ParentId="16" Name="CreateTerm"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.name)}</Parameter><Parameter Type="Int32">1033</Parameter><Parameter Type="Guid">{${termId}}</Parameter></Parameters></Method></ObjectPaths></Request>`;
                 const requestOptionsPost = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    url: `${spoWebUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': res.FormDigestValue
                     },
@@ -108,7 +108,7 @@ class SpoTermAddCommand extends SpoCommand_1.default {
                         break;
                     }
                     const requestOptions = {
-                        url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                        url: `${spoWebUrl}/_vti_bin/client.svc/ProcessQuery`,
                         headers: {
                             'X-RequestDigest': formDigest
                         },
@@ -139,6 +139,7 @@ class SpoTermAddCommand extends SpoCommand_1.default {
 _SpoTermAddCommand_instances = new WeakSet(), _SpoTermAddCommand_initTelemetry = function _SpoTermAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            webUrl: typeof args.options.webUrl !== 'undefined',
             customProperties: typeof args.options.customProperties !== 'undefined',
             description: typeof args.options.description !== 'undefined',
             id: typeof args.options.id !== 'undefined',
@@ -153,6 +154,8 @@ _SpoTermAddCommand_instances = new WeakSet(), _SpoTermAddCommand_initTelemetry =
 }, _SpoTermAddCommand_initOptions = function _SpoTermAddCommand_initOptions() {
     this.options.unshift({
         option: '-n, --name <name>'
+    }, {
+        option: '-u, --webUrl [webUrl]'
     }, {
         option: '--termSetId [termSetId]'
     }, {
@@ -174,6 +177,12 @@ _SpoTermAddCommand_instances = new WeakSet(), _SpoTermAddCommand_initTelemetry =
     });
 }, _SpoTermAddCommand_initValidators = function _SpoTermAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.webUrl) {
+            const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+            if (isValidSharePointUrl !== true) {
+                return isValidSharePointUrl;
+            }
+        }
         if (args.options.id) {
             if (!validation_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;

package/dist/m365/spo/commands/term/term-group-get.js

@@ -40,14 +40,14 @@ class SpoTermGroupGetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
-                const res = yield spo_1.spo.getRequestDigest(spoAdminUrl);
+                const spoWebUrl = args.options.webUrl ? args.options.webUrl : yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield spo_1.spo.getRequestDigest(spoWebUrl);
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving taxonomy term groups...`);
                 }
                 const query = args.options.id ? `<Method Id="32" ParentId="30" Name="GetById"><Parameters><Parameter Type="Guid">{${formatting_1.formatting.escapeXml(args.options.id)}}</Parameter></Parameters></Method>` : `<Method Id="32" ParentId="30" Name="GetByName"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.name)}</Parameter></Parameters></Method>`;
                 const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    url: `${spoWebUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': res.FormDigestValue
                     },
@@ -76,18 +76,27 @@ class SpoTermGroupGetCommand extends SpoCommand_1.default {
 _SpoTermGroupGetCommand_instances = new WeakSet(), _SpoTermGroupGetCommand_initTelemetry = function _SpoTermGroupGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            webUrl: typeof args.options.webUrl !== 'undefined',
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined'
         });
     });
 }, _SpoTermGroupGetCommand_initOptions = function _SpoTermGroupGetCommand_initOptions() {
     this.options.unshift({
+        option: '-u, --webUrl [webUrl]'
+    }, {
         option: '-i, --id [id]'
     }, {
         option: '-n, --name [name]'
     });
 }, _SpoTermGroupGetCommand_initValidators = function _SpoTermGroupGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.webUrl) {
+            const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+            if (isValidSharePointUrl !== true) {
+                return isValidSharePointUrl;
+            }
+        }
         if (args.options.id) {
             if (!validation_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;

package/dist/m365/spo/commands/term/term-set-add.js

@@ -43,8 +43,8 @@ class SpoTermSetAddCommand extends SpoCommand_1.default {
             let formDigest = '';
             let termSet;
             try {
-                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
-                const res = yield spo_1.spo.getRequestDigest(spoAdminUrl);
+                const spoWebUrl = args.options.webUrl ? args.options.webUrl : yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield spo_1.spo.getRequestDigest(spoWebUrl);
                 formDigest = res.FormDigestValue;
                 if (this.verbose) {
                     logger.logToStderr(`Adding taxonomy term set...`);
@@ -54,7 +54,7 @@ class SpoTermSetAddCommand extends SpoCommand_1.default {
                     `<Method Id="42" ParentId="40" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>`;
                 const termSetId = args.options.id || (0, uuid_1.v4)();
                 const requestOptionsQuery = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    url: `${spoWebUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': res.FormDigestValue
                     },
@@ -96,7 +96,7 @@ class SpoTermSetAddCommand extends SpoCommand_1.default {
                         termSet.CustomProperties = customProperties;
                     }
                     const requestOptions = {
-                        url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                        url: `${spoWebUrl}/_vti_bin/client.svc/ProcessQuery`,
                         headers: {
                             'X-RequestDigest': formDigest
                         },
@@ -127,6 +127,7 @@ class SpoTermSetAddCommand extends SpoCommand_1.default {
 _SpoTermSetAddCommand_instances = new WeakSet(), _SpoTermSetAddCommand_initTelemetry = function _SpoTermSetAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            webUrl: typeof args.options.webUrl !== 'undefined',
             customProperties: typeof args.options.customProperties !== 'undefined',
             description: typeof args.options.description !== 'undefined',
             id: typeof args.options.id !== 'undefined',
@@ -137,6 +138,8 @@ _SpoTermSetAddCommand_instances = new WeakSet(), _SpoTermSetAddCommand_initTelem
 }, _SpoTermSetAddCommand_initOptions = function _SpoTermSetAddCommand_initOptions() {
     this.options.unshift({
         option: '-n, --name <name>'
+    }, {
+        option: '-u, --webUrl [webUrl]'
     }, {
         option: '--termGroupId [termGroupId]'
     }, {
@@ -150,6 +153,12 @@ _SpoTermSetAddCommand_instances = new WeakSet(), _SpoTermSetAddCommand_initTelem
     });
 }, _SpoTermSetAddCommand_initValidators = function _SpoTermSetAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.webUrl) {
+            const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+            if (isValidSharePointUrl !== true) {
+                return isValidSharePointUrl;
+            }
+        }
         if (args.options.id) {
             if (!validation_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;

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

@@ -43,14 +43,14 @@ class SpoTermSetListCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
-                const res = yield spo_1.spo.getRequestDigest(spoAdminUrl);
+                const spoWebUrl = args.options.webUrl ? args.options.webUrl : yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield spo_1.spo.getRequestDigest(spoWebUrl);
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving taxonomy term sets...`);
                 }
                 const query = args.options.termGroupId ? `<Method Id="62" ParentId="60" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="62" ParentId="60" Name="GetByName"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
                 const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    url: `${spoWebUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': res.FormDigestValue
                     },
@@ -82,18 +82,27 @@ class SpoTermSetListCommand extends SpoCommand_1.default {
 _SpoTermSetListCommand_instances = new WeakSet(), _SpoTermSetListCommand_initTelemetry = function _SpoTermSetListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            webUrl: typeof args.options.webUrl !== 'undefined',
             termGroupId: typeof args.options.termGroupId !== 'undefined',
             termGroupName: typeof args.options.termGroupName !== 'undefined'
         });
     });
 }, _SpoTermSetListCommand_initOptions = function _SpoTermSetListCommand_initOptions() {
     this.options.unshift({
+        option: '-u, --webUrl [webUrl]'
+    }, {
         option: '--termGroupId [termGroupId]'
     }, {
         option: '--termGroupName [termGroupName]'
     });
 }, _SpoTermSetListCommand_initValidators = function _SpoTermSetListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.webUrl) {
+            const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+            if (isValidSharePointUrl !== true) {
+                return isValidSharePointUrl;
+            }
+        }
         if (args.options.termGroupId) {
             if (!validation_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;

package/docs/docs/cmd/spo/list/list-get.md

@@ -30,6 +30,10 @@ m365 spo list get [options]
 
 --8<-- "docs/cmd/_global.md"
 
+## Remarks
+
+When the `properties` option includes values with a `/`, for example: `ListItemAllFields/Id`, an additional `$expand` query parameter will be included on `ListItemAllFields`.
+
 ## Examples
 
 Get information about a list with specified ID located in the specified site.
@@ -62,6 +66,12 @@ Get information about a list returning the specified list properties.
 m365 spo list get --title Documents --webUrl https://contoso.sharepoint.com/sites/project-x --properties "Title,Id,HasUniqueRoleAssignments,AllowContentTypes"
 ```
 
+Get information about a list returning the list Id, Title and ServerRelativeUrl properties.
+
+```sh
+m365 spo list get --title Documents --webUrl https://contoso.sharepoint.com/sites/project-x --properties "Title,Id,RootFolder/ServerRelativeUrl"
+```
+
 Get information about a list along with the roles and permissions.
 
 ```sh

package/docs/docs/cmd/spo/list/list-list.md

@@ -13,8 +13,18 @@ m365 spo list list [options]
 `-u, --webUrl <webUrl>`
 : URL of the site where the lists to retrieve are located.
 
+`-p, --properties [properties]`
+: Comma-separated list of properties to retrieve. Will retrieve all properties if not specified.
+
+`-f, --filter [filter]`
+: OData filter to use to query the lists with.
+
 --8<-- "docs/cmd/_global.md"
 
+## Remarks
+
+When the `--properties` option includes values with a `/`, for example: `RootFolder/ServerRelativeUrl`, an additional `$expand` query parameter should be included on `RootFolder`.
+
 ## Examples
 
 Return all lists located in in a specific site.
@@ -23,6 +33,24 @@ Return all lists located in in a specific site.
 m365 spo list list --webUrl https://contoso.sharepoint.com/sites/project-x
 ```
 
+Return all lists located in in a specific site with specific properties.
+
+```sh
+m365 spo list list --webUrl https://contoso.sharepoint.com/sites/project-x --properties "BaseTemplate,ParentWebUrl"
+```
+
+Return all lists located in in a specific site with the Id, Title and ServerRelativeUrl properties.
+
+```sh
+m365 spo list list --webUrl https://contoso.sharepoint.com/sites/project-x --properties "Id,Title,RootFolder/ServerRelativeUrl"
+```
+
+Return all lists located in in a specific site based on the given filter.
+
+```sh
+m365 spo list list --webUrl https://contoso.sharepoint.com/sites/project-x --filter "BaseTemplate eq 100"
+```
+
 ## More information
 
 - List REST API resources: [https://msdn.microsoft.com/en-us/library/office/dn531433.aspx#bk_ListEndpoint](https://msdn.microsoft.com/en-us/library/office/dn531433.aspx#bk_ListEndpoint)

package/docs/docs/cmd/spo/term/term-add.md

@@ -13,6 +13,9 @@ m365 spo term add [options]
 `-n, --name <name>`
 : Name of the term to add
 
+`-u, --webUrl [webUrl]`
+: If specified, allows you to add a term to the tenant term store as well as the sitecollection specific term store. Defaults to the tenant admin site.
+
 `--termSetId [termSetId]`
 : ID of the term set in which to create the term. Specify `termSetId` or `termSetName` but not both
 
@@ -48,36 +51,134 @@ m365 spo term add [options]
     When using the `--customProperties` and/or `--localCustomProperties` options it's possible to enter a JSON string. In PowerShell 5 to 7.2 [specific escaping rules](./../../../user-guide/using-cli.md#escaping-double-quotes-in-powershell) apply due to an issue. Remember that you can also use [file tokens](./../../../user-guide/using-cli.md#passing-complex-content-into-cli-options) instead.
 
 !!! important
-    To use this command you have to have permissions to access the tenant admin site.
+    To use this command without the `--webUrl` option you have to have permissions to access the tenant admin site.
+
+When using the `--webUrl` option you can connect to the term store with limited permissions, and do not need the SharePoint Administrator role. It allows you to add a term to a term set in the tenant term store if you are listed as a term store administrator. It allows you to add terms to a term set in the sitecollection term store if you are a site owner.
 
 ## Examples
 
-Add taxonomy term with the specified name to the term group and term set specified by their names
+Add taxonomy term with the specified name to the term group and term set specified by their names.
 
 ```sh
 m365 spo term add --name IT --termSetName Department --termGroupName People
 ```
 
-Add taxonomy term with the specified name to the term group and term set specified by their IDs
+Add taxonomy term with the specified name to the term group and term set specified by their IDs.
 
 ```sh
 m365 spo term add --name IT --termSetId 8ed8c9ea-7052-4c1d-a4d7-b9c10bffea6f --termGroupId 5c928151-c140-4d48-aab9-54da901c7fef
 ```
 
-Add taxonomy term with the specified name and ID
+Add taxonomy term with the specified name and ID.
 
 ```sh
 m365 spo term add --name IT --id 5c928151-c140-4d48-aab9-54da901c7fef --termSetName Department --termGroupName People
 ```
 
-Add taxonomy term with custom properties
+Add taxonomy term to the specified sitecollection with the specified name and ID.
+
+```sh
+m365 spo term add --name IT --id 5c928151-c140-4d48-aab9-54da901c7fef --termSetName Department --termGroupName People --webUrl https://contoso.sharepoint.com/sites/project-x
+```
+
+Add taxonomy term with custom properties.
 
 ```sh
 m365 spo term add --name IT --termSetName Department --termGroupName People --customProperties '{"Property": "Value"}'
 ```
 
-Add taxonomy term below the specified term
+Add taxonomy term below the specified term.
 
 ```sh
 m365 spo term add --name IT --parentTermId 5c928151-c140-4d48-aab9-54da901c7fef --termGroupName People
 ```
+
+## Response
+
+=== "JSON"
+
+    ```json
+    {
+      "CreatedDate": "2023-05-10T06:21:33.873Z",
+      "Id": "346f49b0-3d1c-4ed3-b590-df303294cc16",
+      "LastModifiedDate": "2023-05-10T06:21:33.873Z",
+      "Name": "IT",
+      "CustomProperties": {},
+      "CustomSortOrder": null,
+      "IsAvailableForTagging": true,
+      "Owner": "i:0#.f|membership|john.doe@contoso.onmicrosoft.com",
+      "Description": "",
+      "IsDeprecated": false,
+      "IsKeyword": false,
+      "IsPinned": false,
+      "IsPinnedRoot": false,
+      "IsReused": false,
+      "IsRoot": true,
+      "IsSourceTerm": true,
+      "LocalCustomProperties": {},
+      "MergedTermIds": [],
+      "PathOfTerm": "IT",
+      "TermsCount": 0
+    }
+    ```
+
+=== "Text"
+
+    ```text
+    CreatedDate          : 2023-05-10T06:22:34.686Z
+    CustomProperties     : {}
+    CustomSortOrder      : null
+    Description          :
+    Id                   : 53156df9-5485-4724-9f4f-6670a3d41f88
+    IsAvailableForTagging: true
+    IsDeprecated         : false
+    IsKeyword            : false
+    IsPinned             : false
+    IsPinnedRoot         : false
+    IsReused             : false
+    IsRoot               : true
+    IsSourceTerm         : true
+    LastModifiedDate     : 2023-05-10T06:22:34.686Z
+    LocalCustomProperties: {}
+    MergedTermIds        : []
+    Name                 : IT
+    Owner                : i:0#.f|membership|john.doe@contoso.onmicrosoft.com
+    PathOfTerm           : IT
+    TermsCount           : 0
+    ```
+
+=== "CSV"
+
+    ```csv
+    CreatedDate,Id,LastModifiedDate,Name,IsAvailableForTagging,Owner,Description,IsDeprecated,IsKeyword,IsPinned,IsPinnedRoot,IsReused,IsRoot,IsSourceTerm,PathOfTerm,TermsCount
+    2023-05-10T06:23:13.490Z,0f1e0630-9f45-42d1-a64e-e82fe76826da,2023-05-10T06:23:13.490Z,IT,1,i:0#.f|membership|john.doe@contoso.onmicrosoft.com,,,,,,,1,1,IT,0
+    ```
+
+=== "Markdown"
+
+    ```md
+    # spo term add --termGroupName "People" --termSetName "Department" --name "IT"
+
+    Date: 5/10/2023
+
+    ## IT (6e72d493-000d-4517-aa3e-2afb3a3d4bc8)
+
+    Property | Value
+    ---------|-------
+    CreatedDate | 2023-05-10T06:23:49.970Z
+    Id | 6e72d493-000d-4517-aa3e-2afb3a3d4bc8
+    LastModifiedDate | 2023-05-10T06:23:49.970Z
+    Name | IT
+    IsAvailableForTagging | true
+    Owner | i:0#.f\|membership\|john.doe@contoso.onmicrosoft.com
+    Description |
+    IsDeprecated | false
+    IsKeyword | false
+    IsPinned | false
+    IsPinnedRoot | false
+    IsReused | false
+    IsRoot | true
+    IsSourceTerm | true
+    PathOfTerm | IT
+    TermsCount | 0
+    ```

package/docs/docs/cmd/spo/term/term-get.md

@@ -40,7 +40,7 @@ When retrieving term by its ID, it's sufficient to specify just the ID. When ret
 !!! important
     To use this command without the --webUrl option you have to have permissions to access the tenant admin site.
     
-When using the `--webUrl` option you can connect to the term store with limited permissions, and do not need the SharePoint Adminstrator role. You need to be a site visitor or more. It allows you to get a term from the tenant term store as well as a term from the sitecollection term store.
+When using the `--webUrl` option you can connect to the term store with limited permissions, and do not need the SharePoint Administrator role. You need to be a site visitor or more. It allows you to get a term from the tenant term store as well as a term from the sitecollection term store.
 
 ## Examples
 

package/docs/docs/cmd/spo/term/term-group-get.md

@@ -10,29 +10,95 @@ m365 spo term group get [options]
 
 ## Options
 
+`-u, --webUrl [webUrl]`
+: If specified, allows you to get a term group from the tenant term store as well as the sitecollection specific term store. Defaults to the tenant admin site.
+
 `-i, --id [id]`
-: ID of the term group to retrieve. Specify `name` or `id` but not both
+: ID of the term group to retrieve. Specify `name` or `id` but not both.
 
 `-n, --name [name]`
-: Name of the term group to retrieve. Specify `name` or `id` but not both
+: Name of the term group to retrieve. Specify `name` or `id` but not both.
 
 --8<-- "docs/cmd/_global.md"
 
 ## Remarks
 
 !!! important
-    To use this command you have to have permissions to access the tenant admin site.
+    To use this command without the `--webUrl` option you have to have permissions to access the tenant admin site.
+
+When using the `--webUrl` option you can connect to the term store with limited permissions, and do not need the SharePoint Administrator role. You need to be a site visitor or more. It allows you to get a term group from the tenant term store as well as a term group from the sitecollection term store.
 
 ## Examples
 
-Get information about a taxonomy term group using its ID
+Get information about a taxonomy term group using its ID.
 
 ```sh
 m365 spo term group get --id 0e8f395e-ff58-4d45-9ff7-e331ab728beb
 ```
 
-Get information about a taxonomy term group using its name
+Get information about a taxonomy term group using its name.
 
 ```sh
 m365 spo term group get --name PnPTermSets
 ```
+
+Get information about a taxonomy term group from the specified sitecollection using its ID.
+
+```sh
+m365 spo term group get --id 0e8f395e-ff58-4d45-9ff7-e331ab728beb --webUrl https://contoso.sharepoint.com/sites/project-x
+```
+
+## Response
+
+=== "JSON"
+
+    ```json
+    {
+      "CreatedDate": "2019-09-03T06:41:32.070Z",
+      "Id": "0e8f395e-ff58-4d45-9ff7-e331ab728beb",
+      "LastModifiedDate": "2019-09-03T06:41:32.070Z",
+      "Name": "PnPTermSets",
+      "Description": "",
+      "IsSiteCollectionGroup": false,
+      "IsSystemGroup": false
+    }
+    ```
+
+=== "Text"
+
+    ```text
+    CreatedDate          : 2019-09-03T06:41:32.070Z
+    Description          :
+    Id                   : 0e8f395e-ff58-4d45-9ff7-e331ab728beb
+    IsSiteCollectionGroup: false
+    IsSystemGroup        : false
+    LastModifiedDate     : 2019-09-03T06:41:32.070Z
+    Name                 : PnPTermSets
+    ```
+
+=== "CSV"
+
+    ```csv
+    CreatedDate,Id,LastModifiedDate,Name,Description,IsSiteCollectionGroup,IsSystemGroup
+    2019-09-03T06:41:32.070Z,0e8f395e-ff58-4d45-9ff7-e331ab728beb,2019-09-03T06:41:32.070Z,PnPTermSets,,,
+    ```
+
+=== "Markdown"
+
+    ```md
+    # spo term group get --id "0e8f395e-ff58-4d45-9ff7-e331ab728beb"
+
+    Date: 5/14/2023
+
+    ## PnPTermSets (0e8f395e-ff58-4d45-9ff7-e331ab728beb)
+
+    Property | Value
+    ---------|-------
+    CreatedDate | 2019-09-03T06:41:32.070Z
+    Id | 0e8f395e-ff58-4d45-9ff7-e331ab728beb
+    LastModifiedDate | 2019-09-03T06:41:32.070Z
+    Name | PnPTermSets
+    Description |
+    IsSiteCollectionGroup | false
+    IsSystemGroup | false
+    ```

package/docs/docs/cmd/spo/term/term-group-list.md

@@ -20,7 +20,7 @@ m365 spo term group list [options]
 !!! important
     To use this command without the --webUrl option you have to have permissions to access the tenant admin site.
 
-When using the `--webUrl` option you can connect to the term store with limited permissions, and do not need the SharePoint Adminstrator role. You need to be a site visitor or more. It allows you to list term groups from the tenant term store as well as term groups from the sitecollection term store.
+When using the `--webUrl` option you can connect to the term store with limited permissions, and do not need the SharePoint Administrator role. You need to be a site visitor or more. It allows you to list term groups from the tenant term store as well as term groups from the sitecollection term store.
 
 ## Examples
 

package/docs/docs/cmd/spo/term/term-list.md

@@ -35,7 +35,7 @@ m365 spo term list [options]
 !!! important
     To use this command without the --webUrl option you have to have permissions to access the tenant admin site.
 
-When using the `--webUrl` option you can connect to the term store with limited permissions, and do not need the SharePoint Adminstrator role. You need to be a site visitor or more. It allows you to list terms from the tenant term store as well as terms from the sitecollection term store.
+When using the `--webUrl` option you can connect to the term store with limited permissions, and do not need the SharePoint Administrator role. You need to be a site visitor or more. It allows you to list terms from the tenant term store as well as terms from the sitecollection term store.
 
 ## Examples
 

package/docs/docs/cmd/spo/term/term-set-add.md

@@ -11,22 +11,25 @@ m365 spo term set add [options]
 ## Options
 
 `-n, --name <name>`
-: Name of the term set to add
+: Name of the term set to add.
+
+`-u, --webUrl [webUrl]`
+: If specified, allows you to add a term set to the tenant term store as well as the sitecollection specific term store. Defaults to the tenant admin site.
 
 `--termGroupId [termGroupId]`
-: ID of the term group in which to create the term set. Specify `termGroupId` or `termGroupName` but not both
+: ID of the term group in which to create the term set. Specify `termGroupId` or `termGroupName` but not both.
 
 `--termGroupName [termGroupName]`
-: Name of the term group in which to create the term set. Specify `termGroupId` or `termGroupName` but not both
+: Name of the term group in which to create the term set. Specify `termGroupId` or `termGroupName` but not both.
 
 `-i, --id [id]`
-: ID of the term set to add
+: ID of the term set to add.
 
 `-d, --description [description]`
-: Description of the term set to add
+: Description of the term set to add.
 
 `--customProperties [customProperties]`
-: JSON string with key-value pairs representing custom properties to set on the term set
+: JSON string with key-value pairs representing custom properties to set on the term set.
 
 --8<-- "docs/cmd/_global.md"
 
@@ -36,30 +39,111 @@ m365 spo term set add [options]
     When using the `--customProperties` option it's possible to enter a JSON string. In PowerShell 5 to 7.2 [specific escaping rules](./../../../user-guide/using-cli.md#escaping-double-quotes-in-powershell) apply due to an issue. Remember that you can also use [file tokens](./../../../user-guide/using-cli.md#passing-complex-content-into-cli-options) instead.
 
 !!! important
-    To use this command you have to have permissions to access the tenant admin site.
+    To use this command without the `--webUrl` option you have to have permissions to access the tenant admin site.
+
+When using the `--webUrl` option you can connect to the term store with limited permissions, and do not need the SharePoint Administrator role. You need to be a site visitor or more. It allows you to add a term set to a term group in the tenant term store if you are listed as a term store administrator. It allows you to add a term set to a term group in the sitecollection term store if you are a site owner.
 
 ## Examples
 
-Add taxonomy term set to the term group specified by ID
+Add taxonomy term set to the term group specified by ID.
 
 ```sh
 m365 spo term set add --name PnP-Organizations --termGroupId 0e8f395e-ff58-4d45-9ff7-e331ab728beb
 ```
 
-Add taxonomy term set to the term group specified by name. Create the term set with the specified ID
+Add taxonomy term set to the specified sitecollection's term group specified by ID.
+
+```sh
+m365 spo term set add --name PnP-Organizations --termGroupId 0e8f395e-ff58-4d45-9ff7-e331ab728beb --webUrl https://contoso.sharepoint.com/sites/project-x
+```
+
+Add taxonomy term set to the term group specified by name. Create the term set with the specified ID.
 
 ```sh
 m365 spo term set add --name PnP-Organizations --termGroupName PnPTermSets --id aa70ede6-83d1-466d-8d95-30d29e9bbd7c
 ```
 
-Add taxonomy term set and set its description
+Add taxonomy term set and set its description.
 
 ```sh
 m365 spo term set add --name PnP-Organizations --termGroupId 0e8f395e-ff58-4d45-9ff7-e331ab728beb --description 'Contains a list of organizations'
 ```
 
-Add taxonomy term set and set its custom properties
+Add taxonomy term set and set its custom properties.
 
 ```sh
 m365 spo term set add --name PnP-Organizations --termGroupId 0e8f395e-ff58-4d45-9ff7-e331ab728beb --customProperties '{"Property":"Value"}'
 ```
+
+## Response
+
+### Standard response
+
+=== "JSON"
+
+    ```json
+    {
+      "CreatedDate": "2023-05-14T10:28:31.041Z",
+      "Id": "c28cfcd2-0705-4b7b-b8e6-ba2fb107e5ec",
+      "LastModifiedDate": "2023-05-14T10:28:31.041Z",
+      "Name": "PnP-Organizations",
+      "CustomProperties": {},
+      "CustomSortOrder": null,
+      "IsAvailableForTagging": true,
+      "Owner": "i:0#.f|membership|john.doe@contoso.com",
+      "Contact": "",
+      "Description": "",
+      "IsOpenForTermCreation": false,
+      "Names": {
+        "1033": "PnP-Organizations"
+      },
+      "Stakeholders": []
+    }
+    ```
+
+=== "Text"
+
+    ```text
+    Contact              :
+    CreatedDate          : 2023-05-14T10:30:41.018Z
+    CustomProperties     : {}
+    CustomSortOrder      : null
+    Description          :
+    Id                   : 41102744-9f7b-448b-a265-3bbe3db5c064
+    IsAvailableForTagging: true
+    IsOpenForTermCreation: false
+    LastModifiedDate     : 2023-05-14T10:30:41.018Z
+    Name                 : PnP-Organizations
+    Names                : {"1033":"PnP-Organizations"}
+    Owner                : i:0#.f|membership|john.doe@contoso.com
+    Stakeholders         : []
+    ```
+
+=== "CSV"
+
+    ```csv
+    CreatedDate,Id,LastModifiedDate,Name,IsAvailableForTagging,Owner,Contact,Description,IsOpenForTermCreation
+    2023-05-14T10:31:11.299Z,8f212d7d-eeb3-454b-811a-01b38fea56e1,2023-05-14T10:31:11.299Z,PnP-Organizations,1,i:0#.f|membership|john.doe@contoso.com,,,
+    ```
+
+=== "Markdown"
+
+    ```md
+    # spo term set add --name "PnP-Organizations" --termGroupId "0e8f395e-ff58-4d45-9ff7-e331ab728beb"
+
+    Date: 5/14/2023
+
+    ## PnP-Organizations (73824553-d254-44ef-ac0f-61926b65e925)
+
+    Property | Value
+    ---------|-------
+    CreatedDate | 2023-05-14T10:31:42.422Z
+    Id | 73824553-d254-44ef-ac0f-61926b65e925
+    LastModifiedDate | 2023-05-14T10:31:42.422Z
+    Name | PnP-Organizations
+    IsAvailableForTagging | true
+    Owner | i:0#.f\|membership\|john.doe@contoso.com
+    Contact |
+    Description |
+    IsOpenForTermCreation | false
+    ```

package/docs/docs/cmd/spo/term/term-set-get.md

@@ -32,7 +32,7 @@ m365 spo term set get [options]
 !!! important
     To use this command without the --webUrl option you have to have permissions to access the tenant admin site.
 
-When using the `--webUrl` option you can connect to the term store with limited permissions, and do not need the SharePoint Adminstrator role. You need to be a site visitor or more. It allows you to get a term set from the tenant term store as well as a term set from the sitecollection term store.
+When using the `--webUrl` option you can connect to the term store with limited permissions, and do not need the SharePoint Administrator role. You need to be a site visitor or more. It allows you to get a term set from the tenant term store as well as a term set from the sitecollection term store.
 
 ## Examples
 

package/docs/docs/cmd/spo/term/term-set-list.md

@@ -10,29 +10,109 @@ m365 spo term set list [options]
 
 ## Options
 
+`-u, --webUrl [webUrl]`
+: If specified, allows you to list term sets from the tenant term store as well as the sitecollection specific term store. Defaults to the tenant admin site.
+
 `--termGroupId [termGroupId]`
-: ID of the term group from which to retrieve term sets. Specify `termGroupName` or `termGroupId` but not both
+: ID of the term group from which to retrieve term sets. Specify `termGroupName` or `termGroupId` but not both.
 
 `--termGroupName [termGroupName]`
-: Name of the term group from which to retrieve term sets. Specify `termGroupName` or `termGroupId` but not both
+: Name of the term group from which to retrieve term sets. Specify `termGroupName` or `termGroupId` but not both.
 
 --8<-- "docs/cmd/_global.md"
 
 ## Remarks
 
 !!! important
-    To use this command you have to have permissions to access the tenant admin site.
+    To use this command without the --webUrl option you have to have permissions to access the tenant admin site.
+
+When using the `--webUrl` option you can connect to the term store with limited permissions, and do not need the SharePoint Administrator role. You need to be a site visitor or more. It allows you to list term sets from the tenant term store as well as term sets from the sitecollection term store.
 
 ## Examples
 
-List taxonomy term sets from the term group with the given name
+List taxonomy term sets from the term group with the given name.
 
 ```sh
 m365 spo term set list --termGroupName PnPTermSets
 ```
 
-List taxonomy term sets from the term group with the given ID
+List taxonomy term sets from the term group with the given ID.
 
 ```sh
 m365 spo term set list --termGroupId 0e8f395e-ff58-4d45-9ff7-e331ab728beb
 ```
+
+List taxonomy term sets from the specified sitecollection, from the term group with the given name.
+
+```sh
+m365 spo term set list --termGroupName PnPTermSets --webUrl https://contoso.sharepoint.com/sites/project-x
+```
+
+## Response
+
+=== "JSON"
+
+    ```json
+    [
+      {
+        "_ObjectType_": "SP.Taxonomy.TermSet",
+        "_ObjectIdentity_": "676eb2a0-80e7-2000-3976-610eb3f5a91e|fec14c62-7c3b-481b-851b-c80d7802b224:se:aCf0Cz4D9UOS7+b/OlUY5XrNqUp10tpPhLK4MIXc7g/qydiOUnAdTKTXucEL/+pv",
+        "CreatedDate": "2019-09-03T06:41:32.110Z",
+        "Id": "8ed8c9ea-7052-4c1d-a4d7-b9c10bffea6f",
+        "LastModifiedDate": "2019-09-03T06:41:32.260Z",
+        "Name": "Department",
+        "CustomProperties": {
+          "SearchCenterNavVer": "15"
+        },
+        "CustomSortOrder": null,
+        "IsAvailableForTagging": true,
+        "Owner": "",
+        "Contact": "",
+        "Description": "",
+        "IsOpenForTermCreation": true,
+        "Names": {
+          "1033": "Department"
+        },
+        "Stakeholders": []
+      }
+    ]
+    ```
+
+=== "Text"
+
+    ```text
+    Id                                    Name
+    ------------------------------------  ----------
+    8ed8c9ea-7052-4c1d-a4d7-b9c10bffea6f  Department
+    ```
+
+=== "CSV"
+
+    ```csv
+    _ObjectType_,_ObjectIdentity_,CreatedDate,Id,LastModifiedDate,Name,IsAvailableForTagging,Owner,Contact,Description,IsOpenForTermCreation
+    SP.Taxonomy.TermSet,7c6eb2a0-20fe-2000-47f1-69774ac909f5|fec14c62-7c3b-481b-851b-c80d7802b224:se:aCf0Cz4D9UOS7+b/OlUY5XrNqUp10tpPhLK4MIXc7g/qydiOUnAdTKTXucEL/+pv,2019-09-03T06:41:32.110Z,8ed8c9ea-7052-4c1d-a4d7-b9c10bffea6f,2019-09-03T06:41:32.260Z,Department,1,,,,1
+    ```
+
+=== "Markdown"
+
+    ```md
+    # spo term set list --termGroupName "PnPTermSets"
+
+    Date: 5/13/2023
+
+    ## Department (8ed8c9ea-7052-4c1d-a4d7-b9c10bffea6f)
+
+    Property | Value
+    ---------|-------
+    \_ObjectType\_ | SP.Taxonomy.TermSet
+    \_ObjectIdentity\_ | 826eb2a0-405f-2000-41be-bfe56d4cdc73\|fec14c62-7c3b-481b-851b-c80d7802b224:se:aCf0Cz4D9UOS7+b/OlUY5XrNqUp10tpPhLK4MIXc7g/qydiOUnAdTKTXucEL/+pv
+    CreatedDate | 2019-09-03T06:41:32.110Z
+    Id | 8ed8c9ea-7052-4c1d-a4d7-b9c10bffea6f
+    LastModifiedDate | 2019-09-03T06:41:32.260Z
+    Name | Department
+    IsAvailableForTagging | true
+    Owner |
+    Contact |
+    Description |
+    IsOpenForTermCreation | true
+    ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "6.8.0-beta.c5c3c32",
+  "version": "6.8.0-beta.c74eb4b",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",