@pnp/cli-microsoft365 7.0.0-beta.99e75a7 → 7.0.0-beta.aa2d71e

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

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoCommandSetAddCommand_instances, _SpoCommandSetAddCommand_initTelemetry, _SpoCommandSetAddCommand_initOptions, _SpoCommandSetAddCommand_initValidators;
+var _SpoCommandSetAddCommand_instances, _a, _SpoCommandSetAddCommand_initTelemetry, _SpoCommandSetAddCommand_initOptions, _SpoCommandSetAddCommand_initValidators;
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -78,7 +78,7 @@ class SpoCommandSetAddCommand extends SpoCommand {
         }
     }
 }
-_SpoCommandSetAddCommand_instances = new WeakSet(), _SpoCommandSetAddCommand_initTelemetry = function _SpoCommandSetAddCommand_initTelemetry() {
+_a = SpoCommandSetAddCommand, _SpoCommandSetAddCommand_instances = new WeakSet(), _SpoCommandSetAddCommand_initTelemetry = function _SpoCommandSetAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
@@ -92,29 +92,29 @@ _SpoCommandSetAddCommand_instances = new WeakSet(), _SpoCommandSetAddCommand_ini
     }, {
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-l, --listType <listType>', autocomplete: SpoCommandSetAddCommand.listTypes
+        option: '-l, --listType <listType>', autocomplete: _a.listTypes
     }, {
         option: '-i, --clientSideComponentId  <clientSideComponentId>'
     }, {
         option: '--clientSideComponentProperties  [clientSideComponentProperties]'
     }, {
-        option: '-s, --scope [scope]', autocomplete: SpoCommandSetAddCommand.scopes
+        option: '-s, --scope [scope]', autocomplete: _a.scopes
     }, {
-        option: '--location [location]', autocomplete: SpoCommandSetAddCommand.locations
+        option: '--location [location]', autocomplete: _a.locations
     });
 }, _SpoCommandSetAddCommand_initValidators = function _SpoCommandSetAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.clientSideComponentId && !validation.isValidGuid(args.options.clientSideComponentId)) {
             return `${args.options.clientSideComponentId} is not a valid GUID`;
         }
-        if (SpoCommandSetAddCommand.listTypes.indexOf(args.options.listType) < 0) {
-            return `${args.options.listType} is not a valid list type. Allowed values are ${SpoCommandSetAddCommand.listTypes.join(', ')}`;
+        if (_a.listTypes.indexOf(args.options.listType) < 0) {
+            return `${args.options.listType} is not a valid list type. Allowed values are ${_a.listTypes.join(', ')}`;
         }
-        if (args.options.scope && SpoCommandSetAddCommand.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Allowed values are ${SpoCommandSetAddCommand.scopes.join(', ')}`;
+        if (args.options.scope && _a.scopes.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid scope. Allowed values are ${_a.scopes.join(', ')}`;
         }
-        if (args.options.location && SpoCommandSetAddCommand.locations.indexOf(args.options.location) < 0) {
-            return `${args.options.location} is not a valid location. Allowed values are ${SpoCommandSetAddCommand.locations.join(', ')}`;
+        if (args.options.location && _a.locations.indexOf(args.options.location) < 0) {
+            return `${args.options.location} is not a valid location. Allowed values are ${_a.locations.join(', ')}`;
         }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });

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

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoCommandSetGetCommand_instances, _SpoCommandSetGetCommand_initTelemetry, _SpoCommandSetGetCommand_initOptions, _SpoCommandSetGetCommand_initValidators, _SpoCommandSetGetCommand_initOptionSets;
+var _SpoCommandSetGetCommand_instances, _a, _SpoCommandSetGetCommand_initTelemetry, _SpoCommandSetGetCommand_initOptions, _SpoCommandSetGetCommand_initValidators, _SpoCommandSetGetCommand_initOptionSets;
 import os from 'os';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
@@ -35,7 +35,7 @@ class SpoCommandSetGetCommand extends SpoCommand {
                 if (commandSet === undefined) {
                     throw `Command set with id ${args.options.id} can't be found.`;
                 }
-                else if (!SpoCommandSetGetCommand.allowedCommandSetLocations.some(allowedLocation => allowedLocation === commandSet.Location)) {
+                else if (!_a.allowedCommandSetLocations.some(allowedLocation => allowedLocation === commandSet.Location)) {
                     throw `Custom action with id ${args.options.id} is not a command set.`;
                 }
                 await logger.log(commandSet);
@@ -67,10 +67,10 @@ class SpoCommandSetGetCommand extends SpoCommand {
         }
     }
     getBaseFilter() {
-        return `startswith(Location,'${SpoCommandSetGetCommand.baseLocation}') and`;
+        return `startswith(Location,'${_a.baseLocation}') and`;
     }
 }
-_SpoCommandSetGetCommand_instances = new WeakSet(), _SpoCommandSetGetCommand_initTelemetry = function _SpoCommandSetGetCommand_initTelemetry() {
+_a = SpoCommandSetGetCommand, _SpoCommandSetGetCommand_instances = new WeakSet(), _SpoCommandSetGetCommand_initTelemetry = function _SpoCommandSetGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             title: typeof args.options.title !== 'undefined',
@@ -90,7 +90,7 @@ _SpoCommandSetGetCommand_instances = new WeakSet(), _SpoCommandSetGetCommand_ini
         option: '-c, --clientSideComponentId [clientSideComponentId]'
     }, {
         option: '-s, --scope [scope]',
-        autocomplete: SpoCommandSetGetCommand.scopes
+        autocomplete: _a.scopes
     });
 }, _SpoCommandSetGetCommand_initValidators = function _SpoCommandSetGetCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -100,8 +100,8 @@ _SpoCommandSetGetCommand_instances = new WeakSet(), _SpoCommandSetGetCommand_ini
         if (args.options.clientSideComponentId && !validation.isValidGuid(args.options.clientSideComponentId)) {
             return `${args.options.clientSideComponentId} is not a valid GUID.`;
         }
-        if (args.options.scope && SpoCommandSetGetCommand.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Valid scopes are ${SpoCommandSetGetCommand.scopes.join(', ')}`;
+        if (args.options.scope && _a.scopes.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid scope. Valid scopes are ${_a.scopes.join(', ')}`;
         }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });
@@ -110,6 +110,6 @@ _SpoCommandSetGetCommand_instances = new WeakSet(), _SpoCommandSetGetCommand_ini
 };
 SpoCommandSetGetCommand.scopes = ['All', 'Site', 'Web'];
 SpoCommandSetGetCommand.baseLocation = 'ClientSideExtension.ListViewCommandSet';
-SpoCommandSetGetCommand.allowedCommandSetLocations = [SpoCommandSetGetCommand.baseLocation, `${SpoCommandSetGetCommand.baseLocation}.CommandBar`, `${SpoCommandSetGetCommand.baseLocation}.ContextMenu`];
+SpoCommandSetGetCommand.allowedCommandSetLocations = [_a.baseLocation, `${_a.baseLocation}.CommandBar`, `${_a.baseLocation}.ContextMenu`];
 export default new SpoCommandSetGetCommand();
 //# sourceMappingURL=commandset-get.js.map

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

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoCommandSetListCommand_instances, _SpoCommandSetListCommand_initTelemetry, _SpoCommandSetListCommand_initOptions, _SpoCommandSetListCommand_initValidators;
+var _SpoCommandSetListCommand_instances, _a, _SpoCommandSetListCommand_initTelemetry, _SpoCommandSetListCommand_initOptions, _SpoCommandSetListCommand_initValidators;
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -38,7 +38,7 @@ class SpoCommandSetListCommand extends SpoCommand {
         }
     }
 }
-_SpoCommandSetListCommand_instances = new WeakSet(), _SpoCommandSetListCommand_initTelemetry = function _SpoCommandSetListCommand_initTelemetry() {
+_a = SpoCommandSetListCommand, _SpoCommandSetListCommand_instances = new WeakSet(), _SpoCommandSetListCommand_initTelemetry = function _SpoCommandSetListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             scope: args.options.scope || 'All'
@@ -49,12 +49,12 @@ _SpoCommandSetListCommand_instances = new WeakSet(), _SpoCommandSetListCommand_i
         option: '-u, --webUrl <webUrl>'
     }, {
         option: '-s, --scope [scope]',
-        autocomplete: SpoCommandSetListCommand.scopes
+        autocomplete: _a.scopes
     });
 }, _SpoCommandSetListCommand_initValidators = function _SpoCommandSetListCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.scope && SpoCommandSetListCommand.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Valid scopes are ${SpoCommandSetListCommand.scopes.join(', ')}`;
+        if (args.options.scope && _a.scopes.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid scope. Valid scopes are ${_a.scopes.join(', ')}`;
         }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });

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

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoCommandSetRemoveCommand_instances, _SpoCommandSetRemoveCommand_initTelemetry, _SpoCommandSetRemoveCommand_initOptions, _SpoCommandSetRemoveCommand_initValidators, _SpoCommandSetRemoveCommand_initOptionSets;
+var _SpoCommandSetRemoveCommand_instances, _a, _SpoCommandSetRemoveCommand_initTelemetry, _SpoCommandSetRemoveCommand_initOptions, _SpoCommandSetRemoveCommand_initValidators, _SpoCommandSetRemoveCommand_initOptionSets;
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -87,7 +87,7 @@ class SpoCommandSetRemoveCommand extends SpoCommand {
         }
     }
 }
-_SpoCommandSetRemoveCommand_instances = new WeakSet(), _SpoCommandSetRemoveCommand_initTelemetry = function _SpoCommandSetRemoveCommand_initTelemetry() {
+_a = SpoCommandSetRemoveCommand, _SpoCommandSetRemoveCommand_instances = new WeakSet(), _SpoCommandSetRemoveCommand_initTelemetry = function _SpoCommandSetRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             title: typeof args.options.title !== 'undefined',
@@ -107,7 +107,7 @@ _SpoCommandSetRemoveCommand_instances = new WeakSet(), _SpoCommandSetRemoveComma
     }, {
         option: '-c, --clientSideComponentId  [clientSideComponentId]'
     }, {
-        option: '-s, --scope [scope]', autocomplete: SpoCommandSetRemoveCommand.scopes
+        option: '-s, --scope [scope]', autocomplete: _a.scopes
     }, {
         option: '-f, --force'
     });
@@ -119,8 +119,8 @@ _SpoCommandSetRemoveCommand_instances = new WeakSet(), _SpoCommandSetRemoveComma
         if (args.options.clientSideComponentId && !validation.isValidGuid(args.options.clientSideComponentId)) {
             return `${args.options.clientSideComponentId} is not a valid GUID`;
         }
-        if (args.options.scope && SpoCommandSetRemoveCommand.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Allowed values are ${SpoCommandSetRemoveCommand.scopes.join(', ')}`;
+        if (args.options.scope && _a.scopes.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid scope. Allowed values are ${_a.scopes.join(', ')}`;
         }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });

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

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoCommandSetSetCommand_instances, _SpoCommandSetSetCommand_initTelemetry, _SpoCommandSetSetCommand_initOptions, _SpoCommandSetSetCommand_initValidators, _SpoCommandSetSetCommand_initOptionSets;
+var _SpoCommandSetSetCommand_instances, _a, _SpoCommandSetSetCommand_initTelemetry, _SpoCommandSetSetCommand_initOptions, _SpoCommandSetSetCommand_initValidators, _SpoCommandSetSetCommand_initOptionSets;
 import commands from '../../commands.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -109,7 +109,7 @@ class SpoCommandSetSetCommand extends SpoCommand {
         }
     }
 }
-_SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_initTelemetry = function _SpoCommandSetSetCommand_initTelemetry() {
+_a = SpoCommandSetSetCommand, _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_initTelemetry = function _SpoCommandSetSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             title: typeof args.options.title !== 'undefined',
@@ -136,13 +136,13 @@ _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_ini
     }, {
         option: '--newTitle [newTitle]'
     }, {
-        option: '-l, --listType [listType]', autocomplete: SpoCommandSetSetCommand.listTypes
+        option: '-l, --listType [listType]', autocomplete: _a.listTypes
     }, {
         option: '--clientSideComponentProperties  [clientSideComponentProperties]'
     }, {
-        option: '-s, --scope [scope]', autocomplete: SpoCommandSetSetCommand.scopes
+        option: '-s, --scope [scope]', autocomplete: _a.scopes
     }, {
-        option: '--location [location]', autocomplete: SpoCommandSetSetCommand.locations
+        option: '--location [location]', autocomplete: _a.locations
     });
 }, _SpoCommandSetSetCommand_initValidators = function _SpoCommandSetSetCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -155,14 +155,14 @@ _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_ini
         if (args.options.newClientSideComponentId && !validation.isValidGuid(args.options.newClientSideComponentId)) {
             return `${args.options.newClientSideComponentId} is not a valid GUID`;
         }
-        if (args.options.listType && SpoCommandSetSetCommand.listTypes.indexOf(args.options.listType) < 0) {
-            return `${args.options.listType} is not a valid list type. Allowed values are ${SpoCommandSetSetCommand.listTypes.join(', ')}`;
+        if (args.options.listType && _a.listTypes.indexOf(args.options.listType) < 0) {
+            return `${args.options.listType} is not a valid list type. Allowed values are ${_a.listTypes.join(', ')}`;
         }
-        if (args.options.scope && SpoCommandSetSetCommand.scopes.indexOf(args.options.scope) < 0) {
-            return `${args.options.scope} is not a valid scope. Allowed values are ${SpoCommandSetSetCommand.scopes.join(', ')}`;
+        if (args.options.scope && _a.scopes.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid scope. Allowed values are ${_a.scopes.join(', ')}`;
         }
-        if (args.options.location && SpoCommandSetSetCommand.locations.indexOf(args.options.location) < 0) {
-            return `${args.options.location} is not a valid location. Allowed values are ${SpoCommandSetSetCommand.locations.join(', ')}`;
+        if (args.options.location && _a.locations.indexOf(args.options.location) < 0) {
+            return `${args.options.location} is not a valid location. Allowed values are ${_a.locations.join(', ')}`;
         }
         if (!args.options.newTitle && !args.options.listType && !args.options.clientSideComponentProperties && !args.options.location && !args.options.newClientSideComponentId) {
             return `Please specify option to be updated`;

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

@@ -3,17 +3,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoFileMoveCommand_instances, _SpoFileMoveCommand_initTelemetry, _SpoFileMoveCommand_initOptions, _SpoFileMoveCommand_initValidators;
-import url from 'url';
-import { Cli } from '../../../../cli/Cli.js';
+var _SpoFileMoveCommand_instances, _SpoFileMoveCommand_initTelemetry, _SpoFileMoveCommand_initOptions, _SpoFileMoveCommand_initValidators, _SpoFileMoveCommand_initOptionSets;
 import request from '../../../../request.js';
-import { formatting } from '../../../../utils/formatting.js';
-import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import removeCommand from './file-remove.js';
 class SpoFileMoveCommand extends SpoCommand {
     get name() {
         return commands.FILE_MOVE;
@@ -24,143 +19,124 @@ class SpoFileMoveCommand extends SpoCommand {
     constructor() {
         super();
         _SpoFileMoveCommand_instances.add(this);
+        this.nameConflictBehaviorOptions = ['fail', 'replace', 'rename'];
         __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initOptionSets).call(this);
     }
     getExcludedOptionsWithUrls() {
         return ['targetUrl', 'sourceUrl'];
     }
     async commandAction(logger, args) {
-        const webUrl = args.options.webUrl;
-        const parsedUrl = url.parse(webUrl);
-        const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
         try {
-            const serverRelativePath = urlUtil.getServerRelativePath(webUrl, args.options.sourceUrl);
-            // Check if the source file exists.
-            // Called on purpose, we explicitly check if user specified file
-            // in the sourceUrl option.
-            // The CreateCopyJobs endpoint accepts file, folder or batch from both.
-            // A user might enter folder instead of file as source url by mistake
-            // then there are edge cases when deleteIfAlreadyExists flag is set
-            // the user can receive misleading error message.
-            await this.fileExists(webUrl, serverRelativePath);
-            if (args.options.deleteIfAlreadyExists) {
-                // try delete target file, if deleteIfAlreadyExists flag is set
-                const filename = args.options.sourceUrl.replace(/^.*[\\\/]/, '');
-                await this.recycleFile(tenantUrl, args.options.targetUrl, filename, logger);
+            const sourcePath = await this.getSourcePath(logger, args.options);
+            if (this.verbose) {
+                await logger.logToStderr(`Moving file ${sourcePath} to ${args.options.targetUrl}...`);
+            }
+            const absoluteSourcePath = this.getAbsoluteUrl(args.options.webUrl, sourcePath);
+            let absoluteTargetPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl) + '/';
+            if (args.options.newName) {
+                absoluteTargetPath += args.options.newName;
+            }
+            else {
+                // Keep the original file name
+                absoluteTargetPath += sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
             }
-            // all preconditions met, now create copy job
-            const sourceAbsoluteUrl = urlUtil.urlCombine(tenantUrl, serverRelativePath);
-            const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-            const requestUrl = urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
             const requestOptions = {
-                url: requestUrl,
+                url: `${args.options.webUrl}/_api/SP.MoveCopyUtil.MoveFileByPath`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },
+                responseType: 'json',
                 data: {
-                    exportObjectUris: [sourceAbsoluteUrl],
-                    destinationUri: urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
+                    srcPath: {
+                        DecodedUrl: absoluteSourcePath
+                    },
+                    destPath: {
+                        DecodedUrl: absoluteTargetPath
+                    },
+                    overwrite: args.options.nameConflictBehavior === 'replace',
                     options: {
-                        "AllowSchemaMismatch": allowSchemaMismatch,
-                        "IgnoreVersionHistory": true,
-                        "IsMoveMode": true
+                        KeepBoth: args.options.nameConflictBehavior === 'rename',
+                        ShouldBypassSharedLocks: !!args.options.bypassSharedLock,
+                        RetainEditorAndModifiedOnMove: !!args.options.retainEditorAndModified
                     }
-                },
-                responseType: 'json'
+                }
             };
-            const jobInfo = await request.post(requestOptions);
-            const copyJobInfo = jobInfo.value[0];
-            const progressPollInterval = 1800; // 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
-            await new Promise((resolve, reject) => {
-                setTimeout(() => {
-                    spo.waitUntilCopyJobFinished({
-                        copyJobInfo,
-                        siteUrl: webUrl,
-                        pollingInterval: progressPollInterval,
-                        resolve,
-                        reject,
-                        logger,
-                        debug: this.debug,
-                        verbose: this.verbose
-                    });
-                }, progressPollInterval);
-            });
+            await request.post(requestOptions);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    /**
-     * Checks if a file exists on the server relative url
-     */
-    fileExists(webUrl, sourceUrl) {
-        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(sourceUrl)}')/`;
+    async getSourcePath(logger, options) {
+        if (options.sourceUrl) {
+            return urlUtil.getServerRelativePath(options.webUrl, options.sourceUrl);
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving server-relative path for file with ID '${options.sourceId}'...`);
+        }
         const requestOptions = {
-            url: requestUrl,
-            method: 'GET',
+            url: `${options.webUrl}/_api/Web/GetFileById('${options.sourceId}')?$select=ServerRelativePath`,
             headers: {
-                'accept': 'application/json;odata=nometadata'
+                accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
-        return request.get(requestOptions);
+        const file = await request.get(requestOptions);
+        return file.ServerRelativePath.DecodedUrl;
     }
-    /**
-     * Moves file in the site recycle bin
-     */
-    async recycleFile(tenantUrl, targetUrl, filename, logger) {
-        const targetFolderAbsoluteUrl = urlUtil.urlCombine(tenantUrl, targetUrl);
-        // since the target WebFullUrl is unknown we can use getRequestDigest
-        // to get it from target folder absolute url.
-        // Similar approach used here Microsoft.SharePoint.Client.Web.WebUrlFromFolderUrlDirect
-        const contextResponse = await spo.getRequestDigest(targetFolderAbsoluteUrl);
-        if (this.debug) {
-            await logger.logToStderr(`contextResponse.WebFullUrl: ${contextResponse.WebFullUrl}`);
-        }
-        const targetFileServerRelativeUrl = `${urlUtil.getServerRelativePath(contextResponse.WebFullUrl, targetUrl)}/${filename}`;
-        const removeOptions = {
-            webUrl: contextResponse.WebFullUrl,
-            url: targetFileServerRelativeUrl,
-            recycle: true,
-            force: true,
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        try {
-            await Cli.executeCommand(removeCommand, { options: { ...removeOptions, _: [] } });
-        }
-        catch (err) {
-            if (err !== undefined && err.message !== undefined && err.message.includes('does not exist')) {
-            }
-            else {
-                throw err;
-            }
-        }
+    getAbsoluteUrl(webUrl, url) {
+        return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
     }
 }
 _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry = function _SpoFileMoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            deleteIfAlreadyExists: args.options.deleteIfAlreadyExists || false,
-            allowSchemaMismatch: args.options.allowSchemaMismatch || false
+            sourceUrl: typeof args.options.sourceUrl !== 'undefined',
+            sourceId: typeof args.options.sourceId !== 'undefined',
+            newName: typeof args.options.newName !== 'undefined',
+            nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined',
+            retainEditorAndModified: !!args.options.retainEditorAndModified,
+            bypassSharedLock: !!args.options.bypassSharedLock
         });
     });
 }, _SpoFileMoveCommand_initOptions = function _SpoFileMoveCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-s, --sourceUrl <sourceUrl>'
+        option: '-s, --sourceUrl [sourceUrl]'
+    }, {
+        option: '-i, --sourceId [sourceId]'
     }, {
         option: '-t, --targetUrl <targetUrl>'
     }, {
-        option: '--deleteIfAlreadyExists'
+        option: '--newName [newName]'
+    }, {
+        option: '--nameConflictBehavior [nameConflictBehavior]',
+        autocomplete: this.nameConflictBehaviorOptions
     }, {
-        option: '--allowSchemaMismatch'
+        option: '--retainEditorAndModified'
+    }, {
+        option: '--bypassSharedLock'
     });
 }, _SpoFileMoveCommand_initValidators = function _SpoFileMoveCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
+    this.validators.push(async (args) => {
+        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.sourceId && !validation.isValidGuid(args.options.sourceId)) {
+            return `'${args.options.sourceId}' is not a valid GUID for sourceId.`;
+        }
+        if (args.options.nameConflictBehavior && this.nameConflictBehaviorOptions.indexOf(args.options.nameConflictBehavior) === -1) {
+            return `'${args.options.nameConflictBehavior}' is not a valid value for nameConflictBehavior. Allowed values are: ${this.nameConflictBehaviorOptions.join(', ')}.`;
+        }
+        return true;
+    });
+}, _SpoFileMoveCommand_initOptionSets = function _SpoFileMoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 };
 export default new SpoFileMoveCommand();
 //# sourceMappingURL=file-move.js.map

package/dist/m365/spo/commands/file/file-sharinglink-add.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoFileSharingLinkAddCommand_instances, _SpoFileSharingLinkAddCommand_initTelemetry, _SpoFileSharingLinkAddCommand_initOptions, _SpoFileSharingLinkAddCommand_initValidators, _SpoFileSharingLinkAddCommand_initOptionSets;
+var _SpoFileSharingLinkAddCommand_instances, _a, _SpoFileSharingLinkAddCommand_initTelemetry, _SpoFileSharingLinkAddCommand_initOptions, _SpoFileSharingLinkAddCommand_initValidators, _SpoFileSharingLinkAddCommand_initOptionSets;
 import request from '../../../../request.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
@@ -50,7 +50,7 @@ class SpoFileSharingLinkAddCommand extends SpoCommand {
         }
     }
 }
-_SpoFileSharingLinkAddCommand_instances = new WeakSet(), _SpoFileSharingLinkAddCommand_initTelemetry = function _SpoFileSharingLinkAddCommand_initTelemetry() {
+_a = SpoFileSharingLinkAddCommand, _SpoFileSharingLinkAddCommand_instances = new WeakSet(), _SpoFileSharingLinkAddCommand_initTelemetry = function _SpoFileSharingLinkAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             fileId: typeof args.options.fileId !== 'undefined',
@@ -68,12 +68,12 @@ _SpoFileSharingLinkAddCommand_instances = new WeakSet(), _SpoFileSharingLinkAddC
         option: '--fileUrl [fileUrl]'
     }, {
         option: '--type <type>',
-        autocomplete: SpoFileSharingLinkAddCommand.types
+        autocomplete: _a.types
     }, {
         option: '--expirationDateTime [expirationDateTime]'
     }, {
         option: '--scope [scope]',
-        autocomplete: SpoFileSharingLinkAddCommand.scopes
+        autocomplete: _a.scopes
     });
 }, _SpoFileSharingLinkAddCommand_initValidators = function _SpoFileSharingLinkAddCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -84,12 +84,12 @@ _SpoFileSharingLinkAddCommand_instances = new WeakSet(), _SpoFileSharingLinkAddC
         if (args.options.fileId && !validation.isValidGuid(args.options.fileId)) {
             return `${args.options.fileId} is not a valid GUID`;
         }
-        if (SpoFileSharingLinkAddCommand.types.indexOf(args.options.type) < 0) {
-            return `'${args.options.type}' is not a valid type. Allowed types are ${SpoFileSharingLinkAddCommand.types.join(', ')}`;
+        if (_a.types.indexOf(args.options.type) < 0) {
+            return `'${args.options.type}' is not a valid type. Allowed types are ${_a.types.join(', ')}`;
         }
         if (args.options.scope &&
-            SpoFileSharingLinkAddCommand.scopes.indexOf(args.options.scope) < 0) {
-            return `'${args.options.scope}' is not a valid scope. Allowed scopes are ${SpoFileSharingLinkAddCommand.scopes.join(', ')}`;
+            _a.scopes.indexOf(args.options.scope) < 0) {
+            return `'${args.options.scope}' is not a valid scope. Allowed scopes are ${_a.scopes.join(', ')}`;
         }
         if (args.options.scope && args.options.scope !== 'anonymous' && args.options.expirationDateTime) {
             return `Option expirationDateTime can only be used for links with scope 'anonymous'.`;

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

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoFileSharingLinkListCommand_instances, _SpoFileSharingLinkListCommand_initTelemetry, _SpoFileSharingLinkListCommand_initOptions, _SpoFileSharingLinkListCommand_initValidators, _SpoFileSharingLinkListCommand_initOptionSets;
+var _SpoFileSharingLinkListCommand_instances, _a, _SpoFileSharingLinkListCommand_initTelemetry, _SpoFileSharingLinkListCommand_initOptions, _SpoFileSharingLinkListCommand_initValidators, _SpoFileSharingLinkListCommand_initOptionSets;
 import { Cli } from '../../../../cli/Cli.js';
 import { odata } from '../../../../utils/odata.js';
 import { spo } from '../../../../utils/spo.js';
@@ -59,7 +59,7 @@ class SpoFileSharingLinkListCommand extends SpoCommand {
         }
     }
 }
-_SpoFileSharingLinkListCommand_instances = new WeakSet(), _SpoFileSharingLinkListCommand_initTelemetry = function _SpoFileSharingLinkListCommand_initTelemetry() {
+_a = SpoFileSharingLinkListCommand, _SpoFileSharingLinkListCommand_instances = new WeakSet(), _SpoFileSharingLinkListCommand_initTelemetry = function _SpoFileSharingLinkListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             fileId: typeof args.options.fileId !== 'undefined',
@@ -76,7 +76,7 @@ _SpoFileSharingLinkListCommand_instances = new WeakSet(), _SpoFileSharingLinkLis
         option: '--fileUrl [fileUrl]'
     }, {
         option: '-s, --scope [scope]',
-        autocomplete: SpoFileSharingLinkListCommand.allowedScopes
+        autocomplete: _a.allowedScopes
     });
 }, _SpoFileSharingLinkListCommand_initValidators = function _SpoFileSharingLinkListCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -87,8 +87,8 @@ _SpoFileSharingLinkListCommand_instances = new WeakSet(), _SpoFileSharingLinkLis
         if (args.options.fileId && !validation.isValidGuid(args.options.fileId)) {
             return `${args.options.fileId} is not a valid GUID`;
         }
-        if (args.options.scope && SpoFileSharingLinkListCommand.allowedScopes.indexOf(args.options.scope) === -1) {
-            return `'${args.options.scope}' is not a valid scope. Allowed values are: ${SpoFileSharingLinkListCommand.allowedScopes.join(',')}`;
+        if (args.options.scope && _a.allowedScopes.indexOf(args.options.scope) === -1) {
+            return `'${args.options.scope}' is not a valid scope. Allowed values are: ${_a.allowedScopes.join(',')}`;
         }
         return true;
     });