@pnp/cli-microsoft365 6.5.0-beta.33bab12 → 6.5.0-beta.ccd8e85

package/.eslintrc.js

@@ -10,6 +10,7 @@ const dictionary = [
   'application',
   'apply',
   'approve',
+  'assessment',
   'assets',
   'audit',
   'bin',
@@ -84,6 +85,7 @@ const dictionary = [
   'storage',
   'table',
   'teams',
+  'threat',
   'token',
   'type',
   'user',

package/dist/Command.js

@@ -458,9 +458,18 @@ class Command {
             // replace unescaped newlines with escaped newlines #2807
             .replace(/([^\\])\\n/g, '$1\\\\\\n');
     }
-    getCsvOutput(logStatement) {
+    getCsvOutput(logStatement, options) {
         const { stringify } = require('csv-stringify/sync');
         const cli = Cli_1.Cli.getInstance();
+        if (logStatement && logStatement.length > 0 && !options.query) {
+            logStatement.map(l => {
+                for (const x of Object.keys(l)) {
+                    if (typeof l[x] === 'object') {
+                        delete l[x];
+                    }
+                }
+            });
+        }
         // https://csv.js.org/stringify/options/
         return stringify(logStatement, {
             header: cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.csvHeader, true),
@@ -494,13 +503,14 @@ class Command {
                     output.push(`## ${id}`, os.EOL, os.EOL);
                 }
                 output.push(`Property | Value`, os.EOL, `---------|-------`, os.EOL);
-                output.push(Object.keys(l).map(k => {
-                    const value = l[k];
-                    let stringValue = value;
-                    if (typeof value === 'object') {
-                        stringValue = JSON.stringify(value);
+                output.push(Object.keys(l).filter(x => {
+                    if (!options.query && typeof l[x] === 'object') {
+                        return;
                     }
-                    return `${md_1.md.escapeMd(k)} | ${md_1.md.escapeMd(stringValue)}`;
+                    return x;
+                }).map(k => {
+                    const value = l[k];
+                    return `${md_1.md.escapeMd(k)} | ${md_1.md.escapeMd(value)}`;
                 }).join(os.EOL), os.EOL);
                 output.push(os.EOL);
             });

package/dist/cli/Cli.js

@@ -158,9 +158,10 @@ class Cli {
             const cli = Cli.getInstance();
             const parentCommandName = cli.currentCommandName;
             cli.currentCommandName = command.getCommandName(cli.currentCommandName);
+            const showSpinner = cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.showSpinner, true);
             // don't show spinner if running tests
             /* c8 ignore next 3 */
-            if (typeof global.it === 'undefined') {
+            if (showSpinner && typeof global.it === 'undefined') {
                 cli.spinner.start();
             }
             try {
@@ -529,7 +530,7 @@ class Cli {
         }
         switch (options.output) {
             case 'csv':
-                return command.getCsvOutput(logStatement);
+                return command.getCsvOutput(logStatement, options);
             case 'md':
                 return command.getMdOutput(logStatement, command, options);
             default:
@@ -756,9 +757,10 @@ class Cli {
         /* c8 ignore next */
     }
     static log(message, ...optionalParams) {
+        const cli = Cli.getInstance();
         /* c8 ignore next 3 */
-        if (Cli.getInstance().spinner.isSpinning) {
-            Cli.getInstance().spinner.stop();
+        if (cli.spinner.isSpinning) {
+            cli.spinner.stop();
         }
         if (message) {
             console.log(message, ...optionalParams);
@@ -768,11 +770,12 @@ class Cli {
         }
     }
     static error(message, ...optionalParams) {
+        const cli = Cli.getInstance();
         /* c8 ignore next 3 */
-        if (Cli.getInstance().spinner.isSpinning) {
-            Cli.getInstance().spinner.stop();
+        if (cli.spinner.isSpinning) {
+            cli.spinner.stop();
         }
-        const errorOutput = Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.errorOutput, 'stderr');
+        const errorOutput = cli.getSettingWithDefaultValue(settingsNames_1.settingsNames.errorOutput, 'stderr');
         if (errorOutput === 'stdout') {
             console.log(message, ...optionalParams);
         }
@@ -783,16 +786,17 @@ class Cli {
     static prompt(options) {
         return __awaiter(this, void 0, void 0, function* () {
             const inquirer = require('inquirer');
-            const spinnerSpinning = Cli.getInstance().spinner.isSpinning;
+            const cli = Cli.getInstance();
+            const spinnerSpinning = cli.spinner.isSpinning;
             /* c8 ignore next 3 */
             if (spinnerSpinning) {
-                Cli.getInstance().spinner.stop();
+                cli.spinner.stop();
             }
             const response = yield inquirer.prompt(options);
             // Restart the spinner if it was running before the prompt
             /* c8 ignore next 3 */
             if (spinnerSpinning) {
-                Cli.getInstance().spinner.start();
+                cli.spinner.start();
             }
             return response;
         });
@@ -822,7 +826,7 @@ class Cli {
         });
     }
     static shouldTrimOutput(output) {
-        return output === 'text' || output === 'csv';
+        return output === 'text';
     }
 }
 exports.Cli = Cli;

package/dist/m365/cli/commands/config/config-set.js

@@ -46,6 +46,7 @@ class CliConfigSetCommand extends AnonymousCommand_1.default {
                 case settingsNames_1.settingsNames.printErrorsAsPlainText:
                 case settingsNames_1.settingsNames.prompt:
                 case settingsNames_1.settingsNames.showHelpOnFailure:
+                case settingsNames_1.settingsNames.showSpinner:
                     value = args.options.value === 'true';
                     break;
                 default:

package/dist/m365/pa/commands/app/app-export.js

@@ -0,0 +1,197 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PaAppExportCommand_instances, _PaAppExportCommand_initTelemetry, _PaAppExportCommand_initOptions, _PaAppExportCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const validation_1 = require("../../../../utils/validation");
+const commands_1 = require("../../commands");
+const fs = require("fs");
+const path = require("path");
+const formatting_1 = require("../../../../utils/formatting");
+const request_1 = require("../../../../request");
+const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
+class PaAppExportCommand extends PowerPlatformCommand_1.default {
+    get name() {
+        return commands_1.default.APP_EXPORT;
+    }
+    get description() {
+        return 'Exports the specified Power App';
+    }
+    constructor() {
+        super();
+        _PaAppExportCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const location = yield this.exportPackage(args, logger);
+                const packageLink = yield this.getPackageLink(args, logger, location);
+                //Replace all illegal characters from the file name
+                const illegalCharsRegEx = /[\\\/:*?"<>|]/g;
+                const filename = args.options.packageDisplayName.replace(illegalCharsRegEx, '_');
+                const requestOptions = {
+                    url: packageLink,
+                    // Set responseType to arraybuffer, otherwise binary data will be encoded
+                    // to utf8 and binary data is corrupt
+                    responseType: 'arraybuffer',
+                    headers: {
+                        'x-anonymous': true
+                    }
+                };
+                const file = yield request_1.default.get(requestOptions);
+                let path = args.options.path || './';
+                if (!path.endsWith('/')) {
+                    path += '/';
+                }
+                path += `${filename}.zip`;
+                fs.writeFileSync(path, file, 'binary');
+                if (this.verbose) {
+                    logger.logToStderr(`File saved to path '${path}'`);
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getPackageResources(args, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Getting the Microsoft Power App resources...');
+            }
+            const requestOptions = {
+                url: `${this.resource}/providers/Microsoft.BusinessAppPlatform/environments/${formatting_1.formatting.encodeQueryParameter(args.options.environment)}/listPackageResources?api-version=2016-11-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                data: {
+                    baseResourceIds: [
+                        `/providers/Microsoft.PowerApps/apps/${args.options.id}`
+                    ]
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.post(requestOptions);
+            Object.keys(response.resources).forEach((key) => {
+                response.resources[key].suggestedCreationType = 'Update';
+            });
+            return response.resources;
+        });
+    }
+    exportPackage(args, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Initiating package export for Microsoft Power App ${args.options.id}...`);
+            }
+            const resources = yield this.getPackageResources(args, logger);
+            const requestOptions = {
+                url: `${this.resource}/providers/Microsoft.BusinessAppPlatform/environments/${formatting_1.formatting.encodeQueryParameter(args.options.environment)}/exportPackage?api-version=2016-11-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json',
+                data: {
+                    includedResourceIds: [
+                        `/providers/Microsoft.PowerApps/apps/${args.options.id}`
+                    ],
+                    details: {
+                        creator: args.options.packageCreatedBy,
+                        description: args.options.packageDescription,
+                        displayName: args.options.packageDisplayName,
+                        sourceEnvironment: args.options.packageSourceEnvironment
+                    },
+                    resources: resources
+                },
+                fullResponse: true
+            };
+            const response = yield request_1.default.post(requestOptions);
+            return response.headers.location;
+        });
+    }
+    getPackageLink(args, logger, location) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Retrieving the package link and waiting on the exported package.');
+            }
+            let status;
+            let link;
+            const requestOptions = {
+                url: location,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            do {
+                const response = yield request_1.default.get(requestOptions);
+                status = response.properties.status;
+                if (status === "Succeeded") {
+                    link = response.properties.packageLink.value;
+                }
+                else {
+                    yield this.sleep(5000);
+                }
+                if (this.verbose) {
+                    logger.logToStderr(`Current status of the get package link: ${status}`);
+                }
+            } while (status === 'Running');
+            return link;
+        });
+    }
+    sleep(ms) {
+        return new Promise(resolve => setTimeout(resolve, ms));
+    }
+}
+_PaAppExportCommand_instances = new WeakSet(), _PaAppExportCommand_initTelemetry = function _PaAppExportCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            packageDescription: typeof args.options.packageDescription !== 'undefined',
+            packageCreatedBy: typeof args.options.packageCreatedBy !== 'undefined',
+            packageSourceEnvironment: typeof args.options.packageSourceEnvironment !== 'undefined',
+            path: typeof args.options.path !== 'undefined'
+        });
+    });
+}, _PaAppExportCommand_initOptions = function _PaAppExportCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '-e, --environment <environment>'
+    }, {
+        option: '-n, --packageDisplayName [packageDisplayName]'
+    }, {
+        option: '-d, --packageDescription [packageDescription]'
+    }, {
+        option: '-c, --packageCreatedBy [packageCreatedBy]'
+    }, {
+        option: '-s, --packageSourceEnvironment [packageSourceEnvironment]'
+    }, {
+        option: '-p, --path [path]'
+    });
+}, _PaAppExportCommand_initValidators = function _PaAppExportCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        if (args.options.path && !fs.existsSync(path.dirname(args.options.path))) {
+            return 'Specified path where to save the file does not exist';
+        }
+        return true;
+    }));
+};
+module.exports = new PaAppExportCommand();
+//# sourceMappingURL=app-export.js.map

package/dist/m365/pa/commands.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'pa';
 exports.default = {
+    APP_EXPORT: `${prefix} app export`,
     APP_GET: `${prefix} app get`,
     APP_LIST: `${prefix} app list`,
     APP_REMOVE: `${prefix} app remove`,

package/dist/m365/purview/commands/threatassessment/threatassessment-get.js

@@ -0,0 +1,79 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _PurviewThreatAssessmentGetCommand_instances, _PurviewThreatAssessmentGetCommand_initTelemetry, _PurviewThreatAssessmentGetCommand_initOptions, _PurviewThreatAssessmentGetCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class PurviewThreatAssessmentGetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.THREATASSESSMENT_GET;
+    }
+    get description() {
+        return 'Get a threat assessment';
+    }
+    constructor() {
+        super();
+        _PurviewThreatAssessmentGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PurviewThreatAssessmentGetCommand_instances, "m", _PurviewThreatAssessmentGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PurviewThreatAssessmentGetCommand_instances, "m", _PurviewThreatAssessmentGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PurviewThreatAssessmentGetCommand_instances, "m", _PurviewThreatAssessmentGetCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving threat assessment with id ${args.options.id}`);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/informationProtection/threatAssessmentRequests/${args.options.id}${args.options.includeResults ? '?$expand=results' : ''}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_PurviewThreatAssessmentGetCommand_instances = new WeakSet(), _PurviewThreatAssessmentGetCommand_initTelemetry = function _PurviewThreatAssessmentGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            includeResults: !!args.options.includeResults
+        });
+    });
+}, _PurviewThreatAssessmentGetCommand_initOptions = function _PurviewThreatAssessmentGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '--includeResults'
+    });
+}, _PurviewThreatAssessmentGetCommand_initValidators = function _PurviewThreatAssessmentGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID.`;
+        }
+        return true;
+    }));
+};
+module.exports = new PurviewThreatAssessmentGetCommand();
+//# sourceMappingURL=threatassessment-get.js.map

package/dist/m365/purview/commands.js

@@ -16,6 +16,7 @@ exports.default = {
     RETENTIONLABEL_GET: `${prefix} retentionlabel get`,
     RETENTIONLABEL_LIST: `${prefix} retentionlabel list`,
     RETENTIONLABEL_REMOVE: `${prefix} retentionlabel remove`,
-    RETENTIONLABEL_SET: `${prefix} retentionlabel set`
+    RETENTIONLABEL_SET: `${prefix} retentionlabel set`,
+    THREATASSESSMENT_GET: `${prefix} threatassessment get`
 };
 //# sourceMappingURL=commands.js.map

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

@@ -147,7 +147,7 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
                 yield Cli_1.Cli.executeCommand(removeCommand, { options: Object.assign(Object.assign({}, removeOptions), { _: [] }) });
             }
             catch (err) {
-                if (err.error !== undefined && err.error.message !== undefined && err.error.message.includes('does not exist')) {
+                if (err !== undefined && err.message !== undefined && err.message.includes('does not exist')) {
                 }
                 else {
                     throw err;

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

@@ -42,6 +42,9 @@ class SpoFileRetentionLabelEnsureCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const fileProperties = yield this.getFileProperties(logger, args);
+                if (args.options.assetId) {
+                    yield this.applyAssetId(args.options.webUrl, fileProperties.ListItemAllFields.ParentList.Id, fileProperties.ListItemAllFields.Id, args.options.assetId);
+                }
                 const options = {
                     webUrl: args.options.webUrl,
                     listId: fileProperties.ListItemAllFields.ParentList.Id,
@@ -84,12 +87,28 @@ class SpoFileRetentionLabelEnsureCommand extends SpoCommand_1.default {
             return yield request_1.default.get(requestOptions);
         });
     }
+    applyAssetId(webUrl, listId, listItemId, assetId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestUrl = `${webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(listId)}')`;
+            const requestBody = { "formValues": [{ "FieldName": "ComplianceAssetId", "FieldValue": assetId }] };
+            const requestOptions = {
+                url: `${requestUrl}/items(${listItemId})/ValidateUpdateListItem()`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                data: requestBody,
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
 }
 _SpoFileRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoFileRetentionLabelEnsureCommand_initTelemetry = function _SpoFileRetentionLabelEnsureCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             fileUrl: typeof args.options.fileUrl !== 'undefined',
-            fileId: typeof args.options.fileId !== 'undefined'
+            fileId: typeof args.options.fileId !== 'undefined',
+            assetId: typeof args.options.assetId !== 'undefined'
         });
     });
 }, _SpoFileRetentionLabelEnsureCommand_initOptions = function _SpoFileRetentionLabelEnsureCommand_initOptions() {
@@ -101,6 +120,8 @@ _SpoFileRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoFileRetention
         option: '--fileUrl [fileUrl]'
     }, {
         option: '-i, --fileId [fileId]'
+    }, {
+        option: '-a, --assetId [assetId]'
     });
 }, _SpoFileRetentionLabelEnsureCommand_initValidators = function _SpoFileRetentionLabelEnsureCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -58,8 +58,14 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
             const propertiesToExpand = propertiesWithSlash.map(e => e.split('/')[0]);
             const expandPropertiesArray = propertiesToExpand.filter((item, pos) => propertiesToExpand.indexOf(item) === pos);
             const fieldExpand = expandPropertiesArray.length > 0 ? `&$expand=${expandPropertiesArray.join(",")}` : ``;
+            if (args.options.id) {
+                requestUrl += `/items(${args.options.id})`;
+            }
+            else {
+                requestUrl += `/GetItemByUniqueId(guid'${args.options.uniqueId}')`;
+            }
             const requestOptions = {
-                url: `${requestUrl}/items(${args.options.id})?$select=${formatting_1.formatting.encodeQueryParameter(propertiesSelect.join(","))}${fieldExpand}`,
+                url: `${requestUrl}?$select=${formatting_1.formatting.encodeQueryParameter(propertiesSelect.join(","))}${fieldExpand}`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -68,7 +74,7 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
             try {
                 const itemProperties = yield request_1.default.get(requestOptions);
                 if (args.options.withPermissions) {
-                    requestOptions.url = `${requestUrl}/items(${args.options.id})/RoleAssignments?$expand=Member,RoleDefinitionBindings`;
+                    requestOptions.url = `${requestUrl}/RoleAssignments?$expand=Member,RoleDefinitionBindings`;
                     const response = yield request_1.default.get(requestOptions);
                     response.value.forEach((r) => {
                         r.RoleDefinitionBindings = formatting_1.formatting.setFriendlyPermissions(r.RoleDefinitionBindings);
@@ -90,6 +96,8 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            uniqueId: typeof args.options.uniqueId !== 'undefined',
             withPermissions: !!args.options.withPermissions
         });
     });
@@ -97,7 +105,9 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-i, --id <id>'
+        option: '-i, --id [id]'
+    }, {
+        option: '--uniqueId [uniqueId]'
     }, {
         option: '-l, --listId [listId]'
     }, {
@@ -119,15 +129,20 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
             !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
-        if (isNaN(parseInt(args.options.id))) {
+        if (args.options.id &&
+            isNaN(parseInt(args.options.id))) {
             return `${args.options.id} is not a number`;
         }
+        if (args.options.uniqueId &&
+            !validation_1.validation.isValidGuid(args.options.uniqueId)) {
+            return `${args.options.uniqueId} in option uniqueId is not a valid GUID`;
+        }
         return true;
     }));
 }, _SpoListItemGetCommand_initTypes = function _SpoListItemGetCommand_initTypes() {
-    this.types.string.push('webUrl', 'listId', 'listTitle', 'id', 'properties');
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'id', 'uniqueId', 'properties');
 }, _SpoListItemGetCommand_initOptionSets = function _SpoListItemGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['id', 'uniqueId'] });
 };
 module.exports = new SpoListItemGetCommand();
 //# sourceMappingURL=listitem-get.js.map

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

@@ -42,6 +42,9 @@ class SpoListItemRetentionLabelEnsureCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const labelInformation = yield this.getLabelInformation(args.options, logger);
+                if (args.options.assetId) {
+                    yield this.applyAssetId(args.options, logger);
+                }
                 yield this.applyLabel(args.options, labelInformation, logger);
             }
             catch (err) {
@@ -106,6 +109,34 @@ class SpoListItemRetentionLabelEnsureCommand extends SpoCommand_1.default {
             yield request_1.default.post(requestOptions);
         });
     }
+    applyAssetId(options, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Applying the asset Id ${options.assetId}...`);
+            }
+            let requestUrl = `${options.webUrl}/_api/web`;
+            if (options.listId) {
+                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(options.listId)}')/items(${options.listItemId})/ValidateUpdateListItem()`;
+            }
+            else if (options.listTitle) {
+                requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')/items(${options.listItemId})/ValidateUpdateListItem()`;
+            }
+            else if (options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
+                requestUrl += `/GetList(@listUrl)/items(${options.listItemId})/ValidateUpdateListItem()?@listUrl='${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}'`;
+            }
+            const requestBody = { "formValues": [{ "FieldName": "ComplianceAssetId", "FieldValue": options.assetId }] };
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                data: requestBody,
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
 }
 _SpoListItemRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoListItemRetentionLabelEnsureCommand_initTelemetry = function _SpoListItemRetentionLabelEnsureCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -114,7 +145,8 @@ _SpoListItemRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoListItemR
             listTitle: typeof args.options.listTitle !== 'undefined',
             listUrl: typeof args.options.listUrl !== 'undefined',
             name: typeof args.options.name !== 'undefined',
-            id: typeof args.options.id !== 'undefined'
+            id: typeof args.options.id !== 'undefined',
+            assetId: typeof args.options.assetId !== 'undefined'
         });
     });
 }, _SpoListItemRetentionLabelEnsureCommand_initOptions = function _SpoListItemRetentionLabelEnsureCommand_initOptions() {
@@ -132,6 +164,8 @@ _SpoListItemRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoListItemR
         option: '-n, --name [name]'
     }, {
         option: '-i, --id [id]'
+    }, {
+        option: '-a, --assetId [assetId]'
     });
 }, _SpoListItemRetentionLabelEnsureCommand_initValidators = function _SpoListItemRetentionLabelEnsureCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {

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

@@ -69,20 +69,37 @@ class SpoWebSetCommand extends SpoCommand_1.default {
                 const searchScope = args.options.searchScope.toLowerCase();
                 payload.SearchScope = SpoWebSetCommand.searchScopeOptions.indexOf(searchScope);
             }
-            const requestOptions = {
-                url: `${args.options.url}/_api/web`,
-                headers: {
-                    'content-type': 'application/json;odata=nometadata',
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json',
-                data: payload
-            };
-            if (this.verbose) {
-                logger.logToStderr(`Updating properties of subsite ${args.options.url}...`);
-            }
             try {
+                const requestOptions = {
+                    url: `${args.options.url}/_api/web`,
+                    headers: {
+                        'content-type': 'application/json;odata=nometadata',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json',
+                    data: payload
+                };
+                if (this.verbose) {
+                    logger.logToStderr(`Updating properties of subsite ${args.options.url}...`);
+                }
                 yield request_1.default.patch(requestOptions);
+                if (typeof args.options.welcomePage !== 'undefined') {
+                    if (this.verbose) {
+                        logger.logToStderr(`Setting welcome page to: ${args.options.welcomePage}...`);
+                    }
+                    const requestOptions = {
+                        url: `${args.options.url}/_api/web/RootFolder`,
+                        headers: {
+                            'content-type': 'application/json;odata=nometadata',
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json',
+                        data: {
+                            WelcomePage: args.options.welcomePage
+                        }
+                    };
+                    yield request_1.default.patch(requestOptions);
+                }
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -105,7 +122,8 @@ _SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = f
             quickLaunchEnabled: typeof args.options.quickLaunchEnabled !== 'undefined',
             footerEnabled: typeof args.options.footerEnabled !== 'undefined',
             navAudienceTargetingEnabled: typeof args.options.navAudienceTargetingEnabled !== 'undefined',
-            searchScope: args.options.searchScope !== 'undefined'
+            searchScope: typeof args.options.searchScope !== 'undefined',
+            welcomePage: typeof args.options.welcomePage !== 'undefined'
         });
         this.trackUnknownOptions(this.telemetryProperties, args.options);
     });
@@ -139,6 +157,8 @@ _SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = f
     }, {
         option: '--searchScope [searchScope]',
         autocomplete: SpoWebSetCommand.searchScopeOptions
+    }, {
+        option: '--welcomePage [welcomePage]'
     });
 }, _SpoWebSetCommand_initTypes = function _SpoWebSetCommand_initTypes() {
     this.types.boolean.push('megaMenuEnabled', 'footerEnabled', 'quickLaunchEnabled', 'navAudienceTargetingEnabled');

package/dist/settingsNames.js

@@ -15,7 +15,8 @@ const settingsNames = {
     output: 'output',
     printErrorsAsPlainText: 'printErrorsAsPlainText',
     prompt: 'prompt',
-    showHelpOnFailure: 'showHelpOnFailure'
+    showHelpOnFailure: 'showHelpOnFailure',
+    showSpinner: 'showSpinner'
 };
 exports.settingsNames = settingsNames;
 //# sourceMappingURL=settingsNames.js.map

package/docs/docs/_clisettings.md

@@ -18,3 +18,4 @@ Setting name|Definition|Default value
 `printErrorsAsPlainText`|When output mode is set to `json`, print error messages as plain-text rather than JSON|`true`
 `prompt`|Prompts for missing values in required options|`false`
 `showHelpOnFailure`|Automatically display help when executing a command failed|`true`
+`showSpinner`|Display spinner when executing commands|`true`

package/docs/docs/cmd/pa/app/app-export.md

@@ -0,0 +1,52 @@
+# pa app export
+
+Exports the specified Power App
+
+## Usage
+
+```sh
+m365 pa app export [options]
+```
+
+## Options
+
+`-i, --id <id>`
+: The id of the Power App to export
+
+`-e, --environment <environment>`
+: The name of the environment for which to export the app
+
+`-n, --packageDisplayName [packageDisplayName]`
+: The display name to use in the exported package
+
+`-d, --packageDescription [packageDescription]`
+: The description to use in the exported package
+
+`-c, --packageCreatedBy [packageCreatedBy]`
+: The name of the person to be used as the creator of the exported package
+
+`-s, --packageSourceEnvironment [packageSourceEnvironment]`
+: The name of the source environment from which the exported package was taken
+
+`-p, --path [path]`
+: The path to save the exported package to. If not specified the app will be exported in the current working directory
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Export the specified Power App as a ZIP file
+
+```sh
+m365 pa app export --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --id 3989cb59-ce1a-4a5c-bb78-257c5c39381d 
+```
+
+Export the specified Power App as a ZIP file with the package displayname, package description, the one who created it, the package source environment and the path
+
+```sh
+m365 pa app export --environment Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --id 3989cb59-ce1a-4a5c-bb78-257c5c39381d --packageDisplayName "PowerApp" --packageDescription "Power App Description" --packageCreatedBy "John Doe" --packageSourceEnvironment "Contoso" --path "C:/Users/John/Documents"
+```
+
+## Response
+
+The command won't return a response on success.

package/docs/docs/cmd/purview/threatassessment/threatassessment-get.md

@@ -0,0 +1,191 @@
+# purview threatassessment get
+
+Get a threat assessment
+
+## Usage
+
+```sh
+m365 purview threatassessment get [options]
+```
+
+## Options
+
+`-i, --id <id>`
+: The Id of the threat assessment
+
+`--includeResults`
+: Include the threat assessment results
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Get a threat assessment
+
+```sh
+m365 purview threatassessment get --id c37d695e-d581-4ae9-82a0-9364eba4291e
+```
+
+Get a threat assessment including results
+
+```sh
+m365 purview threatassessment get --id c37d695e-d581-4ae9-82a0-9364eba4291e --includeResults
+```
+
+## Response
+
+### Standard Response
+
+=== "JSON"
+
+    ```json
+    {
+      "id": "8aaba0ac-ec4d-4e62-5774-08db16c68731",
+      "createdDateTime": "2023-02-25T00:23:33.0550644Z",
+      "contentType": "mail",
+      "expectedAssessment": "block",
+      "category": "spam",
+      "status": "pending",
+      "requestSource": "administrator",
+      "recipientEmail": "john@contoso.com",
+      "destinationRoutingReason": "notJunk",
+      "messageUri": "https://graph.microsoft.com/v1.0/users/john@contoso.com/messages/AAMkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgBGAAAAAAC6jQfUzacTSIHqMw2yacnUBwBiOC8xvYmdT6G2E_hLMK5kAAAAAAEMAABiOC8xvYmdT6G2E_hLMK5kAALHNaMuAAA=",
+      "createdBy": {
+        "user": {
+          "id": "fe36f75e-c103-410b-a18a-2bf6df06ac3a",
+          "displayName": "John Doe"
+        }
+      }
+    }
+    ```
+
+=== "Text"
+
+    ```text
+    category                : spam
+    contentType             : mail
+    createdBy               : {"user":{"id":"fe36f75e-c103-410b-a18a-2bf6df06ac3a","displayName":"John Doe"}}
+    createdDateTime         : 2023-02-25T00:23:33.0550644Z
+    destinationRoutingReason: notJunk
+    expectedAssessment      : block
+    id                      : 8aaba0ac-ec4d-4e62-5774-08db16c68731
+    messageUri              : https://graph.microsoft.com/v1.0/users/john@contoso.com/messages/AAMkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgBGAAAAAAC6jQfUzacTSIHqMw2yacnUBwBiOC8xvYmdT6G2E_hLMK5kAAAAAAEMAABiOC8xvYmdT6G2E_hLMK5kAALHNaMuAAA=
+    recipientEmail          : john@contoso.com
+    requestSource           : administrator
+    status                  : pending
+    ```
+
+=== "CSV"
+
+    ```csv
+    id,createdDateTime,contentType,expectedAssessment,category,status,requestSource,recipientEmail,destinationRoutingReason,messageUri,createdBy
+    8aaba0ac-ec4d-4e62-5774-08db16c68731,2023-02-25T00:23:33.0550644Z,mail,block,spam,pending,administrator,john@contoso.com,notJunk,https://graph.microsoft.com/v1.0/users/john@contoso.com/messages/AAMkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgBGAAAAAAC6jQfUzacTSIHqMw2yacnUBwBiOC8xvYmdT6G2E_hLMK5kAAAAAAEMAABiOC8xvYmdT6G2E_hLMK5kAALHNaMuAAA=,"{""user"":{""id"":""fe36f75e-c103-410b-a18a-2bf6df06ac3a"",""displayName"":""John Doe""}}"
+    ```
+
+=== "Markdown"
+
+    ```md
+    # purview threatassessment get --id "8aaba0ac-ec4d-4e62-5774-08db16c68731"
+
+    Date: 25/02/2023
+
+    ## 8aaba0ac-ec4d-4e62-5774-08db16c68731
+
+    Property | Value
+    ---------|-------
+    id | 8aaba0ac-ec4d-4e62-5774-08db16c68731
+    createdDateTime | 2023-02-25T00:23:33.0550644Z
+    contentType | mail
+    expectedAssessment | block
+    category | spam
+    status | pending
+    requestSource | administrator
+    recipientEmail | john@contoso.com
+    destinationRoutingReason | notJunk
+    messageUri | https://graph.microsoft.com/v1.0/users/john@contoso.com/messages/AAMkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgBGAAAAAAC6jQfUzacTSIHqMw2yacnUBwBiOC8xvYmdT6G2E\_hLMK5kAAAAAAEMAABiOC8xvYmdT6G2E\_hLMK5kAALHNaMuAAA=
+    createdBy | {"user":{"id":"fe36f75e-c103-410b-a18a-2bf6df06ac3a","displayName":"John Doe"}}
+    ```
+
+### `includeResults` response
+
+When we make use of the option `includeResults` the response will differ. 
+
+=== "JSON"
+
+    ```json
+    {
+      "id": "8aaba0ac-ec4d-4e62-5774-08db16c68731",
+      "createdDateTime": "2023-02-25T00:23:33.0550644Z",
+      "contentType": "mail",
+      "expectedAssessment": "block",
+      "category": "spam",
+      "status": "pending",
+      "requestSource": "administrator",
+      "recipientEmail": "john@contoso.com",
+      "destinationRoutingReason": "notJunk",
+      "messageUri": "https://graph.microsoft.com/v1.0/users/john@contoso.com/messages/AAMkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgBGAAAAAAC6jQfUzacTSIHqMw2yacnUBwBiOC8xvYmdT6G2E_hLMK5kAAAAAAEMAABiOC8xvYmdT6G2E_hLMK5kAALHNaMuAAA=",
+      "createdBy": {
+        "user": {
+          "id": "fe36f75e-c103-410b-a18a-2bf6df06ac3a",
+          "displayName": "John Doe"
+        }
+      },
+      "results": [
+        {
+          "id": "a5455871-18d1-44d8-0866-08db16c68b85",
+          "createdDateTime": "2023-02-25T00:23:40.28Z",
+          "resultType": "checkPolicy",
+          "message": "No policy was hit."
+        }
+      ]
+    }
+    ```
+
+=== "Text"
+
+    ```text
+    category                : spam
+    contentType             : mail
+    createdBy               : {"user":{"id":"fe36f75e-c103-410b-a18a-2bf6df06ac3a","displayName":"John Doe"}}
+    createdDateTime         : 2023-02-25T00:23:33.0550644Z
+    destinationRoutingReason: notJunk
+    expectedAssessment      : block
+    id                      : 8aaba0ac-ec4d-4e62-5774-08db16c68731
+    messageUri              : https://graph.microsoft.com/v1.0/users/john@contoso.com/messages/AAMkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgBGAAAAAAC6jQfUzacTSIHqMw2yacnUBwBiOC8xvYmdT6G2E_hLMK5kAAAAAAEMAABiOC8xvYmdT6G2E_hLMK5kAALHNaMuAAA=
+    recipientEmail          : john@contoso.com
+    requestSource           : administrator
+    results                 : [{"id":"a5455871-18d1-44d8-0866-08db16c68b85","createdDateTime":"2023-02-25T00:23:40.28Z","resultType":"checkPolicy","message":"No policy was hit."}]
+    status                  : pending
+    ```
+
+=== "CSV"
+
+    ```csv
+    id,createdDateTime,contentType,expectedAssessment,category,status,requestSource,recipientEmail,destinationRoutingReason,messageUri,createdBy,results
+    8aaba0ac-ec4d-4e62-5774-08db16c68731,2023-02-25T00:23:33.0550644Z,mail,block,spam,pending,administrator,john@contoso.com,notJunk,https://graph.microsoft.com/v1.0/users/john@contoso.com/messages/AAMkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgBGAAAAAAC6jQfUzacTSIHqMw2yacnUBwBiOC8xvYmdT6G2E_hLMK5kAAAAAAEMAABiOC8xvYmdT6G2E_hLMK5kAALHNaMuAAA=,"{""user"":{""id"":""fe36f75e-c103-410b-a18a-2bf6df06ac3a"",""displayName"":""John Doe""}}","[{""id"":""a5455871-18d1-44d8-0866-08db16c68b85"",""createdDateTime"":""2023-02-25T00:23:40.28Z"",""resultType"":""checkPolicy"",""message"":""No policy was hit.""}]"
+    ```
+
+=== "Markdown"
+
+    ```md
+    # purview threatassessment get --id "8aaba0ac-ec4d-4e62-5774-08db16c68731" --includeResults "true"
+
+    Date: 25/02/2023
+
+    ## 8aaba0ac-ec4d-4e62-5774-08db16c68731
+
+    Property | Value
+    ---------|-------
+    id | 8aaba0ac-ec4d-4e62-5774-08db16c68731
+    createdDateTime | 2023-02-25T00:23:33.0550644Z
+    contentType | mail
+    expectedAssessment | block
+    category | spam
+    status | pending
+    requestSource | administrator
+    recipientEmail | john@contoso.com
+    destinationRoutingReason | notJunk
+    messageUri | https://graph.microsoft.com/v1.0/users/john@contoso.com/messages/AAMkADgzN2Q1NThiLTI0NjYtNGIxYS05MDdjLTg1OWQxNzgwZGM2ZgBGAAAAAAC6jQfUzacTSIHqMw2yacnUBwBiOC8xvYmdT6G2E\_hLMK5kAAAAAAEMAABiOC8xvYmdT6G2E\_hLMK5kAALHNaMuAAA=
+    createdBy | {"user":{"id":"fe36f75e-c103-410b-a18a-2bf6df06ac3a","displayName":"John Doe"}}
+    results | [{"id":"a5455871-18d1-44d8-0866-08db16c68b85","createdDateTime":"2023-02-25T00:23:40.28Z","resultType":"checkPolicy","message":"No policy was hit."}]
+    ```

package/docs/docs/cmd/spo/file/file-retentionlabel-ensure.md

@@ -22,12 +22,17 @@ m365 spo file retentionlabel ensure [options]
 `--name <name>`
 : Name of the retention label to apply to the file.
 
+`-a, --assetId [assetId]`
+: A Compliance Asset Id to set on the item when it's labeled. See below for more information.
+
 --8<-- "docs/cmd/_global.md"
 
 ## Remarks
 
 You can also use [spo listitem retentionlabel remove](./../../../cmd/spo//listitem/listitem-retentionlabel-remove.md) for removing the retentionlabel from a listitem.
 
+The `--assetId` option has to do with event-based retention. Event-based retention is about starting a retention period when a specific event occurs, instead of the moment a document was labeled or created.
+
 ## Examples
 
 Applies a retention label to a file based on the label name and the fileUrl
@@ -39,7 +44,13 @@ m365 spo file retentionlabel ensure --webUrl https://contoso.sharepoint.com/site
 Applies a retention label to a file based on the label name and the fileId
 
 ```sh
-m365 spo file retentionlabel ensure --webUrl https://contoso.sharepoint.com/sites/project-x --fileId '26541f96-017c-4189-a604-599e083533b8'  --name 'Some label'
+m365 spo file retentionlabel ensure --webUrl https://contoso.sharepoint.com/sites/project-x --fileId '26541f96-017c-4189-a604-599e083533b8' --name 'Some label'
+```
+
+Applies a event-based retention label to a file and updates the Asset Id field
+
+```sh
+m365 spo file retentionlabel ensure --webUrl https://contoso.sharepoint.com/sites/project-x --fileId '26541f96-017c-4189-a604-599e083533b8' --name 'Some label' --assetId 'XYZ'
 ```
 
 ## Response

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

@@ -13,17 +13,20 @@ m365 spo listitem get [options]
 `-u, --webUrl <webUrl>`
 : URL of the site where the item is located.
 
-`-i, --id <id>`
-: ID of the item to retrieve.
+`-i, --id [id]`
+: ID of the item to retrieve. Specify either `id` or `uniqueId` but not both.
+
+`--uniqueId [uniqueId]`
+: The Unique ID (GUID) of the item to retrieve. Specify either `id` or `uniqueId` but not both.
 
 `-l, --listId [listId]`
-: ID of the list. Specify either `listTitle`, `listId` or `listUrl` but not multiple.
+: ID of the list. Specify either `listTitle`, `listId`, or `listUrl` but not multiple.
 
 `-t, --listTitle [listTitle]`
-: Title of the list. Specify either `listTitle`, `listId` or `listUrl` but not multiple.
+: Title of the list. Specify either `listTitle`, `listId`, or `listUrl` but not multiple.
 
 `--listUrl [listUrl]`
-: Server- or site-relative URL of the list. Specify either `listTitle`, `listId` or `listUrl` but not multiple.
+: Server- or site-relative URL of the list. Specify either `listTitle`, `listId`, or `listUrl` but not multiple.
 
 `-p, --properties [properties]`
 : Comma-separated list of properties to retrieve. Will retrieve all properties if not specified and json output is requested.
@@ -45,6 +48,12 @@ Get an item with the ID parameter from a given list in a given site.
 m365 spo listitem get --listTitle "Demo List" --id 147 --webUrl https://contoso.sharepoint.com/sites/project-x
 ```
 
+Get an item with the Unique ID parameter from a given list in a given site.
+
+```sh
+m365 spo listitem get --listTitle "Demo List" --uniqueId "64dc28c4-3c43-45f6-ba66-307d9eb7e6aa" --webUrl https://contoso.sharepoint.com/sites/project-x
+```
+
 Get an item columns with the ID parameter from a given list in a given site.
 
 ```sh

package/docs/docs/cmd/spo/listitem/listitem-retentionlabel-ensure.md

@@ -31,11 +31,18 @@ m365 spo listitem retentionlabel ensure [options]
 `-i, --id [id]`
 : The id of the retention label. Specify either `name` or `id`.
 
+`-a, --assetId [assetId]`
+: A Compliance Asset Id to set on the item when it's labeled. See below for more information.
+
 --8<-- "docs/cmd/_global.md"
 
+## Remarks
+
+The `--assetId` option has to do with event-based retention. Event-based retention is about starting a retention period when a specific event occurs, instead of the moment a document was labeled or created.
+
 ## Examples
 
-Applies the retention label _Some label_ to a list item in a given site based on the list id and label name
+Applies a retention label to a list item in a given site based on the list id and label name
 
 ```sh
 m365 spo listitem retentionlabel ensure --webUrl https://contoso.sharepoint.com/sites/project-x --listId 0cd891ef-afce-4e55-b836-fce03286cccf --listItemId 1 --name 'Some label'
@@ -47,12 +54,18 @@ Applies a retention label to a list item in a given site based on the list title
 m365 spo listitem retentionlabel ensure --webUrl https://contoso.sharepoint.com/sites/project-x --listTitle 'List 1' --listItemId 1 --id '7a621a91-063b-461b-aff6-d713d5fb23eb'
 ```
 
-Applies the retention label _Some label_ to a list item in a given site based on the server relative list url
+Applies a retention label to a list item in a given site based on the server relative list url
 
 ```sh
 m365 spo listitem retentionlabel ensure --webUrl https://contoso.sharepoint.com/sites/project-x --listUrl /sites/project-x/lists/TestList --listItemId 1 --name 'Some label'
 ```
 
+Applies a retention label to a list item in a given site based on the server relative list url and updates the Asset Id field
+
+```sh
+m365 spo listitem retentionlabel ensure --webUrl https://contoso.sharepoint.com/sites/project-x --listUrl /sites/project-x/lists/TestList --listItemId 1 --name 'Some label' --assetId 'XYZ'
+```
+
 ## Response
 
 The command won't return a response on success.

package/package.json

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