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

Showing the changes to packages (25 of 37 files). Show all

Unified · Split

25 files
  1. packages/core/cli/package.json +1 −1
  2. packages/core/cli/src/commands/schema.ts +3 −3
  3. packages/core/fumadb/package.json +1 −1
  4. packages/core/fumadb/src/adapters/drizzle/generate.ts +1 −1
  5. packages/core/fumadb/src/adapters/kysely/migration/execute.ts +2 −2
  6. packages/core/fumadb/src/adapters/kysely/query.ts +2 −2
  7. packages/core/fumadb/src/migration-engine/auto-from-schema.ts +2 −2
  8. packages/core/fumadb/src/query/table-policy.test.ts +4 −4
  9. packages/core/fumadb/src/shared/config.ts +1 −1
  10. packages/core/fumadb/test/snapshots/generate/drizzle-orm.mysql.ts +1 −1
  11. packages/core/fumadb/test/snapshots/generate/drizzle-orm.postgresql.ts +1 −1
  12. packages/core/fumadb/test/snapshots/generate/drizzle-orm.sqlite.ts +1 −1
  13. packages/core/fumadb/vitest.config.ts +1 −1
  14. packages/core/sdk/package.json +1 −1
  15. packages/core/sdk/src/core-schema.ts +2 −2
  16. packages/core/sdk/src/executor-fuma-db.ts +4 −4
  17. packages/core/sdk/src/executor.ts +5 −5
  18. packages/core/sdk/src/fuma-runtime.ts +2 −2
  19. packages/core/sdk/src/index.ts +11 −5
  20. packages/core/sdk/src/owner-policy.ts +2 −2
  21. packages/core/sdk/src/sqlite-test-db.ts +3 −3
  22. packages/core/sdk/src/test-config.ts +1 −1
  23. packages/kernel/runtime-dynamic-worker/package.json +1 −1
  24. packages/kernel/runtime-dynamic-worker/scripts/pglite.ts +1 −1
  25. packages/kernel/runtime-dynamic-worker/src/integration.test.ts +6 −3
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 {

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t