remult 0.25.5-exp.4 → 0.25.5-exp.6

package/esm/src/remult3/remult3.js

@@ -1,5 +1,4 @@
 export {};
-//y1 - another toOne scenario - for a one to one relation, where the other table has my id in one of its fields.
 //y1 - number default storage in knex is decimal and it by default has 8,2 - meaning only 999,999 - I think it should be way bigger than that. in firefly we do at least 18 - https://discord.com/channels/975754286384418847/1195162533447876658
 //y1 - talk about the parameter issue with backend methods
 //y1 - tried to upgrade vitest, nuxt tests are failing with loading uuid - sounds familiar?
@@ -80,3 +79,10 @@ remult.apiClient.url='localhost:3007/api
 //y2 - should enforce integer - currently we probably round / truncate it
 //p1 - adjust react tutorial to esm
 //p1 - write docs on with remult - and usage in init api
+/*y1 - discuss sql stuff:
+     https://discord.com/channels/975754286384418847/975754286384418852/1198997156678357043
+     https://codesandbox.io/p/devbox/demo-sql-expression-forked-f94p6m?file=%2Fsrc%2Findex.ts%3A21%2C3-21%2C12&workspaceId=c0f7eccf-c151-423b-ac8e-0f0f3e1ad350
+     https://codesandbox.io/p/devbox/demo-sql-expression-forked-c2jhyc?file=%2Fsrc%2Findex.ts%3A37%2C50&workspaceId=7e9d0505-ea79-46f1-8973-50cadde4fa96
+
+
+*/

package/esm/src/server-action.js

@@ -92,7 +92,7 @@ export class myServerAction extends Action {
         await doTransaction(remult, async () => {
             if (!remult.isAllowedForInstance(undefined, this.options.allowed))
                 throw new ForbiddenError();
-            info.args = await prepareReceivedArgs(this.types, info.args, remult, ds, res);
+            info.args = await prepareReceivedArgs(this.types(), info.args, remult, ds, res);
             try {
                 result.data = await this.originalMethod(info.args);
             }
@@ -119,14 +119,20 @@ export function BackendMethod(options) {
         const originalMethod = descriptor ? descriptor.value : target;
         let result = originalMethod;
         checkTarget(target);
-        if (target.prototype !== undefined) {
+        function getTypes() {
             var types = Reflect.getMetadata('design:paramtypes', target, key);
             if (options.paramTypes)
-                types = options.paramTypes;
+                types =
+                    typeof options.paramTypes === 'function'
+                        ? options.paramTypes()
+                        : options.paramTypes;
+            return types;
+        }
+        if (target.prototype !== undefined) {
             // if types are undefined - you've forgot to set: "emitDecoratorMetadata":true
-            let serverAction = new myServerAction((options?.apiPrefix ? options.apiPrefix + '/' : '') + key, types, options, (args) => originalMethod.apply(undefined, args));
+            let serverAction = new myServerAction((options?.apiPrefix ? options.apiPrefix + '/' : '') + key, () => getTypes(), options, (args) => originalMethod.apply(undefined, args));
             serverAction.doWork = async (args, self, url, http) => {
-                args = prepareArgsToSend(types, args);
+                args = prepareArgsToSend(getTypes(), args);
                 if (options.blockUser === false) {
                     return await remultStatic.actionInfo.runActionWithoutBlockingUI(async () => (await serverAction.run({ args }, url, http)).data);
                 }
@@ -149,9 +155,6 @@ export function BackendMethod(options) {
             else
                 return result;
         }
-        var types = Reflect.getMetadata('design:paramtypes', target, key);
-        if (options.paramTypes)
-            types = options.paramTypes;
         let x = remultStatic.classHelpers.get(target.constructor);
         if (!x) {
             x = new ClassHelper();
@@ -175,7 +178,7 @@ export function BackendMethod(options) {
                             let remult = req;
                             let r;
                             await doTransaction(remult, async () => {
-                                d.args = await prepareReceivedArgs(types, d.args, remult, remult.dataProvider, res);
+                                d.args = await prepareReceivedArgs(getTypes(), d.args, remult, remult.dataProvider, res);
                                 if (remultStatic.allEntities.includes(constructor)) {
                                     let repo = remult.repo(constructor);
                                     let y;
@@ -246,7 +249,7 @@ export function BackendMethod(options) {
                 }
             },
             doWork: async function (args, self, baseUrl, http) {
-                args = prepareArgsToSend(types, args);
+                args = prepareArgsToSend(getTypes(), args);
                 if (remultStatic.allEntities.includes(target.constructor)) {
                     let defs = getEntityRef(self);
                     await defs.__validateEntity();

package/internals.d.ts

@@ -1,4 +1,4 @@
-export { getRelationInfo, getRelationFieldInfo, RelationFieldInfo, RelationInfo, } from './src/remult3/relationInfoMember.js';
+export { getRelationInfo, getRelationFieldInfo, RelationFieldInfo, RelationInfo, RelationFields, } from './src/remult3/relationInfoMember.js';
 export { decorateColumnSettings, controllerRefImpl, getControllerRef, } from './src/remult3/RepositoryImplementation.js';
 export { getEntitySettings } from './src/remult3/getEntityRef.js';
 export { __updateEntityBasedOnWhere } from './src/filter/filter-interfaces.js';

package/package.json

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

package/src/remult3/remult3.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-//y1 - another toOne scenario - for a one to one relation, where the other table has my id in one of its fields.
 //y1 - number default storage in knex is decimal and it by default has 8,2 - meaning only 999,999 - I think it should be way bigger than that. in firefly we do at least 18 - https://discord.com/channels/975754286384418847/1195162533447876658
 //y1 - talk about the parameter issue with backend methods
 //y1 - tried to upgrade vitest, nuxt tests are failing with loading uuid - sounds familiar?
@@ -81,3 +80,10 @@ remult.apiClient.url='localhost:3007/api
 //y2 - should enforce integer - currently we probably round / truncate it
 //p1 - adjust react tutorial to esm
 //p1 - write docs on with remult - and usage in init api
+/*y1 - discuss sql stuff:
+     https://discord.com/channels/975754286384418847/975754286384418852/1198997156678357043
+     https://codesandbox.io/p/devbox/demo-sql-expression-forked-f94p6m?file=%2Fsrc%2Findex.ts%3A21%2C3-21%2C12&workspaceId=c0f7eccf-c151-423b-ac8e-0f0f3e1ad350
+     https://codesandbox.io/p/devbox/demo-sql-expression-forked-c2jhyc?file=%2Fsrc%2Findex.ts%3A37%2C50&workspaceId=7e9d0505-ea79-46f1-8973-50cadde4fa96
+
+
+*/

package/src/server-action.d.ts

@@ -28,7 +28,7 @@ export declare class myServerAction extends Action<inArgs, result> {
     private types;
     private options;
     originalMethod: (args: any[]) => any;
-    constructor(name: string, types: any[], options: BackendMethodOptions<any>, originalMethod: (args: any[]) => any);
+    constructor(name: string, types: () => any[], options: BackendMethodOptions<any>, originalMethod: (args: any[]) => any);
     protected execute(info: inArgs, remult: Remult, res: DataApiResponse): Promise<result>;
 }
 export interface BackendMethodOptions<type> {
@@ -43,7 +43,7 @@ export interface BackendMethodOptions<type> {
     queue?: boolean;
     /** EXPERIMENTAL: Determines if the user should be blocked while this `BackendMethod` is running*/
     blockUser?: boolean;
-    paramTypes?: any[];
+    paramTypes?: any[] | (() => any[]);
 }
 export declare function Controller(key: string): (target: any, context?: any) => any;
 export interface ClassMethodDecoratorContextStub<This = unknown, Value extends (this: This, ...args: any) => any = (this: This, ...args: any) => any> {

package/src/server-action.js

@@ -145,7 +145,7 @@ var myServerAction = /** @class */ (function (_super) {
                                             if (!remult.isAllowedForInstance(undefined, this.options.allowed))
                                                 throw new ForbiddenError();
                                             _a = info;
-                                            return [4 /*yield*/, prepareReceivedArgs(this.types, info.args, remult, ds, res)];
+                                            return [4 /*yield*/, prepareReceivedArgs(this.types(), info.args, remult, ds, res)];
                                         case 1:
                                             _a.args = _c.sent();
                                             _c.label = 2;
@@ -191,18 +191,24 @@ function BackendMethod(options) {
         var originalMethod = descriptor ? descriptor.value : target;
         var result = originalMethod;
         (0, Fields_js_1.checkTarget)(target);
-        if (target.prototype !== undefined) {
+        function getTypes() {
             var types = Reflect.getMetadata('design:paramtypes', target, key);
             if (options.paramTypes)
-                types = options.paramTypes;
+                types =
+                    typeof options.paramTypes === 'function'
+                        ? options.paramTypes()
+                        : options.paramTypes;
+            return types;
+        }
+        if (target.prototype !== undefined) {
             // if types are undefined - you've forgot to set: "emitDecoratorMetadata":true
-            var serverAction_1 = new myServerAction(((options === null || options === void 0 ? void 0 : options.apiPrefix) ? options.apiPrefix + '/' : '') + key, types, options, function (args) { return originalMethod.apply(undefined, args); });
+            var serverAction_1 = new myServerAction(((options === null || options === void 0 ? void 0 : options.apiPrefix) ? options.apiPrefix + '/' : '') + key, function () { return getTypes(); }, options, function (args) { return originalMethod.apply(undefined, args); });
             serverAction_1.doWork = function (args, self, url, http) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var _this = this;
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            args = prepareArgsToSend(types, args);
+                            args = prepareArgsToSend(getTypes(), args);
                             if (!(options.blockUser === false)) return [3 /*break*/, 2];
                             return [4 /*yield*/, remult_static_js_1.remultStatic.actionInfo.runActionWithoutBlockingUI(function () { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
                                     switch (_a.label) {
@@ -243,9 +249,6 @@ function BackendMethod(options) {
             else
                 return result;
         }
-        var types = Reflect.getMetadata('design:paramtypes', target, key);
-        if (options.paramTypes)
-            types = options.paramTypes;
         var x = remult_static_js_1.remultStatic.classHelpers.get(target.constructor);
         if (!x) {
             x = new context_js_1.ClassHelper();
@@ -283,7 +286,7 @@ function BackendMethod(options) {
                                                 switch (_e.label) {
                                                     case 0:
                                                         _a = d;
-                                                        return [4 /*yield*/, prepareReceivedArgs(types, d.args, remult_1, remult_1.dataProvider, res)];
+                                                        return [4 /*yield*/, prepareReceivedArgs(getTypes(), d.args, remult_1, remult_1.dataProvider, res)];
                                                     case 1:
                                                         _a.args = _e.sent();
                                                         if (!remult_static_js_1.remultStatic.allEntities.includes(constructor)) return [3 /*break*/, 13];
@@ -404,7 +407,7 @@ function BackendMethod(options) {
                     return tslib_1.__generator(this, function (_h) {
                         switch (_h.label) {
                             case 0:
-                                args = prepareArgsToSend(types, args);
+                                args = prepareArgsToSend(getTypes(), args);
                                 if (!remult_static_js_1.remultStatic.allEntities.includes(target.constructor)) return [3 /*break*/, 8];
                                 defs = (0, getEntityRef_js_1.getEntityRef)(self);
                                 return [4 /*yield*/, defs.__validateEntity()];