remult 0.25.8-exp.3 → 0.25.8-exp.4

package/esm/src/CompoundIdField.js

@@ -22,11 +22,17 @@ export class CompoundIdField {
         return Promise.resolve('');
     }
     getId(instance) {
+        let get = (field) => {
+            return instance[field.key];
+        };
+        if (typeof instance === 'function') {
+            get = instance;
+        }
         let r = '';
         this.fields.forEach((c) => {
             if (r.length > 0)
                 r += ',';
-            r += instance[c.key];
+            r += c.valueConverter.toJson(get(c));
         });
         return r;
     }
@@ -49,7 +55,7 @@ export class CompoundIdField {
         let val = value.toString();
         let id = val.split(',');
         this.fields.forEach((c, i) => {
-            result[c.key] = id[i];
+            result[c.key] = c.valueConverter.fromJson(id[i]);
         });
         return result;
     }

package/esm/src/data-api.js

@@ -23,16 +23,30 @@ export class DataApi {
     }
     async httpPost(res, req, body, serializeContext) {
         const action = req?.get('__action');
-        if (action?.startsWith(liveQueryAction))
+        function validateWhereInBody() {
+            if (!body?.where) {
+                throw {
+                    message: `POST with action ${action} must have a where clause in the body`,
+                    httpStatusCode: 400,
+                };
+            }
+        }
+        if (action?.startsWith(liveQueryAction)) {
+            validateWhereInBody();
             return this.liveQuery(res, req, body, serializeContext, action.substring(liveQueryAction.length));
+        }
         switch (action) {
             case 'get':
+                validateWhereInBody();
                 return this.getArray(res, req, body);
             case 'count':
+                validateWhereInBody();
                 return this.count(res, req, body);
             case 'deleteMany':
+                validateWhereInBody();
                 return this.deleteMany(res, req, body);
             case 'updateMany':
+                validateWhereInBody();
                 return this.updateManyImplementation(res, req, body);
             case 'endLiveQuery':
                 await this.remult.liveQueryStorage.remove(body.id);

package/esm/src/remult3/RepositoryImplementation.js

@@ -1186,7 +1186,7 @@ export class rowHelperImplementation extends rowHelperBase {
             return this.instance[y.key];
         };
         if (this.metadata.idMetadata.field instanceof CompoundIdField)
-            return this.metadata.idMetadata.field.fields.map(getVal).join(',');
+            return this.metadata.idMetadata.field.getId(getVal);
         return getVal(this.metadata.idMetadata.field);
     }
     saveMoreOriginalData() {

package/esm/src/remult3/remult3.js

@@ -1,7 +1,5 @@
 export {};
-//y1 - reconsider adding where to all in case of post - it is a breaking change and no longer required
-//y1 - review that with deleteMany, and updateMany I've taken a similar approach to get, that when the filter is complex, we go to post - one reason is that delete doesn't accept a body.
-//y1 - should the remult api be deleteMany({id:[1,2]}) or deleteMany({where:{id:[1,2]}})
+//p1 - should the remult api be deleteMany({id:[1,2]}) or deleteMany({where:{id:[1,2]}})
 //p1 - in this video I'll use remult to turn a frontend app to a fullstack app
 //y1 - getFields didn't work for kobi in the home component
 //y1 - consider replacing all errors with error classes that extend the base Error class

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.25.8-exp.3",
+    "version": "0.25.8-exp.4",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {

package/src/CompoundIdField.js

@@ -28,11 +28,17 @@ var CompoundIdField = /** @class */ (function () {
         return Promise.resolve('');
     };
     CompoundIdField.prototype.getId = function (instance) {
+        var get = function (field) {
+            return instance[field.key];
+        };
+        if (typeof instance === 'function') {
+            get = instance;
+        }
         var r = '';
         this.fields.forEach(function (c) {
             if (r.length > 0)
                 r += ',';
-            r += instance[c.key];
+            r += c.valueConverter.toJson(get(c));
         });
         return r;
     };
@@ -48,7 +54,7 @@ var CompoundIdField = /** @class */ (function () {
         var val = value.toString();
         var id = val.split(',');
         this.fields.forEach(function (c, i) {
-            result[c.key] = id[i];
+            result[c.key] = c.valueConverter.fromJson(id[i]);
         });
         return result;
     };

package/src/data-api.js

@@ -25,13 +25,23 @@ var DataApi = /** @class */ (function () {
     };
     DataApi.prototype.httpPost = function (res, req, body, serializeContext) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
+            function validateWhereInBody() {
+                if (!(body === null || body === void 0 ? void 0 : body.where)) {
+                    throw {
+                        message: "POST with action ".concat(action, " must have a where clause in the body"),
+                        httpStatusCode: 400,
+                    };
+                }
+            }
             var action, _a;
             return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         action = req === null || req === void 0 ? void 0 : req.get('__action');
-                        if (action === null || action === void 0 ? void 0 : action.startsWith(rest_data_provider_js_1.liveQueryAction))
+                        if (action === null || action === void 0 ? void 0 : action.startsWith(rest_data_provider_js_1.liveQueryAction)) {
+                            validateWhereInBody();
                             return [2 /*return*/, this.liveQuery(res, req, body, serializeContext, action.substring(rest_data_provider_js_1.liveQueryAction.length))];
+                        }
                         _a = action;
                         switch (_a) {
                             case 'get': return [3 /*break*/, 1];
@@ -41,10 +51,18 @@ var DataApi = /** @class */ (function () {
                             case 'endLiveQuery': return [3 /*break*/, 5];
                         }
                         return [3 /*break*/, 7];
-                    case 1: return [2 /*return*/, this.getArray(res, req, body)];
-                    case 2: return [2 /*return*/, this.count(res, req, body)];
-                    case 3: return [2 /*return*/, this.deleteMany(res, req, body)];
-                    case 4: return [2 /*return*/, this.updateManyImplementation(res, req, body)];
+                    case 1:
+                        validateWhereInBody();
+                        return [2 /*return*/, this.getArray(res, req, body)];
+                    case 2:
+                        validateWhereInBody();
+                        return [2 /*return*/, this.count(res, req, body)];
+                    case 3:
+                        validateWhereInBody();
+                        return [2 /*return*/, this.deleteMany(res, req, body)];
+                    case 4:
+                        validateWhereInBody();
+                        return [2 /*return*/, this.updateManyImplementation(res, req, body)];
                     case 5: return [4 /*yield*/, this.remult.liveQueryStorage.remove(body.id)];
                     case 6:
                         _b.sent();

package/src/remult3/RepositoryImplementation.js

@@ -1956,7 +1956,7 @@ var rowHelperImplementation = /** @class */ (function (_super) {
             return _this.instance[y.key];
         };
         if (this.metadata.idMetadata.field instanceof CompoundIdField_js_1.CompoundIdField)
-            return this.metadata.idMetadata.field.fields.map(getVal).join(',');
+            return this.metadata.idMetadata.field.getId(getVal);
         return getVal(this.metadata.idMetadata.field);
     };
     rowHelperImplementation.prototype.saveMoreOriginalData = function () {

package/src/remult3/remult3.js

@@ -1,8 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//y1 - reconsider adding where to all in case of post - it is a breaking change and no longer required
-//y1 - review that with deleteMany, and updateMany I've taken a similar approach to get, that when the filter is complex, we go to post - one reason is that delete doesn't accept a body.
-//y1 - should the remult api be deleteMany({id:[1,2]}) or deleteMany({where:{id:[1,2]}})
+//p1 - should the remult api be deleteMany({id:[1,2]}) or deleteMany({where:{id:[1,2]}})
 //p1 - in this video I'll use remult to turn a frontend app to a fullstack app
 //y1 - getFields didn't work for kobi in the home component
 //y1 - consider replacing all errors with error classes that extend the base Error class