hazo_connect 4.0.1 → 4.1.0
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.
- package/CHANGE_LOG.md +82 -0
- package/dist/adapters/pg-adapter.d.ts +53 -5
- package/dist/adapters/pg-adapter.d.ts.map +1 -1
- package/dist/adapters/pg-adapter.js +107 -8
- package/dist/adapters/pg-adapter.js.map +1 -1
- package/dist/query-builder.d.ts +17 -0
- package/dist/query-builder.d.ts.map +1 -1
- package/dist/query-builder.js +101 -2
- package/dist/query-builder.js.map +1 -1
- package/dist/server/index.d.ts +2 -0
- package/dist/server/index.d.ts.map +1 -1
- package/dist/server/index.js +1 -0
- package/dist/server/index.js.map +1 -1
- package/package.json +6 -6
package/CHANGE_LOG.md
CHANGED
|
@@ -5,6 +5,88 @@ All notable changes to this project will be documented in this file.
|
|
|
5
5
|
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
|
|
6
6
|
and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
|
|
7
7
|
|
|
8
|
+
## 4.1.0 — 2026-08-19
|
|
9
|
+
|
|
10
|
+
### Added
|
|
11
|
+
|
|
12
|
+
- **`PgAdapter` now supports the full CRUD surface, not just `POST`.**
|
|
13
|
+
`query(builder, method, body)` dispatches `GET` → SELECT, `PUT`/`PATCH` →
|
|
14
|
+
UPDATE, and `DELETE` → DELETE through `QueryBuilder.toPgSql()` + `raw()`,
|
|
15
|
+
matching the shape already supported by the SQLite adapters. `PUT`/`PATCH`
|
|
16
|
+
and `DELETE` clone the builder before mutating it, so the caller's original
|
|
17
|
+
`QueryBuilder` instance is never side-effected, and both default to
|
|
18
|
+
`RETURNING *` unless the caller already called `.returning()`.
|
|
19
|
+
- **`QueryBuilder.toPgSql()` gained a DELETE branch.** A new `.delete()`
|
|
20
|
+
method (mirroring `.update()`) marks the builder as producing
|
|
21
|
+
`DELETE FROM table WHERE ... RETURNING *` with native `$N` placeholders.
|
|
22
|
+
`.forUpdate()` is now correctly ignored on DELETE as well as UPDATE.
|
|
23
|
+
- **`QueryBuilder.toPgSql()` gained JOIN support.** `.join(table, on, type)`
|
|
24
|
+
now emits `INNER JOIN`/`LEFT JOIN` clauses on the SELECT path, mirroring
|
|
25
|
+
`buildJoinClauses()` in the SQLite query translator: `RIGHT JOIN` is
|
|
26
|
+
rejected the same way, table targets accept `table`, `table alias`, or
|
|
27
|
+
`table AS alias`, and join conditions must be a single-column equality
|
|
28
|
+
(`a.id = b.id`). Matches `toPgSql()`'s existing (lack of) identifier
|
|
29
|
+
quoting convention elsewhere in the method.
|
|
30
|
+
- **`QueryBuilder.getReturning()`** — getter for the RETURNING columns set via
|
|
31
|
+
`.returning()`, added so `PgAdapter` can detect whether the caller already
|
|
32
|
+
set one before defaulting to `RETURNING *`.
|
|
33
|
+
- **`PgAdapter.transaction(fn, options)`** — wraps a callback in postgres.js's
|
|
34
|
+
`sql.begin()`. The callback receives a `tx` facade exposing
|
|
35
|
+
`.query(builder, method, body)` with the *same signature* as the adapter
|
|
36
|
+
itself (not a separate `rawQuery`/named-params shape) plus a `.raw()`
|
|
37
|
+
passthrough, both executing against the transaction-scoped connection so
|
|
38
|
+
every call commits or rolls back together. postgres.js commits when the
|
|
39
|
+
callback resolves and rolls back (rethrowing) when it throws, mirroring
|
|
40
|
+
`BetterSqlite3Adapter.transaction()`'s commit/rollback shape. Nested
|
|
41
|
+
`transaction()` calls on the same adapter instance are rejected, matching
|
|
42
|
+
`BetterSqlite3Adapter`'s guard. `options.begin` forwards a raw BEGIN
|
|
43
|
+
options string (e.g. `'isolation level serializable'`) to
|
|
44
|
+
`sql.begin(options, fn)`.
|
|
45
|
+
- **`PgAdapter`/`PgAdapterConfig`/`PgTransactionContext`/`PgTransactionOptions`
|
|
46
|
+
are now exported from `hazo_connect/server`**, alongside the sql.js and
|
|
47
|
+
better-sqlite3 adapters that were already there. Found and fixed while
|
|
48
|
+
building a consuming app's own backend-selection guard: that code needs
|
|
49
|
+
`adapter instanceof PgAdapter` (the same "class identity survives
|
|
50
|
+
minification, a name string doesn't" reasoning `BetterSqlite3Adapter`'s own
|
|
51
|
+
export already exists for), and had no way to import the class at all — the
|
|
52
|
+
whole rest of this file's CRUD/transaction feature work for `PgAdapter` was
|
|
53
|
+
reachable only through the generic `HazoConnectAdapter` return type of
|
|
54
|
+
`createHazoConnect()`, never as its own importable class.
|
|
55
|
+
|
|
56
|
+
### Verified
|
|
57
|
+
|
|
58
|
+
- Unit: `src/lib/query-builder.pg.test.ts` — DELETE and JOIN SQL emission
|
|
59
|
+
(aliasing, multiple joins, RIGHT JOIN rejection, malformed
|
|
60
|
+
table/condition rejection, JOIN excluded from UPDATE).
|
|
61
|
+
- Unit: `src/lib/__tests__/pg_adapter.test.ts` — `PgAdapter.query()` dispatch
|
|
62
|
+
for GET/PUT/PATCH/DELETE/POST against a mocked `postgres` driver (no live
|
|
63
|
+
DB required), builder-clone-not-mutate behavior, `transaction()` commit/
|
|
64
|
+
propagate-throw/nested-rejection/begin-options behavior.
|
|
65
|
+
- Live: `tests/integration/pg.integration.test.ts` (`PG_INTEGRATION=true`) run
|
|
66
|
+
against a real local Postgres 16 instance — all 10 cases pass, including
|
|
67
|
+
`query(builder, GET/PATCH/DELETE)` round-trips, the JOIN case, and
|
|
68
|
+
`transaction()` commit + rollback-on-throw.
|
|
69
|
+
|
|
70
|
+
## 4.0.2 — 2026-08-19
|
|
71
|
+
|
|
72
|
+
### Changed
|
|
73
|
+
|
|
74
|
+
- `peerDependencies`/`devDependencies` realigned to the current `hazo_*`
|
|
75
|
+
ecosystem: `hazo_config` `^2.4.3`, `hazo_core` `^2.0.0`, `hazo_ui` `^6.9.0`,
|
|
76
|
+
`hazo_logs` `^2.2.1`. No source changes — this closes out the range
|
|
77
|
+
realignment that `4.0.1` started (see below), matching the peer set
|
|
78
|
+
`hazo_ihelp@2.6.0` now requires.
|
|
79
|
+
|
|
80
|
+
## 4.0.1 — 2026-08-XX
|
|
81
|
+
|
|
82
|
+
### Changed
|
|
83
|
+
|
|
84
|
+
- `peerDependencies`/`devDependencies` bumped: `hazo_config` `^2.4.2`,
|
|
85
|
+
`hazo_core` `^1.3.0` → `^2.0.0`, `hazo_ui` `^6.3.1` → `^6.8.0`. No source
|
|
86
|
+
changes. *(Retroactive entry — this version was published without a
|
|
87
|
+
changelog entry; reconstructed from the published package.json diff
|
|
88
|
+
against `4.0.0` since the exact publish date isn't recorded locally.)*
|
|
89
|
+
|
|
8
90
|
## 4.0.0 — 2026-08-04
|
|
9
91
|
|
|
10
92
|
### BREAKING
|
|
@@ -3,8 +3,11 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Supports raw SQL execution via sql.unsafe(), which is required for advanced
|
|
5
5
|
* Postgres features (e.g., SELECT … FOR UPDATE SKIP LOCKED) that PostgREST
|
|
6
|
-
* does not expose.
|
|
7
|
-
*
|
|
6
|
+
* does not expose. query(builder) dispatches GET/POST/PUT/PATCH/DELETE through
|
|
7
|
+
* QueryBuilder.toPgSql() (POST still builds its own INSERT/upsert SQL, since
|
|
8
|
+
* toPgSql() doesn't model INSERT). transaction() wraps a callback in
|
|
9
|
+
* postgres.js's sql.begin(), handing it a facade with the same
|
|
10
|
+
* query(builder, method, body) signature as the adapter itself.
|
|
8
11
|
*/
|
|
9
12
|
import type { Logger, ClaimRowsOptions } from '../types.js';
|
|
10
13
|
import { BaseAdapter } from './base-adapter.js';
|
|
@@ -16,16 +19,61 @@ export interface PgAdapterConfig {
|
|
|
16
19
|
ssl?: boolean | 'require';
|
|
17
20
|
log_level?: string;
|
|
18
21
|
}
|
|
22
|
+
/** Facade handed to the transaction() callback. Same query() signature as PgAdapter itself. */
|
|
23
|
+
export interface PgTransactionContext {
|
|
24
|
+
query: (builder: QueryBuilder, method?: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE', body?: unknown) => Promise<unknown[]>;
|
|
25
|
+
raw: <T = unknown>(text: string, values?: unknown[]) => Promise<T[]>;
|
|
26
|
+
}
|
|
27
|
+
export interface PgTransactionOptions {
|
|
28
|
+
/**
|
|
29
|
+
* Raw BEGIN options string passed through to postgres.js's sql.begin(options, fn),
|
|
30
|
+
* e.g. 'read write', 'isolation level serializable'. Omit for a plain BEGIN.
|
|
31
|
+
*/
|
|
32
|
+
begin?: string;
|
|
33
|
+
}
|
|
19
34
|
export declare class PgAdapter extends BaseAdapter {
|
|
20
35
|
private sql;
|
|
36
|
+
private inTransaction;
|
|
21
37
|
constructor(config: PgAdapterConfig, logger?: Logger);
|
|
22
38
|
/**
|
|
23
39
|
* Execute a query using the QueryBuilder.
|
|
24
|
-
*
|
|
25
|
-
*
|
|
26
|
-
*
|
|
40
|
+
* - GET dispatches to QueryBuilder.toPgSql() (SELECT, with optional JOINs / FOR UPDATE).
|
|
41
|
+
* - PUT/PATCH dispatches to toPgSql() with the payload applied via builder.update(); defaults
|
|
42
|
+
* to RETURNING * when the caller hasn't already called .returning().
|
|
43
|
+
* - DELETE dispatches to toPgSql() with builder.delete(); also defaults to RETURNING *.
|
|
44
|
+
* - POST builds a parameterised INSERT … ON CONFLICT … RETURNING * statement directly
|
|
45
|
+
* (toPgSql() has no INSERT branch) and executes it row by row.
|
|
27
46
|
*/
|
|
28
47
|
query(builder: QueryBuilder, method?: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE', body?: unknown): Promise<unknown[]>;
|
|
48
|
+
private runQuery;
|
|
49
|
+
/**
|
|
50
|
+
* Execute a raw SQL statement against the given executor (pool or transaction),
|
|
51
|
+
* logging the query and translating connection failures via handleConnectionError().
|
|
52
|
+
*/
|
|
53
|
+
private execRaw;
|
|
54
|
+
/**
|
|
55
|
+
* Build and execute a parameterised INSERT … ON CONFLICT … RETURNING * statement,
|
|
56
|
+
* row by row. toPgSql() has no INSERT branch, so this is built directly (mirrors
|
|
57
|
+
* the original query() implementation, parametrised over the executor).
|
|
58
|
+
*/
|
|
59
|
+
private runInsert;
|
|
60
|
+
/**
|
|
61
|
+
* Run a sequence of writes atomically via postgres.js's sql.begin(). The callback
|
|
62
|
+
* receives a tx facade with the same query(builder, method, body) signature as the
|
|
63
|
+
* adapter itself, executed against the transaction-scoped connection so every call
|
|
64
|
+
* participates in the same transaction. postgres.js commits when the callback
|
|
65
|
+
* resolves and rolls back (rethrowing) when it throws — mirroring the
|
|
66
|
+
* commit-on-success / rollback-on-throw shape of BetterSqlite3Adapter.transaction().
|
|
67
|
+
*
|
|
68
|
+
* Nested transactions on the same adapter instance are rejected, matching
|
|
69
|
+
* BetterSqlite3Adapter's guard (the tx facade itself has no .transaction() method,
|
|
70
|
+
* so this only fires if a caller re-enters transaction() on the same adapter while
|
|
71
|
+
* a prior call is still in flight).
|
|
72
|
+
*
|
|
73
|
+
* @param options.begin - Raw BEGIN options string forwarded to sql.begin(options, fn)
|
|
74
|
+
* (e.g. 'isolation level serializable'). Omit for a plain BEGIN.
|
|
75
|
+
*/
|
|
76
|
+
transaction<T>(fn: (tx: PgTransactionContext) => Promise<T>, options?: PgTransactionOptions): Promise<T>;
|
|
29
77
|
/**
|
|
30
78
|
* Not applicable for the pg adapter (no HTTP layer).
|
|
31
79
|
* Satisfies the HazoConnectAdapter interface — use raw() for direct SQL.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg-adapter.d.ts","sourceRoot":"","sources":["../../src/lib/adapters/pg-adapter.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"pg-adapter.d.ts","sourceRoot":"","sources":["../../src/lib/adapters/pg-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAIH,OAAO,KAAK,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAA;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAQvD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,IAAI,CAAA;IACV,gBAAgB,EAAE,MAAM,CAAA;IACxB,OAAO,CAAC,EAAE,MAAM,CAAA;IAChB,GAAG,CAAC,EAAE,OAAO,GAAG,SAAS,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAA;CACnB;AAOD,+FAA+F;AAC/F,MAAM,WAAW,oBAAoB;IACnC,KAAK,EAAE,CACL,OAAO,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,EACpD,IAAI,CAAC,EAAE,OAAO,KACX,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;IACvB,GAAG,EAAE,CAAC,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,CAAA;CACrE;AAED,MAAM,WAAW,oBAAoB;IACnC;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAaD,qBAAa,SAAU,SAAQ,WAAW;IACxC,OAAO,CAAC,GAAG,CAAK;IAChB,OAAO,CAAC,aAAa,CAAQ;gBAEjB,MAAM,EAAE,eAAe,EAAE,MAAM,CAAC,EAAE,MAAM;IAYpD;;;;;;;;OAQG;IACG,KAAK,CACT,OAAO,EAAE,YAAY,EACrB,MAAM,GAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAgB,EAC3D,IAAI,CAAC,EAAE,OAAO,GACb,OAAO,CAAC,OAAO,EAAE,CAAC;YAIP,QAAQ;IAoCtB;;;OAGG;YACW,OAAO;IAcrB;;;;OAIG;YACW,SAAS;IAkEvB;;;;;;;;;;;;;;;OAeG;IACG,WAAW,CAAC,CAAC,EACjB,EAAE,EAAE,CAAC,EAAE,EAAE,oBAAoB,KAAK,OAAO,CAAC,CAAC,CAAC,EAC5C,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,CAAC,CAAC;IAuBb;;;OAGG;IACG,QAAQ,CAAC,SAAS,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,WAAW,GAAG,OAAO,CAAC,KAAK,CAAC;IAOzE;;;;;;;;OAQG;IACG,GAAG,CAAC,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,GAAE,OAAO,EAAO,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAS1E;;;;;;;;;OASG;IACG,SAAS,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAkClF;;;OAGG;IACG,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC;IAI5B;;OAEG;IACG,SAAS,IAAI,OAAO,CAAC,eAAe,CAAC;CAG5C"}
|
|
@@ -3,8 +3,11 @@
|
|
|
3
3
|
*
|
|
4
4
|
* Supports raw SQL execution via sql.unsafe(), which is required for advanced
|
|
5
5
|
* Postgres features (e.g., SELECT … FOR UPDATE SKIP LOCKED) that PostgREST
|
|
6
|
-
* does not expose.
|
|
7
|
-
*
|
|
6
|
+
* does not expose. query(builder) dispatches GET/POST/PUT/PATCH/DELETE through
|
|
7
|
+
* QueryBuilder.toPgSql() (POST still builds its own INSERT/upsert SQL, since
|
|
8
|
+
* toPgSql() doesn't model INSERT). transaction() wraps a callback in
|
|
9
|
+
* postgres.js's sql.begin(), handing it a facade with the same
|
|
10
|
+
* query(builder, method, body) signature as the adapter itself.
|
|
8
11
|
*/
|
|
9
12
|
import postgres from 'postgres';
|
|
10
13
|
import { BaseAdapter } from './base-adapter.js';
|
|
@@ -17,8 +20,12 @@ function quoteIdent(id) {
|
|
|
17
20
|
throw new Error(`PgAdapter: invalid identifier: ${JSON.stringify(id)}`);
|
|
18
21
|
return `"${id}"`;
|
|
19
22
|
}
|
|
23
|
+
function isPlainObject(value) {
|
|
24
|
+
return typeof value === 'object' && value !== null && !Array.isArray(value);
|
|
25
|
+
}
|
|
20
26
|
export class PgAdapter extends BaseAdapter {
|
|
21
27
|
sql;
|
|
28
|
+
inTransaction = false;
|
|
22
29
|
constructor(config, logger) {
|
|
23
30
|
super(config, logger);
|
|
24
31
|
this.validateConfig(['connectionString']);
|
|
@@ -30,14 +37,66 @@ export class PgAdapter extends BaseAdapter {
|
|
|
30
37
|
}
|
|
31
38
|
/**
|
|
32
39
|
* Execute a query using the QueryBuilder.
|
|
33
|
-
*
|
|
34
|
-
*
|
|
35
|
-
*
|
|
40
|
+
* - GET dispatches to QueryBuilder.toPgSql() (SELECT, with optional JOINs / FOR UPDATE).
|
|
41
|
+
* - PUT/PATCH dispatches to toPgSql() with the payload applied via builder.update(); defaults
|
|
42
|
+
* to RETURNING * when the caller hasn't already called .returning().
|
|
43
|
+
* - DELETE dispatches to toPgSql() with builder.delete(); also defaults to RETURNING *.
|
|
44
|
+
* - POST builds a parameterised INSERT … ON CONFLICT … RETURNING * statement directly
|
|
45
|
+
* (toPgSql() has no INSERT branch) and executes it row by row.
|
|
36
46
|
*/
|
|
37
47
|
async query(builder, method = 'GET', body) {
|
|
38
|
-
|
|
39
|
-
|
|
48
|
+
return this.runQuery(this.sql, builder, method, body);
|
|
49
|
+
}
|
|
50
|
+
async runQuery(sqlExec, builder, method = 'GET', body) {
|
|
51
|
+
const normalizedMethod = method.toUpperCase();
|
|
52
|
+
switch (normalizedMethod) {
|
|
53
|
+
case 'GET': {
|
|
54
|
+
const { text, values } = builder.toPgSql();
|
|
55
|
+
return this.execRaw(sqlExec, 'PgAdapter SELECT', text, values);
|
|
56
|
+
}
|
|
57
|
+
case 'PUT':
|
|
58
|
+
case 'PATCH': {
|
|
59
|
+
if (!isPlainObject(body) || Object.keys(body).length === 0) {
|
|
60
|
+
this.throwError(ErrorCode.VALIDATION_ERROR, 'PgAdapter.query: PUT/PATCH payload must be a non-empty object');
|
|
61
|
+
}
|
|
62
|
+
const updateBuilder = builder.clone().update(body);
|
|
63
|
+
if (!updateBuilder.getReturning())
|
|
64
|
+
updateBuilder.returning('*');
|
|
65
|
+
const { text, values } = updateBuilder.toPgSql();
|
|
66
|
+
return this.execRaw(sqlExec, 'PgAdapter UPDATE', text, values);
|
|
67
|
+
}
|
|
68
|
+
case 'DELETE': {
|
|
69
|
+
const deleteBuilder = builder.clone().delete();
|
|
70
|
+
if (!deleteBuilder.getReturning())
|
|
71
|
+
deleteBuilder.returning('*');
|
|
72
|
+
const { text, values } = deleteBuilder.toPgSql();
|
|
73
|
+
return this.execRaw(sqlExec, 'PgAdapter DELETE', text, values);
|
|
74
|
+
}
|
|
75
|
+
case 'POST':
|
|
76
|
+
return this.runInsert(sqlExec, builder, body);
|
|
77
|
+
default:
|
|
78
|
+
this.throwError(ErrorCode.VALIDATION_ERROR, `Unsupported method '${method}' for pg adapter`);
|
|
40
79
|
}
|
|
80
|
+
}
|
|
81
|
+
/**
|
|
82
|
+
* Execute a raw SQL statement against the given executor (pool or transaction),
|
|
83
|
+
* logging the query and translating connection failures via handleConnectionError().
|
|
84
|
+
*/
|
|
85
|
+
async execRaw(sqlExec, operation, text, values = []) {
|
|
86
|
+
try {
|
|
87
|
+
this.logQuery(operation, { sql: text, params: values });
|
|
88
|
+
return (await sqlExec.unsafe(text, values));
|
|
89
|
+
}
|
|
90
|
+
catch (error) {
|
|
91
|
+
this.handleConnectionError(error);
|
|
92
|
+
}
|
|
93
|
+
}
|
|
94
|
+
/**
|
|
95
|
+
* Build and execute a parameterised INSERT … ON CONFLICT … RETURNING * statement,
|
|
96
|
+
* row by row. toPgSql() has no INSERT branch, so this is built directly (mirrors
|
|
97
|
+
* the original query() implementation, parametrised over the executor).
|
|
98
|
+
*/
|
|
99
|
+
async runInsert(sqlExec, builder, body) {
|
|
41
100
|
const table = builder.getTable();
|
|
42
101
|
if (!table) {
|
|
43
102
|
this.throwError(ErrorCode.NOT_IMPLEMENTED, 'PgAdapter.query: builder must have a table set');
|
|
@@ -89,11 +148,51 @@ export class PgAdapter extends BaseAdapter {
|
|
|
89
148
|
}
|
|
90
149
|
const sqlText = `INSERT INTO ${quoteIdent(table)} (${colList}) VALUES (${placeholders})${conflictClause} RETURNING *`;
|
|
91
150
|
this.logQuery('PgAdapter INSERT', { sql: sqlText, params: values });
|
|
92
|
-
const rowResult = await
|
|
151
|
+
const rowResult = await sqlExec.unsafe(sqlText, values);
|
|
93
152
|
results.push(...rowResult);
|
|
94
153
|
}
|
|
95
154
|
return results;
|
|
96
155
|
}
|
|
156
|
+
/**
|
|
157
|
+
* Run a sequence of writes atomically via postgres.js's sql.begin(). The callback
|
|
158
|
+
* receives a tx facade with the same query(builder, method, body) signature as the
|
|
159
|
+
* adapter itself, executed against the transaction-scoped connection so every call
|
|
160
|
+
* participates in the same transaction. postgres.js commits when the callback
|
|
161
|
+
* resolves and rolls back (rethrowing) when it throws — mirroring the
|
|
162
|
+
* commit-on-success / rollback-on-throw shape of BetterSqlite3Adapter.transaction().
|
|
163
|
+
*
|
|
164
|
+
* Nested transactions on the same adapter instance are rejected, matching
|
|
165
|
+
* BetterSqlite3Adapter's guard (the tx facade itself has no .transaction() method,
|
|
166
|
+
* so this only fires if a caller re-enters transaction() on the same adapter while
|
|
167
|
+
* a prior call is still in flight).
|
|
168
|
+
*
|
|
169
|
+
* @param options.begin - Raw BEGIN options string forwarded to sql.begin(options, fn)
|
|
170
|
+
* (e.g. 'isolation level serializable'). Omit for a plain BEGIN.
|
|
171
|
+
*/
|
|
172
|
+
async transaction(fn, options) {
|
|
173
|
+
if (this.inTransaction) {
|
|
174
|
+
this.throwError(ErrorCode.VALIDATION_ERROR, 'Nested transactions are not supported');
|
|
175
|
+
}
|
|
176
|
+
this.inTransaction = true;
|
|
177
|
+
try {
|
|
178
|
+
const runner = async (txSql) => {
|
|
179
|
+
const tx = {
|
|
180
|
+
query: (builder, method, body) => this.runQuery(txSql, builder, method, body),
|
|
181
|
+
raw: (text, values) => this.execRaw(txSql, 'PgAdapter tx raw', text, values ?? []),
|
|
182
|
+
};
|
|
183
|
+
return await fn(tx);
|
|
184
|
+
};
|
|
185
|
+
return (options?.begin
|
|
186
|
+
? await this.sql.begin(options.begin, runner)
|
|
187
|
+
: await this.sql.begin(runner));
|
|
188
|
+
}
|
|
189
|
+
catch (error) {
|
|
190
|
+
this.handleConnectionError(error);
|
|
191
|
+
}
|
|
192
|
+
finally {
|
|
193
|
+
this.inTransaction = false;
|
|
194
|
+
}
|
|
195
|
+
}
|
|
97
196
|
/**
|
|
98
197
|
* Not applicable for the pg adapter (no HTTP layer).
|
|
99
198
|
* Satisfies the HazoConnectAdapter interface — use raw() for direct SQL.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg-adapter.js","sourceRoot":"","sources":["../../src/lib/adapters/pg-adapter.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"pg-adapter.js","sourceRoot":"","sources":["../../src/lib/adapters/pg-adapter.ts"],"names":[],"mappings":"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"}
|
package/dist/query-builder.d.ts
CHANGED
|
@@ -26,6 +26,7 @@ export declare class QueryBuilder {
|
|
|
26
26
|
private _forUpdate?;
|
|
27
27
|
private _returning?;
|
|
28
28
|
private _update?;
|
|
29
|
+
private _delete;
|
|
29
30
|
private _onConflict?;
|
|
30
31
|
private _onConflictAction?;
|
|
31
32
|
private _jsonColumns;
|
|
@@ -160,6 +161,14 @@ export declare class QueryBuilder {
|
|
|
160
161
|
* @returns QueryBuilder instance for chaining
|
|
161
162
|
*/
|
|
162
163
|
update(data: Record<string, unknown>): this;
|
|
164
|
+
/**
|
|
165
|
+
* Mark this builder as producing a DELETE statement (used by toPgSql()).
|
|
166
|
+
* Mirrors update() — the corresponding SQLite path (translateDelete()) is a
|
|
167
|
+
* separate translator function and needs no such marker, but toPgSql() is a
|
|
168
|
+
* single method that must decide its statement shape from builder state.
|
|
169
|
+
* @returns QueryBuilder instance for chaining
|
|
170
|
+
*/
|
|
171
|
+
delete(): this;
|
|
163
172
|
/**
|
|
164
173
|
* Declare the conflict target for an INSERT. Pair with `.doUpdate()` or
|
|
165
174
|
* `.doNothing()` to produce an upsert. Without a following action, the
|
|
@@ -215,6 +224,10 @@ export declare class QueryBuilder {
|
|
|
215
224
|
text: string;
|
|
216
225
|
values: unknown[];
|
|
217
226
|
};
|
|
227
|
+
private _buildJoinClausePg;
|
|
228
|
+
private _normalizeJoinTypePg;
|
|
229
|
+
private _formatJoinTargetPg;
|
|
230
|
+
private _formatJoinConditionPg;
|
|
218
231
|
/**
|
|
219
232
|
* Get the table name
|
|
220
233
|
*/
|
|
@@ -258,6 +271,10 @@ export declare class QueryBuilder {
|
|
|
258
271
|
* Get nested selects
|
|
259
272
|
*/
|
|
260
273
|
getNestedSelects(): NestedSelect[];
|
|
274
|
+
/**
|
|
275
|
+
* Get the RETURNING clause columns set via returning(), if any.
|
|
276
|
+
*/
|
|
277
|
+
getReturning(): string | undefined;
|
|
261
278
|
/**
|
|
262
279
|
* Clone the query builder
|
|
263
280
|
* @returns New QueryBuilder instance with same state
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-builder.d.ts","sourceRoot":"","sources":["../src/lib/query-builder.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"query-builder.d.ts","sourceRoot":"","sources":["../src/lib/query-builder.ts"],"names":[],"mappings":"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"}
|
package/dist/query-builder.js
CHANGED
|
@@ -26,6 +26,7 @@ export class QueryBuilder {
|
|
|
26
26
|
_forUpdate;
|
|
27
27
|
_returning;
|
|
28
28
|
_update;
|
|
29
|
+
_delete = false;
|
|
29
30
|
_onConflict;
|
|
30
31
|
_onConflictAction;
|
|
31
32
|
_jsonColumns = [];
|
|
@@ -320,6 +321,17 @@ export class QueryBuilder {
|
|
|
320
321
|
this._update = data;
|
|
321
322
|
return this;
|
|
322
323
|
}
|
|
324
|
+
/**
|
|
325
|
+
* Mark this builder as producing a DELETE statement (used by toPgSql()).
|
|
326
|
+
* Mirrors update() — the corresponding SQLite path (translateDelete()) is a
|
|
327
|
+
* separate translator function and needs no such marker, but toPgSql() is a
|
|
328
|
+
* single method that must decide its statement shape from builder state.
|
|
329
|
+
* @returns QueryBuilder instance for chaining
|
|
330
|
+
*/
|
|
331
|
+
delete() {
|
|
332
|
+
this._delete = true;
|
|
333
|
+
return this;
|
|
334
|
+
}
|
|
323
335
|
/**
|
|
324
336
|
* Declare the conflict target for an INSERT. Pair with `.doUpdate()` or
|
|
325
337
|
* `.doNothing()` to produce an upsert. Without a following action, the
|
|
@@ -403,7 +415,10 @@ export class QueryBuilder {
|
|
|
403
415
|
const values = [];
|
|
404
416
|
const next = (v) => { values.push(v); return `$${values.length}`; };
|
|
405
417
|
let text = '';
|
|
406
|
-
if (this.
|
|
418
|
+
if (this._delete) {
|
|
419
|
+
text = `DELETE FROM ${this._table}`;
|
|
420
|
+
}
|
|
421
|
+
else if (this._update) {
|
|
407
422
|
const sets = Object.entries(this._update)
|
|
408
423
|
.map(([k, v]) => `${k} = ${next(v)}`).join(', ');
|
|
409
424
|
text = `UPDATE ${this._table} SET ${sets}`;
|
|
@@ -413,6 +428,7 @@ export class QueryBuilder {
|
|
|
413
428
|
const allCols = [...this._selectFields, ...aggCols];
|
|
414
429
|
const cols = allCols.length ? allCols.join(', ') : '*';
|
|
415
430
|
text = `SELECT ${cols} FROM ${this._table}`;
|
|
431
|
+
text += this._buildJoinClausePg();
|
|
416
432
|
}
|
|
417
433
|
if (this._whereConditions.length) {
|
|
418
434
|
const where = this._whereConditions
|
|
@@ -472,7 +488,7 @@ export class QueryBuilder {
|
|
|
472
488
|
if (this._limitValue !== null) {
|
|
473
489
|
text += ` LIMIT ${this._limitValue}`;
|
|
474
490
|
}
|
|
475
|
-
if (this._forUpdate && !this._update) {
|
|
491
|
+
if (this._forUpdate && !this._update && !this._delete) {
|
|
476
492
|
text += ' FOR UPDATE';
|
|
477
493
|
if (this._forUpdate.skipLocked)
|
|
478
494
|
text += ' SKIP LOCKED';
|
|
@@ -482,6 +498,82 @@ export class QueryBuilder {
|
|
|
482
498
|
}
|
|
483
499
|
return { text, values };
|
|
484
500
|
}
|
|
501
|
+
// ---------------------------------------------------------------------------
|
|
502
|
+
// toPgSql() JOIN support — mirrors buildJoinClauses() in
|
|
503
|
+
// src/lib/sqlite/query-translator.ts (same INNER/LEFT support, same RIGHT
|
|
504
|
+
// JOIN rejection, same table/condition format rules) but emits Postgres SQL.
|
|
505
|
+
// toPgSql() does not quote identifiers anywhere else, so these helpers match
|
|
506
|
+
// that existing (lack of) quoting convention rather than introducing a new
|
|
507
|
+
// style; they still validate identifiers against _isSafeIdentifier/_isSafeAlias.
|
|
508
|
+
// ---------------------------------------------------------------------------
|
|
509
|
+
_buildJoinClausePg() {
|
|
510
|
+
if (!this._joins.length)
|
|
511
|
+
return '';
|
|
512
|
+
const clauses = this._joins.map((join) => {
|
|
513
|
+
const joinType = this._normalizeJoinTypePg(join.type);
|
|
514
|
+
const tableSql = this._formatJoinTargetPg(join.table);
|
|
515
|
+
const conditionSql = this._formatJoinConditionPg(join.on);
|
|
516
|
+
return `${joinType} ${tableSql} ON ${conditionSql}`;
|
|
517
|
+
});
|
|
518
|
+
return ` ${clauses.join(' ')}`;
|
|
519
|
+
}
|
|
520
|
+
_normalizeJoinTypePg(type) {
|
|
521
|
+
const normalized = type?.toString().toLowerCase() ?? 'inner';
|
|
522
|
+
if (normalized === 'inner')
|
|
523
|
+
return 'INNER JOIN';
|
|
524
|
+
if (normalized === 'left')
|
|
525
|
+
return 'LEFT JOIN';
|
|
526
|
+
if (normalized === 'right') {
|
|
527
|
+
throw new HazoValidationError({
|
|
528
|
+
code: 'HAZO_CONNECT_VALIDATION_ERROR',
|
|
529
|
+
pkg: 'hazo_connect',
|
|
530
|
+
message: 'toPgSql: RIGHT JOIN is not supported (matches the SQLite adapter); swap table order and use LEFT JOIN instead.'
|
|
531
|
+
});
|
|
532
|
+
}
|
|
533
|
+
throw new HazoValidationError({
|
|
534
|
+
code: 'HAZO_CONNECT_VALIDATION_ERROR',
|
|
535
|
+
pkg: 'hazo_connect',
|
|
536
|
+
message: `toPgSql: unsupported join type '${type}'`
|
|
537
|
+
});
|
|
538
|
+
}
|
|
539
|
+
_formatJoinTargetPg(target) {
|
|
540
|
+
const trimmed = target.trim();
|
|
541
|
+
const parts = trimmed.split(/\s+/);
|
|
542
|
+
if (parts.length === 1) {
|
|
543
|
+
if (!this._isSafeIdentifier(parts[0])) {
|
|
544
|
+
throw new HazoValidationError({ code: 'HAZO_CONNECT_VALIDATION_ERROR', pkg: 'hazo_connect', message: `toPgSql: invalid join table '${parts[0]}'` });
|
|
545
|
+
}
|
|
546
|
+
return parts[0];
|
|
547
|
+
}
|
|
548
|
+
if (parts.length === 2) {
|
|
549
|
+
if (!this._isSafeIdentifier(parts[0]) || !this._isSafeAlias(parts[1])) {
|
|
550
|
+
throw new HazoValidationError({ code: 'HAZO_CONNECT_VALIDATION_ERROR', pkg: 'hazo_connect', message: `toPgSql: invalid join table/alias '${target}'` });
|
|
551
|
+
}
|
|
552
|
+
return `${parts[0]} AS ${parts[1]}`;
|
|
553
|
+
}
|
|
554
|
+
if (parts.length === 3 && parts[1].toLowerCase() === 'as') {
|
|
555
|
+
if (!this._isSafeIdentifier(parts[0]) || !this._isSafeAlias(parts[2])) {
|
|
556
|
+
throw new HazoValidationError({ code: 'HAZO_CONNECT_VALIDATION_ERROR', pkg: 'hazo_connect', message: `toPgSql: invalid join table/alias '${target}'` });
|
|
557
|
+
}
|
|
558
|
+
return `${parts[0]} AS ${parts[2]}`;
|
|
559
|
+
}
|
|
560
|
+
throw new HazoValidationError({
|
|
561
|
+
code: 'HAZO_CONNECT_VALIDATION_ERROR',
|
|
562
|
+
pkg: 'hazo_connect',
|
|
563
|
+
message: `toPgSql: unsupported join table format '${target}'. Use 'table', 'table alias', or 'table AS alias'.`
|
|
564
|
+
});
|
|
565
|
+
}
|
|
566
|
+
_formatJoinConditionPg(condition) {
|
|
567
|
+
const parts = condition.split('=').map((p) => p.trim());
|
|
568
|
+
if (parts.length !== 2 || !parts[0] || !parts[1] || !this._isSafeIdentifier(parts[0]) || !this._isSafeIdentifier(parts[1])) {
|
|
569
|
+
throw new HazoValidationError({
|
|
570
|
+
code: 'HAZO_CONNECT_VALIDATION_ERROR',
|
|
571
|
+
pkg: 'hazo_connect',
|
|
572
|
+
message: `toPgSql: join conditions must be expressed as single-column equality (e.g. table_a.id = table_b.id). Received '${condition}'.`
|
|
573
|
+
});
|
|
574
|
+
}
|
|
575
|
+
return `${parts[0]} = ${parts[1]}`;
|
|
576
|
+
}
|
|
485
577
|
/**
|
|
486
578
|
* Get the table name
|
|
487
579
|
*/
|
|
@@ -536,6 +628,12 @@ export class QueryBuilder {
|
|
|
536
628
|
getNestedSelects() {
|
|
537
629
|
return this._nestedSelects;
|
|
538
630
|
}
|
|
631
|
+
/**
|
|
632
|
+
* Get the RETURNING clause columns set via returning(), if any.
|
|
633
|
+
*/
|
|
634
|
+
getReturning() {
|
|
635
|
+
return this._returning;
|
|
636
|
+
}
|
|
539
637
|
/**
|
|
540
638
|
* Clone the query builder
|
|
541
639
|
* @returns New QueryBuilder instance with same state
|
|
@@ -557,6 +655,7 @@ export class QueryBuilder {
|
|
|
557
655
|
cloned._forUpdate = this._forUpdate ? { ...this._forUpdate } : undefined;
|
|
558
656
|
cloned._returning = this._returning;
|
|
559
657
|
cloned._update = this._update ? { ...this._update } : undefined;
|
|
658
|
+
cloned._delete = this._delete;
|
|
560
659
|
cloned._onConflict = this._onConflict ? [...this._onConflict] : undefined;
|
|
561
660
|
if (this._onConflictAction) {
|
|
562
661
|
cloned._onConflictAction =
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query-builder.js","sourceRoot":"","sources":["../src/lib/query-builder.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"query-builder.js","sourceRoot":"","sources":["../src/lib/query-builder.ts"],"names":[],"mappings":"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"}
|
package/dist/server/index.d.ts
CHANGED
|
@@ -32,6 +32,8 @@ export { BetterSqlite3Adapter } from '../adapters/better-sqlite3-adapter.js';
|
|
|
32
32
|
export type { BetterSqlite3TransactionContext } from '../adapters/better-sqlite3-adapter.js';
|
|
33
33
|
export { SupabaseAdapter } from '../adapters/supabase-adapter.js';
|
|
34
34
|
export { FileAdapter } from '../adapters/file-adapter.js';
|
|
35
|
+
export { PgAdapter } from '../adapters/pg-adapter.js';
|
|
36
|
+
export type { PgAdapterConfig, PgTransactionContext, PgTransactionOptions } from '../adapters/pg-adapter.js';
|
|
35
37
|
export { getSqliteAdminService, initializeAdminService, registerSqliteAdapter, clearRegisteredAdapter } from '../sqlite/admin-service.js';
|
|
36
38
|
export { runMigrations } from '../migrations/runner.js';
|
|
37
39
|
export type { AppliedMigration, RunMigrationsOptions } from '../migrations/runner.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/server/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAkBH,YAAY,EACV,MAAM,EACN,QAAQ,EACR,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,WAAW,EACX,aAAa,EACb,eAAe,EACf,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,gBAAgB,EACjB,MAAM,aAAa,CAAA;AAEpB,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAC7F,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAGnF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAGjD,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAA;AACtB,YAAY,EACV,YAAY,EACZ,WAAW,EACX,kBAAkB,EAClB,sBAAsB,EACtB,WAAW,EACZ,MAAM,eAAe,CAAA;AAGtB,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAA;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAC7D,YAAY,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAA;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAA;AAC5E,YAAY,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAA;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/server/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAkBH,YAAY,EACV,MAAM,EACN,QAAQ,EACR,cAAc,EACd,iBAAiB,EACjB,kBAAkB,EAClB,iBAAiB,EACjB,aAAa,EACb,cAAc,EACd,WAAW,EACX,aAAa,EACb,eAAe,EACf,cAAc,EACd,QAAQ,EACR,YAAY,EACZ,gBAAgB,EACjB,MAAM,aAAa,CAAA;AAEpB,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAC7F,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAGnF,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAGlD,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAGjD,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAA;AACtB,YAAY,EACV,YAAY,EACZ,WAAW,EACX,kBAAkB,EAClB,sBAAsB,EACtB,WAAW,EACZ,MAAM,eAAe,CAAA;AAGtB,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAA;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAC7D,YAAY,EAAE,wBAAwB,EAAE,MAAM,+BAA+B,CAAA;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAA;AAC5E,YAAY,EAAE,+BAA+B,EAAE,MAAM,uCAAuC,CAAA;AAC5F,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AACrD,YAAY,EAAE,eAAe,EAAE,oBAAoB,EAAE,oBAAoB,EAAE,MAAM,2BAA2B,CAAA;AAG5G,OAAO,EACL,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,4BAA4B,CAAA;AAGnC,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AACvD,YAAY,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,yBAAyB,CAAA;AAGrF,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAGnD,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAA;AACxD,YAAY,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAA;AAGlD,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAGpF,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EACpB,KAAK,gBAAgB,EACtB,MAAM,8BAA8B,CAAA;AACrC,YAAY,EACV,kBAAkB,EAClB,eAAe,EACf,YAAY,EACZ,WAAW,EACX,WAAW,EACX,eAAe,EACf,OAAO,EACP,eAAe,EACf,iBAAiB,EACjB,oBAAoB,EACrB,MAAM,4BAA4B,CAAA;AAGnC,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,gCAAgC,CAAA;AACvC,YAAY,EAAE,oBAAoB,EAAE,MAAM,gCAAgC,CAAA;AAG1E,OAAO,EACL,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,gCAAgC,CAAA;AACvC,YAAY,EAAE,mBAAmB,EAAE,MAAM,gCAAgC,CAAA"}
|
package/dist/server/index.js
CHANGED
|
@@ -44,6 +44,7 @@ export { SqliteAdapter } from '../adapters/sqlite-adapter.js';
|
|
|
44
44
|
export { BetterSqlite3Adapter } from '../adapters/better-sqlite3-adapter.js';
|
|
45
45
|
export { SupabaseAdapter } from '../adapters/supabase-adapter.js';
|
|
46
46
|
export { FileAdapter } from '../adapters/file-adapter.js';
|
|
47
|
+
export { PgAdapter } from '../adapters/pg-adapter.js';
|
|
47
48
|
// Export SQLite admin helpers
|
|
48
49
|
export { getSqliteAdminService, initializeAdminService, registerSqliteAdapter, clearRegisteredAdapter } from '../sqlite/admin-service.js';
|
|
49
50
|
// Export migration runner
|
package/dist/server/index.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/server/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAE7C,SAAS,gBAAgB;IACvB,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAClC,MAAM,IAAI,iBAAiB,CAAC;YAC1B,IAAI,EAAE,8BAA8B;YACpC,GAAG,EAAE,cAAc;YACnB,OAAO,EAAE,mIAAmI;SAC7I,CAAC,CAAA;IACJ,CAAC;AACH,CAAC;AAED,sCAAsC;AACtC,gBAAgB,EAAE,CAAA;AAqBlB,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAC7F,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAEnF,uBAAuB;AACvB,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAElD,iBAAiB;AACjB,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAEjD,iBAAiB;AACjB,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAA;AAStB,uCAAuC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAA;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAE7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAA;AAE5E,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/lib/server/index.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;GAiBG;AAEH,OAAO,EAAE,iBAAiB,EAAE,MAAM,WAAW,CAAA;AAE7C,SAAS,gBAAgB;IACvB,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;QAClC,MAAM,IAAI,iBAAiB,CAAC;YAC1B,IAAI,EAAE,8BAA8B;YACpC,GAAG,EAAE,cAAc;YACnB,OAAO,EAAE,mIAAmI;SAC7I,CAAC,CAAA;IACJ,CAAC;AACH,CAAC;AAED,sCAAsC;AACtC,gBAAgB,EAAE,CAAA;AAqBlB,OAAO,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,aAAa,CAAA;AACnD,OAAO,EAAE,aAAa,EAAE,gBAAgB,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAA;AAC7F,OAAO,EAAE,qBAAqB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAEnF,uBAAuB;AACvB,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAElD,iBAAiB;AACjB,OAAO,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAA;AAEjD,iBAAiB;AACjB,OAAO,EACL,aAAa,EACb,iBAAiB,EACjB,gBAAgB,EAChB,YAAY,EACb,MAAM,eAAe,CAAA;AAStB,uCAAuC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AACzD,OAAO,EAAE,gBAAgB,EAAE,MAAM,kCAAkC,CAAA;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAA;AAE7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,uCAAuC,CAAA;AAE5E,OAAO,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AACjE,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,2BAA2B,CAAA;AAGrD,8BAA8B;AAC9B,OAAO,EACL,qBAAqB,EACrB,sBAAsB,EACtB,qBAAqB,EACrB,sBAAsB,EACvB,MAAM,4BAA4B,CAAA;AAEnC,0BAA0B;AAC1B,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AAGvD,gEAAgE;AAChE,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAA;AAEnD,+BAA+B;AAC/B,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,GAAG,EAAE,MAAM,oBAAoB,CAAA;AAGxD,6BAA6B;AAC7B,OAAO,EAAE,cAAc,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAA;AAEpF,4CAA4C;AAC5C,OAAO,EACL,oBAAoB,EACpB,oBAAoB,EAErB,MAAM,8BAA8B,CAAA;AAcrC,wBAAwB;AACxB,OAAO,EACL,cAAc,EACd,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,gCAAgC,CAAA;AAGvC,wBAAwB;AACxB,OAAO,EACL,cAAc,EACd,eAAe,EACf,gBAAgB,EAChB,gBAAgB,GACjB,MAAM,gCAAgC,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "hazo_connect",
|
|
3
|
-
"version": "4.0
|
|
3
|
+
"version": "4.1.0",
|
|
4
4
|
"description": "Module to connect to the data store (postgres via postgrest, supabase, etc)",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"main": "dist/index.js",
|
|
@@ -100,9 +100,9 @@
|
|
|
100
100
|
"neo4j-driver": "^5.14.0"
|
|
101
101
|
},
|
|
102
102
|
"peerDependencies": {
|
|
103
|
-
"hazo_config": "^2.4.
|
|
103
|
+
"hazo_config": "^2.4.3",
|
|
104
104
|
"hazo_core": "^2.0.0",
|
|
105
|
-
"hazo_ui": "^6.
|
|
105
|
+
"hazo_ui": "^6.9.0",
|
|
106
106
|
"lucide-react": "^0.553.0",
|
|
107
107
|
"next": "^14.0.0 || ^16.0.0",
|
|
108
108
|
"react": "^18.0.0 || ^19.0.0",
|
|
@@ -156,13 +156,13 @@
|
|
|
156
156
|
"@types/sql.js": "^1.4.9",
|
|
157
157
|
"eslint": "^8.57.0",
|
|
158
158
|
"eslint-config-next": "14.2.33",
|
|
159
|
-
"hazo_config": "^2.4.
|
|
159
|
+
"hazo_config": "^2.4.3",
|
|
160
160
|
"hazo_core": "^2.0.0",
|
|
161
161
|
"hazo_debug": "^3.2.0",
|
|
162
|
-
"hazo_logs": "^2.2.
|
|
162
|
+
"hazo_logs": "^2.2.1",
|
|
163
163
|
"ioredis": "^5.3.2",
|
|
164
164
|
"neo4j-driver": "^5.14.0",
|
|
165
|
-
"hazo_ui": "^6.
|
|
165
|
+
"hazo_ui": "^6.9.0",
|
|
166
166
|
"jest": "^30.2.0",
|
|
167
167
|
"jest-environment-node": "^30.2.0",
|
|
168
168
|
"lucide-react": "^0.553.0",
|