History

Fix published package imports (#934)

The vendored fumadb fork was published under the bare name "fumadb", which collides with the upstream npm package — so a published @executor-js/sdk would resolve the wrong dependency. Scope the package to @executor-js/fumadb and update every workspace dependency, import specifier, and the build filter to match.

Rhys Sullivan committed 5 months ago

Commit 17174c41 parent 2c8f2d037 files · +89 −80Browse files

Unified · Split

37 files
  1. apps/cloud/package.json +1 −1
  2. apps/cloud/src/db/executor-schema.ts +1 −1
  3. apps/cloud/src/db/fuma.ts +3 −3
  4. apps/host-cloudflare/package.json +1 −1
  5. apps/host-cloudflare/src/db/d1.ts +1 −1
  6. apps/host-selfhost/package.json +1 −1
  7. apps/host-selfhost/src/db/self-host-db.ts +3 −3
  8. apps/local/package.json +1 −1
  9. apps/local/src/db/sqlite-fumadb.ts +3 −3
  10. apps/local/src/db/v1-v2-migration.ts +1 −1
  11. bun.lock +12 −12
  12. package.json +1 −1
  13. packages/core/cli/package.json +1 −1
  14. packages/core/cli/src/commands/schema.ts +3 −3
  15. packages/core/fumadb/package.json +1 −1
  16. packages/core/fumadb/src/adapters/drizzle/generate.ts +1 −1
  17. packages/core/fumadb/src/adapters/kysely/migration/execute.ts +2 −2
  18. packages/core/fumadb/src/adapters/kysely/query.ts +2 −2
  19. packages/core/fumadb/src/migration-engine/auto-from-schema.ts +2 −2
  20. packages/core/fumadb/src/query/table-policy.test.ts +4 −4
  21. packages/core/fumadb/src/shared/config.ts +1 −1
  22. packages/core/fumadb/test/snapshots/generate/drizzle-orm.mysql.ts +1 −1
  23. packages/core/fumadb/test/snapshots/generate/drizzle-orm.postgresql.ts +1 −1
  24. packages/core/fumadb/test/snapshots/generate/drizzle-orm.sqlite.ts +1 −1
  25. packages/core/fumadb/vitest.config.ts +1 −1
  26. packages/core/sdk/package.json +1 −1
  27. packages/core/sdk/src/core-schema.ts +2 −2
  28. packages/core/sdk/src/executor-fuma-db.ts +4 −4
  29. packages/core/sdk/src/executor.ts +5 −5
  30. packages/core/sdk/src/fuma-runtime.ts +2 −2
  31. packages/core/sdk/src/index.ts +11 −5
  32. packages/core/sdk/src/owner-policy.ts +2 −2
  33. packages/core/sdk/src/sqlite-test-db.ts +3 −3
  34. packages/core/sdk/src/test-config.ts +1 −1
  35. packages/kernel/runtime-dynamic-worker/package.json +1 −1
  36. packages/kernel/runtime-dynamic-worker/scripts/pglite.ts +1 −1
  37. packages/kernel/runtime-dynamic-worker/src/integration.test.ts +6 −3
apps/cloud/package.json+1−1
@@ -35,6 +35,7 @@ · 34 unmodified lines
3535 "@executor-js/api": "workspace:*",
3636 "@executor-js/cloudflare": "workspace:*",
3737 "@executor-js/execution": "workspace:*",
38+ "@executor-js/fumadb": "workspace:*",
3839 "@executor-js/host-mcp": "workspace:*",
3940 "@executor-js/plugin-graphql": "workspace:*",
4041 "@executor-js/plugin-mcp": "workspace:*",
@@ -63,7 +64,6 @@ · 22 unmodified lines
6364 "autumn-js": "^1.2.8",
6465 "drizzle-orm": "catalog:",
6566 "effect": "catalog:",
66− "fumadb": "workspace:*",
6767 "jose": "^5.6.3",
6868 "postgres": "^3.4.9",
6969 "posthog-js": "^1.372.5",
apps/cloud/src/db/executor-schema.ts+1−1
@@ -8,7 +8,7 @@ import { · 7 unmodified lines
88 uniqueIndex,
99 bigint,
1010 } from "drizzle-orm/pg-core";
11−import { createId } from "fumadb/cuid";
11+import { createId } from "@executor-js/fumadb/cuid";
1212
1313 export const integration = pgTable(
1414 "integration",
apps/cloud/src/db/fuma.ts+3−3
@@ -1,7 +1,7 @@
11 import { Effect, Layer } from "effect";
2−import { type FumaDB } from "fumadb";
3−import { type DrizzleConfig } from "fumadb/adapters/drizzle";
4−import { type schema as fumaSchema, type RelationsMap } from "fumadb/schema";
2+import { type FumaDB } from "@executor-js/fumadb";
3+import { type DrizzleConfig } from "@executor-js/fumadb/adapters/drizzle";
4+import { type schema as fumaSchema, type RelationsMap } from "@executor-js/fumadb/schema";
55
66 import {
77 createExecutorFumaDb,
apps/host-cloudflare/package.json+1−1
@@ -20,6 +20,7 @@ · 19 unmodified lines
2020 "@executor-js/app": "workspace:*",
2121 "@executor-js/cloudflare": "workspace:*",
2222 "@executor-js/execution": "workspace:*",
23+ "@executor-js/fumadb": "workspace:*",
2324 "@executor-js/host-mcp": "workspace:*",
2425 "@executor-js/plugin-encrypted-secrets": "workspace:*",
2526 "@executor-js/plugin-graphql": "workspace:*",
@@ -33,7 +34,6 @@ · 7 unmodified lines
3334 "@tanstack/react-router": "catalog:",
3435 "drizzle-orm": "catalog:",
3536 "effect": "catalog:",
36− "fumadb": "workspace:*",
3737 "jose": "^5.9.6",
3838 "quickjs-emscripten-core": "0.31.0",
3939 "react": "catalog:",
apps/host-cloudflare/src/db/d1.ts+1−1
@@ -2,7 +2,7 @@ import { drizzle } from "drizzle-orm/d1"; · 1 unmodified line
22 import {
33 createDrizzleRuntimeSchemaFromTables,
44 ensureDrizzleRuntimeSchemaFromTables,
5−} from "fumadb/adapters/drizzle";
5+} from "@executor-js/fumadb/adapters/drizzle";
66 import type { D1Database, R2Bucket } from "@cloudflare/workers-types";
77
88 import { wrapD1WithR2Offload } from "./r2-blob-offload";
apps/host-selfhost/package.json+1−1
@@ -23,6 +23,7 @@ · 22 unmodified lines
2323 "@executor-js/api": "workspace:*",
2424 "@executor-js/app": "workspace:*",
2525 "@executor-js/execution": "workspace:*",
26+ "@executor-js/fumadb": "workspace:*",
2627 "@executor-js/host-mcp": "workspace:*",
2728 "@executor-js/plugin-encrypted-secrets": "workspace:*",
2829 "@executor-js/plugin-graphql": "workspace:*",
@@ -38,7 +39,6 @@ · 9 unmodified lines
3839 "better-auth": "^1.6.11",
3940 "drizzle-orm": "catalog:",
4041 "effect": "catalog:",
41− "fumadb": "workspace:*",
4242 "react": "catalog:",
4343 "react-dom": "catalog:"
4444 },
apps/host-selfhost/src/db/self-host-db.ts+3−3
@@ -3,12 +3,12 @@ import { dirname, resolve } from "node:path"; · 2 unmodified lines
33
44 import { createClient, type Client } from "@libsql/client";
55 import { drizzle, type LibSQLDatabase } from "drizzle-orm/libsql";
6−import { type FumaDB } from "fumadb";
6+import { type FumaDB } from "@executor-js/fumadb";
77 import {
88 createDrizzleRuntimeSchemaFromTables,
99 ensureDrizzleRuntimeSchemaFromTables,
10−} from "fumadb/adapters/drizzle";
11−import { type schema as fumaSchema, type RelationsMap } from "fumadb/schema";
10+} from "@executor-js/fumadb/adapters/drizzle";
11+import { type schema as fumaSchema, type RelationsMap } from "@executor-js/fumadb/schema";
1212 import { Context, Effect, Layer } from "effect";
1313
1414 import {
apps/local/package.json+1−1
@@ -25,6 +25,7 @@ · 24 unmodified lines
2525 "@executor-js/app": "workspace:*",
2626 "@executor-js/config": "workspace:*",
2727 "@executor-js/execution": "workspace:*",
28+ "@executor-js/fumadb": "workspace:*",
2829 "@executor-js/host-mcp": "workspace:*",
2930 "@executor-js/integrations-registry": "workspace:*",
3031 "@executor-js/plugin-desktop-settings": "workspace:*",
@@ -44,7 +45,6 @@ · 13 unmodified lines
4445 "@tanstack/react-router": "catalog:",
4546 "drizzle-orm": "catalog:",
4647 "effect": "catalog:",
47− "fumadb": "workspace:*",
4848 "jsonc-parser": "^3.3.1",
4949 "react": "catalog:",
5050 "react-dom": "catalog:"
apps/local/src/db/sqlite-fumadb.ts+3−3
@@ -1,12 +1,12 @@
11 import { type Client } from "@libsql/client";
22 import { Layer } from "effect";
33 import { drizzle, type LibSQLDatabase } from "drizzle-orm/libsql";
4−import { type FumaDB } from "fumadb";
4+import { type FumaDB } from "@executor-js/fumadb";
55 import {
66 createDrizzleRuntimeSchemaFromTables,
77 createDrizzleRuntimeSchemaSqlFromTables,
8−} from "fumadb/adapters/drizzle";
9−import { type schema as fumaSchema, type RelationsMap } from "fumadb/schema";
8+} from "@executor-js/fumadb/adapters/drizzle";
9+import { type schema as fumaSchema, type RelationsMap } from "@executor-js/fumadb/schema";
1010
1111 import { createExecutorFumaDb, DbProvider, type ExecutorDbHandle } from "@executor-js/api/server";
1212 import type { FumaDb, FumaTables } from "@executor-js/sdk";
apps/local/src/db/v1-v2-migration.ts+1−1
@@ -4,7 +4,7 @@ import type { Client } from "@libsql/client"; · 3 unmodified lines
44 import { drizzle } from "drizzle-orm/libsql";
55 import { migrate } from "drizzle-orm/libsql/migrator";
66 import { Effect } from "effect";
7−import { createId } from "fumadb/cuid";
7+import { createId } from "@executor-js/fumadb/cuid";
88 import { createHash, randomBytes } from "node:crypto";
99 import * as fs from "node:fs";
1010 import { homedir, tmpdir } from "node:os";
bun.lock+12−12
@@ -62,6 +62,7 @@ · 61 unmodified lines
6262 "@executor-js/api": "workspace:*",
6363 "@executor-js/cloudflare": "workspace:*",
6464 "@executor-js/execution": "workspace:*",
65+ "@executor-js/fumadb": "workspace:*",
6566 "@executor-js/host-mcp": "workspace:*",
6667 "@executor-js/plugin-graphql": "workspace:*",
6768 "@executor-js/plugin-mcp": "workspace:*",
@@ -90,7 +91,6 @@ · 22 unmodified lines
9091 "autumn-js": "^1.2.8",
9192 "drizzle-orm": "catalog:",
9293 "effect": "catalog:",
93− "fumadb": "workspace:*",
9494 "jose": "^5.6.3",
9595 "postgres": "^3.4.9",
9696 "posthog-js": "^1.372.5",
@@ -161,6 +161,7 @@ · 64 unmodified lines
161161 "@executor-js/app": "workspace:*",
162162 "@executor-js/cloudflare": "workspace:*",
163163 "@executor-js/execution": "workspace:*",
164+ "@executor-js/fumadb": "workspace:*",
164165 "@executor-js/host-mcp": "workspace:*",
165166 "@executor-js/plugin-encrypted-secrets": "workspace:*",
166167 "@executor-js/plugin-graphql": "workspace:*",
@@ -174,7 +175,6 @@ · 7 unmodified lines
174175 "@tanstack/react-router": "catalog:",
175176 "drizzle-orm": "catalog:",
176177 "effect": "catalog:",
177− "fumadb": "workspace:*",
178178 "jose": "^5.9.6",
179179 "quickjs-emscripten-core": "0.31.0",
180180 "react": "catalog:",
@@ -206,6 +206,7 @@ · 25 unmodified lines
206206 "@executor-js/api": "workspace:*",
207207 "@executor-js/app": "workspace:*",
208208 "@executor-js/execution": "workspace:*",
209+ "@executor-js/fumadb": "workspace:*",
209210 "@executor-js/host-mcp": "workspace:*",
210211 "@executor-js/plugin-encrypted-secrets": "workspace:*",
211212 "@executor-js/plugin-graphql": "workspace:*",
@@ -221,7 +222,6 @@ · 9 unmodified lines
221222 "better-auth": "^1.6.11",
222223 "drizzle-orm": "catalog:",
223224 "effect": "catalog:",
224− "fumadb": "workspace:*",
225225 "react": "catalog:",
226226 "react-dom": "catalog:",
227227 },
@@ -250,6 +250,7 @@ · 22 unmodified lines
250250 "@executor-js/app": "workspace:*",
251251 "@executor-js/config": "workspace:*",
252252 "@executor-js/execution": "workspace:*",
253+ "@executor-js/fumadb": "workspace:*",
253254 "@executor-js/host-mcp": "workspace:*",
254255 "@executor-js/integrations-registry": "workspace:*",
255256 "@executor-js/plugin-desktop-settings": "workspace:*",
@@ -269,7 +270,6 @@ · 13 unmodified lines
269270 "@tanstack/react-router": "catalog:",
270271 "drizzle-orm": "catalog:",
271272 "effect": "catalog:",
272− "fumadb": "workspace:*",
273273 "jsonc-parser": "^3.3.1",
274274 "react": "catalog:",
275275 "react-dom": "catalog:",
@@ -436,10 +436,10 @@ · 160 unmodified lines
436436 "executor-sdk": "./dist/index.js",
437437 },
438438 "dependencies": {
439+ "@executor-js/fumadb": "workspace:*",
439440 "@executor-js/sdk": "workspace:*",
440441 "commander": "^12.1.0",
441442 "effect": "catalog:",
442− "fumadb": "workspace:*",
443443 "jiti": "^2.6.1",
444444 },
445445 "devDependencies": {
@@ -493,7 +493,7 @@ · 47 unmodified lines
493493 },
494494 },
495495 "packages/core/fumadb": {
496− "name": "fumadb",
496+ "name": "@executor-js/fumadb",
497497 "version": "0.3.0",
498498 "dependencies": {
499499 "@clack/prompts": "^1.3.0",
@@ -540,9 +540,9 @@ · 40 unmodified lines
540540 "name": "@executor-js/sdk",
541541 "version": "1.5.4",
542542 "dependencies": {
543+ "@executor-js/fumadb": "workspace:*",
543544 "@standard-schema/spec": "^1.1.0",
544545 "fractional-indexing": "^3.2.0",
545− "fumadb": "workspace:*",
546546 "oauth4webapi": "^3.8.5",
547547 },
548548 "devDependencies": {
@@ -709,11 +709,11 @@ · 160 unmodified lines
709709 "@electric-sql/pglite": "^0.4.4",
710710 "@electric-sql/pglite-socket": "^0.1.4",
711711 "@executor-js/execution": "workspace:*",
712+ "@executor-js/fumadb": "workspace:*",
712713 "@executor-js/plugin-openapi": "workspace:*",
713714 "@executor-js/sdk": "workspace:*",
714715 "@types/node": "catalog:",
715716 "drizzle-orm": "catalog:",
716− "fumadb": "workspace:*",
717717 "postgres": "^3.4.9",
718718 "vitest": "catalog:",
719719 "wrangler": "^4.81.0",
@@ -1523,6 +1523,8 @@ · 803 unmodified lines
15231523
15241524 "@executor-js/execution": ["@executor-js/execution@workspace:packages/core/execution"],
15251525
1526+ "@executor-js/fumadb": ["@executor-js/fumadb@workspace:packages/core/fumadb"],
1527+
15261528 "@executor-js/host-cloudflare": ["@executor-js/host-cloudflare@workspace:apps/host-cloudflare"],
15271529
15281530 "@executor-js/host-mcp": ["@executor-js/host-mcp@workspace:packages/hosts/mcp"],
@@ -3453,8 +3455,6 @@ · 1924 unmodified lines
34533455
34543456 "fsevents": ["fsevents@2.3.3", "", { "os": "darwin" }, "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw=="],
34553457
3456− "fumadb": ["fumadb@workspace:packages/core/fumadb"],
3457−
34583458 "function-bind": ["function-bind@1.1.2", "", {}, "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA=="],
34593459
34603460 "gensync": ["gensync@1.0.0-beta.2", "", {}, "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="],
@@ -5139,6 +5139,8 @@ · 1678 unmodified lines
51395139
51405140 "@executor-js/example-promise-sdk/typescript": ["typescript@6.0.3", "", { "bin": { "tsc": "bin/tsc", "tsserver": "bin/tsserver" } }, "sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw=="],
51415141
5142+ "@executor-js/fumadb/commander": ["commander@14.0.3", "", {}, "sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw=="],
5143+
51425144 "@graphql-tools/executor/@graphql-tools/utils": ["@graphql-tools/utils@11.1.0", "", { "dependencies": { "@graphql-typed-document-node/core": "^3.1.1", "@whatwg-node/promise-helpers": "^1.0.0", "cross-inspect": "1.0.1", "tslib": "^2.4.0" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" } }, "sha512-PtFVG4r8Z2LEBSaPYQMusBiB3o6kjLVJyjCLbnWem/SpSuM21v6LTmgpkXfYU1qpBV2UGsFyuEnSJInl8fR1Ag=="],
51435145
51445146 "@graphql-tools/merge/@graphql-tools/utils": ["@graphql-tools/utils@11.1.0", "", { "dependencies": { "@graphql-typed-document-node/core": "^3.1.1", "@whatwg-node/promise-helpers": "^1.0.0", "cross-inspect": "1.0.1", "tslib": "^2.4.0" }, "peerDependencies": { "graphql": "^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0" } }, "sha512-PtFVG4r8Z2LEBSaPYQMusBiB3o6kjLVJyjCLbnWem/SpSuM21v6LTmgpkXfYU1qpBV2UGsFyuEnSJInl8fR1Ag=="],
@@ -5451,8 +5453,6 @@ · 306 unmodified lines
54515453
54525454 "form-data/mime-types": ["mime-types@2.1.35", "", { "dependencies": { "mime-db": "1.52.0" } }, "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="],
54535455
5454− "fumadb/commander": ["commander@14.0.3", "", {}, "sha512-H+y0Jo/T1RZ9qPP4Eh1pkcQcLRglraJaSLoyOtHxu6AapkjWVCy2Sit1QQ4x3Dng8qDlSsZEet7g5Pq06MvTgw=="],
5455−
54565456 "glob/minimatch": ["minimatch@9.0.9", "", { "dependencies": { "brace-expansion": "^2.0.2" } }, "sha512-OBwBN9AL4dqmETlpS2zasx+vTeWclWzkblfZk7KTA5j3jeOONz/tRCnZomUyvNg83wL5Zv9Ss6HMJXAgL8R2Yg=="],
54575457
54585458 "globby/ignore": ["ignore@5.3.2", "", {}, "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g=="],
package.json+1−1
@@ -36,7 +36,7 @@ · 35 unmodified lines
3636 "test": "turbo run test --filter=!@executor-js/e2e",
3737 "test:e2e": "bun run --cwd e2e test",
3838 "test:release:bootstrap": "vitest run tests/release-bootstrap-smoke.test.ts",
39− "build:packages": "bun run --filter='fumadb' build && bun run --filter='@executor-js/codemode-core' build && bun run --filter='@executor-js/runtime-quickjs' build && bun run --filter='@executor-js/sdk' build && bun run --filter='@executor-js/config' build && bun run --filter='@executor-js/execution' build && bun run --filter='@executor-js/cli' build && bun run --filter='@executor-js/plugin-*' build",
39+ "build:packages": "bun run --filter='@executor-js/fumadb' build && bun run --filter='@executor-js/codemode-core' build && bun run --filter='@executor-js/runtime-quickjs' build && bun run --filter='@executor-js/sdk' build && bun run --filter='@executor-js/config' build && bun run --filter='@executor-js/execution' build && bun run --filter='@executor-js/cli' build && bun run --filter='@executor-js/plugin-*' build",
4040 "typecheck": "turbo run typecheck",
4141 "typecheck:slow": "turbo run typecheck:slow",
4242 "ci": "bun run lint && bun run typecheck && bun run test",
packages/core/cli/package.json+1−1
@@ -40,10 +40,10 @@ · 39 unmodified lines
4040 "typecheck": "tsc --noEmit"
4141 },
4242 "dependencies": {
43+ "@executor-js/fumadb": "workspace:*",
4344 "@executor-js/sdk": "workspace:*",
4445 "commander": "^12.1.0",
4546 "effect": "catalog:",
46− "fumadb": "workspace:*",
4747 "jiti": "^2.6.1"
4848 },
4949 "devDependencies": {
packages/core/cli/src/commands/schema.ts+3−3
@@ -36,9 +36,9 @@ const schemaGenerateAction = async (opts: SchemaGenerateOptions) => { · 35 unmodified lines
3636 }
3737
3838 const [{ fumadb }, { drizzleAdapter }, { schema: fumaSchema }] = await Promise.all([
39− import("fumadb"),
40− import("fumadb/adapters/drizzle"),
41− import("fumadb/schema"),
39+ import("@executor-js/fumadb"),
40+ import("@executor-js/fumadb/adapters/drizzle"),
41+ import("@executor-js/fumadb/schema"),
4242 ]);
4343
4444 const schema = fumaSchema({
packages/core/fumadb/package.json+1−1
@@ -1,5 +1,5 @@
11 {
2− "name": "fumadb",
2+ "name": "@executor-js/fumadb",
33 "description": "A library for interacting with different databases for your package.",
44 "version": "0.3.0",
55 "repository": {
packages/core/fumadb/src/adapters/drizzle/generate.ts+1−1
@@ -173,7 +173,7 @@ export function generateSchema( · 172 unmodified lines
173173 const value = JSON.stringify(column.default.value);
174174 col.push(`default(${value})`);
175175 } else if (column.default.runtime === "auto") {
176− imports.addImport("createId", "fumadb/cuid");
176+ imports.addImport("createId", "@executor-js/fumadb/cuid");
177177 col.push("$defaultFn(() => createId())");
178178 } else if (column.default.runtime === "now") {
179179 col.push("defaultNow()");
packages/core/fumadb/src/adapters/kysely/migration/execute.ts+2−2
@@ -231,7 +231,7 @@ export function execute( · 230 unmodified lines
231231 const {
232232 db,
233233 provider,
234− relationMode = provider === "mssql" ? "fumadb" : "foreign-keys",
234+ relationMode = provider === "mssql" ? "@executor-js/fumadb" : "foreign-keys",
235235 } = config;
236236
237237 function createTable(
@@ -254,7 +254,7 @@ export function execute( · 16 unmodified lines
254254 }
255255
256256 for (const foreignKey of table.foreignKeys) {
257− if (relationMode === "fumadb") break;
257+ if (relationMode === "@executor-js/fumadb") break;
258258 const compiled = compileForeignKey(foreignKey, "sql");
259259
260260 builder = builder.addForeignKeyConstraint(
packages/core/fumadb/src/adapters/kysely/query.ts+2−2
@@ -166,7 +166,7 @@ export function fromKysely( · 165 unmodified lines
166166 const {
167167 db: kysely,
168168 provider,
169− relationMode = provider === "mssql" ? "fumadb" : "foreign-keys",
169+ relationMode = provider === "mssql" ? "@executor-js/fumadb" : "foreign-keys",
170170 } = config;
171171
172172 /**
@@ -520,7 +520,7 @@ export function fromKysely( · 347 unmodified lines
520520 },
521521 };
522522
523− if (relationMode === "fumadb")
523+ if (relationMode === "@executor-js/fumadb")
524524 adapter = createSoftForeignKey(schema, {
525525 ...adapter,
526526 generateInsertValuesDefault(table, values) {
packages/core/fumadb/src/migration-engine/auto-from-schema.ts+2−2
@@ -38,7 +38,7 @@ export function generateMigrationFromSchema( · 37 unmodified lines
3838 const {
3939 provider,
4040 relationMode = provider === "mssql" || provider === "mongodb"
41− ? "fumadb"
41+ ? "@executor-js/fumadb"
4242 : "foreign-keys",
4343 dropUnusedTables = true,
4444 dropUnusedColumns = true,
@@ -205,7 +205,7 @@ export function generateMigrationFromSchema( · 160 unmodified lines
205205 ): Operation[] {
206206 const tableName = getName(newTable.names);
207207 const operations: Operation[] = [];
208− if (relationMode === "fumadb") return operations;
208+ if (relationMode === "@executor-js/fumadb") return operations;
209209
210210 for (const foreignKey of newTable.foreignKeys) {
211211 const compiled = compileForeignKey(foreignKey, "sql");
packages/core/fumadb/src/query/table-policy.test.ts+4−4
@@ -2,14 +2,14 @@ import Database from "better-sqlite3"; · 1 unmodified line
22 import { describe, expect, it } from "@effect/vitest";
33 import { drizzle } from "drizzle-orm/better-sqlite3";
44 import { Effect } from "effect";
5−import { fumadb } from "fumadb";
5+import { fumadb } from "@executor-js/fumadb";
66 import {
77 createDrizzleRuntimeSchemaFromTables,
88 createDrizzleRuntimeSchemaSqlFromTables,
99 drizzleAdapter,
10−} from "fumadb/adapters/drizzle";
11−import { withQueryContext, type AbstractQuery } from "fumadb/query";
12−import { column, idColumn, schema, table } from "fumadb/schema";
10+} from "@executor-js/fumadb/adapters/drizzle";
11+import { withQueryContext, type AbstractQuery } from "@executor-js/fumadb/query";
12+import { column, idColumn, schema, table } from "@executor-js/fumadb/schema";
1313
1414 interface TenantPolicyContext {
1515 readonly allowedTenantIds: ReadonlySet<string>;
packages/core/fumadb/src/shared/config.ts+1−1
@@ -35,4 +35,4 @@ export interface KyselyConfig { · 34 unmodified lines
3535 relationMode?: RelationMode;
3636 }
3737
38−export type RelationMode = "foreign-keys" | "fumadb";
38+export type RelationMode = "foreign-keys" | "@executor-js/fumadb";
packages/core/fumadb/test/snapshots/generate/drizzle-orm.mysql.ts+1−1
@@ -1,5 +1,5 @@
11 import { mysqlTable, varchar, foreignKey, text, customType } from "drizzle-orm/mysql-core"
2−import { createId } from "fumadb/cuid"
2+import { createId } from "@executor-js/fumadb/cuid"
33 import { relations } from "drizzle-orm"
44
55 export const users = mysqlTable("users", {
packages/core/fumadb/test/snapshots/generate/drizzle-orm.postgresql.ts+1−1
@@ -1,5 +1,5 @@
11 import { pgTable, varchar, foreignKey, text, customType } from "drizzle-orm/pg-core"
2−import { createId } from "fumadb/cuid"
2+import { createId } from "@executor-js/fumadb/cuid"
33 import { relations } from "drizzle-orm"
44
55 export const users = pgTable("users", {
packages/core/fumadb/test/snapshots/generate/drizzle-orm.sqlite.ts+1−1
@@ -1,5 +1,5 @@
11 import { sqliteTable, text, foreignKey, customType } from "drizzle-orm/sqlite-core"
2−import { createId } from "fumadb/cuid"
2+import { createId } from "@executor-js/fumadb/cuid"
33 import { relations } from "drizzle-orm"
44
55 export const users = sqliteTable("users", {
packages/core/fumadb/vitest.config.ts+1−1
@@ -4,7 +4,7 @@ import path from "node:path"; · 3 unmodified lines
44 export default defineConfig({
55 resolve: {
66 alias: {
7− "fumadb/cuid": path.resolve(import.meta.dirname, "./src/cuid.ts"),
7+ "@executor-js/fumadb/cuid": path.resolve(import.meta.dirname, "./src/cuid.ts"),
88 },
99 },
1010 test: {
packages/core/sdk/package.json+1−1
@@ -86,9 +86,9 @@ · 85 unmodified lines
8686 "typecheck:slow": "tsc --noEmit"
8787 },
8888 "dependencies": {
89+ "@executor-js/fumadb": "workspace:*",
8990 "@standard-schema/spec": "^1.1.0",
9091 "fractional-indexing": "^3.2.0",
91− "fumadb": "workspace:*",
9292 "oauth4webapi": "^3.8.5"
9393 },
9494 "devDependencies": {
packages/core/sdk/src/core-schema.ts+2−2
@@ -1,5 +1,5 @@
1−import { column, idColumn, table, type AnyColumn, type AnyTable } from "fumadb/schema";
2−import type { Condition, ConditionBuilder } from "fumadb/query";
1+import { column, idColumn, table, type AnyColumn, type AnyTable } from "@executor-js/fumadb/schema";
2+import type { Condition, ConditionBuilder } from "@executor-js/fumadb/query";
33
44 import { StorageError, type FumaRow } from "./fuma-runtime";
55 import {
packages/core/sdk/src/executor-fuma-db.ts+4−4
@@ -18,10 +18,10 @@ · 17 unmodified lines
1818 // root barrel — host code imports it from `@executor-js/sdk/host-internal`.
1919 // ---------------------------------------------------------------------------
2020
21−import { fumadb, type FumaDB } from "fumadb";
22−import { type DrizzleRuntimeProvider } from "fumadb/adapters/drizzle";
23−import { drizzleAdapter } from "fumadb/adapters/drizzle";
24−import { schema as fumaSchema, type RelationsMap } from "fumadb/schema";
21+import { fumadb, type FumaDB } from "@executor-js/fumadb";
22+import { type DrizzleRuntimeProvider } from "@executor-js/fumadb/adapters/drizzle";
23+import { drizzleAdapter } from "@executor-js/fumadb/adapters/drizzle";
24+import { schema as fumaSchema, type RelationsMap } from "@executor-js/fumadb/schema";
2525
2626 import type { FumaDb, FumaTables } from "./fuma-runtime";
2727
packages/core/sdk/src/executor.ts+5−5
@@ -1,10 +1,10 @@
11 import { Effect, Layer, Option, Predicate, Schema } from "effect";
22 import { FetchHttpClient, type HttpClient } from "effect/unstable/http";
3−import { fumadb } from "fumadb";
4−import { memoryAdapter } from "fumadb/adapters/memory";
5−import { withQueryContext, type Condition, type ConditionBuilder } from "fumadb/query";
6−import { schema as fumaSchema, type RelationsMap } from "fumadb/schema";
7−import type { AnyColumn } from "fumadb/schema";
3+import { fumadb } from "@executor-js/fumadb";
4+import { memoryAdapter } from "@executor-js/fumadb/adapters/memory";
5+import { withQueryContext, type Condition, type ConditionBuilder } from "@executor-js/fumadb/query";
6+import { schema as fumaSchema, type RelationsMap } from "@executor-js/fumadb/schema";
7+import type { AnyColumn } from "@executor-js/fumadb/schema";
88 import { generateKeyBetween } from "fractional-indexing";
99
1010 import {
packages/core/sdk/src/fuma-runtime.ts+2−2
@@ -1,6 +1,6 @@
11 import { Cause, Context, Data, Effect, Exit, Layer, Predicate } from "effect";
2−import type { AbstractQuery } from "fumadb/query";
3−import type { AnySchema, AnyTable, Schema as FumaSchema } from "fumadb/schema";
2+import type { AbstractQuery } from "@executor-js/fumadb/query";
3+import type { AnySchema, AnyTable, Schema as FumaSchema } from "@executor-js/fumadb/schema";
44
55 export class StorageError extends Data.TaggedError("StorageError")<{
66 readonly message: string;
packages/core/sdk/src/index.ts+11−5
@@ -16,11 +16,17 @@ export { · 15 unmodified lines
1616 } from "effect/unstable/httpapi";
1717
1818 // FumaDB integration.
19−export { fumadb } from "fumadb";
20−export type { FumaDB } from "fumadb";
21−export type { AbstractQuery, Condition, ConditionBuilder } from "fumadb/query";
22−export { column, idColumn, schema as fumaSchema, table } from "fumadb/schema";
23−export type { AnyColumn, AnySchema, AnyTable, Column, Schema as FumaSchema } from "fumadb/schema";
19+export { fumadb } from "@executor-js/fumadb";
20+export type { FumaDB } from "@executor-js/fumadb";
21+export type { AbstractQuery, Condition, ConditionBuilder } from "@executor-js/fumadb/query";
22+export { column, idColumn, schema as fumaSchema, table } from "@executor-js/fumadb/schema";
23+export type {
24+ AnyColumn,
25+ AnySchema,
26+ AnyTable,
27+ Column,
28+ Schema as FumaSchema,
29+} from "@executor-js/fumadb/schema";
2430
2531 export type {
2632 FumaDb,
packages/core/sdk/src/owner-policy.ts+2−2
@@ -1,5 +1,5 @@
1−import { type Condition, type ConditionBuilder } from "fumadb/query";
2−import type { AnyColumn, AnyTable } from "fumadb/schema";
1+import { type Condition, type ConditionBuilder } from "@executor-js/fumadb/query";
2+import type { AnyColumn, AnyTable } from "@executor-js/fumadb/schema";
33
44 import { StorageError } from "./fuma-runtime";
55
packages/core/sdk/src/sqlite-test-db.ts+3−3
@@ -2,12 +2,12 @@ import { createClient, type Client } from "@libsql/client"; · 1 unmodified line
22 import { drizzle, type LibSQLDatabase } from "drizzle-orm/libsql";
33 import { mkdirSync } from "node:fs";
44 import { dirname, resolve } from "node:path";
5−import { type FumaDB } from "fumadb";
5+import { type FumaDB } from "@executor-js/fumadb";
66 import {
77 createDrizzleRuntimeSchemaFromTables,
88 createDrizzleRuntimeSchemaSqlFromTables,
9−} from "fumadb/adapters/drizzle";
10−import { type schema as fumaSchema, type RelationsMap } from "fumadb/schema";
9+} from "@executor-js/fumadb/adapters/drizzle";
10+import { type schema as fumaSchema, type RelationsMap } from "@executor-js/fumadb/schema";
1111
1212 import { createExecutorFumaDb } from "./executor-fuma-db";
1313 import type { FumaDb, FumaTables } from "./fuma-runtime";
packages/core/sdk/src/test-config.ts+1−1
@@ -1,5 +1,5 @@
11 import { Context, Effect, Layer } from "effect";
2−import { withQueryContext } from "fumadb/query";
2+import { withQueryContext } from "@executor-js/fumadb/query";
33 import { collectTables, createExecutor, type Executor, type ExecutorConfig } from "./executor";
44 import type { FumaDb } from "./fuma-runtime";
55 import { ProviderItemId, ProviderKey, Subject, Tenant } from "./ids";
packages/kernel/runtime-dynamic-worker/package.json+1−1
@@ -23,11 +23,11 @@ · 22 unmodified lines
2323 "@electric-sql/pglite": "^0.4.4",
2424 "@electric-sql/pglite-socket": "^0.1.4",
2525 "@executor-js/execution": "workspace:*",
26+ "@executor-js/fumadb": "workspace:*",
2627 "@executor-js/plugin-openapi": "workspace:*",
2728 "@executor-js/sdk": "workspace:*",
2829 "@types/node": "catalog:",
2930 "drizzle-orm": "catalog:",
30− "fumadb": "workspace:*",
3131 "postgres": "^3.4.9",
3232 "vitest": "catalog:",
3333 "wrangler": "^4.81.0"
packages/kernel/runtime-dynamic-worker/scripts/pglite.ts+1−1
@@ -7,7 +7,7 @@ import { drizzle, type PgliteDatabase } from "drizzle-orm/pglite"; · 6 unmodified lines
77 import {
88 createDrizzleRuntimeSchemaFromTables,
99 ensureDrizzleRuntimeSchemaFromTables,
10−} from "fumadb/adapters/drizzle";
10+} from "@executor-js/fumadb/adapters/drizzle";
1111
1212 import type { FumaTables } from "@executor-js/sdk";
1313
packages/kernel/runtime-dynamic-worker/src/integration.test.ts+6−3
@@ -21,9 +21,12 @@ import * as Effect from "effect/Effect"; · 20 unmodified lines
2121 import * as Layer from "effect/Layer";
2222 import * as Predicate from "effect/Predicate";
2323 import { HttpClient, HttpClientResponse, type HttpClientRequest } from "effect/unstable/http";
24−import { fumadb } from "fumadb";
25−import { createDrizzleRuntimeSchemaFromTables, drizzleAdapter } from "fumadb/adapters/drizzle";
26−import { schema as fumaSchema } from "fumadb/schema";
24+import { fumadb } from "@executor-js/fumadb";
25+import {
26+ createDrizzleRuntimeSchemaFromTables,
27+ drizzleAdapter,
28+} from "@executor-js/fumadb/adapters/drizzle";
29+import { schema as fumaSchema } from "@executor-js/fumadb/schema";
2730 import postgres from "postgres";
2831
2932 import {