@acorex-platform/framework-server 0.0.18 → 0.0.20

package/jql/schema/src/lib/jql-auto-migrator.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.JqlAutoMigrator = void 0;
 const abstract_1 = require("@acorex-platform/framework-server/jql/abstract");
 const domain_data_type_mapper_1 = require("./domain-data-type.mapper");
+const isolation_indexes_util_1 = require("./isolation-indexes.util");
 //#region ---- PostgreSQL auto-migrator ----
 const SCHEMA_HISTORY_TABLE = 'jql_schema_history';
 /** Applies safe, idempotent schema changes for structured entity tables. */
@@ -21,31 +22,45 @@ class JqlAutoMigrator {
             return {
                 status: 'created',
                 addedColumns: schema.columns.map((column) => column.name),
+                alteredColumns: [],
                 addedIndexes: (schema.indexes ?? []).map((index) => index.columns.join('_')),
             };
         }
         const existingColumns = await this.listColumns(pool, tableName);
         const addedColumns = [];
+        const alteredColumns = [];
         for (const column of schema.columns) {
             const columnName = (0, abstract_1.resolveColumnName)(column.name, column.columnName);
-            if (existingColumns.has(columnName)) {
+            const existing = existingColumns.get(columnName);
+            if (!existing) {
+                const sqlType = (0, domain_data_type_mapper_1.mapJqlColumnToPostgresType)(column.dataType);
+                const nullable = column.nullable === false ? 'NOT NULL' : '';
+                await pool.query(`ALTER TABLE ${quoteIdentifier(tableName)} ADD COLUMN IF NOT EXISTS ${quoteIdentifier(columnName)} ${sqlType} ${nullable}`.trim());
+                addedColumns.push(column.name);
                 continue;
             }
-            const sqlType = (0, domain_data_type_mapper_1.mapJqlColumnToPostgresType)(column.dataType);
-            const nullable = column.nullable === false ? 'NOT NULL' : '';
-            await pool.query(`ALTER TABLE ${quoteIdentifier(tableName)} ADD COLUMN IF NOT EXISTS ${quoteIdentifier(columnName)} ${sqlType} ${nullable}`.trim());
-            addedColumns.push(column.name);
+            if (column.dataType === 'jsonb' && isTextLikePgType(existing.dataType)) {
+                try {
+                    await pool.query(buildTextToJsonbAlterSql(tableName, columnName));
+                    alteredColumns.push(column.name);
+                }
+                catch (error) {
+                    // Keep TEXT: mapper still round-trips via fieldType=json. Do not fail bootstrap.
+                    console.warn(`[JqlAutoMigrator] Skip TEXT→JSONB on ${tableName}.${columnName}: ${error instanceof Error ? error.message : String(error)}`);
+                }
+            }
         }
         const addedIndexes = await this.createIndexes(pool, tableName, schema);
-        if (addedColumns.length === 0 && addedIndexes.length === 0) {
-            return { status: 'unchanged', addedColumns, addedIndexes };
+        if (addedColumns.length === 0 && alteredColumns.length === 0 && addedIndexes.length === 0) {
+            return { status: 'unchanged', addedColumns, alteredColumns, addedIndexes };
         }
         await this.recordHistory(pool, schema, 'migrated', {
             addedColumns,
+            alteredColumns,
             addedIndexes,
             fullTextSearchPaths: schema.fullTextSearchPaths,
         });
-        return { status: 'migrated', addedColumns, addedIndexes };
+        return { status: 'migrated', addedColumns, alteredColumns, addedIndexes };
     }
     async ensureSchemaHistoryTable(pool) {
         await pool.query(`
@@ -64,22 +79,32 @@ class JqlAutoMigrator {
         return (result.rowCount ?? 0) > 0;
     }
     async listColumns(pool, tableName) {
-        const result = await pool.query(`SELECT column_name FROM information_schema.columns WHERE table_schema = 'public' AND table_name = $1`, [tableName]);
-        return new Set(result.rows.map((row) => String(row['column_name'])));
+        const result = await pool.query(`SELECT column_name, data_type, udt_name
+       FROM information_schema.columns
+       WHERE table_schema = 'public' AND table_name = $1`, [tableName]);
+        return new Map(result.rows.map((row) => [
+            String(row['column_name']),
+            {
+                dataType: String(row['udt_name'] ?? row['data_type'] ?? '').toLowerCase(),
+            },
+        ]));
     }
     async createIndexes(pool, tableName, schema) {
         const addedIndexes = [];
-        for (const index of schema.indexes ?? []) {
-            const columnNames = index.columns.map((columnName) => {
-                const column = schema.columns.find((item) => item.name === columnName);
-                return (0, abstract_1.resolveColumnName)(columnName, column?.columnName);
-            });
-            if (!columnNames.length) {
+        for (const index of (0, isolation_indexes_util_1.mergeIsolationIndexes)(schema.indexes)) {
+            const expressions = [];
+            const nameParts = [];
+            for (const logicalPath of index.columns) {
+                const resolved = resolveIndexColumnExpression(schema, logicalPath);
+                expressions.push(resolved.sql);
+                nameParts.push(resolved.namePart);
+            }
+            if (!expressions.length) {
                 continue;
             }
-            const indexName = `idx_${tableName}_${columnNames.join('_')}`;
+            const indexName = sanitizeIndexName(`idx_${tableName}_${nameParts.join('_')}`);
             const unique = index.unique ? 'UNIQUE ' : '';
-            await pool.query(`CREATE ${unique}INDEX IF NOT EXISTS ${quoteIdentifier(indexName)} ON ${quoteIdentifier(tableName)} (${columnNames.map(quoteIdentifier).join(', ')})`);
+            await pool.query(`CREATE ${unique}INDEX IF NOT EXISTS ${quoteIdentifier(indexName)} ON ${quoteIdentifier(tableName)} (${expressions.join(', ')})`);
             addedIndexes.push(indexName);
         }
         return addedIndexes;
@@ -99,8 +124,75 @@ function buildCreateTableDdl(tableName, schema) {
     });
     return `CREATE TABLE IF NOT EXISTS ${quoteIdentifier(tableName)} (\n  ${columnDefs.join(',\n  ')}\n);`;
 }
+/**
+ * Resolves an index column path to SQL.
+ * Flat fields → quoted column; dotted paths (e.g. `scopeInfo.tenantId`) → jsonb expression.
+ */
+function resolveIndexColumnExpression(schema, logicalPath) {
+    const segments = logicalPath.split('.').filter((segment) => segment.length > 0);
+    if (!segments.length) {
+        throw new Error(`Invalid empty index column path on entity "${schema.entityName}".`);
+    }
+    const rootLogical = segments[0];
+    const rootColumn = schema.columns.find((item) => item.name === rootLogical);
+    const physicalRoot = (0, abstract_1.resolveColumnName)(rootLogical, rootColumn?.columnName);
+    if (segments.length === 1) {
+        return {
+            sql: quoteIdentifier(physicalRoot),
+            namePart: physicalRoot,
+        };
+    }
+    // Nested keys stay camelCase in JSON payloads (same as postgres field-resolver).
+    const nested = segments.slice(1);
+    const rootSql = quoteIdentifier(physicalRoot);
+    const sql = nested.length === 1
+        ? `(${rootSql}->>'${escapeJsonPath(nested[0])}')`
+        : `(${rootSql}#>>'{${nested.map(escapeJsonPath).join(',')}}')`;
+    return {
+        sql,
+        namePart: [physicalRoot, ...nested.map((segment) => segment.replace(/[^a-zA-Z0-9]+/g, '_'))].join('_'),
+    };
+}
+function sanitizeIndexName(name) {
+    const sanitized = name.replace(/[^a-zA-Z0-9_]+/g, '_').replace(/_+/g, '_');
+    // PostgreSQL identifier limit
+    return sanitized.length <= 63 ? sanitized : sanitized.slice(0, 63);
+}
+function escapeJsonPath(segment) {
+    return segment.replace(/'/g, "''");
+}
 function quoteIdentifier(identifier) {
     return `"${identifier.replace(/"/g, '""')}"`;
 }
+function isTextLikePgType(pgType) {
+    return pgType === 'text' || pgType === 'varchar' || pgType === 'character varying' || pgType === 'bpchar';
+}
+/**
+ * Upgrades TEXT-like columns to JSONB using definition-driven storage types.
+ *
+ * - Postgres text-array literals (`{"a","b"}`) → JSON arrays
+ * - JSON object/array text (`{…}` / `[…]` with JSON shape) → jsonb
+ * - Plain scalars (`Platform…`) → JSON strings via `to_jsonb(text)`
+ */
+function buildTextToJsonbAlterSql(tableName, columnName) {
+    const table = quoteIdentifier(tableName);
+    const column = quoteIdentifier(columnName);
+    const text = `btrim(${column}::text)`;
+    return `
+    ALTER TABLE ${table}
+    ALTER COLUMN ${column} TYPE JSONB
+    USING (
+      CASE
+        WHEN ${column} IS NULL THEN NULL
+        WHEN ${text} = '' THEN NULL
+        WHEN ${text} ~ '^\\{' AND ${text} !~ '":'
+          THEN to_jsonb((${text})::text[])
+        WHEN ${text} ~ '^[\\[{]'
+          THEN (${text})::jsonb
+        ELSE to_jsonb(${text})
+      END
+    )
+  `.trim();
+}
 //#endregion
 //# sourceMappingURL=jql-auto-migrator.js.map

package/jql/schema/src/lib/jql-auto-migrator.js.map

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

package/jql/schema/src/lib/jql-schema.module.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jql-schema.module.d.ts","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/schema/src/lib/jql-schema.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAU,MAAM,gBAAgB,CAAC;AAavD,qBACa,eAAe;IAC1B,MAAM,CAAC,OAAO,IAAI,aAAa;CA2BhC"}
+{"version":3,"file":"jql-schema.module.d.ts","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/schema/src/lib/jql-schema.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAU,MAAM,gBAAgB,CAAC;AAevD,qBACa,eAAe;IAC1B,MAAM,CAAC,OAAO,IAAI,aAAa;CA+ChC"}

package/jql/schema/src/lib/jql-schema.module.js

@@ -8,6 +8,8 @@ const abstract_1 = require("@acorex-platform/framework-server/jql/abstract");
 const jql_schema_controller_1 = require("./jql-schema.controller");
 const jql_schema_registry_service_1 = require("./jql-schema-registry.service");
 const jql_schema_service_1 = require("./jql-schema.service");
+const plugin_contribution_catalog_1 = require("./plugin-contribution.catalog");
+const widget_data_type_catalog_1 = require("./widget-data-type.catalog");
 //#region ---- JQL schema module ----
 let JqlSchemaModule = JqlSchemaModule_1 = class JqlSchemaModule {
     static forRoot() {
@@ -17,18 +19,28 @@ let JqlSchemaModule = JqlSchemaModule_1 = class JqlSchemaModule {
             providers: [
                 jql_schema_registry_service_1.JqlSchemaRegistry,
                 abstract_1.StorageBindingDefinitionCache,
+                plugin_contribution_catalog_1.PluginContributionCatalog,
+                widget_data_type_catalog_1.WidgetDataTypeCatalog,
                 {
                     provide: jql_schema_service_1.JqlSchemaService,
-                    useFactory: (registry, dataSources, bindingCache, appDefaults) => new jql_schema_service_1.JqlSchemaService(registry, dataSources, bindingCache, appDefaults),
+                    useFactory: (registry, dataSources, bindingCache, pluginContributions, widgetDataTypes, appDefaults) => new jql_schema_service_1.JqlSchemaService(registry, dataSources, bindingCache, pluginContributions, widgetDataTypes, appDefaults),
                     inject: [
                         jql_schema_registry_service_1.JqlSchemaRegistry,
                         abstract_1.DataSourceRegistryService,
                         abstract_1.StorageBindingDefinitionCache,
+                        plugin_contribution_catalog_1.PluginContributionCatalog,
+                        widget_data_type_catalog_1.WidgetDataTypeCatalog,
                         abstract_1.APP_PERSISTENCE_DEFAULTS,
                     ],
                 },
             ],
-            exports: [jql_schema_registry_service_1.JqlSchemaRegistry, jql_schema_service_1.JqlSchemaService, abstract_1.StorageBindingDefinitionCache],
+            exports: [
+                jql_schema_registry_service_1.JqlSchemaRegistry,
+                jql_schema_service_1.JqlSchemaService,
+                abstract_1.StorageBindingDefinitionCache,
+                plugin_contribution_catalog_1.PluginContributionCatalog,
+                widget_data_type_catalog_1.WidgetDataTypeCatalog,
+            ],
             global: true,
         };
     }

package/jql/schema/src/lib/jql-schema.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"jql-schema.module.js","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/schema/src/lib/jql-schema.module.ts"],"names":[],"mappings":";;;;;AAAA,2CAAuD;AACvD,6EAKwD;AACxD,mEAA8D;AAC9D,+EAAkE;AAClE,6DAAwD;AAExD,qCAAqC;AAG9B,IAAM,eAAe,uBAArB,MAAM,eAAe;IAC1B,MAAM,CAAC,OAAO;QACZ,OAAO;YACL,MAAM,EAAE,iBAAe;YACvB,WAAW,EAAE,CAAC,2CAAmB,CAAC;YAClC,SAAS,EAAE;gBACT,+CAAiB;gBACjB,wCAA6B;gBAC7B;oBACE,OAAO,EAAE,qCAAgB;oBACzB,UAAU,EAAE,CACV,QAA2B,EAC3B,WAAsC,EACtC,YAA2C,EAC3C,WAAsC,EACtC,EAAE,CAAC,IAAI,qCAAgB,CAAC,QAAQ,EAAE,WAAW,EAAE,YAAY,EAAE,WAAW,CAAC;oBAC3E,MAAM,EAAE;wBACN,+CAAiB;wBACjB,oCAAyB;wBACzB,wCAA6B;wBAC7B,mCAAwB;qBACzB;iBACF;aACF;YACD,OAAO,EAAE,CAAC,+CAAiB,EAAE,qCAAgB,EAAE,wCAA6B,CAAC;YAC7E,MAAM,EAAE,IAAI;SACb,CAAC;IACJ,CAAC;CACF,CAAA;AA5BY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,eAAe,CA4B3B;AAED,YAAY"}
+{"version":3,"file":"jql-schema.module.js","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/schema/src/lib/jql-schema.module.ts"],"names":[],"mappings":";;;;;AAAA,2CAAuD;AACvD,6EAKwD;AACxD,mEAA8D;AAC9D,+EAAkE;AAClE,6DAAwD;AACxD,+EAA0E;AAC1E,yEAAmE;AAEnE,qCAAqC;AAG9B,IAAM,eAAe,uBAArB,MAAM,eAAe;IAC1B,MAAM,CAAC,OAAO;QACZ,OAAO;YACL,MAAM,EAAE,iBAAe;YACvB,WAAW,EAAE,CAAC,2CAAmB,CAAC;YAClC,SAAS,EAAE;gBACT,+CAAiB;gBACjB,wCAA6B;gBAC7B,uDAAyB;gBACzB,gDAAqB;gBACrB;oBACE,OAAO,EAAE,qCAAgB;oBACzB,UAAU,EAAE,CACV,QAA2B,EAC3B,WAAsC,EACtC,YAA2C,EAC3C,mBAA8C,EAC9C,eAAsC,EACtC,WAAsC,EACtC,EAAE,CACF,IAAI,qCAAgB,CAClB,QAAQ,EACR,WAAW,EACX,YAAY,EACZ,mBAAmB,EACnB,eAAe,EACf,WAAW,CACZ;oBACH,MAAM,EAAE;wBACN,+CAAiB;wBACjB,oCAAyB;wBACzB,wCAA6B;wBAC7B,uDAAyB;wBACzB,gDAAqB;wBACrB,mCAAwB;qBACzB;iBACF;aACF;YACD,OAAO,EAAE;gBACP,+CAAiB;gBACjB,qCAAgB;gBAChB,wCAA6B;gBAC7B,uDAAyB;gBACzB,gDAAqB;aACtB;YACD,MAAM,EAAE,IAAI;SACb,CAAC;IACJ,CAAC;CACF,CAAA;AAhDY,0CAAe;0BAAf,eAAe;IAD3B,IAAA,eAAM,EAAC,EAAE,CAAC;GACE,eAAe,CAgD3B;AAED,YAAY"}

package/jql/schema/src/lib/jql-schema.service.d.ts

@@ -1,6 +1,8 @@
 import { AXPPropertyDefinition, AXPEntityDefinition } from '@acorex-platform/framework-server/domain/abstract';
 import { DataSourceRegistryService, JqlEntitySchema, JqlIndexDefinition, JqlSchemaRegistrationResult, StorageBindingDefinitionCache, type AXPAppPersistenceDefaults } from '@acorex-platform/framework-server/jql/abstract';
 import { JqlSchemaRegistry } from './jql-schema-registry.service';
+import { PluginContributionCatalog } from './plugin-contribution.catalog';
+import { WidgetDataTypeCatalog } from './widget-data-type.catalog';
 export interface RegisterEntitySchemaInput {
     entityName: string;
     properties: AXPPropertyDefinition[];
@@ -11,11 +13,13 @@ export declare class JqlSchemaService {
     private readonly registry;
     private readonly dataSources;
     private readonly bindingCache;
+    private readonly pluginContributions;
+    private readonly widgetDataTypes;
     private readonly logger;
     private readonly sourceFactory;
     private schemaHistoryHydrated;
     private readonly bindingResolver;
-    constructor(registry: JqlSchemaRegistry, dataSources: DataSourceRegistryService, bindingCache: StorageBindingDefinitionCache, appDefaults: AXPAppPersistenceDefaults);
+    constructor(registry: JqlSchemaRegistry, dataSources: DataSourceRegistryService, bindingCache: StorageBindingDefinitionCache, pluginContributions: PluginContributionCatalog, widgetDataTypes: WidgetDataTypeCatalog, appDefaults: AXPAppPersistenceDefaults);
     registerFromEntityDefinition(entity: AXPEntityDefinition, entityName?: string): Promise<JqlSchemaRegistrationResult>;
     registerFromProperties(input: RegisterEntitySchemaInput): Promise<JqlSchemaRegistrationResult>;
     registerSchema(schema: JqlEntitySchema, entityDef?: AXPEntityDefinition): Promise<JqlSchemaRegistrationResult>;

package/jql/schema/src/lib/jql-schema.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jql-schema.service.d.ts","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/schema/src/lib/jql-schema.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,mDAAmD,CAAC;AAE3D,OAAO,EAGL,yBAAyB,EAEzB,eAAe,EAEf,kBAAkB,EAClB,2BAA2B,EAC3B,6BAA6B,EAK7B,KAAK,yBAAyB,EAE/B,MAAM,gDAAgD,CAAC;AAYxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAIlE,MAAM,WAAW,yBAAyB;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,qBAAqB,EAAE,CAAC;IACpC,OAAO,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC/B,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,qBACa,gBAAgB;IAOzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAR/B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqC;IAC5D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsC;IACpE,OAAO,CAAC,qBAAqB,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyB;gBAGtC,QAAQ,EAAE,iBAAiB,EAC3B,WAAW,EAAE,yBAAyB,EACtC,YAAY,EAAE,6BAA6B,EAC5D,WAAW,EAAE,yBAAyB;IAKlC,4BAA4B,CAChC,MAAM,EAAE,mBAAmB,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,2BAA2B,CAAC;IAOjC,sBAAsB,CAC1B,KAAK,EAAE,yBAAyB,GAC/B,OAAO,CAAC,2BAA2B,CAAC;IASjC,cAAc,CAClB,MAAM,EAAE,eAAe,EACvB,SAAS,CAAC,EAAE,mBAAmB,GAC9B,OAAO,CAAC,2BAA2B,CAAC;IAqDjC,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAoDrE,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAI9D,+BAA+B,IAAI,OAAO,CAAC,MAAM,CAAC;YAa1C,iBAAiB;YAkCjB,mCAAmC;YASnC,mBAAmB;IAKjC,OAAO,CAAC,eAAe;CAOxB"}
+{"version":3,"file":"jql-schema.service.d.ts","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/schema/src/lib/jql-schema.service.ts"],"names":[],"mappings":"AACA,OAAO,EACL,qBAAqB,EACrB,mBAAmB,EACpB,MAAM,mDAAmD,CAAC;AAE3D,OAAO,EAGL,yBAAyB,EAEzB,eAAe,EAEf,kBAAkB,EAClB,2BAA2B,EAC3B,6BAA6B,EAK7B,KAAK,yBAAyB,EAE/B,MAAM,gDAAgD,CAAC;AAYxD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAClE,OAAO,EAAE,yBAAyB,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAC;AAInE,MAAM,WAAW,yBAAyB;IACxC,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,qBAAqB,EAAE,CAAC;IACpC,OAAO,CAAC,EAAE,kBAAkB,EAAE,CAAC;IAC/B,YAAY,CAAC,EAAE,OAAO,CAAC;CACxB;AAED,qBACa,gBAAgB;IAOzB,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,WAAW;IAC5B,OAAO,CAAC,QAAQ,CAAC,YAAY;IAC7B,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IACpC,OAAO,CAAC,QAAQ,CAAC,eAAe;IAVlC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqC;IAC5D,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsC;IACpE,OAAO,CAAC,qBAAqB,CAAS;IACtC,OAAO,CAAC,QAAQ,CAAC,eAAe,CAAyB;gBAGtC,QAAQ,EAAE,iBAAiB,EAC3B,WAAW,EAAE,yBAAyB,EACtC,YAAY,EAAE,6BAA6B,EAC3C,mBAAmB,EAAE,yBAAyB,EAC9C,eAAe,EAAE,qBAAqB,EACvD,WAAW,EAAE,yBAAyB;IAKlC,4BAA4B,CAChC,MAAM,EAAE,mBAAmB,EAC3B,UAAU,CAAC,EAAE,MAAM,GAClB,OAAO,CAAC,2BAA2B,CAAC;IAWjC,sBAAsB,CAC1B,KAAK,EAAE,yBAAyB,GAC/B,OAAO,CAAC,2BAA2B,CAAC;IAUjC,cAAc,CAClB,MAAM,EAAE,eAAe,EACvB,SAAS,CAAC,EAAE,mBAAmB,GAC9B,OAAO,CAAC,2BAA2B,CAAC;IAyDjC,iBAAiB,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,eAAe,CAAC;IAoDrE,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,eAAe,GAAG,SAAS;IAI9D,+BAA+B,IAAI,OAAO,CAAC,MAAM,CAAC;YAa1C,iBAAiB;YAkCjB,mCAAmC;YASnC,mBAAmB;IAKjC,OAAO,CAAC,eAAe;CAOxB"}

package/jql/schema/src/lib/jql-schema.service.js

@@ -13,11 +13,15 @@ const entity_schema_builder_1 = require("./entity-schema-builder");
 const entity_schema_jql_source_factory_1 = require("./entity-schema-jql-source.factory");
 const jql_schema_history_hydrator_1 = require("./jql-schema-history.hydrator");
 const jql_schema_registry_service_1 = require("./jql-schema-registry.service");
+const plugin_contribution_catalog_1 = require("./plugin-contribution.catalog");
+const widget_data_type_catalog_1 = require("./widget-data-type.catalog");
 let JqlSchemaService = JqlSchemaService_1 = class JqlSchemaService {
-    constructor(registry, dataSources, bindingCache, appDefaults) {
+    constructor(registry, dataSources, bindingCache, pluginContributions, widgetDataTypes, appDefaults) {
         this.registry = registry;
         this.dataSources = dataSources;
         this.bindingCache = bindingCache;
+        this.pluginContributions = pluginContributions;
+        this.widgetDataTypes = widgetDataTypes;
         this.logger = new common_1.Logger(JqlSchemaService_1.name);
         this.sourceFactory = new entity_schema_jql_source_factory_1.EntitySchemaJqlSourceFactory();
         this.schemaHistoryHydrated = false;
@@ -26,7 +30,11 @@ let JqlSchemaService = JqlSchemaService_1 = class JqlSchemaService {
     async registerFromEntityDefinition(entity, entityName) {
         const name = entityName ?? entity.name;
         this.bindingCache.putEntity(asSharedEntityDefinition(entity), name);
-        const schema = entity_schema_builder_1.EntitySchemaBuilder.fromEntityDefinition(entity, { entityName: name });
+        const schema = entity_schema_builder_1.EntitySchemaBuilder.fromEntityDefinition(entity, {
+            entityName: name,
+            pluginContributions: this.pluginContributions.getAll(),
+            widgetDataTypes: this.widgetDataTypes.getAll(),
+        });
         return this.registerSchema(schema, entity);
     }
     async registerFromProperties(input) {
@@ -34,6 +42,7 @@ let JqlSchemaService = JqlSchemaService_1 = class JqlSchemaService {
             entityName: input.entityName,
             hierarchical: input.hierarchical,
             indexes: input.indexes,
+            widgetDataTypes: this.widgetDataTypes.getAll(),
         });
         return this.registerSchema(schema);
     }
@@ -65,9 +74,13 @@ let JqlSchemaService = JqlSchemaService_1 = class JqlSchemaService {
         }
         const source = this.sourceFactory.create(normalized);
         if (binding.physicalName) {
+            // physicalName is for document/index overrides (Mongo collection, ES index).
+            // Never replace a structured SQL table name derived from the entity schema.
             source.name = binding.physicalName;
             source.collection = binding.physicalName;
-            source.table = binding.physicalName;
+            if (source.storage !== 'structured') {
+                source.table = binding.physicalName;
+            }
         }
         await engine.registerAndEnsureSource(source);
         await engine.ensureEntityTable(normalized);
@@ -191,7 +204,9 @@ exports.JqlSchemaService = JqlSchemaService = JqlSchemaService_1 = tslib_1.__dec
     (0, common_1.Injectable)(),
     tslib_1.__metadata("design:paramtypes", [jql_schema_registry_service_1.JqlSchemaRegistry,
         abstract_1.DataSourceRegistryService,
-        abstract_1.StorageBindingDefinitionCache, Object])
+        abstract_1.StorageBindingDefinitionCache,
+        plugin_contribution_catalog_1.PluginContributionCatalog,
+        widget_data_type_catalog_1.WidgetDataTypeCatalog, Object])
 ], JqlSchemaService);
 //#endregion
 //# sourceMappingURL=jql-schema.service.js.map

package/jql/schema/src/lib/jql-schema.service.js.map

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

package/jql/schema/src/lib/plugin-contribution-columns.util.d.ts

@@ -0,0 +1,27 @@
+import type { AXPPluginDefinitionValue } from '@acorex-platform/framework-server/domain/abstract';
+import type { JqlColumnDefinition } from '@acorex-platform/framework-server/jql/abstract';
+/** Minimal contribution shape used for JQL column materialization. */
+export interface JqlPluginPropertyContribution {
+    name: string;
+    nameFromOption?: string;
+    dataType?: string;
+    nullable?: boolean;
+}
+export interface JqlPluginContributions {
+    properties?: JqlPluginPropertyContribution[];
+}
+export type JqlPluginContributionsByName = ReadonlyMap<string, JqlPluginContributions>;
+/**
+ * Resolves host-entity columns from plugin instances + catalog contributions
+ * (`contributions.properties` + `nameFromOption`).
+ */
+export declare function resolvePluginContributionColumns(plugins: AXPPluginDefinitionValue[] | undefined, contributionsByName: JqlPluginContributionsByName | undefined): JqlColumnDefinition[];
+/** True for AI/docs placeholders that must never become physical columns. */
+export declare function isDocumentationPlaceholderName(name: string): boolean;
+/** Parses `contributionsJson` from a PluginDefinition catalog/entity row. */
+export declare function parsePluginContributionsJson(contributionsJson: unknown): JqlPluginContributions | null;
+export declare function buildPluginContributionsMap(rows: ReadonlyArray<{
+    name?: string;
+    contributionsJson?: unknown;
+}>): Map<string, JqlPluginContributions>;
+//# sourceMappingURL=plugin-contribution-columns.util.d.ts.map

package/jql/schema/src/lib/plugin-contribution-columns.util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin-contribution-columns.util.d.ts","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/schema/src/lib/plugin-contribution-columns.util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,wBAAwB,EAAE,MAAM,mDAAmD,CAAC;AAClG,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,gDAAgD,CAAC;AAM1F,sEAAsE;AACtE,MAAM,WAAW,6BAA6B;IAC5C,IAAI,EAAE,MAAM,CAAC;IACb,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,MAAM,WAAW,sBAAsB;IACrC,UAAU,CAAC,EAAE,6BAA6B,EAAE,CAAC;CAC9C;AAED,MAAM,MAAM,4BAA4B,GAAG,WAAW,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAAC;AAEvF;;;GAGG;AACH,wBAAgB,gCAAgC,CAC9C,OAAO,EAAE,wBAAwB,EAAE,GAAG,SAAS,EAC/C,mBAAmB,EAAE,4BAA4B,GAAG,SAAS,GAC5D,mBAAmB,EAAE,CAsCvB;AAED,6EAA6E;AAC7E,wBAAgB,8BAA8B,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAGpE;AAED,6EAA6E;AAC7E,wBAAgB,4BAA4B,CAC1C,iBAAiB,EAAE,OAAO,GACzB,sBAAsB,GAAG,IAAI,CAqC/B;AAED,wBAAgB,2BAA2B,CACzC,IAAI,EAAE,aAAa,CAAC;IAAE,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,iBAAiB,CAAC,EAAE,OAAO,CAAA;CAAE,CAAC,GAClE,GAAG,CAAC,MAAM,EAAE,sBAAsB,CAAC,CAYrC"}

package/jql/schema/src/lib/plugin-contribution-columns.util.js

@@ -0,0 +1,100 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.resolvePluginContributionColumns = resolvePluginContributionColumns;
+exports.isDocumentationPlaceholderName = isDocumentationPlaceholderName;
+exports.parsePluginContributionsJson = parsePluginContributionsJson;
+exports.buildPluginContributionsMap = buildPluginContributionsMap;
+const abstract_1 = require("@acorex-platform/framework-server/jql/abstract");
+const domain_data_type_mapper_1 = require("./domain-data-type.mapper");
+/**
+ * Resolves host-entity columns from plugin instances + catalog contributions
+ * (`contributions.properties` + `nameFromOption`).
+ */
+function resolvePluginContributionColumns(plugins, contributionsByName) {
+    if (!plugins?.length || !contributionsByName?.size) {
+        return [];
+    }
+    const columns = [];
+    const seen = new Set();
+    for (const plugin of plugins) {
+        const contributions = contributionsByName.get(plugin.name);
+        if (!contributions?.properties?.length) {
+            continue;
+        }
+        const options = (plugin.options ?? {});
+        for (const property of contributions.properties) {
+            const fromOption = property.nameFromOption && typeof options[property.nameFromOption] === 'string'
+                ? String(options[property.nameFromOption]).trim()
+                : '';
+            const fieldName = fromOption || property.name;
+            // Skip catalog documentation placeholders like "(from options.fields[].name)".
+            if (!fieldName || isDocumentationPlaceholderName(fieldName) || seen.has(fieldName)) {
+                continue;
+            }
+            seen.add(fieldName);
+            columns.push({
+                name: fieldName,
+                columnName: (0, abstract_1.resolveColumnName)(fieldName),
+                dataType: (0, domain_data_type_mapper_1.mapDomainDataType)(property.dataType ?? 'string'),
+                nullable: property.nullable ?? true,
+            });
+        }
+    }
+    return columns;
+}
+/** True for AI/docs placeholders that must never become physical columns. */
+function isDocumentationPlaceholderName(name) {
+    const trimmed = name.trim();
+    return trimmed.startsWith('(from ') || trimmed.includes('options.fields[]');
+}
+/** Parses `contributionsJson` from a PluginDefinition catalog/entity row. */
+function parsePluginContributionsJson(contributionsJson) {
+    if (contributionsJson == null) {
+        return null;
+    }
+    let parsed = contributionsJson;
+    if (typeof contributionsJson === 'string') {
+        const trimmed = contributionsJson.trim();
+        if (!trimmed) {
+            return null;
+        }
+        try {
+            parsed = JSON.parse(trimmed);
+        }
+        catch {
+            return null;
+        }
+    }
+    if (parsed == null || typeof parsed !== 'object') {
+        return null;
+    }
+    const properties = parsed.properties;
+    if (!Array.isArray(properties)) {
+        return { properties: [] };
+    }
+    return {
+        properties: properties
+            .filter((p) => !!p && typeof p.name === 'string')
+            .map((p) => ({
+            name: p.name,
+            nameFromOption: typeof p.nameFromOption === 'string' ? p.nameFromOption : undefined,
+            dataType: typeof p.dataType === 'string' ? p.dataType : 'string',
+            nullable: typeof p.nullable === 'boolean' ? p.nullable : true,
+        })),
+    };
+}
+function buildPluginContributionsMap(rows) {
+    const map = new Map();
+    for (const row of rows) {
+        if (!row.name) {
+            continue;
+        }
+        const contributions = parsePluginContributionsJson(row.contributionsJson);
+        if (contributions) {
+            map.set(row.name, contributions);
+        }
+    }
+    return map;
+}
+//#endregion
+//# sourceMappingURL=plugin-contribution-columns.util.js.map

package/jql/schema/src/lib/plugin-contribution-columns.util.js.map

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

package/jql/schema/src/lib/plugin-contribution.catalog.d.ts

@@ -0,0 +1,18 @@
+import { type JqlPluginContributions, type JqlPluginContributionsByName } from './plugin-contribution-columns.util';
+/**
+ * In-memory map of plugin name → contributions used when building JQL schemas.
+ * Primed from generated bootstrap catalog; can be refreshed from DB rows after seed.
+ */
+export declare class PluginContributionCatalog {
+    private contributions;
+    getAll(): JqlPluginContributionsByName;
+    get(pluginName: string): JqlPluginContributions | undefined;
+    /** Replace/merge contributions from PluginDefinition entity rows. */
+    loadFromRows(rows: ReadonlyArray<{
+        name?: string;
+        contributionsJson?: unknown;
+    }>): number;
+    /** Reset to generated bootstrap (tests / re-seed). */
+    resetToBootstrap(): void;
+}
+//# sourceMappingURL=plugin-contribution.catalog.d.ts.map

package/jql/schema/src/lib/plugin-contribution.catalog.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin-contribution.catalog.d.ts","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/schema/src/lib/plugin-contribution.catalog.ts"],"names":[],"mappings":"AACA,OAAO,EAEL,KAAK,sBAAsB,EAC3B,KAAK,4BAA4B,EAClC,MAAM,oCAAoC,CAAC;AAK5C;;;GAGG;AACH,qBACa,yBAAyB;IACpC,OAAO,CAAC,aAAa,CAEnB;IAEF,MAAM,IAAI,4BAA4B;IAItC,GAAG,CAAC,UAAU,EAAE,MAAM,GAAG,sBAAsB,GAAG,SAAS;IAI3D,qEAAqE;IACrE,YAAY,CAAC,IAAI,EAAE,aAAa,CAAC;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,iBAAiB,CAAC,EAAE,OAAO,CAAA;KAAE,CAAC,GAAG,MAAM;IAQzF,sDAAsD;IACtD,gBAAgB,IAAI,IAAI;CAGzB"}

package/jql/schema/src/lib/plugin-contribution.catalog.js

@@ -0,0 +1,41 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.PluginContributionCatalog = void 0;
+const tslib_1 = require("tslib");
+const common_1 = require("@nestjs/common");
+const plugin_contribution_columns_util_1 = require("./plugin-contribution-columns.util");
+const plugin_contributions_bootstrap_1 = require("./generated/plugin-contributions.bootstrap");
+//#region ---- Plugin contribution catalog ----
+/**
+ * In-memory map of plugin name → contributions used when building JQL schemas.
+ * Primed from generated bootstrap catalog; can be refreshed from DB rows after seed.
+ */
+let PluginContributionCatalog = class PluginContributionCatalog {
+    constructor() {
+        this.contributions = new Map(Object.entries(plugin_contributions_bootstrap_1.PLUGIN_CONTRIBUTIONS_BOOTSTRAP));
+    }
+    getAll() {
+        return this.contributions;
+    }
+    get(pluginName) {
+        return this.contributions.get(pluginName);
+    }
+    /** Replace/merge contributions from PluginDefinition entity rows. */
+    loadFromRows(rows) {
+        const next = (0, plugin_contribution_columns_util_1.buildPluginContributionsMap)(rows);
+        for (const [name, value] of next) {
+            this.contributions.set(name, value);
+        }
+        return next.size;
+    }
+    /** Reset to generated bootstrap (tests / re-seed). */
+    resetToBootstrap() {
+        this.contributions = new Map(Object.entries(plugin_contributions_bootstrap_1.PLUGIN_CONTRIBUTIONS_BOOTSTRAP));
+    }
+};
+exports.PluginContributionCatalog = PluginContributionCatalog;
+exports.PluginContributionCatalog = PluginContributionCatalog = tslib_1.__decorate([
+    (0, common_1.Injectable)()
+], PluginContributionCatalog);
+//#endregion
+//# sourceMappingURL=plugin-contribution.catalog.js.map

package/jql/schema/src/lib/plugin-contribution.catalog.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"plugin-contribution.catalog.js","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/schema/src/lib/plugin-contribution.catalog.ts"],"names":[],"mappings":";;;;AAAA,2CAA4C;AAC5C,yFAI4C;AAC5C,+FAA4F;AAE5F,+CAA+C;AAE/C;;;GAGG;AAEI,IAAM,yBAAyB,GAA/B,MAAM,yBAAyB;IAA/B;QACG,kBAAa,GAAwC,IAAI,GAAG,CAClE,MAAM,CAAC,OAAO,CAAC,+DAA8B,CAAC,CAC/C,CAAC;IAuBJ,CAAC;IArBC,MAAM;QACJ,OAAO,IAAI,CAAC,aAAa,CAAC;IAC5B,CAAC;IAED,GAAG,CAAC,UAAkB;QACpB,OAAO,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAC5C,CAAC;IAED,qEAAqE;IACrE,YAAY,CAAC,IAAmE;QAC9E,MAAM,IAAI,GAAG,IAAA,8DAA2B,EAAC,IAAI,CAAC,CAAC;QAC/C,KAAK,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;YACjC,IAAI,CAAC,aAAa,CAAC,GAAG,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,IAAI,CAAC,IAAI,CAAC;IACnB,CAAC;IAED,sDAAsD;IACtD,gBAAgB;QACd,IAAI,CAAC,aAAa,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,+DAA8B,CAAC,CAAC,CAAC;IAC/E,CAAC;CACF,CAAA;AA1BY,8DAAyB;oCAAzB,yBAAyB;IADrC,IAAA,mBAAU,GAAE;GACA,yBAAyB,CA0BrC;AAED,YAAY"}