remult 3.0.6-next.0 → 3.0.6

package/esm/src/remult3/RepositoryImplementation.js

@@ -1191,7 +1191,7 @@ class rowHelperBase {
             for (const col of this.fieldsMetadata) {
                 if (this.errors?.[col.key]) {
                     error.message =
-                        this.fields[col.key].metadata.caption +
+                        this.fields[col.key].metadata.label +
                             ': ' +
                             this.errors[col.key];
                     this.error = error.message;
@@ -1950,23 +1950,26 @@ export class FieldRefImplementation {
         return !!!this.error;
     }
 }
-let tempCaptionTransformer = {
-    transformCaption: (remult, key, caption, entityMetaData) => caption,
+let tempLabelTransformer = {
+    transformLabel: (remult, key, label, entityMetaData) => label,
+    set transformCaption(val) {
+        this.transformLabel = val;
+    },
 };
 export const fieldOptionsEnricher = remultStatic.fieldOptionsEnricher || {
     enrichFieldOptions: (options) => options,
 };
-export const CaptionTransformer = remultStatic.captionTransformer ||
-    (remultStatic.captionTransformer = tempCaptionTransformer);
-export function buildCaption(caption, key, remult, metaData) {
+export const LabelTransformer = remultStatic.labelTransformer ||
+    (remultStatic.labelTransformer = tempLabelTransformer);
+export function buildLabel(label, key, remult, metaData) {
     let result = undefined;
-    if (typeof caption === 'function') {
+    if (typeof label === 'function') {
         if (remult)
-            result = caption(remult);
+            result = label(remult);
     }
-    else if (caption)
-        result = caption;
-    result = CaptionTransformer.transformCaption(remult, key, result ?? '', metaData);
+    else if (label)
+        result = label;
+    result = LabelTransformer.transformLabel(remult, key, result ?? '', metaData);
     if (result)
         return result;
     if (key)
@@ -1994,7 +1997,7 @@ export class columnDefsImpl {
                         catch (err) {
                             const error = `${String(prop)} failed for value ${args?.[0]}. Error: ${typeof err === 'string' ? err : err.message}`;
                             throw new EntityError({
-                                message: this.caption + ': ' + error,
+                                message: this.label + ': ' + error,
                                 modelState: {
                                     [this.key]: error,
                                 },
@@ -2018,7 +2021,7 @@ export class columnDefsImpl {
         this.dbName = settings.dbName;
         if (this.dbName == undefined)
             this.dbName = settings.key;
-        this.caption = buildCaption(settings.caption, settings.key, remult, entityDefs);
+        this.label = buildLabel(settings.label ?? settings.caption, settings.key, remult, entityDefs);
     }
     apiUpdateAllowed(item) {
         if (this.options.allowApiUpdate === undefined)
@@ -2049,7 +2052,10 @@ export class columnDefsImpl {
     readonly = false;
     valueConverter;
     allowNull;
-    caption;
+    label;
+    get caption() {
+        return this.label;
+    }
     dbName;
     inputType;
     key;
@@ -2103,7 +2109,7 @@ class EntityFullInfo {
             this.fieldsMetadata.push((r[x.key] = new columnDefsImpl(x, this, remult)));
         }
         this.fields = r;
-        this.caption = buildCaption(entityInfo.caption, this.key, remult, this);
+        this.label = buildLabel(entityInfo.label ?? entityInfo.caption, this.key, remult, this);
         if (entityInfo.id) {
             let r = typeof entityInfo.id === 'string'
                 ? this.fields.find(entityInfo.id)
@@ -2218,7 +2224,10 @@ class EntityFullInfo {
     };
     fields;
     dbName;
-    caption;
+    label;
+    get caption() {
+        return this.label;
+    }
 }
 export function FieldType(...options) {
     return (target, context) => {
@@ -2238,7 +2247,7 @@ export function ValueListFieldType(...options) {
         FieldType((o) => {
             ;
             (o.valueConverter = ValueListInfo.get(type)),
-                (o.displayValue = (item, val) => val?.caption);
+                (o.displayValue = (item, val) => val?.label ?? val?.caption);
             o.validate = (entity, ref) => {
                 const values = ValueListInfo.get(type).getValues();
                 if (ref.value && !values.find((v) => v === ref.value)) {
@@ -2271,8 +2280,7 @@ export class ValueListInfo {
                     s.id = member;
                 if (typeof s.id === 'number')
                     this.isNumeric = true;
-                if (s.caption === undefined)
-                    s.caption = makeTitle(s.id !== undefined ? s.id.toString() : member);
+                setLabelAndCaption(s, member);
                 this.byIdMap.set(s.id, s);
                 this.values.push(s);
             }
@@ -2287,8 +2295,7 @@ export class ValueListInfo {
                     this.values.splice(0, this.values.length, ...op.getValues());
                     this.byIdMap.clear();
                     this.values.forEach((s) => {
-                        if (s.caption === undefined && s.id !== undefined)
-                            s.caption = makeTitle(s.id);
+                        setLabelAndCaption(s, '');
                         this.byIdMap.set(s.id, s);
                     });
                 }
@@ -2337,6 +2344,15 @@ export class ValueListInfo {
     inputType;
 }
 const typeCache = new Map();
+function setLabelAndCaption(s, member) {
+    let label = s.label ?? s.caption;
+    if (label === undefined)
+        label = makeTitle(s.id !== undefined ? s.id.toString() : member);
+    if (s.label === undefined)
+        s.label = label;
+    if (s.caption === undefined)
+        s.caption = label;
+}
 export function getValueList(type) {
     let meta = type?.metadata;
     if (!meta && isOfType(type, 'options'))

package/graphql.js

@@ -586,7 +586,7 @@ function remultGraphql(options) {
                             currentType.fields.push({
                                 key: f.key,
                                 value: "".concat(getMetaType(ref)).concat(f.allowNull ? '' : '!'),
-                                comment: f.caption,
+                                comment: f.label,
                             });
                             currentType.query.resultProcessors.push(function (r, orig) {
                                 r[f.key] = function (args, req, gqlInfo) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
@@ -661,7 +661,7 @@ function remultGraphql(options) {
                     currentType.fields.push({
                         key: f.key,
                         value: "".concat(getMetaType(ref)).concat(f.allowNull ? '' : '!'),
-                        comment: f.caption,
+                        comment: f.label,
                     });
                     var refKey_1 = ref.key;
                     currentType.query.resultProcessors.push(function (r) {
@@ -713,7 +713,7 @@ function remultGraphql(options) {
                     currentType.fields.push({
                         key: f.key,
                         value: "".concat(type).concat(f.allowNull ? '' : '!'),
-                        comment: f.caption,
+                        comment: f.label,
                     });
                 }
                 // sorting

package/index.d.ts

@@ -4,7 +4,15 @@ export { ArrayEntityDataProvider } from './src/data-providers/array-entity-data-
 export type { ClassType } from './classType.js';
 export { ValidateFieldEvent, MembersOnly, NumericKeys, FieldsMetadata, FieldRef, IdFieldRef, FieldsRef, EntityMetadata, EntityOrderBy, EntityFilter, FindOptions, FindOptionsBase, QueryResult, QueryOptions, UpsertOptions, Repository, GroupByOptions, GroupByResult, FindFirstOptions, ComparisonValueFilter, ValueFilter, IdFilter, ContainsStringValueFilter, EntityRef, SortSegments, Paginator, LiveQuery, LiveQueryChangeInfo, Subscribable, RefSubscriber, RefSubscriberBase, RelationOptions, ObjectMembersOnly, MembersToInclude, RepositoryRelations, EntityIdFields, ClassFieldDecorator, ClassFieldDecoratorContextStub, //n1 consider removing in ts5
 LifecycleEvent, FieldsRefBase, FieldsRefForEntityBase, RepositoryRelationsForEntityBase, ControllerRefForControllerBase, ControllerRefBase, ControllerRef, EntityRefForEntityBase, IdMetadata, FindFirstOptionsBase, } from './src/remult3/remult3.js';
-export { EntityBase, ControllerBase, FieldType, getFields, ValueListFieldType, getValueList, ValueListFieldOptions, ValueListInfo, CaptionTransformer, } from './src/remult3/RepositoryImplementation.js';
+export { EntityBase, ControllerBase, FieldType, getFields, ValueListFieldType, getValueList, ValueListFieldOptions, ValueListInfo, } from './src/remult3/RepositoryImplementation.js';
+export { LabelTransformer } from './src/remult3/RepositoryImplementation.js';
+/**
+ * @deprecated use `LabelTransformer` instead
+ */
+export declare const CaptionTransformer: {
+    transformLabel: (remult: import("./src/context.js").Remult, key: string, label: string, entityMetaData: import("./src/remult3/remult3.js").EntityMetadata<any>) => string;
+    transformCaption: (remult: import("./src/context.js").Remult, key: string, label: string, entityMetaData: import("./src/remult3/remult3.js").EntityMetadata<any>) => string;
+};
 export { Entity } from './src/remult3/entity.js';
 export { getEntityRef } from './src/remult3/getEntityRef.js';
 export { Field, Fields, StringFieldOptions, Relations, } from './src/remult3/Fields.js';

package/index.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SubscriptionChannel = exports.InMemoryLiveQueryStorage = exports.remult = exports.ValueConverters = exports.createValueValidator = exports.createValueValidatorWithArgs = exports.createValidatorWithArgs = exports.createValidator = exports.valueValidator = exports.Validators = exports.UrlBuilder = exports.Filter = exports.CompoundIdField = exports.Sort = exports.EventSource = exports.isBackend = exports.withRemult = exports.Remult = exports.Allow = exports.ForbiddenError = exports.ProgressListener = exports.BackendMethod = exports.Controller = exports.JsonEntityIndexedDbStorage = exports.JsonEntityOpfsStorage = exports.JsonDataProvider = exports.dbNamesOf = exports.CustomSqlFilterBuilder = exports.SqlDatabase = exports.InMemoryDataProvider = exports.RestDataProvider = exports.EntityError = exports.describeEntity = exports.describeBackendMethods = exports.describeClass = exports.IdEntity = exports.Relations = exports.Fields = exports.Field = exports.getEntityRef = exports.Entity = exports.CaptionTransformer = exports.ValueListInfo = exports.getValueList = exports.ValueListFieldType = exports.getFields = exports.FieldType = exports.ControllerBase = exports.EntityBase = exports.ArrayEntityDataProvider = void 0;
+exports.InMemoryLiveQueryStorage = exports.remult = exports.ValueConverters = exports.createValueValidator = exports.createValueValidatorWithArgs = exports.createValidatorWithArgs = exports.createValidator = exports.valueValidator = exports.Validators = exports.UrlBuilder = exports.Filter = exports.CompoundIdField = exports.Sort = exports.EventSource = exports.isBackend = exports.withRemult = exports.Remult = exports.Allow = exports.ForbiddenError = exports.ProgressListener = exports.BackendMethod = exports.Controller = exports.JsonEntityIndexedDbStorage = exports.JsonEntityOpfsStorage = exports.JsonDataProvider = exports.dbNamesOf = exports.CustomSqlFilterBuilder = exports.SqlDatabase = exports.InMemoryDataProvider = exports.RestDataProvider = exports.EntityError = exports.describeEntity = exports.describeBackendMethods = exports.describeClass = exports.IdEntity = exports.Relations = exports.Fields = exports.Field = exports.getEntityRef = exports.Entity = exports.CaptionTransformer = exports.LabelTransformer = exports.ValueListInfo = exports.getValueList = exports.ValueListFieldType = exports.getFields = exports.FieldType = exports.ControllerBase = exports.EntityBase = exports.ArrayEntityDataProvider = void 0;
+exports.SubscriptionChannel = void 0;
 exports.repo = repo;
 var array_entity_data_provider_js_1 = require("./src/data-providers/array-entity-data-provider.js");
 Object.defineProperty(exports, "ArrayEntityDataProvider", { enumerable: true, get: function () { return array_entity_data_provider_js_1.ArrayEntityDataProvider; } });
@@ -12,7 +13,13 @@ Object.defineProperty(exports, "getFields", { enumerable: true, get: function ()
 Object.defineProperty(exports, "ValueListFieldType", { enumerable: true, get: function () { return RepositoryImplementation_js_1.ValueListFieldType; } });
 Object.defineProperty(exports, "getValueList", { enumerable: true, get: function () { return RepositoryImplementation_js_1.getValueList; } });
 Object.defineProperty(exports, "ValueListInfo", { enumerable: true, get: function () { return RepositoryImplementation_js_1.ValueListInfo; } });
-Object.defineProperty(exports, "CaptionTransformer", { enumerable: true, get: function () { return RepositoryImplementation_js_1.CaptionTransformer; } });
+var RepositoryImplementation_js_2 = require("./src/remult3/RepositoryImplementation.js");
+var RepositoryImplementation_js_3 = require("./src/remult3/RepositoryImplementation.js");
+Object.defineProperty(exports, "LabelTransformer", { enumerable: true, get: function () { return RepositoryImplementation_js_3.LabelTransformer; } });
+/**
+ * @deprecated use `LabelTransformer` instead
+ */
+exports.CaptionTransformer = RepositoryImplementation_js_2.LabelTransformer;
 var entity_js_1 = require("./src/remult3/entity.js");
 Object.defineProperty(exports, "Entity", { enumerable: true, get: function () { return entity_js_1.Entity; } });
 var getEntityRef_js_1 = require("./src/remult3/getEntityRef.js");

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "remult",
-    "version": "3.0.6-next.0",
+    "version": "3.0.6",
     "description": "A CRUD framework for full-stack TypeScript",
     "homepage": "https://remult.dev",
     "repository": {
@@ -131,6 +131,16 @@
             "import": "./esm/remult-duckdb.js",
             "types": "./remult-duckdb.d.ts"
         },
+        "./remult-d1": {
+            "require": "./remult-d1.js",
+            "import": "./esm/remult-d1.js",
+            "types": "./remult-d1.d.ts"
+        },
+        "./remult-d1-http": {
+            "require": "./remult-d1-http.js",
+            "import": "./esm/remult-d1-http.js",
+            "types": "./remult-d1-http.d.ts"
+        },
         "./remult-bun-sqlite": {
             "require": "./remult-bun-sqlite.js",
             "import": "./esm/remult-bun-sqlite.js",

package/remult-d1-http.d.ts

@@ -0,0 +1,16 @@
+import { SqlDatabase } from './index.js';
+import { type D1Client, D1DataProvider, type D1RowObject } from './remult-d1.js';
+export { D1DataProvider };
+type D1Credentials = {
+    accountId: string;
+    apiToken: string;
+    databaseId: string;
+};
+export declare function createD1HttpDataProvider(creds: D1Credentials): SqlDatabase;
+export declare class D1HttpClient implements D1Client {
+    private d1;
+    private accountId;
+    private databaseId;
+    constructor({ accountId, databaseId, apiToken }: D1Credentials);
+    execute(sql: string, params?: unknown[]): Promise<D1RowObject[]>;
+}

package/remult-d1-http.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.D1HttpClient = exports.D1DataProvider = void 0;
+exports.createD1HttpDataProvider = createD1HttpDataProvider;
+var tslib_1 = require("tslib");
+var cloudflare_1 = tslib_1.__importDefault(require("cloudflare"));
+var index_js_1 = require("./index.js");
+var remult_d1_js_1 = require("./remult-d1.js");
+Object.defineProperty(exports, "D1DataProvider", { enumerable: true, get: function () { return remult_d1_js_1.D1DataProvider; } });
+function createD1HttpDataProvider(creds) {
+    return new index_js_1.SqlDatabase(new remult_d1_js_1.D1DataProvider(new D1HttpClient(creds)));
+}
+var D1HttpClient = /** @class */ (function () {
+    function D1HttpClient(_a) {
+        var accountId = _a.accountId, databaseId = _a.databaseId, apiToken = _a.apiToken;
+        this.d1 = new cloudflare_1.default({ apiToken: apiToken }).d1.database;
+        this.accountId = accountId;
+        this.databaseId = databaseId;
+    }
+    D1HttpClient.prototype.execute = function (sql_1) {
+        return tslib_1.__awaiter(this, arguments, void 0, function (sql, params) {
+            if (params === void 0) { params = []; }
+            return tslib_1.__generator(this, function (_a) {
+                return [2 /*return*/, this.d1
+                        .query(this.databaseId, {
+                        sql: sql,
+                        params: params,
+                        account_id: this.accountId,
+                    })
+                        .then(function (_a) {
+                        var pages = _a.result;
+                        return pages.flatMap(function (page) { return page.results; });
+                    })
+                    // NOTE: d1 query endpoint returns the result as array of object with keys as column names.
+                    // We're returning that now because the rest of remult seems to expect that.
+                    // D1 also has a more efficient raw() endpoint that returns {columns: string[], rows: any[][]} that we may want
+                    // to use eventually, and write code like fromRowToSql()
+                    // at https://github.com/tursodatabase/libsql-client-ts/blob/main/packages/libsql-client/src/sqlite3.ts#L398
+                    // to adapt the data
+                ];
+            });
+        });
+    };
+    return D1HttpClient;
+}());
+exports.D1HttpClient = D1HttpClient;

package/remult-d1.d.ts

@@ -0,0 +1,27 @@
+import { SqlDatabase, type SqlImplementation } from './index.js';
+import { SqliteCoreDataProvider } from './remult-sqlite-core.js';
+export declare function createD1DataProvider(d1: D1Database): SqlDatabase;
+export declare class D1DataProvider extends SqliteCoreDataProvider {
+    private d1;
+    /**
+     * For production or local d1 using binding
+     *
+     * const dataProvider = new SqlDatabase(new D1DataProvider(new D1BindingClient(d1)))
+     */
+    constructor(d1: D1Client);
+    transaction(action: (sql: SqlImplementation) => Promise<void>): Promise<void>;
+}
+export type D1RowObject = Record<string, unknown>;
+export interface D1Client {
+    execute(sql: string, params?: unknown[]): Promise<D1RowObject[]>;
+}
+export declare class D1BindingClient implements D1Client {
+    private d1;
+    /**
+     * Simple d1 client that wraps the d1 binding directly
+     *
+     * const d1 = new D1BindingClient(env.DB)
+     */
+    constructor(d1: D1Database);
+    execute(sql: string, params?: unknown[]): Promise<D1RowObject[]>;
+}

package/remult-d1.js

@@ -0,0 +1,128 @@
+"use strict";
+/// <reference types="@cloudflare/workers-types" />
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.D1BindingClient = exports.D1DataProvider = void 0;
+exports.createD1DataProvider = createD1DataProvider;
+var tslib_1 = require("tslib");
+var index_js_1 = require("./index.js");
+var remult_sqlite_core_js_1 = require("./remult-sqlite-core.js");
+function createD1DataProvider(d1) {
+    return new index_js_1.SqlDatabase(new D1DataProvider(new D1BindingClient(d1)));
+}
+var D1DataProvider = /** @class */ (function (_super) {
+    tslib_1.__extends(D1DataProvider, _super);
+    /**
+     * For production or local d1 using binding
+     *
+     * const dataProvider = new SqlDatabase(new D1DataProvider(new D1BindingClient(d1)))
+     */
+    function D1DataProvider(d1) {
+        var _this = _super.call(this, function () { return new D1Command(_this.d1); }, function () { return tslib_1.__awaiter(_this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                return [2 /*return*/];
+            });
+        }); }) || this;
+        _this.d1 = d1;
+        return _this;
+    }
+    D1DataProvider.prototype.transaction = function (action) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: 
+                    // As of June 2025, D1 doesn't support transactions
+                    // Here we simply run the action without wrapping it in a transaction
+                    // It means queries in action() will be run individually (this is the same decision prisma made)
+                    return [4 /*yield*/, action(this)];
+                    case 1:
+                        // As of June 2025, D1 doesn't support transactions
+                        // Here we simply run the action without wrapping it in a transaction
+                        // It means queries in action() will be run individually (this is the same decision prisma made)
+                        _a.sent();
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    return D1DataProvider;
+}(remult_sqlite_core_js_1.SqliteCoreDataProvider));
+exports.D1DataProvider = D1DataProvider;
+var D1BindingClient = /** @class */ (function () {
+    /**
+     * Simple d1 client that wraps the d1 binding directly
+     *
+     * const d1 = new D1BindingClient(env.DB)
+     */
+    function D1BindingClient(d1) {
+        this.d1 = d1;
+    }
+    D1BindingClient.prototype.execute = function (sql_1) {
+        return tslib_1.__awaiter(this, arguments, void 0, function (sql, params) {
+            var results;
+            var _a;
+            if (params === void 0) { params = []; }
+            return tslib_1.__generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0: return [4 /*yield*/, (_a = this.d1
+                            .prepare(sql))
+                            .bind.apply(_a, tslib_1.__spreadArray([], tslib_1.__read(params), false)).run()];
+                    case 1:
+                        results = (_b.sent()).results;
+                        return [2 /*return*/, results];
+                }
+            });
+        });
+    };
+    return D1BindingClient;
+}());
+exports.D1BindingClient = D1BindingClient;
+var D1Command = /** @class */ (function () {
+    function D1Command(d1) {
+        this.params = [];
+        this.d1 = d1;
+    }
+    D1Command.prototype.execute = function (sql) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            var results;
+            return tslib_1.__generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, this.d1.execute(sql, this.params)];
+                    case 1:
+                        results = _a.sent();
+                        return [2 /*return*/, new D1SqlResult(results)];
+                }
+            });
+        });
+    };
+    /** @deprecated use `param` instead*/
+    D1Command.prototype.addParameterAndReturnSqlToken = function (val) {
+        return this.param(val);
+    };
+    D1Command.prototype.param = function (val) {
+        var p;
+        if (val instanceof Date)
+            p = val.valueOf();
+        else if (typeof val === 'boolean')
+            p = val ? 1 : 0;
+        else
+            p = val;
+        this.params.push(p);
+        // According to https://developers.cloudflare.com/d1/worker-api/prepared-statements/
+        // only the ordered "?NNN" and anonymous "?" param types are supported (although :AAAA seems to work too)
+        var key = "?".concat(this.params.length);
+        return key;
+    };
+    return D1Command;
+}());
+var D1SqlResult = /** @class */ (function () {
+    function D1SqlResult(rows) {
+        if (rows === void 0) { rows = []; }
+        this.rows = rows;
+        // NOTE: are we guaranteed that when this is reached, rows is not empty?
+        this.columns = rows.length === 0 ? [] : Object.keys(rows[0]);
+    }
+    D1SqlResult.prototype.getColumnKeyInResultForIndexInSelect = function (index) {
+        return this.columns[index];
+    };
+    return D1SqlResult;
+}());

package/remult-express.js

@@ -19,7 +19,10 @@ function remultApi(options) {
         app.use(express.urlencoded({ extended: true, limit: options.bodySizeLimit }));
     }
     var server = (0, index_js_1.createRemultServer)(options, {
-        buildGenericRequestInfo: function (req) { return req; },
+        buildGenericRequestInfo: function (req) { return ({
+            internal: tslib_1.__assign(tslib_1.__assign({}, req), { on: req.on }),
+            public: { headers: new Headers(req.headers) },
+        }); },
         getRequestBody: function (req) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
             return [2 /*return*/, req.body];
         }); }); },

package/remult-fastify.js

@@ -39,7 +39,12 @@ function remultApi(options) {
         return response;
     }
     var api = (0, index_js_1.createRemultServer)(options, {
-        buildGenericRequestInfo: function (req) { return req; },
+        buildGenericRequestInfo: function (req) { return ({
+            internal: tslib_1.__assign(tslib_1.__assign({}, req), { url: req.originalUrl, 
+                // @ts-ignore
+                on: req.on }),
+            public: { headers: new Headers(req.headers) },
+        }); },
         getRequestBody: function (req) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
             return [2 /*return*/, req.body];
         }); }); },

package/remult-fresh.js

@@ -7,7 +7,11 @@ var remult_api_server_js_1 = require("./server/remult-api-server.js");
 function remultApi(options, response) {
     var _this = this;
     var server = (0, remult_api_server_js_1.createRemultServerCore)(options, {
-        buildGenericRequestInfo: function (r) { return r; },
+        buildGenericRequestInfo: function (r) { return ({
+            // @ts-ignore
+            internal: tslib_1.__assign(tslib_1.__assign({}, r), { on: r.on }),
+            public: { headers: r.headers },
+        }); },
         getRequestBody: function (req) { return req.json(); },
     });
     return {

package/remult-hapi.js

@@ -9,13 +9,10 @@ function remultApi(options) {
     var _this = this;
     var api = (0, index_js_1.createRemultServer)(options, {
         buildGenericRequestInfo: function (req) { return ({
-            method: req.method,
-            params: req.params,
-            query: req.query,
-            url: req.url.pathname,
-            on: function (e, do1) {
-                req.raw.req.on('close', do1);
-            },
+            internal: tslib_1.__assign(tslib_1.__assign({}, req), { url: req.url.pathname, on: function (e, do1) {
+                    req.raw.req.on('close', do1);
+                } }),
+            public: { headers: new Headers(req.headers) },
         }); },
         getRequestBody: function (req) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
             return [2 /*return*/, req.payload];

package/remult-hono.js

@@ -12,22 +12,24 @@ function remultApi(options) {
     var api = (0, index_js_1.createRemultServer)(options, {
         buildGenericRequestInfo: function (c) {
             return {
-                method: c.req.method,
-                params: c.req.param(),
-                query: new Proxy(c.req, {
-                    get: function (target, prop) {
-                        var r = c.req.queries(prop);
-                        if ((r === null || r === void 0 ? void 0 : r.length) == 1)
-                            return r[0];
-                        return r;
+                internal: {
+                    method: c.req.method,
+                    params: c.req.param(),
+                    query: new Proxy(c.req, {
+                        get: function (target, prop) {
+                            var r = c.req.queries(prop);
+                            if ((r === null || r === void 0 ? void 0 : r.length) == 1)
+                                return r[0];
+                            return r;
+                        },
+                    }),
+                    url: c.req.url,
+                    on: function (e, do1) {
+                        ;
+                        c['_tempOnClose'](function () { return do1(); });
                     },
-                }),
-                url: c.req.url,
-                on: function (e, do1) {
-                    ;
-                    c['_tempOnClose'](function () { return do1(); });
-                    //   c.req.on('close', do1)
                 },
+                public: { headers: new Headers(c.req.header()) },
             };
         },
         getRequestBody: function (c) { return tslib_1.__awaiter(_this, void 0, void 0, function () {

package/remult-next.js

@@ -8,7 +8,10 @@ var index_js_1 = require("./server/index.js");
 function remultNext(options) {
     var _this = this;
     var result = (0, index_js_1.createRemultServer)(options, {
-        buildGenericRequestInfo: function (req) { return req; },
+        buildGenericRequestInfo: function (req) { return ({
+            internal: tslib_1.__assign(tslib_1.__assign({}, req), { on: req.on }),
+            public: { headers: new Headers(req.headers) },
+        }); },
         getRequestBody: function (req) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
             return [2 /*return*/, req.body];
         }); }); },
@@ -84,14 +87,17 @@ function remultApi(options) {
     var result = (0, index_js_1.createRemultServer)(options, {
         getRequestBody: function (req) { return req.json(); },
         buildGenericRequestInfo: function (req) { return ({
-            url: req === null || req === void 0 ? void 0 : req.url,
-            method: req === null || req === void 0 ? void 0 : req.method,
-            on: function (e, do1) {
-                if (e === 'close') {
-                    ;
-                    req['_tempOnClose'] = do1;
-                }
+            internal: {
+                url: req === null || req === void 0 ? void 0 : req.url,
+                method: req === null || req === void 0 ? void 0 : req.method,
+                on: function (e, do1) {
+                    if (e === 'close') {
+                        ;
+                        req['_tempOnClose'] = do1;
+                    }
+                },
             },
+            public: { headers: req.headers },
         }); },
     });
     var handler = function (req) { return tslib_1.__awaiter(_this, void 0, void 0, function () {

package/remult-nuxt.js

@@ -8,8 +8,8 @@ var index_js_1 = require("./server/index.js");
 function remultApi(options) {
     var _this = this;
     var result = (0, index_js_1.createRemultServer)(options, {
-        buildGenericRequestInfo: function (event) {
-            return {
+        buildGenericRequestInfo: function (event) { return ({
+            internal: {
                 method: event.node.req.method,
                 url: event.node.req.url,
                 on: function (a, b) {
@@ -17,8 +17,11 @@ function remultApi(options) {
                         b();
                     });
                 },
-            };
-        },
+            },
+            public: {
+                headers: new Headers(event.node.req.headers),
+            },
+        }); },
         getRequestBody: function (event) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, (0, h3_1.readBody)(event)];

package/remult-solid-start.js

@@ -9,13 +9,16 @@ function remultApi(options) {
     var _this = this;
     var result = (0, index_js_1.createRemultServer)(options, {
         buildGenericRequestInfo: function (event) { return ({
-            url: event.request.url,
-            method: event.request.method,
-            on: function (e, do1) {
-                if (e === 'close') {
-                    event.locals['_tempOnClose'] = do1;
-                }
+            internal: {
+                url: event.request.url,
+                method: event.request.method,
+                on: function (e, do1) {
+                    if (e === 'close') {
+                        event.locals['_tempOnClose'] = do1;
+                    }
+                },
             },
+            public: { headers: new Headers(event.request.headers) },
         }); },
         getRequestBody: function (event) { return event.request.json(); },
     });