@weave-kit/engine 2.1.0 → 2.1.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/CHANGELOG.md +30 -1
- package/dist/cli/commands/doctor.d.ts.map +1 -1
- package/dist/cli/commands/doctor.js +7 -4
- package/dist/cli/commands/doctor.js.map +1 -1
- package/dist/core/rbac/rls.d.ts.map +1 -1
- package/dist/core/rbac/rls.js +4 -2
- package/dist/core/rbac/rls.js.map +1 -1
- package/dist/core/storage/pool.d.ts +13 -4
- package/dist/core/storage/pool.d.ts.map +1 -1
- package/dist/core/storage/pool.js +27 -5
- package/dist/core/storage/pool.js.map +1 -1
- package/dist/core/storage/schema-scope.d.ts +7 -4
- package/dist/core/storage/schema-scope.d.ts.map +1 -1
- package/dist/core/storage/schema-scope.js +7 -4
- package/dist/core/storage/schema-scope.js.map +1 -1
- package/dist/experimental.d.ts +1 -0
- package/dist/experimental.d.ts.map +1 -1
- package/dist/experimental.js +1 -0
- package/dist/experimental.js.map +1 -1
- package/dist/version.d.ts +1 -1
- package/dist/version.js +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -5,6 +5,33 @@ the project uses [Semantic Versioning](https://semver.org/).
|
|
|
5
5
|
|
|
6
6
|
## [Unreleased]
|
|
7
7
|
|
|
8
|
+
## [2.1.1] - 2026-10-13
|
|
9
|
+
|
|
10
|
+
Patch: `systemSchema` search-path handling, an experimental export, and doc corrections.
|
|
11
|
+
|
|
12
|
+
### Added
|
|
13
|
+
|
|
14
|
+
- **`buildDeploymentReport`** (and its `DeploymentReport` / `DeploymentReportInput` types) is now
|
|
15
|
+
exported from `@weave-kit/engine/experimental`, matching the `weave doctor --report` note.
|
|
16
|
+
|
|
17
|
+
### Fixed
|
|
18
|
+
|
|
19
|
+
- **`systemSchema` no longer clobbers the connection's `search_path`.** The runtime now **appends**
|
|
20
|
+
the system schema to the effective path per connection (pg-pool `onConnect`) instead of replacing
|
|
21
|
+
`options`. Previously a URL `options` silently dropped the system schema (engine tables then
|
|
22
|
+
unresolved) and, without one, the role's object schema was overwritten — so a non-`public` object
|
|
23
|
+
schema (e.g. `app`) could not be used together with `systemSchema`.
|
|
24
|
+
- `weave doctor`'s missing-role hand-off SQL now quotes identifiers and adds
|
|
25
|
+
`GRANT <role> TO <current_user>` (required for `SET LOCAL ROLE`).
|
|
26
|
+
|
|
27
|
+
### Docs
|
|
28
|
+
|
|
29
|
+
- `schema-scope` / `rls` comments: the runtime resolves engine tables via `search_path`, and the
|
|
30
|
+
`rls.enforce` object-path exception is called out.
|
|
31
|
+
- 2.0 migration guide + changelog record the `auth.oidc.tenantClaim` → `scopeClaim` /
|
|
32
|
+
`claims.tenantId` → `claims.scopeId` rename.
|
|
33
|
+
- Contract-freeze: new externally-visible capabilities land in `./experimental` first.
|
|
34
|
+
|
|
8
35
|
## [2.1.0] - 2026-10-12
|
|
9
36
|
|
|
10
37
|
Additive + internal (no `CONTRACT_VERSION` bump).
|
|
@@ -40,7 +67,9 @@ Additive + internal (no `CONTRACT_VERSION` bump).
|
|
|
40
67
|
`withDefaultTenant`, `principalTenantId`, `tenantOf`, the `.tenantId` property on
|
|
41
68
|
`IdentitySubject`/`AuditEvent`/`DataAccessContext`, and the `weavekit_audit.tenant_id` column/index
|
|
42
69
|
(now `scope_id` / `weavekit_audit_scope_idx`). Use `scope` / `scopeId` / `EngineConfig.scope` /
|
|
43
|
-
`weavekit.scope_id`. The `object.tenant.immutable` error code is now `object.scope.immutable`.
|
|
70
|
+
`weavekit.scope_id`. The `object.tenant.immutable` error code is now `object.scope.immutable`. The
|
|
71
|
+
OIDC options `auth.oidc.tenantClaim` and the surfaced `claims.tenantId` are now
|
|
72
|
+
`auth.oidc.scopeClaim` / `claims.scopeId`.
|
|
44
73
|
|
|
45
74
|
### Removed
|
|
46
75
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/doctor.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"doctor.d.ts","sourceRoot":"","sources":["../../../src/cli/commands/doctor.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAwB,KAAK,YAAY,EAAE,MAAM,yBAAyB,CAAC;AAIlF,OAAO,EAAmB,KAAK,WAAW,EAAE,KAAK,aAAa,EAAE,KAAK,YAAY,EAAE,MAAM,mBAAmB,CAAC;AAE7G;;;;;;GAMG;AACH,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,uBAAuB,CAAC;IAC9B,WAAW,EAAE,MAAM,CAAC;IACpB,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAE,CAAC;IACrD,OAAO,EAAE;QAAE,IAAI,EAAE,MAAM,CAAC;QAAC,QAAQ,EAAE,MAAM,CAAC;QAAC,eAAe,CAAC,EAAE,MAAM,CAAA;KAAE,CAAC;IACtE,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,MAAM,EAAE;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,MAAM,EAAE,MAAM,CAAC;QAAC,eAAe,EAAE,MAAM,CAAA;KAAE,CAAC;IACrE,UAAU,EAAE;QACV,KAAK,CAAC,EAAE;YAAE,IAAI,EAAE,MAAM,CAAA;SAAE,CAAC;QACzB,MAAM,EAAE,OAAO,CAAC;QAChB,QAAQ,EAAE,OAAO,CAAC;QAClB,MAAM,EAAE,OAAO,CAAC;QAChB,KAAK,EAAE,OAAO,CAAC;KAChB,CAAC;IACF,QAAQ,EAAE;QAAE,IAAI,EAAE,OAAO,CAAC;QAAC,GAAG,EAAE,OAAO,CAAC;QAAC,OAAO,EAAE,OAAO,CAAC;QAAC,MAAM,EAAE,OAAO,CAAA;KAAE,CAAC;IAC7E,QAAQ,EAAE;QAAE,UAAU,EAAE,OAAO,CAAC;QAAC,KAAK,EAAE,OAAO,CAAC;QAAC,YAAY,EAAE,OAAO,CAAA;KAAE,CAAC;IACzE,QAAQ,EAAE;QAAE,IAAI,EAAE,MAAM,GAAG,QAAQ,GAAG,UAAU,GAAG,MAAM,GAAG,UAAU,CAAA;KAAE,CAAC;IACzE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;CAChC;AAYD,MAAM,WAAW,qBAAqB;IACpC,MAAM,EAAE,YAAY,CAAC;IACrB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,MAAM,EAAE,SAAS,WAAW,EAAE,CAAC;IAC/B,GAAG,CAAC,EAAE,IAAI,CAAC;CACZ;AAED,2DAA2D;AAC3D,wBAAgB,qBAAqB,CAAC,KAAK,EAAE,qBAAqB,GAAG,gBAAgB,CAoDpF;AAuBD,wFAAwF;AACxF,wBAAsB,SAAS,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,CAsLlE;AAED,mGAAmG;AACnG,wBAAsB,qBAAqB,CACzC,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,YAAY,EACpB,MAAM,EAAE,MAAM,GAAG,IAAI,GACpB,OAAO,CAAC,MAAM,CAAC,CAqBjB;AAED,mFAAmF;AACnF,wBAAsB,MAAM,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,GAAG,OAAO,CAAC,IAAI,CAAC,CAsC/E"}
|
|
@@ -2,7 +2,7 @@ import { createRequire } from 'node:module';
|
|
|
2
2
|
import { writeFile } from 'node:fs/promises';
|
|
3
3
|
import { join } from 'node:path';
|
|
4
4
|
import kleur from 'kleur';
|
|
5
|
-
import { buildMappingReport, buildSystemTables, createPool, createSchemaScope, diffAll, inspectSchema, planObjectRls, } from '../../core/index.js';
|
|
5
|
+
import { buildMappingReport, buildSystemTables, createPool, createSchemaScope, diffAll, inspectSchema, planObjectRls, sqlIdent, } from '../../core/index.js';
|
|
6
6
|
import { loadSchemaDir } from '../../runtime/git/index.js';
|
|
7
7
|
import { resolveObjectRlsRole } from '../../runtime/engine.js';
|
|
8
8
|
import { version, CONTRACT_VERSION } from '../../version.js';
|
|
@@ -247,9 +247,12 @@ export async function runDoctor(cwd) {
|
|
|
247
247
|
add('role-createrole', DOCTOR_STATUSES.PASS, `RLS role(s) present: ${roles.join(', ')}`);
|
|
248
248
|
}
|
|
249
249
|
else {
|
|
250
|
-
const priv = await pool.query('SELECT rolsuper OR rolcreaterole AS can_create FROM pg_roles WHERE rolname = current_user');
|
|
251
|
-
const
|
|
252
|
-
const
|
|
250
|
+
const priv = await pool.query('SELECT rolsuper OR rolcreaterole AS can_create, current_user::text AS me FROM pg_roles WHERE rolname = current_user');
|
|
251
|
+
const row = priv.rows[0];
|
|
252
|
+
const canCreate = row?.can_create === true;
|
|
253
|
+
// a DBA-created role still needs membership for `SET LOCAL ROLE`, so the hand-off SQL grants it
|
|
254
|
+
const me = row?.me ?? 'current_user';
|
|
255
|
+
const sql = missing.map((role) => `CREATE ROLE ${sqlIdent(role)}; GRANT ${sqlIdent(role)} TO ${sqlIdent(me)};`).join(' ');
|
|
253
256
|
if (canCreate) {
|
|
254
257
|
add('role-createrole', DOCTOR_STATUSES.WARN, `role(s) ${missing.join(', ')} missing — "weave migrate" creates them (current_user has CREATEROLE)`);
|
|
255
258
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../src/cli/commands/doctor.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"doctor.js","sourceRoot":"","sources":["../../../src/cli/commands/doctor.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rls.d.ts","sourceRoot":"","sources":["../../../src/core/rbac/rls.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAa,MAAM,mBAAmB,CAAC;AAKrE,OAAO,EAA0C,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;
|
|
1
|
+
{"version":3,"file":"rls.d.ts","sourceRoot":"","sources":["../../../src/core/rbac/rls.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,gBAAgB,EAAa,MAAM,mBAAmB,CAAC;AAKrE,OAAO,EAA0C,KAAK,YAAY,EAAE,MAAM,cAAc,CAAC;AAiCzF,wBAAgB,UAAU,CAAC,GAAG,EAAE,gBAAgB,GAAG,MAAM,CAExD;AAUD;;;;;GAKG;AACH,wBAAgB,cAAc,CAAC,GAAG,EAAE,gBAAgB,GAAG,MAAM,GAAG,SAAS,CAQxE;AA4BD,qFAAqF;AACrF,wBAAgB,iBAAiB,CAAC,GAAG,EAAE,gBAAgB,GAAG,MAAM,EAAE,CAQjE;AAED,8DAA8D;AAC9D,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,MAAM,CAE5E;AAED;;;;GAIG;AACH,wBAAgB,gBAAgB,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAE3D;AAED;;;;;GAKG;AACH,eAAO,MAAM,uBAAuB,oBAAoB,CAAC;AAEzD,qEAAqE;AACrE,eAAO,MAAM,mBAAmB;;;;CAItB,CAAC;AAEX,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,CAAC,OAAO,mBAAmB,CAAC,CAAC,MAAM,OAAO,mBAAmB,CAAC,CAAC;IACrE,OAAO,EAAE,QAAQ,GAAG,QAAQ,GAAG,QAAQ,CAAC;IACxC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AA6ED;;;;;;GAMG;AACH,wBAAgB,sBAAsB,CAAC,MAAM,EAAE,YAAY,EAAE,GAAG,EAAE,gBAAgB,GAAG,eAAe,EAAE,CAYrG;AAkCD;;;;GAIG;AACH,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAGnD"}
|
package/dist/core/rbac/rls.js
CHANGED
|
@@ -6,8 +6,10 @@ import { buildRowScopeFor, resolvePermissionFor } from './details.js';
|
|
|
6
6
|
const q = (id) => `"${id}"`;
|
|
7
7
|
/**
|
|
8
8
|
* Row-level security policy generation for the script sandbox's restricted SQL
|
|
9
|
-
* (`this.db.query`). The engine's own data access runs as the table
|
|
10
|
-
* bypasses RLS (no `FORCE`), so row scoping stays in the application
|
|
9
|
+
* (`this.db.query`). The engine's own data access normally runs as the table
|
|
10
|
+
* owner, which bypasses RLS (no `FORCE`), so row scoping stays in the application
|
|
11
|
+
* layer there — **except** under `EngineConfig.rls.enforce`, where the engine's
|
|
12
|
+
* customer-table access runs under the object role (see object-path RLS below).
|
|
11
13
|
* `db.query` switches to a dedicated non-owner role (`SET LOCAL ROLE`) that IS
|
|
12
14
|
* subject to RLS, and the subject is carried in session GUCs:
|
|
13
15
|
*
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rls.js","sourceRoot":"","sources":["../../../src/core/rbac/rls.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,aAAa,CAAC;AAEzC,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAqB,MAAM,cAAc,CAAC;AAGzF,MAAM,CAAC,GAAG,CAAC,EAAU,EAAE,EAAE,CAAC,IAAI,EAAE,GAAG,CAAC;AAEpC
|
|
1
|
+
{"version":3,"file":"rls.js","sourceRoot":"","sources":["../../../src/core/rbac/rls.ts"],"names":[],"mappings":"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"}
|
|
@@ -2,10 +2,19 @@ import pg from 'pg';
|
|
|
2
2
|
/** create a pg connection pool from a DATABASE_URL connection string */
|
|
3
3
|
export declare function createPool(databaseUrl: string, options?: pg.PoolConfig): pg.Pool;
|
|
4
4
|
/**
|
|
5
|
-
* Pool config that
|
|
6
|
-
*
|
|
7
|
-
*
|
|
8
|
-
*
|
|
5
|
+
* Pool config that makes the engine's own tables resolvable when `systemSchema`
|
|
6
|
+
* is set, **without disturbing the connection's existing `search_path`**.
|
|
7
|
+
*
|
|
8
|
+
* The runtime references its `weavekit_*` / record-meta / link tables unqualified
|
|
9
|
+
* (only `migrate` DDL uses explicit qualification), so they must be on the search
|
|
10
|
+
* path. Replacing the path via `options` would drop the object schema — which may
|
|
11
|
+
* come from the URL `options`, the role default or `PGOPTIONS` (and a later
|
|
12
|
+
* `-c search_path` wins anyway, so appending inside `options` does not work).
|
|
13
|
+
*
|
|
14
|
+
* Instead we **append** the system schema to whatever path is already in effect,
|
|
15
|
+
* per physical connection. `pg-pool` awaits `onConnect` before handing the client
|
|
16
|
+
* out, so the setting is present for every query; a failure rejects acquisition
|
|
17
|
+
* (fail-closed). `undefined` → the plain pool.
|
|
9
18
|
*/
|
|
10
19
|
export declare function searchPathOptions(systemSchema?: string): pg.PoolConfig;
|
|
11
20
|
//# sourceMappingURL=pool.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../../src/core/storage/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../../src/core/storage/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AAIpB,wEAAwE;AACxE,wBAAgB,UAAU,CAAC,WAAW,EAAE,MAAM,EAAE,OAAO,GAAE,EAAE,CAAC,UAAe,GAAG,EAAE,CAAC,IAAI,CAEpF;AAED;;;;;;;;;;;;;;GAcG;AACH,wBAAgB,iBAAiB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,EAAE,CAAC,UAAU,CAYtE"}
|
|
@@ -1,15 +1,37 @@
|
|
|
1
1
|
import pg from 'pg';
|
|
2
|
+
import { assertSchemaName } from './schema-scope.js';
|
|
3
|
+
import { sqlIdent } from './sql-literals.js';
|
|
2
4
|
/** create a pg connection pool from a DATABASE_URL connection string */
|
|
3
5
|
export function createPool(databaseUrl, options = {}) {
|
|
4
6
|
return new pg.Pool({ connectionString: databaseUrl, ...options });
|
|
5
7
|
}
|
|
6
8
|
/**
|
|
7
|
-
* Pool config that
|
|
8
|
-
*
|
|
9
|
-
*
|
|
10
|
-
*
|
|
9
|
+
* Pool config that makes the engine's own tables resolvable when `systemSchema`
|
|
10
|
+
* is set, **without disturbing the connection's existing `search_path`**.
|
|
11
|
+
*
|
|
12
|
+
* The runtime references its `weavekit_*` / record-meta / link tables unqualified
|
|
13
|
+
* (only `migrate` DDL uses explicit qualification), so they must be on the search
|
|
14
|
+
* path. Replacing the path via `options` would drop the object schema — which may
|
|
15
|
+
* come from the URL `options`, the role default or `PGOPTIONS` (and a later
|
|
16
|
+
* `-c search_path` wins anyway, so appending inside `options` does not work).
|
|
17
|
+
*
|
|
18
|
+
* Instead we **append** the system schema to whatever path is already in effect,
|
|
19
|
+
* per physical connection. `pg-pool` awaits `onConnect` before handing the client
|
|
20
|
+
* out, so the setting is present for every query; a failure rejects acquisition
|
|
21
|
+
* (fail-closed). `undefined` → the plain pool.
|
|
11
22
|
*/
|
|
12
23
|
export function searchPathOptions(systemSchema) {
|
|
13
|
-
|
|
24
|
+
if (systemSchema === undefined)
|
|
25
|
+
return {};
|
|
26
|
+
assertSchemaName(systemSchema);
|
|
27
|
+
const schema = sqlIdent(systemSchema);
|
|
28
|
+
return {
|
|
29
|
+
onConnect: async (client) => {
|
|
30
|
+
const res = await client.query("SELECT current_setting('search_path') AS path");
|
|
31
|
+
const current = res.rows[0]?.path?.trim() ?? '';
|
|
32
|
+
const next = current === '' ? schema : `${current}, ${schema}`;
|
|
33
|
+
await client.query('SELECT set_config(\'search_path\', $1, false)', [next]);
|
|
34
|
+
},
|
|
35
|
+
};
|
|
14
36
|
}
|
|
15
37
|
//# sourceMappingURL=pool.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../src/core/storage/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../../../src/core/storage/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,IAAI,CAAC;AACpB,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAC;AAE7C,wEAAwE;AACxE,MAAM,UAAU,UAAU,CAAC,WAAmB,EAAE,UAAyB,EAAE;IACzE,OAAO,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,gBAAgB,EAAE,WAAW,EAAE,GAAG,OAAO,EAAE,CAAC,CAAC;AACpE,CAAC;AAED;;;;;;;;;;;;;;GAcG;AACH,MAAM,UAAU,iBAAiB,CAAC,YAAqB;IACrD,IAAI,YAAY,KAAK,SAAS;QAAE,OAAO,EAAE,CAAC;IAC1C,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC/B,MAAM,MAAM,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;IACtC,OAAO;QACL,SAAS,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;YAC1B,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,KAAK,CAAmB,+CAA+C,CAAC,CAAC;YAClG,MAAM,OAAO,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;YAChD,MAAM,IAAI,GAAG,OAAO,KAAK,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,KAAK,MAAM,EAAE,CAAC;YAC/D,MAAM,MAAM,CAAC,KAAK,CAAC,+CAA+C,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9E,CAAC;KACF,CAAC;AACJ,CAAC"}
|
|
@@ -7,10 +7,13 @@
|
|
|
7
7
|
* tables. `EngineConfig.systemSchema` moves them into a dedicated schema so a
|
|
8
8
|
* DBA reviewing the customer schema does not see engine plumbing.
|
|
9
9
|
*
|
|
10
|
-
*
|
|
11
|
-
* identifier for an engine table is qualified with the configured
|
|
12
|
-
*
|
|
13
|
-
*
|
|
10
|
+
* Migration DDL and the metadata cache use **explicit qualification**: every
|
|
11
|
+
* emitted identifier for an engine table is qualified with the configured
|
|
12
|
+
* schema. The runtime data-access path instead references engine tables
|
|
13
|
+
* unqualified and resolves them via `search_path` — `searchPathOptions` appends
|
|
14
|
+
* the system schema to the effective path (see `pool.ts`). Identifiers left
|
|
15
|
+
* unqualified (customer + identity object tables) resolve to the object schema.
|
|
16
|
+
* `undefined` reproduces the legacy behaviour exactly.
|
|
14
17
|
*/
|
|
15
18
|
/** the schema that holds engine-owned tables; `undefined` = connection default */
|
|
16
19
|
export interface SchemaScope {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-scope.d.ts","sourceRoot":"","sources":["../../../src/core/storage/schema-scope.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"schema-scope.d.ts","sourceRoot":"","sources":["../../../src/core/storage/schema-scope.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAKH,kFAAkF;AAClF,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,4EAA4E;AAC5E,eAAO,MAAM,oBAAoB,EAAE,WAAgB,CAAC;AAEpD,gEAAgE;AAChE,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI,CAInD;AAED,kFAAkF;AAClF,wBAAgB,iBAAiB,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,WAAW,CAIpE;AAED,wDAAwD;AACxD,wBAAgB,QAAQ,CAAC,KAAK,CAAC,EAAE,WAAW,GAAG,OAAO,CAErD;AAED;;;;GAIG;AACH,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,CAAC,EAAE,WAAW,GAAG,MAAM,CAGtE"}
|
|
@@ -7,10 +7,13 @@
|
|
|
7
7
|
* tables. `EngineConfig.systemSchema` moves them into a dedicated schema so a
|
|
8
8
|
* DBA reviewing the customer schema does not see engine plumbing.
|
|
9
9
|
*
|
|
10
|
-
*
|
|
11
|
-
* identifier for an engine table is qualified with the configured
|
|
12
|
-
*
|
|
13
|
-
*
|
|
10
|
+
* Migration DDL and the metadata cache use **explicit qualification**: every
|
|
11
|
+
* emitted identifier for an engine table is qualified with the configured
|
|
12
|
+
* schema. The runtime data-access path instead references engine tables
|
|
13
|
+
* unqualified and resolves them via `search_path` — `searchPathOptions` appends
|
|
14
|
+
* the system schema to the effective path (see `pool.ts`). Identifiers left
|
|
15
|
+
* unqualified (customer + identity object tables) resolve to the object schema.
|
|
16
|
+
* `undefined` reproduces the legacy behaviour exactly.
|
|
14
17
|
*/
|
|
15
18
|
/** a validated lowercase PostgreSQL identifier */
|
|
16
19
|
const IDENTIFIER = /^[a-z_][a-z0-9_]*$/;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"schema-scope.js","sourceRoot":"","sources":["../../../src/core/storage/schema-scope.ts"],"names":[],"mappings":"AAAA
|
|
1
|
+
{"version":3,"file":"schema-scope.js","sourceRoot":"","sources":["../../../src/core/storage/schema-scope.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;;;GAgBG;AAEH,kDAAkD;AAClD,MAAM,UAAU,GAAG,oBAAoB,CAAC;AAOxC,4EAA4E;AAC5E,MAAM,CAAC,MAAM,oBAAoB,GAAgB,EAAE,CAAC;AAEpD,gEAAgE;AAChE,MAAM,UAAU,gBAAgB,CAAC,IAAY;IAC3C,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;QAC3B,MAAM,IAAI,KAAK,CAAC,yBAAyB,IAAI,qDAAqD,CAAC,CAAC;IACtG,CAAC;AACH,CAAC;AAED,kFAAkF;AAClF,MAAM,UAAU,iBAAiB,CAAC,YAAqB;IACrD,IAAI,YAAY,KAAK,SAAS;QAAE,OAAO,oBAAoB,CAAC;IAC5D,gBAAgB,CAAC,YAAY,CAAC,CAAC;IAC/B,OAAO,EAAE,YAAY,EAAE,CAAC;AAC1B,CAAC;AAED,wDAAwD;AACxD,MAAM,UAAU,QAAQ,CAAC,KAAmB;IAC1C,OAAO,KAAK,EAAE,YAAY,KAAK,SAAS,CAAC;AAC3C,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,YAAY,CAAC,IAAY,EAAE,KAAmB;IAC5D,MAAM,MAAM,GAAG,KAAK,EAAE,YAAY,CAAC;IACnC,OAAO,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,IAAI,IAAI,GAAG,CAAC,CAAC,CAAC,IAAI,MAAM,MAAM,IAAI,GAAG,CAAC;AACtE,CAAC"}
|
package/dist/experimental.d.ts
CHANGED
|
@@ -11,4 +11,5 @@ export * from './runtime/metadata/index.js';
|
|
|
11
11
|
export * from './runtime/tunnel/index.js';
|
|
12
12
|
export * from './adapters/ops/index.js';
|
|
13
13
|
export * from './infrastructure/index.js';
|
|
14
|
+
export { buildDeploymentReport, type DeploymentReport, type DeploymentReportInput, } from './cli/commands/doctor.js';
|
|
14
15
|
//# sourceMappingURL=experimental.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"experimental.d.ts","sourceRoot":"","sources":["../src/experimental.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC"}
|
|
1
|
+
{"version":3,"file":"experimental.d.ts","sourceRoot":"","sources":["../src/experimental.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,OAAO,EACL,qBAAqB,EACrB,KAAK,gBAAgB,EACrB,KAAK,qBAAqB,GAC3B,MAAM,0BAA0B,CAAC"}
|
package/dist/experimental.js
CHANGED
|
@@ -11,4 +11,5 @@ export * from './runtime/metadata/index.js';
|
|
|
11
11
|
export * from './runtime/tunnel/index.js';
|
|
12
12
|
export * from './adapters/ops/index.js';
|
|
13
13
|
export * from './infrastructure/index.js';
|
|
14
|
+
export { buildDeploymentReport, } from './cli/commands/doctor.js';
|
|
14
15
|
//# sourceMappingURL=experimental.js.map
|
package/dist/experimental.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"experimental.js","sourceRoot":"","sources":["../src/experimental.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC"}
|
|
1
|
+
{"version":3,"file":"experimental.js","sourceRoot":"","sources":["../src/experimental.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,cAAc,6BAA6B,CAAC;AAC5C,cAAc,2BAA2B,CAAC;AAC1C,cAAc,yBAAyB,CAAC;AACxC,cAAc,2BAA2B,CAAC;AAC1C,OAAO,EACL,qBAAqB,GAGtB,MAAM,0BAA0B,CAAC"}
|
package/dist/version.d.ts
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/** engine version — single source of truth for CLI, ops routes and MCP metadata */
|
|
2
|
-
export declare const version = "2.1.
|
|
2
|
+
export declare const version = "2.1.1";
|
|
3
3
|
/**
|
|
4
4
|
* Frozen public-contract version (G1). Bump only on a **breaking** change to the
|
|
5
5
|
* frozen surface (schema/workflow format, REST routes, MCP tool names, event
|
package/dist/version.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
/** engine version — single source of truth for CLI, ops routes and MCP metadata */
|
|
2
|
-
export const version = '2.1.
|
|
2
|
+
export const version = '2.1.1';
|
|
3
3
|
/**
|
|
4
4
|
* Frozen public-contract version (G1). Bump only on a **breaking** change to the
|
|
5
5
|
* frozen surface (schema/workflow format, REST routes, MCP tool names, event
|