remult 3.0.5 → 3.0.6-next.0

package/esm/server/index.js

@@ -5,6 +5,7 @@ export { SseSubscriptionServer } from '../SseSubscriptionServer.js';
 export { DataProviderLiveQueryStorage } from '../live-query/data-provider-live-query-storage.js';
 export { JsonEntityFileStorage, JsonFileDataProvider, } from './JsonEntityFileStorage.js';
 export { TestApiDataProvider } from './test-api-data-provider.js';
+export { Module } from './module.js';
 export function createRemultServer(options, serverCoreOptions) {
     initAsyncHooks();
     return createRemultServerCore(options, serverCoreOptions || {

package/esm/server/module.js

@@ -0,0 +1,38 @@
+export class Module {
+    key;
+    priority;
+    entities;
+    controllers;
+    initApi;
+    initRequest;
+    modules;
+    constructor(options) {
+        this.key = options.key;
+        this.priority = options.priority ?? 0;
+        this.entities = options.entities;
+        this.controllers = options.controllers;
+        this.initRequest = options.initRequest;
+        this.initApi = options.initApi;
+        this.modules = options.modules;
+    }
+}
+/**
+ * Full flat and ordered list by index and concatenaining the modules name
+ */
+export const modulesFlatAndOrdered = (modules) => {
+    const flattenModules = (modules, parentName = '') => {
+        return modules.reduce((acc, module) => {
+            const fullKey = parentName ? `${parentName}-${module.key}` : module.key;
+            // Create a new module object without the 'modules' property
+            const { modules: _, ...flatModule } = module;
+            const newModule = { ...flatModule, key: fullKey };
+            const subModules = module.modules
+                ? flattenModules(module.modules, fullKey)
+                : [];
+            return [...acc, newModule, ...subModules];
+        }, []);
+    };
+    const flatModules = flattenModules(modules);
+    flatModules.sort((a, b) => a.priority - b.priority);
+    return flatModules;
+};

package/esm/server/remult-api-server.js

@@ -14,6 +14,7 @@ import { remultStatic } from '../src/remult-static.js';
 import remultAdminHtml, { buildEntityInfo } from './remult-admin.js';
 import { isOfType } from '../src/isOfType.js';
 import { initDataProviderOrJson } from './initDataProviderOrJson.js';
+import { modulesFlatAndOrdered } from './module.js';
 export function createRemultServerCore(options, serverCoreOptions) {
     const safeOptions = options ?? {};
     if (!safeOptions.entities)
@@ -57,6 +58,9 @@ export class RemultServerImplementation {
     dataProvider;
     coreOptions;
     liveQueryStorage = new InMemoryLiveQueryStorage();
+    modulesSorted = [];
+    entities = [];
+    controllers = [];
     constructor(queue, options, dataProvider, coreOptions) {
         this.queue = queue;
         this.options = options;
@@ -67,6 +71,19 @@ export class RemultServerImplementation {
         if (options.subscriptionServer)
             this.subscriptionServer = options.subscriptionServer;
         const entitiesMetaData = [];
+        const modules = options.modules ?? [];
+        modules.push({
+            key: 'default',
+            priority: 0,
+            entities: options.entities ?? [],
+            controllers: options.controllers ?? [],
+            initApi: options.initApi,
+            initRequest: options.initRequest,
+            modules: [],
+        });
+        this.modulesSorted = modulesFlatAndOrdered(modules);
+        this.entities = this.modulesSorted.flatMap((m) => m.entities ?? []);
+        this.controllers = this.modulesSorted.flatMap((m) => m.controllers ?? []);
         this.dataProvider = dataProvider.then(async (dp) => {
             await this.runWithRemult(async (remult) => {
                 remult.dataProvider = dp;
@@ -78,8 +95,8 @@ export class RemultServerImplementation {
                         started = true;
                         console.time('Schema ensured');
                     };
-                    if (options.entities)
-                        entitiesMetaData.push(...options.entities.map((e) => remult.repo(e).metadata));
+                    if (this.entities)
+                        entitiesMetaData.push(...this.entities.map((e) => remult.repo(e).metadata));
                     if (dp.ensureSchema) {
                         startConsoleLog();
                         await dp.ensureSchema(entitiesMetaData);
@@ -96,8 +113,12 @@ export class RemultServerImplementation {
                     if (started)
                         console.timeEnd('Schema ensured');
                 }
-                if (options.initApi)
-                    await options.initApi(remult);
+                for (let i = 0; i < this.modulesSorted.length; i++) {
+                    const _initApi = this.modulesSorted[i].initApi;
+                    if (_initApi) {
+                        await _initApi(remult);
+                    }
+                }
             }, { skipDataProvider: true });
             return dp;
         });
@@ -124,10 +145,10 @@ export class RemultServerImplementation {
     getEntities() {
         //TODO V2 - consider using entitiesMetaData - but it may require making it all awaitable
         var r = new Remult();
-        return this.options.entities.map((x) => r.repo(x).metadata);
+        return this.entities.map((x) => r.repo(x).metadata);
     }
     runWithSerializedJsonContextData = async (jsonContextData, entityKey, what) => {
-        for (const e of this.options.entities) {
+        for (const e of this.entities) {
             let key = getEntityKey(e);
             if (key === entityKey) {
                 await this.runWithRemult(async (remult) => {
@@ -173,7 +194,7 @@ export class RemultServerImplementation {
             throw 'Router already registered';
         this.registeredRouter = true;
         {
-            for (const c of this.options.controllers) {
+            for (const c of this.controllers) {
                 let z = c[classBackendMethodsArray];
                 if (z)
                     for (const a of z) {
@@ -211,7 +232,7 @@ export class RemultServerImplementation {
                         if (orig?.params?.id === '__entities-metadata') {
                             res.success(buildEntityInfo({
                                 remult,
-                                entities: this.options.entities ?? [],
+                                entities: this.entities,
                             }));
                         }
                         else {
@@ -259,7 +280,7 @@ export class RemultServerImplementation {
                 res.success(await remult.liveQueryStorage.keepAliveAndReturnUnknownQueryIds(await this.coreOptions.getRequestBody(origReq)));
             }));
         }
-        this.options.entities?.forEach((e) => {
+        this.entities.forEach((e) => {
             this.addEntity(e, getEntityKey(e), r);
         });
     }
@@ -351,16 +372,19 @@ export class RemultServerImplementation {
                                 }
                                 if (user)
                                     remult.user = user;
-                                if (this.options.initRequest) {
-                                    await this.options.initRequest(req, {
-                                        remult,
-                                        get liveQueryStorage() {
-                                            return remult.liveQueryStorage;
-                                        },
-                                        set liveQueryStorage(value) {
-                                            remult.liveQueryStorage = value;
-                                        },
-                                    });
+                                for (let i = 0; i < this.modulesSorted.length; i++) {
+                                    const _initRequest = this.modulesSorted[i].initRequest;
+                                    if (_initRequest) {
+                                        await _initRequest(req, {
+                                            remult,
+                                            get liveQueryStorage() {
+                                                return remult.liveQueryStorage;
+                                            },
+                                            set liveQueryStorage(value) {
+                                                remult.liveQueryStorage = value;
+                                            },
+                                        });
+                                    }
                                 }
                                 await what(remult, myReq, myRes, genReq, origRes, req);
                             }

package/package.json

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

package/server/index.d.ts

@@ -4,4 +4,6 @@ export { DataProviderLiveQueryStorage } from '../live-query/data-provider-live-q
 export { JsonEntityFileStorage, JsonFileDataProvider, } from './JsonEntityFileStorage.js';
 export { TestApiDataProvider } from './test-api-data-provider.js';
 export { GenericRequestHandler, GenericRequestInfo, GenericResponse, GenericRouter, InitRequestOptions, QueueStorage, RemultServer, RemultServerCore, RemultServerOptions, SpecificRoute, queuedJobInfo, } from './remult-api-server.js';
+export { Module } from './module.js';
+export type { ModuleInput } from './module.js';
 export declare function createRemultServer<RequestType>(options: RemultServerOptions<RequestType>, serverCoreOptions?: ServerCoreOptions<RequestType>): RemultServer<RequestType>;

package/server/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.TestApiDataProvider = exports.JsonFileDataProvider = exports.JsonEntityFileStorage = exports.DataProviderLiveQueryStorage = exports.SseSubscriptionServer = void 0;
+exports.Module = exports.TestApiDataProvider = exports.JsonFileDataProvider = exports.JsonEntityFileStorage = exports.DataProviderLiveQueryStorage = exports.SseSubscriptionServer = void 0;
 exports.createRemultServer = createRemultServer;
 var tslib_1 = require("tslib");
 var remult_api_server_js_1 = require("./remult-api-server.js");
@@ -15,6 +15,8 @@ Object.defineProperty(exports, "JsonEntityFileStorage", { enumerable: true, get:
 Object.defineProperty(exports, "JsonFileDataProvider", { enumerable: true, get: function () { return JsonEntityFileStorage_js_1.JsonFileDataProvider; } });
 var test_api_data_provider_js_1 = require("./test-api-data-provider.js");
 Object.defineProperty(exports, "TestApiDataProvider", { enumerable: true, get: function () { return test_api_data_provider_js_1.TestApiDataProvider; } });
+var module_js_1 = require("./module.js");
+Object.defineProperty(exports, "Module", { enumerable: true, get: function () { return module_js_1.Module; } });
 function createRemultServer(options, serverCoreOptions) {
     var _this = this;
     (0, initAsyncHooks_js_1.initAsyncHooks)();

package/server/module.d.ts

@@ -0,0 +1,26 @@
+import type { ClassType } from '../classType.js';
+import type { RemultServerOptions } from './remult-api-server.js';
+export interface ModuleInput<RequestType> {
+    key: string;
+    /** @default 0 */
+    priority?: number;
+    entities?: ClassType<unknown>[];
+    controllers?: ClassType<unknown>[];
+    initApi?: RemultServerOptions<RequestType>['initApi'];
+    initRequest?: RemultServerOptions<RequestType>['initRequest'];
+    modules?: Module<RequestType>[];
+}
+export declare class Module<RequestType> {
+    key: string;
+    priority: number;
+    entities?: ClassType<unknown>[];
+    controllers?: ClassType<unknown>[];
+    initApi?: RemultServerOptions<RequestType>['initApi'];
+    initRequest?: RemultServerOptions<RequestType>['initRequest'];
+    modules?: Module<RequestType>[];
+    constructor(options: ModuleInput<RequestType>);
+}
+/**
+ * Full flat and ordered list by index and concatenaining the modules name
+ */
+export declare const modulesFlatAndOrdered: <RequestType>(modules: Module<RequestType>[]) => Module<RequestType>[];

package/server/module.js

@@ -0,0 +1,40 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.modulesFlatAndOrdered = exports.Module = void 0;
+var tslib_1 = require("tslib");
+var Module = /** @class */ (function () {
+    function Module(options) {
+        var _a;
+        this.key = options.key;
+        this.priority = (_a = options.priority) !== null && _a !== void 0 ? _a : 0;
+        this.entities = options.entities;
+        this.controllers = options.controllers;
+        this.initRequest = options.initRequest;
+        this.initApi = options.initApi;
+        this.modules = options.modules;
+    }
+    return Module;
+}());
+exports.Module = Module;
+/**
+ * Full flat and ordered list by index and concatenaining the modules name
+ */
+var modulesFlatAndOrdered = function (modules) {
+    var flattenModules = function (modules, parentName) {
+        if (parentName === void 0) { parentName = ''; }
+        return modules.reduce(function (acc, module) {
+            var fullKey = parentName ? "".concat(parentName, "-").concat(module.key) : module.key;
+            // Create a new module object without the 'modules' property
+            var _ = module.modules, flatModule = tslib_1.__rest(module, ["modules"]);
+            var newModule = tslib_1.__assign(tslib_1.__assign({}, flatModule), { key: fullKey });
+            var subModules = module.modules
+                ? flattenModules(module.modules, fullKey)
+                : [];
+            return tslib_1.__spreadArray(tslib_1.__spreadArray(tslib_1.__spreadArray([], tslib_1.__read(acc), false), [newModule], false), tslib_1.__read(subModules), false);
+        }, []);
+    };
+    var flatModules = flattenModules(modules);
+    flatModules.sort(function (a, b) { return a.priority - b.priority; });
+    return flatModules;
+};
+exports.modulesFlatAndOrdered = modulesFlatAndOrdered;

package/server/remult-api-server.d.ts

@@ -6,6 +6,7 @@ import type { LiveQueryStorage, SubscriptionServer } from '../src/live-query/Sub
 import { IdEntity } from '../src/remult3/IdEntity.js';
 import type { EntityMetadata, Repository } from '../src/remult3/remult3.js';
 import type { queuedJobInfoResponse } from '../src/server-action.js';
+import { type Module } from './module.js';
 export interface RemultServerOptions<RequestType> {
     /**Entities to use for the api */
     entities?: ClassType<any>[];
@@ -92,6 +93,24 @@ export interface RemultServerOptions<RequestType> {
         responseBody: any;
         sendError: (httpStatusCode: number, body: any) => void;
     }) => Promise<void> | undefined;
+    /**
+     * Modules are here to group code by feature.
+     *
+     * @example
+     * import { Module } from 'remult/server'
+     *
+     * modules: [
+     *   new Module({
+     *     key: 'analytics',
+     *     entities: [AnalyticsEvent],
+     *     controllers: [AnalyticsController],
+     *     initApi: () => {
+     *       console.log('analytics module initialized')
+     *     },
+     *   }),
+     * ]
+     */
+    modules?: Module<RequestType>[];
 }
 export interface InitRequestOptions {
     liveQueryStorage: LiveQueryStorage;

package/server/remult-api-server.js

@@ -18,6 +18,7 @@ var remult_static_js_1 = require("../src/remult-static.js");
 var remult_admin_js_1 = tslib_1.__importStar(require("./remult-admin.js"));
 var isOfType_js_1 = require("../src/isOfType.js");
 var initDataProviderOrJson_js_1 = require("./initDataProviderOrJson.js");
+var module_js_1 = require("./module.js");
 function createRemultServerCore(options, serverCoreOptions) {
     var safeOptions = options !== null && options !== void 0 ? options : {};
     if (!safeOptions.entities)
@@ -58,11 +59,15 @@ function createRemultServerCore(options, serverCoreOptions) {
 var RemultServerImplementation = /** @class */ (function () {
     function RemultServerImplementation(queue, options, dataProvider, coreOptions) {
         var _this = this;
+        var _a, _b, _c;
         this.queue = queue;
         this.options = options;
         this.dataProvider = dataProvider;
         this.coreOptions = coreOptions;
         this.liveQueryStorage = new SubscriptionServer_js_1.InMemoryLiveQueryStorage();
+        this.modulesSorted = [];
+        this.entities = [];
+        this.controllers = [];
         this.runWithSerializedJsonContextData = function (jsonContextData, entityKey, what) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             var _loop_1, this_1, _a, _b, e, state_1, e_1_1;
             var e_1, _c;
@@ -113,7 +118,7 @@ var RemultServerImplementation = /** @class */ (function () {
                         _d.label = 1;
                     case 1:
                         _d.trys.push([1, 6, 7, 8]);
-                        _a = tslib_1.__values(this.options.entities), _b = _a.next();
+                        _a = tslib_1.__values(this.entities), _b = _a.next();
                         _d.label = 2;
                     case 2:
                         if (!!_b.done) return [3 /*break*/, 5];
@@ -171,12 +176,25 @@ var RemultServerImplementation = /** @class */ (function () {
         if (options.subscriptionServer)
             this.subscriptionServer = options.subscriptionServer;
         var entitiesMetaData = [];
+        var modules = (_a = options.modules) !== null && _a !== void 0 ? _a : [];
+        modules.push({
+            key: 'default',
+            priority: 0,
+            entities: (_b = options.entities) !== null && _b !== void 0 ? _b : [],
+            controllers: (_c = options.controllers) !== null && _c !== void 0 ? _c : [],
+            initApi: options.initApi,
+            initRequest: options.initRequest,
+            modules: [],
+        });
+        this.modulesSorted = (0, module_js_1.modulesFlatAndOrdered)(modules);
+        this.entities = this.modulesSorted.flatMap(function (m) { var _a; return (_a = m.entities) !== null && _a !== void 0 ? _a : []; });
+        this.controllers = this.modulesSorted.flatMap(function (m) { var _a; return (_a = m.controllers) !== null && _a !== void 0 ? _a : []; });
         this.dataProvider = dataProvider.then(function (dp) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
             var _this = this;
             return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.runWithRemult(function (remult) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                            var started_1, startConsoleLog, _a, _b, item, e_2_1;
+                            var started_1, startConsoleLog, _a, _b, item, e_2_1, i, _initApi;
                             var e_2, _c;
                             return tslib_1.__generator(this, function (_d) {
                                 switch (_d.label) {
@@ -190,8 +208,8 @@ var RemultServerImplementation = /** @class */ (function () {
                                             started_1 = true;
                                             console.time('Schema ensured');
                                         };
-                                        if (options.entities)
-                                            entitiesMetaData.push.apply(entitiesMetaData, tslib_1.__spreadArray([], tslib_1.__read(options.entities.map(function (e) { return remult.repo(e).metadata; })), false));
+                                        if (this.entities)
+                                            entitiesMetaData.push.apply(entitiesMetaData, tslib_1.__spreadArray([], tslib_1.__read(this.entities.map(function (e) { return remult.repo(e).metadata; })), false));
                                         if (!dp.ensureSchema) return [3 /*break*/, 2];
                                         startConsoleLog();
                                         return [4 /*yield*/, dp.ensureSchema(entitiesMetaData)];
@@ -233,12 +251,20 @@ var RemultServerImplementation = /** @class */ (function () {
                                             console.timeEnd('Schema ensured');
                                         _d.label = 10;
                                     case 10:
-                                        if (!options.initApi) return [3 /*break*/, 12];
-                                        return [4 /*yield*/, options.initApi(remult)];
+                                        i = 0;
+                                        _d.label = 11;
                                     case 11:
+                                        if (!(i < this.modulesSorted.length)) return [3 /*break*/, 14];
+                                        _initApi = this.modulesSorted[i].initApi;
+                                        if (!_initApi) return [3 /*break*/, 13];
+                                        return [4 /*yield*/, _initApi(remult)];
+                                    case 12:
                                         _d.sent();
-                                        _d.label = 12;
-                                    case 12: return [2 /*return*/];
+                                        _d.label = 13;
+                                    case 13:
+                                        i++;
+                                        return [3 /*break*/, 11];
+                                    case 14: return [2 /*return*/];
                                 }
                             });
                         }); }, { skipDataProvider: true })];
@@ -284,7 +310,7 @@ var RemultServerImplementation = /** @class */ (function () {
     RemultServerImplementation.prototype.getEntities = function () {
         //TODO V2 - consider using entitiesMetaData - but it may require making it all awaitable
         var r = new context_js_1.Remult();
-        return this.options.entities.map(function (x) { return r.repo(x).metadata; });
+        return this.entities.map(function (x) { return r.repo(x).metadata; });
     };
     RemultServerImplementation.prototype.getRouteImpl = function () {
         if (!this.routeImpl) {
@@ -299,14 +325,13 @@ var RemultServerImplementation = /** @class */ (function () {
     RemultServerImplementation.prototype.registerRouter = function (r) {
         var e_3, _a, e_4, _b;
         var _this = this;
-        var _c;
         if (this.registeredRouter)
             throw 'Router already registered';
         this.registeredRouter = true;
         {
             try {
-                for (var _d = tslib_1.__values(this.options.controllers), _e = _d.next(); !_e.done; _e = _d.next()) {
-                    var c = _e.value;
+                for (var _c = tslib_1.__values(this.controllers), _d = _c.next(); !_d.done; _d = _c.next()) {
+                    var c = _d.value;
                     var z = c[server_action_js_1.classBackendMethodsArray];
                     if (z)
                         try {
@@ -331,7 +356,7 @@ var RemultServerImplementation = /** @class */ (function () {
             catch (e_3_1) { e_3 = { error: e_3_1 }; }
             finally {
                 try {
-                    if (_e && !_e.done && (_a = _d.return)) _a.call(_d);
+                    if (_d && !_d.done && (_a = _c.return)) _a.call(_c);
                 }
                 finally { if (e_3) throw e_3.error; }
             }
@@ -365,8 +390,8 @@ var RemultServerImplementation = /** @class */ (function () {
                 var admin = function () {
                     return _this.process(function (remult, req, res, orig, origResponse) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                         var allowed, head, requireAuthToken, disableLiveQuery;
-                        var _a, _b, _c, _d, _e, _f, _g, _h;
-                        return tslib_1.__generator(this, function (_j) {
+                        var _a, _b, _c, _d, _e, _f, _g;
+                        return tslib_1.__generator(this, function (_h) {
                             allowed = (0, isOfType_js_1.isOfType)(this.options.admin, 'allow')
                                 ? this.options.admin.allow
                                 : this.options.admin;
@@ -374,7 +399,7 @@ var RemultServerImplementation = /** @class */ (function () {
                                 if (((_a = orig === null || orig === void 0 ? void 0 : orig.params) === null || _a === void 0 ? void 0 : _a.id) === '__entities-metadata') {
                                     res.success((0, remult_admin_js_1.buildEntityInfo)({
                                         remult: remult,
-                                        entities: (_b = this.options.entities) !== null && _b !== void 0 ? _b : [],
+                                        entities: this.entities,
                                     }));
                                 }
                                 else {
@@ -382,14 +407,14 @@ var RemultServerImplementation = /** @class */ (function () {
                                     requireAuthToken = false;
                                     disableLiveQuery = false;
                                     if ((0, isOfType_js_1.isOfType)(this.options.admin, 'allow')) {
-                                        head = (_e = (_d = (_c = this.options.admin).customHtmlHead) === null || _d === void 0 ? void 0 : _d.call(_c, remult)) !== null && _e !== void 0 ? _e : head;
+                                        head = (_d = (_c = (_b = this.options.admin).customHtmlHead) === null || _c === void 0 ? void 0 : _c.call(_b, remult)) !== null && _d !== void 0 ? _d : head;
                                         requireAuthToken =
-                                            (_f = this.options.admin.requireAuthToken) !== null && _f !== void 0 ? _f : requireAuthToken;
+                                            (_e = this.options.admin.requireAuthToken) !== null && _e !== void 0 ? _e : requireAuthToken;
                                         disableLiveQuery =
-                                            (_g = this.options.admin.disableLiveQuery) !== null && _g !== void 0 ? _g : disableLiveQuery;
+                                            (_f = this.options.admin.disableLiveQuery) !== null && _f !== void 0 ? _f : disableLiveQuery;
                                     }
                                     origResponse.send((0, remult_admin_js_1.default)({
-                                        rootPath: (_h = this.options.rootPath) !== null && _h !== void 0 ? _h : '/api',
+                                        rootPath: (_g = this.options.rootPath) !== null && _g !== void 0 ? _g : '/api',
                                         head: head,
                                         requireAuthToken: requireAuthToken,
                                         disableLiveQuery: disableLiveQuery,
@@ -465,7 +490,7 @@ var RemultServerImplementation = /** @class */ (function () {
                 });
             }); }));
         }
-        (_c = this.options.entities) === null || _c === void 0 ? void 0 : _c.forEach(function (e) {
+        this.entities.forEach(function (e) {
             _this.addEntity(e, (0, getEntityRef_js_1.getEntityKey)(e), r);
         });
     };
@@ -627,17 +652,17 @@ var RemultServerImplementation = /** @class */ (function () {
                         return [4 /*yield*/, what(remult_static_js_1.remultStatic.asyncContext.getStore().remult, myReq, myRes, genReq, origRes, req)];
                     case 2: return [2 /*return*/, _a.sent()];
                     case 3: return [4 /*yield*/, this.runWithRemult(function (remult) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
-                            var user;
+                            var user, i, _initRequest;
                             return tslib_1.__generator(this, function (_a) {
                                 switch (_a.label) {
                                     case 0:
-                                        if (!req) return [3 /*break*/, 9];
+                                        if (!req) return [3 /*break*/, 11];
                                         ;
                                         remult.context.request = req;
                                         remult_static_js_1.remultStatic.asyncContext.setInInitRequest(true);
                                         _a.label = 1;
                                     case 1:
-                                        _a.trys.push([1, , 8, 9]);
+                                        _a.trys.push([1, , 10, 11]);
                                         user = void 0;
                                         if (!this.options.getUser) return [3 /*break*/, 3];
                                         return [4 /*yield*/, this.options.getUser(req)];
@@ -654,8 +679,13 @@ var RemultServerImplementation = /** @class */ (function () {
                                     case 4:
                                         if (user)
                                             remult.user = user;
-                                        if (!this.options.initRequest) return [3 /*break*/, 6];
-                                        return [4 /*yield*/, this.options.initRequest(req, {
+                                        i = 0;
+                                        _a.label = 5;
+                                    case 5:
+                                        if (!(i < this.modulesSorted.length)) return [3 /*break*/, 8];
+                                        _initRequest = this.modulesSorted[i].initRequest;
+                                        if (!_initRequest) return [3 /*break*/, 7];
+                                        return [4 /*yield*/, _initRequest(req, {
                                                 remult: remult,
                                                 get liveQueryStorage() {
                                                     return remult.liveQueryStorage;
@@ -664,17 +694,20 @@ var RemultServerImplementation = /** @class */ (function () {
                                                     remult.liveQueryStorage = value;
                                                 },
                                             })];
-                                    case 5:
+                                    case 6:
                                         _a.sent();
-                                        _a.label = 6;
-                                    case 6: return [4 /*yield*/, what(remult, myReq, myRes, genReq, origRes, req)];
+                                        _a.label = 7;
                                     case 7:
+                                        i++;
+                                        return [3 /*break*/, 5];
+                                    case 8: return [4 /*yield*/, what(remult, myReq, myRes, genReq, origRes, req)];
+                                    case 9:
                                         _a.sent();
-                                        return [3 /*break*/, 9];
-                                    case 8:
+                                        return [3 /*break*/, 11];
+                                    case 10:
                                         remult_static_js_1.remultStatic.asyncContext.setInInitRequest(false);
                                         return [7 /*endfinally*/];
-                                    case 9: return [2 /*return*/];
+                                    case 11: return [2 /*return*/];
                                 }
                             });
                         }); })];