@atri-bot/lib-db 2.0.3 → 2.0.4

package/dist/index.d.mts

@@ -1,29 +1,22 @@
 import * as _atri_bot_core0 from "@atri-bot/core";
 import { AnyRelations, DrizzleConfig, EmptyRelations } from "drizzle-orm";
-import * as drizzle_orm_bun_sql_postgres_driver0 from "drizzle-orm/bun-sql/postgres/driver";
+import { BunSQLDatabase } from "drizzle-orm/bun-sql/postgres/driver.js";
 import { MigrationConfig } from "drizzle-orm/migrator";
 
 //#region src/index.d.ts
-interface InitDbPluginOptions {
-  connectString: string;
-  config?: DrizzleConfig;
+interface DbPluginProps<TSchema extends Record<string, unknown>, TRelations extends AnyRelations> {
+  drizzle: BunSQLDatabase<TSchema, TRelations> & {
+    $client: Bun.SQL;
+  };
+}
+interface DbPluginConfig {
+  connectionString?: string;
 }
-declare function InitDbPlugin(options: InitDbPluginOptions): _atri_bot_core0.definePluginReturnType<{
+interface DbPluginOptions<TSchema extends Record<string, unknown>, TRelations extends AnyRelations> extends DbPluginConfig {
   pluginName: string;
-  install(): Promise<void>;
-  uninstall(): void;
-}, object>;
-interface DbPluginOptions<TSchema extends Record<string, unknown>, TRelations extends AnyRelations> {
   config: DrizzleConfig<TSchema, TRelations>;
   migration?: MigrationConfig;
 }
-declare function DbPlugin<TSchema extends Record<string, unknown>, TRelations extends AnyRelations = EmptyRelations>(options: DbPluginOptions<TSchema, TRelations>): _atri_bot_core0.definePluginReturnType<{
-  pluginName: string;
-  drizzle: drizzle_orm_bun_sql_postgres_driver0.BunSQLDatabase<TSchema, TRelations> & {
-    $client: Bun.SQL;
-  };
-  install(): Promise<void>;
-  uninstall(): void;
-}, object>;
+declare function DbPlugin<TSchema extends Record<string, unknown>, TRelations extends AnyRelations = EmptyRelations>(options: DbPluginOptions<TSchema, TRelations>): _atri_bot_core0.definePluginReturnType<Omit<DbPluginProps<TSchema, TRelations>, keyof _atri_bot_core0.PluginBaseOptions<TConfig>>, DbPluginConfig>;
 //#endregion
-export { DbPlugin, DbPluginOptions, InitDbPlugin, InitDbPluginOptions };
+export { DbPlugin, DbPluginConfig, DbPluginOptions, DbPluginProps };

package/dist/index.mjs

@@ -1 +1 @@
-import{definePlugin as e}from"@atri-bot/core";import{sql as t}from"drizzle-orm";import{drizzle as n}from"drizzle-orm/bun-sql";import{migrate as r}from"drizzle-orm/bun-sql/migrator";var i=`@atri-bot/lib-db`;let a=null;function o(r){return e({pluginName:`${i}-init-db`,async install(){try{await n(r.connectString,r.config??{}).execute(t`SELECT 1;`),a=r,this.logger.INFO(`测试数据库连接成功`)}catch(e){throw this.logger.ERROR(`测试数据库连接失败`,e),e}},uninstall(){}})}function s(t){if(!a)throw Error(`请先通过 InitDbPlugin 插件初始化数据库连接`);return e({pluginName:`${i}-db`,drizzle:n(a.connectString,{...a.config,...t.config}),async install(){t.migration&&await r(this.drizzle,t.migration)},uninstall(){}})}export{s as DbPlugin,o as InitDbPlugin};
+import{definePlugin as e}from"@atri-bot/core";import{drizzle as t}from"drizzle-orm/bun-sql";import{migrate as n}from"drizzle-orm/bun-sql/migrator";var r=`@atri-bot/lib-db`;function i(i){return e({pluginName:r,defaultConfig:{connectionString:``},drizzle:{},async install(){if(!i.connectionString||!this.config.connectionString||i.connectionString===``||this.config.connectionString===``)throw this.logger.ERROR(`请配置DbPlugin插件的配置文件, 至少需要提供connectionString参数。`),Error(`请配置DbPlugin插件的配置文件, 至少需要提供connectionString参数。`);this.drizzle=t(i.connectionString??this.config.connectionString,i.config),i.migration&&await n(this.drizzle,{...i.migration,migrationsTable:`migrations_${i.pluginName}`})},uninstall(){}})}export{i as DbPlugin};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@atri-bot/lib-db",
   "type": "module",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "description": "db lib for atri framework",
   "author": "huan_kong",
   "license": "MIT",