@pnp/cli-microsoft365 10.0.0-beta.a4e89de → 10.0.0-beta.b184dfb

package/dist/m365/entra/commands/user/user-license-add.js

@@ -7,7 +7,6 @@ var _EntraUserLicenseAddCommand_instances, _EntraUserLicenseAddCommand_initTelem
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
-import aadCommands from '../../aadCommands.js';
 import commands from '../../commands.js';
 class EntraUserLicenseAddCommand extends GraphCommand {
     get name() {
@@ -16,9 +15,6 @@ class EntraUserLicenseAddCommand extends GraphCommand {
     get description() {
         return 'Assigns a license to a user';
     }
-    alias() {
-        return [aadCommands.USER_LICENSE_ADD];
-    }
     constructor() {
         super();
         _EntraUserLicenseAddCommand_instances.add(this);
@@ -28,7 +24,6 @@ class EntraUserLicenseAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraUserLicenseAddCommand_instances, "m", _EntraUserLicenseAddCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_LICENSE_ADD, commands.USER_LICENSE_ADD);
         const addLicenses = args.options.ids.split(',').map(x => { return { "disabledPlans": [], "skuId": x }; });
         const requestBody = { "addLicenses": addLicenses, "removeLicenses": [] };
         const requestOptions = {

package/dist/m365/entra/commands/user/user-license-list.js

@@ -10,7 +10,6 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import auth from '../../../../Auth.js';
-import aadCommands from '../../aadCommands.js';
 class EntraUserLicenseListCommand extends GraphCommand {
     get name() {
         return commands.USER_LICENSE_LIST;
@@ -18,9 +17,6 @@ class EntraUserLicenseListCommand extends GraphCommand {
     get description() {
         return 'Lists the license details for a given user';
     }
-    alias() {
-        return [aadCommands.USER_LICENSE_LIST];
-    }
     defaultProperties() {
         return ['id', 'skuId', 'skuPartNumber'];
     }
@@ -34,7 +30,6 @@ class EntraUserLicenseListCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[this.resource].accessToken);
-        await this.showDeprecationWarning(logger, aadCommands.USER_LICENSE_LIST, commands.USER_LICENSE_LIST);
         if (isAppOnlyAccessToken && !args.options.userId && !args.options.userName) {
             this.handleError(`Specify at least 'userId' or 'userName' when using application permissions.`);
         }

package/dist/m365/entra/commands/user/user-license-remove.js

@@ -9,7 +9,6 @@ import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import { cli } from '../../../../cli/cli.js';
 import GraphCommand from '../../../base/GraphCommand.js';
-import aadCommands from '../../aadCommands.js';
 class EntraUserLicenseRemoveCommand extends GraphCommand {
     get name() {
         return commands.USER_LICENSE_REMOVE;
@@ -17,9 +16,6 @@ class EntraUserLicenseRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes a license from a user';
     }
-    alias() {
-        return [aadCommands.USER_LICENSE_REMOVE];
-    }
     constructor() {
         super();
         _EntraUserLicenseRemoveCommand_instances.add(this);
@@ -29,7 +25,6 @@ class EntraUserLicenseRemoveCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraUserLicenseRemoveCommand_instances, "m", _EntraUserLicenseRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_LICENSE_REMOVE, commands.USER_LICENSE_REMOVE);
         if (this.verbose) {
             await logger.logToStderr(`Removing the licenses for the user '${args.options.userId || args.options.userName}'...`);
         }

package/dist/m365/entra/commands/user/user-list.js

@@ -8,7 +8,6 @@ import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import aadCommands from '../../aadCommands.js';
 class EntraUserListCommand extends GraphCommand {
     get name() {
         return commands.USER_LIST;
@@ -16,9 +15,6 @@ class EntraUserListCommand extends GraphCommand {
     get description() {
         return 'Lists users matching specified criteria';
     }
-    alias() {
-        return [aadCommands.USER_LIST];
-    }
     allowUnknownOptions() {
         return true;
     }
@@ -34,7 +30,6 @@ class EntraUserListCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraUserListCommand_instances, "m", _EntraUserListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_LIST, commands.USER_LIST);
         try {
             let url = `${this.resource}/v1.0/users`;
             if (args.options.properties) {

package/dist/m365/entra/commands/user/user-password-validate.js

@@ -6,7 +6,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _EntraUserPasswordValidateCommand_instances, _EntraUserPasswordValidateCommand_initOptions;
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
-import aadCommands from '../../aadCommands.js';
 import commands from '../../commands.js';
 class EntraUserPasswordValidateCommand extends GraphCommand {
     get name() {
@@ -15,16 +14,12 @@ class EntraUserPasswordValidateCommand extends GraphCommand {
     get description() {
         return "Check a user's password against the organization's password validation policy";
     }
-    alias() {
-        return [aadCommands.USER_PASSWORD_VALIDATE];
-    }
     constructor() {
         super();
         _EntraUserPasswordValidateCommand_instances.add(this);
         __classPrivateFieldGet(this, _EntraUserPasswordValidateCommand_instances, "m", _EntraUserPasswordValidateCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_PASSWORD_VALIDATE, commands.USER_PASSWORD_VALIDATE);
         try {
             const requestOptions = {
                 url: `${this.resource}/beta/users/validatePassword`,

package/dist/m365/entra/commands/user/user-recyclebinitem-clear.js

@@ -9,7 +9,6 @@ import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import aadCommands from '../../aadCommands.js';
 class EntraUserRecycleBinItemClearCommand extends GraphCommand {
     get name() {
         return commands.USER_RECYCLEBINITEM_CLEAR;
@@ -17,9 +16,6 @@ class EntraUserRecycleBinItemClearCommand extends GraphCommand {
     get description() {
         return 'Removes all users from the tenant recycle bin';
     }
-    alias() {
-        return [aadCommands.USER_RECYCLEBINITEM_CLEAR];
-    }
     constructor() {
         super();
         _EntraUserRecycleBinItemClearCommand_instances.add(this);
@@ -27,7 +23,6 @@ class EntraUserRecycleBinItemClearCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraUserRecycleBinItemClearCommand_instances, "m", _EntraUserRecycleBinItemClearCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_RECYCLEBINITEM_CLEAR, commands.USER_RECYCLEBINITEM_CLEAR);
         const clearRecycleBinUsers = async () => {
             try {
                 const users = await odata.getAllItems(`${this.resource}/v1.0/directory/deletedItems/microsoft.graph.user?$select=id`);

package/dist/m365/entra/commands/user/user-recyclebinitem-list.js

@@ -1,7 +1,6 @@
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import aadCommands from '../../aadCommands.js';
 class EntraUserRecycleBinItemListCommand extends GraphCommand {
     get name() {
         return commands.USER_RECYCLEBINITEM_LIST;
@@ -9,14 +8,10 @@ class EntraUserRecycleBinItemListCommand extends GraphCommand {
     get description() {
         return 'Lists users from the recycle bin in the current tenant';
     }
-    alias() {
-        return [aadCommands.USER_RECYCLEBINITEM_LIST];
-    }
     defaultProperties() {
         return ['id', 'displayName', 'userPrincipalName'];
     }
     async commandAction(logger) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_RECYCLEBINITEM_LIST, commands.USER_RECYCLEBINITEM_LIST);
         if (this.verbose) {
             await logger.logToStderr('Retrieving users from the recycle bin...');
         }

package/dist/m365/entra/commands/user/user-recyclebinitem-remove.js

@@ -8,7 +8,6 @@ import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
-import aadCommands from '../../aadCommands.js';
 import commands from '../../commands.js';
 class EntraUserRecycleBinItemRemoveCommand extends GraphCommand {
     get name() {
@@ -17,9 +16,6 @@ class EntraUserRecycleBinItemRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes a user from the recycle bin in the current tenant';
     }
-    alias() {
-        return [aadCommands.USER_RECYCLEBINITEM_REMOVE];
-    }
     constructor() {
         super();
         _EntraUserRecycleBinItemRemoveCommand_instances.add(this);
@@ -28,7 +24,6 @@ class EntraUserRecycleBinItemRemoveCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraUserRecycleBinItemRemoveCommand_instances, "m", _EntraUserRecycleBinItemRemoveCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_RECYCLEBINITEM_REMOVE, commands.USER_RECYCLEBINITEM_REMOVE);
         const clearRecycleBinItem = async () => {
             if (this.verbose) {
                 await logger.logToStderr(`Permanently deleting user with id ${args.options.id} from Microsoft Entra ID`);

package/dist/m365/entra/commands/user/user-recyclebinitem-restore.js

@@ -8,7 +8,6 @@ import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import aadCommands from '../../aadCommands.js';
 class EntraUserRecycleBinItemRestoreCommand extends GraphCommand {
     get name() {
         return commands.USER_RECYCLEBINITEM_RESTORE;
@@ -16,9 +15,6 @@ class EntraUserRecycleBinItemRestoreCommand extends GraphCommand {
     get description() {
         return 'Restores a user from the tenant recycle bin';
     }
-    alias() {
-        return [aadCommands.USER_RECYCLEBINITEM_RESTORE];
-    }
     constructor() {
         super();
         _EntraUserRecycleBinItemRestoreCommand_instances.add(this);
@@ -26,7 +22,6 @@ class EntraUserRecycleBinItemRestoreCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraUserRecycleBinItemRestoreCommand_instances, "m", _EntraUserRecycleBinItemRestoreCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_RECYCLEBINITEM_RESTORE, commands.USER_RECYCLEBINITEM_RESTORE);
         if (this.verbose) {
             await logger.logToStderr(`Restoring user with id ${args.options.id} from the recycle bin.`);
         }

package/dist/m365/entra/commands/user/user-registrationdetails-list.js

@@ -6,7 +6,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _EntraUserRegistrationDetailsListCommand_instances, _EntraUserRegistrationDetailsListCommand_initTelemetry, _EntraUserRegistrationDetailsListCommand_initOptions, _EntraUserRegistrationDetailsListCommand_initValidators;
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import aadCommands from '../../aadCommands.js';
 import { odata } from '../../../../utils/odata.js';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { validation } from '../../../../utils/validation.js';
@@ -20,9 +19,6 @@ class EntraUserRegistrationDetailsListCommand extends GraphCommand {
     get description() {
         return 'Retrieves a list of the authentication methods registered for users';
     }
-    alias() {
-        return [aadCommands.USER_REGISTRATIONDETAILS_LIST];
-    }
     defaultProperties() {
         return ['userPrincipalName', 'methodsRegistered', 'lastUpdatedDateTime'];
     }

package/dist/m365/entra/commands/user/user-remove.js

@@ -9,7 +9,6 @@ import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import { cli } from '../../../../cli/cli.js';
 import GraphCommand from '../../../base/GraphCommand.js';
-import aadCommands from '../../aadCommands.js';
 class EntraUserRemoveCommand extends GraphCommand {
     get name() {
         return commands.USER_REMOVE;
@@ -17,9 +16,6 @@ class EntraUserRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes a specific user';
     }
-    alias() {
-        return [aadCommands.USER_REMOVE];
-    }
     constructor() {
         super();
         _EntraUserRemoveCommand_instances.add(this);
@@ -29,7 +25,6 @@ class EntraUserRemoveCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraUserRemoveCommand_instances, "m", _EntraUserRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_REMOVE, commands.USER_REMOVE);
         if (this.verbose) {
             await logger.logToStderr(`Removing user '${args.options.id || args.options.userName}'...`);
         }

package/dist/m365/entra/commands/user/user-set.js

@@ -10,7 +10,6 @@ import { accessToken } from '../../../../utils/accessToken.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
-import aadCommands from '../../aadCommands.js';
 import commands from '../../commands.js';
 class EntraUserSetCommand extends GraphCommand {
     get name() {
@@ -19,9 +18,6 @@ class EntraUserSetCommand extends GraphCommand {
     get description() {
         return 'Updates information about the specified user';
     }
-    alias() {
-        return [aadCommands.USER_SET];
-    }
     allowUnknownOptions() {
         return true;
     }
@@ -35,7 +31,6 @@ class EntraUserSetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraUserSetCommand_instances, "m", _EntraUserSetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_SET, commands.USER_SET);
         try {
             if (args.options.currentPassword) {
                 if (args.options.id && args.options.id !== accessToken.getUserIdFromAccessToken(auth.connection.accessTokens[auth.defaultResource].accessToken)) {

package/dist/m365/entra/commands/user/user-signin-list.js

@@ -9,7 +9,6 @@ import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import aadCommands from '../../aadCommands.js';
 class EntraUserSigninListCommand extends GraphCommand {
     get name() {
         return commands.USER_SIGNIN_LIST;
@@ -17,9 +16,6 @@ class EntraUserSigninListCommand extends GraphCommand {
     get description() {
         return 'Retrieves the Entra ID user sign-ins for the tenant';
     }
-    alias() {
-        return [aadCommands.USER_SIGNIN_LIST];
-    }
     constructor() {
         super();
         _EntraUserSigninListCommand_instances.add(this);
@@ -31,7 +27,6 @@ class EntraUserSigninListCommand extends GraphCommand {
         return ['id', 'userPrincipalName', 'appId', 'appDisplayName', 'createdDateTime'];
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_SIGNIN_LIST, commands.USER_SIGNIN_LIST);
         try {
             let endpoint = `${this.resource}/v1.0/auditLogs/signIns`;
             let filter = "";

package/dist/m365/entra/commands.js

@@ -41,9 +41,9 @@ export default {
     GROUP_LIST: `${prefix} group list`,
     GROUP_REMOVE: `${prefix} group remove`,
     GROUP_SET: `${prefix} group set`,
-    GROUP_USER_ADD: `${prefix} group user add`,
-    GROUP_USER_LIST: `${prefix} group user list`,
-    GROUP_USER_SET: `${prefix} group user set`,
+    GROUP_MEMBER_ADD: `${prefix} group member add`,
+    GROUP_MEMBER_LIST: `${prefix} group member list`,
+    GROUP_MEMBER_SET: `${prefix} group member set`,
     GROUPSETTING_ADD: `${prefix} groupsetting add`,
     GROUPSETTING_GET: `${prefix} groupsetting get`,
     GROUPSETTING_LIST: `${prefix} groupsetting list`,

package/dist/m365/external/commands/item/item-add.js

@@ -45,8 +45,7 @@ class ExternalItemAddCommand extends GraphCommand {
             properties: {}
         };
         // we need to rewrite the @odata properties to the correct format
-        // because . in @odata.type is interpreted by minimist as a child property
-        // we also need to extract multiple values for collections into arrays
+        // to extract multiple values for collections into arrays
         this.rewriteCollectionProperties(args.options);
         this.addUnknownOptionsToPayload(requestBody.properties, args.options);
         const requestOptions = {
@@ -81,11 +80,9 @@ class ExternalItemAddCommand extends GraphCommand {
     }
     rewriteCollectionProperties(options) {
         Object.getOwnPropertyNames(options).forEach(name => {
-            if (!name.endsWith('@odata')) {
+            if (!name.includes('@odata')) {
                 return;
             }
-            options[`${name}.type`] = options[name].type;
-            delete options[name];
             // convert the value of a collection to an array
             const nameWithoutOData = name.substring(0, name.indexOf('@odata'));
             if (options[nameWithoutOData]) {

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

@@ -0,0 +1,135 @@
+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 _FileMoveCommand_instances, _FileMoveCommand_initTelemetry, _FileMoveCommand_initOptions, _FileMoveCommand_initValidators;
+import GraphCommand from '../../base/GraphCommand.js';
+import { setTimeout } from 'timers/promises';
+import commands from '../commands.js';
+import request from '../../../request.js';
+import { spo } from '../../../utils/spo.js';
+import { urlUtil } from '../../../utils/urlUtil.js';
+import { drive } from '../../../utils/drive.js';
+import { validation } from '../../../utils/validation.js';
+class FileMoveCommand extends GraphCommand {
+    get name() {
+        return commands.MOVE;
+    }
+    get description() {
+        return 'Moves a file to another location using the Microsoft Graph';
+    }
+    constructor() {
+        super();
+        _FileMoveCommand_instances.add(this);
+        this.pollingInterval = 10000;
+        this.nameConflictBehaviorOptions = ['fail', 'replace', 'rename'];
+        __classPrivateFieldGet(this, _FileMoveCommand_instances, "m", _FileMoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _FileMoveCommand_instances, "m", _FileMoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _FileMoveCommand_instances, "m", _FileMoveCommand_initValidators).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            const { webUrl, sourceUrl, targetUrl, nameConflictBehavior, newName, verbose } = args.options;
+            const sourcePath = this.getAbsoluteUrl(webUrl, sourceUrl);
+            const destinationPath = this.getAbsoluteUrl(webUrl, targetUrl);
+            const { driveId, itemId } = await this.getDriveIdAndItemId(webUrl, sourcePath, sourceUrl, logger, verbose);
+            const targetSiteUrl = urlUtil.getTargetSiteAbsoluteUrl(webUrl, targetUrl);
+            const targetFolderUrl = this.getAbsoluteUrl(targetSiteUrl, targetUrl);
+            const { driveId: targetDriveId, itemId: targetItemId } = await this.getDriveIdAndItemId(targetSiteUrl, targetFolderUrl, targetUrl, logger, verbose);
+            const requestOptions = this.getRequestOptions(driveId, itemId, targetDriveId, targetItemId, newName, sourcePath, nameConflictBehavior);
+            if (verbose) {
+                await logger.logToStderr(`Moving file '${sourcePath}' to '${destinationPath}'...`);
+            }
+            if (driveId === targetDriveId) {
+                await request.patch(requestOptions);
+            }
+            else {
+                const response = await request.post(requestOptions);
+                await this.waitUntilCopyOperationCompleted(response.headers.location, logger);
+                const itemUrl = `${this.resource}/v1.0/drives/${driveId}/items/${itemId}`;
+                await request.delete({ url: itemUrl, headers: requestOptions.headers });
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    getAbsoluteUrl(webUrl, url) {
+        return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+    }
+    async getDriveIdAndItemId(webUrl, folderUrl, sourceUrl, logger, verbose) {
+        const siteId = await spo.getSiteId(webUrl, logger, verbose);
+        const driveDetails = await drive.getDriveByUrl(siteId, new URL(folderUrl), logger, verbose);
+        const itemId = await drive.getDriveItemId(driveDetails, new URL(folderUrl), logger, verbose);
+        return { driveId: driveDetails.id, itemId };
+    }
+    getRequestOptions(sourceDriveId, sourceItemId, targetDriveId, targetItemId, newName, sourcePath, nameConflictBehavior) {
+        const apiUrl = sourceDriveId === targetDriveId
+            ? `${this.resource}/v1.0/drives/${sourceDriveId}/items/${sourceItemId}`
+            : `${this.resource}/v1.0/drives/${sourceDriveId}/items/${sourceItemId}/copy`;
+        const queryParameters = nameConflictBehavior && nameConflictBehavior !== 'fail'
+            ? `@microsoft.graph.conflictBehavior=${nameConflictBehavior}`
+            : '';
+        const urlWithQuery = `${apiUrl}${queryParameters ? `?${queryParameters}` : ''}`;
+        const requestOptions = {
+            url: urlWithQuery,
+            headers: { accept: 'application/json;odata.metadata=none' },
+            responseType: 'json',
+            fullResponse: true,
+            data: { parentReference: { driveId: targetDriveId, id: targetItemId } }
+        };
+        if (newName) {
+            const sourceFileName = sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
+            const sourceFileExtension = sourceFileName.includes('.') ? sourceFileName.substring(sourceFileName.lastIndexOf('.')) : '';
+            const newNameExtension = newName.includes('.') ? newName.substring(newName.lastIndexOf('.')) : '';
+            requestOptions.data.name = newNameExtension ? `${newName.replace(newNameExtension, "")}${sourceFileExtension}` : `${newName}${sourceFileExtension}`;
+        }
+        return requestOptions;
+    }
+    async waitUntilCopyOperationCompleted(monitorUrl, logger) {
+        const requestOptions = {
+            url: monitorUrl,
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        if (response.status === 'completed') {
+            if (this.verbose) {
+                await logger.logToStderr('Copy operation completed succesfully. Returning...');
+            }
+            return;
+        }
+        else if (response.status === 'failed') {
+            throw response.error.message;
+        }
+        else {
+            if (this.verbose) {
+                await logger.logToStderr(`Still copying. Retrying in ${this.pollingInterval / 1000} seconds...`);
+            }
+            await setTimeout(this.pollingInterval);
+            await this.waitUntilCopyOperationCompleted(monitorUrl, logger);
+        }
+    }
+}
+_FileMoveCommand_instances = new WeakSet(), _FileMoveCommand_initTelemetry = function _FileMoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            webUrl: typeof args.options.webUrl !== 'undefined',
+            sourceUrl: typeof args.options.sourceUrl !== 'undefined',
+            targetUrl: typeof args.options.targetUrl !== 'undefined',
+            newName: typeof args.options.newName !== 'undefined',
+            nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined'
+        });
+    });
+}, _FileMoveCommand_initOptions = function _FileMoveCommand_initOptions() {
+    this.options.unshift({ option: '-u, --webUrl <webUrl>' }, { option: '-s, --sourceUrl <sourceUrl>' }, { option: '-t, --targetUrl <targetUrl>' }, { option: '--newName [newName]' }, { option: '--nameConflictBehavior [nameConflictBehavior]', autocomplete: this.nameConflictBehaviorOptions });
+}, _FileMoveCommand_initValidators = function _FileMoveCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.nameConflictBehavior && this.nameConflictBehaviorOptions.indexOf(args.options.nameConflictBehavior) === -1) {
+            return `${args.options.nameConflictBehavior} is not a valid nameConflictBehavior value. Allowed values: ${this.nameConflictBehaviorOptions.join(', ')}.`;
+        }
+        return validation.isValidSharePointUrl(args.options.webUrl);
+    });
+};
+export default new FileMoveCommand();
+//# sourceMappingURL=file-move.js.map

package/dist/m365/file/commands.js

@@ -3,6 +3,7 @@ export default {
     ADD: `${prefix} add`,
     CONVERT_PDF: `${prefix} convert pdf`,
     COPY: `${prefix} copy`,
-    LIST: `${prefix} list`
+    LIST: `${prefix} list`,
+    MOVE: `${prefix} move`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/flow/commands/environment/environment-list.js

@@ -23,8 +23,8 @@ class FlowEnvironmentListCommand extends PowerAutomateCommand {
                         e.displayName = e.properties.displayName;
                     });
                 }
-                await logger.log(res);
             }
+            await logger.log(res);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -33,13 +33,8 @@ class PaAppListCommand extends PowerAppsCommand {
                 apps.forEach(a => {
                     a.displayName = a.properties.displayName;
                 });
-                await logger.log(apps);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No apps found');
-                }
             }
+            await logger.log(apps);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/pa/commands/connector/connector-list.js

@@ -35,13 +35,8 @@ class PaConnectorListCommand extends PowerAppsCommand {
                 connectors.forEach(c => {
                     c.displayName = c.properties.displayName;
                 });
-                await logger.log(connectors);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No custom connectors found');
-                }
             }
+            await logger.log(connectors);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/pa/commands/environment/environment-list.js

@@ -28,8 +28,8 @@ class PaEnvironmentListCommand extends PowerAppsCommand {
                 res.value.forEach(e => {
                     e.displayName = e.properties.displayName;
                 });
-                await logger.log(res.value);
             }
+            await logger.log(res.value);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/pp/commands/environment/environment-list.js

@@ -47,8 +47,8 @@ class PpEnvironmentListCommand extends PowerPlatformCommand {
                 res.value.forEach(e => {
                     e.displayName = e.properties.displayName;
                 });
-                await logger.log(res.value);
             }
+            await logger.log(res.value);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spfx/commands/project/project-doctor/doctor-1.20.0.js

@@ -0,0 +1,27 @@
+import { FN002021_DEVDEP_rushstack_eslint_config } from '../project-upgrade/rules/FN002021_DEVDEP_rushstack_eslint_config.js';
+import { FN001008_DEP_react } from './rules/FN001008_DEP_react.js';
+import { FN001009_DEP_react_dom } from './rules/FN001009_DEP_react_dom.js';
+import { FN001035_DEP_fluentui_react } from './rules/FN001035_DEP_fluentui_react.js';
+import { FN002004_DEVDEP_gulp } from './rules/FN002004_DEVDEP_gulp.js';
+import { FN002007_DEVDEP_ajv } from './rules/FN002007_DEVDEP_ajv.js';
+import { FN002013_DEVDEP_types_webpack_env } from './rules/FN002013_DEVDEP_types_webpack_env.js';
+import { FN002015_DEVDEP_types_react } from './rules/FN002015_DEVDEP_types_react.js';
+import { FN002016_DEVDEP_types_react_dom } from './rules/FN002016_DEVDEP_types_react_dom.js';
+import { FN002019_DEVDEP_microsoft_rush_stack_compiler } from './rules/FN002019_DEVDEP_microsoft_rush_stack_compiler.js';
+import { FN021001_PKG_spfx_deps_versions_match_project_version } from './rules/FN021001_PKG_spfx_deps_versions_match_project_version.js';
+import { FN021013_PKG_spfx_devdeps_match_version } from './rules/FN021013_PKG_spfx_devdeps_match_version.js';
+export default [
+    new FN001008_DEP_react('17'),
+    new FN001009_DEP_react_dom('17'),
+    new FN001035_DEP_fluentui_react('^8.106.4'),
+    new FN002004_DEVDEP_gulp('4.0.2'),
+    new FN002007_DEVDEP_ajv('^6.12.5'),
+    new FN002013_DEVDEP_types_webpack_env('~1.15.2'),
+    new FN002015_DEVDEP_types_react('17'),
+    new FN002016_DEVDEP_types_react_dom('17'),
+    new FN002019_DEVDEP_microsoft_rush_stack_compiler(['4.7']),
+    new FN002021_DEVDEP_rushstack_eslint_config('4.0.1'),
+    new FN021001_PKG_spfx_deps_versions_match_project_version(false),
+    new FN021013_PKG_spfx_devdeps_match_version('1.20.2')
+];
+//# sourceMappingURL=doctor-1.20.0.js.map

package/dist/m365/spfx/commands/project/project-doctor/rules/FN002021_DEVDEP_rushstack_eslint_config.js

@@ -0,0 +1,10 @@
+import { DependencyRule } from './DependencyRule.js';
+export class FN002021_DEVDEP_rushstack_eslint_config extends DependencyRule {
+    constructor(supportedRange) {
+        super('@rushstack/eslint-config', supportedRange, true);
+    }
+    get id() {
+        return 'FN002021';
+    }
+}
+//# sourceMappingURL=FN002021_DEVDEP_rushstack_eslint_config.js.map

package/dist/m365/spfx/commands/project/project-doctor.js

@@ -70,7 +70,8 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
             '1.18.0',
             '1.18.1',
             '1.18.2',
-            '1.19.0'
+            '1.19.0',
+            '1.20.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);