@acorex-platform/framework-server 0.0.18 → 0.0.20

package/jql/mongodb/src/lib/compile/field-resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"field-resolver.d.ts","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/mongodb/src/lib/compile/field-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAC;AAI3E,MAAM,WAAW,yBAAyB;IACxC,MAAM,CAAC,EAAE,SAAS,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,EACb,GAAG,GAAE,yBAA8B,GAClC,MAAM,CA6BR"}
+{"version":3,"file":"field-resolver.d.ts","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/mongodb/src/lib/compile/field-resolver.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAC;AAI3E,MAAM,WAAW,yBAAyB;IACxC,MAAM,CAAC,EAAE,SAAS,CAAC;CACpB;AAED;;;;;;;;GAQG;AACH,wBAAgB,qBAAqB,CACnC,KAAK,EAAE,MAAM,EACb,GAAG,GAAE,yBAA8B,GAClC,MAAM,CA2CR"}

package/jql/mongodb/src/lib/compile/field-resolver.js

@@ -4,25 +4,37 @@ exports.resolveMongoFieldPath = resolveMongoFieldPath;
 /**
  * Resolves a logical JQL field to a MongoDB BSON path.
  *
+ * - Logical identity `id` (or `source.idField`) always maps to physical `_id`.
  * - Structured entity collections store logical camelCase keys at the document root.
  * - Document storage on MongoDB also writes flat logical keys at the root (`jsonPath` /
  *   field name). Postgres hybrid tables use `column` (e.g. `id`, `ref_id`) — those names
  *   must not be used when compiling Mongo filters.
  */
 function resolveMongoFieldPath(field, ctx = {}) {
+    if (typeof field !== 'string' || !field) {
+        return '_id';
+    }
     const source = ctx.source;
+    const idField = source?.idField ?? 'id';
+    const dotIndex = field.indexOf('.');
+    const rootField = dotIndex > 0 ? field.slice(0, dotIndex) : field;
+    const nestedPath = dotIndex > 0 ? field.slice(dotIndex + 1) : '';
+    if (rootField === idField) {
+        return nestedPath ? `_id.${nestedPath}` : '_id';
+    }
     if (!source) {
         return field;
     }
     if (source.storage === 'structured') {
         return field;
     }
-    const dotIndex = field.indexOf('.');
-    const rootField = dotIndex > 0 ? field.slice(0, dotIndex) : field;
-    const nestedPath = dotIndex > 0 ? field.slice(dotIndex + 1) : '';
     const descriptor = source.fields?.[rootField];
-    // Document storage: prefer logical/jsonPath names (Mongo insert stores flat docs).
+    // Document storage: flat seed rows keep logical columns at the document root.
+    // Prefer `column` when it matches the logical field (same rule as Postgres hybrid tables).
     if (source.storage === 'document') {
+        if (descriptor?.column && descriptor.column === rootField) {
+            return nestedPath ? `${descriptor.column}.${nestedPath}` : descriptor.column;
+        }
         const root = descriptor?.jsonPath?.trim() || rootField;
         return nestedPath ? `${root}.${nestedPath}` : root;
     }

package/jql/mongodb/src/lib/compile/field-resolver.js.map

@@ -1 +1 @@
-{"version":3,"file":"field-resolver.js","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/mongodb/src/lib/compile/field-resolver.ts"],"names":[],"mappings":";;AAgBA,sDAgCC;AAxCD;;;;;;;GAOG;AACH,SAAgB,qBAAqB,CACnC,KAAa,EACb,MAAiC,EAAE;IAEnC,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1B,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,KAAK,YAAY,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACpC,MAAM,SAAS,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAClE,MAAM,UAAU,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IACjE,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC;IAE9C,mFAAmF;IACnF,IAAI,MAAM,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,SAAS,CAAC;QACvD,OAAO,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACrD,CAAC;IAED,IAAI,UAAU,EAAE,MAAM,EAAE,CAAC;QACvB,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,GAAG,UAAU,CAAC,MAAM,IAAI,UAAU,EAAE,CAAC;QAC9C,CAAC;QACD,OAAO,UAAU,CAAC,MAAM,CAAC;IAC3B,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,YAAY"}
+{"version":3,"file":"field-resolver.js","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/mongodb/src/lib/compile/field-resolver.ts"],"names":[],"mappings":";;AAiBA,sDA8CC;AAvDD;;;;;;;;GAQG;AACH,SAAgB,qBAAqB,CACnC,KAAa,EACb,MAAiC,EAAE;IAEnC,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,CAAC,KAAK,EAAE,CAAC;QACxC,OAAO,KAAK,CAAC;IACf,CAAC;IACD,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1B,MAAM,OAAO,GAAG,MAAM,EAAE,OAAO,IAAI,IAAI,CAAC;IACxC,MAAM,QAAQ,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IACpC,MAAM,SAAS,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,QAAQ,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;IAClE,MAAM,UAAU,GAAG,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,QAAQ,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;IAEjE,IAAI,SAAS,KAAK,OAAO,EAAE,CAAC;QAC1B,OAAO,UAAU,CAAC,CAAC,CAAC,OAAO,UAAU,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC;IAClD,CAAC;IAED,IAAI,CAAC,MAAM,EAAE,CAAC;QACZ,OAAO,KAAK,CAAC;IACf,CAAC;IAED,IAAI,MAAM,CAAC,OAAO,KAAK,YAAY,EAAE,CAAC;QACpC,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,CAAC;IAE9C,8EAA8E;IAC9E,2FAA2F;IAC3F,IAAI,MAAM,CAAC,OAAO,KAAK,UAAU,EAAE,CAAC;QAClC,IAAI,UAAU,EAAE,MAAM,IAAI,UAAU,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;YAC1D,OAAO,UAAU,CAAC,CAAC,CAAC,GAAG,UAAU,CAAC,MAAM,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC;QAC/E,CAAC;QAED,MAAM,IAAI,GAAG,UAAU,EAAE,QAAQ,EAAE,IAAI,EAAE,IAAI,SAAS,CAAC;QACvD,OAAO,UAAU,CAAC,CAAC,CAAC,GAAG,IAAI,IAAI,UAAU,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;IACrD,CAAC;IAED,IAAI,UAAU,EAAE,MAAM,EAAE,CAAC;QACvB,IAAI,UAAU,EAAE,CAAC;YACf,OAAO,GAAG,UAAU,CAAC,MAAM,IAAI,UAAU,EAAE,CAAC;QAC9C,CAAC;QACD,OAAO,UAAU,CAAC,MAAM,CAAC;IAC3B,CAAC;IAED,OAAO,KAAK,CAAC;AACf,CAAC;AAED,YAAY"}

package/jql/mongodb/src/lib/compile/sort-builder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sort-builder.d.ts","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/mongodb/src/lib/compile/sort-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAC;AACpF,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAK/B,wBAAgB,cAAc,CAC5B,IAAI,EAAE,OAAO,EAAE,GAAG,SAAS,EAC3B,MAAM,CAAC,EAAE,SAAS,EAClB,OAAO,SAAO,GACb,IAAI,CAUN"}
+{"version":3,"file":"sort-builder.d.ts","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/mongodb/src/lib/compile/sort-builder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,MAAM,gDAAgD,CAAC;AACpF,OAAO,EAAE,IAAI,EAAE,MAAM,SAAS,CAAC;AAK/B,wBAAgB,cAAc,CAC5B,IAAI,EAAE,OAAO,EAAE,GAAG,SAAS,EAC3B,MAAM,CAAC,EAAE,SAAS,EAClB,OAAO,SAAO,GACb,IAAI,CAgBN"}

package/jql/mongodb/src/lib/compile/sort-builder.js

@@ -9,8 +9,14 @@ function buildMongoSort(sort, source, idField = 'id') {
     }
     const mongoSort = {};
     for (const item of sort) {
+        if (typeof item.field !== 'string' || !item.field) {
+            continue;
+        }
         mongoSort[(0, field_resolver_1.resolveMongoFieldPath)(item.field, { source })] = item.dir === 'desc' ? -1 : 1;
     }
+    if (!Object.keys(mongoSort).length) {
+        return { [(0, field_resolver_1.resolveMongoFieldPath)(idField, { source })]: 1 };
+    }
     return mongoSort;
 }
 //#endregion

package/jql/mongodb/src/lib/compile/sort-builder.js.map

@@ -1 +1 @@
-{"version":3,"file":"sort-builder.js","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/mongodb/src/lib/compile/sort-builder.ts"],"names":[],"mappings":";;AAMA,wCAcC;AAlBD,qDAAyD;AAEzD,wCAAwC;AAExC,SAAgB,cAAc,CAC5B,IAA2B,EAC3B,MAAkB,EAClB,OAAO,GAAG,IAAI;IAEd,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;QAClB,OAAO,EAAE,CAAC,IAAA,sCAAqB,EAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IAC7D,CAAC;IAED,MAAM,SAAS,GAA2B,EAAE,CAAC;IAC7C,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACxB,SAAS,CAAC,IAAA,sCAAqB,EAAC,IAAI,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1F,CAAC;IACD,OAAO,SAAiB,CAAC;AAC3B,CAAC;AAED,YAAY"}
+{"version":3,"file":"sort-builder.js","sourceRoot":"","sources":["../../../../../../../../../libs/framework/server/jql/mongodb/src/lib/compile/sort-builder.ts"],"names":[],"mappings":";;AAMA,wCAoBC;AAxBD,qDAAyD;AAEzD,wCAAwC;AAExC,SAAgB,cAAc,CAC5B,IAA2B,EAC3B,MAAkB,EAClB,OAAO,GAAG,IAAI;IAEd,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;QAClB,OAAO,EAAE,CAAC,IAAA,sCAAqB,EAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IAC7D,CAAC;IAED,MAAM,SAAS,GAA2B,EAAE,CAAC;IAC7C,KAAK,MAAM,IAAI,IAAI,IAAI,EAAE,CAAC;QACxB,IAAI,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE,CAAC;YAClD,SAAS;QACX,CAAC;QACD,SAAS,CAAC,IAAA,sCAAqB,EAAC,IAAI,CAAC,KAAK,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,KAAK,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;IAC1F,CAAC;IACD,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,MAAM,EAAE,CAAC;QACnC,OAAO,EAAE,CAAC,IAAA,sCAAqB,EAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC;IAC7D,CAAC;IACD,OAAO,SAAiB,CAAC;AAC3B,CAAC;AAED,YAAY"}

package/jql/mongodb/src/lib/document-mapper.d.ts

@@ -1,4 +1,18 @@
 import { type Document as MongoDocument } from 'mongodb';
-export declare function toDocument(doc: MongoDocument): Record<string, unknown>;
-export declare function toDocuments(docs: MongoDocument[]): Record<string, unknown>[];
+/**
+ * Maps a stored Mongo document to the logical JQL/app shape.
+ * Physical identity is `_id` (UUID string); logical identity is always `id`.
+ * Nested join/lookup arrays that carry `_id` are mapped the same way.
+ */
+export declare function toDocument(doc: MongoDocument, idField?: string): Record<string, unknown>;
+export declare function toDocuments(docs: MongoDocument[], idField?: string): Record<string, unknown>[];
+/**
+ * Builds the BSON document for insert: logical `id` becomes physical `_id` only.
+ * No mirrored `id` field is stored.
+ */
+export declare function toMongoInsertDocument(doc: Record<string, unknown>, id: string, idField?: string): MongoDocument;
+/**
+ * Strips identity fields from `$set` so updates never rewrite `_id` / logical `id`.
+ */
+export declare function sanitizeMongoUpdateSet(set: Record<string, unknown>, idField?: string): Record<string, unknown>;
 //# sourceMappingURL=document-mapper.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"document-mapper.d.ts","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/mongodb/src/lib/document-mapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,IAAI,aAAa,EAAE,MAAM,SAAS,CAAC;AAIzD,wBAAgB,UAAU,CAAC,GAAG,EAAE,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAGtE;AAED,wBAAgB,WAAW,CAAC,IAAI,EAAE,aAAa,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAE5E"}
+{"version":3,"file":"document-mapper.d.ts","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/mongodb/src/lib/document-mapper.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,IAAI,aAAa,EAAE,MAAM,SAAS,CAAC;AAIzD;;;;GAIG;AACH,wBAAgB,UAAU,CACxB,GAAG,EAAE,aAAa,EAClB,OAAO,SAAO,GACb,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAYzB;AAED,wBAAgB,WAAW,CACzB,IAAI,EAAE,aAAa,EAAE,EACrB,OAAO,SAAO,GACb,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAAE,CAE3B;AAED;;;GAGG;AACH,wBAAgB,qBAAqB,CACnC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,EAAE,EAAE,MAAM,EACV,OAAO,SAAO,GACb,aAAa,CAGf;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CACpC,GAAG,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EAC5B,OAAO,SAAO,GACb,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAKzB"}

package/jql/mongodb/src/lib/document-mapper.js

@@ -2,13 +2,77 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.toDocument = toDocument;
 exports.toDocuments = toDocuments;
+exports.toMongoInsertDocument = toMongoInsertDocument;
+exports.sanitizeMongoUpdateSet = sanitizeMongoUpdateSet;
 //#region ---- Document mapping ----
-function toDocument(doc) {
-    const { _id: _omit, ...rest } = doc;
-    return rest;
+/**
+ * Maps a stored Mongo document to the logical JQL/app shape.
+ * Physical identity is `_id` (UUID string); logical identity is always `id`.
+ * Nested join/lookup arrays that carry `_id` are mapped the same way.
+ */
+function toDocument(doc, idField = 'id') {
+    const raw = doc;
+    const { _id, ...rest } = raw;
+    const { [idField]: _dropLogicalId, ...withoutLogicalId } = rest;
+    const mapped = {
+        ...mapNestedMongoValues(withoutLogicalId, idField),
+    };
+    if (_id !== undefined) {
+        mapped[idField] = stringifyMongoId(_id);
+    }
+    return mapped;
 }
-function toDocuments(docs) {
-    return docs.map((doc) => toDocument(doc));
+function toDocuments(docs, idField = 'id') {
+    return docs.map((doc) => toDocument(doc, idField));
+}
+/**
+ * Builds the BSON document for insert: logical `id` becomes physical `_id` only.
+ * No mirrored `id` field is stored.
+ */
+function toMongoInsertDocument(doc, id, idField = 'id') {
+    const { [idField]: _omitLogicalId, _id: _omitPhysicalId, ...rest } = doc;
+    return { ...rest, _id: id };
+}
+/**
+ * Strips identity fields from `$set` so updates never rewrite `_id` / logical `id`.
+ */
+function sanitizeMongoUpdateSet(set, idField = 'id') {
+    const next = { ...set };
+    delete next[idField];
+    delete next['_id'];
+    return next;
+}
+function mapNestedMongoValues(value, idField) {
+    const out = {};
+    for (const [key, nested] of Object.entries(value)) {
+        out[key] = mapMongoValue(nested, idField);
+    }
+    return out;
+}
+function mapMongoValue(value, idField) {
+    if (Array.isArray(value)) {
+        return value.map((item) => mapMongoValue(item, idField));
+    }
+    if (isMongoIdentityDocument(value)) {
+        return toDocument(value, idField);
+    }
+    return value;
+}
+function isMongoIdentityDocument(value) {
+    return (value != null &&
+        typeof value === 'object' &&
+        !Array.isArray(value) &&
+        !(value instanceof Date) &&
+        Object.prototype.hasOwnProperty.call(value, '_id'));
+}
+function stringifyMongoId(value) {
+    if (typeof value === 'string' || typeof value === 'number') {
+        return String(value);
+    }
+    if (value != null && typeof value.toString === 'function') {
+        return String(value);
+    }
+    return '';
 }
 //#endregion
 //# sourceMappingURL=document-mapper.js.map

package/jql/mongodb/src/lib/document-mapper.js.map

@@ -1 +1 @@
-{"version":3,"file":"document-mapper.js","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/mongodb/src/lib/document-mapper.ts"],"names":[],"mappings":";;AAIA,gCAGC;AAED,kCAEC;AATD,oCAAoC;AAEpC,SAAgB,UAAU,CAAC,GAAkB;IAC3C,MAAM,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,IAAI,EAAE,GAAG,GAA8B,CAAC;IAC/D,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAgB,WAAW,CAAC,IAAqB;IAC/C,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC;AAC5C,CAAC;AAED,YAAY"}
+{"version":3,"file":"document-mapper.js","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/mongodb/src/lib/document-mapper.ts"],"names":[],"mappings":"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"}

package/jql/mongodb/src/lib/jql-mongodb.engine.d.ts

@@ -27,7 +27,9 @@ export declare class JqlMongodbEngine extends JqlEngineBase implements OnModuleD
     private ensureConnected;
     private connect;
     private getCollection;
+    private buildFindItemStages;
     private buildJoinPipeline;
+    private buildOneJoinStages;
     private buildAggregateStages;
     private aggregationExpression;
 }

package/jql/mongodb/src/lib/jql-mongodb.engine.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"jql-mongodb.engine.d.ts","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/mongodb/src/lib/jql-mongodb.engine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAOzD,OAAO,EACL,YAAY,EACZ,SAAS,EACT,aAAa,EACb,eAAe,EACf,SAAS,EAET,QAAQ,EACR,SAAS,EACT,SAAS,EAET,iBAAiB,EACjB,eAAe,EACf,SAAS,EAGV,MAAM,gDAAgD,CAAC;AAKxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAIxD,qBAAa,gBAAiB,SAAQ,aAAc,YAAW,eAAe;IAS1E,OAAO,CAAC,QAAQ,CAAC,MAAM;IARzB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqC;IAC5D,QAAQ,CAAC,OAAO,EAAG,SAAS,CAAU;IACtC,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,EAAE,CAAM;IAChB,OAAO,CAAC,iBAAiB,CAA8B;IACvD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsC;gBAGjD,MAAM,EAAE,gBAAgB,EACzC,QAAQ,EAAE,iBAAiB,EAC3B,YAAY,EAAE,MAAM;IAKhB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAItC,8EAA8E;IACxE,uBAAuB,CAC3B,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,WAAW,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,GAC/C,OAAO,CAAC,IAAI,CAAC;cA8CA,iBAAiB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;cAYnD,sBAAsB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;cAe9D,WAAW,CAAC,CAAC,EAC3B,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;cAqCR,YAAY,CAC1B,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,GACvC,OAAO,CAAC,MAAM,CAAC;cAOF,gBAAgB,CAAC,CAAC,EAChC,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,QAAQ,GAAG;QAAE,SAAS,EAAE,YAAY,CAAA;KAAE,GAC5C,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;cAsBR,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAmBvE,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;cAQrE,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;YAUvE,qBAAqB;YAcrB,eAAe;YAQf,OAAO;IAOrB,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,iBAAiB;IAqBzB,OAAO,CAAC,oBAAoB;IA8B5B,OAAO,CAAC,qBAAqB;CAsB9B"}
+{"version":3,"file":"jql-mongodb.engine.d.ts","sourceRoot":"","sources":["../../../../../../../../libs/framework/server/jql/mongodb/src/lib/jql-mongodb.engine.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,eAAe,EAAE,MAAM,gBAAgB,CAAC;AAQzD,OAAO,EACL,YAAY,EACZ,SAAS,EACT,aAAa,EACb,eAAe,EACf,SAAS,EAET,QAAQ,EACR,SAAS,EACT,SAAS,EAET,iBAAiB,EACjB,eAAe,EACf,SAAS,EAGV,MAAM,gDAAgD,CAAC;AAUxD,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAIxD,qBAAa,gBAAiB,SAAQ,aAAc,YAAW,eAAe;IAS1E,OAAO,CAAC,QAAQ,CAAC,MAAM;IARzB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAqC;IAC5D,QAAQ,CAAC,OAAO,EAAG,SAAS,CAAU;IACtC,OAAO,CAAC,MAAM,CAAe;IAC7B,OAAO,CAAC,EAAE,CAAM;IAChB,OAAO,CAAC,iBAAiB,CAA8B;IACvD,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAsC;gBAGjD,MAAM,EAAE,gBAAgB,EACzC,QAAQ,EAAE,iBAAiB,EAC3B,YAAY,EAAE,MAAM;IAKhB,eAAe,IAAI,OAAO,CAAC,IAAI,CAAC;IAItC,8EAA8E;IACxE,uBAAuB,CAC3B,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,WAAW,CAAC,eAAe,CAAC,SAAS,CAAC,CAAC,GAC/C,OAAO,CAAC,IAAI,CAAC;cAoDA,iBAAiB,CAAC,MAAM,EAAE,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC;cAQnD,sBAAsB,CAAC,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;cAe9D,WAAW,CAAC,CAAC,EAC3B,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,QAAQ,GACd,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;cA0CR,YAAY,CAC1B,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,IAAI,CAAC,QAAQ,EAAE,OAAO,GAAG,OAAO,CAAC,GACvC,OAAO,CAAC,MAAM,CAAC;cAOF,gBAAgB,CAAC,CAAC,EAChC,MAAM,EAAE,SAAS,EACjB,KAAK,EAAE,QAAQ,GAAG;QAAE,SAAS,EAAE,YAAY,CAAA;KAAE,GAC5C,OAAO,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;cAsBR,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;cAmBvE,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;cAarE,aAAa,CAAC,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,SAAS,GAAG,OAAO,CAAC,MAAM,CAAC;YAUvE,qBAAqB;YAcrB,eAAe;YAQf,OAAO;IAOrB,OAAO,CAAC,aAAa;IAKrB,OAAO,CAAC,mBAAmB;IA6B3B,OAAO,CAAC,iBAAiB;IAYzB,OAAO,CAAC,kBAAkB;IAwE1B,OAAO,CAAC,oBAAoB;IA8B5B,OAAO,CAAC,qBAAqB;CAuB9B"}

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

@@ -7,6 +7,7 @@ const abstract_1 = require("@acorex-platform/framework-server/jql/abstract");
 const schema_1 = require("@acorex-platform/framework-server/jql/schema");
 const filter_compiler_1 = require("./compile/filter-compiler");
 const sort_builder_1 = require("./compile/sort-builder");
+const field_resolver_1 = require("./compile/field-resolver");
 const document_mapper_1 = require("./document-mapper");
 //#region ---- MongoDB JQL engine ----
 class JqlMongodbEngine extends abstract_1.JqlEngineBase {
@@ -29,7 +30,12 @@ class JqlMongodbEngine extends abstract_1.JqlEngineBase {
         const existingKeySpecs = new Set(existingIndexes.map((index) => normalizeMongoIndexKeySpec(index.key)));
         for (const indexSpec of indexes) {
             const rich = isRichIndexSpec(indexSpec);
-            const keys = rich ? indexSpec.keys : indexSpec;
+            const rawKeys = rich ? indexSpec.keys : indexSpec;
+            const keys = remapMongoIndexKeys(rawKeys);
+            // `_id` is always indexed by MongoDB; skip redundant identity indexes.
+            if (isOnlyMongoIdIndex(keys)) {
+                continue;
+            }
             const requestedSpec = normalizeMongoIndexKeySpec(keys);
             if (existingKeySpecs.has(requestedSpec)) {
                 continue;
@@ -61,9 +67,6 @@ class JqlMongodbEngine extends abstract_1.JqlEngineBase {
         }
     }
     async applySourceSchema(source) {
-        if (source.storage === 'structured') {
-            return;
-        }
         if (!source.schema?.indexes?.length) {
             return;
         }
@@ -86,31 +89,37 @@ class JqlMongodbEngine extends abstract_1.JqlEngineBase {
     async executeFind(source, query) {
         await this.ensureConnected();
         const collection = this.getCollection(source);
+        const idField = source.idField ?? 'id';
         const filter = (0, filter_compiler_1.compileJqlFilterToMongo)(query.where, { source });
-        const sort = (0, sort_builder_1.buildMongoSort)(query.sort, source, source.idField ?? 'id');
-        const total = await collection.countDocuments(filter);
+        const sort = (0, sort_builder_1.buildMongoSort)(query.sort, source, idField);
+        const projection = buildMongoInclusionProjection(query.projection, idField);
         const skip = query.skip ?? 0;
         const take = query.take ?? 0;
-        let cursor = collection.find(filter).sort(sort).skip(skip);
-        if (take > 0) {
-            cursor = cursor.limit(take);
-        }
-        const pipeline = this.buildJoinPipeline(query.joins);
-        if (pipeline.length) {
-            const aggPipeline = [{ $match: filter }, ...pipeline];
-            if (sort) {
-                aggPipeline.push({ $sort: sort });
-            }
-            if (skip > 0) {
-                aggPipeline.push({ $skip: skip });
-            }
-            if (take > 0) {
-                aggPipeline.push({ $limit: take });
-            }
-            const items = (await collection.aggregate(aggPipeline).toArray()).map((doc) => (0, document_mapper_1.toDocument)(doc));
-            return { total, items };
+        const itemStages = this.buildFindItemStages({
+            source,
+            query,
+            sort,
+            projection,
+            skip,
+            take,
+        });
+        const pipeline = [{ $match: filter }];
+        if (query.includeTotal === false) {
+            pipeline.push(...itemStages);
+            const items = (0, document_mapper_1.toDocuments)(await collection.aggregate(pipeline, { allowDiskUse: true }).toArray(), idField);
+            return { items };
         }
-        const items = (0, document_mapper_1.toDocuments)(await cursor.toArray());
+        pipeline.push({
+            $facet: {
+                items: itemStages.length ? itemStages : [{ $skip: 0 }],
+                total: [{ $count: 'count' }],
+            },
+        });
+        const [facet] = (await collection
+            .aggregate(pipeline, { allowDiskUse: true })
+            .toArray());
+        const items = (0, document_mapper_1.toDocuments)(facet?.items ?? [], idField);
+        const total = facet?.total?.[0]?.count ?? 0;
         return { total, items };
     }
     async executeCount(source, query) {
@@ -124,12 +133,12 @@ class JqlMongodbEngine extends abstract_1.JqlEngineBase {
         const collection = this.getCollection(source);
         const filter = (0, filter_compiler_1.compileJqlFilterToMongo)(query.where, { source });
         const pipeline = [{ $match: filter }];
-        pipeline.push(...this.buildJoinPipeline(query.joins));
-        pipeline.push(...this.buildAggregateStages(query.aggregate));
+        pipeline.push(...this.buildJoinPipeline(query.joins, source));
+        pipeline.push(...this.buildAggregateStages(query.aggregate, source));
         if (query.aggregate.having) {
             pipeline.push({ $match: (0, filter_compiler_1.compileJqlFilterToMongo)(query.aggregate.having, { source }) });
         }
-        const sort = (0, sort_builder_1.buildMongoSort)(query.sort, source);
+        const sort = (0, sort_builder_1.buildMongoSort)(query.sort, source, source.idField ?? 'id');
         if (Object.keys(sort).length) {
             pipeline.push({ $sort: sort });
         }
@@ -145,7 +154,7 @@ class JqlMongodbEngine extends abstract_1.JqlEngineBase {
             const id = typeof doc[idField] === 'string' && doc[idField]
                 ? doc[idField]
                 : crypto.randomUUID();
-            const record = { ...doc, [idField]: id };
+            const record = (0, document_mapper_1.toMongoInsertDocument)(doc, id, idField);
             await collection.insertOne(record);
             ids.push(id);
         }
@@ -154,8 +163,13 @@ class JqlMongodbEngine extends abstract_1.JqlEngineBase {
     async executeUpdate(source, command) {
         await this.ensureConnected();
         const collection = this.getCollection(source);
+        const idField = source.idField ?? 'id';
         const filter = (0, filter_compiler_1.compileJqlFilterToMongo)(command.where, { source });
-        const result = await collection.updateMany(filter, { $set: command.set });
+        const set = (0, document_mapper_1.sanitizeMongoUpdateSet)(command.set, idField);
+        if (!Object.keys(set).length) {
+            return 0;
+        }
+        const result = await collection.updateMany(filter, { $set: set });
         return result.modifiedCount;
     }
     async executeDelete(source, command) {
@@ -193,35 +207,104 @@ class JqlMongodbEngine extends abstract_1.JqlEngineBase {
         const name = source.collection ?? source.table ?? source.name;
         return this.db.collection(name);
     }
-    buildJoinPipeline(joins) {
+    buildFindItemStages(args) {
+        const stages = [];
+        if (Object.keys(args.sort).length) {
+            stages.push({ $sort: args.sort });
+        }
+        if (args.skip > 0) {
+            stages.push({ $skip: args.skip });
+        }
+        if (args.take > 0) {
+            stages.push({ $limit: args.take });
+        }
+        stages.push(...this.buildJoinPipeline(args.query.joins, args.source));
+        const joinedProjection = mergeJoinAliasesIntoProjection(args.projection, args.query.joins);
+        if (joinedProjection) {
+            stages.push({ $project: joinedProjection });
+        }
+        return stages;
+    }
+    buildJoinPipeline(joins, source) {
         if (!joins?.length) {
             return [];
         }
-        return joins.map((join) => {
-            const joinSource = this.registry.get(join.source);
-            const fromCollection = joinSource.collection ?? joinSource.table ?? join.source;
-            const localField = join.on[0]?.left ?? 'id';
-            const foreignField = join.on[0]?.right ?? 'id';
-            return {
+        const stages = [];
+        for (const join of joins) {
+            stages.push(...this.buildOneJoinStages(join, source));
+        }
+        return stages;
+    }
+    buildOneJoinStages(join, hostSource) {
+        if (!this.registry.has(join.source)) {
+            return [];
+        }
+        const joinSource = this.registry.get(join.source);
+        const fromCollection = joinSource.collection ?? joinSource.table ?? join.source;
+        const as = join.as ?? join.source;
+        const localField = (0, field_resolver_1.resolveMongoFieldPath)(join.on[0]?.left ?? hostSource.idField ?? 'id', {
+            source: hostSource,
+        });
+        const foreignField = (0, field_resolver_1.resolveMongoFieldPath)(join.on[0]?.right ?? joinSource.idField ?? 'id', { source: joinSource });
+        const pipeline = [
+            {
+                $match: {
+                    $expr: join.multiple
+                        ? {
+                            $in: [
+                                `$${foreignField}`,
+                                {
+                                    $cond: [
+                                        { $isArray: '$$fk' },
+                                        '$$fk',
+                                        { $cond: [{ $eq: ['$$fk', null] }, [], ['$$fk']] },
+                                    ],
+                                },
+                            ],
+                        }
+                        : { $eq: [`$${foreignField}`, '$$fk'] },
+                },
+            },
+        ];
+        if (join.where) {
+            const isolation = (0, filter_compiler_1.compileJqlFilterToMongo)(join.where, { source: joinSource });
+            if (isolation && Object.keys(isolation).length > 0) {
+                pipeline.push({ $match: isolation });
+            }
+        }
+        pipeline.push(...this.buildJoinPipeline(join.joins, joinSource));
+        const joinProjection = buildJoinInclusionProjection(join, joinSource);
+        if (joinProjection) {
+            pipeline.push({ $project: joinProjection });
+        }
+        pipeline.push({ $addFields: { id: '$_id' } });
+        const stages = [
+            {
                 $lookup: {
                     from: fromCollection,
-                    localField,
-                    foreignField,
-                    as: join.as ?? join.source,
+                    let: { fk: `$${localField}` },
+                    pipeline,
+                    as,
                 },
-            };
-        });
+            },
+        ];
+        if (!join.multiple) {
+            stages.push({
+                $unwind: { path: `$${as}`, preserveNullAndEmptyArrays: true },
+            });
+        }
+        return stages;
     }
-    buildAggregateStages(aggregate) {
+    buildAggregateStages(aggregate, source) {
         const groupId = {};
         for (const field of aggregate.groupBy ?? []) {
-            groupId[field] = `$${field}`;
+            groupId[field] = `$${(0, field_resolver_1.resolveMongoFieldPath)(field, { source })}`;
         }
         const groupStage = {
             _id: Object.keys(groupId).length ? groupId : null,
         };
         for (const agg of aggregate.aggregations) {
-            groupStage[agg.alias] = this.aggregationExpression(agg.fn, agg.field);
+            groupStage[agg.alias] = this.aggregationExpression(agg.fn, agg.field, source);
         }
         const stages = [{ $group: groupStage }];
         if (aggregate.groupBy?.length) {
@@ -236,8 +319,8 @@ class JqlMongodbEngine extends abstract_1.JqlEngineBase {
         }
         return stages;
     }
-    aggregationExpression(fn, field) {
-        const fieldRef = field ? `$${field}` : null;
+    aggregationExpression(fn, field, source) {
+        const fieldRef = field ? `$${(0, field_resolver_1.resolveMongoFieldPath)(field, { source })}` : null;
         switch (fn) {
             case 'count':
                 return fieldRef ? { $sum: 1 } : { $sum: 1 };
@@ -255,6 +338,100 @@ class JqlMongodbEngine extends abstract_1.JqlEngineBase {
     }
 }
 exports.JqlMongodbEngine = JqlMongodbEngine;
+function collectJoinAliases(joins) {
+    if (!joins?.length) {
+        return [];
+    }
+    return joins.map((join) => join.as ?? join.source);
+}
+/** Mongo `$project` rejects both `user` and `user.name` in the same inclusion spec. */
+function dropPathsUnderAlias(projection, alias) {
+    const prefix = `${alias}.`;
+    for (const key of Object.keys(projection)) {
+        if (key.startsWith(prefix)) {
+            delete projection[key];
+        }
+    }
+}
+function mergeJoinAliasesIntoProjection(projection, joins) {
+    if (!projection) {
+        return undefined;
+    }
+    const next = { ...projection };
+    for (const alias of collectJoinAliases(joins)) {
+        dropPathsUnderAlias(next, alias);
+        next[alias] = 1;
+    }
+    return next;
+}
+function buildJoinInclusionProjection(join, joinSource) {
+    if (!join.projection?.length) {
+        return undefined;
+    }
+    const idField = joinSource.idField ?? 'id';
+    const nestedAliases = new Set(collectJoinAliases(join.joins));
+    const doc = { _id: 1 };
+    for (const field of join.projection) {
+        const trimmed = field.trim();
+        if (!trimmed) {
+            continue;
+        }
+        if (trimmed === idField) {
+            doc['_id'] = 1;
+            continue;
+        }
+        const dotIndex = trimmed.indexOf('.');
+        const root = dotIndex > 0 ? trimmed.slice(0, dotIndex) : trimmed;
+        if (root === idField) {
+            doc[`_id.${trimmed.slice(idField.length + 1)}`] = 1;
+            continue;
+        }
+        if (nestedAliases.has(root)) {
+            continue;
+        }
+        doc[trimmed] = 1;
+    }
+    for (const alias of nestedAliases) {
+        dropPathsUnderAlias(doc, alias);
+        doc[alias] = 1;
+    }
+    return doc;
+}
+function buildMongoInclusionProjection(projection, idField = 'id') {
+    if (!projection?.length) {
+        return undefined;
+    }
+    const doc = {};
+    let includeIdentity = false;
+    for (const field of projection) {
+        const trimmed = field.trim();
+        if (!trimmed) {
+            continue;
+        }
+        if (trimmed === idField) {
+            includeIdentity = true;
+            doc['_id'] = 1;
+            continue;
+        }
+        doc[trimmed] = 1;
+    }
+    if (!includeIdentity) {
+        doc['_id'] = 0;
+    }
+    return Object.keys(doc).length > 0 ? doc : undefined;
+}
+function remapMongoIndexKeys(keys) {
+    const remapped = {};
+    for (const [field, direction] of Object.entries(keys)) {
+        const physical = field === 'id' ? '_id' : field;
+        remapped[physical] = direction;
+    }
+    return remapped;
+}
+function isOnlyMongoIdIndex(keys) {
+    const fields = Object.keys(keys);
+    return fields.length === 1 && fields[0] === '_id';
+}
 function isRichIndexSpec(spec) {
     return 'keys' in spec && typeof spec['keys'] === 'object';
 }