@pnp/cli-microsoft365 6.0.0-beta.566a6b8 → 6.0.0-beta.5ea1353

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

@@ -18,10 +18,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
-// uncomment to support upgrading to preview releases
-const semver_1 = require("semver");
 const Command_1 = require("../../../../Command");
-const utils_1 = require("../../../../utils");
+const fsUtil_1 = require("../../../../utils/fsUtil");
+const packageManager_1 = require("../../../../utils/packageManager");
 const commands_1 = require("../../commands");
 const base_project_command_1 = require("./base-project-command");
 const FN017001_MISC_npm_dedupe_1 = require("./project-upgrade/rules/FN017001_MISC_npm_dedupe");
@@ -65,7 +64,7 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.14.0',
             '1.15.0',
             '1.15.2',
-            '1.16.0-beta.1'
+            '1.16.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);
@@ -77,6 +76,9 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
     get description() {
         return 'Upgrades SharePoint Framework project to the specified version';
     }
+    get allowedOutputs() {
+        return ['json', 'text', 'md', 'tour'];
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             this.projectRootPath = this.getProjectRoot(process.cwd());
@@ -85,15 +87,15 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             }
             this.toVersion = args.options.toVersion ? args.options.toVersion : this.supportedVersions[this.supportedVersions.length - 1];
             // uncomment to support upgrading to preview releases
-            if (!args.options.toVersion &&
-                !args.options.preview &&
-                (0, semver_1.prerelease)(this.toVersion)) {
-                // no version and no preview specified while the current version to
-                // upgrade to is a prerelease so let's grab the first non-preview version
-                // since we're supporting only one preview version, it's sufficient for
-                // us to take second to last version
-                this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-            }
+            // if (!args.options.toVersion &&
+            //   !args.options.preview &&
+            //   prerelease(this.toVersion)) {
+            //   // no version and no preview specified while the current version to
+            //   // upgrade to is a prerelease so let's grab the first non-preview version
+            //   // since we're supporting only one preview version, it's sufficient for
+            //   // us to take second to last version
+            //   this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+            // }
             this.packageManager = args.options.packageManager || 'npm';
             this.shell = args.options.shell || 'bash';
             if (this.supportedVersions.indexOf(this.toVersion) < 0) {
@@ -192,33 +194,33 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
                 // matches must be in this particular order to avoid false matches, eg.
                 // uninstallDev contains install
                 if (f.resolution.startsWith('uninstallDev')) {
-                    f.resolution = f.resolution.replace('uninstallDev', utils_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager));
+                    f.resolution = f.resolution.replace('uninstallDev', packageManager_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager));
                     return;
                 }
                 if (f.resolution.startsWith('installDev')) {
-                    f.resolution = f.resolution.replace('installDev', utils_1.packageManager.getPackageManagerCommand('installDev', this.packageManager));
+                    f.resolution = f.resolution.replace('installDev', packageManager_1.packageManager.getPackageManagerCommand('installDev', this.packageManager));
                     return;
                 }
                 if (f.resolution.startsWith('uninstall')) {
-                    f.resolution = f.resolution.replace('uninstall', utils_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager));
+                    f.resolution = f.resolution.replace('uninstall', packageManager_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager));
                     return;
                 }
                 if (f.resolution.startsWith('install')) {
-                    f.resolution = f.resolution.replace('install', utils_1.packageManager.getPackageManagerCommand('install', this.packageManager));
+                    f.resolution = f.resolution.replace('install', packageManager_1.packageManager.getPackageManagerCommand('install', this.packageManager));
                     return;
                 }
                 // copy support for multiple shells
                 if (f.resolution.startsWith('copy_cmd')) {
-                    f.resolution = f.resolution.replace('copy_cmd', utils_1.fsUtil.getCopyCommand('copyCommand', this.shell));
-                    f.resolution = f.resolution.replace('DestinationParam', utils_1.fsUtil.getCopyCommand('copyDestinationParam', this.shell));
+                    f.resolution = f.resolution.replace('copy_cmd', fsUtil_1.fsUtil.getCopyCommand('copyCommand', this.shell));
+                    f.resolution = f.resolution.replace('DestinationParam', fsUtil_1.fsUtil.getCopyCommand('copyDestinationParam', this.shell));
                     return;
                 }
                 // createdir support for multiple shells
                 if (f.resolution.startsWith('create_dir_cmd')) {
-                    f.resolution = f.resolution.replace('create_dir_cmd', utils_1.fsUtil.getDirectoryCommand('createDirectoryCommand', this.shell));
-                    f.resolution = f.resolution.replace('NameParam', utils_1.fsUtil.getDirectoryCommand('createDirectoryNameParam', this.shell));
-                    f.resolution = f.resolution.replace('PathParam', utils_1.fsUtil.getDirectoryCommand('createDirectoryPathParam', this.shell));
-                    f.resolution = f.resolution.replace('ItemTypeParam', utils_1.fsUtil.getDirectoryCommand('createDirectoryItemTypeParam', this.shell));
+                    f.resolution = f.resolution.replace('create_dir_cmd', fsUtil_1.fsUtil.getDirectoryCommand('createDirectoryCommand', this.shell));
+                    f.resolution = f.resolution.replace('NameParam', fsUtil_1.fsUtil.getDirectoryCommand('createDirectoryNameParam', this.shell));
+                    f.resolution = f.resolution.replace('PathParam', fsUtil_1.fsUtil.getDirectoryCommand('createDirectoryPathParam', this.shell));
+                    f.resolution = f.resolution.replace('ItemTypeParam', fsUtil_1.fsUtil.getDirectoryCommand('createDirectoryItemTypeParam', this.shell));
                     return;
                 }
                 // 'Add' support for multiple shells
@@ -229,7 +231,7 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
                     const contentStart = f.resolution.indexOf('[BEFORECONTENT]') + '[BEFORECONTENT]'.length;
                     const contentEnd = f.resolution.indexOf('[AFTERCONTENT]');
                     const fileContent = f.resolution.substring(contentStart, contentEnd);
-                    f.resolution = utils_1.fsUtil.getAddCommand('addFileCommand', this.shell);
+                    f.resolution = fsUtil_1.fsUtil.getAddCommand('addFileCommand', this.shell);
                     f.resolution = f.resolution.replace('[FILECONTENT]', fileContent);
                     f.resolution = f.resolution.replace('[FILEPATH]', filePath);
                     f.resolution = f.resolution.replace('[BEFOREPATH]', ' ');
@@ -240,7 +242,7 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
                 }
                 // 'Remove' support for multiple shells
                 if (f.resolution.startsWith('remove_cmd')) {
-                    f.resolution = f.resolution.replace('remove_cmd', utils_1.fsUtil.getRemoveCommand('removeFileCommand', this.shell));
+                    f.resolution = f.resolution.replace('remove_cmd', fsUtil_1.fsUtil.getRemoveCommand('removeFileCommand', this.shell));
                     return;
                 }
             });
@@ -277,10 +279,10 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '-----------------------', os.EOL,
             (reportData.packageManagerCommands
                 .concat(reportData.commandsToExecute
-                .filter((command) => command.indexOf(utils_1.packageManager.getPackageManagerCommand('install', this.packageManager)) === -1 &&
-                command.indexOf(utils_1.packageManager.getPackageManagerCommand('installDev', this.packageManager)) === -1 &&
-                command.indexOf(utils_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager)) === -1 &&
-                command.indexOf(utils_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager)) === -1))).join(os.EOL), os.EOL,
+                .filter((command) => command.indexOf(packageManager_1.packageManager.getPackageManagerCommand('install', this.packageManager)) === -1 &&
+                command.indexOf(packageManager_1.packageManager.getPackageManagerCommand('installDev', this.packageManager)) === -1 &&
+                command.indexOf(packageManager_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager)) === -1 &&
+                command.indexOf(packageManager_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager)) === -1))).join(os.EOL), os.EOL,
             os.EOL,
             Object.keys(reportData.modificationPerFile).map(file => {
                 return [
@@ -336,10 +338,10 @@ ${f.resolution}
             '```sh', os.EOL,
             (reportData.packageManagerCommands
                 .concat(reportData.commandsToExecute
-                .filter((command) => command.indexOf(utils_1.packageManager.getPackageManagerCommand('install', this.packageManager)) === -1 &&
-                command.indexOf(utils_1.packageManager.getPackageManagerCommand('installDev', this.packageManager)) === -1 &&
-                command.indexOf(utils_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager)) === -1 &&
-                command.indexOf(utils_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager)) === -1))).join(os.EOL), os.EOL,
+                .filter((command) => command.indexOf(packageManager_1.packageManager.getPackageManagerCommand('install', this.packageManager)) === -1 &&
+                command.indexOf(packageManager_1.packageManager.getPackageManagerCommand('installDev', this.packageManager)) === -1 &&
+                command.indexOf(packageManager_1.packageManager.getPackageManagerCommand('uninstall', this.packageManager)) === -1 &&
+                command.indexOf(packageManager_1.packageManager.getPackageManagerCommand('uninstallDev', this.packageManager)) === -1))).join(os.EOL), os.EOL,
             '```', os.EOL,
             os.EOL,
             '### Modify files', os.EOL,
@@ -419,7 +421,7 @@ ${f.resolution}
             if (f.resolutionType === 'cmd') {
                 if (f.resolution.indexOf('npm') > -1 ||
                     f.resolution.indexOf('yarn') > -1) {
-                    utils_1.packageManager.mapPackageManagerCommand({
+                    packageManager_1.packageManager.mapPackageManagerCommand({
                         command: f.resolution,
                         packagesDevExact,
                         packagesDepExact,
@@ -445,7 +447,7 @@ ${f.resolution}
                 });
             }
         });
-        const packageManagerCommands = utils_1.packageManager.reducePackageManagerCommand({
+        const packageManagerCommands = packageManager_1.packageManager.reducePackageManagerCommand({
             packagesDepExact,
             packagesDevExact,
             packagesDepUn,
@@ -475,9 +477,9 @@ _SpfxProjectUpgradeCommand_instances = new WeakSet(), _SpfxProjectUpgradeCommand
             preview: args.options.preview
         });
         // uncomment to support upgrading to preview releases
-        if ((0, semver_1.prerelease)(this.telemetryProperties.toVersion) && !args.options.preview) {
-            this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        }
+        // if (prerelease(this.telemetryProperties.toVersion) && !args.options.preview) {
+        //   this.telemetryProperties.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        // }
     });
 }, _SpfxProjectUpgradeCommand_initOptions = function _SpfxProjectUpgradeCommand_initOptions() {
     this.options.unshift({
@@ -493,7 +495,7 @@ _SpfxProjectUpgradeCommand_instances = new WeakSet(), _SpfxProjectUpgradeCommand
     });
     this.options.forEach(o => {
         if (o.option.indexOf('--output') > -1) {
-            o.autocomplete = ['json', 'text', 'md', 'tour'];
+            o.autocomplete = this.allowedOutputs;
         }
     });
 }, _SpfxProjectUpgradeCommand_initValidators = function _SpfxProjectUpgradeCommand_initValidators() {

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

@@ -13,7 +13,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 _SpfxDoctorCommand_instances, _SpfxDoctorCommand_initTelemetry, _SpfxDoctorCommand_initOptions, _SpfxDoctorCommand_initValidators, _SpfxDoctorCommand_initTypes;
+var _SpfxDoctorCommand_instances, _SpfxDoctorCommand_initTelemetry, _SpfxDoctorCommand_initOptions, _SpfxDoctorCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const child_process = require("child_process");
@@ -428,12 +428,29 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     range: '^4',
                     fix: 'npm i -g yo@4'
                 }
+            },
+            '1.16.0': {
+                gulpCli: {
+                    range: '^1 || ^2',
+                    fix: 'npm i -g gulp-cli@2'
+                },
+                node: {
+                    range: '>=16.13.0 <17.0.0',
+                    fix: 'Install Node.js >=16.13.0 <17.0.0'
+                },
+                sp: SharePointVersion.SPO,
+                yo: {
+                    range: '^4',
+                    fix: 'npm i -g yo@4'
+                }
             }
         };
         __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _SpfxDoctorCommand_instances, "m", _SpfxDoctorCommand_initTypes).call(this);
+    }
+    get allowedOutputs() {
+        return ['text'];
     }
     get name() {
         return commands_1.default.DOCTOR;
@@ -442,6 +459,7 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
         return 'Verifies environment configuration for using the specific version of the SharePoint Framework';
     }
     commandAction(logger, args) {
+        var _a;
         return __awaiter(this, void 0, void 0, function* () {
             if (!args.options.output) {
                 args.options.output = 'text';
@@ -454,7 +472,7 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
             let prerequisites;
             const fixes = [];
             try {
-                spfxVersion = yield this.getSharePointFrameworkVersion(logger);
+                spfxVersion = (_a = args.options.spfxVersion) !== null && _a !== void 0 ? _a : yield this.getSharePointFrameworkVersion(logger);
                 if (!spfxVersion) {
                     logger.log(this.getStatus(CheckStatus.Failure, `SharePoint Framework`));
                     throw `SharePoint Framework not found`;
@@ -464,7 +482,13 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                     logger.log(this.getStatus(CheckStatus.Failure, `SharePoint Framework v${spfxVersion}`));
                     throw `spfx doctor doesn't support SPFx v${spfxVersion} at this moment`;
                 }
-                logger.log(this.getStatus(CheckStatus.Success, `SharePoint Framework v${spfxVersion}`));
+                if (args.options.spfxVersion) {
+                    yield this.checkSharePointFrameworkVersion(args.options.spfxVersion, fixes, logger);
+                }
+                else {
+                    // spfx was detected and if we are here, it means that we support it
+                    logger.log(this.getStatus(CheckStatus.Success, `SharePoint Framework v${spfxVersion}`));
+                }
                 yield this.checkSharePointCompatibility(spfxVersion, prerequisites, args, fixes, logger);
                 yield this.checkNodeVersion(prerequisites, fixes, logger);
                 yield this.checkYo(prerequisites, fixes, logger);
@@ -517,6 +541,23 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
             this.checkStatus('Node', nodeVersion, prerequisites.node, OptionalOrRequired.Required, fixes, logger);
         });
     }
+    checkSharePointFrameworkVersion(spfxVersionRequested, fixes, logger) {
+        return this
+            .getPackageVersion('@microsoft/generator-sharepoint', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
+            .then((spfxVersionDetected) => {
+            const versionCheck = {
+                range: spfxVersionRequested,
+                fix: `npm i -g @microsoft/generator-sharepoint@${spfxVersionRequested}`
+            };
+            if (spfxVersionDetected) {
+                this.checkStatus(`SharePoint Framework`, spfxVersionDetected, versionCheck, OptionalOrRequired.Required, fixes, logger);
+            }
+            else {
+                logger.log(this.getStatus(CheckStatus.Failure, `SharePoint Framework v${spfxVersionRequested} not found`));
+                fixes.push(versionCheck.fix);
+            }
+        });
+    }
     checkYo(prerequisites, fixes, logger) {
         return this
             .getPackageVersion('yo', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
@@ -695,13 +736,17 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
 _SpfxDoctorCommand_instances = new WeakSet(), _SpfxDoctorCommand_initTelemetry = function _SpfxDoctorCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            env: args.options.env
+            env: args.options.env,
+            spfxVersion: args.options.spfxVersion
         });
     });
 }, _SpfxDoctorCommand_initOptions = function _SpfxDoctorCommand_initOptions() {
     this.options.unshift({
         option: '-e, --env [env]',
         autocomplete: ['sp2016', 'sp2019', 'spo']
+    }, {
+        option: '-v, --spfxVersion [spfxVersion]',
+        autocomplete: Object.keys(this.versions)
     });
 }, _SpfxDoctorCommand_initValidators = function _SpfxDoctorCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -711,13 +756,13 @@ _SpfxDoctorCommand_instances = new WeakSet(), _SpfxDoctorCommand_initTelemetry =
                 return `${args.options.env} is not a valid SharePoint version. Valid versions are sp2016, sp2019 or spo`;
             }
         }
-        if (args.options.output && args.options.output !== 'text') {
-            return `The output option only accepts the type 'text'`;
+        if (args.options.spfxVersion) {
+            if (!this.versions[args.options.spfxVersion]) {
+                return `${args.options.spfxVersion} is not a supported SharePoint Framework version. Supported versions are ${Object.keys(this.versions).join(', ')}`;
+            }
         }
         return true;
     }));
-}, _SpfxDoctorCommand_initTypes = function _SpfxDoctorCommand_initTypes() {
-    this.types.string.push('e', 'env');
 };
 module.exports = new SpfxDoctorCommand();
 //# sourceMappingURL=spfx-doctor.js.map

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

@@ -18,7 +18,8 @@ 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 spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -40,7 +41,7 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
             const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
             const overwrite = args.options.overwrite || false;
             try {
-                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 const appCatalogUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
                 const fullPath = path.resolve(args.options.filePath);
                 if (this.verbose) {
@@ -109,7 +110,7 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
             return `Path '${fullPath}' points to a directory`;
         }
         if (args.options.appCatalogUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }));

package/dist/m365/spo/commands/app/app-deploy.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppDeployCommand_instances, _SpoAppDeployCommand_initTelemetry, _SpoAppDeployCommand_initOptions, _SpoAppDeployCommand_initValidators, _SpoAppDeployCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -40,7 +41,7 @@ class SpoAppDeployCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
             const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
             let appCatalogUrl = '';
             try {
-                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 appCatalogUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
                 let res;
                 if (args.options.id) {
@@ -118,11 +119,11 @@ _SpoAppDeployCommand_instances = new WeakSet(), _SpoAppDeployCommand_initTelemet
                 return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.appCatalogUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }));

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

@@ -16,7 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppGetCommand_instances, _SpoAppGetCommand_initTelemetry, _SpoAppGetCommand_initOptions, _SpoAppGetCommand_initValidators, _SpoAppGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -38,7 +40,7 @@ class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
-                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 const appCatalogSiteUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
                 let appId;
                 if (args.options.id) {
@@ -62,7 +64,7 @@ class SpoAppGetCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                     logger.logToStderr(`Retrieving information for app ${appId}...`);
                 }
                 const requestOptions = {
-                    url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(appId)}')`,
+                    url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(appId)}')`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },
@@ -109,11 +111,11 @@ _SpoAppGetCommand_instances = new WeakSet(), _SpoAppGetCommand_initTelemetry = f
                 return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.appCatalogUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }));

package/dist/m365/spo/commands/app/app-install.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppInstallCommand_instances, _SpoAppInstallCommand_initTelemetry, _SpoAppInstallCommand_initOptions, _SpoAppInstallCommand_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 SpoAppInstallCommand extends SpoCommand_1.default {
@@ -40,7 +41,7 @@ class SpoAppInstallCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Installing app '${args.options.id}' in site '${args.options.siteUrl}'...`);
             }
             const requestOptions = {
-                url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/install`,
+                url: `${args.options.siteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/install`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 }
@@ -77,10 +78,10 @@ _SpoAppInstallCommand_instances = new WeakSet(), _SpoAppInstallCommand_initTelem
                 return `appCatalogScope must be either 'tenant' or 'sitecollection' if specified`;
             }
         }
-        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`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
 };
 module.exports = new SpoAppInstallCommand();

package/dist/m365/spo/commands/app/app-instance-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppInStanceListCommand_instances, _SpoAppInStanceListCommand_initOptions, _SpoAppInStanceListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppInStanceListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -71,7 +71,7 @@ _SpoAppInStanceListCommand_instances = new WeakSet(), _SpoAppInStanceListCommand
     });
 }, _SpoAppInStanceListCommand_initValidators = function _SpoAppInStanceListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoAppListCommand_instances, _SpoAppListCommand_initTelemetry, _SpoAppListCommand_initOptions, _SpoAppListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -42,7 +43,7 @@ class SpoAppListCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
             let appCatalogSiteUrl = '';
             let spoUrl = '';
             try {
-                spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                 appCatalogSiteUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving apps...`);
@@ -96,7 +97,7 @@ _SpoAppListCommand_instances = new WeakSet(), _SpoAppListCommand_initTelemetry =
                 return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
             if (args.options.appCatalogUrl) {
-                return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+                return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
             }
         }
         return true;

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

@@ -15,9 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoAppRemoveCommand_instances, _SpoAppRemoveCommand_initTelemetry, _SpoAppRemoveCommand_initOptions, _SpoAppRemoveCommand_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 formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppRemoveCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -39,13 +41,13 @@ class SpoAppRemoveCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
             const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
             const removeApp = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                    const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                     const appCatalogUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
                     if (this.debug) {
                         logger.logToStderr(`Retrieved app catalog URL ${appCatalogUrl}. Removing app from the app catalog...`);
                     }
                     const requestOptions = {
-                        url: `${appCatalogUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/remove`,
+                        url: `${appCatalogUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/remove`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         }
@@ -60,7 +62,7 @@ class SpoAppRemoveCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                 yield removeApp();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -104,11 +106,11 @@ _SpoAppRemoveCommand_instances = new WeakSet(), _SpoAppRemoveCommand_initTelemet
                 return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
-        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`;
         }
         if (args.options.appCatalogUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }));

package/dist/m365/spo/commands/app/app-retract.js

@@ -15,9 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoAppRetractCommand_instances, _SpoAppRetractCommand_initTelemetry, _SpoAppRetractCommand_initOptions, _SpoAppRetractCommand_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 formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const commands_1 = require("../../commands");
 const SpoAppBaseCommand_1 = require("./SpoAppBaseCommand");
 class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
@@ -39,13 +41,13 @@ class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
             const scope = (args.options.appCatalogScope) ? args.options.appCatalogScope.toLowerCase() : 'tenant';
             const retractApp = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                    const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
                     const appCatalogSiteUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
                     if (this.verbose) {
                         logger.logToStderr(`Retracting app...`);
                     }
                     const requestOptions = {
-                        url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${encodeURIComponent(args.options.id)}')/retract`,
+                        url: `${appCatalogSiteUrl}/_api/web/${scope}appcatalog/AvailableApps/GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/retract`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         }
@@ -60,7 +62,7 @@ class SpoAppRetractCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                 yield retractApp();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -103,11 +105,11 @@ _SpoAppRetractCommand_instances = new WeakSet(), _SpoAppRetractCommand_initTelem
                 return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
             }
         }
-        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`;
         }
         if (args.options.appCatalogUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.appCatalogUrl);
         }
         return true;
     }));

package/dist/m365/spo/commands/app/app-teamspackage-download.js

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const spo_1 = require("../../../../utils/spo");
 const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
@@ -103,7 +104,7 @@ class SpoAppTeamsPackageDownloadCommand extends SpoAppBaseCommand_1.SpoAppBaseCo
                 url += `GetList('${serverRelativeAppCatalogListUrl}')/GetItemById(${args.options.appItemId})?$expand=File&$select=File/Name`;
             }
             else if (args.options.appName) {
-                url += `getfolderbyserverrelativeurl('${appCatalogListName}')/files('${encodeURIComponent(args.options.appName)}')/ListItemAllFields?$select=Id`;
+                url += `getfolderbyserverrelativeurl('${appCatalogListName}')/files('${formatting_1.formatting.encodeQueryParameter(args.options.appName)}')/ListItemAllFields?$select=Id`;
             }
             const requestOptions = {
                 url,