@antelopejs/dms-frontend 0.3.10 → 0.3.11

package/README.md

@@ -72,7 +72,7 @@ pnpm add -g @antelopejs/core @antelopejs/dms-frontend
 ```
 
 The plugin prints through the output module of `@antelopejs/core`
-(`@antelopejs/core/cli`), so it needs `@antelopejs/core` 1.13.1 or later.
+(`@antelopejs/core/cli`), so it needs `@antelopejs/core` 1.13.2 or later.
 `npm install -g` works too; this repository and every generated workspace use
 pnpm. Inside a package script, `ajs` resolves from `node_modules/.bin`, and the
 `dms` command it delegates to resolves the project-local plugin, so a script

package/dist/commands/clean-action.d.ts

@@ -4,5 +4,5 @@ export interface CleanOptions {
     all?: boolean;
     yes?: boolean;
 }
-export declare function describeWorkspaces(records: WorkspaceRecord[], isTerminal: boolean): string[];
+export declare function describeWorkspaces(records: WorkspaceRecord[], isTerminal: boolean, columns?: number): string[];
 export declare function runClean(options: CleanOptions): Promise<void>;

package/dist/commands/clean-action.js

@@ -11,25 +11,30 @@ const CLEAN_ALL_COMMAND = "ajs dms clean --all";
 const YES_FLAG = "--yes";
 const COLUMN_GAP = "  ";
 const ROW_INDENT = "  ";
-function describeWorkspaces(records, isTerminal) {
+function describeWorkspaces(records, isTerminal, columns) {
     const rows = records.map((record) => [
         (0, output_1.workspaceId)(record.dir, isTerminal),
         record.backendUrl,
         (0, workspaces_action_1.describeKey)(record),
     ]);
     const widths = rows[0].map((_, column) => Math.max(...rows.map((row) => row[column].length)));
-    return rows.map((row) => row
-        .map((cell, column) => cell.padEnd(widths[column]))
+    return rows.flatMap(([id, ...rest]) => (0, output_1.wrapAfter)(`${id.padEnd(widths[0])}${COLUMN_GAP}`, rest
+        .map((cell, column) => cell.padEnd(widths[column + 1]))
         .join(COLUMN_GAP)
-        .trimEnd());
+        .trimEnd(), columns).map((line) => line.trimEnd()));
+}
+function writeWorkspaces(records, isTerminal, write, paint = (line) => line) {
+    const columns = (0, output_1.feedbackColumns)();
+    const width = columns === undefined ? undefined : columns - ROW_INDENT.length;
+    for (const line of describeWorkspaces(records, isTerminal, width)) {
+        write(`${ROW_INDENT}${paint(line)}`);
+    }
 }
 async function confirmCleanAll(records, totalBytes, options) {
     const prompter = (0, cli_1.createPrompter)({ command: CLEAN_ALL_COMMAND });
     if (!options.yes && prompter.isInteractive) {
         (0, output_1.writeFeedback)(`Remove ${(0, cli_1.pluralize)(records.length, "workspace")} (${(0, output_1.formatSize)(totalBytes)})?`);
-        for (const line of describeWorkspaces(records, true)) {
-            (0, output_1.writeFeedback)(`${ROW_INDENT}${line}`);
-        }
+        writeWorkspaces(records, true, output_1.writeFeedback);
     }
     return prompter.confirm({
         message: "Continue?",
@@ -57,11 +62,10 @@ async function cleanAll(options) {
     ui.message("success", [
         `Removed ${(0, cli_1.pluralize)(records.length, "workspace")}`,
         `freed ${(0, output_1.formatSize)(totalBytes)}`,
-    ].join(ui.symbols.separator), {
-        details: options.yes
-            ? describeWorkspaces(records, (0, output_1.isTerminalFeedback)())
-            : [],
-    });
+    ].join(ui.symbols.separator));
+    if (options.yes) {
+        writeWorkspaces(records, (0, output_1.isTerminalFeedback)(), output_1.writeInfo, ui.palette().dim);
+    }
     (0, workspaces_action_1.reportSkipped)(ui, skipped);
 }
 async function runClean(options) {

package/dist/layer-watch.d.ts

@@ -1,3 +1,3 @@
 import { type Ui } from "@antelopejs/core/cli";
 import { ResolvedLayer } from "./workspace";
-export declare function startLayerWatchers(workspaceDir: string, layers: ResolvedLayer[], ui?: Ui, write?: (text: string) => void): () => Promise<void>;
+export declare function startLayerWatchers(workspaceDir: string, layers: ResolvedLayer[], ui?: Ui, write?: (text: string) => void, isQuiet?: boolean): () => Promise<void>;

package/dist/layer-watch.js

@@ -272,11 +272,14 @@ function createDerivedOutputRefresher(workspaceDir, layers, reporter) {
         },
     };
 }
-function startLayerWatchers(workspaceDir, layers, ui = (0, cli_1.getProcessUi)(), write = output_1.writeFeedback) {
+function startLayerWatchers(workspaceDir, layers, ui = (0, cli_1.getProcessUi)(), write = output_1.writeFeedback, isQuiet = (0, cli_1.isQuietRun)()) {
     const mapPath = (0, child_output_1.createPathMapper)(workspaceDir, layers.map((layer) => ({ ...layer, sourcePath: layer.path })));
     const reporter = {
         warn: (text, options) => write((0, output_1.formatTimedMessage)("warn", text, options, ui)),
-        succeed: (text) => write((0, output_1.formatTimedMessage)("success", text, {}, ui)),
+        succeed: (text) => {
+            if (!isQuiet)
+                write((0, output_1.formatTimedMessage)("success", text, {}, ui));
+        },
         describe: (error) => (0, output_1.failureDetails)(error, ui).map((line) => mapPath(line)),
         show: (path) => {
             const mapped = mapPath(path);

package/dist/output.d.ts

@@ -3,6 +3,8 @@ import { CancelledError } from "./cancellation";
 export declare function exitOnBrokenPipe(stream?: NodeJS.WriteStream): void;
 export declare function isTerminalFeedback(): boolean;
 export declare function isTerminalResult(): boolean;
+export declare function feedbackColumns(): number | undefined;
+export declare function wrapAfter(prefix: string, text: string, columns: number | undefined, paint?: (line: string) => string): string[];
 export declare function writeFeedback(line: string): void;
 export declare function writeInfo(line: string): void;
 export declare function writeHeader(command: string, context: string[], ui?: Ui): void;
@@ -27,7 +29,7 @@ export interface ReadyBlock {
     lines: ReadyLine[];
     footer: string;
 }
-export declare function formatReadyBlock(block: ReadyBlock, ui?: Ui, isQuiet?: boolean): string[];
+export declare function formatReadyBlock(block: ReadyBlock, ui?: Ui, isQuiet?: boolean, columns?: number | undefined): string[];
 export declare function writeReadyBlock(block: ReadyBlock, ui?: Ui): void;
 declare const TIMED_LEVEL_COLORS: {
     readonly success: "green";
@@ -38,6 +40,7 @@ type TimedLevel = keyof typeof TIMED_LEVEL_COLORS;
 export interface TimedMessageOptions {
     details?: readonly string[];
     fixes?: readonly string[];
+    columns?: number;
 }
 export declare function formatTimedMessage(level: TimedLevel, text: string, options?: TimedMessageOptions, ui?: Ui, now?: Date): string;
 export {};

package/dist/output.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.exitOnBrokenPipe = exitOnBrokenPipe;
 exports.isTerminalFeedback = isTerminalFeedback;
 exports.isTerminalResult = isTerminalResult;
+exports.feedbackColumns = feedbackColumns;
+exports.wrapAfter = wrapAfter;
 exports.writeFeedback = writeFeedback;
 exports.writeInfo = writeInfo;
 exports.writeHeader = writeHeader;
@@ -21,6 +23,7 @@ exports.writeReadyBlock = writeReadyBlock;
 exports.formatTimedMessage = formatTimedMessage;
 const node_os_1 = require("node:os");
 const node_path_1 = require("node:path");
+const node_util_1 = require("node:util");
 const cli_1 = require("@antelopejs/core/cli");
 const cancellation_1 = require("./cancellation");
 const HOME_PREFIX = "~";
@@ -34,6 +37,8 @@ const BLOCK_INDENT = "  ";
 const LINK_GAP = "  ";
 const LABEL_SUFFIX = ":";
 const TIME_LENGTH = 8;
+const MIN_WRAP_WIDTH = 20;
+const LEADING_SPACES = /^ */;
 const BYTES_PER_UNIT = 1024;
 const SIZE_UNITS = ["B", "KB", "MB", "GB", "TB"];
 const DECIMAL_SIZE_LIMIT = 10;
@@ -56,6 +61,17 @@ function isTerminalFeedback() {
 function isTerminalResult() {
     return (0, cli_1.detectCapabilities)((0, cli_1.processCapabilityContext)()).terminals.result;
 }
+function feedbackColumns() {
+    return isTerminalFeedback() ? process.stderr.columns || undefined : undefined;
+}
+function wrapAfter(prefix, text, columns, paint = (line) => line) {
+    const indent = " ".repeat((0, node_util_1.stripVTControlCharacters)(prefix).length);
+    const leading = LEADING_SPACES.exec(text)?.[0] ?? "";
+    const lines = columns === undefined
+        ? [text]
+        : (0, cli_1.wrapText)(text.slice(leading.length), Math.max(MIN_WRAP_WIDTH, columns - indent.length - leading.length)).map((line) => `${leading}${line}`);
+    return lines.map((line, index) => `${index === 0 ? prefix : indent}${paint(line)}`);
+}
 function writeFeedback(line) {
     (0, cli_1.getProcessTasks)().write(process.stderr, `${line}\n`);
 }
@@ -65,7 +81,10 @@ function writeInfo(line) {
 }
 function writeHeader(command, context, ui = (0, cli_1.getProcessUi)()) {
     const title = ui.palette().bold(`ajs dms ${command}`);
-    writeInfo(`${title}  ${context.join(ui.symbols.separator)}`);
+    const text = context.join(ui.symbols.separator);
+    for (const line of wrapAfter(`${title}  `, text, feedbackColumns())) {
+        writeInfo(line);
+    }
 }
 function writeBlankLine() {
     writeInfo("");
@@ -163,9 +182,11 @@ function reportStopped(stop, ui = (0, cli_1.getProcessUi)()) {
         ? STOPPED_SYMBOLS.unicode
         : STOPPED_SYMBOLS.ascii;
     const text = [stop.stopped, ...stop.context].join(ui.symbols.separator);
-    writeFeedback(`${lineStart}${ui.palette().red(symbol)} ${text}`);
+    const symbolPrefix = `${ui.palette().red(symbol)} `;
+    const lines = wrapAfter(symbolPrefix, text, feedbackColumns());
+    writeFeedback(`${lineStart}${lines.join("\n")}`);
 }
-function formatReadyBlock(block, ui = (0, cli_1.getProcessUi)(), isQuiet = (0, cli_1.isQuietRun)()) {
+function formatReadyBlock(block, ui = (0, cli_1.getProcessUi)(), isQuiet = (0, cli_1.isQuietRun)(), columns = feedbackColumns()) {
     const palette = ui.palette();
     const arrow = isUnicode(ui) ? LINK_SYMBOLS.unicode : LINK_SYMBOLS.ascii;
     const shown = isQuiet
@@ -173,18 +194,17 @@ function formatReadyBlock(block, ui = (0, cli_1.getProcessUi)(), isQuiet = (0, c
         : block.lines;
     const width = Math.max(...shown.map(({ label }) => label.length + LABEL_SUFFIX.length));
     const lead = (isLink) => `${BLOCK_INDENT}${isLink ? palette.cyan(arrow) : " ".repeat(arrow.length)}${LINK_GAP}`;
-    const lines = shown.map(({ label, value, isLink }) => {
+    const lines = shown.flatMap(({ label, value, isLink }) => {
         const shownLabel = `${label}${LABEL_SUFFIX}`.padEnd(width);
-        const shownValue = isLink ? palette.cyan(value) : value;
-        return `${lead(isLink)}${palette.dim(shownLabel)} ${shownValue}`;
+        return wrapAfter(`${lead(isLink)}${palette.dim(shownLabel)} `, value, columns, isLink ? palette.cyan : undefined);
     });
     if (isQuiet)
         return lines;
     return [
-        `${palette.green(ui.symbols.levels.success)} ${block.title}`,
+        ...wrapAfter(`${palette.green(ui.symbols.levels.success)} `, block.title, columns),
         "",
         ...lines,
-        `${lead()}${palette.dim(block.footer)}`,
+        ...wrapAfter(lead(), block.footer, columns, palette.dim),
     ];
 }
 function writeReadyBlock(block, ui = (0, cli_1.getProcessUi)()) {
@@ -201,14 +221,14 @@ function clockTime(date) {
     return date.toTimeString().slice(0, TIME_LENGTH);
 }
 function formatTimedMessage(level, text, options = {}, ui = (0, cli_1.getProcessUi)(), now = new Date()) {
-    const { details = [], fixes = [] } = options;
+    const { details = [], fixes = [], columns = feedbackColumns() } = options;
     const palette = ui.palette();
     const paint = palette[TIMED_LEVEL_COLORS[level]];
     const hint = palette.cyan(ui.symbols.levels.hint);
     const indent = " ".repeat(TIME_LENGTH + 1) + BLOCK_INDENT;
     return [
-        `${palette.dim(clockTime(now))} ${paint(ui.symbols.levels[level])} ${text}`,
-        ...details.map((detail) => `${indent}${palette.dim(detail)}`),
-        ...fixes.map((fix) => `${indent}${hint} ${fix}`),
+        ...wrapAfter(`${palette.dim(clockTime(now))} ${paint(ui.symbols.levels[level])} `, text, columns),
+        ...details.flatMap((detail) => wrapAfter(indent, detail, columns, palette.dim)),
+        ...fixes.flatMap((fix) => wrapAfter(`${indent}${hint} `, fix, columns)),
     ].join("\n");
 }

package/dist/update-check.d.ts

@@ -14,6 +14,7 @@ export interface UpdateCheckOptions {
     fetchLatestVersion?: (packageName: string) => Promise<string | undefined>;
     ui?: Ui;
     write?: (line: string) => void;
+    columns?: number;
 }
 export interface UpdateNoticeOptions {
     isFollowed?: boolean;

package/dist/update-check.js

@@ -182,11 +182,11 @@ function fetchLatestVersionFromRegistry(packageName, registryUrl = DEFAULT_REGIS
         }
     });
 }
-function formatNotice(currentVersion, latestVersion, ui) {
+function formatNotice(currentVersion, latestVersion, ui, columns) {
     const palette = ui.palette("feedback");
     const { info, hint } = ui.symbols.levels;
-    return (`${palette.blue(info)} ajs dms ${latestVersion} is available ` +
-        `(you have ${currentVersion}) ${palette.cyan(`${hint} ${UPDATE_COMMAND}`)}`);
+    return (0, output_1.wrapAfter)(`${palette.blue(info)} `, `ajs dms ${latestVersion} is available (you have ${currentVersion}) ` +
+        palette.cyan(`${hint} ${UPDATE_COMMAND}`), columns);
 }
 async function isNewer(currentVersion, latestVersion) {
     if (currentVersion === latestVersion)
@@ -200,7 +200,7 @@ async function isNewer(currentVersion, latestVersion) {
 }
 function startUpdateCheck(options) {
     try {
-        const { currentVersion, argv = process.argv.slice(2), env = process.env, isTerminal = (0, output_1.isTerminalFeedback)(), now = Date.now, cacheFile = updateCheckCacheFile(), fetchLatestVersion = fetchLatestVersionFromRegistry, ui = (0, cli_1.getProcessUi)(), write = output_1.writeFeedback, } = options;
+        const { currentVersion, argv = process.argv.slice(2), env = process.env, isTerminal = (0, output_1.isTerminalFeedback)(), now = Date.now, cacheFile = updateCheckCacheFile(), fetchLatestVersion = fetchLatestVersionFromRegistry, ui = (0, cli_1.getProcessUi)(), write = output_1.writeFeedback, columns = (0, output_1.feedbackColumns)(), } = options;
         if (!isTerminal || !isUpdateCheckEnabled(argv, env))
             return undefined;
         const cached = readCache(cacheFile);
@@ -230,8 +230,10 @@ function startUpdateCheck(options) {
             const known = latestVersion;
             if (!known || !(await isNewer(currentVersion, known)))
                 return;
-            const line = formatNotice(currentVersion, known, ui);
-            for (const text of placement.isFollowed ? [line, ""] : ["", line]) {
+            const lines = formatNotice(currentVersion, known, ui, columns);
+            for (const text of placement.isFollowed
+                ? [...lines, ""]
+                : ["", ...lines]) {
                 write(text);
             }
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@antelopejs/dms-frontend",
-  "version": "0.3.10",
+  "version": "0.3.11",
   "description": "Frontend-agnostic loader for AntelopeJS DMS, shipping the Vue 3 renderer (Vite, Inertia, SSR)",
   "keywords": [
     "antelope",
@@ -73,7 +73,7 @@
     "unzipper": "^0.12.3"
   },
   "devDependencies": {
-    "@antelopejs/core": "^1.13.1",
+    "@antelopejs/core": "^1.13.2",
     "@antelopejs/tooling-configs": ">=0.0.7 <1.0.0",
     "@iconify/utils": "^3.1.0",
     "@iconify/vue": "^5.0.1",
@@ -101,7 +101,7 @@
     "vue-i18n": "^11.2.7"
   },
   "peerDependencies": {
-    "@antelopejs/core": ">=1.13.1 <2"
+    "@antelopejs/core": ">=1.13.2 <2"
   },
   "optionalDependencies": {
     "@oxc-parser/binding-darwin-arm64": "^0.95.0",