@wener/common 2.0.5 → 2.0.6

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.5",
+  "version": "2.0.6",
   "type": "module",
   "description": "Common utils for console & server",
   "repository": {
@@ -121,23 +121,22 @@
     "@standard-schema/spec": "^1.1.0",
     "@wener/utils": "^1.1.58",
     "date-fns": "^4.1.0",
-    "es-toolkit": "^1.44.0",
+    "es-toolkit": "^1.45.1",
     "std-env": "^3.10.0",
     "ts-pattern": "^5.9.0"
   },
   "devDependencies": {
-    "@mikro-orm/better-sqlite": "^6.6.6",
-    "@mikro-orm/core": "^6.6.6",
-    "@mikro-orm/knex": "^6.6.6",
-    "@orpc/client": "^1.13.4",
-    "@orpc/contract": "^1.13.4",
-    "@orpc/openapi-client": "^1.13.4",
-    "@orpc/server": "^1.13.4",
+    "@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",
-    "@types/better-sqlite3": "^7.6.13",
     "@types/micromatch": "^4.0.10",
     "@types/mime-types": "^3.0.1",
     "ajv-formats": "^3.0.1",
@@ -149,15 +148,16 @@
     "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.6",
+    "minio": "^8.0.7",
     "pathe": "^2.0.3",
     "s3mini": "^0.9.1",
-    "webdav": "^5.8.0",
+    "webdav": "^5.9.0",
     "zod": "^4.3.6"
   },
   "scripts": {

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/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/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/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/dayjs/formatDuration.ts

@@ -1,5 +1,6 @@
 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,4 +1,4 @@
-import { parseDate, type MaybeDate } from '@wener/utils';
+import { type MaybeDate, parseDate } from '@wener/utils';
 import dayjs from 'dayjs';
 import duration from 'dayjs/plugin/duration';
 import quarterOfYear from 'dayjs/plugin/quarterOfYear';

package/src/drain3/Drain.test.ts

@@ -1,11 +1,11 @@
 import { readFile, unlink } from 'node:fs/promises';
 import { tmpdir } from 'node:os';
 import { join } from 'node:path';
-import { describe, it, expect, beforeEach } from 'vitest';
+import { beforeEach, describe, expect, it } from 'vitest';
 import { Drain } from './Drain';
-import { TemplateMiner } from './TemplateMiner';
 import { FilePersistence } from './persistence/FilePersistence';
 import { MemoryPersistence } from './persistence/MemoryPersistence';
+import { TemplateMiner } from './TemplateMiner';
 
 describe('Drain', () => {
 	describe('basic functionality', () => {

package/src/drain3/index.ts

@@ -28,9 +28,7 @@
 export { Drain } from './Drain';
 export { LogCluster } from './LogCluster';
 export { Node } from './Node';
+export { MemoryPersistence } from './persistence/MemoryPersistence';
+export type { PersistenceHandler } from './persistence/PersistenceHandler';
 export { TemplateMiner } from './TemplateMiner';
-
 export type { ClusterUpdateType, DrainOptions, ExtractedParameter, SearchStrategy } from './types';
-
-export type { PersistenceHandler } from './persistence/PersistenceHandler';
-export { MemoryPersistence } from './persistence/MemoryPersistence';

package/src/fs/createWebDavFileSystem.ts

@@ -1,6 +1,6 @@
 import type { Readable, Writable } from 'node:stream';
-import { maybeFunction, type MaybeFunction } from '@wener/utils';
-import type { FileStat, GetDirectoryContentsOptions, ResponseDataDetailed, WebDAVClient } from 'webdav';
+import { type MaybeFunction, maybeFunction } from '@wener/utils';
+import type { FileStat, ResponseDataDetailed, WebDAVClient } from 'webdav';
 import type {
 	IFileStat,
 	IFileSystem,
@@ -77,11 +77,6 @@ class WebdavFS implements IFileSystem {
 		path: string,
 		{ glob, recursive, depth, kind, hidden, signal }: ReaddirOptions = {},
 	): Promise<IFileStat[]> {
-		// webdav depth 只支持 0,1
-		let o: GetDirectoryContentsOptions = {};
-		if (recursive) {
-			o.deep = true;
-		}
 		let res = await this.client.getDirectoryContents(path, {
 			deep: recursive,
 			signal,

package/src/fs/createWebFileSystem.ts

@@ -5,8 +5,8 @@ import type {
 	IFileStat,
 	IFileSystem,
 	MkdirOptions,
-	ReadFileOptions,
 	ReaddirOptions,
+	ReadFileOptions,
 	RenameOptions,
 	RmOptions,
 	StatOptions,

package/src/fs/index.ts

@@ -1,8 +1,8 @@
-export type * from './IFileSystem';
-export { createSandboxFileSystem } from './createSandboxFileSystem';
-export { createMemoryFileSystem } from './createMemoryFileSystem';
 export { createBrowserFileSystem } from './createBrowserFileSystem';
+export { createMemoryFileSystem } from './createMemoryFileSystem';
+export { createSandboxFileSystem } from './createSandboxFileSystem';
 export { createWebFileSystem } from './createWebFileSystem';
+export { FileSystemError, FileSystemErrorCode } from './FileSystemError';
 export { findMimeType } from './findMimeType';
+export type * from './IFileSystem';
 export { type FileUrlOptions, FileUrlOptionsSchema } from './types';
-export { FileSystemError, FileSystemErrorCode } from './FileSystemError';

package/src/fs/minio/createMinioFileSystem.ts

@@ -1,7 +1,7 @@
-import { basename, dirname, normalize } from 'pathe';
 import { PassThrough, Readable, type Writable } from 'node:stream';
-import { parseS3Url, type ParseS3UrlOptions } from '@wener/common/s3';
+import { type ParseS3UrlOptions, parseS3Url } from '@wener/common/s3';
 import { Client } from 'minio';
+import { basename, dirname, normalize } from 'pathe';
 import type {
 	CopyOptions,
 	CreateReadStreamOptions,

package/src/fs/minio/index.ts

@@ -1 +1 @@
-export { createMinioFileSystem, type CreateMinioFileSystemOptions } from './createMinioFileSystem';
+export { type CreateMinioFileSystemOptions, createMinioFileSystem } from './createMinioFileSystem';

package/src/fs/s3/createS3MiniFileSystem.ts

@@ -1,6 +1,6 @@
 import { basename, dirname, normalize } from 'node:path';
 import { Readable } from 'node:stream';
-import { formatS3Url, parseS3Url, type ParseS3UrlOptions } from '@wener/common/s3';
+import { formatS3Url, type ParseS3UrlOptions, parseS3Url } from '@wener/common/s3';
 import { S3mini, sanitizeETag } from 's3mini';
 import type {
 	CopyOptions,