@objectstack/rest 4.1.1 → 4.2.0

package/dist/index.js

@@ -211,6 +211,18 @@ var RouteGroupBuilder = class {
 // src/rest-server.ts
 var logError = (...args) => globalThis.console?.error(...args);
 function mapDataError(error, object) {
+  if (error?.code === "CONCURRENT_UPDATE" || error?.name === "ConcurrentUpdateError") {
+    return {
+      status: 409,
+      body: {
+        error: error?.message ?? "Record was modified by another user",
+        code: "CONCURRENT_UPDATE",
+        ...error?.currentVersion ? { currentVersion: error.currentVersion } : {},
+        ...error?.currentRecord ? { currentRecord: error.currentRecord } : {},
+        ...object ? { object } : {}
+      }
+    };
+  }
   if (error?.code === "VALIDATION_FAILED" || error?.name === "ValidationError") {
     return {
       status: 400,
@@ -1381,10 +1393,19 @@ var RestServer = class {
             const p = await this.resolveProtocol(projectId, req);
             const context = await this.resolveExecCtx(projectId, req);
             if (this.enforceAuth(req, res, context)) return;
+            const ifMatchHeader = req.headers?.["if-match"] ?? req.headers?.["If-Match"];
+            const bodyVersion = req.body && typeof req.body === "object" ? req.body.expectedVersion : void 0;
+            const expectedVersion = bodyVersion ?? ifMatchHeader;
+            let data = req.body;
+            if (data && typeof data === "object" && "expectedVersion" in data) {
+              const { expectedVersion: _drop, ...rest } = data;
+              data = rest;
+            }
             const result = await p.updateData({
               object: req.params.object,
               id: req.params.id,
-              data: req.body,
+              data,
+              ...expectedVersion ? { expectedVersion: String(expectedVersion) } : {},
               ...projectId ? { projectId } : {},
               ...context ? { context } : {}
             });
@@ -1411,9 +1432,13 @@ var RestServer = class {
             const p = await this.resolveProtocol(projectId, req);
             const context = await this.resolveExecCtx(projectId, req);
             if (this.enforceAuth(req, res, context)) return;
+            const ifMatchHeader = req.headers?.["if-match"] ?? req.headers?.["If-Match"];
+            const queryVersion = req.query && typeof req.query === "object" ? req.query.expectedVersion : void 0;
+            const expectedVersion = queryVersion ?? ifMatchHeader;
             const result = await p.deleteData({
               object: req.params.object,
               id: req.params.id,
+              ...expectedVersion ? { expectedVersion: String(expectedVersion) } : {},
               ...projectId ? { projectId } : {},
               ...context ? { context } : {}
             });