remult 0.16.2 → 0.16.3-exp.1

package/README.md

@@ -3,51 +3,71 @@
     <img src="https://github.com/remult/remult/raw/master/docs/.vuepress/public/logo.png" width="140" height="140">
   </a>
   <h1>Remult</h1>
-	<a href="https://circleci.com/gh/remult/remult/tree/master">
+	<a href="https://circleci.com/gh/remult/remult/tree/master" rel="nofollow">
 		<img alt="CircleCI" src="https://circleci.com/gh/remult/remult/tree/master.svg?style=shield">
 	</a>
-	<a href="https://codecov.io/gh/remult/remult">
+	<a href="https://codecov.io/gh/remult/remult" rel="nofollow">
         	<img src="https://codecov.io/gh/remult/remult/branch/master/graph/badge.svg?token=LYWQRUN3D1"/>
       	</a>
-    	<a href="https://raw.githubusercontent.com/remult/remult/master/LICENSE">
+    	<a href="https://raw.githubusercontent.com/remult/remult/master/LICENSE" rel="nofollow">
 		<img alt="GitHub license" src="https://img.shields.io/badge/license-MIT-blue.svg">
 	</a>
-	<a href="https://www.npmjs.com/package/remult">
+	<a href="https://www.npmjs.com/package/remult" rel="nofollow">
 		<img alt="npm version" src="https://badge.fury.io/js/remult.svg">
 	</a>
-	<a href="https://www.npmjs.com/package/remult">
+	<a href="https://www.npmjs.com/package/remult" rel="nofollow">
 		<img alt="npm downloads" src="https://img.shields.io/npm/dm/remult">
 	</a>
-	<a href="https://discord.gg/GXHk7ZfuG5">
-		<img alt="chat on discord" src="https://img.shields.io/badge/chat-on%20discord-blueviolet"/>
+	<a href="https://discord.gg/GXHk7ZfuG5" rel="nofollow">
+		<img alt="Join Discord" src="https://badgen.net/discord/online-members/GXHk7ZfuG5?icon=discord&label=Discord"/>
 	</a>
-	<a href="https://twitter.com/remultjs">
-	<img alt="Twitter Follow" src="https://img.shields.io/twitter/follow/remultjs?style=social">
+  <a href="https://twitter.com/intent/tweet?text=Remult%20-%20open-source%20CRUD%20framework%20for%20full-stack%20TypeScript%0A%0A%40remultjs%0A&url=https%3A%2F%2Fgithub.com%2Fremult%2Fremult">
+    <img alt="Twitter URL" src="https://img.shields.io/twitter/url?style=social&url=https%3A%2F%2Ftwitter.com%2Fintent%2Ftweet%3Ftext%3DRemult%2520-%2520open-source%2520CRUD%2520framework%2520for%2520full-stack%2520TypeScript%250A%250A%2540remultjs%250A%26url%3Dhttps%253A%252F%252Fgithub.com%252Fremult%252Fremult">
+  </a>
+	<a href="https://twitter.com/remultjs" rel="nofollow">
+	  <img alt="Twitter Follow" src="https://img.shields.io/twitter/url.svg?label=Follow%20%40remultjs&style=social&url=https%3A%2F%2Ftwitter.com%2FRemultJs">
 	</a>
 </div>
 <hr/>
 
-[Getting Started](#getting-started) | [Documentation](#documentation) | [Example Apps](#example-apps)
+[Getting Started](#getting-started) | [Documentation](#documentation) |
+[Example Apps](#example-apps)
 
 ## What is Remult?
 
-**Remult** is a full-stack CRUD framework that uses your **TypeScript entities as a single source of truth for your API, frontend type-safe API client and backend ORM**.
+**Remult** is a full-stack CRUD framework that uses your **TypeScript entities
+as a single source of truth for your API, frontend type-safe API client and
+backend ORM**.
 
 ### Status
 
-Remult is **production-ready** and, in fact, used in production apps since 2018. However, we’re keeping the major version at zero so we can use community feedback to finalize the v1 API.
+Remult is **production-ready** and, in fact, used in production apps since 2018.
+However, we’re keeping the major version at zero so we can use community
+feedback to finalize the v1 API.
 
 ## Motivation
 
-Full-stack web development is (still) too complicated. **Simple CRUD, a common requirement of any business application, should be simple to build, maintain, and extend** when the need arises.
+Full-stack web development is (still) too complicated. **Simple CRUD, a common
+requirement of any business application, should be simple to build, maintain,
+and extend** when the need arises.
 
-Remult abstracts away repetitive, boilerplate, error-prone, and poorly designed code on the one hand, and enables total flexibility and control on the other. **Remult helps building fullstack apps using only TypeScript code you can easily follow and safely refactor**, and fits nicely into any existing or new project by being minimalistic and completely unopinionated regarding the developer’s choice of other frameworks and tools.
+Remult abstracts away repetitive, boilerplate, error-prone, and poorly designed
+code on the one hand, and enables total flexibility and control on the other.
+**Remult helps building fullstack apps using only TypeScript code you can easily
+follow and safely refactor**, and fits nicely into any existing or new project
+by being minimalistic and completely unopinionated regarding the developer’s
+choice of other frameworks and tools.
 
-Other frameworks tend to fall into either too much abstraction (no-code, low-code, BaaS) or partial abstraction (MVC frameworks, GraphQL, ORMs, API generators, code generators), and tend to be opinionated regarding the development tool-chain, deployment environment, configuration/conventions or DSL. Remult attempts to strike a better balance.
+Other frameworks tend to fall into either too much abstraction (no-code,
+low-code, BaaS) or partial abstraction (MVC frameworks, GraphQL, ORMs, API
+generators, code generators), and tend to be opinionated regarding the
+development tool-chain, deployment environment, configuration/conventions or
+DSL. Remult attempts to strike a better balance.
 
 ## Installation
 
-The *remult* package is one and the same for both the frontend bundle and the backend. Install it once for a monolith project or per-repo in a monorepo.
+The _remult_ package is one and the same for both the frontend bundle and the
+backend. Install it once for a monolith project or per-repo in a monorepo.
 
 ```sh
 npm i remult
@@ -56,17 +76,18 @@ npm i remult
 ## Usage
 
 ### Define model classes
+
 ```ts
 // shared/product.ts
 
-import { Entity, Fields } from 'remult';
+import { Entity, Fields } from "remult";
 
-@Entity('products', {
-    allowApiCrud: true
+@Entity("products", {
+  allowApiCrud: true,
 })
 export class Product {
   @Fields.string()
-  name = '';
+  name = "";
 
   @Fields.number()
   unitPrice = 0;
@@ -74,18 +95,19 @@ export class Product {
 ```
 
 ### Setup API backend using an Express middleware
+
 ```ts
 // backend/index.ts
 
-import express from 'express';
-import { remultExpress } from 'remult/remult-express';
-import { Product } from '../shared/product';
+import express from "express";
+import { remultExpress } from "remult/remult-express";
+import { Product } from "../shared/product";
 
 const port = 3001;
 const app = express();
 
 app.use(remultExpress({
-  entities: [Product]
+  entities: [Product],
 }));
 
 app.listen(port, () => {
@@ -94,6 +116,7 @@ app.listen(port, () => {
 ```
 
 ### :rocket: API Ready
+
 ```sh
 > curl http://localhost:3001/api/products
 
@@ -101,24 +124,26 @@ app.listen(port, () => {
 ```
 
 ### Find and manipulate data in type-safe frontend code
+
 ```ts
 // frontend/code.ts
 
-import { Remult } from 'remult';
-import { Product } from '../shared/product';
+import { Remult } from "remult";
+import { Product } from "../shared/product";
 
 const remult = new Remult();
 
 async function increasePriceOfTofu(priceIncrease: number) {
   const productsRepo = remult.repo(Product);
 
-  const product = await productsRepo.findFirst({ name: 'Tofu' }); // filter is passed through API request all the way to the db
+  const product = await productsRepo.findFirst({ name: "Tofu" }); // filter is passed through API request all the way to the db
   product.unitPrice += priceIncrease;
   productsRepo.save(product); // mutation request updates the db with no boilerplate code
 }
 ```
 
-### ...*exactly* the same way as in backend code
+### ..._exactly_ the same way as in backend code
+
 ```ts
 @BackendMethod({ allowed: Allow.authenticated })
 static async increasePriceOfTofu(priceIncrease: number, remult?: Remult) {
@@ -133,48 +158,51 @@ static async increasePriceOfTofu(priceIncrease: number, remult?: Remult) {
 ### :ballot_box_with_check: Data validation and constraints - defined once
 
 ```ts
-import { Entity, Fields, Validators } from 'remult';
+import { Entity, Fields, Validators } from "remult";
 
-@Entity('products', {
-    allowApiCrud: true
+@Entity("products", {
+  allowApiCrud: true,
 })
 export class Product {
-    @Fields.string({
-        validate: Validators.required
-    })
-    name = '';
-
-    @Fields.string<Product>({
-        validate: product => {
-            if (product.description.trim().length < 50)
-                throw "too short";
-        }
-    })
-    description = '';
-
-    @Fields.number({
-        validate: (_, field) => {
-            if (field.value < 0)
-                field.error = "must not be less than 0"; // or: throw "must not be less than 0";
-        }
-    })
-    unitPrice = 0;
+  @Fields.string({
+    validate: Validators.required,
+  })
+  name = "";
+
+  @Fields.string<Product>({
+    validate: (product) => {
+      if (product.description.trim().length < 50) {
+        throw "too short";
+      }
+    },
+  })
+  description = "";
+
+  @Fields.number({
+    validate: (_, field) => {
+      if (field.value < 0) {
+        field.error = "must not be less than 0"; // or: throw "must not be less than 0";
+      }
+    },
+  })
+  unitPrice = 0;
 }
 ```
 
 ### Enforced in frontend:
+
 ```ts
 const product = productsRepo.create();
 
 try {
   await productsRepo.save(product);
-}
-catch (e: any) {
+} catch (e: any) {
   console.error(e.message); // Browser console will display - "Name: required"
 }
 ```
 
 ### Enforced in backend:
+
 ```sh
 > curl http://localhost:3001/api/products -H "Content-Type: application/json" -d "{""unitPrice"":-1}"
 
@@ -182,58 +210,78 @@ catch (e: any) {
 ```
 
 ### :lock: Secure the API with fine-grained authorization
+
 ```ts
-@Entity<Article>('Articles', {
-    allowApiRead: true,
-    allowApiInsert: remult => remult.authenticated(),
-    allowApiUpdate: (remult, article) => article.author.id == remult.user.id
+@Entity<Article>("Articles", {
+  allowApiRead: true,
+  allowApiInsert: (remult) => remult.authenticated(),
+  allowApiUpdate: (remult, article) => article.author.id == remult.user.id,
 })
 export class Article {
-    @Fields.string({ allowApiUpdate: false })
-    slug = '';
-    
-    @Field(() => Profile, { allowApiUpdate: false })
-    author!: Profile;
-
-    @Fields.string()
-    content = '';
+  @Fields.string({ allowApiUpdate: false })
+  slug = "";
+
+  @Field(() => Profile, { allowApiUpdate: false })
+  author!: Profile;
+
+  @Fields.string()
+  content = "";
 }
 ```
 
 ## What about complex CRUD?
 
-While simple CRUD shouldn’t require any backend coding, using Remult means having the ability to handle any complex scenario by controlling the backend in numerous ways:
-
-* Backend computed (read-only) fields - from simple [expressions](https://remult.dev/docs/ref_field.html#serverexpression) to complex data lookups or even direct db access (SQL)
-* Custom side-effects with [entity lifecycle hooks](https://remult.dev/docs/ref_entity.html#saving) (before/after saving/deleting)
-* Backend only updatable fields (e.g. “last updated at”)
-* Many-to-one [relations](https://remult.dev/docs/entity-relations.html) with [lazy/eager loading](https://remult.dev/docs/lazy-loading-of-related-entities.html)
-* Roll-your-own type-safe endpoints with [Backend Methods](https://remult.dev/docs/backendMethods.html)
-* Roll-your-own low-level endpoints (Express, Fastify, koa, others…)
+While simple CRUD shouldn’t require any backend coding, using Remult means
+having the ability to handle any complex scenario by controlling the backend in
+numerous ways:
+
+- Backend computed (read-only) fields - from simple
+  [expressions](https://remult.dev/docs/ref_field.html#serverexpression) to
+  complex data lookups or even direct db access (SQL)
+- Custom side-effects with
+  [entity lifecycle hooks](https://remult.dev/docs/ref_entity.html#saving)
+  (before/after saving/deleting)
+- Backend only updatable fields (e.g. “last updated at”)
+- Many-to-one [relations](https://remult.dev/docs/entity-relations.html) with
+  [lazy/eager loading](https://remult.dev/docs/lazy-loading-of-related-entities.html)
+- Roll-your-own type-safe endpoints with
+  [Backend Methods](https://remult.dev/docs/backendMethods.html)
+- Roll-your-own low-level endpoints (Express, Fastify, koa, others…)
 
 ## Getting started
-The best way to learn Remult is by following a tutorial of a simple Todo web app with a Node.js Express backend. 
 
-* [Tutorial with React](https://remult.dev/tutorials/react/) 
-* [Tutorial with Angular](https://remult.dev/tutorials/angular/)
-* [Tutorial with Vue](https://remult.dev/tutorials/vue/)
-* [Tutorial with Next.js](https://remult.dev/tutorials/react-next/)
+The best way to learn Remult is by following a tutorial of a simple Todo web app
+with a Node.js Express backend.
+
+- [Tutorial with React](https://remult.dev/tutorials/react/)
+- [Tutorial with Angular](https://remult.dev/tutorials/angular/)
+- [Tutorial with Vue](https://remult.dev/tutorials/vue/)
+- [Tutorial with Next.js](https://remult.dev/tutorials/react-next/)
 
 ## Documentation
-The [documentation](https://remult.dev/docs) covers the main features of Remult. However, it is still a work-in-progress.
+
+The [documentation](https://remult.dev/docs) covers the main features of Remult.
+However, it is still a work-in-progress.
 
 ## Example Apps
 
-* Fullstack TodoMVC example with React and Express. ([Source code](https://github.com/remult/TodoMVC-eample) | [CodeSandbox](https://codesandbox.io/s/github/remult/TodoMVC-example?file=/src/frontend/App.tsx))
+- Fullstack TodoMVC example with React and Express.
+  ([Source code](https://github.com/remult/TodoMVC-eample) |
+  [CodeSandbox](https://codesandbox.io/s/github/remult/TodoMVC-example?file=/src/frontend/App.tsx))
 
-* [CRM demo](https://github.com/remult/crm-demo) with a React + [MUI](https://mui.com) front-end and Postgres database.
+- [CRM demo](https://github.com/remult/crm-demo) with a React +
+  [MUI](https://mui.com) front-end and Postgres database.
 
 ## Contributing
+
 Contributions are welcome. See [CONTRIBUTING.md](CONTRIBUTING.md).
 
-* :speech_balloon: Any feedback or suggestions? Start a [discussion](https://github.com/remult/remult/discussions).
-* :muscle: Want to help out? Look for "help wanted" labeled [issues](https://github.com/remult/remult/issues).
-* :star: Give this repo a star.
+- :speech_balloon: Any feedback or suggestions? Start a
+  [discussion](https://github.com/remult/remult/discussions).
+- :muscle: Want to help out? Look for "help wanted" labeled
+  [issues](https://github.com/remult/remult/issues).
+- :star: Give this repo a star.
 
 ## License
+
 Remult is [MIT Licensed](LICENSE).

package/esm/index.d.ts

@@ -1,4 +1,5 @@
-export { Field, Fields, StringFieldOptions, FieldsMetadata, Entity, BuildEntity, EntityBase, ControllerBase, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, QueryResult, QueryOptions, Repository, FieldType, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, getFields, EntityRef, getEntityRef, SortSegments, ValueListFieldType, getValueList, ValueListFieldOptions, ValueListInfo, OmitEB, Paginator, CaptionTransformer } from './src/remult3';
+export { Field, Fields, StringFieldOptions, FieldsMetadata, Entity, EntityBase, ControllerBase, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, QueryResult, QueryOptions, Repository, FieldType, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, getFields, EntityRef, getEntityRef, SortSegments, ValueListFieldType, getValueList, ValueListFieldOptions, ValueListInfo, OmitEB, Paginator, CaptionTransformer } from './src/remult3';
+export { describeClass } from './src/remult3/DecoratorReplacer';
 export { EntityOptions } from './src/entity';
 export { DataProvider, EntityDataProvider, EntityDataProviderFindOptions, ErrorInfo, RestDataProviderHttpProvider } from './src/data-interfaces';
 export { SqlCommand, SqlImplementation, SqlResult } from './src/sql-command';

package/esm/index.js

@@ -1,7 +1,8 @@
 /*
  * Public API Surface of remult
  */
-export { Field, Fields, Entity, BuildEntity, EntityBase, ControllerBase, FieldType, getFields, getEntityRef, ValueListFieldType, getValueList, ValueListInfo, CaptionTransformer } from './src/remult3';
+export { Field, Fields, Entity, EntityBase, ControllerBase, FieldType, getFields, getEntityRef, ValueListFieldType, getValueList, ValueListInfo, CaptionTransformer } from './src/remult3';
+export { describeClass } from './src/remult3/DecoratorReplacer';
 export { RestDataProvider } from './src/data-providers/rest-data-provider'; //V
 export { InMemoryDataProvider } from './src/data-providers/in-memory-database'; //V
 export { ArrayEntityDataProvider } from './src/data-providers/array-entity-data-provider'; //V

package/esm/src/context.d.ts

@@ -85,9 +85,6 @@ export interface ControllerOptions {
 }
 export declare const classHelpers: Map<any, ClassHelper>;
 export declare class ClassHelper {
-    methods: MethodHelper[];
-}
-export declare class MethodHelper {
     classes: Map<any, ControllerOptions>;
 }
 export declare function buildRestDataProvider(provider: ExternalHttpProvider | typeof fetch): RestDataProviderHttpProvider | RestDataProviderHttpProviderUsingFetch;

package/esm/src/context.js

@@ -206,11 +206,6 @@ Remult.onFind = (metadata, options) => { };
 export const allEntities = [];
 export const classHelpers = new Map();
 export class ClassHelper {
-    constructor() {
-        this.methods = [];
-    }
-}
-export class MethodHelper {
     constructor() {
         this.classes = new Map();
     }
@@ -241,11 +236,9 @@ export function setControllerSettings(target, options) {
     let r = target;
     while (true) {
         let helper = classHelpers.get(r);
-        if (helper) {
-            for (const m of helper.methods) {
-                m.classes.set(target, options);
-            }
-        }
+        if (!helper)
+            classHelpers.set(r, helper = new ClassHelper());
+        helper.classes.set(target, options);
         let p = Object.getPrototypeOf(r.prototype);
         if (p == null)
             break;

package/esm/src/remult3/DecoratorReplacer.d.ts

@@ -0,0 +1,10 @@
+import { OmitEB } from "./remult3";
+declare type Decorator<T = any> = (a: T, b: string, c?: any) => void;
+declare type Decorators<T> = T extends new (...args: any[]) => infer R ? {
+    [K in keyof OmitEB<R>]?: Decorator;
+} : never;
+declare type StaticDecorators<T> = {
+    [K in keyof T]?: Decorator;
+};
+export declare function describeClass<classType>(classType: classType, classDecorator: ((x: any) => any) | undefined, members?: Decorators<classType> | undefined, staticMembers?: StaticDecorators<classType>): void;
+export {};

package/esm/src/remult3/DecoratorReplacer.js

@@ -0,0 +1,20 @@
+export function describeClass(classType, classDecorator, members, staticMembers) {
+    if (classDecorator)
+        classDecorator(classType);
+    for (const fieldKey in members) {
+        if (Object.prototype.hasOwnProperty.call(members, fieldKey)) {
+            const element = members[fieldKey];
+            const prop = Object.getOwnPropertyDescriptor(classType.prototype, fieldKey);
+            element(classType.prototype, fieldKey, prop);
+            if (prop)
+                Object.defineProperty(classType.prototype, fieldKey, prop);
+        }
+    }
+    for (const staticFieldKey in staticMembers) {
+        const staticElement = staticMembers[staticFieldKey];
+        const prop = Object.getOwnPropertyDescriptor(classType, staticFieldKey);
+        staticElement(classType, staticFieldKey, prop);
+        if (prop)
+            Object.defineProperty(classType, staticFieldKey, prop);
+    }
+}

package/esm/src/remult3/RepositoryImplementation.d.ts

@@ -271,10 +271,6 @@ interface columnInfo {
     key: string;
     settings: (remult: Remult) => FieldOptions;
 }
-export declare type BuildEntityFields<entityType> = {
-    [Properties in keyof Partial<OmitEB<entityType>>]: any;
-};
-export declare function BuildEntity<entityType>(c: ClassType<entityType>, key: string, fields: BuildEntityFields<entityType>, ...options: (EntityOptions<entityType> | ((options: EntityOptions<entityType>, remult: Remult) => void))[]): void;
 /**Decorates classes that should be used as entities.
  * Receives a key and an array of EntityOptions.
  * @example
@@ -310,7 +306,7 @@ export declare class EntityBase {
 }
 export declare class ControllerBase {
     protected remult: Remult;
-    constructor(remult: Remult);
+    constructor(remult?: Remult);
     assign(values: Partial<Omit<this, keyof EntityBase>>): this;
     get $(): FieldsRef<this>;
     get _(): ControllerRef<this>;

package/esm/src/remult3/RepositoryImplementation.js

@@ -1578,15 +1578,6 @@ export function decorateColumnSettings(settings, remult) {
     }
     return settings;
 }
-export function BuildEntity(c, key, fields, ...options) {
-    Entity(key, ...options)(c);
-    for (const fieldKey in fields) {
-        if (Object.prototype.hasOwnProperty.call(fields, fieldKey)) {
-            const element = fields[fieldKey];
-            element(c.prototype, fieldKey);
-        }
-    }
-}
 /**Decorates classes that should be used as entities.
  * Receives a key and an array of EntityOptions.
  * @example
@@ -1667,14 +1658,14 @@ export class EntityBase {
 }
 export class ControllerBase {
     constructor(remult) {
-        this.remult = remult;
+        this.remult = remult || RepositoryImplementation.defaultRemult;
     }
     assign(values) {
         assign(this, values);
         return this;
     }
-    get $() { return getFields(this); }
-    get _() { return getControllerRef(this); }
+    get $() { return getFields(this, this.remult); }
+    get _() { return getControllerRef(this, this.remult); }
 }
 class QueryResultImpl {
     constructor(options, repo) {

package/esm/src/server-action.d.ts

@@ -33,6 +33,7 @@ export interface BackendMethodOptions<type> {
     queue?: boolean;
     /** EXPERIMENTAL: Determines if the user should be blocked while this `BackendMethod` is running*/
     blockUser?: boolean;
+    paramTypes?: any[];
 }
 export declare const actionInfo: {
     allActions: any[];

package/esm/src/server-action.js

@@ -1,5 +1,5 @@
 import 'reflect-metadata';
-import { Remult, allEntities, classHelpers, ClassHelper, MethodHelper, setControllerSettings, buildRestDataProvider } from './context';
+import { Remult, allEntities, classHelpers, ClassHelper, setControllerSettings, buildRestDataProvider } from './context';
 import { SqlDatabase } from './data-providers/sql-database';
 import { getEntityRef, decorateColumnSettings, getEntitySettings, getControllerRef, RepositoryImplementation } from './remult3';
 export class Action {
@@ -100,7 +100,6 @@ export const actionInfo = {
     })
 };
 export const serverActionField = Symbol('serverActionField');
-const methodHelpers = new Map();
 const classOptions = new Map();
 export function Controller(key) {
     return function (target) {
@@ -116,6 +115,8 @@ export function BackendMethod(options) {
         if (target.prototype !== undefined) {
             var originalMethod = descriptor.value;
             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
             let serverAction = new myServerAction(key, types, options, args => originalMethod.apply(undefined, args));
             serverAction.doWork = async (args, self, url, http) => {
@@ -138,20 +139,19 @@ export function BackendMethod(options) {
             return descriptor;
         }
         var types = Reflect.getMetadata("design:paramtypes", target, key);
+        if (options.paramTypes)
+            types = options.paramTypes;
         let x = classHelpers.get(target.constructor);
         if (!x) {
             x = new ClassHelper();
             classHelpers.set(target.constructor, x);
         }
-        let mh = new MethodHelper();
-        methodHelpers.set(descriptor, mh);
-        x.methods.push(mh);
         var originalMethod = descriptor.value;
         let serverAction = {
             __register(reg) {
                 let c = new Remult();
-                for (const constructor of mh.classes.keys()) {
-                    let controllerOptions = mh.classes.get(constructor);
+                for (const constructor of x.classes.keys()) {
+                    let controllerOptions = x.classes.get(constructor);
                     if (!controllerOptions.key) {
                         controllerOptions.key = c.repo(constructor).metadata.key;
                     }
@@ -238,7 +238,7 @@ export function BackendMethod(options) {
                 if (allEntities.includes(target.constructor)) {
                     let defs = getEntityRef(self);
                     await defs.__validateEntity();
-                    let classOptions = mh.classes.get(self.constructor);
+                    let classOptions = x.classes.get(self.constructor);
                     if (!classOptions.key) {
                         classOptions.key = defs.repository.metadata.key + "_methods";
                     }
@@ -265,7 +265,7 @@ export function BackendMethod(options) {
                     try {
                         await defs.__validateEntity();
                         let r = await (new class extends Action {
-                        }(mh.classes.get(self.constructor).key + "/" + key, options ? options.queue : false, options.allowed).run({
+                        }(x.classes.get(self.constructor).key + "/" + key, options ? options.queue : false, options.allowed).run({
                             args,
                             fields: await defs.toApiJson()
                         }, baseUrl, http));

package/esm/src/shared-tests/test-custom-id-column.spec.js

@@ -1,13 +1,14 @@
-import { Entity, EntityBase, BuildEntity, Fields } from '../remult3';
+import { Entity, EntityBase, Fields } from '../remult3';
+import { describeClass } from '../remult3/DecoratorReplacer';
 import { testAll } from './db-tests-setup';
 describe("custom id column", () => {
     testAll("basic test", async ({ createEntity }) => {
         let type = class extends EntityBase {
         };
-        BuildEntity(type, 'custom', {
+        describeClass(type, Entity('custom', { allowApiCrud: true }), {
             a: Fields.number(),
             b: Fields.number()
-        }, { allowApiCrud: true });
+        });
         let c = await createEntity(type);
         let r = c.create();
         r.a = 1;

package/index.d.ts

@@ -1,4 +1,5 @@
-export { Field, Fields, StringFieldOptions, FieldsMetadata, Entity, BuildEntity, EntityBase, ControllerBase, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, QueryResult, QueryOptions, Repository, FieldType, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, getFields, EntityRef, getEntityRef, SortSegments, ValueListFieldType, getValueList, ValueListFieldOptions, ValueListInfo, OmitEB, Paginator, CaptionTransformer } from './src/remult3';
+export { Field, Fields, StringFieldOptions, FieldsMetadata, Entity, EntityBase, ControllerBase, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, QueryResult, QueryOptions, Repository, FieldType, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, getFields, EntityRef, getEntityRef, SortSegments, ValueListFieldType, getValueList, ValueListFieldOptions, ValueListInfo, OmitEB, Paginator, CaptionTransformer } from './src/remult3';
+export { describeClass } from './src/remult3/DecoratorReplacer';
 export { EntityOptions } from './src/entity';
 export { DataProvider, EntityDataProvider, EntityDataProviderFindOptions, ErrorInfo, RestDataProviderHttpProvider } from './src/data-interfaces';
 export { SqlCommand, SqlImplementation, SqlResult } from './src/sql-command';

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.remult = exports.ValueConverters = exports.Validators = exports.UrlBuilder = exports.FilterConsumerBridgeToSqlRequest = exports.Filter = exports.CompoundIdField = exports.OneToMany = exports.Sort = exports.IdEntity = exports.EventSource = exports.isBackend = exports.Remult = exports.Allow = exports.ProgressListener = exports.BackendMethod = exports.Controller = exports.JsonDataProvider = exports.CustomSqlFilterBuilder = exports.SqlDatabase = exports.WebSqlDataProvider = exports.ArrayEntityDataProvider = exports.InMemoryDataProvider = exports.RestDataProvider = exports.CaptionTransformer = exports.ValueListInfo = exports.getValueList = exports.ValueListFieldType = exports.getEntityRef = exports.getFields = exports.FieldType = exports.ControllerBase = exports.EntityBase = exports.BuildEntity = exports.Entity = exports.Fields = exports.Field = void 0;
+exports.remult = exports.ValueConverters = exports.Validators = exports.UrlBuilder = exports.FilterConsumerBridgeToSqlRequest = exports.Filter = exports.CompoundIdField = exports.OneToMany = exports.Sort = exports.IdEntity = exports.EventSource = exports.isBackend = exports.Remult = exports.Allow = exports.ProgressListener = exports.BackendMethod = exports.Controller = exports.JsonDataProvider = exports.CustomSqlFilterBuilder = exports.SqlDatabase = exports.WebSqlDataProvider = exports.ArrayEntityDataProvider = exports.InMemoryDataProvider = exports.RestDataProvider = exports.describeClass = exports.CaptionTransformer = exports.ValueListInfo = exports.getValueList = exports.ValueListFieldType = exports.getEntityRef = exports.getFields = exports.FieldType = exports.ControllerBase = exports.EntityBase = exports.Entity = exports.Fields = exports.Field = void 0;
 /*
  * Public API Surface of remult
  */
@@ -8,7 +8,6 @@ var remult3_1 = require("./src/remult3");
 Object.defineProperty(exports, "Field", { enumerable: true, get: function () { return remult3_1.Field; } });
 Object.defineProperty(exports, "Fields", { enumerable: true, get: function () { return remult3_1.Fields; } });
 Object.defineProperty(exports, "Entity", { enumerable: true, get: function () { return remult3_1.Entity; } });
-Object.defineProperty(exports, "BuildEntity", { enumerable: true, get: function () { return remult3_1.BuildEntity; } });
 Object.defineProperty(exports, "EntityBase", { enumerable: true, get: function () { return remult3_1.EntityBase; } });
 Object.defineProperty(exports, "ControllerBase", { enumerable: true, get: function () { return remult3_1.ControllerBase; } });
 Object.defineProperty(exports, "FieldType", { enumerable: true, get: function () { return remult3_1.FieldType; } });
@@ -18,6 +17,8 @@ Object.defineProperty(exports, "ValueListFieldType", { enumerable: true, get: fu
 Object.defineProperty(exports, "getValueList", { enumerable: true, get: function () { return remult3_1.getValueList; } });
 Object.defineProperty(exports, "ValueListInfo", { enumerable: true, get: function () { return remult3_1.ValueListInfo; } });
 Object.defineProperty(exports, "CaptionTransformer", { enumerable: true, get: function () { return remult3_1.CaptionTransformer; } });
+var DecoratorReplacer_1 = require("./src/remult3/DecoratorReplacer");
+Object.defineProperty(exports, "describeClass", { enumerable: true, get: function () { return DecoratorReplacer_1.describeClass; } });
 var rest_data_provider_1 = require("./src/data-providers/rest-data-provider"); //V
 Object.defineProperty(exports, "RestDataProvider", { enumerable: true, get: function () { return rest_data_provider_1.RestDataProvider; } });
 var in_memory_database_1 = require("./src/data-providers/in-memory-database"); //V

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "0.16.2",
+    "version": "0.16.3-exp.1",
     "description": "A CRUD framework for full-stack TypeScript",
     "main": "index.js",
     "types": "index.d.ts",

package/src/context.d.ts

@@ -85,9 +85,6 @@ export interface ControllerOptions {
 }
 export declare const classHelpers: Map<any, ClassHelper>;
 export declare class ClassHelper {
-    methods: MethodHelper[];
-}
-export declare class MethodHelper {
     classes: Map<any, ControllerOptions>;
 }
 export declare function buildRestDataProvider(provider: ExternalHttpProvider | typeof fetch): RestDataProviderHttpProvider | RestDataProviderHttpProviderUsingFetch;

package/src/context.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.EventSource = exports.queryConfig = exports.Allow = exports.setControllerSettings = exports.buildRestDataProvider = exports.MethodHelper = exports.ClassHelper = exports.classHelpers = exports.allEntities = exports.Remult = exports.isBackend = exports.processHttpException = exports.toPromise = exports.retry = exports.HttpProviderBridgeToRestDataProviderHttpProvider = void 0;
+exports.EventSource = exports.queryConfig = exports.Allow = exports.setControllerSettings = exports.buildRestDataProvider = exports.ClassHelper = exports.classHelpers = exports.allEntities = exports.Remult = exports.isBackend = exports.processHttpException = exports.toPromise = exports.retry = exports.HttpProviderBridgeToRestDataProviderHttpProvider = void 0;
 var tslib_1 = require("tslib");
 var server_action_1 = require("./server-action");
 var rest_data_provider_1 = require("./data-providers/rest-data-provider");
@@ -290,18 +290,11 @@ exports.allEntities = [];
 exports.classHelpers = new Map();
 var ClassHelper = /** @class */ (function () {
     function ClassHelper() {
-        this.methods = [];
+        this.classes = new Map();
     }
     return ClassHelper;
 }());
 exports.ClassHelper = ClassHelper;
-var MethodHelper = /** @class */ (function () {
-    function MethodHelper() {
-        this.classes = new Map();
-    }
-    return MethodHelper;
-}());
-exports.MethodHelper = MethodHelper;
 function isExternalHttpProvider(item) {
     var http = item;
     if (http && http.get && http.put && http.post && http.delete)
@@ -326,25 +319,12 @@ function buildRestDataProvider(provider) {
 }
 exports.buildRestDataProvider = buildRestDataProvider;
 function setControllerSettings(target, options) {
-    var e_3, _a;
     var r = target;
     while (true) {
         var helper = exports.classHelpers.get(r);
-        if (helper) {
-            try {
-                for (var _b = (e_3 = void 0, tslib_1.__values(helper.methods)), _c = _b.next(); !_c.done; _c = _b.next()) {
-                    var m = _c.value;
-                    m.classes.set(target, options);
-                }
-            }
-            catch (e_3_1) { e_3 = { error: e_3_1 }; }
-            finally {
-                try {
-                    if (_c && !_c.done && (_a = _b.return)) _a.call(_b);
-                }
-                finally { if (e_3) throw e_3.error; }
-            }
-        }
+        if (!helper)
+            exports.classHelpers.set(r, helper = new ClassHelper());
+        helper.classes.set(target, options);
         var p = Object.getPrototypeOf(r.prototype);
         if (p == null)
             break;
@@ -387,8 +367,8 @@ var EventSource = /** @class */ (function () {
     }
     EventSource.prototype.fire = function () {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
-            var _a, _b, l, e_4_1;
-            var e_4, _c;
+            var _a, _b, l, e_3_1;
+            var e_3, _c;
             return tslib_1.__generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
@@ -407,14 +387,14 @@ var EventSource = /** @class */ (function () {
                         return [3 /*break*/, 1];
                     case 4: return [3 /*break*/, 7];
                     case 5:
-                        e_4_1 = _d.sent();
-                        e_4 = { error: e_4_1 };
+                        e_3_1 = _d.sent();
+                        e_3 = { error: e_3_1 };
                         return [3 /*break*/, 7];
                     case 6:
                         try {
                             if (_b && !_b.done && (_c = _a.return)) _c.call(_a);
                         }
-                        finally { if (e_4) throw e_4.error; }
+                        finally { if (e_3) throw e_3.error; }
                         return [7 /*endfinally*/];
                     case 7: return [2 /*return*/];
                 }

package/src/remult3/DecoratorReplacer.d.ts

@@ -0,0 +1,10 @@
+import { OmitEB } from "./remult3";
+declare type Decorator<T = any> = (a: T, b: string, c?: any) => void;
+declare type Decorators<T> = T extends new (...args: any[]) => infer R ? {
+    [K in keyof OmitEB<R>]?: Decorator;
+} : never;
+declare type StaticDecorators<T> = {
+    [K in keyof T]?: Decorator;
+};
+export declare function describeClass<classType>(classType: classType, classDecorator: ((x: any) => any) | undefined, members?: Decorators<classType> | undefined, staticMembers?: StaticDecorators<classType>): void;
+export {};

package/src/remult3/DecoratorReplacer.js

@@ -0,0 +1,24 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.describeClass = void 0;
+function describeClass(classType, classDecorator, members, staticMembers) {
+    if (classDecorator)
+        classDecorator(classType);
+    for (var fieldKey in members) {
+        if (Object.prototype.hasOwnProperty.call(members, fieldKey)) {
+            var element = members[fieldKey];
+            var prop = Object.getOwnPropertyDescriptor(classType.prototype, fieldKey);
+            element(classType.prototype, fieldKey, prop);
+            if (prop)
+                Object.defineProperty(classType.prototype, fieldKey, prop);
+        }
+    }
+    for (var staticFieldKey in staticMembers) {
+        var staticElement = staticMembers[staticFieldKey];
+        var prop = Object.getOwnPropertyDescriptor(classType, staticFieldKey);
+        staticElement(classType, staticFieldKey, prop);
+        if (prop)
+            Object.defineProperty(classType, staticFieldKey, prop);
+    }
+}
+exports.describeClass = describeClass;

package/src/remult3/RepositoryImplementation.d.ts

@@ -271,10 +271,6 @@ interface columnInfo {
     key: string;
     settings: (remult: Remult) => FieldOptions;
 }
-export declare type BuildEntityFields<entityType> = {
-    [Properties in keyof Partial<OmitEB<entityType>>]: any;
-};
-export declare function BuildEntity<entityType>(c: ClassType<entityType>, key: string, fields: BuildEntityFields<entityType>, ...options: (EntityOptions<entityType> | ((options: EntityOptions<entityType>, remult: Remult) => void))[]): void;
 /**Decorates classes that should be used as entities.
  * Receives a key and an array of EntityOptions.
  * @example
@@ -310,7 +306,7 @@ export declare class EntityBase {
 }
 export declare class ControllerBase {
     protected remult: Remult;
-    constructor(remult: Remult);
+    constructor(remult?: Remult);
     assign(values: Partial<Omit<this, keyof EntityBase>>): this;
     get $(): FieldsRef<this>;
     get _(): ControllerRef<this>;

package/src/remult3/RepositoryImplementation.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ControllerBase = exports.EntityBase = exports.Entity = exports.BuildEntity = exports.decorateColumnSettings = exports.storableMember = exports.Field = exports.getValueList = exports.ValueListInfo = exports.ValueListFieldType = exports.isAutoIncrement = exports.Fields = exports.FieldType = exports.columnDefsImpl = exports.buildCaption = exports.CaptionTransformer = exports.getEntityRef = exports.FieldRefImplementation = exports.controllerRefImpl = exports.getControllerRef = exports.getFields = exports.rowHelperImplementation = exports.createOldEntity = exports.columnsOfType = exports.getEntityKey = exports.getEntitySettings = exports.entityInfo_key = exports.entityInfo = exports.__updateEntityBasedOnWhere = exports.RepositoryImplementation = void 0;
+exports.ControllerBase = exports.EntityBase = exports.Entity = exports.decorateColumnSettings = exports.storableMember = exports.Field = exports.getValueList = exports.ValueListInfo = exports.ValueListFieldType = exports.isAutoIncrement = exports.Fields = exports.FieldType = exports.columnDefsImpl = exports.buildCaption = exports.CaptionTransformer = exports.getEntityRef = exports.FieldRefImplementation = exports.controllerRefImpl = exports.getControllerRef = exports.getFields = exports.rowHelperImplementation = exports.createOldEntity = exports.columnsOfType = exports.getEntityKey = exports.getEntitySettings = exports.entityInfo_key = exports.entityInfo = exports.__updateEntityBasedOnWhere = exports.RepositoryImplementation = void 0;
 var tslib_1 = require("tslib");
 var column_1 = require("../column");
 var context_1 = require("../context");
@@ -2618,20 +2618,6 @@ function decorateColumnSettings(settings, remult) {
     return settings;
 }
 exports.decorateColumnSettings = decorateColumnSettings;
-function BuildEntity(c, key, fields) {
-    var options = [];
-    for (var _i = 3; _i < arguments.length; _i++) {
-        options[_i - 3] = arguments[_i];
-    }
-    Entity.apply(void 0, tslib_1.__spread([key], options))(c);
-    for (var fieldKey in fields) {
-        if (Object.prototype.hasOwnProperty.call(fields, fieldKey)) {
-            var element = fields[fieldKey];
-            element(c.prototype, fieldKey);
-        }
-    }
-}
-exports.BuildEntity = BuildEntity;
 /**Decorates classes that should be used as entities.
  * Receives a key and an array of EntityOptions.
  * @example
@@ -2738,19 +2724,19 @@ var EntityBase = /** @class */ (function () {
 exports.EntityBase = EntityBase;
 var ControllerBase = /** @class */ (function () {
     function ControllerBase(remult) {
-        this.remult = remult;
+        this.remult = remult || RepositoryImplementation.defaultRemult;
     }
     ControllerBase.prototype.assign = function (values) {
         assign_1.assign(this, values);
         return this;
     };
     Object.defineProperty(ControllerBase.prototype, "$", {
-        get: function () { return getFields(this); },
+        get: function () { return getFields(this, this.remult); },
         enumerable: false,
         configurable: true
     });
     Object.defineProperty(ControllerBase.prototype, "_", {
-        get: function () { return getControllerRef(this); },
+        get: function () { return getControllerRef(this, this.remult); },
         enumerable: false,
         configurable: true
     });

package/src/server-action.d.ts

@@ -33,6 +33,7 @@ export interface BackendMethodOptions<type> {
     queue?: boolean;
     /** EXPERIMENTAL: Determines if the user should be blocked while this `BackendMethod` is running*/
     blockUser?: boolean;
+    paramTypes?: any[];
 }
 export declare const actionInfo: {
     allActions: any[];

package/src/server-action.js

@@ -174,7 +174,6 @@ exports.actionInfo = {
     }); }
 };
 exports.serverActionField = Symbol('serverActionField');
-var methodHelpers = new Map();
 var classOptions = new Map();
 function Controller(key) {
     return function (target) {
@@ -192,6 +191,8 @@ function BackendMethod(options) {
         if (target.prototype !== undefined) {
             var originalMethod = descriptor.value;
             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(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 () {
@@ -236,14 +237,13 @@ function BackendMethod(options) {
             return descriptor;
         }
         var types = Reflect.getMetadata("design:paramtypes", target, key);
+        if (options.paramTypes)
+            types = options.paramTypes;
         var x = context_1.classHelpers.get(target.constructor);
         if (!x) {
             x = new context_1.ClassHelper();
             context_1.classHelpers.set(target.constructor, x);
         }
-        var mh = new context_1.MethodHelper();
-        methodHelpers.set(descriptor, mh);
-        x.methods.push(mh);
         var originalMethod = descriptor.value;
         var serverAction = {
             __register: function (reg) {
@@ -251,7 +251,7 @@ function BackendMethod(options) {
                 var _this = this;
                 var c = new context_1.Remult();
                 var _loop_1 = function (constructor) {
-                    var controllerOptions = mh.classes.get(constructor);
+                    var controllerOptions = x.classes.get(constructor);
                     if (!controllerOptions.key) {
                         controllerOptions.key = c.repo(constructor).metadata.key;
                     }
@@ -376,7 +376,7 @@ function BackendMethod(options) {
                     }); });
                 };
                 try {
-                    for (var _b = tslib_1.__values(mh.classes.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
+                    for (var _b = tslib_1.__values(x.classes.keys()), _c = _b.next(); !_c.done; _c = _b.next()) {
                         var constructor = _c.value;
                         _loop_1(constructor);
                     }
@@ -402,7 +402,7 @@ function BackendMethod(options) {
                                 return [4 /*yield*/, defs.__validateEntity()];
                             case 1:
                                 _h.sent();
-                                classOptions_1 = mh.classes.get(self.constructor);
+                                classOptions_1 = x.classes.get(self.constructor);
                                 if (!classOptions_1.key) {
                                     classOptions_1.key = defs.repository.metadata.key + "_methods";
                                 }
@@ -451,7 +451,7 @@ function BackendMethod(options) {
                                         return _super !== null && _super.apply(this, arguments) || this;
                                     }
                                     return class_2;
-                                }(Action))(mh.classes.get(self.constructor).key + "/" + key, options ? options.queue : false, options.allowed)).run;
+                                }(Action))(x.classes.get(self.constructor).key + "/" + key, options ? options.queue : false, options.allowed)).run;
                                 _g = {
                                     args: args
                                 };

package/src/shared-tests/test-custom-id-column.spec.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
 var remult3_1 = require("../remult3");
+var DecoratorReplacer_1 = require("../remult3/DecoratorReplacer");
 var db_tests_setup_1 = require("./db-tests-setup");
 describe("custom id column", function () {
     db_tests_setup_1.testAll("basic test", function (_a) {
@@ -18,10 +19,10 @@ describe("custom id column", function () {
                             }
                             return class_1;
                         }(remult3_1.EntityBase));
-                        remult3_1.BuildEntity(type, 'custom', {
+                        DecoratorReplacer_1.describeClass(type, remult3_1.Entity('custom', { allowApiCrud: true }), {
                             a: remult3_1.Fields.number(),
                             b: remult3_1.Fields.number()
-                        }, { allowApiCrud: true });
+                        });
                         return [4 /*yield*/, createEntity(type)];
                     case 1:
                         c = _b.sent();