@wener/common 2.0.1 → 2.0.3

package/lib/cn/pinyin/loader.js

@@ -0,0 +1,14 @@
+import { setCharToPinyinTable } from "./toPinyinPure.js";
+import { transformData } from "./transform.js";
+export function loadCharToPinyinTable() {
+    return import("./data.json", {
+        with: {
+            type: "json"
+        }
+    }).then((v) => v.default).then((data) => {
+        let out = transformData(data);
+        setCharToPinyinTable(out);
+        return out;
+    });
+}
+//# sourceMappingURL=loader.js.map

package/lib/cn/pinyin/loader.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/cn/pinyin/loader.ts"],"sourcesContent":["import { setCharToPinyinTable } from './toPinyinPure';\nimport { transformData } from './transform';\n\nexport function loadCharToPinyinTable(): Promise<Record<string, string[]>> {\n\treturn import('./data.json' as unknown as string, { with: { type: 'json' } })\n\t\t.then((v) => v.default as Record<string, string[]>)\n\t\t.then((data) => {\n\t\t\tlet out = transformData(data);\n\t\t\tsetCharToPinyinTable(out);\n\t\t\treturn out;\n\t\t});\n}\n"],"names":["setCharToPinyinTable","transformData","loadCharToPinyinTable","with","type","then","v","default","data","out"],"mappings":"AAAA,SAASA,oBAAoB,QAAQ,iBAAiB;AACtD,SAASC,aAAa,QAAQ,cAAc;AAE5C,OAAO,SAASC;IACf,OAAO,MAAM,CAAC,eAAoC;QAAEC,MAAM;YAAEC,MAAM;QAAO;IAAE,GACzEC,IAAI,CAAC,CAACC,IAAMA,EAAEC,OAAO,EACrBF,IAAI,CAAC,CAACG;QACN,IAAIC,MAAMR,cAAcO;QACxBR,qBAAqBS;QACrB,OAAOA;IACR;AACF"}

package/lib/cn/pinyin/preload.js

@@ -0,0 +1,3 @@
+import { loadCharToPinyinTable } from "./loader.js";
+await loadCharToPinyinTable();
+//# sourceMappingURL=preload.js.map

package/lib/cn/pinyin/preload.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/cn/pinyin/preload.ts"],"sourcesContent":["import { loadCharToPinyinTable } from './loader';\n\nawait loadCharToPinyinTable();\n"],"names":["loadCharToPinyinTable"],"mappings":"AAAA,SAASA,qBAAqB,QAAQ,WAAW;AAEjD,MAAMA"}

package/lib/cn/pinyin/toPinyin.test.js

@@ -0,0 +1,167 @@
+function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) {
+    try {
+        var info = gen[key](arg);
+        var value = info.value;
+    }
+    catch (error) {
+        reject(error);
+        return;
+    }
+    if (info.done) {
+        resolve(value);
+    }
+    else {
+        Promise.resolve(value).then(_next, _throw);
+    }
+}
+function _async_to_generator(fn) {
+    return function () {
+        var self = this, args = arguments;
+        return new Promise(function (resolve, reject) {
+            var gen = fn.apply(self, args);
+            function _next(value) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value);
+            }
+            function _throw(err) {
+                asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err);
+            }
+            _next(undefined);
+        });
+    };
+}
+function _ts_generator(thisArg, body) {
+    var f, y, t, _ = {
+        label: 0,
+        sent: function () {
+            if (t[0] & 1)
+                throw t[1];
+            return t[1];
+        },
+        trys: [],
+        ops: []
+    }, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype), d = Object.defineProperty;
+    return d(g, "next", {
+        value: verb(0)
+    }), d(g, "throw", {
+        value: verb(1)
+    }), d(g, "return", {
+        value: verb(2)
+    }), typeof Symbol === "function" && d(g, Symbol.iterator, {
+        value: function () {
+            return this;
+        }
+    }), g;
+    function verb(n) {
+        return function (v) {
+            return step([
+                n,
+                v
+            ]);
+        };
+    }
+    function step(op) {
+        if (f)
+            throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _)
+            try {
+                if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done)
+                    return t;
+                if (y = 0, t)
+                    op = [
+                        op[0] & 2,
+                        t.value
+                    ];
+                switch (op[0]) {
+                    case 0:
+                    case 1:
+                        t = op;
+                        break;
+                    case 4:
+                        _.label++;
+                        return {
+                            value: op[1],
+                            done: false
+                        };
+                    case 5:
+                        _.label++;
+                        y = op[1];
+                        op = [
+                            0
+                        ];
+                        continue;
+                    case 7:
+                        op = _.ops.pop();
+                        _.trys.pop();
+                        continue;
+                    default:
+                        if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+                            _ = 0;
+                            continue;
+                        }
+                        if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+                            _.label = op[1];
+                            break;
+                        }
+                        if (op[0] === 6 && _.label < t[1]) {
+                            _.label = t[1];
+                            t = op;
+                            break;
+                        }
+                        if (t && _.label < t[2]) {
+                            _.label = t[2];
+                            _.ops.push(op);
+                            break;
+                        }
+                        if (t[2])
+                            _.ops.pop();
+                        _.trys.pop();
+                        continue;
+                }
+                op = body.call(thisArg, _);
+            }
+            catch (e) {
+                op = [
+                    6,
+                    e
+                ];
+                y = 0;
+            }
+            finally {
+                f = t = 0;
+            }
+        if (op[0] & 5)
+            throw op[1];
+        return {
+            value: op[0] ? op[1] : void 0,
+            done: true
+        };
+    }
+}
+import { assert, test } from "vitest";
+import { loadCharToPinyinTable } from "./loader.js";
+import { toPinyinPure } from "./toPinyinPure.js";
+test("toPinyin", function () {
+    return _async_to_generator(function () {
+        return _ts_generator(this, function (_state) {
+            switch (_state.label) {
+                case 0:
+                    return [
+                        4,
+                        loadCharToPinyinTable()
+                    ];
+                case 1:
+                    _state.sent();
+                    assert.deepEqual(toPinyinPure("\u771F\u601D"), [
+                        "zhen,sai",
+                        "zhen,si"
+                    ]);
+                    return [
+                        2
+                    ];
+            }
+        });
+        // char to py -> 350k
+        // py to char -> 145k
+        // csv -> 96k
+    })();
+});

package/lib/cn/pinyin/toPinyinPure.js

@@ -0,0 +1,33 @@
+import { cartesianProduct } from "./cartesianProduct.js";
+let CharToPinyinTable;
+export function setCharToPinyinTable(table) {
+    CharToPinyinTable = table;
+}
+export function getCharToPinyinTable() {
+    if (!CharToPinyinTable) {
+        return {};
+    }
+    return CharToPinyinTable;
+}
+export function toPinyinPureFirst(s, sep = ",") {
+    let tab = getCharToPinyinTable();
+    return s.split("").map((c) => tab[c]?.[0]).filter(Boolean).join(sep);
+}
+export function toPinyinPure(s, sep = ",") {
+    let tab = getCharToPinyinTable();
+    // ensure order
+    return cartesianProduct(s.split("").map((c) => tab[c] || "")).sort((a, b) => {
+        for (let i = 0; i < a.length; i++) {
+            let x = a[i];
+            let y = b[i];
+            if (x < y)
+                return -1;
+            if (x > y)
+                return 1;
+        }
+        return 0;
+    }).map((v) => v.filter(Boolean).join(sep));
+} // export function lookupPinyinPure(s: string): Array<Array<string>> {
+//   return cartesianProductOfArray(s.split('').map(c => Lookup[c]));
+// }
+//# sourceMappingURL=toPinyinPure.js.map

package/lib/cn/pinyin/toPinyinPure.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/cn/pinyin/toPinyinPure.ts"],"sourcesContent":["import { cartesianProduct } from './cartesianProduct';\n\nlet CharToPinyinTable: Record<string, string[]> | undefined;\n\nexport function setCharToPinyinTable(table: Record<string, string[]>) {\n\tCharToPinyinTable = table;\n}\n\nexport function getCharToPinyinTable() {\n\tif (!CharToPinyinTable) {\n\t\treturn {};\n\t}\n\treturn CharToPinyinTable;\n}\n\nexport function toPinyinPureFirst(s: string, sep = ','): string {\n\tlet tab = getCharToPinyinTable();\n\treturn s\n\t\t.split('')\n\t\t.map((c) => tab[c]?.[0])\n\t\t.filter(Boolean)\n\t\t.join(sep);\n}\n\nexport function toPinyinPure(s: string, sep = ','): string[] {\n\tlet tab = getCharToPinyinTable();\n\t// ensure order\n\treturn cartesianProduct(s.split('').map((c) => tab[c] || ''))\n\t\t.sort((a, b) => {\n\t\t\tfor (let i = 0; i < a.length; i++) {\n\t\t\t\tlet x = a[i];\n\t\t\t\tlet y = b[i];\n\t\t\t\tif (x < y) return -1;\n\t\t\t\tif (x > y) return 1;\n\t\t\t}\n\t\t\treturn 0;\n\t\t})\n\t\t.map((v) => v.filter(Boolean).join(sep));\n}\n\n// export function lookupPinyinPure(s: string): Array<Array<string>> {\n//   return cartesianProductOfArray(s.split('').map(c => Lookup[c]));\n// }\n"],"names":["cartesianProduct","CharToPinyinTable","setCharToPinyinTable","table","getCharToPinyinTable","toPinyinPureFirst","s","sep","tab","split","map","c","filter","Boolean","join","toPinyinPure","sort","a","b","i","length","x","y","v"],"mappings":"AAAA,SAASA,gBAAgB,QAAQ,qBAAqB;AAEtD,IAAIC;AAEJ,OAAO,SAASC,qBAAqBC,KAA+B;IACnEF,oBAAoBE;AACrB;AAEA,OAAO,SAASC;IACf,IAAI,CAACH,mBAAmB;QACvB,OAAO,CAAC;IACT;IACA,OAAOA;AACR;AAEA,OAAO,SAASI,kBAAkBC,CAAS,EAAEC,MAAM,GAAG;IACrD,IAAIC,MAAMJ;IACV,OAAOE,EACLG,KAAK,CAAC,IACNC,GAAG,CAAC,CAACC,IAAMH,GAAG,CAACG,EAAE,EAAE,CAAC,EAAE,EACtBC,MAAM,CAACC,SACPC,IAAI,CAACP;AACR;AAEA,OAAO,SAASQ,aAAaT,CAAS,EAAEC,MAAM,GAAG;IAChD,IAAIC,MAAMJ;IACV,eAAe;IACf,OAAOJ,iBAAiBM,EAAEG,KAAK,CAAC,IAAIC,GAAG,CAAC,CAACC,IAAMH,GAAG,CAACG,EAAE,IAAI,KACvDK,IAAI,CAAC,CAACC,GAAGC;QACT,IAAK,IAAIC,IAAI,GAAGA,IAAIF,EAAEG,MAAM,EAAED,IAAK;YAClC,IAAIE,IAAIJ,CAAC,CAACE,EAAE;YACZ,IAAIG,IAAIJ,CAAC,CAACC,EAAE;YACZ,IAAIE,IAAIC,GAAG,OAAO,CAAC;YACnB,IAAID,IAAIC,GAAG,OAAO;QACnB;QACA,OAAO;IACR,GACCZ,GAAG,CAAC,CAACa,IAAMA,EAAEX,MAAM,CAACC,SAASC,IAAI,CAACP;AACrC,EAEA,sEAAsE;CACtE,qEAAqE;CACrE,IAAI"}

package/lib/cn/pinyin/transform.js

@@ -0,0 +1,14 @@
+export function transformData(input) {
+    let out = {};
+    for (let [py, chars] of Object.entries(input)){
+        for (let c of chars){
+            if (!out[c]) {
+                out[c] = [];
+            }
+            out[c].push(py);
+        }
+    }
+    return out;
+}
+
+//# sourceMappingURL=transform.js.map

package/lib/cn/pinyin/transform.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/cn/pinyin/transform.ts"],"sourcesContent":["export function transformData(input: Record<string, string[]>) {\n\tlet out = {} as Record<string, string[]>;\n\tfor (let [py, chars] of Object.entries(input)) {\n\t\tfor (let c of chars) {\n\t\t\tif (!out[c]) {\n\t\t\t\tout[c] = [];\n\t\t\t}\n\t\t\tout[c].push(py);\n\t\t}\n\t}\n\treturn out;\n}\n"],"names":["transformData","input","out","py","chars","Object","entries","c","push"],"mappings":"AAAA,OAAO,SAASA,cAAcC,KAA+B;IAC5D,IAAIC,MAAM,CAAC;IACX,KAAK,IAAI,CAACC,IAAIC,MAAM,IAAIC,OAAOC,OAAO,CAACL,OAAQ;QAC9C,KAAK,IAAIM,KAAKH,MAAO;YACpB,IAAI,CAACF,GAAG,CAACK,EAAE,EAAE;gBACZL,GAAG,CAACK,EAAE,GAAG,EAAE;YACZ;YACAL,GAAG,CAACK,EAAE,CAACC,IAAI,CAACL;QACb;IACD;IACA,OAAOD;AACR"}

package/lib/cn/types.d.js

@@ -4,3 +4,5 @@
  * @see https://en.wikipedia.org/wiki/Resident_Identity_Card
  * @see https://en.wikipedia.org/wiki/Foreign_Permanent_Resident_ID_Card
  */ export { };
+
+//# sourceMappingURL=types.d.js.map

package/lib/cn/types.d.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/cn/types.d.ts"],"sourcesContent":["/**\n * 居民身份证\n *\n * @see https://en.wikipedia.org/wiki/Resident_Identity_Card\n * @see https://en.wikipedia.org/wiki/Foreign_Permanent_Resident_ID_Card\n */\nexport interface ResidentIdentityCardInfo {\n\t/**\n\t * @title 姓名\n\t */\n\tname: string;\n\t/**\n\t * @title 性别\n\t */\n\tsex: 'Male' | 'Female';\n\t/**\n\t * @title 民族\n\t * 例如 '汉'/'满'/'回'\n\t */\n\tethnicity: string;\n\t/**\n\t * @title 出生日期\n\t * @format date\n\t */\n\tbirthDate: string;\n\t/**\n\t * @title 地址\n\t *\n\t * - 通常为 domicile/户籍地\n\t */\n\taddress: string;\n\t/**\n\t * @title 身份证号\n\t */\n\tidentityCardNumber: string;\n\t/**\n\t * @title 签发机关\n\t */\n\tissuer: string;\n\t/**\n\t * @title 有效期开始日期\n\t * @format date\n\t */\n\tvalidStartDate: string;\n\t/**\n\t * @title 有效期结束日期\n\t * @format date\n\t * @description 如长期有效则为 空\n\t */\n\tvalidEndDate?: string;\n}\n"],"names":[],"mappings":"AAAA;;;;;CAKC,GACD,WA4CC"}

package/lib/consola/createStandardConsolaReporter.js

@@ -1,11 +1,10 @@
 import { formatLogObject } from "./formatLogObject.js";
-export function createStandardConsolaReporter() {
-    var _ref = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {}, _ref_format = _ref.format, format = _ref_format === void 0 ? formatLogObject : _ref_format;
+export function createStandardConsolaReporter({ format = formatLogObject } = {}) {
     return {
-        log: function (o, ctx) {
-            var out = format(o, ctx);
-            var fn = console.log;
-            var level = o.level;
+        log: (o, ctx) => {
+            let out = format(o, ctx);
+            let fn = console.log;
+            const { level } = o;
             if (level < 1) {
                 fn = console.error;
             }
@@ -16,3 +15,4 @@ export function createStandardConsolaReporter() {
         }
     };
 }
+//# sourceMappingURL=createStandardConsolaReporter.js.map

package/lib/consola/createStandardConsolaReporter.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/consola/createStandardConsolaReporter.ts"],"sourcesContent":["import type { ConsolaOptions, ConsolaReporter, LogObject } from 'consola/core';\nimport { formatLogObject } from './formatLogObject';\n\ntype Formatter = (\n\to: LogObject,\n\tctx: {\n\t\toptions: ConsolaOptions;\n\t},\n) => string;\n\nexport function createStandardConsolaReporter({\n\tformat = formatLogObject,\n}: {\n\tformat?: Formatter;\n} = {}): ConsolaReporter {\n\treturn {\n\t\tlog: (o, ctx) => {\n\t\t\tlet out = format(o, ctx);\n\t\t\tlet fn = console.log;\n\n\t\t\tconst { level } = o;\n\t\t\tif (level < 1) {\n\t\t\t\tfn = console.error;\n\t\t\t} else if (level === 1) {\n\t\t\t\tfn = console.warn;\n\t\t\t}\n\n\t\t\tfn(out);\n\t\t},\n\t};\n}\n"],"names":["formatLogObject","createStandardConsolaReporter","format","log","o","ctx","out","fn","console","level","error","warn"],"mappings":"AACA,SAASA,eAAe,QAAQ,oBAAoB;AASpD,OAAO,SAASC,8BAA8B,EAC7CC,SAASF,eAAe,EAGxB,GAAG,CAAC,CAAC;IACL,OAAO;QACNG,KAAK,CAACC,GAAGC;YACR,IAAIC,MAAMJ,OAAOE,GAAGC;YACpB,IAAIE,KAAKC,QAAQL,GAAG;YAEpB,MAAM,EAAEM,KAAK,EAAE,GAAGL;YAClB,IAAIK,QAAQ,GAAG;gBACdF,KAAKC,QAAQE,KAAK;YACnB,OAAO,IAAID,UAAU,GAAG;gBACvBF,KAAKC,QAAQG,IAAI;YAClB;YAEAJ,GAAGD;QACJ;IACD;AACD"}

package/lib/consola/formatLogObject.js

@@ -1,93 +1,7 @@
-function _array_like_to_array(arr, len) {
-    if (len == null || len > arr.length) len = arr.length;
-    for(var i = 0, arr2 = new Array(len); i < len; i++)arr2[i] = arr[i];
-    return arr2;
-}
-function _array_with_holes(arr) {
-    if (Array.isArray(arr)) return arr;
-}
-function _array_without_holes(arr) {
-    if (Array.isArray(arr)) return _array_like_to_array(arr);
-}
-function _define_property(obj, key, value) {
-    if (key in obj) {
-        Object.defineProperty(obj, key, {
-            value: value,
-            enumerable: true,
-            configurable: true,
-            writable: true
-        });
-    } else {
-        obj[key] = value;
-    }
-    return obj;
-}
-function _iterable_to_array(iter) {
-    if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter);
-}
-function _non_iterable_rest() {
-    throw new TypeError("Invalid attempt to destructure non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _non_iterable_spread() {
-    throw new TypeError("Invalid attempt to spread non-iterable instance.\\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method.");
-}
-function _object_spread(target) {
-    for(var i = 1; i < arguments.length; i++){
-        var source = arguments[i] != null ? arguments[i] : {};
-        var ownKeys = Object.keys(source);
-        if (typeof Object.getOwnPropertySymbols === "function") {
-            ownKeys = ownKeys.concat(Object.getOwnPropertySymbols(source).filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(source, sym).enumerable;
-            }));
-        }
-        ownKeys.forEach(function(key) {
-            _define_property(target, key, source[key]);
-        });
-    }
-    return target;
-}
-function ownKeys(object, enumerableOnly) {
-    var keys = Object.keys(object);
-    if (Object.getOwnPropertySymbols) {
-        var symbols = Object.getOwnPropertySymbols(object);
-        if (enumerableOnly) {
-            symbols = symbols.filter(function(sym) {
-                return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-            });
-        }
-        keys.push.apply(keys, symbols);
-    }
-    return keys;
-}
-function _object_spread_props(target, source) {
-    source = source != null ? source : {};
-    if (Object.getOwnPropertyDescriptors) {
-        Object.defineProperties(target, Object.getOwnPropertyDescriptors(source));
-    } else {
-        ownKeys(Object(source)).forEach(function(key) {
-            Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
-        });
-    }
-    return target;
-}
-function _to_array(arr) {
-    return _array_with_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_rest();
-}
-function _to_consumable_array(arr) {
-    return _array_without_holes(arr) || _iterable_to_array(arr) || _unsupported_iterable_to_array(arr) || _non_iterable_spread();
-}
-function _unsupported_iterable_to_array(o, minLen) {
-    if (!o) return;
-    if (typeof o === "string") return _array_like_to_array(o, minLen);
-    var n = Object.prototype.toString.call(o).slice(8, -1);
-    if (n === "Object" && o.constructor) n = o.constructor.name;
-    if (n === "Map" || n === "Set") return Array.from(n);
-    if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _array_like_to_array(o, minLen);
-}
-import colors from 'chalk';
-import dayjs from 'dayjs';
-import { isDevelopment } from 'std-env';
-var levelColors = {
+import colors, { Chalk } from "chalk";
+import dayjs from "dayjs";
+import { isDevelopment } from "std-env";
+const LevelColors = {
     trace: colors.gray,
     debug: colors.cyan,
     info: colors.blueBright,
@@ -103,7 +17,7 @@ var levelColors = {
     box: colors.white,
     verbose: colors.green
 };
-var levelShort = {
+const levelShort = {
     trace: 'TRAC',
     debug: 'DEBG',
     info: 'INFO',
@@ -119,18 +33,27 @@ var levelShort = {
     box: 'BOX ',
     verbose: 'VERB'
 };
-var start = Date.now();
+const start = Date.now();
+const Colors = colors;
+const NoColors = new Chalk({
+    level: 0
+});
 export function formatLogObject(o, ctx) {
-    var date = o.date, type = o.type, tag = o.tag;
+    const shouldColor = Boolean(ctx.options?.formatOptions?.colors);
+    let { date, type, tag } = o;
     type = type === 'log' ? 'info' : type;
-    var color = levelColors[type] || colors.white;
-    var levelText = levelShort[type] || type.toUpperCase().slice(0, 4); // Get first 4 chars, consistent uppercase
-    var line = '';
-    var out = [];
+    const colors = shouldColor ? Colors : NoColors;
+    let color = LevelColors[type] || colors.white;
+    if (!shouldColor) {
+        color = (v)=>v;
+    }
+    const levelText = levelShort[type] || type.toUpperCase().slice(0, 4); // Get first 4 chars, consistent uppercase
+    let line = '';
+    let out = [];
     // Timestamp
     if (isDevelopment) {
         // process.hrtime.bigint()
-        var diff = (date.getTime() - start) / 1000;
+        let diff = (date.getTime() - start) / 1000;
         out.push(colors.gray(diff.toFixed(3).padStart(7, ' ')));
     } else {
         out.push(colors.gray(dayjs(date).format('YYYY-MM-DD HH:mm:ss.SSS')));
@@ -139,17 +62,19 @@ export function formatLogObject(o, ctx) {
     // Pad to 4 characters
     out.push(color(levelText.padEnd(4, ' ')));
     if (tag) {
-        out.push(colors.yellow("[".concat(tag, "]"))); // Added color for tag
+        out.push(colors.yellow(`[${tag}]`)); // Added color for tag
     }
     {
-        var _formatArgs_split = _to_array(formatArgs(o.args, ctx).split('\n')), message = _formatArgs_split[0], additional = _formatArgs_split.slice(1);
+        const [message, ...additional] = formatArgs(o.args, {
+            colors: shouldColor
+        }).split('\n');
         out.push(characterFormat(message));
         line = out.join(' ');
         if (additional.length > 0) {
             line += characterFormat(additional.join('\n'));
         }
         if (type === 'trace') {
-            var _err = new Error('Trace: ' + o.message);
+            const _err = new Error('Trace: ' + o.message);
             line += formatStack(_err.stack || '', _err.message);
         }
     }
@@ -169,32 +94,20 @@ export function formatLogObject(o, ctx) {
 }
 function characterFormat(str) {
     return str// highlight backticks
-    .replace(/`([^`]+)`/gm, function(_, m) {
-        return colors.cyan(m);
-    })// underline underscores
-    .replace(/\s+_([^_]+)_\s+/gm, function(_, m) {
-        return " ".concat(colors.underline(m), " ");
-    });
+    .replace(/`([^`]+)`/gm, (_, m)=>colors.cyan(m))// underline underscores
+    .replace(/\s+_([^_]+)_\s+/gm, (_, m)=>` ${colors.underline(m)} `);
 }
 function parseStack(stack, message) {
     // const cwd = process.cwd() + sep;
-    var lines = stack.split('\n').splice(message.split('\n').length).map(function(l) {
-        return l.trim().replace('file://', '');
-    });
+    const lines = stack.split('\n').splice(message.split('\n').length).map((l)=>l.trim().replace('file://', ''));
     return lines;
 }
 function formatStack(stack, message, opts) {
-    var indent = '  '.repeat(((opts === null || opts === void 0 ? void 0 : opts.errorLevel) || 0) + 1);
-    return "\n".concat(indent) + parseStack(stack, message).map(function(line) {
-        return '  ' + line.replace(/^at +/, function(m) {
-            return colors.gray(m);
-        }).replace(/\((.+)\)/, function(_, m) {
-            return "(".concat(colors.cyan(m), ")");
-        });
-    }).join("\n".concat(indent));
+    const indent = '  '.repeat((opts?.errorLevel || 0) + 1);
+    return `\n${indent}` + parseStack(stack, message).map((line)=>'  ' + line.replace(/^at +/, (m)=>colors.gray(m)).replace(/\((.+)\)/, (_, m)=>`(${colors.cyan(m)})`)).join(`\n${indent}`);
 }
 function formatArgs(args, opts) {
-    var _args = args.map(function(arg) {
+    const _args = args.map((arg)=>{
         if (arg && typeof arg.stack === 'string') {
             return formatError(arg, opts);
         }
@@ -202,25 +115,44 @@ function formatArgs(args, opts) {
     });
     // Only supported with Node >= 10
     // https://nodejs.org/api/util.html#util_util_inspect_object_options
-    return formatWithOptions.apply(void 0, [
-        opts
-    ].concat(_to_consumable_array(_args)));
-}
-function formatWithOptions(o) {
-    for(var _len = arguments.length, params = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++){
-        params[_key - 1] = arguments[_key];
+    return formatWithOptions(Boolean(opts.colors), ..._args);
+}
+function formatWithOptions(shouldColor, ...params) {
+    return params.map((value)=>formatValue(value, shouldColor)).join(' ');
+}
+function formatValue(value, shouldColor = false) {
+    const colors = shouldColor ? Colors : NoColors;
+    if (value === null) return 'null';
+    if (value === undefined) return 'undefined';
+    if (typeof value === 'string') return value;
+    if (typeof value === 'number' || typeof value === 'boolean') return String(value);
+    if (typeof value === 'object' && value.constructor === Object) {
+        const entries = Object.entries(value);
+        if (entries.length === 0) return '{}';
+        return entries.map(([key, val])=>{
+            const keyStr = shouldColor ? colors.blue(key) : key;
+            const valStr = shouldColor ? colors.green(JSON.stringify(val)) : JSON.stringify(val);
+            return `${keyStr}=${valStr}`;
+        }).join(' ');
+    }
+    // For arrays and other objects, use JSON.stringify directly
+    try {
+        const result = JSON.stringify(value);
+        return shouldColor ? colors.green(result) : result;
+    } catch  {
+        return String(value);
     }
-    // import { formatWithOptions } from 'node:util';
-    return params.join(' ');
 }
 function formatError(err, opts) {
-    var _err_message;
-    var message = (_err_message = err.message) !== null && _err_message !== void 0 ? _err_message : formatWithOptions(opts, err);
-    var stack = err.stack ? formatStack(err.stack, message, opts) : '';
-    var level = (opts === null || opts === void 0 ? void 0 : opts.errorLevel) || 0;
-    var causedPrefix = level > 0 ? "".concat('  '.repeat(level), "[cause]: ") : '';
-    var causedError = err.cause ? '\n\n' + formatError(err.cause, _object_spread_props(_object_spread({}, opts), {
+    const message = err.message ?? formatWithOptions(Boolean(opts.colors), err);
+    const stack = err.stack ? formatStack(err.stack, message, opts) : '';
+    const level = opts?.errorLevel || 0;
+    const causedPrefix = level > 0 ? `${'  '.repeat(level)}[cause]: ` : '';
+    const causedError = err.cause ? '\n\n' + formatError(err.cause, {
+        ...opts,
         errorLevel: level + 1
-    })) : '';
+    }) : '';
     return causedPrefix + message + '\n' + stack + causedError;
 }
+
+//# sourceMappingURL=formatLogObject.js.map

package/lib/consola/formatLogObject.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/consola/formatLogObject.ts"],"sourcesContent":["import colors, { Chalk, type ChalkInstance } from 'chalk';\nimport type { ConsolaOptions, FormatOptions, LogObject, LogType } from 'consola/core';\nimport dayjs from 'dayjs';\nimport { isDevelopment } from 'std-env';\n\nconst LevelColors: Record<LogType, (str: string) => string> = {\n\ttrace: colors.gray,\n\tdebug: colors.cyan,\n\tinfo: colors.blueBright,\n\twarn: colors.yellow,\n\terror: colors.red,\n\tfatal: colors.bgRed.white,\n\tsilent: colors.white,\n\tlog: colors.white,\n\tsuccess: colors.green,\n\tfail: colors.red,\n\tready: colors.green,\n\tstart: colors.cyan,\n\tbox: colors.white,\n\tverbose: colors.green,\n};\n\nconst levelShort: Record<LogType, string> = {\n\ttrace: 'TRAC',\n\tdebug: 'DEBG',\n\tinfo: 'INFO',\n\twarn: 'WARN',\n\terror: 'ERRO',\n\tfatal: 'FATL',\n\tsilent: 'SLNT',\n\tlog: 'LOG ', // Added space to make it 4 characters\n\tsuccess: 'SUCC',\n\tfail: 'FAIL',\n\tready: 'READ',\n\tstart: 'STRT',\n\tbox: 'BOX ', // Added space to make it 4 characters\n\tverbose: 'VERB',\n};\nconst start = Date.now();\n\nconst Colors: ChalkInstance = colors;\nconst NoColors = new Chalk({ level: 0 });\n\nexport function formatLogObject(\n\to: LogObject,\n\tctx: {\n\t\toptions: ConsolaOptions;\n\t},\n) {\n\tconst shouldColor = Boolean(ctx.options?.formatOptions?.colors);\n\n\tlet { date, type, tag } = o;\n\ttype = type === 'log' ? 'info' : type;\n\tconst colors = shouldColor ? Colors : NoColors;\n\tlet color = LevelColors[type] || colors.white;\n\tif (!shouldColor) {\n\t\tcolor = (v) => v;\n\t}\n\tconst levelText = levelShort[type] || type.toUpperCase().slice(0, 4); // Get first 4 chars, consistent uppercase\n\n\tlet line = '';\n\tlet out: string[] = [];\n\n\t// Timestamp\n\tif (isDevelopment) {\n\t\t// process.hrtime.bigint()\n\t\tlet diff = (date.getTime() - start) / 1000;\n\n\t\tout.push(colors.gray(diff.toFixed(3).padStart(7, ' ')));\n\t} else {\n\t\tout.push(colors.gray(dayjs(date).format('YYYY-MM-DD HH:mm:ss.SSS')));\n\t}\n\n\t// Log Level (colored)\n\t// Pad to 4 characters\n\tout.push(color(levelText.padEnd(4, ' ')));\n\n\tif (tag) {\n\t\tout.push(colors.yellow(`[${tag}]`)); // Added color for tag\n\t}\n\n\t{\n\t\tconst [message, ...additional] = formatArgs(o.args, { colors: shouldColor }).split('\\n');\n\n\t\tout.push(characterFormat(message));\n\n\t\tline = out.join(' ');\n\t\tif (additional.length > 0) {\n\t\t\tline += characterFormat(additional.join('\\n'));\n\t\t}\n\n\t\tif (type === 'trace') {\n\t\t\tconst _err = new Error('Trace: ' + o.message);\n\t\t\tline += formatStack(_err.stack || '', _err.message);\n\t\t}\n\t}\n\n\t// if (!message && typeof args[0] === 'string') {\n\t//   message = args.shift();\n\t// }\n\t// if (message) {\n\t//   out.push(message);\n\t// }\n\t// if (args.length) {\n\t//   out.push(...args.map((a) => (typeof a === 'string' ? a : JSON.stringify(a)))); // Handle non-string args\n\t// }\n\n\t// todo format error\n\t// https://github.com/unjs/consola/blob/main/src/reporters/fancy.ts\n\n\t// return out.join('  '); // Increased spacing for better readability\n\treturn line;\n}\n\nfunction characterFormat(str: string) {\n\treturn (\n\t\tstr\n\t\t\t// highlight backticks\n\t\t\t.replace(/`([^`]+)`/gm, (_, m) => colors.cyan(m))\n\t\t\t// underline underscores\n\t\t\t.replace(/\\s+_([^_]+)_\\s+/gm, (_, m) => ` ${colors.underline(m)} `)\n\t);\n}\n\nfunction parseStack(stack: string, message: string) {\n\t// const cwd = process.cwd() + sep;\n\n\tconst lines = stack\n\t\t.split('\\n')\n\t\t.splice(message.split('\\n').length)\n\t\t.map(\n\t\t\t(l) => l.trim().replace('file://', ''),\n\t\t\t// .replace(cwd, '')\n\t\t);\n\n\treturn lines;\n}\n\nfunction formatStack(stack: string, message: string, opts?: FormatOptions) {\n\tconst indent = '  '.repeat((opts?.errorLevel || 0) + 1);\n\treturn (\n\t\t`\\n${indent}`\n\t\t+ parseStack(stack, message)\n\t\t\t.map(\n\t\t\t\t(line) =>\n\t\t\t\t\t'  ' + line.replace(/^at +/, (m) => colors.gray(m)).replace(/\\((.+)\\)/, (_, m) => `(${colors.cyan(m)})`),\n\t\t\t)\n\t\t\t.join(`\\n${indent}`)\n\t);\n}\n\nfunction formatArgs(args: any[], opts: FormatOptions) {\n\tconst _args = args.map((arg) => {\n\t\tif (arg && typeof arg.stack === 'string') {\n\t\t\treturn formatError(arg, opts);\n\t\t}\n\t\treturn arg;\n\t});\n\n\t// Only supported with Node >= 10\n\t// https://nodejs.org/api/util.html#util_util_inspect_object_options\n\treturn formatWithOptions(Boolean(opts.colors), ..._args);\n}\n\nfunction formatWithOptions(shouldColor: boolean, ...params: any[]) {\n\treturn params.map((value) => formatValue(value, shouldColor)).join(' ');\n}\n\nfunction formatValue(value: any, shouldColor: boolean = false): string {\n\tconst colors = shouldColor ? Colors : NoColors;\n\n\tif (value === null) return 'null';\n\tif (value === undefined) return 'undefined';\n\tif (typeof value === 'string') return value;\n\tif (typeof value === 'number' || typeof value === 'boolean') return String(value);\n\n\tif (typeof value === 'object' && value.constructor === Object) {\n\t\tconst entries = Object.entries(value);\n\t\tif (entries.length === 0) return '{}';\n\t\treturn entries\n\t\t\t.map(([key, val]) => {\n\t\t\t\tconst keyStr = shouldColor ? colors.blue(key) : key;\n\t\t\t\tconst valStr = shouldColor ? colors.green(JSON.stringify(val)) : JSON.stringify(val);\n\t\t\t\treturn `${keyStr}=${valStr}`;\n\t\t\t})\n\t\t\t.join(' ');\n\t}\n\n\t// For arrays and other objects, use JSON.stringify directly\n\ttry {\n\t\tconst result = JSON.stringify(value);\n\t\treturn shouldColor ? colors.green(result) : result;\n\t} catch {\n\t\treturn String(value);\n\t}\n}\n\nfunction formatError(err: any, opts: FormatOptions): string {\n\tconst message = err.message ?? formatWithOptions(Boolean(opts.colors), err);\n\tconst stack = err.stack ? formatStack(err.stack, message, opts) : '';\n\n\tconst level = opts?.errorLevel || 0;\n\tconst causedPrefix = level > 0 ? `${'  '.repeat(level)}[cause]: ` : '';\n\tconst causedError = err.cause ? '\\n\\n' + formatError(err.cause, { ...opts, errorLevel: level + 1 }) : '';\n\n\treturn causedPrefix + message + '\\n' + stack + causedError;\n}\n"],"names":["colors","Chalk","dayjs","isDevelopment","LevelColors","trace","gray","debug","cyan","info","blueBright","warn","yellow","error","red","fatal","bgRed","white","silent","log","success","green","fail","ready","start","box","verbose","levelShort","Date","now","Colors","NoColors","level","formatLogObject","o","ctx","shouldColor","Boolean","options","formatOptions","date","type","tag","color","v","levelText","toUpperCase","slice","line","out","diff","getTime","push","toFixed","padStart","format","padEnd","message","additional","formatArgs","args","split","characterFormat","join","length","_err","Error","formatStack","stack","str","replace","_","m","underline","parseStack","lines","splice","map","l","trim","opts","indent","repeat","errorLevel","_args","arg","formatError","formatWithOptions","params","value","formatValue","undefined","String","Object","entries","key","val","keyStr","blue","valStr","JSON","stringify","result","err","causedPrefix","causedError","cause"],"mappings":"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"}