@wener/common 2.0.5 → 2.0.6

package/src/fs/server/loadTestDatabase.ts

@@ -1,131 +1,20 @@
-import { inspect } from 'node:util';
-import type { Options as BetterSqliteOptions } from '@mikro-orm/better-sqlite';
-import { Errors, ulid } from '@wener/utils';
-import type { Database } from 'better-sqlite3';
+import { MikroORM } from '@mikro-orm/core';
+import { SqliteDriver } from '@mikro-orm/sql';
+import { createSqliteDialect } from '../../orm/createSqliteDialect';
 import { FileNodeContentEntity, FileNodeMetaEntity } from './createDatabaseFileSystem';
 
-export async function loadTestDatabase({ options }: { options?: BetterSqliteOptions } = {}) {
-	const { MikroORM: SqliteMikroORM } = await import('@mikro-orm/better-sqlite');
-
-	const orm = await SqliteMikroORM.init({
+export async function loadTestDatabase() {
+	const orm = await MikroORM.init({
+		driver: SqliteDriver,
 		dbName: ':memory:',
 		entities: [FileNodeContentEntity, FileNodeMetaEntity],
-		discovery: {
-			disableDynamicFileAccess: true,
-			requireEntitiesArray: true,
-		},
-		serialization: {
-			includePrimaryKeys: true,
-			forceObject: true,
-		},
-		findOneOrFailHandler(entityName, where) {
-			throw Errors.NotFound.asError(`未找到数据: ${entityName} ${inspect(where)}`);
-		},
-		findExactlyOneOrFailHandler(entityName, where) {
-			throw Errors.BadRequest.asError(`错误的数据数量: ${entityName} ${inspect(where)}`);
-		},
-		...options,
+		driverOptions: await createSqliteDialect(':memory:'),
 	});
 
-	const knex = orm.em.getKnex();
-	{
-		const db: Database = await knex.client.acquireConnection();
-		db.function('ulid', () => ulid());
-		await knex.client.releaseConnection(db);
-	}
-
-	// Execute schema creation
-	for (const stmt of FileSystemSchema.split(';')) {
-		const sql = stmt.trim();
-		if (sql) {
-			await knex.raw(sql);
-		}
-	}
+	await orm.schema.create();
 
 	return {
 		orm,
 		em: orm.em.fork(),
 	};
 }
-
-export const FileSystemSchema = `
-CREATE TABLE IF NOT EXISTS "file_node_meta"
-(
-    -- Base fields
-    "id"         TEXT PRIMARY KEY NOT NULL DEFAULT (ulid()),
-    "tid"        TEXT,
-    "uid"        TEXT,
-    "eid"        TEXT,
-    "created_at" TEXT             NOT NULL DEFAULT (datetime('now')),
-    "updated_at" TEXT             NOT NULL DEFAULT (datetime('now')),
-    "deleted_at" TEXT,
-    "attributes" TEXT,
-    "properties" TEXT,
-    "extensions" TEXT,
-
-    -- File identification
-    "filename"   TEXT             NOT NULL,
-    "size"       INTEGER          NOT NULL DEFAULT 0,
-    "kind"       TEXT             NOT NULL,
-
-    -- Timestamps
-    "atime"      TEXT             NOT NULL,
-    "btime"      TEXT             NOT NULL,
-    "ctime"      TEXT             NOT NULL,
-    "mtime"      TEXT             NOT NULL,
-
-    -- Metadata
-    "metadata"   TEXT             NOT NULL DEFAULT '{}',
-
-    -- Hierarchy
-    "parent_id"  TEXT,
-
-    -- Small file content (for files < 64KB)
-    "content"    BLOB,
-
-    FOREIGN KEY ("parent_id") REFERENCES "file_node_meta" ("id")
-);
-
-CREATE INDEX IF NOT EXISTS "idx_file_node_meta_filename" ON "file_node_meta" ("filename");
-CREATE INDEX IF NOT EXISTS "idx_file_node_meta_parent_id" ON "file_node_meta" ("parent_id");
-CREATE INDEX IF NOT EXISTS "idx_file_node_meta_tid_parent_filename" ON "file_node_meta" ("tid", "parent_id", "filename");
-
-CREATE TABLE IF NOT EXISTS "file_node_content"
-(
-    -- Base fields
-    "id"         TEXT PRIMARY KEY NOT NULL DEFAULT (ulid()),
-    "node_id"    TEXT             NOT NULL UNIQUE,
-    "tid"        TEXT,
-    "uid"        TEXT,
-    "eid"        TEXT,
-    "created_at" TEXT             NOT NULL DEFAULT (datetime('now')),
-    "updated_at" TEXT             NOT NULL DEFAULT (datetime('now')),
-    "deleted_at" TEXT,
-    "attributes" TEXT,
-    "properties" TEXT,
-    "extensions" TEXT,
-
-    -- Content information
-    "size"       INTEGER          NOT NULL,
-    "content"    BLOB,
-
-    -- File properties
-    "mime_type"  TEXT,
-
-    -- Checksums
-    "md5"        TEXT,
-    "sha256"     TEXT,
-
-    -- Content metadata
-    "text"       TEXT,
-    "width"      INTEGER,
-    "height"     INTEGER,
-
-    -- Additional metadata
-    "metadata"   TEXT             NOT NULL DEFAULT '{}',
-
-    FOREIGN KEY ("node_id") REFERENCES "file_node_meta" ("id") ON DELETE CASCADE
-);
-
-CREATE INDEX IF NOT EXISTS "idx_file_node_content_node_id" ON "file_node_content" ("node_id");
-`;

package/src/jsonschema/index.ts

@@ -1,3 +1,3 @@
+export { forEachJsonSchema } from './forEachJsonSchema';
 export { JsonSchema } from './JsonSchema';
 export type { JsonSchemaDef } from './types';
-export { forEachJsonSchema } from './forEachJsonSchema';

package/src/meta/index.ts

@@ -1,5 +1,4 @@
-export { createMetadataKey, defineMetadata, getMetadata } from './defineMetadata';
+export { defineFileType, type FileTypeDef, getFileType } from './defineFileType';
 
 export { defineInit, type InitDef, runInit } from './defineInit';
-
-export { defineFileType, getFileType, type FileTypeDef } from './defineFileType';
+export { createMetadataKey, defineMetadata, getMetadata } from './defineMetadata';

package/src/orm/createSqliteDialect.ts

@@ -0,0 +1,17 @@
+import { NodeSqliteDialect } from '@mikro-orm/sql';
+
+/**
+ * Create a Kysely SQLite dialect based on the current runtime.
+ * - Bun: uses bun:sqlite via kysely-bun-sqlite
+ * - Node.js 22.5+: uses node:sqlite via NodeSqliteDialect
+ */
+export async function createSqliteDialect(dbName: string) {
+	if (typeof (globalThis as any).Bun !== 'undefined') {
+		// @ts-expect-error bun-only module
+		const { BunSqliteDialect } = await import('kysely-bun-sqlite');
+		// @ts-expect-error bun-only module
+		const { Database } = await import('bun:sqlite');
+		return new BunSqliteDialect({ database: new Database(dbName) });
+	}
+	return new NodeSqliteDialect(dbName);
+}

package/src/orm/index.ts

@@ -0,0 +1 @@
+export { createSqliteDialect } from './createSqliteDialect';

package/src/orpc/createOpenApiContractClient.ts

@@ -1,4 +1,4 @@
-import { createORPCClient, type ClientContext } from '@orpc/client';
+import { type ClientContext, createORPCClient } from '@orpc/client';
 import type { LinkFetchClientOptions } from '@orpc/client/fetch';
 import type { BatchLinkPluginOptions, DedupeRequestsPluginOptions } from '@orpc/client/plugins';
 import type { StandardLinkPlugin } from '@orpc/client/standard';

package/src/orpc/index.ts

@@ -1,2 +1,2 @@
-export { createRpcContractClient } from './createRpcContractClient';
 export { createOpenApiContractClient } from './createOpenApiContractClient';
+export { createRpcContractClient } from './createRpcContractClient';

package/src/password/createArgon2PasswordAlgorithm.ts

@@ -1,4 +1,4 @@
-import { maybeFunction, type MaybeFunction, type MaybePromise } from '@wener/utils';
+import { type MaybeFunction, type MaybePromise, maybeFunction } from '@wener/utils';
 import type { Password } from './Password';
 
 type Provide = {

package/src/password/index.ts

@@ -1,5 +1,5 @@
-export { PHC } from './PHC';
-export { Password } from './Password';
 export { createArgon2PasswordAlgorithm } from './createArgon2PasswordAlgorithm';
 export { createBase64PasswordAlgorithm } from './createBase64PasswordAlgorithm';
 export { createBcryptPasswordAlgorithm } from './createBcryptPasswordAlgorithm';
+export { Password } from './Password';
+export { PHC } from './PHC';

package/src/resource/index.ts

@@ -1,4 +1,4 @@
-export type { AnyResource } from './schema/AnyResourceSchema';
-export type { Identifiable } from './Identifiable';
 export { getTitleOfResource } from './getTitleOfResource';
-export { type ListQueryInput, type ListQuery, resolveListQuery, ListQuerySchema } from './ListQuery';
+export type { Identifiable } from './Identifiable';
+export { type ListQuery, type ListQueryInput, ListQuerySchema, resolveListQuery } from './ListQuery';
+export type { AnyResource } from './schema/AnyResourceSchema';

package/src/resource/schema/index.ts

@@ -1,5 +1,5 @@
-export { ResourceStatus, ResourceStatusSchema } from './ResourceStatus';
-export { ResourceActionType, ResourceActionTypeSchema, ResourceActionDataSchema } from './ResourceActionType';
-export { AnyResourceSchema, type AnyResource } from './AnyResourceSchema';
-export { rz, type EnumValues } from './types';
+export { type AnyResource, AnyResourceSchema } from './AnyResourceSchema';
 export { BaseResourceSchema } from './BaseResourceSchema';
+export { ResourceActionDataSchema, ResourceActionType, ResourceActionTypeSchema } from './ResourceActionType';
+export { ResourceStatus, ResourceStatusSchema } from './ResourceStatus';
+export { type EnumValues, rz } from './types';

package/src/s3/index.ts

@@ -1,2 +1,2 @@
-export { parseS3Url, type ParseS3UrlOptions } from './parseS3Url';
 export { formatS3Url } from './formatS3Url';
+export { type ParseS3UrlOptions, parseS3Url } from './parseS3Url';

package/src/schema/SchemaRegistry.ts

@@ -1,6 +1,6 @@
 import { getGlobalStates } from '@wener/utils';
 import type { JsonSchemaDef } from '../jsonschema';
-import { toJsonSchema, type SchemaOutput, type TypeSchema } from './index';
+import { type SchemaOutput, type TypeSchema, toJsonSchema } from './index';
 
 export namespace SchemaRegistry {
 	const types = getGlobalStates('@wener/common/resource/schema/SchemaRegistry', () => new Map<string, JsonSchemaDef>());

package/src/schema/createSchemaData.ts

@@ -1,7 +1,7 @@
 import { match, P } from 'ts-pattern';
 import type { JsonSchemaDef } from '../jsonschema';
-import { toJsonSchema } from './toJsonSchema';
 import type { SchemaOutput, TypeSchema } from './TypeSchema';
+import { toJsonSchema } from './toJsonSchema';
 
 export function createSchemaData<S extends TypeSchema>(
 	ts: S,

package/src/schema/findJsonSchemaByPath.ts

@@ -1,6 +1,6 @@
 import { firstOfMaybeArray } from '@wener/utils';
-import { toJsonSchema } from './toJsonSchema';
 import type { TypeSchema } from './TypeSchema';
+import { toJsonSchema } from './toJsonSchema';
 
 export function findJsonSchemaByPath(schema: TypeSchema, objectPath: string) {
 	schema = toJsonSchema(schema);

package/src/schema/index.ts

@@ -1,7 +1,7 @@
-export type * from './TypeSchema';
-export { isJsonSchema, isZodSchema, isTypeBoxSchema, validate, parseData, type ValidationResult } from './validate';
-export { getSchemaOptions, getSchemaOptionLabel } from './getSchemaOptions';
-export { toJsonSchema } from './toJsonSchema';
-export { findJsonSchemaByPath } from './findJsonSchemaByPath';
 export { createSchemaData } from './createSchemaData';
+export { findJsonSchemaByPath } from './findJsonSchemaByPath';
+export { getSchemaOptionLabel, getSchemaOptions } from './getSchemaOptions';
 export { SchemaRegistry } from './SchemaRegistry';
+export type * from './TypeSchema';
+export { toJsonSchema } from './toJsonSchema';
+export { isJsonSchema, isTypeBoxSchema, isZodSchema, parseData, type ValidationResult, validate } from './validate';

package/src/schema/validate.ts

@@ -1,4 +1,4 @@
-import { Kind as TypeBoxKind, type TSchema } from '@sinclair/typebox';
+import { type TSchema, Kind as TypeBoxKind } from '@sinclair/typebox';
 import '@sinclair/typebox';
 import { TypeCompiler } from '@sinclair/typebox/compiler';
 import { ifPresent } from '@wener/utils';

package/src/utils/buildRedactorFormSchema.ts

@@ -1,5 +1,5 @@
 import { forEachJsonSchema, type JsonSchemaDef } from '../jsonschema';
-import { toJsonSchema, type TypeSchema } from '../schema';
+import { type TypeSchema, toJsonSchema } from '../schema';
 
 export const RedactedText = '[redacted]';
 

package/src/utils/formatNumber.ts

@@ -0,0 +1,18 @@
+/**
+ * Format a number, removing trailing zeros
+ * @param value - number or string convertible to number
+ * @param decimals - decimal places to keep, default 2
+ *
+ * @example
+ * formatNumber(1.50) // "1.5"
+ * formatNumber(1.00) // "1"
+ * formatNumber(1.234) // "1.23"
+ */
+export function formatNumber(value: number | string, decimals = 2): string {
+	const num = typeof value === 'string' ? Number.parseFloat(value) : value;
+	if (Number.isNaN(num)) return String(value);
+	return num
+		.toFixed(decimals)
+		.replace(/(\.\d*?)0+$/, '$1')
+		.replace(/\.$/, '');
+}

package/src/utils/formatPercent.ts

@@ -0,0 +1,17 @@
+import { formatNumber } from './formatNumber';
+
+/**
+ * Format a percentage, removing trailing zeros
+ * @param value - number (0-1 or 0-100)
+ * @param decimals - decimal places to keep, default 2
+ * @param isRatio - whether value is a ratio (0-1), default false
+ *
+ * @example
+ * formatPercent(0.5, 2, true) // "50"
+ * formatPercent(50.00) // "50"
+ * formatPercent(33.33) // "33.33"
+ */
+export function formatPercent(value: number, decimals = 2, isRatio = false): string {
+	const percent = isRatio ? value * 100 : value;
+	return formatNumber(percent, decimals);
+}

package/src/utils/index.ts

@@ -1,5 +1,5 @@
-export { getEstimateProcessTime } from './getEstimateProcessTime';
+export { buildBaseUrl } from './buildBaseUrl';
 
 export { buildRedactorFormSchema } from './buildRedactorFormSchema';
-
-export { buildBaseUrl } from './buildBaseUrl';
+export { formatNumber } from './formatNumber';
+export { getEstimateProcessTime } from './getEstimateProcessTime';

package/src/utils/resolveFeatureOptions.ts

@@ -1,4 +1,4 @@
-import { maybeFunction, type MaybeFunction } from '@wener/utils';
+import { type MaybeFunction, maybeFunction } from '@wener/utils';
 
 export function resolveFeatureOptions<T>(
 	value: boolean | T | undefined | null,