@objectstack/objectql 3.2.1 → 3.2.2

package/.turbo/turbo-build.log

@@ -1,5 +1,5 @@
 
-> @objectstack/objectql@3.2.1 build /home/runner/work/spec/spec/packages/objectql
+> @objectstack/objectql@3.2.2 build /home/runner/work/spec/spec/packages/objectql
 > tsup --config ../../tsup.config.ts
 
 CLI Building entry: src/index.ts
@@ -10,13 +10,13 @@
 CLI Cleaning output folder
 ESM Build start
 CJS Build start
-ESM dist/index.mjs     93.78 KB
-ESM dist/index.mjs.map 191.98 KB
-ESM ⚡️ Build success in 182ms
-CJS dist/index.js     95.52 KB
-CJS dist/index.js.map 193.28 KB
-CJS ⚡️ Build success in 195ms
+ESM dist/index.mjs     93.53 KB
+ESM dist/index.mjs.map 191.56 KB
+ESM ⚡️ Build success in 169ms
+CJS dist/index.js     95.27 KB
+CJS dist/index.js.map 192.86 KB
+CJS ⚡️ Build success in 181ms
 DTS Build start
-DTS ⚡️ Build success in 22850ms
-DTS dist/index.d.mts 77.32 KB
-DTS dist/index.d.ts  77.32 KB
+DTS ⚡️ Build success in 23512ms
+DTS dist/index.d.mts 77.33 KB
+DTS dist/index.d.ts  77.33 KB

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @objectstack/objectql
 
+## 3.2.2
+
+### Patch Changes
+
+- Updated dependencies [46defbb]
+  - @objectstack/spec@3.2.2
+  - @objectstack/core@3.2.2
+  - @objectstack/types@3.2.2
+
 ## 3.2.1
 
 ### Patch Changes

package/dist/index.d.mts

@@ -1867,12 +1867,12 @@ declare class ObjectQLPlugin implements Plugin {
     init: (ctx: PluginContext) => Promise<void>;
     start: (ctx: PluginContext) => Promise<void>;
     /**
-     * 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.
      */
     private registerAuditHooks;
     /**
-     * Register tenant isolation middleware that auto-injects space_id filter
+     * Register tenant isolation middleware that auto-injects tenant_id filter
      * for multi-tenant operations.
      */
     private registerTenantMiddleware;

package/dist/index.d.ts

@@ -1867,12 +1867,12 @@ declare class ObjectQLPlugin implements Plugin {
     init: (ctx: PluginContext) => Promise<void>;
     start: (ctx: PluginContext) => Promise<void>;
     /**
-     * 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.
      */
     private registerAuditHooks;
     /**
-     * Register tenant isolation middleware that auto-injects space_id filter
+     * Register tenant isolation middleware that auto-injects tenant_id filter
      * for multi-tenant operations.
      */
     private registerTenantMiddleware;

package/dist/index.js

@@ -710,7 +710,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,
@@ -801,7 +801,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;
@@ -823,12 +823,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,
@@ -836,7 +836,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,
@@ -893,13 +893,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;
@@ -907,28 +907,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;
@@ -972,7 +972,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) {
@@ -1136,7 +1136,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
     });
   }
@@ -1821,7 +1821,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 } : {}
         };
@@ -1829,7 +1829,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) {
@@ -1841,7 +1841,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);
           }
         }
@@ -2009,10 +2009,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 = {
@@ -2060,7 +2059,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 = {
@@ -2114,7 +2112,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;
@@ -2348,8 +2346,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
     });
   }
@@ -2362,7 +2360,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
     });
   }
@@ -2624,7 +2622,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) {
@@ -2634,11 +2632,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;
           }
         }
       }
@@ -2647,8 +2645,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 });
@@ -2656,7 +2654,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;
@@ -2669,7 +2667,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;
@@ -2678,10 +2676,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) {
@@ -2692,7 +2690,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 {