inup 1.6.6 → 1.6.8

package/dist/{ui → features/interactive}/modal/package-info-sections/sections.js

@@ -7,25 +7,30 @@ exports.buildUsedBySections = buildUsedBySections;
 exports.buildPackageInfoSections = buildPackageInfoSections;
 const node_path_1 = __importDefault(require("node:path"));
 const chalk_1 = __importDefault(require("chalk"));
+const engines_1 = require("../../../../shared/engines");
+const terminal_1 = require("../../../../shared/terminal");
+const audit_1 = require("../../../audit");
 const themes_colors_1 = require("../../themes-colors");
-const vulnerability_1 = require("../../presenters/vulnerability");
-const utils_1 = require("../../utils");
-const utils_2 = require("../../../utils");
 const release_notes_1 = require("./release-notes");
 function formatNumber(num) {
     if (!num)
         return 'N/A';
     if (num >= 1000000)
-        return (num / 1000000).toFixed(1) + 'M';
+        return `${(num / 1000000).toFixed(1)}M`;
     if (num >= 1000)
-        return (num / 1000).toFixed(1) + 'K';
+        return `${(num / 1000).toFixed(1)}K`;
     return num.toString();
 }
 function getUsedByPaths(state) {
+    // Catalog entries live in pnpm-workspace.yaml; the interesting "used by"
+    // answer is the member packages that reference the catalog entry.
+    if (state.catalog && state.catalogReferencedBy?.length) {
+        return state.catalogReferencedBy;
+    }
     return state.packageJsonPaths ?? [state.packageJsonPath];
 }
 function buildTabBarSuffix(activeTab, usedByCount) {
-    const styleFor = (tab) => tab === activeTab ? chalk_1.default.bold.underline : chalk_1.default.gray;
+    const styleFor = (tab) => (tab === activeTab ? chalk_1.default.bold.underline : chalk_1.default.gray);
     const usedByLabel = `Used by${usedByCount > 0 ? ` (${usedByCount})` : ''}`;
     return ('  ' +
         chalk_1.default.gray('[ ') +
@@ -40,14 +45,16 @@ function buildUsedBySections(state, modalWidth) {
     const contentWidth = Math.max(10, modalWidth - 4);
     const formatRelative = (absolutePath) => {
         const display = node_path_1.default.relative(cwd, absolutePath) || absolutePath;
-        return (0, utils_1.truncatePlainText)(display, contentWidth);
+        return (0, terminal_1.truncatePlainText)(display, contentWidth);
     };
-    return [
+    const sections = [
         {
             key: 'used-by-summary',
             rows: [
                 chalk_1.default.bold(`${paths.length} package.json file${paths.length === 1 ? '' : 's'} depend on ${state.name}`),
-                chalk_1.default.gray(`Type: ${state.type}`),
+                chalk_1.default.gray(state.catalog
+                    ? `Type: ${state.type} • via catalog:${state.catalog}`
+                    : `Type: ${state.type}`),
             ],
             required: true,
             behavior: 'pinned',
@@ -58,6 +65,25 @@ function buildUsedBySections(state, modalWidth) {
             behavior: 'body',
         },
     ];
+    // For catalog entries, also show what else the catalog pins — the whole
+    // point of a catalog is that these versions move together.
+    if (state.catalog && state.catalogEntries?.length) {
+        sections.push({
+            key: 'catalog-contents',
+            rows: [
+                chalk_1.default.bold(`Catalog "${state.catalog}"`) + chalk_1.default.gray(' — pnpm-workspace.yaml'),
+                ...state.catalogEntries.map((entry) => {
+                    const isCurrent = entry.name === state.name;
+                    const label = (0, terminal_1.truncatePlainText)(`${entry.name}: ${entry.range}`, contentWidth - 2);
+                    return isCurrent
+                        ? `${(0, themes_colors_1.getThemeColor)('packageName')('▸')} ${chalk_1.default.bold(label)}`
+                        : `${chalk_1.default.gray('•')} ${label}`;
+                }),
+            ],
+            behavior: 'body',
+        });
+    }
+    return sections;
 }
 function buildPackageInfoSections(state, modalWidth, activeTab) {
     const title = chalk_1.default.bold('Package: ') +
@@ -82,6 +108,11 @@ function buildPackageInfoSections(state, modalWidth, activeTab) {
         key: 'meta',
         rows: [
             `Current: ${currentVersion}  Target: ${targetVersion}`,
+            ...(state.catalog
+                ? [
+                    (0, themes_colors_1.getThemeColor)('textSecondary')(`Catalog: ${state.catalog} — range lives in pnpm-workspace.yaml`),
+                ]
+                : []),
             ...(state.weeklyDownloads !== undefined
                 ? [(0, themes_colors_1.getThemeColor)('primary')(`Downloads/week: ${formatNumber(state.weeklyDownloads)}`)]
                 : []),
@@ -95,13 +126,13 @@ function buildPackageInfoSections(state, modalWidth, activeTab) {
         // Wrap (don't truncate) so a deprecation URL stays whole and clickable —
         // truncation with "..." produces a dead link. `wrapPlainText` breaks on
         // spaces only, so the URL keeps its own intact line. No emoji marker:
-        // `getVisualLength` scores glyphs like ⚠ as width 2 while many terminals
-        // render them as width 1, which throws off the modal's border alignment.
-        for (const line of (0, utils_1.wrapPlainText)(`Deprecated: ${state.deprecated}`, warningContentWidth)) {
+        // terminal fonts disagree on whether such glyphs render one or two columns
+        // wide, which throws off the modal's border alignment.
+        for (const line of (0, terminal_1.wrapPlainText)(`Deprecated: ${state.deprecated}`, warningContentWidth)) {
             warningRows.push((0, themes_colors_1.getThemeColor)('warning')(line));
         }
     }
-    const engineWarning = (0, utils_2.checkNodeEngineCompatibility)(state.enginesNode);
+    const engineWarning = (0, engines_1.checkNodeEngineCompatibility)(state.enginesNode);
     if (engineWarning) {
         warningRows.push((0, themes_colors_1.getThemeColor)('warning')(`Hold: ${engineWarning}`));
     }
@@ -116,7 +147,7 @@ function buildPackageInfoSections(state, modalWidth, activeTab) {
         sections.push({
             key: 'homepage',
             rows: [
-                `Homepage: ${chalk_1.default.underline((0, themes_colors_1.getThemeColor)('primary')((0, utils_1.truncatePlainText)(state.homepage, modalWidth - 14)))}`,
+                `Homepage: ${chalk_1.default.underline((0, themes_colors_1.getThemeColor)('primary')((0, terminal_1.truncatePlainText)(state.homepage, modalWidth - 14)))}`,
             ],
             behavior: 'pinned',
         });
@@ -124,30 +155,30 @@ function buildPackageInfoSections(state, modalWidth, activeTab) {
     if (state.description) {
         sections.push({
             key: 'description',
-            rows: (0, utils_1.wrapPlainText)(state.description, modalWidth - 4)
+            rows: (0, terminal_1.wrapPlainText)(state.description, modalWidth - 4)
                 .slice(0, 4)
                 .map((line, index, rows) => index === rows.length - 1 && rows.length === 4
-                ? (0, utils_1.truncatePlainText)(line, modalWidth - 4)
+                ? (0, terminal_1.truncatePlainText)(line, modalWidth - 4)
                 : line),
             behavior: 'pinned',
         });
     }
     if (state.vulnerability && state.vulnerability.count > 0) {
-        const representative = (0, vulnerability_1.selectRepresentativeAdvisory)(state.vulnerability);
-        const severityColor = (0, vulnerability_1.getVulnerabilitySeverityColor)(state.vulnerability.highestSeverity);
+        const representative = (0, audit_1.selectRepresentativeAdvisory)(state.vulnerability);
+        const severityColor = (0, audit_1.getVulnerabilitySeverityColor)(state.vulnerability.highestSeverity);
         const vulnerabilityRows = [
             chalk_1.default.red.bold(`${state.vulnerability.count} known vulnerabilit${state.vulnerability.count === 1 ? 'y' : 'ies'} (${severityColor(state.vulnerability.highestSeverity.toUpperCase())})`),
         ];
         if (representative) {
             const severityLabel = ` ${severityColor(`[${representative.severity.toUpperCase()}]`)} `;
-            const availableTitleWidth = Math.max(0, modalWidth - 4 - (0, utils_1.getVisualLength)(severityLabel));
-            vulnerabilityRows.push(`${severityLabel}${(0, utils_1.truncatePlainText)(representative.title, availableTitleWidth)}`);
+            const availableTitleWidth = Math.max(0, modalWidth - 4 - (0, terminal_1.getVisualLength)(severityLabel));
+            vulnerabilityRows.push(`${severityLabel}${(0, terminal_1.truncatePlainText)(representative.title, availableTitleWidth)}`);
         }
         const detailsUrl = state.vulnerability.detailsUrl || representative?.url;
         if (detailsUrl) {
-            const linkPrefix = ` ${(0, vulnerability_1.getVulnerabilityLinkLabel)(detailsUrl)} `;
-            const availableLinkWidth = Math.max(0, modalWidth - 4 - (0, utils_1.getVisualLength)(linkPrefix));
-            vulnerabilityRows.push(`${linkPrefix}${chalk_1.default.underline((0, themes_colors_1.getThemeColor)('primary')((0, utils_1.truncatePlainText)(detailsUrl, availableLinkWidth)))}`);
+            const linkPrefix = ` ${(0, audit_1.getVulnerabilityLinkLabel)(detailsUrl)} `;
+            const availableLinkWidth = Math.max(0, modalWidth - 4 - (0, terminal_1.getVisualLength)(linkPrefix));
+            vulnerabilityRows.push(`${linkPrefix}${chalk_1.default.underline((0, themes_colors_1.getThemeColor)('primary')((0, terminal_1.truncatePlainText)(detailsUrl, availableLinkWidth)))}`);
         }
         if (state.vulnerability.count > 1) {
             vulnerabilityRows.push(chalk_1.default.gray(` ... and ${state.vulnerability.count - 1} more`));
@@ -163,7 +194,7 @@ function buildPackageInfoSections(state, modalWidth, activeTab) {
         sections.push({
             key: 'changelog',
             rows: [
-                `Changelog: ${chalk_1.default.underline((0, themes_colors_1.getThemeColor)('primary')((0, utils_1.truncatePlainText)(state.repository, modalWidth - 15)))}`,
+                `Changelog: ${chalk_1.default.underline((0, themes_colors_1.getThemeColor)('primary')((0, terminal_1.truncatePlainText)(state.repository, modalWidth - 15)))}`,
             ],
             behavior: 'pinned',
         });

package/dist/{ui → features/interactive}/modal/package-info-sections/text.js

@@ -8,7 +8,7 @@ exports.linkifyRepositoryReferences = linkifyRepositoryReferences;
 exports.linkifyMarkdownText = linkifyMarkdownText;
 exports.pushWrappedLines = pushWrappedLines;
 exports.isLowSignalTrailerLine = isLowSignalTrailerLine;
-const utils_1 = require("../../utils");
+const terminal_1 = require("../../../../shared/terminal");
 function formatTerminalLink(label, url) {
     return `]8;;${url}${label}]8;;`;
 }
@@ -33,7 +33,7 @@ function linkifyContributorMentions(text) {
 }
 function linkifyRepositoryReferences(text, repositoryUrl) {
     const repoBaseUrl = getRepositoryBaseUrl(repositoryUrl);
-    if (!repoBaseUrl || !repoBaseUrl.includes('github.com')) {
+    if (!repoBaseUrl?.includes('github.com')) {
         return text;
     }
     return text
@@ -48,16 +48,16 @@ function linkifyMarkdownText(text, repositoryUrl) {
     return linkifyRepositoryReferences(linkifyContributorMentions(text), repositoryUrl);
 }
 function pushWrappedLines(lines, text, width, firstPrefix, restPrefix = firstPrefix, style) {
-    const firstWidth = Math.max(1, width - (0, utils_1.getVisualLength)(firstPrefix));
-    const restWidth = Math.max(1, width - (0, utils_1.getVisualLength)(restPrefix));
-    const segments = (0, utils_1.wrapPlainText)(text, firstWidth);
+    const firstWidth = Math.max(1, width - (0, terminal_1.getVisualLength)(firstPrefix));
+    const restWidth = Math.max(1, width - (0, terminal_1.getVisualLength)(restPrefix));
+    const segments = (0, terminal_1.wrapPlainText)(text, firstWidth);
     if (segments.length === 0) {
         lines.push(firstPrefix.trimEnd());
         return;
     }
     lines.push(firstPrefix + (style ? style(segments[0]) : segments[0]));
     for (let i = 1; i < segments.length; i++) {
-        const wrappedSegments = (0, utils_1.wrapPlainText)(segments[i], restWidth);
+        const wrappedSegments = (0, terminal_1.wrapPlainText)(segments[i], restWidth);
         for (const segment of wrappedSegments) {
             lines.push(restPrefix + (style ? style(segment) : segment));
         }

package/dist/{ui → features/interactive}/modal/package-info.js

@@ -51,14 +51,20 @@ function renderPackageInfoModal(state, terminalWidth = 80, terminalHeight = 24,
     }
     const fixedModalHeight = maxHeight;
     const padding = Math.floor((terminalWidth - modalWidth) / 2);
-    const pinnedSections = allSections.filter((section) => (section.behavior ?? 'pinned') === 'pinned');
-    const bodySections = allSections.filter((section) => (section.behavior ?? 'pinned') !== 'pinned');
+    // Every section built by buildPackageInfoSections declares a behavior, so we
+    // partition directly: 'pinned' stays fixed, everything else scrolls.
+    const pinnedSections = allSections.filter((section) => section.behavior === 'pinned');
+    const bodySections = allSections.filter((section) => section.behavior !== 'pinned');
     const minBodyRows = 3;
-    const reservedBodyRows = minBodyRows + (bodySections.length > 0 ? 1 : 0);
+    // hasScrollableBody guaranteed a 'body' section above, so bodySections is
+    // non-empty and always reserves its separator row.
+    const reservedBodyRows = minBodyRows + 1;
     const maxPinnedHeight = Math.max(6, fixedModalHeight - reservedBodyRows);
     const fittedPinned = (0, layout_1.fitModalSections)(pinnedSections, maxPinnedHeight, trimOrder);
     const pinnedRowCount = (0, layout_1.getModalSectionRowCount)(fittedPinned);
-    const availableForBody = Math.max(minBodyRows, fixedModalHeight - 2 - pinnedRowCount - (bodySections.length > 0 ? 1 : 0));
+    // bodySections is non-empty here (see reservedBodyRows), so its separator
+    // row is always subtracted.
+    const availableForBody = Math.max(minBodyRows, fixedModalHeight - 2 - pinnedRowCount - 1);
     const bodyRows = [];
     bodySections.forEach((section, index) => {
         if (index > 0) {
@@ -91,18 +97,24 @@ function renderPackageInfoModal(state, terminalWidth = 80, terminalHeight = 24,
             ? clampedOffset < maxScroll
                 ? chalk_1.default.gray(`Lines ${clampedOffset + 1}-${Math.min(clampedOffset + visibleBodyRows, totalScrollableRows)} of ${totalScrollableRows}`)
                 : chalk_1.default.gray('End of release notes')
-            : canGoNewer || canGoOlder
-                ? chalk_1.default.gray([canGoNewer ? '← newer version' : null, canGoOlder ? '→ older version' : null]
-                    .filter((hint) => Boolean(hint))
-                    .join('  ·  '))
-                : null;
+            : // A truthy hint footer shrinks visibleBodyRows, which forces
+                // maxScroll ≥ 1 whenever the scroll path is entered — so this arm can
+                // only resolve to the hints when maxScroll is 0, which cannot happen.
+                // Kept as a safety net for future layout changes.
+                /* v8 ignore start */
+                canGoNewer || canGoOlder
+                    ? chalk_1.default.gray([canGoNewer ? '← newer version' : null, canGoOlder ? '→ older version' : null]
+                        .filter((hint) => Boolean(hint))
+                        .join('  ·  '))
+                    : null;
+    /* v8 ignore stop */
     const visibleSlice = bodyRows.slice(clampedOffset, clampedOffset + visibleBodyRows);
     const lines = [];
     const topPadding = Math.max(0, Math.floor((terminalHeight - fixedModalHeight) / 2));
     for (let i = 0; i < topPadding; i++) {
         lines.push('');
     }
-    lines.push(' '.repeat(padding) + chalk_1.default.gray('╭' + '─'.repeat(modalWidth - 2) + '╮'));
+    lines.push(' '.repeat(padding) + chalk_1.default.gray(`╭${'─'.repeat(modalWidth - 2)}╮`));
     fittedPinned.forEach((section, sectionIndex) => {
         if (sectionIndex > 0) {
             lines.push((0, layout_1.renderModalSeparator)(padding, modalWidth));
@@ -111,9 +123,9 @@ function renderPackageInfoModal(state, terminalWidth = 80, terminalHeight = 24,
             lines.push((0, layout_1.renderModalRow)(padding, modalWidth, row));
         }
     });
-    if (bodySections.length > 0) {
-        lines.push((0, layout_1.renderModalSeparator)(padding, modalWidth));
-    }
+    // bodySections is never empty on the scroll path (see above), so a
+    // separator between the pinned rows and the body is always drawn.
+    lines.push((0, layout_1.renderModalSeparator)(padding, modalWidth));
     let renderedScrollRows = 0;
     for (const entry of visibleSlice) {
         if (entry.row === '__SEPARATOR__') {
@@ -124,19 +136,22 @@ function renderPackageInfoModal(state, terminalWidth = 80, terminalHeight = 24,
         }
         renderedScrollRows++;
     }
-    const usedContentRows = pinnedRowCount +
-        (bodySections.length > 0 ? 1 : 0) +
-        renderedScrollRows +
-        (resolvedFooterStatus ? 1 : 0);
+    const usedContentRows = 
+    // bodySections is non-empty on this path, so its separator row always counts.
+    pinnedRowCount + 1 + renderedScrollRows + (resolvedFooterStatus ? 1 : 0);
     const totalContentSlots = fixedModalHeight - 2;
+    // The scroll path is only entered when content overflows the frame, so the
+    // window is always full and there are never filler rows to add.
+    /* v8 ignore start */
     const emptyRows = Math.max(0, totalContentSlots - usedContentRows);
     for (let i = 0; i < emptyRows; i++) {
         lines.push((0, layout_1.renderModalRow)(padding, modalWidth, ''));
     }
+    /* v8 ignore stop */
     if (resolvedFooterStatus) {
         lines.push((0, layout_1.renderModalRow)(padding, modalWidth, resolvedFooterStatus));
     }
-    lines.push(' '.repeat(padding) + chalk_1.default.gray('╰' + '─'.repeat(modalWidth - 2) + '╯'));
+    lines.push(' '.repeat(padding) + chalk_1.default.gray(`╰${'─'.repeat(modalWidth - 2)}╯`));
     return {
         lines,
         maxScrollOffset: maxScroll,

package/dist/features/interactive/modal/types.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=types.js.map

package/dist/{ui → features/interactive}/presenters/health.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getHealthBadge = getHealthBadge;
-const utils_1 = require("../../utils");
+const engines_1 = require("../../../shared/engines");
 const themes_colors_1 = require("../themes-colors");
 /**
  * A compact badge flagging a package's health in the list:
@@ -16,7 +16,7 @@ function getHealthBadge(state) {
     if (state.deprecated) {
         return (0, themes_colors_1.getThemeColor)('warning')('[DEPR]');
     }
-    if ((0, utils_1.checkNodeEngineCompatibility)(state.enginesNode)) {
+    if ((0, engines_1.checkNodeEngineCompatibility)(state.enginesNode)) {
         return (0, themes_colors_1.getThemeColor)('warning')('[ENG]');
     }
     return '';

package/dist/{ui → features/interactive}/renderer/confirmation.js

@@ -15,10 +15,13 @@ function renderConfirmation(choices) {
     // Group choices by package name to show unique packages
     const packagesByName = new Map();
     choices.forEach((choice) => {
-        if (!packagesByName.has(choice.name)) {
-            packagesByName.set(choice.name, []);
+        const group = packagesByName.get(choice.name);
+        if (group) {
+            group.push(choice);
+        }
+        else {
+            packagesByName.set(choice.name, [choice]);
         }
-        packagesByName.get(choice.name).push(choice);
     });
     let output = chalk_1.default.bold(`\n🚀 Ready to upgrade ${packagesByName.size} package(s):\n`);
     packagesByName.forEach((packageChoices, packageName) => {

package/dist/{ui → features/interactive}/renderer/help-modal.js

@@ -5,8 +5,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderHelpModal = renderHelpModal;
 const chalk_1 = __importDefault(require("chalk"));
-const modal_1 = require("../modal");
 const keymap_1 = require("../keymap");
+const modal_1 = require("../modal");
 const themes_colors_1 = require("../themes-colors");
 const KEY_COLUMN_WIDTH = 9;
 /**
@@ -46,7 +46,7 @@ function renderHelpModal(terminalWidth, terminalHeight, scrollOffset = 0) {
     const topPadding = Math.max(0, Math.floor((terminalHeight - fixedModalHeight) / 2));
     for (let i = 0; i < topPadding; i++)
         lines.push('');
-    lines.push(' '.repeat(padding) + chalk_1.default.gray('╭' + '─'.repeat(modalWidth - 2) + '╮'));
+    lines.push(' '.repeat(padding) + chalk_1.default.gray(`╭${'─'.repeat(modalWidth - 2)}╮`));
     for (const row of pinnedRows) {
         lines.push((0, modal_1.renderModalRow)(padding, modalWidth, row));
     }
@@ -64,7 +64,7 @@ function renderHelpModal(terminalWidth, terminalHeight, scrollOffset = 0) {
         lines.push((0, modal_1.renderModalRow)(padding, modalWidth, ''));
     if (footer)
         lines.push((0, modal_1.renderModalRow)(padding, modalWidth, footer));
-    lines.push(' '.repeat(padding) + chalk_1.default.gray('╰' + '─'.repeat(modalWidth - 2) + '╯'));
+    lines.push(' '.repeat(padding) + chalk_1.default.gray(`╰${'─'.repeat(modalWidth - 2)}╯`));
     return {
         lines,
         maxScrollOffset: maxScroll,

package/dist/{ui → features/interactive}/renderer/index.js

@@ -37,9 +37,9 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.UIRenderer = void 0;
-const PackageList = __importStar(require("./package-list"));
-const Confirmation = __importStar(require("./confirmation"));
 const Modal = __importStar(require("../modal"));
+const Confirmation = __importStar(require("./confirmation"));
+const PackageList = __importStar(require("./package-list"));
 /**
  * Main UI renderer class that composes all rendering parts
  */
@@ -70,8 +70,7 @@ class UIRenderer {
     }
 }
 exports.UIRenderer = UIRenderer;
+__exportStar(require("./confirmation"), exports);
 // Re-export all functions for direct use if needed
 __exportStar(require("./package-list"), exports);
-__exportStar(require("./confirmation"), exports);
-__exportStar(require("../modal"), exports);
 //# sourceMappingURL=index.js.map

package/dist/{types.js → features/interactive/renderer/package-list/index.js}

@@ -14,7 +14,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-__exportStar(require("./types/domain"), exports);
-__exportStar(require("./types/ui"), exports);
-__exportStar(require("./types/streaming"), exports);
-//# sourceMappingURL=types.js.map
+__exportStar(require("./interface"), exports);
+__exportStar(require("./rows"), exports);
+//# sourceMappingURL=index.js.map

package/dist/{ui → features/interactive}/renderer/package-list/interface.js

@@ -6,11 +6,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.renderInterface = renderInterface;
 exports.renderPackagesTable = renderPackagesTable;
 const chalk_1 = __importDefault(require("chalk"));
-const utils_1 = require("../../utils");
+const config_1 = require("../../../../shared/config");
+const keymap_1 = require("../../keymap");
 const themes_colors_1 = require("../../themes-colors");
-const config_1 = require("../../../config");
+const version_format_1 = require("../version-format");
 const rows_1 = require("./rows");
-const keymap_1 = require("../../keymap");
 function renderInterface(states, currentRow, scrollOffset, maxVisibleItems, _forceFullRender, renderableItems, activeFilterLabel, packageManager, filterMode, filterQuery, totalPackagesBeforeFilter, terminalWidth = 80, loadingProgress, auditProgress, options = {}, notice) {
     const output = [];
     if (packageManager) {
@@ -31,17 +31,17 @@ function renderInterface(states, currentRow, scrollOffset, maxVisibleItems, _for
                 (0, themes_colors_1.getThemeColor)('textSecondary')(' - ') +
                 (0, themes_colors_1.getThemeColor)('primary')(activeFilterLabel)
             : headerLine;
-        const headerPadding = Math.max(0, terminalWidth - utils_1.VersionUtils.getVisualLength(fullHeaderLine));
+        const headerPadding = Math.max(0, terminalWidth - version_format_1.VersionUtils.getVisualLength(fullHeaderLine));
         output.push(fullHeaderLine + ' '.repeat(headerPadding));
     }
     else {
-        const headerLine = '  ' + chalk_1.default.bold.blue('🚀 ') + (0, themes_colors_1.coloredInupLogo)();
+        const headerLine = `  ${chalk_1.default.bold.blue('🚀 ')}${(0, themes_colors_1.coloredInupLogo)()}`;
         const fullHeaderLine = activeFilterLabel
             ? headerLine +
                 (0, themes_colors_1.getThemeColor)('textSecondary')(' - ') +
                 (0, themes_colors_1.getThemeColor)('primary')(activeFilterLabel)
             : headerLine;
-        const headerPadding = Math.max(0, terminalWidth - utils_1.VersionUtils.getVisualLength(fullHeaderLine));
+        const headerPadding = Math.max(0, terminalWidth - version_format_1.VersionUtils.getVisualLength(fullHeaderLine));
         output.push(fullHeaderLine + ' '.repeat(headerPadding));
     }
     output.push('');
@@ -50,7 +50,7 @@ function renderInterface(states, currentRow, scrollOffset, maxVisibleItems, _for
             chalk_1.default.bold.white('Search: ') +
             (0, themes_colors_1.getThemeColor)('primary')(filterQuery || '') +
             (0, themes_colors_1.getThemeColor)('border')('█');
-        const padding = Math.max(0, terminalWidth - utils_1.VersionUtils.getVisualLength(filterDisplay));
+        const padding = Math.max(0, terminalWidth - version_format_1.VersionUtils.getVisualLength(filterDisplay));
         output.push(filterDisplay + ' '.repeat(padding));
     }
     else if (filterQuery) {
@@ -58,14 +58,14 @@ function renderInterface(states, currentRow, scrollOffset, maxVisibleItems, _for
             chalk_1.default.bold.white('Search: ') +
             (0, themes_colors_1.getThemeColor)('primary')(filterQuery) +
             (0, themes_colors_1.getThemeColor)('textSecondary')(' (press / to edit)');
-        const padding = Math.max(0, terminalWidth - utils_1.VersionUtils.getVisualLength(filterDisplay));
+        const padding = Math.max(0, terminalWidth - version_format_1.VersionUtils.getVisualLength(filterDisplay));
         output.push(filterDisplay + ' '.repeat(padding));
     }
     else {
         const hintLine = (0, keymap_1.getFooterHints)()
-            .map(({ keyLabel, label }) => chalk_1.default.bold.white(keyLabel + ' ') + (0, themes_colors_1.getThemeColor)('textSecondary')(label))
+            .map(({ keyLabel, label }) => chalk_1.default.bold.white(`${keyLabel} `) + (0, themes_colors_1.getThemeColor)('textSecondary')(label))
             .join('  ');
-        output.push('  ' + hintLine);
+        output.push(`  ${hintLine}`);
     }
     const totalPackages = states.length;
     const totalBeforeFilter = totalPackagesBeforeFilter || totalPackages;
@@ -107,8 +107,7 @@ function renderInterface(states, currentRow, scrollOffset, maxVisibleItems, _for
         const matchCount = totalVisualItems > maxVisibleItems
             ? (0, themes_colors_1.getThemeColor)('textSecondary')(`Showing ${chalk_1.default.white(startItem)}-${chalk_1.default.white(endItem)} of ${chalk_1.default.white(totalPackages)} matches`)
             : (0, themes_colors_1.getThemeColor)('textSecondary')(`Showing all ${chalk_1.default.white(totalPackages)} matches`);
-        statusLine =
-            matchCount + '  ' + chalk_1.default.bold.white('Esc ') + chalk_1.default.gray('Clear filter');
+        statusLine = `${matchCount}  ${chalk_1.default.bold.white('Esc ')}${chalk_1.default.gray('Clear filter')}`;
     }
     else {
         if (totalVisualItems > maxVisibleItems) {
@@ -130,13 +129,13 @@ function renderInterface(states, currentRow, scrollOffset, maxVisibleItems, _for
         const auditLabel = auditProgress.isRunning
             ? `Audit ${auditProgress.completed}/${auditProgress.total}`
             : `Audit ${auditProgress.total}/${auditProgress.total}`;
-        statusLine += '  ' + (0, themes_colors_1.getThemeColor)('textSecondary')(auditLabel);
+        statusLine += `  ${(0, themes_colors_1.getThemeColor)('textSecondary')(auditLabel)}`;
     }
     // A one-shot notice (e.g. "nothing selected") replaces the status line for a
     // single render so the layout height stays constant.
     const statusContent = notice ? (0, themes_colors_1.getThemeColor)('warning')(notice) : statusLine;
-    const statusLineFull = '  ' + statusContent;
-    const statusPadding = Math.max(0, terminalWidth - utils_1.VersionUtils.getVisualLength(statusLineFull));
+    const statusLineFull = `  ${statusContent}`;
+    const statusPadding = Math.max(0, terminalWidth - version_format_1.VersionUtils.getVisualLength(statusLineFull));
     output.push(statusLineFull + ' '.repeat(statusPadding));
     output.push('');
     if (renderableItems && renderableItems.length > 0) {
@@ -166,7 +165,7 @@ function renderInterface(states, currentRow, scrollOffset, maxVisibleItems, _for
         const loadingLine = '  ' +
             (0, themes_colors_1.getThemeColor)('textSecondary')(loadingLabel) +
             (failedLabel ? chalk_1.default.yellow(failedLabel) : '');
-        const loadingPadding = Math.max(0, terminalWidth - utils_1.VersionUtils.getVisualLength(loadingLine));
+        const loadingPadding = Math.max(0, terminalWidth - version_format_1.VersionUtils.getVisualLength(loadingLine));
         output.push(loadingLine + ' '.repeat(loadingPadding));
     }
     return output.map((line) => (0, rows_1.padLineToWidth)(line, terminalWidth));