@reliverse/relinka 1.2.7 → 1.2.8

package/dist-npm/components/messages/messages.d.ts

@@ -4,7 +4,7 @@ import { type VariantName } from "./variants.js";
 /**
  * Known symbol names that will have IntelliSense support
  */
-export type SymbolName = "pointer" | "start" | "middle" | "end" | "line" | "corner_top_right" | "step_active" | "step_error" | "info";
+export type SymbolName = "pointer" | "start" | "middle" | "end" | "line" | "corner_top_right" | "step_active" | "step_error" | "info" | "success";
 export type FmtMsgOptions = {
     type: MsgType;
     title?: string;
@@ -54,14 +54,13 @@ export declare const symbols: {
     readonly success: string;
 };
 /**
- * Returns a colored vertical bar symbol.
+ * Returns a colored vertical bar symbol. Prevents gradient colors for bars.
  */
-export declare const bar: ({ borderColor, }: {
+export declare const bar: ({ borderColor, }?: {
     borderColor?: ColorName;
 }) => string;
 /**
- * Formats a message line according to the given FmtMsgOptions.
- * Returns both the formatted text and the number of lines it would occupy.
+ * Main formatter function: builds the final text output based on FmtMsgOptions.
  */
 export declare function fmt(opts: FmtMsgOptions): {
     text: string;
@@ -83,7 +82,6 @@ export declare function msgUndoAll(): void;
 /**
  * Prints:  "│  <text>"  (two spaces after the bar).
  * If text is empty, it just prints "│".
- * If indent is 1, it prints "│ <text>" (one space).
- * If indent is 2, it prints "│  <text>" (two spaces), etc.
+ * If indent is 1, it prints "│ <text>", etc.
  */
 export declare function printLineBar(text: string, indent?: number): void;

package/dist-npm/components/messages/messages.js

@@ -22,44 +22,35 @@ export const symbols = {
   info: u("\u2139", "i"),
   success: u("\u2705", "\u2713")
 };
-function wrapAndStyleText(input, typographyName, colorName, variantName, borderColor) {
-  const adjustedWidth = getTerminalWidth();
-  const wrappedText = wrapAnsi(input, adjustedWidth, {
-    hard: false,
-    trim: true
-  });
-  return wrappedText.split("\n").map((line) => {
-    const isOption = line.startsWith("  ") || line.startsWith("[ ]") || line.startsWith("[x]");
-    return applyStyles(
-      line,
-      colorName && !isOption ? colorName : void 0,
-      typographyName && !isOption ? typographyName : void 0,
-      variantName && variantName !== "none" ? variantName : void 0,
-      borderColor
-    );
-  }).join("\n");
+function wrapThenStyle(input, wrap, typographyName, colorName, variantName, borderColor) {
+  if (!input) return "";
+  const width = getTerminalWidth();
+  const wrappedText = wrap ? wrapAnsi(input, width, { hard: false, trim: true }) : input;
+  return wrappedText.split("\n").map(
+    (line) => applyStyles(line, colorName, typographyName, variantName, borderColor)
+  ).join("\n");
 }
 function applyStyles(text, colorName, typographyName, variantName, borderColor) {
   let styledText = text;
-  if (!isValidVariant(variantName)) {
-    if (colorName && colorMap[colorName]) {
-      styledText = colorMap[colorName](styledText);
-    }
-    if (typographyName && typographyMap[typographyName]) {
-      styledText = typographyMap[typographyName](styledText);
-    }
-  } else if (variantName) {
+  if (variantName && isValidVariant(variantName)) {
     styledText = variantMap[variantName](
       [styledText],
       void 0,
       borderColor
     ).toString();
+    return styledText;
+  }
+  if (colorName && colorMap[colorName]) {
+    styledText = colorMap[colorName](styledText);
+  }
+  if (typographyName && typographyMap[typographyName]) {
+    styledText = typographyMap[typographyName](styledText);
   }
   return styledText;
 }
 export const bar = ({
   borderColor = "dim"
-}) => {
+} = {}) => {
   if (borderColor.endsWith("Gradient")) {
     console.error(
       "Gradient colors are not supported for bars. Please use a solid color instead."
@@ -71,22 +62,87 @@ export const bar = ({
 function countLines(text) {
   return text.split("\n").length;
 }
+function getColoredSymbol(customSymbol, symbolName, symbolColor) {
+  if (customSymbol) {
+    return symbolColor && colorMap[symbolColor] ? colorMap[symbolColor](customSymbol) : customSymbol;
+  }
+  if (symbolName && symbols[symbolName]) {
+    return symbolColor && colorMap[symbolColor] ? colorMap[symbolColor](symbols[symbolName]) : symbols[symbolName];
+  }
+  return void 0;
+}
+function formatTitle(opts, borderTwoSpaces, borderError) {
+  let formattedTitle = "";
+  if (!opts.title) return formattedTitle;
+  const wrappedOrStyledTitle = wrapThenStyle(
+    opts.title,
+    opts.wrapTitle ?? true,
+    opts.titleTypography ?? "bold",
+    opts.titleColor ?? "cyan",
+    opts.titleVariant,
+    opts.borderColor
+  );
+  formattedTitle += wrappedOrStyledTitle;
+  if (opts.hint) {
+    const hintColor = opts.hintPlaceholderColor ?? "blue";
+    const wrappedHint = wrapThenStyle(
+      opts.hint,
+      opts.wrapTitle ?? true,
+      // same wrap logic as title by default
+      opts.hintTypography ?? "italic",
+      hintColor,
+      void 0,
+      opts.borderColor
+    );
+    formattedTitle += `
+${borderTwoSpaces}${wrappedHint}`;
+  }
+  if (opts.placeholder && opts.type === "M_GENERAL") {
+    const placeHolderColor = opts.hintPlaceholderColor ?? "blue";
+    formattedTitle += `
+${borderTwoSpaces}${colorMap[placeHolderColor](opts.placeholder)}`;
+  }
+  if (opts.errorMessage) {
+    const formattedError = applyStyles(
+      opts.errorMessage,
+      "red",
+      "bold",
+      void 0,
+      opts.borderColor
+    );
+    formattedTitle += `
+${borderError}  ${formattedError}`;
+  }
+  return formattedTitle;
+}
+function formatContent(opts) {
+  if (!opts.content) return "";
+  return wrapThenStyle(
+    opts.content,
+    opts.wrapContent ?? true,
+    opts.contentTypography ?? "italic",
+    opts.contentColor ?? "dim",
+    opts.contentVariant,
+    opts.borderColor
+  );
+}
 export function fmt(opts) {
   if (!opts.borderColor) {
     opts.borderColor = "dim";
   }
-  const border = applyStyles(symbols.middle, opts.borderColor);
+  const borderColored = applyStyles(symbols.middle, opts.borderColor);
   const borderError = applyStyles(symbols.middle, "red");
-  const borderWithSpace = `${border}  `;
+  const borderTwoSpaces = `${borderColored}  `;
   const prefixStartLine = opts.borderColor ? colorMap[opts.borderColor](symbols.start + symbols.line) : symbols.start + symbols.line;
   const prefixEndLine = opts.borderColor ? colorMap[opts.borderColor](symbols.end + symbols.line) : symbols.end + symbols.line;
   const lineLength = opts.horizontalLineLength === 0 ? getExactTerminalWidth() - 3 : opts.horizontalLineLength ?? getExactTerminalWidth() - 3;
   const suffixStartLine = opts.borderColor ? colorMap[opts.borderColor](`${symbols.line.repeat(lineLength)}\u22B1`) : `${symbols.line.repeat(lineLength)}\u22B1`;
   const suffixEndLine = opts.borderColor ? colorMap[opts.borderColor](`${symbols.line.repeat(lineLength)}\u22B1`) : `${symbols.line.repeat(lineLength)}\u22B1`;
-  const MSG_CONFIGS = {
+  const computedSymbol = getColoredSymbol(opts.customSymbol, opts.symbol, opts.symbolColor) ?? pc.green(symbols.step_active);
+  const MESSAGE_CONFIG_MAP = {
     M_NULL: {
       symbol: "",
-      prefix: borderWithSpace,
+      prefix: borderTwoSpaces,
       suffix: "",
       newLineBefore: opts.addNewLineBefore ?? false,
       newLineAfter: opts.addNewLineAfter ?? false
@@ -100,7 +156,7 @@ export function fmt(opts) {
     },
     M_INFO_NULL: {
       symbol: "",
-      prefix: borderWithSpace,
+      prefix: borderTwoSpaces,
       suffix: "",
       newLineBefore: opts.addNewLineBefore ?? false,
       newLineAfter: opts.addNewLineAfter ?? false
@@ -109,47 +165,49 @@ export function fmt(opts) {
       symbol: "",
       prefix: "",
       suffix: `
-${borderWithSpace}`,
+${borderTwoSpaces}`,
       newLineBefore: opts.addNewLineBefore ?? false,
       newLineAfter: opts.addNewLineAfter ?? false
     },
     M_MIDDLE: {
       symbol: "",
-      prefix: borderWithSpace,
+      prefix: borderTwoSpaces,
       suffix: "",
       newLineBefore: opts.addNewLineBefore ?? false,
       newLineAfter: opts.addNewLineAfter ?? false
     },
     M_GENERAL: {
-      symbol: opts.customSymbol ? opts.symbolColor ? colorMap[opts.symbolColor](opts.customSymbol) : opts.customSymbol : opts.symbol ? opts.symbolColor ? colorMap[opts.symbolColor](symbols[opts.symbol]) : symbols[opts.symbol] : pc.green(symbols.step_active),
-      prefix: borderWithSpace,
+      symbol: computedSymbol,
+      prefix: borderTwoSpaces,
       suffix: "",
       newLineBefore: opts.addNewLineBefore ?? false,
       newLineAfter: opts.addNewLineAfter ?? false
     },
     M_GENERAL_NULL: {
       symbol: "",
-      prefix: borderWithSpace,
+      prefix: borderTwoSpaces,
       suffix: opts.placeholder ? colorMap[opts.hintPlaceholderColor ?? "blue"](opts.placeholder) : "",
       newLineBefore: opts.addNewLineBefore ?? false,
       newLineAfter: opts.addNewLineAfter ?? false
     },
     M_INFO: {
-      symbol: opts.customSymbol ? opts.symbolColor ? colorMap[opts.symbolColor](opts.customSymbol) : opts.customSymbol : opts.symbol ? opts.symbolColor ? colorMap[opts.symbolColor](symbols[opts.symbol]) : symbols[opts.symbol] : pc.green(symbols.info),
-      prefix: borderWithSpace,
+      symbol: computedSymbol || pc.green(symbols.info),
+      prefix: borderTwoSpaces,
       suffix: "",
       newLineBefore: opts.addNewLineBefore ?? false,
       newLineAfter: opts.addNewLineAfter ?? true
     },
     M_ERROR: {
-      symbol: opts.customSymbol ? opts.symbolColor ? colorMap[opts.symbolColor](opts.customSymbol) : opts.customSymbol : opts.symbol ? opts.symbolColor ? colorMap[opts.symbolColor](symbols[opts.symbol]) : symbols[opts.symbol] : pc.redBright(symbols.step_error),
-      prefix: borderWithSpace,
+      symbol: computedSymbol || pc.redBright(symbols.step_error),
+      prefix: borderTwoSpaces,
+      suffix: "",
       newLineBefore: opts.addNewLineBefore ?? false,
       newLineAfter: opts.addNewLineAfter ?? false
     },
     M_ERROR_NULL: {
       symbol: "",
-      prefix: borderWithSpace,
+      prefix: borderTwoSpaces,
+      suffix: "",
       newLineBefore: opts.addNewLineBefore ?? false,
       newLineAfter: opts.addNewLineAfter ?? false
     },
@@ -162,111 +220,31 @@ ${borderWithSpace}`,
     },
     M_NEWLINE: {
       symbol: "",
-      prefix: borderWithSpace,
+      prefix: borderTwoSpaces,
+      suffix: "",
       newLineBefore: opts.addNewLineBefore ?? false,
       newLineAfter: opts.addNewLineAfter ?? false
     }
   };
-  const config = MSG_CONFIGS[opts.type];
+  const config = MESSAGE_CONFIG_MAP[opts.type];
   if (!config) {
     throw new Error(`Invalid message type: ${opts.type}`);
   }
-  const {
-    symbol = "",
-    suffix = "",
-    newLineBefore = false,
-    newLineAfter = false
-  } = config;
-  function validateColorName(colorName) {
-    if (!colorMap[colorName]) {
-      throw new Error(`Invalid color name: ${colorName}`);
-    }
-  }
-  let formattedTitle = "";
-  if (opts.title) {
-    const rawTitle = opts.title;
-    if (opts.wrapTitle ?? true) {
-      formattedTitle = wrapAndStyleText(
-        rawTitle,
-        opts.titleTypography ?? "bold",
-        opts.titleColor ?? "cyan",
-        opts.titleVariant,
-        opts.borderColor
-      );
-    } else {
-      formattedTitle = applyStyles(
-        rawTitle,
-        opts.titleColor ?? "cyan",
-        opts.titleTypography ?? "bold",
-        opts.titleVariant,
-        opts.borderColor
-      );
-    }
-    if (opts.hint) {
-      const hintPlaceholderColor = opts.hintPlaceholderColor ?? "blue";
-      if (opts.hintPlaceholderColor) {
-        validateColorName(opts.hintPlaceholderColor);
-      }
-      const formattedHint = wrapAndStyleText(
-        opts.hint,
-        opts.hintTypography ?? "italic",
-        hintPlaceholderColor,
-        void 0,
-        opts.borderColor
-      );
-      formattedTitle += `
-${borderWithSpace}${formattedHint}`;
-    }
-    if (opts.placeholder && opts.type === "M_GENERAL") {
-      formattedTitle += `
-${borderWithSpace}${colorMap[opts.hintPlaceholderColor ?? "blue"](opts.placeholder)}`;
-    }
-    if (opts.errorMessage) {
-      const formattedError = applyStyles(
-        opts.errorMessage,
-        "red",
-        "bold",
-        "",
-        opts.borderColor
-      );
-      formattedTitle += `
-${borderError}  ${formattedError}`;
-    }
-  }
-  let formattedContent = "";
-  if (opts.content) {
-    const rawContent = opts.content;
-    if (opts.wrapContent ?? true) {
-      formattedContent = wrapAndStyleText(
-        rawContent,
-        opts.contentTypography ?? "italic",
-        opts.contentColor ?? "dim",
-        opts.contentVariant,
-        opts.borderColor
-      );
-    } else {
-      formattedContent = applyStyles(
-        rawContent,
-        opts.contentColor ?? "dim",
-        opts.contentTypography ?? "italic",
-        opts.contentVariant,
-        opts.borderColor
-      );
-    }
-  }
+  const { symbol, suffix, newLineBefore, newLineAfter } = config;
+  const finalTitle = formatTitle(opts, borderTwoSpaces, borderError);
+  const finalContent = formatContent(opts);
   let text = "";
   if (opts.type === "M_BAR") {
     text = bar({ borderColor: opts.borderColor });
   } else {
-    text = [formattedTitle, formattedContent].filter(Boolean).join(`
-`);
+    text = [finalTitle, finalContent].filter(Boolean).join("\n");
   }
   const fullText = [
     newLineBefore ? `
-${borderWithSpace}` : "",
+${borderTwoSpaces}` : "",
     text,
     newLineAfter ? `
-${borderWithSpace}` : "",
+${borderTwoSpaces}` : "",
     suffix
   ].filter(Boolean).join("");
   const lines = fullText.split("\n").map((line, index) => {
@@ -275,11 +253,12 @@ ${borderWithSpace}` : "",
         return `${prefixStartLine} ${line} ${suffixStartLine}`;
       }
       if (index === 1) {
-        return borderWithSpace;
+        return borderTwoSpaces;
       }
     }
     if (opts.type === "M_END" && opts.border && index === 0) {
-      return !opts.title ? "" : `${bar({ borderColor: opts.borderColor })}  ${line}`;
+      if (!opts.title) return "";
+      return `${bar({ borderColor: opts.borderColor })}  ${line}`;
     }
     if (!line.trim() || line.includes(symbols.middle)) {
       return line;
@@ -287,7 +266,7 @@ ${borderWithSpace}` : "",
     if (index === 0 && symbol) {
       return `${symbol}  ${line}`;
     }
-    return `${borderWithSpace}${line}`;
+    return `${config.prefix}${line}`;
   });
   if (opts.type === "M_END" && opts.border) {
     lines.push(`${prefixEndLine}${suffixEndLine}
@@ -300,8 +279,7 @@ ${borderWithSpace}` : "",
 const printedLineStack = [];
 export function msg(opts) {
   const { text, lineCount } = fmt(opts);
-  process.stdout.write(text + `
-`);
+  process.stdout.write(text + "\n");
   printedLineStack.push(lineCount + 1);
 }
 export function msgUndo(count = 1) {
@@ -323,7 +301,7 @@ export function msgUndoAll() {
 export function printLineBar(text, indent = 2) {
   if (text === "") {
     console.log(pc.dim("\u2502"));
-  } else {
-    console.log(`${pc.dim("\u2502")}${" ".repeat(indent)}${text}`);
+    return;
   }
+  console.log(`${pc.dim("\u2502")}${" ".repeat(indent)}${text}`);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reliverse/relinka",
-  "version": "1.2.7",
+  "version": "1.2.8",
   "author": "blefnk",
   "type": "module",
   "description": "@reliverse/relinka is a powerful logger for your terminal.",