remult 2.7.33 → 3.0.0-next.1

package/README.md

@@ -97,14 +97,14 @@ _Example:_
 // backend/index.ts
 
 import express from 'express'
-import { remultExpress } from 'remult/remult-express' // adapters for: Fastify,Next.js, Nuxt, SvelteKit, SolidStart, Nest, more...
+import { remultApi } from 'remult/remult-express' // adapters for: Fastify,Next.js, Nuxt, SvelteKit, SolidStart, Nest, more...
 import { createPostgresDataProvider } from 'remult/postgres' // supported: PostgreSQL, MySQL, SQLite, MongoDB, MSSQL and Oracle
 import { Product } from '../shared/product'
 
 const app = express()
 
 app.use(
-  remultExpress({
+  remultApi({
     entities: [Product],
     dataProvider: createPostgresDataProvider({
       connectionString: 'postgres://user:password@host:5432/database"',

package/esm/remult-express.js

@@ -1,6 +1,6 @@
 import * as express from 'express';
 import { createRemultServer } from './server/index.js';
-export function remultExpress(options) {
+export function remultApi(options) {
     let app = express.Router();
     if (!options) {
         options = {};
@@ -24,3 +24,5 @@ export function remultExpress(options) {
         withRemultAsync: (req, what) => server.withRemultAsync(req, what),
     });
 }
+// @deprecated use remultApi instead
+export const remultExpress = remultApi;

package/esm/remult-fastify.js

@@ -1,5 +1,5 @@
 import { createRemultServer } from './server/index.js';
-export function remultFastify(options) {
+export function remultApi(options) {
     function fastifyHandler(handler) {
         const response = (req, res) => {
             const myRes = {
@@ -69,3 +69,5 @@ export function remultFastify(options) {
         withRemult: (req, what) => api.withRemultAsync(req, what),
     });
 }
+// @deprecated use remultApi instead
+export const remultFastify = remultApi;

package/esm/remult-hapi.js

@@ -1,6 +1,6 @@
 import { createRemultServer, } from './server/index.js';
 import { PassThrough } from 'stream';
-export function remultHapi(options) {
+export function remultApi(options) {
     const api = createRemultServer(options, {
         buildGenericRequestInfo: (req) => ({
             method: req.method,
@@ -112,3 +112,5 @@ export function remultHapi(options) {
         withRemult: (req, what) => api.withRemultAsync(req, what),
     });
 }
+// @deprecated use remultApi instead
+export const remultHapi = remultApi;

package/esm/remult-hono.js

@@ -1,7 +1,7 @@
 import { Hono } from 'hono';
 import { streamSSE } from 'hono/streaming';
 import { createRemultServer, } from './server/index.js';
-export function remultHono(options) {
+export function remultApi(options) {
     let app = new Hono();
     const api = createRemultServer(options, {
         buildGenericRequestInfo: (c) => {
@@ -102,3 +102,5 @@ export function remultHono(options) {
         withRemult: async (c, what) => api.withRemultAsync(c, what),
     });
 }
+// @deprecated use remultApi instead
+export const remultHono = remultApi;

package/esm/remult-knex/index.js

@@ -119,12 +119,17 @@ class KnexEntityDataProvider {
     async groupBy(options) {
         return groupByImpl(options, await dbNamesOf(this.entity, this.dp.wrapIdentifier), this.dp.createCommand(), false, (limit, offset) => ' limit ' + limit + ' offset ' + offset);
     }
+    getEntityFrom(e) {
+        if (this.entity.options.sqlExpression)
+            return this.knex.fromRaw(e.$entityName);
+        return this.knex(e.$entityName);
+    }
     async count(where) {
         const e = await this.init();
         const br = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
         where.__applyToConsumer(br);
         let r = await br.resolveWhere();
-        const result = await this.knex(e.$entityName)
+        const result = await this.getEntityFrom(e)
             .count()
             .where((b) => r.forEach((w) => w(b)));
         var row = result[0];
@@ -151,7 +156,7 @@ class KnexEntityDataProvider {
                 colKeys.push(x);
             }
         }
-        let query = this.knex(e.$entityName).select(cols);
+        let query = this.getEntityFrom(e).select(cols);
         if (options?.where) {
             const br = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
             options.where.__applyToConsumer(br);
@@ -218,7 +223,7 @@ class KnexEntityDataProvider {
             }
         }
         let where = await f.resolveWhere();
-        await this.knex(e.$entityName)
+        await this.getEntityFrom(e)
             .update(updateObject)
             .where((b) => where.forEach((w) => w(b)));
         return getRowAfterUpdate(this.entity, this, data, id, 'update');
@@ -228,7 +233,7 @@ class KnexEntityDataProvider {
         let f = new FilterConsumerBridgeToKnexRequest(e, this.rawSqlWrapIdentifier);
         Filter.fromEntityFilter(this.entity, this.entity.idMetadata.getIdFilter(id)).__applyToConsumer(f);
         let where = await f.resolveWhere();
-        await this.knex(e.$entityName)
+        await this.getEntityFrom(e)
             .delete()
             .where((b) => where.forEach((w) => w(b)));
     }
@@ -246,7 +251,7 @@ class KnexEntityDataProvider {
                 }
             }
         }
-        let insert = this.knex(e.$entityName).insert(insertObject);
+        let insert = this.getEntityFrom(e).insert(insertObject);
         if (isAutoIncrement(this.entity.idMetadata.field)) {
             let newId;
             if (this.knex.client.config.client === 'mysql2' ||

package/esm/remult-next.js

@@ -37,7 +37,7 @@ export function remultNext(options) {
     });
 }
 const encoder = new TextEncoder();
-export function remultNextApp(options) {
+export function remultApi(options) {
     let result = createRemultServer(options, {
         getRequestBody: (req) => req.json(),
         buildGenericRequestInfo: (req) => ({
@@ -121,3 +121,4 @@ export function remultNextApp(options) {
         withRemult: (what) => result.withRemultAsync({}, what),
     };
 }
+export const remultNextApp = remultApi;

package/esm/remult-nuxt.js

@@ -1,6 +1,6 @@
 import { readBody, setResponseStatus } from 'h3';
 import { createRemultServer } from './server/index.js';
-export function remultNuxt(options) {
+export function remultApi(options) {
     const result = createRemultServer(options, {
         buildGenericRequestInfo: (event) => {
             return {
@@ -52,3 +52,4 @@ export function remultNuxt(options) {
         },
     });
 }
+export const remultNuxt = remultApi;

package/esm/remult-solid-start.js

@@ -1,6 +1,6 @@
 import { getRequestEvent } from 'solid-js/web';
 import { createRemultServer } from './server/index.js';
-export function remultSolidStart(options) {
+export function remultApi(options) {
     let result = createRemultServer(options, {
         buildGenericRequestInfo: (event) => ({
             url: event.request.url,
@@ -95,3 +95,4 @@ export function remultSolidStart(options) {
         DELETE: serverHandler,
     });
 }
+export const remultSolidStart = remultApi;

package/esm/remult-sveltekit.js

@@ -1,5 +1,5 @@
 import { createRemultServer } from './server/index.js';
-export function remultSveltekit(options) {
+export function remultApi(options) {
     let result = createRemultServer(options, {
         buildGenericRequestInfo: (event) => ({
             url: event.request.url,
@@ -86,3 +86,4 @@ export function remultSveltekit(options) {
         DELETE: serverHandler,
     });
 }
+export const remultSveltekit = remultApi;