mepcli 1.0.1 → 1.1.0

package/dist/highlight.d.ts

@@ -1 +1,7 @@
 export declare function highlightJson(json: string): string;
+export declare function highlightEnv(env: string): string;
+export declare function highlightToml(toml: string): string;
+export declare function highlightCsv(csv: string): string;
+export declare function highlightShell(script: string): string;
+export declare function highlightProperties(props: string): string;
+export declare function highlight(code: string, language: string): string;

package/dist/highlight.js

@@ -1,39 +1,30 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.highlightJson = highlightJson;
+exports.highlightEnv = highlightEnv;
+exports.highlightToml = highlightToml;
+exports.highlightCsv = highlightCsv;
+exports.highlightShell = highlightShell;
+exports.highlightProperties = highlightProperties;
+exports.highlight = highlight;
 const ansi_1 = require("./ansi");
 const theme_1 = require("./theme");
+// --- 1. JSON Highlighter ---
 function highlightJson(json) {
     if (!json)
         return '';
-    // Updated Regex for better partial matching and separation
-    // 1. Strings (keys or values), allowing unclosed quotes for partial typing
-    // 2. Numbers
-    // 3. Booleans/Null
-    // 4. Punctuation (separated colon from keys logic)
-    // Regex explanation:
-    // ("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"?) -> Captures strings, optionally unclosed at the end
-    // (-?\d+(?:\.\d*)?(?:[eE][+-]?\d+)?)       -> Captures numbers
-    // (true|false|null)                        -> Captures keywords
-    // ([{}[\],:])                              -> Captures punctuation
     const tokenRegex = /("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"?)|(-?\d+(?:\.\d*)?(?:[eE][+-]?\d+)?)|(true|false|null)|([{}[\],:])/g;
     let result = '';
     let lastIndex = 0;
     let match;
     while ((match = tokenRegex.exec(json)) !== null) {
-        // Add any non-matching text (whitespace/invalid) as-is
         if (match.index > lastIndex) {
             result += json.substring(lastIndex, match.index);
         }
         const token = match[0];
-        // 1. Strings (Key or Value determination is context-based, but here we do simple check)
-        // Note: In strict JSON, keys are strings followed by :, but since we separated colon,
-        // we can't easily distinguish keys just by regex lookahead safely without lookbehind support.
-        // However, for visual highlighting, colouring all strings consistently is often acceptable 
-        // or we can try to peek ahead.
         if (token.startsWith('"')) {
-            // Simple heuristic: If the NEXT non-whitespace char is ':', treat as key
             const remaining = json.substring(tokenRegex.lastIndex);
+            // Heuristic for keys: followed by optional whitespace and a colon
             if (/^\s*:/.test(remaining)) {
                 result += `${theme_1.theme.syntax.key}${token}${ansi_1.ANSI.RESET}`;
             }
@@ -41,32 +32,146 @@ function highlightJson(json) {
                 result += `${theme_1.theme.syntax.string}${token}${ansi_1.ANSI.RESET}`;
             }
         }
-        // 2. Numbers
         else if (/^-?\d/.test(token)) {
             result += `${theme_1.theme.syntax.number}${token}${ansi_1.ANSI.RESET}`;
         }
-        // 3. Booleans/Null
         else if (/^(true|false|null)$/.test(token)) {
-            if (token === 'null') {
-                result += `${theme_1.theme.syntax.null}${token}${ansi_1.ANSI.RESET}`;
-            }
-            else {
-                result += `${theme_1.theme.syntax.boolean}${token}${ansi_1.ANSI.RESET}`;
-            }
+            result += (token === 'null')
+                ? `${theme_1.theme.syntax.null}${token}${ansi_1.ANSI.RESET}`
+                : `${theme_1.theme.syntax.boolean}${token}${ansi_1.ANSI.RESET}`;
         }
-        // 4. Punctuation
         else if (/^[{}[\],:]$/.test(token)) {
             result += `${theme_1.theme.syntax.punctuation}${token}${ansi_1.ANSI.RESET}`;
         }
-        // Fallback
         else {
             result += token;
         }
         lastIndex = tokenRegex.lastIndex;
     }
-    // Append remaining text
     if (lastIndex < json.length) {
         result += json.substring(lastIndex);
     }
     return result;
 }
+// --- 2. ENV Highlighter ---
+function highlightEnv(env) {
+    if (!env)
+        return '';
+    return env.split('\n').map(line => {
+        if (line.trim().startsWith('#')) {
+            return `${theme_1.theme.muted}${line}${ansi_1.ANSI.RESET}`;
+        }
+        const match = line.match(/^([^=]+)=(.*)$/);
+        if (match) {
+            const [, key, value] = match;
+            return `${theme_1.theme.syntax.key}${key}${theme_1.theme.syntax.punctuation}=${theme_1.theme.syntax.string}${value}${ansi_1.ANSI.RESET}`;
+        }
+        return line;
+    }).join('\n');
+}
+// --- 3. TOML Highlighter ---
+function highlightToml(toml) {
+    if (!toml)
+        return '';
+    return toml.split('\n').map(line => {
+        const trimmed = line.trim();
+        if (trimmed.startsWith('#')) {
+            return `${theme_1.theme.muted}${line}${ansi_1.ANSI.RESET}`;
+        }
+        // [section]
+        if (trimmed.startsWith('[') && trimmed.endsWith(']')) {
+            return `${theme_1.theme.syntax.key}${line}${ansi_1.ANSI.RESET}`;
+        }
+        // Key = Value
+        const match = line.match(/^(\s*[\w\d_-]+)(\s*=)/);
+        if (match) {
+            const fullMatch = match[0];
+            const keyPart = match[1];
+            const eqPart = match[2];
+            const rest = line.substring(fullMatch.length);
+            return `${theme_1.theme.syntax.key}${keyPart}${ansi_1.ANSI.RESET}${theme_1.theme.syntax.punctuation}${eqPart}${theme_1.theme.syntax.string}${rest}${ansi_1.ANSI.RESET}`;
+        }
+        return line;
+    }).join('\n');
+}
+// --- 4. CSV Highlighter ---
+function highlightCsv(csv) {
+    if (!csv)
+        return '';
+    // Cycle through colors to differentiate columns
+    const colors = [theme_1.theme.syntax.string, theme_1.theme.syntax.key, theme_1.theme.syntax.number, theme_1.theme.syntax.boolean];
+    return csv.split('\n').map(line => {
+        if (!line.trim())
+            return line;
+        // Split by comma, ignoring commas inside double quotes
+        // Regex explanation: Match comma only if followed by an even number of quotes (or 0) until end of line
+        const parts = line.split(/,(?=(?:(?:[^"]*"){2})*[^"]*$)/);
+        return parts.map((part, index) => {
+            const color = colors[index % colors.length];
+            return `${color}${part}${ansi_1.ANSI.RESET}`;
+        }).join(`${theme_1.theme.syntax.punctuation},${ansi_1.ANSI.RESET}`);
+    }).join('\n');
+}
+// --- 5. Shell/Bash Highlighter ---
+function highlightShell(script) {
+    if (!script)
+        return '';
+    // Simple replacements for common shell patterns
+    // 1. Comments
+    // 2. Keywords
+    // 3. Variables
+    const keywords = /\b(if|then|else|elif|fi|for|in|do|done|while|case|esac|return|exit|export|source|echo|printf)\b/g;
+    return script.split('\n').map(line => {
+        if (line.trim().startsWith('#')) {
+            return `${theme_1.theme.muted}${line}${ansi_1.ANSI.RESET}`;
+        }
+        // Temporarily hide strings properly is hard with regex replace, 
+        // so we just do best-effort highlights for keywords and vars outside of checking quote context.
+        const processed = line
+            .replace(keywords, match => `${theme_1.theme.syntax.boolean}${match}${ansi_1.ANSI.RESET}`)
+            .replace(/(\$[\w\d_]+|\$\{[^}]+\})/g, match => `${theme_1.theme.syntax.key}${match}${ansi_1.ANSI.RESET}`)
+            .replace(/(\s|^)(-{1,2}[a-zA-Z0-9_-]+)/g, (_match, prefix, flag) => `${prefix}${theme_1.theme.syntax.number}${flag}${ansi_1.ANSI.RESET}`);
+        return processed;
+    }).join('\n');
+}
+// --- 6. Properties Highlighter ---
+function highlightProperties(props) {
+    if (!props)
+        return '';
+    return props.split('\n').map(line => {
+        const trimmed = line.trim();
+        // Supports # or ! for comments
+        if (trimmed.startsWith('#') || trimmed.startsWith('!')) {
+            return `${theme_1.theme.muted}${line}${ansi_1.ANSI.RESET}`;
+        }
+        // Keys can be separated by = or :
+        const match = line.match(/^([^=:]+)([=:])(.*)$/);
+        if (match) {
+            const [, key, sep, value] = match;
+            return `${theme_1.theme.syntax.key}${key}${theme_1.theme.syntax.punctuation}${sep}${theme_1.theme.syntax.string}${value}${ansi_1.ANSI.RESET}`;
+        }
+        return line;
+    }).join('\n');
+}
+// --- Main Mapping ---
+const highlighters = {
+    'json': highlightJson,
+    'env': highlightEnv,
+    'toml': highlightToml,
+    'csv': highlightCsv,
+    'sh': highlightShell,
+    'bash': highlightShell,
+    'zsh': highlightShell,
+    'properties': highlightProperties,
+    'props': highlightProperties,
+    'conf': highlightProperties // loose convention
+};
+function highlight(code, language) {
+    const lang = language.toLowerCase();
+    const highlightFunc = highlighters[lang];
+    if (highlightFunc) {
+        return highlightFunc(code);
+    }
+    // Fallback: If no highlighter found, return original code
+    return code;
+}

package/dist/prompts/code.js

@@ -5,6 +5,7 @@ const ansi_1 = require("../ansi");
 const base_1 = require("../base");
 const theme_1 = require("../theme");
 const utils_1 = require("../utils");
+const highlight_1 = require("../highlight");
 class CodePrompt extends base_1.Prompt {
     constructor(options) {
         super(options);
@@ -76,44 +77,58 @@ class CodePrompt extends base_1.Prompt {
         let highlighted = '';
         const shouldHighlight = this.options.highlight !== false;
         if (shouldHighlight) {
-            const jsonTokenRegex = /("(\\u[a-zA-Z0-9]{4}|\\[^u]|[^\\"])*"?)|(-?\d+(?:\.\d*)?(?:[eE][+-]?\d+)?)|(true|false|null)|([{}[\],:])/g;
-            let match;
-            let lastIndex = 0;
-            while ((match = jsonTokenRegex.exec(fullRawText)) !== null) {
-                if (match.index > lastIndex) {
-                    const gap = fullRawText.substring(lastIndex, match.index);
-                    this.appendSegment(gap, lastIndex, activeVarStart, activeVarEnd, ansi_1.ANSI.FG_WHITE, (s) => highlighted += s);
-                }
-                const tokenText = match[0];
-                const tokenStart = match.index;
-                let color = theme_1.theme.syntax?.punctuation || ansi_1.ANSI.FG_WHITE;
-                if (tokenText.startsWith('"')) {
-                    const remaining = fullRawText.substring(jsonTokenRegex.lastIndex);
-                    if (/^\s*:/.test(remaining)) {
-                        color = theme_1.theme.syntax?.key || ansi_1.ANSI.FG_CYAN;
+            const lang = this.options.language || 'json';
+            const highlightedText = (0, highlight_1.highlight)(fullRawText, lang);
+            let visibleIdx = 0;
+            let activeColor = ''; // Tracks the last set color
+            for (let i = 0; i < highlightedText.length; i++) {
+                const char = highlightedText[i];
+                if (char === '\x1b') {
+                    // Start of ANSI sequence
+                    let sequence = char;
+                    i++;
+                    while (i < highlightedText.length && highlightedText[i] !== 'm') {
+                        sequence += highlightedText[i];
+                        i++;
+                    }
+                    if (i < highlightedText.length)
+                        sequence += 'm'; // Append terminator
+                    // Interpret sequence (naive)
+                    if (sequence === ansi_1.ANSI.RESET || sequence === '\x1b[0m') {
+                        activeColor = '';
                     }
                     else {
-                        color = theme_1.theme.syntax?.string || ansi_1.ANSI.FG_GREEN;
+                        // Assuming it's a color code.
+                        activeColor = sequence;
                     }
+                    // If we are INSIDE the active range, and we encounter a color change/reset,
+                    // we must ensure UNDERLINE is kept/restored.
+                    if (visibleIdx >= activeVarStart && visibleIdx < activeVarEnd) {
+                        // Output the sequence (e.g. a color change)
+                        highlighted += sequence;
+                        // Then re-assert underline
+                        highlighted += ansi_1.ANSI.UNDERLINE;
+                    }
+                    else {
+                        highlighted += sequence;
+                    }
+                    continue;
                 }
-                else if (/^-?\d/.test(tokenText)) {
-                    color = theme_1.theme.syntax?.number || ansi_1.ANSI.FG_YELLOW;
-                }
-                else if (/^(true|false|null)$/.test(tokenText)) {
-                    color = (tokenText === 'null')
-                        ? (theme_1.theme.syntax?.null || ansi_1.ANSI.FG_RED)
-                        : (theme_1.theme.syntax?.boolean || ansi_1.ANSI.FG_MAGENTA);
+                // Normal char
+                if (visibleIdx === activeVarStart) {
+                    highlighted += `${theme_1.theme.main}${ansi_1.ANSI.UNDERLINE}`;
                 }
-                else if (/^[{}[\],:]$/.test(tokenText)) {
-                    color = theme_1.theme.syntax?.punctuation || ansi_1.ANSI.FG_WHITE;
+                highlighted += char;
+                visibleIdx++;
+                if (visibleIdx === activeVarEnd) {
+                    highlighted += ansi_1.ANSI.RESET;
+                    // Restore previous color if any
+                    if (activeColor) {
+                        highlighted += activeColor;
+                    }
                 }
-                this.appendSegment(tokenText, tokenStart, activeVarStart, activeVarEnd, color, (s) => highlighted += s);
-                lastIndex = jsonTokenRegex.lastIndex;
-            }
-            if (lastIndex < fullRawText.length) {
-                const tail = fullRawText.substring(lastIndex);
-                this.appendSegment(tail, lastIndex, activeVarStart, activeVarEnd, ansi_1.ANSI.FG_WHITE, (s) => highlighted += s);
             }
+            highlighted += ansi_1.ANSI.RESET;
         }
         else {
             this.appendSegment(fullRawText, 0, activeVarStart, activeVarEnd, ansi_1.ANSI.RESET, (s) => highlighted += s);

package/dist/types.d.ts

@@ -190,7 +190,7 @@ export interface WaitOptions extends BaseOptions {
 }
 export interface CodeOptions extends BaseOptions {
     template: string;
-    language?: 'json';
+    language?: 'json' | 'env' | 'toml' | 'csv' | 'sh' | 'bash' | 'zsh' | 'properties' | 'props' | 'conf';
     /**
      * Enable syntax highlighting (Experimental).
      * @default true

package/dist/utils.js

@@ -20,7 +20,7 @@ function detectCapabilities() {
     // Check if it is a TTY
     const isTTY = process.stdout.isTTY;
     const isWindows = process.platform === 'win32';
-    // Logic detect Unicode xịn hơn
+    // Better Unicode detection logic
     const isUnicodeSupported = () => {
         // 1. Windows: Check specific environmental variables
         if (isWindows) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mepcli",
-  "version": "1.0.1",
+  "version": "1.1.0",
   "description": "Zero-dependency, interactive CLI prompt",
   "repository": {
     "type": "git",