@wener/common 2.0.3 → 2.0.6

package/lib/utils/buildRedactorFormSchema.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/utils/buildRedactorFormSchema.ts"],"sourcesContent":["import { forEachJsonSchema, type JsonSchemaDef } from '../jsonschema';\nimport { toJsonSchema, type TypeSchema } from '../schema';\n\nexport const RedactedText = '[redacted]';\n\nexport function buildRedactorFormSchema(\n\tts: TypeSchema,\n\t{\n\t\tshouldRedact = (schema) => schema['x-sensitive'] === true,\n\t\treplacer = () => RedactedText,\n\t}: {\n\t\tshouldRedact?: (schema: JsonSchemaDef) => boolean;\n\t\treplacer?: (key: string, value: any) => any;\n\t},\n) {\n\tlet js = toJsonSchema(ts);\n\n\tlet paths: string[][] = [];\n\n\tforEachJsonSchema(js, (js, { path }) => {\n\t\tif (shouldRedact(js)) {\n\t\t\tpaths.push(path);\n\t\t}\n\t});\n\tconst vis = (root: any, path: string[]) => {\n\t\tswitch (root) {\n\t\t\tcase null:\n\t\t\tcase undefined:\n\t\t\t\treturn;\n\t\t}\n\n\t\tlet c = root;\n\t\tfor (let i = 0; i < path.length; i++) {\n\t\t\tlet k = path[i];\n\t\t\tif (c && typeof c === 'object' && k in c) {\n\t\t\t\tlet v = c[k];\n\t\t\t\tif (path.length === 1) {\n\t\t\t\t\tc[k] = replacer(k, v);\n\t\t\t\t} else if (Array.isArray(v)) {\n\t\t\t\t\tfor (let vv of v) {\n\t\t\t\t\t\tvis(vv, path.slice(i + 1));\n\t\t\t\t\t}\n\t\t\t\t} else {\n\t\t\t\t\tvis(v, path.slice(i + 1));\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t};\n\n\treturn (root: any) => {\n\t\tif (!paths.length) {\n\t\t\treturn root;\n\t\t}\n\n\t\tpaths.forEach((path) => {\n\t\t\tvis(root, path);\n\t\t});\n\n\t\treturn root;\n\t};\n}\n\nfunction buildReversibleRedactText({\n\tid,\n\ttype,\n\tkey,\n\ttimestamp,\n}: {\n\tid?: string | number;\n\ttype?: string;\n\tkey?: string;\n\ttimestamp?: number | boolean;\n} = {}) {\n\tif (!id) {\n\t\treturn RedactedText;\n\t}\n\tif (timestamp === true) {\n\t\ttimestamp = Date.now();\n\t}\n\treturn `[redacted ${id}]`;\n}\n\nexport function isRedactedText(v: any) {\n\treturn v === RedactedText || (typeof v === 'string' && v.startsWith('[redacted ') && v.endsWith(']'));\n}\n"],"names":["forEachJsonSchema","toJsonSchema","RedactedText","buildRedactorFormSchema","ts","shouldRedact","schema","replacer","js","paths","path","push","vis","root","undefined","c","i","length","k","v","Array","isArray","vv","slice","forEach","buildReversibleRedactText","id","type","key","timestamp","Date","now","isRedactedText","startsWith","endsWith"],"mappings":"AAAA,SAASA,iBAAiB,QAA4B,gBAAgB;AACtE,SAASC,YAAY,QAAyB,YAAY;AAE1D,OAAO,MAAMC,eAAe,aAAa;AAEzC,OAAO,SAASC,wBACfC,EAAc,EACd,EACCC,eAAe,CAACC,SAAWA,MAAM,CAAC,cAAc,KAAK,IAAI,EACzDC,WAAW,IAAML,YAAY,EAI7B;IAED,IAAIM,KAAKP,aAAaG;IAEtB,IAAIK,QAAoB,EAAE;IAE1BT,kBAAkBQ,IAAI,CAACA,IAAI,EAAEE,IAAI,EAAE;QAClC,IAAIL,aAAaG,KAAK;YACrBC,MAAME,IAAI,CAACD;QACZ;IACD;IACA,MAAME,MAAM,CAACC,MAAWH;QACvB,OAAQG;YACP,KAAK;YACL,KAAKC;gBACJ;QACF;QAEA,IAAIC,IAAIF;QACR,IAAK,IAAIG,IAAI,GAAGA,IAAIN,KAAKO,MAAM,EAAED,IAAK;YACrC,IAAIE,IAAIR,IAAI,CAACM,EAAE;YACf,IAAID,KAAK,OAAOA,MAAM,YAAYG,KAAKH,GAAG;gBACzC,IAAII,IAAIJ,CAAC,CAACG,EAAE;gBACZ,IAAIR,KAAKO,MAAM,KAAK,GAAG;oBACtBF,CAAC,CAACG,EAAE,GAAGX,SAASW,GAAGC;gBACpB,OAAO,IAAIC,MAAMC,OAAO,CAACF,IAAI;oBAC5B,KAAK,IAAIG,MAAMH,EAAG;wBACjBP,IAAIU,IAAIZ,KAAKa,KAAK,CAACP,IAAI;oBACxB;gBACD,OAAO;oBACNJ,IAAIO,GAAGT,KAAKa,KAAK,CAACP,IAAI;gBACvB;YACD;QACD;IACD;IAEA,OAAO,CAACH;QACP,IAAI,CAACJ,MAAMQ,MAAM,EAAE;YAClB,OAAOJ;QACR;QAEAJ,MAAMe,OAAO,CAAC,CAACd;YACdE,IAAIC,MAAMH;QACX;QAEA,OAAOG;IACR;AACD;AAEA,SAASY,0BAA0B,EAClCC,EAAE,EACFC,IAAI,EACJC,GAAG,EACHC,SAAS,EAMT,GAAG,CAAC,CAAC;IACL,IAAI,CAACH,IAAI;QACR,OAAOxB;IACR;IACA,IAAI2B,cAAc,MAAM;QACvBA,YAAYC,KAAKC,GAAG;IACrB;IACA,OAAO,CAAC,UAAU,EAAEL,GAAG,CAAC,CAAC;AAC1B;AAEA,OAAO,SAASM,eAAeb,CAAM;IACpC,OAAOA,MAAMjB,gBAAiB,OAAOiB,MAAM,YAAYA,EAAEc,UAAU,CAAC,iBAAiBd,EAAEe,QAAQ,CAAC;AACjG"}
+{"version":3,"sources":["../../src/utils/buildRedactorFormSchema.ts"],"sourcesContent":["import { forEachJsonSchema, type JsonSchemaDef } from '../jsonschema';\nimport { toJsonSchema, type TypeSchema } from '../schema';\n\nexport const RedactedText = '[redacted]';\n\nexport function buildRedactorFormSchema(\n\tts: TypeSchema,\n\t{\n\t\tshouldRedact = (schema) => schema['x-sensitive'] === true,\n\t\treplacer = () => RedactedText,\n\t}: {\n\t\tshouldRedact?: (schema: JsonSchemaDef) => boolean;\n\t\treplacer?: (key: string, value: any) => any;\n\t},\n) {\n\tlet js = toJsonSchema(ts);\n\n\tlet paths: string[][] = [];\n\n\tforEachJsonSchema(js, (js, { path }) => {\n\t\tif (shouldRedact(js)) {\n\t\t\tpaths.push(path);\n\t\t}\n\t});\n\tconst vis = (root: any, path: string[]) => {\n\t\tswitch (root) {\n\t\t\tcase null:\n\t\t\tcase undefined:\n\t\t\t\treturn;\n\t\t}\n\n\t\tlet c = root;\n\t\tfor (let i = 0; i < path.length; i++) {\n\t\t\tlet k = path[i];\n\t\t\tif (c && typeof c === 'object' && k in c) {\n\t\t\t\tlet v = c[k];\n\t\t\t\tif (path.length === 1) {\n\t\t\t\t\tc[k] = replacer(k, v);\n\t\t\t\t} else if (Array.isArray(v)) {\n\t\t\t\t\tfor (let vv of v) {\n\t\t\t\t\t\tvis(vv, path.slice(i + 1));\n\t\t\t\t\t}\n\t\t\t\t} else {\n\t\t\t\t\tvis(v, path.slice(i + 1));\n\t\t\t\t}\n\t\t\t}\n\t\t}\n\t};\n\n\treturn (root: any) => {\n\t\tif (!paths.length) {\n\t\t\treturn root;\n\t\t}\n\n\t\tpaths.forEach((path) => {\n\t\t\tvis(root, path);\n\t\t});\n\n\t\treturn root;\n\t};\n}\n\nfunction _buildReversibleRedactText({\n\tid,\n\ttype: _type,\n\tkey: _key,\n\ttimestamp,\n}: {\n\tid?: string | number;\n\ttype?: string;\n\tkey?: string;\n\ttimestamp?: number | boolean;\n} = {}) {\n\tif (!id) {\n\t\treturn RedactedText;\n\t}\n\tif (timestamp === true) {\n\t\ttimestamp = Date.now();\n\t}\n\treturn `[redacted ${id}]`;\n}\n\nexport function isRedactedText(v: any) {\n\treturn v === RedactedText || (typeof v === 'string' && v.startsWith('[redacted ') && v.endsWith(']'));\n}\n"],"names":["forEachJsonSchema","toJsonSchema","RedactedText","buildRedactorFormSchema","ts","shouldRedact","schema","replacer","js","paths","path","push","vis","root","undefined","c","i","length","k","v","Array","isArray","vv","slice","forEach","_buildReversibleRedactText","id","type","_type","key","_key","timestamp","Date","now","isRedactedText","startsWith","endsWith"],"mappings":"AAAA,SAASA,iBAAiB,QAA4B,gBAAgB;AACtE,SAASC,YAAY,QAAyB,YAAY;AAE1D,OAAO,MAAMC,eAAe,aAAa;AAEzC,OAAO,SAASC,wBACfC,EAAc,EACd,EACCC,eAAe,CAACC,SAAWA,MAAM,CAAC,cAAc,KAAK,IAAI,EACzDC,WAAW,IAAML,YAAY,EAI7B;IAED,IAAIM,KAAKP,aAAaG;IAEtB,IAAIK,QAAoB,EAAE;IAE1BT,kBAAkBQ,IAAI,CAACA,IAAI,EAAEE,IAAI,EAAE;QAClC,IAAIL,aAAaG,KAAK;YACrBC,MAAME,IAAI,CAACD;QACZ;IACD;IACA,MAAME,MAAM,CAACC,MAAWH;QACvB,OAAQG;YACP,KAAK;YACL,KAAKC;gBACJ;QACF;QAEA,IAAIC,IAAIF;QACR,IAAK,IAAIG,IAAI,GAAGA,IAAIN,KAAKO,MAAM,EAAED,IAAK;YACrC,IAAIE,IAAIR,IAAI,CAACM,EAAE;YACf,IAAID,KAAK,OAAOA,MAAM,YAAYG,KAAKH,GAAG;gBACzC,IAAII,IAAIJ,CAAC,CAACG,EAAE;gBACZ,IAAIR,KAAKO,MAAM,KAAK,GAAG;oBACtBF,CAAC,CAACG,EAAE,GAAGX,SAASW,GAAGC;gBACpB,OAAO,IAAIC,MAAMC,OAAO,CAACF,IAAI;oBAC5B,KAAK,IAAIG,MAAMH,EAAG;wBACjBP,IAAIU,IAAIZ,KAAKa,KAAK,CAACP,IAAI;oBACxB;gBACD,OAAO;oBACNJ,IAAIO,GAAGT,KAAKa,KAAK,CAACP,IAAI;gBACvB;YACD;QACD;IACD;IAEA,OAAO,CAACH;QACP,IAAI,CAACJ,MAAMQ,MAAM,EAAE;YAClB,OAAOJ;QACR;QAEAJ,MAAMe,OAAO,CAAC,CAACd;YACdE,IAAIC,MAAMH;QACX;QAEA,OAAOG;IACR;AACD;AAEA,SAASY,2BAA2B,EACnCC,EAAE,EACFC,MAAMC,KAAK,EACXC,KAAKC,IAAI,EACTC,SAAS,EAMT,GAAG,CAAC,CAAC;IACL,IAAI,CAACL,IAAI;QACR,OAAOxB;IACR;IACA,IAAI6B,cAAc,MAAM;QACvBA,YAAYC,KAAKC,GAAG;IACrB;IACA,OAAO,CAAC,UAAU,EAAEP,GAAG,CAAC,CAAC;AAC1B;AAEA,OAAO,SAASQ,eAAef,CAAM;IACpC,OAAOA,MAAMjB,gBAAiB,OAAOiB,MAAM,YAAYA,EAAEgB,UAAU,CAAC,iBAAiBhB,EAAEiB,QAAQ,CAAC;AACjG"}

package/lib/utils/getEstimateProcessTime.js

@@ -1,21 +1,26 @@
-export function getEstimateProcessTime({ total, processed, startTime, elapsed = startTime ? (Date.now() - startTime.getTime()) / 1000 : undefined }) {
-    if (typeof total !== 'number' || typeof processed !== 'number' || !elapsed || processed === 0 || processed >= total) {
-        return undefined;
-    }
-    const now = new Date();
-    const rate = processed / elapsed;
-    if (rate === 0) {
-        return undefined;
-    }
-    const remaining = total - processed;
-    const eta = Math.round(remaining / rate);
-    const endTime = new Date(now.getTime() + eta * 1000);
-    return {
-        eta,
-        elapsed,
-        endTime,
-        rate
-    };
+export function getEstimateProcessTime({
+	total,
+	processed,
+	startTime,
+	elapsed = startTime ? (Date.now() - startTime.getTime()) / 1000 : undefined,
+}) {
+	if (typeof total !== 'number' || typeof processed !== 'number' || !elapsed || processed === 0 || processed >= total) {
+		return undefined;
+	}
+	const now = new Date();
+	const rate = processed / elapsed;
+	if (rate === 0) {
+		return undefined;
+	}
+	const remaining = total - processed;
+	const eta = Math.round(remaining / rate);
+	const endTime = new Date(now.getTime() + eta * 1000);
+	return {
+		eta,
+		elapsed,
+		endTime,
+		rate,
+	};
 }
 
-//# sourceMappingURL=getEstimateProcessTime.js.map
+//# sourceMappingURL=getEstimateProcessTime.js.map

package/lib/utils/index.js

@@ -1,4 +1,4 @@
-export { getEstimateProcessTime } from "./getEstimateProcessTime.js";
-export { buildRedactorFormSchema } from "./buildRedactorFormSchema.js";
-export { buildBaseUrl } from "./buildBaseUrl.js";
+export { buildBaseUrl } from './buildBaseUrl.js';
+export { buildRedactorFormSchema } from './buildRedactorFormSchema.js';
+export { getEstimateProcessTime } from './getEstimateProcessTime.js';
 //# sourceMappingURL=index.js.map

package/lib/utils/resolveFeatureOptions.js

@@ -1,12 +1,12 @@
-import { maybeFunction } from "@wener/utils";
+import { maybeFunction } from '@wener/utils';
 export function resolveFeatureOptions(value, defaultValue) {
-    if (value === false) {
-        return undefined;
-    }
-    if (value === true || value === undefined || value === null) {
-        return maybeFunction(defaultValue);
-    }
-    return value;
+	if (value === false) {
+		return undefined;
+	}
+	if (value === true || value === undefined || value === null) {
+		return maybeFunction(defaultValue);
+	}
+	return value;
 }
 
-//# sourceMappingURL=resolveFeatureOptions.js.map
+//# sourceMappingURL=resolveFeatureOptions.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@wener/common",
-  "version": "2.0.3",
+  "version": "2.0.6",
   "type": "module",
   "description": "Common utils for console & server",
   "repository": {
@@ -36,26 +36,38 @@
       "types": "./src/decimal/index.ts",
       "default": "./lib/decimal/index.js"
     },
+    "./drain3": {
+      "types": "./src/drain3/index.ts",
+      "default": "./lib/drain3/index.js"
+    },
     "./fs": {
       "types": "./src/fs/index.ts",
       "default": "./lib/fs/index.js"
     },
-    "./fs/orpc": {
-      "types": "./src/fs/orpc/index.ts",
-      "default": "./lib/fs/orpc/index.js"
+    "./fs/webdav": {
+      "types": "./src/fs/webdav/index.ts",
+      "default": "./lib/fs/webdav/index.js"
     },
-    "./fs/orpc/server": {
-      "types": "./src/fs/orpc/server/index.ts",
-      "default": "./lib/fs/orpc/server/index.js"
-    },
-    "./fs/s3": {
+    "./fs/s3mini": {
       "types": "./src/fs/s3/index.ts",
       "default": "./lib/fs/s3/index.js"
     },
+    "./fs/minio": {
+      "types": "./src/fs/minio/index.ts",
+      "default": "./lib/fs/minio/index.js"
+    },
     "./fs/server": {
       "types": "./src/fs/server/index.ts",
       "default": "./lib/fs/server/index.js"
     },
+    "./fs/orpc": {
+      "types": "./src/fs/orpc/index.ts",
+      "default": "./lib/fs/orpc/index.js"
+    },
+    "./fs/orpc/server": {
+      "types": "./src/fs/orpc/server/index.ts",
+      "default": "./lib/fs/orpc/server/index.js"
+    },
     "./jsonschema": {
       "types": "./src/jsonschema/index.ts",
       "default": "./lib/jsonschema/index.js"
@@ -109,15 +121,19 @@
     "@standard-schema/spec": "^1.1.0",
     "@wener/utils": "^1.1.58",
     "date-fns": "^4.1.0",
-    "es-toolkit": "^1.43.0",
+    "es-toolkit": "^1.45.1",
     "std-env": "^3.10.0",
     "ts-pattern": "^5.9.0"
   },
   "devDependencies": {
-    "@orpc/client": "^1.13.4",
-    "@orpc/contract": "^1.13.4",
-    "@orpc/openapi-client": "^1.13.4",
-    "@sinclair/typebox": "^0.34.47",
+    "@mikro-orm/core": "^7.0.2",
+    "@mikro-orm/decorators": "^7.0.2",
+    "@mikro-orm/sql": "^7.0.2",
+    "@orpc/client": "^1.13.7",
+    "@orpc/contract": "^1.13.7",
+    "@orpc/openapi-client": "^1.13.7",
+    "@orpc/server": "^1.13.7",
+    "@sinclair/typebox": "^0.34.48",
     "@sinclair/typebox-codegen": "^0.11.1",
     "@types/argon2-browser": "^1.18.4",
     "@types/bcrypt": "^6.0.0",
@@ -132,14 +148,17 @@
     "bcryptjs": "^3.0.3",
     "chalk": "^5.6.2",
     "consola": "^3.4.2",
-    "dayjs": "^1.11.19",
+    "dayjs": "^1.11.20",
     "decimal.js": "^10.6.0",
-    "emittery": "^1.2.0",
+    "emittery": "^1.2.1",
+    "kysely": "^0.28.11",
     "micromatch": "^4.0.8",
     "mime-types": "^3.0.2",
+    "minio": "^8.0.7",
     "pathe": "^2.0.3",
-    "s3mini": "^0.8.1",
-    "zod": "^4.3.5"
+    "s3mini": "^0.9.1",
+    "webdav": "^5.9.0",
+    "zod": "^4.3.6"
   },
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1"

package/src/ai/qwen3vl/utils.ts

@@ -2,7 +2,7 @@
 type Bbox2d = [number, number, number, number];
 type Dimensions = { width: number; height: number };
 // x_center, y_center, z_center, x_size, y_size, z_size, roll, pitch, yaw
-type Bbox3d = [number, number, number, number, number, number, number, number, number];
+type _Bbox3d = [number, number, number, number, number, number, number, number, number];
 /**
  * Convert Qwen3V format bbox (0-1000 range) to absolute pixel coordinates
  * @param dimensions Image dimensions {width, height}

package/src/ai/vision/index.ts

@@ -1,2 +1,2 @@
-export { ImageAnnotationSchema, type ImageAnnotation } from './ImageAnnotationSchema';
-export { resolveImageAnnotation, type ResolvedImageAnnotation } from './resolveImageAnnotation';
+export { type ImageAnnotation, ImageAnnotationSchema } from './ImageAnnotationSchema';
+export { type ResolvedImageAnnotation, resolveImageAnnotation } from './resolveImageAnnotation';

package/src/cn/ChineseResidentIdNo.ts

@@ -32,7 +32,7 @@ export function parseChineseResidentIdNo(idNo: string): ParsedChineseResidentIdN
 		addressCode: division,
 		birthDate: `${year}-${month}-${day}`,
 		sequence: seq,
-		checkDigit: checkDigit.toUpperCase() === 'X' ? 10 : parseInt(checkDigit),
+		checkDigit: checkDigit.toUpperCase() === 'X' ? 10 : parseInt(checkDigit, 10),
 		sex: seq % 2 === 0 ? SexType.Male : SexType.Female,
 		age: new Date().getFullYear() - parseInt(year, 10),
 		valid: Mod11.validate(idNo),

package/src/cn/Mod11.ts

@@ -12,7 +12,7 @@ export class Mod11Checksum {
 		const { weights } = this;
 		let sum = 0;
 		for (let i = 0; i < s.length; i++) {
-			sum += parseInt(s[i]) * weights[i];
+			sum += parseInt(s[i], 10) * weights[i];
 		}
 		const num = (12 - (sum % 11)) % 11;
 		if (num < 10) {

package/src/cn/__snapshots__/ChineseResidentIdNo.test.ts.snap

@@ -3,7 +3,7 @@
 exports[`ChineseResidentIdNo > should parse 1`] = `
 {
   "addressCode": "110105",
-  "age": 76,
+  "age": 77,
   "birthDate": "1949-12-31",
   "checkDigit": 10,
   "raw": "11010519491231002X",

package/src/cn/__snapshots__/UnifiedSocialCreditCode.test.ts.snap

@@ -45,26 +45,3 @@ exports[`UnifiedSocialCreditCode > should parse 2`] = `
   "valid": true,
 }
 `;
-
-exports[`UnifiedSocialCreditCode > should parse 3`] = `
-{
-  "adminDivisionCode": "310120",
-  "checkDigit": "0",
-  "codes": [
-    "9",
-    "1",
-    "310120",
-    "MAEXK9GG9",
-    "0",
-  ],
-  "entityCategoryCode": "1",
-  "names": [
-    "工商",
-    "企业",
-  ],
-  "organizationCode": "MAEXK9GG9",
-  "raw": "91310120MAEXK9GG90",
-  "registrationAuthorityCode": "9",
-  "valid": false,
-}
-`;

package/src/cn/index.ts

@@ -1,7 +1,6 @@
 export { ChineseResidentIdNo } from './ChineseResidentIdNo';
-export { UnifiedSocialCreditCode } from './UnifiedSocialCreditCode';
 export { DivisionCode } from './DivisionCode';
-
 export * from './formatChineseAmount';
 export * from './parseChineseNumber';
 export * from './pinyin/toPinyinPure';
+export { UnifiedSocialCreditCode } from './UnifiedSocialCreditCode';

package/src/cn/parseChineseNumber.test.ts

@@ -36,7 +36,7 @@ test('parseChineseNumber', () => {
 
 function formatChineseNumber(v: number): string {
 	if (v < 0) {
-		return '负' + formatChineseNumber(-v);
+		return `负${formatChineseNumber(-v)}`;
 	}
 
 	// 数字对应的中文表示
@@ -88,7 +88,7 @@ function formatChineseNumber(v: number): string {
 export function formatChineseAmount0(amount: number): string {
 	// 检查金额是否合理
 	if (amount < 0) {
-		return '(负)' + formatChineseAmount0(-amount);
+		return `(负)${formatChineseAmount0(-amount)}`;
 	}
 	// 大写数字和单位
 	const digits = ['零', '壹', '贰', '叁', '肆', '伍', '陆', '柒', '捌', '玖'];
@@ -111,10 +111,10 @@ export function formatChineseAmount0(amount: number): string {
 	integerAmount = Math.floor(integerAmount / 100); // 转为元为单位
 
 	if (fen > 0) {
-		result = digits[fen] + '分' + result;
+		result = `${digits[fen]}分${result}`;
 	}
 	if (jiao > 0) {
-		result = digits[jiao] + '角' + result;
+		result = `${digits[jiao]}角${result}`;
 	}
 	if (cents === 0) {
 		result += '整';

package/src/consola/formatLogObject.ts

@@ -90,7 +90,7 @@ export function formatLogObject(
 		}
 
 		if (type === 'trace') {
-			const _err = new Error('Trace: ' + o.message);
+			const _err = new Error(`Trace: ${o.message}`);
 			line += formatStack(_err.stack || '', _err.message);
 		}
 	}
@@ -139,11 +139,11 @@ function parseStack(stack: string, message: string) {
 function formatStack(stack: string, message: string, opts?: FormatOptions) {
 	const indent = '  '.repeat((opts?.errorLevel || 0) + 1);
 	return (
-		`\n${indent}`
-		+ parseStack(stack, message)
+		`\n${indent}` +
+		parseStack(stack, message)
 			.map(
 				(line) =>
-					'  ' + line.replace(/^at +/, (m) => colors.gray(m)).replace(/\((.+)\)/, (_, m) => `(${colors.cyan(m)})`),
+					`  ${line.replace(/^at +/, (m) => colors.gray(m)).replace(/\((.+)\)/, (_, m) => `(${colors.cyan(m)})`)}`,
 			)
 			.join(`\n${indent}`)
 	);
@@ -201,7 +201,7 @@ function formatError(err: any, opts: FormatOptions): string {
 
 	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 }) : '';
+	const causedError = err.cause ? `\n\n${formatError(err.cause, { ...opts, errorLevel: level + 1 })}` : '';
 
-	return causedPrefix + message + '\n' + stack + causedError;
+	return `${causedPrefix + message}\n${stack}${causedError}`;
 }

package/src/consola/index.ts

@@ -1,2 +1,2 @@
-export { formatLogObject } from './formatLogObject';
 export { createStandardConsolaReporter } from './createStandardConsolaReporter';
+export { formatLogObject } from './formatLogObject';

package/src/data/index.ts

@@ -1,5 +1,4 @@
-export type * from './types';
-
-export { resolvePagination, type PaginationInput, type ResolvedPagination } from './resolvePagination';
-export { parseSort, type SortRule } from './parseSort';
 export { formatSort } from './formatSort';
+export { parseSort, type SortRule } from './parseSort';
+export { type PaginationInput, type ResolvedPagination, resolvePagination } from './resolvePagination';
+export type * from './types';

package/src/data/maybeNumber.ts

@@ -20,7 +20,7 @@ export function maybeNumber(v: MaybeNumber) {
 			}
 	}
 	const n = Number(v);
-	if (isNaN(n)) {
+	if (Number.isNaN(n)) {
 		return undefined;
 	}
 	return n;

package/src/data/parseSort.test.ts

@@ -1,5 +1,4 @@
 import { describe, expect, test } from 'vitest';
-import { formatSort } from './formatSort';
 import { parseSort } from './parseSort';
 
 describe('parseSort', () => {

package/src/data/resolvePagination.ts

@@ -1,6 +1,6 @@
-import { maybeFunction, type MaybeFunction } from '@wener/utils';
+import { type MaybeFunction, maybeFunction } from '@wener/utils';
 import { mapValues, omitBy, pick } from 'es-toolkit';
-import { maybeNumber, type MaybeNumber } from './maybeNumber';
+import { type MaybeNumber, maybeNumber } from './maybeNumber';
 
 export type PaginationInput = {
 	limit?: MaybeNumber;

package/src/data/types.d.ts

@@ -25,14 +25,14 @@ export type ListQueryInput = {
 	deleted?: boolean;
 };
 
-type ListResult<T = any> = {
+type _ListResult<T = any> = {
 	/** List of items */
 	data: T[];
 	/** Total number of items */
 	total: number;
 };
 
-type PageInfo = {
+type _PageInfo = {
 	/** Whether there are more items */
 	hasNextPage: boolean;
 	/** Whether there are previous items */

package/src/dayjs/formatDuration.ts

@@ -1,5 +1,6 @@
-import { type OpUnitType, type UnitTypeLongPlural } from 'dayjs';
-import { type Duration } from 'dayjs/plugin/duration';
+import type { OpUnitType, UnitTypeLongPlural } from 'dayjs';
+import type { Duration } from 'dayjs/plugin/duration';
+import { formatNumber } from '../utils/formatNumber';
 import { parseDuration } from './parseDuration';
 
 type FormatDurationOptions = {
@@ -29,7 +30,6 @@ export function formatDuration(value: MaybeDuration, o?: FormatDurationOptions):
 	}
 
 	let { format, humanize, iso } = o || {};
-	// Use local variables instead of modifying o directly
 	switch (format) {
 		case 'human':
 		case 'humanize':
@@ -56,18 +56,17 @@ export function formatDuration(value: MaybeDuration, o?: FormatDurationOptions):
 	}
 
 	// auto format
-	// 1h2m3s
 	if (v.asDays() > 1) {
 		let s = v.toISOString();
 		return s.replace('P', '').replace('T', '').toLowerCase();
 	}
 
 	{
-		let parts: string[] = [];
-		let h = v.hours();
-		let m = v.minutes();
-		let s = v.seconds();
-		let ms = v.milliseconds();
+		const parts: string[] = [];
+		const h = v.hours();
+		const m = v.minutes();
+		const s = v.seconds();
+		const ms = v.milliseconds();
 
 		if (h > 0) {
 			parts.push(`${h}h`);
@@ -78,8 +77,8 @@ export function formatDuration(value: MaybeDuration, o?: FormatDurationOptions):
 		if (s > 0) {
 			parts.push(`${s}s`);
 		}
-		if (ms > 0 || (h === 0 && m === 0 && s === 0)) {
-			parts.push(`${ms}ms`);
+		if (ms > 0 || parts.length === 0) {
+			parts.push(`${formatNumber(ms, 2)}ms`);
 		}
 		return parts.join('');
 	}

package/src/dayjs/index.ts

@@ -1,5 +1,5 @@
 export { dayjs } from './dayjs';
-export { parseDuration, type MaybeDuration } from './parseDuration';
 export { formatDuration } from './formatDuration';
+export { type MaybeDuration, parseDuration } from './parseDuration';
 
 export { resolveRelativeTime } from './resolveRelativeTime';

package/src/dayjs/parseRelativeTime.ts

@@ -1,6 +1,6 @@
 import dayjs from 'dayjs';
 import type { Duration } from 'dayjs/plugin/duration';
-import { checkDurationUnit, RelativeDurationUnits, type RelativeDurationUnit } from './resolveRelativeTime';
+import { checkDurationUnit, type RelativeDurationUnit, RelativeDurationUnits } from './resolveRelativeTime';
 
 export type TimeOperation =
 	| {

package/src/dayjs/resolveRelativeTime.ts

@@ -1,3 +1,4 @@
+import { type MaybeDate, parseDate } from '@wener/utils';
 import dayjs from 'dayjs';
 import duration from 'dayjs/plugin/duration';
 import quarterOfYear from 'dayjs/plugin/quarterOfYear';
@@ -75,26 +76,22 @@ dayjs.extend(weekOfYear);
  * resolveRelativeTime('now\\d', refDate);  // End of reference day
  * ```
  */
-export function resolveRelativeTime(s: string | Date | number, now?: Date | undefined): Date {
+export function resolveRelativeTime(s: string | Date | number, now?: Date | undefined): Date;
+export function resolveRelativeTime(s: MaybeDate, now?: Date | undefined): Date | undefined;
+export function resolveRelativeTime(s: MaybeDate, now?: Date | undefined): Date | undefined {
 	{
-		let out: Date | undefined;
-		if (!s) {
-		} else if (s instanceof Date) {
-			out = s;
-		} else if (typeof s === 'number') {
-			out = new Date(s);
-		} else if (!s.startsWith('now')) {
-			out = new Date(s);
-		}
+		let out = parseDate(s);
 		if (out) {
-			if (isNaN(out.getTime())) {
-				throw new Error(`Invalid date: ${s}`);
-			}
 			return out;
 		}
+		if (s == null) {
+			return;
+		}
 	}
 
-	if (typeof s !== 'string' || !s.startsWith('now')) {
+	if (typeof s === 'string' && s.startsWith('now')) {
+		// valid
+	} else {
 		throw new Error(`Invalid relative time format: ${s}`);
 	}