@forge/cli-shared 3.26.1-next.2 → 4.0.0-next.3

package/out/shared/cli-details.js

@@ -5,8 +5,8 @@ const tslib_1 = require("tslib");
 const semver_1 = tslib_1.__importDefault(require("semver"));
 exports.FORGE_CLI_PACKAGE = '@forge/cli';
 const isLatestCLIVersion = (cliDetails) => {
-    const version = semver_1.default.valid(cliDetails === null || cliDetails === void 0 ? void 0 : cliDetails.version);
-    const latest = semver_1.default.valid(cliDetails === null || cliDetails === void 0 ? void 0 : cliDetails.latest);
+    const version = semver_1.default.valid(cliDetails?.version);
+    const latest = semver_1.default.valid(cliDetails?.latest);
     if (!version || !latest) {
         return false;
     }

package/out/shared/error-handling.js

@@ -8,11 +8,10 @@ function isErrorWithAnalytics(e) {
     return e.getAttributes !== undefined;
 }
 function isUserError(e) {
-    var _a, _b;
     if (isErrorWithAnalytics(e)) {
-        return (_a = e.getAttributes().isUserError) !== null && _a !== void 0 ? _a : false;
+        return e.getAttributes().isUserError ?? false;
     }
-    if (((_b = e.constructor) === null || _b === void 0 ? void 0 : _b.name) === 'FetchError') {
+    if (e.constructor?.name === 'FetchError') {
         if (e.type === 'system') {
             return true;
         }
@@ -30,6 +29,7 @@ function getErrorAttributes(e) {
 }
 exports.getErrorAttributes = getErrorAttributes;
 class BaseError extends Error {
+    requestId;
     constructor(requestId, message) {
         super(message);
         this.requestId = requestId;
@@ -108,6 +108,7 @@ class BundlerTSError extends UserError {
 }
 exports.BundlerTSError = BundlerTSError;
 class ApplicationCompileError extends UserError {
+    error;
     constructor(error) {
         super(error.message);
         this.error = error;
@@ -115,6 +116,7 @@ class ApplicationCompileError extends UserError {
 }
 exports.ApplicationCompileError = ApplicationCompileError;
 class UIPromptError extends BaseError {
+    isTtyError;
     constructor(message, isTtyError = false) {
         super(undefined, message);
         this.isTtyError = isTtyError;

package/out/shared/product.js

@@ -19,13 +19,11 @@ function getSupportedProducts({ enableAtlas = false } = {}) {
 }
 exports.getSupportedProducts = getSupportedProducts;
 function productDisplayName(ariResourceOwner) {
-    var _a;
-    return (_a = PRODUCT_DISPLAY_NAME_MAPPING[ariResourceOwner]) !== null && _a !== void 0 ? _a : (0, case_1.capital)(ariResourceOwner);
+    return PRODUCT_DISPLAY_NAME_MAPPING[ariResourceOwner] ?? (0, case_1.capital)(ariResourceOwner);
 }
 exports.productDisplayName = productDisplayName;
 function ariResourceOwner(productDisplayName) {
-    var _a;
-    return (_a = PRODUCT_ARI_MAPPING[productDisplayName]) !== null && _a !== void 0 ? _a : productDisplayName.toLowerCase();
+    return PRODUCT_ARI_MAPPING[productDisplayName] ?? productDisplayName.toLowerCase();
 }
 exports.ariResourceOwner = ariResourceOwner;
 const isWorkspaceProduct = (product) => {

package/out/shared/read-app-config-files.js

@@ -6,9 +6,11 @@ const path_1 = tslib_1.__importDefault(require("path"));
 const array_prototype_flatmap_1 = tslib_1.__importDefault(require("array.prototype.flatmap"));
 const typescript_1 = require("typescript");
 const listGitIgnoreFiles = async (fileSystemReader, gitIgnorePath = '.gitignore') => {
-    var _a;
-    const gitignoreContents = ((_a = fileSystemReader
-        .readFile(gitIgnorePath)) === null || _a === void 0 ? void 0 : _a.trim().split('\n').filter((glob) => glob.trim() !== '')) || [];
+    const gitignoreContents = fileSystemReader
+        .readFile(gitIgnorePath)
+        ?.trim()
+        .split('\n')
+        .filter((glob) => glob.trim() !== '') || [];
     return (0, array_prototype_flatmap_1.default)(await Promise.all(gitignoreContents.map((pattern) => {
         if (fileSystemReader.hasGlobSpecialChars(pattern)) {
             return fileSystemReader.readGlob({ pattern });
@@ -32,8 +34,8 @@ const listTSConfigIncludeExclude = async (fileSystemReader, tsConfigPath = 'tsco
         return { include: [], exclude: [] };
     }
     return {
-        include: await processTSConfigGlobList(fileSystemReader, config === null || config === void 0 ? void 0 : config.include),
-        exclude: await processTSConfigGlobList(fileSystemReader, config === null || config === void 0 ? void 0 : config.exclude)
+        include: await processTSConfigGlobList(fileSystemReader, config?.include),
+        exclude: await processTSConfigGlobList(fileSystemReader, config?.exclude)
     };
 };
 exports.listTSConfigIncludeExclude = listTSConfigIncludeExclude;

package/out/shared/validate.js

@@ -16,7 +16,7 @@ const validateSite = (site, product) => {
             urlObj.pathname = '/';
             return urlObj;
         }
-        catch (_a) {
+        catch {
         }
     }
     throw new error_handling_1.ValidationError(ui_1.Text.error.invalidSite);

package/out/ui/command-line-ui.js

@@ -20,22 +20,25 @@ var ProgressLogType;
     ProgressLogType[ProgressLogType["other"] = 2] = "other";
 })(ProgressLogType || (ProgressLogType = {}));
 class CommandLineUI {
+    verbose;
+    logger;
+    spinner;
+    promptInternal;
+    insideProgress = false;
+    addedProgressPadding = false;
     constructor(verbose, spinner, logger) {
         this.verbose = verbose;
-        this.insideProgress = false;
-        this.addedProgressPadding = false;
         this.spinner = spinner || (0, ora_1.default)({ discardStdin: false });
         this.logger = logger || console;
         this.promptInternal = inquirer_1.default.createPromptModule({ skipTTYChecks: false });
         this.registerCustomUIElements();
     }
     async prompt(questions, initialAnswers) {
-        var _a;
         try {
             return await this.promptInternal(questions, initialAnswers);
         }
         catch (e) {
-            throw new shared_1.UIPromptError(e.message, (_a = e.isTtyError) !== null && _a !== void 0 ? _a : false);
+            throw new shared_1.UIPromptError(e.message, e.isTtyError ?? false);
         }
     }
     get traceEnabled() {
@@ -159,7 +162,7 @@ class CommandLineUI {
         return this.promptForString(message, true);
     }
     async promptForList(message, choices, config) {
-        const formattedChoices = (config === null || config === void 0 ? void 0 : config.format) ? choices.map((choice) => { var _a; return (_a = config === null || config === void 0 ? void 0 : config.format) === null || _a === void 0 ? void 0 : _a.call(config, choice); }) : choices;
+        const formattedChoices = config?.format ? choices.map((choice) => config?.format?.(choice)) : choices;
         const { choice } = await this.prompt([
             {
                 type: 'list',
@@ -168,7 +171,7 @@ class CommandLineUI {
                 message
             }
         ]);
-        const formattedChoice = (config === null || config === void 0 ? void 0 : config.format) ? choices[formattedChoices.indexOf(choice)] : choice;
+        const formattedChoice = config?.format ? choices[formattedChoices.indexOf(choice)] : choice;
         return formattedChoice;
     }
     async promptForTable(message, infoMessage, columns, choices) {
@@ -230,13 +233,16 @@ class CommandLineUI {
         return formattedValue !== prevFormattedValue;
     }
     logTable(head, data, { format, groupRows }) {
-        const table = new cli_table3_1.default(Object.assign(Object.assign({}, log_color_1.TableStyle.default), { head: head.map(([, heading]) => heading) }));
+        const table = new cli_table3_1.default({
+            ...log_color_1.TableStyle.default,
+            head: head.map(([, heading]) => heading)
+        });
         if (data) {
             const rowSpanByKey = {};
             for (let i = data.length - 1; i >= 0; i--) {
                 const tableRow = [];
                 head.forEach(([key]) => {
-                    rowSpanByKey[key] || (rowSpanByKey[key] = 1);
+                    rowSpanByKey[key] ||= 1;
                     const row = data[i];
                     const value = row[key];
                     const formattedValue = this.formatTableValue(key, value, format);

package/out/ui/multiple-table-prompt.js

@@ -25,9 +25,9 @@ const getRowFormatFn = (isDone, isHover, isSelected) => {
 };
 exports.getRowFormatFn = getRowFormatFn;
 class MultipleChoiceTablePrompt extends table_prompt_1.TablePrompt {
+    selectedIndexes = new Set();
     constructor(questions, readline, answers) {
         super(questions, readline, answers);
-        this.selectedIndexes = new Set();
     }
     handleSpaceKey({ pointer, hasMultipleChoices }) {
         if (hasMultipleChoices) {

package/out/ui/table-prompt.js

@@ -8,9 +8,16 @@ const readline_1 = tslib_1.__importDefault(require("inquirer/lib/utils/readline"
 const cli_table3_1 = tslib_1.__importDefault(require("cli-table3"));
 const text_1 = require("./text");
 class TablePrompt extends base_1.default {
+    done;
+    columns;
+    rows;
+    promptMessage;
+    infoMessage;
+    pointer = 1;
+    options;
+    hasMultipleChoices;
     constructor(questions, readline, answers) {
         super(questions, readline, answers);
-        this.pointer = 1;
         this.options = this.opt;
         this.promptMessage = text_1.Text.customPrompts.table.promptMessage(this.options.message);
         this.infoMessage = this.options.infoMessage;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forge/cli-shared",
-  "version": "3.26.1-next.2",
+  "version": "4.0.0-next.3",
   "description": "Common functionality for Forge CLI",
   "author": "Atlassian",
   "license": "UNLICENSED",
@@ -12,7 +12,7 @@
     "generate-graphql-types": "graphql-codegen --config src/graphql/codegen.yml"
   },
   "dependencies": {
-    "@forge/manifest": "7.0.1-next.0",
+    "@forge/manifest": "7.1.0-next.1",
     "@forge/util": "1.4.3-next.0",
     "@sentry/node": "7.100.1",
     "adm-zip": "^0.5.10",