remult 0.21.1 → 0.22.0

package/src/remult3/remult3.d.ts

@@ -1,10 +1,10 @@
-import { ClassType } from "../../classType";
-import { FieldMetadata } from "../column-interfaces";
-import { LiveQueryChange, SubscriptionListener, Unsubscribe } from "../live-query/SubscriptionChannel";
-import { EntityOptions } from "../entity";
-import { SortSegment } from "../sort";
-import { entityEventListener } from "../__EntityValueProvider";
-import { ErrorInfo } from "../..";
+import { ClassType } from '../../classType';
+import { FieldMetadata } from '../column-interfaces';
+import { LiveQueryChange, SubscriptionListener, Unsubscribe } from '../live-query/SubscriptionChannel';
+import { EntityOptions } from '../entity';
+import { SortSegment } from '../sort';
+import { entityEventListener } from '../__EntityValueProvider';
+import { ErrorInfo } from '../..';
 export interface EntityRef<entityType> extends Subscribable {
     hasErrors(): boolean;
     undoChanges(): any;
@@ -44,7 +44,7 @@ export interface Subscribable {
 }
 export declare type FieldsRef<entityType> = {
     [Properties in keyof OmitEB<entityType>]: entityType[Properties] extends {
-        id?: (number | string);
+        id?: number | string;
     } ? IdFieldRef<entityType, entityType[Properties]> : FieldRef<entityType, entityType[Properties]>;
 } & {
     find(fieldMetadataOrKey: FieldMetadata | string): FieldRef<entityType, any>;
@@ -68,12 +68,12 @@ export interface IdFieldRef<entityType, valueType> extends FieldRef<entityType,
         id?: number;
     } ? number : valueType extends {
         id?: string;
-    } ? string : (string | number)): any;
-    getId(): (valueType extends {
+    } ? string : string | number): any;
+    getId(): valueType extends {
         id?: number;
     } ? number : valueType extends {
         id?: string;
-    } ? string : (string | number));
+    } ? string : string | number;
 }
 export interface FieldRef<entityType = any, valueType = any> extends Subscribable {
     error: string;
@@ -110,7 +110,7 @@ export interface EntityMetadata<entityType = any> {
     /** A human readable caption for the entity. Can be used to achieve a consistent caption for a field throughout the app
      * @example
      * <h1>Create a new item in {taskRepo.metadata.caption}</h1>
-    */
+     */
     readonly caption: string;
     /** The options send to the `Entity`'s decorator */
     readonly options: EntityOptions;
@@ -122,7 +122,7 @@ export interface EntityMetadata<entityType = any> {
      * if (taskRepo.metadata.apiUpdateAllowed(task)){
      *   // Allow user to edit the entity
      * }
-    */
+     */
     apiUpdateAllowed(item?: entityType): boolean;
     /** true if the current user is allowed to read from entity
      * @example
@@ -138,7 +138,7 @@ export interface EntityMetadata<entityType = any> {
      * if (taskRepo.metadata.apiDeleteAllowed(task)){
      *   // display delete button
      * }
-    */
+     */
     apiDeleteAllowed(item?: entityType): boolean;
     /** true if the current user is allowed to create an entity instance
      * @example
@@ -146,7 +146,7 @@ export interface EntityMetadata<entityType = any> {
      * if (taskRepo.metadata.apiInsertAllowed(task)){
      *   // display insert button
      * }
-    */
+     */
     apiInsertAllowed(item?: entityType): boolean;
     /** Returns the dbName - based on it's `dbName` option and it's `sqlExpression` option */
     getDbName(): Promise<string>;
@@ -158,7 +158,7 @@ export declare type idType<entityType> = entityType extends {
     id?: number;
 } ? number : entityType extends {
     id?: string;
-} ? string : (string | number);
+} ? string : string | number;
 /**used to perform CRUD operations on an `entityType` */
 export interface Repository<entityType> {
     /** returns a result array based on the provided options */
@@ -190,7 +190,7 @@ export interface Repository<entityType> {
      * @see [EntityFilter](http://remult.dev/docs/entityFilter.html)
      * @example
      * await taskRepo.count({ completed:false })
-    */
+     */
     count(where?: EntityFilter<entityType>): Promise<number>;
     /**Validates an item
      * @example
@@ -202,11 +202,11 @@ export interface Repository<entityType> {
      * // Can also be used to validate specific fields
      * const error = repo.validate(task,"title")
      */
-    validate(item: Partial<entityType>, ...fields: (Extract<keyof OmitEB<entityType>, string>)[]): Promise<ErrorInfo<entityType> | undefined>;
+    validate(item: Partial<entityType>, ...fields: Extract<keyof OmitEB<entityType>, string>[]): Promise<ErrorInfo<entityType> | undefined>;
     /** saves an item or item[] to the data source. It assumes that if an `id` value exists, it's an existing row - otherwise it's a new row
      * @example
      * await taskRepo.save({...task, completed:true })
-    */
+     */
     save(item: Partial<OmitEB<entityType>>[]): Promise<entityType[]>;
     save(item: Partial<OmitEB<entityType>>): Promise<entityType>;
     /**Insert an item or item[] to the data source
@@ -214,41 +214,46 @@ export interface Repository<entityType> {
      * await taskRepo.insert({title:"task a"})
      * @example
      * await taskRepo.insert([{title:"task a"}, {title:"task b", completed:true }])
-    */
+     */
     insert(item: Partial<OmitEB<entityType>>[]): Promise<entityType[]>;
     insert(item: Partial<OmitEB<entityType>>): Promise<entityType>;
     /** Updates an item, based on its `id`
      * @example
      * taskRepo.update(task.id,{...task,completed:true})
-    */
-    update(id: (entityType extends {
+     */
+    update(id: entityType extends {
         id?: number;
     } ? number : entityType extends {
         id?: string;
-    } ? string : (string | number)), item: Partial<OmitEB<entityType>>): Promise<entityType>;
+    } ? string : string | number, item: Partial<OmitEB<entityType>>): Promise<entityType>;
     update(id: Partial<OmitEB<entityType>>, item: Partial<OmitEB<entityType>>): Promise<entityType>;
     /** Deletes an Item*/
-    delete(id: (entityType extends {
+    delete(id: entityType extends {
         id?: number;
     } ? number : entityType extends {
         id?: string;
-    } ? string : (string | number))): Promise<void>;
+    } ? string : string | number): Promise<void>;
     delete(item: Partial<OmitEB<entityType>>): Promise<void>;
     /** Creates an instance of an item. It'll not be saved to the data source unless `save` or `insert` will be called for that item */
     create(item?: Partial<OmitEB<entityType>>): entityType;
+    toJson(item: Promise<entityType[]>): Promise<any[]>;
+    toJson(item: entityType[]): any[];
+    toJson(item: Promise<entityType>): Promise<any>;
+    toJson(item: entityType): any;
     /** Translates a json object to an item instance */
-    fromJson(x: any, isNew?: boolean): Promise<entityType>;
+    fromJson(x: any[], isNew?: boolean): entityType[];
+    fromJson(x: any, isNew?: boolean): entityType;
     /** returns an `entityRef` for an item returned by `create`, `find` etc... */
     getEntityRef(item: entityType): EntityRef<entityType>;
     /** Provides information about the fields of the Repository's entity
      * @example
      * console.log(repo.fields.title.caption) // displays the caption of a specific field
      * console.log(repo.fields.title.options)// writes the options that were defined for this field
-    */
+     */
     fields: FieldsMetadata<entityType>;
     /**The metadata for the `entity`
      * @See [EntityMetadata](https://remult.dev/docs/ref_entitymetadata.html)
-    */
+     */
     metadata: EntityMetadata<entityType>;
     addEventListener(listener: entityEventListener<entityType>): Unsubscribe;
 }
@@ -259,7 +264,7 @@ export interface LiveQuery<entityType> {
 export interface LiveQueryChangeInfo<entityType> {
     items: entityType[];
     changes: LiveQueryChange[];
-    applyChanges(prevState: entityType[]): entityType[];
+    applyChanges(prevState: entityType[] | undefined): entityType[];
 }
 export interface FindOptions<entityType> extends FindOptionsBase<entityType> {
     /** Determines the number of rows returned by the request, on the browser the default is 100 rows
@@ -268,7 +273,7 @@ export interface FindOptions<entityType> extends FindOptionsBase<entityType> {
      *  limit:10,
      *  page:2
      * })
-    */
+     */
     limit?: number;
     /** Determines the page number that will be used to extract the data
      * @example
@@ -276,7 +281,7 @@ export interface FindOptions<entityType> extends FindOptionsBase<entityType> {
      *  limit:10,
      *  page:2
      * })
-    */
+     */
     page?: number;
 }
 /** Determines the order of items returned .
@@ -286,34 +291,34 @@ export interface FindOptions<entityType> extends FindOptionsBase<entityType> {
  * await this.remult.repo(Products).find({ orderBy: { price: "desc", name: "asc" }})
  */
 export declare type EntityOrderBy<entityType> = {
-    [Properties in keyof Partial<OmitEB<entityType>>]?: "asc" | "desc";
+    [Properties in keyof Partial<OmitEB<entityType>>]?: 'asc' | 'desc';
 };
 /**Used to filter the desired result set
  * @see [EntityFilter](http://remult.dev/docs/entityFilter.html)
  */
 export declare type EntityFilter<entityType> = {
-    [Properties in keyof Partial<OmitEB<entityType>>]?: (Partial<OmitEB<entityType>>[Properties] extends (number | Date | undefined) ? ComparisonValueFilter<Partial<OmitEB<entityType>>[Properties]> : Partial<OmitEB<entityType>>[Properties] extends (string | undefined) ? ContainsStringValueFilter & ComparisonValueFilter<string> : Partial<OmitEB<entityType>>[Properties] extends (boolean | undefined) ? ValueFilter<boolean> : Partial<OmitEB<entityType>>[Properties] extends ({
-        id?: (string | number);
-    } | undefined) ? IdFilter<Partial<OmitEB<entityType>>[Properties]> : ValueFilter<Partial<OmitEB<entityType>>[Properties]>) & ContainsStringValueFilter;
+    [Properties in keyof Partial<OmitEB<entityType>>]?: (Partial<OmitEB<entityType>>[Properties] extends number | Date | undefined ? ComparisonValueFilter<Partial<OmitEB<entityType>>[Properties]> : Partial<OmitEB<entityType>>[Properties] extends string | undefined ? ContainsStringValueFilter & ComparisonValueFilter<string> : Partial<OmitEB<entityType>>[Properties] extends boolean | undefined ? ValueFilter<boolean> : Partial<OmitEB<entityType>>[Properties] extends {
+        id?: string | number;
+    } | undefined ? IdFilter<Partial<OmitEB<entityType>>[Properties]> : ValueFilter<Partial<OmitEB<entityType>>[Properties]>) & ContainsStringValueFilter;
 } & {
     $or?: EntityFilter<entityType>[];
     $and?: EntityFilter<entityType>[];
 };
 export declare type ValueFilter<valueType> = valueType | valueType[] | {
     $ne?: valueType | valueType[];
-    "!="?: valueType | valueType[];
+    '!='?: valueType | valueType[];
     $in?: valueType[];
     $nin?: valueType[];
 };
 export declare type ComparisonValueFilter<valueType> = ValueFilter<valueType> & {
     $gt?: valueType;
-    ">"?: valueType;
+    '>'?: valueType;
     $gte?: valueType;
-    ">="?: valueType;
+    '>='?: valueType;
     $lt?: valueType;
-    "<"?: valueType;
+    '<'?: valueType;
     $lte?: valueType;
-    "<="?: valueType;
+    '<='?: valueType;
 };
 export interface ContainsStringValueFilter {
     $contains?: string;
@@ -328,24 +333,24 @@ export interface LoadOptions<entityType> {
 }
 export interface FindOptionsBase<entityType> extends LoadOptions<entityType> {
     /** filters the data
-    * @example
-    * await taskRepo.find({where: { completed:false }})
-    * @see For more usage examples see [EntityFilter](https://remult.dev/docs/entityFilter.html)
-    */
+     * @example
+     * await taskRepo.find({where: { completed:false }})
+     * @see For more usage examples see [EntityFilter](https://remult.dev/docs/entityFilter.html)
+     */
     where?: EntityFilter<entityType>;
     /** Determines the order of items returned .
-    * @example
-    * await this.remult.repo(Products).find({ orderBy: { name: "asc" }})
-    * @example
-    * await this.remult.repo(Products).find({ orderBy: { price: "desc", name: "asc" }})
-    */
+     * @example
+     * await this.remult.repo(Products).find({ orderBy: { name: "asc" }})
+     * @example
+     * await this.remult.repo(Products).find({ orderBy: { price: "desc", name: "asc" }})
+     */
     orderBy?: EntityOrderBy<entityType>;
 }
 export interface FindFirstOptions<entityType> extends FindOptionsBase<entityType>, FindFirstOptionsBase<entityType> {
 }
 export interface FindFirstOptionsBase<entityType> extends LoadOptions<entityType> {
     /** determines if to cache the result, and return the results from cache.
-      */
+     */
     useCache?: boolean;
     /** If set to true and an item is not found, it's created and returned*/
     createIfNotFound?: boolean;
@@ -366,7 +371,7 @@ export interface QueryResult<entityType> {
      * for await (const task of taskRepo.query()) {
      *   await taskRepo.save({ ...task, completed });
      * }
-    */
+     */
     [Symbol.asyncIterator](): {
         next: () => Promise<IteratorResult<entityType, entityType>>;
     };

package/src/remult3/remult3.js

@@ -1,3 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-;

package/src/server-action.d.ts

@@ -17,7 +17,7 @@ export declare abstract class Action<inParam, outParam> implements ActionInterfa
     run(pIn: inParam, baseUrl?: string, http?: RestDataProviderHttpProvider): Promise<outParam>;
     doWork: (args: any[], self: any, baseUrl?: string, http?: RestDataProviderHttpProvider) => Promise<any>;
     protected abstract execute(info: inParam, req: Remult, res: DataApiResponse): Promise<outParam>;
-    __register(reg: (url: string, queue: boolean, allowed: AllowedForInstance<any>, what: ((data: any, req: Remult, res: DataApiResponse) => void)) => void): void;
+    __register(reg: (url: string, queue: boolean, allowed: AllowedForInstance<any>, what: (data: any, req: Remult, res: DataApiResponse) => void) => void): void;
 }
 export declare class ForbiddenError extends Error {
     constructor();
@@ -26,7 +26,7 @@ export declare class ForbiddenError extends Error {
 export declare class myServerAction extends Action<inArgs, result> {
     private types;
     private options;
-    private originalMethod;
+    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>;
 }
@@ -54,9 +54,16 @@ export declare const actionInfo: {
     };
 };
 export declare const serverActionField: unique symbol;
-export declare function Controller(key: string): (target: 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> {
+    readonly kind: 'method';
+    readonly name: string | symbol;
+    readonly access: {
+        has(object: This): boolean;
+    };
+}
 /** Indicates that the decorated methods runs on the backend. See: [Backend Methods](https://remult.dev/docs/backendMethods.html) */
-export declare function BackendMethod<type = any>(options: BackendMethodOptions<type>): (target: any, key: string, descriptor: any) => any;
+export declare function BackendMethod<type = any>(options: BackendMethodOptions<type>): (target: any, context: ClassMethodDecoratorContextStub<type> | string, descriptor?: any) => any;
 export interface jobWasQueuedResult {
     queuedJobId?: string;
 }
@@ -76,6 +83,6 @@ export declare function prepareReceivedArgs(types: any[], args: any[], remult: R
 export declare const classBackendMethodsArray: unique symbol;
 export interface ActionInterface {
     doWork: (args: any[], self: any, baseUrl?: string, http?: RestDataProviderHttpProvider) => Promise<any>;
-    __register(reg: (url: string, queue: boolean, allowed: AllowedForInstance<any>, what: ((data: any, req: Remult, res: DataApiResponse) => void)) => void): any;
+    __register(reg: (url: string, queue: boolean, allowed: AllowedForInstance<any>, what: (data: any, req: Remult, res: DataApiResponse) => void) => void): any;
 }
 export {};

package/src/server-action.js

@@ -40,9 +40,11 @@ var Action = /** @class */ (function () {
                                         case 0:
                                             if (!(!runningJob_1 || !runningJob_1.done)) return [3 /*break*/, 4];
                                             if (!runningJob_1) return [3 /*break*/, 2];
-                                            return [4 /*yield*/, new Promise(function (res) { return setTimeout(function () {
-                                                    res(undefined);
-                                                }, 200); })];
+                                            return [4 /*yield*/, new Promise(function (res) {
+                                                    return setTimeout(function () {
+                                                        res(undefined);
+                                                    }, 200);
+                                                })];
                                         case 1:
                                             _a.sent();
                                             _a.label = 2;
@@ -88,7 +90,8 @@ var Action = /** @class */ (function () {
                         return [3 /*break*/, 3];
                     case 2:
                         err_1 = _a.sent();
-                        if (err_1.isForbiddenError) // got a problem in next with instance of ForbiddenError  - so replaced it with this bool
+                        if (err_1.isForbiddenError)
+                            // got a problem in next with instance of ForbiddenError  - so replaced it with this bool
                             res.forbidden();
                         else
                             res.error(err_1);
@@ -105,7 +108,7 @@ exports.Action = Action;
 var ForbiddenError = /** @class */ (function (_super) {
     tslib_1.__extends(ForbiddenError, _super);
     function ForbiddenError() {
-        var _this = _super.call(this, "Forbidden") || this;
+        var _this = _super.call(this, 'Forbidden') || this;
         _this.isForbiddenError = true;
         return _this;
     }
@@ -169,16 +172,18 @@ exports.myServerAction = myServerAction;
 exports.actionInfo = {
     allActions: [],
     runningOnServer: false,
-    runActionWithoutBlockingUI: function (what) { return what(); },
+    runActionWithoutBlockingUI: function (what) {
+        return what();
+    },
     startBusyWithProgress: function () { return ({
         progress: function (percent) { },
-        close: function () { }
-    }); }
+        close: function () { },
+    }); },
 };
 exports.serverActionField = Symbol('serverActionField');
 var classOptions = new Map();
 function Controller(key) {
-    return function (target) {
+    return function (target, context) {
         var r = target;
         classOptions.set(r, { key: key });
         context_1.setControllerSettings(target, { key: key });
@@ -189,14 +194,17 @@ exports.Controller = Controller;
 /** Indicates that the decorated methods runs on the backend. See: [Backend Methods](https://remult.dev/docs/backendMethods.html) */
 function BackendMethod(options) {
     var _this = this;
-    return function (target, key, descriptor) {
+    return function (target, context, descriptor) {
+        var key = typeof context === 'string' ? context : context.name.toString();
+        var originalMethod = descriptor ? descriptor.value : target;
+        var result = originalMethod;
+        remult3_1.checkTarget(target);
         if (target.prototype !== undefined) {
-            var originalMethod = descriptor.value;
-            var types = Reflect.getMetadata("design:paramtypes", target, key);
+            var types = Reflect.getMetadata('design:paramtypes', target, key);
             if (options.paramTypes)
                 types = options.paramTypes;
             // 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, types, 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) {
@@ -216,7 +224,7 @@ function BackendMethod(options) {
                     }
                 });
             }); };
-            descriptor.value = function () {
+            result = function () {
                 var args = [];
                 for (var _i = 0; _i < arguments.length; _i++) {
                     args[_i] = arguments[_i];
@@ -225,20 +233,25 @@ function BackendMethod(options) {
                     return tslib_1.__generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
-                                if (!!exports.actionInfo.runningOnServer) return [3 /*break*/, 2];
+                                if (!!context_1.isBackend()) return [3 /*break*/, 2];
                                 return [4 /*yield*/, serverAction_1.doWork(args, undefined)];
                             case 1: return [2 /*return*/, _a.sent()];
-                            case 2: return [4 /*yield*/, originalMethod.apply(undefined, args)];
-                            case 3: return [2 /*return*/, (_a.sent())];
+                            case 2: return [4 /*yield*/, originalMethod.apply(this, args)];
+                            case 3: return [2 /*return*/, _a.sent()];
                         }
                     });
                 });
             };
-            registerAction(target, descriptor);
-            descriptor.value[exports.serverActionField] = serverAction_1;
-            return descriptor;
+            registerAction(target, result);
+            result[exports.serverActionField] = serverAction_1;
+            if (descriptor) {
+                descriptor.value = result;
+                return descriptor;
+            }
+            else
+                return result;
         }
-        var types = Reflect.getMetadata("design:paramtypes", target, key);
+        var types = Reflect.getMetadata('design:paramtypes', target, key);
         if (options.paramTypes)
             types = options.paramTypes;
         var x = context_1.classHelpers.get(target.constructor);
@@ -246,7 +259,6 @@ function BackendMethod(options) {
             x = new context_1.ClassHelper();
             context_1.classHelpers.set(target.constructor, x);
         }
-        var originalMethod = descriptor.value;
         var serverAction = {
             __register: function (reg) {
                 var e_1, _a;
@@ -257,13 +269,16 @@ function BackendMethod(options) {
                     if (!controllerOptions.key) {
                         controllerOptions.key = c.repo(constructor).metadata.key;
                     }
-                    reg(controllerOptions.key + '/' + ((options === null || options === void 0 ? void 0 : options.apiPrefix) ? (options.apiPrefix + '/') : '') + key, options ? options.queue : false, options.allowed, function (d, req, res) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+                    reg(controllerOptions.key +
+                        '/' +
+                        ((options === null || options === void 0 ? void 0 : options.apiPrefix) ? options.apiPrefix + '/' : '') +
+                        key, options ? options.queue : false, options.allowed, function (d, req, res) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                         var allowed, remult_1, r_1, err_3;
                         var _this = this;
                         return tslib_1.__generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
-                                    d.args = d.args.map(function (x) { return isCustomUndefined(x) ? undefined : x; });
+                                    d.args = d.args.map(function (x) { return (isCustomUndefined(x) ? undefined : x); });
                                     allowed = options.allowed;
                                     _a.label = 1;
                                 case 1:
@@ -290,12 +305,12 @@ function BackendMethod(options) {
                                                         _e.sent();
                                                         return [3 /*break*/, 6];
                                                     case 3: return [4 /*yield*/, repo.find({
-                                                            where: tslib_1.__assign(tslib_1.__assign({}, repo.metadata.idMetadata.getIdFilter(d.rowInfo.id)), { $and: [repo.metadata.options.apiPrefilter] })
+                                                            where: tslib_1.__assign(tslib_1.__assign({}, repo.metadata.idMetadata.getIdFilter(d.rowInfo.id)), { $and: [repo.metadata.options.apiPrefilter] }),
                                                         })];
                                                     case 4:
                                                         rows = _e.sent();
                                                         if (rows.length != 1)
-                                                            throw new Error("not found or too many matches");
+                                                            throw new Error('not found or too many matches');
                                                         y = rows[0];
                                                         return [4 /*yield*/, repo.getEntityRef(y)._updateEntityBasedOnApi(d.rowInfo.data)];
                                                     case 5:
@@ -365,7 +380,8 @@ function BackendMethod(options) {
                                     return [3 /*break*/, 4];
                                 case 3:
                                     err_3 = _a.sent();
-                                    if (err_3.isForbiddenError) // got a problem in next with instance of ForbiddenError  - so replaced it with this bool
+                                    if (err_3.isForbiddenError)
+                                        // got a problem in next with instance of ForbiddenError  - so replaced it with this bool
                                         res.forbidden();
                                     else
                                         res.error(err_3);
@@ -404,29 +420,33 @@ function BackendMethod(options) {
                                 _h.sent();
                                 classOptions_1 = x.classes.get(self.constructor);
                                 if (!classOptions_1.key) {
-                                    classOptions_1.key = defs.repository.metadata.key + "_methods";
+                                    classOptions_1.key = defs.repository.metadata.key + '_methods';
                                 }
                                 _h.label = 2;
                             case 2:
                                 _h.trys.push([2, 6, , 7]);
-                                _b = (_a = new /** @class */ (function (_super) {
+                                _b = (_a = new (/** @class */ (function (_super) {
                                     tslib_1.__extends(class_1, _super);
                                     function class_1() {
                                         return _super !== null && _super.apply(this, arguments) || this;
                                     }
                                     return class_1;
-                                }(Action))(classOptions_1.key + "/" + ((options === null || options === void 0 ? void 0 : options.apiPrefix) ? (options.apiPrefix + '/') : '') + key, options ? options.queue : false, options.allowed)).run;
+                                }(Action)))(classOptions_1.key +
+                                    '/' +
+                                    ((options === null || options === void 0 ? void 0 : options.apiPrefix) ? options.apiPrefix + '/' : '') +
+                                    key, options ? options.queue : false, options.allowed)).run;
                                 _e = {
                                     args: args
                                 };
                                 _f = {};
                                 return [4 /*yield*/, defs.toApiJson()];
-                            case 3: return [4 /*yield*/, (_b.apply(_a, [(_e.rowInfo = (_f.data = _h.sent(),
+                            case 3: return [4 /*yield*/, _b.apply(_a, [(_e.rowInfo = (_f.data = _h.sent(),
                                         _f.isNewRow = defs.isNew(),
                                         _f.wasChanged = defs.wasChanged(),
                                         _f.id = defs.getOriginalId(),
                                         _f),
-                                        _e), baseUrl, http]))];
+                                        _e), baseUrl,
+                                    http])];
                             case 4:
                                 r = _h.sent();
                                 return [4 /*yield*/, defs._updateEntityBasedOnApi(r.rowInfo.data)];
@@ -445,19 +465,23 @@ function BackendMethod(options) {
                                 return [4 /*yield*/, defs.__validateEntity()];
                             case 10:
                                 _h.sent();
-                                _d = (_c = new /** @class */ (function (_super) {
+                                _d = (_c = new (/** @class */ (function (_super) {
                                     tslib_1.__extends(class_2, _super);
                                     function class_2() {
                                         return _super !== null && _super.apply(this, arguments) || this;
                                     }
                                     return class_2;
-                                }(Action))(x.classes.get(self.constructor).key + "/" + ((options === null || options === void 0 ? void 0 : options.apiPrefix) ? (options.apiPrefix + '/') : '') + key, options ? options.queue : false, options.allowed)).run;
+                                }(Action)))(x.classes.get(self.constructor).key +
+                                    '/' +
+                                    ((options === null || options === void 0 ? void 0 : options.apiPrefix) ? options.apiPrefix + '/' : '') +
+                                    key, options ? options.queue : false, options.allowed)).run;
                                 _g = {
                                     args: args
                                 };
                                 return [4 /*yield*/, defs.toApiJson()];
-                            case 11: return [4 /*yield*/, (_d.apply(_c, [(_g.fields = _h.sent(),
-                                        _g), baseUrl, http]))];
+                            case 11: return [4 /*yield*/, _d.apply(_c, [(_g.fields = _h.sent(),
+                                        _g), baseUrl,
+                                    http])];
                             case 12:
                                 r = _h.sent();
                                 return [4 /*yield*/, defs._updateEntityBasedOnApi(r.fields)];
@@ -471,9 +495,9 @@ function BackendMethod(options) {
                         }
                     });
                 });
-            }
+            },
         };
-        descriptor.value = function () {
+        result = function () {
             var args = [];
             for (var _i = 0; _i < arguments.length; _i++) {
                 args[_i] = arguments[_i];
@@ -483,27 +507,33 @@ function BackendMethod(options) {
                 return tslib_1.__generator(this, function (_a) {
                     switch (_a.label) {
                         case 0:
-                            if (!!exports.actionInfo.runningOnServer) return [3 /*break*/, 1];
+                            if (!!context_1.isBackend()) return [3 /*break*/, 1];
                             self_1 = this;
                             return [2 /*return*/, serverAction.doWork(args, self_1)];
                         case 1: return [4 /*yield*/, originalMethod.apply(this, args)];
-                        case 2: return [2 /*return*/, (_a.sent())];
+                        case 2: return [2 /*return*/, _a.sent()];
                     }
                 });
             });
         };
-        registerAction(target.constructor, descriptor);
-        descriptor.value[exports.serverActionField] = serverAction;
-        return descriptor;
+        registerAction(target.constructor, result);
+        result[exports.serverActionField] = serverAction;
+        if (descriptor) {
+            descriptor.value = result;
+            return descriptor;
+        }
+        else
+            return result;
     };
 }
 exports.BackendMethod = BackendMethod;
 var customUndefined = {
-    _isUndefined: true
+    _isUndefined: true,
 };
-function registerAction(target, descriptor) {
-    (target[exports.classBackendMethodsArray] || (target[exports.classBackendMethodsArray] = [])).push(descriptor.value);
-    exports.actionInfo.allActions.push(descriptor.value);
+function registerAction(target, resultMethod) {
+    ;
+    (target[exports.classBackendMethodsArray] || (target[exports.classBackendMethodsArray] = [])).push(resultMethod);
+    exports.actionInfo.allActions.push(resultMethod);
 }
 function isCustomUndefined(x) {
     return x && x._isUndefined;
@@ -553,7 +583,7 @@ function prepareArgsToSend(types, args) {
             }
         }
     }
-    return args.map(function (x) { return x !== undefined ? x : customUndefined; });
+    return args.map(function (x) { return (x !== undefined ? x : customUndefined); });
 }
 exports.prepareArgsToSend = prepareArgsToSend;
 function prepareReceivedArgs(types, args, remult, ds, res) {