@prisma-next/driver-postgres 0.1.0-pr.50.4 → 0.1.0-pr.51.2

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.
@@ -79,16 +79,20 @@ var PostgresDriverImpl = class {
79
79
  return this.pool.connect();
80
80
  }
81
81
  if (this.directClient) {
82
- try {
83
- await this.directClient.connect();
84
- } catch (error) {
85
- if (error instanceof Error) {
86
- const message = error.message.toLowerCase();
87
- if (!message.includes("already") && !message.includes("connected")) {
82
+ const client = this.directClient;
83
+ const isConnected = client._connection !== void 0 && client._connection !== null && !client._ending;
84
+ if (!isConnected) {
85
+ try {
86
+ await this.directClient.connect();
87
+ } catch (error) {
88
+ if (error instanceof Error) {
89
+ const message = error.message.toLowerCase();
90
+ if (!message.includes("already") && !message.includes("connected")) {
91
+ throw error;
92
+ }
93
+ } else {
88
94
  throw error;
89
95
  }
90
- } else {
91
- throw error;
92
96
  }
93
97
  }
94
98
  return this.directClient;
@@ -1 +1 @@
1
- {"version":3,"sources":["../../src/exports/runtime.ts","../../src/postgres-driver.ts"],"sourcesContent":["import { readFileSync } from 'node:fs';\nimport { dirname, join } from 'node:path';\nimport { fileURLToPath } from 'node:url';\nimport type { ExtensionPackManifest } from '@prisma-next/contract/pack-manifest-types';\nimport type {\n RuntimeDriverDescriptor,\n RuntimeDriverInstance,\n} from '@prisma-next/core-execution-plane/types';\nimport type { SqlDriver } from '@prisma-next/sql-relational-core/ast';\nimport { type } from 'arktype';\nimport type { PostgresDriverOptions } from '../postgres-driver';\nimport { createPostgresDriverFromOptions } from '../postgres-driver';\n\nconst __filename = fileURLToPath(import.meta.url);\nconst __dirname = dirname(__filename);\n\nconst TypesImportSpecSchema = type({\n package: 'string',\n named: 'string',\n alias: 'string',\n});\n\nconst ExtensionPackManifestSchema = type({\n id: 'string',\n version: 'string',\n 'targets?': type({ '[string]': type({ 'minVersion?': 'string' }) }),\n 'capabilities?': 'Record<string, unknown>',\n 'types?': type({\n 'codecTypes?': type({\n import: TypesImportSpecSchema,\n }),\n 'operationTypes?': type({\n import: TypesImportSpecSchema,\n }),\n }),\n 'operations?': 'unknown[]',\n});\n\n/**\n * Loads the driver manifest from packs/manifest.json.\n */\nfunction loadDriverManifest(): ExtensionPackManifest {\n const manifestPath = join(__dirname, '../../packs/manifest.json');\n const manifestJson = JSON.parse(readFileSync(manifestPath, 'utf-8'));\n\n const result = ExtensionPackManifestSchema(manifestJson);\n if (result instanceof type.errors) {\n const messages = result.map((p: { message: string }) => p.message).join('; ');\n throw new Error(`Invalid driver manifest structure at ${manifestPath}: ${messages}`);\n }\n\n return result as ExtensionPackManifest;\n}\n\n/**\n * Postgres runtime driver instance interface.\n * SqlDriver provides SQL-specific methods (execute, explain, close).\n * RuntimeDriverInstance provides target identification (targetId).\n * We use intersection type to combine both interfaces.\n */\nexport type PostgresRuntimeDriver = RuntimeDriverInstance<'postgres'> & SqlDriver;\n\n/**\n * Postgres driver descriptor for runtime plane.\n */\nconst postgresRuntimeDriverDescriptor: RuntimeDriverDescriptor<\n 'sql',\n 'postgres',\n PostgresRuntimeDriver\n> = {\n kind: 'driver',\n familyId: 'sql',\n targetId: 'postgres',\n id: 'postgres',\n manifest: loadDriverManifest(),\n create(options: PostgresDriverOptions): PostgresRuntimeDriver {\n return createPostgresDriverFromOptions(options) as PostgresRuntimeDriver;\n },\n};\n\nexport default postgresRuntimeDriverDescriptor;\nexport type {\n CreatePostgresDriverOptions,\n PostgresDriverOptions,\n QueryResult,\n} from '../postgres-driver';\nexport { createPostgresDriver, createPostgresDriverFromOptions } from '../postgres-driver';\n","import type {\n SqlDriver,\n SqlExecuteRequest,\n SqlExplainResult,\n SqlQueryResult,\n} from '@prisma-next/sql-relational-core/ast';\nimport type {\n Client,\n QueryResult as PgQueryResult,\n PoolClient,\n Pool as PoolType,\n QueryResultRow,\n} from 'pg';\nimport { Pool } from 'pg';\nimport Cursor from 'pg-cursor';\n\nexport type QueryResult<T extends QueryResultRow = QueryResultRow> = PgQueryResult<T>;\n\nexport interface PostgresDriverOptions {\n readonly connect: { client: Client } | { pool: PoolType };\n readonly cursor?:\n | {\n readonly batchSize?: number;\n readonly disabled?: boolean;\n }\n | undefined;\n}\n\nconst DEFAULT_BATCH_SIZE = 100;\n\nclass PostgresDriverImpl implements SqlDriver {\n private readonly pool: PoolType | undefined;\n private readonly directClient: Client | undefined;\n private readonly cursorBatchSize: number;\n private readonly cursorDisabled: boolean;\n\n constructor(options: PostgresDriverOptions) {\n if ('client' in options.connect) {\n this.directClient = options.connect.client;\n } else if ('pool' in options.connect) {\n this.pool = options.connect.pool;\n } else {\n throw new Error('PostgresDriver requires a pool or client');\n }\n\n this.cursorBatchSize = options.cursor?.batchSize ?? DEFAULT_BATCH_SIZE;\n this.cursorDisabled = options.cursor?.disabled ?? false;\n }\n\n async connect(): Promise<void> {\n // No-op: caller controls connecting the underlying client or pool\n }\n\n async *execute<Row = Record<string, unknown>>(request: SqlExecuteRequest): AsyncIterable<Row> {\n const client = await this.acquireClient();\n try {\n if (!this.cursorDisabled) {\n try {\n for await (const row of this.executeWithCursor(client, request.sql, request.params)) {\n yield row as Row;\n }\n return;\n } catch (cursorError) {\n if (!(cursorError instanceof Error)) {\n throw cursorError;\n }\n }\n }\n\n for await (const row of this.executeBuffered(client, request.sql, request.params)) {\n yield row as Row;\n }\n } finally {\n await this.releaseClient(client);\n }\n }\n\n async explain(request: SqlExecuteRequest): Promise<SqlExplainResult> {\n const text = `EXPLAIN (FORMAT JSON) ${request.sql}`;\n const client = await this.acquireClient();\n try {\n const result = await client.query(text, request.params as unknown[] | undefined);\n return { rows: result.rows as ReadonlyArray<Record<string, unknown>> };\n } finally {\n await this.releaseClient(client);\n }\n }\n\n async query<Row = Record<string, unknown>>(\n sql: string,\n params?: readonly unknown[],\n ): Promise<SqlQueryResult<Row>> {\n const client = await this.acquireClient();\n try {\n const result = await client.query(sql, params as unknown[] | undefined);\n return result as unknown as SqlQueryResult<Row>;\n } finally {\n await this.releaseClient(client);\n }\n }\n\n async close(): Promise<void> {\n if (this.pool) {\n // Check if pool is already closed to avoid \"Called end on pool more than once\" error\n // pg Pool has an 'ended' property that indicates if the pool has been closed\n if (!(this.pool as { ended?: boolean }).ended) {\n await this.pool.end();\n }\n }\n }\n\n private async acquireClient(): Promise<PoolClient | Client> {\n if (this.pool) {\n return this.pool.connect();\n }\n if (this.directClient) {\n // Lazy connection: connect if not already connected\n // This allows tests to manage their own connections while still supporting lazy connection\n // pg's Client.connect() will throw if already connected, so we catch and ignore that case\n try {\n await this.directClient.connect();\n } catch (error: unknown) {\n // If already connected, pg throws an error - ignore it and proceed\n // Re-throw other errors (actual connection failures)\n if (error instanceof Error) {\n const message = error.message.toLowerCase();\n if (!message.includes('already') && !message.includes('connected')) {\n throw error;\n }\n } else {\n throw error;\n }\n }\n return this.directClient;\n }\n throw new Error('PostgresDriver requires a pool or client');\n }\n\n private async releaseClient(client: PoolClient | Client): Promise<void> {\n if (this.pool) {\n (client as PoolClient).release();\n }\n }\n\n private async *executeWithCursor(\n client: PoolClient | Client,\n sql: string,\n params: readonly unknown[] | undefined,\n ): AsyncIterable<Record<string, unknown>> {\n const cursor = client.query(new Cursor(sql, params as unknown[] | undefined));\n\n try {\n while (true) {\n const rows = await readCursor(cursor, this.cursorBatchSize);\n if (rows.length === 0) {\n break;\n }\n\n for (const row of rows) {\n yield row;\n }\n }\n } finally {\n await closeCursor(cursor);\n }\n }\n\n private async *executeBuffered(\n client: PoolClient | Client,\n sql: string,\n params: readonly unknown[] | undefined,\n ): AsyncIterable<Record<string, unknown>> {\n const result = await client.query(sql, params as unknown[] | undefined);\n for (const row of result.rows as Record<string, unknown>[]) {\n yield row;\n }\n }\n}\n\nexport interface CreatePostgresDriverOptions {\n readonly cursor?: PostgresDriverOptions['cursor'];\n readonly poolFactory?: typeof Pool;\n}\n\nexport function createPostgresDriver(\n connectionString: string,\n options?: CreatePostgresDriverOptions,\n): SqlDriver {\n const PoolImpl: typeof Pool = options?.poolFactory ?? Pool;\n const pool = new PoolImpl({ connectionString });\n return new PostgresDriverImpl({\n connect: { pool },\n cursor: options?.cursor,\n });\n}\n\nexport function createPostgresDriverFromOptions(options: PostgresDriverOptions): SqlDriver {\n return new PostgresDriverImpl(options);\n}\n\nfunction readCursor<Row>(cursor: Cursor<Row>, size: number): Promise<Row[]> {\n return new Promise<Row[]>((resolve, reject) => {\n cursor.read(size, (err, rows) => {\n if (err) {\n reject(err);\n return;\n }\n\n resolve(rows ?? []);\n });\n });\n}\n\nfunction closeCursor(cursor: Cursor<unknown>): Promise<void> {\n return new Promise<void>((resolve, reject) => {\n cursor.close((err) => {\n if (err) {\n reject(err);\n return;\n }\n\n resolve();\n });\n });\n}\n"],"mappings":"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","names":[]}
1
+ {"version":3,"sources":["../../src/exports/runtime.ts","../../src/postgres-driver.ts"],"sourcesContent":["import { readFileSync } from 'node:fs';\nimport { dirname, join } from 'node:path';\nimport { fileURLToPath } from 'node:url';\nimport type { ExtensionPackManifest } from '@prisma-next/contract/pack-manifest-types';\nimport type {\n RuntimeDriverDescriptor,\n RuntimeDriverInstance,\n} from '@prisma-next/core-execution-plane/types';\nimport type { SqlDriver } from '@prisma-next/sql-relational-core/ast';\nimport { type } from 'arktype';\nimport type { PostgresDriverOptions } from '../postgres-driver';\nimport { createPostgresDriverFromOptions } from '../postgres-driver';\n\nconst __filename = fileURLToPath(import.meta.url);\nconst __dirname = dirname(__filename);\n\nconst TypesImportSpecSchema = type({\n package: 'string',\n named: 'string',\n alias: 'string',\n});\n\nconst ExtensionPackManifestSchema = type({\n id: 'string',\n version: 'string',\n 'targets?': type({ '[string]': type({ 'minVersion?': 'string' }) }),\n 'capabilities?': 'Record<string, unknown>',\n 'types?': type({\n 'codecTypes?': type({\n import: TypesImportSpecSchema,\n }),\n 'operationTypes?': type({\n import: TypesImportSpecSchema,\n }),\n }),\n 'operations?': 'unknown[]',\n});\n\n/**\n * Loads the driver manifest from packs/manifest.json.\n */\nfunction loadDriverManifest(): ExtensionPackManifest {\n const manifestPath = join(__dirname, '../../packs/manifest.json');\n const manifestJson = JSON.parse(readFileSync(manifestPath, 'utf-8'));\n\n const result = ExtensionPackManifestSchema(manifestJson);\n if (result instanceof type.errors) {\n const messages = result.map((p: { message: string }) => p.message).join('; ');\n throw new Error(`Invalid driver manifest structure at ${manifestPath}: ${messages}`);\n }\n\n return result as ExtensionPackManifest;\n}\n\n/**\n * Postgres runtime driver instance interface.\n * SqlDriver provides SQL-specific methods (execute, explain, close).\n * RuntimeDriverInstance provides target identification (targetId).\n * We use intersection type to combine both interfaces.\n */\nexport type PostgresRuntimeDriver = RuntimeDriverInstance<'postgres'> & SqlDriver;\n\n/**\n * Postgres driver descriptor for runtime plane.\n */\nconst postgresRuntimeDriverDescriptor: RuntimeDriverDescriptor<\n 'sql',\n 'postgres',\n PostgresRuntimeDriver\n> = {\n kind: 'driver',\n familyId: 'sql',\n targetId: 'postgres',\n id: 'postgres',\n manifest: loadDriverManifest(),\n create(options: PostgresDriverOptions): PostgresRuntimeDriver {\n return createPostgresDriverFromOptions(options) as PostgresRuntimeDriver;\n },\n};\n\nexport default postgresRuntimeDriverDescriptor;\nexport type {\n CreatePostgresDriverOptions,\n PostgresDriverOptions,\n QueryResult,\n} from '../postgres-driver';\nexport { createPostgresDriver, createPostgresDriverFromOptions } from '../postgres-driver';\n","import type {\n SqlDriver,\n SqlExecuteRequest,\n SqlExplainResult,\n SqlQueryResult,\n} from '@prisma-next/sql-relational-core/ast';\nimport type {\n Client,\n QueryResult as PgQueryResult,\n PoolClient,\n Pool as PoolType,\n QueryResultRow,\n} from 'pg';\nimport { Pool } from 'pg';\nimport Cursor from 'pg-cursor';\n\nexport type QueryResult<T extends QueryResultRow = QueryResultRow> = PgQueryResult<T>;\n\nexport interface PostgresDriverOptions {\n readonly connect: { client: Client } | { pool: PoolType };\n readonly cursor?:\n | {\n readonly batchSize?: number;\n readonly disabled?: boolean;\n }\n | undefined;\n}\n\nconst DEFAULT_BATCH_SIZE = 100;\n\nclass PostgresDriverImpl implements SqlDriver {\n private readonly pool: PoolType | undefined;\n private readonly directClient: Client | undefined;\n private readonly cursorBatchSize: number;\n private readonly cursorDisabled: boolean;\n\n constructor(options: PostgresDriverOptions) {\n if ('client' in options.connect) {\n this.directClient = options.connect.client;\n } else if ('pool' in options.connect) {\n this.pool = options.connect.pool;\n } else {\n throw new Error('PostgresDriver requires a pool or client');\n }\n\n this.cursorBatchSize = options.cursor?.batchSize ?? DEFAULT_BATCH_SIZE;\n this.cursorDisabled = options.cursor?.disabled ?? false;\n }\n\n async connect(): Promise<void> {\n // No-op: caller controls connecting the underlying client or pool\n }\n\n async *execute<Row = Record<string, unknown>>(request: SqlExecuteRequest): AsyncIterable<Row> {\n const client = await this.acquireClient();\n try {\n if (!this.cursorDisabled) {\n try {\n for await (const row of this.executeWithCursor(client, request.sql, request.params)) {\n yield row as Row;\n }\n return;\n } catch (cursorError) {\n if (!(cursorError instanceof Error)) {\n throw cursorError;\n }\n }\n }\n\n for await (const row of this.executeBuffered(client, request.sql, request.params)) {\n yield row as Row;\n }\n } finally {\n await this.releaseClient(client);\n }\n }\n\n async explain(request: SqlExecuteRequest): Promise<SqlExplainResult> {\n const text = `EXPLAIN (FORMAT JSON) ${request.sql}`;\n const client = await this.acquireClient();\n try {\n const result = await client.query(text, request.params as unknown[] | undefined);\n return { rows: result.rows as ReadonlyArray<Record<string, unknown>> };\n } finally {\n await this.releaseClient(client);\n }\n }\n\n async query<Row = Record<string, unknown>>(\n sql: string,\n params?: readonly unknown[],\n ): Promise<SqlQueryResult<Row>> {\n const client = await this.acquireClient();\n try {\n const result = await client.query(sql, params as unknown[] | undefined);\n return result as unknown as SqlQueryResult<Row>;\n } finally {\n await this.releaseClient(client);\n }\n }\n\n async close(): Promise<void> {\n if (this.pool) {\n // Check if pool is already closed to avoid \"Called end on pool more than once\" error\n // pg Pool has an 'ended' property that indicates if the pool has been closed\n if (!(this.pool as { ended?: boolean }).ended) {\n await this.pool.end();\n }\n }\n }\n\n private async acquireClient(): Promise<PoolClient | Client> {\n if (this.pool) {\n return this.pool.connect();\n }\n if (this.directClient) {\n // Check if client is already connected before attempting to connect\n // This prevents hanging when the database only supports a single connection\n // pg's Client has internal connection state that we can check\n const client = this.directClient as Client & {\n _ending?: boolean;\n _connection?: unknown;\n };\n const isConnected =\n client._connection !== undefined && client._connection !== null && !client._ending;\n\n // Only connect if not already connected\n // If caller provided a connected client (e.g., in tests), use it as-is\n if (!isConnected) {\n try {\n await this.directClient.connect();\n } catch (error: unknown) {\n // If already connected, pg throws an error - ignore it and proceed\n // Re-throw other errors (actual connection failures)\n if (error instanceof Error) {\n const message = error.message.toLowerCase();\n if (!message.includes('already') && !message.includes('connected')) {\n throw error;\n }\n } else {\n throw error;\n }\n }\n }\n return this.directClient;\n }\n throw new Error('PostgresDriver requires a pool or client');\n }\n\n private async releaseClient(client: PoolClient | Client): Promise<void> {\n if (this.pool) {\n (client as PoolClient).release();\n }\n }\n\n private async *executeWithCursor(\n client: PoolClient | Client,\n sql: string,\n params: readonly unknown[] | undefined,\n ): AsyncIterable<Record<string, unknown>> {\n const cursor = client.query(new Cursor(sql, params as unknown[] | undefined));\n\n try {\n while (true) {\n const rows = await readCursor(cursor, this.cursorBatchSize);\n if (rows.length === 0) {\n break;\n }\n\n for (const row of rows) {\n yield row;\n }\n }\n } finally {\n await closeCursor(cursor);\n }\n }\n\n private async *executeBuffered(\n client: PoolClient | Client,\n sql: string,\n params: readonly unknown[] | undefined,\n ): AsyncIterable<Record<string, unknown>> {\n const result = await client.query(sql, params as unknown[] | undefined);\n for (const row of result.rows as Record<string, unknown>[]) {\n yield row;\n }\n }\n}\n\nexport interface CreatePostgresDriverOptions {\n readonly cursor?: PostgresDriverOptions['cursor'];\n readonly poolFactory?: typeof Pool;\n}\n\nexport function createPostgresDriver(\n connectionString: string,\n options?: CreatePostgresDriverOptions,\n): SqlDriver {\n const PoolImpl: typeof Pool = options?.poolFactory ?? Pool;\n const pool = new PoolImpl({ connectionString });\n return new PostgresDriverImpl({\n connect: { pool },\n cursor: options?.cursor,\n });\n}\n\nexport function createPostgresDriverFromOptions(options: PostgresDriverOptions): SqlDriver {\n return new PostgresDriverImpl(options);\n}\n\nfunction readCursor<Row>(cursor: Cursor<Row>, size: number): Promise<Row[]> {\n return new Promise<Row[]>((resolve, reject) => {\n cursor.read(size, (err, rows) => {\n if (err) {\n reject(err);\n return;\n }\n\n resolve(rows ?? []);\n });\n });\n}\n\nfunction closeCursor(cursor: Cursor<unknown>): Promise<void> {\n return new Promise<void>((resolve, reject) => {\n cursor.close((err) => {\n if (err) {\n reject(err);\n return;\n }\n\n resolve();\n });\n });\n}\n"],"mappings":"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","names":[]}
package/package.json CHANGED
@@ -1,18 +1,18 @@
1
1
  {
2
2
  "name": "@prisma-next/driver-postgres",
3
- "version": "0.1.0-pr.50.4",
3
+ "version": "0.1.0-pr.51.2",
4
4
  "type": "module",
5
5
  "sideEffects": false,
6
6
  "dependencies": {
7
7
  "arktype": "^2.0.0",
8
8
  "pg": "^8.11.5",
9
9
  "pg-cursor": "^2.10.5",
10
- "@prisma-next/contract": "0.1.0-pr.50.4",
11
- "@prisma-next/core-control-plane": "0.1.0-pr.50.4",
12
- "@prisma-next/core-execution-plane": "0.1.0-pr.50.4",
13
- "@prisma-next/sql-contract": "0.1.0-pr.50.4",
14
- "@prisma-next/sql-operations": "0.1.0-pr.50.4",
15
- "@prisma-next/sql-relational-core": "0.1.0-pr.50.4"
10
+ "@prisma-next/contract": "0.1.0-pr.51.2",
11
+ "@prisma-next/core-control-plane": "0.1.0-pr.51.2",
12
+ "@prisma-next/core-execution-plane": "0.1.0-pr.51.2",
13
+ "@prisma-next/sql-contract": "0.1.0-pr.51.2",
14
+ "@prisma-next/sql-operations": "0.1.0-pr.51.2",
15
+ "@prisma-next/sql-relational-core": "0.1.0-pr.51.2"
16
16
  },
17
17
  "devDependencies": {
18
18
  "pg-mem": "^3.0.5",