@objectstack/objectql 3.0.11 → 3.1.1

package/dist/index.mjs

@@ -734,6 +734,16 @@ var ObjectStackProtocolImplementation = class {
     if (typeof options.populate === "string") {
       options.populate = options.populate.split(",").map((s) => s.trim()).filter(Boolean);
     }
+    const expandValue = options.$expand ?? options.expand;
+    if (expandValue && !options.populate) {
+      if (typeof expandValue === "string") {
+        options.populate = expandValue.split(",").map((s) => s.trim()).filter(Boolean);
+      } else if (Array.isArray(expandValue)) {
+        options.populate = expandValue;
+      }
+    }
+    delete options.$expand;
+    delete options.expand;
     for (const key of ["distinct", "count"]) {
       if (options[key] === "true") options[key] = true;
       else if (options[key] === "false") options[key] = false;
@@ -750,9 +760,16 @@ var ObjectStackProtocolImplementation = class {
     };
   }
   async getData(request) {
-    const result = await this.engine.findOne(request.object, {
+    const queryOptions = {
       filter: { _id: request.id }
-    });
+    };
+    if (request.select) {
+      queryOptions.select = typeof request.select === "string" ? request.select.split(",").map((s) => s.trim()).filter(Boolean) : request.select;
+    }
+    if (request.expand) {
+      queryOptions.populate = typeof request.expand === "string" ? request.expand.split(",").map((s) => s.trim()).filter(Boolean) : request.expand;
+    }
+    const result = await this.engine.findOne(request.object, queryOptions);
     if (result) {
       return {
         object: request.object,
@@ -1230,7 +1247,7 @@ var ObjectStackProtocolImplementation = class {
 import { ExecutionContextSchema } from "@objectstack/spec/kernel";
 import { createLogger } from "@objectstack/core";
 import { CoreServiceName } from "@objectstack/spec/system";
-var ObjectQL = class _ObjectQL {
+var _ObjectQL = class _ObjectQL {
   constructor(hostContext = {}) {
     this.drivers = /* @__PURE__ */ new Map();
     this.defaultDriver = null;
@@ -1725,6 +1742,89 @@ var ObjectQL = class _ObjectQL {
     }
     this.logger.info("ObjectQL engine destroyed");
   }
+  /**
+   * Post-process expand: resolve lookup/master_detail fields by batch-loading related records.
+   * 
+   * This is a driver-agnostic implementation that uses secondary queries ($in batches)
+   * to load related records, then injects them into the result set.
+   * 
+   * @param objectName - The source object name
+   * @param records - The records returned by the driver
+   * @param expand - The expand map from QueryAST (field name → nested QueryAST)
+   * @param depth - Current recursion depth (0-based)
+   * @returns Records with expanded lookup fields (IDs replaced by full objects)
+   */
+  async expandRelatedRecords(objectName, records, expand, depth = 0) {
+    if (!records || records.length === 0) return records;
+    if (depth >= _ObjectQL.MAX_EXPAND_DEPTH) return records;
+    const objectSchema = SchemaRegistry.getObject(objectName);
+    if (!objectSchema || !objectSchema.fields) return records;
+    for (const [fieldName, nestedAST] of Object.entries(expand)) {
+      const fieldDef = objectSchema.fields[fieldName];
+      if (!fieldDef || !fieldDef.reference) continue;
+      if (fieldDef.type !== "lookup" && fieldDef.type !== "master_detail") continue;
+      const referenceObject = fieldDef.reference;
+      const allIds = [];
+      for (const record of records) {
+        const val = record[fieldName];
+        if (val == null) continue;
+        if (Array.isArray(val)) {
+          allIds.push(...val.filter((id) => id != null));
+        } else if (typeof val === "object") {
+          continue;
+        } else {
+          allIds.push(val);
+        }
+      }
+      const uniqueIds = [...new Set(allIds)];
+      if (uniqueIds.length === 0) continue;
+      try {
+        const relatedQuery = {
+          object: referenceObject,
+          where: { _id: { $in: uniqueIds } },
+          ...nestedAST.fields ? { fields: nestedAST.fields } : {},
+          ...nestedAST.orderBy ? { orderBy: nestedAST.orderBy } : {}
+        };
+        const driver = this.getDriver(referenceObject);
+        const relatedRecords = await driver.find(referenceObject, relatedQuery) ?? [];
+        const recordMap = /* @__PURE__ */ new Map();
+        for (const rec of relatedRecords) {
+          const id = rec._id ?? rec.id;
+          if (id != null) recordMap.set(String(id), rec);
+        }
+        if (nestedAST.expand && Object.keys(nestedAST.expand).length > 0) {
+          const expandedRelated = await this.expandRelatedRecords(
+            referenceObject,
+            relatedRecords,
+            nestedAST.expand,
+            depth + 1
+          );
+          recordMap.clear();
+          for (const rec of expandedRelated) {
+            const id = rec._id ?? rec.id;
+            if (id != null) recordMap.set(String(id), rec);
+          }
+        }
+        for (const record of records) {
+          const val = record[fieldName];
+          if (val == null) continue;
+          if (Array.isArray(val)) {
+            record[fieldName] = val.map((id) => recordMap.get(String(id)) ?? id);
+          } else if (typeof val !== "object") {
+            record[fieldName] = recordMap.get(String(val)) ?? val;
+          }
+        }
+      } catch (e) {
+        this.logger.warn("Failed to expand relationship field; retaining foreign key IDs", {
+          object: objectName,
+          field: fieldName,
+          reference: referenceObject,
+          error: e.message
+        });
+      }
+    }
+    return records;
+  }
   // ============================================
   // Helper: Query Conversion
   // ============================================
@@ -1784,7 +1884,10 @@ var ObjectQL = class _ObjectQL {
       };
       await this.triggerHooks("beforeFind", hookContext);
       try {
-        const result = await driver.find(object, hookContext.input.ast, hookContext.input.options);
+        let result = await driver.find(object, hookContext.input.ast, hookContext.input.options);
+        if (ast.expand && Object.keys(ast.expand).length > 0 && Array.isArray(result)) {
+          result = await this.expandRelatedRecords(object, result, ast.expand, 0);
+        }
         hookContext.event = "afterFind";
         hookContext.result = result;
         await this.triggerHooks("afterFind", hookContext);
@@ -1810,7 +1913,12 @@ var ObjectQL = class _ObjectQL {
       context: query?.context
     };
     await this.executeWithMiddleware(opCtx, async () => {
-      return driver.findOne(objectName, opCtx.ast);
+      let result = await driver.findOne(objectName, opCtx.ast);
+      if (ast.expand && Object.keys(ast.expand).length > 0 && result != null) {
+        const expanded = await this.expandRelatedRecords(objectName, [result], ast.expand, 0);
+        result = expanded[0];
+      }
+      return result;
     });
     return opCtx.result;
   }
@@ -2159,6 +2267,12 @@ var ObjectQL = class _ObjectQL {
     return ql;
   }
 };
+// ============================================
+// Helper: Expand Related Records
+// ============================================
+/** Maximum depth for recursive expand to prevent infinite loops */
+_ObjectQL.MAX_EXPAND_DEPTH = 3;
+var ObjectQL = _ObjectQL;
 var ObjectRepository = class {
   constructor(objectName, context, engine) {
     this.objectName = objectName;