@prisma-next/postgres 0.4.0-dev.9 → 0.5.0-dev.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +1 @@
1
- {"version":3,"file":"config.d.mts","names":[],"sources":["../src/config/define-config.ts"],"sourcesContent":[],"mappings":";;;;UAWiB,qBAAA;;EAAA,SAAA,EAAA,CAAA,EAAA;IAmBD,SAAA,UAAY,CAAA,EAAU,MAAA;;iCAdL;;;;;iBAcjB,YAAA,UAAsB,wBAAwB"}
1
+ {"version":3,"file":"config.d.mts","names":[],"sources":["../src/config/define-config.ts"],"sourcesContent":[],"mappings":";;;;UAYiB,qBAAA;;EAAA,SAAA,EAAA,CAAA,EAAA;IAmBD,SAAA,UAAY,CAAA,EAAU,MAAA;;iCAdL;;;;;iBAcjB,YAAA,UAAsB,wBAAwB"}
package/dist/config.mjs CHANGED
@@ -1,11 +1,12 @@
1
- import { pathToFileURL } from "node:url";
2
1
  import postgresAdapter from "@prisma-next/adapter-postgres/control";
3
2
  import { defineConfig as defineConfig$1 } from "@prisma-next/config/config-types";
4
3
  import postgresDriver from "@prisma-next/driver-postgres/control";
5
4
  import sql from "@prisma-next/family-sql/control";
6
5
  import { prismaContract } from "@prisma-next/sql-contract-psl/provider";
6
+ import { typescriptContractFromPath } from "@prisma-next/sql-contract-ts/config-types";
7
7
  import postgres from "@prisma-next/target-postgres/control";
8
- import { extname, isAbsolute, resolve } from "pathe";
8
+ import { ifDefined } from "@prisma-next/utils/defined";
9
+ import { extname } from "pathe";
9
10
 
10
11
  //#region src/config/define-config.ts
11
12
  function deriveOutputPath(contractPath) {
@@ -16,27 +17,18 @@ function deriveOutputPath(contractPath) {
16
17
  function defineConfig(options) {
17
18
  const extensions = options.extensions ?? [];
18
19
  const output = deriveOutputPath(options.contract);
19
- const ext = extname(options.contract);
20
- const absoluteContractPath = isAbsolute(options.contract) ? options.contract : resolve(process.cwd(), options.contract);
21
20
  return defineConfig$1({
22
21
  family: sql,
23
22
  target: postgres,
24
23
  adapter: postgresAdapter,
25
24
  driver: postgresDriver,
26
25
  extensionPacks: extensions,
27
- contract: ext === ".ts" ? {
28
- source: async (context) => {
29
- const { typescriptContract } = await import("@prisma-next/sql-contract-ts/config-types");
30
- const mod = await import(pathToFileURL(absoluteContractPath).href);
31
- return typescriptContract(mod.default ?? mod.contract, output).source(context);
32
- },
33
- output
34
- } : prismaContract(options.contract, {
26
+ contract: extname(options.contract) === ".ts" ? typescriptContractFromPath(options.contract, output) : prismaContract(options.contract, {
35
27
  output,
36
28
  target: postgres
37
29
  }),
38
- ...options.db !== void 0 ? { db: options.db } : {},
39
- ...options.migrations !== void 0 ? { migrations: options.migrations } : {}
30
+ ...ifDefined("db", options.db),
31
+ ...ifDefined("migrations", options.migrations)
40
32
  });
41
33
  }
42
34
 
@@ -1 +1 @@
1
- {"version":3,"file":"config.mjs","names":["coreDefineConfig"],"sources":["../src/config/define-config.ts"],"sourcesContent":["import { pathToFileURL } from 'node:url';\nimport postgresAdapter from '@prisma-next/adapter-postgres/control';\nimport type { ContractSourceContext, PrismaNextConfig } from '@prisma-next/config/config-types';\nimport { defineConfig as coreDefineConfig } from '@prisma-next/config/config-types';\nimport postgresDriver from '@prisma-next/driver-postgres/control';\nimport sql from '@prisma-next/family-sql/control';\nimport type { ControlExtensionDescriptor } from '@prisma-next/framework-components/control';\nimport { prismaContract } from '@prisma-next/sql-contract-psl/provider';\nimport postgres from '@prisma-next/target-postgres/control';\nimport { extname, isAbsolute, resolve } from 'pathe';\n\nexport interface PostgresConfigOptions {\n readonly contract: string;\n readonly db?: {\n readonly connection?: string;\n };\n readonly extensions?: readonly ControlExtensionDescriptor<'sql', 'postgres'>[];\n readonly migrations?: {\n readonly dir?: string;\n };\n}\n\nfunction deriveOutputPath(contractPath: string): string {\n const ext = extname(contractPath);\n if (ext.length === 0) {\n return `${contractPath}.json`;\n }\n return `${contractPath.slice(0, -ext.length)}.json`;\n}\n\nexport function defineConfig(options: PostgresConfigOptions): PrismaNextConfig<'sql', 'postgres'> {\n const extensions = options.extensions ?? [];\n const output = deriveOutputPath(options.contract);\n const ext = extname(options.contract);\n\n const absoluteContractPath = isAbsolute(options.contract)\n ? options.contract\n : resolve(process.cwd(), options.contract);\n\n const contractConfig =\n ext === '.ts'\n ? {\n source: async (context: ContractSourceContext) => {\n const { typescriptContract } = await import(\n '@prisma-next/sql-contract-ts/config-types'\n );\n const mod = await import(pathToFileURL(absoluteContractPath).href);\n const contract = mod.default ?? mod.contract;\n return typescriptContract(contract, output).source(context);\n },\n output,\n }\n : prismaContract(options.contract, {\n output,\n target: postgres,\n });\n\n return coreDefineConfig({\n family: sql,\n target: postgres,\n adapter: postgresAdapter,\n driver: postgresDriver,\n extensionPacks: extensions,\n contract: contractConfig,\n ...(options.db !== undefined ? { db: options.db } : {}),\n ...(options.migrations !== undefined ? { migrations: options.migrations } : {}),\n });\n}\n"],"mappings":";;;;;;;;;;AAsBA,SAAS,iBAAiB,cAA8B;CACtD,MAAM,MAAM,QAAQ,aAAa;AACjC,KAAI,IAAI,WAAW,EACjB,QAAO,GAAG,aAAa;AAEzB,QAAO,GAAG,aAAa,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC;;AAG/C,SAAgB,aAAa,SAAqE;CAChG,MAAM,aAAa,QAAQ,cAAc,EAAE;CAC3C,MAAM,SAAS,iBAAiB,QAAQ,SAAS;CACjD,MAAM,MAAM,QAAQ,QAAQ,SAAS;CAErC,MAAM,uBAAuB,WAAW,QAAQ,SAAS,GACrD,QAAQ,WACR,QAAQ,QAAQ,KAAK,EAAE,QAAQ,SAAS;AAoB5C,QAAOA,eAAiB;EACtB,QAAQ;EACR,QAAQ;EACR,SAAS;EACT,QAAQ;EACR,gBAAgB;EAChB,UAvBA,QAAQ,QACJ;GACE,QAAQ,OAAO,YAAmC;IAChD,MAAM,EAAE,uBAAuB,MAAM,OACnC;IAEF,MAAM,MAAM,MAAM,OAAO,cAAc,qBAAqB,CAAC;AAE7D,WAAO,mBADU,IAAI,WAAW,IAAI,UACA,OAAO,CAAC,OAAO,QAAQ;;GAE7D;GACD,GACD,eAAe,QAAQ,UAAU;GAC/B;GACA,QAAQ;GACT,CAAC;EASN,GAAI,QAAQ,OAAO,SAAY,EAAE,IAAI,QAAQ,IAAI,GAAG,EAAE;EACtD,GAAI,QAAQ,eAAe,SAAY,EAAE,YAAY,QAAQ,YAAY,GAAG,EAAE;EAC/E,CAAC"}
1
+ {"version":3,"file":"config.mjs","names":["coreDefineConfig"],"sources":["../src/config/define-config.ts"],"sourcesContent":["import postgresAdapter from '@prisma-next/adapter-postgres/control';\nimport type { PrismaNextConfig } from '@prisma-next/config/config-types';\nimport { defineConfig as coreDefineConfig } from '@prisma-next/config/config-types';\nimport postgresDriver from '@prisma-next/driver-postgres/control';\nimport sql from '@prisma-next/family-sql/control';\nimport type { ControlExtensionDescriptor } from '@prisma-next/framework-components/control';\nimport { prismaContract } from '@prisma-next/sql-contract-psl/provider';\nimport { typescriptContractFromPath } from '@prisma-next/sql-contract-ts/config-types';\nimport postgres from '@prisma-next/target-postgres/control';\nimport { ifDefined } from '@prisma-next/utils/defined';\nimport { extname } from 'pathe';\n\nexport interface PostgresConfigOptions {\n readonly contract: string;\n readonly db?: {\n readonly connection?: string;\n };\n readonly extensions?: readonly ControlExtensionDescriptor<'sql', 'postgres'>[];\n readonly migrations?: {\n readonly dir?: string;\n };\n}\n\nfunction deriveOutputPath(contractPath: string): string {\n const ext = extname(contractPath);\n if (ext.length === 0) {\n return `${contractPath}.json`;\n }\n return `${contractPath.slice(0, -ext.length)}.json`;\n}\n\nexport function defineConfig(options: PostgresConfigOptions): PrismaNextConfig<'sql', 'postgres'> {\n const extensions = options.extensions ?? [];\n const output = deriveOutputPath(options.contract);\n const ext = extname(options.contract);\n\n const contractConfig =\n ext === '.ts'\n ? typescriptContractFromPath(options.contract, output)\n : prismaContract(options.contract, {\n output,\n target: postgres,\n });\n\n return coreDefineConfig({\n family: sql,\n target: postgres,\n adapter: postgresAdapter,\n driver: postgresDriver,\n extensionPacks: extensions,\n contract: contractConfig,\n ...ifDefined('db', options.db),\n ...ifDefined('migrations', options.migrations),\n });\n}\n"],"mappings":";;;;;;;;;;;AAuBA,SAAS,iBAAiB,cAA8B;CACtD,MAAM,MAAM,QAAQ,aAAa;AACjC,KAAI,IAAI,WAAW,EACjB,QAAO,GAAG,aAAa;AAEzB,QAAO,GAAG,aAAa,MAAM,GAAG,CAAC,IAAI,OAAO,CAAC;;AAG/C,SAAgB,aAAa,SAAqE;CAChG,MAAM,aAAa,QAAQ,cAAc,EAAE;CAC3C,MAAM,SAAS,iBAAiB,QAAQ,SAAS;AAWjD,QAAOA,eAAiB;EACtB,QAAQ;EACR,QAAQ;EACR,SAAS;EACT,QAAQ;EACR,gBAAgB;EAChB,UAhBU,QAAQ,QAAQ,SAAS,KAG3B,QACJ,2BAA2B,QAAQ,UAAU,OAAO,GACpD,eAAe,QAAQ,UAAU;GAC/B;GACA,QAAQ;GACT,CAAC;EASN,GAAG,UAAU,MAAM,QAAQ,GAAG;EAC9B,GAAG,UAAU,cAAc,QAAQ,WAAW;EAC/C,CAAC"}
@@ -1,5 +1,5 @@
1
1
  import { orm } from "@prisma-next/sql-orm-client";
2
- import { ExecutionContext, Middleware, Runtime, RuntimeVerifyOptions, SqlExecutionStackWithDriver, SqlRuntimeExtensionDescriptor } from "@prisma-next/sql-runtime";
2
+ import { ExecutionContext, Middleware, Runtime, RuntimeVerifyOptions, SqlExecutionStackWithDriver, SqlRuntimeExtensionDescriptor, TransactionContext } from "@prisma-next/sql-runtime";
3
3
  import { Client, Pool } from "pg";
4
4
  import { Contract } from "@prisma-next/contract/types";
5
5
  import { Db } from "@prisma-next/sql-builder/types";
@@ -33,6 +33,10 @@ type PostgresBindingInput = {
33
33
  //#region src/runtime/postgres.d.ts
34
34
  type PostgresTargetId = 'postgres';
35
35
  type OrmClient<TContract extends Contract<SqlStorage>> = ReturnType<typeof orm<TContract>>;
36
+ interface PostgresTransactionContext<TContract extends Contract<SqlStorage>> extends TransactionContext {
37
+ readonly sql: Db<TContract>;
38
+ readonly orm: OrmClient<TContract>;
39
+ }
36
40
  interface PostgresClient<TContract extends Contract<SqlStorage>> {
37
41
  readonly sql: Db<TContract>;
38
42
  readonly orm: OrmClient<TContract>;
@@ -40,6 +44,7 @@ interface PostgresClient<TContract extends Contract<SqlStorage>> {
40
44
  readonly stack: SqlExecutionStackWithDriver<PostgresTargetId>;
41
45
  connect(bindingInput?: PostgresBindingInput): Promise<Runtime>;
42
46
  runtime(): Runtime;
47
+ transaction<R>(fn: (tx: PostgresTransactionContext<TContract>) => PromiseLike<R>): Promise<R>;
43
48
  }
44
49
  interface PostgresOptionsBase<TContract extends Contract<SqlStorage>> {
45
50
  readonly extensions?: readonly SqlRuntimeExtensionDescriptor<PostgresTargetId>[];
@@ -1 +1 @@
1
- {"version":3,"file":"runtime.d.mts","names":[],"sources":["../src/runtime/binding.ts","../src/runtime/postgres.ts"],"sourcesContent":[],"mappings":";;;;;;;;KAGY,eAAA;;;;;iBAEkC;;EAFlC,SAAA,IAAA,EAAA,UAAe;EAKf,SAAA,MAAA,EAFsC,MAElB;CAER;AAUL,KAZP,oBAAA,GAYO;EAAO,SAAA,OAAA,EAVF,eAUE;EAAM,SAAA,GAAA,CAAA,EAAA,KAAA;;;;ECYpB,SAAA,OAAA,CAAA,EAAgB,KAAA;EACvB,SAAA,EAAA,CAAS,EAAA,KAAA;CAA4B,GAAA;EAAT,SAAA,EAAA,EDbd,ICac,GDbP,MCaO;EAAqD,SAAA,OAAA,CAAA,EAAA,KAAA;EAAX,SAAA,GAAA,CAAA,EAAA,KAAA;CAAlB;;;KAD7C,gBAAA;AD7BZ,KC8BK,SD9BO,CAAA,kBC8BqB,QD3BiB,CC2BR,UD3Bc,CAAA,CAAA,GC2BC,UD3BD,CAAA,OC2BmB,GD3BnB,CC2B8B,SD3B9B,CAAA,CAAA;AAE5C,UC2BK,cD3Be,CAAA,kBC2BkB,QD3BlB,CC2B2B,UD3B3B,CAAA,CAAA,CAAA;EAER,SAAA,GAAA,EC0BR,ED1BQ,CC0BL,SD1BK,CAAA;EAUL,SAAA,GAAA,ECiBH,SDjBG,CCiBO,SDjBP,CAAA;EAAO,SAAA,OAAA,ECkBN,gBDlBM,CCkBW,SDlBX,CAAA;EAAM,SAAA,KAAA,ECmBd,2BDnBc,CCmBc,gBDnBd,CAAA;yBCoBP,uBAAuB,QAAQ;aAC3C;;AATD,UAYK,mBAZW,CAAA,kBAY2B,QAZ3B,CAYoC,UAZpC,CAAA,CAAA,CAAA;EACvB,SAAA,UAAS,CAAA,EAAA,SAYmB,6BAZnB,CAYiD,gBAZjD,CAAA,EAAA;EAA4B,SAAA,UAAA,CAAA,EAAA,SAaT,UAbS,CAaE,SAbF,CAAA,EAAA;EAAT,SAAA,MAAA,CAAA,EAcb,oBAda;EAAqD,SAAA,WAAA,CAAA,EAAA;IAAX,SAAA,uBAAA,CAAA,EAAA,MAAA;IAAlB,SAAA,iBAAA,CAAA,EAAA,MAAA;EAAU,CAAA;AAEnE;AAA2D,UAmB1C,sBAAA,CAnB0C;EAAT,SAAA,OAAA,CAAA,EAoB7B,eApB6B;EAC/B,SAAA,GAAA,CAAA,EAAA,MAAA;EAAH,SAAA,EAAA,CAAA,EAqBA,IArBA,GAqBO,MArBP;;AACA,KAuBJ,2BAvBI,CAAA,kBAuB0C,QAvB1C,CAuBmD,UAvBnD,CAAA,CAAA,GAwBd,sBAxBc,GAyBZ,mBAzBY,CAyBQ,SAzBR,CAAA,GAAA;EACqB,SAAA,QAAA,EAyBZ,SAzBY;EAAjB,SAAA,YAAA,CAAA,EAAA,KAAA;CAC0B;AAA5B,KA4BN,+BA5BM,CAAA,kBA4B4C,QA5B5C,CA4BqD,UA5BrD,CAAA,CAAA,GA6BhB,sBA7BgB,GA8Bd,mBA9Bc,CA8BM,SA9BN,CAAA,GAAA;EACO,SAAA,YAAA,EAAA,OAAA;EAA+B,SAAA,QAAA,CAAA,EAAA,KAAA;CAAR;AACnC,KAiCD,eAjCC,CAAA,kBAiCiC,QAjCjC,CAiC0C,UAjC1C,CAAA,CAAA,GAkCT,2BAlCS,CAkCmB,SAlCnB,CAAA,GAmCT,+BAnCS,CAmCuB,SAnCvB,CAAA;;AAGb;;;;;;AAEiC,iBAsET,QAtES,CAAA,kBAsEkB,QAtElB,CAsE2B,UAtE3B,CAAA,CAAA,CAAA,OAAA,EAuEtB,2BAvEsB,CAuEM,SAvEN,CAAA,CAAA,EAwE9B,cAxE8B,CAwEf,SAxEe,CAAA;AACb,iBAwEI,QAxEJ,CAAA,kBAwE+B,QAxE/B,CAwEwC,UAxExC,CAAA,CAAA,CAAA,OAAA,EAyET,+BAzES,CAyEuB,SAzEvB,CAAA,CAAA,EA0EjB,cA1EiB,CA0EF,SA1EE,CAAA"}
1
+ {"version":3,"file":"runtime.d.mts","names":[],"sources":["../src/runtime/binding.ts","../src/runtime/postgres.ts"],"sourcesContent":[],"mappings":"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"}
package/dist/runtime.mjs CHANGED
@@ -5,7 +5,7 @@ import { instantiateExecutionStack } from "@prisma-next/framework-components/exe
5
5
  import { sql } from "@prisma-next/sql-builder/runtime";
6
6
  import { validateContract } from "@prisma-next/sql-contract/validate";
7
7
  import { orm } from "@prisma-next/sql-orm-client";
8
- import { createExecutionContext, createRuntime, createSqlExecutionStack } from "@prisma-next/sql-runtime";
8
+ import { createExecutionContext, createRuntime, createSqlExecutionStack, withTransaction } from "@prisma-next/sql-runtime";
9
9
  import postgresTarget from "@prisma-next/target-postgres/runtime";
10
10
  import { Client, Pool } from "pg";
11
11
 
@@ -146,6 +146,21 @@ function postgres(options) {
146
146
  },
147
147
  runtime() {
148
148
  return getRuntime();
149
+ },
150
+ transaction(fn) {
151
+ return withTransaction(getRuntime(), (txCtx) => {
152
+ const txSql = sql({ context });
153
+ const txOrm = orm({
154
+ runtime: { execute(plan) {
155
+ return txCtx.execute(plan);
156
+ } },
157
+ context
158
+ });
159
+ return fn(Object.assign(Object.create(txCtx), {
160
+ sql: txSql,
161
+ orm: txOrm
162
+ }));
163
+ });
149
164
  }
150
165
  };
151
166
  }
@@ -1 +1 @@
1
- {"version":3,"file":"runtime.mjs","names":["parsed: URL","PgPool","PgClient","runtimeInstance: Runtime | undefined","runtimeDriver: { connect(binding: unknown): Promise<void> } | undefined","connectPromise: Promise<void> | undefined","backgroundConnectError: unknown","orm: OrmClient<TContract>","ormBuilder","sqlBuilder"],"sources":["../src/runtime/binding.ts","../src/runtime/postgres.ts"],"sourcesContent":["import type { Client, Pool } from 'pg';\nimport { Client as PgClient, Pool as PgPool } from 'pg';\n\nexport type PostgresBinding =\n | { readonly kind: 'url'; readonly url: string }\n | { readonly kind: 'pgPool'; readonly pool: Pool }\n | { readonly kind: 'pgClient'; readonly client: Client };\n\nexport type PostgresBindingInput =\n | {\n readonly binding: PostgresBinding;\n readonly url?: never;\n readonly pg?: never;\n }\n | {\n readonly url: string;\n readonly binding?: never;\n readonly pg?: never;\n }\n | {\n readonly pg: Pool | Client;\n readonly binding?: never;\n readonly url?: never;\n };\n\ntype PostgresBindingFields = {\n readonly binding?: PostgresBinding;\n readonly url?: string;\n readonly pg?: Pool | Client;\n};\n\nfunction validatePostgresUrl(url: string): string {\n const trimmed = url.trim();\n if (trimmed.length === 0) {\n throw new Error('Postgres URL must be a non-empty string');\n }\n\n let parsed: URL;\n try {\n parsed = new URL(trimmed);\n } catch {\n throw new Error('Postgres URL must be a valid URL');\n }\n\n if (parsed.protocol !== 'postgres:' && parsed.protocol !== 'postgresql:') {\n throw new Error('Postgres URL must use postgres:// or postgresql://');\n }\n\n return trimmed;\n}\n\nexport function resolvePostgresBinding(options: PostgresBindingInput): PostgresBinding {\n const providedCount =\n Number(options.binding !== undefined) +\n Number(options.url !== undefined) +\n Number(options.pg !== undefined);\n\n if (providedCount !== 1) {\n throw new Error('Provide one binding input: binding, url, or pg');\n }\n\n if (options.binding !== undefined) {\n return options.binding;\n }\n\n if (options.url !== undefined) {\n return { kind: 'url', url: validatePostgresUrl(options.url) };\n }\n\n const pgBinding = options.pg;\n if (pgBinding === undefined) {\n throw new Error('Invariant violation: expected pg binding after validation');\n }\n\n if (pgBinding instanceof PgPool) {\n return { kind: 'pgPool', pool: pgBinding };\n }\n\n if (pgBinding instanceof PgClient) {\n return { kind: 'pgClient', client: pgBinding };\n }\n\n throw new Error(\n 'Unable to determine pg binding type from pg input; use binding with explicit kind',\n );\n}\n\nexport function resolveOptionalPostgresBinding(\n options: PostgresBindingFields,\n): PostgresBinding | undefined {\n const providedCount =\n Number(options.binding !== undefined) +\n Number(options.url !== undefined) +\n Number(options.pg !== undefined);\n\n if (providedCount === 0) {\n return undefined;\n }\n\n return resolvePostgresBinding(options as PostgresBindingInput);\n}\n","import postgresAdapter from '@prisma-next/adapter-postgres/runtime';\nimport type { Contract } from '@prisma-next/contract/types';\nimport postgresDriver from '@prisma-next/driver-postgres/runtime';\nimport { emptyCodecLookup } from '@prisma-next/framework-components/codec';\nimport { instantiateExecutionStack } from '@prisma-next/framework-components/execution';\nimport { sql as sqlBuilder } from '@prisma-next/sql-builder/runtime';\nimport type { Db } from '@prisma-next/sql-builder/types';\nimport type { SqlStorage } from '@prisma-next/sql-contract/types';\nimport { validateContract } from '@prisma-next/sql-contract/validate';\nimport { orm as ormBuilder } from '@prisma-next/sql-orm-client';\nimport type {\n ExecutionContext,\n Middleware,\n Runtime,\n RuntimeVerifyOptions,\n SqlExecutionStackWithDriver,\n SqlRuntimeExtensionDescriptor,\n} from '@prisma-next/sql-runtime';\nimport {\n createExecutionContext,\n createRuntime,\n createSqlExecutionStack,\n} from '@prisma-next/sql-runtime';\nimport postgresTarget from '@prisma-next/target-postgres/runtime';\nimport { type Client, Pool } from 'pg';\nimport {\n type PostgresBinding,\n type PostgresBindingInput,\n resolveOptionalPostgresBinding,\n resolvePostgresBinding,\n} from './binding';\n\nexport type PostgresTargetId = 'postgres';\ntype OrmClient<TContract extends Contract<SqlStorage>> = ReturnType<typeof ormBuilder<TContract>>;\n\nexport interface PostgresClient<TContract extends Contract<SqlStorage>> {\n readonly sql: Db<TContract>;\n readonly orm: OrmClient<TContract>;\n readonly context: ExecutionContext<TContract>;\n readonly stack: SqlExecutionStackWithDriver<PostgresTargetId>;\n connect(bindingInput?: PostgresBindingInput): Promise<Runtime>;\n runtime(): Runtime;\n}\n\nexport interface PostgresOptionsBase<TContract extends Contract<SqlStorage>> {\n readonly extensions?: readonly SqlRuntimeExtensionDescriptor<PostgresTargetId>[];\n readonly middleware?: readonly Middleware<TContract>[];\n readonly verify?: RuntimeVerifyOptions;\n readonly poolOptions?: {\n readonly connectionTimeoutMillis?: number;\n readonly idleTimeoutMillis?: number;\n };\n}\n\nexport interface PostgresBindingOptions {\n readonly binding?: PostgresBinding;\n readonly url?: string;\n readonly pg?: Pool | Client;\n}\n\nexport type PostgresOptionsWithContract<TContract extends Contract<SqlStorage>> =\n PostgresBindingOptions &\n PostgresOptionsBase<TContract> & {\n readonly contract: TContract;\n readonly contractJson?: never;\n };\n\nexport type PostgresOptionsWithContractJson<TContract extends Contract<SqlStorage>> =\n PostgresBindingOptions &\n PostgresOptionsBase<TContract> & {\n readonly contractJson: unknown;\n readonly contract?: never;\n };\n\nexport type PostgresOptions<TContract extends Contract<SqlStorage>> =\n | PostgresOptionsWithContract<TContract>\n | PostgresOptionsWithContractJson<TContract>;\n\nfunction hasContractJson<TContract extends Contract<SqlStorage>>(\n options: PostgresOptions<TContract>,\n): options is PostgresOptionsWithContractJson<TContract> {\n return 'contractJson' in options;\n}\n\nfunction resolveContract<TContract extends Contract<SqlStorage>>(\n options: PostgresOptions<TContract>,\n): TContract {\n const contractInput = hasContractJson(options) ? options.contractJson : options.contract;\n return validateContract<TContract>(contractInput, emptyCodecLookup);\n}\n\nfunction toRuntimeBinding<TContract extends Contract<SqlStorage>>(\n binding: PostgresBinding,\n options: PostgresOptions<TContract>,\n) {\n if (binding.kind !== 'url') {\n return binding;\n }\n\n return {\n kind: 'pgPool',\n pool: new Pool({\n connectionString: binding.url,\n connectionTimeoutMillis: options.poolOptions?.connectionTimeoutMillis ?? 20_000,\n idleTimeoutMillis: options.poolOptions?.idleTimeoutMillis ?? 30_000,\n }),\n } as const;\n}\n\n/**\n * Creates a lazy Postgres client from either `contractJson` or a TypeScript-authored `contract`.\n * Static query surfaces are available immediately, while `runtime()` instantiates the driver/pool on first call.\n *\n * - No-emit: pass a TypeScript-authored contract. Example: postgres({ contract })\n * - Emitted: pass Contract type explicitly. Example: postgres<Contract>({ contractJson, url })\n */\nexport default function postgres<TContract extends Contract<SqlStorage>>(\n options: PostgresOptionsWithContract<TContract>,\n): PostgresClient<TContract>;\nexport default function postgres<TContract extends Contract<SqlStorage>>(\n options: PostgresOptionsWithContractJson<TContract>,\n): PostgresClient<TContract>;\nexport default function postgres<TContract extends Contract<SqlStorage>>(\n options: PostgresOptions<TContract>,\n): PostgresClient<TContract> {\n const contract = resolveContract(options);\n let binding = resolveOptionalPostgresBinding(options);\n const stack = createSqlExecutionStack({\n target: postgresTarget,\n adapter: postgresAdapter,\n driver: postgresDriver,\n extensionPacks: options.extensions ?? [],\n });\n\n const context = createExecutionContext({\n contract,\n stack,\n });\n\n let runtimeInstance: Runtime | undefined;\n let runtimeDriver: { connect(binding: unknown): Promise<void> } | undefined;\n let driverConnected = false;\n let connectPromise: Promise<void> | undefined;\n let backgroundConnectError: unknown;\n const connectDriver = async (resolvedBinding: PostgresBinding): Promise<void> => {\n if (driverConnected) return;\n if (!runtimeDriver) throw new Error('Postgres runtime driver missing');\n if (connectPromise) return connectPromise;\n const runtimeBinding = toRuntimeBinding(resolvedBinding, options);\n connectPromise = runtimeDriver\n .connect(runtimeBinding)\n .then(() => {\n driverConnected = true;\n })\n .catch(async (err) => {\n backgroundConnectError = err;\n connectPromise = undefined;\n if (resolvedBinding.kind === 'url' && runtimeBinding.kind === 'pgPool') {\n await runtimeBinding.pool.end().catch(() => undefined);\n }\n throw err;\n });\n return connectPromise;\n };\n const getRuntime = (): Runtime => {\n if (backgroundConnectError !== undefined) {\n throw backgroundConnectError;\n }\n\n if (runtimeInstance) {\n return runtimeInstance;\n }\n\n const stackInstance = instantiateExecutionStack(stack);\n const driverDescriptor = stack.driver;\n if (!driverDescriptor) {\n throw new Error('Driver descriptor missing from execution stack');\n }\n\n const driver = driverDescriptor.create({\n cursor: { disabled: true },\n });\n runtimeDriver = driver;\n if (binding !== undefined) {\n void connectDriver(binding).catch(() => undefined);\n }\n\n runtimeInstance = createRuntime({\n stackInstance,\n context,\n driver,\n verify: options.verify ?? { mode: 'onFirstUse', requireMarker: false },\n ...(options.middleware ? { middleware: options.middleware } : {}),\n });\n\n return runtimeInstance;\n };\n const orm: OrmClient<TContract> = ormBuilder({\n runtime: {\n execute(plan) {\n return getRuntime().execute(plan);\n },\n connection() {\n return getRuntime().connection();\n },\n },\n context,\n });\n\n const sql: Db<TContract> = sqlBuilder<TContract>({ context });\n\n return {\n sql,\n orm,\n context,\n stack,\n async connect(bindingInput) {\n if (driverConnected || connectPromise) {\n throw new Error('Postgres client already connected');\n }\n\n if (bindingInput !== undefined) {\n binding = resolvePostgresBinding(bindingInput);\n }\n\n if (binding === undefined) {\n throw new Error(\n 'Postgres binding not configured. Pass url/pg/binding to postgres(...) or call db.connect({ ... }).',\n );\n }\n\n const runtime = getRuntime();\n if (driverConnected) {\n return runtime;\n }\n\n await connectDriver(binding);\n return runtime;\n },\n runtime() {\n return getRuntime();\n },\n };\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"runtime.mjs","names":["parsed: URL","PgPool","PgClient","runtimeInstance: Runtime | undefined","runtimeDriver: { connect(binding: unknown): Promise<void> } | undefined","connectPromise: Promise<void> | undefined","backgroundConnectError: unknown","orm: OrmClient<TContract>","ormBuilder","sqlBuilder","txSql: Db<TContract>","txOrm: OrmClient<TContract>"],"sources":["../src/runtime/binding.ts","../src/runtime/postgres.ts"],"sourcesContent":["import type { Client, Pool } from 'pg';\nimport { Client as PgClient, Pool as PgPool } from 'pg';\n\nexport type PostgresBinding =\n | { readonly kind: 'url'; readonly url: string }\n | { readonly kind: 'pgPool'; readonly pool: Pool }\n | { readonly kind: 'pgClient'; readonly client: Client };\n\nexport type PostgresBindingInput =\n | {\n readonly binding: PostgresBinding;\n readonly url?: never;\n readonly pg?: never;\n }\n | {\n readonly url: string;\n readonly binding?: never;\n readonly pg?: never;\n }\n | {\n readonly pg: Pool | Client;\n readonly binding?: never;\n readonly url?: never;\n };\n\ntype PostgresBindingFields = {\n readonly binding?: PostgresBinding;\n readonly url?: string;\n readonly pg?: Pool | Client;\n};\n\nfunction validatePostgresUrl(url: string): string {\n const trimmed = url.trim();\n if (trimmed.length === 0) {\n throw new Error('Postgres URL must be a non-empty string');\n }\n\n let parsed: URL;\n try {\n parsed = new URL(trimmed);\n } catch {\n throw new Error('Postgres URL must be a valid URL');\n }\n\n if (parsed.protocol !== 'postgres:' && parsed.protocol !== 'postgresql:') {\n throw new Error('Postgres URL must use postgres:// or postgresql://');\n }\n\n return trimmed;\n}\n\nexport function resolvePostgresBinding(options: PostgresBindingInput): PostgresBinding {\n const providedCount =\n Number(options.binding !== undefined) +\n Number(options.url !== undefined) +\n Number(options.pg !== undefined);\n\n if (providedCount !== 1) {\n throw new Error('Provide one binding input: binding, url, or pg');\n }\n\n if (options.binding !== undefined) {\n return options.binding;\n }\n\n if (options.url !== undefined) {\n return { kind: 'url', url: validatePostgresUrl(options.url) };\n }\n\n const pgBinding = options.pg;\n if (pgBinding === undefined) {\n throw new Error('Invariant violation: expected pg binding after validation');\n }\n\n if (pgBinding instanceof PgPool) {\n return { kind: 'pgPool', pool: pgBinding };\n }\n\n if (pgBinding instanceof PgClient) {\n return { kind: 'pgClient', client: pgBinding };\n }\n\n throw new Error(\n 'Unable to determine pg binding type from pg input; use binding with explicit kind',\n );\n}\n\nexport function resolveOptionalPostgresBinding(\n options: PostgresBindingFields,\n): PostgresBinding | undefined {\n const providedCount =\n Number(options.binding !== undefined) +\n Number(options.url !== undefined) +\n Number(options.pg !== undefined);\n\n if (providedCount === 0) {\n return undefined;\n }\n\n return resolvePostgresBinding(options as PostgresBindingInput);\n}\n","import postgresAdapter from '@prisma-next/adapter-postgres/runtime';\nimport type { Contract } from '@prisma-next/contract/types';\nimport postgresDriver from '@prisma-next/driver-postgres/runtime';\nimport { emptyCodecLookup } from '@prisma-next/framework-components/codec';\nimport { instantiateExecutionStack } from '@prisma-next/framework-components/execution';\nimport { sql as sqlBuilder } from '@prisma-next/sql-builder/runtime';\nimport type { Db } from '@prisma-next/sql-builder/types';\nimport type { SqlStorage } from '@prisma-next/sql-contract/types';\nimport { validateContract } from '@prisma-next/sql-contract/validate';\nimport { orm as ormBuilder } from '@prisma-next/sql-orm-client';\nimport type {\n ExecutionContext,\n Middleware,\n Runtime,\n RuntimeVerifyOptions,\n SqlExecutionStackWithDriver,\n SqlRuntimeExtensionDescriptor,\n TransactionContext,\n} from '@prisma-next/sql-runtime';\nimport {\n createExecutionContext,\n createRuntime,\n createSqlExecutionStack,\n withTransaction,\n} from '@prisma-next/sql-runtime';\nimport postgresTarget from '@prisma-next/target-postgres/runtime';\nimport { type Client, Pool } from 'pg';\nimport {\n type PostgresBinding,\n type PostgresBindingInput,\n resolveOptionalPostgresBinding,\n resolvePostgresBinding,\n} from './binding';\n\nexport type PostgresTargetId = 'postgres';\ntype OrmClient<TContract extends Contract<SqlStorage>> = ReturnType<typeof ormBuilder<TContract>>;\n\nexport interface PostgresTransactionContext<TContract extends Contract<SqlStorage>>\n extends TransactionContext {\n readonly sql: Db<TContract>;\n readonly orm: OrmClient<TContract>;\n}\n\nexport interface PostgresClient<TContract extends Contract<SqlStorage>> {\n readonly sql: Db<TContract>;\n readonly orm: OrmClient<TContract>;\n readonly context: ExecutionContext<TContract>;\n readonly stack: SqlExecutionStackWithDriver<PostgresTargetId>;\n connect(bindingInput?: PostgresBindingInput): Promise<Runtime>;\n runtime(): Runtime;\n transaction<R>(fn: (tx: PostgresTransactionContext<TContract>) => PromiseLike<R>): Promise<R>;\n}\n\nexport interface PostgresOptionsBase<TContract extends Contract<SqlStorage>> {\n readonly extensions?: readonly SqlRuntimeExtensionDescriptor<PostgresTargetId>[];\n readonly middleware?: readonly Middleware<TContract>[];\n readonly verify?: RuntimeVerifyOptions;\n readonly poolOptions?: {\n readonly connectionTimeoutMillis?: number;\n readonly idleTimeoutMillis?: number;\n };\n}\n\nexport interface PostgresBindingOptions {\n readonly binding?: PostgresBinding;\n readonly url?: string;\n readonly pg?: Pool | Client;\n}\n\nexport type PostgresOptionsWithContract<TContract extends Contract<SqlStorage>> =\n PostgresBindingOptions &\n PostgresOptionsBase<TContract> & {\n readonly contract: TContract;\n readonly contractJson?: never;\n };\n\nexport type PostgresOptionsWithContractJson<TContract extends Contract<SqlStorage>> =\n PostgresBindingOptions &\n PostgresOptionsBase<TContract> & {\n readonly contractJson: unknown;\n readonly contract?: never;\n };\n\nexport type PostgresOptions<TContract extends Contract<SqlStorage>> =\n | PostgresOptionsWithContract<TContract>\n | PostgresOptionsWithContractJson<TContract>;\n\nfunction hasContractJson<TContract extends Contract<SqlStorage>>(\n options: PostgresOptions<TContract>,\n): options is PostgresOptionsWithContractJson<TContract> {\n return 'contractJson' in options;\n}\n\nfunction resolveContract<TContract extends Contract<SqlStorage>>(\n options: PostgresOptions<TContract>,\n): TContract {\n const contractInput = hasContractJson(options) ? options.contractJson : options.contract;\n return validateContract<TContract>(contractInput, emptyCodecLookup);\n}\n\nfunction toRuntimeBinding<TContract extends Contract<SqlStorage>>(\n binding: PostgresBinding,\n options: PostgresOptions<TContract>,\n) {\n if (binding.kind !== 'url') {\n return binding;\n }\n\n return {\n kind: 'pgPool',\n pool: new Pool({\n connectionString: binding.url,\n connectionTimeoutMillis: options.poolOptions?.connectionTimeoutMillis ?? 20_000,\n idleTimeoutMillis: options.poolOptions?.idleTimeoutMillis ?? 30_000,\n }),\n } as const;\n}\n\n/**\n * Creates a lazy Postgres client from either `contractJson` or a TypeScript-authored `contract`.\n * Static query surfaces are available immediately, while `runtime()` instantiates the driver/pool on first call.\n *\n * - No-emit: pass a TypeScript-authored contract. Example: postgres({ contract })\n * - Emitted: pass Contract type explicitly. Example: postgres<Contract>({ contractJson, url })\n */\nexport default function postgres<TContract extends Contract<SqlStorage>>(\n options: PostgresOptionsWithContract<TContract>,\n): PostgresClient<TContract>;\nexport default function postgres<TContract extends Contract<SqlStorage>>(\n options: PostgresOptionsWithContractJson<TContract>,\n): PostgresClient<TContract>;\nexport default function postgres<TContract extends Contract<SqlStorage>>(\n options: PostgresOptions<TContract>,\n): PostgresClient<TContract> {\n const contract = resolveContract(options);\n let binding = resolveOptionalPostgresBinding(options);\n const stack = createSqlExecutionStack({\n target: postgresTarget,\n adapter: postgresAdapter,\n driver: postgresDriver,\n extensionPacks: options.extensions ?? [],\n });\n\n const context = createExecutionContext({\n contract,\n stack,\n });\n\n let runtimeInstance: Runtime | undefined;\n let runtimeDriver: { connect(binding: unknown): Promise<void> } | undefined;\n let driverConnected = false;\n let connectPromise: Promise<void> | undefined;\n let backgroundConnectError: unknown;\n const connectDriver = async (resolvedBinding: PostgresBinding): Promise<void> => {\n if (driverConnected) return;\n if (!runtimeDriver) throw new Error('Postgres runtime driver missing');\n if (connectPromise) return connectPromise;\n const runtimeBinding = toRuntimeBinding(resolvedBinding, options);\n connectPromise = runtimeDriver\n .connect(runtimeBinding)\n .then(() => {\n driverConnected = true;\n })\n .catch(async (err) => {\n backgroundConnectError = err;\n connectPromise = undefined;\n if (resolvedBinding.kind === 'url' && runtimeBinding.kind === 'pgPool') {\n await runtimeBinding.pool.end().catch(() => undefined);\n }\n throw err;\n });\n return connectPromise;\n };\n const getRuntime = (): Runtime => {\n if (backgroundConnectError !== undefined) {\n throw backgroundConnectError;\n }\n\n if (runtimeInstance) {\n return runtimeInstance;\n }\n\n const stackInstance = instantiateExecutionStack(stack);\n const driverDescriptor = stack.driver;\n if (!driverDescriptor) {\n throw new Error('Driver descriptor missing from execution stack');\n }\n\n const driver = driverDescriptor.create({\n cursor: { disabled: true },\n });\n runtimeDriver = driver;\n if (binding !== undefined) {\n void connectDriver(binding).catch(() => undefined);\n }\n\n runtimeInstance = createRuntime({\n stackInstance,\n context,\n driver,\n verify: options.verify ?? { mode: 'onFirstUse', requireMarker: false },\n ...(options.middleware ? { middleware: options.middleware } : {}),\n });\n\n return runtimeInstance;\n };\n const orm: OrmClient<TContract> = ormBuilder({\n runtime: {\n execute(plan) {\n return getRuntime().execute(plan);\n },\n connection() {\n return getRuntime().connection();\n },\n },\n context,\n });\n\n const sql: Db<TContract> = sqlBuilder<TContract>({ context });\n\n return {\n sql,\n orm,\n context,\n stack,\n\n async connect(bindingInput) {\n if (driverConnected || connectPromise) {\n throw new Error('Postgres client already connected');\n }\n\n if (bindingInput !== undefined) {\n binding = resolvePostgresBinding(bindingInput);\n }\n\n if (binding === undefined) {\n throw new Error(\n 'Postgres binding not configured. Pass url/pg/binding to postgres(...) or call db.connect({ ... }).',\n );\n }\n\n const runtime = getRuntime();\n if (driverConnected) {\n return runtime;\n }\n\n await connectDriver(binding);\n return runtime;\n },\n\n runtime() {\n return getRuntime();\n },\n\n transaction<R>(fn: (tx: PostgresTransactionContext<TContract>) => PromiseLike<R>): Promise<R> {\n return withTransaction(getRuntime(), (txCtx) => {\n const txSql: Db<TContract> = sqlBuilder<TContract>({ context });\n\n const txOrm: OrmClient<TContract> = ormBuilder({\n runtime: {\n execute(plan) {\n return txCtx.execute(plan);\n },\n },\n context,\n });\n\n // Use `txCtx` as the prototype instead of spreading it so that live\n // accessors (notably the `invalidated` getter, which reads a closure\n // variable in `withTransaction`) remain wired to the original object.\n // Spreading would evaluate the getter once and freeze its value.\n const tx: PostgresTransactionContext<TContract> = Object.assign(\n Object.create(txCtx) as TransactionContext,\n { sql: txSql, orm: txOrm },\n );\n\n return fn(tx);\n });\n },\n };\n}\n"],"mappings":";;;;;;;;;;;;AA+BA,SAAS,oBAAoB,KAAqB;CAChD,MAAM,UAAU,IAAI,MAAM;AAC1B,KAAI,QAAQ,WAAW,EACrB,OAAM,IAAI,MAAM,0CAA0C;CAG5D,IAAIA;AACJ,KAAI;AACF,WAAS,IAAI,IAAI,QAAQ;SACnB;AACN,QAAM,IAAI,MAAM,mCAAmC;;AAGrD,KAAI,OAAO,aAAa,eAAe,OAAO,aAAa,cACzD,OAAM,IAAI,MAAM,qDAAqD;AAGvE,QAAO;;AAGT,SAAgB,uBAAuB,SAAgD;AAMrF,KAJE,OAAO,QAAQ,YAAY,OAAU,GACrC,OAAO,QAAQ,QAAQ,OAAU,GACjC,OAAO,QAAQ,OAAO,OAAU,KAEZ,EACpB,OAAM,IAAI,MAAM,iDAAiD;AAGnE,KAAI,QAAQ,YAAY,OACtB,QAAO,QAAQ;AAGjB,KAAI,QAAQ,QAAQ,OAClB,QAAO;EAAE,MAAM;EAAO,KAAK,oBAAoB,QAAQ,IAAI;EAAE;CAG/D,MAAM,YAAY,QAAQ;AAC1B,KAAI,cAAc,OAChB,OAAM,IAAI,MAAM,4DAA4D;AAG9E,KAAI,qBAAqBC,KACvB,QAAO;EAAE,MAAM;EAAU,MAAM;EAAW;AAG5C,KAAI,qBAAqBC,OACvB,QAAO;EAAE,MAAM;EAAY,QAAQ;EAAW;AAGhD,OAAM,IAAI,MACR,oFACD;;AAGH,SAAgB,+BACd,SAC6B;AAM7B,KAJE,OAAO,QAAQ,YAAY,OAAU,GACrC,OAAO,QAAQ,QAAQ,OAAU,GACjC,OAAO,QAAQ,OAAO,OAAU,KAEZ,EACpB;AAGF,QAAO,uBAAuB,QAAgC;;;;;ACZhE,SAAS,gBACP,SACuD;AACvD,QAAO,kBAAkB;;AAG3B,SAAS,gBACP,SACW;AAEX,QAAO,iBADe,gBAAgB,QAAQ,GAAG,QAAQ,eAAe,QAAQ,UAC9B,iBAAiB;;AAGrE,SAAS,iBACP,SACA,SACA;AACA,KAAI,QAAQ,SAAS,MACnB,QAAO;AAGT,QAAO;EACL,MAAM;EACN,MAAM,IAAI,KAAK;GACb,kBAAkB,QAAQ;GAC1B,yBAAyB,QAAQ,aAAa,2BAA2B;GACzE,mBAAmB,QAAQ,aAAa,qBAAqB;GAC9D,CAAC;EACH;;AAgBH,SAAwB,SACtB,SAC2B;CAC3B,MAAM,WAAW,gBAAgB,QAAQ;CACzC,IAAI,UAAU,+BAA+B,QAAQ;CACrD,MAAM,QAAQ,wBAAwB;EACpC,QAAQ;EACR,SAAS;EACT,QAAQ;EACR,gBAAgB,QAAQ,cAAc,EAAE;EACzC,CAAC;CAEF,MAAM,UAAU,uBAAuB;EACrC;EACA;EACD,CAAC;CAEF,IAAIC;CACJ,IAAIC;CACJ,IAAI,kBAAkB;CACtB,IAAIC;CACJ,IAAIC;CACJ,MAAM,gBAAgB,OAAO,oBAAoD;AAC/E,MAAI,gBAAiB;AACrB,MAAI,CAAC,cAAe,OAAM,IAAI,MAAM,kCAAkC;AACtE,MAAI,eAAgB,QAAO;EAC3B,MAAM,iBAAiB,iBAAiB,iBAAiB,QAAQ;AACjE,mBAAiB,cACd,QAAQ,eAAe,CACvB,WAAW;AACV,qBAAkB;IAClB,CACD,MAAM,OAAO,QAAQ;AACpB,4BAAyB;AACzB,oBAAiB;AACjB,OAAI,gBAAgB,SAAS,SAAS,eAAe,SAAS,SAC5D,OAAM,eAAe,KAAK,KAAK,CAAC,YAAY,OAAU;AAExD,SAAM;IACN;AACJ,SAAO;;CAET,MAAM,mBAA4B;AAChC,MAAI,2BAA2B,OAC7B,OAAM;AAGR,MAAI,gBACF,QAAO;EAGT,MAAM,gBAAgB,0BAA0B,MAAM;EACtD,MAAM,mBAAmB,MAAM;AAC/B,MAAI,CAAC,iBACH,OAAM,IAAI,MAAM,iDAAiD;EAGnE,MAAM,SAAS,iBAAiB,OAAO,EACrC,QAAQ,EAAE,UAAU,MAAM,EAC3B,CAAC;AACF,kBAAgB;AAChB,MAAI,YAAY,OACd,CAAK,cAAc,QAAQ,CAAC,YAAY,OAAU;AAGpD,oBAAkB,cAAc;GAC9B;GACA;GACA;GACA,QAAQ,QAAQ,UAAU;IAAE,MAAM;IAAc,eAAe;IAAO;GACtE,GAAI,QAAQ,aAAa,EAAE,YAAY,QAAQ,YAAY,GAAG,EAAE;GACjE,CAAC;AAEF,SAAO;;CAET,MAAMC,QAA4BC,IAAW;EAC3C,SAAS;GACP,QAAQ,MAAM;AACZ,WAAO,YAAY,CAAC,QAAQ,KAAK;;GAEnC,aAAa;AACX,WAAO,YAAY,CAAC,YAAY;;GAEnC;EACD;EACD,CAAC;AAIF,QAAO;EACL,KAHyBC,IAAsB,EAAE,SAAS,CAAC;EAI3D;EACA;EACA;EAEA,MAAM,QAAQ,cAAc;AAC1B,OAAI,mBAAmB,eACrB,OAAM,IAAI,MAAM,oCAAoC;AAGtD,OAAI,iBAAiB,OACnB,WAAU,uBAAuB,aAAa;AAGhD,OAAI,YAAY,OACd,OAAM,IAAI,MACR,qGACD;GAGH,MAAM,UAAU,YAAY;AAC5B,OAAI,gBACF,QAAO;AAGT,SAAM,cAAc,QAAQ;AAC5B,UAAO;;EAGT,UAAU;AACR,UAAO,YAAY;;EAGrB,YAAe,IAA+E;AAC5F,UAAO,gBAAgB,YAAY,GAAG,UAAU;IAC9C,MAAMC,QAAuBD,IAAsB,EAAE,SAAS,CAAC;IAE/D,MAAME,QAA8BH,IAAW;KAC7C,SAAS,EACP,QAAQ,MAAM;AACZ,aAAO,MAAM,QAAQ,KAAK;QAE7B;KACD;KACD,CAAC;AAWF,WAAO,GAL2C,OAAO,OACvD,OAAO,OAAO,MAAM,EACpB;KAAE,KAAK;KAAO,KAAK;KAAO,CAC3B,CAEY;KACb;;EAEL"}
package/package.json CHANGED
@@ -1,26 +1,27 @@
1
1
  {
2
2
  "name": "@prisma-next/postgres",
3
- "version": "0.4.0-dev.9",
3
+ "version": "0.5.0-dev.1",
4
4
  "type": "module",
5
5
  "sideEffects": false,
6
6
  "description": "One-liner lazy Postgres client composition for Prisma Next",
7
7
  "dependencies": {
8
8
  "pathe": "^2.0.3",
9
9
  "pg": "8.16.3",
10
- "@prisma-next/adapter-postgres": "0.4.0-dev.9",
11
- "@prisma-next/config": "0.4.0-dev.9",
12
- "@prisma-next/contract": "0.4.0-dev.9",
13
- "@prisma-next/driver-postgres": "0.4.0-dev.9",
14
- "@prisma-next/framework-components": "0.4.0-dev.9",
15
- "@prisma-next/sql-contract": "0.4.0-dev.9",
16
- "@prisma-next/sql-contract-ts": "0.4.0-dev.9",
17
- "@prisma-next/sql-contract-psl": "0.4.0-dev.9",
18
- "@prisma-next/sql-builder": "0.4.0-dev.9",
19
- "@prisma-next/sql-orm-client": "0.4.0-dev.9",
20
- "@prisma-next/family-sql": "0.4.0-dev.9",
21
- "@prisma-next/sql-relational-core": "0.4.0-dev.9",
22
- "@prisma-next/target-postgres": "0.4.0-dev.9",
23
- "@prisma-next/sql-runtime": "0.4.0-dev.9"
10
+ "@prisma-next/adapter-postgres": "0.5.0-dev.1",
11
+ "@prisma-next/config": "0.5.0-dev.1",
12
+ "@prisma-next/framework-components": "0.5.0-dev.1",
13
+ "@prisma-next/family-sql": "0.5.0-dev.1",
14
+ "@prisma-next/driver-postgres": "0.5.0-dev.1",
15
+ "@prisma-next/sql-contract": "0.5.0-dev.1",
16
+ "@prisma-next/sql-contract-psl": "0.5.0-dev.1",
17
+ "@prisma-next/contract": "0.5.0-dev.1",
18
+ "@prisma-next/sql-contract-ts": "0.5.0-dev.1",
19
+ "@prisma-next/sql-builder": "0.5.0-dev.1",
20
+ "@prisma-next/sql-orm-client": "0.5.0-dev.1",
21
+ "@prisma-next/sql-relational-core": "0.5.0-dev.1",
22
+ "@prisma-next/target-postgres": "0.5.0-dev.1",
23
+ "@prisma-next/utils": "0.5.0-dev.1",
24
+ "@prisma-next/sql-runtime": "0.5.0-dev.1"
24
25
  },
25
26
  "devDependencies": {
26
27
  "@types/pg": "8.16.0",
@@ -1,13 +1,14 @@
1
- import { pathToFileURL } from 'node:url';
2
1
  import postgresAdapter from '@prisma-next/adapter-postgres/control';
3
- import type { ContractSourceContext, PrismaNextConfig } from '@prisma-next/config/config-types';
2
+ import type { PrismaNextConfig } from '@prisma-next/config/config-types';
4
3
  import { defineConfig as coreDefineConfig } from '@prisma-next/config/config-types';
5
4
  import postgresDriver from '@prisma-next/driver-postgres/control';
6
5
  import sql from '@prisma-next/family-sql/control';
7
6
  import type { ControlExtensionDescriptor } from '@prisma-next/framework-components/control';
8
7
  import { prismaContract } from '@prisma-next/sql-contract-psl/provider';
8
+ import { typescriptContractFromPath } from '@prisma-next/sql-contract-ts/config-types';
9
9
  import postgres from '@prisma-next/target-postgres/control';
10
- import { extname, isAbsolute, resolve } from 'pathe';
10
+ import { ifDefined } from '@prisma-next/utils/defined';
11
+ import { extname } from 'pathe';
11
12
 
12
13
  export interface PostgresConfigOptions {
13
14
  readonly contract: string;
@@ -33,23 +34,9 @@ export function defineConfig(options: PostgresConfigOptions): PrismaNextConfig<'
33
34
  const output = deriveOutputPath(options.contract);
34
35
  const ext = extname(options.contract);
35
36
 
36
- const absoluteContractPath = isAbsolute(options.contract)
37
- ? options.contract
38
- : resolve(process.cwd(), options.contract);
39
-
40
37
  const contractConfig =
41
38
  ext === '.ts'
42
- ? {
43
- source: async (context: ContractSourceContext) => {
44
- const { typescriptContract } = await import(
45
- '@prisma-next/sql-contract-ts/config-types'
46
- );
47
- const mod = await import(pathToFileURL(absoluteContractPath).href);
48
- const contract = mod.default ?? mod.contract;
49
- return typescriptContract(contract, output).source(context);
50
- },
51
- output,
52
- }
39
+ ? typescriptContractFromPath(options.contract, output)
53
40
  : prismaContract(options.contract, {
54
41
  output,
55
42
  target: postgres,
@@ -62,7 +49,7 @@ export function defineConfig(options: PostgresConfigOptions): PrismaNextConfig<'
62
49
  driver: postgresDriver,
63
50
  extensionPacks: extensions,
64
51
  contract: contractConfig,
65
- ...(options.db !== undefined ? { db: options.db } : {}),
66
- ...(options.migrations !== undefined ? { migrations: options.migrations } : {}),
52
+ ...ifDefined('db', options.db),
53
+ ...ifDefined('migrations', options.migrations),
67
54
  });
68
55
  }
@@ -15,11 +15,13 @@ import type {
15
15
  RuntimeVerifyOptions,
16
16
  SqlExecutionStackWithDriver,
17
17
  SqlRuntimeExtensionDescriptor,
18
+ TransactionContext,
18
19
  } from '@prisma-next/sql-runtime';
19
20
  import {
20
21
  createExecutionContext,
21
22
  createRuntime,
22
23
  createSqlExecutionStack,
24
+ withTransaction,
23
25
  } from '@prisma-next/sql-runtime';
24
26
  import postgresTarget from '@prisma-next/target-postgres/runtime';
25
27
  import { type Client, Pool } from 'pg';
@@ -33,6 +35,12 @@ import {
33
35
  export type PostgresTargetId = 'postgres';
34
36
  type OrmClient<TContract extends Contract<SqlStorage>> = ReturnType<typeof ormBuilder<TContract>>;
35
37
 
38
+ export interface PostgresTransactionContext<TContract extends Contract<SqlStorage>>
39
+ extends TransactionContext {
40
+ readonly sql: Db<TContract>;
41
+ readonly orm: OrmClient<TContract>;
42
+ }
43
+
36
44
  export interface PostgresClient<TContract extends Contract<SqlStorage>> {
37
45
  readonly sql: Db<TContract>;
38
46
  readonly orm: OrmClient<TContract>;
@@ -40,6 +48,7 @@ export interface PostgresClient<TContract extends Contract<SqlStorage>> {
40
48
  readonly stack: SqlExecutionStackWithDriver<PostgresTargetId>;
41
49
  connect(bindingInput?: PostgresBindingInput): Promise<Runtime>;
42
50
  runtime(): Runtime;
51
+ transaction<R>(fn: (tx: PostgresTransactionContext<TContract>) => PromiseLike<R>): Promise<R>;
43
52
  }
44
53
 
45
54
  export interface PostgresOptionsBase<TContract extends Contract<SqlStorage>> {
@@ -214,6 +223,7 @@ export default function postgres<TContract extends Contract<SqlStorage>>(
214
223
  orm,
215
224
  context,
216
225
  stack,
226
+
217
227
  async connect(bindingInput) {
218
228
  if (driverConnected || connectPromise) {
219
229
  throw new Error('Postgres client already connected');
@@ -237,8 +247,35 @@ export default function postgres<TContract extends Contract<SqlStorage>>(
237
247
  await connectDriver(binding);
238
248
  return runtime;
239
249
  },
250
+
240
251
  runtime() {
241
252
  return getRuntime();
242
253
  },
254
+
255
+ transaction<R>(fn: (tx: PostgresTransactionContext<TContract>) => PromiseLike<R>): Promise<R> {
256
+ return withTransaction(getRuntime(), (txCtx) => {
257
+ const txSql: Db<TContract> = sqlBuilder<TContract>({ context });
258
+
259
+ const txOrm: OrmClient<TContract> = ormBuilder({
260
+ runtime: {
261
+ execute(plan) {
262
+ return txCtx.execute(plan);
263
+ },
264
+ },
265
+ context,
266
+ });
267
+
268
+ // Use `txCtx` as the prototype instead of spreading it so that live
269
+ // accessors (notably the `invalidated` getter, which reads a closure
270
+ // variable in `withTransaction`) remain wired to the original object.
271
+ // Spreading would evaluate the getter once and freeze its value.
272
+ const tx: PostgresTransactionContext<TContract> = Object.assign(
273
+ Object.create(txCtx) as TransactionContext,
274
+ { sql: txSql, orm: txOrm },
275
+ );
276
+
277
+ return fn(tx);
278
+ });
279
+ },
243
280
  };
244
281
  }