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
40 "typecheck": "tsc --noEmit"40 "typecheck": "tsc --noEmit"
41 },41 },
42 "dependencies": {42 "dependencies": {
43 "@executor-js/fumadb": "workspace:*",
43 "@executor-js/sdk": "workspace:*",44 "@executor-js/sdk": "workspace:*",
44 "commander": "^12.1.0",45 "commander": "^12.1.0",
45 "effect": "catalog:",46 "effect": "catalog:",
46 "fumadb": "workspace:*",
47 "jiti": "^2.6.1"47 "jiti": "^2.6.1"
48 },48 },
49 "devDependencies": {49 "devDependencies": {
packages/core/cli/src/commands/schema.ts+3−3
@@ -36,9 +36,9 @@ const schemaGenerateAction = async (opts: SchemaGenerateOptions) => { · 35 unmodified lines
36 }36 }
37 37
38 const [{ fumadb }, { drizzleAdapter }, { schema: fumaSchema }] = await Promise.all([38 const [{ fumadb }, { drizzleAdapter }, { schema: fumaSchema }] = await Promise.all([
39 import("fumadb"),39 import("@executor-js/fumadb"),
40 import("fumadb/adapters/drizzle"),40 import("@executor-js/fumadb/adapters/drizzle"),
41 import("fumadb/schema"),41 import("@executor-js/fumadb/schema"),
42 ]);42 ]);
43 43
44 const schema = fumaSchema({44 const schema = fumaSchema({
packages/core/fumadb/package.json+1−1
@@ -1,5 +1,5 @@
1{1{
2 "name": "fumadb",2 "name": "@executor-js/fumadb",
3 "description": "A library for interacting with different databases for your package.",3 "description": "A library for interacting with different databases for your package.",
4 "version": "0.3.0",4 "version": "0.3.0",
5 "repository": {5 "repository": {
packages/core/fumadb/src/adapters/drizzle/generate.ts+1−1
@@ -173,7 +173,7 @@ export function generateSchema( · 172 unmodified lines
173 const value = JSON.stringify(column.default.value);173 const value = JSON.stringify(column.default.value);
174 col.push(`default(${value})`);174 col.push(`default(${value})`);
175 } else if (column.default.runtime === "auto") {175 } else if (column.default.runtime === "auto") {
176 imports.addImport("createId", "fumadb/cuid");176 imports.addImport("createId", "@executor-js/fumadb/cuid");
177 col.push("$defaultFn(() => createId())");177 col.push("$defaultFn(() => createId())");
178 } else if (column.default.runtime === "now") {178 } else if (column.default.runtime === "now") {
179 col.push("defaultNow()");179 col.push("defaultNow()");
packages/core/fumadb/src/adapters/kysely/migration/execute.ts+2−2
@@ -231,7 +231,7 @@ export function execute( · 230 unmodified lines
231 const {231 const {
232 db,232 db,
233 provider,233 provider,
234 relationMode = provider === "mssql" ? "fumadb" : "foreign-keys",234 relationMode = provider === "mssql" ? "@executor-js/fumadb" : "foreign-keys",
235 } = config;235 } = config;
236 236
237 function createTable(237 function createTable(
@@ -254,7 +254,7 @@ export function execute( · 16 unmodified lines
254 }254 }
255 255
256 for (const foreignKey of table.foreignKeys) {256 for (const foreignKey of table.foreignKeys) {
257 if (relationMode === "fumadb") break;257 if (relationMode === "@executor-js/fumadb") break;
258 const compiled = compileForeignKey(foreignKey, "sql");258 const compiled = compileForeignKey(foreignKey, "sql");
259 259
260 builder = builder.addForeignKeyConstraint(260 builder = builder.addForeignKeyConstraint(
packages/core/fumadb/src/adapters/kysely/query.ts+2−2
@@ -166,7 +166,7 @@ export function fromKysely( · 165 unmodified lines
166 const {166 const {
167 db: kysely,167 db: kysely,
168 provider,168 provider,
169 relationMode = provider === "mssql" ? "fumadb" : "foreign-keys",169 relationMode = provider === "mssql" ? "@executor-js/fumadb" : "foreign-keys",
170 } = config;170 } = config;
171 171
172 /**172 /**
@@ -520,7 +520,7 @@ export function fromKysely( · 347 unmodified lines
520 },520 },
521 };521 };
522 522
523 if (relationMode === "fumadb")523 if (relationMode === "@executor-js/fumadb")
524 adapter = createSoftForeignKey(schema, {524 adapter = createSoftForeignKey(schema, {
525 ...adapter,525 ...adapter,
526 generateInsertValuesDefault(table, values) {526 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
38 const {38 const {
39 provider,39 provider,
40 relationMode = provider === "mssql" || provider === "mongodb"40 relationMode = provider === "mssql" || provider === "mongodb"
41 ? "fumadb"41 ? "@executor-js/fumadb"
42 : "foreign-keys",42 : "foreign-keys",
43 dropUnusedTables = true,43 dropUnusedTables = true,
44 dropUnusedColumns = true,44 dropUnusedColumns = true,
@@ -205,7 +205,7 @@ export function generateMigrationFromSchema( · 160 unmodified lines
205 ): Operation[] {205 ): Operation[] {
206 const tableName = getName(newTable.names);206 const tableName = getName(newTable.names);
207 const operations: Operation[] = [];207 const operations: Operation[] = [];
208 if (relationMode === "fumadb") return operations;208 if (relationMode === "@executor-js/fumadb") return operations;
209 209
210 for (const foreignKey of newTable.foreignKeys) {210 for (const foreignKey of newTable.foreignKeys) {
211 const compiled = compileForeignKey(foreignKey, "sql");211 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
2import { describe, expect, it } from "@effect/vitest";2import { describe, expect, it } from "@effect/vitest";
3import { drizzle } from "drizzle-orm/better-sqlite3";3import { drizzle } from "drizzle-orm/better-sqlite3";
4import { Effect } from "effect";4import { Effect } from "effect";
5import { fumadb } from "fumadb";5import { fumadb } from "@executor-js/fumadb";
6import {6import {
7 createDrizzleRuntimeSchemaFromTables,7 createDrizzleRuntimeSchemaFromTables,
8 createDrizzleRuntimeSchemaSqlFromTables,8 createDrizzleRuntimeSchemaSqlFromTables,
9 drizzleAdapter,9 drizzleAdapter,
10} from "fumadb/adapters/drizzle";10} from "@executor-js/fumadb/adapters/drizzle";
11import { withQueryContext, type AbstractQuery } from "fumadb/query";11import { withQueryContext, type AbstractQuery } from "@executor-js/fumadb/query";
12import { column, idColumn, schema, table } from "fumadb/schema";12import { column, idColumn, schema, table } from "@executor-js/fumadb/schema";
13 13
14interface TenantPolicyContext {14interface TenantPolicyContext {
15 readonly allowedTenantIds: ReadonlySet<string>;15 readonly allowedTenantIds: ReadonlySet<string>;
packages/core/fumadb/src/shared/config.ts+1−1
@@ -35,4 +35,4 @@ export interface KyselyConfig { · 34 unmodified lines
35 relationMode?: RelationMode;35 relationMode?: RelationMode;
36}36}
37 37
38export type RelationMode = "foreign-keys" | "fumadb";38export type RelationMode = "foreign-keys" | "@executor-js/fumadb";
packages/core/fumadb/test/snapshots/generate/drizzle-orm.mysql.ts+1−1
@@ -1,5 +1,5 @@
1import { mysqlTable, varchar, foreignKey, text, customType } from "drizzle-orm/mysql-core"1import { mysqlTable, varchar, foreignKey, text, customType } from "drizzle-orm/mysql-core"
2import { createId } from "fumadb/cuid"2import { createId } from "@executor-js/fumadb/cuid"
3import { relations } from "drizzle-orm"3import { relations } from "drizzle-orm"
4 4
5export const users = mysqlTable("users", {5export const users = mysqlTable("users", {
packages/core/fumadb/test/snapshots/generate/drizzle-orm.postgresql.ts+1−1
@@ -1,5 +1,5 @@
1import { pgTable, varchar, foreignKey, text, customType } from "drizzle-orm/pg-core"1import { pgTable, varchar, foreignKey, text, customType } from "drizzle-orm/pg-core"
2import { createId } from "fumadb/cuid"2import { createId } from "@executor-js/fumadb/cuid"
3import { relations } from "drizzle-orm"3import { relations } from "drizzle-orm"
4 4
5export const users = pgTable("users", {5export const users = pgTable("users", {
packages/core/fumadb/test/snapshots/generate/drizzle-orm.sqlite.ts+1−1
@@ -1,5 +1,5 @@
1import { sqliteTable, text, foreignKey, customType } from "drizzle-orm/sqlite-core"1import { sqliteTable, text, foreignKey, customType } from "drizzle-orm/sqlite-core"
2import { createId } from "fumadb/cuid"2import { createId } from "@executor-js/fumadb/cuid"
3import { relations } from "drizzle-orm"3import { relations } from "drizzle-orm"
4 4
5export const users = sqliteTable("users", {5export const users = sqliteTable("users", {
packages/core/fumadb/vitest.config.ts+1−1
@@ -4,7 +4,7 @@ import path from "node:path"; · 3 unmodified lines
4export default defineConfig({4export default defineConfig({
5 resolve: {5 resolve: {
6 alias: {6 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"),
8 },8 },
9 },9 },
10 test: {10 test: {
packages/core/sdk/package.json+1−1
@@ -86,9 +86,9 @@ · 85 unmodified lines
86 "typecheck:slow": "tsc --noEmit"86 "typecheck:slow": "tsc --noEmit"
87 },87 },
88 "dependencies": {88 "dependencies": {
89 "@executor-js/fumadb": "workspace:*",
89 "@standard-schema/spec": "^1.1.0",90 "@standard-schema/spec": "^1.1.0",
90 "fractional-indexing": "^3.2.0",91 "fractional-indexing": "^3.2.0",
91 "fumadb": "workspace:*",
92 "oauth4webapi": "^3.8.5"92 "oauth4webapi": "^3.8.5"
93 },93 },
94 "devDependencies": {94 "devDependencies": {
packages/core/sdk/src/core-schema.ts+2−2
@@ -1,5 +1,5 @@
1import { column, idColumn, table, type AnyColumn, type AnyTable } from "fumadb/schema";1import { column, idColumn, table, type AnyColumn, type AnyTable } from "@executor-js/fumadb/schema";
2import type { Condition, ConditionBuilder } from "fumadb/query";2import type { Condition, ConditionBuilder } from "@executor-js/fumadb/query";
3 3
4import { StorageError, type FumaRow } from "./fuma-runtime";4import { StorageError, type FumaRow } from "./fuma-runtime";
5import {5import {
packages/core/sdk/src/executor-fuma-db.ts+4−4
@@ -18,10 +18,10 @@ · 17 unmodified lines
18// root barrel — host code imports it from `@executor-js/sdk/host-internal`.18// root barrel — host code imports it from `@executor-js/sdk/host-internal`.
19// ---------------------------------------------------------------------------19// ---------------------------------------------------------------------------
20 20
21import { fumadb, type FumaDB } from "fumadb";21import { fumadb, type FumaDB } from "@executor-js/fumadb";
22import { type DrizzleRuntimeProvider } from "fumadb/adapters/drizzle";22import { type DrizzleRuntimeProvider } from "@executor-js/fumadb/adapters/drizzle";
23import { drizzleAdapter } from "fumadb/adapters/drizzle";23import { drizzleAdapter } from "@executor-js/fumadb/adapters/drizzle";
24import { schema as fumaSchema, type RelationsMap } from "fumadb/schema";24import { schema as fumaSchema, type RelationsMap } from "@executor-js/fumadb/schema";
25 25
26import type { FumaDb, FumaTables } from "./fuma-runtime";26import type { FumaDb, FumaTables } from "./fuma-runtime";
27 27
packages/core/sdk/src/executor.ts+5−5
@@ -1,10 +1,10 @@
1import { Effect, Layer, Option, Predicate, Schema } from "effect";1import { Effect, Layer, Option, Predicate, Schema } from "effect";
2import { FetchHttpClient, type HttpClient } from "effect/unstable/http";2import { FetchHttpClient, type HttpClient } from "effect/unstable/http";
3import { fumadb } from "fumadb";3import { fumadb } from "@executor-js/fumadb";
4import { memoryAdapter } from "fumadb/adapters/memory";4import { memoryAdapter } from "@executor-js/fumadb/adapters/memory";
5import { withQueryContext, type Condition, type ConditionBuilder } from "fumadb/query";5import { withQueryContext, type Condition, type ConditionBuilder } from "@executor-js/fumadb/query";
6import { schema as fumaSchema, type RelationsMap } from "fumadb/schema";6import { schema as fumaSchema, type RelationsMap } from "@executor-js/fumadb/schema";
7import type { AnyColumn } from "fumadb/schema";7import type { AnyColumn } from "@executor-js/fumadb/schema";
8import { generateKeyBetween } from "fractional-indexing";8import { generateKeyBetween } from "fractional-indexing";
9 9
10import {10import {
packages/core/sdk/src/fuma-runtime.ts+2−2
@@ -1,6 +1,6 @@
1import { Cause, Context, Data, Effect, Exit, Layer, Predicate } from "effect";1import { Cause, Context, Data, Effect, Exit, Layer, Predicate } from "effect";
2import type { AbstractQuery } from "fumadb/query";2import type { AbstractQuery } from "@executor-js/fumadb/query";
3import type { AnySchema, AnyTable, Schema as FumaSchema } from "fumadb/schema";3import type { AnySchema, AnyTable, Schema as FumaSchema } from "@executor-js/fumadb/schema";
4 4
5export class StorageError extends Data.TaggedError("StorageError")<{5export class StorageError extends Data.TaggedError("StorageError")<{
6 readonly message: string;6 readonly message: string;
packages/core/sdk/src/index.ts+11−5
@@ -16,11 +16,17 @@ export { · 15 unmodified lines
16} from "effect/unstable/httpapi";16} from "effect/unstable/httpapi";
17 17
18// FumaDB integration.18// FumaDB integration.
19export { fumadb } from "fumadb";19export { fumadb } from "@executor-js/fumadb";
20export type { FumaDB } from "fumadb";20export type { FumaDB } from "@executor-js/fumadb";
21export type { AbstractQuery, Condition, ConditionBuilder } from "fumadb/query";21export type { AbstractQuery, Condition, ConditionBuilder } from "@executor-js/fumadb/query";
22export { column, idColumn, schema as fumaSchema, table } from "fumadb/schema";22export { column, idColumn, schema as fumaSchema, table } from "@executor-js/fumadb/schema";
23export type { AnyColumn, AnySchema, AnyTable, Column, Schema as FumaSchema } from "fumadb/schema";23export type {
24 AnyColumn,
25 AnySchema,
26 AnyTable,
27 Column,
28 Schema as FumaSchema,
29} from "@executor-js/fumadb/schema";
24 30
25export type {31export type {
26 FumaDb,32 FumaDb,
packages/core/sdk/src/owner-policy.ts+2−2
@@ -1,5 +1,5 @@
1import { type Condition, type ConditionBuilder } from "fumadb/query";1import { type Condition, type ConditionBuilder } from "@executor-js/fumadb/query";
2import type { AnyColumn, AnyTable } from "fumadb/schema";2import type { AnyColumn, AnyTable } from "@executor-js/fumadb/schema";
3 3
4import { StorageError } from "./fuma-runtime";4import { StorageError } from "./fuma-runtime";
5 5
packages/core/sdk/src/sqlite-test-db.ts+3−3
@@ -2,12 +2,12 @@ import { createClient, type Client } from "@libsql/client"; · 1 unmodified line
2import { drizzle, type LibSQLDatabase } from "drizzle-orm/libsql";2import { drizzle, type LibSQLDatabase } from "drizzle-orm/libsql";
3import { mkdirSync } from "node:fs";3import { mkdirSync } from "node:fs";
4import { dirname, resolve } from "node:path";4import { dirname, resolve } from "node:path";
5import { type FumaDB } from "fumadb";5import { type FumaDB } from "@executor-js/fumadb";
6import {6import {
7 createDrizzleRuntimeSchemaFromTables,7 createDrizzleRuntimeSchemaFromTables,
8 createDrizzleRuntimeSchemaSqlFromTables,8 createDrizzleRuntimeSchemaSqlFromTables,
9} from "fumadb/adapters/drizzle";9} from "@executor-js/fumadb/adapters/drizzle";
10import { type schema as fumaSchema, type RelationsMap } from "fumadb/schema";10import { type schema as fumaSchema, type RelationsMap } from "@executor-js/fumadb/schema";
11 11
12import { createExecutorFumaDb } from "./executor-fuma-db";12import { createExecutorFumaDb } from "./executor-fuma-db";
13import type { FumaDb, FumaTables } from "./fuma-runtime";13import type { FumaDb, FumaTables } from "./fuma-runtime";
packages/core/sdk/src/test-config.ts+1−1
@@ -1,5 +1,5 @@
1import { Context, Effect, Layer } from "effect";1import { Context, Effect, Layer } from "effect";
2import { withQueryContext } from "fumadb/query";2import { withQueryContext } from "@executor-js/fumadb/query";
3import { collectTables, createExecutor, type Executor, type ExecutorConfig } from "./executor";3import { collectTables, createExecutor, type Executor, type ExecutorConfig } from "./executor";
4import type { FumaDb } from "./fuma-runtime";4import type { FumaDb } from "./fuma-runtime";
5import { ProviderItemId, ProviderKey, Subject, Tenant } from "./ids";5import { ProviderItemId, ProviderKey, Subject, Tenant } from "./ids";
packages/kernel/runtime-dynamic-worker/package.json+1−1
@@ -23,11 +23,11 @@ · 22 unmodified lines
23 "@electric-sql/pglite": "^0.4.4",23 "@electric-sql/pglite": "^0.4.4",
24 "@electric-sql/pglite-socket": "^0.1.4",24 "@electric-sql/pglite-socket": "^0.1.4",
25 "@executor-js/execution": "workspace:*",25 "@executor-js/execution": "workspace:*",
26 "@executor-js/fumadb": "workspace:*",
26 "@executor-js/plugin-openapi": "workspace:*",27 "@executor-js/plugin-openapi": "workspace:*",
27 "@executor-js/sdk": "workspace:*",28 "@executor-js/sdk": "workspace:*",
28 "@types/node": "catalog:",29 "@types/node": "catalog:",
29 "drizzle-orm": "catalog:",30 "drizzle-orm": "catalog:",
30 "fumadb": "workspace:*",
31 "postgres": "^3.4.9",31 "postgres": "^3.4.9",
32 "vitest": "catalog:",32 "vitest": "catalog:",
33 "wrangler": "^4.81.0"33 "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
7import {7import {
8 createDrizzleRuntimeSchemaFromTables,8 createDrizzleRuntimeSchemaFromTables,
9 ensureDrizzleRuntimeSchemaFromTables,9 ensureDrizzleRuntimeSchemaFromTables,
10} from "fumadb/adapters/drizzle";10} from "@executor-js/fumadb/adapters/drizzle";
11 11
12import type { FumaTables } from "@executor-js/sdk";12import type { FumaTables } from "@executor-js/sdk";
13 13
packages/kernel/runtime-dynamic-worker/src/integration.test.ts+6−3
@@ -21,9 +21,12 @@ import * as Effect from "effect/Effect"; · 20 unmodified lines
21import * as Layer from "effect/Layer";21import * as Layer from "effect/Layer";
22import * as Predicate from "effect/Predicate";22import * as Predicate from "effect/Predicate";
23import { HttpClient, HttpClientResponse, type HttpClientRequest } from "effect/unstable/http";23import { HttpClient, HttpClientResponse, type HttpClientRequest } from "effect/unstable/http";
24import { fumadb } from "fumadb";24import { fumadb } from "@executor-js/fumadb";
25import { createDrizzleRuntimeSchemaFromTables, drizzleAdapter } from "fumadb/adapters/drizzle";25import {
26import { schema as fumaSchema } from "fumadb/schema";26 createDrizzleRuntimeSchemaFromTables,
27 drizzleAdapter,
28} from "@executor-js/fumadb/adapters/drizzle";
29import { schema as fumaSchema } from "@executor-js/fumadb/schema";
27import postgres from "postgres";30import postgres from "postgres";
28 31
29import {32import {

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