hazo_connect 3.10.1 → 4.0.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.
- package/CHANGE_LOG.md +97 -0
- package/README.md +21 -0
- package/dist/adapters/base-adapter.js +22 -24
- package/dist/adapters/base-adapter.js.map +1 -1
- package/dist/adapters/better-sqlite3-adapter.d.ts.map +1 -1
- package/dist/adapters/better-sqlite3-adapter.js +58 -82
- package/dist/adapters/better-sqlite3-adapter.js.map +1 -1
- package/dist/adapters/clause-builder.js +24 -36
- package/dist/adapters/clause-builder.js.map +1 -1
- package/dist/adapters/file-adapter.js +6 -10
- package/dist/adapters/file-adapter.js.map +1 -1
- package/dist/adapters/pg-adapter.js +16 -22
- package/dist/adapters/pg-adapter.js.map +1 -1
- package/dist/adapters/postgrest-adapter.js +31 -33
- package/dist/adapters/postgrest-adapter.js.map +1 -1
- package/dist/adapters/sqlite-adapter.js +71 -70
- package/dist/adapters/sqlite-adapter.js.map +1 -1
- package/dist/adapters/supabase-adapter.js +20 -23
- package/dist/adapters/supabase-adapter.js.map +1 -1
- package/dist/connect-config.js +39 -43
- package/dist/connect-config.js.map +1 -1
- package/dist/crypto/field-crypto.js +8 -14
- package/dist/crypto/field-crypto.js.map +1 -1
- package/dist/default-logger.js +10 -16
- package/dist/default-logger.js.map +1 -1
- package/dist/factory.js +24 -30
- package/dist/factory.js.map +1 -1
- package/dist/helpers.js +9 -15
- package/dist/helpers.js.map +1 -1
- package/dist/index.js +1 -2
- package/dist/index.js.map +1 -1
- package/dist/log-level-wrapper.d.ts +1 -1
- package/dist/log-level-wrapper.d.ts.map +1 -1
- package/dist/log-level-wrapper.js +2 -6
- package/dist/log-level-wrapper.js.map +1 -1
- package/dist/migrations/runner.js +13 -19
- package/dist/migrations/runner.js.map +1 -1
- package/dist/nextjs/api-route-helpers.d.ts.map +1 -1
- package/dist/nextjs/api-route-helpers.js +10 -21
- package/dist/nextjs/api-route-helpers.js.map +1 -1
- package/dist/nextjs/index.d.ts.map +1 -1
- package/dist/nextjs/index.js +4 -34
- package/dist/nextjs/index.js.map +1 -1
- package/dist/nextjs/route-setup.js +32 -39
- package/dist/nextjs/route-setup.js.map +1 -1
- package/dist/nextjs/server-only.d.ts.map +1 -1
- package/dist/nextjs/server-only.js +3 -26
- package/dist/nextjs/server-only.js.map +1 -1
- package/dist/nextjs/setup-helpers.d.ts.map +1 -1
- package/dist/nextjs/setup-helpers.js +20 -36
- package/dist/nextjs/setup-helpers.js.map +1 -1
- package/dist/providers/index.js +2 -12
- package/dist/providers/index.js.map +1 -1
- package/dist/providers/neo4j-provider.js +15 -54
- package/dist/providers/neo4j-provider.js.map +1 -1
- package/dist/providers/redis-provider.js +13 -51
- package/dist/providers/redis-provider.js.map +1 -1
- package/dist/query-builder.d.ts +1 -1
- package/dist/query-builder.d.ts.map +1 -1
- package/dist/query-builder.js +33 -34
- package/dist/query-builder.js.map +1 -1
- package/dist/server/index.d.ts +14 -2
- package/dist/server/index.d.ts.map +1 -1
- package/dist/server/index.js +35 -73
- package/dist/server/index.js.map +1 -1
- package/dist/sqlite/admin-service.d.ts +3 -3
- package/dist/sqlite/admin-service.d.ts.map +1 -1
- package/dist/sqlite/admin-service.js +44 -53
- package/dist/sqlite/admin-service.js.map +1 -1
- package/dist/sqlite/placeholder-rewrite.js +5 -9
- package/dist/sqlite/placeholder-rewrite.js.map +1 -1
- package/dist/sqlite/query-translator.d.ts +1 -1
- package/dist/sqlite/query-translator.d.ts.map +1 -1
- package/dist/sqlite/query-translator.js +14 -22
- package/dist/sqlite/query-translator.js.map +1 -1
- package/dist/testing/index.js +1 -7
- package/dist/testing/index.js.map +1 -1
- package/dist/types.js +3 -6
- package/dist/types.js.map +1 -1
- package/dist/ui/components/sqlite-admin-client.js +48 -51
- package/dist/ui/components/sqlite-admin-client.js.map +1 -1
- package/dist/ui/index.js +2 -10
- package/dist/ui/index.js.map +1 -1
- package/dist/utils/assertions.js +8 -12
- package/dist/utils/assertions.js.map +1 -1
- package/dist/utils/config-validator.js +2 -6
- package/dist/utils/config-validator.js.map +1 -1
- package/dist/utils/database-url.js +4 -10
- package/dist/utils/database-url.js.map +1 -1
- package/dist/utils/jsonb.js +1 -4
- package/dist/utils/jsonb.js.map +1 -1
- package/dist/utils/result.js +3 -8
- package/dist/utils/result.js.map +1 -1
- package/dist/utils/sqlite-utils.js +10 -18
- package/dist/utils/sqlite-utils.js.map +1 -1
- package/dist/utils/wasm-resolver.d.ts.map +1 -1
- package/dist/utils/wasm-resolver.js +58 -57
- package/dist/utils/wasm-resolver.js.map +1 -1
- package/dist/utils/where-builder.d.ts +1 -1
- package/dist/utils/where-builder.d.ts.map +1 -1
- package/dist/utils/where-builder.js +14 -19
- package/dist/utils/where-builder.js.map +1 -1
- package/docs/migration-guide.md +36 -0
- package/docs/troubleshooting.md +42 -0
- package/package.json +17 -16
- package/scripts/{postinstall-setup.js → postinstall-setup.cjs} +1 -1
- /package/scripts/{setup-routes.js → setup-routes.cjs} +0 -0
|
@@ -1,36 +1,24 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/**
|
|
3
2
|
* Shared serialization helpers for the claimRows primitive.
|
|
4
3
|
* Pure functions; no I/O. Used by Pg, Postgrest, and Sqlite adapters.
|
|
5
4
|
*/
|
|
6
|
-
|
|
7
|
-
exports.isNowSentinel = isNowSentinel;
|
|
8
|
-
exports.validateColumnName = validateColumnName;
|
|
9
|
-
exports.validateOperator = validateOperator;
|
|
10
|
-
exports.resolveNowSentinel = resolveNowSentinel;
|
|
11
|
-
exports.serializeWhereToPostgrest = serializeWhereToPostgrest;
|
|
12
|
-
exports.serializeWhereToPgSql = serializeWhereToPgSql;
|
|
13
|
-
exports.serializeSetToPgSql = serializeSetToPgSql;
|
|
14
|
-
exports.serializeSetToPostgrestBody = serializeSetToPostgrestBody;
|
|
15
|
-
exports.incrementedColumns = incrementedColumns;
|
|
16
|
-
exports.validateClaimRowsOptions = validateClaimRowsOptions;
|
|
17
|
-
const hazo_core_1 = require("hazo_core");
|
|
5
|
+
import { HazoValidationError } from 'hazo_core';
|
|
18
6
|
const COLUMN_NAME_RE = /^[a-zA-Z_][a-zA-Z0-9_]*$/;
|
|
19
7
|
const ALLOWED_OPS = new Set(["eq", "lte", "gte", "lt", "gt", "in", "increment", "$now"]);
|
|
20
|
-
function isNowSentinel(v) {
|
|
8
|
+
export function isNowSentinel(v) {
|
|
21
9
|
return typeof v === "object" && v !== null && "$now" in v && v.$now === true;
|
|
22
10
|
}
|
|
23
|
-
function validateColumnName(name) {
|
|
11
|
+
export function validateColumnName(name) {
|
|
24
12
|
if (!COLUMN_NAME_RE.test(name)) {
|
|
25
|
-
throw new
|
|
13
|
+
throw new HazoValidationError({ code: 'HAZO_CONNECT_VALIDATION_ERROR', pkg: 'hazo_connect', message: `invalid column name: ${JSON.stringify(name)}` });
|
|
26
14
|
}
|
|
27
15
|
}
|
|
28
|
-
function validateOperator(op) {
|
|
16
|
+
export function validateOperator(op) {
|
|
29
17
|
if (!ALLOWED_OPS.has(op)) {
|
|
30
|
-
throw new
|
|
18
|
+
throw new HazoValidationError({ code: 'HAZO_CONNECT_VALIDATION_ERROR', pkg: 'hazo_connect', message: `unknown operator: ${JSON.stringify(op)}` });
|
|
31
19
|
}
|
|
32
20
|
}
|
|
33
|
-
function resolveNowSentinel(v, dialect) {
|
|
21
|
+
export function resolveNowSentinel(v, dialect) {
|
|
34
22
|
if (!isNowSentinel(v))
|
|
35
23
|
return { kind: "literal", value: v };
|
|
36
24
|
if (dialect === "pg")
|
|
@@ -46,7 +34,7 @@ function asOperator(v) {
|
|
|
46
34
|
if (keys.length === 0)
|
|
47
35
|
return null;
|
|
48
36
|
if (keys.length > 1) {
|
|
49
|
-
throw new
|
|
37
|
+
throw new HazoValidationError({ code: 'HAZO_CONNECT_VALIDATION_ERROR', pkg: 'hazo_connect', message: `multiple operators in single clause not supported: ${keys.join(", ")}` });
|
|
50
38
|
}
|
|
51
39
|
const op = keys[0];
|
|
52
40
|
return { op, value: v[op] };
|
|
@@ -58,7 +46,7 @@ function isNotNullSentinel(v) {
|
|
|
58
46
|
"isNotNull" in v &&
|
|
59
47
|
v.isNotNull === true);
|
|
60
48
|
}
|
|
61
|
-
function serializeWhereToPostgrest(where) {
|
|
49
|
+
export function serializeWhereToPostgrest(where) {
|
|
62
50
|
const out = {};
|
|
63
51
|
for (const [col, raw] of Object.entries(where)) {
|
|
64
52
|
validateColumnName(col);
|
|
@@ -74,11 +62,11 @@ function serializeWhereToPostgrest(where) {
|
|
|
74
62
|
if (opObj) {
|
|
75
63
|
if (opObj.op === "in") {
|
|
76
64
|
if (!Array.isArray(opObj.value))
|
|
77
|
-
throw new
|
|
65
|
+
throw new HazoValidationError({ code: 'HAZO_CONNECT_VALIDATION_ERROR', pkg: 'hazo_connect', message: `in clause requires array for column ${col}` });
|
|
78
66
|
for (const v of opObj.value) {
|
|
79
67
|
const s = String(v);
|
|
80
68
|
if (s.includes(",") || s.includes("(") || s.includes(")")) {
|
|
81
|
-
throw new
|
|
69
|
+
throw new HazoValidationError({ code: 'HAZO_CONNECT_VALIDATION_ERROR', pkg: 'hazo_connect', message: `in clause value contains reserved PostgREST chars (, ( )) — column ${col}` });
|
|
82
70
|
}
|
|
83
71
|
}
|
|
84
72
|
out[col] = `in.(${opObj.value.map(String).join(",")})`;
|
|
@@ -86,7 +74,7 @@ function serializeWhereToPostgrest(where) {
|
|
|
86
74
|
else {
|
|
87
75
|
const resolved = resolveNowSentinel(opObj.value, "postgrest");
|
|
88
76
|
if (resolved.kind === "sql")
|
|
89
|
-
throw new
|
|
77
|
+
throw new HazoValidationError({ code: 'HAZO_CONNECT_VALIDATION_ERROR', pkg: 'hazo_connect', message: "postgrest path cannot use sql sentinel" });
|
|
90
78
|
out[col] = `${opObj.op}.${String(resolved.value)}`;
|
|
91
79
|
}
|
|
92
80
|
}
|
|
@@ -101,7 +89,7 @@ function serializeWhereToPostgrest(where) {
|
|
|
101
89
|
const PG_OP_SQL = {
|
|
102
90
|
lte: "<=", gte: ">=", lt: "<", gt: ">", eq: "=",
|
|
103
91
|
};
|
|
104
|
-
function serializeWhereToPgSql(where, startIndex) {
|
|
92
|
+
export function serializeWhereToPgSql(where, startIndex) {
|
|
105
93
|
const parts = [];
|
|
106
94
|
const params = [];
|
|
107
95
|
let idx = startIndex;
|
|
@@ -119,7 +107,7 @@ function serializeWhereToPgSql(where, startIndex) {
|
|
|
119
107
|
if (opObj) {
|
|
120
108
|
if (opObj.op === "in") {
|
|
121
109
|
if (!Array.isArray(opObj.value))
|
|
122
|
-
throw new
|
|
110
|
+
throw new HazoValidationError({ code: 'HAZO_CONNECT_VALIDATION_ERROR', pkg: 'hazo_connect', message: `in clause requires array for column ${col}` });
|
|
123
111
|
const slots = opObj.value.map(() => `$${idx++}`);
|
|
124
112
|
params.push(...opObj.value);
|
|
125
113
|
parts.push(`${col} IN (${slots.join(", ")})`);
|
|
@@ -148,7 +136,7 @@ function serializeWhereToPgSql(where, startIndex) {
|
|
|
148
136
|
}
|
|
149
137
|
return { fragment: parts.join(" AND "), params, nextParamIndex: idx };
|
|
150
138
|
}
|
|
151
|
-
function serializeSetToPgSql(set, startIndex) {
|
|
139
|
+
export function serializeSetToPgSql(set, startIndex) {
|
|
152
140
|
const parts = [];
|
|
153
141
|
const params = [];
|
|
154
142
|
let idx = startIndex;
|
|
@@ -157,7 +145,7 @@ function serializeSetToPgSql(set, startIndex) {
|
|
|
157
145
|
if (typeof raw === "object" && raw !== null && "increment" in raw) {
|
|
158
146
|
const n = raw.increment;
|
|
159
147
|
if (typeof n !== "number" || !Number.isFinite(n))
|
|
160
|
-
throw new
|
|
148
|
+
throw new HazoValidationError({ code: 'HAZO_CONNECT_VALIDATION_ERROR', pkg: 'hazo_connect', message: `increment must be a finite number for column ${col}` });
|
|
161
149
|
parts.push(`${col} = ${col} + ${n}`);
|
|
162
150
|
continue;
|
|
163
151
|
}
|
|
@@ -172,18 +160,18 @@ function serializeSetToPgSql(set, startIndex) {
|
|
|
172
160
|
}
|
|
173
161
|
return { fragment: parts.join(", "), params, nextParamIndex: idx };
|
|
174
162
|
}
|
|
175
|
-
function serializeSetToPostgrestBody(set, observed) {
|
|
163
|
+
export function serializeSetToPostgrestBody(set, observed) {
|
|
176
164
|
const out = {};
|
|
177
165
|
for (const [col, raw] of Object.entries(set)) {
|
|
178
166
|
validateColumnName(col);
|
|
179
167
|
if (typeof raw === "object" && raw !== null && "increment" in raw) {
|
|
180
168
|
const n = raw.increment;
|
|
181
169
|
if (typeof n !== "number" || !Number.isFinite(n))
|
|
182
|
-
throw new
|
|
170
|
+
throw new HazoValidationError({ code: 'HAZO_CONNECT_VALIDATION_ERROR', pkg: 'hazo_connect', message: `increment must be a finite number for column ${col}` });
|
|
183
171
|
const current = observed[col];
|
|
184
172
|
if (typeof current !== "number") {
|
|
185
173
|
const display = current === null ? "null" : typeof current;
|
|
186
|
-
throw new
|
|
174
|
+
throw new HazoValidationError({ code: 'HAZO_CONNECT_VALIDATION_ERROR', pkg: 'hazo_connect', message: `increment on ${col} requires observed numeric value (got ${display})` });
|
|
187
175
|
}
|
|
188
176
|
out[col] = current + n;
|
|
189
177
|
continue;
|
|
@@ -194,7 +182,7 @@ function serializeSetToPostgrestBody(set, observed) {
|
|
|
194
182
|
return out;
|
|
195
183
|
}
|
|
196
184
|
/** Columns the caller incremented — needed for CAS witnesses on PostgrestAdapter. */
|
|
197
|
-
function incrementedColumns(set) {
|
|
185
|
+
export function incrementedColumns(set) {
|
|
198
186
|
return Object.entries(set)
|
|
199
187
|
.filter(([_, v]) => typeof v === "object" && v !== null && "increment" in v)
|
|
200
188
|
.map(([col]) => col);
|
|
@@ -208,15 +196,15 @@ function incrementedColumns(set) {
|
|
|
208
196
|
* here because the helper lives in clause-builder which doesn't import
|
|
209
197
|
* from types.ts (avoids circular import risk).
|
|
210
198
|
*/
|
|
211
|
-
function validateClaimRowsOptions(opts) {
|
|
199
|
+
export function validateClaimRowsOptions(opts) {
|
|
212
200
|
if (Object.keys(opts.where).length === 0) {
|
|
213
|
-
throw new
|
|
201
|
+
throw new HazoValidationError({ code: 'HAZO_CONNECT_VALIDATION_ERROR', pkg: 'hazo_connect', message: 'claimRows: where must contain at least one condition' });
|
|
214
202
|
}
|
|
215
203
|
if (Object.keys(opts.set).length === 0) {
|
|
216
|
-
throw new
|
|
204
|
+
throw new HazoValidationError({ code: 'HAZO_CONNECT_VALIDATION_ERROR', pkg: 'hazo_connect', message: 'claimRows: set must contain at least one field' });
|
|
217
205
|
}
|
|
218
206
|
if (opts.returning !== undefined && opts.returning.length === 0) {
|
|
219
|
-
throw new
|
|
207
|
+
throw new HazoValidationError({ code: 'HAZO_CONNECT_VALIDATION_ERROR', pkg: 'hazo_connect', message: 'claimRows: returning must contain at least one column (or omit for default *)' });
|
|
220
208
|
}
|
|
221
209
|
}
|
|
222
210
|
//# sourceMappingURL=clause-builder.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"clause-builder.js","sourceRoot":"","sources":["../../src/lib/adapters/clause-builder.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"clause-builder.js","sourceRoot":"","sources":["../../src/lib/adapters/clause-builder.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/**
|
|
3
2
|
* Purpose: File-based storage adapter stub
|
|
4
3
|
*
|
|
@@ -14,14 +13,12 @@
|
|
|
14
13
|
* }
|
|
15
14
|
* }
|
|
16
15
|
*/
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
const base_adapter_js_1 = require("./base-adapter.js");
|
|
20
|
-
const types_js_1 = require("../types.js");
|
|
16
|
+
import { BaseAdapter } from './base-adapter.js';
|
|
17
|
+
import { ErrorCode } from '../types.js';
|
|
21
18
|
/**
|
|
22
19
|
* File adapter implementation (stub)
|
|
23
20
|
*/
|
|
24
|
-
class FileAdapter extends
|
|
21
|
+
export class FileAdapter extends BaseAdapter {
|
|
25
22
|
/**
|
|
26
23
|
* Constructor
|
|
27
24
|
* @param config - File storage configuration
|
|
@@ -39,7 +36,7 @@ class FileAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
39
36
|
* @returns Promise with query results
|
|
40
37
|
*/
|
|
41
38
|
async query(builder, method = 'GET', body) {
|
|
42
|
-
this.throwError(
|
|
39
|
+
this.throwError(ErrorCode.NOT_IMPLEMENTED, 'File adapter is not yet implemented. Please use PostgREST adapter for now.');
|
|
43
40
|
}
|
|
44
41
|
/**
|
|
45
42
|
* Execute a raw query
|
|
@@ -48,7 +45,7 @@ class FileAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
48
45
|
* @returns Promise with query results
|
|
49
46
|
*/
|
|
50
47
|
async rawQuery(endpoint, options = {}) {
|
|
51
|
-
this.throwError(
|
|
48
|
+
this.throwError(ErrorCode.NOT_IMPLEMENTED, 'File adapter is not yet implemented. Please use PostgREST adapter for now.');
|
|
52
49
|
}
|
|
53
50
|
/**
|
|
54
51
|
* Get the adapter's configuration
|
|
@@ -58,8 +55,7 @@ class FileAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
58
55
|
return Promise.resolve(this.config.file || this.config);
|
|
59
56
|
}
|
|
60
57
|
async claimRows(_opts) {
|
|
61
|
-
this.throwError(
|
|
58
|
+
this.throwError(ErrorCode.NOT_IMPLEMENTED, "FileAdapter.claimRows: not supported by file backend");
|
|
62
59
|
}
|
|
63
60
|
}
|
|
64
|
-
exports.FileAdapter = FileAdapter;
|
|
65
61
|
//# sourceMappingURL=file-adapter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"file-adapter.js","sourceRoot":"","sources":["../../src/lib/adapters/file-adapter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"file-adapter.js","sourceRoot":"","sources":["../../src/lib/adapters/file-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAGH,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAE/C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC;;GAEG;AACH,MAAM,OAAO,WAAY,SAAQ,WAAW;IAC1C;;;;OAIG;IACH,YAAY,MAAW,EAAE,MAAe;QACtC,KAAK,CAAC,MAAM,EAAE,MAAM,CAAC,CAAA;QACrB,8CAA8C;IAChD,CAAC;IAED;;;;;;OAMG;IACH,KAAK,CAAC,KAAK,CACT,OAAqB,EACrB,SAAsD,KAAK,EAC3D,IAAU;QAEV,IAAI,CAAC,UAAU,CACb,SAAS,CAAC,eAAe,EACzB,4EAA4E,CAC7E,CAAA;IACH,CAAC;IAED;;;;;OAKG;IACH,KAAK,CAAC,QAAQ,CAAC,QAAgB,EAAE,UAAuB,EAAE;QACxD,IAAI,CAAC,UAAU,CACb,SAAS,CAAC,eAAe,EACzB,4EAA4E,CAC7E,CAAA;IACH,CAAC;IAED;;;OAGG;IACH,KAAK,CAAC,SAAS;QACb,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,CAAC,CAAA;IACzD,CAAC;IAED,KAAK,CAAC,SAAS,CAA8B,KAAuB;QAClE,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC,eAAe,EAAE,sDAAsD,CAAC,CAAA;IACpG,CAAC;CACF"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/**
|
|
3
2
|
* Purpose: PostgreSQL adapter powered by the `postgres` (postgres.js) driver.
|
|
4
3
|
*
|
|
@@ -7,15 +6,10 @@
|
|
|
7
6
|
* does not expose. The query(builder) method intentionally throws until Task 1.3
|
|
8
7
|
* adds toPgSql() to the QueryBuilder.
|
|
9
8
|
*/
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
};
|
|
13
|
-
|
|
14
|
-
exports.PgAdapter = void 0;
|
|
15
|
-
const postgres_1 = __importDefault(require("postgres"));
|
|
16
|
-
const base_adapter_js_1 = require("./base-adapter.js");
|
|
17
|
-
const types_js_1 = require("../types.js");
|
|
18
|
-
const clause_builder_js_1 = require("./clause-builder.js");
|
|
9
|
+
import postgres from 'postgres';
|
|
10
|
+
import { BaseAdapter } from './base-adapter.js';
|
|
11
|
+
import { ErrorCode } from '../types.js';
|
|
12
|
+
import { serializeWhereToPgSql, serializeSetToPgSql, validateColumnName, validateClaimRowsOptions, } from './clause-builder.js';
|
|
19
13
|
// Safe identifier: letters, digits, underscores only, must start with letter or underscore.
|
|
20
14
|
const IDENT_RE = /^[A-Za-z_][A-Za-z0-9_]*$/;
|
|
21
15
|
function quoteIdent(id) {
|
|
@@ -23,11 +17,12 @@ function quoteIdent(id) {
|
|
|
23
17
|
throw new Error(`PgAdapter: invalid identifier: ${JSON.stringify(id)}`);
|
|
24
18
|
return `"${id}"`;
|
|
25
19
|
}
|
|
26
|
-
class PgAdapter extends
|
|
20
|
+
export class PgAdapter extends BaseAdapter {
|
|
21
|
+
sql;
|
|
27
22
|
constructor(config, logger) {
|
|
28
23
|
super(config, logger);
|
|
29
24
|
this.validateConfig(['connectionString']);
|
|
30
|
-
this.sql = (
|
|
25
|
+
this.sql = postgres(config.connectionString, {
|
|
31
26
|
max: config.poolMax ?? 10,
|
|
32
27
|
ssl: config.ssl ?? false,
|
|
33
28
|
onnotice: () => { },
|
|
@@ -41,11 +36,11 @@ class PgAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
41
36
|
*/
|
|
42
37
|
async query(builder, method = 'GET', body) {
|
|
43
38
|
if (method !== 'POST') {
|
|
44
|
-
this.throwError(
|
|
39
|
+
this.throwError(ErrorCode.NOT_IMPLEMENTED, 'PgAdapter.query: only POST (INSERT/upsert) is implemented; use raw() for other operations');
|
|
45
40
|
}
|
|
46
41
|
const table = builder.getTable();
|
|
47
42
|
if (!table) {
|
|
48
|
-
this.throwError(
|
|
43
|
+
this.throwError(ErrorCode.NOT_IMPLEMENTED, 'PgAdapter.query: builder must have a table set');
|
|
49
44
|
}
|
|
50
45
|
// Normalise body to array of row objects.
|
|
51
46
|
const rows = !body
|
|
@@ -104,7 +99,7 @@ class PgAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
104
99
|
* Satisfies the HazoConnectAdapter interface — use raw() for direct SQL.
|
|
105
100
|
*/
|
|
106
101
|
async rawQuery(_endpoint, _options) {
|
|
107
|
-
this.throwError(
|
|
102
|
+
this.throwError(ErrorCode.NOT_IMPLEMENTED, 'PgAdapter.rawQuery: not supported — use raw() for direct SQL execution');
|
|
108
103
|
}
|
|
109
104
|
/**
|
|
110
105
|
* Execute a raw SQL statement with positional parameters.
|
|
@@ -135,21 +130,21 @@ class PgAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
135
130
|
* @returns Array of updated row objects (empty when no rows match)
|
|
136
131
|
*/
|
|
137
132
|
async claimRows(opts) {
|
|
138
|
-
|
|
139
|
-
|
|
133
|
+
validateClaimRowsOptions(opts);
|
|
134
|
+
validateColumnName(opts.table);
|
|
140
135
|
const returning = (opts.returning ?? ['*']).map((c) => {
|
|
141
136
|
if (c !== '*')
|
|
142
|
-
|
|
137
|
+
validateColumnName(c);
|
|
143
138
|
return c;
|
|
144
139
|
});
|
|
145
140
|
if (opts.orderBy)
|
|
146
|
-
|
|
141
|
+
validateColumnName(opts.orderBy.column);
|
|
147
142
|
const limit = opts.limit ?? 1;
|
|
148
|
-
const whereFrag =
|
|
143
|
+
const whereFrag = serializeWhereToPgSql(opts.where, 1);
|
|
149
144
|
const orderByClause = opts.orderBy
|
|
150
145
|
? `ORDER BY ${opts.orderBy.column} ${opts.orderBy.direction.toUpperCase()}`
|
|
151
146
|
: '';
|
|
152
|
-
const setFrag =
|
|
147
|
+
const setFrag = serializeSetToPgSql(opts.set, whereFrag.nextParamIndex);
|
|
153
148
|
const sql = `
|
|
154
149
|
WITH claimed AS (
|
|
155
150
|
SELECT id FROM ${opts.table}
|
|
@@ -181,5 +176,4 @@ class PgAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
181
176
|
return { ...this.config };
|
|
182
177
|
}
|
|
183
178
|
}
|
|
184
|
-
exports.PgAdapter = PgAdapter;
|
|
185
179
|
//# sourceMappingURL=pg-adapter.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg-adapter.js","sourceRoot":"","sources":["../../src/lib/adapters/pg-adapter.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"pg-adapter.js","sourceRoot":"","sources":["../../src/lib/adapters/pg-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,3 @@
|
|
|
1
|
-
"use strict";
|
|
2
1
|
/**
|
|
3
2
|
* Purpose: PostgREST adapter implementation
|
|
4
3
|
*
|
|
@@ -6,17 +5,17 @@
|
|
|
6
5
|
* Uses injected config and logger (no file reading or project dependencies).
|
|
7
6
|
* Zero dependencies - only Node.js built-ins (fetch) and types.
|
|
8
7
|
*/
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
const types_js_1 = require("../types.js");
|
|
15
|
-
const clause_builder_js_1 = require("./clause-builder.js");
|
|
8
|
+
import { HazoUnavailableError, fetchWithRequestId } from 'hazo_core';
|
|
9
|
+
import { encryptBody, decryptRows, tableFromEndpoint } from '../crypto/field-crypto.js';
|
|
10
|
+
import { BaseAdapter } from './base-adapter.js';
|
|
11
|
+
import { ErrorCode as EC } from '../types.js';
|
|
12
|
+
import { incrementedColumns, serializeSetToPostgrestBody, serializeWhereToPostgrest, validateClaimRowsOptions, validateColumnName, } from './clause-builder.js';
|
|
16
13
|
/**
|
|
17
14
|
* PostgREST adapter implementation
|
|
18
15
|
*/
|
|
19
|
-
class PostgrestAdapter extends
|
|
16
|
+
export class PostgrestAdapter extends BaseAdapter {
|
|
17
|
+
postgrestConfig;
|
|
18
|
+
fieldCrypto;
|
|
20
19
|
/**
|
|
21
20
|
* Constructor
|
|
22
21
|
* @param config - PostgREST configuration (must include postgrest.base_url and postgrest.api_key)
|
|
@@ -30,7 +29,7 @@ class PostgrestAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
30
29
|
this.fieldCrypto = config.fieldCrypto;
|
|
31
30
|
// Validate required fields in postgrestConfig, not the main config
|
|
32
31
|
if (!this.postgrestConfig.base_url || !this.postgrestConfig.api_key) {
|
|
33
|
-
this.throwError(
|
|
32
|
+
this.throwError(EC.CONFIG_ERROR, 'PostgREST base_url and api_key are required in configuration');
|
|
34
33
|
}
|
|
35
34
|
// Ensure base_url doesn't end with /
|
|
36
35
|
if (this.postgrestConfig.base_url.endsWith('/')) {
|
|
@@ -45,11 +44,11 @@ class PostgrestAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
45
44
|
// PostgREST does not support SQL-style JOINs - use nested selects instead
|
|
46
45
|
const joins = builder.getJoins();
|
|
47
46
|
if (joins.length > 0) {
|
|
48
|
-
this.throwError(
|
|
47
|
+
this.throwError(EC.VALIDATION_ERROR, 'PostgREST adapter does not support SQL-style JOINs. Use nestedSelect() instead for related data.');
|
|
49
48
|
}
|
|
50
49
|
// PostgREST cannot give SQLite-parity aggregation; reject aggregate/GROUP BY/HAVING queries.
|
|
51
50
|
if (builder.getAggregates().length > 0 || builder.getGroupBy().length > 0 || builder.getHaving().length > 0) {
|
|
52
|
-
this.throwError(
|
|
51
|
+
this.throwError(EC.VALIDATION_ERROR, 'PostgREST adapter does not support aggregate/GROUP BY/HAVING queries. Use the pg or sqlite backend for grouped aggregation.');
|
|
53
52
|
}
|
|
54
53
|
}
|
|
55
54
|
/**
|
|
@@ -60,7 +59,7 @@ class PostgrestAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
60
59
|
buildPostgrestUrl(builder) {
|
|
61
60
|
const table = builder.getTable();
|
|
62
61
|
if (!table) {
|
|
63
|
-
this.throwError(
|
|
62
|
+
this.throwError(EC.VALIDATION_ERROR, 'Table name is required');
|
|
64
63
|
}
|
|
65
64
|
// Validate QueryBuilder doesn't use unsupported features
|
|
66
65
|
this.validateQueryBuilder(builder);
|
|
@@ -210,11 +209,11 @@ class PostgrestAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
210
209
|
(options.method === 'POST' || options.method === 'PATCH') &&
|
|
211
210
|
typeof options.body === 'string' &&
|
|
212
211
|
options.body.length > 0) {
|
|
213
|
-
const table =
|
|
212
|
+
const table = tableFromEndpoint(endpoint);
|
|
214
213
|
if (table && this.fieldCrypto.fields[table]) {
|
|
215
214
|
try {
|
|
216
215
|
const parsed = JSON.parse(options.body);
|
|
217
|
-
const encrypted = await
|
|
216
|
+
const encrypted = await encryptBody(table, parsed, endpoint, this.fieldCrypto);
|
|
218
217
|
options = { ...options, body: JSON.stringify(encrypted) };
|
|
219
218
|
}
|
|
220
219
|
catch {
|
|
@@ -234,7 +233,7 @@ class PostgrestAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
234
233
|
hasBody: !!options.body
|
|
235
234
|
});
|
|
236
235
|
try {
|
|
237
|
-
const response = await
|
|
236
|
+
const response = await fetchWithRequestId(url, { ...options, headers });
|
|
238
237
|
if (!response.ok) {
|
|
239
238
|
const errorData = await response.text();
|
|
240
239
|
const parsedDetails = this.parseErrorPayload(errorData);
|
|
@@ -270,7 +269,7 @@ class PostgrestAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
270
269
|
url: sanitizedUrl
|
|
271
270
|
});
|
|
272
271
|
}
|
|
273
|
-
this.throwError(
|
|
272
|
+
this.throwError(EC.QUERY_ERROR, friendlyMessage, response.status, parsedDetails ?? errorData);
|
|
274
273
|
}
|
|
275
274
|
// Handle empty response
|
|
276
275
|
const responseBody = await response.text();
|
|
@@ -287,9 +286,9 @@ class PostgrestAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
287
286
|
// --- Decrypt seam ---
|
|
288
287
|
// Decrypt configured columns in responses before returning to the caller.
|
|
289
288
|
if (this.fieldCrypto) {
|
|
290
|
-
const table =
|
|
289
|
+
const table = tableFromEndpoint(endpoint);
|
|
291
290
|
if (table && this.fieldCrypto.fields[table]) {
|
|
292
|
-
return
|
|
291
|
+
return decryptRows(table, parsedData, this.fieldCrypto);
|
|
293
292
|
}
|
|
294
293
|
}
|
|
295
294
|
return parsedData;
|
|
@@ -309,13 +308,13 @@ class PostgrestAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
309
308
|
url: sanitizedUrl,
|
|
310
309
|
cause: error?.cause?.code || error?.code || error?.message || String(error),
|
|
311
310
|
});
|
|
312
|
-
this.throwError(
|
|
311
|
+
this.throwError(EC.CONNECTION_FAILED, `Cannot reach PostgREST at ${this.postgrestConfig.base_url} (${reason}). ${hint}`, undefined, error);
|
|
313
312
|
}
|
|
314
313
|
// Re-throw with error code if not already set
|
|
315
314
|
if (error.code) {
|
|
316
315
|
throw error;
|
|
317
316
|
}
|
|
318
|
-
this.throwError(
|
|
317
|
+
this.throwError(EC.QUERY_ERROR, `PostgREST request error: ${error.message || String(error)}`, undefined, error);
|
|
319
318
|
}
|
|
320
319
|
}
|
|
321
320
|
/**
|
|
@@ -373,18 +372,18 @@ class PostgrestAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
373
372
|
* If neither condition holds, concurrent claims may both succeed.
|
|
374
373
|
*/
|
|
375
374
|
async claimRows(opts) {
|
|
376
|
-
|
|
377
|
-
|
|
375
|
+
validateClaimRowsOptions(opts);
|
|
376
|
+
validateColumnName(opts.table);
|
|
378
377
|
const returning = (opts.returning ?? ['*']).map((col) => {
|
|
379
378
|
if (col !== '*')
|
|
380
|
-
|
|
379
|
+
validateColumnName(col);
|
|
381
380
|
return col;
|
|
382
381
|
});
|
|
383
382
|
if (opts.orderBy)
|
|
384
|
-
|
|
383
|
+
validateColumnName(opts.orderBy.column);
|
|
385
384
|
const limit = opts.limit ?? 1;
|
|
386
|
-
const incCols =
|
|
387
|
-
const whereParams =
|
|
385
|
+
const incCols = incrementedColumns(opts.set);
|
|
386
|
+
const whereParams = serializeWhereToPostgrest(opts.where);
|
|
388
387
|
// Always fetch `id` plus every incremented column so we can build CAS witnesses.
|
|
389
388
|
const candidateSelectCols = ['id', ...incCols].join(',');
|
|
390
389
|
const orderClause = opts.orderBy ? `${opts.orderBy.column}.${opts.orderBy.direction}` : undefined;
|
|
@@ -394,10 +393,10 @@ class PostgrestAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
394
393
|
limit: String(limit),
|
|
395
394
|
...(orderClause ? { order: orderClause } : {}),
|
|
396
395
|
});
|
|
397
|
-
const candidatesRes = await
|
|
396
|
+
const candidatesRes = await fetchWithRequestId(getUrl, { headers: this.claimRowsHeaders() });
|
|
398
397
|
if (!candidatesRes.ok) {
|
|
399
398
|
const body = await candidatesRes.text();
|
|
400
|
-
throw new
|
|
399
|
+
throw new HazoUnavailableError({ code: 'HAZO_CONNECT_QUERY_TIMEOUT', pkg: 'hazo_connect', message: `claimRows: GET candidates failed (${candidatesRes.status}): ${body}` });
|
|
401
400
|
}
|
|
402
401
|
const candidates = (await candidatesRes.json());
|
|
403
402
|
if (candidates.length === 0)
|
|
@@ -415,8 +414,8 @@ class PostgrestAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
415
414
|
...casWitness, // CAS guard — MUST be included; omitting it destroys the safety contract
|
|
416
415
|
select: returning.join(','),
|
|
417
416
|
});
|
|
418
|
-
const body =
|
|
419
|
-
const patchRes = await
|
|
417
|
+
const body = serializeSetToPostgrestBody(opts.set, cand);
|
|
418
|
+
const patchRes = await fetchWithRequestId(patchUrl, {
|
|
420
419
|
method: 'PATCH',
|
|
421
420
|
headers: this.claimRowsHeaders({
|
|
422
421
|
'Content-Type': 'application/json',
|
|
@@ -427,7 +426,7 @@ class PostgrestAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
427
426
|
// 4xx/5xx are real errors — throw rather than silently swallow.
|
|
428
427
|
if (!patchRes.ok) {
|
|
429
428
|
const errBody = await patchRes.text();
|
|
430
|
-
throw new
|
|
429
|
+
throw new HazoUnavailableError({ code: 'HAZO_CONNECT_QUERY_TIMEOUT', pkg: 'hazo_connect', message: `claimRows: PATCH failed (${patchRes.status}): ${errBody}` });
|
|
431
430
|
}
|
|
432
431
|
// 2xx with empty array means the CAS witness failed — another worker claimed this row first.
|
|
433
432
|
const patched = (await patchRes.json());
|
|
@@ -463,5 +462,4 @@ class PostgrestAdapter extends base_adapter_js_1.BaseAdapter {
|
|
|
463
462
|
: url;
|
|
464
463
|
}
|
|
465
464
|
}
|
|
466
|
-
exports.PostgrestAdapter = PostgrestAdapter;
|
|
467
465
|
//# sourceMappingURL=postgrest-adapter.js.map
|