@pnp/cli-microsoft365 5.8.0 → 5.9.0-beta.005c47a

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFileCheckoutCommand_instances, _SpoFileCheckoutCommand_initTelemetry, _SpoFileCheckoutCommand_initOptions, _SpoFileCheckoutCommand_initValidators, _SpoFileCheckoutCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFileCheckoutCommand extends SpoCommand_1.default {
@@ -76,12 +76,12 @@ _SpoFileCheckoutCommand_instances = new WeakSet(), _SpoFileCheckoutCommand_initT
     });
 }, _SpoFileCheckoutCommand_initValidators = function _SpoFileCheckoutCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.id) {
-            if (!utils_1.validation.isValidGuid(args.options.id)) {
+            if (!validation_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }

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

@@ -17,7 +17,9 @@ var _SpoFileCopyCommand_instances, _SpoFileCopyCommand_initTelemetry, _SpoFileCo
 Object.defineProperty(exports, "__esModule", { value: true });
 const url = require("url");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFileCopyCommand extends SpoCommand_1.default {
@@ -57,9 +59,9 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
                     yield this.recycleFile(tenantUrl, args.options.targetUrl, filename, logger);
                 }
                 // all preconditions met, now create copy job
-                const sourceAbsoluteUrl = utils_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
+                const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
                 const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-                const requestUrl = utils_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
+                const requestUrl = urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
                 const requestOptions = {
                     url: requestUrl,
                     headers: {
@@ -67,7 +69,7 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
                     },
                     data: {
                         exportObjectUris: [sourceAbsoluteUrl],
-                        destinationUri: utils_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
+                        destinationUri: urlUtil_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
                         options: {
                             "AllowSchemaMismatch": allowSchemaMismatch,
                             "IgnoreVersionHistory": true
@@ -81,7 +83,7 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
                     const copyJobInfo = jobInfo.value[0];
                     const progressPollInterval = 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
                     setTimeout(() => {
-                        utils_1.spo.waitUntilCopyJobFinished({
+                        spo_1.spo.waitUntilCopyJobFinished({
                             copyJobInfo,
                             siteUrl: webUrl,
                             pollingInterval: progressPollInterval,
@@ -122,11 +124,11 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
      */
     recycleFile(tenantUrl, targetUrl, filename, logger) {
         return new Promise((resolve, reject) => {
-            const targetFolderAbsoluteUrl = utils_1.urlUtil.urlCombine(tenantUrl, targetUrl);
+            const targetFolderAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(tenantUrl, targetUrl);
             // since the target WebFullUrl is unknown we can use getRequestDigestForSite
             // to get it from target folder absolute url.
             // Similar approach used here Microsoft.SharePoint.Client.Web.WebUrlFromFolderUrlDirect
-            utils_1.spo
+            spo_1.spo
                 .getRequestDigest(targetFolderAbsoluteUrl)
                 .then((contextResponse) => {
                 if (this.debug) {
@@ -188,7 +190,7 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
         option: '--allowSchemaMismatch'
     });
 }, _SpoFileCopyCommand_initValidators = function _SpoFileCopyCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new SpoFileCopyCommand();
 //# sourceMappingURL=file-copy.js.map

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

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFileGetCommand extends SpoCommand_1.default {
@@ -140,12 +140,12 @@ _SpoFileGetCommand_instances = new WeakSet(), _SpoFileGetCommand_initTelemetry =
     });
 }, _SpoFileGetCommand_initValidators = function _SpoFileGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.id) {
-            if (!utils_1.validation.isValidGuid(args.options.id)) {
+            if (!validation_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFileListCommand_instances, _SpoFileListCommand_initTelemetry, _SpoFileListCommand_initOptions, _SpoFileListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFileListCommand extends SpoCommand_1.default {
@@ -51,7 +52,7 @@ class SpoFileListCommand extends SpoCommand_1.default {
     getFiles(folderUrl, args, files = { value: [] }) {
         // If --recursive option is specified, retrieve both Files and Folder details, otherwise only Files.
         const expandParameters = args.options.recursive ? 'Files,Folders' : 'Files';
-        let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${utils_1.formatting.encodeQueryParameter(folderUrl)}')?$expand=${expandParameters}`;
+        let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderUrl)}')?$expand=${expandParameters}`;
         if (args.options.output !== 'json') {
             requestUrl += '&$select=Files/UniqueId,Files/Name,Files/ServerRelativeUrl';
         }
@@ -94,7 +95,7 @@ _SpoFileListCommand_instances = new WeakSet(), _SpoFileListCommand_initTelemetry
         option: '-r, --recursive'
     });
 }, _SpoFileListCommand_initValidators = function _SpoFileListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new SpoFileListCommand();
 //# sourceMappingURL=file-list.js.map

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

@@ -17,7 +17,9 @@ var _SpoFileMoveCommand_instances, _SpoFileMoveCommand_initTelemetry, _SpoFileMo
 Object.defineProperty(exports, "__esModule", { value: true });
 const url = require("url");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFileMoveCommand extends SpoCommand_1.default {
@@ -57,9 +59,9 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
                     yield this.recycleFile(tenantUrl, args.options.targetUrl, filename, logger);
                 }
                 // all preconditions met, now create copy job
-                const sourceAbsoluteUrl = utils_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
+                const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
                 const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-                const requestUrl = utils_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
+                const requestUrl = urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
                 const requestOptions = {
                     url: requestUrl,
                     headers: {
@@ -67,7 +69,7 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
                     },
                     data: {
                         exportObjectUris: [sourceAbsoluteUrl],
-                        destinationUri: utils_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
+                        destinationUri: urlUtil_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
                         options: {
                             "AllowSchemaMismatch": allowSchemaMismatch,
                             "IgnoreVersionHistory": true,
@@ -82,7 +84,7 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
                 const progressPollInterval = 1800; // 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
                 yield new Promise((resolve, reject) => {
                     setTimeout(() => {
-                        utils_1.spo.waitUntilCopyJobFinished({
+                        spo_1.spo.waitUntilCopyJobFinished({
                             copyJobInfo,
                             siteUrl: webUrl,
                             pollingInterval: progressPollInterval,
@@ -123,11 +125,11 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
      */
     recycleFile(tenantUrl, targetUrl, filename, logger) {
         return new Promise((resolve, reject) => {
-            const targetFolderAbsoluteUrl = utils_1.urlUtil.urlCombine(tenantUrl, targetUrl);
+            const targetFolderAbsoluteUrl = urlUtil_1.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
-            utils_1.spo.getRequestDigest(targetFolderAbsoluteUrl)
+            spo_1.spo.getRequestDigest(targetFolderAbsoluteUrl)
                 .then((contextResponse) => {
                 if (this.debug) {
                     logger.logToStderr(`contextResponse.WebFullUrl: ${contextResponse.WebFullUrl}`);
@@ -188,7 +190,7 @@ _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry
         option: '--allowSchemaMismatch'
     });
 }, _SpoFileMoveCommand_initValidators = function _SpoFileMoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new SpoFileMoveCommand();
 //# sourceMappingURL=file-move.js.map

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileRemoveCommand_instances, _SpoFileRemoveCommand_initTelemetry, _SpoFileRemoveCommand_initOptions, _SpoFileRemoveCommand_initValidators, _SpoFileRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFileRemoveCommand extends SpoCommand_1.default {
@@ -86,7 +86,7 @@ class SpoFileRemoveCommand extends SpoCommand_1.default {
                 yield removeFile();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -122,12 +122,12 @@ _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelem
     });
 }, _SpoFileRemoveCommand_initValidators = function _SpoFileRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.id &&
-            !utils_1.validation.isValidGuid(args.options.id)) {
+            !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileRenameCommand_instances, _SpoFileRenameCommand_initTelemetry, _SpoFileRenameCommand_initOptions, _SpoFileRenameCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const removeCommand = require('./file-remove');
@@ -38,7 +39,7 @@ class SpoFileRenameCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const webUrl = args.options.webUrl;
-            const originalFileServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.sourceUrl);
+            const originalFileServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.sourceUrl);
             try {
                 yield this.getFile(originalFileServerRelativeUrl, webUrl);
                 if (args.options.force) {
@@ -78,7 +79,7 @@ class SpoFileRenameCommand extends SpoCommand_1.default {
         return request_1.default.get(requestOptions);
     }
     deleteFile(webUrl, sourceUrl, targetFileName) {
-        const targetFileServerRelativeUrl = `${utils_1.urlUtil.getServerRelativePath(webUrl, sourceUrl.substring(0, sourceUrl.lastIndexOf('/')))}/${targetFileName}`;
+        const targetFileServerRelativeUrl = `${urlUtil_1.urlUtil.getServerRelativePath(webUrl, sourceUrl.substring(0, sourceUrl.lastIndexOf('/')))}/${targetFileName}`;
         const options = {
             webUrl: webUrl,
             url: targetFileServerRelativeUrl,
@@ -87,7 +88,7 @@ class SpoFileRenameCommand extends SpoCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(removeCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
+        return Cli_1.Cli.executeCommandWithOutput(removeCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
             .then(_ => {
             return Promise.resolve();
         }, (err) => {
@@ -115,7 +116,7 @@ _SpoFileRenameCommand_instances = new WeakSet(), _SpoFileRenameCommand_initTelem
         option: '--force'
     });
 }, _SpoFileRenameCommand_initValidators = function _SpoFileRenameCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new SpoFileRenameCommand();
 //# sourceMappingURL=file-rename.js.map

package/dist/m365/spo/commands/file/file-roleinheritance-reset.js

@@ -0,0 +1,125 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoFileRoleInheritanceResetCommand_instances, _SpoFileRoleInheritanceResetCommand_initTelemetry, _SpoFileRoleInheritanceResetCommand_initOptions, _SpoFileRoleInheritanceResetCommand_initValidators, _SpoFileRoleInheritanceResetCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const formatting_1 = require("../../../../utils/formatting");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const SpoFileGetCommand = require("./file-get");
+class SpoFileRoleInheritanceResetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFileRoleInheritanceResetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFileRoleInheritanceResetCommand_instances, "m", _SpoFileRoleInheritanceResetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFileRoleInheritanceResetCommand_instances, "m", _SpoFileRoleInheritanceResetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFileRoleInheritanceResetCommand_instances, "m", _SpoFileRoleInheritanceResetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileRoleInheritanceResetCommand_instances, "m", _SpoFileRoleInheritanceResetCommand_initOptionSets).call(this);
+    }
+    get name() {
+        return commands_1.default.FILE_ROLEINHERITANCE_RESET;
+    }
+    get description() {
+        return 'Restores the role inheritance of a file';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const resetFileRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const fileURL = yield this.getFileURL(args);
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/resetroleinheritance`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield resetFileRoleInheritance();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to reset the role inheritance of file ${args.options.fileUrl || args.options.fileId} located in site ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield resetFileRoleInheritance();
+                }
+            }
+        });
+    }
+    getFileURL(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.fileUrl) {
+                return args.options.fileUrl;
+            }
+            const options = {
+                webUrl: args.options.webUrl,
+                id: args.options.fileId,
+                output: 'json',
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoFileGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            const getFileOutput = JSON.parse(output.stdout);
+            return getFileOutput.ServerRelativeUrl;
+        });
+    }
+}
+_SpoFileRoleInheritanceResetCommand_instances = new WeakSet(), _SpoFileRoleInheritanceResetCommand_initTelemetry = function _SpoFileRoleInheritanceResetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            fileUrl: typeof args.options.fileUrl !== 'undefined',
+            fileId: typeof args.options.fileId !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoFileRoleInheritanceResetCommand_initOptions = function _SpoFileRoleInheritanceResetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--fileUrl [fileUrl]'
+    }, {
+        option: 'i, --fileId [fileId]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoFileRoleInheritanceResetCommand_initValidators = function _SpoFileRoleInheritanceResetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.fileId && !validation_1.validation.isValidGuid(args.options.fileId)) {
+            return `${args.options.fileId} is not a valid GUID`;
+        }
+        return true;
+    }));
+}, _SpoFileRoleInheritanceResetCommand_initOptionSets = function _SpoFileRoleInheritanceResetCommand_initOptionSets() {
+    this.optionSets.push(['fileId', 'fileUrl']);
+};
+module.exports = new SpoFileRoleInheritanceResetCommand();
+//# sourceMappingURL=file-roleinheritance-reset.js.map

package/dist/m365/spo/commands/file/file-sharinginfo-get.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFileSharinginfoGetCommand_instances, _SpoFileSharinginfoGetCommand_initTelemetry, _SpoFileSharinginfoGetCommand_initOptions, _SpoFileSharinginfoGetCommand_initValidators, _SpoFileSharinginfoGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const FileSharingPrincipalType_1 = require("./FileSharingPrincipalType");
@@ -49,7 +50,7 @@ class SpoFileSharinginfoGetCommand extends SpoCommand_1.default {
                     logger.logToStderr(`Retrieving sharing information report for the file with item Id  ${fileInformation.fileItemId}`);
                 }
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/lists/getbytitle('${utils_1.formatting.encodeQueryParameter(fileInformation.libraryName)}')/items(${fileInformation.fileItemId})/GetSharingInformation?$select=permissionsInformation&$Expand=permissionsInformation`,
+                    url: `${args.options.webUrl}/_api/web/lists/getbytitle('${formatting_1.formatting.encodeQueryParameter(fileInformation.libraryName)}')/items(${fileInformation.fileItemId})/GetSharingInformation?$select=permissionsInformation&$Expand=permissionsInformation`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -129,12 +130,12 @@ _SpoFileSharinginfoGetCommand_instances = new WeakSet(), _SpoFileSharinginfoGetC
     });
 }, _SpoFileSharinginfoGetCommand_initValidators = function _SpoFileSharinginfoGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.id) {
-            if (!utils_1.validation.isValidGuid(args.options.id)) {
+            if (!validation_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFolderAddCommand_instances, _SpoFolderAddCommand_initOptions, _SpoFolderAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFolderAddCommand extends SpoCommand_1.default {
@@ -37,7 +38,7 @@ class SpoFolderAddCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Adding folder to site ${args.options.webUrl}...`);
             }
-            const parentFolderServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.parentFolderUrl);
+            const parentFolderServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.parentFolderUrl);
             const serverRelativeUrl = `${parentFolderServerRelativeUrl}/${args.options.name}`;
             const requestUrl = `${args.options.webUrl}/_api/web/folders`;
             const requestOptions = {
@@ -69,7 +70,7 @@ _SpoFolderAddCommand_instances = new WeakSet(), _SpoFolderAddCommand_initOptions
         option: '-n, --name <name>'
     });
 }, _SpoFolderAddCommand_initValidators = function _SpoFolderAddCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new SpoFolderAddCommand();
 //# sourceMappingURL=folder-add.js.map

package/dist/m365/spo/commands/folder/folder-copy.js

@@ -17,7 +17,9 @@ var _SpoFolderCopyCommand_instances, _SpoFolderCopyCommand_initTelemetry, _SpoFo
 Object.defineProperty(exports, "__esModule", { value: true });
 const url = require("url");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFolderCopyCommand extends SpoCommand_1.default {
@@ -42,9 +44,9 @@ class SpoFolderCopyCommand extends SpoCommand_1.default {
             const webUrl = args.options.webUrl;
             const parsedUrl = url.parse(webUrl);
             const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
-            const sourceAbsoluteUrl = utils_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
+            const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
             const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-            const requestUrl = utils_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
+            const requestUrl = urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
             const requestOptions = {
                 url: requestUrl,
                 headers: {
@@ -52,7 +54,7 @@ class SpoFolderCopyCommand extends SpoCommand_1.default {
                 },
                 data: {
                     exportObjectUris: [sourceAbsoluteUrl],
-                    destinationUri: utils_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
+                    destinationUri: urlUtil_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
                     options: {
                         "AllowSchemaMismatch": allowSchemaMismatch,
                         "IgnoreVersionHistory": true
@@ -67,7 +69,7 @@ class SpoFolderCopyCommand extends SpoCommand_1.default {
                 const progressPollInterval = 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
                 yield new Promise((resolve, reject) => {
                     setTimeout(() => {
-                        utils_1.spo.waitUntilCopyJobFinished({
+                        spo_1.spo.waitUntilCopyJobFinished({
                             copyJobInfo,
                             siteUrl: webUrl,
                             pollingInterval: progressPollInterval,
@@ -104,7 +106,7 @@ _SpoFolderCopyCommand_instances = new WeakSet(), _SpoFolderCopyCommand_initTelem
         option: '--allowSchemaMismatch'
     });
 }, _SpoFolderCopyCommand_initValidators = function _SpoFolderCopyCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new SpoFolderCopyCommand();
 //# sourceMappingURL=folder-copy.js.map

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

@@ -13,19 +13,22 @@ 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 _SpoFolderGetCommand_instances, _SpoFolderGetCommand_initOptions, _SpoFolderGetCommand_initValidators;
+var _SpoFolderGetCommand_instances, _SpoFolderGetCommand_initTelemetry, _SpoFolderGetCommand_initOptions, _SpoFolderGetCommand_initValidators, _SpoFolderGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFolderGetCommand extends SpoCommand_1.default {
     constructor() {
         super();
         _SpoFolderGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.FOLDER_GET;
@@ -38,8 +41,14 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Retrieving folder from site ${args.options.webUrl}...`);
             }
-            const serverRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
-            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')`;
+            let requestUrl = '';
+            if (args.options.id) {
+                requestUrl = `${args.options.webUrl}/_api/web/GetFolderById('${encodeURIComponent(args.options.id)}')`;
+            }
+            else if (args.options.folderUrl) {
+                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+                requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')`;
+            }
             const requestOptions = {
                 url: requestUrl,
                 headers: {
@@ -60,14 +69,36 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoFolderGetCommand_instances = new WeakSet(), _SpoFolderGetCommand_initOptions = function _SpoFolderGetCommand_initOptions() {
+_SpoFolderGetCommand_instances = new WeakSet(), _SpoFolderGetCommand_initTelemetry = function _SpoFolderGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: (!(!args.options.id)).toString(),
+            folderUrl: (!(!args.options.folderUrl)).toString()
+        });
+    });
+}, _SpoFolderGetCommand_initOptions = function _SpoFolderGetCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --folderUrl <folderUrl>'
+        option: '-f, --folderUrl [folderUrl]'
+    }, {
+        option: '-i, --id [id]'
     });
 }, _SpoFolderGetCommand_initValidators = function _SpoFolderGetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.id) {
+            if (!validation_1.validation.isValidGuid(args.options.id)) {
+                return `${args.options.id} is not a valid GUID`;
+            }
+        }
+        return true;
+    }));
+}, _SpoFolderGetCommand_initOptionSets = function _SpoFolderGetCommand_initOptionSets() {
+    this.optionSets.push(['folderUrl', 'id']);
 };
 module.exports = new SpoFolderGetCommand();
 //# sourceMappingURL=folder-get.js.map