Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(driver-adapters): remove external wasm deps hack for napi, lift driver-adapters from query-engine/.. to libs/.. #5115

Merged
merged 21 commits into from
Jan 14, 2025
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
4e19353
feat(schema-engine-wasm): created wasm-compatible schema-engine-wasm …
jkomyno Jan 9, 2025
f1cb86f
chore(schema-engine-wasm): added "make build-se-wasm" command
jkomyno Jan 9, 2025
a339bb5
fix(schema-engine-wasm): replace "SchemaEngineParams" class instance …
jkomyno Jan 9, 2025
30e488a
feat(schema-engine-wasm): implement playground skeleton
jkomyno Jan 9, 2025
93379e7
fix(schema-engine-wasm): clippy
jkomyno Jan 10, 2025
4fdd27b
chore(schema-engine-wasm): lift "driver-adapters" from "query-engine"…
jkomyno Jan 10, 2025
0360567
Delete libs/driver-adapters/executor/bench/seed.sql.gz
jkomyno Jan 10, 2025
d492067
chore: update Cargo.lock
jkomyno Jan 10, 2025
69de78e
Merge branch 'feat/schema-engine-wasm-init' into chore/lift-driver-ad…
jkomyno Jan 10, 2025
3ed63a5
chore: update driver-adapters path references
jkomyno Jan 10, 2025
26f8a0d
Merge branch 'chore/lift-driver-adapters' of github.com:prisma/prisma…
jkomyno Jan 10, 2025
e6d2fb1
chore: update query-engine-wasm path references
jkomyno Jan 10, 2025
40b522a
chore: update query-engine-wasm path references
jkomyno Jan 10, 2025
c5270b0
chore: update query-engine-wasm and schema-engine-wasm path references
jkomyno Jan 10, 2025
f7d6654
feat(driver-adapters): get rid of external import hack, fix paths in …
jkomyno Jan 10, 2025
f8c3578
Revert "Delete libs/driver-adapters/executor/bench/seed.sql.gz"
jkomyno Jan 10, 2025
a9712e1
chore: merge main, fix conflicts
jkomyno Jan 13, 2025
0fb1712
chore: fix conflicts
jkomyno Jan 13, 2025
30726a6
chore: fix pnpm version to avoid https://github.com/pnpm/pnpm/issues/…
jkomyno Jan 13, 2025
63c00b1
fix: use actual dist JS file
jkomyno Jan 14, 2025
2a2e03a
chore: update tsup to latest
jkomyno Jan 14, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
feat(schema-engine-wasm): implement playground skeleton
  • Loading branch information
jkomyno committed Jan 9, 2025
commit 30e488a1564c54ff0d5ec17e249bf53d1747b5f6
1 change: 1 addition & 0 deletions query-engine/driver-adapters/executor/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
pnpm-debug.log
dist/
./db.sqlite
Empty file.
6 changes: 5 additions & 1 deletion query-engine/driver-adapters/executor/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,17 @@
"scripts": {
"build": "tsup ./src/testd-qe.ts ./src/bench.ts --format esm --dts",
"test:qe": "node --import tsx ./src/testd-qe.ts",
"demo:se": "node --import tsx ./src/demo-se.ts",
"clean:d1": "rm -rf ../../connector-test-kit-rs/query-engine-tests/.wrangler"
},
"tsup": {
"external": [
"../../../query-engine-wasm/pkg/postgresql/query_engine_bg.js",
"../../../query-engine-wasm/pkg/mysql/query_engine_bg.js",
"../../../query-engine-wasm/pkg/sqlite/query_engine_bg.js"
"../../../query-engine-wasm/pkg/sqlite/query_engine_bg.js",
"../../../schema-engine-wasm/pkg/postgresql/schema_engine_bg.js",
"../../../schema-engine-wasm/pkg/mysql/schema_engine_bg.js",
"../../../schema-engine-wasm/pkg/sqlite/schema_engine_bg.js"
]
},
"keywords": [],
Expand Down
93 changes: 93 additions & 0 deletions query-engine/driver-adapters/executor/src/demo-se.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,93 @@
import * as S from '@effect/schema/Schema'
import { bindAdapter } from '@prisma/driver-adapter-utils'

import type { DriverAdaptersManager } from './driver-adapters-manager'
import { Env } from './types'
import * as se from './schema-engine'
import { err } from './utils'
import { setupDriverAdaptersManager } from './setup'

/**
* Example run: `DRIVER_ADAPTER="libsql" pnpm demo:se`
*/
async function main(): Promise<void> {
const env = S.decodeUnknownSync(Env)(process.env)
console.log('[env]', env)

/**
* Static input for demo purposes.
*/

const url = 'file:./db.sqlite'

const schema = /* prisma */ `
generator client {
provider = "prisma-client-js"
}

datasource db {
provider = "sqlite"
url = "file:./db.sqlite"
}

model User {
id Int @id @default(autoincrement())
email String @unique
name String?
posts Post[]
}

model Post {
id Int @id @default(autoincrement())
title String
content String
author User @relation(fields: [authorId], references: [id])
authorId Int
}
`

const driverAdapterManager = await setupDriverAdaptersManager(
env,
)

const { engine, adapter } = await initSE({
env,
driverAdapterManager,
url,
schema,
})

console.log('[adapter]', adapter)

// TODO: use `engine`.
}

type InitQueryEngineParams = {
env: Env
driverAdapterManager: DriverAdaptersManager
url: string
schema: string
}

async function initSE({
env,
driverAdapterManager,
url,
schema,
}: InitQueryEngineParams) {
const adapter = await driverAdapterManager.connect({ url })
const errorCapturingAdapter = bindAdapter(adapter)
const engineInstance = await se.initSchemaEngine(
{
datamodel: schema,
},
adapter,
)

return {
engine: engineInstance,
adapter: errorCapturingAdapter,
}
}

main().catch(err)
30 changes: 30 additions & 0 deletions query-engine/driver-adapters/executor/src/schema-engine-wasm.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
import * as wasmPostgres from '../../../../schema-engine/schema-engine-wasm/pkg/postgresql/schema_engine_bg.js'
import * as wasmMysql from '../../../../schema-engine/schema-engine-wasm/pkg/mysql/schema_engine_bg.js'
import * as wasmSqlite from '../../../../schema-engine/schema-engine-wasm/pkg/sqlite/schema_engine_bg.js'
import fs from 'node:fs/promises'
import path from 'node:path'
import { __dirname } from './utils.js'

const wasm = {
postgres: wasmPostgres,
mysql: wasmMysql,
sqlite: wasmSqlite
}

type EngineName = keyof typeof wasm

const initializedModules = new Set<EngineName>()

export async function getSchemaEngineForProvider(provider: EngineName) {
const engine = wasm[provider]
if (!initializedModules.has(provider)) {
const subDir = provider === 'postgres' ? 'postgresql' : provider
const bytes = await fs.readFile(path.resolve(__dirname, '..', '..', '..', '..', 'schema-engine', 'schema-engine-wasm', 'pkg', subDir, 'schema_engine_bg.wasm'))
const module = new WebAssembly.Module(bytes)
const instance = new WebAssembly.Instance(module, { './schema_engine_bg.js': engine })
engine.__wbg_set_wasm(instance.exports)
initializedModules.add(provider)
}

return engine.SchemaEngine
}
25 changes: 25 additions & 0 deletions query-engine/driver-adapters/executor/src/schema-engine.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
import type { DriverAdapter } from '@prisma/driver-adapter-utils'
import { __dirname } from './utils'

export type SchemaEngineParams = {
// TODO: support multiple datamodels
datamodel: string
}

export interface SchemaEngine {
new(params: SchemaEngineParams, adapter: DriverAdapter): SchemaEngine
debugPanic(): Promise<void>
version(): Promise<string | undefined>
reset(): Promise<void>
}

export type QueryLogCallback = (log: string) => void

export async function initSchemaEngine(
params: SchemaEngineParams,
adapter: DriverAdapter,
): Promise<SchemaEngine> {
const { getSchemaEngineForProvider: getEngineForProvider } = await import('./schema-engine-wasm')
const WasmSchemaEngine = (await getEngineForProvider(adapter.provider)) as SchemaEngine
return new WasmSchemaEngine(params, adapter)
}
Loading