Merge pull request #188 from bknd-io/feat/generic-sqlite

env aware sqlite (node, bun)

.github/workflows/test.yml

@@ -12,6 +12,11 @@ jobs:
     steps:
       - uses: actions/checkout@v4
       
+      - name: Setup Node.js
+        uses: actions/setup-node@v4
+        with:
+          node-version: "22.x"
+          
       - name: Setup Bun
         uses: oven-sh/setup-bun@v1
         with:

app/__test__/adapter/adapter.test.ts

@@ -3,21 +3,36 @@ import * as adapter from "adapter";
 import { disableConsoleLog, enableConsoleLog } from "core/utils";
 import { adapterTestSuite } from "adapter/adapter-test-suite";
 import { bunTestRunner } from "adapter/bun/test";
+import { omitKeys } from "core/utils";
 
 beforeAll(disableConsoleLog);
 afterAll(enableConsoleLog);
 
 describe("adapter", () => {
    it("makes config", () => {
-      expect(adapter.makeConfig({})).toEqual({});
-      expect(adapter.makeConfig({}, { env: { TEST: "test" } })).toEqual({});
+      expect(omitKeys(adapter.makeConfig({}), ["connection"])).toEqual({});
+      expect(omitKeys(adapter.makeConfig({}, { env: { TEST: "test" } }), ["connection"])).toEqual(
+         {},
+      );
 
       // merges everything returned from `app` with the config
-      expect(adapter.makeConfig({ app: (a) => a as any }, { env: { TEST: "test" } })).toEqual({
-         env: { TEST: "test" },
-      } as any);
+      expect(
+         omitKeys(
+            adapter.makeConfig(
+               { app: (a) => ({ initialConfig: { server: { cors: { origin: a.env.TEST } } } }) },
+               { env: { TEST: "test" } },
+            ),
+            ["connection"],
+         ),
+      ).toEqual({
+         initialConfig: { server: { cors: { origin: "test" } } },
+      });
    });
 
+   /* it.only("...", async () => {
+      const app = await adapter.createAdapterApp();
+   }); */
+
    it("reuses apps correctly", async () => {
       const id = crypto.randomUUID();
 

app/__test__/app/App.spec.ts

@@ -1,6 +1,6 @@
 import { describe, expect, mock, test } from "bun:test";
 import type { ModuleBuildContext } from "../../src";
-import { App, createApp } from "../../src/App";
+import { App, createApp } from "core/test/utils";
 import * as proto from "../../src/data/prototype";
 
 describe("App", () => {

app/__test__/app/repro.spec.ts

@@ -1,5 +1,6 @@
 import { describe, expect, test } from "bun:test";
-import { createApp, registries } from "../../src";
+import { registries } from "../../src";
+import { createApp } from "core/test/utils";
 import * as proto from "../../src/data/prototype";
 import { StorageLocalAdapter } from "adapter/node/storage/StorageLocalAdapter";
 

app/__test__/integration/config.integration.test.ts

@@ -1,5 +1,5 @@
 import { describe, expect, it } from "bun:test";
-import { createApp } from "../../src";
+import { createApp } from "core/test/utils";
 import { Api } from "../../src/Api";
 
 describe("integration config", () => {

app/__test__/media/MediaController.spec.ts

@@ -1,7 +1,8 @@
 /// <reference types="@types/bun" />
 
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { createApp, registries } from "../../src";
+import { registries } from "../../src";
+import { createApp } from "core/test/utils";
 import { mergeObject, randomString } from "../../src/core/utils";
 import type { TAppMediaConfig } from "../../src/media/media-schema";
 import { StorageLocalAdapter } from "adapter/node/storage/StorageLocalAdapter";

app/__test__/modules/AppAuth.spec.ts

@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, beforeEach, describe, expect, spyOn, test } from "bun:test";
-import { createApp } from "../../src";
+import { createApp } from "core/test/utils";
 import { AuthController } from "../../src/auth/api/AuthController";
 import { em, entity, make, text } from "../../src/data";
 import { AppAuth, type ModuleBuildContext } from "../../src/modules";

app/__test__/modules/AppMedia.spec.ts

@@ -1,5 +1,6 @@
 import { describe, expect, test } from "bun:test";
-import { createApp, registries } from "../../src";
+import { registries } from "../../src";
+import { createApp } from "core/test/utils";
 import { em, entity, text } from "../../src/data";
 import { StorageLocalAdapter } from "adapter/node/storage/StorageLocalAdapter";
 import { AppMedia } from "../../src/modules";

app/build.ts

@@ -244,7 +244,11 @@ async function buildAdapters() {
 
    // specific adatpers
    await tsup.build(baseConfig("react-router"));
-   await tsup.build(baseConfig("bun"));
+   await tsup.build(
+      baseConfig("bun", {
+         external: [/^bun\:.*/],
+      }),
+   );
    await tsup.build(baseConfig("astro"));
    await tsup.build(baseConfig("aws"));
    await tsup.build(
@@ -267,6 +271,29 @@ async function buildAdapters() {
       ...baseConfig("node"),
       platform: "node",
    });
+
+   await tsup.build({
+      ...baseConfig("sqlite/edge"),
+      entry: ["src/adapter/sqlite/edge.ts"],
+      outDir: "dist/adapter/sqlite",
+      metafile: false,
+   });
+
+   await tsup.build({
+      ...baseConfig("sqlite/node"),
+      entry: ["src/adapter/sqlite/node.ts"],
+      outDir: "dist/adapter/sqlite",
+      platform: "node",
+      metafile: false,
+   });
+
+   await tsup.build({
+      ...baseConfig("sqlite/bun"),
+      entry: ["src/adapter/sqlite/bun.ts"],
+      outDir: "dist/adapter/sqlite",
+      metafile: false,
+      external: [/^bun\:.*/],
+   });
 }
 
 await buildApi();

app/package.json

@@ -13,6 +13,9 @@
   "bugs": {
     "url": "https://github.com/bknd-io/bknd/issues"
   },
+  "engines": {
+    "node": ">=22"
+  },
   "scripts": {
     "dev": "BKND_CLI_LOG_LEVEL=debug vite",
     "build": "NODE_ENV=production bun run build.ts --minify --types",
@@ -31,11 +34,9 @@
     "test": "ALL_TESTS=1 bun test --bail",
     "test:all": "bun run test && bun run test:node",
     "test:bun": "ALL_TESTS=1 bun test --bail",
-    "test:node": "tsx --test $(find . -type f -name '*.native-spec.ts')",
+    "test:node": "vitest run",
     "test:adapters": "bun test src/adapter/**/*.adapter.spec.ts --bail",
     "test:coverage": "ALL_TESTS=1 bun test --bail --coverage",
-    "test:vitest": "vitest run",
-    "test:vitest:watch": "vitest",
     "test:vitest:coverage": "vitest run --coverage",
     "test:e2e": "playwright test",
     "test:e2e:adapters": "bun run e2e/adapters.ts",
@@ -50,7 +51,6 @@
     "@codemirror/lang-json": "^6.0.1",
     "@hello-pangea/dnd": "^18.0.1",
     "@hono/swagger-ui": "^0.5.1",
-    "@libsql/client": "^0.15.2",
     "@mantine/core": "^7.17.1",
     "@mantine/hooks": "^7.17.1",
     "@sinclair/typebox": "0.34.30",
@@ -61,11 +61,11 @@
     "bcryptjs": "^3.0.2",
     "dayjs": "^1.11.13",
     "fast-xml-parser": "^5.0.8",
+    "hono": "^4.7.11",
     "json-schema-form-react": "^0.0.2",
     "json-schema-library": "10.0.0-rc7",
     "json-schema-to-ts": "^3.1.1",
     "kysely": "^0.27.6",
-    "hono": "^4.7.11",
     "lodash-es": "^4.17.21",
     "oauth4webapi": "^2.11.1",
     "object-path-immutable": "^4.1.2",
@@ -76,11 +76,13 @@
   "devDependencies": {
     "@aws-sdk/client-s3": "^3.758.0",
     "@bluwy/giget-core": "^0.1.2",
+    "@cloudflare/vitest-pool-workers": "^0.8.38",
     "@cloudflare/workers-types": "^4.20250606.0",
     "@dagrejs/dagre": "^1.1.4",
     "@hono/typebox-validator": "^0.3.3",
     "@hono/vite-dev-server": "^0.19.1",
     "@hookform/resolvers": "^4.1.3",
+    "@libsql/client": "^0.15.9",
     "@libsql/kysely-libsql": "^0.4.1",
     "@mantine/modals": "^7.17.1",
     "@mantine/notifications": "^7.17.1",
@@ -104,6 +106,7 @@
     "jsonv-ts": "^0.1.0",
     "kysely-d1": "^0.3.0",
     "kysely-generic-sqlite": "^1.2.1",
+    "libsql-stateless-easy": "^1.8.0",
     "open": "^10.1.0",
     "openapi-types": "^12.1.3",
     "picocolors": "^1.1.1",
@@ -184,6 +187,20 @@
       "import": "./dist/media/index.js",
       "require": "./dist/media/index.js"
     },
+    "./adapter/sqlite": {
+      "types": "./dist/types/adapter/sqlite/edge.d.ts",
+      "import": {
+        "workerd": "./dist/adapter/sqlite/edge.js",
+        "edge-light": "./dist/adapter/sqlite/edge.js",
+        "netlify": "./dist/adapter/sqlite/edge.js",
+        "vercel": "./dist/adapter/sqlite/edge.js",
+        "browser": "./dist/adapter/sqlite/edge.js",
+        "bun": "./dist/adapter/sqlite/bun.js",
+        "node": "./dist/adapter/sqlite/node.js",
+        "default": "./dist/adapter/sqlite/node.js"
+      },
+      "require": "./dist/adapter/sqlite/node.js"
+    },
     "./adapter/cloudflare": {
       "types": "./dist/types/adapter/cloudflare/index.d.ts",
       "import": "./dist/adapter/cloudflare/index.js",

app/src/App.ts

@@ -1,7 +1,7 @@
 import type { CreateUserPayload } from "auth/AppAuth";
 import { $console } from "core";
 import { Event } from "core/events";
-import { Connection, type LibSqlCredentials, LibsqlConnection } from "data";
+import { Connection } from "data/connection/Connection";
 import type { Hono } from "hono";
 import {
    ModuleManager,
@@ -14,10 +14,10 @@ import {
 import * as SystemPermissions from "modules/permissions";
 import { AdminController, type AdminControllerOptions } from "modules/server/AdminController";
 import { SystemController } from "modules/server/SystemController";
+import type { ServerEnv } from "modules/Controller";
 
 // biome-ignore format: must be here
 import { Api, type ApiOptions } from "Api";
-import type { ServerEnv } from "modules/Controller";
 
 export type AppPlugin = (app: App) => Promise<void> | void;
 
@@ -51,15 +51,8 @@ export type AppOptions = {
    manager?: Omit<ModuleManagerOptions, "initial" | "onUpdated" | "seed">;
    asyncEventsMode?: "sync" | "async" | "none";
 };
-export type CreateAppConfig = {
-   connection?:
-      | Connection
-      | {
-           // @deprecated
-           type: "libsql";
-           config: LibSqlCredentials;
-        }
-      | LibSqlCredentials;
+export type CreateAppConfig<C extends Connection = Connection> = {
+   connection?: C | { url: string };
    initialConfig?: InitialModuleConfigs;
    options?: AppOptions;
 };
@@ -67,7 +60,7 @@ export type CreateAppConfig = {
 export type AppConfig = InitialModuleConfigs;
 export type LocalApiOptions = Request | ApiOptions;
 
-export class App {
+export class App<C extends Connection = Connection> {
    static readonly Events = AppEvents;
 
    modules: ModuleManager;
@@ -79,7 +72,7 @@ export class App {
    private _building: boolean = false;
 
    constructor(
-      private connection: Connection,
+      public connection: C,
       _initialConfig?: InitialModuleConfigs,
       private options?: AppOptions,
    ) {
@@ -262,31 +255,9 @@ export class App {
 }
 
 export function createApp(config: CreateAppConfig = {}) {
-   let connection: Connection | undefined = undefined;
-
-   try {
-      if (Connection.isConnection(config.connection)) {
-         connection = config.connection;
-      } else if (typeof config.connection === "object") {
-         if ("type" in config.connection) {
-            $console.warn(
-               "Using deprecated connection type 'libsql', use the 'config' object directly.",
-            );
-            connection = new LibsqlConnection(config.connection.config);
-         } else {
-            connection = new LibsqlConnection(config.connection);
-         }
-      } else {
-         connection = new LibsqlConnection({ url: ":memory:" });
-         $console.warn("No connection provided, using in-memory database");
-      }
-   } catch (e) {
-      $console.error("Could not create connection", e);
-   }
-
-   if (!connection) {
+   if (!config.connection || !Connection.isConnection(config.connection)) {
       throw new Error("Invalid connection");
    }
 
-   return new App(connection, config.initialConfig, config.options);
+   return new App(config.connection, config.initialConfig, config.options);
 }

app/src/adapter/bun/bun.adapter.ts

@@ -2,10 +2,11 @@
 
 import path from "node:path";
 import { type RuntimeBkndConfig, createRuntimeApp, type RuntimeOptions } from "bknd/adapter";
-import { registerLocalMediaAdapter } from "bknd/adapter/node";
+import { registerLocalMediaAdapter } from ".";
 import { config } from "bknd/core";
 import type { ServeOptions } from "bun";
 import { serveStatic } from "hono/bun";
+import type { App } from "App";
 
 type BunEnv = Bun.Env;
 export type BunBkndConfig<Env = BunEnv> = RuntimeBkndConfig<Env> & Omit<ServeOptions, "fetch">;
@@ -33,8 +34,11 @@ export function createHandler<Env = BunEnv>(
    args: Env = {} as Env,
    opts?: RuntimeOptions,
 ) {
+   let app: App | undefined;
    return async (req: Request) => {
-      const app = await createApp(config, args ?? (process.env as Env), opts);
+      if (!app) {
+         app = await createApp(config, args ?? (process.env as Env), opts);
+      }
       return app.fetch(req);
    };
 }
@@ -72,5 +76,5 @@ export function serve<Env = BunEnv>(
       ),
    });
 
-   console.log(`Server is running on http://localhost:${port}`);
+   console.info(`Server is running on http://localhost:${port}`);
 }

app/src/adapter/bun/connection/BunSqliteConnection.ts

@@ -1,4 +1,4 @@
-import type { Database } from "bun:sqlite";
+import { Database } from "bun:sqlite";
 import {
    buildQueryFn,
    GenericSqliteConnection,
@@ -30,12 +30,19 @@ function bunSqliteExecutor(db: Database, cache: boolean): IGenericSqlite<Databas
    };
 }
 
-export function bunSqlite(config: BunSqliteConnectionConfig) {
-   return new GenericSqliteConnection(
-      config.database,
-      () => bunSqliteExecutor(config.database, false),
-      {
-         name: "bun-sqlite",
-      },
-   );
+export function bunSqlite(config?: BunSqliteConnectionConfig | { url: string }) {
+   let database: Database;
+   if (config) {
+      if ("database" in config) {
+         database = config.database;
+      } else {
+         database = new Database(config.url);
+      }
+   } else {
+      database = new Database(":memory:");
+   }
+
+   return new GenericSqliteConnection(database, () => bunSqliteExecutor(database, false), {
+      name: "bun-sqlite",
+   });
 }

app/src/adapter/bun/index.ts

@@ -1 +1,3 @@
 export * from "./bun.adapter";
+export * from "../node/storage";
+export * from "./connection/BunSqliteConnection";

app/src/adapter/cloudflare/cloudflare-workers.adapter.spec.ts

@@ -13,30 +13,32 @@ describe("cf adapter", () => {
    const DB_URL = ":memory:";
    const $ctx = (env?: any, request?: Request, ctx?: ExecutionContext) => ({
       request: request ?? (null as any),
-      env: env ?? { DB_URL },
+      env: env ?? { url: DB_URL },
       ctx: ctx ?? (null as any),
    });
 
    it("makes config", async () => {
-      expect(
-         makeConfig(
-            {
-               connection: { url: DB_URL },
-            },
-            $ctx({ DB_URL }),
-         ),
-      ).toEqual({ connection: { url: DB_URL } });
+      const staticConfig = makeConfig(
+         {
+            connection: { url: DB_URL },
+            initialConfig: { data: { basepath: DB_URL } },
+         },
+         $ctx({ DB_URL }),
+      );
+      expect(staticConfig.initialConfig).toEqual({ data: { basepath: DB_URL } });
+      expect(staticConfig.connection).toBeDefined();
 
-      expect(
-         makeConfig(
-            {
-               app: (env) => ({
-                  connection: { url: env.DB_URL },
-               }),
-            },
-            $ctx({ DB_URL }),
-         ),
-      ).toEqual({ connection: { url: DB_URL } });
+      const dynamicConfig = makeConfig(
+         {
+            app: (env) => ({
+               initialConfig: { data: { basepath: env.DB_URL } },
+               connection: { url: env.DB_URL },
+            }),
+         },
+         $ctx({ DB_URL }),
+      );
+      expect(dynamicConfig.initialConfig).toEqual({ data: { basepath: DB_URL } });
+      expect(dynamicConfig.connection).toBeDefined();
    });
 
    adapterTestSuite<CloudflareBkndConfig, CfMakeConfigArgs<any>>(bunTestRunner, {

app/src/adapter/cloudflare/config.ts

@@ -9,6 +9,7 @@ import { makeConfig as makeAdapterConfig } from "bknd/adapter";
 import type { Context, ExecutionContext } from "hono";
 import { $console } from "core";
 import { setCookie } from "hono/cookie";
+import { sqlite } from "bknd/adapter/sqlite";
 
 export const constants = {
    exec_async_event_id: "cf_register_waituntil",
@@ -98,54 +99,70 @@ export function makeConfig<Env extends CloudflareEnv = CloudflareEnv>(
 
    const appConfig = makeAdapterConfig(config, args?.env);
 
-   if (args?.env) {
-      const bindings = config.bindings?.(args?.env);
+   // if connection instance is given, don't do anything
+   // other than checking if D1 session is defined
+   if (D1Connection.isConnection(appConfig.connection)) {
+      if (config.d1?.session) {
+         // we cannot guarantee that db was opened with session
+         throw new Error(
+            "D1 session don't work when D1 is directly given as connection. Define it in bindings instead.",
+         );
+      }
+      // if connection is given, try to open with unified sqlite adapter
+   } else if (appConfig.connection) {
+      appConfig.connection = sqlite(appConfig.connection);
 
+      // if connection is not given, but env is set
+      // try to make D1 from bindings
+   } else if (args?.env) {
+      const bindings = config.bindings?.(args?.env);
       const sessionHelper = d1SessionHelper(config);
       const sessionId = sessionHelper.get(args.request);
       let session: D1DatabaseSession | undefined;
+      let db: D1Database | undefined;
 
-      if (!appConfig.connection) {
-         let db: D1Database | undefined;
-         if (bindings?.db) {
-            $console.log("Using database from bindings");
-            db = bindings.db;
-         } else if (Object.keys(args).length > 0) {
-            const binding = getBinding(args.env, "D1Database");
-            if (binding) {
-               $console.log(`Using database from env "${binding.key}"`);
-               db = binding.value;
-            }
-         }
+      // if db is given in bindings, use it
+      if (bindings?.db) {
+         $console.log("Using database from bindings");
+         db = bindings.db;
 
-         if (db) {
-            if (config.d1?.session) {
-               session = db.withSession(sessionId ?? config.d1?.first);
-               appConfig.connection = new D1Connection({ binding: session });
-            } else {
-               appConfig.connection = new D1Connection({ binding: db });
-            }
-         } else {
-            throw new Error("No database connection given");
+         // scan for D1Database in args
+      } else {
+         const binding = getBinding(args.env, "D1Database");
+         if (binding) {
+            $console.log(`Using database from env "${binding.key}"`);
+            db = binding.value;
          }
       }
 
-      if (config.d1?.session) {
-         appConfig.options = {
-            ...appConfig.options,
-            manager: {
-               ...appConfig.options?.manager,
-               onServerInit: (server) => {
-                  server.use(async (c, next) => {
-                     sessionHelper.set(c, session);
-                     await next();
-                  });
+      // if db is found, check if session is requested
+      if (db) {
+         if (config.d1?.session) {
+            session = db.withSession(sessionId ?? config.d1?.first);
+
+            appConfig.connection = new D1Connection({ binding: session });
+            appConfig.options = {
+               ...appConfig.options,
+               manager: {
+                  ...appConfig.options?.manager,
+                  onServerInit: (server) => {
+                     server.use(async (c, next) => {
+                        sessionHelper.set(c, session);
+                        await next();
+                     });
+                  },
                },
-            },
-         };
+            };
+         } else {
+            appConfig.connection = new D1Connection({ binding: db });
+         }
       }
    }
 
+   if (!D1Connection.isConnection(appConfig.connection)) {
+      throw new Error("Couldn't find database connection");
+   }
+
    return appConfig;
 }
 

app/src/adapter/cloudflare/modes/durable.ts

@@ -64,7 +64,7 @@ export class DurableBkndApp extends DurableObject {
             "type" in config.connection &&
             config.connection.type === "libsql"
          ) {
-            config.connection.config.protocol = "wss";
+            //config.connection.config.protocol = "wss";
          }
 
          this.app = await createRuntimeApp({

app/src/adapter/cloudflare/storage/StorageR2Adapter.native-spec.ts

@@ -1,32 +0,0 @@
-import { createWriteStream, readFileSync } from "node:fs";
-import { test } from "node:test";
-import { Miniflare } from "miniflare";
-import { StorageR2Adapter } from "./StorageR2Adapter";
-import { adapterTestSuite } from "media";
-import { nodeTestRunner } from "adapter/node/test";
-import path from "node:path";
-
-// https://github.com/nodejs/node/issues/44372#issuecomment-1736530480
-console.log = async (message: any) => {
-   const tty = createWriteStream("/dev/tty");
-   const msg = typeof message === "string" ? message : JSON.stringify(message, null, 2);
-   return tty.write(`${msg}\n`);
-};
-
-test("StorageR2Adapter", async () => {
-   const mf = new Miniflare({
-      modules: true,
-      script: "export default { async fetch() { return new Response(null); } }",
-      r2Buckets: ["BUCKET"],
-   });
-
-   const bucket = (await mf.getR2Bucket("BUCKET")) as unknown as R2Bucket;
-   const adapter = new StorageR2Adapter(bucket);
-
-   const basePath = path.resolve(import.meta.dirname, "../../../../__test__/_assets");
-   const buffer = readFileSync(path.join(basePath, "image.png"));
-   const file = new File([buffer], "image.png", { type: "image/png" });
-
-   await adapterTestSuite(nodeTestRunner, adapter, file);
-   await mf.dispose();
-});

app/src/adapter/cloudflare/storage/StorageR2Adapter.vitest.ts

@@ -0,0 +1,32 @@
+import { readFileSync } from "node:fs";
+import { Miniflare } from "miniflare";
+import { StorageR2Adapter } from "./StorageR2Adapter";
+import { adapterTestSuite } from "media/storage/adapters/adapter-test-suite";
+import path from "node:path";
+import { describe, afterAll, test, expect } from "vitest";
+import { viTestRunner } from "adapter/node/vitest";
+
+let mf: Miniflare | undefined;
+describe("StorageR2Adapter", async () => {
+   mf = new Miniflare({
+      modules: true,
+      script: "export default { async fetch() { return new Response(null); } }",
+      r2Buckets: ["BUCKET"],
+   });
+   const bucket = (await mf?.getR2Bucket("BUCKET")) as unknown as R2Bucket;
+
+   test("test", () => {
+      expect(bucket).toBeDefined();
+   });
+   const adapter = new StorageR2Adapter(bucket);
+
+   const basePath = path.resolve(import.meta.dirname, "../../../../__test__/_assets");
+   const buffer = readFileSync(path.join(basePath, "image.png"));
+   const file = new File([buffer], "image.png", { type: "image/png" });
+
+   await adapterTestSuite(viTestRunner, adapter, file);
+});
+
+afterAll(async () => {
+   await mf?.dispose();
+});

app/src/adapter/cloudflare/vitest.config.ts

@@ -0,0 +1,14 @@
+import { defineWorkersConfig } from "@cloudflare/vitest-pool-workers/config";
+
+export default defineWorkersConfig({
+   test: {
+      poolOptions: {
+         workers: {
+            miniflare: {
+               compatibilityDate: "2025-06-04",
+            },
+         },
+      },
+      include: ["**/*.vi-test.ts", "**/*.vitest.ts"],
+   },
+});

app/src/adapter/index.ts

@@ -1,7 +1,10 @@
 import { App, type CreateAppConfig } from "bknd";
-import { config as $config } from "bknd/core";
+import { config as $config, $console } from "bknd/core";
 import type { MiddlewareHandler } from "hono";
 import type { AdminControllerOptions } from "modules/server/AdminController";
+import { Connection } from "bknd/data";
+
+export { Connection } from "bknd/data";
 
 export type BkndConfig<Args = any> = CreateAppConfig & {
    app?: CreateAppConfig | ((args: Args) => CreateAppConfig);
@@ -59,7 +62,20 @@ export async function createAdapterApp<Config extends BkndConfig = BkndConfig, A
    const id = opts?.id ?? "app";
    let app = apps.get(id);
    if (!app || opts?.force) {
-      app = App.create(makeConfig(config, args));
+      const appConfig = makeConfig(config, args);
+      if (!appConfig.connection || !Connection.isConnection(appConfig.connection)) {
+         let connection: Connection | undefined;
+         if (Connection.isConnection(config.connection)) {
+            connection = config.connection;
+         } else {
+            const sqlite = (await import("bknd/adapter/sqlite")).sqlite;
+            connection = sqlite(config.connection ?? { url: ":memory:" });
+            $console.info(`Using ${connection.name} connection`);
+         }
+         appConfig.connection = connection;
+      }
+
+      app = App.create(appConfig);
       apps.set(id, app);
    }
    return app;

app/src/adapter/node/connection/NodeSqliteConnection.ts

@@ -4,7 +4,7 @@ import {
    parseBigInt,
    type IGenericSqlite,
 } from "../../../data/connection/sqlite/GenericSqliteConnection";
-import type { DatabaseSync } from "node:sqlite";
+import { DatabaseSync } from "node:sqlite";
 
 export type NodeSqliteConnectionConfig = {
    database: DatabaseSync;
@@ -39,8 +39,19 @@ function nodeSqliteExecutor(db: DatabaseSync): IGenericSqlite<DatabaseSync> {
    };
 }
 
-export function nodeSqlite(config: NodeSqliteConnectionConfig) {
-   return new GenericSqliteConnection(config.database, () => nodeSqliteExecutor(config.database), {
+export function nodeSqlite(config?: NodeSqliteConnectionConfig | { url: string }) {
+   let database: DatabaseSync;
+   if (config) {
+      if ("database" in config) {
+         database = config.database;
+      } else {
+         database = new DatabaseSync(config.url);
+      }
+   } else {
+      database = new DatabaseSync(":memory:");
+   }
+
+   return new GenericSqliteConnection(database, () => nodeSqliteExecutor(database), {
       name: "node-sqlite",
    });
 }

app/src/adapter/node/index.ts

@@ -1,18 +1,3 @@
-import { registries } from "bknd";
-import { type LocalAdapterConfig, StorageLocalAdapter } from "./storage/StorageLocalAdapter";
-
 export * from "./node.adapter";
-export { StorageLocalAdapter, type LocalAdapterConfig };
-
-let registered = false;
-export function registerLocalMediaAdapter() {
-   if (!registered) {
-      registries.media.register("local", StorageLocalAdapter);
-      registered = true;
-   }
-
-   return (config: Partial<LocalAdapterConfig> = {}) => {
-      const adapter = new StorageLocalAdapter(config);
-      return adapter.toJSON(true);
-   };
-}
+export * from "./storage";
+export * from "./connection/NodeSqliteConnection";

app/src/adapter/node/node.adapter.spec.ts

@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe } from "bun:test";
-import * as node from "./node.adapter";
+import { createApp, createHandler } from "./node.adapter";
 import { adapterTestSuite } from "adapter/adapter-test-suite";
 import { bunTestRunner } from "adapter/bun/test";
 import { disableConsoleLog, enableConsoleLog } from "core/utils";
@@ -9,7 +9,7 @@ afterAll(enableConsoleLog);
 
 describe("node adapter (bun)", () => {
    adapterTestSuite(bunTestRunner, {
-      makeApp: node.createApp,
-      makeHandler: node.createHandler,
+      makeApp: createApp,
+      makeHandler: createHandler,
    });
 });

app/src/adapter/node/node.adapter.ts

@@ -1,10 +1,11 @@
 import path from "node:path";
 import { serve as honoServe } from "@hono/node-server";
 import { serveStatic } from "@hono/node-server/serve-static";
-import { registerLocalMediaAdapter } from "adapter/node/index";
+import { registerLocalMediaAdapter } from "adapter/node/storage";
 import { type RuntimeBkndConfig, createRuntimeApp, type RuntimeOptions } from "bknd/adapter";
 import { config as $config } from "bknd/core";
 import { $console } from "core";
+import type { App } from "App";
 
 type NodeEnv = NodeJS.ProcessEnv;
 export type NodeBkndConfig<Env = NodeEnv> = RuntimeBkndConfig<Env> & {
@@ -45,8 +46,11 @@ export function createHandler<Env = NodeEnv>(
    args: Env = {} as Env,
    opts?: RuntimeOptions,
 ) {
+   let app: App | undefined;
    return async (req: Request) => {
-      const app = await createApp(config, args ?? (process.env as Env), opts);
+      if (!app) {
+         app = await createApp(config, args ?? (process.env as Env), opts);
+      }
       return app.fetch(req);
    };
 }

app/src/adapter/node/storage/StorageLocalAdapter.vitest.ts

@@ -1,5 +1,5 @@
-import { describe } from "node:test";
-import { nodeTestRunner } from "adapter/node/test";
+import { describe } from "vitest";
+import { viTestRunner } from "adapter/node/vitest";
 import { StorageLocalAdapter } from "adapter/node";
 import { adapterTestSuite } from "media/storage/adapters/adapter-test-suite";
 import { readFileSync } from "node:fs";
@@ -14,5 +14,5 @@ describe("StorageLocalAdapter (node)", async () => {
       path: path.join(basePath, "tmp"),
    });
 
-   await adapterTestSuite(nodeTestRunner, adapter, file);
+   await adapterTestSuite(viTestRunner, adapter, file);
 });

app/src/adapter/node/storage/index.ts

@@ -0,0 +1,17 @@
+import { registries } from "bknd";
+import { type LocalAdapterConfig, StorageLocalAdapter } from "./StorageLocalAdapter";
+
+export * from "./StorageLocalAdapter";
+
+let registered = false;
+export function registerLocalMediaAdapter() {
+   if (!registered) {
+      registries.media.register("local", StorageLocalAdapter);
+      registered = true;
+   }
+
+   return (config: Partial<LocalAdapterConfig> = {}) => {
+      const adapter = new StorageLocalAdapter(config);
+      return adapter.toJSON(true);
+   };
+}

app/src/adapter/sqlite/bun.ts

@@ -0,0 +1,6 @@
+import type { Connection } from "bknd/data";
+import { bunSqlite } from "../bun/connection/BunSqliteConnection";
+
+export function sqlite(config: { url: string }): Connection {
+   return bunSqlite(config);
+}

app/src/adapter/sqlite/edge.ts

@@ -0,0 +1,6 @@
+import type { Connection } from "bknd/data";
+import { libsql } from "../../data/connection/sqlite/LibsqlConnection";
+
+export function sqlite(config: { url: string }): Connection {
+   return libsql(config);
+}

app/src/adapter/sqlite/node.ts

@@ -0,0 +1,6 @@
+import type { Connection } from "bknd/data";
+import { nodeSqlite } from "../node/connection/NodeSqliteConnection";
+
+export function sqlite(config: { url: string }): Connection {
+   return nodeSqlite(config);
+}

app/src/adapter/sqlite/types.ts

@@ -0,0 +1,3 @@
+import type { Connection } from "bknd/data";
+
+export type SqliteConnection = (config: { url: string }) => Connection;

app/src/cli/commands/run/platform.ts

@@ -1,6 +1,5 @@
 import path from "node:path";
-import type { Config } from "@libsql/client/node";
-import { $console, config } from "core";
+import { $console } from "core";
 import type { MiddlewareHandler } from "hono";
 import open from "open";
 import { fileExists, getRelativeDistPath } from "../../utils/sys";
@@ -27,10 +26,6 @@ export async function serveStatic(server: Platform): Promise<MiddlewareHandler>
    }
 }
 
-export async function attachServeStatic(app: any, platform: Platform) {
-   app.module.server.client.get(config.server.assets_path + "*", await serveStatic(platform));
-}
-
 export async function startServer(
    server: Platform,
    app: App,

app/src/cli/commands/run/run.ts

@@ -1,6 +1,6 @@
 import type { Config } from "@libsql/client/node";
-import { App, type CreateAppConfig } from "App";
-import { StorageLocalAdapter } from "adapter/node";
+import type { App, CreateAppConfig } from "App";
+import { StorageLocalAdapter } from "adapter/node/storage";
 import type { CliBkndConfig, CliCommand } from "cli/types";
 import { Option } from "commander";
 import { colorizeConsole, config } from "core";
@@ -11,19 +11,19 @@ import path from "node:path";
 import {
    PLATFORMS,
    type Platform,
-   attachServeStatic,
    getConfigPath,
    getConnectionCredentialsFromEnv,
+   serveStatic,
    startServer,
 } from "./platform";
-import { makeConfig } from "adapter";
-import { isBun as $isBun } from "cli/utils/sys";
+import { createRuntimeApp, makeConfig } from "adapter";
+import { isBun } from "core/utils";
 
 const env_files = [".env", ".dev.vars"];
 dotenv.config({
    path: env_files.map((file) => path.resolve(process.cwd(), file)),
 });
-const isBun = $isBun();
+const is_bun = isBun();
 
 export const run: CliCommand = (program) => {
    program
@@ -52,7 +52,7 @@ export const run: CliCommand = (program) => {
       .addOption(
          new Option("--server <server>", "server type")
             .choices(PLATFORMS)
-            .default(isBun ? "bun" : "node"),
+            .default(is_bun ? "bun" : "node"),
       )
       .addOption(new Option("--no-open", "don't open browser window on start"))
       .action(action);
@@ -72,23 +72,9 @@ type MakeAppConfig = {
 };
 
 async function makeApp(config: MakeAppConfig) {
-   const app = App.create({ connection: config.connection });
-
-   app.emgr.onEvent(
-      App.Events.AppBuiltEvent,
-      async () => {
-         if (config.onBuilt) {
-            await config.onBuilt(app);
-         }
-
-         await attachServeStatic(app, config.server?.platform ?? "node");
-         app.registerAdminController();
-      },
-      "sync",
-   );
-
-   await app.build();
-   return app;
+   return await createRuntimeApp({
+      serveStatic: await serveStatic(config.server?.platform ?? "node"),
+   });
 }
 
 export async function makeConfigApp(_config: CliBkndConfig, platform?: Platform) {

app/src/cli/commands/user.ts

@@ -11,7 +11,7 @@ import type { CliCommand } from "cli/types";
 import { Argument } from "commander";
 import { $console } from "core";
 import c from "picocolors";
-import { isBun } from "cli/utils/sys";
+import { isBun } from "core/utils";
 
 export const user: CliCommand = (program) => {
    program

app/src/cli/utils/sys.ts

@@ -4,14 +4,6 @@ import { readFile, writeFile as nodeWriteFile } from "node:fs/promises";
 import path from "node:path";
 import url from "node:url";
 
-export function isBun(): boolean {
-   try {
-      return typeof Bun !== "undefined";
-   } catch (e) {
-      return false;
-   }
-}
-
 export function getRootPath() {
    const _path = path.dirname(url.fileURLToPath(import.meta.url));
    // because of "src", local needs one more level up

app/src/core/test/utils.ts

@@ -0,0 +1,12 @@
+import { createApp as createAppInternal, type CreateAppConfig } from "App";
+import { bunSqlite } from "adapter/bun/connection/BunSqliteConnection";
+import { Connection } from "data/connection/Connection";
+
+export { App } from "App";
+
+export function createApp({ connection, ...config }: CreateAppConfig = {}) {
+   return createAppInternal({
+      ...config,
+      connection: Connection.isConnection(connection) ? connection : bunSqlite(connection as any),
+   });
+}

app/src/core/utils/runtime.ts

@@ -48,6 +48,14 @@ export function isNode() {
    }
 }
 
+export function isBun() {
+   try {
+      return typeof Bun !== "undefined";
+   } catch (e) {
+      return false;
+   }
+}
+
 export function invariant(condition: boolean | any, message: string) {
    if (!condition) {
       throw new Error(message);

app/src/data/api/DataApi.ts

@@ -1,5 +1,5 @@
 import type { DB } from "core";
-import type { EntityData, RepoQueryIn, RepositoryResponse } from "data";
+import type { EntityData, RepoQueryIn, RepositoryResultJSON } from "data";
 import type { Insertable, Selectable, Updateable } from "kysely";
 import { type BaseModuleApiOptions, ModuleApi, type PrimaryFieldType } from "modules";
 import type { FetchPromise, ResponseObject } from "modules/ModuleApi";
@@ -32,10 +32,7 @@ export class DataApi extends ModuleApi<DataApiOptions> {
       query: Omit<RepoQueryIn, "where" | "limit" | "offset"> = {},
    ) {
       type Data = E extends keyof DB ? Selectable<DB[E]> : EntityData;
-      return this.get<Pick<RepositoryResponse<Data>, "meta" | "data">>(
-         ["entity", entity as any, id],
-         query,
-      );
+      return this.get<RepositoryResultJSON<Data>>(["entity", entity as any, id], query);
    }
 
    readOneBy<E extends keyof DB | string>(
@@ -43,7 +40,7 @@ export class DataApi extends ModuleApi<DataApiOptions> {
       query: Omit<RepoQueryIn, "limit" | "offset" | "sort"> = {},
    ) {
       type Data = E extends keyof DB ? Selectable<DB[E]> : EntityData;
-      type T = Pick<RepositoryResponse<Data>, "meta" | "data">;
+      type T = RepositoryResultJSON<Data>;
       return this.readMany(entity, {
          ...query,
          limit: 1,
@@ -53,7 +50,7 @@ export class DataApi extends ModuleApi<DataApiOptions> {
 
    readMany<E extends keyof DB | string>(entity: E, query: RepoQueryIn = {}) {
       type Data = E extends keyof DB ? Selectable<DB[E]> : EntityData;
-      type T = Pick<RepositoryResponse<Data[]>, "meta" | "data">;
+      type T = RepositoryResultJSON<Data[]>;
 
       const input = query ?? this.options.defaultQuery;
       const req = this.get<T>(["entity", entity as any], input);
@@ -72,7 +69,7 @@ export class DataApi extends ModuleApi<DataApiOptions> {
       query: RepoQueryIn = {},
    ) {
       type Data = R extends keyof DB ? Selectable<DB[R]> : EntityData;
-      return this.get<Pick<RepositoryResponse<Data[]>, "meta" | "data">>(
+      return this.get<RepositoryResultJSON<Data[]>>(
          ["entity", entity as any, id, reference],
          query ?? this.options.defaultQuery,
       );
@@ -83,7 +80,7 @@ export class DataApi extends ModuleApi<DataApiOptions> {
       input: Insertable<Input>,
    ) {
       type Data = E extends keyof DB ? Selectable<DB[E]> : EntityData;
-      return this.post<RepositoryResponse<Data>>(["entity", entity as any], input);
+      return this.post<RepositoryResultJSON<Data>>(["entity", entity as any], input);
    }
 
    createMany<E extends keyof DB | string, Input = E extends keyof DB ? DB[E] : EntityData>(
@@ -94,7 +91,7 @@ export class DataApi extends ModuleApi<DataApiOptions> {
          throw new Error("input is required");
       }
       type Data = E extends keyof DB ? Selectable<DB[E]> : EntityData;
-      return this.post<RepositoryResponse<Data[]>>(["entity", entity as any], input);
+      return this.post<RepositoryResultJSON<Data[]>>(["entity", entity as any], input);
    }
 
    updateOne<E extends keyof DB | string, Input = E extends keyof DB ? DB[E] : EntityData>(
@@ -104,7 +101,7 @@ export class DataApi extends ModuleApi<DataApiOptions> {
    ) {
       if (!id) throw new Error("ID is required");
       type Data = E extends keyof DB ? Selectable<DB[E]> : EntityData;
-      return this.patch<RepositoryResponse<Data>>(["entity", entity as any, id], input);
+      return this.patch<RepositoryResultJSON<Data>>(["entity", entity as any, id], input);
    }
 
    updateMany<E extends keyof DB | string, Input = E extends keyof DB ? DB[E] : EntityData>(
@@ -114,7 +111,7 @@ export class DataApi extends ModuleApi<DataApiOptions> {
    ) {
       this.requireObjectSet(where);
       type Data = E extends keyof DB ? Selectable<DB[E]> : EntityData;
-      return this.patch<RepositoryResponse<Data[]>>(["entity", entity as any], {
+      return this.patch<RepositoryResultJSON<Data[]>>(["entity", entity as any], {
          update,
          where,
       });
@@ -123,24 +120,24 @@ export class DataApi extends ModuleApi<DataApiOptions> {
    deleteOne<E extends keyof DB | string>(entity: E, id: PrimaryFieldType) {
       if (!id) throw new Error("ID is required");
       type Data = E extends keyof DB ? Selectable<DB[E]> : EntityData;
-      return this.delete<RepositoryResponse<Data>>(["entity", entity as any, id]);
+      return this.delete<RepositoryResultJSON<Data>>(["entity", entity as any, id]);
    }
 
    deleteMany<E extends keyof DB | string>(entity: E, where: RepoQueryIn["where"]) {
       this.requireObjectSet(where);
       type Data = E extends keyof DB ? Selectable<DB[E]> : EntityData;
-      return this.delete<RepositoryResponse<Data>>(["entity", entity as any], where);
+      return this.delete<RepositoryResultJSON<Data>>(["entity", entity as any], where);
    }
 
    count<E extends keyof DB | string>(entity: E, where: RepoQueryIn["where"] = {}) {
-      return this.post<RepositoryResponse<{ entity: E; count: number }>>(
+      return this.post<RepositoryResultJSON<{ entity: E; count: number }>>(
          ["entity", entity as any, "fn", "count"],
          where,
       );
    }
 
    exists<E extends keyof DB | string>(entity: E, where: RepoQueryIn["where"] = {}) {
-      return this.post<RepositoryResponse<{ entity: E; exists: boolean }>>(
+      return this.post<RepositoryResultJSON<{ entity: E; exists: boolean }>>(
          ["entity", entity as any, "fn", "exists"],
          where,
       );

app/src/data/connection/DummyConnection.ts

@@ -1,6 +1,8 @@
 import { Connection, type FieldSpec, type SchemaResponse } from "./Connection";
 
 export class DummyConnection extends Connection {
+   override name: string = "dummy";
+
    protected override readonly supported = {
       batching: true,
    };

app/src/data/connection/index.ts

@@ -5,11 +5,13 @@ export {
    type IndexSpec,
    type DbFunctions,
    type SchemaResponse,
+   type ConnQuery,
+   type ConnQueryResults,
    customIntrospector,
 } from "./Connection";
 
 // sqlite
-export { LibsqlConnection, type LibSqlCredentials } from "./sqlite/LibsqlConnection";
+//export { libsql, LibsqlConnection, type LibSqlCredentials } from "./sqlite/LibsqlConnection";
 export { SqliteConnection } from "./sqlite/SqliteConnection";
 export { SqliteIntrospector } from "./sqlite/SqliteIntrospector";
 export { SqliteLocalConnection } from "./sqlite/SqliteLocalConnection";

app/src/data/connection/sqlite/GenericSqliteConnection.ts

@@ -8,12 +8,14 @@ import {
    GenericSqliteDialect,
 } from "kysely-generic-sqlite";
 import { SqliteConnection } from "./SqliteConnection";
+import type { Features } from "../Connection";
 
 export type GenericSqliteConnectionConfig = {
    name: string;
    additionalPlugins?: KyselyPlugin[];
    excludeTables?: string[];
    onCreateConnection?: OnCreateConnection;
+   supports?: Partial<Features>;
 };
 
 export { parseBigInt, buildQueryFn, GenericSqliteDialect, type IGenericSqlite };
@@ -33,5 +35,15 @@ export class GenericSqliteConnection<DB = unknown> extends SqliteConnection<DB>
          excludeTables: config?.excludeTables,
       });
       this.client = db;
+      if (config?.name) {
+         this.name = config.name;
+      }
+      if (config?.supports) {
+         for (const [key, value] of Object.entries(config.supports)) {
+            if (value) {
+               this.supported[key] = value;
+            }
+         }
+      }
    }
 }

app/src/data/connection/sqlite/LibsqlConnection.spec.ts

@@ -2,10 +2,11 @@ import { connectionTestSuite } from "../connection-test-suite";
 import { LibsqlConnection } from "./LibsqlConnection";
 import { bunTestRunner } from "adapter/bun/test";
 import { describe } from "bun:test";
+import { createClient } from "@libsql/client";
 
 describe("LibsqlConnection", () => {
    connectionTestSuite(bunTestRunner, {
-      makeConnection: () => new LibsqlConnection({ url: ":memory:" }),
+      makeConnection: () => new LibsqlConnection(createClient({ url: ":memory:" })),
       rawDialectDetails: ["rowsAffected", "lastInsertRowid"],
    });
 });

app/src/data/connection/sqlite/LibsqlConnection.ts

@@ -1,15 +1,29 @@
-import { createClient, type Client, type Config, type InStatement } from "@libsql/client";
+import type { Client, Config, InStatement } from "@libsql/client";
+import { createClient } from "libsql-stateless-easy";
 import { LibsqlDialect } from "@libsql/kysely-libsql";
-import { $console } from "core";
 import { FilterNumericKeysPlugin } from "data/plugins/FilterNumericKeysPlugin";
-import type { ConnQuery, ConnQueryResults } from "../Connection";
-import { SqliteConnection } from "./SqliteConnection";
+import { type ConnQuery, type ConnQueryResults, SqliteConnection } from "bknd/data";
 
 export const LIBSQL_PROTOCOLS = ["wss", "https", "libsql"] as const;
 export type LibSqlCredentials = Config & {
    protocol?: (typeof LIBSQL_PROTOCOLS)[number];
 };
 
+function getClient(clientOrCredentials: Client | LibSqlCredentials): Client {
+   if (clientOrCredentials && "url" in clientOrCredentials) {
+      let { url, authToken, protocol } = clientOrCredentials;
+      if (protocol && LIBSQL_PROTOCOLS.includes(protocol)) {
+         console.info("changing protocol to", protocol);
+         const [, rest] = url.split("://");
+         url = `${protocol}://${rest}`;
+      }
+
+      return createClient({ url, authToken });
+   }
+
+   return clientOrCredentials as Client;
+}
+
 export class LibsqlConnection extends SqliteConnection<Client> {
    override name = "libsql";
    protected override readonly supported = {
@@ -17,22 +31,8 @@ export class LibsqlConnection extends SqliteConnection<Client> {
       softscans: true,
    };
 
-   constructor(client: Client);
-   constructor(credentials: LibSqlCredentials);
    constructor(clientOrCredentials: Client | LibSqlCredentials) {
-      let client: Client;
-      if (clientOrCredentials && "url" in clientOrCredentials) {
-         let { url, authToken, protocol } = clientOrCredentials;
-         if (protocol && LIBSQL_PROTOCOLS.includes(protocol)) {
-            $console.log("changing protocol to", protocol);
-            const [, rest] = url.split("://");
-            url = `${protocol}://${rest}`;
-         }
-
-         client = createClient({ url, authToken });
-      } else {
-         client = clientOrCredentials;
-      }
+      const client = getClient(clientOrCredentials);
 
       super({
          excludeTables: ["libsql_wasm_func_table"],
@@ -56,3 +56,7 @@ export class LibsqlConnection extends SqliteConnection<Client> {
       return this.withTransformedRows(await this.client.batch(stms)) as any;
    }
 }
+
+export function libsql(credentials: LibSqlCredentials): LibsqlConnection {
+   return new LibsqlConnection(credentials);
+}

app/src/data/entities/index.ts

@@ -4,3 +4,5 @@ export * from "./mutation/Mutator";
 export * from "./query/Repository";
 export * from "./query/WhereBuilder";
 export * from "./query/WithBuilder";
+export * from "./query/RepositoryResult";
+export * from "./mutation/MutatorResult";

app/src/data/entities/mutation/MutatorResult.ts

@@ -19,7 +19,7 @@ export class MutatorResult<T = EntityData[]> extends Result<T> {
          hydrator: (rows) => em.hydrate(entity.name, rows as any),
          beforeExecute: (compiled) => {
             if (!options?.silent) {
-               $console.debug(`[Mutation]\n${compiled.sql}\n`, compiled.parameters);
+               $console.debug(`[Mutation]\n${compiled.sql}\n`);
             }
          },
          onError: (error) => {

app/src/data/schema/SchemaManager.ts

@@ -333,7 +333,7 @@ export class SchemaManager {
 
             if (config.force) {
                try {
-                  $console.log("[SchemaManager]", sql);
+                  $console.debug("[SchemaManager]", sql);
                   await qb.execute();
                } catch (e) {
                   throw new Error(`Failed to execute query: ${sql}: ${(e as any).message}`);

app/src/media/api/MediaController.ts

@@ -216,7 +216,9 @@ export class MediaController extends Controller {
             const paths_to_delete: string[] = [];
             if (max_items) {
                const { overwrite } = c.req.valid("query");
-               const { count } = await this.media.em.repository(media_entity).count(mediaRef);
+               const {
+                  data: { count },
+               } = await this.media.em.repository(media_entity).count(mediaRef);
 
                // if there are more than or equal to max items
                if (count >= max_items) {
@@ -255,7 +257,9 @@ export class MediaController extends Controller {
             }
 
             // check if entity exists in database
-            const { exists } = await this.media.em.repository(entity).exists({ id: entity_id });
+            const {
+               data: { exists },
+            } = await this.media.em.repository(entity).exists({ id: entity_id });
             if (!exists) {
                return c.json(
                   { error: `Entity "${entity_name}" with ID "${entity_id}" doesn't exist found` },

app/src/modules/ModuleManager.ts

@@ -11,16 +11,9 @@ import {
    stripMark,
    transformObject,
 } from "core/utils";
-import {
-   type Connection,
-   EntityManager,
-   type Schema,
-   datetime,
-   entity,
-   enumm,
-   jsonSchema,
-   number,
-} from "data";
+import type { Connection, Schema } from "data";
+import { EntityManager } from "data/entities/EntityManager";
+import * as proto from "data/prototype";
 import { TransformPersistFailedException } from "data/errors";
 import { Hono } from "hono";
 import type { Kysely } from "kysely";
@@ -116,12 +109,12 @@ const configJsonSchema = Type.Union([
       }),
    ),
 ]);
-export const __bknd = entity(TABLE_NAME, {
-   version: number().required(),
-   type: enumm({ enum: ["config", "diff", "backup"] }).required(),
-   json: jsonSchema({ schema: configJsonSchema }).required(),
-   created_at: datetime(),
-   updated_at: datetime(),
+export const __bknd = proto.entity(TABLE_NAME, {
+   version: proto.number().required(),
+   type: proto.enumm({ enum: ["config", "diff", "backup"] }).required(),
+   json: proto.jsonSchema({ schema: configJsonSchema }).required(),
+   created_at: proto.datetime(),
+   updated_at: proto.datetime(),
 });
 type ConfigTable2 = Schema<typeof __bknd>;
 interface T_INTERNAL_EM {
@@ -234,7 +227,8 @@ export class ModuleManager {
    }
 
    private get db() {
-      return this.connection.kysely as Kysely<{ table: ConfigTable }>;
+      // @todo: check why this is neccessary
+      return this.connection.kysely as unknown as Kysely<{ table: ConfigTable }>;
    }
 
    // @todo: add indices for: version, type

app/src/ui/client/api/use-entity.ts

@@ -1,7 +1,7 @@
 import type { DB, PrimaryFieldType } from "core";
 import { objectTransform } from "core/utils/objects";
 import { encodeSearch } from "core/utils/reqres";
-import type { EntityData, RepoQueryIn, RepositoryResponse } from "data";
+import type { EntityData, RepoQueryIn, RepositoryResult } from "data";
 import type { Insertable, Selectable, Updateable } from "kysely";
 import type { FetchPromise, ModuleApi, ResponseObject } from "modules/ModuleApi";
 import useSWR, { type SWRConfiguration, type SWRResponse, mutate } from "swr";
@@ -28,15 +28,13 @@ interface UseEntityReturn<
    Entity extends keyof DB | string,
    Id extends PrimaryFieldType | undefined,
    Data = Entity extends keyof DB ? DB[Entity] : EntityData,
-   Response = ResponseObject<RepositoryResponse<Selectable<Data>>>,
+   Response = ResponseObject<RepositoryResult<Selectable<Data>>>,
 > {
    create: (input: Insertable<Data>) => Promise<Response>;
    read: (
       query?: RepoQueryIn,
    ) => Promise<
-      ResponseObject<
-         RepositoryResponse<Id extends undefined ? Selectable<Data>[] : Selectable<Data>>
-      >
+      ResponseObject<RepositoryResult<Id extends undefined ? Selectable<Data>[] : Selectable<Data>>>
    >;
    update: Id extends undefined
       ? (input: Updateable<Data>, id: Id) => Promise<Response>

app/vite.dev.ts

@@ -3,30 +3,33 @@ import { serveStatic } from "@hono/node-server/serve-static";
 import { showRoutes } from "hono/dev";
 import { App, registries } from "./src";
 import { StorageLocalAdapter } from "./src/adapter/node";
-import { EntityManager, LibsqlConnection } from "data";
+import type { Connection } from "./src/data/connection/Connection";
 import { __bknd } from "modules/ModuleManager";
+import { nodeSqlite } from "./src/adapter/node/connection/NodeSqliteConnection";
+import { libsql } from "./src/data/connection/sqlite/LibsqlConnection";
 import { $console } from "core";
-//import { DatabaseSync } from "node:sqlite";
-//import { nodeSqlite } from "./src/adapter/node/connection/NodeSqliteConnection";
 
 registries.media.register("local", StorageLocalAdapter);
 
 const example = import.meta.env.VITE_EXAMPLE;
+const dbUrl = example ? `file:.configs/${example}.db` : import.meta.env.VITE_DB_URL;
 
-const credentials = example
-   ? {
-        url: `file:.configs/${example}.db`,
-     }
-   : import.meta.env.VITE_DB_URL
-     ? {
-          url: import.meta.env.VITE_DB_URL!,
-          authToken: import.meta.env.VITE_DB_TOKEN!,
-       }
-     : {
-          url: ":memory:",
-       };
+let connection: Connection;
+if (dbUrl) {
+   connection = nodeSqlite({ url: dbUrl });
+   $console.debug("Using node-sqlite connection", dbUrl);
+} else if (import.meta.env.VITE_DB_LIBSQL_URL) {
+   connection = libsql({
+      url: import.meta.env.VITE_DB_LIBSQL_URL!,
+      authToken: import.meta.env.VITE_DB_LIBSQL_TOKEN!,
+   });
+   $console.debug("Using libsql connection", import.meta.env.VITE_DB_URL);
+} else {
+   connection = nodeSqlite();
+   $console.debug("No connection provided, using in-memory database");
+}
 
-if (example) {
+/* if (example) {
    const { version, ...config } = JSON.parse(await readFile(`.configs/${example}.json`, "utf-8"));
 
    // create db with config
@@ -50,7 +53,7 @@ if (example) {
          json: config,
       });
    }
-}
+} */
 
 let app: App;
 const recreate = import.meta.env.VITE_APP_FRESH === "1";
@@ -60,8 +63,7 @@ export default {
    async fetch(request: Request) {
       if (!app || recreate) {
          app = App.create({
-            connection: credentials,
-            //connection: nodeSqlite({ database: new DatabaseSync(":memory:") }),
+            connection,
          });
          app.emgr.onEvent(
             App.Events.AppBuiltEvent,
@@ -78,15 +80,11 @@ export default {
          // log routes
          if (firstStart) {
             firstStart = false;
-            // biome-ignore lint/suspicious/noConsoleLog:
-            console.log("[DB]", credentials);
 
             if (import.meta.env.VITE_SHOW_ROUTES === "1") {
-               // biome-ignore lint/suspicious/noConsoleLog:
-               console.log("\n[APP ROUTES]");
+               console.info("\n[APP ROUTES]");
                showRoutes(app.server);
-               // biome-ignore lint/suspicious/noConsoleLog:
-               console.log("-------\n");
+               console.info("-------\n");
             }
          }
       }

app/vitest.config.ts

@@ -1,18 +1,26 @@
 import { defineConfig } from "vitest/config";
 import react from "@vitejs/plugin-react";
 import tsconfigPaths from "vite-tsconfig-paths";
-
+import path from "node:path";
 export default defineConfig({
-   plugins: [react(), tsconfigPaths()],
+   plugins: [tsconfigPaths()],
    test: {
-      globals: true,
-      environment: "jsdom",
-      setupFiles: ["./__test__/vitest/setup.ts"],
+      projects: ["**/*.vitest.config.ts"],
       include: ["**/*.vi-test.ts", "**/*.vitest.ts"],
-      coverage: {
-         provider: "v8",
-         reporter: ["text", "json", "html"],
-         exclude: ["node_modules/", "**/*.d.ts", "**/*.test.ts", "**/*.config.ts"],
-      },
    },
 });
+
+// export defineConfig({
+//    plugins: [tsconfigPaths()],
+//    test: {
+//       globals: true,
+//       environment: "jsdom",
+//       setupFiles: ["./__test__/vitest/setup.ts"],
+//       include: ["**/*.vi-test.ts", "**/*.vitest.ts"],
+//       coverage: {
+//          provider: "v8",
+//          reporter: ["text", "json", "html"],
+//          exclude: ["node_modules/", "**/*.d.ts", "**/*.test.ts", "**/*.config.ts"],
+//       },
+//    },
+// });

package.json

@@ -4,14 +4,7 @@
   "sideEffects": false,
   "type": "module",
   "scripts": {
-    "test": "ALL_TESTS=1 bun test --bail",
-    "test:coverage": "bun test --coverage",
-    "types": "bun run --filter './packages/**' types",
-    "build": "bun run clean:dist && bun run --cwd app build:all && bun build:packages",
-    "build:packages": "bun run --filter './packages/{cli,plasmic}' build",
-    "git:pre-commit": "bun run test",
     "updater": "bun x npm-check-updates -ui",
-    "clean:dist": "find packages -name 'dist' -type d -exec rm -rf {} +",
     "ci": "find . -name 'node_modules' -type d -exec rm -rf {} + && bun install",
     "npm:local": "verdaccio --config verdaccio.yml",
     "format": "bunx biome format --write ./app",
@@ -20,26 +13,15 @@
   "dependencies": {},
   "devDependencies": {
     "@biomejs/biome": "1.9.4",
-    "@clack/prompts": "^0.10.0",
     "@tsconfig/strictest": "^2.0.5",
     "@types/lodash-es": "^4.17.12",
     "bun-types": "^1.1.18",
-    "dotenv": "^16.4.5",
-    "esbuild": "^0.23.0",
-    "esbuild-plugin-tsc": "^0.4.0",
     "miniflare": "^3.20240806.0",
-    "mitata": "^0.1.11",
-    "picocolors": "^1.0.1",
-    "semver": "^7.6.2",
-    "sql-formatter": "^15.3.2",
-    "tsd": "^0.31.1",
-    "tsup": "^8.1.0",
     "typescript": "^5.5.3",
-    "verdaccio": "^5.32.1",
-    "wrangler": "^3.108.1"
+    "verdaccio": "^5.32.1"
   },
   "engines": {
-    "node": ">=20.0.0"
+    "node": ">=22"
   },
   "workspaces": ["app", "packages/*"]
 }