extended data canvas and init indices management

2026-08-02 08:06:00 +00:00 · 2025-05-03 17:58:58 +02:00
424 changed files with 7009 additions and 9655 deletions
@@ -12,15 +12,10 @@ 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:
-          bun-version: "1.2.19"
+          bun-version: "1.2.5"

      - name: Install dependencies
        working-directory: ./app
@@ -29,6 +29,4 @@ packages/media/.env
 .idea
 .vscode
 .git_old
-docker/tmp
-.debug
-.history
+docker/tmp
@@ -1 +0,0 @@
-22
@@ -1,4 +1,5 @@
 [![npm version](https://img.shields.io/npm/v/bknd.svg)](https://npmjs.org/package/bknd)
+[![npm downloads](https://img.shields.io/npm/dm/bknd)](https://www.npmjs.com/package/bknd)

 ![bknd](https://raw.githubusercontent.com/bknd-io/bknd/refs/heads/main/docs/_assets/poster.png)

@@ -9,30 +10,22 @@
 </p>

 bknd simplifies app development by providing a fully functional backend for database management, authentication, media and workflows. Being lightweight and built on Web Standards, it can be deployed nearly anywhere, including running inside your framework of choice. No more deploying multiple separate services!
-* **Runtimes**: Node.js 22+, Bun 1.0+, Deno, Browser, Cloudflare Workers/Pages, Vercel, Netlify, AWS Lambda, etc.
-* **Databases**:
-  * SQLite: LibSQL, Node SQLite, Bun SQLite, Cloudflare D1, Cloudflare Durable Objects SQLite, SQLocal
-  * Postgres: Vanilla Postgres, Supabase, Neon, Xata
-* **Frameworks**: React, Next.js, React Router, Astro, Vite, Waku
-* **Storage**: AWS S3, S3-compatible (Tigris, R2, Minio, etc.), Cloudflare R2 (binding), Cloudinary, Filesystem

 **For documentation and examples, please visit https://docs.bknd.io.**

 > [!WARNING]
-> This project requires Node.js 22 or higher (because of `node:sqlite`).
->
 > Please keep in mind that **bknd** is still under active development
 > and therefore full backward compatibility is not guaranteed before reaching v1.0.0.

 ## Size
-![gzipped size of bknd](https://img.shields.io/bundlejs/size/bknd?label=bknd)
+![gzipped size of bknd](https://img.badgesize.io/https://unpkg.com/bknd@latest/dist/index.js?compression=gzip&label=bknd)
 ![gzipped size of bknd/client](https://img.badgesize.io/https://unpkg.com/bknd@latest/dist/ui/client/index.js?compression=gzip&label=bknd/client)
 ![gzipped size of bknd/elements](https://img.badgesize.io/https://unpkg.com/bknd@latest/dist/ui/elements/index.js?compression=gzip&label=bknd/elements)
 ![gzipped size of bknd/ui](https://img.badgesize.io/https://unpkg.com/bknd@latest/dist/ui/index.js?compression=gzip&label=bknd/ui)

 The size on npm is misleading, as the `bknd` package includes the backend, the ui components as well as the whole backend bundled into the cli including static assets. 

-Depending on what you use, the size can be higher as additional dependencies are getting pulled in. The minimal size of a full `bknd` app as an API is around 300 kB gzipped (e.g. deployed as Cloudflare Worker).
+Depending on what you use, the size can be higher as additional dependencies are getting pulled in. The minimal size of a full `bknd` app as an API is around 212 kB gzipped (e.g. deployed as Cloudflare Worker).

 ## Motivation
 Creating digital products always requires developing both the backend (the logic) and the frontend (the appearance). Building a backend from scratch demands deep knowledge in areas such as authentication and database management. Using a backend framework can speed up initial development, but it still requires ongoing effort to work within its constraints (e.g., *"how to do X with Y?"*), which can quickly slow you down. Choosing a backend system is a tough decision, as you might not be aware of its limitations until you encounter them.
@@ -1,42 +0,0 @@
-# ===== DB Settings =====
-VITE_DB_URL=:memory:
-# you can set a location for a database here, it'll overwrite the previous setting
-# ideally use the ".db" folder (create it first), it's git ignored
-VITE_DB_URL=file:.db/dev.db
-
-# alternatively, you can use url/token combination
-#VITE_DB_URL=
-#VITE_DB_TOKEN=
-
-
-# ===== DEV Server =====
-# restart the dev server on every change (enable with "1")
-VITE_APP_FRESH=
-# displays react-scan widget (enable with "1")
-VITE_DEBUG_RERENDERS=
-# console logs registered routes on start (enable with "1")
-VITE_SHOW_ROUTES=
-
-
-# ===== Test Credentials =====
-RESEND_API_KEY=
-R2_TOKEN=
-
-R2_ACCESS_KEY=
-R2_SECRET_ACCESS_KEY=
-R2_URL=
-
-AWS_ACCESS_KEY=
-AWS_SECRET_KEY=
-AWS_S3_URL=
-
-OAUTH_CLIENT_ID=
-OAUTH_CLIENT_SECRET=
-
-PUBLIC_POSTHOG_KEY=
-PUBLIC_POSTHOG_HOST=
-
-# ===== Internals =====
-BKND_CLI_CREATE_REF=main
-BKND_CLI_LOG_LEVEL=debug
-BKND_MODULES_DEBUG=1
@@ -1,9 +1,6 @@
-import { afterEach, describe, test, expect } from "bun:test";
-import { App, createApp } from "core/test/utils";
+import { afterAll, afterEach, describe, expect, test } from "bun:test";
+import { App } from "../src";
 import { getDummyConnection } from "./helper";
-import { Hono } from "hono";
-import * as proto from "../src/data/prototype";
-import { pick } from "lodash-es";

 const { dummyConnection, afterAllCleanup } = getDummyConnection();
 afterEach(afterAllCleanup);
@@ -13,133 +10,18 @@ describe("App tests", async () => {
      const app = new App(dummyConnection);
      await app.build();

-      expect(await app.em.ping()).toBeTrue();
+      //expect(await app.data?.em.ping()).toBeTrue();
   });

-   test("plugins", async () => {
-      const called: string[] = [];
-      const app = createApp({
-         initialConfig: {
-            auth: {
-               enabled: true,
-            },
-         },
-         options: {
-            plugins: [
-               (app) => {
-                  expect(app).toBeDefined();
-                  expect(app).toBeInstanceOf(App);
-                  return {
-                     name: "test",
-                     schema: () => {
-                        called.push("schema");
-                        return proto.em(
-                           {
-                              posts: proto.entity("posts", {
-                                 title: proto.text(),
-                              }),
-                              comments: proto.entity("comments", {
-                                 content: proto.text(),
-                              }),
-                              users: proto.entity("users", {
-                                 email_verified: proto.boolean(),
-                              }),
-                           },
-                           (fn, s) => {
-                              fn.relation(s.comments).manyToOne(s.posts);
-                              fn.index(s.posts).on(["title"]);
-                           },
-                        );
-                     },
-                     onBoot: async () => {
-                        called.push("onBoot");
-                     },
-                     beforeBuild: async () => {
-                        called.push("beforeBuild");
-                     },
-                     onBuilt: async () => {
-                        called.push("onBuilt");
-                     },
-                     onServerInit: async (server) => {
-                        called.push("onServerInit");
-                        expect(server).toBeDefined();
-                        expect(server).toBeInstanceOf(Hono);
-                     },
-                     onFirstBoot: async () => {
-                        called.push("onFirstBoot");
-                     },
-                  };
-               },
-            ],
+   /*test.only("what", async () => {
+      const app = new App(dummyConnection, {
+         auth: {
+            enabled: true,
         },
      });
-
-      await app.build();
-
-      expect(app.em.entities.map((e) => e.name)).toEqual(["users", "posts", "comments"]);
-      expect(app.em.indices.map((i) => i.name)).toEqual([
-         "idx_unique_users_email",
-         "idx_users_strategy",
-         "idx_users_strategy_value",
-         "idx_posts_title",
-      ]);
-      expect(
-         app.em.relations.all.map((r) => pick(r.toJSON(), ["type", "source", "target"])),
-      ).toEqual([
-         {
-            type: "n:1",
-            source: "comments",
-            target: "posts",
-         },
-      ]);
-      expect(called).toEqual([
-         "onBoot",
-         "onServerInit",
-         "beforeBuild",
-         "onServerInit",
-         "schema",
-         "onFirstBoot",
-         "onBuilt",
-      ]);
-      expect(app.plugins.size).toBe(1);
-      expect(Array.from(app.plugins.keys())).toEqual(["test"]);
-   });
-
-   test.only("drivers", async () => {
-      const called: string[] = [];
-      const app = new App(dummyConnection, undefined, {
-         drivers: {
-            email: {
-               send: async (to, subject, body) => {
-                  called.push("email.send");
-                  return {
-                     id: "",
-                  };
-               },
-            },
-            cache: {
-               get: async (key) => {
-                  called.push("cache.get");
-                  return "";
-               },
-               set: async (key, value, ttl) => {
-                  called.push("cache.set");
-               },
-               del: async (key) => {
-                  called.push("cache.del");
-               },
-            },
-         },
-      });
-      await app.build();
-
-      expect(app.drivers.cache).toBeDefined();
-      expect(app.drivers.email).toBeDefined();
-      await app.drivers.email.send("", "", "");
-      await app.drivers.cache.get("");
-      await app.drivers.cache.set("", "", 0);
-      await app.drivers.cache.del("");
-
-      expect(called).toEqual(["email.send", "cache.get", "cache.set", "cache.del"]);
-   });
+      await app.module.auth.build();
+      await app.module.data.build();
+      console.log(app.em.entities.map((e) => e.name));
+      console.log(await app.em.schema().getDiff());
+   });*/
 });
@@ -1,2 +1 @@
-tmp/*
-!tmp/.gitkeep
+tmp/*
@@ -3,36 +3,21 @@ 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(omitKeys(adapter.makeConfig({}), ["connection"])).toEqual({});
-      expect(omitKeys(adapter.makeConfig({}, { env: { TEST: "test" } }), ["connection"])).toEqual(
-         {},
-      );
+      expect(adapter.makeConfig({})).toEqual({});
+      expect(adapter.makeConfig({}, { env: { TEST: "test" } })).toEqual({});

      // merges everything returned from `app` with the config
-      expect(
-         omitKeys(
-            adapter.makeConfig(
-               { app: (a) => ({ initialConfig: { server: { cors: { origin: a.env.TEST } } } }) },
-               { env: { TEST: "test" } },
-            ),
-            ["connection"],
-         ),
-      ).toEqual({
-         initialConfig: { server: { cors: { origin: "test" } } },
-      });
+      expect(adapter.makeConfig({ app: (a) => a as any }, { env: { TEST: "test" } })).toEqual({
+         env: { TEST: "test" },
+      } as any);
   });

-   /* it.only("...", async () => {
-      const app = await adapter.createAdapterApp();
-   }); */
-
   it("reuses apps correctly", async () => {
      const id = crypto.randomUUID();

@@ -1,12 +1,12 @@
 import { afterAll, beforeAll, describe, expect, it } from "bun:test";
-import { Guard } from "../../src/auth/authorize/Guard";
+import { Guard } from "../../src/auth";
+import { parse } from "../../src/core/utils";
 import { DataApi } from "../../src/data/api/DataApi";
 import { DataController } from "../../src/data/api/DataController";
 import { dataConfigSchema } from "../../src/data/data-schema";
 import * as proto from "../../src/data/prototype";
 import { schemaToEm } from "../helper";
 import { disableConsoleLog, enableConsoleLog } from "core/utils/test";
-import { parse } from "core/utils/schema";

 beforeAll(disableConsoleLog);
 afterAll(enableConsoleLog);
@@ -153,7 +153,7 @@ describe("DataApi", () => {
      const oneBy = api.readOneBy("posts", { where: { title: "baz" }, select: ["title"] });
      const oneByRes = await oneBy;
      expect(oneByRes.data).toEqual({ title: "baz" } as any);
-      expect(oneByRes.body.meta.items).toEqual(1);
+      expect(oneByRes.body.meta.count).toEqual(1);
   });

   it("exists/count", async () => {
@@ -202,7 +202,7 @@ describe("DataApi", () => {
      {
         // create many
         const res = await api.createMany("posts", payload);
-         expect(res.data?.length).toEqual(4);
+         expect(res.data.length).toEqual(4);
         expect(res.ok).toBeTrue();
      }

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

 describe("App", () => {
@@ -20,7 +20,6 @@ describe("App", () => {
                  "guard",
                  "flags",
                  "logger",
-                  "helper",
               ]);
            },
         },
@@ -1,37 +0,0 @@
-import { AppServer, serverConfigSchema } from "modules/server/AppServer";
-import { describe, test, expect } from "bun:test";
-
-describe("AppServer", () => {
-   test("config", () => {
-      {
-         const server = new AppServer();
-         expect(server).toBeDefined();
-         expect(server.config).toEqual({
-            cors: {
-               allow_credentials: true,
-               origin: "*",
-               allow_methods: ["GET", "POST", "PATCH", "PUT", "DELETE"],
-               allow_headers: ["Content-Type", "Content-Length", "Authorization", "Accept"],
-            },
-         });
-      }
-
-      {
-         const server = new AppServer({
-            cors: {
-               origin: "https",
-               allow_methods: ["GET", "POST"],
-            },
-         });
-         expect(server).toBeDefined();
-         expect(server.config).toEqual({
-            cors: {
-               allow_credentials: true,
-               origin: "https",
-               allow_methods: ["GET", "POST"],
-               allow_headers: ["Content-Type", "Content-Length", "Authorization", "Accept"],
-            },
-         });
-      }
-   });
-});
@@ -1,6 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { registries } from "../../src";
-import { createApp } from "core/test/utils";
+import { createApp, registries } from "../../src";
 import * as proto from "../../src/data/prototype";
 import { StorageLocalAdapter } from "adapter/node/storage/StorageLocalAdapter";

@@ -1,3 +1,46 @@
 import { describe, expect, test } from "bun:test";
+import { Authenticator, type User, type UserPool } from "../../src/auth";
+import { cookieConfig } from "../../src/auth/authenticate/Authenticator";
+import { PasswordStrategy } from "../../src/auth/authenticate/strategies/PasswordStrategy";
+import * as hash from "../../src/auth/utils/hash";
+import { Default, parse } from "../../src/core/utils";

-describe("Authenticator", async () => {});
+/*class MemoryUserPool implements UserPool {
+   constructor(private users: User[] = []) {}
+
+   async findBy(prop: "id" | "email" | "username", value: string | number) {
+      return this.users.find((user) => user[prop] === value);
+   }
+
+   async create(user: Pick<User, "email" | "password">) {
+      const id = this.users.length + 1;
+      const newUser = { ...user, id, username: user.email };
+      this.users.push(newUser);
+      return newUser;
+   }
+}*/
+
+describe("Authenticator", async () => {
+   test("cookie options", async () => {
+      console.log("parsed", parse(cookieConfig, undefined));
+      console.log(Default(cookieConfig, {}));
+   });
+   /*const userpool = new MemoryUserPool([
+      { id: 1, email: "d", username: "test", password: await hash.sha256("test") },
+   ]);
+
+   test("sha256 login", async () => {
+      const auth = new Authenticator(userpool, {
+         password: new PasswordStrategy({
+            hashing: "sha256",
+         }),
+      });
+
+      const { token } = await auth.login("password", { email: "d", password: "test" });
+      expect(token).toBeDefined();
+
+      const { iat, ...decoded } = decodeJwt<any>(token);
+      expect(decoded).toEqual({ id: 1, email: "d", username: "test" });
+      expect(await auth.verify(token)).toBe(true);
+   });*/
+});
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { Guard } from "../../../src/auth/authorize/Guard";
+import { Guard } from "../../../src/auth";

 describe("authorize", () => {
   test("basic", async () => {
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
-import { Registry } from "core/registry/Registry";
-import { s } from "core/utils/schema";
+import { type TObject, type TString, Type } from "@sinclair/typebox";
+import { Registry } from "core";

 type Constructor<T> = new (...args: any[]) => T;

@@ -11,7 +11,7 @@ class What {
      return null;
   }
   getType() {
-      return s.object({ type: s.string() });
+      return Type.Object({ type: Type.String() });
   }
 }
 class What2 extends What {}
@@ -19,7 +19,7 @@ class NotAllowed {}

 type Test1 = {
   cls: new (...args: any[]) => What;
-   schema: s.ObjectSchema<{ type: s.StringSchema }>;
+   schema: TObject<{ type: TString }>;
   enabled: boolean;
 };

@@ -28,7 +28,7 @@ describe("Registry", () => {
      const registry = new Registry<Test1>().set({
         first: {
            cls: What,
-            schema: s.object({ type: s.string(), what: s.string() }),
+            schema: Type.Object({ type: Type.String(), what: Type.String() }),
            enabled: true,
         },
      } satisfies Record<string, Test1>);
@@ -37,7 +37,7 @@ describe("Registry", () => {
      expect(item).toBeDefined();
      expect(item?.cls).toBe(What);

-      const second = s.object({ type: s.string(), what: s.string() });
+      const second = Type.Object({ type: Type.String(), what: Type.String() });
      registry.add("second", {
         cls: What2,
         schema: second,
@@ -46,7 +46,7 @@ describe("Registry", () => {
      // @ts-ignore
      expect(registry.get("second").schema).toEqual(second);

-      const third = s.object({ type: s.string({ default: "1" }), what22: s.string() });
+      const third = Type.Object({ type: Type.String({ default: "1" }), what22: Type.String() });
      registry.add("third", {
         // @ts-expect-error
         cls: NotAllowed,
@@ -56,7 +56,7 @@ describe("Registry", () => {
      // @ts-ignore
      expect(registry.get("third").schema).toEqual(third);

-      const fourth = s.object({ type: s.number(), what22: s.string() });
+      const fourth = Type.Object({ type: Type.Number(), what22: Type.String() });
      registry.add("fourth", {
         cls: What,
         // @ts-expect-error
@@ -81,8 +81,6 @@ describe("Registry", () => {
      registry.register("what2", What2);
      expect(registry.get("what2")).toBeDefined();
      expect(registry.get("what2").cls).toBe(What2);
-      expect(JSON.stringify(registry.get("what2").schema)).toEqual(
-         JSON.stringify(What2.prototype.getType()),
-      );
+      expect(registry.get("what2").schema).toEqual(What2.prototype.getType());
   });
 });
@@ -1,11 +1,11 @@
 import { describe, expect, test } from "bun:test";
-import { s } from "core/utils/schema";
-import { SchemaObject } from "core/object/SchemaObject";
+import { SchemaObject } from "../../../src/core";
+import { Type } from "@sinclair/typebox";

 describe("SchemaObject", async () => {
   test("basic", async () => {
      const m = new SchemaObject(
-         s.strictObject({ a: s.string({ default: "b" }) }),
+         Type.Object({ a: Type.String({ default: "b" }) }),
         { a: "test" },
         {
            forceParse: true,
@@ -23,19 +23,19 @@ describe("SchemaObject", async () => {

   test("patch", async () => {
      const m = new SchemaObject(
-         s.strictObject({
-            s: s.strictObject(
+         Type.Object({
+            s: Type.Object(
               {
-                  a: s.string({ default: "b" }),
-                  b: s.strictObject(
+                  a: Type.String({ default: "b" }),
+                  b: Type.Object(
                     {
-                        c: s.string({ default: "d" }),
-                        e: s.string({ default: "f" }),
+                        c: Type.String({ default: "d" }),
+                        e: Type.String({ default: "f" }),
                     },
                     { default: {} },
                  ),
               },
-               { default: {} },
+               { default: {}, additionalProperties: false },
            ),
         }),
      );
@@ -44,7 +44,7 @@ describe("SchemaObject", async () => {
      await m.patch("s.a", "c");

      // non-existing path on no additional properties
-      expect(m.patch("s.s.s", "c")).rejects.toThrow();
+      expect(() => m.patch("s.s.s", "c")).toThrow();
      // wrong type
      expect(() => m.patch("s.a", 1)).toThrow();

@@ -58,8 +58,8 @@ describe("SchemaObject", async () => {

   test("patch array", async () => {
      const m = new SchemaObject(
-         s.strictObject({
-            methods: s.array(s.string(), { default: ["GET", "PATCH"] }),
+         Type.Object({
+            methods: Type.Array(Type.String(), { default: ["GET", "PATCH"] }),
         }),
      );
      expect(m.get()).toEqual({ methods: ["GET", "PATCH"] });
@@ -75,13 +75,13 @@ describe("SchemaObject", async () => {

   test("remove", async () => {
      const m = new SchemaObject(
-         s.object({
-            s: s.object(
+         Type.Object({
+            s: Type.Object(
               {
-                  a: s.string({ default: "b" }),
-                  b: s.object(
+                  a: Type.String({ default: "b" }),
+                  b: Type.Object(
                     {
-                        c: s.string({ default: "d" }),
+                        c: Type.String({ default: "d" }),
                     },
                     { default: {} },
                  ),
@@ -107,8 +107,8 @@ describe("SchemaObject", async () => {

   test("set", async () => {
      const m = new SchemaObject(
-         s.strictObject({
-            methods: s.array(s.string(), { default: ["GET", "PATCH"] }),
+         Type.Object({
+            methods: Type.Array(Type.String(), { default: ["GET", "PATCH"] }),
         }),
      );
      expect(m.get()).toEqual({ methods: ["GET", "PATCH"] });
@@ -124,8 +124,8 @@ describe("SchemaObject", async () => {
      let called = false;
      let result: any;
      const m = new SchemaObject(
-         s.strictObject({
-            methods: s.array(s.string(), { default: ["GET", "PATCH"] }),
+         Type.Object({
+            methods: Type.Array(Type.String(), { default: ["GET", "PATCH"] }),
         }),
         undefined,
         {
@@ -145,8 +145,8 @@ describe("SchemaObject", async () => {
   test("listener: onBeforeUpdate", async () => {
      let called = false;
      const m = new SchemaObject(
-         s.strictObject({
-            methods: s.array(s.string(), { default: ["GET", "PATCH"] }),
+         Type.Object({
+            methods: Type.Array(Type.String(), { default: ["GET", "PATCH"] }),
         }),
         undefined,
         {
@@ -167,7 +167,7 @@ describe("SchemaObject", async () => {
   });

   test("throwIfRestricted", async () => {
-      const m = new SchemaObject(s.strictObject({}), undefined, {
+      const m = new SchemaObject(Type.Object({}), undefined, {
         restrictPaths: ["a.b"],
      });

@@ -179,13 +179,13 @@ describe("SchemaObject", async () => {

   test("restriction bypass", async () => {
      const m = new SchemaObject(
-         s.strictObject({
-            s: s.strictObject(
+         Type.Object({
+            s: Type.Object(
               {
-                  a: s.string({ default: "b" }),
-                  b: s.strictObject(
+                  a: Type.String({ default: "b" }),
+                  b: Type.Object(
                     {
-                        c: s.string({ default: "d" }),
+                        c: Type.String({ default: "d" }),
                     },
                     { default: {} },
                  ),
@@ -205,21 +205,7 @@ describe("SchemaObject", async () => {
      expect(m.get()).toEqual({ s: { a: "b", b: { c: "e" } } });
   });

-   const dataEntitiesSchema = s.strictObject({
-      entities: s.record(
-         s.object({
-            fields: s.record(
-               s.object({
-                  type: s.string(),
-                  config: s.object({}).optional(),
-               }),
-            ),
-            config: s.record(s.string()).optional(),
-         }),
-      ),
-   });
-
-   /* const dataEntitiesSchema = Type.Object(
+   const dataEntitiesSchema = Type.Object(
      {
         entities: Type.Object(
            {},
@@ -244,7 +230,7 @@ describe("SchemaObject", async () => {
      {
         additionalProperties: false,
      },
-   ); */
+   );
   test("patch safe object, overwrite", async () => {
      const data = {
         entities: {
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { type ObjectQuery, convert, validate } from "core/object/query/object-query";
+import { type ObjectQuery, convert, validate } from "../../../src/core/object/query/object-query";

 describe("object-query", () => {
   const q: ObjectQuery = { name: "Michael" };
@@ -1,16 +1,19 @@
 import { afterAll, beforeAll, describe, expect, test } from "bun:test";

-import { Guard } from "../../src/auth/authorize/Guard";
-import { parse } from "core/utils/schema";
-
+import { Guard } from "../../src/auth";
+import { parse } from "../../src/core/utils";
+import {
+   Entity,
+   type EntityData,
+   EntityManager,
+   ManyToOneRelation,
+   type MutatorResponse,
+   type RepositoryResponse,
+   TextField,
+} from "../../src/data";
 import { DataController } from "../../src/data/api/DataController";
 import { dataConfigSchema } from "../../src/data/data-schema";
 import { disableConsoleLog, enableConsoleLog, getDummyConnection } from "../helper";
-import type { RepositoryResultJSON } from "data/entities/query/RepositoryResult";
-import type { MutatorResultJSON } from "data/entities/mutation/MutatorResult";
-import { Entity, EntityManager, type EntityData } from "data/entities";
-import { TextField } from "data/fields";
-import { ManyToOneRelation } from "data/relations";

 const { dummyConnection, afterAllCleanup } = getDummyConnection();
 beforeAll(() => disableConsoleLog(["log", "warn"]));
@@ -18,6 +21,52 @@ afterAll(async () => (await afterAllCleanup()) && enableConsoleLog());

 const dataConfig = parse(dataConfigSchema, {});
 describe("[data] DataController", async () => {
+   test("repoResult", async () => {
+      const em = new EntityManager<any>([], dummyConnection);
+      const ctx: any = { em, guard: new Guard() };
+      const controller = new DataController(ctx, dataConfig);
+
+      const res = controller.repoResult({
+         entity: null as any,
+         data: [] as any,
+         sql: "",
+         parameters: [] as any,
+         result: [] as any,
+         meta: {
+            total: 0,
+            count: 0,
+            items: 0,
+         },
+      });
+
+      expect(res).toEqual({
+         meta: {
+            total: 0,
+            count: 0,
+            items: 0,
+         },
+         data: [],
+      });
+   });
+
+   test("mutatorResult", async () => {
+      const em = new EntityManager([], dummyConnection);
+      const ctx: any = { em, guard: new Guard() };
+      const controller = new DataController(ctx, dataConfig);
+
+      const res = controller.mutatorResult({
+         entity: null as any,
+         data: [] as any,
+         sql: "",
+         parameters: [] as any,
+         result: [] as any,
+      });
+
+      expect(res).toEqual({
+         data: [],
+      });
+   });
+
   describe("getController", async () => {
      const users = new Entity("users", [
         new TextField("name", { required: true }),
@@ -71,7 +120,8 @@ describe("[data] DataController", async () => {
               method: "POST",
               body: JSON.stringify(_user),
            });
-            const result = (await res.json()) as MutatorResultJSON;
+            //console.log("res", { _user }, res);
+            const result = (await res.json()) as MutatorResponse;
            const { id, ...data } = result.data as any;

            expect(res.status).toBe(201);
@@ -85,7 +135,7 @@ describe("[data] DataController", async () => {
               method: "POST",
               body: JSON.stringify(_post),
            });
-            const result = (await res.json()) as MutatorResultJSON;
+            const result = (await res.json()) as MutatorResponse;
            const { id, ...data } = result.data as any;

            expect(res.status).toBe(201);
@@ -96,13 +146,13 @@ describe("[data] DataController", async () => {

      test("/:entity (read many)", async () => {
         const res = await app.request("/entity/users");
-         const data = (await res.json()) as RepositoryResultJSON;
+         const data = (await res.json()) as RepositoryResponse;

-         //expect(data.meta.total).toBe(3);
-         //expect(data.meta.count).toBe(3);
+         expect(data.meta.total).toBe(3);
+         expect(data.meta.count).toBe(3);
         expect(data.meta.items).toBe(3);
         expect(data.data.length).toBe(3);
-         expect(data.data[0]?.name).toBe("foo");
+         expect(data.data[0].name).toBe("foo");
      });

      test("/:entity/query (func query)", async () => {
@@ -115,32 +165,33 @@ describe("[data] DataController", async () => {
               where: { bio: { $isnull: 1 } },
            }),
         });
-         const data = (await res.json()) as RepositoryResultJSON;
+         const data = (await res.json()) as RepositoryResponse;

-         //expect(data.meta.total).toBe(3);
-         //expect(data.meta.count).toBe(1);
+         expect(data.meta.total).toBe(3);
+         expect(data.meta.count).toBe(1);
         expect(data.meta.items).toBe(1);
         expect(data.data.length).toBe(1);
-         expect(data.data[0]?.name).toBe("bar");
+         expect(data.data[0].name).toBe("bar");
      });

      test("/:entity (read many, paginated)", async () => {
         const res = await app.request("/entity/users?limit=1&offset=2");
-         const data = (await res.json()) as RepositoryResultJSON;
+         const data = (await res.json()) as RepositoryResponse;

-         //expect(data.meta.total).toBe(3);
-         //expect(data.meta.count).toBe(3);
+         expect(data.meta.total).toBe(3);
+         expect(data.meta.count).toBe(3);
         expect(data.meta.items).toBe(1);
         expect(data.data.length).toBe(1);
-         expect(data.data[0]?.name).toBe("baz");
+         expect(data.data[0].name).toBe("baz");
      });

      test("/:entity/:id (read one)", async () => {
         const res = await app.request("/entity/users/3");
-         const data = (await res.json()) as RepositoryResultJSON<EntityData>;
+         const data = (await res.json()) as RepositoryResponse<EntityData>;
+         console.log("data", data);

-         //expect(data.meta.total).toBe(3);
-         //expect(data.meta.count).toBe(1);
+         expect(data.meta.total).toBe(3);
+         expect(data.meta.count).toBe(1);
         expect(data.meta.items).toBe(1);
         expect(data.data).toEqual({ id: 3, ...fixtures.users[2] });
      });
@@ -150,7 +201,7 @@ describe("[data] DataController", async () => {
            method: "PATCH",
            body: JSON.stringify({ name: "new name" }),
         });
-         const { data } = (await res.json()) as MutatorResultJSON;
+         const { data } = (await res.json()) as MutatorResponse;

         expect(res.ok).toBe(true);
         expect(data as any).toEqual({ id: 3, ...fixtures.users[2], name: "new name" });
@@ -158,26 +209,27 @@ describe("[data] DataController", async () => {

      test("/:entity/:id/:reference (read references)", async () => {
         const res = await app.request("/entity/users/1/posts");
-         const data = (await res.json()) as RepositoryResultJSON;
+         const data = (await res.json()) as RepositoryResponse;
+         console.log("data", data);

-         //expect(data.meta.total).toBe(2);
-         //expect(data.meta.count).toBe(1);
+         expect(data.meta.total).toBe(2);
+         expect(data.meta.count).toBe(1);
         expect(data.meta.items).toBe(1);
         expect(data.data.length).toBe(1);
-         expect(data.data[0]?.content).toBe("post 1");
+         expect(data.data[0].content).toBe("post 1");
      });

      test("/:entity/:id (delete one)", async () => {
         const res = await app.request("/entity/posts/2", {
            method: "DELETE",
         });
-         const { data } = (await res.json()) as RepositoryResultJSON<EntityData>;
+         const { data } = (await res.json()) as RepositoryResponse<EntityData>;
         expect(data).toEqual({ id: 2, ...fixtures.posts[1] });

         // verify
         const res2 = await app.request("/entity/posts");
-         const data2 = (await res2.json()) as RepositoryResultJSON;
-         //expect(data2.meta.total).toBe(1);
+         const data2 = (await res2.json()) as RepositoryResponse;
+         expect(data2.meta.total).toBe(1);
      });
   });
 });
@@ -1,18 +1,25 @@
-import { describe, test, expect } from "bun:test";
-import { getDummyConnection } from "../helper";
-import { WhereBuilder, type WhereQuery } from "data/entities/query/WhereBuilder";
+import { describe, expect, test } from "bun:test";
+import { Value, _jsonp } from "../../src/core/utils";
+import { type RepoQuery, WhereBuilder, type WhereQuery, querySchema } from "../../src/data";
+import type { RepoQueryIn } from "../../src/data/server/data-query-impl";
+import { getDummyConnection } from "./helper";

-function qb() {
-   const c = getDummyConnection();
-   const kysely = c.dummyConnection.kysely;
-   return kysely.selectFrom("t").selectAll();
-}
-function compile(q: WhereQuery) {
-   const { sql, parameters } = WhereBuilder.addClause(qb(), q).compile();
-   return { sql, parameters };
-}
+const decode = (input: RepoQueryIn, expected: RepoQuery) => {
+   const result = Value.Decode(querySchema, input);
+   expect(result).toEqual(expected);
+};
+
+describe("data-query-impl", () => {
+   function qb() {
+      const c = getDummyConnection();
+      const kysely = c.dummyConnection.kysely;
+      return kysely.selectFrom("t").selectAll();
+   }
+   function compile(q: WhereQuery) {
+      const { sql, parameters } = WhereBuilder.addClause(qb(), q).compile();
+      return { sql, parameters };
+   }

-describe("WhereBuilder", () => {
   test("single validation", () => {
      const tests: [WhereQuery, string, any[]][] = [
         [{ name: "Michael", age: 40 }, '("name" = ? and "age" = ?)', ["Michael", 40]],
@@ -87,4 +94,64 @@ describe("WhereBuilder", () => {
         expect(keys).toEqual(expectedKeys);
      }
   });
+
+   test("with", () => {
+      decode({ with: ["posts"] }, { with: { posts: {} } });
+      decode({ with: { posts: {} } }, { with: { posts: {} } });
+      decode({ with: { posts: { limit: 1 } } }, { with: { posts: { limit: 1 } } });
+      decode(
+         {
+            with: {
+               posts: {
+                  with: {
+                     images: {
+                        select: ["id"],
+                     },
+                  },
+               },
+            },
+         },
+         {
+            with: {
+               posts: {
+                  with: {
+                     images: {
+                        select: ["id"],
+                     },
+                  },
+               },
+            },
+         },
+      );
+
+      // over http
+      {
+         const output = { with: { images: {} } };
+         decode({ with: "images" }, output);
+         decode({ with: '["images"]' }, output);
+         decode({ with: ["images"] }, output);
+         decode({ with: { images: {} } }, output);
+      }
+
+      {
+         const output = { with: { images: {}, comments: {} } };
+         decode({ with: "images,comments" }, output);
+         decode({ with: ["images", "comments"] }, output);
+         decode({ with: '["images", "comments"]' }, output);
+         decode({ with: { images: {}, comments: {} } }, output);
+      }
+   });
+});
+
+describe("data-query-impl: Typebox", () => {
+   test("sort", async () => {
+      const _dflt = { sort: { by: "id", dir: "asc" } };
+
+      decode({ sort: "" }, _dflt);
+      decode({ sort: "name" }, { sort: { by: "name", dir: "asc" } });
+      decode({ sort: "-name" }, { sort: { by: "name", dir: "desc" } });
+      decode({ sort: "-posts.name" }, { sort: { by: "posts.name", dir: "desc" } });
+      decode({ sort: "-1name" }, _dflt);
+      decode({ sort: { by: "name", dir: "desc" } }, { sort: { by: "name", dir: "desc" } });
+   });
 });
@@ -1,6 +1,12 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { Entity, EntityManager } from "data/entities";
-import { TextField, PrimaryField, NumberField } from "data/fields";
+import {
+   Entity,
+   EntityManager,
+   NumberField,
+   PrimaryField,
+   Repository,
+   TextField,
+} from "../../src/data";
 import { getDummyConnection } from "./helper";

 const { dummyConnection, afterAllCleanup } = getDummyConnection();
@@ -28,12 +34,19 @@ describe("some tests", async () => {

   test("findId", async () => {
      const query = await em.repository(users).findId(1);
+      /*const { result, total, count, time } = query;
+      console.log("query", query.result, {
+         result,
+         total,
+         count,
+         time,
+      });*/

      expect(query.sql).toBe(
         'select "users"."id" as "id", "users"."username" as "username", "users"."email" as "email" from "users" where "id" = ? limit ?',
      );
      expect(query.parameters).toEqual([1, 1]);
-      expect(query.data).toBeUndefined();
+      expect(query.result).toEqual([]);
   });

   test("findMany", async () => {
@@ -43,7 +56,7 @@ describe("some tests", async () => {
         'select "users"."id" as "id", "users"."username" as "username", "users"."email" as "email" from "users" order by "users"."id" asc limit ? offset ?',
      );
      expect(query.parameters).toEqual([10, 0]);
-      expect(query.data).toEqual([]);
+      expect(query.result).toEqual([]);
   });

   test("findMany with number", async () => {
@@ -53,7 +66,7 @@ describe("some tests", async () => {
         'select "posts"."id" as "id", "posts"."title" as "title", "posts"."content" as "content", "posts"."created_at" as "created_at", "posts"."likes" as "likes" from "posts" order by "posts"."id" asc limit ? offset ?',
      );
      expect(query.parameters).toEqual([10, 0]);
-      expect(query.data).toEqual([]);
+      expect(query.result).toEqual([]);
   });

   test("try adding an existing field name", async () => {
@@ -97,18 +110,4 @@ describe("some tests", async () => {
         new EntityManager([entity, entity2], connection);
      }).toThrow();
   });
-
-   test("primary uuid", async () => {
-      const entity = new Entity("users", [
-         new PrimaryField("id", { format: "uuid" }),
-         new TextField("username"),
-      ]);
-      const em = new EntityManager([entity], getDummyConnection().dummyConnection);
-      await em.schema().sync({ force: true });
-
-      const mutator = em.mutator(entity);
-      const data = await mutator.insertOne({ username: "test" });
-      expect(data.data.id).toBeDefined();
-      expect(data.data.id).toBeString();
-   });
 });
@@ -2,7 +2,7 @@ import { unlink } from "node:fs/promises";
 import type { SqliteDatabase } from "kysely";
 // @ts-ignore
 import Database from "libsql";
-import { SqliteLocalConnection } from "data/connection/sqlite/SqliteLocalConnection";
+import { SqliteLocalConnection } from "../../src/data";

 export function getDummyDatabase(memory: boolean = true): {
   dummyDb: SqliteDatabase;
@@ -1,10 +1,13 @@
 // eslint-disable-next-line import/no-unresolved
 import { afterAll, describe, expect, test } from "bun:test";
-import { Entity } from "data/entities";
-import { EntityManager } from "data/entities/EntityManager";
-import { ManyToOneRelation } from "data/relations";
-import { NumberField, TextField } from "data/fields";
-import { SchemaManager } from "data/schema/SchemaManager";
+import {
+   Entity,
+   EntityManager,
+   ManyToOneRelation,
+   NumberField,
+   SchemaManager,
+   TextField,
+} from "../../src/data";
 import { getDummyConnection } from "./helper";

 const { dummyConnection, afterAllCleanup } = getDummyConnection();
@@ -1,8 +1,7 @@
 // eslint-disable-next-line import/no-unresolved
 import { afterAll, describe, expect, test } from "bun:test";
-import { Entity, EntityManager } from "data/entities";
-import { NumberField, TextField } from "data/fields";
-import { TransformPersistFailedException } from "data/errors";
+import { Entity, EntityManager, Mutator, NumberField, TextField } from "../../src/data";
+import { TransformPersistFailedException } from "../../src/data/errors";
 import { getDummyConnection } from "./helper";

 const { dummyConnection, afterAllCleanup } = getDummyConnection();
@@ -46,7 +45,7 @@ describe("Mutator simple", async () => {
         },
      });

-      expect(query.data).toEqual([{ id: 1, label: "test", count: 1 }]);
+      expect(query.result).toEqual([{ id: 1, label: "test", count: 1 }]);
   });

   test("update inserted row", async () => {
@@ -88,7 +87,7 @@ describe("Mutator simple", async () => {
      expect(mutation.data).toEqual({ id, label: "new label", count: 100 });

      const query2 = await em.repository(items).findId(id);
-      expect(query2.data).toBeUndefined();
+      expect(query2.result.length).toBe(0);
   });

   test("validation: insert incomplete row", async () => {
@@ -178,13 +177,13 @@ describe("Mutator simple", async () => {
   });

   test("insertMany", async () => {
-      const oldCount = (await em.repo(items).count()).data.count;
+      const oldCount = (await em.repo(items).count()).count;
      const inserts = [{ label: "insert 1" }, { label: "insert 2" }];
      const { data } = await em.mutator(items).insertMany(inserts);

      expect(data.length).toBe(2);
      expect(data.map((d) => ({ label: d.label }))).toEqual(inserts);
-      const newCount = (await em.repo(items).count()).data.count;
+      const newCount = (await em.repo(items).count()).count;
      expect(newCount).toBe(oldCount + inserts.length);

      const { data: data2 } = await em.repo(items).findMany({ offset: oldCount });
@@ -1,8 +1,6 @@
 import { afterAll, expect as bunExpect, describe, test } from "bun:test";
-import { stripMark } from "core/utils/schema";
-import { Entity, EntityManager } from "data/entities";
-import { TextField } from "data/fields";
-import { PolymorphicRelation } from "data/relations";
+import { stripMark } from "../../src/core/utils";
+import { Entity, EntityManager, PolymorphicRelation, TextField } from "../../src/data";
 import { getDummyConnection } from "./helper";

 const { dummyConnection, afterAllCleanup } = getDummyConnection();
@@ -2,20 +2,19 @@ import { describe, expect, test } from "bun:test";
 import {
   BooleanField,
   DateField,
+   Entity,
+   EntityIndex,
+   EntityManager,
   EnumField,
   JsonField,
-   NumberField,
-   TextField,
-   EntityIndex,
-} from "data/fields";
-import { Entity, EntityManager } from "data/entities";
-import {
   ManyToManyRelation,
   ManyToOneRelation,
+   NumberField,
   OneToOneRelation,
   PolymorphicRelation,
-} from "data/relations";
-import { DummyConnection } from "data/connection/DummyConnection";
+   TextField,
+} from "../../src/data";
+import { DummyConnection } from "../../src/data/connection/DummyConnection";
 import {
   FieldPrototype,
   type FieldSchema,
@@ -33,8 +32,8 @@ import {
   number,
   relation,
   text,
-} from "data/prototype";
-import { MediaField } from "media/MediaField";
+} from "../../src/data/prototype";
+import { MediaField } from "../../src/media/MediaField";

 describe("prototype", () => {
   test("...", () => {
@@ -102,8 +101,7 @@ describe("prototype", () => {

      type Posts = Schema<typeof posts2>;

-      // @todo: check
-      //expect(posts1.toJSON()).toEqual(posts2.toJSON());
+      expect(posts1.toJSON()).toEqual(posts2.toJSON());
   });

   test("test example", async () => {
@@ -297,9 +295,9 @@ describe("prototype", () => {
         new Entity("posts", [new TextField("name"), new TextField("slug", { required: true })]),
         new Entity("comments", [new TextField("some")]),
         new Entity("users", [new TextField("email")]),
-      ] as const;
+      ];
      const _em2 = new EntityManager(
-         [...es],
+         es,
         new DummyConnection(),
         [new ManyToOneRelation(es[0], es[1]), new ManyToOneRelation(es[0], es[2])],
         [
@@ -1,14 +1,13 @@
 // eslint-disable-next-line import/no-unresolved
 import { afterAll, describe, expect, test } from "bun:test";
-import { Entity, EntityManager } from "data/entities";
-import { TextField } from "data/fields";
+import { Entity, EntityManager, TextField } from "../../src/data";
 import {
   ManyToManyRelation,
   ManyToOneRelation,
   OneToOneRelation,
   PolymorphicRelation,
   RelationField,
-} from "data/relations";
+} from "../../src/data/relations";
 import { getDummyConnection } from "./helper";

 const { dummyConnection, afterAllCleanup } = getDummyConnection();
@@ -78,7 +77,7 @@ describe("Relations", async () => {
      const em = new EntityManager(entities, dummyConnection, relations);

      // verify naming
-      const rel = em.relations.all[0]!;
+      const rel = em.relations.all[0];
      expect(rel.source.entity.name).toBe(posts.name);
      expect(rel.source.reference).toBe(posts.name);
      expect(rel.target.entity.name).toBe(users.name);
@@ -90,11 +89,11 @@ describe("Relations", async () => {
      // verify low level relation
      expect(em.relationsOf(users.name).length).toBe(1);
      expect(em.relationsOf(users.name).length).toBe(1);
-      expect(em.relationsOf(users.name)[0]!.source.entity).toBe(posts);
+      expect(em.relationsOf(users.name)[0].source.entity).toBe(posts);
      expect(posts.field("author_id")).toBeInstanceOf(RelationField);
      expect(em.relationsOf(users.name).length).toBe(1);
      expect(em.relationsOf(users.name).length).toBe(1);
-      expect(em.relationsOf(users.name)[0]!.source.entity).toBe(posts);
+      expect(em.relationsOf(users.name)[0].source.entity).toBe(posts);

      // verify high level relation (from users)
      const userPostsRel = em.relationOf(users.name, "posts");
@@ -192,7 +191,7 @@ describe("Relations", async () => {
      const em = new EntityManager(entities, dummyConnection, relations);

      // verify naming
-      const rel = em.relations.all[0]!;
+      const rel = em.relations.all[0];
      expect(rel.source.entity.name).toBe(users.name);
      expect(rel.source.reference).toBe(users.name);
      expect(rel.target.entity.name).toBe(settings.name);
@@ -203,8 +202,8 @@ describe("Relations", async () => {

      expect(em.relationsOf(users.name).length).toBe(1);
      expect(em.relationsOf(users.name).length).toBe(1);
-      expect(em.relationsOf(users.name)[0]!.source.entity).toBe(users);
-      expect(em.relationsOf(users.name)[0]!.target.entity).toBe(settings);
+      expect(em.relationsOf(users.name)[0].source.entity).toBe(users);
+      expect(em.relationsOf(users.name)[0].target.entity).toBe(settings);

      // verify high level relation (from users)
      const userSettingRel = em.relationOf(users.name, settings.name);
@@ -324,7 +323,7 @@ describe("Relations", async () => {
      );

      // mutation info
-      expect(relations[0]!.helper(posts.name)!.getMutationInfo()).toEqual({
+      expect(relations[0].helper(posts.name)!.getMutationInfo()).toEqual({
         reference: "categories",
         local_field: undefined,
         $set: false,
@@ -335,7 +334,7 @@ describe("Relations", async () => {
         cardinality: undefined,
         relation_type: "m:n",
      });
-      expect(relations[0]!.helper(categories.name)!.getMutationInfo()).toEqual({
+      expect(relations[0].helper(categories.name)!.getMutationInfo()).toEqual({
         reference: "posts",
         local_field: undefined,
         $set: false,
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
-import { Entity } from "data/entities";
-import { NumberField, TextField } from "data/fields";
+import { Entity, NumberField, TextField } from "data";
+import * as p from "data/prototype";

 describe("[data] Entity", async () => {
   const entity = new Entity("test", [
@@ -1,8 +1,12 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { Entity, EntityManager } from "data/entities";
-import { ManyToManyRelation, ManyToOneRelation } from "data/relations";
-import { SchemaManager } from "data/schema/SchemaManager";
-import { UnableToConnectException } from "data/errors";
+import {
+   Entity,
+   EntityManager,
+   ManyToManyRelation,
+   ManyToOneRelation,
+   SchemaManager,
+} from "../../../src/data";
+import { UnableToConnectException } from "../../../src/data/errors";
 import { getDummyConnection } from "../helper";

 const { dummyConnection, afterAllCleanup } = getDummyConnection();
@@ -1,8 +1,6 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { Entity, EntityManager } from "data/entities";
-import { ManyToOneRelation } from "data/relations";
-import { TextField } from "data/fields";
-import { JoinBuilder } from "data/entities/query/JoinBuilder";
+import { Entity, EntityManager, ManyToOneRelation, TextField } from "../../../src/data";
+import { JoinBuilder } from "../../../src/data/entities/query/JoinBuilder";
 import { getDummyConnection } from "../helper";

 const { dummyConnection, afterAllCleanup } = getDummyConnection();
@@ -1,23 +1,22 @@
-import { afterAll, beforeAll, describe, expect, test } from "bun:test";
+import { afterAll, describe, expect, test } from "bun:test";
 import type { EventManager } from "../../../src/core/events";
-import { Entity, EntityManager } from "data/entities";
 import {
+   Entity,
+   EntityManager,
   ManyToOneRelation,
+   MutatorEvents,
+   NumberField,
   OneToOneRelation,
-   RelationField,
+   type RelationField,
   RelationMutator,
-} from "data/relations";
-import { NumberField, TextField } from "data/fields";
-import * as proto from "data/prototype";
-import { getDummyConnection, disableConsoleLog, enableConsoleLog } from "../../helper";
-import { MutatorEvents } from "data/events";
+   TextField,
+} from "../../../src/data";
+import * as proto from "../../../src/data/prototype";
+import { getDummyConnection } from "../helper";

 const { dummyConnection, afterAllCleanup } = getDummyConnection();
 afterAll(afterAllCleanup);

-beforeAll(() => disableConsoleLog(["log", "warn"]));
-afterAll(async () => (await afterAllCleanup()) && enableConsoleLog());
-
 describe("[data] Mutator (base)", async () => {
   const entity = new Entity("items", [
      new TextField("label", { required: true }),
@@ -1,10 +1,17 @@
 import { afterAll, describe, expect, test } from "bun:test";
 import type { Kysely, Transaction } from "kysely";
-import { TextField } from "data/fields";
-import { em as $em, entity as $entity, text as $text } from "data/prototype";
-import { Entity, EntityManager } from "data/entities";
-import { ManyToOneRelation } from "data/relations";
-import { RepositoryEvents } from "data/events";
+import { Perf } from "core/utils";
+import {
+   Entity,
+   EntityManager,
+   LibsqlConnection,
+   ManyToOneRelation,
+   RepositoryEvents,
+   TextField,
+   entity as $entity,
+   text as $text,
+   em as $em,
+} from "data";
 import { getDummyConnection } from "../helper";

 type E = Kysely<any> | Transaction<any>;
@@ -19,6 +26,120 @@ async function sleep(ms: number) {
 }

 describe("[Repository]", async () => {
+   test.skip("bulk", async () => {
+      //const connection = dummyConnection;
+      //const connection = getLocalLibsqlConnection();
+      const credentials = null as any; // @todo: determine what to do here
+      const connection = new LibsqlConnection(credentials);
+
+      const em = new EntityManager([], connection);
+      /*const emLibsql = new EntityManager([], {
+         url: connection.url.replace("https", "libsql"),
+         authToken: connection.authToken,
+      });*/
+      const table = "posts";
+
+      const client = connection.getClient();
+      if (!client) {
+         console.log("Cannot perform test without libsql connection");
+         return;
+      }
+
+      const conn = em.connection.kysely;
+      const selectQ = (e: E) => e.selectFrom(table).selectAll().limit(2);
+      const countQ = (e: E) => e.selectFrom(table).select(e.fn.count("*").as("count"));
+
+      async function executeTransaction(em: EntityManager<any>) {
+         return await em.connection.kysely.transaction().execute(async (e) => {
+            const res = await selectQ(e).execute();
+            const count = await countQ(e).execute();
+
+            return [res, count];
+         });
+      }
+
+      async function executeBatch(em: EntityManager<any>) {
+         const queries = [selectQ(conn), countQ(conn)];
+         return await em.connection.batchQuery(queries);
+      }
+
+      async function executeSingleKysely(em: EntityManager<any>) {
+         const res = await selectQ(conn).execute();
+         const count = await countQ(conn).execute();
+         return [res, count];
+      }
+
+      async function executeSingleClient(em: EntityManager<any>) {
+         const q1 = selectQ(conn).compile();
+         const res = await client.execute({
+            sql: q1.sql,
+            args: q1.parameters as any,
+         });
+
+         const q2 = countQ(conn).compile();
+         const count = await client.execute({
+            sql: q2.sql,
+            args: q2.parameters as any,
+         });
+         return [res, count];
+      }
+
+      const transaction = await executeTransaction(em);
+      const batch = await executeBatch(em);
+
+      expect(batch).toEqual(transaction as any);
+
+      const testperf = false;
+      if (testperf) {
+         const times = 5;
+
+         const exec = async (
+            name: string,
+            fn: (em: EntityManager<any>) => Promise<any>,
+            em: EntityManager<any>,
+         ) => {
+            const res = await Perf.execute(() => fn(em), times);
+            await sleep(1000);
+            const info = {
+               name,
+               total: res.total.toFixed(2),
+               avg: (res.total / times).toFixed(2),
+               first: res.marks[0].time.toFixed(2),
+               last: res.marks[res.marks.length - 1].time.toFixed(2),
+            };
+            console.log(info.name, info, res.marks);
+            return info;
+         };
+
+         const data: any[] = [];
+         data.push(await exec("transaction.http", executeTransaction, em));
+         data.push(await exec("bulk.http", executeBatch, em));
+         data.push(await exec("singleKy.http", executeSingleKysely, em));
+         data.push(await exec("singleCl.http", executeSingleClient, em));
+
+         /*data.push(await exec("transaction.libsql", executeTransaction, emLibsql));
+         data.push(await exec("bulk.libsql", executeBatch, emLibsql));
+         data.push(await exec("singleKy.libsql", executeSingleKysely, emLibsql));
+         data.push(await exec("singleCl.libsql", executeSingleClient, emLibsql));*/
+
+         console.table(data);
+         /**
+          * ┌───┬────────────────────┬────────┬────────┬────────┬────────┐
+          * │   │ name               │ total  │ avg    │ first  │ last   │
+          * ├───┼────────────────────┼────────┼────────┼────────┼────────┤
+          * │ 0 │ transaction.http   │ 681.29 │ 136.26 │ 136.46 │ 396.09 │
+          * │ 1 │ bulk.http          │ 164.82 │ 32.96  │ 32.95  │ 99.91  │
+          * │ 2 │ singleKy.http      │ 330.01 │ 66.00  │ 65.86  │ 195.41 │
+          * │ 3 │ singleCl.http      │ 326.17 │ 65.23  │ 61.32  │ 198.08 │
+          * │ 4 │ transaction.libsql │ 856.79 │ 171.36 │ 132.31 │ 595.24 │
+          * │ 5 │ bulk.libsql        │ 180.63 │ 36.13  │ 35.39  │ 107.71 │
+          * │ 6 │ singleKy.libsql    │ 347.11 │ 69.42  │ 65.00  │ 207.14 │
+          * │ 7 │ singleCl.libsql    │ 328.60 │ 65.72  │ 62.19  │ 195.04 │
+          * └───┴────────────────────┴────────┴────────┴────────┴────────┘
+          */
+      }
+   });
+
   test("count & exists", async () => {
      const items = new Entity("items", [new TextField("label")]);
      const em = new EntityManager([items], dummyConnection);
@@ -39,44 +160,25 @@ describe("[Repository]", async () => {
      // count all
      const res = await em.repository(items).count();
      expect(res.sql).toBe('select count(*) as "count" from "items"');
-      expect(res.data.count).toBe(3);
-
-      //
-      {
-         const res = await em.repository(items).findMany();
-         expect(res.count).toBe(3);
-      }
-
-      {
-         const res = await em
-            .repository(items, {
-               includeCounts: true,
-            })
-            .findMany();
-         expect(res.count).toBe(3);
-      }
+      expect(res.count).toBe(3);

      // count filtered
-      const res2 = await em
-         .repository(items, {
-            includeCounts: true,
-         })
-         .count({ label: { $in: ["a", "b"] } });
+      const res2 = await em.repository(items).count({ label: { $in: ["a", "b"] } });

      expect(res2.sql).toBe('select count(*) as "count" from "items" where "label" in (?, ?)');
      expect(res2.parameters).toEqual(["a", "b"]);
-      expect(res2.data.count).toBe(2);
+      expect(res2.count).toBe(2);

      // check exists
      const res3 = await em.repository(items).exists({ label: "a" });
-      expect(res3.data.exists).toBe(true);
+      expect(res3.exists).toBe(true);

      const res4 = await em.repository(items).exists({ label: "d" });
-      expect(res4.data.exists).toBe(false);
+      expect(res4.exists).toBe(false);

      // for now, allow empty filter
      const res5 = await em.repository(items).exists({});
-      expect(res5.data.exists).toBe(true);
+      expect(res5.exists).toBe(true);
   });

   test("option: silent", async () => {
@@ -89,9 +191,6 @@ describe("[Repository]", async () => {
      // should throw because table doesn't exist
      expect(em.repo("items").findMany({})).rejects.toThrow(/no such table/);
      // should silently return empty result
-      em.repo("items", { silent: true })
-         .findMany({})
-         .then((r) => r.data);
      expect(
         em
            .repo("items", { silent: true })
@@ -110,16 +209,16 @@ describe("[Repository]", async () => {

      expect(
         em
-            .repo("items", { includeCounts: true })
+            .repo("items")
            .findMany({})
-            .then((r) => [r.count, r.total]),
+            .then((r) => [r.meta.count, r.meta.total]),
      ).resolves.toEqual([0, 0]);

      expect(
         em
            .repo("items", { includeCounts: false })
            .findMany({})
-            .then((r) => [r.count, r.total]),
+            .then((r) => [r.meta.count, r.meta.total]),
      ).resolves.toEqual([undefined, undefined]);
   });
 });
@@ -1,9 +1,7 @@
 // eslint-disable-next-line import/no-unresolved
 import { afterAll, describe, expect, test } from "bun:test";
-import { randomString } from "core/utils";
-import { Entity, EntityManager } from "data/entities";
-import { TextField, EntityIndex } from "data/fields";
-import { SchemaManager } from "data/schema/SchemaManager";
+import { randomString } from "../../../src/core/utils";
+import { Entity, EntityIndex, EntityManager, SchemaManager, TextField } from "../../../src/data";
 import { getDummyConnection } from "../helper";

 const { dummyConnection, afterAllCleanup } = getDummyConnection();
@@ -1,9 +1,14 @@
 import { describe, expect, test } from "bun:test";
-import { Entity, EntityManager } from "data/entities";
-import { ManyToManyRelation, ManyToOneRelation, PolymorphicRelation } from "data/relations";
-import { TextField } from "data/fields";
-import * as proto from "data/prototype";
-import { WithBuilder } from "data/entities/query/WithBuilder";
+import {
+   Entity,
+   EntityManager,
+   ManyToManyRelation,
+   ManyToOneRelation,
+   PolymorphicRelation,
+   TextField,
+   WithBuilder,
+} from "../../../src/data";
+import * as proto from "../../../src/data/prototype";
 import { schemaToEm } from "../../helper";
 import { getDummyConnection } from "../helper";

@@ -84,9 +89,9 @@ describe("[data] WithBuilder", async () => {
      const res2 = qb2.compile();

      expect(res2.sql).toBe(
-         'select (select json_object(\'id\', "obj"."id", \'username\', "obj"."username") from (select "users"."id" as "id", "users"."username" as "username" from "users" as "author" where "author"."id" = "posts"."author_id" order by "users"."id" asc limit ?) as obj) as "author" from "posts"',
+         'select (select json_object(\'id\', "obj"."id", \'username\', "obj"."username") from (select "users"."id" as "id", "users"."username" as "username" from "users" as "author" where "author"."id" = "posts"."author_id" order by "users"."id" asc limit ? offset ?) as obj) as "author" from "posts"',
      );
-      expect(res2.parameters).toEqual([1]);
+      expect(res2.parameters).toEqual([1, 0]);
   });

   test("test with empty join", async () => {
@@ -189,9 +194,9 @@ describe("[data] WithBuilder", async () => {
      );
      const res = qb.compile();
      expect(res.sql).toBe(
-         'select (select json_object(\'id\', "obj"."id", \'path\', "obj"."path") from (select "media"."id" as "id", "media"."path" as "path" from "media" where "media"."reference" = ? and "categories"."id" = "media"."entity_id" order by "media"."id" asc limit ?) as obj) as "single" from "categories"',
+         'select (select json_object(\'id\', "obj"."id", \'path\', "obj"."path") from (select "media"."id" as "id", "media"."path" as "path" from "media" where "media"."reference" = ? and "categories"."id" = "media"."entity_id" order by "media"."id" asc limit ? offset ?) as obj) as "single" from "categories"',
      );
-      expect(res.parameters).toEqual(["categories.single", 1]);
+      expect(res.parameters).toEqual(["categories.single", 1, 0]);

      const qb2 = WithBuilder.addClause(
         em,
@@ -268,9 +273,9 @@ describe("[data] WithBuilder", async () => {

         //prettyPrintQb(qb);
         expect(qb.compile().sql).toBe(
-            'select (select json_object(\'id\', "obj"."id", \'username\', "obj"."username", \'avatar\', "obj"."avatar") from (select "users"."id" as "id", "users"."username" as "username", (select json_object(\'id\', "obj"."id", \'path\', "obj"."path") from (select "media"."id" as "id", "media"."path" as "path" from "media" where "media"."reference" = ? and "users"."id" = "media"."entity_id" order by "media"."id" asc limit ?) as obj) as "avatar" from "users" as "users" where "users"."id" = "posts"."users_id" order by "users"."username" asc limit ?) as obj) as "users" from "posts"',
+            'select (select json_object(\'id\', "obj"."id", \'username\', "obj"."username", \'avatar\', "obj"."avatar") from (select "users"."id" as "id", "users"."username" as "username", (select json_object(\'id\', "obj"."id", \'path\', "obj"."path") from (select "media"."id" as "id", "media"."path" as "path" from "media" where "media"."reference" = ? and "users"."id" = "media"."entity_id" order by "media"."id" asc limit ? offset ?) as obj) as "avatar" from "users" as "users" where "users"."id" = "posts"."users_id" order by "users"."username" asc limit ? offset ?) as obj) as "users" from "posts"',
         );
-         expect(qb.compile().parameters).toEqual(["users.avatar", 1, 1]);
+         expect(qb.compile().parameters).toEqual(["users.avatar", 1, 0, 1, 0]);
      });

      test("compiles with many", async () => {
@@ -310,9 +315,9 @@ describe("[data] WithBuilder", async () => {
         );

         expect(qb.compile().sql).toBe(
-            'select (select coalesce(json_group_array(json_object(\'id\', "agg"."id", \'posts_id\', "agg"."posts_id", \'users_id\', "agg"."users_id", \'users\', "agg"."users")), \'[]\') from (select "comments"."id" as "id", "comments"."posts_id" as "posts_id", "comments"."users_id" as "users_id", (select json_object(\'username\', "obj"."username") from (select "users"."username" as "username" from "users" as "users" where "users"."id" = "comments"."users_id" order by "users"."id" asc limit ?) as obj) as "users" from "comments" as "comments" where "comments"."posts_id" = "posts"."id" order by "comments"."id" asc limit ? offset ?) as agg) as "comments" from "posts"',
+            'select (select coalesce(json_group_array(json_object(\'id\', "agg"."id", \'posts_id\', "agg"."posts_id", \'users_id\', "agg"."users_id", \'users\', "agg"."users")), \'[]\') from (select "comments"."id" as "id", "comments"."posts_id" as "posts_id", "comments"."users_id" as "users_id", (select json_object(\'username\', "obj"."username") from (select "users"."username" as "username" from "users" as "users" where "users"."id" = "comments"."users_id" order by "users"."id" asc limit ? offset ?) as obj) as "users" from "comments" as "comments" where "comments"."posts_id" = "posts"."id" order by "comments"."id" asc limit ? offset ?) as agg) as "comments" from "posts"',
         );
-         expect(qb.compile().parameters).toEqual([1, 12, 0]);
+         expect(qb.compile().parameters).toEqual([1, 0, 12, 0]);
      });

      test("returns correct result", async () => {
@@ -1,5 +1,5 @@
 import { afterAll, describe, expect, test } from "bun:test";
-import { EntityManager } from "data/entities/EntityManager";
+import { EntityManager } from "../../../../src/data";
 import { getDummyConnection } from "../../helper";

 const { dummyConnection, afterAllCleanup } = getDummyConnection();
@@ -1,10 +1,9 @@
-import { bunTestRunner } from "adapter/bun/test";
 import { describe, expect, test } from "bun:test";
-import { BooleanField } from "data/fields";
+import { BooleanField } from "../../../../src/data";
 import { fieldTestSuite, transformPersist } from "data/fields/field-test-suite";

 describe("[data] BooleanField", async () => {
-   fieldTestSuite(bunTestRunner, BooleanField, { defaultValue: true, schemaType: "boolean" });
+   fieldTestSuite({ expect, test }, BooleanField, { defaultValue: true, schemaType: "boolean" });

   test("transformRetrieve", async () => {
      const field = new BooleanField("test");
@@ -1,15 +1,9 @@
-import { describe, test } from "bun:test";
-import { DateField } from "data/fields";
+import { describe, expect, test } from "bun:test";
+import { DateField } from "../../../../src/data";
 import { fieldTestSuite } from "data/fields/field-test-suite";
-import { bunTestRunner } from "adapter/bun/test";

 describe("[data] DateField", async () => {
-   fieldTestSuite(
-      bunTestRunner,
-      DateField,
-      { defaultValue: new Date(), schemaType: "date" },
-      { type: "date" },
-   );
+   fieldTestSuite({ expect, test }, DateField, { defaultValue: new Date(), schemaType: "date" });

   // @todo: add datefield tests
   test("week", async () => {
@@ -1,6 +1,5 @@
-import { bunTestRunner } from "adapter/bun/test";
 import { describe, expect, test } from "bun:test";
-import { EnumField } from "data/fields";
+import { EnumField } from "../../../../src/data";
 import { fieldTestSuite, transformPersist } from "data/fields/field-test-suite";

 function options(strings: string[]) {
@@ -9,7 +8,7 @@ function options(strings: string[]) {

 describe("[data] EnumField", async () => {
   fieldTestSuite(
-      bunTestRunner,
+      { expect, test },
      // @ts-ignore
      EnumField,
      { defaultValue: "a", schemaType: "text" },
@@ -1,8 +1,7 @@
 import { describe, expect, test } from "bun:test";
+import { Default, stripMark } from "../../../../src/core/utils";
 import { baseFieldConfigSchema, Field } from "../../../../src/data/fields/Field";
 import { fieldTestSuite } from "data/fields/field-test-suite";
-import { bunTestRunner } from "adapter/bun/test";
-import { stripMark } from "core/utils/schema";

 describe("[data] Field", async () => {
   class FieldSpec extends Field {
@@ -20,10 +19,10 @@ describe("[data] Field", async () => {
      });
   });

-   fieldTestSuite(bunTestRunner, FieldSpec, { defaultValue: "test", schemaType: "text" });
+   fieldTestSuite({ expect, test }, FieldSpec, { defaultValue: "test", schemaType: "text" });

   test("default config", async () => {
-      const config = baseFieldConfigSchema.template({});
+      const config = Default(baseFieldConfigSchema, {});
      expect(stripMark(new FieldSpec("test").config)).toEqual(config as any);
   });

@@ -1,11 +1,10 @@
 import { describe, expect, test } from "bun:test";
-import { Entity } from "data/entities";
-import { Field, EntityIndex } from "data/fields";
-import { s } from "core/utils/schema";
+import { Type } from "@sinclair/typebox";
+import { Entity, EntityIndex, Field } from "../../../../src/data";

 class TestField extends Field {
   protected getSchema(): any {
-      return s.any();
+      return Type.Any();
   }

   override schema() {
@@ -1,11 +1,10 @@
-import { bunTestRunner } from "adapter/bun/test";
 import { describe, expect, test } from "bun:test";
-import { JsonField } from "data/fields";
+import { JsonField } from "../../../../src/data";
 import { fieldTestSuite, transformPersist } from "data/fields/field-test-suite";

 describe("[data] JsonField", async () => {
   const field = new JsonField("test");
-   fieldTestSuite(bunTestRunner, JsonField, {
+   fieldTestSuite({ expect, test }, JsonField, {
      defaultValue: { a: 1 },
      sampleValues: ["string", { test: 1 }, 1],
      schemaType: "text",
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { JsonSchemaField } from "data/fields";
+import { JsonSchemaField } from "../../../../src/data";
 import { fieldTestSuite } from "data/fields/field-test-suite";

 describe("[data] JsonSchemaField", async () => {
@@ -1,6 +1,5 @@
-import { bunTestRunner } from "adapter/bun/test";
 import { describe, expect, test } from "bun:test";
-import { NumberField } from "data/fields";
+import { NumberField } from "../../../../src/data";
 import { fieldTestSuite, transformPersist } from "data/fields/field-test-suite";

 describe("[data] NumberField", async () => {
@@ -16,5 +15,5 @@ describe("[data] NumberField", async () => {
      expect(transformPersist(field2, 10000)).resolves.toBe(10000);
   });

-   fieldTestSuite(bunTestRunner, NumberField, { defaultValue: 12, schemaType: "integer" });
+   fieldTestSuite({ expect, test }, NumberField, { defaultValue: 12, schemaType: "integer" });
 });
@@ -1,5 +1,5 @@
 import { describe, expect, test } from "bun:test";
-import { PrimaryField } from "data/fields";
+import { PrimaryField } from "../../../../src/data";

 describe("[data] PrimaryField", async () => {
   const field = new PrimaryField("primary");
@@ -39,28 +39,4 @@ describe("[data] PrimaryField", async () => {
      expect(field.transformPersist(1)).rejects.toThrow();
      expect(field.transformRetrieve(1)).toBe(1);
   });
-
-   test("format", () => {
-      const uuid = new PrimaryField("uuid", { format: "uuid" });
-      expect(uuid.format).toBe("uuid");
-      expect(uuid.fieldType).toBe("text");
-      expect(uuid.getNewValue()).toBeString();
-      expect(uuid.toType()).toEqual({
-         required: true,
-         comment: undefined,
-         type: "Generated<string>",
-         import: [{ package: "kysely", name: "Generated" }],
-      });
-
-      const integer = new PrimaryField("integer", { format: "integer" });
-      expect(integer.format).toBe("integer");
-      expect(integer.fieldType).toBe("integer");
-      expect(integer.getNewValue()).toBeUndefined();
-      expect(integer.toType()).toEqual({
-         required: true,
-         comment: undefined,
-         type: "Generated<number>",
-         import: [{ package: "kysely", name: "Generated" }],
-      });
-   });
 });
@@ -1,7 +1,6 @@
 import { describe, expect, test } from "bun:test";
-import { TextField } from "data/fields";
+import { TextField } from "../../../../src/data";
 import { fieldTestSuite, transformPersist } from "data/fields/field-test-suite";
-import { bunTestRunner } from "adapter/bun/test";

 describe("[data] TextField", async () => {
   test("transformPersist (config)", async () => {
@@ -12,5 +11,5 @@ describe("[data] TextField", async () => {
      expect(transformPersist(field, "abc")).resolves.toBe("abc");
   });

-   fieldTestSuite(bunTestRunner, TextField, { defaultValue: "abc", schemaType: "text" });
+   fieldTestSuite({ expect, test }, TextField, { defaultValue: "abc", schemaType: "text" });
 });
@@ -1,11 +1,11 @@
 import { describe, expect, it, test } from "bun:test";
-import { Entity, type EntityManager } from "data/entities";
+import { Entity, type EntityManager } from "../../../../src/data";
 import {
   type BaseRelationConfig,
   EntityRelation,
   EntityRelationAnchor,
   RelationTypes,
-} from "data/relations";
+} from "../../../../src/data/relations";

 class TestEntityRelation extends EntityRelation {
   constructor(config?: BaseRelationConfig) {
@@ -24,11 +24,11 @@ class TestEntityRelation extends EntityRelation {
      return this;
   }

-   buildWith(): any {
+   buildWith(a: any, b: any, c: any): any {
      return;
   }

-   buildJoin(): any {
+   buildJoin(a: any, b: any): any {
      return;
   }
 }
@@ -41,7 +41,7 @@ beforeAll(() =>
 );
 afterAll(unmockFetch);

-describe.skip("FetchTask", async () => {
+describe("FetchTask", async () => {
   test("Simple fetch", async () => {
      const task = new FetchTask("Fetch Something", {
         url: "https://jsonplaceholder.typicode.com/todos/1",
@@ -1,6 +1,6 @@
 import { describe, expect, test } from "bun:test";
 import { Flow, LogTask, SubFlowTask, RenderTask, Task } from "../../src/flows";
-import { s } from "core/utils/schema";
+import { Type } from "@sinclair/typebox";

 export class StringifyTask<Output extends string> extends Task<
   typeof StringifyTask.schema,
@@ -8,16 +8,18 @@ export class StringifyTask<Output extends string> extends Task<
 > {
   type = "stringify";

-   static override schema = s.object({
-      input: s.string().optional(),
-   });
+   static override schema = Type.Optional(
+      Type.Object({
+         input: Type.Optional(Type.String()),
+      }),
+   );

   async execute() {
      return JSON.stringify(this.params.input) as Output;
   }
 }

-describe.skip("SubFlowTask", async () => {
+describe("SubFlowTask", async () => {
   test("Simple Subflow", async () => {
      const subTask = new RenderTask("render", {
         render: "subflow",
@@ -1,12 +1,12 @@
 import { describe, expect, test } from "bun:test";
+import { Type } from "@sinclair/typebox";
 import { Task } from "../../src/flows";
 import { dynamic } from "../../src/flows/tasks/Task";
-import { s } from "core/utils/schema";

-describe.skip("Task", async () => {
+describe("Task", async () => {
   test("resolveParams: template with parse", async () => {
      const result = await Task.resolveParams(
-         s.object({ test: dynamic(s.number()) }),
+         Type.Object({ test: dynamic(Type.Number()) }),
         {
            test: "{{ some.path }}",
         },
@@ -22,7 +22,7 @@ describe.skip("Task", async () => {

   test("resolveParams: with string", async () => {
      const result = await Task.resolveParams(
-         s.object({ test: s.string() }),
+         Type.Object({ test: Type.String() }),
         {
            test: "{{ some.path }}",
         },
@@ -38,7 +38,7 @@ describe.skip("Task", async () => {

   test("resolveParams: with object", async () => {
      const result = await Task.resolveParams(
-         s.object({ test: dynamic(s.object({ key: s.string(), value: s.string() })) }),
+         Type.Object({ test: dynamic(Type.Object({ key: Type.String(), value: Type.String() })) }),
         {
            test: { key: "path", value: "{{ some.path }}" },
         },
@@ -1,7 +1,8 @@
 import { describe, expect, test } from "bun:test";
 import { Hono } from "hono";
 import { Event, EventManager } from "../../src/core/events";
-import { s, parse } from "core/utils/schema";
+import { parse } from "../../src/core/utils";
+import { type Static, type StaticDecode, Type } from "@sinclair/typebox";
 import { EventTrigger, Flow, HttpTrigger, type InputsMap, Task } from "../../src/flows";
 import { dynamic } from "../../src/flows/tasks/Task";

@@ -14,15 +15,15 @@ class Passthrough extends Task {
   }
 }

-type OutputIn = s.Static<typeof OutputParamTask.schema>;
-type OutputOut = s.StaticCoerced<typeof OutputParamTask.schema>;
+type OutputIn = Static<typeof OutputParamTask.schema>;
+type OutputOut = StaticDecode<typeof OutputParamTask.schema>;

 class OutputParamTask extends Task<typeof OutputParamTask.schema> {
   type = "output-param";

-   static override schema = s.strictObject({
+   static override schema = Type.Object({
      number: dynamic(
-         s.number({
+         Type.Number({
            title: "Output number",
         }),
         Number.parseInt,
@@ -43,7 +44,7 @@ class PassthroughFlowInput extends Task {
   }
 }

-describe.skip("Flow task inputs", async () => {
+describe("Flow task inputs", async () => {
   test("types", async () => {
      const schema = OutputParamTask.schema;

@@ -30,7 +30,7 @@ class ExecTask extends Task {
   }
 }

-describe.skip("Flow trigger", async () => {
+describe("Flow trigger", async () => {
   test("manual trigger", async () => {
      let called = false;

@@ -2,7 +2,7 @@
 import { describe, expect, test } from "bun:test";
 import { isEqual } from "lodash-es";
 import { _jsonp, withDisabledConsole } from "../../src/core/utils";
-import { s } from "core/utils/schema";
+import { type Static, Type } from "@sinclair/typebox";
 import { Condition, ExecutionEvent, FetchTask, Flow, LogTask, Task } from "../../src/flows";

 /*beforeAll(disableConsoleLog);
@@ -11,19 +11,19 @@ afterAll(enableConsoleLog);*/
 class ExecTask extends Task<typeof ExecTask.schema> {
   type = "exec";

-   static override schema = s.object({
-      delay: s.number({ default: 10 }),
+   static override schema = Type.Object({
+      delay: Type.Number({ default: 10 }),
   });

   constructor(
      name: string,
-      params: s.Static<typeof ExecTask.schema>,
+      params: Static<typeof ExecTask.schema>,
      private func: () => Promise<any>,
   ) {
      super(name, params);
   }

-   override clone(name: string, params: s.Static<typeof ExecTask.schema>) {
+   override clone(name: string, params: Static<typeof ExecTask.schema>) {
      return new ExecTask(name, params, this.func);
   }

@@ -78,7 +78,7 @@ function getObjectDiff(obj1, obj2) {
   return diff;
 }

-describe.skip("Flow tests", async () => {
+describe("Flow tests", async () => {
   test("Simple single task", async () => {
      const simple = getTask(0);

@@ -2,12 +2,11 @@ import { unlink } from "node:fs/promises";
 import type { SelectQueryBuilder, SqliteDatabase } from "kysely";
 import Database from "libsql";
 import { format as sqlFormat } from "sql-formatter";
+import { type Connection, EntityManager, SqliteLocalConnection } from "../src/data";
 import type { em as protoEm } from "../src/data/prototype";
 import { writeFile } from "node:fs/promises";
 import { join } from "node:path";
 import { slugify } from "core/utils/strings";
-import { type Connection, SqliteLocalConnection } from "data/connection";
-import { EntityManager } from "data/entities/EntityManager";

 export function getDummyDatabase(memory: boolean = true): {
   dummyDb: SqliteDatabase;
@@ -39,15 +38,14 @@ export function getLocalLibsqlConnection() {
   return { url: "http://127.0.0.1:8080" };
 }

-type ConsoleSeverity = "debug" | "log" | "warn" | "error";
+type ConsoleSeverity = "log" | "warn" | "error";
 const _oldConsoles = {
-   debug: console.debug,
   log: console.log,
   warn: console.warn,
   error: console.error,
 };

-export function disableConsoleLog(severities: ConsoleSeverity[] = ["debug", "log", "warn"]) {
+export function disableConsoleLog(severities: ConsoleSeverity[] = ["log", "warn"]) {
   severities.forEach((severity) => {
      console[severity] = () => null;
   });
@@ -1,5 +1,5 @@
 import { describe, expect, it } from "bun:test";
-import { createApp } from "core/test/utils";
+import { createApp } from "../../src";
 import { Api } from "../../src/Api";

 describe("integration config", () => {
@@ -13,8 +13,9 @@ describe("integration config", () => {

      // create entity
      await api.system.addConfig("data", "entities.posts", {
+         name: "posts",
         config: { sort_field: "id", sort_dir: "asc" },
-         fields: { id: { type: "primary" }, asdf: { type: "text" } },
+         fields: { id: { type: "primary", name: "id" }, asdf: { type: "text" } },
         type: "regular",
      });

@@ -1,8 +1,7 @@
 /// <reference types="@types/bun" />

 import { afterAll, beforeAll, describe, expect, test } from "bun:test";
-import { registries } from "../../src";
-import { createApp } from "core/test/utils";
+import { createApp, registries } from "../../src";
 import { mergeObject, randomString } from "../../src/core/utils";
 import type { TAppMediaConfig } from "../../src/media/media-schema";
 import { StorageLocalAdapter } from "adapter/node/storage/StorageLocalAdapter";
@@ -44,7 +43,7 @@ beforeAll(disableConsoleLog);
 afterAll(enableConsoleLog);

 describe("MediaController", () => {
-   test("accepts direct", async () => {
+   test.only("accepts direct", async () => {
      const app = await makeApp();

      const file = Bun.file(path);
@@ -54,6 +53,7 @@ describe("MediaController", () => {
         body: file,
      });
      const result = (await res.json()) as any;
+      console.log(result);
      expect(result.name).toBe(name);

      const destFile = Bun.file(assetsTmpPath + "/" + name);
@@ -1,7 +1,7 @@
 import { describe, expect, test } from "bun:test";
 import { type FileBody, Storage } from "../../src/media/storage/Storage";
 import * as StorageEvents from "../../src/media/storage/events";
-import { StorageAdapter } from "media/storage/StorageAdapter";
+import { StorageAdapter } from "media";

 class TestAdapter extends StorageAdapter {
   files: Record<string, FileBody> = {};
@@ -1,18 +1,13 @@
 import { afterAll, beforeAll, beforeEach, describe, expect, spyOn, test } from "bun:test";
-import { createApp } from "core/test/utils";
+import { createApp } from "../../src";
 import { AuthController } from "../../src/auth/api/AuthController";
-import { em, entity, make, text } from "data/prototype";
-import { AppAuth, type ModuleBuildContext } from "modules";
+import { em, entity, make, text } from "../../src/data";
+import { AppAuth, type ModuleBuildContext } from "../../src/modules";
 import { disableConsoleLog, enableConsoleLog } from "../helper";
+// @ts-ignore
 import { makeCtx, moduleTestSuite } from "./module-test-suite";

 describe("AppAuth", () => {
-   test.only("...", () => {
-      const auth = new AppAuth({});
-      console.log(auth.toJSON());
-      console.log(auth.config);
-   });
-
   moduleTestSuite(AppAuth);

   let ctx: ModuleBuildContext;
@@ -158,7 +153,6 @@ describe("AppAuth", () => {
      });

      await app.build();
-      app.registerAdminController();
      const spy = spyOn(app.module.auth.authenticator, "requestCookieRefresh");

      // register custom route
@@ -168,10 +162,6 @@ describe("AppAuth", () => {
      await app.server.request("/api/system/ping");
      await app.server.request("/test");

-      expect(spy.mock.calls.length).toBe(0);
-
-      // admin route
-      await app.server.request("/");
      expect(spy.mock.calls.length).toBe(1);
   });

@@ -1,5 +1,5 @@
 import { beforeEach, describe, expect, test } from "bun:test";
-import { parse } from "core/utils/schema";
+import { parse } from "../../src/core/utils";
 import { fieldsSchema } from "../../src/data/data-schema";
 import { AppData, type ModuleBuildContext } from "../../src/modules";
 import { makeCtx, moduleTestSuite } from "./module-test-suite";
@@ -1,17 +1,11 @@
 import { describe, expect, test } from "bun:test";
-import { createApp } from "core/test/utils";
-import { em, entity, text } from "data/prototype";
-import { registries } from "modules/registries";
+import { createApp, registries } from "../../src";
+import { em, entity, text } from "../../src/data";
 import { StorageLocalAdapter } from "adapter/node/storage/StorageLocalAdapter";
-import { AppMedia } from "../../src/media/AppMedia";
+import { AppMedia } from "../../src/modules";
 import { moduleTestSuite } from "./module-test-suite";

 describe("AppMedia", () => {
-   test.only("...", () => {
-      const media = new AppMedia();
-      console.log(media.toJSON());
-   });
-
   moduleTestSuite(AppMedia);

   test("should allow additional fields", async () => {
@@ -1,13 +1,12 @@
 import { describe, expect, test } from "bun:test";
-import { s, stripMark } from "core/utils/schema";
-import { em, entity, index, text } from "data/prototype";
-import { EntityManager } from "data/entities/EntityManager";
+import { stripMark } from "../../src/core/utils";
+import { type TSchema, Type } from "@sinclair/typebox";
+import { EntityManager, em, entity, index, text } from "../../src/data";
 import { DummyConnection } from "../../src/data/connection/DummyConnection";
 import { Module } from "../../src/modules/Module";
-import { ModuleHelper } from "modules/ModuleHelper";

-function createModule<Schema extends s.Schema>(schema: Schema) {
-   return class TestModule extends Module<Schema> {
+function createModule<Schema extends TSchema>(schema: Schema) {
+   class TestModule extends Module<typeof schema> {
      getSchema() {
         return schema;
      }
@@ -17,7 +16,9 @@ function createModule<Schema extends s.Schema>(schema: Schema) {
      override useForceParse() {
         return true;
      }
-   };
+   }
+
+   return TestModule;
 }

 describe("Module", async () => {
@@ -25,7 +26,7 @@ describe("Module", async () => {
      test("listener", async () => {
         let result: any;

-         const module = createModule(s.object({ a: s.string() }));
+         const module = createModule(Type.Object({ a: Type.String() }));
         const m = new module({ a: "test" });

         await m.schema().set({ a: "test2" });
@@ -41,13 +42,13 @@ describe("Module", async () => {
   describe("db schema", () => {
      class M extends Module {
         override getSchema() {
-            return s.object({});
+            return Type.Object({});
         }

         prt = {
-            ensureEntity: this.ctx.helper.ensureEntity.bind(this.ctx.helper),
-            ensureIndex: this.ctx.helper.ensureIndex.bind(this.ctx.helper),
-            ensureSchema: this.ctx.helper.ensureSchema.bind(this.ctx.helper),
+            ensureEntity: this.ensureEntity.bind(this),
+            ensureIndex: this.ensureIndex.bind(this),
+            ensureSchema: this.ensureSchema.bind(this),
         };

         get em() {
@@ -62,11 +63,7 @@ describe("Module", async () => {
            _em.relations,
            _em.indices,
         );
-         const ctx = {
-            em,
-            flags: Module.ctx_flags,
-         };
-         return new M({} as any, { ...ctx, helper: new ModuleHelper(ctx as any) } as any);
+         return new M({} as any, { em, flags: Module.ctx_flags } as any);
      }
      function flat(_em: EntityManager) {
         return {
@@ -146,9 +143,14 @@ describe("Module", async () => {

         // this should only add the field "important"
         m.prt.ensureEntity(
-            entity("u", {
-               important: text(),
-            }),
+            entity(
+               "u",
+               {
+                  important: text(),
+               },
+               undefined,
+               "system",
+            ),
         );

         expect(m.ctx.flags.sync_required).toBe(true);
@@ -157,7 +159,8 @@ describe("Module", async () => {
               {
                  name: "u",
                  fields: ["id", "name", "important"],
-                  type: "regular",
+                  // ensured type must be present
+                  type: "system",
               },
               {
                  name: "p",
@@ -1,13 +1,13 @@
 import { afterEach, beforeEach, describe, expect, mock, test } from "bun:test";
-import { disableConsoleLog, enableConsoleLog } from "core/utils";
-
+import { disableConsoleLog, enableConsoleLog, stripMark } from "core/utils";
+import { Type } from "@sinclair/typebox";
+import { Connection, entity, text } from "data";
 import { Module } from "modules/Module";
 import { type ConfigTable, getDefaultConfig, ModuleManager } from "modules/ModuleManager";
 import { CURRENT_VERSION, TABLE_NAME } from "modules/migrations";
 import { getDummyConnection } from "../helper";
-import { s, stripMark } from "core/utils/schema";
-import { Connection } from "data/connection/Connection";
-import { entity, text } from "data/prototype";
+import { diff } from "core/object/diff";
+import type { Static } from "@sinclair/typebox";

 describe("ModuleManager", async () => {
   test("s1: no config, no build", async () => {
@@ -92,11 +92,7 @@ describe("ModuleManager", async () => {

      await mm2.build();

-      /* console.log({
-         json,
-         configs: mm2.configs(),
-      }); */
-      //expect(stripMark(json)).toEqual(stripMark(mm2.configs()));
+      expect(stripMark(json)).toEqual(stripMark(mm2.configs()));
      expect(mm2.configs().data.entities?.test).toBeDefined();
      expect(mm2.configs().data.entities?.test?.fields?.content).toBeDefined();
      expect(mm2.get("data").toJSON().entities?.test?.fields?.content).toBeDefined();
@@ -261,10 +257,10 @@ describe("ModuleManager", async () => {
   // @todo: add tests for migrations (check "backup" and new version)

   describe("revert", async () => {
-      const failingModuleSchema = s.partialObject({
-         value: s.number(),
+      const failingModuleSchema = Type.Object({
+         value: Type.Optional(Type.Number()),
      });
-      class FailingModule extends Module<s.Static<typeof failingModuleSchema>> {
+      class FailingModule extends Module<typeof failingModuleSchema> {
         getSchema() {
            return failingModuleSchema;
         }
@@ -435,11 +431,11 @@ describe("ModuleManager", async () => {
   });

   describe("validate & revert", () => {
-      const schema = s.object({
-         value: s.array(s.number()),
+      const schema = Type.Object({
+         value: Type.Array(Type.Number(), { default: [] }),
      });
-      type SampleSchema = s.Static<typeof schema>;
-      class Sample extends Module<SampleSchema> {
+      type SampleSchema = Static<typeof schema>;
+      class Sample extends Module<typeof schema> {
         getSchema() {
            return schema;
         }
@@ -1,17 +1,17 @@
 import { beforeEach, describe, expect, it } from "bun:test";

 import { Hono } from "hono";
-import { Guard } from "auth/authorize/Guard";
-import { DebugLogger } from "core/utils/DebugLogger";
-import { EventManager } from "core/events";
-import { EntityManager } from "data/entities/EntityManager";
-import { Module, type ModuleBuildContext } from "modules/Module";
+import { Guard } from "../../src/auth";
+import { DebugLogger } from "../../src/core";
+import { EventManager } from "../../src/core/events";
+import { Default, stripMark } from "../../src/core/utils";
+import { EntityManager } from "../../src/data";
+import { Module, type ModuleBuildContext } from "../../src/modules/Module";
 import { getDummyConnection } from "../helper";
-import { ModuleHelper } from "modules/ModuleHelper";

 export function makeCtx(overrides?: Partial<ModuleBuildContext>): ModuleBuildContext {
   const { dummyConnection } = getDummyConnection();
-   const ctx = {
+   return {
      connection: dummyConnection,
      server: new Hono(),
      em: new EntityManager([], dummyConnection),
@@ -21,10 +21,6 @@ export function makeCtx(overrides?: Partial<ModuleBuildContext>): ModuleBuildCon
      logger: new DebugLogger(false),
      ...overrides,
   };
-   return {
-      ...ctx,
-      helper: new ModuleHelper(ctx as any),
-   } as any;
 }

 export function moduleTestSuite(module: { new (): Module }) {
@@ -44,8 +40,7 @@ export function moduleTestSuite(module: { new (): Module }) {
      it("uses the default config", async () => {
         const m = new module();
         await m.setContext(ctx).build();
-         expect(m.toJSON()).toEqual(m.getSchema().template({}, { withOptional: true }));
-         //expect(stripMark(m.toJSON())).toEqual(Default(m.getSchema(), {}));
+         expect(stripMark(m.toJSON())).toEqual(Default(m.getSchema(), {}));
      });
   });
 }
@@ -1,23 +0,0 @@
-import pkg from "./package.json" with { type: "json" };
-import c from "picocolors";
-import { formatNumber } from "core/utils";
-
-const result = await Bun.build({
-   entrypoints: ["./src/cli/index.ts"],
-   target: "node",
-   outdir: "./dist/cli",
-   env: "PUBLIC_*",
-   minify: true,
-   define: {
-      __isDev: "0",
-      __version: JSON.stringify(pkg.version),
-   },
-});
-
-for (const output of result.outputs) {
-   const size_ = await output.text();
-   console.info(
-      c.cyan(formatNumber.fileSize(size_.length)),
-      c.dim(output.path.replace(import.meta.dir + "/", "")),
-   );
-}
@@ -1,6 +1,5 @@
 import { $ } from "bun";
 import * as tsup from "tsup";
-import pkg from "./package.json" with { type: "json" };

 const args = process.argv.slice(2);
 const watch = args.includes("--watch");
@@ -9,13 +8,8 @@ const types = args.includes("--types");
 const sourcemap = args.includes("--sourcemap");
 const clean = args.includes("--clean");

-const define = {
-   __isDev: "0",
-   __version: JSON.stringify(pkg.version),
-};
-
 if (clean) {
-   console.info("Cleaning dist (w/o static)");
+   console.log("Cleaning dist (w/o static)");
   await $`find dist -mindepth 1 ! -path "dist/static/*" ! -path "dist/static" -exec rm -rf {} +`;
 }

@@ -27,11 +21,11 @@ function buildTypes() {
   Bun.spawn(["bun", "build:types"], {
      stdout: "inherit",
      onExit: () => {
-         console.info("Types built");
+         console.log("Types built");
         Bun.spawn(["bun", "tsc-alias"], {
            stdout: "inherit",
            onExit: () => {
-               console.info("Types aliased");
+               console.log("Types aliased");
               types_running = false;
            },
         });
@@ -53,21 +47,14 @@ if (types && !watch) {
 }

 function banner(title: string) {
-   console.info("");
-   console.info("=".repeat(40));
-   console.info(title.toUpperCase());
-   console.info("-".repeat(40));
+   console.log("");
+   console.log("=".repeat(40));
+   console.log(title.toUpperCase());
+   console.log("-".repeat(40));
 }

 // collection of always-external packages
-const external = [
-   "bun:test",
-   "node:test",
-   "node:assert/strict",
-   "@libsql/client",
-   "bknd",
-   /^bknd\/.*/,
-] as const;
+const external = ["bun:test", "node:test", "node:assert/strict", "@libsql/client"] as const;

 /**
 * Building backend and general API
@@ -78,8 +65,13 @@ async function buildApi() {
      minify,
      sourcemap,
      watch,
-      define,
-      entry: ["src/index.ts", "src/core/utils/index.ts", "src/plugins/index.ts"],
+      entry: [
+         "src/index.ts",
+         "src/core/index.ts",
+         "src/core/utils/index.ts",
+         "src/data/index.ts",
+         "src/media/index.ts",
+      ],
      outDir: "dist",
      external: [...external],
      metafile: true,
@@ -109,7 +101,6 @@ async function buildUi() {
      minify,
      sourcemap,
      watch,
-      define,
      external: [
         ...external,
         "react",
@@ -169,7 +160,6 @@ async function buildUiElements() {
      minify,
      sourcemap,
      watch,
-      define,
      entry: ["src/ui/elements/index.ts"],
      outDir: "dist/ui/elements",
      external: [
@@ -221,15 +211,14 @@ function baseConfig(adapter: string, overrides: Partial<tsup.Options> = {}): tsu
      },
      ...overrides,
      define: {
-         ...define,
+         __isDev: "0",
         ...overrides.define,
      },
      external: [
         /^cloudflare*/,
-         /^@?hono.*?/,
+         /^@?(hono|libsql).*?/,
         /^(bknd|react|next|node).*?/,
         /.*\.(html)$/,
-         ...external,
         ...(Array.isArray(overrides.external) ? overrides.external : []),
      ],
   };
@@ -246,14 +235,14 @@ async function buildAdapters() {

   // specific adatpers
   await tsup.build(baseConfig("react-router"));
-   await tsup.build(
-      baseConfig("bun", {
-         external: [/^bun\:.*/],
-      }),
-   );
+   await tsup.build(baseConfig("bun"));
   await tsup.build(baseConfig("astro"));
   await tsup.build(baseConfig("aws"));
-   await tsup.build(baseConfig("cloudflare"));
+   await tsup.build(
+      baseConfig("cloudflare", {
+         external: [/^kysely/],
+      }),
+   );

   await tsup.build({
      ...baseConfig("vite"),
@@ -269,29 +258,6 @@ 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();
@@ -142,7 +142,6 @@ const adapters = {
   },
   nextjs: {
      dir: path.join(basePath, "examples/nextjs"),
-      env: "TEST_TIMEOUT=20000",
      clean: async function () {
         const cwd = path.relative(process.cwd(), this.dir);
         await $`cd ${cwd} && rm -rf .nextjs data.db`;
@@ -196,8 +195,7 @@ async function testAdapter(name: keyof typeof adapters) {
   console.log("proc:", proc.pid, "data:", c.cyan(data));
   //proc.kill();process.exit(0);

-   const add_env = "env" in config && config.env ? config.env : "";
-   await $`TEST_URL=${data} TEST_ADAPTER=${name} ${add_env} bun run test:e2e`;
+   await $`TEST_URL=${data} TEST_ADAPTER=${name} bun run test:e2e`;
   console.log("DONE!");

   while (!proc.killed) {
@@ -207,8 +205,6 @@ async function testAdapter(name: keyof typeof adapters) {
   }
 }

-// run with: TEST_ADAPTER=astro bun run e2e/adapters.ts
-// (modify `test:e2e` to `test:e2e:ui` to see the UI)
 if (process.env.TEST_ADAPTER) {
   await testAdapter(process.env.TEST_ADAPTER as any);
 } else {
@@ -3,7 +3,7 @@
  "type": "module",
  "sideEffects": false,
  "bin": "./dist/cli/index.js",
-  "version": "0.16.0-rc.0",
+  "version": "0.12.0",
  "description": "Lightweight Firebase/Supabase alternative built to run anywhere — incl. Next.js, React Router, Astro, Cloudflare, Bun, Node, AWS Lambda & more.",
  "homepage": "https://bknd.io",
  "repository": {
@@ -13,16 +13,12 @@
  "bugs": {
    "url": "https://github.com/bknd-io/bknd/issues"
  },
-  "packageManager": "bun@1.2.19",
-  "engines": {
-    "node": ">=22"
-  },
  "scripts": {
    "dev": "BKND_CLI_LOG_LEVEL=debug vite",
    "build": "NODE_ENV=production bun run build.ts --minify --types",
    "build:all": "rm -rf dist && bun run build:static && NODE_ENV=production bun run build.ts --minify --types --clean && bun run build:cli",
    "build:ci": "mkdir -p dist/static/.vite && echo '{}' > dist/static/.vite/manifest.json && NODE_ENV=production bun run build.ts",
-    "build:cli": "bun run build.cli.ts",
+    "build:cli": "bun build src/cli/index.ts --target node --outdir dist/cli --env PUBLIC_* --minify",
    "build:static": "vite build",
    "watch": "bun run build.ts --types --watch",
    "types": "bun tsc -p tsconfig.build.json --noEmit",
@@ -35,9 +31,11 @@
    "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": "vitest run",
+    "test:node": "tsx --test $(find . -type f -name '*.native-spec.ts')",
    "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",
@@ -51,7 +49,7 @@
    "@codemirror/lang-html": "^6.4.9",
    "@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",
    "@tanstack/react-form": "^1.0.5",
@@ -61,30 +59,30 @@
    "bcryptjs": "^3.0.2",
    "dayjs": "^1.11.13",
    "fast-xml-parser": "^5.0.8",
-    "hono": "4.8.3",
+    "hono": "^4.7.4",
+    "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",
-    "lodash-es": "^4.17.21",
    "oauth4webapi": "^2.11.1",
    "object-path-immutable": "^4.1.2",
    "radix-ui": "^1.1.3",
-    "swr": "^2.3.3"
+    "swr": "^2.3.3",
+    "lodash-es": "^4.17.21",
+    "@sinclair/typebox": "0.34.30"
  },
  "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/vite-dev-server": "^0.19.1",
+    "@hono/typebox-validator": "^0.3.2",
+    "@hono/vite-dev-server": "^0.19.0",
    "@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",
    "@playwright/test": "^1.51.1",
    "@rjsf/core": "5.22.2",
-    "@standard-schema/spec": "^1.0.0",
    "@tabler/icons-react": "3.18.0",
    "@tailwindcss/postcss": "^4.0.12",
    "@tailwindcss/vite": "^4.0.12",
@@ -100,17 +98,14 @@
    "dotenv": "^16.4.7",
    "jotai": "^2.12.2",
    "jsdom": "^26.0.0",
-    "jsonv-ts": "^0.3.2",
    "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",
    "postcss": "^8.5.3",
    "postcss-preset-mantine": "^1.17.0",
    "postcss-simple-vars": "^7.0.1",
    "posthog-js-lite": "^3.4.2",
+    "picocolors": "^1.1.1",
    "react": "^19.0.0",
    "react-dom": "^19.0.0",
    "react-hook-form": "^7.54.2",
@@ -123,15 +118,13 @@
    "tsc-alias": "^1.8.11",
    "tsup": "^8.4.0",
    "tsx": "^4.19.3",
-    "uuid": "^11.1.0",
-    "vite": "^6.3.5",
-    "vite-plugin-circular-dependency": "^0.5.0",
+    "vite": "^6.2.1",
    "vite-tsconfig-paths": "^5.1.4",
    "vitest": "^3.0.9",
    "wouter": "^3.6.0"
  },
  "optionalDependencies": {
-    "@hono/node-server": "^1.14.3"
+    "@hono/node-server": "^1.13.8"
  },
  "peerDependencies": {
    "react": ">=19",
@@ -161,6 +154,16 @@
      "import": "./dist/ui/client/index.js",
      "require": "./dist/ui/client/index.js"
    },
+    "./data": {
+      "types": "./dist/types/data/index.d.ts",
+      "import": "./dist/data/index.js",
+      "require": "./dist/data/index.js"
+    },
+    "./core": {
+      "types": "./dist/types/core/index.d.ts",
+      "import": "./dist/core/index.js",
+      "require": "./dist/core/index.js"
+    },
    "./utils": {
      "types": "./dist/types/core/utils/index.d.ts",
      "import": "./dist/core/utils/index.js",
@@ -171,24 +174,10 @@
      "import": "./dist/cli/index.js",
      "require": "./dist/cli/index.js"
    },
-    "./plugins": {
-      "types": "./dist/types/plugins/index.d.ts",
-      "import": "./dist/plugins/index.js",
-      "require": "./dist/plugins/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"
+    "./media": {
+      "types": "./dist/types/media/index.d.ts",
+      "import": "./dist/media/index.js",
+      "require": "./dist/media/index.js"
    },
    "./adapter/cloudflare": {
      "types": "./dist/types/adapter/cloudflare/index.d.ts",
@@ -236,23 +225,7 @@
    },
    "./dist/main.css": "./dist/ui/main.css",
    "./dist/styles.css": "./dist/ui/styles.css",
-    "./dist/manifest.json": "./dist/static/.vite/manifest.json",
-    "./static/*": "./dist/static/*"
-  },
-  "typesVersions": {
-    "*": {
-      "utils": ["./dist/types/core/utils/index.d.ts"],
-      "cli": ["./dist/types/cli/index.d.ts"],
-      "plugins": ["./dist/types/plugins/index.d.ts"],
-      "adapter": ["./dist/types/adapter/index.d.ts"],
-      "adapter/cloudflare": ["./dist/types/adapter/cloudflare/index.d.ts"],
-      "adapter/vite": ["./dist/types/adapter/vite/index.d.ts"],
-      "adapter/nextjs": ["./dist/types/adapter/nextjs/index.d.ts"],
-      "adapter/react-router": ["./dist/types/adapter/react-router/index.d.ts"],
-      "adapter/bun": ["./dist/types/adapter/bun/index.d.ts"],
-      "adapter/node": ["./dist/types/adapter/node/index.d.ts"],
-      "adapter/sqlite": ["./dist/types/adapter/sqlite/edge.d.ts"]
-    }
+    "./dist/manifest.json": "./dist/static/.vite/manifest.json"
  },
  "publishConfig": {
    "access": "public"
@@ -3,7 +3,6 @@ import { defineConfig, devices } from "@playwright/test";
 const baseUrl = process.env.TEST_URL || "http://localhost:28623";
 const startCommand = process.env.TEST_START_COMMAND || "bun run dev";
 const autoStart = ["1", "true", undefined].includes(process.env.TEST_AUTO_START);
-const timeout = process.env.TEST_TIMEOUT ? Number.parseInt(process.env.TEST_TIMEOUT) : 5000;

 export default defineConfig({
   testMatch: "**/*.e2e-spec.ts",
@@ -13,7 +12,7 @@ export default defineConfig({
   retries: process.env.CI ? 2 : 0,
   workers: process.env.CI ? 1 : undefined,
   reporter: "html",
-   timeout,
+   timeout: 20000,
   use: {
      baseURL: baseUrl,
      trace: "on-first-retry",
@@ -1,11 +1,10 @@
-import type { SafeUser } from "bknd";
-import { AuthApi, type AuthApiOptions } from "auth/api/AuthApi";
-import { DataApi, type DataApiOptions } from "data/api/DataApi";
+import type { SafeUser } from "auth";
+import { AuthApi } from "auth/api/AuthApi";
+import { DataApi } from "data/api/DataApi";
 import { decode } from "hono/jwt";
-import { MediaApi, type MediaApiOptions } from "media/api/MediaApi";
+import { MediaApi } from "media/api/MediaApi";
 import { SystemApi } from "modules/SystemApi";
 import { omitKeys } from "core/utils";
-import type { BaseModuleApiOptions } from "modules";

 export type TApiUser = SafeUser;

@@ -22,24 +21,14 @@ declare global {
   }
 }

-type SubApiOptions<T extends BaseModuleApiOptions> = Omit<T, keyof BaseModuleApiOptions>;
-
 export type ApiOptions = {
   host?: string;
   headers?: Headers;
   key?: string;
-   storage?: {
-      getItem: (key: string) => string | undefined | null | Promise<string | undefined | null>;
-      setItem: (key: string, value: string) => void | Promise<void>;
-      removeItem: (key: string) => void | Promise<void>;
-   };
-   onAuthStateChange?: (state: AuthState) => void;
+   localStorage?: boolean;
   fetcher?: ApiFetcher;
   verbose?: boolean;
   verified?: boolean;
-   data?: SubApiOptions<DataApiOptions>;
-   auth?: SubApiOptions<AuthApiOptions>;
-   media?: SubApiOptions<MediaApiOptions>;
 } & (
   | {
        token?: string;
@@ -72,18 +61,18 @@ export class Api {
      this.verified = options.verified === true;

      // prefer request if given
-      if ("request" in options && options.request) {
+      if ("request" in options) {
         this.options.host = options.host ?? new URL(options.request.url).origin;
         this.options.headers = options.headers ?? options.request.headers;
         this.extractToken();

         // then check for a token
-      } else if ("token" in options && options.token) {
+      } else if ("token" in options) {
         this.token_transport = "header";
-         this.updateToken(options.token, { trigger: false });
+         this.updateToken(options.token);

         // then check for an user object
-      } else if ("user" in options && options.user) {
+      } else if ("user" in options) {
         this.token_transport = "none";
         this.user = options.user;
         this.verified = options.verified !== false;
@@ -126,30 +115,16 @@ export class Api {
            this.updateToken(headerToken);
            return;
         }
-      } else if (this.storage) {
-         this.storage.getItem(this.tokenKey).then((token) => {
+      } else if (this.options.localStorage) {
+         const token = localStorage.getItem(this.tokenKey);
+         if (token) {
            this.token_transport = "header";
-            this.updateToken(token ? String(token) : undefined);
-         });
+            this.updateToken(token);
+         }
      }
   }

-   private get storage() {
-      if (!this.options.storage) return null;
-      return {
-         getItem: async (key: string) => {
-            return await this.options.storage!.getItem(key);
-         },
-         setItem: async (key: string, value: string) => {
-            return await this.options.storage!.setItem(key, value);
-         },
-         removeItem: async (key: string) => {
-            return await this.options.storage!.removeItem(key);
-         },
-      };
-   }
-
-   updateToken(token?: string, opts?: { rebuild?: boolean; trigger?: boolean }) {
+   updateToken(token?: string, rebuild?: boolean) {
      this.token = token;
      this.verified = false;

@@ -159,25 +134,17 @@ export class Api {
         this.user = undefined;
      }

-      if (this.storage) {
+      if (this.options.localStorage) {
         const key = this.tokenKey;

         if (token) {
-            this.storage.setItem(key, token).then(() => {
-               this.options.onAuthStateChange?.(this.getAuthState());
-            });
+            localStorage.setItem(key, token);
         } else {
-            this.storage.removeItem(key).then(() => {
-               this.options.onAuthStateChange?.(this.getAuthState());
-            });
-         }
-      } else {
-         if (opts?.trigger !== false) {
-            this.options.onAuthStateChange?.(this.getAuthState());
+            localStorage.removeItem(key);
         }
      }

-      if (opts?.rebuild) this.buildApis();
+      if (rebuild) this.buildApis();
   }

   private markAuthVerified(verfied: boolean) {
@@ -247,32 +214,15 @@ export class Api {
      const fetcher = this.options.fetcher;

      this.system = new SystemApi(baseParams, fetcher);
-      this.data = new DataApi(
-         {
-            ...baseParams,
-            ...this.options.data,
-         },
-         fetcher,
-      );
+      this.data = new DataApi(baseParams, fetcher);
      this.auth = new AuthApi(
         {
            ...baseParams,
-            credentials: this.options.storage ? "omit" : "include",
-            ...this.options.auth,
-            onTokenUpdate: (token) => {
-               this.updateToken(token, { rebuild: true });
-               this.options.auth?.onTokenUpdate?.(token);
-            },
-         },
-         fetcher,
-      );
-      this.media = new MediaApi(
-         {
-            ...baseParams,
-            ...this.options.media,
+            onTokenUpdate: (token) => this.updateToken(token, true),
         },
         fetcher,
      );
+      this.media = new MediaApi(baseParams, fetcher);
   }
 }

@@ -1,8 +1,7 @@
 import type { CreateUserPayload } from "auth/AppAuth";
-import { $console } from "core/utils";
+import { $console } from "core";
 import { Event } from "core/events";
-import type { em as prototypeEm } from "data/prototype";
-import { Connection } from "data/connection/Connection";
+import { Connection, type LibSqlCredentials, LibsqlConnection } from "data";
 import type { Hono } from "hono";
 import {
   ModuleManager,
@@ -15,29 +14,15 @@ import {
 import * as SystemPermissions from "modules/permissions";
 import { AdminController, type AdminControllerOptions } from "modules/server/AdminController";
 import { SystemController } from "modules/server/SystemController";
-import type { MaybePromise } from "core/types";
-import type { ServerEnv } from "modules/Controller";
-import type { IEmailDriver, ICacheDriver } from "core/drivers";

 // biome-ignore format: must be here
 import { Api, type ApiOptions } from "Api";
+import type { ServerEnv } from "modules/Controller";

-export type AppPluginConfig = {
-   name: string;
-   schema?: () => MaybePromise<ReturnType<typeof prototypeEm> | void>;
-   beforeBuild?: () => MaybePromise<void>;
-   onBuilt?: () => MaybePromise<void>;
-   onServerInit?: (server: Hono<ServerEnv>) => MaybePromise<void>;
-   onFirstBoot?: () => MaybePromise<void>;
-   onBoot?: () => MaybePromise<void>;
-};
-export type AppPlugin = (app: App) => AppPluginConfig;
+export type AppPlugin = (app: App) => Promise<void> | void;

 abstract class AppEvent<A = {}> extends Event<{ app: App } & A> {}
-export class AppConfigUpdatedEvent extends AppEvent<{
-   module: string;
-   config: ModuleConfigs[keyof ModuleConfigs];
-}> {
+export class AppConfigUpdatedEvent extends AppEvent {
   static override slug = "app-config-updated";
 }
 export class AppBuiltEvent extends AppEvent {
@@ -65,13 +50,16 @@ export type AppOptions = {
   seed?: (ctx: ModuleBuildContext & { app: App }) => Promise<void>;
   manager?: Omit<ModuleManagerOptions, "initial" | "onUpdated" | "seed">;
   asyncEventsMode?: "sync" | "async" | "none";
-   drivers?: {
-      email?: IEmailDriver;
-      cache?: ICacheDriver;
-   };
 };
 export type CreateAppConfig = {
-   connection?: Connection | { url: string };
+   connection?:
+      | Connection
+      | {
+           // @deprecated
+           type: "libsql";
+           config: LibSqlCredentials;
+        }
+      | LibSqlCredentials;
   initialConfig?: InitialModuleConfigs;
   options?: AppOptions;
 };
@@ -79,40 +67,29 @@ export type CreateAppConfig = {
 export type AppConfig = InitialModuleConfigs;
 export type LocalApiOptions = Request | ApiOptions;

-export class App<C extends Connection = Connection, Options extends AppOptions = AppOptions> {
+export class App {
   static readonly Events = AppEvents;

   modules: ModuleManager;
   adminController?: AdminController;
   _id: string = crypto.randomUUID();
-   plugins: Map<string, AppPluginConfig> = new Map();
-   drivers: Options["drivers"] = {};

   private trigger_first_boot = false;
+   private plugins: AppPlugin[];
   private _building: boolean = false;

   constructor(
-      public connection: C,
+      private connection: Connection,
      _initialConfig?: InitialModuleConfigs,
-      private options?: Options,
+      private options?: AppOptions,
   ) {
-      this.drivers = options?.drivers ?? {};
-
-      for (const plugin of options?.plugins ?? []) {
-         const config = plugin(this);
-         if (this.plugins.has(config.name)) {
-            throw new Error(`Plugin ${config.name} already registered`);
-         }
-         this.plugins.set(config.name, config);
-      }
-      this.runPlugins("onBoot");
+      this.plugins = options?.plugins ?? [];
      this.modules = new ModuleManager(connection, {
         ...(options?.manager ?? {}),
         initial: _initialConfig,
         onUpdated: this.onUpdated.bind(this),
         onFirstBoot: this.onFirstBoot.bind(this),
         onServerInit: this.onServerInit.bind(this),
-         onModulesBuilt: this.onModulesBuilt.bind(this),
      });
      this.modules.ctx().emgr.registerEvents(AppEvents);
   }
@@ -121,32 +98,6 @@ export class App<C extends Connection = Connection, Options extends AppOptions =
      return this.modules.ctx().emgr;
   }

-   protected async runPlugins<Key extends keyof AppPluginConfig>(
-      key: Key,
-      ...args: any[]
-   ): Promise<{ name: string; result: any }[]> {
-      const results: { name: string; result: any }[] = [];
-      for (const [name, config] of this.plugins) {
-         try {
-            if (key in config && config[key]) {
-               const fn = config[key];
-               if (fn && typeof fn === "function") {
-                  $console.debug(`[Plugin:${name}] ${key}`);
-                  // @ts-expect-error
-                  const result = await fn(...args);
-                  results.push({
-                     name,
-                     result,
-                  });
-               }
-            }
-         } catch (e) {
-            $console.warn(`[Plugin:${name}] error running "${key}"`, String(e));
-         }
-      }
-      return results as any;
-   }
-
   async build(options?: { sync?: boolean; fetch?: boolean; forceBuild?: boolean }) {
      // prevent multiple concurrent builds
      if (this._building) {
@@ -155,8 +106,6 @@ export class App<C extends Connection = Connection, Options extends AppOptions =
         }
         if (!options?.forceBuild) return;
      }
-
-      await this.runPlugins("beforeBuild");
      this._building = true;

      if (options?.sync) this.modules.ctx().flags.sync_required = true;
@@ -168,10 +117,13 @@ export class App<C extends Connection = Connection, Options extends AppOptions =
      guard.registerPermissions(Object.values(SystemPermissions));
      server.route("/api/system", new SystemController(this).getController());

-      // emit built event
+      // load plugins
+      if (this.plugins.length > 0) {
+         await Promise.all(this.plugins.map((plugin) => plugin(this)));
+      }
+
      $console.log("App built");
      await this.emgr.emit(new AppBuiltEvent({ app: this }));
-      await this.runPlugins("onBuilt");

      // first boot is set from ModuleManager when there wasn't a config table
      if (this.trigger_first_boot) {
@@ -199,7 +151,7 @@ export class App<C extends Connection = Connection, Options extends AppOptions =
   }

   get fetch(): Hono["fetch"] {
-      return this.server.fetch as any;
+      return this.server.fetch;
   }

   get module() {
@@ -268,16 +220,15 @@ export class App<C extends Connection = Connection, Options extends AppOptions =
      $console.log("App config updated", module);
      // @todo: potentially double syncing
      await this.build({ sync: true });
-      await this.emgr.emit(new AppConfigUpdatedEvent({ app: this, module, config }));
+      await this.emgr.emit(new AppConfigUpdatedEvent({ app: this }));
   }

-   protected async onFirstBoot() {
+   async onFirstBoot() {
      $console.log("App first boot");
      this.trigger_first_boot = true;
-      await this.runPlugins("onFirstBoot");
   }

-   protected async onServerInit(server: Hono<ServerEnv>) {
+   async onServerInit(server: Hono<ServerEnv>) {
      server.use(async (c, next) => {
         c.set("app", this);
         await this.emgr.emit(new AppRequest({ app: this, request: c.req.raw }));
@@ -302,35 +253,35 @@ export class App<C extends Connection = Connection, Options extends AppOptions =
               break;
         }
      });
-
-      // call server init if set
-      if (this.options?.manager?.onServerInit) {
-         this.options.manager.onServerInit(server);
-      }
-
-      await this.runPlugins("onServerInit", server);
-   }
-
-   protected async onModulesBuilt(ctx: ModuleBuildContext) {
-      const results = (await this.runPlugins("schema")) as {
-         name: string;
-         result: ReturnType<typeof prototypeEm>;
-      }[];
-      if (results.length > 0) {
-         for (const { name, result } of results) {
-            if (result) {
-               $console.log(`[Plugin:${name}] schema`);
-               ctx.helper.ensureSchema(result);
-            }
-         }
-      }
   }
 }

 export function createApp(config: CreateAppConfig = {}) {
-   if (!config.connection || !Connection.isConnection(config.connection)) {
+   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) {
      throw new Error("Invalid connection");
   }

-   return new App(config.connection, config.initialConfig, config.options);
+   return new App(connection, config.initialConfig, config.options);
 }
@@ -2,8 +2,8 @@

 import path from "node:path";
 import { type RuntimeBkndConfig, createRuntimeApp, type RuntimeOptions } from "bknd/adapter";
-import { registerLocalMediaAdapter } from ".";
-import { config, type App } from "bknd";
+import { registerLocalMediaAdapter } from "bknd/adapter/node";
+import { config } from "bknd/core";
 import type { ServeOptions } from "bun";
 import { serveStatic } from "hono/bun";

@@ -20,8 +20,8 @@ export async function createApp<Env = BunEnv>(

   return await createRuntimeApp(
      {
-         serveStatic: serveStatic({ root }),
         ...config,
+         serveStatic: serveStatic({ root }),
      },
      args ?? (process.env as Env),
      opts,
@@ -33,11 +33,8 @@ export function createHandler<Env = BunEnv>(
   args: Env = {} as Env,
   opts?: RuntimeOptions,
 ) {
-   let app: App | undefined;
   return async (req: Request) => {
-      if (!app) {
-         app = await createApp(config, args ?? (process.env as Env), opts);
-      }
+      const app = await createApp(config, args ?? (process.env as Env), opts);
      return app.fetch(req);
   };
 }
@@ -52,7 +49,6 @@ export function serve<Env = BunEnv>(
      onBuilt,
      buildConfig,
      adminOptions,
-      serveStatic,
      ...serveOptions
   }: BunBkndConfig<Env> = {},
   args: Env = {} as Env,
@@ -70,12 +66,11 @@ export function serve<Env = BunEnv>(
            buildConfig,
            adminOptions,
            distPath,
-            serveStatic,
         },
         args,
         opts,
      ),
   });

-   console.info(`Server is running on http://localhost:${port}`);
+   console.log(`Server is running on http://localhost:${port}`);
 }
@@ -1,15 +0,0 @@
-import { connectionTestSuite } from "data/connection/connection-test-suite";
-import { bunSqlite } from "./BunSqliteConnection";
-import { bunTestRunner } from "adapter/bun/test";
-import { describe } from "bun:test";
-import { Database } from "bun:sqlite";
-
-describe("BunSqliteConnection", () => {
-   connectionTestSuite(bunTestRunner, {
-      makeConnection: () => ({
-         connection: bunSqlite({ database: new Database(":memory:") }),
-         dispose: async () => {},
-      }),
-      rawDialectDetails: [],
-   });
-});
@@ -1,40 +0,0 @@
-import { Database } from "bun:sqlite";
-import { genericSqlite, type GenericSqliteConnection } from "bknd";
-
-export type BunSqliteConnection = GenericSqliteConnection<Database>;
-export type BunSqliteConnectionConfig = {
-   database: Database;
-};
-
-export function bunSqlite(config?: BunSqliteConnectionConfig | { url: string }) {
-   let db: Database;
-   if (config) {
-      if ("database" in config) {
-         db = config.database;
-      } else {
-         db = new Database(config.url);
-      }
-   } else {
-      db = new Database(":memory:");
-   }
-
-   return genericSqlite("bun-sqlite", db, (utils) => {
-      //const fn = cache ? "query" : "prepare";
-      const getStmt = (sql: string) => db.prepare(sql);
-
-      return {
-         db,
-         query: utils.buildQueryFn({
-            all: (sql, parameters) => getStmt(sql).all(...(parameters || [])),
-            run: (sql, parameters) => {
-               const { changes, lastInsertRowid } = getStmt(sql).run(...(parameters || []));
-               return {
-                  insertId: utils.parseBigInt(lastInsertRowid),
-                  numAffectedRows: utils.parseBigInt(changes),
-               };
-            },
-         }),
-         close: () => db.close(),
-      };
-   });
-}
@@ -1,3 +1 @@
 export * from "./bun.adapter";
-export * from "../node/storage";
-export * from "./connection/BunSqliteConnection";
@@ -1,11 +1,7 @@
-import { expect, test, mock, describe, beforeEach, afterEach, afterAll } from "bun:test";
+import { expect, test, mock } from "bun:test";

 export const bunTestRunner = {
-   describe,
   expect,
   test,
   mock,
-   beforeEach,
-   afterEach,
-   afterAll,
 };
@@ -0,0 +1,63 @@
+/// <reference types="@cloudflare/workers-types" />
+
+import { KyselyPluginRunner, SqliteConnection, SqliteIntrospector } from "bknd/data";
+import type { QB } from "data/connection/Connection";
+import { type DatabaseIntrospector, Kysely, ParseJSONResultsPlugin } from "kysely";
+import { D1Dialect } from "kysely-d1";
+
+export type D1ConnectionConfig = {
+   binding: D1Database;
+};
+
+class CustomD1Dialect extends D1Dialect {
+   override createIntrospector(db: Kysely<any>): DatabaseIntrospector {
+      return new SqliteIntrospector(db, {
+         excludeTables: ["_cf_KV", "_cf_METADATA"],
+      });
+   }
+}
+
+export class D1Connection extends SqliteConnection {
+   protected override readonly supported = {
+      batching: true,
+   };
+
+   constructor(private config: D1ConnectionConfig) {
+      const plugins = [new ParseJSONResultsPlugin()];
+
+      const kysely = new Kysely({
+         dialect: new CustomD1Dialect({ database: config.binding }),
+         plugins,
+      });
+      super(kysely, {}, plugins);
+   }
+
+   get client(): D1Database {
+      return this.config.binding;
+   }
+
+   protected override async batch<Queries extends QB[]>(
+      queries: [...Queries],
+   ): Promise<{
+      [K in keyof Queries]: Awaited<ReturnType<Queries[K]["execute"]>>;
+   }> {
+      const db = this.config.binding;
+
+      const res = await db.batch(
+         queries.map((q) => {
+            const { sql, parameters } = q.compile();
+            return db.prepare(sql).bind(...parameters);
+         }),
+      );
+
+      // let it run through plugins
+      const kyselyPlugins = new KyselyPluginRunner(this.plugins);
+      const data: any = [];
+      for (const r of res) {
+         const rows = await kyselyPlugins.transformResultRows(r.results);
+         data.push(rows);
+      }
+
+      return data;
+   }
+}
@@ -12,10 +12,7 @@ export function getBindings<T extends GetBindingType>(env: any, type: T): Bindin
   const bindings: BindingMap<T>[] = [];
   for (const key in env) {
      try {
-         if (
-            env[key] &&
-            ((env[key] as any).constructor.name === type || String(env[key]) === `[object ${type}]`)
-         ) {
+         if (env[key] && (env[key] as any).constructor.name === type) {
            bindings.push({
               key,
               value: env[key] as BindingTypeMap[T],
@@ -1,6 +1,6 @@
 import { afterAll, beforeAll, describe, expect, it } from "bun:test";
 import { makeApp } from "./modes/fresh";
-import { makeConfig, type CfMakeConfigArgs } from "./config";
+import { makeConfig } from "./config";
 import { disableConsoleLog, enableConsoleLog } from "core/utils";
 import { adapterTestSuite } from "adapter/adapter-test-suite";
 import { bunTestRunner } from "adapter/bun/test";
@@ -13,38 +13,36 @@ describe("cf adapter", () => {
   const DB_URL = ":memory:";
   const $ctx = (env?: any, request?: Request, ctx?: ExecutionContext) => ({
      request: request ?? (null as any),
-      env: env ?? { url: DB_URL },
+      env: env ?? { DB_URL },
      ctx: ctx ?? (null as any),
   });

   it("makes config", async () => {
-      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(
+            {
+               connection: { url: 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();
+      expect(
+         makeConfig(
+            {
+               app: (env) => ({
+                  connection: { url: env.DB_URL },
+               }),
+            },
+            {
+               DB_URL,
+            },
+         ),
+      ).toEqual({ connection: { url: DB_URL } });
   });

-   adapterTestSuite<CloudflareBkndConfig, CfMakeConfigArgs<any>>(bunTestRunner, {
-      makeApp: async (c, a, o) => {
-         return await makeApp(c, { env: a } as any, o);
-      },
+   adapterTestSuite<CloudflareBkndConfig, object>(bunTestRunner, {
+      makeApp,
      makeHandler: (c, a, o) => {
         return async (request: any) => {
            const app = await makeApp(
@@ -52,7 +50,7 @@ describe("cf adapter", () => {
               c ?? {
                  connection: { url: DB_URL },
               },
-               a!,
+               a,
               o,
            );
            return app.fetch(request);
@@ -7,15 +7,9 @@ import { getFresh } from "./modes/fresh";
 import { getCached } from "./modes/cached";
 import { getDurable } from "./modes/durable";
 import type { App } from "bknd";
-import { $console } from "core/utils";
+import { $console } from "core";

-declare global {
-   namespace Cloudflare {
-      interface Env {}
-   }
-}
-
-export type CloudflareEnv = Cloudflare.Env;
+export type CloudflareEnv = object;
 export type CloudflareBkndConfig<Env = CloudflareEnv> = RuntimeBkndConfig<Env> & {
   mode?: "warm" | "fresh" | "cache" | "durable";
   bindings?: (args: Env) => {
@@ -23,17 +17,11 @@ export type CloudflareBkndConfig<Env = CloudflareEnv> = RuntimeBkndConfig<Env> &
      dobj?: DurableObjectNamespace;
      db?: D1Database;
   };
-   d1?: {
-      session?: boolean;
-      transport?: "header" | "cookie";
-      first?: D1SessionConstraint;
-   };
   static?: "kv" | "assets";
   key?: string;
   keepAliveSeconds?: number;
   forceHttps?: boolean;
   manifest?: string;
-   registerMedia?: boolean | ((env: Env) => void);
 };

 export type Context<Env = CloudflareEnv> = {
@@ -1,176 +1,50 @@
-/// <reference types="@cloudflare/workers-types" />
-
-import { Connection } from "bknd";
-import { sqlite } from "bknd/adapter/sqlite";
-import { makeConfig as makeAdapterConfig } from "bknd/adapter";
 import { registerMedia } from "./storage/StorageR2Adapter";
 import { getBinding } from "./bindings";
-import { d1Sqlite } from "./connection/D1Connection";
+import { D1Connection } from "./D1Connection";
 import type { CloudflareBkndConfig, CloudflareEnv } from ".";
 import { App } from "bknd";
-import type { Context, ExecutionContext } from "hono";
-import { $console } from "core/utils";
-import { setCookie } from "hono/cookie";
+import { makeConfig as makeAdapterConfig } from "bknd/adapter";
+import type { ExecutionContext } from "hono";
+import { $console } from "core";

 export const constants = {
   exec_async_event_id: "cf_register_waituntil",
   cache_endpoint: "/__bknd/cache",
   do_endpoint: "/__bknd/do",
-   d1_session: {
-      cookie: "cf_d1_session",
-      header: "x-cf-d1-session",
-   },
 };

-export type CfMakeConfigArgs<Env extends CloudflareEnv = CloudflareEnv> = {
-   env: Env;
-   ctx?: ExecutionContext;
-   request?: Request;
-};
-
-function getCookieValue(cookies: string | null, name: string) {
-   if (!cookies) return null;
-
-   for (const cookie of cookies.split("; ")) {
-      const [key, value] = cookie.split("=");
-      if (key === name && value) {
-         return decodeURIComponent(value);
-      }
-   }
-   return null;
-}
-
-export function d1SessionHelper(config: CloudflareBkndConfig<any>) {
-   const headerKey = constants.d1_session.header;
-   const cookieKey = constants.d1_session.cookie;
-   const transport = config.d1?.transport;
-
-   return {
-      get: (request?: Request): D1SessionBookmark | undefined => {
-         if (!request || !config.d1?.session) return undefined;
-
-         if (!transport || transport === "cookie") {
-            const cookies = request.headers.get("Cookie");
-            if (cookies) {
-               const cookie = getCookieValue(cookies, cookieKey);
-               if (cookie) {
-                  return cookie;
-               }
-            }
-         }
-
-         if (!transport || transport === "header") {
-            if (request.headers.has(headerKey)) {
-               return request.headers.get(headerKey) as any;
-            }
-         }
-
-         return undefined;
-      },
-      set: (c: Context, d1?: D1DatabaseSession) => {
-         if (!d1 || !config.d1?.session) return;
-
-         const session = d1.getBookmark();
-         if (session) {
-            if (!transport || transport === "header") {
-               c.header(headerKey, session);
-            }
-            if (!transport || transport === "cookie") {
-               setCookie(c, cookieKey, session, {
-                  httpOnly: true,
-                  secure: true,
-                  sameSite: "Lax",
-                  maxAge: 60 * 5, // 5 minutes
-               });
-            }
-         }
-      },
-   };
-}
-
 let media_registered: boolean = false;
 export function makeConfig<Env extends CloudflareEnv = CloudflareEnv>(
   config: CloudflareBkndConfig<Env>,
-   args?: CfMakeConfigArgs<Env>,
+   args: Env = {} as Env,
 ) {
-   if (!media_registered && config.registerMedia !== false) {
-      if (typeof config.registerMedia === "function") {
-         config.registerMedia(args?.env as any);
-      } else {
-         registerMedia(args?.env as any);
-      }
+   if (!media_registered) {
+      registerMedia(args as any);
      media_registered = true;
   }

-   const appConfig = makeAdapterConfig(config, args?.env);
-
-   // if connection instance is given, don't do anything
-   // other than checking if D1 session is defined
-   if (Connection.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;
+   const appConfig = makeAdapterConfig(config, args);
+   const bindings = config.bindings?.(args);
+   if (!appConfig.connection) {
      let db: D1Database | undefined;
-
-      // if db is given in bindings, use it
      if (bindings?.db) {
-         $console.debug("Using database from bindings");
+         $console.log("Using database from bindings");
         db = bindings.db;
-
-         // scan for D1Database in args
-      } else {
-         const binding = getBinding(args.env, "D1Database");
+      } else if (Object.keys(args).length > 0) {
+         const binding = getBinding(args, "D1Database");
         if (binding) {
-            $console.debug(`Using database from env "${binding.key}"`);
+            $console.log(`Using database from env "${binding.key}"`);
            db = binding.value;
         }
      }

-      // if db is found, check if session is requested
      if (db) {
-         if (config.d1?.session) {
-            session = db.withSession(sessionId ?? config.d1?.first);
-            if (!session) {
-               throw new Error("Couldn't create session");
-            }
-
-            appConfig.connection = d1Sqlite({ 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 = d1Sqlite({ binding: db });
-         }
+         appConfig.connection = new D1Connection({ binding: db });
+      } else {
+         throw new Error("No database connection given");
      }
   }

-   if (!Connection.isConnection(appConfig.connection)) {
-      throw new Error("Couldn't find database connection");
-   }
-
   return appConfig;
 }

@@ -1,75 +0,0 @@
-/// <reference types="@cloudflare/workers-types" />
-
-import { genericSqlite, type GenericSqliteConnection } from "bknd";
-import type { QueryResult } from "kysely";
-
-export type D1SqliteConnection = GenericSqliteConnection<D1Database>;
-
-export type D1ConnectionConfig<DB extends D1Database | D1DatabaseSession = D1Database> = {
-   binding: DB;
-};
-
-export function d1Sqlite<DB extends D1Database | D1DatabaseSession = D1Database>(
-   config: D1ConnectionConfig<DB>,
-) {
-   const db = config.binding;
-
-   return genericSqlite(
-      "d1-sqlite",
-      db,
-      (utils) => {
-         const getStmt = (sql: string, parameters?: any[] | readonly any[]) =>
-            db.prepare(sql).bind(...(parameters || []));
-
-         const mapResult = (res: D1Result<any>): QueryResult<any> => {
-            if (res.error) {
-               throw new Error(res.error);
-            }
-
-            const numAffectedRows =
-               res.meta.changes > 0 ? utils.parseBigInt(res.meta.changes) : undefined;
-            const insertId = res.meta.last_row_id
-               ? utils.parseBigInt(res.meta.last_row_id)
-               : undefined;
-
-            return {
-               insertId,
-               numAffectedRows,
-               rows: res.results,
-               // @ts-ignore
-               meta: res.meta,
-            };
-         };
-
-         return {
-            db,
-            batch: async (stmts) => {
-               const res = await db.batch(
-                  stmts.map(({ sql, parameters }) => {
-                     return getStmt(sql, parameters);
-                  }),
-               );
-               return res.map(mapResult);
-            },
-            query: utils.buildQueryFn({
-               all: async (sql, parameters) => {
-                  const prep = getStmt(sql, parameters);
-                  return mapResult(await prep.all()).rows;
-               },
-               run: async (sql, parameters) => {
-                  const prep = getStmt(sql, parameters);
-                  return mapResult(await prep.run());
-               },
-            }),
-            close: () => {},
-         };
-      },
-      {
-         supports: {
-            batching: true,
-            softscans: false,
-         },
-         excludeTables: ["_cf_KV", "_cf_METADATA"],
-      },
-   );
-}
@@ -1,33 +0,0 @@
-import { describe, test, expect } from "vitest";
-
-import { viTestRunner } from "adapter/node/vitest";
-import { connectionTestSuite } from "data/connection/connection-test-suite";
-import { Miniflare } from "miniflare";
-import { d1Sqlite } from "./D1Connection";
-
-describe("d1Sqlite", async () => {
-   connectionTestSuite(viTestRunner, {
-      makeConnection: async () => {
-         const mf = new Miniflare({
-            modules: true,
-            script: "export default { async fetch() { return new Response(null); } }",
-            d1Databases: ["DB"],
-         });
-
-         const binding = (await mf.getD1Database("DB")) as D1Database;
-         return {
-            connection: d1Sqlite({ binding }),
-            dispose: () => mf.dispose(),
-         };
-      },
-      rawDialectDetails: [
-         "meta.served_by",
-         "meta.duration",
-         "meta.changes",
-         "meta.changed_db",
-         "meta.size_after",
-         "meta.rows_read",
-         "meta.rows_written",
-      ],
-   });
-});
@@ -1,80 +0,0 @@
-/// <reference types="@cloudflare/workers-types" />
-
-import { genericSqlite, type GenericSqliteConnection } from "bknd";
-import type { QueryResult } from "kysely";
-
-export type D1SqliteConnection = GenericSqliteConnection<D1Database>;
-export type DurableObjecSql = DurableObjectState["storage"]["sql"];
-
-export type D1ConnectionConfig<DB extends DurableObjecSql> =
-   | DurableObjectState
-   | {
-        sql: DB;
-     };
-
-export function doSqlite<DB extends DurableObjecSql>(config: D1ConnectionConfig<DB>) {
-   const db = "sql" in config ? config.sql : config.storage.sql;
-
-   return genericSqlite(
-      "do-sqlite",
-      db,
-      (utils) => {
-         // must be async to work with the miniflare mock
-         const getStmt = async (sql: string, parameters?: any[] | readonly any[]) =>
-            await db.exec(sql, ...(parameters || []));
-
-         const mapResult = (
-            cursor: SqlStorageCursor<Record<string, SqlStorageValue>>,
-         ): QueryResult<any> => {
-            const numAffectedRows =
-               cursor.rowsWritten > 0 ? utils.parseBigInt(cursor.rowsWritten) : undefined;
-            const insertId = undefined;
-
-            const obj = {
-               insertId,
-               numAffectedRows,
-               rows: cursor.toArray() || [],
-               // @ts-ignore
-               meta: {
-                  rowsWritten: cursor.rowsWritten,
-                  rowsRead: cursor.rowsRead,
-                  databaseSize: db.databaseSize,
-               },
-            };
-            //console.info("mapResult", obj);
-            return obj;
-         };
-
-         return {
-            db,
-            batch: async (stmts) => {
-               // @todo: maybe wrap in a transaction?
-               // because d1 implicitly does a transaction on batch
-               return Promise.all(
-                  stmts.map(async (stmt) => {
-                     return mapResult(await getStmt(stmt.sql, stmt.parameters));
-                  }),
-               );
-            },
-            query: utils.buildQueryFn({
-               all: async (sql, parameters) => {
-                  const prep = getStmt(sql, parameters);
-                  return mapResult(await prep).rows;
-               },
-               run: async (sql, parameters) => {
-                  const prep = getStmt(sql, parameters);
-                  return mapResult(await prep);
-               },
-            }),
-            close: () => {},
-         };
-      },
-      {
-         supports: {
-            batching: true,
-            softscans: false,
-         },
-         excludeTables: ["_cf_KV", "_cf_METADATA"],
-      },
-   );
-}
@@ -1,92 +0,0 @@
-/// <reference types="@cloudflare/workers-types" />
-
-import { describe, test, expect } from "vitest";
-
-import { viTestRunner } from "adapter/node/vitest";
-import { connectionTestSuite } from "data/connection/connection-test-suite";
-import { Miniflare } from "miniflare";
-import { doSqlite } from "./DoConnection";
-
-const script = `
-import { DurableObject } from "cloudflare:workers";
-
-export class TestObject extends DurableObject {
-    constructor(ctx, env) {
-      super(ctx, env);
-      this.storage = ctx.storage;
-   }
-      
-   async exec(sql, ...parameters) {
-      //return { sql, parameters }
-      const cursor = this.storage.sql.exec(sql, ...parameters);
-      return {
-         rows: cursor.toArray() || [],
-         rowsWritten: cursor.rowsWritten,
-         rowsRead: cursor.rowsRead,
-         databaseSize: this.storage.sql.databaseSize,
-      }
-   }
-      
-   async databaseSize() {
-      return this.storage.sql.databaseSize;
-   }
-}
-   
-export default {
-   async fetch(request, env) {
-      const stub = env.TEST_OBJECT.get(env.TEST_OBJECT.idFromName("test"));
-      return stub.fetch(request);
-   }
-}
-`;
-
-describe("doSqlite", async () => {
-   connectionTestSuite(viTestRunner, {
-      makeConnection: async () => {
-         const mf = new Miniflare({
-            modules: true,
-            durableObjects: { TEST_OBJECT: { className: "TestObject", useSQLite: true } },
-            script,
-         });
-
-         const ns = await mf.getDurableObjectNamespace("TEST_OBJECT");
-         const id = ns.idFromName("test");
-         const stub = ns.get(id) as unknown as DurableObjectStub<
-            Rpc.DurableObjectBranded & {
-               exec: (sql: string, ...parameters: any[]) => Promise<any>;
-            }
-         >;
-
-         const stubs: any[] = [];
-         const mock = {
-            databaseSize: 0,
-            exec: async function (sql: string, ...parameters: any[]) {
-               // @ts-ignore
-               const result = (await stub.exec(sql, ...parameters)) as any;
-               this.databaseSize = result.databaseSize;
-               stubs.push(result);
-               return {
-                  toArray: () => result.rows,
-                  rowsWritten: result.rowsWritten,
-                  rowsRead: result.rowsRead,
-               };
-            },
-         };
-
-         return {
-            connection: doSqlite({ sql: mock as any }),
-            dispose: async () => {
-               await Promise.all(
-                  stubs.map((stub) => {
-                     try {
-                        return stub[Symbol.dispose]();
-                     } catch (e) {}
-                  }),
-               );
-               await mf.dispose();
-            },
-         };
-      },
-      rawDialectDetails: ["meta.rowsWritten", "meta.rowsRead", "meta.databaseSize"],
-   });
-});
@@ -1,45 +0,0 @@
-import type { ICacheDriver } from "core/drivers";
-
-interface WorkersKVCacheOptions {
-   // default time-to-live in seconds
-   defaultTTL?: number;
-   // prefix for the cache key
-   cachePrefix?: string;
-}
-
-export class WorkersKVCacheDriver implements ICacheDriver {
-   protected readonly kv: KVNamespace;
-   protected readonly defaultTTL?: number;
-   protected readonly cachePrefix: string;
-
-   constructor(kv: KVNamespace, options: WorkersKVCacheOptions = {}) {
-      this.kv = kv;
-      this.cachePrefix = options.cachePrefix ?? "";
-      this.defaultTTL = options.defaultTTL;
-   }
-
-   protected getKey(key: string): string {
-      return this.cachePrefix + key;
-   }
-
-   async get(key: string): Promise<string | undefined> {
-      const value = await this.kv.get(this.getKey(key));
-      return value === null ? undefined : value;
-   }
-
-   async set(key: string, value: string, ttl?: number): Promise<void> {
-      let expirationTtl = ttl ?? this.defaultTTL;
-      if (expirationTtl) {
-         expirationTtl = Math.max(expirationTtl, 60);
-      }
-      await this.kv.put(this.getKey(key), value, { expirationTtl: expirationTtl });
-   }
-
-   async del(key: string): Promise<void> {
-      await this.kv.delete(this.getKey(key));
-   }
-}
-
-export const cacheWorkersKV = (kv: KVNamespace, options?: WorkersKVCacheOptions) => {
-   return new WorkersKVCacheDriver(kv, options);
-};
@@ -1,34 +0,0 @@
-import { describe, vi, afterAll, beforeAll } from "vitest";
-import { cacheWorkersKV } from "./cache";
-import { viTestRunner } from "adapter/node/vitest";
-import { cacheDriverTestSuite } from "core/drivers/cache/cache-driver-test-suite";
-import { Miniflare } from "miniflare";
-
-describe("cacheWorkersKV", async () => {
-   beforeAll(() => {
-      vi.useFakeTimers();
-   });
-   afterAll(() => {
-      vi.restoreAllMocks();
-   });
-
-   const mf = new Miniflare({
-      modules: true,
-      script: "export default { async fetch() { return new Response(null); } }",
-      kvNamespaces: ["KV"],
-   });
-
-   const kv = (await mf.getKVNamespace("KV")) as unknown as KVNamespace;
-
-   cacheDriverTestSuite(viTestRunner, {
-      makeCache: () => cacheWorkersKV(kv),
-      setTime: (ms: number) => {
-         vi.advanceTimersByTime(ms);
-      },
-      options: {
-         minTTL: 60,
-         // doesn't work with miniflare
-         skipTTL: true,
-      },
-   });
-});
@@ -1,10 +1,10 @@
-import { d1Sqlite, type D1ConnectionConfig } from "./connection/D1Connection";
+import { D1Connection, type D1ConnectionConfig } from "./D1Connection";

 export * from "./cloudflare-workers.adapter";
 export { makeApp, getFresh } from "./modes/fresh";
 export { getCached } from "./modes/cached";
 export { DurableBkndApp, getDurable } from "./modes/durable";
-export { d1Sqlite, type D1ConnectionConfig };
+export { D1Connection, type D1ConnectionConfig };
 export {
   getBinding,
   getBindings,
@@ -12,13 +12,7 @@ export {
   type GetBindingType,
   type BindingMap,
 } from "./bindings";
-export { constants } from "./config";
-export { StorageR2Adapter, registerMedia } from "./storage/StorageR2Adapter";
-export { registries } from "bknd";

-// for compatibility with old code
-export function d1<DB extends D1Database | D1DatabaseSession = D1Database>(
-   config: D1ConnectionConfig<DB>,
-) {
-   return d1Sqlite<DB>(config);
+export function d1(config: D1ConnectionConfig) {
+   return new D1Connection(config);
 }
@@ -5,9 +5,8 @@ import { makeConfig, registerAsyncsExecutionContext, constants } from "../config

 export async function getCached<Env extends CloudflareEnv = CloudflareEnv>(
   config: CloudflareBkndConfig<Env>,
-   args: Context<Env>,
+   { env, ctx, ...args }: Context<Env>,
 ) {
-   const { env, ctx } = args;
   const { kv } = config.bindings?.(env)!;
   if (!kv) throw new Error("kv namespace is not defined in cloudflare.bindings");
   const key = config.key ?? "app";
@@ -21,7 +20,7 @@ export async function getCached<Env extends CloudflareEnv = CloudflareEnv>(

   const app = await createRuntimeApp(
      {
-         ...makeConfig(config, args),
+         ...makeConfig(config, env),
         initialConfig,
         onBuilt: async (app) => {
            registerAsyncsExecutionContext(app, ctx);
@@ -42,7 +41,7 @@ export async function getCached<Env extends CloudflareEnv = CloudflareEnv>(
            await config.beforeBuild?.(app);
         },
      },
-      args,
+      { env, ctx, ...args },
   );

   if (!cachedConfig) {
@@ -3,7 +3,7 @@ import type { App, CreateAppConfig } from "bknd";
 import { createRuntimeApp, makeConfig } from "bknd/adapter";
 import type { CloudflareBkndConfig, Context, CloudflareEnv } from "../index";
 import { constants, registerAsyncsExecutionContext } from "../config";
-import { $console } from "core/utils";
+import { $console } from "core";

 export async function getDurable<Env extends CloudflareEnv = CloudflareEnv>(
   config: CloudflareBkndConfig<Env>,
@@ -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({
@@ -1,13 +1,13 @@
 import { createRuntimeApp, type RuntimeOptions } from "bknd/adapter";
 import type { CloudflareBkndConfig, Context, CloudflareEnv } from "../index";
-import { makeConfig, registerAsyncsExecutionContext, type CfMakeConfigArgs } from "../config";
+import { makeConfig, registerAsyncsExecutionContext } from "../config";

 export async function makeApp<Env extends CloudflareEnv = CloudflareEnv>(
   config: CloudflareBkndConfig<Env>,
-   args?: CfMakeConfigArgs<Env>,
+   args: Env = {} as Env,
   opts?: RuntimeOptions,
 ) {
-   return await createRuntimeApp<Env>(makeConfig(config, args), args?.env, opts);
+   return await createRuntimeApp<Env>(makeConfig(config, args), args, opts);
 }

 export async function getFresh<Env extends CloudflareEnv = CloudflareEnv>(
@@ -23,7 +23,7 @@ export async function getFresh<Env extends CloudflareEnv = CloudflareEnv>(
            await config.onBuilt?.(app);
         },
      },
-      ctx,
+      ctx.env,
      opts,
   );
 }
@@ -0,0 +1,32 @@
+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();
+});
@@ -1,12 +1,15 @@
-import { registries, isDebug, guessMimeType } from "bknd";
+import { registries } from "bknd";
+import { isDebug } from "bknd/core";
+import { StringEnum } from "bknd/utils";
+import { guessMimeType as guess, StorageAdapter, type FileBody } from "bknd/media";
 import { getBindings } from "../bindings";
-import { s } from "bknd/utils";
-import { StorageAdapter, type FileBody } from "bknd";
+import * as tb from "@sinclair/typebox";
+const { Type } = tb;

 export function makeSchema(bindings: string[] = []) {
-   return s.object(
+   return Type.Object(
      {
-         binding: bindings.length > 0 ? s.string({ enum: bindings }) : s.string().optional(),
+         binding: bindings.length > 0 ? StringEnum(bindings) : Type.Optional(Type.String()),
      },
      { title: "R2", description: "Cloudflare R2 storage" },
   );
@@ -60,49 +63,46 @@ export class StorageR2Adapter extends StorageAdapter {

   async putObject(key: string, body: FileBody) {
      try {
-         const res = await this.bucket.put(this.getKey(key), body);
+         const res = await this.bucket.put(key, body);
         return res?.etag;
      } catch (e) {
         return undefined;
      }
   }
-   async listObjects(prefix = ""): Promise<{ key: string; last_modified: Date; size: number }[]> {
-      const list = await this.bucket.list({ limit: 50, prefix: this.getKey(prefix) });
+   async listObjects(
+      prefix?: string,
+   ): Promise<{ key: string; last_modified: Date; size: number }[]> {
+      const list = await this.bucket.list({ limit: 50 });
      return list.objects.map((item) => ({
-         key: item.key.replace(this.getKey(""), ""),
+         key: item.key,
         size: item.size,
         last_modified: item.uploaded,
      }));
   }

   private async headObject(key: string): Promise<R2Object | null> {
-      return await this.bucket.head(this.getKey(key));
+      return await this.bucket.head(key);
   }

   async objectExists(key: string): Promise<boolean> {
      return (await this.headObject(key)) !== null;
   }

-   async getObject(_key: string, headers: Headers): Promise<Response> {
+   async getObject(key: string, headers: Headers): Promise<Response> {
      let object: R2ObjectBody | null;
-      const key = this.getKey(_key);
-
      const responseHeaders = new Headers({
         "Accept-Ranges": "bytes",
-         "Content-Type": guessMimeType(key),
+         "Content-Type": guess(key),
      });

-      const range = headers.has("range");
-
      //console.log("getObject:headers", headersToObject(headers));
-      if (range) {
+      if (headers.has("range")) {
         const options = isDebug()
            ? {} // miniflare doesn't support range requests
            : {
                 range: headers,
                 onlyIf: headers,
              };
-
         object = (await this.bucket.get(key, options)) as R2ObjectBody;

         if (!object) {
@@ -130,18 +130,17 @@ export class StorageR2Adapter extends StorageAdapter {
      responseHeaders.set("Last-Modified", object.uploaded.toUTCString());

      return new Response(object.body, {
-         status: range ? 206 : 200,
+         status: object.range ? 206 : 200,
         headers: responseHeaders,
      });
   }

   private writeHttpMetadata(headers: Headers, object: R2Object | R2ObjectBody): void {
      let metadata = object.httpMetadata;
-
      if (!metadata || Object.keys(metadata).length === 0) {
         // guessing is especially required for dev environment (miniflare)
         metadata = {
-            contentType: guessMimeType(object.key),
+            contentType: guess(object.key),
         };
      }

@@ -158,23 +157,19 @@ export class StorageR2Adapter extends StorageAdapter {
      }

      return {
-         type: String(head.httpMetadata?.contentType ?? guessMimeType(key)),
+         type: String(head.httpMetadata?.contentType ?? guess(key)),
         size: head.size,
      };
   }

   async deleteObject(key: string): Promise<void> {
-      await this.bucket.delete(this.getKey(key));
+      await this.bucket.delete(key);
   }

   getObjectUrl(key: string): string {
      throw new Error("Method getObjectUrl not implemented.");
   }

-   protected getKey(key: string) {
-      return key;
-   }
-
   toJSON(secrets?: boolean) {
      return {
         type: this.getName(),
@@ -1,32 +0,0 @@
-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();
-});
@@ -1,14 +0,0 @@
-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"],
-   },
-});
@@ -1,8 +1,7 @@
-import { config as $config, App, type CreateAppConfig, Connection, guessMimeType } from "bknd";
-import { $console } from "bknd/utils";
-import type { Context, MiddlewareHandler, Next } from "hono";
+import { App, type CreateAppConfig } from "bknd";
+import { config as $config } from "bknd/core";
+import type { MiddlewareHandler } from "hono";
 import type { AdminControllerOptions } from "modules/server/AdminController";
-import type { Manifest } from "vite";

 export type BkndConfig<Args = any> = CreateAppConfig & {
   app?: CreateAppConfig | ((args: Args) => CreateAppConfig);
@@ -60,21 +59,7 @@ export async function createAdapterApp<Config extends BkndConfig = BkndConfig, A
   const id = opts?.id ?? "app";
   let app = apps.get(id);
   if (!app || opts?.force) {
-      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;
-            const conf = appConfig.connection ?? { url: ":memory:" };
-            connection = sqlite(conf);
-            $console.info(`Using ${connection!.name} connection`, conf.url);
-         }
-         appConfig.connection = connection;
-      }
-
-      app = App.create(appConfig);
+      app = App.create(makeConfig(config, args));
      apps.set(id, app);
   }
   return app;
@@ -137,55 +122,3 @@ export async function createRuntimeApp<Args = DefaultArgs>(

   return app;
 }
-
-/**
- * Creates a middleware handler to serve static assets via dynamic imports.
- * This is useful for environments where filesystem access is limited but bundled assets can be imported.
- *
- * @param manifest - Vite manifest object containing asset information
- * @returns Hono middleware handler for serving static assets
- *
- * @example
- * ```typescript
- * import { serveStaticViaImport } from "bknd/adapter";
- *
- * serve({
- *   serveStatic: serveStaticViaImport(),
- * });
- * ```
- */
-export function serveStaticViaImport(opts?: { manifest?: Manifest }) {
-   let files: string[] | undefined;
-
-   // @ts-ignore
-   return async (c: Context, next: Next) => {
-      if (!files) {
-         const manifest =
-            opts?.manifest || ((await import("bknd/dist/manifest.json")).default as Manifest);
-         files = Object.values(manifest).flatMap((asset) => [asset.file, ...(asset.css || [])]);
-      }
-
-      const path = c.req.path.substring(1);
-      if (files.includes(path)) {
-         try {
-            const content = await import(`bknd/static/${path}?raw`, {
-               /* @vite-ignore */
-               assert: { type: "text" },
-            }).then((m) => m.default);
-
-            if (content) {
-               return c.body(content, {
-                  headers: {
-                     "Content-Type": guessMimeType(path),
-                     "Cache-Control": "public, max-age=31536000, immutable",
-                  },
-               });
-            }
-         } catch (e) {
-            console.error("Error serving static file:", e);
-            return c.text("File not found", 404);
-         }
-      }
-      await next();
-   };
-}
@@ -3,6 +3,7 @@ import { isNode } from "bknd/utils";
 import type { NextApiRequest } from "next";

 type NextjsEnv = NextApiRequest["env"];
+
 export type NextjsBkndConfig<Env = NextjsEnv> = FrameworkBkndConfig<Env> & {
   cleanRequest?: { searchParams?: string[] };
 };
@@ -1,57 +0,0 @@
-import { genericSqlite } from "bknd";
-import { DatabaseSync } from "node:sqlite";
-
-export type NodeSqliteConnectionConfig = {
-   database: DatabaseSync;
-};
-
-export function nodeSqlite(config?: NodeSqliteConnectionConfig | { url: string }) {
-   let db: DatabaseSync;
-   if (config) {
-      if ("database" in config) {
-         db = config.database;
-      } else {
-         db = new DatabaseSync(config.url);
-      }
-   } else {
-      db = new DatabaseSync(":memory:");
-   }
-
-   return genericSqlite(
-      "node-sqlite",
-      db,
-      (utils) => {
-         const getStmt = (sql: string) => {
-            const stmt = db.prepare(sql);
-            //stmt.setReadBigInts(true);
-            return stmt;
-         };
-
-         return {
-            db,
-            query: utils.buildQueryFn({
-               all: (sql, parameters = []) => getStmt(sql).all(...parameters),
-               run: (sql, parameters = []) => {
-                  const { changes, lastInsertRowid } = getStmt(sql).run(...parameters);
-                  return {
-                     insertId: utils.parseBigInt(lastInsertRowid),
-                     numAffectedRows: utils.parseBigInt(changes),
-                  };
-               },
-            }),
-            close: () => db.close(),
-            iterator: (isSelect, sql, parameters = []) => {
-               if (!isSelect) {
-                  throw new Error("Only support select in stream()");
-               }
-               return getStmt(sql).iterate(...parameters) as any;
-            },
-         };
-      },
-      {
-         supports: {
-            batching: false,
-         },
-      },
-   );
-}
@@ -1,15 +0,0 @@
-import { nodeSqlite } from "./NodeSqliteConnection";
-import { DatabaseSync } from "node:sqlite";
-import { connectionTestSuite } from "data/connection/connection-test-suite";
-import { describe } from "vitest";
-import { viTestRunner } from "../vitest";
-
-describe("NodeSqliteConnection", () => {
-   connectionTestSuite(viTestRunner, {
-      makeConnection: () => ({
-         connection: nodeSqlite({ database: new DatabaseSync(":memory:") }),
-         dispose: async () => {},
-      }),
-      rawDialectDetails: [],
-   });
-});
@@ -1,3 +1,18 @@
+import { registries } from "bknd";
+import { type LocalAdapterConfig, StorageLocalAdapter } from "./storage/StorageLocalAdapter";
+
 export * from "./node.adapter";
-export * from "./storage";
-export * from "./connection/NodeSqliteConnection";
+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);
+   };
+}
@@ -1,14 +1,14 @@
-import { describe, beforeAll, afterAll } from "vitest";
+import { describe, before, after } from "node:test";
 import * as node from "./node.adapter";
 import { adapterTestSuite } from "adapter/adapter-test-suite";
-import { viTestRunner } from "adapter/node/vitest";
+import { nodeTestRunner } from "adapter/node/test";
 import { disableConsoleLog, enableConsoleLog } from "core/utils";

-beforeAll(() => disableConsoleLog());
-afterAll(enableConsoleLog);
+before(() => disableConsoleLog());
+after(enableConsoleLog);

 describe("node adapter", () => {
-   adapterTestSuite(viTestRunner, {
+   adapterTestSuite(nodeTestRunner, {
      makeApp: node.createApp,
      makeHandler: node.createHandler,
   });
@@ -1,5 +1,5 @@
 import { afterAll, beforeAll, describe } from "bun:test";
-import { createApp, createHandler } from "./node.adapter";
+import * as node 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: createApp,
-      makeHandler: createHandler,
+      makeApp: node.createApp,
+      makeHandler: node.createHandler,
   });
 });
--- a/Show More
+++ b/Show More