@objectstack/objectql 3.2.1 → 3.2.3

package/dist/index.mjs

@@ -670,7 +670,7 @@ var ObjectStackProtocolImplementation = class {
         }
       };
     } else {
-      const formFields = fieldKeys.filter((k) => k !== "id" && k !== "created_at" && k !== "modified_at" && !fields[k].hidden).map((f) => ({
+      const formFields = fieldKeys.filter((k) => k !== "id" && k !== "created_at" && k !== "updated_at" && !fields[k].hidden).map((f) => ({
         field: f,
         label: fields[f]?.label,
         required: fields[f]?.required,
@@ -761,7 +761,7 @@ var ObjectStackProtocolImplementation = class {
   }
   async getData(request) {
     const queryOptions = {
-      filter: { _id: request.id }
+      filter: { id: request.id }
     };
     if (request.select) {
       queryOptions.select = typeof request.select === "string" ? request.select.split(",").map((s) => s.trim()).filter(Boolean) : request.select;
@@ -783,12 +783,12 @@ var ObjectStackProtocolImplementation = class {
     const result = await this.engine.insert(request.object, request.data);
     return {
       object: request.object,
-      id: result._id || result.id,
+      id: result.id,
       record: result
     };
   }
   async updateData(request) {
-    const result = await this.engine.update(request.object, request.data, { filter: { _id: request.id } });
+    const result = await this.engine.update(request.object, request.data, { filter: { id: request.id } });
     return {
       object: request.object,
       id: request.id,
@@ -796,7 +796,7 @@ var ObjectStackProtocolImplementation = class {
     };
   }
   async deleteData(request) {
-    await this.engine.delete(request.object, { filter: { _id: request.id } });
+    await this.engine.delete(request.object, { filter: { id: request.id } });
     return {
       object: request.object,
       id: request.id,
@@ -853,13 +853,13 @@ var ObjectStackProtocolImplementation = class {
         switch (operation) {
           case "create": {
             const created = await this.engine.insert(object, record.data || record);
-            results.push({ id: created._id || created.id, success: true, record: created });
+            results.push({ id: created.id, success: true, record: created });
             succeeded++;
             break;
           }
           case "update": {
             if (!record.id) throw new Error("Record id is required for update");
-            const updated = await this.engine.update(object, record.data || {}, { filter: { _id: record.id } });
+            const updated = await this.engine.update(object, record.data || {}, { filter: { id: record.id } });
             results.push({ id: record.id, success: true, record: updated });
             succeeded++;
             break;
@@ -867,28 +867,28 @@ var ObjectStackProtocolImplementation = class {
           case "upsert": {
             if (record.id) {
               try {
-                const existing = await this.engine.findOne(object, { filter: { _id: record.id } });
+                const existing = await this.engine.findOne(object, { filter: { id: record.id } });
                 if (existing) {
-                  const updated = await this.engine.update(object, record.data || {}, { filter: { _id: record.id } });
+                  const updated = await this.engine.update(object, record.data || {}, { filter: { id: record.id } });
                   results.push({ id: record.id, success: true, record: updated });
                 } else {
-                  const created = await this.engine.insert(object, { _id: record.id, ...record.data || {} });
-                  results.push({ id: created._id || created.id, success: true, record: created });
+                  const created = await this.engine.insert(object, { id: record.id, ...record.data || {} });
+                  results.push({ id: created.id, success: true, record: created });
                 }
               } catch {
-                const created = await this.engine.insert(object, { _id: record.id, ...record.data || {} });
-                results.push({ id: created._id || created.id, success: true, record: created });
+                const created = await this.engine.insert(object, { id: record.id, ...record.data || {} });
+                results.push({ id: created.id, success: true, record: created });
               }
             } else {
               const created = await this.engine.insert(object, record.data || record);
-              results.push({ id: created._id || created.id, success: true, record: created });
+              results.push({ id: created.id, success: true, record: created });
             }
             succeeded++;
             break;
           }
           case "delete": {
             if (!record.id) throw new Error("Record id is required for delete");
-            await this.engine.delete(object, { filter: { _id: record.id } });
+            await this.engine.delete(object, { filter: { id: record.id } });
             results.push({ id: record.id, success: true });
             succeeded++;
             break;
@@ -932,7 +932,7 @@ var ObjectStackProtocolImplementation = class {
     let failed = 0;
     for (const record of records) {
       try {
-        const updated = await this.engine.update(object, record.data, { filter: { _id: record.id } });
+        const updated = await this.engine.update(object, record.data, { filter: { id: record.id } });
         results.push({ id: record.id, success: true, record: updated });
         succeeded++;
       } catch (err) {
@@ -1096,7 +1096,7 @@ var ObjectStackProtocolImplementation = class {
   }
   async deleteManyData(request) {
     return this.engine.delete(request.object, {
-      filter: { _id: { $in: request.ids } },
+      filter: { id: { $in: request.ids } },
       ...request.options
     });
   }
@@ -1781,7 +1781,7 @@ var _ObjectQL = class _ObjectQL {
       try {
         const relatedQuery = {
           object: referenceObject,
-          where: { _id: { $in: uniqueIds } },
+          where: { id: { $in: uniqueIds } },
           ...nestedAST.fields ? { fields: nestedAST.fields } : {},
           ...nestedAST.orderBy ? { orderBy: nestedAST.orderBy } : {}
         };
@@ -1789,7 +1789,7 @@ var _ObjectQL = class _ObjectQL {
         const relatedRecords = await driver.find(referenceObject, relatedQuery) ?? [];
         const recordMap = /* @__PURE__ */ new Map();
         for (const rec of relatedRecords) {
-          const id = rec._id ?? rec.id;
+          const id = rec.id;
           if (id != null) recordMap.set(String(id), rec);
         }
         if (nestedAST.expand && Object.keys(nestedAST.expand).length > 0) {
@@ -1801,7 +1801,7 @@ var _ObjectQL = class _ObjectQL {
           );
           recordMap.clear();
           for (const rec of expandedRelated) {
-            const id = rec._id ?? rec.id;
+            const id = rec.id;
             if (id != null) recordMap.set(String(id), rec);
           }
         }
@@ -1969,10 +1969,9 @@ var _ObjectQL = class _ObjectQL {
     object = this.resolveObjectName(object);
     this.logger.debug("Update operation starting", { object });
     const driver = this.getDriver(object);
-    let id = data.id || data._id;
+    let id = data.id;
     if (!id && options?.filter) {
       if (typeof options.filter === "string") id = options.filter;
-      else if (options.filter._id) id = options.filter._id;
       else if (options.filter.id) id = options.filter.id;
     }
     const opCtx = {
@@ -2020,7 +2019,6 @@ var _ObjectQL = class _ObjectQL {
     let id = void 0;
     if (options?.filter) {
       if (typeof options.filter === "string") id = options.filter;
-      else if (options.filter._id) id = options.filter._id;
       else if (options.filter.id) id = options.filter.id;
     }
     const opCtx = {
@@ -2074,7 +2072,7 @@ var _ObjectQL = class _ObjectQL {
         const ast = this.toQueryAST(object, { filter: query?.filter });
         return driver.count(object, ast);
       }
-      const res = await this.find(object, { filter: query?.filter, select: ["_id"] });
+      const res = await this.find(object, { filter: query?.filter, select: ["id"] });
       return res.length;
     });
     return opCtx.result;
@@ -2308,8 +2306,8 @@ var ObjectRepository = class {
   }
   /** Update a single record by ID */
   async updateById(id, data) {
-    return this.engine.update(this.objectName, { ...data, _id: id }, {
-      filter: { _id: id },
+    return this.engine.update(this.objectName, { ...data, id }, {
+      filter: { id },
       context: this.context
     });
   }
@@ -2322,7 +2320,7 @@ var ObjectRepository = class {
   /** Delete a single record by ID */
   async deleteById(id) {
     return this.engine.delete(this.objectName, {
-      filter: { _id: id },
+      filter: { id },
       context: this.context
     });
   }
@@ -2570,6 +2568,7 @@ var ObjectQLPlugin = class {
           }
         }
       }
+      await this.ql?.init();
       this.registerAuditHooks(ctx);
       this.registerTenantMiddleware(ctx);
       ctx.logger.info("ObjectQL engine started", {
@@ -2584,7 +2583,7 @@ var ObjectQLPlugin = class {
     }
   }
   /**
-   * Register built-in audit hooks for auto-stamping createdBy/modifiedBy
+   * Register built-in audit hooks for auto-stamping created_by/updated_by
    * and fetching previousData for update/delete operations.
    */
   registerAuditHooks(ctx) {
@@ -2594,11 +2593,11 @@ var ObjectQLPlugin = class {
         const data = hookCtx.input.data;
         if (typeof data === "object" && data !== null) {
           data.created_by = data.created_by ?? hookCtx.session.userId;
-          data.modified_by = hookCtx.session.userId;
+          data.updated_by = hookCtx.session.userId;
           data.created_at = data.created_at ?? (/* @__PURE__ */ new Date()).toISOString();
-          data.modified_at = (/* @__PURE__ */ new Date()).toISOString();
+          data.updated_at = (/* @__PURE__ */ new Date()).toISOString();
           if (hookCtx.session.tenantId) {
-            data.space_id = data.space_id ?? hookCtx.session.tenantId;
+            data.tenant_id = data.tenant_id ?? hookCtx.session.tenantId;
           }
         }
       }
@@ -2607,8 +2606,8 @@ var ObjectQLPlugin = class {
       if (hookCtx.session?.userId && hookCtx.input?.data) {
         const data = hookCtx.input.data;
         if (typeof data === "object" && data !== null) {
-          data.modified_by = hookCtx.session.userId;
-          data.modified_at = (/* @__PURE__ */ new Date()).toISOString();
+          data.updated_by = hookCtx.session.userId;
+          data.updated_at = (/* @__PURE__ */ new Date()).toISOString();
         }
       }
     }, { object: "*", priority: 10 });
@@ -2616,7 +2615,7 @@ var ObjectQLPlugin = class {
       if (hookCtx.input?.id && !hookCtx.previous) {
         try {
           const existing = await this.ql.findOne(hookCtx.object, {
-            filter: { _id: hookCtx.input.id }
+            filter: { id: hookCtx.input.id }
           });
           if (existing) {
             hookCtx.previous = existing;
@@ -2629,7 +2628,7 @@ var ObjectQLPlugin = class {
       if (hookCtx.input?.id && !hookCtx.previous) {
         try {
           const existing = await this.ql.findOne(hookCtx.object, {
-            filter: { _id: hookCtx.input.id }
+            filter: { id: hookCtx.input.id }
           });
           if (existing) {
             hookCtx.previous = existing;
@@ -2638,10 +2637,10 @@ var ObjectQLPlugin = class {
         }
       }
     }, { object: "*", priority: 5 });
-    ctx.logger.debug("Audit hooks registered (createdBy/modifiedBy, previousData)");
+    ctx.logger.debug("Audit hooks registered (created_by/updated_by, previousData)");
   }
   /**
-   * Register tenant isolation middleware that auto-injects space_id filter
+   * Register tenant isolation middleware that auto-injects tenant_id filter
    * for multi-tenant operations.
    */
   registerTenantMiddleware(ctx) {
@@ -2652,7 +2651,7 @@ var ObjectQLPlugin = class {
       }
       if (["find", "findOne", "count", "aggregate"].includes(opCtx.operation)) {
         if (opCtx.ast) {
-          const tenantFilter = { space_id: opCtx.context.tenantId };
+          const tenantFilter = { tenant_id: opCtx.context.tenantId };
           if (opCtx.ast.where) {
             opCtx.ast.where = { $and: [opCtx.ast.where, tenantFilter] };
           } else {