@pnp/cli-microsoft365 12.0.0-beta.e4f7675 → 12.0.0-beta.feb621e

package/dist/m365/teams/commands/chat/chat-member-remove.js

@@ -1,15 +1,25 @@
-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 _TeamsChatMemberRemoveCommand_instances, _TeamsChatMemberRemoveCommand_initTelemetry, _TeamsChatMemberRemoveCommand_initOptions, _TeamsChatMemberRemoveCommand_initValidators, _TeamsChatMemberRemoveCommand_initOptionSets;
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    chatId: z.string().refine(val => validation.isValidTeamsChatId(val), {
+        message: 'The value of the option chatId must be a valid Teams ChatId.'
+    }).alias('i'),
+    id: z.string().optional(),
+    userId: z.string().refine(val => validation.isValidGuid(val), {
+        message: 'The value of the option userId must be a valid GUID.'
+    }).optional(),
+    userName: z.string().refine(val => validation.isValidUserPrincipalName(val), {
+        message: 'The value of the option userName must be a valid user principal name.'
+    }).optional(),
+    force: z.boolean().optional().alias('f')
+});
 class TeamsChatMemberRemoveCommand extends GraphCommand {
     get name() {
         return commands.CHAT_MEMBER_REMOVE;
@@ -17,13 +27,18 @@ class TeamsChatMemberRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes a member from a Microsoft Teams chat conversation';
     }
-    constructor() {
-        super();
-        _TeamsChatMemberRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _TeamsChatMemberRemoveCommand_instances, "m", _TeamsChatMemberRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsChatMemberRemoveCommand_instances, "m", _TeamsChatMemberRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsChatMemberRemoveCommand_instances, "m", _TeamsChatMemberRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsChatMemberRemoveCommand_instances, "m", _TeamsChatMemberRemoveCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.id, opts.userId, opts.userName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify one of id, userId or userName, but not more than one.',
+            params: {
+                customCode: 'optionSet',
+                options: ['id', 'userId', 'userName']
+            }
+        });
     }
     async commandAction(logger, args) {
         const removeUserFromChat = async () => {
@@ -76,42 +91,5 @@ class TeamsChatMemberRemoveCommand extends GraphCommand {
         }
     }
 }
-_TeamsChatMemberRemoveCommand_instances = new WeakSet(), _TeamsChatMemberRemoveCommand_initTelemetry = function _TeamsChatMemberRemoveCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
-            userId: typeof args.options.userId !== 'undefined',
-            userName: typeof args.options.userName !== 'undefined',
-            force: !!args.options.force
-        });
-    });
-}, _TeamsChatMemberRemoveCommand_initOptions = function _TeamsChatMemberRemoveCommand_initOptions() {
-    this.options.unshift({
-        option: '-i, --chatId <chatId>'
-    }, {
-        option: '--id [id]'
-    }, {
-        option: '--userId [userId]'
-    }, {
-        option: '--userName [userName]'
-    }, {
-        option: '-f, --force'
-    });
-}, _TeamsChatMemberRemoveCommand_initValidators = function _TeamsChatMemberRemoveCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (!validation.isValidTeamsChatId(args.options.chatId)) {
-            return `${args.options.chatId} is not a valid Teams chatId.`;
-        }
-        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
-            return `${args.options.userId} is not a valid userId.`;
-        }
-        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
-            return `${args.options.userName} is not a valid user principal name.`;
-        }
-        return true;
-    });
-}, _TeamsChatMemberRemoveCommand_initOptionSets = function _TeamsChatMemberRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'userId', 'userName'] });
-};
 export default new TeamsChatMemberRemoveCommand();
 //# sourceMappingURL=chat-member-remove.js.map

package/dist/m365/teams/commands/chat/chat-message-send.js

@@ -1,10 +1,6 @@
-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 _TeamsChatMessageSendCommand_instances, _TeamsChatMessageSendCommand_initTelemetry, _TeamsChatMessageSendCommand_initOptions, _TeamsChatMessageSendCommand_initValidators, _TeamsChatMessageSendCommand_initOptionSets;
+import { z } from 'zod';
 import auth from '../../../../Auth.js';
+import { globalOptionsZod } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { validation } from '../../../../utils/validation.js';
@@ -13,6 +9,24 @@ import { chatUtil } from './chatUtil.js';
 import { cli } from '../../../../cli/cli.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphDelegatedCommand from '../../../base/GraphDelegatedCommand.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    chatId: z.string().refine(val => validation.isValidTeamsChatId(val), {
+        message: 'The value is not a valid Teams ChatId.'
+    }).optional(),
+    userEmails: z.string().refine(val => {
+        const userEmails = val.trim().toLowerCase().split(',').filter(e => e && e !== '');
+        if (!userEmails || userEmails.length === 0) {
+            return false;
+        }
+        return userEmails.every(e => validation.isValidUserPrincipalName(e));
+    }, {
+        message: 'The option userEmails contains one or more invalid email addresses.'
+    }).alias('e').optional(),
+    chatName: z.string().optional(),
+    message: z.string().alias('m'),
+    contentType: z.enum(['text', 'html']).optional()
+});
 class TeamsChatMessageSendCommand extends GraphDelegatedCommand {
     get name() {
         return commands.CHAT_MESSAGE_SEND;
@@ -20,14 +34,18 @@ class TeamsChatMessageSendCommand extends GraphDelegatedCommand {
     get description() {
         return 'Sends a chat message to a Microsoft Teams chat conversation.';
     }
-    constructor() {
-        super();
-        _TeamsChatMessageSendCommand_instances.add(this);
-        this.contentTypes = ['text', 'html'];
-        __classPrivateFieldGet(this, _TeamsChatMessageSendCommand_instances, "m", _TeamsChatMessageSendCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _TeamsChatMessageSendCommand_instances, "m", _TeamsChatMessageSendCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _TeamsChatMessageSendCommand_instances, "m", _TeamsChatMessageSendCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _TeamsChatMessageSendCommand_instances, "m", _TeamsChatMessageSendCommand_initOptionSets).call(this);
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(opts => [opts.chatId, opts.userEmails, opts.chatName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify one of chatId, userEmails or chatName, but not more than one.',
+            params: {
+                customCode: 'optionSet',
+                options: ['chatId', 'userEmails', 'chatName']
+            }
+        });
     }
     async commandAction(logger, args) {
         try {
@@ -126,46 +144,5 @@ class TeamsChatMessageSendCommand extends GraphDelegatedCommand {
         return request.post(requestOptions);
     }
 }
-_TeamsChatMessageSendCommand_instances = new WeakSet(), _TeamsChatMessageSendCommand_initTelemetry = function _TeamsChatMessageSendCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            chatId: typeof args.options.chatId !== 'undefined',
-            userEmails: typeof args.options.userEmails !== 'undefined',
-            chatName: typeof args.options.chatName !== 'undefined',
-            contentType: args.options.contentType ?? 'text'
-        });
-    });
-}, _TeamsChatMessageSendCommand_initOptions = function _TeamsChatMessageSendCommand_initOptions() {
-    this.options.unshift({
-        option: '--chatId [chatId]'
-    }, {
-        option: '-e, --userEmails [userEmails]'
-    }, {
-        option: '--chatName [chatName]'
-    }, {
-        option: '-m, --message <message>'
-    }, {
-        option: '--contentType [contentType]',
-        autocomplete: this.contentTypes
-    });
-}, _TeamsChatMessageSendCommand_initValidators = function _TeamsChatMessageSendCommand_initValidators() {
-    this.validators.push(async (args) => {
-        if (args.options.chatId && !validation.isValidTeamsChatId(args.options.chatId)) {
-            return `${args.options.chatId} is not a valid Teams ChatId.`;
-        }
-        if (args.options.userEmails) {
-            const userEmails = args.options.userEmails.trim().toLowerCase().split(',').filter(e => e && e !== '');
-            if (!userEmails || userEmails.length === 0 || userEmails.some(e => !validation.isValidUserPrincipalName(e))) {
-                return `${args.options.userEmails} contains one or more invalid email addresses.`;
-            }
-        }
-        if (args.options.contentType && !this.contentTypes.includes(args.options.contentType)) {
-            return `'${args.options.contentType}' is not a valid value for option contentType. Allowed values are ${this.contentTypes.join(', ')}.`;
-        }
-        return true;
-    });
-}, _TeamsChatMessageSendCommand_initOptionSets = function _TeamsChatMessageSendCommand_initOptionSets() {
-    this.optionSets.push({ options: ['chatId', 'userEmails', 'chatName'] });
-};
 export default new TeamsChatMessageSendCommand();
 //# sourceMappingURL=chat-message-send.js.map

package/dist/m365/util/commands/accesstoken/accesstoken-get.js

@@ -1,13 +1,14 @@
-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 _UtilAccessTokenGetCommand_instances, _UtilAccessTokenGetCommand_initTelemetry, _UtilAccessTokenGetCommand_initOptions;
+import { z } from 'zod';
 import auth, { Auth } from '../../../../Auth.js';
-import Command from '../../../../Command.js';
+import Command, { globalOptionsZod } from '../../../../Command.js';
 import commands from '../../commands.js';
 import { accessToken } from '../../../../utils/accessToken.js';
+export const options = z.strictObject({
+    ...globalOptionsZod.shape,
+    resource: z.string().alias('r'),
+    new: z.boolean().optional(),
+    decoded: z.boolean().optional()
+});
 class UtilAccessTokenGetCommand extends Command {
     get name() {
         return commands.ACCESSTOKEN_GET;
@@ -15,11 +16,8 @@ class UtilAccessTokenGetCommand extends Command {
     get description() {
         return 'Gets access token for the specified resource';
     }
-    constructor() {
-        super();
-        _UtilAccessTokenGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _UtilAccessTokenGetCommand_instances, "m", _UtilAccessTokenGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _UtilAccessTokenGetCommand_instances, "m", _UtilAccessTokenGetCommand_initOptions).call(this);
+    get schema() {
+        return options;
     }
     async commandAction(logger, args) {
         let resource = args.options.resource;
@@ -49,21 +47,5 @@ class UtilAccessTokenGetCommand extends Command {
         }
     }
 }
-_UtilAccessTokenGetCommand_instances = new WeakSet(), _UtilAccessTokenGetCommand_initTelemetry = function _UtilAccessTokenGetCommand_initTelemetry() {
-    this.telemetry.push((args) => {
-        Object.assign(this.telemetryProperties, {
-            new: args.options.new,
-            decoded: args.options.decoded
-        });
-    });
-}, _UtilAccessTokenGetCommand_initOptions = function _UtilAccessTokenGetCommand_initOptions() {
-    this.options.unshift({
-        option: '-r, --resource <resource>'
-    }, {
-        option: '--new'
-    }, {
-        option: '--decoded'
-    });
-};
 export default new UtilAccessTokenGetCommand();
 //# sourceMappingURL=accesstoken-get.js.map

package/dist/telemetry.js

@@ -1,25 +1,21 @@
-import appInsights from './appInsights.js';
 import { cli } from './cli/cli.js';
+import { googleAnalytics } from './googleAnalytics.js';
 import { settingsNames } from './settingsNames.js';
 import { pid } from './utils/pid.js';
 import { session } from './utils/session.js';
 async function trackTelemetry(object) {
     try {
         const { commandName, properties, exception } = object;
-        appInsights.commonProperties.shell = pid.getProcessName(process.ppid) || '';
-        appInsights.context.tags[appInsights.context.keys.sessionId] = session.getId(process.ppid);
+        const context = {
+            shell: pid.getProcessName(process.ppid) || '',
+            sessionId: session.getId(process.ppid)
+        };
         if (exception) {
-            appInsights.trackException({
-                exception
-            });
+            await googleAnalytics.trackException(exception, context);
         }
         else {
-            appInsights.trackEvent({
-                name: commandName,
-                properties
-            });
+            await googleAnalytics.trackEvent(commandName, properties, context);
         }
-        await appInsights.flush();
     }
     catch {
         // Do nothing

package/dist/utils/spo.js

@@ -1250,9 +1250,7 @@ export const spo = {
             // Neither properties nor contentTypeName provided, no need to proceed
             throw 'Either properties or contentTypeName must be provided for systemUpdateListItem.';
         }
-        const parsedUrl = new URL(absoluteListUrl);
-        const serverRelativeSiteMatch = absoluteListUrl.match(new RegExp('/sites/[^/]+'));
-        const webUrl = `${parsedUrl.protocol}//${parsedUrl.host}${serverRelativeSiteMatch ?? ''}`;
+        const webUrl = absoluteListUrl.substring(0, absoluteListUrl.indexOf('/_api/'));
         if (verbose && logger) {
             await logger.logToStderr(`Getting list id...`);
         }

package/dist/utils/urlUtil.js

@@ -165,8 +165,8 @@ export const urlUtil = {
     */
     getTargetSiteAbsoluteUrl(webUrl, url) {
         const fullUrl = url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
-        // Pattern to match SharePoint URLs
-        const urlPattern = /https:\/\/[\w-]+\.sharepoint\.com\/(teams|sites|personal)\/([\w-]+)/;
+        // Pattern to match SharePoint site collection URLs on any of the supported managed paths
+        const urlPattern = /^https:\/\/[\w-]+\.sharepoint\.com\/(teams|sites|personal)\/[^/?#]+/i;
         const match = fullUrl.match(urlPattern);
         if (match) {
             // If a match is found, return the matched URL

package/docs/docs/cmd/entra/m365group/m365group-remove.mdx

@@ -24,8 +24,8 @@ m365 entra m365group remove [options]
 `-f, --force`
 : Don't prompt for confirming removing the group
 
-`--skipRecycleBin`
-: Set to directly remove the group without moving it to the Recycle Bin
+`--permanent`
+: Permanently remove the group without leaving it in the recycle bin.
 ```
 
 <Global />
@@ -53,7 +53,7 @@ m365 entra m365group remove [options]
 
 If the specified _id_ doesn't refer to an existing group, you will get a `Resource does not exist` error. Additionally, if you do not have access to the group or the associated group-connected site, you will get an `Access denied` error.
 
-When you use `--skipRecycleBin` flag to remove a Microsoft 365 group permanently, the process involves deleting the associated group-connected site and the group, and then checking if the group has been moved to the deleted groups list. In some cases, it may take a few seconds for the group to appear in the deleted groups list.
+When you use the `--permanent` flag to remove a Microsoft 365 group permanently, the process involves deleting the associated group-connected site and the group, and then checking if the group has been moved to the deleted groups list. In some cases, it may take a few seconds for the group to appear in the deleted groups list.
 
 To ensure a smooth deletion process, the command employs a retry mechanism with the following parameters:
 
@@ -80,7 +80,7 @@ m365 entra m365group remove --displayName Finance --force
 Remove group with id _28beab62-7540-4db1-a23f-29a6018a3848_ without prompting for confirmation and without moving it to the Recycle Bin
 
 ```sh
-m365 entra m365group remove --id 28beab62-7540-4db1-a23f-29a6018a3848 --force --skipRecycleBin
+m365 entra m365group remove --id 28beab62-7540-4db1-a23f-29a6018a3848 --force --permanent
 ```
 
 ## Response

package/docs/docs/cmd/spe/container/container-remove.mdx

@@ -27,8 +27,8 @@ m365 spe container remove [options]
 `--containerTypeName [containerTypeName]`
 : The name of the container type. Specify either `containerTypeId` or `containerTypeName` when using `name` but not both.
 
-`--recycle`
-: Recycle the container instance instead of permanently deleting it.
+`--permanent`
+: Permanently delete the container instance instead of moving it to the recycle bin.
 
 `-f, --force`
 : Do not prompt for confirmation.
@@ -67,16 +67,16 @@ The command is based on an API that is currently in preview and is subject to ch
 
 ## Examples
 
-Remove a container by ID.
+Move a container specified by ID to the recycle bin.
 
 ```sh
 m365 spe container remove --id "b!ISJs1WRro0y0EWgkUYcktDa0mE8zSlFEqFzqRn70Zwp1CEtDEBZgQICPkRbil_5Z"
 ```
 
-Move a container specified by ID to the recycle bin.
+Permanently remove a container by ID.
 
 ```sh
-m365 spe container remove --id "b!ISJs1WRro0y0EWgkUYcktDa0mE8zSlFEqFzqRn70Zwp1CEtDEBZgQICPkRbil_5Z" --recycle
+m365 spe container remove --id "b!ISJs1WRro0y0EWgkUYcktDa0mE8zSlFEqFzqRn70Zwp1CEtDEBZgQICPkRbil_5Z" --permanent
 ```
 
 Remove a container by name specifying the container type id.

package/docs/docs/cmd/spo/file/file-archive.mdx

@@ -22,7 +22,7 @@ m365 spo file archive [options]
 : The server- or site-relative decoded URL of the file to archive. Specify either `url` or `id`, but not both.
 
 `-i, --id [id]`
-: The UniqueId (GUID) of the file to archive. Specify either `url` or `id`, but not both.
+: The unique ID (GUID) of the file to archive. Specify either `url` or `id`, but not both.
 
 `-f, --force`
 : Don't prompt for confirmation.
@@ -30,6 +30,14 @@ m365 spo file archive [options]
 
 <Global />
 
+## Remarks
+
+:::warning
+
+You will be able to reactivate an archived file instantly for the first 7 days. After that, it will take up to 24 hours to reactivate.
+
+:::
+
 ## Permissions
 
 <Tabs>

package/docs/docs/cmd/spo/file/file-checkin.mdx

@@ -22,7 +22,7 @@ m365 spo file checkin [options]
 : The server- or site-relative decoded URL of the file to retrieve. Specify either `url` or `id` but not both.
 
 `-i, --id [id]`
-: The UniqueId (GUID) of the file to retrieve. Specify either `url` or `id` but not both.
+: The unique ID (GUID) of the file to retrieve. Specify either `url` or `id` but not both.
 
 `-t, --type [type]`
 : Type of the check in. Allowed values: `Minor`, `Major`, `Overwrite`. Defaults to `Major`.
@@ -54,7 +54,7 @@ m365 spo file checkin [options]
 
 ## Examples
 
-Checks in file with the specified UniqueId located in the specified site.
+Checks in file with the specified unique ID located in the specified site.
 
 ```sh
 m365 spo file checkin --webUrl https://contoso.sharepoint.com/sites/project-x --id 'b2307a39-e878-458b-bc90-03bc578531d6'

package/docs/docs/cmd/spo/file/file-checkout-undo.mdx

@@ -22,7 +22,7 @@ m365 spo file checkout undo [options]
 : The server- or site-relative decoded URL of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
 
 `-i, --fileId [fileId]`
-: The UniqueId (GUID) of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
+: The unique ID (GUID) of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
 
 `-f, --force`
 : Don't prompt for confirmation.

package/docs/docs/cmd/spo/file/file-checkout.mdx

@@ -22,7 +22,7 @@ m365 spo file checkout [options]
 : The server- or site-relative decoded URL of the file to retrieve. Specify either `url` or `id` but not both.
 
 `-i, --id [id]`
-: The UniqueId (GUID) of the file to retrieve. Specify either `url` or `id` but not both.
+: The unique ID (GUID) of the file to retrieve. Specify either `url` or `id` but not both.
 ```
 
 <Global />
@@ -48,7 +48,7 @@ m365 spo file checkout [options]
 
 ## Examples
 
-Checks out file with the specified UniqueId located in the specified site.
+Checks out file with the specified unique ID located in the specified site.
 
 ```sh
 m365 spo file checkout --webUrl https://contoso.sharepoint.com/sites/project-x --id 'b2307a39-e878-458b-bc90-03bc578531d6'

package/docs/docs/cmd/spo/file/file-copy.mdx

@@ -85,13 +85,13 @@ Copy a file by site-relative URL to a document library in another site collectio
 m365 spo file copy --webUrl https://contoso.sharepoint.com/sites/project --sourceUrl "/Shared Documents/Document.pdf" --targetUrl "/sites/IT/Shared Documents" --ignoreVersionHistory
 ```
 
-Copy file by sourceId (UniqueId) to a document library in another site collection and rename the file (without specifying the file extension).
+Copy file by sourceId (unique ID) to a document library in another site collection and rename the file (without specifying the file extension).
 
 ```sh
 m365 spo file copy --webUrl https://contoso.sharepoint.com/sites/project --sourceId "b2307a39-e878-458b-bc90-03bc578531d6" --targetUrl "/sites/IT/Shared Documents" --newName "Report.pdf"
 ```
 
-Copy file by sourceId (UniqueId) to a document library in another site collection with a new name, rename the file if it already exists.
+Copy file by sourceId (unique ID) to a document library in another site collection with a new name, rename the file if it already exists.
 
 ```sh
 m365 spo file copy --webUrl https://contoso.sharepoint.com/sites/project --sourceId "b2307a39-e878-458b-bc90-03bc578531d6" --targetUrl "/sites/IT/Shared Documents" --newName "Report.pdf" --nameConflictBehavior rename

package/docs/docs/cmd/spo/file/file-get.mdx

@@ -22,7 +22,7 @@ m365 spo file get [options]
 : The server- or site-relative decoded URL of the file to retrieve. Specify either `url` or `id` but not both.
 
 `-i, --id [id]`
-: The UniqueId (GUID) of the file to retrieve. Specify either `url` or `id` but not both.
+: The unique ID (GUID) of the file to retrieve. Specify either `url` or `id` but not both.
 
 `--asString`
 : Set to retrieve the contents of the specified file as string.
@@ -63,25 +63,25 @@ m365 spo file get [options]
 
 ## Examples
 
-Get file properties for a file with id (UniqueId) parameter located in a site.
+Get file properties for a file with id (unique ID) parameter located in a site.
 
 ```sh
 m365 spo file get --webUrl https://contoso.sharepoint.com/sites/project-x --id 'b2307a39-e878-458b-bc90-03bc578531d6'
 ```
 
-Get contents of the file with id (UniqueId) parameter located in a site.
+Get contents of the file with id (unique ID) parameter located in a site.
 
 ```sh
 m365 spo file get --webUrl https://contoso.sharepoint.com/sites/project-x --id 'b2307a39-e878-458b-bc90-03bc578531d6' --asString
 ```
 
-Get list item properties for a file with id (UniqueId) parameter located in a site.
+Get list item properties for a file with id (unique ID) parameter located in a site.
 
 ```sh
 m365 spo file get --webUrl https://contoso.sharepoint.com/sites/project-x --id 'b2307a39-e878-458b-bc90-03bc578531d6' --asListItem
 ```
 
-Saves the file with id (UniqueId) parameter located in a site to a local file.
+Saves the file with id (unique ID) parameter located in a site to a local file.
 
 ```sh
 m365 spo file get --webUrl https://contoso.sharepoint.com/sites/project-x --id 'b2307a39-e878-458b-bc90-03bc578531d6' --asFile --path /Users/user/documents/SavedAsTest1.docx
@@ -111,7 +111,7 @@ Saves a file with the server-relative url located in a site to a local file.
 m365 spo file get --webUrl https://contoso.sharepoint.com/sites/project-x --url '/sites/project-x/documents/Test1.docx' --asFile --path /Users/user/documents/SavedAsTest1.docx
 ```
 
-Gets the file properties for a file with id (UniqueId) parameter located in a site with permissions.
+Gets the file properties for a file with id (unique ID) parameter located in a site with permissions.
 
 ```sh
 m365 spo file get --webUrl https://contoso.sharepoint.com/sites/project-x --id 'b2307a39-e878-458b-bc90-03bc578531d6' --withPermissions

package/docs/docs/cmd/spo/file/file-remove.mdx

@@ -30,8 +30,8 @@ m365 spo page template remove
 `--url [url]`
 : The server- or site-relative decoded URL of the file to remove. Specify either `id` or `url` but not both.
 
-`--recycle`
-: Recycle the file instead of actually deleting it.
+`--permanent`
+: Permanently delete the file instead of moving it to the recycle bin.
 
 `--bypassSharedLock`
 : Remove the file even if it is locked for shared use.
@@ -75,10 +75,10 @@ Remove a file by site-relative URL.
 m365 spo file remove --webUrl https://contoso.sharepoint.com/sites/project-x --url "/Shared Documents/Test.docx"
 ```
 
-Remove a file by server-relative URL to the recycle bin.
+Permanently remove a file by server-relative URL.
 
 ```sh
-m365 spo file remove --webUrl https://contoso.sharepoint.com/sites/project-x --url "/sites/project-x/Shared Documents/Test.docx" --recycle
+m365 spo file remove --webUrl https://contoso.sharepoint.com/sites/project-x --url "/sites/project-x/Shared Documents/Test.docx" --permanent
 ```
 
 Remove a file that is locked

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

@@ -22,7 +22,7 @@ m365 spo file retentionlabel ensure [options]
 : The site- or server-relative decoded URL of the file that should be labelled. Specify either `fileUrl` or `fileId` but not both.
 
 `-i, --fileId [fileId]`
-: The UniqueId (GUID) of the file that should be labelled. Specify either `fileUrl` or `fileId` but not both.
+: The unique ID (GUID) of the file that should be labelled. Specify either `fileUrl` or `fileId` but not both.
 
 `--name <name>`
 : Name of the retention label to apply to the file.

package/docs/docs/cmd/spo/file/file-retentionlabel-remove.mdx

@@ -22,7 +22,7 @@ m365 spo file retentionlabel remove [options]
 : The server- or site-relative decoded URL of the file of which the label should be removed. Specify either `fileUrl` or `fileId` but not both.
 
 `-i, --fileId [fileId]`
-: The UniqueId (GUID) of the file of which the label should be removed. Specify either `fileUrl` or `fileId` but not both.
+: The unique ID (GUID) of the file of which the label should be removed. Specify either `fileUrl` or `fileId` but not both.
 
 `-f, --force`
 : Don't prompt for confirming removing the retention label from a file.

package/docs/docs/cmd/spo/file/file-roleassignment-add.mdx

@@ -22,7 +22,7 @@ m365 spo file roleassignment add [options]
 : The server- or site-relative decoded URL of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
 
 `-i, --fileId [fileId]`
-: The UniqueId (GUID) of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
+: The unique ID (GUID) of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
 
 `--principalId [principalId]`
 : The SharePoint Id of the principal. It may be either a user id or group id to add a role assignment for. Specify either `upn`, `groupName`, or `principalId` but not multiple.

package/docs/docs/cmd/spo/file/file-roleassignment-remove.mdx

@@ -22,7 +22,7 @@ m365 spo file roleassignment remove [options]
 : The server- or site-relative decoded URL of the file. Specify either `fileUrl` or `fileId` but not both.
 
 `-i, --fileId [fileId]`
-: The UniqueId (GUID) of the file. Specify either `fileUrl` or `fileId` but not both.
+: The unique ID (GUID) of the file. Specify either `fileUrl` or `fileId` but not both.
 
 `--principalId [principalId]`
 : The SharePoint Id of the principal. It may be either a user id or group id. Specify either `upn`, `groupName`, `entraGroupId`, `entraGroupName`, or `principalId` but not multiple.

package/docs/docs/cmd/spo/file/file-roleinheritance-break.mdx

@@ -22,7 +22,7 @@ m365 spo file roleinheritance break [options]
 : The server- or site-relative decoded URL of the file. Specify either `fileUrl` or `fileId` but not both.
 
 `-i, --fileId [fileId]`
-: The UniqueId (GUID) of the file. Specify either `fileUrl` or `fileId` but not both.
+: The unique ID (GUID) of the file. Specify either `fileUrl` or `fileId` but not both.
 
 `-c, --clearExistingPermissions`
 : Clear all existing permissions from the file.
@@ -54,13 +54,13 @@ m365 spo file roleinheritance break [options]
 
 ## Examples
 
-Break the inheritance of a file with a specific id (UniqueId).
+Break the inheritance of a file with a specific id (unique ID).
 
 ```sh
 m365 spo file roleinheritance break --webUrl "https://contoso.sharepoint.com/sites/project-x" --fileId "b2307a39-e878-458b-bc90-03bc578531d6"
 ```
 
-Break the inheritance of a file with a specific id (UniqueId) and clear all existing permissions.
+Break the inheritance of a file with a specific id (unique ID) and clear all existing permissions.
 
 ```sh
 m365 spo file roleinheritance break --webUrl "https://contoso.sharepoint.com/sites/project-x" --fileId "b2307a39-e878-458b-bc90-03bc578531d6" --clearExistingPermissions

package/docs/docs/cmd/spo/file/file-roleinheritance-reset.mdx

@@ -22,7 +22,7 @@ m365 spo file roleinheritance reset [options]
 : The server- or site-relative decoded URL of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
 
 `-i, --fileId [fileId]`
-: The UniqueId (GUID) of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
+: The unique ID (GUID) of the file to retrieve. Specify either `fileUrl` or `fileId` but not both.
 
 `-f, --force`
 : Don't prompt for confirmation.
@@ -51,7 +51,7 @@ m365 spo file roleinheritance reset [options]
 
 ## Examples
 
-Reset inheritance of file with the specified id (UniqueId) located in the specified site.
+Reset inheritance of file with the specified id (unique ID) located in the specified site.
 
 ```sh
 m365 spo file roleinheritance reset --webUrl "https://contoso.sharepoint.com/sites/project-x" --fileId "b2307a39-e878-458b-bc90-03bc578531d6"