@acorex-platform/framework-server 0.0.15 → 0.0.20

package/jql/postgres/src/lib/jql-postgres.engine.js

@@ -13,6 +13,24 @@ const query_builder_1 = require("./compile/query-builder");
 const document_mapper_1 = require("./document-mapper");
 const structured_document_mapper_1 = require("./structured-document-mapper");
 const postgres_connection_util_1 = require("./postgres-connection.util");
+//#region ---- Constants ----
+const POSTGRES_FIND_TOTAL_COLUMN = '__jql_total';
+function stripPostgresFindTotal(row) {
+    const { [POSTGRES_FIND_TOTAL_COLUMN]: _total, ...rest } = row;
+    return rest;
+}
+function readPostgresFindTotal(row) {
+    const raw = row?.[POSTGRES_FIND_TOTAL_COLUMN];
+    if (typeof raw === 'number' && Number.isFinite(raw)) {
+        return raw;
+    }
+    if (typeof raw === 'string' && raw.trim()) {
+        const parsed = Number(raw);
+        return Number.isFinite(parsed) ? parsed : undefined;
+    }
+    return undefined;
+}
+//#endregion
 //#region ---- PostgreSQL JQL engine ----
 class JqlPostgresEngine extends abstract_1.JqlEngineBase {
     constructor(config, registry, instanceName) {
@@ -53,17 +71,72 @@ class JqlPostgresEngine extends abstract_1.JqlEngineBase {
             collectionName: schema.collectionName ?? (0, abstract_1.entityNameToStorageName)(schema.entityName),
         };
         await this.autoMigrator.applyMigration(pool, normalized);
+        // Physical jsonb columns may outlive a later schema that maps the field as text.
+        // Keep JQL field types aligned so serialize/deserialize stay type-driven.
+        if (normalized.tableName) {
+            const source = this.findStructuredSourceForTable(normalized.tableName, normalized.entityName);
+            if (source) {
+                await this.alignJsonbFieldTypesFromPostgres(source, normalized.tableName);
+            }
+        }
+    }
+    findStructuredSourceForTable(tableName, entityName) {
+        const preferredName = (0, abstract_1.resolveEntityJqlSourceName)(entityName);
+        const byName = this.registry.tryGet(preferredName);
+        if (byName?.storage === 'structured') {
+            return byName;
+        }
+        return this.registry
+            .list()
+            .find((source) => source.storage === 'structured' &&
+            (source.table === tableName || (0, query_builder_1.resolvePostgresTableName)(source) === tableName));
+    }
+    /**
+     * Forces `fields[*].type = 'json'` for any physical column that is json/jsonb in Postgres.
+     */
+    async alignJsonbFieldTypesFromPostgres(source, tableName) {
+        if (!source.fields) {
+            return;
+        }
+        const pool = await this.ensurePool();
+        const result = await pool.query(`SELECT column_name, udt_name
+       FROM information_schema.columns
+       WHERE table_schema = 'public' AND table_name = $1`, [tableName]);
+        const jsonbColumns = new Set();
+        for (const row of result.rows) {
+            const udt = String(row['udt_name'] ?? '').toLowerCase();
+            if (udt === 'jsonb' || udt === 'json') {
+                jsonbColumns.add(String(row['column_name']));
+            }
+        }
+        if (!jsonbColumns.size) {
+            return;
+        }
+        let aligned = 0;
+        for (const descriptor of Object.values(source.fields)) {
+            if (!descriptor.column || !jsonbColumns.has(descriptor.column)) {
+                continue;
+            }
+            if (descriptor.type !== 'json') {
+                descriptor.type = 'json';
+                aligned += 1;
+            }
+        }
+        if (aligned > 0) {
+            this.logger.debug(`Aligned ${aligned} field type(s) to json from Postgres jsonb columns on ${tableName}`);
+        }
     }
     async executeFind(source, query) {
         await this.ensurePool();
         const { sql: fromSql, primaryAlias } = (0, query_builder_1.buildPostgresFrom)(source, this.registry, query.joins);
         const where = (0, query_builder_1.buildPostgresWhere)(source, primaryAlias, query.where);
-        const countSql = (0, pg_placeholders_util_1.applyPgPlaceholders)(`SELECT COUNT(*)::int AS total FROM ${fromSql} WHERE ${where.sql}`);
-        const countResult = await this.pool.query(countSql, where.params);
-        const total = countResult.rows[0]?.total ?? 0;
         const orderBy = (0, query_builder_1.buildPostgresOrderBy)(source, primaryAlias, query.sort, source.idField ?? 'id');
         const selectList = (0, query_builder_1.buildPostgresSelectList)(source, primaryAlias);
-        let listSql = `SELECT ${selectList} FROM ${fromSql} WHERE ${where.sql} ${orderBy}`;
+        const includeTotal = query.includeTotal !== false;
+        const selectSql = includeTotal
+            ? `${selectList}, COUNT(*) OVER()::int AS ${POSTGRES_FIND_TOTAL_COLUMN}`
+            : selectList;
+        let listSql = `SELECT ${selectSql} FROM ${fromSql} WHERE ${where.sql} ${orderBy}`;
         const listParams = [...where.params];
         const skip = query.skip ?? 0;
         const take = query.take ?? 0;
@@ -76,8 +149,18 @@ class JqlPostgresEngine extends abstract_1.JqlEngineBase {
             listParams.push(skip);
         }
         const listResult = await this.pool.query((0, pg_placeholders_util_1.applyPgPlaceholders)(listSql), listParams);
-        const items = listResult.rows.map((row) => this.rowToItem(source, row));
-        return { total, items };
+        const items = listResult.rows.map((row) => this.rowToItem(source, stripPostgresFindTotal(row)));
+        if (!includeTotal) {
+            return { items };
+        }
+        const totalFromRows = readPostgresFindTotal(listResult.rows[0]);
+        if (typeof totalFromRows === 'number') {
+            return { total: totalFromRows, items };
+        }
+        if (skip > 0 && items.length === 0) {
+            return { total: await this.executeCount(source, query), items };
+        }
+        return { total: 0, items };
     }
     async executeCount(source, query) {
         await this.ensurePool();
@@ -168,13 +251,14 @@ class JqlPostgresEngine extends abstract_1.JqlEngineBase {
                 const native = this.extractNativeColumns(source, merged);
                 const setCols = [source.documentColumn, ...Object.keys(native)];
                 const setVals = [(0, document_mapper_1.serializeDocument)(merged), ...Object.values(native)];
-                const updateSql = (0, pg_placeholders_util_1.applyPgPlaceholders)(`UPDATE ${source.table} SET ${setCols.map((c) => `${c} = ?`).join(', ')} WHERE ${idCol} = ?`);
+                const tableName = (0, pg_placeholders_util_1.quotePgIdentifier)((0, query_builder_1.resolvePostgresTableName)(source));
+                const updateSql = (0, pg_placeholders_util_1.applyPgPlaceholders)(`UPDATE ${tableName} SET ${setCols.map((c) => `${(0, pg_placeholders_util_1.quotePgIdentifier)(c)} = ?`).join(', ')} WHERE ${(0, pg_placeholders_util_1.quotePgIdentifier)(idCol)} = ?`);
                 await this.pool.query(updateSql, [...setVals, row.__jql_id]);
                 changes++;
             }
             return changes;
         }
-        const setParts = Object.keys(command.set).map((k) => `${k} = ?`);
+        const setParts = Object.keys(command.set).map((k) => `${(0, pg_placeholders_util_1.quotePgIdentifier)(k)} = ?`);
         const updateSql = (0, pg_placeholders_util_1.applyPgPlaceholders)(`UPDATE ${fromSql} SET ${setParts.join(', ')} WHERE ${where.sql}`);
         const result = await this.pool.query(updateSql, [
             ...Object.values(command.set),
@@ -184,8 +268,9 @@ class JqlPostgresEngine extends abstract_1.JqlEngineBase {
     }
     async executeDelete(source, command) {
         await this.ensurePool();
+        const tableName = (0, pg_placeholders_util_1.quotePgIdentifier)((0, query_builder_1.resolvePostgresTableName)(source));
         const where = (0, query_builder_1.buildPostgresWhere)(source, '', command.where);
-        const deleteSql = (0, pg_placeholders_util_1.applyPgPlaceholders)(`DELETE FROM ${source.table} WHERE ${where.sql}`);
+        const deleteSql = (0, pg_placeholders_util_1.applyPgPlaceholders)(`DELETE FROM ${tableName} WHERE ${where.sql}`);
         const result = await this.pool.query(deleteSql, where.params);
         return result.rowCount ?? 0;
     }
@@ -223,41 +308,64 @@ class JqlPostgresEngine extends abstract_1.JqlEngineBase {
             const row = (0, structured_document_mapper_1.serializeStructuredRow)(source, (0, structured_document_mapper_1.mapDocumentToStructuredRow)(source, fullDoc));
             const columns = Object.keys(row);
             const quotedColumns = columns.map(pg_placeholders_util_1.quotePgIdentifier);
-            const tableName = (0, pg_placeholders_util_1.quotePgIdentifier)((0, query_builder_1.resolvePostgresTableName)(source));
+            const physicalTable = (0, query_builder_1.resolvePostgresTableName)(source);
+            const tableName = (0, pg_placeholders_util_1.quotePgIdentifier)(physicalTable);
             const sql = (0, pg_placeholders_util_1.applyPgPlaceholders)(`INSERT INTO ${tableName} (${quotedColumns.join(', ')}) VALUES (${columns.map(() => '?').join(', ')}) ON CONFLICT (${(0, pg_placeholders_util_1.quotePgIdentifier)('id')}) DO UPDATE SET ${columns
                 .filter((column) => column !== 'id')
                 .map((column) => `${(0, pg_placeholders_util_1.quotePgIdentifier)(column)} = EXCLUDED.${(0, pg_placeholders_util_1.quotePgIdentifier)(column)}`)
                 .join(', ')}`);
-            await client.query(sql, columns.map((column) => row[column]));
+            const values = columns.map((column) => row[column]);
+            try {
+                await client.query(sql, values);
+            }
+            catch (error) {
+                const preview = columns
+                    .map((column) => {
+                    const value = row[column];
+                    const shown = typeof value === 'string'
+                        ? value.slice(0, 80)
+                        : value === null || value === undefined
+                            ? String(value)
+                            : `${typeof value}:${JSON.stringify(value)?.slice(0, 60)}`;
+                    return `${column}=${shown}`;
+                })
+                    .join('; ');
+                const message = error instanceof Error ? error.message : String(error);
+                throw Object.assign(new Error(`JQL insert into "${physicalTable}" failed: ${message}. Values: ${preview}`), { cause: error });
+            }
             return id;
         }
         if (source.storage === 'document' && source.documentColumn) {
             const fullDoc = { ...doc, [idField]: id };
             const native = this.extractNativeColumns(source, fullDoc);
             const columns = [source.documentColumn, ...Object.keys(native)];
+            const quotedColumns = columns.map(pg_placeholders_util_1.quotePgIdentifier);
             const placeholders = columns.map(() => '?').join(', ');
             const values = [(0, document_mapper_1.serializeDocument)(fullDoc), ...Object.values(native)];
+            const tableName = (0, pg_placeholders_util_1.quotePgIdentifier)((0, query_builder_1.resolvePostgresTableName)(source));
+            const documentColumn = (0, pg_placeholders_util_1.quotePgIdentifier)(source.documentColumn);
             const conflictCols = Object.keys(native).length
                 ? `, ${Object.keys(native)
-                    .map((c) => `${c} = EXCLUDED.${c}`)
+                    .map((c) => `${(0, pg_placeholders_util_1.quotePgIdentifier)(c)} = EXCLUDED.${(0, pg_placeholders_util_1.quotePgIdentifier)(c)}`)
                     .join(', ')}`
                 : '';
             const idCol = source.fields?.[idField]?.column ?? idField;
             const entityCol = source.fields?.['entityName']?.column;
             if (entityCol) {
-                const sql = (0, pg_placeholders_util_1.applyPgPlaceholders)(`INSERT INTO ${source.table} (${columns.join(', ')}) VALUES (${placeholders})
-           ON CONFLICT (entity_name, id) DO UPDATE SET ${source.documentColumn} = EXCLUDED.${source.documentColumn}${conflictCols}`);
+                const sql = (0, pg_placeholders_util_1.applyPgPlaceholders)(`INSERT INTO ${tableName} (${quotedColumns.join(', ')}) VALUES (${placeholders})
+           ON CONFLICT (${(0, pg_placeholders_util_1.quotePgIdentifier)('entity_name')}, ${(0, pg_placeholders_util_1.quotePgIdentifier)('id')}) DO UPDATE SET ${documentColumn} = EXCLUDED.${documentColumn}${conflictCols}`);
                 await client.query(sql, values);
             }
             else {
-                const sql = (0, pg_placeholders_util_1.applyPgPlaceholders)(`INSERT INTO ${source.table} (${columns.join(', ')}) VALUES (${placeholders})
-           ON CONFLICT (${idCol}) DO UPDATE SET ${source.documentColumn} = EXCLUDED.${source.documentColumn}${conflictCols}`);
+                const sql = (0, pg_placeholders_util_1.applyPgPlaceholders)(`INSERT INTO ${tableName} (${quotedColumns.join(', ')}) VALUES (${placeholders})
+           ON CONFLICT (${(0, pg_placeholders_util_1.quotePgIdentifier)(idCol)}) DO UPDATE SET ${documentColumn} = EXCLUDED.${documentColumn}${conflictCols}`);
                 await client.query(sql, values);
             }
             return id;
         }
         const columns = Object.keys(doc);
-        const sql = (0, pg_placeholders_util_1.applyPgPlaceholders)(`INSERT INTO ${source.table} (${columns.join(', ')}) VALUES (${columns.map(() => '?').join(', ')})`);
+        const tableName = (0, pg_placeholders_util_1.quotePgIdentifier)((0, query_builder_1.resolvePostgresTableName)(source));
+        const sql = (0, pg_placeholders_util_1.applyPgPlaceholders)(`INSERT INTO ${tableName} (${columns.map(pg_placeholders_util_1.quotePgIdentifier).join(', ')}) VALUES (${columns.map(() => '?').join(', ')})`);
         await client.query(sql, columns.map((c) => doc[c]));
         return id;
     }

package/jql/postgres/src/lib/jql-postgres.engine.js.map

@@ -1 +1 @@
-{"version":3,"file":"jql-postgres.engine.js","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/postgres/src/lib/jql-postgres.engine.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"jql-postgres.engine.js","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/postgres/src/lib/jql-postgres.engine.ts"],"names":[],"mappings":"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"}

package/jql/postgres/src/lib/structured-document-mapper.d.ts

@@ -1,7 +1,23 @@
 import { JqlFieldDescriptor, JqlSource } from '@acorex-platform/framework-server/jql/abstract';
 export declare function mapDocumentToStructuredRow(source: JqlSource, doc: Record<string, unknown>): Record<string, unknown>;
 export declare function mapStructuredRowToDocument(source: JqlSource, row: Record<string, unknown>): Record<string, unknown>;
-/** Serializes structured column values for PostgreSQL parameter binding. */
+/**
+ * Serializes values for PostgreSQL parameter binding based on the field's
+ * declared JQL type (from entity/plugin definitions) — not value heuristics.
+ */
 export declare function serializeStructuredColumnValue(value: unknown, fieldType?: JqlFieldDescriptor['type']): unknown;
+/**
+ * Deserializes column values based on declared JQL field type only.
+ *
+ * For `json` fields, strings are parsed as JSON. Legacy node-pg text-array
+ * literals (`{"a","b"}`) are accepted only for `json` fields when JSON.parse fails
+ * (data written before array/MLS columns were typed as jsonb).
+ */
+export declare function deserializeStructuredColumnValue(value: unknown, fieldType?: JqlFieldDescriptor['type']): unknown;
+/**
+ * Parses a Postgres text-array literal (`{}` / `{a,b}` / `{"a","b"}`).
+ * Returns null when the value looks like a JSON object (`{"key":…}`).
+ */
+export declare function tryParsePostgresTextArray(value: string): unknown[] | null;
 export declare function serializeStructuredRow(source: JqlSource, row: Record<string, unknown>): Record<string, unknown>;
 //# sourceMappingURL=structured-document-mapper.d.ts.map

package/jql/postgres/src/lib/structured-document-mapper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"structured-document-mapper.d.ts","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/postgres/src/lib/structured-document-mapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAC;AAI/F,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,SAAS,EACjB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAuBzB;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,SAAS,EACjB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAgBzB;AAED,4EAA4E;AAC5E,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,OAAO,EACd,SAAS,CAAC,EAAE,kBAAkB,CAAC,MAAM,CAAC,GACrC,OAAO,CAmCT;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,SAAS,EACjB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzB"}
+{"version":3,"file":"structured-document-mapper.d.ts","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/postgres/src/lib/structured-document-mapper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAC;AAI/F,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,SAAS,EACjB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAuBzB;AAED,wBAAgB,0BAA0B,CACxC,MAAM,EAAE,SAAS,EACjB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAmBzB;AAED;;;GAGG;AACH,wBAAgB,8BAA8B,CAC5C,KAAK,EAAE,OAAO,EACd,SAAS,CAAC,EAAE,kBAAkB,CAAC,MAAM,CAAC,GACrC,OAAO,CA4CT;AAED;;;;;;GAMG;AACH,wBAAgB,gCAAgC,CAC9C,KAAK,EAAE,OAAO,EACd,SAAS,CAAC,EAAE,kBAAkB,CAAC,MAAM,CAAC,GACrC,OAAO,CAoCT;AAED;;;GAGG;AACH,wBAAgB,yBAAyB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,EAAE,GAAG,IAAI,CA6DzE;AAED,wBAAgB,sBAAsB,CACpC,MAAM,EAAE,SAAS,EACjB,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAC3B,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CASzB"}

package/jql/postgres/src/lib/structured-document-mapper.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.mapDocumentToStructuredRow = mapDocumentToStructuredRow;
 exports.mapStructuredRowToDocument = mapStructuredRowToDocument;
 exports.serializeStructuredColumnValue = serializeStructuredColumnValue;
+exports.deserializeStructuredColumnValue = deserializeStructuredColumnValue;
+exports.tryParsePostgresTextArray = tryParsePostgresTextArray;
 exports.serializeStructuredRow = serializeStructuredRow;
 const lodash_es_1 = require("lodash-es");
 //#region ---- Structured document mapping ----
@@ -33,13 +35,16 @@ function mapStructuredRowToDocument(source, row) {
                 continue;
             }
             if (descriptor.column in row) {
-                doc[logical] = row[descriptor.column];
+                doc[logical] = deserializeStructuredColumnValue(row[descriptor.column], descriptor.type);
             }
         }
     }
     return doc;
 }
-/** Serializes structured column values for PostgreSQL parameter binding. */
+/**
+ * Serializes values for PostgreSQL parameter binding based on the field's
+ * declared JQL type (from entity/plugin definitions) — not value heuristics.
+ */
 function serializeStructuredColumnValue(value, fieldType) {
     if (value === undefined || value === null) {
         return value;
@@ -63,12 +68,119 @@ function serializeStructuredColumnValue(value, fieldType) {
         if (typeof value === 'string' && value.trim() !== '' && !Number.isNaN(Number(value))) {
             return Number(value);
         }
+        return value;
+    }
+    if (fieldType === 'json') {
+        // Always emit JSON text for jsonb/json columns. Plain JS strings become JSON
+        // string scalars (`"Platform"`), not raw text (which Postgres rejects as json).
+        return JSON.stringify(value, structuredJsonReplacer);
     }
-    if (fieldType === 'json' || (fieldType === undefined && typeof value === 'object')) {
+    // Objects/arrays must not bind as raw JS parameters on TEXT columns either.
+    if (typeof value === 'object') {
         return JSON.stringify(value, structuredJsonReplacer);
     }
     return value;
 }
+/**
+ * Deserializes column values based on declared JQL field type only.
+ *
+ * For `json` fields, strings are parsed as JSON. Legacy node-pg text-array
+ * literals (`{"a","b"}`) are accepted only for `json` fields when JSON.parse fails
+ * (data written before array/MLS columns were typed as jsonb).
+ */
+function deserializeStructuredColumnValue(value, fieldType) {
+    if (value === undefined || value === null) {
+        return value;
+    }
+    // node-pg returns PostgreSQL NUMERIC as string; coerce to JS number for JQL number fields.
+    if (fieldType === 'number') {
+        if (typeof value === 'number') {
+            return value;
+        }
+        if (typeof value === 'string' && value.trim() !== '') {
+            const parsed = Number(value);
+            return Number.isFinite(parsed) ? parsed : value;
+        }
+        return value;
+    }
+    if (fieldType !== 'json') {
+        return value;
+    }
+    if (typeof value !== 'string') {
+        return value;
+    }
+    const trimmed = value.trim();
+    if (!trimmed) {
+        return value;
+    }
+    try {
+        return JSON.parse(trimmed);
+    }
+    catch {
+        const pgArray = tryParsePostgresTextArray(trimmed);
+        return pgArray ?? value;
+    }
+}
+/**
+ * Parses a Postgres text-array literal (`{}` / `{a,b}` / `{"a","b"}`).
+ * Returns null when the value looks like a JSON object (`{"key":…}`).
+ */
+function tryParsePostgresTextArray(value) {
+    const trimmed = value.trim();
+    if (!trimmed.startsWith('{') || !trimmed.endsWith('}')) {
+        return null;
+    }
+    if (/"\s*:/.test(trimmed)) {
+        return null;
+    }
+    const inner = trimmed.slice(1, -1);
+    if (!inner.trim()) {
+        return [];
+    }
+    const elements = [];
+    let i = 0;
+    while (i < inner.length) {
+        while (i < inner.length && /\s/.test(inner[i])) {
+            i += 1;
+        }
+        if (i >= inner.length) {
+            break;
+        }
+        if (inner[i] === '"') {
+            i += 1;
+            let token = '';
+            while (i < inner.length) {
+                if (inner[i] === '\\' && i + 1 < inner.length) {
+                    token += inner[i + 1];
+                    i += 2;
+                    continue;
+                }
+                if (inner[i] === '"') {
+                    i += 1;
+                    break;
+                }
+                token += inner[i];
+                i += 1;
+            }
+            elements.push(token);
+        }
+        else {
+            const start = i;
+            while (i < inner.length && inner[i] !== ',') {
+                i += 1;
+            }
+            const token = inner.slice(start, i).trim();
+            elements.push(token.toUpperCase() === 'NULL' ? null : token);
+        }
+        while (i < inner.length && /\s/.test(inner[i])) {
+            i += 1;
+        }
+        if (inner[i] === ',') {
+            i += 1;
+        }
+    }
+    return elements;
+}
 function serializeStructuredRow(source, row) {
     const columnTypes = buildColumnTypeMap(source);
     const serialized = {};

package/jql/postgres/src/lib/structured-document-mapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"structured-document-mapper.js","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/postgres/src/lib/structured-document-mapper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"structured-document-mapper.js","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/postgres/src/lib/structured-document-mapper.ts"],"names":[],"mappings":"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"}

package/jql/providers/src/lib/datasource.module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"datasource.module.d.ts","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/providers/src/lib/datasource.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,yBAAyB,EAC/B,MAAM,gDAAgD,CAAC;AACxD,OAAO,EAAE,aAAa,EAAiC,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAOL,KAAK,qBAAqB,EAC3B,MAAM,sBAAsB,CAAC;AAK9B,MAAM,WAAW,uBAAuB;IACtC,oEAAoE;IACpE,WAAW,CAAC,EAAE,SAAS,qBAAqB,EAAE,CAAC;IAC/C,yCAAyC;IACzC,cAAc,CAAC,EAAE,yBAAyB,CAAC;CAC5C;AAED,qBACa,gBAAgB;IAC3B,MAAM,CAAC,OAAO,CAAC,OAAO,GAAE,uBAA4B,GAAG,aAAa;CA2CrE"}
+{"version":3,"file":"datasource.module.d.ts","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/providers/src/lib/datasource.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAML,KAAK,yBAAyB,EAC/B,MAAM,gDAAgD,CAAC;AACxD,OAAO,EAAE,aAAa,EAAiC,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAQL,KAAK,qBAAqB,EAC3B,MAAM,sBAAsB,CAAC;AAK9B,MAAM,WAAW,uBAAuB;IACtC,oEAAoE;IACpE,WAAW,CAAC,EAAE,SAAS,qBAAqB,EAAE,CAAC;IAC/C,yCAAyC;IACzC,cAAc,CAAC,EAAE,yBAAyB,CAAC;CAC5C;AAED,qBACa,gBAAgB;IAC3B,MAAM,CAAC,OAAO,CAAC,OAAO,GAAE,uBAA4B,GAAG,aAAa;CA2CrE"}

package/jql/providers/src/lib/datasource.module.js

@@ -15,7 +15,7 @@ let DataSourceModule = DataSourceModule_1 = class DataSourceModule {
         const imports = [];
         const engineTokens = [];
         for (const name of names) {
-            const entry = datasources_config_1.dataSourceCatalog[name];
+            const entry = (0, datasources_config_1.resolveDataSourceCatalogEntry)(name);
             const module = createDataSourceEngineModule(name, entry);
             imports.push(module);
             engineTokens.push((0, abstract_1.JQL_ENGINE)(name));
@@ -65,6 +65,7 @@ function createDataSourceEngineModule(name, entry) {
                 instanceName: name,
                 backend: 'postgres',
                 connectionString: (0, datasources_config_1.requiredEnv)(entry.uriEnv),
+                dbName: (0, datasources_config_1.optionalEnv)(entry.dbNameEnv) ?? entry.defaultDbName,
             });
         case 'elasticsearch': {
             const node = (0, datasources_config_1.requiredEnv)(entry.nodeEnv);

package/jql/providers/src/lib/datasource.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"datasource.module.js","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/providers/src/lib/datasource.module.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"datasource.module.js","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/providers/src/lib/datasource.module.ts"],"names":[],"mappings":"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"}

package/jql/providers/src/lib/datasources.config.d.ts

@@ -8,6 +8,8 @@ export interface MongoDataSourceCatalogEntry {
 export interface PostgresDataSourceCatalogEntry {
     kind: 'postgres';
     uriEnv: string;
+    dbNameEnv: string;
+    defaultDbName: string;
 }
 export interface ElasticsearchDataSourceCatalogEntry {
     kind: 'elasticsearch';
@@ -20,10 +22,24 @@ export interface JsonDataSourceCatalogEntry {
     rootDirEnv: string;
     defaultRootDir: string;
 }
+/** Document-store catalog row whose backend kind is resolved from env at runtime. */
+export interface SwitchableDocumentStoreCatalogEntry {
+    kind: 'mongodb' | 'postgres';
+    uriEnv: string;
+    dbNameEnv: string;
+    defaultDbName: string;
+    /** Primary env for backend kind (e.g. `DATASOURCE_STORAGE_KIND`). */
+    kindEnv?: string;
+    /** Legacy fallback (e.g. `ENTITY_STORAGE_PROVIDER` / `DOMAIN_DEFINITION_PROVIDER`). */
+    legacyKindEnv?: string;
+}
 export type DataSourceCatalogEntry = MongoDataSourceCatalogEntry | PostgresDataSourceCatalogEntry | ElasticsearchDataSourceCatalogEntry | JsonDataSourceCatalogEntry;
 /**
  * Laravel-style connection map: names + which env keys hold secrets.
  * Never put credentials in this file.
+ *
+ * `storage` / `definition` / `files` default to mongodb; override with
+ * `DATASOURCE_*_KIND` (or legacy `ENTITY_STORAGE_PROVIDER` / `DOMAIN_DEFINITION_PROVIDER`).
  */
 export declare const dataSourceCatalog: {
     readonly storage: {
@@ -32,6 +48,8 @@ export declare const dataSourceCatalog: {
         readonly dbNameEnv: "DATASOURCE_STORAGE_DB";
         /** Runtime entity rows (all business entities). */
         readonly defaultDbName: "acorex_storage";
+        readonly kindEnv: "DATASOURCE_STORAGE_KIND";
+        readonly legacyKindEnv: "ENTITY_STORAGE_PROVIDER";
     };
     readonly definition: {
         readonly kind: "mongodb";
@@ -39,6 +57,8 @@ export declare const dataSourceCatalog: {
         readonly dbNameEnv: "DATASOURCE_DEFINITION_DB";
         /** Entity definitions + PlatformManagement catalog entities (Widget, …). */
         readonly defaultDbName: "acorex_definition";
+        readonly kindEnv: "DATASOURCE_DEFINITION_KIND";
+        readonly legacyKindEnv: "DOMAIN_DEFINITION_PROVIDER";
     };
     readonly insight: {
         readonly kind: "elasticsearch";
@@ -51,11 +71,25 @@ export declare const dataSourceCatalog: {
         readonly uriEnv: "DATASOURCE_FILES_URI";
         readonly dbNameEnv: "DATASOURCE_FILES_DB";
         readonly defaultDbName: "acorex_files";
+        readonly kindEnv: "DATASOURCE_FILES_KIND";
+    };
+    readonly history: {
+        readonly kind: "mongodb";
+        readonly uriEnv: "DATASOURCE_HISTORY_URI";
+        readonly dbNameEnv: "DATASOURCE_HISTORY_DB";
+        /** Entity version streams/entries (Change History). */
+        readonly defaultDbName: "acorex_history";
+        readonly kindEnv: "DATASOURCE_HISTORY_KIND";
     };
 };
 export type DataSourceCatalogName = keyof typeof dataSourceCatalog;
 export declare function requiredEnv(name: string): string;
 export declare function optionalEnv(name: string): string | undefined;
 export declare function resolveAppDefaultDataSource(): string;
+/**
+ * Resolves catalog entry with runtime kind overrides from env.
+ * Use this (not the raw catalog row) when registering engines.
+ */
+export declare function resolveDataSourceCatalogEntry(name: string): DataSourceCatalogEntry;
 export declare function catalogKind(name: string): DataSourceKind;
 //# sourceMappingURL=datasources.config.d.ts.map

package/jql/providers/src/lib/datasources.config.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"datasources.config.d.ts","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/providers/src/lib/datasources.config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gDAAgD,CAAC;AAIrF,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,8BAA8B;IAC7C,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;CAChB;AAED,MAAM,WAAW,mCAAmC;IAClD,IAAI,EAAE,eAAe,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,MAAM,sBAAsB,GAC9B,2BAA2B,GAC3B,8BAA8B,GAC9B,mCAAmC,GACnC,0BAA0B,CAAC;AAE/B;;;GAGG;AACH,eAAO,MAAM,iBAAiB;;;;;QAK1B,mDAAmD;;;;;;;QAOnD,4EAA4E;;;;;;;;;;;;;;;CAerB,CAAC;AAE5D,MAAM,MAAM,qBAAqB,GAAG,MAAM,OAAO,iBAAiB,CAAC;AAEnE,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQhD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAG5D;AAED,wBAAgB,2BAA2B,IAAI,MAAM,CAEpD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAMxD"}
+{"version":3,"file":"datasources.config.d.ts","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/providers/src/lib/datasources.config.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,gDAAgD,CAAC;AAIrF,MAAM,WAAW,2BAA2B;IAC1C,IAAI,EAAE,SAAS,CAAC;IAChB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,8BAA8B;IAC7C,IAAI,EAAE,UAAU,CAAC;IACjB,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB;AAED,MAAM,WAAW,mCAAmC;IAClD,IAAI,EAAE,eAAe,CAAC;IACtB,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,WAAW,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,0BAA0B;IACzC,IAAI,EAAE,MAAM,CAAC;IACb,UAAU,EAAE,MAAM,CAAC;IACnB,cAAc,EAAE,MAAM,CAAC;CACxB;AAED,qFAAqF;AACrF,MAAM,WAAW,mCAAmC;IAClD,IAAI,EAAE,SAAS,GAAG,UAAU,CAAC;IAC7B,MAAM,EAAE,MAAM,CAAC;IACf,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;IACtB,qEAAqE;IACrE,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,uFAAuF;IACvF,aAAa,CAAC,EAAE,MAAM,CAAC;CACxB;AAED,MAAM,MAAM,sBAAsB,GAC9B,2BAA2B,GAC3B,8BAA8B,GAC9B,mCAAmC,GACnC,0BAA0B,CAAC;AAE/B;;;;;;GAMG;AACH,eAAO,MAAM,iBAAiB;;;;;QAK1B,mDAAmD;;;;;;;;;QASnD,4EAA4E;;;;;;;;;;;;;;;;;;;;;;QAsB5E,uDAAuD;;;;CAS1D,CAAC;AAEF,MAAM,MAAM,qBAAqB,GAAG,MAAM,OAAO,iBAAiB,CAAC;AAEnE,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,CAQhD;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAG5D;AAED,wBAAgB,2BAA2B,IAAI,MAAM,CAEpD;AA8BD;;;GAGG;AACH,wBAAgB,6BAA6B,CAAC,IAAI,EAAE,MAAM,GAAG,sBAAsB,CAyBlF;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,GAAG,cAAc,CAExD"}