joist-orm 2.4.0 → 2.5.0-next.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.
Files changed (58) hide show
  1. package/build/drivers/PostgreJsDriver.cjs +216 -0
  2. package/build/drivers/PostgreJsDriver.cjs.map +1 -0
  3. package/build/drivers/PostgreJsDriver.d.cts +87 -0
  4. package/build/drivers/PostgreJsDriver.d.cts.map +1 -0
  5. package/build/drivers/PostgreJsDriver.d.mts +87 -0
  6. package/build/drivers/PostgreJsDriver.d.mts.map +1 -0
  7. package/build/drivers/PostgreJsDriver.js +212 -0
  8. package/build/drivers/PostgreJsDriver.js.map +1 -0
  9. package/build/drivers/PostgresDriver.cjs +165 -196
  10. package/build/drivers/PostgresDriver.cjs.map +1 -1
  11. package/build/drivers/PostgresDriver.d.cts +71 -47
  12. package/build/drivers/PostgresDriver.d.cts.map +1 -1
  13. package/build/drivers/PostgresDriver.d.mts +71 -47
  14. package/build/drivers/PostgresDriver.d.mts.map +1 -1
  15. package/build/drivers/PostgresDriver.js +164 -197
  16. package/build/drivers/PostgresDriver.js.map +1 -1
  17. package/build/drivers/WireRowData.cjs +26 -130
  18. package/build/drivers/WireRowData.cjs.map +1 -1
  19. package/build/drivers/WireRowData.d.cts +26 -33
  20. package/build/drivers/WireRowData.d.cts.map +1 -1
  21. package/build/drivers/WireRowData.d.mts +26 -33
  22. package/build/drivers/WireRowData.d.mts.map +1 -1
  23. package/build/drivers/WireRowData.js +27 -128
  24. package/build/drivers/WireRowData.js.map +1 -1
  25. package/build/drivers/binaryParsers.cjs +21 -13
  26. package/build/drivers/binaryParsers.cjs.map +1 -1
  27. package/build/drivers/binaryParsers.d.cts +16 -18
  28. package/build/drivers/binaryParsers.d.cts.map +1 -1
  29. package/build/drivers/binaryParsers.d.mts +16 -18
  30. package/build/drivers/binaryParsers.d.mts.map +1 -1
  31. package/build/drivers/binaryParsers.js +21 -13
  32. package/build/drivers/binaryParsers.js.map +1 -1
  33. package/build/drivers/patchPgProtocol.cjs.map +1 -1
  34. package/build/drivers/patchPgProtocol.d.cts +2 -3
  35. package/build/drivers/patchPgProtocol.d.cts.map +1 -1
  36. package/build/drivers/patchPgProtocol.d.mts +2 -3
  37. package/build/drivers/patchPgProtocol.d.mts.map +1 -1
  38. package/build/drivers/patchPgProtocol.js.map +1 -1
  39. package/build/drivers/postgresSql.cjs +145 -0
  40. package/build/drivers/postgresSql.cjs.map +1 -0
  41. package/build/drivers/postgresSql.d.cts +19 -0
  42. package/build/drivers/postgresSql.d.cts.map +1 -0
  43. package/build/drivers/postgresSql.d.mts +19 -0
  44. package/build/drivers/postgresSql.d.mts.map +1 -0
  45. package/build/drivers/postgresSql.js +143 -0
  46. package/build/drivers/postgresSql.js.map +1 -0
  47. package/build/index.js +1 -2
  48. package/build/pg-export.d.cts +1 -1
  49. package/build/pg-export.d.mts +1 -1
  50. package/build/postgrejs-export.cjs +3 -0
  51. package/build/postgrejs-export.d.cts +2 -0
  52. package/build/postgrejs-export.d.mts +2 -0
  53. package/build/postgrejs-export.js +1 -0
  54. package/build/seed.d.cts +1 -2
  55. package/build/seed.d.cts.map +1 -1
  56. package/build/seed.d.mts +1 -2
  57. package/build/seed.d.mts.map +1 -1
  58. package/package.json +38 -11
@@ -1 +1 @@
1
- {"version":3,"file":"patchPgProtocol.js","names":["#fields"],"sources":["../../src/drivers/patchPgProtocol.ts"],"sourcesContent":["import { createRequire } from \"node:module\";\nimport { dirname, join } from \"node:path\";\n\nconst runtimeRequire = createRequire(import.meta.url);\n\n/**\n * Patches pg-protocol at runtime so that DataRow messages are lazy *and* their bytes are\n * immutable, i.e. so `WireRowData` can retain raw row payloads by reference — no per-cell\n * strings, no per-row copies, no arena.\n *\n * We patch at runtime (instead of shipping a patched pg-protocol) so that installing joist-orm\n * requires no package-manager patch steps; see JS-ROW-STORE-DESIGN.md \"Distribution\". Two\n * prototype methods are replaced, porting brianc/node-postgres#3719 (which may or may not ever\n * land upstream — this patch is how we run its design in production regardless):\n *\n * - `handlePacket` (stable across pg-protocol 1.10-1.15) returns a {@link LazyDataRowMessage}\n * for DataRow packets and delegates every other message type to the original.\n * - `parse` replaces the recycled-scratch buffer management: each socket chunk is parsed *in\n * place*, and only the one message per chunk that straddles a read boundary is reassembled\n * into a buffer of its own, which is handed to that message and never touched again. Every\n * message therefore stays valid for as long as it is held (holding one pins the ~64 KiB chunk\n * it came from) — versus stock pg-protocol, which copies whole chunks into a scratch buffer\n * and compacts it in place over the bytes earlier messages point into.\n *\n * The patch verifies itself by round-tripping synthetic DataRows through a fresh `Parser` —\n * including a message that straddles chunks, retained across later reads that would clobber it\n * under the stock buffer management. On any mismatch (i.e. a future pg-protocol internals\n * rewrite), it un-patches and reports failure so the driver can fall back to classic rows.\n *\n * The lazy message's memoized `fields` getter decodes identically to the original for classic\n * consumers, i.e. pg's own `Result.parseRow(msg.fields)`.\n */\nexport function ensureLazyDataRows(): boolean {\n patched ??= tryPatch() ? \"applied\" : \"failed\";\n return patched === \"applied\";\n}\n\n/** A drop-in `DataRowMessage` that defers cell decoding; lazy consumers read `bytes`/`offset`. */\nexport class LazyDataRowMessage {\n public readonly name = \"dataRow\";\n public readonly fieldCount: number;\n #fields: (string | null)[] | undefined = undefined;\n\n constructor(\n public readonly length: number,\n /** The row's payload bytes; immutable under our `parse` patch, so safe to retain. */\n public readonly bytes: Buffer,\n public readonly offset: number,\n ) {\n this.fieldCount = bytes.readInt16BE(offset);\n }\n\n /** Lazily materializes the per-cell strings for classic consumers, i.e. pg's `Result.parseRow`. */\n get fields(): (string | null)[] {\n let fields = this.#fields;\n if (fields === undefined) {\n const { bytes, fieldCount } = this;\n fields = new Array(fieldCount);\n let pos = this.offset + 2;\n for (let i = 0; i < fieldCount; i++) {\n const len = bytes.readInt32BE(pos);\n pos += 4;\n if (len === -1) {\n fields[i] = null;\n } else {\n fields[i] = bytes.toString(\"utf8\", pos, pos + len);\n pos += len;\n }\n }\n this.#fields = fields;\n }\n return fields;\n }\n}\n\nlet patched: \"applied\" | \"failed\" | undefined;\n\n/** The 'D' message-type byte identifying a DataRow packet. */\nconst DATA_ROW_CODE = 68;\nconst CODE_LENGTH = 1;\nconst HEADER_LENGTH = 5;\n/** Cap on up-front allocation for a straddling message's claimed length, i.e. corrupt streams. */\nconst MAX_EAGER_MESSAGE_LENGTH = 1024 * 1024;\nconst emptyBuffer = Buffer.allocUnsafe(0);\n\n/** Resolves pg's own pg-protocol Parser class and swaps in the lazy/immutable DataRow handling. */\nfunction tryPatch(): boolean {\n try {\n const { Parser, version } = resolvePgProtocol();\n // Only patch the protocol major we've verified `handlePacket`'s shape against (1.10-1.15);\n // anything else fails closed (the driver then uses classic rows) until explicitly vetted\n if (!version.startsWith(\"1.\")) return false;\n const originalHandlePacket = Parser.prototype.handlePacket;\n const originalParse = Parser.prototype.parse;\n if (typeof originalHandlePacket !== \"function\" || typeof originalParse !== \"function\") return false;\n Parser.prototype.handlePacket = function (offset: number, code: number, length: number, bytes: Buffer) {\n if (code === DATA_ROW_CODE) return new LazyDataRowMessage(length, bytes, offset);\n return originalHandlePacket.call(this, offset, code, length, bytes);\n };\n Parser.prototype.parse = patchedParse;\n if (!verifyLazyDataRows(Parser) || !verifyImmutableBytes(Parser)) {\n Parser.prototype.handlePacket = originalHandlePacket;\n Parser.prototype.parse = originalParse;\n return false;\n }\n return true;\n } catch {\n return false;\n }\n}\n\n/**\n * The ported #3719 `parse`: chunks are parsed in place, and only the message that straddles a\n * read boundary is reassembled into its own buffer (see `completePartial`). Partial state lives\n * on the parser instance under `_joist`-prefixed keys, so the stock fields are simply unused.\n */\nfunction patchedParse(this: any, chunk: Buffer, callback: (msg: any) => void): void {\n const chunkLength = chunk.byteLength;\n // finish the message the previous chunk cut in half, if any, before parsing this one\n let offset = this._joistPartialLength > 0 ? completePartial(this, chunk, callback) : 0;\n while (offset + HEADER_LENGTH <= chunkLength) {\n const code = chunk[offset];\n const length = chunk.readUInt32BE(offset + CODE_LENGTH);\n const fullMessageLength = CODE_LENGTH + length;\n if (fullMessageLength + offset <= chunkLength) {\n const message = this.handlePacket(offset + HEADER_LENGTH, code, length, chunk);\n callback(message);\n offset += fullMessageLength;\n } else {\n break;\n }\n }\n if (offset < chunkLength) {\n startPartial(this, chunk, offset);\n }\n}\n\n/** Copies the trailing bytes of `chunk` that do not yet form a whole message into their own buffer. */\nfunction startPartial(parser: any, chunk: Buffer, offset: number): void {\n const remaining = chunk.byteLength - offset;\n parser._joistPartial = emptyBuffer;\n parser._joistPartialLength = 0;\n // the length is only known once the header is complete\n parser._joistPartialTotal = remaining >= HEADER_LENGTH ? CODE_LENGTH + chunk.readUInt32BE(offset + CODE_LENGTH) : -1;\n growPartial(parser, remaining);\n chunk.copy(parser._joistPartial, 0, offset);\n parser._joistPartialLength = remaining;\n}\n\n/**\n * Fills the straddling message from the head of `chunk` and emits it once whole, returning the\n * offset in `chunk` where parsing continues. The buffer is handed to the message and forgotten,\n * so nothing is ever parsed twice out of the same bytes and the message stays valid when held.\n */\nfunction completePartial(parser: any, chunk: Buffer, callback: (msg: any) => void): number {\n let consumed = 0;\n if (parser._joistPartialTotal === -1) {\n // the header itself was split, so complete it before its length can be read\n consumed = Math.min(HEADER_LENGTH - parser._joistPartialLength, chunk.byteLength);\n chunk.copy(parser._joistPartial, parser._joistPartialLength, 0, consumed);\n parser._joistPartialLength += consumed;\n if (parser._joistPartialLength < HEADER_LENGTH) return consumed;\n parser._joistPartialTotal = CODE_LENGTH + parser._joistPartial.readUInt32BE(CODE_LENGTH);\n }\n if (parser._joistPartialLength < parser._joistPartialTotal) {\n const available = Math.min(parser._joistPartialTotal - parser._joistPartialLength, chunk.byteLength - consumed);\n growPartial(parser, parser._joistPartialLength + available);\n chunk.copy(parser._joistPartial, parser._joistPartialLength, consumed, consumed + available);\n parser._joistPartialLength += available;\n consumed += available;\n if (parser._joistPartialLength < parser._joistPartialTotal) return consumed;\n }\n const partial = parser._joistPartial;\n parser._joistPartial = emptyBuffer;\n parser._joistPartialLength = 0;\n parser._joistPartialTotal = -1;\n const message = parser.handlePacket(HEADER_LENGTH, partial[0], partial.readUInt32BE(CODE_LENGTH), partial);\n callback(message);\n return consumed;\n}\n\n/** Sizes the partial buffer to hold at least `needed` bytes, i.e. the whole message when known. */\nfunction growPartial(parser: any, needed: number): void {\n if (needed <= parser._joistPartial.byteLength) return;\n const total = parser._joistPartialTotal;\n // grow geometrically, jumping straight to the message's full length when known and modest\n const whole = total === -1 ? HEADER_LENGTH : Math.min(total, MAX_EAGER_MESSAGE_LENGTH);\n let capacity = Math.max(needed, whole, parser._joistPartial.byteLength * 2);\n if (total !== -1 && capacity > total) capacity = total;\n const grown = Buffer.allocUnsafe(capacity);\n parser._joistPartial.copy(grown, 0, 0, parser._joistPartialLength);\n parser._joistPartial = grown;\n}\n\n/** Loads the Parser class + version from the pg-protocol instance that `pg` itself resolves to. */\nfunction resolvePgProtocol(): { Parser: any; version: string } {\n // Resolve pg-protocol relative to pg, so that we patch the copy pg's Connections actually\n // use, even if the dependency tree has multiple pg-protocol installs\n const pgPath = runtimeRequire.resolve(\"pg\");\n const parserPath = runtimeRequire.resolve(\"pg-protocol/dist/parser.js\", { paths: [dirname(pgPath)] });\n // An absolute-path require bypasses the package's exports map, so this is always readable\n const { version } = runtimeRequire(join(dirname(parserPath), \"..\", \"package.json\"));\n return { Parser: runtimeRequire(parserPath).Parser, version };\n}\n\n/** Round-trips a synthetic two-cell DataRow (utf8 + NULL) through a fresh patched Parser. */\nfunction verifyLazyDataRows(Parser: any): boolean {\n const cell = Buffer.from(\"wörld\", \"utf8\");\n const payload = Buffer.concat([\n Buffer.from([0, 2]), // int16 fieldCount\n int32(cell.length),\n cell,\n int32(-1), // NULL cell\n ]);\n const frame = Buffer.concat([Buffer.from(\"D\"), int32(payload.length + 4), payload]);\n let ok = false;\n new Parser().parse(frame, (msg: any) => {\n ok =\n msg.name === \"dataRow\" &&\n msg.fieldCount === 2 &&\n msg.bytes !== undefined &&\n typeof msg.offset === \"number\" &&\n msg.fields.length === 2 &&\n msg.fields[0] === \"wörld\" &&\n msg.fields[1] === null;\n });\n return ok;\n}\n\n/**\n * Verifies a straddling DataRow's bytes survive later parser reads.\n *\n * We retain a message that straddles two chunks, drive a third read shaped to trigger the stock\n * parser's move-to-front compaction over its bytes, and only then decode the retained message's\n * cell (the `fields` getter memoizes, so it must not be read earlier). Under our `parse` patch\n * the straddler owns its buffer, so the cell decodes intact.\n */\nfunction verifyImmutableBytes(Parser: any): boolean {\n const cellB = \"b\".repeat(85);\n const frameA = dataRowFrame(\"aaaa\"); // 15 bytes, fully inside chunk1\n const frameB = dataRowFrame(cellB); // 96 bytes, straddles chunk1/chunk2\n const frameC = dataRowFrame(\"c\".repeat(45)); // 56 bytes, straddles chunk2/chunk3\n const chunk1 = Buffer.concat([frameA, frameB.subarray(0, 50)]);\n const chunk2 = Buffer.concat([frameB.subarray(50), frameC.subarray(0, 30)]);\n const chunk3 = Buffer.from(frameC.subarray(30));\n const messages: any[] = [];\n const parser = new Parser();\n function collect(msg: any): void {\n messages.push(msg);\n }\n parser.parse(chunk1, collect);\n parser.parse(chunk2, collect);\n parser.parse(chunk3, collect);\n try {\n return messages.length === 3 && messages[1].name === \"dataRow\" && messages[1].fields[0] === cellB;\n } catch {\n return false;\n }\n}\n\n/** Builds a complete one-cell DataRow frame (code + int32 length + payload) for `cell`. */\nfunction dataRowFrame(cell: string): Buffer {\n const bytes = Buffer.from(cell, \"utf8\");\n const payload = Buffer.concat([Buffer.from([0, 1]), int32(bytes.length), bytes]);\n return Buffer.concat([Buffer.from(\"D\"), int32(payload.length + 4), payload]);\n}\n\n/** Returns a 4-byte big-endian buffer for `value`. */\nfunction int32(value: number): Buffer {\n const buffer = Buffer.alloc(4);\n buffer.writeInt32BE(value);\n return buffer;\n}\n"],"mappings":"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"}
1
+ {"version":3,"file":"patchPgProtocol.js","names":[],"sources":["../../src/drivers/patchPgProtocol.ts"],"sourcesContent":["import { createRequire } from \"node:module\";\nimport { dirname, join } from \"node:path\";\n\nconst runtimeRequire = createRequire(import.meta.url);\n\n/**\n * Patches pg-protocol at runtime so that DataRow messages are lazy *and* their bytes are\n * immutable, i.e. so `WireRowData` can retain raw row payloads by reference — no per-cell\n * strings, no per-row copies, no arena.\n *\n * We patch at runtime (instead of shipping a patched pg-protocol) so that installing joist-orm\n * requires no package-manager patch steps; see JS-ROW-STORE-DESIGN.md \"Distribution\". Two\n * prototype methods are replaced, porting brianc/node-postgres#3719 (which may or may not ever\n * land upstream — this patch is how we run its design in production regardless):\n *\n * - `handlePacket` (stable across pg-protocol 1.10-1.15) returns a {@link LazyDataRowMessage}\n * for DataRow packets and delegates every other message type to the original.\n * - `parse` replaces the recycled-scratch buffer management: each socket chunk is parsed *in\n * place*, and only the one message per chunk that straddles a read boundary is reassembled\n * into a buffer of its own, which is handed to that message and never touched again. Every\n * message therefore stays valid for as long as it is held (holding one pins the ~64 KiB chunk\n * it came from) — versus stock pg-protocol, which copies whole chunks into a scratch buffer\n * and compacts it in place over the bytes earlier messages point into.\n *\n * The patch verifies itself by round-tripping synthetic DataRows through a fresh `Parser` —\n * including a message that straddles chunks, retained across later reads that would clobber it\n * under the stock buffer management. On any mismatch (i.e. a future pg-protocol internals\n * rewrite), it un-patches and reports failure so the driver can fall back to classic rows.\n *\n * The lazy message's memoized `fields` getter decodes identically to the original for classic\n * consumers, i.e. pg's own `Result.parseRow(msg.fields)`.\n */\nexport function ensureLazyDataRows(): boolean {\n patched ??= tryPatch() ? \"applied\" : \"failed\";\n return patched === \"applied\";\n}\n\n/** A drop-in `DataRowMessage` that defers cell decoding; lazy consumers read `bytes`/`offset`. */\nexport class LazyDataRowMessage {\n public readonly name = \"dataRow\";\n public readonly fieldCount: number;\n #fields: (string | null)[] | undefined = undefined;\n\n constructor(\n public readonly length: number,\n /** The row's payload bytes; immutable under our `parse` patch, so safe to retain. */\n public readonly bytes: Buffer,\n public readonly offset: number,\n ) {\n this.fieldCount = bytes.readInt16BE(offset);\n }\n\n /** Lazily materializes the per-cell strings for classic consumers, i.e. pg's `Result.parseRow`. */\n get fields(): (string | null)[] {\n let fields = this.#fields;\n if (fields === undefined) {\n const { bytes, fieldCount } = this;\n fields = new Array(fieldCount);\n let pos = this.offset + 2;\n for (let i = 0; i < fieldCount; i++) {\n const len = bytes.readInt32BE(pos);\n pos += 4;\n if (len === -1) {\n fields[i] = null;\n } else {\n fields[i] = bytes.toString(\"utf8\", pos, pos + len);\n pos += len;\n }\n }\n this.#fields = fields;\n }\n return fields;\n }\n}\n\nlet patched: \"applied\" | \"failed\" | undefined;\n\n/** The 'D' message-type byte identifying a DataRow packet. */\nconst DATA_ROW_CODE = 68;\nconst CODE_LENGTH = 1;\nconst HEADER_LENGTH = 5;\n/** Cap on up-front allocation for a straddling message's claimed length, i.e. corrupt streams. */\nconst MAX_EAGER_MESSAGE_LENGTH = 1024 * 1024;\nconst emptyBuffer = Buffer.allocUnsafe(0);\n\n/** Resolves pg's own pg-protocol Parser class and swaps in the lazy/immutable DataRow handling. */\nfunction tryPatch(): boolean {\n try {\n const { Parser, version } = resolvePgProtocol();\n // Only patch the protocol major we've verified `handlePacket`'s shape against (1.10-1.15);\n // anything else fails closed (the driver then uses classic rows) until explicitly vetted\n if (!version.startsWith(\"1.\")) return false;\n const originalHandlePacket = Parser.prototype.handlePacket;\n const originalParse = Parser.prototype.parse;\n if (typeof originalHandlePacket !== \"function\" || typeof originalParse !== \"function\") return false;\n Parser.prototype.handlePacket = function (offset: number, code: number, length: number, bytes: Buffer) {\n if (code === DATA_ROW_CODE) return new LazyDataRowMessage(length, bytes, offset);\n return originalHandlePacket.call(this, offset, code, length, bytes);\n };\n Parser.prototype.parse = patchedParse;\n if (!verifyLazyDataRows(Parser) || !verifyImmutableBytes(Parser)) {\n Parser.prototype.handlePacket = originalHandlePacket;\n Parser.prototype.parse = originalParse;\n return false;\n }\n return true;\n } catch {\n return false;\n }\n}\n\n/**\n * The ported #3719 `parse`: chunks are parsed in place, and only the message that straddles a\n * read boundary is reassembled into its own buffer (see `completePartial`). Partial state lives\n * on the parser instance under `_joist`-prefixed keys, so the stock fields are simply unused.\n */\nfunction patchedParse(this: any, chunk: Buffer, callback: (msg: any) => void): void {\n const chunkLength = chunk.byteLength;\n // finish the message the previous chunk cut in half, if any, before parsing this one\n let offset = this._joistPartialLength > 0 ? completePartial(this, chunk, callback) : 0;\n while (offset + HEADER_LENGTH <= chunkLength) {\n const code = chunk[offset];\n const length = chunk.readUInt32BE(offset + CODE_LENGTH);\n const fullMessageLength = CODE_LENGTH + length;\n if (fullMessageLength + offset <= chunkLength) {\n const message = this.handlePacket(offset + HEADER_LENGTH, code, length, chunk);\n callback(message);\n offset += fullMessageLength;\n } else {\n break;\n }\n }\n if (offset < chunkLength) {\n startPartial(this, chunk, offset);\n }\n}\n\n/** Copies the trailing bytes of `chunk` that do not yet form a whole message into their own buffer. */\nfunction startPartial(parser: any, chunk: Buffer, offset: number): void {\n const remaining = chunk.byteLength - offset;\n parser._joistPartial = emptyBuffer;\n parser._joistPartialLength = 0;\n // the length is only known once the header is complete\n parser._joistPartialTotal = remaining >= HEADER_LENGTH ? CODE_LENGTH + chunk.readUInt32BE(offset + CODE_LENGTH) : -1;\n growPartial(parser, remaining);\n chunk.copy(parser._joistPartial, 0, offset);\n parser._joistPartialLength = remaining;\n}\n\n/**\n * Fills the straddling message from the head of `chunk` and emits it once whole, returning the\n * offset in `chunk` where parsing continues. The buffer is handed to the message and forgotten,\n * so nothing is ever parsed twice out of the same bytes and the message stays valid when held.\n */\nfunction completePartial(parser: any, chunk: Buffer, callback: (msg: any) => void): number {\n let consumed = 0;\n if (parser._joistPartialTotal === -1) {\n // the header itself was split, so complete it before its length can be read\n consumed = Math.min(HEADER_LENGTH - parser._joistPartialLength, chunk.byteLength);\n chunk.copy(parser._joistPartial, parser._joistPartialLength, 0, consumed);\n parser._joistPartialLength += consumed;\n if (parser._joistPartialLength < HEADER_LENGTH) return consumed;\n parser._joistPartialTotal = CODE_LENGTH + parser._joistPartial.readUInt32BE(CODE_LENGTH);\n }\n if (parser._joistPartialLength < parser._joistPartialTotal) {\n const available = Math.min(parser._joistPartialTotal - parser._joistPartialLength, chunk.byteLength - consumed);\n growPartial(parser, parser._joistPartialLength + available);\n chunk.copy(parser._joistPartial, parser._joistPartialLength, consumed, consumed + available);\n parser._joistPartialLength += available;\n consumed += available;\n if (parser._joistPartialLength < parser._joistPartialTotal) return consumed;\n }\n const partial = parser._joistPartial;\n parser._joistPartial = emptyBuffer;\n parser._joistPartialLength = 0;\n parser._joistPartialTotal = -1;\n const message = parser.handlePacket(HEADER_LENGTH, partial[0], partial.readUInt32BE(CODE_LENGTH), partial);\n callback(message);\n return consumed;\n}\n\n/** Sizes the partial buffer to hold at least `needed` bytes, i.e. the whole message when known. */\nfunction growPartial(parser: any, needed: number): void {\n if (needed <= parser._joistPartial.byteLength) return;\n const total = parser._joistPartialTotal;\n // grow geometrically, jumping straight to the message's full length when known and modest\n const whole = total === -1 ? HEADER_LENGTH : Math.min(total, MAX_EAGER_MESSAGE_LENGTH);\n let capacity = Math.max(needed, whole, parser._joistPartial.byteLength * 2);\n if (total !== -1 && capacity > total) capacity = total;\n const grown = Buffer.allocUnsafe(capacity);\n parser._joistPartial.copy(grown, 0, 0, parser._joistPartialLength);\n parser._joistPartial = grown;\n}\n\n/** Loads the Parser class + version from the pg-protocol instance that `pg` itself resolves to. */\nfunction resolvePgProtocol(): { Parser: any; version: string } {\n // Resolve pg-protocol relative to pg, so that we patch the copy pg's Connections actually\n // use, even if the dependency tree has multiple pg-protocol installs\n const pgPath = runtimeRequire.resolve(\"pg\");\n const parserPath = runtimeRequire.resolve(\"pg-protocol/dist/parser.js\", { paths: [dirname(pgPath)] });\n // An absolute-path require bypasses the package's exports map, so this is always readable\n const { version } = runtimeRequire(join(dirname(parserPath), \"..\", \"package.json\"));\n return { Parser: runtimeRequire(parserPath).Parser, version };\n}\n\n/** Round-trips a synthetic two-cell DataRow (utf8 + NULL) through a fresh patched Parser. */\nfunction verifyLazyDataRows(Parser: any): boolean {\n const cell = Buffer.from(\"wörld\", \"utf8\");\n const payload = Buffer.concat([\n Buffer.from([0, 2]), // int16 fieldCount\n int32(cell.length),\n cell,\n int32(-1), // NULL cell\n ]);\n const frame = Buffer.concat([Buffer.from(\"D\"), int32(payload.length + 4), payload]);\n let ok = false;\n new Parser().parse(frame, (msg: any) => {\n ok =\n msg.name === \"dataRow\" &&\n msg.fieldCount === 2 &&\n msg.bytes !== undefined &&\n typeof msg.offset === \"number\" &&\n msg.fields.length === 2 &&\n msg.fields[0] === \"wörld\" &&\n msg.fields[1] === null;\n });\n return ok;\n}\n\n/**\n * Verifies a straddling DataRow's bytes survive later parser reads.\n *\n * We retain a message that straddles two chunks, drive a third read shaped to trigger the stock\n * parser's move-to-front compaction over its bytes, and only then decode the retained message's\n * cell (the `fields` getter memoizes, so it must not be read earlier). Under our `parse` patch\n * the straddler owns its buffer, so the cell decodes intact.\n */\nfunction verifyImmutableBytes(Parser: any): boolean {\n const cellB = \"b\".repeat(85);\n const frameA = dataRowFrame(\"aaaa\"); // 15 bytes, fully inside chunk1\n const frameB = dataRowFrame(cellB); // 96 bytes, straddles chunk1/chunk2\n const frameC = dataRowFrame(\"c\".repeat(45)); // 56 bytes, straddles chunk2/chunk3\n const chunk1 = Buffer.concat([frameA, frameB.subarray(0, 50)]);\n const chunk2 = Buffer.concat([frameB.subarray(50), frameC.subarray(0, 30)]);\n const chunk3 = Buffer.from(frameC.subarray(30));\n const messages: any[] = [];\n const parser = new Parser();\n function collect(msg: any): void {\n messages.push(msg);\n }\n parser.parse(chunk1, collect);\n parser.parse(chunk2, collect);\n parser.parse(chunk3, collect);\n try {\n return messages.length === 3 && messages[1].name === \"dataRow\" && messages[1].fields[0] === cellB;\n } catch {\n return false;\n }\n}\n\n/** Builds a complete one-cell DataRow frame (code + int32 length + payload) for `cell`. */\nfunction dataRowFrame(cell: string): Buffer {\n const bytes = Buffer.from(cell, \"utf8\");\n const payload = Buffer.concat([Buffer.from([0, 1]), int32(bytes.length), bytes]);\n return Buffer.concat([Buffer.from(\"D\"), int32(payload.length + 4), payload]);\n}\n\n/** Returns a 4-byte big-endian buffer for `value`. */\nfunction int32(value: number): Buffer {\n const buffer = Buffer.alloc(4);\n buffer.writeInt32BE(value);\n return buffer;\n}\n"],"mappings":"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"}
@@ -0,0 +1,145 @@
1
+ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
2
+ let joist_core = require("joist-core");
3
+ //#region src/drivers/postgresSql.ts
4
+ /**
5
+ * Flushes already-ID-assigned entities using PostgreSQL bulk SQL and optimistic locks.
6
+ *
7
+ * Deferred foreign keys allow bulk inserts without topographic ordering. The caller owns
8
+ * ID assignment, transactions and query observation; this module only issues numbered SQL.
9
+ */
10
+ async function flushPostgres(query, entityTodos, joinRows) {
11
+ const ops = (0, joist_core.generateOps)(entityTodos);
12
+ await Promise.all([
13
+ ...ops.inserts.map((op) => batchInsert(query, op)),
14
+ ...ops.updates.map((op) => batchUpdate(query, op)),
15
+ ...ops.deletes.map((op) => batchDelete(query, op)),
16
+ ...Object.entries(joinRows).flatMap(([joinTableName, todo]) => [m2mBatchInsert(query, joinTableName, todo), m2mBatchDelete(query, joinTableName, todo)])
17
+ ]);
18
+ }
19
+ /** Inserts a rectangular batch through a typed unnest CTE. */
20
+ async function batchInsert(query, op) {
21
+ const { tableName, columns, columnValues } = op;
22
+ const [cte, bindings] = buildUnnestCte("data", columns, columnValues);
23
+ return query(toPgParams((0, joist_core.cleanSql)(`
24
+ ${cte}
25
+ INSERT INTO ${(0, joist_core.kq)(tableName)} (${columns.map((c) => (0, joist_core.kq)(c.columnName)).join(", ")})
26
+ SELECT * FROM data
27
+ `)), bindings);
28
+ }
29
+ /**
30
+ * Updates a batch and rejects rows whose optimistic lock no longer matches.
31
+ *
32
+ * The returned IDs must cover the entire batch; missing rows indicate a concurrent change.
33
+ */
34
+ async function batchUpdate(query, op) {
35
+ const { tableName, columns, columnValues, updatedAt } = op;
36
+ const [cte, bindings] = buildUnnestCte("data", columns, columnValues);
37
+ const truncateToMills = !(0, joist_core.getRuntimeConfig)().temporal;
38
+ const maybeUpdatedAt = updatedAt && truncateToMills ? ` AND date_trunc('milliseconds', ${(0, joist_core.kqDot)(tableName, updatedAt)}) = data.__original_updated_at` : updatedAt ? ` AND ${(0, joist_core.kqDot)(tableName, updatedAt)} = data.__original_updated_at` : "";
39
+ const sql = `
40
+ ${cte}
41
+ UPDATE ${(0, joist_core.kq)(tableName)}
42
+ SET ${columns.filter((c) => c.columnName !== "id" && c.columnName !== "__original_updated_at").map((c) => `${(0, joist_core.kq)(c.columnName)} = data.${(0, joist_core.kq)(c.columnName)}`).join(", ")}
43
+ FROM data
44
+ WHERE ${(0, joist_core.kq)(tableName)}.id = data.id ${maybeUpdatedAt}
45
+ RETURNING ${(0, joist_core.kq)(tableName)}.id
46
+ `;
47
+ const results = (await query(toPgParams((0, joist_core.cleanSql)(sql)), bindings)).rows;
48
+ const ids = columnValues[0];
49
+ if (results.length !== ids.length) {
50
+ const updated = new Set(results.map((r) => r.id));
51
+ const missing = ids.filter((id) => !updated.has(id));
52
+ throw new Error(`Oplock failure for ${tableName} rows ${missing.join(", ")}`);
53
+ }
54
+ }
55
+ /** Deletes a batch by its database identifiers. */
56
+ async function batchDelete(query, op) {
57
+ const { tableName, ids } = op;
58
+ await query(toPgParams(`DELETE FROM ${(0, joist_core.kq)(tableName)} WHERE id = ANY(?)`), [ids]);
59
+ }
60
+ /** Creates a CTE named `tableName` that bulk-injects the `columnValues` into a SQL query. */
61
+ function buildUnnestCte(tableName, columns, columnValues) {
62
+ (0, joist_core.ensureRectangularArraySizes)(columns, columnValues);
63
+ return [`WITH ${tableName} AS (SELECT ${columns.map((c) => {
64
+ if (c.dbType.endsWith("[]")) {
65
+ if (c.isNullableArray) return `unnest_arrays(?::${c.dbType}[], true) as ${(0, joist_core.kq)(c.columnName)}`;
66
+ else return `unnest_arrays(?::${c.dbType}[]) as ${(0, joist_core.kq)(c.columnName)}`;
67
+ } else return `unnest(?::${c.dbType}[]) as ${(0, joist_core.kq)(c.columnName)}`;
68
+ }).join(", ")})`, columnValues];
69
+ }
70
+ /**
71
+ * Inserts join rows and records their persisted state, including surrogate IDs when present.
72
+ *
73
+ * Join tables without surrogate IDs use their foreign-key pair as the conflict target.
74
+ */
75
+ async function m2mBatchInsert(query, joinTableName, todo) {
76
+ const { m2m, newRows } = todo;
77
+ if (newRows.length === 0) return;
78
+ const col1Values = newRows.map((row) => todo.dbValue(row, m2m.columnName));
79
+ const col2Values = newRows.map((row) => todo.dbValue(row, m2m.otherColumnName));
80
+ if (m2m.hasJoinTableId) {
81
+ const { rows } = await query(toPgParams((0, joist_core.cleanSql)(`
82
+ WITH data AS (SELECT unnest(?::int[]) as ${(0, joist_core.kq)(m2m.columnName)}, unnest(?::int[]) as ${(0, joist_core.kq)(m2m.otherColumnName)})
83
+ INSERT INTO ${(0, joist_core.kq)(joinTableName)} (${(0, joist_core.kq)(m2m.columnName)}, ${(0, joist_core.kq)(m2m.otherColumnName)})
84
+ SELECT * FROM data
85
+ ON CONFLICT (${(0, joist_core.kq)(m2m.columnName)}, ${(0, joist_core.kq)(m2m.otherColumnName)}) DO UPDATE SET id = ${(0, joist_core.kq)(joinTableName)}.id
86
+ RETURNING id;
87
+ `)), [col1Values, col2Values]);
88
+ for (let i = 0; i < rows.length; i++) {
89
+ newRows[i].id = rows[i].id;
90
+ newRows[i].op = joist_core.JoinRowOperation.Flushed;
91
+ newRows[i].persisted = true;
92
+ }
93
+ } else {
94
+ await query(toPgParams((0, joist_core.cleanSql)(`
95
+ WITH data AS (SELECT unnest(?::int[]) as ${(0, joist_core.kq)(m2m.columnName)}, unnest(?::int[]) as ${(0, joist_core.kq)(m2m.otherColumnName)})
96
+ INSERT INTO ${(0, joist_core.kq)(joinTableName)} (${(0, joist_core.kq)(m2m.columnName)}, ${(0, joist_core.kq)(m2m.otherColumnName)})
97
+ SELECT * FROM data
98
+ ON CONFLICT (${(0, joist_core.kq)(m2m.columnName)}, ${(0, joist_core.kq)(m2m.otherColumnName)}) DO NOTHING;
99
+ `)), [col1Values, col2Values]);
100
+ for (const row of newRows) {
101
+ row.op = joist_core.JoinRowOperation.Flushed;
102
+ row.persisted = true;
103
+ }
104
+ }
105
+ }
106
+ /**
107
+ * Deletes join rows by surrogate ID or by their foreign-key pair.
108
+ *
109
+ * Unloaded collections may only know the pair, while loaded rows can use their surrogate IDs.
110
+ */
111
+ async function m2mBatchDelete(query, joinTableName, todo) {
112
+ const { m2m, deletedRows } = todo;
113
+ if (deletedRows.length === 0) return;
114
+ const [haveIds, noIds] = (0, joist_core.partition)(deletedRows, (r) => {
115
+ return r.id !== void 0 && r.id !== -1;
116
+ });
117
+ if (haveIds.length > 0) await query(toPgParams(`DELETE FROM ${(0, joist_core.kq)(joinTableName)} WHERE id = ANY(?)`), [haveIds.map((r) => r.id)]);
118
+ if (noIds.length > 0) {
119
+ const data = noIds.filter((row) => !todo.isNew(row, m2m.columnName) && !todo.isNew(row, m2m.otherColumnName)).map((row) => [todo.dbValue(row, m2m.columnName), todo.dbValue(row, m2m.otherColumnName)]);
120
+ if (data.length > 0) await query(toPgParams(`
121
+ DELETE FROM ${(0, joist_core.kq)(joinTableName)}
122
+ WHERE (${(0, joist_core.kq)(m2m.columnName)}, ${(0, joist_core.kq)(m2m.otherColumnName)}) IN (
123
+ SELECT (data->>0)::int, (data->>1)::int FROM jsonb_array_elements(?) data
124
+ )`), [JSON.stringify(data)]);
125
+ }
126
+ deletedRows.forEach((row) => {
127
+ row.id = void 0;
128
+ row.persisted = false;
129
+ row.op = joist_core.JoinRowOperation.Flushed;
130
+ });
131
+ }
132
+ const questionMarks = /(?<!@)\?/g;
133
+ /**
134
+ * Converts our knex-style `?` placeholders to pg-native `$1, $2, ...` numbered parameters.
135
+ *
136
+ * We skipping postgres operators like `@?`. */
137
+ function toPgParams(sql) {
138
+ let i = 0;
139
+ return sql.replace(questionMarks, () => `$${++i}`);
140
+ }
141
+ //#endregion
142
+ exports.flushPostgres = flushPostgres;
143
+ exports.toPgParams = toPgParams;
144
+
145
+ //# sourceMappingURL=postgresSql.cjs.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"postgresSql.cjs","names":["generateOps","cleanSql","kq","getRuntimeConfig","kqDot","JoinRowOperation","partition"],"sources":["../../src/drivers/postgresSql.ts"],"sourcesContent":["import {\n type DeleteOp,\n type DriverQueryResult,\n type InsertOp,\n JoinRowOperation,\n type JoinRowTodo,\n type OpColumn,\n type Todo,\n type UpdateOp,\n cleanSql,\n ensureRectangularArraySizes,\n generateOps,\n getRuntimeConfig,\n kq,\n kqDot,\n partition,\n} from \"joist-core\";\n\n/** A SQL execution boundary, independent of either driver's connection API. */\ntype QueryRunner = (sql: string, bindings: readonly unknown[]) => Promise<DriverQueryResult>;\n\n/**\n * Flushes already-ID-assigned entities using PostgreSQL bulk SQL and optimistic locks.\n *\n * Deferred foreign keys allow bulk inserts without topographic ordering. The caller owns\n * ID assignment, transactions and query observation; this module only issues numbered SQL.\n */\nexport async function flushPostgres(\n query: QueryRunner,\n entityTodos: Record<string, Todo>,\n joinRows: Record<string, JoinRowTodo>,\n): Promise<void> {\n const ops = generateOps(entityTodos);\n // Do INSERTs+UPDATEs first so that we avoid DELETE cascades invalidating oplocks\n // See https://github.com/joist-orm/joist-orm/issues/591\n await Promise.all([\n ...ops.inserts.map((op) => batchInsert(query, op)),\n ...ops.updates.map((op) => batchUpdate(query, op)),\n ...ops.deletes.map((op) => batchDelete(query, op)),\n ...Object.entries(joinRows).flatMap(([joinTableName, todo]) => [\n m2mBatchInsert(query, joinTableName, todo),\n m2mBatchDelete(query, joinTableName, todo),\n ]),\n ]);\n}\n\n/** Inserts a rectangular batch through a typed unnest CTE. */\nasync function batchInsert(query: QueryRunner, op: InsertOp): Promise<unknown> {\n const { tableName, columns, columnValues } = op;\n const [cte, bindings] = buildUnnestCte(\"data\", columns, columnValues);\n const sql = cleanSql(`\n ${cte}\n INSERT INTO ${kq(tableName)} (${columns.map((c) => kq(c.columnName)).join(\", \")})\n SELECT * FROM data\n `);\n const pgSql = toPgParams(sql);\n return query(pgSql, bindings);\n}\n\n/**\n * Updates a batch and rejects rows whose optimistic lock no longer matches.\n *\n * The returned IDs must cover the entire batch; missing rows indicate a concurrent change.\n */\nasync function batchUpdate(query: QueryRunner, op: UpdateOp): Promise<void> {\n const { tableName, columns, columnValues, updatedAt } = op;\n\n const [cte, bindings] = buildUnnestCte(\"data\", columns, columnValues);\n\n // JS Dates only have millisecond-level precision, so we may have dropped/lost accuracy when\n // reading Postgres's microsecond-level `timestamptz` values; using `date_trunc` \"downgrades\"\n // the pg data to match what we have in the JS Date.\n //\n // ...but Temporal's types don't have this flaw.\n const truncateToMills = !getRuntimeConfig().temporal;\n const maybeUpdatedAt =\n updatedAt && truncateToMills\n ? ` AND date_trunc('milliseconds', ${kqDot(tableName, updatedAt)}) = data.__original_updated_at`\n : updatedAt\n ? ` AND ${kqDot(tableName, updatedAt)} = data.__original_updated_at`\n : \"\";\n\n const sql = `\n ${cte}\n UPDATE ${kq(tableName)}\n SET ${columns\n .filter((c) => c.columnName !== \"id\" && c.columnName !== \"__original_updated_at\")\n .map((c) => `${kq(c.columnName)} = data.${kq(c.columnName)}`)\n .join(\", \")}\n FROM data\n WHERE ${kq(tableName)}.id = data.id ${maybeUpdatedAt}\n RETURNING ${kq(tableName)}.id\n `;\n\n const pgSql = toPgParams(cleanSql(sql));\n const result = await query(pgSql, bindings);\n const results = result.rows;\n\n const ids = columnValues[0]; // assume id is the 1st column\n if (results.length !== ids.length) {\n const updated = new Set(results.map((r: any) => r.id));\n const missing = ids.filter((id) => !updated.has(id));\n throw new Error(`Oplock failure for ${tableName} rows ${missing.join(\", \")}`);\n }\n}\n\n/** Deletes a batch by its database identifiers. */\nasync function batchDelete(query: QueryRunner, op: DeleteOp): Promise<void> {\n const { tableName, ids } = op;\n const pgSql = toPgParams(`DELETE FROM ${kq(tableName)} WHERE id = ANY(?)`);\n await query(pgSql, [ids]);\n}\n\n/** Creates a CTE named `tableName` that bulk-injects the `columnValues` into a SQL query. */\nfunction buildUnnestCte(tableName: string, columns: OpColumn[], columnValues: any[][]): [string, any[][]] {\n ensureRectangularArraySizes(columns, columnValues);\n const selects = columns.map((c) => {\n if (c.dbType.endsWith(\"[]\")) {\n if (c.isNullableArray) {\n return `unnest_arrays(?::${c.dbType}[], true) as ${kq(c.columnName)}`;\n } else {\n return `unnest_arrays(?::${c.dbType}[]) as ${kq(c.columnName)}`;\n }\n } else {\n return `unnest(?::${c.dbType}[]) as ${kq(c.columnName)}`;\n }\n });\n const sql = `WITH ${tableName} AS (SELECT ${selects.join(\", \")})`;\n return [sql, columnValues];\n}\n\n/**\n * Inserts join rows and records their persisted state, including surrogate IDs when present.\n *\n * Join tables without surrogate IDs use their foreign-key pair as the conflict target.\n */\nasync function m2mBatchInsert(query: QueryRunner, joinTableName: string, todo: JoinRowTodo) {\n const { m2m, newRows } = todo;\n if (newRows.length === 0) return;\n const col1Values = newRows.map((row) => todo.dbValue(row, m2m.columnName));\n const col2Values = newRows.map((row) => todo.dbValue(row, m2m.otherColumnName));\n if (m2m.hasJoinTableId) {\n const sql = cleanSql(`\n WITH data AS (SELECT unnest(?::int[]) as ${kq(m2m.columnName)}, unnest(?::int[]) as ${kq(m2m.otherColumnName)})\n INSERT INTO ${kq(joinTableName)} (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)})\n SELECT * FROM data\n ON CONFLICT (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)}) DO UPDATE SET id = ${kq(joinTableName)}.id\n RETURNING id;\n `);\n const pgSql = toPgParams(sql);\n const { rows } = await query(pgSql, [col1Values, col2Values]);\n for (let i = 0; i < rows.length; i++) {\n newRows[i].id = rows[i].id;\n newRows[i].op = JoinRowOperation.Flushed;\n newRows[i].persisted = true;\n }\n } else {\n // Id-less join tables have no surrogate id to return; the FK pair is the PK, so just\n // insert and let any duplicate be a no-op.\n const sql = cleanSql(`\n WITH data AS (SELECT unnest(?::int[]) as ${kq(m2m.columnName)}, unnest(?::int[]) as ${kq(m2m.otherColumnName)})\n INSERT INTO ${kq(joinTableName)} (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)})\n SELECT * FROM data\n ON CONFLICT (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)}) DO NOTHING;\n `);\n const pgSql = toPgParams(sql);\n await query(pgSql, [col1Values, col2Values]);\n for (const row of newRows) {\n row.op = JoinRowOperation.Flushed;\n row.persisted = true;\n }\n }\n}\n\n/**\n * Deletes join rows by surrogate ID or by their foreign-key pair.\n *\n * Unloaded collections may only know the pair, while loaded rows can use their surrogate IDs.\n */\nasync function m2mBatchDelete(query: QueryRunner, joinTableName: string, todo: JoinRowTodo) {\n const { m2m, deletedRows } = todo;\n if (deletedRows.length === 0) return;\n // Rows with a surrogate id are deleted by id; rows without one — id-less tables, or `remove`s\n // done against an unloaded ManyToManyCollection — are deleted by their (col1, col2) composite.\n const [haveIds, noIds] = partition(deletedRows, (r) => {\n // We used to use `id !== -1` as a marker for \"row is/is-not persisted in the db\" -- but when adding support\n // for id-column-less m2m tables, we couldn't use `id === -1` as this marker anymore, so now rely on a dedicated\n // `persisted` key instead.\n //\n // So, ideally, this `id !== -1` could go away _except_ that our internal verisoning plugin leverages this \"m2m rows\n // with an id=-1 delete by their FK values\" to handle our versioned m2m tables. And for now it's easier to\n // keep/restore this `id !== -1` than refactor that.\n return r.id !== undefined && r.id !== -1;\n });\n if (haveIds.length > 0) {\n const pgSql = toPgParams(`DELETE FROM ${kq(joinTableName)} WHERE id = ANY(?)`);\n await query(pgSql, [haveIds.map((r) => r.id!)]);\n }\n if (noIds.length > 0) {\n const data = noIds\n // Watch for m2m rows that got added-then-removed to entities that were themselves added-then-removed,\n // as the deTagId will be undefined for those, as we're skipping adding them to the database.\n .filter((row) => !todo.isNew(row, m2m.columnName) && !todo.isNew(row, m2m.otherColumnName))\n .map((row) => [todo.dbValue(row, m2m.columnName), todo.dbValue(row, m2m.otherColumnName)] as any);\n if (data.length > 0) {\n const pgSql = toPgParams(`\n DELETE FROM ${kq(joinTableName)}\n WHERE (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)}) IN (\n SELECT (data->>0)::int, (data->>1)::int FROM jsonb_array_elements(?) data\n )`);\n await query(pgSql, [JSON.stringify(data)]);\n }\n }\n deletedRows.forEach((row) => {\n row.id = undefined;\n row.persisted = false;\n row.op = JoinRowOperation.Flushed;\n });\n}\n\nconst questionMarks = /(?<!@)\\?/g;\n\n/**\n * Converts our knex-style `?` placeholders to pg-native `$1, $2, ...` numbered parameters.\n *\n * We skipping postgres operators like `@?`. */\nexport function toPgParams(sql: string): string {\n let i = 0;\n return sql.replace(questionMarks, () => `$${++i}`);\n}\n"],"mappings":"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"}
@@ -0,0 +1,19 @@
1
+ import { DriverQueryResult, JoinRowTodo, Todo } from "joist-core";
2
+ //#region src/drivers/postgresSql.d.ts
3
+ /** A SQL execution boundary, independent of either driver's connection API. */
4
+ type QueryRunner = (sql: string, bindings: readonly unknown[]) => Promise<DriverQueryResult>;
5
+ /**
6
+ * Flushes already-ID-assigned entities using PostgreSQL bulk SQL and optimistic locks.
7
+ *
8
+ * Deferred foreign keys allow bulk inserts without topographic ordering. The caller owns
9
+ * ID assignment, transactions and query observation; this module only issues numbered SQL.
10
+ */
11
+ export declare function flushPostgres(query: QueryRunner, entityTodos: Record<string, Todo>, joinRows: Record<string, JoinRowTodo>): Promise<void>;
12
+ /**
13
+ * Converts our knex-style `?` placeholders to pg-native `$1, $2, ...` numbered parameters.
14
+ *
15
+ * We skipping postgres operators like `@?`. */
16
+ export declare function toPgParams(sql: string): string;
17
+ //#endregion
18
+ export {};
19
+ //# sourceMappingURL=postgresSql.d.cts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"postgresSql.d.cts","names":[],"sources":["../../src/drivers/postgresSql.ts"],"mappings":";;;KAmBK,eAAe,aAAa,iCAAiC,QAAQ;;;;;;;wBAQpD,cACpB,OAAO,aACP,aAAa,eAAe,OAC5B,UAAU,eAAe,eACxB;;;;;wBAmMa,WAAW"}
@@ -0,0 +1,19 @@
1
+ import { DriverQueryResult, JoinRowTodo, Todo } from "joist-core";
2
+ //#region src/drivers/postgresSql.d.ts
3
+ /** A SQL execution boundary, independent of either driver's connection API. */
4
+ type QueryRunner = (sql: string, bindings: readonly unknown[]) => Promise<DriverQueryResult>;
5
+ /**
6
+ * Flushes already-ID-assigned entities using PostgreSQL bulk SQL and optimistic locks.
7
+ *
8
+ * Deferred foreign keys allow bulk inserts without topographic ordering. The caller owns
9
+ * ID assignment, transactions and query observation; this module only issues numbered SQL.
10
+ */
11
+ export declare function flushPostgres(query: QueryRunner, entityTodos: Record<string, Todo>, joinRows: Record<string, JoinRowTodo>): Promise<void>;
12
+ /**
13
+ * Converts our knex-style `?` placeholders to pg-native `$1, $2, ...` numbered parameters.
14
+ *
15
+ * We skipping postgres operators like `@?`. */
16
+ export declare function toPgParams(sql: string): string;
17
+ //#endregion
18
+ export {};
19
+ //# sourceMappingURL=postgresSql.d.mts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"postgresSql.d.mts","names":[],"sources":["../../src/drivers/postgresSql.ts"],"mappings":";;;KAmBK,eAAe,aAAa,iCAAiC,QAAQ;;;;;;;wBAQpD,cACpB,OAAO,aACP,aAAa,eAAe,OAC5B,UAAU,eAAe,eACxB;;;;;wBAmMa,WAAW"}
@@ -0,0 +1,143 @@
1
+ import { JoinRowOperation, cleanSql, ensureRectangularArraySizes, generateOps, getRuntimeConfig, kq, kqDot, partition } from "joist-core";
2
+ //#region src/drivers/postgresSql.ts
3
+ /**
4
+ * Flushes already-ID-assigned entities using PostgreSQL bulk SQL and optimistic locks.
5
+ *
6
+ * Deferred foreign keys allow bulk inserts without topographic ordering. The caller owns
7
+ * ID assignment, transactions and query observation; this module only issues numbered SQL.
8
+ */
9
+ async function flushPostgres(query, entityTodos, joinRows) {
10
+ const ops = generateOps(entityTodos);
11
+ await Promise.all([
12
+ ...ops.inserts.map((op) => batchInsert(query, op)),
13
+ ...ops.updates.map((op) => batchUpdate(query, op)),
14
+ ...ops.deletes.map((op) => batchDelete(query, op)),
15
+ ...Object.entries(joinRows).flatMap(([joinTableName, todo]) => [m2mBatchInsert(query, joinTableName, todo), m2mBatchDelete(query, joinTableName, todo)])
16
+ ]);
17
+ }
18
+ /** Inserts a rectangular batch through a typed unnest CTE. */
19
+ async function batchInsert(query, op) {
20
+ const { tableName, columns, columnValues } = op;
21
+ const [cte, bindings] = buildUnnestCte("data", columns, columnValues);
22
+ return query(toPgParams(cleanSql(`
23
+ ${cte}
24
+ INSERT INTO ${kq(tableName)} (${columns.map((c) => kq(c.columnName)).join(", ")})
25
+ SELECT * FROM data
26
+ `)), bindings);
27
+ }
28
+ /**
29
+ * Updates a batch and rejects rows whose optimistic lock no longer matches.
30
+ *
31
+ * The returned IDs must cover the entire batch; missing rows indicate a concurrent change.
32
+ */
33
+ async function batchUpdate(query, op) {
34
+ const { tableName, columns, columnValues, updatedAt } = op;
35
+ const [cte, bindings] = buildUnnestCte("data", columns, columnValues);
36
+ const truncateToMills = !getRuntimeConfig().temporal;
37
+ const maybeUpdatedAt = updatedAt && truncateToMills ? ` AND date_trunc('milliseconds', ${kqDot(tableName, updatedAt)}) = data.__original_updated_at` : updatedAt ? ` AND ${kqDot(tableName, updatedAt)} = data.__original_updated_at` : "";
38
+ const sql = `
39
+ ${cte}
40
+ UPDATE ${kq(tableName)}
41
+ SET ${columns.filter((c) => c.columnName !== "id" && c.columnName !== "__original_updated_at").map((c) => `${kq(c.columnName)} = data.${kq(c.columnName)}`).join(", ")}
42
+ FROM data
43
+ WHERE ${kq(tableName)}.id = data.id ${maybeUpdatedAt}
44
+ RETURNING ${kq(tableName)}.id
45
+ `;
46
+ const results = (await query(toPgParams(cleanSql(sql)), bindings)).rows;
47
+ const ids = columnValues[0];
48
+ if (results.length !== ids.length) {
49
+ const updated = new Set(results.map((r) => r.id));
50
+ const missing = ids.filter((id) => !updated.has(id));
51
+ throw new Error(`Oplock failure for ${tableName} rows ${missing.join(", ")}`);
52
+ }
53
+ }
54
+ /** Deletes a batch by its database identifiers. */
55
+ async function batchDelete(query, op) {
56
+ const { tableName, ids } = op;
57
+ await query(toPgParams(`DELETE FROM ${kq(tableName)} WHERE id = ANY(?)`), [ids]);
58
+ }
59
+ /** Creates a CTE named `tableName` that bulk-injects the `columnValues` into a SQL query. */
60
+ function buildUnnestCte(tableName, columns, columnValues) {
61
+ ensureRectangularArraySizes(columns, columnValues);
62
+ return [`WITH ${tableName} AS (SELECT ${columns.map((c) => {
63
+ if (c.dbType.endsWith("[]")) {
64
+ if (c.isNullableArray) return `unnest_arrays(?::${c.dbType}[], true) as ${kq(c.columnName)}`;
65
+ else return `unnest_arrays(?::${c.dbType}[]) as ${kq(c.columnName)}`;
66
+ } else return `unnest(?::${c.dbType}[]) as ${kq(c.columnName)}`;
67
+ }).join(", ")})`, columnValues];
68
+ }
69
+ /**
70
+ * Inserts join rows and records their persisted state, including surrogate IDs when present.
71
+ *
72
+ * Join tables without surrogate IDs use their foreign-key pair as the conflict target.
73
+ */
74
+ async function m2mBatchInsert(query, joinTableName, todo) {
75
+ const { m2m, newRows } = todo;
76
+ if (newRows.length === 0) return;
77
+ const col1Values = newRows.map((row) => todo.dbValue(row, m2m.columnName));
78
+ const col2Values = newRows.map((row) => todo.dbValue(row, m2m.otherColumnName));
79
+ if (m2m.hasJoinTableId) {
80
+ const { rows } = await query(toPgParams(cleanSql(`
81
+ WITH data AS (SELECT unnest(?::int[]) as ${kq(m2m.columnName)}, unnest(?::int[]) as ${kq(m2m.otherColumnName)})
82
+ INSERT INTO ${kq(joinTableName)} (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)})
83
+ SELECT * FROM data
84
+ ON CONFLICT (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)}) DO UPDATE SET id = ${kq(joinTableName)}.id
85
+ RETURNING id;
86
+ `)), [col1Values, col2Values]);
87
+ for (let i = 0; i < rows.length; i++) {
88
+ newRows[i].id = rows[i].id;
89
+ newRows[i].op = JoinRowOperation.Flushed;
90
+ newRows[i].persisted = true;
91
+ }
92
+ } else {
93
+ await query(toPgParams(cleanSql(`
94
+ WITH data AS (SELECT unnest(?::int[]) as ${kq(m2m.columnName)}, unnest(?::int[]) as ${kq(m2m.otherColumnName)})
95
+ INSERT INTO ${kq(joinTableName)} (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)})
96
+ SELECT * FROM data
97
+ ON CONFLICT (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)}) DO NOTHING;
98
+ `)), [col1Values, col2Values]);
99
+ for (const row of newRows) {
100
+ row.op = JoinRowOperation.Flushed;
101
+ row.persisted = true;
102
+ }
103
+ }
104
+ }
105
+ /**
106
+ * Deletes join rows by surrogate ID or by their foreign-key pair.
107
+ *
108
+ * Unloaded collections may only know the pair, while loaded rows can use their surrogate IDs.
109
+ */
110
+ async function m2mBatchDelete(query, joinTableName, todo) {
111
+ const { m2m, deletedRows } = todo;
112
+ if (deletedRows.length === 0) return;
113
+ const [haveIds, noIds] = partition(deletedRows, (r) => {
114
+ return r.id !== void 0 && r.id !== -1;
115
+ });
116
+ if (haveIds.length > 0) await query(toPgParams(`DELETE FROM ${kq(joinTableName)} WHERE id = ANY(?)`), [haveIds.map((r) => r.id)]);
117
+ if (noIds.length > 0) {
118
+ const data = noIds.filter((row) => !todo.isNew(row, m2m.columnName) && !todo.isNew(row, m2m.otherColumnName)).map((row) => [todo.dbValue(row, m2m.columnName), todo.dbValue(row, m2m.otherColumnName)]);
119
+ if (data.length > 0) await query(toPgParams(`
120
+ DELETE FROM ${kq(joinTableName)}
121
+ WHERE (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)}) IN (
122
+ SELECT (data->>0)::int, (data->>1)::int FROM jsonb_array_elements(?) data
123
+ )`), [JSON.stringify(data)]);
124
+ }
125
+ deletedRows.forEach((row) => {
126
+ row.id = void 0;
127
+ row.persisted = false;
128
+ row.op = JoinRowOperation.Flushed;
129
+ });
130
+ }
131
+ const questionMarks = /(?<!@)\?/g;
132
+ /**
133
+ * Converts our knex-style `?` placeholders to pg-native `$1, $2, ...` numbered parameters.
134
+ *
135
+ * We skipping postgres operators like `@?`. */
136
+ function toPgParams(sql) {
137
+ let i = 0;
138
+ return sql.replace(questionMarks, () => `$${++i}`);
139
+ }
140
+ //#endregion
141
+ export { flushPostgres, toPgParams };
142
+
143
+ //# sourceMappingURL=postgresSql.js.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"postgresSql.js","names":[],"sources":["../../src/drivers/postgresSql.ts"],"sourcesContent":["import {\n type DeleteOp,\n type DriverQueryResult,\n type InsertOp,\n JoinRowOperation,\n type JoinRowTodo,\n type OpColumn,\n type Todo,\n type UpdateOp,\n cleanSql,\n ensureRectangularArraySizes,\n generateOps,\n getRuntimeConfig,\n kq,\n kqDot,\n partition,\n} from \"joist-core\";\n\n/** A SQL execution boundary, independent of either driver's connection API. */\ntype QueryRunner = (sql: string, bindings: readonly unknown[]) => Promise<DriverQueryResult>;\n\n/**\n * Flushes already-ID-assigned entities using PostgreSQL bulk SQL and optimistic locks.\n *\n * Deferred foreign keys allow bulk inserts without topographic ordering. The caller owns\n * ID assignment, transactions and query observation; this module only issues numbered SQL.\n */\nexport async function flushPostgres(\n query: QueryRunner,\n entityTodos: Record<string, Todo>,\n joinRows: Record<string, JoinRowTodo>,\n): Promise<void> {\n const ops = generateOps(entityTodos);\n // Do INSERTs+UPDATEs first so that we avoid DELETE cascades invalidating oplocks\n // See https://github.com/joist-orm/joist-orm/issues/591\n await Promise.all([\n ...ops.inserts.map((op) => batchInsert(query, op)),\n ...ops.updates.map((op) => batchUpdate(query, op)),\n ...ops.deletes.map((op) => batchDelete(query, op)),\n ...Object.entries(joinRows).flatMap(([joinTableName, todo]) => [\n m2mBatchInsert(query, joinTableName, todo),\n m2mBatchDelete(query, joinTableName, todo),\n ]),\n ]);\n}\n\n/** Inserts a rectangular batch through a typed unnest CTE. */\nasync function batchInsert(query: QueryRunner, op: InsertOp): Promise<unknown> {\n const { tableName, columns, columnValues } = op;\n const [cte, bindings] = buildUnnestCte(\"data\", columns, columnValues);\n const sql = cleanSql(`\n ${cte}\n INSERT INTO ${kq(tableName)} (${columns.map((c) => kq(c.columnName)).join(\", \")})\n SELECT * FROM data\n `);\n const pgSql = toPgParams(sql);\n return query(pgSql, bindings);\n}\n\n/**\n * Updates a batch and rejects rows whose optimistic lock no longer matches.\n *\n * The returned IDs must cover the entire batch; missing rows indicate a concurrent change.\n */\nasync function batchUpdate(query: QueryRunner, op: UpdateOp): Promise<void> {\n const { tableName, columns, columnValues, updatedAt } = op;\n\n const [cte, bindings] = buildUnnestCte(\"data\", columns, columnValues);\n\n // JS Dates only have millisecond-level precision, so we may have dropped/lost accuracy when\n // reading Postgres's microsecond-level `timestamptz` values; using `date_trunc` \"downgrades\"\n // the pg data to match what we have in the JS Date.\n //\n // ...but Temporal's types don't have this flaw.\n const truncateToMills = !getRuntimeConfig().temporal;\n const maybeUpdatedAt =\n updatedAt && truncateToMills\n ? ` AND date_trunc('milliseconds', ${kqDot(tableName, updatedAt)}) = data.__original_updated_at`\n : updatedAt\n ? ` AND ${kqDot(tableName, updatedAt)} = data.__original_updated_at`\n : \"\";\n\n const sql = `\n ${cte}\n UPDATE ${kq(tableName)}\n SET ${columns\n .filter((c) => c.columnName !== \"id\" && c.columnName !== \"__original_updated_at\")\n .map((c) => `${kq(c.columnName)} = data.${kq(c.columnName)}`)\n .join(\", \")}\n FROM data\n WHERE ${kq(tableName)}.id = data.id ${maybeUpdatedAt}\n RETURNING ${kq(tableName)}.id\n `;\n\n const pgSql = toPgParams(cleanSql(sql));\n const result = await query(pgSql, bindings);\n const results = result.rows;\n\n const ids = columnValues[0]; // assume id is the 1st column\n if (results.length !== ids.length) {\n const updated = new Set(results.map((r: any) => r.id));\n const missing = ids.filter((id) => !updated.has(id));\n throw new Error(`Oplock failure for ${tableName} rows ${missing.join(\", \")}`);\n }\n}\n\n/** Deletes a batch by its database identifiers. */\nasync function batchDelete(query: QueryRunner, op: DeleteOp): Promise<void> {\n const { tableName, ids } = op;\n const pgSql = toPgParams(`DELETE FROM ${kq(tableName)} WHERE id = ANY(?)`);\n await query(pgSql, [ids]);\n}\n\n/** Creates a CTE named `tableName` that bulk-injects the `columnValues` into a SQL query. */\nfunction buildUnnestCte(tableName: string, columns: OpColumn[], columnValues: any[][]): [string, any[][]] {\n ensureRectangularArraySizes(columns, columnValues);\n const selects = columns.map((c) => {\n if (c.dbType.endsWith(\"[]\")) {\n if (c.isNullableArray) {\n return `unnest_arrays(?::${c.dbType}[], true) as ${kq(c.columnName)}`;\n } else {\n return `unnest_arrays(?::${c.dbType}[]) as ${kq(c.columnName)}`;\n }\n } else {\n return `unnest(?::${c.dbType}[]) as ${kq(c.columnName)}`;\n }\n });\n const sql = `WITH ${tableName} AS (SELECT ${selects.join(\", \")})`;\n return [sql, columnValues];\n}\n\n/**\n * Inserts join rows and records their persisted state, including surrogate IDs when present.\n *\n * Join tables without surrogate IDs use their foreign-key pair as the conflict target.\n */\nasync function m2mBatchInsert(query: QueryRunner, joinTableName: string, todo: JoinRowTodo) {\n const { m2m, newRows } = todo;\n if (newRows.length === 0) return;\n const col1Values = newRows.map((row) => todo.dbValue(row, m2m.columnName));\n const col2Values = newRows.map((row) => todo.dbValue(row, m2m.otherColumnName));\n if (m2m.hasJoinTableId) {\n const sql = cleanSql(`\n WITH data AS (SELECT unnest(?::int[]) as ${kq(m2m.columnName)}, unnest(?::int[]) as ${kq(m2m.otherColumnName)})\n INSERT INTO ${kq(joinTableName)} (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)})\n SELECT * FROM data\n ON CONFLICT (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)}) DO UPDATE SET id = ${kq(joinTableName)}.id\n RETURNING id;\n `);\n const pgSql = toPgParams(sql);\n const { rows } = await query(pgSql, [col1Values, col2Values]);\n for (let i = 0; i < rows.length; i++) {\n newRows[i].id = rows[i].id;\n newRows[i].op = JoinRowOperation.Flushed;\n newRows[i].persisted = true;\n }\n } else {\n // Id-less join tables have no surrogate id to return; the FK pair is the PK, so just\n // insert and let any duplicate be a no-op.\n const sql = cleanSql(`\n WITH data AS (SELECT unnest(?::int[]) as ${kq(m2m.columnName)}, unnest(?::int[]) as ${kq(m2m.otherColumnName)})\n INSERT INTO ${kq(joinTableName)} (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)})\n SELECT * FROM data\n ON CONFLICT (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)}) DO NOTHING;\n `);\n const pgSql = toPgParams(sql);\n await query(pgSql, [col1Values, col2Values]);\n for (const row of newRows) {\n row.op = JoinRowOperation.Flushed;\n row.persisted = true;\n }\n }\n}\n\n/**\n * Deletes join rows by surrogate ID or by their foreign-key pair.\n *\n * Unloaded collections may only know the pair, while loaded rows can use their surrogate IDs.\n */\nasync function m2mBatchDelete(query: QueryRunner, joinTableName: string, todo: JoinRowTodo) {\n const { m2m, deletedRows } = todo;\n if (deletedRows.length === 0) return;\n // Rows with a surrogate id are deleted by id; rows without one — id-less tables, or `remove`s\n // done against an unloaded ManyToManyCollection — are deleted by their (col1, col2) composite.\n const [haveIds, noIds] = partition(deletedRows, (r) => {\n // We used to use `id !== -1` as a marker for \"row is/is-not persisted in the db\" -- but when adding support\n // for id-column-less m2m tables, we couldn't use `id === -1` as this marker anymore, so now rely on a dedicated\n // `persisted` key instead.\n //\n // So, ideally, this `id !== -1` could go away _except_ that our internal verisoning plugin leverages this \"m2m rows\n // with an id=-1 delete by their FK values\" to handle our versioned m2m tables. And for now it's easier to\n // keep/restore this `id !== -1` than refactor that.\n return r.id !== undefined && r.id !== -1;\n });\n if (haveIds.length > 0) {\n const pgSql = toPgParams(`DELETE FROM ${kq(joinTableName)} WHERE id = ANY(?)`);\n await query(pgSql, [haveIds.map((r) => r.id!)]);\n }\n if (noIds.length > 0) {\n const data = noIds\n // Watch for m2m rows that got added-then-removed to entities that were themselves added-then-removed,\n // as the deTagId will be undefined for those, as we're skipping adding them to the database.\n .filter((row) => !todo.isNew(row, m2m.columnName) && !todo.isNew(row, m2m.otherColumnName))\n .map((row) => [todo.dbValue(row, m2m.columnName), todo.dbValue(row, m2m.otherColumnName)] as any);\n if (data.length > 0) {\n const pgSql = toPgParams(`\n DELETE FROM ${kq(joinTableName)}\n WHERE (${kq(m2m.columnName)}, ${kq(m2m.otherColumnName)}) IN (\n SELECT (data->>0)::int, (data->>1)::int FROM jsonb_array_elements(?) data\n )`);\n await query(pgSql, [JSON.stringify(data)]);\n }\n }\n deletedRows.forEach((row) => {\n row.id = undefined;\n row.persisted = false;\n row.op = JoinRowOperation.Flushed;\n });\n}\n\nconst questionMarks = /(?<!@)\\?/g;\n\n/**\n * Converts our knex-style `?` placeholders to pg-native `$1, $2, ...` numbered parameters.\n *\n * We skipping postgres operators like `@?`. */\nexport function toPgParams(sql: string): string {\n let i = 0;\n return sql.replace(questionMarks, () => `$${++i}`);\n}\n"],"mappings":";;;;;;;;AA2BA,eAAsB,cACpB,OACA,aACA,UACe;CACf,MAAM,MAAM,YAAY,WAAW;CAGnC,MAAM,QAAQ,IAAI;EAChB,GAAG,IAAI,QAAQ,KAAK,OAAO,YAAY,OAAO,EAAE,CAAC;EACjD,GAAG,IAAI,QAAQ,KAAK,OAAO,YAAY,OAAO,EAAE,CAAC;EACjD,GAAG,IAAI,QAAQ,KAAK,OAAO,YAAY,OAAO,EAAE,CAAC;EACjD,GAAG,OAAO,QAAQ,QAAQ,CAAC,CAAC,SAAS,CAAC,eAAe,UAAU,CAC7D,eAAe,OAAO,eAAe,IAAI,GACzC,eAAe,OAAO,eAAe,IAAI,CAC3C,CAAC;CACH,CAAC;AACH;;AAGA,eAAe,YAAY,OAAoB,IAAgC;CAC7E,MAAM,EAAE,WAAW,SAAS,iBAAiB;CAC7C,MAAM,CAAC,KAAK,YAAY,eAAe,QAAQ,SAAS,YAAY;CAOpE,OAAO,MADO,WALF,SAAS;MACjB,IAAI;kBACQ,GAAG,SAAS,EAAE,IAAI,QAAQ,KAAK,MAAM,GAAG,EAAE,UAAU,CAAC,CAAC,CAAC,KAAK,IAAI,EAAE;;GAGvD,CACV,GAAG,QAAQ;AAC9B;;;;;;AAOA,eAAe,YAAY,OAAoB,IAA6B;CAC1E,MAAM,EAAE,WAAW,SAAS,cAAc,cAAc;CAExD,MAAM,CAAC,KAAK,YAAY,eAAe,QAAQ,SAAS,YAAY;CAOpE,MAAM,kBAAkB,CAAC,iBAAiB,CAAC,CAAC;CAC5C,MAAM,iBACJ,aAAa,kBACT,mCAAmC,MAAM,WAAW,SAAS,EAAE,kCAC/D,YACE,QAAQ,MAAM,WAAW,SAAS,EAAE,iCACpC;CAER,MAAM,MAAM;MACR,IAAI;aACG,GAAG,SAAS,EAAE;UACjB,QACH,QAAQ,MAAM,EAAE,eAAe,QAAQ,EAAE,eAAe,uBAAuB,CAAC,CAChF,KAAK,MAAM,GAAG,GAAG,EAAE,UAAU,EAAE,UAAU,GAAG,EAAE,UAAU,GAAG,CAAC,CAC5D,KAAK,IAAI,EAAE;;YAEN,GAAG,SAAS,EAAE,gBAAgB,eAAe;gBACzC,GAAG,SAAS,EAAE;;CAK5B,MAAM,WAAU,MADK,MADP,WAAW,SAAS,GAAG,CACN,GAAG,QAAQ,EAAA,CACnB;CAEvB,MAAM,MAAM,aAAa;CACzB,IAAI,QAAQ,WAAW,IAAI,QAAQ;EACjC,MAAM,UAAU,IAAI,IAAI,QAAQ,KAAK,MAAW,EAAE,EAAE,CAAC;EACrD,MAAM,UAAU,IAAI,QAAQ,OAAO,CAAC,QAAQ,IAAI,EAAE,CAAC;EACnD,MAAM,IAAI,MAAM,sBAAsB,UAAU,QAAQ,QAAQ,KAAK,IAAI,GAAG;CAC9E;AACF;;AAGA,eAAe,YAAY,OAAoB,IAA6B;CAC1E,MAAM,EAAE,WAAW,QAAQ;CAE3B,MAAM,MADQ,WAAW,eAAe,GAAG,SAAS,EAAE,mBACtC,GAAG,CAAC,GAAG,CAAC;AAC1B;;AAGA,SAAS,eAAe,WAAmB,SAAqB,cAA0C;CACxG,4BAA4B,SAAS,YAAY;CAajD,OAAO,CAAC,QADY,UAAU,cAXd,QAAQ,KAAK,MAAM;EACjC,IAAI,EAAE,OAAO,SAAS,IAAI,GAAG;GAC3B,IAAI,EAAE,iBACJ,OAAO,oBAAoB,EAAE,OAAO,eAAe,GAAG,EAAE,UAAU;QAElE,OAAO,oBAAoB,EAAE,OAAO,SAAS,GAAG,EAAE,UAAU;EAEhE,OACE,OAAO,aAAa,EAAE,OAAO,SAAS,GAAG,EAAE,UAAU;CAEzD,CACkD,CAAC,CAAC,KAAK,IAAI,EAAE,IAClD,YAAY;AAC3B;;;;;;AAOA,eAAe,eAAe,OAAoB,eAAuB,MAAmB;CAC1F,MAAM,EAAE,KAAK,YAAY;CACzB,IAAI,QAAQ,WAAW,GAAG;CAC1B,MAAM,aAAa,QAAQ,KAAK,QAAQ,KAAK,QAAQ,KAAK,IAAI,UAAU,CAAC;CACzE,MAAM,aAAa,QAAQ,KAAK,QAAQ,KAAK,QAAQ,KAAK,IAAI,eAAe,CAAC;CAC9E,IAAI,IAAI,gBAAgB;EAStB,MAAM,EAAE,SAAS,MAAM,MADT,WAPF,SAAS;iDACwB,GAAG,IAAI,UAAU,EAAE,wBAAwB,GAAG,IAAI,eAAe,EAAE;oBAChG,GAAG,aAAa,EAAE,IAAI,GAAG,IAAI,UAAU,EAAE,IAAI,GAAG,IAAI,eAAe,EAAE;;qBAEpE,GAAG,IAAI,UAAU,EAAE,IAAI,GAAG,IAAI,eAAe,EAAE,uBAAuB,GAAG,aAAa,EAAE;;KAG9E,CACM,GAAG,CAAC,YAAY,UAAU,CAAC;EAC5D,KAAK,IAAI,IAAI,GAAG,IAAI,KAAK,QAAQ,KAAK;GACpC,QAAQ,EAAE,CAAC,KAAK,KAAK,EAAE,CAAC;GACxB,QAAQ,EAAE,CAAC,KAAK,iBAAiB;GACjC,QAAQ,EAAE,CAAC,YAAY;EACzB;CACF,OAAO;EAUL,MAAM,MADQ,WANF,SAAS;iDACwB,GAAG,IAAI,UAAU,EAAE,wBAAwB,GAAG,IAAI,eAAe,EAAE;oBAChG,GAAG,aAAa,EAAE,IAAI,GAAG,IAAI,UAAU,EAAE,IAAI,GAAG,IAAI,eAAe,EAAE;;qBAEpE,GAAG,IAAI,UAAU,EAAE,IAAI,GAAG,IAAI,eAAe,EAAE;KAErC,CACX,GAAG,CAAC,YAAY,UAAU,CAAC;EAC3C,KAAK,MAAM,OAAO,SAAS;GACzB,IAAI,KAAK,iBAAiB;GAC1B,IAAI,YAAY;EAClB;CACF;AACF;;;;;;AAOA,eAAe,eAAe,OAAoB,eAAuB,MAAmB;CAC1F,MAAM,EAAE,KAAK,gBAAgB;CAC7B,IAAI,YAAY,WAAW,GAAG;CAG9B,MAAM,CAAC,SAAS,SAAS,UAAU,cAAc,MAAM;EAQrD,OAAO,EAAE,OAAO,KAAA,KAAa,EAAE,OAAO;CACxC,CAAC;CACD,IAAI,QAAQ,SAAS,GAEnB,MAAM,MADQ,WAAW,eAAe,GAAG,aAAa,EAAE,mBAC1C,GAAG,CAAC,QAAQ,KAAK,MAAM,EAAE,EAAG,CAAC,CAAC;CAEhD,IAAI,MAAM,SAAS,GAAG;EACpB,MAAM,OAAO,MAGV,QAAQ,QAAQ,CAAC,KAAK,MAAM,KAAK,IAAI,UAAU,KAAK,CAAC,KAAK,MAAM,KAAK,IAAI,eAAe,CAAC,CAAC,CAC1F,KAAK,QAAQ,CAAC,KAAK,QAAQ,KAAK,IAAI,UAAU,GAAG,KAAK,QAAQ,KAAK,IAAI,eAAe,CAAC,CAAQ;EAClG,IAAI,KAAK,SAAS,GAMhB,MAAM,MALQ,WAAW;sBACT,GAAG,aAAa,EAAE;iBACvB,GAAG,IAAI,UAAU,EAAE,IAAI,GAAG,IAAI,eAAe,EAAE;;UAG1C,GAAG,CAAC,KAAK,UAAU,IAAI,CAAC,CAAC;CAE7C;CACA,YAAY,SAAS,QAAQ;EAC3B,IAAI,KAAK,KAAA;EACT,IAAI,YAAY;EAChB,IAAI,KAAK,iBAAiB;CAC5B,CAAC;AACH;AAEA,MAAM,gBAAgB;;;;;AAMtB,SAAgB,WAAW,KAAqB;CAC9C,IAAI,IAAI;CACR,OAAO,IAAI,QAAQ,qBAAqB,IAAI,EAAE,GAAG;AACnD"}
package/build/index.js CHANGED
@@ -1,3 +1,2 @@
1
- import { Deferred, groupBy, isPlainObject, keyBy, newPgConnectionConfig } from "joist-utils";
1
+ export { Deferred, groupBy, isPlainObject, keyBy, newPgConnectionConfig } from "joist-utils";
2
2
  export * from "joist-core";
3
- export { Deferred, groupBy, isPlainObject, keyBy, newPgConnectionConfig };
@@ -1,4 +1,4 @@
1
- import { PostgresDriver, PostgresDriverOpts, setupLatestPgTypes } from "./drivers/PostgresDriver.cjs";
2
1
  import { BinaryParse, binaryArrayParser, binaryTextParser, getBinaryTypeParser, registerDatabaseBinaryParsers, setBinaryTypeParser, setSessionTimeZone } from "./drivers/binaryParsers.cjs";
2
+ import { PostgresDriver, PostgresDriverOpts, setupLatestPgTypes } from "./drivers/PostgresDriver.cjs";
3
3
  import { seed } from "./seed.cjs";
4
4
  export { type BinaryParse, PostgresDriver, type PostgresDriverOpts, binaryArrayParser, binaryTextParser, getBinaryTypeParser, registerDatabaseBinaryParsers, seed, setBinaryTypeParser, setSessionTimeZone, setupLatestPgTypes };
@@ -1,4 +1,4 @@
1
- import { PostgresDriver, PostgresDriverOpts, setupLatestPgTypes } from "./drivers/PostgresDriver.mjs";
2
1
  import { BinaryParse, binaryArrayParser, binaryTextParser, getBinaryTypeParser, registerDatabaseBinaryParsers, setBinaryTypeParser, setSessionTimeZone } from "./drivers/binaryParsers.mjs";
2
+ import { PostgresDriver, PostgresDriverOpts, setupLatestPgTypes } from "./drivers/PostgresDriver.mjs";
3
3
  import { seed } from "./seed.mjs";
4
4
  export { type BinaryParse, PostgresDriver, type PostgresDriverOpts, binaryArrayParser, binaryTextParser, getBinaryTypeParser, registerDatabaseBinaryParsers, seed, setBinaryTypeParser, setSessionTimeZone, setupLatestPgTypes };
@@ -0,0 +1,3 @@
1
+ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
2
+ const require_drivers_PostgreJsDriver = require("./drivers/PostgreJsDriver.cjs");
3
+ exports.PostgreJsDriver = require_drivers_PostgreJsDriver.PostgreJsDriver;
@@ -0,0 +1,2 @@
1
+ import { PostgreJsDriver, PostgreJsDriverOpts } from "./drivers/PostgreJsDriver.cjs";
2
+ export { PostgreJsDriver, type PostgreJsDriverOpts };
@@ -0,0 +1,2 @@
1
+ import { PostgreJsDriver, PostgreJsDriverOpts } from "./drivers/PostgreJsDriver.mjs";
2
+ export { PostgreJsDriver, type PostgreJsDriverOpts };
@@ -0,0 +1 @@
1
+ export { PostgreJsDriver } from "./drivers/PostgreJsDriver.js";
package/build/seed.d.cts CHANGED
@@ -18,7 +18,6 @@ import { EntityManager } from "joist-core";
18
18
  * });
19
19
  * ```
20
20
  */
21
- declare function seed<E extends EntityManager = EntityManager>(fn: (em: E) => Promise<void>): void;
21
+ export declare function seed<E extends EntityManager = EntityManager>(fn: (em: E) => Promise<void>): void;
22
22
  //#endregion
23
- export { seed };
24
23
  //# sourceMappingURL=seed.d.cts.map
@@ -1 +1 @@
1
- {"version":3,"file":"seed.d.cts","names":[],"sources":["../src/seed.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;iBAuBgB,KAAK,UAAU,gBAAgB,eAAe,KAAK,IAAI,MAAM"}
1
+ {"version":3,"file":"seed.d.cts","names":[],"sources":["../src/seed.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;wBAuBgB,KAAK,UAAU,gBAAgB,eAAe,KAAK,IAAI,MAAM"}
package/build/seed.d.mts CHANGED
@@ -18,7 +18,6 @@ import { EntityManager } from "joist-core";
18
18
  * });
19
19
  * ```
20
20
  */
21
- declare function seed<E extends EntityManager = EntityManager>(fn: (em: E) => Promise<void>): void;
21
+ export declare function seed<E extends EntityManager = EntityManager>(fn: (em: E) => Promise<void>): void;
22
22
  //#endregion
23
- export { seed };
24
23
  //# sourceMappingURL=seed.d.mts.map
@@ -1 +1 @@
1
- {"version":3,"file":"seed.d.mts","names":[],"sources":["../src/seed.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;iBAuBgB,KAAK,UAAU,gBAAgB,eAAe,KAAK,IAAI,MAAM"}
1
+ {"version":3,"file":"seed.d.mts","names":[],"sources":["../src/seed.ts"],"mappings":";;;;;;;;;;;;;;;;;;;;wBAuBgB,KAAK,UAAU,gBAAgB,eAAe,KAAK,IAAI,MAAM"}