@fragno-dev/db 0.3.0 → 0.4.1

package/dist/with-database.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"with-database.d.ts","names":[],"sources":["../src/with-database.ts"],"sourcesContent":[],"mappings":";;;;;;;;;AA8CA;;;;;;;;;;;;;;;;;AAyBI,iBAzBY,YAyBZ,CAAA,gBAzByC,SAyBzC,CAAA,CAAA,MAAA,EAxBM,OAwBN,CAAA,EAAA,CAAA,OAAA,EAAA,KAAA,EAAA,aAAA,EAAA,SAAA,EAAA,YAAA,EAAA,gBAAA,EAAA,4BAhB0B,kBAgB1B,EAAA,4BAf0B,kBAe1B,EAAA,eAAA,EAAA,yBAbuB,MAavB,CAAA,MAAA,EAbsC,6BAatC,CAAA,CAAA,CAAA,OAAA,EAXO,yBAWP,CAVA,OAUA,EATA,kBASA,EARA,KAQA,EAPA,aAOA,EANA,SAMA,EALA,YAKA,EAJA,gBAIA,EAHA,mBAGA,EAFA,mBAEA,EADA,eACA,EAAA,gBAAA,CAAA,EAAA,GAEC,iCAFD,CAGF,OAHE,EAIF,OAJE,EAKF,KALE,GAKM,4BALN,CAKmC,OALnC,CAAA,EAMF,aANE,EAOF,SAPE,EAQF,YARE,EASF,gBATE,EAUF,QAVE,EAWF,sBAXE,CAWqB,QAXrB,CAAA,EAYF,sBAZE,EAaF,gBAbE,GAAA;EAXO,gBAAA,EAwB8B,wBAxB9B;CAcT,CAAA"}
+{"version":3,"file":"with-database.d.ts","names":[],"sources":["../src/with-database.ts"],"sourcesContent":[],"mappings":";;;;;;;;AAiCA;;;;;;;;;;;;;;;;;AAcW,iBAdK,YAcL,CAAA,gBAdkC,SAclC,CAAA,CAAA,MAAA,EAbD,OAaC,CAAA,EAAA,CAAA,OAAA,EAAA,KAAA,EAAA,aAAA,EAAA,SAAA,EAAA,YAAA,EAAA,gBAAA,EAAA,4BALmB,kBAKnB,EAAA,4BAJmB,kBAInB,EAAA,eAAA,EAAA,wBAAA,SAFwB,iBAExB,EAAA,CAAA,CAAA,OAAA,EAAA,yBAAA,CACP,OADO,EAEP,kBAFO,EAGP,KAHO,EAIP,aAJO,EAKP,SALO,EAMP,YANO,EAOP,gBAPO,EAQP,mBARO,EASP,mBATO,EAUP,eAVO,EAWP,eAXO,CAAA,EAAA,GAaN,iCAbM,CAcT,OAdS,EAeT,OAfS,EAgBT,KAhBS,GAgBD,4BAhBC,CAgB4B,OAhB5B,CAAA,EAiBT,aAjBS,EAkBT,SAlBS,EAmBT,YAnBS,EAoBT,gBApBS,EAqBT,QArBS,EAsBT,sBAtBS,CAsBc,QAtBd,CAAA,EAuBT,sBAvBS,EAwBT,eAxBS,CAAA"}

package/dist/with-database.js

@@ -1,16 +1,11 @@
-import { instantiate } from "./packages/fragno/dist/api/fragment-instantiator.js";
-import { resolveDatabaseAdapter } from "./util/default-database-adapter.js";
 import { DatabaseFragmentDefinitionBuilder } from "./db-fragment-definition-builder.js";
-import { internalFragmentDef } from "./fragments/internal-fragment.js";
-import { internalFragmentRoutes } from "./fragments/internal-fragment.routes.js";
+import { getInternalFragment, getRegistryForAdapterSync } from "./internal/adapter-registry.js";
+import { FragmentDefinitionBuilder } from "@fragno-dev/core";
 
 //#region src/with-database.ts
-function shouldExposeOutboxRoutes(options, schema) {
-	return resolveDatabaseAdapter(options, schema).outbox?.enabled ?? false;
-}
 /**
 * Helper to add database support to a fragment builder.
-* Automatically links the internal fragment and adds ImplicitDatabaseDependencies to the TDeps type.
+* Registers the schema with the adapter registry and adds ImplicitDatabaseDependencies to the TDeps type.
 *
 * @example
 * ```typescript
@@ -28,13 +23,10 @@ function shouldExposeOutboxRoutes(options, schema) {
 */
 function withDatabase(schema) {
 	return (builder) => {
-		return new DatabaseFragmentDefinitionBuilder(builder.withLinkedFragment("_fragno_internal", ({ config, options }) => {
-			const internalRoutes = shouldExposeOutboxRoutes(options, schema) ? [internalFragmentRoutes] : [];
-			return instantiate(internalFragmentDef).withConfig(config).withOptions({
-				...options,
-				databaseNamespace: null
-			}).withRoutes(internalRoutes).build();
-		}), schema);
+		return new DatabaseFragmentDefinitionBuilder(builder, schema, void 0, void 0, {
+			getRegistryForAdapterSync,
+			getInternalFragment
+		});
 	};
 }
 

package/dist/with-database.js.map

@@ -1 +1 @@
-{"version":3,"file":"with-database.js","names":[],"sources":["../src/with-database.ts"],"sourcesContent":["import type { AnySchema } from \"./schema/create\";\nimport type {\n  RequestThisContext,\n  FragnoPublicConfig,\n  AnyFragnoInstantiatedFragment,\n} from \"@fragno-dev/core\";\nimport { FragmentDefinitionBuilder, instantiate } from \"@fragno-dev/core\";\nimport {\n  DatabaseFragmentDefinitionBuilder,\n  type DatabaseServiceContext,\n  type DatabaseHandlerContext,\n  type ImplicitDatabaseDependencies,\n  type FragnoPublicConfigWithDatabase,\n  type DatabaseRequestStorage,\n} from \"./db-fragment-definition-builder\";\nimport { internalFragmentDef, type InternalFragmentInstance } from \"./fragments/internal-fragment\";\nimport { internalFragmentRoutes } from \"./fragments/internal-fragment.routes\";\nimport type { HooksMap } from \"./hooks/hooks\";\nimport { resolveDatabaseAdapter } from \"./util/default-database-adapter\";\n\nfunction shouldExposeOutboxRoutes(\n  options: FragnoPublicConfigWithDatabase,\n  schema: AnySchema,\n): boolean {\n  const adapter = resolveDatabaseAdapter(options, schema) as { outbox?: { enabled?: boolean } };\n  return adapter.outbox?.enabled ?? false;\n}\n\n/**\n * Helper to add database support to a fragment builder.\n * Automatically links the internal fragment and adds ImplicitDatabaseDependencies to the TDeps type.\n *\n * @example\n * ```typescript\n * // With .extend() - recommended\n * const def = defineFragment(\"my-frag\")\n *   .extend(withDatabase(mySchema))\n *   .withDependencies(...)\n *   .build();\n *\n * // Or as a function wrapper\n * const def = withDatabase(mySchema)(defineFragment(\"my-frag\"))\n *   .withDependencies(...)\n *   .build();\n * ```\n */\nexport function withDatabase<TSchema extends AnySchema>(\n  schema: TSchema,\n): <\n  TConfig,\n  TDeps,\n  TBaseServices,\n  TServices,\n  TServiceDeps,\n  TPrivateServices,\n  TServiceThisContext extends RequestThisContext,\n  THandlerThisContext extends RequestThisContext,\n  TRequestStorage,\n  TLinkedFragments extends Record<string, AnyFragnoInstantiatedFragment>,\n>(\n  builder: FragmentDefinitionBuilder<\n    TConfig,\n    FragnoPublicConfig,\n    TDeps,\n    TBaseServices,\n    TServices,\n    TServiceDeps,\n    TPrivateServices,\n    TServiceThisContext,\n    THandlerThisContext,\n    TRequestStorage,\n    TLinkedFragments\n  >,\n) => DatabaseFragmentDefinitionBuilder<\n  TSchema,\n  TConfig,\n  TDeps & ImplicitDatabaseDependencies<TSchema>,\n  TBaseServices,\n  TServices,\n  TServiceDeps,\n  TPrivateServices,\n  HooksMap,\n  DatabaseServiceContext<HooksMap>,\n  DatabaseHandlerContext,\n  TLinkedFragments & { _fragno_internal: InternalFragmentInstance }\n> {\n  return <\n    TConfig,\n    TDeps,\n    TBaseServices,\n    TServices,\n    TServiceDeps,\n    TPrivateServices,\n    TServiceThisContext extends RequestThisContext,\n    THandlerThisContext extends RequestThisContext,\n    TRequestStorage,\n    TLinkedFragments extends Record<string, AnyFragnoInstantiatedFragment>,\n  >(\n    builder: FragmentDefinitionBuilder<\n      TConfig,\n      FragnoPublicConfig,\n      TDeps,\n      TBaseServices,\n      TServices,\n      TServiceDeps,\n      TPrivateServices,\n      TServiceThisContext,\n      THandlerThisContext,\n      TRequestStorage,\n      TLinkedFragments\n    >,\n  ) => {\n    const builderWithInternal = builder.withLinkedFragment(\n      \"_fragno_internal\",\n      ({ config, options }) => {\n        const internalRoutes = shouldExposeOutboxRoutes(\n          options as FragnoPublicConfigWithDatabase,\n          schema,\n        )\n          ? [internalFragmentRoutes]\n          : [];\n\n        // Cast is safe: by the time this callback is invoked during fragment instantiation,\n        // the options will be FragnoPublicConfigWithDatabase (enforced by DatabaseFragmentDefinitionBuilder)\n        return instantiate(internalFragmentDef)\n          .withConfig(config as {})\n          .withOptions({\n            ...(options as FragnoPublicConfigWithDatabase),\n            databaseNamespace: null,\n          })\n          .withRoutes(internalRoutes)\n          .build();\n      },\n    );\n\n    // Cast is safe: we're creating a DatabaseFragmentDefinitionBuilder which internally uses\n    // FragnoPublicConfigWithDatabase, but the input builder uses FragnoPublicConfig.\n    // The database builder's build() method will enforce FragnoPublicConfigWithDatabase at the end.\n    // We also add ImplicitDatabaseDependencies to TDeps so they're available in service constructors.\n    // Note: We discard TRequestStorage here because database fragments manage their own storage (DatabaseRequestStorage).\n    // We set TServiceThisContext to DatabaseServiceContext (restricted) and THandlerThisContext to DatabaseHandlerContext (full).\n    return new DatabaseFragmentDefinitionBuilder<\n      TSchema,\n      TConfig,\n      TDeps & ImplicitDatabaseDependencies<TSchema>,\n      TBaseServices,\n      TServices,\n      TServiceDeps,\n      TPrivateServices,\n      {}, // Start with empty hooks, provideHooks() will update this\n      DatabaseServiceContext<{}>,\n      DatabaseHandlerContext,\n      TLinkedFragments & { _fragno_internal: InternalFragmentInstance }\n    >(\n      builderWithInternal as unknown as FragmentDefinitionBuilder<\n        TConfig,\n        FragnoPublicConfigWithDatabase,\n        TDeps & ImplicitDatabaseDependencies<TSchema>,\n        TBaseServices,\n        TServices,\n        TServiceDeps,\n        TPrivateServices,\n        DatabaseServiceContext<{}>,\n        DatabaseHandlerContext,\n        DatabaseRequestStorage,\n        TLinkedFragments & { _fragno_internal: InternalFragmentInstance }\n      >,\n      schema,\n    );\n  };\n}\n"],"mappings":";;;;;;;AAoBA,SAAS,yBACP,SACA,QACS;AAET,QADgB,uBAAuB,SAAS,OAAO,CACxC,QAAQ,WAAW;;;;;;;;;;;;;;;;;;;;AAqBpC,SAAgB,aACd,QAsCA;AACA,SAYE,YAaG;AA8BH,SAAO,IAAI,kCA7BiB,QAAQ,mBAClC,qBACC,EAAE,QAAQ,cAAc;GACvB,MAAM,iBAAiB,yBACrB,SACA,OACD,GACG,CAAC,uBAAuB,GACxB,EAAE;AAIN,UAAO,YAAY,oBAAoB,CACpC,WAAW,OAAa,CACxB,YAAY;IACX,GAAI;IACJ,mBAAmB;IACpB,CAAC,CACD,WAAW,eAAe,CAC1B,OAAO;IAEb,EAkCC,OACD"}
+{"version":3,"file":"with-database.js","names":[],"sources":["../src/with-database.ts"],"sourcesContent":["import type { RequestThisContext, FragnoPublicConfig, AnyRouteOrFactory } from \"@fragno-dev/core\";\nimport { FragmentDefinitionBuilder } from \"@fragno-dev/core\";\n\nimport {\n  DatabaseFragmentDefinitionBuilder,\n  type DatabaseServiceContext,\n  type DatabaseHandlerContext,\n  type ImplicitDatabaseDependencies,\n  type FragnoPublicConfigWithDatabase,\n  type DatabaseRequestStorage,\n} from \"./db-fragment-definition-builder\";\nimport type { HooksMap } from \"./hooks/hooks\";\nimport { getInternalFragment, getRegistryForAdapterSync } from \"./internal/adapter-registry\";\nimport type { AnySchema } from \"./schema/create\";\n\n/**\n * Helper to add database support to a fragment builder.\n * Registers the schema with the adapter registry and adds ImplicitDatabaseDependencies to the TDeps type.\n *\n * @example\n * ```typescript\n * // With .extend() - recommended\n * const def = defineFragment(\"my-frag\")\n *   .extend(withDatabase(mySchema))\n *   .withDependencies(...)\n *   .build();\n *\n * // Or as a function wrapper\n * const def = withDatabase(mySchema)(defineFragment(\"my-frag\"))\n *   .withDependencies(...)\n *   .build();\n * ```\n */\nexport function withDatabase<TSchema extends AnySchema>(\n  schema: TSchema,\n): <\n  TConfig,\n  TDeps,\n  TBaseServices,\n  TServices,\n  TServiceDeps,\n  TPrivateServices,\n  TServiceThisContext extends RequestThisContext,\n  THandlerThisContext extends RequestThisContext,\n  TRequestStorage,\n  TInternalRoutes extends readonly AnyRouteOrFactory[],\n>(\n  builder: FragmentDefinitionBuilder<\n    TConfig,\n    FragnoPublicConfig,\n    TDeps,\n    TBaseServices,\n    TServices,\n    TServiceDeps,\n    TPrivateServices,\n    TServiceThisContext,\n    THandlerThisContext,\n    TRequestStorage,\n    TInternalRoutes\n  >,\n) => DatabaseFragmentDefinitionBuilder<\n  TSchema,\n  TConfig,\n  TDeps & ImplicitDatabaseDependencies<TSchema>,\n  TBaseServices,\n  TServices,\n  TServiceDeps,\n  TPrivateServices,\n  HooksMap,\n  DatabaseServiceContext<HooksMap>,\n  DatabaseHandlerContext,\n  TInternalRoutes\n> {\n  return <\n    TConfig,\n    TDeps,\n    TBaseServices,\n    TServices,\n    TServiceDeps,\n    TPrivateServices,\n    TServiceThisContext extends RequestThisContext,\n    THandlerThisContext extends RequestThisContext,\n    TRequestStorage,\n    TInternalRoutes extends readonly AnyRouteOrFactory[],\n  >(\n    builder: FragmentDefinitionBuilder<\n      TConfig,\n      FragnoPublicConfig,\n      TDeps,\n      TBaseServices,\n      TServices,\n      TServiceDeps,\n      TPrivateServices,\n      TServiceThisContext,\n      THandlerThisContext,\n      TRequestStorage,\n      TInternalRoutes\n    >,\n  ) => {\n    // Cast is safe: we're creating a DatabaseFragmentDefinitionBuilder which internally uses\n    // FragnoPublicConfigWithDatabase, but the input builder uses FragnoPublicConfig.\n    // The database builder's build() method will enforce FragnoPublicConfigWithDatabase at the end.\n    // We also add ImplicitDatabaseDependencies to TDeps so they're available in service constructors.\n    // Note: We discard TRequestStorage here because database fragments manage their own storage (DatabaseRequestStorage).\n    // We set TServiceThisContext to DatabaseServiceContext (restricted) and THandlerThisContext to DatabaseHandlerContext (full).\n    return new DatabaseFragmentDefinitionBuilder<\n      TSchema,\n      TConfig,\n      TDeps & ImplicitDatabaseDependencies<TSchema>,\n      TBaseServices,\n      TServices,\n      TServiceDeps,\n      TPrivateServices,\n      {}, // Start with empty hooks, provideHooks() will update this\n      DatabaseServiceContext<{}>,\n      DatabaseHandlerContext,\n      TInternalRoutes\n    >(\n      builder as unknown as FragmentDefinitionBuilder<\n        TConfig,\n        FragnoPublicConfigWithDatabase,\n        TDeps & ImplicitDatabaseDependencies<TSchema>,\n        TBaseServices,\n        TServices,\n        TServiceDeps,\n        TPrivateServices,\n        DatabaseServiceContext<{}>,\n        DatabaseHandlerContext,\n        DatabaseRequestStorage,\n        TInternalRoutes\n      >,\n      schema,\n      undefined,\n      undefined,\n      {\n        getRegistryForAdapterSync,\n        getInternalFragment,\n      },\n    );\n  };\n}\n"],"mappings":";;;;;;;;;;;;;;;;;;;;;;;AAiCA,SAAgB,aACd,QAsCA;AACA,SAYE,YAaG;AAOH,SAAO,IAAI,kCAaT,SAaA,QACA,QACA,QACA;GACE;GACA;GACD,CACF"}

package/package.json

@@ -1,143 +1,135 @@
 {
   "name": "@fragno-dev/db",
-  "version": "0.3.0",
+  "version": "0.4.1",
+  "homepage": "https://fragno.dev",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/rejot-dev/fragno.git",
+    "directory": "packages/fragno-db"
+  },
   "type": "module",
   "exports": {
     ".": {
-      "development": "./src/mod.ts",
+      "workerd": "./dist/mod.js",
+      "worker": "./dist/mod.js",
+      "browser": "./dist/browser/mod.js",
       "types": "./dist/mod.d.ts",
       "default": "./dist/mod.js"
     },
     "./id": {
-      "development": "./src/id.ts",
       "types": "./dist/id.d.ts",
       "default": "./dist/id.js"
     },
     "./schema": {
-      "development": "./src/schema/create.ts",
       "types": "./dist/schema/create.d.ts",
       "default": "./dist/schema/create.js"
     },
     "./drivers": {
-      "development": "./src/adapters/generic-sql/driver-config.ts",
       "types": "./dist/adapters/generic-sql/driver-config.d.ts",
       "default": "./dist/adapters/generic-sql/driver-config.js"
     },
     "./sql-driver": {
-      "development": "./src/sql-driver/sql-driver.ts",
       "types": "./dist/sql-driver/sql-driver.d.ts",
       "default": "./dist/sql-driver/sql-driver.js"
     },
     "./dialects": {
-      "development": "./src/sql-driver/dialects/dialects.ts",
       "types": "./dist/sql-driver/dialects/dialects.d.ts",
       "default": "./dist/sql-driver/dialects/dialects.js"
     },
     "./dialects/durable-object": {
-      "development": "./src/sql-driver/dialects/durable-object-dialect.ts",
       "types": "./dist/sql-driver/dialects/durable-object-dialect.d.ts",
       "default": "./dist/sql-driver/dialects/durable-object-dialect.js"
     },
     "./query": {
-      "development": "./src/query/simple-query-interface.ts",
       "types": "./dist/query/simple-query-interface.d.ts",
       "default": "./dist/query/simple-query-interface.js"
     },
     "./adapters": {
-      "development": "./src/adapters/adapters.ts",
       "types": "./dist/adapters/adapters.d.ts",
       "default": "./dist/adapters/adapters.js"
     },
     "./adapters/in-memory": {
-      "development": "./src/adapters/in-memory/index.ts",
       "types": "./dist/adapters/in-memory/index.d.ts",
       "default": "./dist/adapters/in-memory/index.js"
     },
     "./adapters/sql": {
-      "development": "./src/adapters/sql/index.ts",
       "types": "./dist/adapters/sql/index.d.ts",
       "default": "./dist/adapters/sql/index.js"
     },
     "./schema-output/drizzle": {
-      "development": "./src/schema-output/drizzle.ts",
       "types": "./dist/schema-output/drizzle.d.ts",
       "default": "./dist/schema-output/drizzle.js"
     },
     "./schema-output/prisma": {
-      "development": "./src/schema-output/prisma.ts",
       "types": "./dist/schema-output/prisma.d.ts",
       "default": "./dist/schema-output/prisma.js"
     },
+    "./client": {
+      "types": "./dist/client.d.ts",
+      "default": "./dist/client.js"
+    },
+    "./sync": {
+      "browser": "./dist/browser/mod.js",
+      "types": "./dist/sync/index.d.ts",
+      "default": "./dist/sync/index.js"
+    },
     "./unit-of-work": {
-      "development": "./src/query/unit-of-work/unit-of-work.ts",
       "types": "./dist/query/unit-of-work/unit-of-work.d.ts",
       "default": "./dist/query/unit-of-work/unit-of-work.js"
     },
     "./cursor": {
-      "development": "./src/query/cursor.ts",
       "types": "./dist/query/cursor.d.ts",
       "default": "./dist/query/cursor.js"
     },
     "./fragment": {
-      "development": "./src/fragment.ts",
       "types": "./dist/fragment.d.ts",
       "default": "./dist/fragment.js"
     },
     "./fragment-definition-builder": {
-      "development": "./src/db-fragment-definition-builder.ts",
       "types": "./dist/db-fragment-definition-builder.d.ts",
       "default": "./dist/db-fragment-definition-builder.js"
     },
+    "./durable-hooks": {
+      "types": "./dist/durable-hooks.d.ts",
+      "default": "./dist/durable-hooks.js"
+    },
     "./dispatchers/node": {
-      "development": "./src/dispatchers/node/index.ts",
       "types": "./dist/dispatchers/node/index.d.ts",
       "default": "./dist/dispatchers/node/index.js"
     },
     "./dispatchers/cloudflare-do": {
-      "development": "./src/dispatchers/cloudflare-do/index.ts",
       "types": "./dist/dispatchers/cloudflare-do/index.d.ts",
       "default": "./dist/dispatchers/cloudflare-do/index.js"
     },
     "./generation-engine": {
-      "development": "./src/migration-engine/generation-engine.ts",
       "types": "./dist/migration-engine/generation-engine.d.ts",
       "default": "./dist/migration-engine/generation-engine.js"
     }
   },
+  "dependencies": {
+    "@standard-schema/spec": "^1.1.0",
+    "kysely": "^0.28.10",
+    "superjson": "^2.2.1",
+    "@fragno-dev/core": "0.2.2"
+  },
   "devDependencies": {
     "@electric-sql/pglite": "^0.3.15",
     "@libsql/client": "^0.15.15",
     "@types/better-sqlite3": "^7.6.13",
     "@types/node": "^22.19.7",
-    "@vitest/coverage-istanbul": "^3.2.4",
+    "@vitest/coverage-istanbul": "^4.1.0",
     "better-sqlite3": "^12.6.2",
     "drizzle-kit": "^0.31.8",
     "drizzle-orm": "^0.44.7",
     "kysely-pglite": "^0.6.1",
     "mysql2": "^3.16.1",
     "sqlocal": "^0.15.2",
-    "vitest": "^3.2.4",
+    "vitest": "^4.1.4",
     "zod": "^4.3.5",
-    "@fragno-dev/core": "0.2.0",
     "@fragno-private/typescript-config": "0.0.1",
     "@fragno-private/vitest-config": "0.0.0"
   },
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/rejot-dev/fragno.git",
-    "directory": "packages/fragno-db"
-  },
-  "homepage": "https://fragno.dev",
-  "license": "MIT",
-  "dependencies": {
-    "@paralleldrive/cuid2": "^2.3.1",
-    "@standard-schema/spec": "^1.1.0",
-    "kysely": "^0.28.10",
-    "superjson": "^2.2.1"
-  },
-  "optionalDependencies": {
-    "better-sqlite3": "^12.6.2"
-  },
   "peerDependencies": {
     "drizzle-orm": "^0.44.6"
   },
@@ -149,7 +141,7 @@
   "scripts": {
     "build": "tsdown",
     "build:watch": "tsdown --watch",
-    "types:check": "tsc --noEmit",
+    "types:check": "tsgo --noEmit",
     "test": "vitest run",
     "test:watch": "vitest --watch"
   }

package/src/adapters/adapters.ts

@@ -1,11 +1,12 @@
-import type { SimpleQueryInterface } from "../query/simple-query-interface";
-import type { AnySchema } from "../schema/create";
 import type { RequestContextStorage } from "@fragno-dev/core/internal/request-context-storage";
+
+import type { SqlNamingStrategy } from "../naming/sql-naming";
+import type { SimpleQueryInterface } from "../query/simple-query-interface";
 import type { IUnitOfWork } from "../query/unit-of-work/unit-of-work";
-import type { PreparedMigrations } from "./generic-sql/migration/prepared-migrations";
+import type { AnySchema } from "../schema/create";
 import type { SQLProvider } from "../shared/providers";
+import type { PreparedMigrations } from "./generic-sql/migration/prepared-migrations";
 import type { SQLiteStorageMode } from "./generic-sql/sqlite-storage";
-import type { SqlNamingStrategy } from "../naming/sql-naming";
 
 export const fragnoDatabaseAdapterNameFakeSymbol = "$fragno-database-adapter-name" as const;
 export const fragnoDatabaseAdapterVersionFakeSymbol = "$fragno-database-adapter-version" as const;

package/src/adapters/drizzle/migrate-drizzle.test.ts

@@ -1,6 +1,8 @@
 import { beforeAll, describe, expect, it } from "vitest";
-import { column, idColumn, referenceColumn, schema } from "../../schema/create";
+
 import { createRequire } from "node:module";
+
+import { column, idColumn, referenceColumn, schema } from "../../schema/create";
 import { writeAndLoadSchema } from "./test-utils";
 
 // I dunno
@@ -151,7 +153,7 @@ describe("generateSchema and migrate", () => {
 
     expect(migrationStatements.join("\n")).toMatchInlineSnapshot(`
       "CREATE TABLE "fragno_db_settings" (
-      	"id" varchar(30) NOT NULL,
+      	"id" varchar(128) NOT NULL,
       	"key" text NOT NULL,
       	"value" text NOT NULL,
       	"_internalId" bigserial PRIMARY KEY NOT NULL,
@@ -160,7 +162,7 @@ describe("generateSchema and migrate", () => {
       );
 
       CREATE TABLE "fragno_hooks" (
-      	"id" varchar(30) NOT NULL,
+      	"id" varchar(128) NOT NULL,
       	"namespace" text NOT NULL,
       	"hookName" text NOT NULL,
       	"payload" json NOT NULL,
@@ -178,7 +180,7 @@ describe("generateSchema and migrate", () => {
       );
 
       CREATE TABLE "fragno_db_outbox" (
-      	"id" varchar(30) NOT NULL,
+      	"id" varchar(128) NOT NULL,
       	"versionstamp" text NOT NULL,
       	"uowId" text NOT NULL,
       	"payload" json NOT NULL,
@@ -189,8 +191,37 @@ describe("generateSchema and migrate", () => {
       	CONSTRAINT "fragno_db_outbox_id_unique" UNIQUE("id")
       );
 
+      CREATE TABLE "fragno_db_outbox_mutations" (
+      	"id" varchar(128) NOT NULL,
+      	"entryVersionstamp" text NOT NULL,
+      	"mutationVersionstamp" text NOT NULL,
+      	"uowId" text NOT NULL,
+      	"schema" text NOT NULL,
+      	"table" text NOT NULL,
+      	"externalId" text NOT NULL,
+      	"op" text NOT NULL,
+      	"createdAt" timestamp DEFAULT now() NOT NULL,
+      	"_internalId" bigserial PRIMARY KEY NOT NULL,
+      	"_version" integer DEFAULT 0 NOT NULL,
+      	CONSTRAINT "fragno_db_outbox_mutations_id_unique" UNIQUE("id")
+      );
+
+      CREATE TABLE "fragno_db_sync_requests" (
+      	"id" varchar(128) NOT NULL,
+      	"requestId" text NOT NULL,
+      	"status" text NOT NULL,
+      	"confirmedCommandIds" json NOT NULL,
+      	"conflictCommandId" text,
+      	"baseVersionstamp" text,
+      	"lastVersionstamp" text,
+      	"createdAt" timestamp DEFAULT now() NOT NULL,
+      	"_internalId" bigserial PRIMARY KEY NOT NULL,
+      	"_version" integer DEFAULT 0 NOT NULL,
+      	CONSTRAINT "fragno_db_sync_requests_id_unique" UNIQUE("id")
+      );
+
       CREATE TABLE "test"."users" (
-      	"id" varchar(30) NOT NULL,
+      	"id" varchar(128) NOT NULL,
       	"name" text NOT NULL,
       	"email" text NOT NULL,
       	"age" integer,
@@ -204,7 +235,7 @@ describe("generateSchema and migrate", () => {
       );
 
       CREATE TABLE "test"."posts" (
-      	"id" varchar(30) NOT NULL,
+      	"id" varchar(128) NOT NULL,
       	"title" text NOT NULL,
       	"slug" varchar(255) NOT NULL,
       	"content" text NOT NULL,
@@ -224,7 +255,7 @@ describe("generateSchema and migrate", () => {
       );
 
       CREATE TABLE "test"."comments" (
-      	"id" varchar(30) NOT NULL,
+      	"id" varchar(128) NOT NULL,
       	"content" text NOT NULL,
       	"postId" bigint NOT NULL,
       	"userId" bigint NOT NULL,
@@ -238,7 +269,7 @@ describe("generateSchema and migrate", () => {
       );
 
       CREATE TABLE "test"."tags" (
-      	"id" varchar(30) NOT NULL,
+      	"id" varchar(128) NOT NULL,
       	"name" text NOT NULL,
       	"slug" varchar(100) NOT NULL,
       	"description" text,
@@ -250,7 +281,7 @@ describe("generateSchema and migrate", () => {
       );
 
       CREATE TABLE "test"."postTags" (
-      	"id" varchar(30) NOT NULL,
+      	"id" varchar(128) NOT NULL,
       	"postId" bigint NOT NULL,
       	"tagId" bigint NOT NULL,
       	"order" integer DEFAULT 0 NOT NULL,
@@ -269,8 +300,14 @@ describe("generateSchema and migrate", () => {
       CREATE UNIQUE INDEX "unique_key" ON "fragno_db_settings" USING btree ("key");
       CREATE INDEX "idx_namespace_status_retry" ON "fragno_hooks" USING btree ("namespace","status","nextRetryAt");
       CREATE INDEX "idx_nonce" ON "fragno_hooks" USING btree ("nonce");
+      CREATE INDEX "idx_namespace_status_last_attempt" ON "fragno_hooks" USING btree ("namespace","status","lastAttemptAt");
+      CREATE INDEX "idx_namespace_created_at" ON "fragno_hooks" USING btree ("namespace","createdAt","id");
       CREATE UNIQUE INDEX "idx_outbox_versionstamp" ON "fragno_db_outbox" USING btree ("versionstamp");
       CREATE INDEX "idx_outbox_uow" ON "fragno_db_outbox" USING btree ("uowId");
+      CREATE INDEX "idx_outbox_mutations_entry" ON "fragno_db_outbox_mutations" USING btree ("entryVersionstamp");
+      CREATE INDEX "idx_outbox_mutations_key" ON "fragno_db_outbox_mutations" USING btree ("schema","table","externalId","entryVersionstamp");
+      CREATE INDEX "idx_outbox_mutations_uow" ON "fragno_db_outbox_mutations" USING btree ("uowId");
+      CREATE UNIQUE INDEX "idx_sync_request_id" ON "fragno_db_sync_requests" USING btree ("requestId");
       CREATE UNIQUE INDEX "idx_users_email" ON "test"."users" USING btree ("email");
       CREATE INDEX "idx_users_name" ON "test"."users" USING btree ("name");
       CREATE INDEX "idx_users_active" ON "test"."users" USING btree ("isActive");

package/src/adapters/drizzle/migration-parity-drizzle-kit.test.ts

@@ -1,10 +1,12 @@
 import { describe, expect, it } from "vitest";
+
 import { createRequire } from "node:module";
-import { column, idColumn, referenceColumn, schema } from "../../schema/create";
-import { writeAndLoadSchema } from "./test-utils";
-import { createPreparedMigrations } from "../generic-sql/migration/prepared-migrations";
+
 import { createNamingResolver } from "../../naming/sql-naming";
+import { column, idColumn, referenceColumn, schema } from "../../schema/create";
 import { defaultNamingStrategyForDatabase } from "../generic-sql/driver-config";
+import { createPreparedMigrations } from "../generic-sql/migration/prepared-migrations";
+import { writeAndLoadSchema } from "./test-utils";
 
 const require = createRequire(import.meta.url);
 const {

package/src/adapters/drizzle/test-utils.ts

@@ -1,8 +1,9 @@
 import { mkdir, writeFile, rm, access } from "node:fs/promises";
 import { join } from "node:path";
+
+import { internalSchema } from "../../fragments/internal-fragment.schema";
 import { generateDrizzleSchema, type SupportedProvider } from "../../schema-output/drizzle";
 import type { Schema } from "../../schema/create";
-import { internalSchema } from "../../fragments/internal-fragment.schema";
 
 /**
  * Writes a Fragno schema to a temporary TypeScript file and dynamically imports it.

package/src/adapters/generic-sql/generic-sql-adapter.test.ts

@@ -1,9 +1,11 @@
-import { SQLocalKysely } from "sqlocal/kysely";
 import { assert, describe, expect, it } from "vitest";
+
+import { SQLocalKysely } from "sqlocal/kysely";
+
+import { internalSchema } from "../../fragments/internal-fragment";
+import { column, idColumn, schema } from "../../schema/create";
 import { SQLocalDriverConfig } from "./driver-config";
 import { SqlAdapter } from "./generic-sql-adapter";
-import { column, idColumn, schema } from "../../schema/create";
-import { internalSchema } from "../../fragments/internal-fragment";
 
 describe("SqlAdapter", () => {
   const testSchema = schema("test", (s) => {

package/src/adapters/generic-sql/generic-sql-adapter.ts

@@ -1,4 +1,18 @@
 import { RequestContextStorage } from "@fragno-dev/core/internal/request-context-storage";
+
+import { getOutboxConfigForAdapter } from "../../internal/outbox-state";
+import {
+  createNamingResolver,
+  type NamingResolver,
+  type SqlNamingStrategy,
+} from "../../naming/sql-naming";
+import { createSQLSerializer } from "../../query/serialize/create-sql-serializer";
+import type { SimpleQueryInterface } from "../../query/simple-query-interface";
+import type { UOWInstrumentation } from "../../query/unit-of-work/unit-of-work";
+import type { AnyColumn, AnySchema } from "../../schema/create";
+import { sql } from "../../sql-driver/sql";
+import type { CompiledQuery, Dialect, QueryResult } from "../../sql-driver/sql-driver";
+import { SqlDriverAdapter } from "../../sql-driver/sql-driver-adapter";
 import {
   fragnoDatabaseAdapterNameFakeSymbol,
   fragnoDatabaseAdapterVersionFakeSymbol,
@@ -7,31 +21,18 @@ import {
   type DatabaseAdapterMetadata,
   type SQLiteProfile,
 } from "../adapters";
-import type { CompiledQuery, Dialect, QueryResult } from "../../sql-driver/sql-driver";
-import { SqlDriverAdapter } from "../../sql-driver/sql-driver-adapter";
-import { sql } from "../../sql-driver/sql";
-import type { AnyColumn, AnySchema } from "../../schema/create";
-import type { SimpleQueryInterface } from "../../query/simple-query-interface";
-import { createExecutor } from "./generic-sql-uow-executor";
-import { UnitOfWorkDecoder } from "./uow-decoder";
-import { createPreparedMigrations, type PreparedMigrations } from "./migration/prepared-migrations";
-import type { DriverConfig } from "./driver-config";
-import { GenericSQLUOWOperationCompiler } from "./query/generic-sql-uow-operation-compiler";
-import { createUOWCompilerFromOperationCompiler } from "../shared/uow-operation-compiler";
 import {
   fromUnitOfWorkCompiler,
   type UnitOfWorkFactory,
 } from "../shared/from-unit-of-work-compiler";
-import type { UOWInstrumentation } from "../../query/unit-of-work/unit-of-work";
+import { createUOWCompilerFromOperationCompiler } from "../shared/uow-operation-compiler";
+import type { DriverConfig } from "./driver-config";
+import { createExecutor } from "./generic-sql-uow-executor";
+import { createPreparedMigrations, type PreparedMigrations } from "./migration/prepared-migrations";
+import { GenericSQLUOWOperationCompiler } from "./query/generic-sql-uow-operation-compiler";
 import type { SQLiteStorageMode } from "./sqlite-storage";
 import { sqliteStorageDefault, sqliteStoragePrisma } from "./sqlite-storage";
-import type { OutboxConfig } from "../../outbox/outbox";
-import { createSQLSerializer } from "../../query/serialize/create-sql-serializer";
-import {
-  createNamingResolver,
-  type NamingResolver,
-  type SqlNamingStrategy,
-} from "../../naming/sql-naming";
+import { UnitOfWorkDecoder } from "./uow-decoder";
 
 export interface UnitOfWorkConfig {
   onQuery?: (query: CompiledQuery) => void;
@@ -43,7 +44,6 @@ export interface SqlAdapterOptions {
   dialect: Dialect;
   driverConfig: DriverConfig;
   uowConfig?: UnitOfWorkConfig;
-  outbox?: OutboxConfig;
   sqliteProfile?: SQLiteProfile;
   sqliteStorageMode?: SQLiteStorageMode;
   namingStrategy?: SqlNamingStrategy;
@@ -58,7 +58,6 @@ export class SqlAdapter implements DatabaseAdapter<UnitOfWorkConfig> {
   readonly dialect: Dialect;
   readonly driverConfig: DriverConfig;
   readonly uowConfig?: UnitOfWorkConfig;
-  readonly outbox?: OutboxConfig;
   readonly sqliteStorageMode?: SQLiteStorageMode;
   readonly sqliteProfile?: SQLiteProfile;
   readonly adapterMetadata: DatabaseAdapterMetadata;
@@ -73,7 +72,6 @@ export class SqlAdapter implements DatabaseAdapter<UnitOfWorkConfig> {
     dialect,
     driverConfig,
     uowConfig,
-    outbox,
     sqliteProfile,
     sqliteStorageMode,
     namingStrategy,
@@ -81,7 +79,6 @@ export class SqlAdapter implements DatabaseAdapter<UnitOfWorkConfig> {
     this.dialect = dialect;
     this.driverConfig = driverConfig;
     this.uowConfig = uowConfig;
-    this.outbox = outbox;
     this.namingStrategy = namingStrategy ?? driverConfig.defaultNamingStrategy;
     const resolvedProfile = sqliteProfile ?? "default";
 
@@ -195,7 +192,7 @@ export class SqlAdapter implements DatabaseAdapter<UnitOfWorkConfig> {
       executor: createExecutor(this.#driver, this.driverConfig, {
         dialect: this.dialect,
         dryRun: false,
-        outbox: this.outbox,
+        outbox: getOutboxConfigForAdapter(this),
         namingStrategy: this.namingStrategy,
       }),
       decoder: new UnitOfWorkDecoder(this.driverConfig, this.sqliteStorageMode, resolver),

package/src/adapters/generic-sql/generic-sql-uow-executor.test.ts

@@ -1,4 +1,5 @@
 import { describe, expect, it } from "vitest";
+
 import type { CompiledMutation } from "../../query/unit-of-work/unit-of-work";
 import type { CompiledQuery, Dialect } from "../../sql-driver/sql-driver";
 import type { SqlDriverAdapter } from "../../sql-driver/sql-driver-adapter";