remult 2.7.33 → 3.0.0-next.1

package/esm/src/context.js

@@ -64,14 +64,16 @@ export class Remult {
      * @param dataProvider - an optional alternative data provider to use. Useful for writing to offline storage or an alternative data provider
      */
     repo = (entity, dataProvider) => {
+        const info = createOldEntity(entity, this);
         if (dataProvider === undefined)
-            dataProvider = this.dataProvider;
+            dataProvider =
+                info?.options?.dataProvider?.(this.dataProvider) ?? this.dataProvider;
         let dpCache = this.repCache.get(dataProvider);
         if (!dpCache)
             this.repCache.set(dataProvider, (dpCache = new Map()));
         let r = dpCache.get(entity);
         if (!r) {
-            dpCache.set(entity, (r = new RepositoryImplementation(entity, this, dataProvider, createOldEntity(entity, this))));
+            dpCache.set(entity, (r = new RepositoryImplementation(entity, this, dataProvider, info)));
             verifyFieldRelationInfo(r, this, dataProvider);
         }
         return r;

package/package.json

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

package/remult-express.d.ts

@@ -1,9 +1,10 @@
 import * as express from 'express';
 import type { RemultServer, RemultServerCore, RemultServerOptions } from './server/remult-api-server.js';
-export declare function remultExpress(options?: RemultServerOptions<express.Request> & {
+export declare function remultApi(options?: RemultServerOptions<express.Request> & {
     bodyParser?: boolean;
     bodySizeLimit?: string;
-}): RemultExpressServer;
-export type RemultExpressServer = express.RequestHandler & RemultServerCore<express.Request> & {
+}): remultApiServer;
+export type remultApiServer = express.RequestHandler & RemultServerCore<express.Request> & {
     withRemult: (req: express.Request, res: express.Response, next: VoidFunction) => void;
 } & Pick<RemultServer<express.Request>, 'withRemultAsync'>;
+export declare const remultExpress: typeof remultApi;

package/remult-express.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.remultExpress = remultExpress;
+exports.remultExpress = void 0;
+exports.remultApi = remultApi;
 var tslib_1 = require("tslib");
 var express = tslib_1.__importStar(require("express"));
 var index_js_1 = require("./server/index.js");
-function remultExpress(options) {
+function remultApi(options) {
     var _this = this;
     var app = express.Router();
     if (!options) {
@@ -33,3 +34,5 @@ function remultExpress(options) {
         },
     });
 }
+// @deprecated use remultApi instead
+exports.remultExpress = remultApi;

package/remult-fastify.d.ts

@@ -1,6 +1,7 @@
 import type { FastifyPluginCallback, FastifyRequest } from 'fastify';
 import type { RemultServerCore, RemultServerOptions, RemultServer } from './server/remult-api-server.js';
-export declare function remultFastify(options: RemultServerOptions<FastifyRequest>): RemultFastifyServer;
+export declare function remultApi(options: RemultServerOptions<FastifyRequest>): RemultFastifyServer;
 export type RemultFastifyServer = FastifyPluginCallback & RemultServerCore<FastifyRequest> & {
     withRemult: RemultServer<FastifyRequest>['withRemultAsync'];
 };
+export declare const remultFastify: typeof remultApi;

package/remult-fastify.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.remultFastify = remultFastify;
+exports.remultFastify = void 0;
+exports.remultApi = remultApi;
 var tslib_1 = require("tslib");
 var index_js_1 = require("./server/index.js");
-function remultFastify(options) {
+function remultApi(options) {
     var _this = this;
     function fastifyHandler(handler) {
         var response = function (req, res) {
@@ -81,3 +82,5 @@ function remultFastify(options) {
         },
     });
 }
+// @deprecated use remultApi instead
+exports.remultFastify = remultApi;

package/remult-hapi.d.ts

@@ -1,6 +1,7 @@
 import type { Request, Plugin } from '@hapi/hapi';
 import { type RemultServerCore, type RemultServerOptions, type RemultServer } from './server/index.js';
-export declare function remultHapi(options: RemultServerOptions<Request>): RemultHapiServer;
+export declare function remultApi(options: RemultServerOptions<Request>): RemultHapiServer;
 export type RemultHapiServer = Plugin<any, any> & RemultServerCore<Request> & {
     withRemult: RemultServer<Request>['withRemultAsync'];
 };
+export declare const remultHapi: typeof remultApi;

package/remult-hapi.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.remultHapi = remultHapi;
+exports.remultHapi = void 0;
+exports.remultApi = remultApi;
 var tslib_1 = require("tslib");
 var index_js_1 = require("./server/index.js");
 var stream_1 = require("stream");
-function remultHapi(options) {
+function remultApi(options) {
     var _this = this;
     var api = (0, index_js_1.createRemultServer)(options, {
         buildGenericRequestInfo: function (req) { return ({
@@ -125,3 +126,5 @@ function remultHapi(options) {
         },
     });
 }
+// @deprecated use remultApi instead
+exports.remultHapi = remultApi;

package/remult-hono.d.ts

@@ -1,7 +1,8 @@
 import { type Context, type Env, Hono } from 'hono';
 import type { BlankInput } from 'hono/types';
 import { type RemultServerOptions, type RemultServerCore } from './server/index.js';
-export declare function remultHono(options: RemultServerOptions<Context<Env, '', BlankInput>>): RemultHonoServer;
+export declare function remultApi(options: RemultServerOptions<Context<Env, '', BlankInput>>): RemultHonoServer;
 export type RemultHonoServer = Hono & RemultServerCore<Context<Env, '', BlankInput>> & {
     withRemult: <T>(c: Context<Env, '', BlankInput>, what: () => Promise<T>) => Promise<T>;
 };
+export declare const remultHono: typeof remultApi;

package/remult-hono.js

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.remultHono = remultHono;
+exports.remultHono = void 0;
+exports.remultApi = remultApi;
 var tslib_1 = require("tslib");
 var hono_1 = require("hono");
 var streaming_1 = require("hono/streaming");
 var index_js_1 = require("./server/index.js");
-function remultHono(options) {
+function remultApi(options) {
     var _this = this;
     var app = new hono_1.Hono();
     var api = (0, index_js_1.createRemultServer)(options, {
@@ -113,3 +114,5 @@ function remultHono(options) {
         }); }); },
     });
 }
+// @deprecated use remultApi instead
+exports.remultHono = remultApi;

package/remult-knex/index.js

@@ -217,6 +217,11 @@ var KnexEntityDataProvider = /** @class */ (function () {
             });
         });
     };
+    KnexEntityDataProvider.prototype.getEntityFrom = function (e) {
+        if (this.entity.options.sqlExpression)
+            return this.knex.fromRaw(e.$entityName);
+        return this.knex(e.$entityName);
+    };
     KnexEntityDataProvider.prototype.count = function (where) {
         return tslib_1.__awaiter(this, void 0, void 0, function () {
             var e, br, r, result, row, key, element;
@@ -230,7 +235,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [4 /*yield*/, br.resolveWhere()];
                     case 2:
                         r = _a.sent();
-                        return [4 /*yield*/, this.knex(e.$entityName)
+                        return [4 /*yield*/, this.getEntityFrom(e)
                                 .count()
                                 .where(function (b) { return r.forEach(function (w) { return w(b); }); })];
                     case 3:
@@ -279,7 +284,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                             }
                             finally { if (e_3) throw e_3.error; }
                         }
-                        query = this.knex(e.$entityName).select(cols);
+                        query = this.getEntityFrom(e).select(cols);
                         if (!(options === null || options === void 0 ? void 0 : options.where)) return [3 /*break*/, 3];
                         br = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
                         options.where.__applyToConsumer(br);
@@ -395,7 +400,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                     case 10: return [4 /*yield*/, f.resolveWhere()];
                     case 11:
                         where = _d.sent();
-                        return [4 /*yield*/, this.knex(e.$entityName)
+                        return [4 /*yield*/, this.getEntityFrom(e)
                                 .update(updateObject)
                                 .where(function (b) { return where.forEach(function (w) { return w(b); }); })];
                     case 12:
@@ -418,7 +423,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         return [4 /*yield*/, f.resolveWhere()];
                     case 2:
                         where = _a.sent();
-                        return [4 /*yield*/, this.knex(e.$entityName)
+                        return [4 /*yield*/, this.getEntityFrom(e)
                                 .delete()
                                 .where(function (b) { return where.forEach(function (w) { return w(b); }); })];
                     case 3:
@@ -472,7 +477,7 @@ var KnexEntityDataProvider = /** @class */ (function () {
                         finally { if (e_5) throw e_5.error; }
                         return [7 /*endfinally*/];
                     case 10:
-                        insert = this.knex(e.$entityName).insert(insertObject);
+                        insert = this.getEntityFrom(e).insert(insertObject);
                         if (!(0, RepositoryImplementation_js_1.isAutoIncrement)(this.entity.idMetadata.field)) return [3 /*break*/, 15];
                         if (!(this.knex.client.config.client === 'mysql2' ||
                             this.knex.client.config.client === 'mysql')) return [3 /*break*/, 12];

package/remult-next.d.ts

@@ -15,7 +15,7 @@ export type RemultNextServer = RemultServerCore<NextApiRequest> & NextApiHandler
      */
     handle<T>(handler: NextApiHandler<T>): NextApiHandler<T>;
 };
-export declare function remultNextApp(options?: RemultServerOptions<Request>): RemultNextAppServer;
+export declare function remultApi(options?: RemultServerOptions<Request>): RemultNextAppServer;
 export type RemultNextAppServer = RemultServerCore<Request> & {
     GET: (req: Request) => Promise<Response | undefined>;
     PUT: (req: Request) => Promise<Response | undefined>;
@@ -23,3 +23,4 @@ export type RemultNextAppServer = RemultServerCore<Request> & {
     DELETE: (req: Request) => Promise<Response | undefined>;
     withRemult<T>(what: () => Promise<T>): Promise<T>;
 };
+export declare const remultNextApp: typeof remultApi;

package/remult-next.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.remultNextApp = void 0;
 exports.remultNext = remultNext;
-exports.remultNextApp = remultNextApp;
+exports.remultApi = remultApi;
 var tslib_1 = require("tslib");
 var index_js_1 = require("./server/index.js");
 function remultNext(options) {
@@ -78,7 +79,7 @@ function remultNext(options) {
     });
 }
 var encoder = new TextEncoder();
-function remultNextApp(options) {
+function remultApi(options) {
     var _this = this;
     var result = (0, index_js_1.createRemultServer)(options, {
         getRequestBody: function (req) { return req.json(); },
@@ -183,3 +184,4 @@ function remultNextApp(options) {
         },
     };
 }
+exports.remultNextApp = remultApi;

package/remult-nuxt.d.ts

@@ -1,6 +1,7 @@
 import type { H3Event } from 'h3';
 import type { RemultServerCore, RemultServerOptions, RemultServer } from './server/index.js';
-export declare function remultNuxt(options: RemultServerOptions<H3Event>): RemultNuxtServer;
+export declare function remultApi(options: RemultServerOptions<H3Event>): RemultNuxtServer;
 export type RemultNuxtServer = RemultServerCore<H3Event> & ((event: H3Event) => Promise<any>) & {
     withRemult: RemultServer<H3Event>['withRemultAsync'];
 };
+export declare const remultNuxt: typeof remultApi;

package/remult-nuxt.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.remultNuxt = remultNuxt;
+exports.remultNuxt = void 0;
+exports.remultApi = remultApi;
 var tslib_1 = require("tslib");
 var h3_1 = require("h3");
 var index_js_1 = require("./server/index.js");
-function remultNuxt(options) {
+function remultApi(options) {
     var _this = this;
     var result = (0, index_js_1.createRemultServer)(options, {
         buildGenericRequestInfo: function (event) {
@@ -76,3 +77,4 @@ function remultNuxt(options) {
         },
     });
 }
+exports.remultNuxt = remultApi;

package/remult-solid-start.d.ts

@@ -1,6 +1,6 @@
 import { type RequestEvent } from 'solid-js/web';
 import type { RemultServerCore, RemultServerOptions } from './server/index.js';
-export declare function remultSolidStart(options: RemultServerOptions<RequestEvent>): RemultSolidStartServer;
+export declare function remultApi(options: RemultServerOptions<RequestEvent>): RemultSolidStartServer;
 type RequestHandler = (event: RequestEvent) => Promise<Response>;
 export type RemultSolidStartServer = RemultServerCore<RequestEvent> & {
     withRemult<T>(what: () => Promise<T>): Promise<T>;
@@ -9,4 +9,5 @@ export type RemultSolidStartServer = RemultServerCore<RequestEvent> & {
     POST: RequestHandler;
     DELETE: RequestHandler;
 };
+export declare const remultSolidStart: typeof remultApi;
 export {};

package/remult-solid-start.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.remultSolidStart = remultSolidStart;
+exports.remultSolidStart = void 0;
+exports.remultApi = remultApi;
 var tslib_1 = require("tslib");
 var web_1 = require("solid-js/web");
 var index_js_1 = require("./server/index.js");
-function remultSolidStart(options) {
+function remultApi(options) {
     var _this = this;
     var result = (0, index_js_1.createRemultServer)(options, {
         buildGenericRequestInfo: function (event) { return ({
@@ -131,3 +132,4 @@ function remultSolidStart(options) {
         DELETE: serverHandler,
     });
 }
+exports.remultSolidStart = remultApi;

package/remult-sveltekit.d.ts

@@ -1,6 +1,6 @@
 import type { Handle, RequestEvent, RequestHandler } from '@sveltejs/kit';
 import type { RemultServerCore, RemultServerOptions, RemultServer } from './server/index.js';
-export declare function remultSveltekit(options: RemultServerOptions<RequestEvent>): RemultSveltekitServer;
+export declare function remultApi(options: RemultServerOptions<RequestEvent>): RemultSveltekitServer;
 export type RemultSveltekitServer = RemultServerCore<RequestEvent> & Handle & {
     withRemult: RemultServer<RequestEvent>['withRemultAsync'];
     GET: RequestHandler;
@@ -8,3 +8,4 @@ export type RemultSveltekitServer = RemultServerCore<RequestEvent> & Handle & {
     POST: RequestHandler;
     DELETE: RequestHandler;
 };
+export declare const remultSveltekit: typeof remultApi;

package/remult-sveltekit.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.remultSveltekit = remultSveltekit;
+exports.remultSveltekit = void 0;
+exports.remultApi = remultApi;
 var tslib_1 = require("tslib");
 var index_js_1 = require("./server/index.js");
-function remultSveltekit(options) {
+function remultApi(options) {
     var _this = this;
     var result = (0, index_js_1.createRemultServer)(options, {
         buildGenericRequestInfo: function (event) { return ({
@@ -119,3 +120,4 @@ function remultSveltekit(options) {
         DELETE: serverHandler,
     });
 }
+exports.remultSveltekit = remultApi;