hazo_connect 4.3.5 → 4.6.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 +106 -0
- package/README.md +18 -3
- package/dist/adapters/pg-adapter.d.ts +41 -0
- package/dist/adapters/pg-adapter.d.ts.map +1 -1
- package/dist/adapters/pg-adapter.js +65 -0
- package/dist/adapters/pg-adapter.js.map +1 -1
- package/dist/adapters/postgrest-adapter.d.ts.map +1 -1
- package/dist/adapters/postgrest-adapter.js +34 -4
- package/dist/adapters/postgrest-adapter.js.map +1 -1
- package/dist/factory.d.ts.map +1 -1
- package/dist/factory.js +9 -3
- package/dist/factory.js.map +1 -1
- package/dist/migrations/runner.d.ts +20 -4
- package/dist/migrations/runner.d.ts.map +1 -1
- package/dist/migrations/runner.js +86 -31
- package/dist/migrations/runner.js.map +1 -1
- package/dist/search-service.d.ts +50 -0
- package/dist/search-service.d.ts.map +1 -0
- package/dist/search-service.js +44 -0
- package/dist/search-service.js.map +1 -0
- package/dist/server/index.d.ts +2 -0
- package/dist/server/index.d.ts.map +1 -1
- package/dist/server/index.js +2 -0
- package/dist/server/index.js.map +1 -1
- package/package.json +8 -8
package/CHANGE_LOG.md
CHANGED
|
@@ -5,6 +5,112 @@ 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.6.0 — 2026-11-22
|
|
9
|
+
|
|
10
|
+
### Added
|
|
11
|
+
|
|
12
|
+
- **PostgREST adapter: `selectAgg()`/`groupBy()` now supported**, translated to PostgREST's own
|
|
13
|
+
native aggregate request syntax instead of being rejected outright. `{ fn: 'avg', field: 'cost',
|
|
14
|
+
as: 'avg_cost' }` becomes `avg_cost:cost.avg()`; `{ fn: 'count', field: '*', as: 'n' }` becomes
|
|
15
|
+
the bare `n:count()` form; grouping is implicit — plain (non-aggregate) columns already in the
|
|
16
|
+
select list become the GROUP BY keys (matching the pg/sqlite convention: `groupBy()` does not
|
|
17
|
+
auto-add its columns to `select()`, the caller passes both). **Requires PostgREST ≥ v12 with
|
|
18
|
+
`db-aggregates-enabled`** — see the README's PostgREST caveat and
|
|
19
|
+
[PostgREST's aggregate functions docs](https://docs.postgrest.org/en/v12/references/api/aggregate_functions.html).
|
|
20
|
+
`validateAggregateQuery()` (the same cross-clause check used by the pg/sqlite paths — e.g.
|
|
21
|
+
`groupBy()` requires an aggregate) now also runs on the PostgREST path.
|
|
22
|
+
- **PostgREST adapter: `having()` and `distinct: true` aggregates still rejected, now with a
|
|
23
|
+
narrower, clearer coded error.** `having(...)` throws `HazoValidationError` with *"having() is
|
|
24
|
+
not supported on the PostgREST adapter; use a database view instead."* — replacing the old
|
|
25
|
+
blanket message that also (incorrectly, as of this release) implicated aggregates/groupBy.
|
|
26
|
+
A `selectAgg()` spec with `distinct: true` is now also explicitly rejected (`PostgREST adapter
|
|
27
|
+
does not support distinct aggregates ...; use a database view instead`) — PostgREST's `count()`
|
|
28
|
+
has no documented DISTINCT form, so silently dropping `distinct` would overcount and silently
|
|
29
|
+
produce wrong results.
|
|
30
|
+
- docs: README's PostgREST/Supabase aggregate caveat split in two — the PostgREST adapter's new
|
|
31
|
+
aggregate support (with the `db-aggregates-enabled` requirement) documented separately from the
|
|
32
|
+
still-unchanged Supabase adapter rejection.
|
|
33
|
+
- test: `src/lib/__tests__/postgrest_adapter.test.ts` — the old blanket-rejection test (which
|
|
34
|
+
asserted aggregates/groupBy/having were ALL rejected) is replaced: `selectAgg()` alone,
|
|
35
|
+
`selectAgg()` + `groupBy()`, multiple aggregate specs, bare `count()`, a `distinct` aggregate
|
|
36
|
+
(still rejected), and `having()` (still rejected, updated message).
|
|
37
|
+
|
|
38
|
+
### Note
|
|
39
|
+
|
|
40
|
+
- This supersedes the 3.7.0 entry documenting the PostgREST/Supabase blanket rejection of
|
|
41
|
+
aggregate/GROUP BY/HAVING queries — that entry is left as-is for history; the PostgREST adapter's
|
|
42
|
+
behavior as of 3.7.0 no longer applies as of this release. Supabase's behavior is unchanged.
|
|
43
|
+
|
|
44
|
+
## 4.5.0 — 2026-11-21
|
|
45
|
+
|
|
46
|
+
### Added
|
|
47
|
+
|
|
48
|
+
- **`runMigrations()` now supports `PgAdapter`, with a Postgres advisory lock
|
|
49
|
+
serializing concurrent runners.** Previously `src/lib/migrations/runner.ts`
|
|
50
|
+
only worked against `SqliteAdapter` (the lone adapter exposing
|
|
51
|
+
`execScript()`/`transaction()`). `PgAdapter` now exposes the same shape:
|
|
52
|
+
a top-level `execScript(sql)` (used to bootstrap the tracking table,
|
|
53
|
+
outside any transaction — runs via `postgres.js`'s simple query protocol
|
|
54
|
+
so a multi-statement migration file applies in one call), and its
|
|
55
|
+
`transaction()` facade additionally exposes `execScript`/`rawQuery`
|
|
56
|
+
alongside its existing `query`/`raw`, so the SAME per-file transactional
|
|
57
|
+
apply loop the runner already used for SQLite now works unchanged for
|
|
58
|
+
Postgres too. The runner's own tracking-table DDL and INSERT are
|
|
59
|
+
dialect-aware (`now()`/`$1,$2` for Postgres vs. `datetime('now')`/`?` for
|
|
60
|
+
SQLite) via a cheap `typeof adapter.raw === 'function'` check.
|
|
61
|
+
- **`PgAdapter.withAdvisoryLock(key, fn)`** — reserves a connection from the
|
|
62
|
+
pool, takes a session-level `pg_advisory_lock(key)` (blocking until
|
|
63
|
+
acquired), runs `fn()`, then unlocks and releases the connection in a
|
|
64
|
+
`finally`. `runMigrations()` wraps its whole run in this whenever the
|
|
65
|
+
adapter exposes it (Postgres only — SqliteAdapter runs unlocked, same as
|
|
66
|
+
before), keyed by a deterministic hash of the tracking table's name by
|
|
67
|
+
default, or an explicit `lockKey` option — so two processes booting
|
|
68
|
+
against the same database at once can't both apply the same pending
|
|
69
|
+
migration. Proven against a real local Postgres in
|
|
70
|
+
`tests/integration/pg-migrations.test.ts` (gated behind
|
|
71
|
+
`PG_INTEGRATION=true`, same convention as `pg.integration.test.ts`): two
|
|
72
|
+
concurrent `runMigrations()` calls against the same tracking table apply
|
|
73
|
+
a migration exactly once between them, not twice.
|
|
74
|
+
- `RunMigrationsOptions.lockKey?: number` — override the default
|
|
75
|
+
tableName-derived advisory-lock key, for callers running multiple
|
|
76
|
+
independent migration sets against the same database that must not
|
|
77
|
+
serialize against each other.
|
|
78
|
+
|
|
79
|
+
## 4.4.1 — 2026-11-14
|
|
80
|
+
|
|
81
|
+
### Fixed
|
|
82
|
+
|
|
83
|
+
- **`createHazoConnect({ type: 'postgrest', postgrest: { api_key } })` no longer
|
|
84
|
+
requires the `postgrest_api_key`/`POSTGREST_API_KEY` env var when the caller
|
|
85
|
+
already passed `api_key` directly.** The direct-config branch in
|
|
86
|
+
`src/lib/factory.ts` called `extractPostgrestConfig()`, which throws
|
|
87
|
+
`HAZO_CONNECT_CONFIG_ERROR` as soon as the env var is unset — *before* merging
|
|
88
|
+
in the caller's own `postgrest.api_key` — so any direct caller supplying its
|
|
89
|
+
own key (e.g. `hazo_umetrics`'s `createUmetricsConnect()`, which passes
|
|
90
|
+
`HAZO_UMETRICS_DATABASE_API_KEY` as `api_key`) still had to also set the
|
|
91
|
+
generic env var or boot would fail. Now the env var is read as a fallback
|
|
92
|
+
value, merged under the direct config, and only then validated — so an
|
|
93
|
+
explicit `api_key` on its own is sufficient. Added regression tests in
|
|
94
|
+
`src/lib/__tests__/factory.test.ts`.
|
|
95
|
+
|
|
96
|
+
## 4.4.0 — 2026-11-13
|
|
97
|
+
|
|
98
|
+
### Added
|
|
99
|
+
|
|
100
|
+
- **`createSearchService()` (exported from `hazo_connect/server`)** — a multi-entity
|
|
101
|
+
search orchestrator: give it a list of `{ type, search }` entity definitions and it
|
|
102
|
+
runs every entity's `search(query)` concurrently (`Promise.allSettled`, not
|
|
103
|
+
`Promise.all`), returning results grouped by `type` with an optional `limitPerType`
|
|
104
|
+
cap per entity. Extracted from GoTimer's `search_all()` (`src/lib/search.ts`, ~291
|
|
105
|
+
lines) — generalized from that function's two hardcoded DB queries to any number of
|
|
106
|
+
app-defined entities, and changed from one shared try/catch (a single DB error there
|
|
107
|
+
zeroed out *every* result) to per-entity failure isolation, so one broken entity's
|
|
108
|
+
search never blanks out the others' working results. Fully DB-agnostic: an entity's
|
|
109
|
+
`search` function is just `(query: string) => Promise<TResult[]>` — ownership
|
|
110
|
+
scoping, SQL, full-text search, whatever — the caller owns all of that; this module
|
|
111
|
+
only fans the calls out and stitches the settled outcomes back together. See
|
|
112
|
+
`src/lib/search-service.ts`, tests in `src/lib/__tests__/search_service.test.ts`.
|
|
113
|
+
|
|
8
114
|
## 4.3.5 — 2026-10-19
|
|
9
115
|
|
|
10
116
|
### Changed
|
package/README.md
CHANGED
|
@@ -234,9 +234,24 @@ const monthlyVolume = await hazo.query(
|
|
|
234
234
|
least one aggregate, `having()` requires at least one aggregate, and every plain selected
|
|
235
235
|
dimension must appear in `groupBy()`.
|
|
236
236
|
|
|
237
|
-
> **PostgREST
|
|
238
|
-
>
|
|
239
|
-
> `
|
|
237
|
+
> **PostgREST caveat:** the PostgREST adapter translates `selectAgg()` / `groupBy()` into
|
|
238
|
+
> PostgREST's own native aggregate request syntax instead of SQL — e.g.
|
|
239
|
+
> `select=network,avg_cost:cost.avg()`. This **requires PostgREST ≥ v12 with
|
|
240
|
+
> `db-aggregates-enabled` set** (`PGRST_DB_AGGREGATES_ENABLED=true`, or
|
|
241
|
+
> `pgrst.db_aggregates_enabled` on the connection role) — see PostgREST's
|
|
242
|
+
> [aggregate functions docs](https://docs.postgrest.org/en/v12/references/api/aggregate_functions.html).
|
|
243
|
+
> Grouping is implicit there: whichever plain (non-aggregate) columns are in the select list
|
|
244
|
+
> become the GROUP BY keys, so pass `groupBy()` columns to `select()` too — `groupBy()` does not
|
|
245
|
+
> auto-add them. Two things PostgREST's syntax cannot express, so the adapter still **rejects**
|
|
246
|
+
> them with a coded `HazoValidationError` advising a database view instead:
|
|
247
|
+
> - **`having()`** — no post-aggregate filter in PostgREST's select-based syntax.
|
|
248
|
+
> - **`distinct: true` aggregates** (`count(DISTINCT col)`) — PostgREST's `count()` has no
|
|
249
|
+
> distinct form.
|
|
250
|
+
>
|
|
251
|
+
> **Supabase caveat:** the Supabase adapter is unchanged — it still has no SQLite-parity
|
|
252
|
+
> aggregation path and **rejects** any query using `selectAgg()` / `groupBy()` / `having()` with a
|
|
253
|
+
> coded `HazoValidationError`. Use the `pg` or `sqlite` backend, or the PostgREST adapter directly,
|
|
254
|
+
> for grouped aggregation against Supabase's underlying Postgres.
|
|
240
255
|
|
|
241
256
|
### JSON Columns (SQLite)
|
|
242
257
|
|
|
@@ -23,6 +23,18 @@ export interface PgAdapterConfig {
|
|
|
23
23
|
export interface PgTransactionContext {
|
|
24
24
|
query: <T = Record<string, unknown>>(builder: QueryBuilder, method?: 'GET' | 'POST' | 'PUT' | 'PATCH' | 'DELETE', body?: unknown) => Promise<T[]>;
|
|
25
25
|
raw: <T = unknown>(text: string, values?: unknown[]) => Promise<T[]>;
|
|
26
|
+
/**
|
|
27
|
+
* Alias for raw(), shaped to match the migration runner's
|
|
28
|
+
* MigrationCapableAdapter tx contract (`rawQuery(sql, { params })`), so
|
|
29
|
+
* PgAdapter's transaction() facade is structurally compatible with
|
|
30
|
+
* src/lib/migrations/runner.ts without that runner needing a
|
|
31
|
+
* Postgres-specific code path.
|
|
32
|
+
*/
|
|
33
|
+
rawQuery: <T = unknown>(sql: string, options?: {
|
|
34
|
+
params?: unknown[];
|
|
35
|
+
}) => Promise<T[]>;
|
|
36
|
+
/** Execute a (possibly multi-statement) raw SQL script within this transaction. */
|
|
37
|
+
execScript: (sql: string) => Promise<void>;
|
|
26
38
|
}
|
|
27
39
|
export interface PgTransactionOptions {
|
|
28
40
|
/**
|
|
@@ -105,6 +117,35 @@ export declare class PgAdapter extends BaseAdapter {
|
|
|
105
117
|
* @returns Array of updated row objects (empty when no rows match)
|
|
106
118
|
*/
|
|
107
119
|
claimRows<T = Record<string, unknown>>(opts: ClaimRowsOptions): Promise<T[]>;
|
|
120
|
+
/**
|
|
121
|
+
* Execute a (possibly multi-statement) raw SQL script against the pool.
|
|
122
|
+
* postgres.js's sql.unsafe() runs multi-statement text via the simple
|
|
123
|
+
* query protocol whenever no parameters are supplied, which is exactly
|
|
124
|
+
* what a migration file (several `;`-separated DDL/DML statements) needs.
|
|
125
|
+
* Used outside any transaction by runMigrations() to bootstrap the
|
|
126
|
+
* tracking table; migration files themselves are applied inside
|
|
127
|
+
* transaction()'s per-file transaction via the tx facade's own
|
|
128
|
+
* execScript(), not this one.
|
|
129
|
+
*/
|
|
130
|
+
execScript(sql: string): Promise<void>;
|
|
131
|
+
private execScriptOn;
|
|
132
|
+
/**
|
|
133
|
+
* Run `fn` while holding a Postgres session-level advisory lock keyed by
|
|
134
|
+
* `key`, serializing concurrent callers (across processes/connections)
|
|
135
|
+
* against the same key. Used by runMigrations() so two processes starting
|
|
136
|
+
* up at once don't both try to apply the same pending migration.
|
|
137
|
+
*
|
|
138
|
+
* The lock is taken on a connection reserved from the pool for the
|
|
139
|
+
* duration of the call (`sql.reserve()`) — advisory locks are
|
|
140
|
+
* connection-scoped, so acquiring it on an arbitrary pooled connection
|
|
141
|
+
* that's handed back after one query would release it immediately.
|
|
142
|
+
* `fn` itself runs ordinary pool-borrowed queries/transactions (e.g. via
|
|
143
|
+
* this.transaction()); the lock being held on the reserved connection is
|
|
144
|
+
* what blocks a second caller, regardless of which connection `fn`'s own
|
|
145
|
+
* queries happen to run on. pg_advisory_lock blocks until acquired, so a
|
|
146
|
+
* second caller simply waits rather than racing.
|
|
147
|
+
*/
|
|
148
|
+
withAdvisoryLock<T>(key: number, fn: () => Promise<T>): Promise<T>;
|
|
108
149
|
/**
|
|
109
150
|
* Drain the connection pool and release all Postgres connections.
|
|
110
151
|
* Call this on process shutdown or when the adapter is no longer needed.
|
|
@@ -1 +1 @@
|
|
|
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,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACjC,OAAO,EAAE,YAAY,EACrB,MAAM,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAQ,EACpD,IAAI,CAAC,EAAE,OAAO,KACX,OAAO,CAAC,CAAC,EAAE,CAAC,CAAA;IACjB,GAAG,EAAE,CAAC,CAAC,GAAG,OAAO,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,CAAC,EAAE,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"pg-adapter.d.ts","sourceRoot":"","sources":["../../src/lib/adapters/pg-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -188,6 +188,8 @@ export class PgAdapter extends BaseAdapter {
|
|
|
188
188
|
const tx = {
|
|
189
189
|
query: (builder, method, body) => this.runQuery(txSql, builder, method, body),
|
|
190
190
|
raw: (text, values) => this.execRaw(txSql, 'PgAdapter tx raw', text, values ?? []),
|
|
191
|
+
rawQuery: (sql, options) => this.execRaw(txSql, 'PgAdapter tx rawQuery', sql, options?.params ?? []),
|
|
192
|
+
execScript: (sql) => this.execScriptOn(txSql, sql),
|
|
191
193
|
};
|
|
192
194
|
return await fn(tx);
|
|
193
195
|
};
|
|
@@ -270,6 +272,69 @@ export class PgAdapter extends BaseAdapter {
|
|
|
270
272
|
const params = [...whereFrag.params, ...setFrag.params];
|
|
271
273
|
return await this.raw(sql, params);
|
|
272
274
|
}
|
|
275
|
+
/**
|
|
276
|
+
* Execute a (possibly multi-statement) raw SQL script against the pool.
|
|
277
|
+
* postgres.js's sql.unsafe() runs multi-statement text via the simple
|
|
278
|
+
* query protocol whenever no parameters are supplied, which is exactly
|
|
279
|
+
* what a migration file (several `;`-separated DDL/DML statements) needs.
|
|
280
|
+
* Used outside any transaction by runMigrations() to bootstrap the
|
|
281
|
+
* tracking table; migration files themselves are applied inside
|
|
282
|
+
* transaction()'s per-file transaction via the tx facade's own
|
|
283
|
+
* execScript(), not this one.
|
|
284
|
+
*/
|
|
285
|
+
async execScript(sql) {
|
|
286
|
+
await this.execScriptOn(this.sql, sql);
|
|
287
|
+
}
|
|
288
|
+
async execScriptOn(sqlExec, sql) {
|
|
289
|
+
try {
|
|
290
|
+
this.logQuery('PgAdapter execScript', { sql });
|
|
291
|
+
await sqlExec.unsafe(sql);
|
|
292
|
+
}
|
|
293
|
+
catch (error) {
|
|
294
|
+
this.handleConnectionError(error);
|
|
295
|
+
}
|
|
296
|
+
}
|
|
297
|
+
/**
|
|
298
|
+
* Run `fn` while holding a Postgres session-level advisory lock keyed by
|
|
299
|
+
* `key`, serializing concurrent callers (across processes/connections)
|
|
300
|
+
* against the same key. Used by runMigrations() so two processes starting
|
|
301
|
+
* up at once don't both try to apply the same pending migration.
|
|
302
|
+
*
|
|
303
|
+
* The lock is taken on a connection reserved from the pool for the
|
|
304
|
+
* duration of the call (`sql.reserve()`) — advisory locks are
|
|
305
|
+
* connection-scoped, so acquiring it on an arbitrary pooled connection
|
|
306
|
+
* that's handed back after one query would release it immediately.
|
|
307
|
+
* `fn` itself runs ordinary pool-borrowed queries/transactions (e.g. via
|
|
308
|
+
* this.transaction()); the lock being held on the reserved connection is
|
|
309
|
+
* what blocks a second caller, regardless of which connection `fn`'s own
|
|
310
|
+
* queries happen to run on. pg_advisory_lock blocks until acquired, so a
|
|
311
|
+
* second caller simply waits rather than racing.
|
|
312
|
+
*/
|
|
313
|
+
async withAdvisoryLock(key, fn) {
|
|
314
|
+
const reserved = await this.sql.reserve();
|
|
315
|
+
try {
|
|
316
|
+
await reserved.unsafe('SELECT pg_advisory_lock($1)', [key]);
|
|
317
|
+
}
|
|
318
|
+
catch (error) {
|
|
319
|
+
reserved.release();
|
|
320
|
+
this.handleConnectionError(error);
|
|
321
|
+
}
|
|
322
|
+
try {
|
|
323
|
+
return await fn();
|
|
324
|
+
}
|
|
325
|
+
finally {
|
|
326
|
+
try {
|
|
327
|
+
await reserved.unsafe('SELECT pg_advisory_unlock($1)', [key]);
|
|
328
|
+
}
|
|
329
|
+
catch {
|
|
330
|
+
// Best-effort: the lock is released automatically when the
|
|
331
|
+
// connection closes even if this explicit unlock fails.
|
|
332
|
+
}
|
|
333
|
+
finally {
|
|
334
|
+
reserved.release();
|
|
335
|
+
}
|
|
336
|
+
}
|
|
337
|
+
}
|
|
273
338
|
/**
|
|
274
339
|
* Drain the connection pool and release all Postgres connections.
|
|
275
340
|
* Call this on process shutdown or when the adapter is no longer needed.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pg-adapter.js","sourceRoot":"","sources":["../../src/lib/adapters/pg-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;GAUG;AAEH,OAAO,QAA2C,MAAM,UAAU,CAAA;AAGlE,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAEvC,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACnB,kBAAkB,EAClB,wBAAwB,GACzB,MAAM,qBAAqB,CAAA;
|
|
1
|
+
{"version":3,"file":"pg-adapter.js","sourceRoot":"","sources":["../../src/lib/adapters/pg-adapter.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgrest-adapter.d.ts","sourceRoot":"","sources":["../../src/lib/adapters/postgrest-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,EAAqB,MAAM,aAAa,CAAA;AAElG,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAUlD;;GAEG;AACH,UAAU,eAAe;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,WAAY,YAAW,kBAAkB;IAC7E,OAAO,CAAC,eAAe,CAAiB;IACxC,OAAO,CAAC,WAAW,CAAC,CAAmB;IAEvC;;;;OAIG;gBACS,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM;IAuBxC;;;OAGG;IACH,OAAO,CAAC,oBAAoB;
|
|
1
|
+
{"version":3,"file":"postgrest-adapter.d.ts","sourceRoot":"","sources":["../../src/lib/adapters/postgrest-adapter.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAGH,OAAO,KAAK,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,EAAqB,MAAM,aAAa,CAAA;AAElG,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAA;AAC/C,OAAO,EAAE,YAAY,EAAE,MAAM,qBAAqB,CAAA;AAUlD;;GAEG;AACH,UAAU,eAAe;IACvB,QAAQ,EAAE,MAAM,CAAA;IAChB,OAAO,EAAE,MAAM,CAAA;CAChB;AAED;;GAEG;AACH,qBAAa,gBAAiB,SAAQ,WAAY,YAAW,kBAAkB;IAC7E,OAAO,CAAC,eAAe,CAAiB;IACxC,OAAO,CAAC,WAAW,CAAC,CAAmB;IAEvC;;;;OAIG;gBACS,MAAM,EAAE,GAAG,EAAE,MAAM,CAAC,EAAE,MAAM;IAuBxC;;;OAGG;IACH,OAAO,CAAC,oBAAoB;IAuC5B;;;;OAIG;IACH,OAAO,CAAC,iBAAiB;IAmIzB;;;;;;;;OAQG;IACG,KAAK,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACrC,OAAO,EAAE,YAAY,EACrB,MAAM,GAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,QAAgB,EAC3D,IAAI,CAAC,EAAE,GAAG,GACT,OAAO,CAAC,CAAC,EAAE,CAAC;IAiCf;;;;;OAKG;IACG,QAAQ,CAAC,QAAQ,EAAE,MAAM,EAAE,OAAO,GAAE,WAAgB,GAAG,OAAO,CAAC,GAAG,CAAC;IA2JzE;;;OAGG;IACG,SAAS,IAAI,OAAO,CAAC,eAAe,CAAC;IAG3C,OAAO,CAAC,iBAAiB;IAYzB,OAAO,CAAC,yBAAyB;IA+BjC;;;;;;;;;;;;;;;;;OAiBG;IACG,SAAS,CAAC,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,EAAE,gBAAgB,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IA8ElF;;;OAGG;IACH,OAAO,CAAC,iBAAiB;IAQzB;;;OAGG;IACH,OAAO,CAAC,gBAAgB;IAQxB,OAAO,CAAC,WAAW;CAKpB"}
|
|
@@ -46,9 +46,24 @@ export class PostgrestAdapter extends BaseAdapter {
|
|
|
46
46
|
if (joins.length > 0) {
|
|
47
47
|
this.throwError(EC.VALIDATION_ERROR, 'PostgREST adapter does not support SQL-style JOINs. Use nestedSelect() instead for related data.');
|
|
48
48
|
}
|
|
49
|
-
// PostgREST
|
|
50
|
-
|
|
51
|
-
|
|
49
|
+
// PostgREST (>= v12, with db-aggregates-enabled) has a native aggregate request
|
|
50
|
+
// syntax, so selectAgg()/groupBy() ARE supported — see buildPostgrestUrl(). HAVING
|
|
51
|
+
// has no equivalent in that syntax (PostgREST groups implicitly from the select
|
|
52
|
+
// list and cannot post-filter on the aggregated value), so it stays rejected.
|
|
53
|
+
if (builder.getHaving().length > 0) {
|
|
54
|
+
this.throwError(EC.VALIDATION_ERROR, 'having() is not supported on the PostgREST adapter; use a database view instead.');
|
|
55
|
+
}
|
|
56
|
+
// Cross-clause aggregate/groupBy validation, shared with the pg/sqlite paths
|
|
57
|
+
// (GROUP BY requires an aggregate, every plain selected dimension must appear
|
|
58
|
+
// in groupBy(), etc).
|
|
59
|
+
builder.validateAggregateQuery();
|
|
60
|
+
// PostgREST's native aggregate functions have no DISTINCT form (confirmed against
|
|
61
|
+
// https://docs.postgrest.org/en/v12/references/api/aggregate_functions.html, which
|
|
62
|
+
// documents avg()/count()/max()/min()/sum() with no distinct variant) — only a
|
|
63
|
+
// database view can express COUNT(DISTINCT col) server-side.
|
|
64
|
+
const distinctSpec = builder.getAggregates().find((spec) => spec.distinct === true);
|
|
65
|
+
if (distinctSpec) {
|
|
66
|
+
this.throwError(EC.VALIDATION_ERROR, `PostgREST adapter does not support distinct aggregates (count(distinct ${distinctSpec.field})); use a database view instead.`);
|
|
52
67
|
}
|
|
53
68
|
}
|
|
54
69
|
/**
|
|
@@ -67,7 +82,8 @@ export class PostgrestAdapter extends BaseAdapter {
|
|
|
67
82
|
// Select fields
|
|
68
83
|
const selectFields = builder.getSelectFields();
|
|
69
84
|
const nestedSelects = builder.getNestedSelects();
|
|
70
|
-
|
|
85
|
+
const aggregates = builder.getAggregates();
|
|
86
|
+
if (selectFields.length > 0 || nestedSelects.length > 0 || aggregates.length > 0) {
|
|
71
87
|
const selectParts = [];
|
|
72
88
|
// Add regular select fields
|
|
73
89
|
if (selectFields.length > 0) {
|
|
@@ -81,6 +97,20 @@ export class PostgrestAdapter extends BaseAdapter {
|
|
|
81
97
|
});
|
|
82
98
|
selectParts.push(...nestedParts);
|
|
83
99
|
}
|
|
100
|
+
// Add aggregate specs (PostgREST native aggregate syntax, requires PostgREST
|
|
101
|
+
// >= v12 with db-aggregates-enabled): `<alias>:<field>.<fn>()`, or the bare
|
|
102
|
+
// `<alias>:<fn>()` form for `{ fn: 'count', field: '*' }` (whole-row count).
|
|
103
|
+
// Grouping is implicit on PostgREST — whichever plain (non-aggregate) columns
|
|
104
|
+
// are in the select list become the GROUP BY keys, so groupBy() columns must
|
|
105
|
+
// also be passed to select() by the caller (same convention as the pg/sqlite
|
|
106
|
+
// paths — groupBy() does not auto-add its fields to the select list).
|
|
107
|
+
if (aggregates.length > 0) {
|
|
108
|
+
const aggParts = aggregates.map((spec) => {
|
|
109
|
+
const fnExpr = spec.field === '*' ? `${spec.fn}()` : `${spec.field}.${spec.fn}()`;
|
|
110
|
+
return `${spec.as}:${fnExpr}`;
|
|
111
|
+
});
|
|
112
|
+
selectParts.push(...aggParts);
|
|
113
|
+
}
|
|
84
114
|
if (selectParts.length > 0) {
|
|
85
115
|
params.push(`select=${encodeURIComponent(selectParts.join(','))}`);
|
|
86
116
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"postgrest-adapter.js","sourceRoot":"","sources":["../../src/lib/adapters/postgrest-adapter.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"postgrest-adapter.js","sourceRoot":"","sources":["../../src/lib/adapters/postgrest-adapter.ts"],"names":[],"mappings":"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"}
|
package/dist/factory.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/lib/factory.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AA+EvE;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,kBAAkB,
|
|
1
|
+
{"version":3,"file":"factory.d.ts","sourceRoot":"","sources":["../src/lib/factory.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAIH,OAAO,KAAK,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,YAAY,CAAA;AA+EvE;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,MAAM,EAAE,iBAAiB,GAAG,kBAAkB,CAiH/E"}
|
package/dist/factory.js
CHANGED
|
@@ -109,12 +109,18 @@ export function createHazoConnect(config) {
|
|
|
109
109
|
}
|
|
110
110
|
}
|
|
111
111
|
if (type === 'postgrest') {
|
|
112
|
-
|
|
113
|
-
//
|
|
112
|
+
// Merge: direct config's postgrest values take precedence, env API key
|
|
113
|
+
// is only a fallback — validate only after the merge, so a caller
|
|
114
|
+
// passing api_key directly (e.g. hazo_umetrics) doesn't need the env
|
|
115
|
+
// var set too.
|
|
114
116
|
providerConfig.postgrest = {
|
|
115
|
-
|
|
117
|
+
base_url: '',
|
|
118
|
+
api_key: extractPostgrestApiKey(),
|
|
116
119
|
...(providerConfig.postgrest || {})
|
|
117
120
|
};
|
|
121
|
+
if (!providerConfig.postgrest.api_key) {
|
|
122
|
+
throw new HazoConfigError({ code: 'HAZO_CONNECT_CONFIG_ERROR', pkg: 'hazo_connect', message: 'Environment variable postgrest_api_key is required for PostgREST connections' });
|
|
123
|
+
}
|
|
118
124
|
}
|
|
119
125
|
else if (type === 'supabase') {
|
|
120
126
|
// Support Supabase configuration from environment variables
|
package/dist/factory.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/lib/factory.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"factory.js","sourceRoot":"","sources":["../src/lib/factory.ts"],"names":[],"mappings":"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"}
|
|
@@ -6,10 +6,18 @@
|
|
|
6
6
|
* table. Each migration runs inside the adapter's transaction, so a failure
|
|
7
7
|
* mid-file leaves the database unchanged.
|
|
8
8
|
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
* future adapter
|
|
12
|
-
*
|
|
9
|
+
* Targets any adapter exposing `.transaction()` and `.execScript()` — today
|
|
10
|
+
* that's `SqliteAdapter` and `PgAdapter`. The runner uses duck typing so a
|
|
11
|
+
* future adapter implementing those methods is supported without code
|
|
12
|
+
* changes here.
|
|
13
|
+
*
|
|
14
|
+
* On Postgres specifically (or any adapter additionally exposing
|
|
15
|
+
* `.withAdvisoryLock()`), the whole run is wrapped in a session-level
|
|
16
|
+
* advisory lock keyed by the tracking table's name (or an explicit
|
|
17
|
+
* `lockKey`), so two processes starting up concurrently against the same
|
|
18
|
+
* database don't race to apply the same pending migration twice. Adapters
|
|
19
|
+
* without `.withAdvisoryLock()` (e.g. SqliteAdapter) run unlocked, same as
|
|
20
|
+
* before this existed.
|
|
13
21
|
*/
|
|
14
22
|
import type { HazoConnectAdapter } from '../types.js';
|
|
15
23
|
/**
|
|
@@ -28,6 +36,14 @@ export interface RunMigrationsOptions {
|
|
|
28
36
|
directory: string;
|
|
29
37
|
/** Name of the tracking table. Defaults to `_migrations`. */
|
|
30
38
|
tableName?: string;
|
|
39
|
+
/**
|
|
40
|
+
* Postgres advisory-lock key (an arbitrary 32-bit signed integer shared by
|
|
41
|
+
* every process that must serialize against each other). Defaults to a
|
|
42
|
+
* deterministic hash of `tableName`, so separate apps using distinct
|
|
43
|
+
* tracking-table names don't collide on the same lock by accident. Only
|
|
44
|
+
* used when the adapter exposes `.withAdvisoryLock()` (ignored otherwise).
|
|
45
|
+
*/
|
|
46
|
+
lockKey?: number;
|
|
31
47
|
}
|
|
32
48
|
/**
|
|
33
49
|
* Apply all pending migrations in `options.directory` against `adapter`.
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/lib/migrations/runner.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../../src/lib/migrations/runner.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;;GAoBG;AAMH,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAA;AAErD;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAA;IACZ,QAAQ,EAAE,MAAM,CAAA;IAChB,UAAU,EAAE,MAAM,CAAA;CACnB;AAED;;GAEG;AACH,MAAM,WAAW,oBAAoB;IACnC,oEAAoE;IACpE,SAAS,EAAE,MAAM,CAAA;IACjB,6DAA6D;IAC7D,SAAS,CAAC,EAAE,MAAM,CAAA;IAClB;;;;;;OAMG;IACH,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB;AAqED;;;;;GAKG;AACH,wBAAsB,aAAa,CACjC,OAAO,EAAE,kBAAkB,EAC3B,OAAO,EAAE,oBAAoB,GAC5B,OAAO,CAAC,gBAAgB,EAAE,CAAC,CAsE7B"}
|
|
@@ -6,10 +6,18 @@
|
|
|
6
6
|
* table. Each migration runs inside the adapter's transaction, so a failure
|
|
7
7
|
* mid-file leaves the database unchanged.
|
|
8
8
|
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
11
|
-
* future adapter
|
|
12
|
-
*
|
|
9
|
+
* Targets any adapter exposing `.transaction()` and `.execScript()` — today
|
|
10
|
+
* that's `SqliteAdapter` and `PgAdapter`. The runner uses duck typing so a
|
|
11
|
+
* future adapter implementing those methods is supported without code
|
|
12
|
+
* changes here.
|
|
13
|
+
*
|
|
14
|
+
* On Postgres specifically (or any adapter additionally exposing
|
|
15
|
+
* `.withAdvisoryLock()`), the whole run is wrapped in a session-level
|
|
16
|
+
* advisory lock keyed by the tracking table's name (or an explicit
|
|
17
|
+
* `lockKey`), so two processes starting up concurrently against the same
|
|
18
|
+
* database don't race to apply the same pending migration twice. Adapters
|
|
19
|
+
* without `.withAdvisoryLock()` (e.g. SqliteAdapter) run unlocked, same as
|
|
20
|
+
* before this existed.
|
|
13
21
|
*/
|
|
14
22
|
import crypto from 'crypto';
|
|
15
23
|
import fs from 'fs';
|
|
@@ -20,6 +28,31 @@ function isMigrationCapable(adapter) {
|
|
|
20
28
|
return (typeof adapter.execScript === 'function' &&
|
|
21
29
|
typeof adapter.transaction === 'function');
|
|
22
30
|
}
|
|
31
|
+
function hasAdvisoryLock(adapter) {
|
|
32
|
+
return typeof adapter.withAdvisoryLock === 'function';
|
|
33
|
+
}
|
|
34
|
+
/** Deterministic string hash, folded into Postgres's signed-int32 advisory-lock key range. */
|
|
35
|
+
function defaultLockKey(seed) {
|
|
36
|
+
let hash = 0;
|
|
37
|
+
for (let i = 0; i < seed.length; i++) {
|
|
38
|
+
hash = (Math.imul(31, hash) + seed.charCodeAt(i)) | 0;
|
|
39
|
+
}
|
|
40
|
+
return hash;
|
|
41
|
+
}
|
|
42
|
+
/**
|
|
43
|
+
* Read rows for a plain SQL SELECT, outside any transaction. Prefers the
|
|
44
|
+
* adapter's `.raw()` (PgAdapter's real SQL-execution path) over `.rawQuery()`
|
|
45
|
+
* (whose PgAdapter implementation is reserved for the PostgREST-style
|
|
46
|
+
* endpoint contract and intentionally throws) — falls back to `.rawQuery()`
|
|
47
|
+
* for adapters (SqliteAdapter) that don't expose `.raw()`.
|
|
48
|
+
*/
|
|
49
|
+
async function readRows(adapter, sql) {
|
|
50
|
+
const anyAdapter = adapter;
|
|
51
|
+
if (typeof anyAdapter.raw === 'function') {
|
|
52
|
+
return anyAdapter.raw(sql);
|
|
53
|
+
}
|
|
54
|
+
return adapter.rawQuery(sql);
|
|
55
|
+
}
|
|
23
56
|
function computeChecksum(contents) {
|
|
24
57
|
return crypto.createHash('sha256').update(contents).digest('hex').slice(0, 16);
|
|
25
58
|
}
|
|
@@ -43,38 +76,60 @@ export async function runMigrations(adapter, options) {
|
|
|
43
76
|
throw new HazoInternalError({
|
|
44
77
|
code: 'HAZO_CONNECT_NOT_IMPLEMENTED',
|
|
45
78
|
pkg: 'hazo_connect',
|
|
46
|
-
message: 'runMigrations requires an adapter that exposes execScript() and transaction(). Today
|
|
79
|
+
message: 'runMigrations requires an adapter that exposes execScript() and transaction(). Today SqliteAdapter and PgAdapter qualify.',
|
|
47
80
|
});
|
|
48
81
|
}
|
|
49
82
|
const tableName = options.tableName ?? '_migrations';
|
|
50
83
|
const quotedTable = quoteIdent(tableName);
|
|
51
|
-
//
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
84
|
+
// PgAdapter is the only adapter exposing .raw() — SqliteAdapter doesn't.
|
|
85
|
+
// Used here to pick the right placeholder style ($1/$2 vs ?) and DEFAULT
|
|
86
|
+
// expression (now() vs sqlite's datetime('now')); readRows() above makes
|
|
87
|
+
// the same check for the same reason.
|
|
88
|
+
const isPg = typeof adapter.raw === 'function';
|
|
89
|
+
const createTableSql = isPg
|
|
90
|
+
? `CREATE TABLE IF NOT EXISTS ${quotedTable} (
|
|
91
|
+
name TEXT PRIMARY KEY,
|
|
92
|
+
applied_at TIMESTAMPTZ NOT NULL DEFAULT now(),
|
|
93
|
+
checksum TEXT NOT NULL
|
|
94
|
+
);`
|
|
95
|
+
: `CREATE TABLE IF NOT EXISTS ${quotedTable} (
|
|
96
|
+
name TEXT PRIMARY KEY,
|
|
97
|
+
applied_at TEXT NOT NULL DEFAULT (datetime('now')),
|
|
98
|
+
checksum TEXT NOT NULL
|
|
99
|
+
);`;
|
|
100
|
+
const insertSql = isPg
|
|
101
|
+
? `INSERT INTO ${quotedTable} (name, checksum) VALUES ($1, $2)`
|
|
102
|
+
: `INSERT INTO ${quotedTable} (name, checksum) VALUES (?, ?)`;
|
|
103
|
+
const run = async () => {
|
|
104
|
+
// Create the tracking table if absent. Outside any transaction.
|
|
105
|
+
await adapter.execScript(createTableSql);
|
|
106
|
+
const appliedRows = await readRows(adapter, `SELECT name FROM ${quotedTable}`);
|
|
107
|
+
const alreadyApplied = new Set(appliedRows.map((row) => String(row.name)));
|
|
108
|
+
const files = listMigrationFiles(options.directory);
|
|
109
|
+
const applied = [];
|
|
110
|
+
for (const name of files) {
|
|
111
|
+
if (alreadyApplied.has(name))
|
|
112
|
+
continue;
|
|
113
|
+
const filePath = path.join(options.directory, name);
|
|
114
|
+
const contents = fs.readFileSync(filePath, 'utf-8');
|
|
115
|
+
const checksum = computeChecksum(contents);
|
|
116
|
+
await adapter.transaction(async (tx) => {
|
|
117
|
+
await tx.execScript(contents);
|
|
118
|
+
await tx.rawQuery(insertSql, { params: [name, checksum] });
|
|
119
|
+
});
|
|
120
|
+
applied.push({
|
|
121
|
+
name,
|
|
122
|
+
checksum,
|
|
123
|
+
applied_at: new Date().toISOString()
|
|
124
|
+
});
|
|
125
|
+
}
|
|
126
|
+
return applied;
|
|
127
|
+
};
|
|
128
|
+
if (hasAdvisoryLock(adapter)) {
|
|
129
|
+
const lockKey = options.lockKey ?? defaultLockKey(tableName);
|
|
130
|
+
return adapter.withAdvisoryLock(lockKey, run);
|
|
76
131
|
}
|
|
77
|
-
return
|
|
132
|
+
return run();
|
|
78
133
|
}
|
|
79
134
|
function quoteIdent(identifier) {
|
|
80
135
|
if (!/^[A-Za-z_][A-Za-z0-9_]*$/.test(identifier)) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/lib/migrations/runner.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"runner.js","sourceRoot":"","sources":["../../src/lib/migrations/runner.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,50 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Purpose: Multi-entity search orchestrator — parallel execution + result merging
|
|
3
|
+
*
|
|
4
|
+
* Extracted from GoTimer's `search_all()` pattern (src/lib/search.ts, ~291 lines):
|
|
5
|
+
* that function hardcoded "timer pages" and "blog posts" as two DB queries run via
|
|
6
|
+
* `Promise.all` inside one function body. This generalizes the same shape to any
|
|
7
|
+
* number of app-defined entity types, with two differences GoTimer's version didn't
|
|
8
|
+
* need: entities run under `Promise.allSettled` rather than `Promise.all` (GoTimer
|
|
9
|
+
* wrapped its *whole* DB step in one try/catch, so one failing query zeroed out every
|
|
10
|
+
* DB result for that call; here each entity type's failure is isolated to itself —
|
|
11
|
+
* a broken "friends" search shouldn't blank out working "memes"/"occasions" results),
|
|
12
|
+
* and results come back grouped by `type` rather than pre-flattened, since a
|
|
13
|
+
* consumer's "All results, top 3 per type" tab needs the grouping to slice against.
|
|
14
|
+
*
|
|
15
|
+
* Deliberately agnostic of any particular database or query shape — an entity's
|
|
16
|
+
* `search` function is just `(query: string) => Promise<TResult[]>`, so the caller
|
|
17
|
+
* decides what a "meme" or "friend" result row looks like (including any
|
|
18
|
+
* ownership/ACL scoping on the query itself); this module only fans the calls out
|
|
19
|
+
* and stitches the outcomes back together.
|
|
20
|
+
*/
|
|
21
|
+
export interface SearchServiceEntity<TResult> {
|
|
22
|
+
/** Identifies this entity's results in the returned grouping (e.g. "memes"). */
|
|
23
|
+
type: string;
|
|
24
|
+
/** Runs this entity's own search for `query`. Scoping (ownership, status, etc.)
|
|
25
|
+
* is entirely the caller's responsibility — this module never inspects `query`
|
|
26
|
+
* or the returned rows. */
|
|
27
|
+
search: (query: string) => Promise<TResult[]>;
|
|
28
|
+
}
|
|
29
|
+
export interface SearchServiceEntityResult<TResult> {
|
|
30
|
+
type: string;
|
|
31
|
+
results: TResult[];
|
|
32
|
+
/** Set only when this entity's `search` rejected — see `createSearchService`'s
|
|
33
|
+
* per-entity isolation note above. `results` is always `[]` in that case. */
|
|
34
|
+
error?: string;
|
|
35
|
+
}
|
|
36
|
+
export interface SearchServiceOptions {
|
|
37
|
+
/** Caps each entity's own result array independently (e.g. "top 3 per type"
|
|
38
|
+
* for a combined/"All" view). Omit for the entity's full, unsliced result set. */
|
|
39
|
+
limitPerType?: number;
|
|
40
|
+
}
|
|
41
|
+
export interface SearchService<TResult> {
|
|
42
|
+
search: (query: string, options?: SearchServiceOptions) => Promise<SearchServiceEntityResult<TResult>[]>;
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Builds a search service from a fixed list of entity definitions. The returned
|
|
46
|
+
* `search(query)` runs every entity's `search` concurrently and resolves once all
|
|
47
|
+
* of them have settled — one way or another — never rejecting itself.
|
|
48
|
+
*/
|
|
49
|
+
export declare function createSearchService<TResult>(entities: ReadonlyArray<SearchServiceEntity<TResult>>): SearchService<TResult>;
|
|
50
|
+
//# sourceMappingURL=search-service.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"search-service.d.ts","sourceRoot":"","sources":["../src/lib/search-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AAEH,MAAM,WAAW,mBAAmB,CAAC,OAAO;IAC1C,gFAAgF;IAChF,IAAI,EAAE,MAAM,CAAA;IACZ;;+BAE2B;IAC3B,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,EAAE,CAAC,CAAA;CAC9C;AAED,MAAM,WAAW,yBAAyB,CAAC,OAAO;IAChD,IAAI,EAAE,MAAM,CAAA;IACZ,OAAO,EAAE,OAAO,EAAE,CAAA;IAClB;iFAC6E;IAC7E,KAAK,CAAC,EAAE,MAAM,CAAA;CACf;AAED,MAAM,WAAW,oBAAoB;IACnC;sFACkF;IAClF,YAAY,CAAC,EAAE,MAAM,CAAA;CACtB;AAED,MAAM,WAAW,aAAa,CAAC,OAAO;IACpC,MAAM,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,oBAAoB,KAAK,OAAO,CAAC,yBAAyB,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA;CACzG;AAMD;;;;GAIG;AACH,wBAAgB,mBAAmB,CAAC,OAAO,EACzC,QAAQ,EAAE,aAAa,CAAC,mBAAmB,CAAC,OAAO,CAAC,CAAC,GACpD,aAAa,CAAC,OAAO,CAAC,CAgBxB"}
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Purpose: Multi-entity search orchestrator — parallel execution + result merging
|
|
3
|
+
*
|
|
4
|
+
* Extracted from GoTimer's `search_all()` pattern (src/lib/search.ts, ~291 lines):
|
|
5
|
+
* that function hardcoded "timer pages" and "blog posts" as two DB queries run via
|
|
6
|
+
* `Promise.all` inside one function body. This generalizes the same shape to any
|
|
7
|
+
* number of app-defined entity types, with two differences GoTimer's version didn't
|
|
8
|
+
* need: entities run under `Promise.allSettled` rather than `Promise.all` (GoTimer
|
|
9
|
+
* wrapped its *whole* DB step in one try/catch, so one failing query zeroed out every
|
|
10
|
+
* DB result for that call; here each entity type's failure is isolated to itself —
|
|
11
|
+
* a broken "friends" search shouldn't blank out working "memes"/"occasions" results),
|
|
12
|
+
* and results come back grouped by `type` rather than pre-flattened, since a
|
|
13
|
+
* consumer's "All results, top 3 per type" tab needs the grouping to slice against.
|
|
14
|
+
*
|
|
15
|
+
* Deliberately agnostic of any particular database or query shape — an entity's
|
|
16
|
+
* `search` function is just `(query: string) => Promise<TResult[]>`, so the caller
|
|
17
|
+
* decides what a "meme" or "friend" result row looks like (including any
|
|
18
|
+
* ownership/ACL scoping on the query itself); this module only fans the calls out
|
|
19
|
+
* and stitches the outcomes back together.
|
|
20
|
+
*/
|
|
21
|
+
function reasonToMessage(reason) {
|
|
22
|
+
return reason instanceof Error ? reason.message : String(reason);
|
|
23
|
+
}
|
|
24
|
+
/**
|
|
25
|
+
* Builds a search service from a fixed list of entity definitions. The returned
|
|
26
|
+
* `search(query)` runs every entity's `search` concurrently and resolves once all
|
|
27
|
+
* of them have settled — one way or another — never rejecting itself.
|
|
28
|
+
*/
|
|
29
|
+
export function createSearchService(entities) {
|
|
30
|
+
return {
|
|
31
|
+
async search(query, options) {
|
|
32
|
+
const settled = await Promise.allSettled(entities.map((entity) => entity.search(query)));
|
|
33
|
+
return entities.map((entity, index) => {
|
|
34
|
+
const outcome = settled[index];
|
|
35
|
+
if (outcome.status === 'rejected') {
|
|
36
|
+
return { type: entity.type, results: [], error: reasonToMessage(outcome.reason) };
|
|
37
|
+
}
|
|
38
|
+
const results = options?.limitPerType != null ? outcome.value.slice(0, options.limitPerType) : outcome.value;
|
|
39
|
+
return { type: entity.type, results };
|
|
40
|
+
});
|
|
41
|
+
}
|
|
42
|
+
};
|
|
43
|
+
}
|
|
44
|
+
//# sourceMappingURL=search-service.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"search-service.js","sourceRoot":"","sources":["../src/lib/search-service.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;;;;GAmBG;AA6BH,SAAS,eAAe,CAAC,MAAe;IACtC,OAAO,MAAM,YAAY,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAA;AAClE,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,mBAAmB,CACjC,QAAqD;IAErD,OAAO;QACL,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO;YACzB,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,UAAU,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,CAAA;YAExF,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,KAAK,EAAsC,EAAE;gBACxE,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAE,CAAA;gBAC/B,IAAI,OAAO,CAAC,MAAM,KAAK,UAAU,EAAE,CAAC;oBAClC,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,KAAK,EAAE,eAAe,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE,CAAA;gBACnF,CAAC;gBACD,MAAM,OAAO,GACX,OAAO,EAAE,YAAY,IAAI,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,KAAK,CAAA;gBAC9F,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,EAAE,CAAA;YACvC,CAAC,CAAC,CAAA;QACJ,CAAC;KACF,CAAA;AACH,CAAC"}
|
package/dist/server/index.d.ts
CHANGED
|
@@ -40,6 +40,8 @@ export type { AppliedMigration, RunMigrationsOptions } from '../migrations/runne
|
|
|
40
40
|
export { parseJsonbField } from '../utils/jsonb.js';
|
|
41
41
|
export { wrapResult, ok, err } from '../utils/result.js';
|
|
42
42
|
export type { DbResult } from '../utils/result.js';
|
|
43
|
+
export { createSearchService } from '../search-service.js';
|
|
44
|
+
export type { SearchService, SearchServiceEntity, SearchServiceEntityResult, SearchServiceOptions } from '../search-service.js';
|
|
43
45
|
export { AssertionError, assertNotEmpty, assertFound } from '../utils/assertions.js';
|
|
44
46
|
export { validateNextJsConfig, getConfigurationTips, type ValidationResult } from '../utils/config-validator.js';
|
|
45
47
|
export type { SqliteAdminService, SqliteTableType, TableSummary, TableSchema, TableColumn, TableForeignKey, RowPage, RowQueryOptions, SqliteWhereFilter, SqliteFilterOperator } from '../sqlite/admin-service.js';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/server/index.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/lib/server/index.ts"],"names":[],"mappings":"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"}
|
package/dist/server/index.js
CHANGED
|
@@ -53,6 +53,8 @@ export { runMigrations } from '../migrations/runner.js';
|
|
|
53
53
|
export { parseJsonbField } from '../utils/jsonb.js';
|
|
54
54
|
// Export result type utilities
|
|
55
55
|
export { wrapResult, ok, err } from '../utils/result.js';
|
|
56
|
+
// Export multi-entity search orchestrator
|
|
57
|
+
export { createSearchService } from '../search-service.js';
|
|
56
58
|
// Export assertion utilities
|
|
57
59
|
export { AssertionError, assertNotEmpty, assertFound } from '../utils/assertions.js';
|
|
58
60
|
// Export configuration validation utilities
|
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;AA0BlB,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"}
|
|
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;AA0BlB,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,0CAA0C;AAC1C,OAAO,EAAE,mBAAmB,EAAE,MAAM,sBAAsB,CAAA;AAQ1D,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.
|
|
3
|
+
"version": "4.6.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,10 +100,10 @@
|
|
|
100
100
|
"neo4j-driver": "^5.14.0"
|
|
101
101
|
},
|
|
102
102
|
"peerDependencies": {
|
|
103
|
-
"hazo_config": "^2.
|
|
104
|
-
"hazo_core": "^2.
|
|
105
|
-
"hazo_i18n": "^0.
|
|
106
|
-
"hazo_ui": "^6.
|
|
103
|
+
"hazo_config": "^2.7.2",
|
|
104
|
+
"hazo_core": "^2.5.0",
|
|
105
|
+
"hazo_i18n": "^0.17.0",
|
|
106
|
+
"hazo_ui": "^6.21.0",
|
|
107
107
|
"lucide-react": "^0.553.0",
|
|
108
108
|
"next": "^14.0.0 || ^16.0.0",
|
|
109
109
|
"react": "^18.0.0 || ^19.0.0",
|
|
@@ -160,13 +160,13 @@
|
|
|
160
160
|
"@types/sql.js": "^1.4.9",
|
|
161
161
|
"eslint": "^8.57.0",
|
|
162
162
|
"eslint-config-next": "14.2.33",
|
|
163
|
-
"hazo_config": "^2.
|
|
163
|
+
"hazo_config": "^2.7.2",
|
|
164
164
|
"hazo_core": "^2.5.0",
|
|
165
165
|
"hazo_debug": "^3.3.0",
|
|
166
|
-
"hazo_logs": "^2.3.
|
|
166
|
+
"hazo_logs": "^2.3.1",
|
|
167
167
|
"ioredis": "^5.3.2",
|
|
168
168
|
"neo4j-driver": "^5.14.0",
|
|
169
|
-
"hazo_ui": "^6.
|
|
169
|
+
"hazo_ui": "^6.21.0",
|
|
170
170
|
"jest": "^30.2.0",
|
|
171
171
|
"jest-environment-node": "^30.2.0",
|
|
172
172
|
"lucide-react": "^0.553.0",
|