From e6293ce52fd6ec2d7bfbbf6c0601a5191d792d34 Mon Sep 17 00:00:00 2001 From: imbytecat Date: Wed, 21 Jan 2026 16:34:33 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E7=A7=BB=E9=99=A4=E6=9C=AC?= =?UTF-8?q?=E5=9C=B0=E6=95=B0=E6=8D=AE=E5=BA=93=E4=BE=9D=E8=B5=96=E5=B9=B6?= =?UTF-8?q?=E6=B8=85=E7=90=86=E5=BA=9F=E5=BC=83=E6=A8=A1=E5=9D=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移除对本地数据库包的依赖并更新客户端、合约和服务器包的引用为目录源。 - 移除对本地数据库包的依赖引用并清理相关配置 - 删除数据库包的配置文件及依赖项 - 移除对 todo 模式的导出，清理已废弃的模块引用。 - 删除待办事项表的定义及相关字段配置 - 删除已废弃的字段生成工具函数及对应配置，移除对 uuidv7 和 PostgreSQL 特定生成策略的依赖。 - 移除字段工具导出，不再从字段工具模块导出内容 - 删除 SQLite 数据库模块的初始化文件 - 删除数据库包中的 TypeScript 配置文件以统一项目配置 --- apps/server/package.json | 1 - bun.lock | 14 ----- packages/database/package.json | 24 -------- .../database/src/postgres/schema/index.ts | 1 - packages/database/src/postgres/schema/todo.ts | 8 --- packages/database/src/postgres/utils/field.ts | 58 ------------------- packages/database/src/postgres/utils/index.ts | 1 - packages/database/src/sqlite/index.ts | 0 packages/database/tsconfig.json | 3 - 9 files changed, 110 deletions(-) delete mode 100644 packages/database/package.json delete mode 100644 packages/database/src/postgres/schema/index.ts delete mode 100644 packages/database/src/postgres/schema/todo.ts delete mode 100644 packages/database/src/postgres/utils/field.ts delete mode 100644 packages/database/src/postgres/utils/index.ts delete mode 100644 packages/database/src/sqlite/index.ts delete mode 100644 packages/database/tsconfig.json diff --git a/apps/server/package.json b/apps/server/package.json index f180f29..de9180e 100644 --- a/apps/server/package.json +++ b/apps/server/package.json @@ -15,7 +15,6 @@ "typecheck": "tsc --noEmit" }, "dependencies": { - "@furtherverse/database": "workspace:*", "@orpc/client": "catalog:", "@orpc/contract": "catalog:", "@orpc/server": "catalog:", diff --git a/bun.lock b/bun.lock index e389d09..d3feaa5 100644 --- a/bun.lock +++ b/bun.lock @@ -20,7 +20,6 @@ "name": "@furtherverse/server", "version": "1.0.0", "dependencies": { - "@furtherverse/database": "workspace:*", "@orpc/client": "catalog:", "@orpc/contract": "catalog:", "@orpc/server": "catalog:", @@ -61,17 +60,6 @@ "vite-tsconfig-paths": "catalog:", }, }, - "packages/database": { - "name": "@furtherverse/database", - "version": "1.0.0", - "dependencies": { - "drizzle-orm": "catalog:", - "uuid": "catalog:", - }, - "devDependencies": { - "@furtherverse/tsconfig": "workspace:*", - }, - }, "packages/tsconfig": { "name": "@furtherverse/tsconfig", "version": "0.0.0", @@ -271,8 +259,6 @@ "@esbuild/win32-x64": ["@esbuild/win32-x64@0.25.12", "", { "os": "win32", "cpu": "x64" }, "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA=="], - "@furtherverse/database": ["@furtherverse/database@workspace:packages/database"], - "@furtherverse/desktop": ["@furtherverse/desktop@workspace:apps/desktop"], "@furtherverse/server": ["@furtherverse/server@workspace:apps/server"], diff --git a/packages/database/package.json b/packages/database/package.json deleted file mode 100644 index b1cba4e..0000000 --- a/packages/database/package.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "name": "@furtherverse/database", - "version": "1.0.0", - "private": true, - "type": "module", - "imports": { - "#*": "./src/*" - }, - "exports": { - ".": "./src/index.ts", - "./*": "./src/*.ts" - }, - "scripts": { - "fix": "biome check --write", - "typecheck": "tsc --noEmit" - }, - "dependencies": { - "drizzle-orm": "catalog:", - "uuid": "catalog:" - }, - "devDependencies": { - "@furtherverse/tsconfig": "workspace:*" - } -} diff --git a/packages/database/src/postgres/schema/index.ts b/packages/database/src/postgres/schema/index.ts deleted file mode 100644 index a1cad6c..0000000 --- a/packages/database/src/postgres/schema/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './todo' diff --git a/packages/database/src/postgres/schema/todo.ts b/packages/database/src/postgres/schema/todo.ts deleted file mode 100644 index bbf16af..0000000 --- a/packages/database/src/postgres/schema/todo.ts +++ /dev/null @@ -1,8 +0,0 @@ -import { boolean, pgTable, text } from 'drizzle-orm/pg-core' -import { generatedFields } from '../utils' - -export const todoTable = pgTable('todo', { - ...generatedFields, - title: text('title').notNull(), - completed: boolean('completed').notNull().default(false), -}) diff --git a/packages/database/src/postgres/utils/field.ts b/packages/database/src/postgres/utils/field.ts deleted file mode 100644 index 4ba0ef9..0000000 --- a/packages/database/src/postgres/utils/field.ts +++ /dev/null @@ -1,58 +0,0 @@ -import { sql } from 'drizzle-orm' -import { timestamp, uuid } from 'drizzle-orm/pg-core' -import { v7 as uuidv7 } from 'uuid' - -// id - -export const id = (name: string) => uuid(name) -export const pk = (name: string, strategy?: 'native' | 'extension') => { - switch (strategy) { - // PG 18+ - case 'native': - return id(name).primaryKey().default(sql`uuidv7()`) - - // PG 13+ with extension - case 'extension': - return id(name).primaryKey().default(sql`uuid_generate_v7()`) - - // Any PG version - default: - return id(name) - .primaryKey() - .$defaultFn(() => uuidv7()) - } -} - -// timestamp - -export const createdAt = (name = 'created_at') => - timestamp(name, { withTimezone: true }).notNull().defaultNow() - -export const updatedAt = (name = 'updated_at') => - timestamp(name, { withTimezone: true }) - .notNull() - .defaultNow() - .$onUpdateFn(() => new Date()) - -// generated fields - -export const generatedFields = { - id: pk('id'), - createdAt: createdAt('created_at'), - updatedAt: updatedAt('updated_at'), -} - -// Helper to create omit keys from generatedFields -const createGeneratedFieldKeys = >( - fields: T, -): Record => { - return Object.keys(fields).reduce( - (acc, key) => { - acc[key as keyof T] = true - return acc - }, - {} as Record, - ) -} - -export const generatedFieldKeys = createGeneratedFieldKeys(generatedFields) diff --git a/packages/database/src/postgres/utils/index.ts b/packages/database/src/postgres/utils/index.ts deleted file mode 100644 index 15f2189..0000000 --- a/packages/database/src/postgres/utils/index.ts +++ /dev/null @@ -1 +0,0 @@ -export * from './field' diff --git a/packages/database/src/sqlite/index.ts b/packages/database/src/sqlite/index.ts deleted file mode 100644 index e69de29..0000000 diff --git a/packages/database/tsconfig.json b/packages/database/tsconfig.json deleted file mode 100644 index 086fbdf..0000000 --- a/packages/database/tsconfig.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "extends": "@furtherverse/tsconfig/base.json" -}