@acorex-platform/framework-server 0.0.18 → 0.0.20

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":";;AAKA,gEA0BC;AAED,gEAsBC;AAMD,wEA+CC;AASD,4EAuCC;AAMD,8DA6DC;AAED,wDAYC;AA7OD,yCAAgC;AAGhC,+CAA+C;AAE/C,SAAgB,0BAA0B,CACxC,MAAiB,EACjB,GAA4B;IAE5B,MAAM,GAAG,GAA4B,EAAE,CAAC;IAExC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAClB,KAAK,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YAClE,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;gBACvB,SAAS;YACX,CAAC;YAED,MAAM,KAAK,GACT,OAAO,IAAI,GAAG;gBACZ,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC;gBACd,CAAC,CAAC,UAAU,CAAC,QAAQ;oBACnB,CAAC,CAAC,IAAA,eAAG,EAAC,GAAG,EAAE,UAAU,CAAC,QAAQ,CAAC;oBAC/B,CAAC,CAAC,SAAS,CAAC;YAElB,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACxB,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,GAAG,KAAK,CAAC;YACjC,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED,SAAgB,0BAA0B,CACxC,MAAiB,EACjB,GAA4B;IAE5B,MAAM,GAAG,GAA4B,EAAE,CAAC;IAExC,IAAI,MAAM,CAAC,MAAM,EAAE,CAAC;QAClB,KAAK,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;YAClE,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,CAAC;gBACvB,SAAS;YACX,CAAC;YAED,IAAI,UAAU,CAAC,MAAM,IAAI,GAAG,EAAE,CAAC;gBAC7B,GAAG,CAAC,OAAO,CAAC,GAAG,gCAAgC,CAC7C,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EACtB,UAAU,CAAC,IAAI,CAChB,CAAC;YACJ,CAAC;QACH,CAAC;IACH,CAAC;IAED,OAAO,GAAG,CAAC;AACb,CAAC;AAED;;;GAGG;AACH,SAAgB,8BAA8B,CAC5C,KAAc,EACd,SAAsC;IAEtC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAC1C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;QACzB,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;YAC1B,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC;QAC7B,CAAC;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YACjC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC1B,OAAO,IAAI,IAAI,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;YACxC,CAAC;QACH,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;QAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,KAAK,CAAC;QACf,CAAC;QAED,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;YACrF,OAAO,MAAM,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;QAED,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;QACzB,6EAA6E;QAC7E,gFAAgF;QAChF,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,sBAAsB,CAAC,CAAC;IACvD,CAAC;IAED,4EAA4E;IAC5E,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,EAAE,sBAAsB,CAAC,CAAC;IACvD,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED;;;;;;GAMG;AACH,SAAgB,gCAAgC,CAC9C,KAAc,EACd,SAAsC;IAEtC,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE,CAAC;QAC1C,OAAO,KAAK,CAAC;IACf,CAAC;IAED,2FAA2F;IAC3F,IAAI,SAAS,KAAK,QAAQ,EAAE,CAAC;QAC3B,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;YAC9B,OAAO,KAAK,CAAC;QACf,CAAC;QACD,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,KAAK,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC;YACrD,MAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC;YAC7B,OAAO,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,KAAK,CAAC;QAClD,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,SAAS,KAAK,MAAM,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE,CAAC;QAC9B,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,CAAC,OAAO,EAAE,CAAC;QACb,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,CAAC;QACH,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAY,CAAC;IACxC,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,OAAO,GAAG,yBAAyB,CAAC,OAAO,CAAC,CAAC;QACnD,OAAO,OAAO,IAAI,KAAK,CAAC;IAC1B,CAAC;AACH,CAAC;AAED;;;GAGG;AACH,SAAgB,yBAAyB,CAAC,KAAa;IACrD,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QACvD,OAAO,IAAI,CAAC;IACd,CAAC;IAED,IAAI,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAED,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACnC,IAAI,CAAC,KAAK,CAAC,IAAI,EAAE,EAAE,CAAC;QAClB,OAAO,EAAE,CAAC;IACZ,CAAC;IAED,MAAM,QAAQ,GAAc,EAAE,CAAC;IAC/B,IAAI,CAAC,GAAG,CAAC,CAAC;IAEV,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;QACxB,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC;YAChD,CAAC,IAAI,CAAC,CAAC;QACT,CAAC;QACD,IAAI,CAAC,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;YACtB,MAAM;QACR,CAAC;QAED,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YACrB,CAAC,IAAI,CAAC,CAAC;YACP,IAAI,KAAK,GAAG,EAAE,CAAC;YACf,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;gBACxB,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,IAAI,IAAI,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;oBAC9C,KAAK,IAAI,KAAK,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;oBACtB,CAAC,IAAI,CAAC,CAAC;oBACP,SAAS;gBACX,CAAC;gBACD,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;oBACrB,CAAC,IAAI,CAAC,CAAC;oBACP,MAAM;gBACR,CAAC;gBACD,KAAK,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC;gBAClB,CAAC,IAAI,CAAC,CAAC;YACT,CAAC;YACD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,MAAM,KAAK,GAAG,CAAC,CAAC;YAChB,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;gBAC5C,CAAC,IAAI,CAAC,CAAC;YACT,CAAC;YACD,MAAM,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAC3C,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,WAAW,EAAE,KAAK,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC;QAC/D,CAAC;QAED,OAAO,CAAC,GAAG,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAE,CAAC,EAAE,CAAC;YAChD,CAAC,IAAI,CAAC,CAAC;QACT,CAAC;QACD,IAAI,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE,CAAC;YACrB,CAAC,IAAI,CAAC,CAAC;QACT,CAAC;IACH,CAAC;IAED,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,SAAgB,sBAAsB,CACpC,MAAiB,EACjB,GAA4B;IAE5B,MAAM,WAAW,GAAG,kBAAkB,CAAC,MAAM,CAAC,CAAC;IAC/C,MAAM,UAAU,GAA4B,EAAE,CAAC;IAE/C,KAAK,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC;QAClD,UAAU,CAAC,MAAM,CAAC,GAAG,8BAA8B,CAAC,KAAK,EAAE,WAAW,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC;IACtF,CAAC;IAED,OAAO,UAAU,CAAC;AACpB,CAAC;AAED,SAAS,kBAAkB,CAAC,MAAiB;IAC3C,MAAM,WAAW,GAAG,IAAI,GAAG,EAAsC,CAAC;IAElE,KAAK,MAAM,UAAU,IAAI,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,EAAE,CAAC,EAAE,CAAC;QAC5D,IAAI,UAAU,CAAC,MAAM,EAAE,CAAC;YACtB,WAAW,CAAC,GAAG,CAAC,UAAU,CAAC,MAAM,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC;QACtD,CAAC;IACH,CAAC;IAED,OAAO,WAAW,CAAC;AACrB,CAAC;AAED,SAAS,sBAAsB,CAAC,IAAY,EAAE,KAAc;IAC1D,IAAI,KAAK,YAAY,IAAI,EAAE,CAAC;QAC1B,OAAO,KAAK,CAAC,WAAW,EAAE,CAAC;IAC7B,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,YAAY"}

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"}

package/jql/providers/src/lib/datasources.config.js

@@ -4,10 +4,14 @@ exports.dataSourceCatalog = void 0;
 exports.requiredEnv = requiredEnv;
 exports.optionalEnv = optionalEnv;
 exports.resolveAppDefaultDataSource = resolveAppDefaultDataSource;
+exports.resolveDataSourceCatalogEntry = resolveDataSourceCatalogEntry;
 exports.catalogKind = catalogKind;
 /**
  * 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`).
  */
 exports.dataSourceCatalog = {
     storage: {
@@ -16,6 +20,8 @@ exports.dataSourceCatalog = {
         dbNameEnv: 'DATASOURCE_STORAGE_DB',
         /** Runtime entity rows (all business entities). */
         defaultDbName: 'acorex_storage',
+        kindEnv: 'DATASOURCE_STORAGE_KIND',
+        legacyKindEnv: 'ENTITY_STORAGE_PROVIDER',
     },
     definition: {
         kind: 'mongodb',
@@ -23,6 +29,8 @@ exports.dataSourceCatalog = {
         dbNameEnv: 'DATASOURCE_DEFINITION_DB',
         /** Entity definitions + PlatformManagement catalog entities (Widget, …). */
         defaultDbName: 'acorex_definition',
+        kindEnv: 'DATASOURCE_DEFINITION_KIND',
+        legacyKindEnv: 'DOMAIN_DEFINITION_PROVIDER',
     },
     insight: {
         kind: 'elasticsearch',
@@ -35,6 +43,15 @@ exports.dataSourceCatalog = {
         uriEnv: 'DATASOURCE_FILES_URI',
         dbNameEnv: 'DATASOURCE_FILES_DB',
         defaultDbName: 'acorex_files',
+        kindEnv: 'DATASOURCE_FILES_KIND',
+    },
+    history: {
+        kind: 'mongodb',
+        uriEnv: 'DATASOURCE_HISTORY_URI',
+        dbNameEnv: 'DATASOURCE_HISTORY_DB',
+        /** Entity version streams/entries (Change History). */
+        defaultDbName: 'acorex_history',
+        kindEnv: 'DATASOURCE_HISTORY_KIND',
     },
 };
 function requiredEnv(name) {
@@ -51,12 +68,47 @@ function optionalEnv(name) {
 function resolveAppDefaultDataSource() {
     return optionalEnv('APP_DEFAULT_DATASOURCE') ?? 'storage';
 }
-function catalogKind(name) {
+function normalizeDocumentStoreKind(raw) {
+    const value = raw.trim().toLowerCase();
+    if (value === 'mongo') {
+        return 'mongodb';
+    }
+    if (value === 'postgresql' || value === 'pg') {
+        return 'postgres';
+    }
+    if (value === 'mongodb' || value === 'postgres') {
+        return value;
+    }
+    throw new Error(`Unsupported document-store DataSource kind "${raw}". Supported: mongodb, postgres.`);
+}
+function isSwitchableDocumentStore(entry) {
+    return 'uriEnv' in entry;
+}
+/**
+ * Resolves catalog entry with runtime kind overrides from env.
+ * Use this (not the raw catalog row) when registering engines.
+ */
+function resolveDataSourceCatalogEntry(name) {
     const entry = exports.dataSourceCatalog[name];
     if (!entry) {
         throw new Error(`Unknown DataSource "${name}" is not in dataSourceCatalog.`);
     }
-    return entry.kind;
+    if (!isSwitchableDocumentStore(entry)) {
+        return entry;
+    }
+    const rawKind = (entry.kindEnv ? optionalEnv(entry.kindEnv) : undefined) ??
+        (entry.legacyKindEnv ? optionalEnv(entry.legacyKindEnv) : undefined) ??
+        entry.kind;
+    const kind = normalizeDocumentStoreKind(rawKind);
+    return {
+        kind,
+        uriEnv: entry.uriEnv,
+        dbNameEnv: entry.dbNameEnv,
+        defaultDbName: entry.defaultDbName,
+    };
+}
+function catalogKind(name) {
+    return resolveDataSourceCatalogEntry(name).kind;
 }
 //#endregion
 //# sourceMappingURL=datasources.config.js.map

package/jql/providers/src/lib/datasources.config.js.map

@@ -1 +1 @@
-{"version":3,"file":"datasources.config.js","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/providers/src/lib/datasources.config.ts"],"names":[],"mappings":";;;AAsEA,kCAQC;AAED,kCAGC;AAED,kEAEC;AAED,kCAMC;AA5DD;;;GAGG;AACU,QAAA,iBAAiB,GAAG;IAC/B,OAAO,EAAE;QACP,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,wBAAwB;QAChC,SAAS,EAAE,uBAAuB;QAClC,mDAAmD;QACnD,aAAa,EAAE,gBAAgB;KAChC;IACD,UAAU,EAAE;QACV,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,2BAA2B;QACnC,SAAS,EAAE,0BAA0B;QACrC,4EAA4E;QAC5E,aAAa,EAAE,mBAAmB;KACnC;IACD,OAAO,EAAE;QACP,IAAI,EAAE,eAAe;QACrB,OAAO,EAAE,yBAAyB;QAClC,WAAW,EAAE,6BAA6B;QAC1C,WAAW,EAAE,6BAA6B;KAC3C;IACD,KAAK,EAAE;QACL,IAAI,EAAE,SAAS;QACf,MAAM,EAAE,sBAAsB;QAC9B,SAAS,EAAE,qBAAqB;QAChC,aAAa,EAAE,cAAc;KAC9B;CACwD,CAAC;AAI5D,SAAgB,WAAW,CAAC,IAAY;IACtC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC;IACxC,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CACb,0CAA0C,IAAI,iCAAiC,CAChF,CAAC;IACJ,CAAC;IACD,OAAO,KAAK,CAAC;AACf,CAAC;AAED,SAAgB,WAAW,CAAC,IAAY;IACtC,MAAM,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,CAAC;IACxC,OAAO,KAAK,IAAI,SAAS,CAAC;AAC5B,CAAC;AAED,SAAgB,2BAA2B;IACzC,OAAO,WAAW,CAAC,wBAAwB,CAAC,IAAI,SAAS,CAAC;AAC5D,CAAC;AAED,SAAgB,WAAW,CAAC,IAAY;IACtC,MAAM,KAAK,GAAI,yBAA4D,CAAC,IAAI,CAAC,CAAC;IAClF,IAAI,CAAC,KAAK,EAAE,CAAC;QACX,MAAM,IAAI,KAAK,CAAC,uBAAuB,IAAI,gCAAgC,CAAC,CAAC;IAC/E,CAAC;IACD,OAAO,KAAK,CAAC,IAAI,CAAC;AACpB,CAAC;AAED,YAAY"}
+{"version":3,"file":"datasources.config.js","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/providers/src/lib/datasources.config.ts"],"names":[],"mappings":"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"}

package/jql/schema/src/index.d.ts

@@ -7,4 +7,10 @@ export * from './lib/jql-schema-registry.service';
 export * from './lib/jql-schema.service';
 export * from './lib/jql-schema.controller';
 export * from './lib/jql-schema.module';
+export * from './lib/plugin-contribution.catalog';
+export * from './lib/plugin-contribution-columns.util';
+export * from './lib/resolve-storage-data-type.util';
+export * from './lib/widget-data-type.catalog';
+export * from './lib/generated/plugin-contributions.bootstrap';
+export * from './lib/generated/widget-data-types.bootstrap';
 //# sourceMappingURL=index.d.ts.map

package/jql/schema/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../libs/framework/server/jql/schema/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,wCAAwC,CAAC;AACvD,cAAc,yBAAyB,CAAC;AACxC,cAAc,mCAAmC,CAAC;AAClD,cAAc,mCAAmC,CAAC;AAClD,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../../../libs/framework/server/jql/schema/src/index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,6BAA6B,CAAC;AAC5C,cAAc,wCAAwC,CAAC;AACvD,cAAc,yBAAyB,CAAC;AACxC,cAAc,mCAAmC,CAAC;AAClD,cAAc,mCAAmC,CAAC;AAClD,cAAc,0BAA0B,CAAC;AACzC,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,mCAAmC,CAAC;AAClD,cAAc,wCAAwC,CAAC;AACvD,cAAc,sCAAsC,CAAC;AACrD,cAAc,gCAAgC,CAAC;AAC/C,cAAc,gDAAgD,CAAC;AAC/D,cAAc,6CAA6C,CAAC"}

package/jql/schema/src/index.js

@@ -10,4 +10,10 @@ tslib_1.__exportStar(require("./lib/jql-schema-registry.service"), exports);
 tslib_1.__exportStar(require("./lib/jql-schema.service"), exports);
 tslib_1.__exportStar(require("./lib/jql-schema.controller"), exports);
 tslib_1.__exportStar(require("./lib/jql-schema.module"), exports);
+tslib_1.__exportStar(require("./lib/plugin-contribution.catalog"), exports);
+tslib_1.__exportStar(require("./lib/plugin-contribution-columns.util"), exports);
+tslib_1.__exportStar(require("./lib/resolve-storage-data-type.util"), exports);
+tslib_1.__exportStar(require("./lib/widget-data-type.catalog"), exports);
+tslib_1.__exportStar(require("./lib/generated/plugin-contributions.bootstrap"), exports);
+tslib_1.__exportStar(require("./lib/generated/widget-data-types.bootstrap"), exports);
 //# sourceMappingURL=index.js.map

package/jql/schema/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/framework/server/jql/schema/src/index.ts"],"names":[],"mappings":";;;AAAA,wEAA8C;AAC9C,sEAA4C;AAC5C,iFAAuD;AACvD,kEAAwC;AACxC,4EAAkD;AAClD,4EAAkD;AAClD,mEAAyC;AACzC,sEAA4C;AAC5C,kEAAwC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/framework/server/jql/schema/src/index.ts"],"names":[],"mappings":";;;AAAA,wEAA8C;AAC9C,sEAA4C;AAC5C,iFAAuD;AACvD,kEAAwC;AACxC,4EAAkD;AAClD,4EAAkD;AAClD,mEAAyC;AACzC,sEAA4C;AAC5C,kEAAwC;AACxC,4EAAkD;AAClD,iFAAuD;AACvD,+EAAqD;AACrD,yEAA+C;AAC/C,yFAA+D;AAC/D,sFAA4D"}

package/jql/schema/src/lib/entity-schema-builder.d.ts

@@ -1,9 +1,15 @@
 import { AXPEntityDefinition, AXPPropertyDefinition } from '@acorex-platform/framework-server/domain/abstract';
 import { JqlEntitySchema, JqlIndexDefinition } from '@acorex-platform/framework-server/jql/abstract';
+import { type JqlPluginContributionsByName } from './plugin-contribution-columns.util';
+import type { JqlWidgetDataTypesByName } from './widget-data-type.catalog';
 export interface EntitySchemaBuildOptions {
     entityName?: string;
     hierarchical?: boolean;
     indexes?: JqlIndexDefinition[];
+    /** Plugin name → contributions (from PluginDefinition catalog / bootstrap). */
+    pluginContributions?: JqlPluginContributionsByName;
+    /** Widget name → base bound-value dataType (from Widget catalog / bootstrap). */
+    widgetDataTypes?: JqlWidgetDataTypesByName;
 }
 /** Builds {@link JqlEntitySchema} instances from domain entity definitions or runtime property lists. */
 export declare class EntitySchemaBuilder {

package/jql/schema/src/lib/entity-schema-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"entity-schema-builder.d.ts","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/schema/src/lib/entity-schema-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,mBAAmB,EAEnB,qBAAqB,EACtB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAIL,eAAe,EACf,kBAAkB,EAMnB,MAAM,gDAAgD,CAAC;AAsBxD,MAAM,WAAW,wBAAwB;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,kBAAkB,EAAE,CAAC;CAChC;AAED,yGAAyG;AACzG,qBAAa,mBAAmB;IAC9B,MAAM,CAAC,oBAAoB,CACzB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,GAAE,wBAA6B,GACrC,eAAe;IA+ClB,MAAM,CAAC,cAAc,CACnB,UAAU,EAAE,qBAAqB,EAAE,EACnC,OAAO,EAAE,wBAAwB,GAAG;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,GACzD,eAAe;CAsBnB"}
+{"version":3,"file":"entity-schema-builder.d.ts","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/schema/src/lib/entity-schema-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,mBAAmB,EAEnB,qBAAqB,EACtB,MAAM,mDAAmD,CAAC;AAC3D,OAAO,EAIL,eAAe,EACf,kBAAkB,EAMnB,MAAM,gDAAgD,CAAC;AAExD,OAAO,EAEL,KAAK,4BAA4B,EAClC,MAAM,oCAAoC,CAAC;AAG5C,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AAqB3E,MAAM,WAAW,wBAAwB;IACvC,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,OAAO,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC/B,+EAA+E;IAC/E,mBAAmB,CAAC,EAAE,4BAA4B,CAAC;IACnD,iFAAiF;IACjF,eAAe,CAAC,EAAE,wBAAwB,CAAC;CAC5C;AAED,yGAAyG;AACzG,qBAAa,mBAAmB;IAC9B,MAAM,CAAC,oBAAoB,CACzB,MAAM,EAAE,mBAAmB,EAC3B,OAAO,GAAE,wBAA6B,GACrC,eAAe;IAuDlB,MAAM,CAAC,cAAc,CACnB,UAAU,EAAE,qBAAqB,EAAE,EACnC,OAAO,EAAE,wBAAwB,GAAG;QAAE,UAAU,EAAE,MAAM,CAAA;KAAE,GACzD,eAAe;CAsBnB"}

package/jql/schema/src/lib/entity-schema-builder.js

@@ -2,21 +2,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EntitySchemaBuilder = void 0;
 const abstract_1 = require("@acorex-platform/framework-server/jql/abstract");
-const domain_data_type_mapper_1 = require("./domain-data-type.mapper");
+const plugin_contribution_columns_util_1 = require("./plugin-contribution-columns.util");
+const isolation_indexes_util_1 = require("./isolation-indexes.util");
+const resolve_storage_data_type_util_1 = require("./resolve-storage-data-type.util");
 //#region ---- Entity schema builder ----
 const SYSTEM_FIELD_NAMES = new Set([
     'id',
     'parentId',
     'auditInfo',
     'stateInfo',
-    'ownershipInfo',
+    'scopeInfo',
     'workflowInfo',
 ]);
 /** Platform metadata columns injected by middleware (audit, visibility, ownership, workflow). */
 const SYSTEM_METADATA_COLUMNS = [
     { name: 'auditInfo', columnName: 'audit_info', dataType: 'jsonb', nullable: true },
     { name: 'stateInfo', columnName: 'state_info', dataType: 'jsonb', nullable: true },
-    { name: 'ownershipInfo', columnName: 'ownership_info', dataType: 'jsonb', nullable: true },
+    { name: 'scopeInfo', columnName: 'scope_info', dataType: 'jsonb', nullable: true },
     { name: 'workflowInfo', columnName: 'workflow_info', dataType: 'jsonb', nullable: true },
 ];
 /** Builds {@link JqlEntitySchema} instances from domain entity definitions or runtime property lists. */
@@ -37,11 +39,13 @@ class EntitySchemaBuilder {
             if (physicalColumnNames.has(physicalName)) {
                 continue;
             }
-            columns.push(mapPropertyToColumn(property));
+            columns.push(mapPropertyToColumn(property, options.widgetDataTypes));
             columnNames.add(property.name);
             physicalColumnNames.add(physicalName);
         }
         addLookupSnapshotColumns(columns, entity.fields, columnNames, physicalColumnNames);
+        addMergeDetailReferenceColumns(columns, entity.relatedEntities, columnNames, physicalColumnNames);
+        addPluginContributionColumns(columns, entity.plugins, options.pluginContributions, columnNames, physicalColumnNames);
         const fullTextSearchPaths = (0, abstract_1.mergeFullTextSearchPaths)((0, abstract_1.collectFullTextSearchPathsFromSchemaColumns)({
             entityName,
             columns,
@@ -51,7 +55,7 @@ class EntitySchemaBuilder {
             tableName,
             collectionName,
             columns,
-            indexes: options.indexes ?? extractIndexesFromEntity(entity, hierarchical),
+            indexes: (0, isolation_indexes_util_1.mergeIsolationIndexes)(options.indexes ?? extractIndexesFromEntity(entity, hierarchical)),
             hierarchical,
             fullTextSearchPaths,
         };
@@ -64,14 +68,14 @@ class EntitySchemaBuilder {
             if (SYSTEM_FIELD_NAMES.has(property.name)) {
                 continue;
             }
-            columns.push(mapPropertyToColumn(property));
+            columns.push(mapPropertyToColumn(property, options.widgetDataTypes));
         }
         return {
             entityName: options.entityName,
             tableName,
             collectionName,
             columns,
-            indexes: options.indexes,
+            indexes: (0, isolation_indexes_util_1.mergeIsolationIndexes)(options.indexes),
             hierarchical: options.hierarchical,
         };
     }
@@ -113,12 +117,13 @@ function buildSystemColumns(hierarchical) {
     columns.push(...SYSTEM_METADATA_COLUMNS);
     return columns;
 }
-function mapPropertyToColumn(property) {
+function mapPropertyToColumn(property, widgetDataTypes) {
     const entityProperty = property;
+    const storageDataType = (0, resolve_storage_data_type_util_1.resolveEffectiveStorageDataType)(property, { widgetDataTypes });
     return {
         name: property.name,
         columnName: (0, abstract_1.resolveColumnName)(property.name),
-        dataType: (0, domain_data_type_mapper_1.mapDomainDataType)(property.dataType),
+        dataType: storageDataType,
         nullable: entityProperty.fieldFeatures?.nullable ?? true,
         isForeignKey: property.dataType?.toLowerCase() === 'reference',
     };
@@ -141,6 +146,62 @@ function addLookupSnapshotColumns(columns, fields, existingNames, existingPhysic
         existingPhysicalNames.add(physicalName);
     }
 }
+/**
+ * Merge-detail referenced relations (e.g. Employee → Person via personId / person)
+ * are not entity.fields — without these columns Postgres drops them on insert
+ * (Mongo documents are schemaless so this never showed up there).
+ */
+function addMergeDetailReferenceColumns(columns, relatedEntities, existingNames, existingPhysicalNames) {
+    for (const related of relatedEntities ?? []) {
+        if (related.layout?.type !== 'merge-detail') {
+            continue;
+        }
+        const persistence = related.persistence;
+        if ((persistence?.strategy ?? 'embedded') !== 'referenced') {
+            continue;
+        }
+        const dataPath = persistence?.dataPath?.trim();
+        const idField = persistence?.idField?.trim() ||
+            (dataPath ? `${dataPath.split('.').filter(Boolean).pop()}Id` : undefined);
+        if (idField) {
+            addColumnIfMissing(columns, existingNames, existingPhysicalNames, {
+                name: idField,
+                columnName: (0, abstract_1.resolveColumnName)(idField),
+                dataType: 'text',
+                nullable: true,
+                isForeignKey: true,
+            });
+        }
+        if (dataPath && !dataPath.includes('.')) {
+            addColumnIfMissing(columns, existingNames, existingPhysicalNames, {
+                name: dataPath,
+                columnName: (0, abstract_1.resolveColumnName)(dataPath),
+                dataType: 'jsonb',
+                nullable: true,
+            });
+        }
+    }
+}
+/**
+ * Materializes columns from PluginDefinition contributions joined with
+ * host `entity.plugins` instances (`nameFromOption` → options).
+ */
+function addPluginContributionColumns(columns, plugins, contributionsByName, existingNames, existingPhysicalNames) {
+    for (const column of (0, plugin_contribution_columns_util_1.resolvePluginContributionColumns)(plugins, contributionsByName)) {
+        addColumnIfMissing(columns, existingNames, existingPhysicalNames, column);
+    }
+}
+function addColumnIfMissing(columns, existingNames, existingPhysicalNames, column) {
+    const physicalName = (0, abstract_1.resolveColumnName)(column.name, column.columnName);
+    if (existingNames.has(column.name) ||
+        SYSTEM_FIELD_NAMES.has(column.name) ||
+        existingPhysicalNames.has(physicalName)) {
+        return;
+    }
+    columns.push({ ...column, columnName: physicalName });
+    existingNames.add(column.name);
+    existingPhysicalNames.add(physicalName);
+}
 function extractIndexesFromEntity(entity, hierarchical) {
     const indexes = [];
     for (const field of entity.fields) {