@flink-app/flink 0.12.1-alpha.2 → 0.12.1-alpha.20

package/dist/src/FlinkApp.d.ts

@@ -1,7 +1,7 @@
 import { OptionsJson } from "body-parser";
 import { Express } from "express";
 import { JSONSchema7 } from "json-schema";
-import { Db } from "mongodb";
+import { Db, MongoClient } from "mongodb";
 import { ToadScheduler } from "toad-scheduler";
 import { FlinkAuthPlugin } from "./auth/FlinkAuthPlugin";
 import { FlinkContext } from "./FlinkContext";
@@ -156,6 +156,7 @@ export declare class FlinkApp<C extends FlinkContext> {
     name: string;
     expressApp?: Express;
     db?: Db;
+    dbClient?: MongoClient;
     handlers: HandlerConfig[];
     port?: number;
     started: boolean;
@@ -164,13 +165,14 @@ export declare class FlinkApp<C extends FlinkContext> {
     private debug;
     private onDbConnection?;
     private plugins;
-    private auth?;
+    auth?: FlinkAuthPlugin;
     private corsOpts;
     private routingConfigured;
     private jsonOptions?;
     private rawContentTypes?;
     private schedulingOptions?;
     private disableHttpServer;
+    private expressServer;
     private repos;
     /**
      * Internal cache used to track registered handlers and potentially any overlapping routes
@@ -181,6 +183,7 @@ export declare class FlinkApp<C extends FlinkContext> {
     constructor(opts: FlinkOptions);
     get ctx(): C;
     start(): Promise<this>;
+    stop(): Promise<void>;
     /**
      * Manually registers a handler.
      *

package/dist/src/FlinkApp.js

@@ -231,7 +231,7 @@ var FlinkApp = /** @class */ (function () {
                             this.started = true;
                         }
                         else {
-                            (_d = this.expressApp) === null || _d === void 0 ? void 0 : _d.listen(this.port, function () {
+                            this.expressServer = (_d = this.expressApp) === null || _d === void 0 ? void 0 : _d.listen(this.port, function () {
                                 FlinkLog_1.log.fontColorLog("magenta", "\u26A1\uFE0F HTTP server '".concat(_this.name, "' is running and waiting for connections on ").concat(_this.port));
                                 _this.started = true;
                             });
@@ -241,6 +241,36 @@ var FlinkApp = /** @class */ (function () {
             });
         });
     };
+    FlinkApp.prototype.stop = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        FlinkLog_1.log.info("🛑 Stopping Flink app...");
+                        if (!this.scheduler) return [3 /*break*/, 2];
+                        return [4 /*yield*/, this.scheduler.stop()];
+                    case 1:
+                        _a.sent();
+                        _a.label = 2;
+                    case 2:
+                        if (this.expressServer) {
+                            return [2 /*return*/, new Promise(function (resolve, reject) {
+                                    var int = setTimeout(function () {
+                                        reject("Failed to stop HTTP server in time");
+                                    }, 2000);
+                                    _this.expressServer.close(function () {
+                                        clearInterval(int);
+                                        FlinkLog_1.log.info("HTTP server stopped");
+                                        resolve();
+                                    });
+                                })];
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
     /**
      * Manually registers a handler.
      *
@@ -412,11 +442,11 @@ var FlinkApp = /** @class */ (function () {
      */
     FlinkApp.prototype.registerAutoRegisterableHandlers = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _i, autoRegisteredHandlers_1, _a, handler, assumedHttpMethod, pathParams, _b, _c, param;
-            var _d, _e, _f;
-            return __generator(this, function (_g) {
-                for (_i = 0, autoRegisteredHandlers_1 = exports.autoRegisteredHandlers; _i < autoRegisteredHandlers_1.length; _i++) {
-                    _a = autoRegisteredHandlers_1[_i], handler = _a.handler, assumedHttpMethod = _a.assumedHttpMethod;
+            var _i, _a, _b, handler, assumedHttpMethod, pathParams, _c, _d, param;
+            var _e, _f, _g;
+            return __generator(this, function (_h) {
+                for (_i = 0, _a = exports.autoRegisteredHandlers.sort(function (a, b) { var _a, _b; return (((_a = a.handler.Route) === null || _a === void 0 ? void 0 : _a.order) || 0) - (((_b = b.handler.Route) === null || _b === void 0 ? void 0 : _b.order) || 0); }); _i < _a.length; _i++) {
+                    _b = _a[_i], handler = _b.handler, assumedHttpMethod = _b.assumedHttpMethod;
                     if (!handler.Route) {
                         FlinkLog_1.log.error("Missing Props in handler ".concat(handler.__file));
                         continue;
@@ -425,10 +455,10 @@ var FlinkApp = /** @class */ (function () {
                         FlinkLog_1.log.error("Missing exported handler function in handler ".concat(handler.__file));
                         continue;
                     }
-                    if (!!((_d = handler.__params) === null || _d === void 0 ? void 0 : _d.length)) {
+                    if (!!((_e = handler.__params) === null || _e === void 0 ? void 0 : _e.length)) {
                         pathParams = (0, utils_1.getPathParams)(handler.Route.path);
-                        for (_b = 0, _c = handler.__params; _b < _c.length; _b++) {
-                            param = _c[_b];
+                        for (_c = 0, _d = handler.__params; _c < _d.length; _c++) {
+                            param = _d[_c];
                             if (!pathParams.includes(param.name)) {
                                 FlinkLog_1.log.error("Handler ".concat(handler.__file, " has param ").concat(param.name, " but it is not present in the path '").concat(handler.Route.path, "'"));
                                 throw new Error("Invalid/missing handler path param");
@@ -441,8 +471,8 @@ var FlinkApp = /** @class */ (function () {
                     this.registerHandler({
                         routeProps: __assign(__assign({}, handler.Route), { method: handler.Route.method || assumedHttpMethod, origin: this.name }),
                         schema: {
-                            reqSchema: (_e = handler.__schemas) === null || _e === void 0 ? void 0 : _e.reqSchema,
-                            resSchema: (_f = handler.__schemas) === null || _f === void 0 ? void 0 : _f.resSchema,
+                            reqSchema: (_f = handler.__schemas) === null || _f === void 0 ? void 0 : _f.reqSchema,
+                            resSchema: (_g = handler.__schemas) === null || _g === void 0 ? void 0 : _g.resSchema,
                         },
                         queryMetadata: handler.__query || [],
                         paramsMetadata: handler.__params || [],
@@ -553,7 +583,7 @@ var FlinkApp = /** @class */ (function () {
                 if (this.dbOpts) {
                     for (_i = 0, autoRegisteredRepos_1 = exports.autoRegisteredRepos; _i < autoRegisteredRepos_1.length; _i++) {
                         _a = autoRegisteredRepos_1[_i], collectionName = _a.collectionName, repoInstanceName = _a.repoInstanceName, Repo = _a.Repo;
-                        repoInstance = new Repo(collectionName, this.db);
+                        repoInstance = new Repo(collectionName, this.db, this.dbClient);
                         this.repos[repoInstanceName] = repoInstance;
                         FlinkLog_1.log.info("Registered repo ".concat(repoInstanceName));
                     }
@@ -599,6 +629,7 @@ var FlinkApp = /** @class */ (function () {
                     case 2:
                         client = _a.sent();
                         this.db = client.db();
+                        this.dbClient = client;
                         return [3 /*break*/, 4];
                     case 3:
                         err_2 = _a.sent();
@@ -685,6 +716,15 @@ var FlinkApp = /** @class */ (function () {
         if (!this.dbOpts) {
             throw new Error("No db configured");
         }
+        var driverVersion = require("mongodb/package.json").version;
+        if (driverVersion.startsWith("3")) {
+            FlinkLog_1.log.debug("Using legacy mongodb connection options as mongo client is version ".concat(driverVersion));
+            return {
+                useNewUrlParser: true,
+                useUnifiedTopology: true,
+            };
+        }
+        FlinkLog_1.log.debug("Using modern MongoDB client options (driver version ".concat(driverVersion, ")"));
         return {
             serverApi: {
                 version: mongodb_1.ServerApiVersion.v1,

package/dist/src/FlinkHttpHandler.d.ts

@@ -10,7 +10,12 @@ export declare enum HttpMethod {
     delete = "delete"
 }
 type Params = Request["params"];
-type Query = Request["query"];
+/**
+ * Query type for request query parameters.
+ * Does currently not allow nested objects, although
+ * underlying express Request does allow it.
+ */
+type Query = Record<string, string | string[] | undefined>;
 /**
  * Flink request extends express Request but adds reqId and user object.
  */
@@ -63,6 +68,14 @@ export interface RouteProps {
      * I.e. filename or plugin name that describes where handler origins from
      */
     origin?: string;
+    /**
+     * Order handler should be registered in.
+     *
+     * By default all handlers has order 0 and in most cases this is fine,
+     * but if for example you want to register a handler before all others
+     * to avoid conflicts you can set a negative order.
+     */
+    order?: number;
 }
 /**
  * Http handler function that handlers implements in order to

package/dist/src/FlinkRepo.d.ts

@@ -1,22 +1,38 @@
-import { Collection, Db, Document, ObjectId } from "mongodb";
+import { Collection, Db, Document, MongoClient, ObjectId } from "mongodb";
 import { FlinkContext } from "./FlinkContext";
+/**
+ * Partial model to have intellisense for partial updates but
+ * also allow any other properties to be set such as nested objects etc.
+ */
+type PartialModel<Model> = Partial<Model> & {
+    [x: string]: any;
+};
 export declare abstract class FlinkRepo<C extends FlinkContext, Model extends Document> {
-    private collectionName;
-    private db;
+    collectionName: string;
+    db: Db;
+    client?: MongoClient | undefined;
     collection: Collection;
     private _ctx?;
     set ctx(ctx: FlinkContext);
     get ctx(): FlinkContext;
-    constructor(collectionName: string, db: Db);
+    constructor(collectionName: string, db: Db, client?: MongoClient | undefined);
     findAll(query?: {}): Promise<Model[]>;
     getById(id: string | ObjectId): Promise<Model | null>;
     getOne(query?: {}): Promise<Model | null>;
     create<C = Omit<Model, "_id">>(model: C): Promise<C & {
         _id: string;
     }>;
-    updateOne(id: string | ObjectId, model: Partial<Model>): Promise<Model | null>;
-    updateMany<U = Partial<Model>>(query: any, model: U): Promise<number>;
+    updateOne(id: string | ObjectId, model: PartialModel<Model>): Promise<Model | null>;
+    updateMany<U = PartialModel<Model>>(query: any, model: U): Promise<number>;
     deleteById(id: string | ObjectId): Promise<number>;
-    private buildId;
+    /**
+     * Helper to ensure the id is always an ObjectId.
+     * If a string is passed, it will be converted to an ObjectId.
+     * If an ObjectId is passed, it will be returned as is.
+     * @param id
+     * @returns
+     */
+    buildId(id: string | ObjectId): ObjectId;
     private objectIdToString;
 }
+export {};

package/dist/src/FlinkRepo.js

@@ -46,13 +46,25 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlinkRepo = void 0;
 var mongodb_1 = require("mongodb");
 var FlinkRepo = /** @class */ (function () {
-    function FlinkRepo(collectionName, db) {
+    function FlinkRepo(collectionName, db, client) {
         this.collectionName = collectionName;
         this.db = db;
+        this.client = client;
         this.collection = db.collection(this.collectionName);
     }
     Object.defineProperty(FlinkRepo.prototype, "ctx", {
@@ -129,12 +141,13 @@ var FlinkRepo = /** @class */ (function () {
     };
     FlinkRepo.prototype.updateOne = function (id, model) {
         return __awaiter(this, void 0, void 0, function () {
-            var oid, res;
+            var oid, _id, modelWithoutId, res;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         oid = this.buildId(id);
-                        return [4 /*yield*/, this.collection.updateOne({ _id: oid }, { $set: model })];
+                        _id = model._id, modelWithoutId = __rest(model, ["_id"]);
+                        return [4 /*yield*/, this.collection.updateOne({ _id: oid }, { $set: modelWithoutId })];
                     case 1:
                         _a.sent();
                         return [4 /*yield*/, this.collection.findOne({ _id: oid })];
@@ -150,14 +163,16 @@ var FlinkRepo = /** @class */ (function () {
     };
     FlinkRepo.prototype.updateMany = function (query, model) {
         return __awaiter(this, void 0, void 0, function () {
-            var modifiedCount;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.collection.updateMany(query, {
-                            $set: model,
-                        })];
+            var _a, _id, modelWithoutId, modifiedCount;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = model, _id = _a._id, modelWithoutId = __rest(_a, ["_id"]);
+                        return [4 /*yield*/, this.collection.updateMany(query, {
+                                $set: modelWithoutId,
+                            })];
                     case 1:
-                        modifiedCount = (_a.sent()).modifiedCount;
+                        modifiedCount = (_b.sent()).modifiedCount;
                         return [2 /*return*/, modifiedCount];
                 }
             });
@@ -178,6 +193,13 @@ var FlinkRepo = /** @class */ (function () {
             });
         });
     };
+    /**
+     * Helper to ensure the id is always an ObjectId.
+     * If a string is passed, it will be converted to an ObjectId.
+     * If an ObjectId is passed, it will be returned as is.
+     * @param id
+     * @returns
+     */
     FlinkRepo.prototype.buildId = function (id) {
         var oid;
         if (typeof id === "string") {

package/dist/src/TypeScriptCompiler.d.ts

@@ -3,6 +3,7 @@ declare class TypeScriptCompiler {
     private cwd;
     private project;
     private schemaGenerator?;
+    private isEsm;
     /**
      * Parsed typescript schemas that will be added to intermediate
      * schemas.ts file.
@@ -17,6 +18,15 @@ declare class TypeScriptCompiler {
      */
     private tsSchemasSymbolsToImports;
     constructor(cwd: string);
+    /**
+     * Detects if the project is using ESM (ECMAScript Modules)
+     * by checking type in package.json.
+     */
+    private isEsmProject;
+    /**
+     * Gets the module specifier for imports, adding .js extension for ESM
+     */
+    private getModuleSpecifier;
     /**
      * Deletes all generated files.
      * @param cwd

package/dist/src/TypeScriptCompiler.js

@@ -10,6 +10,29 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -59,7 +82,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-var fs_1 = require("fs");
+var fs_1 = __importStar(require("fs"));
 var path_1 = require("path");
 var tiny_glob_1 = __importDefault(require("tiny-glob"));
 var ts_json_schema_generator_1 = require("ts-json-schema-generator");
@@ -83,16 +106,62 @@ var TypeScriptCompiler = /** @class */ (function () {
          * This will be added to file in a batch for performance reasons.
          */
         this.tsSchemasSymbolsToImports = [];
+        // Detect if project is using ESM based solely on package.json "type": "module"
+        this.isEsm = this.isEsmProject(cwd);
+        var compilerOptions = {
+            noEmit: false, // We need to emit files
+            outDir: (0, path_1.join)(cwd, "dist"),
+        };
+        // Set appropriate module settings based on detected module system
+        if (this.isEsm) {
+            // For ESM projects, use ESNext module with Node resolution
+            compilerOptions.module = ts_morph_1.ts.ModuleKind.ESNext;
+            compilerOptions.moduleResolution = ts_morph_1.ts.ModuleResolutionKind.NodeJs;
+            compilerOptions.esModuleInterop = true;
+        }
+        else {
+            // For CommonJS projects, use CommonJS module with Node resolution
+            compilerOptions.module = ts_morph_1.ts.ModuleKind.CommonJS;
+            compilerOptions.moduleResolution = ts_morph_1.ts.ModuleResolutionKind.NodeJs;
+        }
         this.project = new ts_morph_1.Project({
             tsConfigFilePath: (0, path_1.join)(cwd, "tsconfig.json"),
-            compilerOptions: {
-                noEmit: false,
-                outDir: (0, path_1.join)(cwd, "dist"),
-                // incremental: true,
-            },
+            compilerOptions: compilerOptions,
         });
         console.log("Loaded", this.project.getSourceFiles().length, "source file(s) from", cwd);
+        console.log("Module system:", this.isEsm ? "ESM" : "CommonJS");
+        console.log("Using module:", compilerOptions.module === ts_morph_1.ts.ModuleKind.ESNext ? "ESNext" : "CommonJS");
     }
+    /**
+     * Detects if the project is using ESM (ECMAScript Modules)
+     * by checking type in package.json.
+     */
+    TypeScriptCompiler.prototype.isEsmProject = function (cwd) {
+        try {
+            // Check package.json for "type": "module"
+            var packageJsonPath = (0, path_1.join)(cwd, "package.json");
+            if (fs_1.default.existsSync(packageJsonPath)) {
+                var packageJson = JSON.parse(fs_1.default.readFileSync(packageJsonPath, "utf8"));
+                return packageJson.type === "module";
+            }
+        }
+        catch (error) {
+            // If we can't determine, default to CommonJS
+            console.warn("Error detecting module system, defaulting to CommonJS:", error);
+        }
+        return false;
+    };
+    /**
+     * Gets the module specifier for imports, adding .js extension for ESM
+     */
+    TypeScriptCompiler.prototype.getModuleSpecifier = function (fromFile, toFile) {
+        var moduleSpecifier = fromFile.getRelativePathAsModuleSpecifierTo(toFile);
+        // Add .js extension for ESM imports (only for relative paths)
+        if (this.isEsm && !moduleSpecifier.startsWith("@") && !moduleSpecifier.endsWith(".js")) {
+            moduleSpecifier += ".js";
+        }
+        return moduleSpecifier;
+    };
     /**
      * Deletes all generated files.
      * @param cwd
@@ -233,7 +302,7 @@ var TypeScriptCompiler = /** @class */ (function () {
                         namespaceImport = sf.getBaseNameWithoutExtension().replace(/\./g, "_") + "_" + i;
                         imports.push({
                             defaultImport: "* as " + namespaceImport,
-                            moduleSpecifier: generatedFile.getRelativePathAsModuleSpecifierTo(sf),
+                            moduleSpecifier: this.getModuleSpecifier(generatedFile, sf),
                         });
                         assumedHttpMethod = (0, utils_1.getHttpMethodFromHandlerName)(sf.getBaseName());
                         return [4 /*yield*/, this.extractSchemasFromHandlerSourceFile(sf)];
@@ -309,7 +378,7 @@ var TypeScriptCompiler = /** @class */ (function () {
                             console.log("Detected repo ".concat(sf.getBaseName()));
                             imports.push({
                                 defaultImport: sf.getBaseNameWithoutExtension(),
-                                moduleSpecifier: generatedFile.getRelativePathAsModuleSpecifierTo(sf),
+                                moduleSpecifier: this.getModuleSpecifier(generatedFile, sf),
                             });
                             reposArr.insertElement(i, "{collectionName: \"".concat((0, utils_1.getCollectionNameForRepo)(sf.getBaseName()), "\", repoInstanceName: \"").concat((0, utils_1.getRepoInstanceName)(sf.getBaseName()), "\", Repo: ").concat(sf.getBaseNameWithoutExtension(), "}"));
                             i++;
@@ -341,7 +410,7 @@ var TypeScriptCompiler = /** @class */ (function () {
                             console.error("Cannot find entry script '".concat(appEntryScript, "'"));
                             return [2 /*return*/, process.exit(1)];
                         }
-                        sf = this.createSourceFile(["start.ts"], "// Generated ".concat(new Date(), "\nimport \"./generatedHandlers\";\nimport \"./generatedRepos\";\nimport \"./generatedJobs\";\nimport \"..").concat(appEntryScript.replace(/\.ts/g, ""), "\";\n"));
+                        sf = this.createSourceFile(["start.ts"], "// Generated ".concat(new Date(), "\nimport \"./generatedHandlers").concat(this.isEsm ? ".js" : "", "\";\nimport \"./generatedRepos").concat(this.isEsm ? ".js" : "", "\";\nimport \"./generatedJobs").concat(this.isEsm ? ".js" : "", "\";\nimport \"..").concat(appEntryScript.replace(/\.ts/g, "")).concat(this.isEsm ? ".js" : "", "\";\nexport default {}; // Export an empty object to make it a module\n"));
                         return [4 /*yield*/, sf.save()];
                     case 1:
                         _a.sent();
@@ -672,7 +741,7 @@ var TypeScriptCompiler = /** @class */ (function () {
                             namespaceImport = sf.getBaseNameWithoutExtension().replace(/\./g, "_") + "_" + i;
                             imports.push({
                                 defaultImport: "* as " + namespaceImport,
-                                moduleSpecifier: generatedFile.getRelativePathAsModuleSpecifierTo(sf),
+                                moduleSpecifier: this.getModuleSpecifier(generatedFile, sf),
                             });
                             // Append metadata to source file that will be part of emitted dist bundle (javascript)
                             sf.addVariableStatement({

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flink-app/flink",
-    "version": "0.12.1-alpha.2",
+    "version": "0.12.1-alpha.20",
     "description": "Typescript only framework for creating REST-like APIs on top of Express and mongodb",
     "types": "dist/src/index.d.ts",
     "main": "dist/src/index.js",
@@ -9,7 +9,7 @@
         "test": "jasmine-ts --preserve-symlinks --config=./spec/support/jasmine.json",
         "test:watch": "nodemon --ext ts --exec 'jasmine-ts  --config=./spec/support/jasmine.json'",
         "start": "ts-node src/index.ts",
-        "prepublish": "npm run build",
+        "prepare": "npm run build",
         "build": "tsc --project tsconfig.dist.json",
         "watch": "nodemon --exec 'tsc --project tsconfig.dist.json'",
         "clean": "rimraf dist"
@@ -38,7 +38,6 @@
         "fs-extra": "^10.0.0",
         "mkdirp": "^1.0.4",
         "mock-json-schema": "^1.0.8",
-        "mongodb": "^6.15.0",
         "morgan": "^1.10.0",
         "ms": "^2.0.0",
         "node-color-log": "^10.0.2",
@@ -62,9 +61,13 @@
         "jasmine": "^3.7.0",
         "jasmine-spec-reporter": "^7.0.0",
         "jasmine-ts": "^0.3.3",
+        "mongodb": "^6.15.0",
         "nodemon": "^2.0.7",
         "rimraf": "^3.0.2",
         "ts-node": "^9.1.1"
     },
-    "gitHead": "b5be77c75e10067c81e0ecab8716b30f99833b83"
+    "peerDependencies": {
+        "mongodb": ">=3.7.0 <7.0.0"
+    },
+    "gitHead": "133c6f50b3119f8264f6350e2043c171781b583f"
 }

package/spec/FlinkRepo.spec.ts

@@ -4,6 +4,7 @@ import { FlinkRepo } from "../src/FlinkRepo";
 interface Model {
     _id: string;
     name: string;
+    nested?: { field: number };
 }
 
 class Repo extends FlinkRepo<any, Model> {}
@@ -61,9 +62,19 @@ describe("FlinkRepo", () => {
 
         const updatedDoc = await repo.updateOne(createdDoc._id + "", {
             name: "foo",
+            "nested.field": 1,
         });
 
         expect(updatedDoc).toBeDefined();
         expect(updatedDoc?.name).toBe("foo");
+        expect(updatedDoc?.nested?.field).toBe(1);
+    });
+
+    it("should update many documents", async () => {
+        await collection.insertMany([{ name: "foo" }, { name: "foo" }, { name: "foo" }]);
+
+        const updatedCount = await repo.updateMany({ name: "foo" }, { name: "bar", "nested.field": 1 });
+
+        expect(updatedCount).toBe(3);
     });
 });

package/src/FlinkApp.ts

@@ -12,7 +12,7 @@ import { v4 } from "uuid";
 import { FlinkAuthPlugin } from "./auth/FlinkAuthPlugin";
 import { FlinkContext } from "./FlinkContext";
 import { internalServerError, notFound, unauthorized } from "./FlinkErrors";
-import { Handler, HandlerFile, HttpMethod, QueryParamMetadata, RouteProps } from "./FlinkHttpHandler";
+import { FlinkRequest, Handler, HandlerFile, HttpMethod, QueryParamMetadata, RouteProps } from "./FlinkHttpHandler";
 import { FlinkJobFile } from "./FlinkJob";
 import { log } from "./FlinkLog";
 import { FlinkPlugin } from "./FlinkPlugin";
@@ -217,6 +217,7 @@ export class FlinkApp<C extends FlinkContext> {
     public name: string;
     public expressApp?: Express;
     public db?: Db;
+    public dbClient?: MongoClient;
     public handlers: HandlerConfig[] = [];
     public port?: number;
     public started = false;
@@ -227,13 +228,14 @@ export class FlinkApp<C extends FlinkContext> {
     private onDbConnection?: FlinkOptions["onDbConnection"];
 
     private plugins: FlinkPlugin[] = [];
-    private auth?: FlinkAuthPlugin;
+    public auth?: FlinkAuthPlugin;
     private corsOpts: FlinkOptions["cors"];
     private routingConfigured = false;
     private jsonOptions?: OptionsJson;
     private rawContentTypes?: string[];
     private schedulingOptions?: FlinkOptions["scheduling"];
     private disableHttpServer = false;
+    private expressServer: any; // for simplicity, we don't want to import types from express/node here
 
     private repos: { [x: string]: FlinkRepo<C, any> } = {};
 
@@ -367,7 +369,7 @@ export class FlinkApp<C extends FlinkContext> {
             log.info("🚧 HTTP server is disabled, but flink app is running");
             this.started = true;
         } else {
-            this.expressApp?.listen(this.port, () => {
+            this.expressServer = this.expressApp?.listen(this.port, () => {
                 log.fontColorLog("magenta", `⚡️ HTTP server '${this.name}' is running and waiting for connections on ${this.port}`);
                 this.started = true;
             });
@@ -376,6 +378,28 @@ export class FlinkApp<C extends FlinkContext> {
         return this;
     }
 
+    async stop() {
+        log.info("🛑 Stopping Flink app...");
+
+        if (this.scheduler) {
+            await this.scheduler.stop();
+        }
+
+        if (this.expressServer) {
+            return new Promise<void>((resolve, reject) => {
+                const int = setTimeout(() => {
+                    reject("Failed to stop HTTP server in time");
+                }, 2000);
+
+                this.expressServer.close(() => {
+                    clearInterval(int);
+                    log.info("HTTP server stopped");
+                    resolve();
+                });
+            });
+        }
+    }
+
     /**
      * Manually registers a handler.
      *
@@ -506,7 +530,7 @@ export class FlinkApp<C extends FlinkContext> {
                 try {
                     // 👇 This is where the actual handler gets invoked
                     handlerRes = await handler({
-                        req,
+                        req: req as FlinkRequest,
                         ctx: this.ctx,
                         origin: routeProps.origin,
                     });
@@ -570,7 +594,7 @@ export class FlinkApp<C extends FlinkContext> {
      * Will not register any handlers added programmatically.
      */
     private async registerAutoRegisterableHandlers() {
-        for (const { handler, assumedHttpMethod } of autoRegisteredHandlers) {
+        for (const { handler, assumedHttpMethod } of autoRegisteredHandlers.sort((a, b) => (a.handler.Route?.order || 0) - (b.handler.Route?.order || 0))) {
             if (!handler.Route) {
                 log.error(`Missing Props in handler ${handler.__file}`);
                 continue;
@@ -717,7 +741,7 @@ export class FlinkApp<C extends FlinkContext> {
     private async buildContext() {
         if (this.dbOpts) {
             for (const { collectionName, repoInstanceName, Repo } of autoRegisteredRepos) {
-                const repoInstance: FlinkRepo<C, any> = new Repo(collectionName, this.db);
+                const repoInstance: FlinkRepo<C, any> = new Repo(collectionName, this.db, this.dbClient);
 
                 this.repos[repoInstanceName] = repoInstance;
 
@@ -753,8 +777,10 @@ export class FlinkApp<C extends FlinkContext> {
         if (this.dbOpts) {
             try {
                 log.debug("Connecting to db");
+
                 const client = await MongoClient.connect(this.dbOpts.uri, this.getMongoConnectionOptions());
                 this.db = client.db();
+                this.dbClient = client;
             } catch (err) {
                 log.error("Failed to connect to db: " + err);
                 process.exit(1);
@@ -797,7 +823,7 @@ export class FlinkApp<C extends FlinkContext> {
         if (!this.auth) {
             throw new Error(`Attempting to authenticate request (${req.method} ${req.path}) but no authPlugin is set`);
         }
-        return await this.auth.authenticateRequest(req, permissions);
+        return await this.auth.authenticateRequest(req as FlinkRequest, permissions);
     }
 
     public getRegisteredRoutes() {
@@ -813,6 +839,18 @@ export class FlinkApp<C extends FlinkContext> {
             throw new Error("No db configured");
         }
 
+        const { version: driverVersion } = require("mongodb/package.json");
+
+        if (driverVersion.startsWith("3")) {
+            log.debug(`Using legacy mongodb connection options as mongo client is version ${driverVersion}`);
+            return {
+                useNewUrlParser: true,
+                useUnifiedTopology: true,
+            };
+        }
+
+        log.debug(`Using modern MongoDB client options (driver version ${driverVersion})`);
+
         return {
             serverApi: {
                 version: ServerApiVersion.v1,

package/src/FlinkHttpHandler.ts

@@ -5,24 +5,25 @@ import { FlinkError } from "./FlinkErrors";
 import { FlinkResponse } from "./FlinkResponse";
 
 export enum HttpMethod {
-  get = "get",
-  post = "post",
-  put = "put",
-  delete = "delete",
+    get = "get",
+    post = "post",
+    put = "put",
+    delete = "delete",
 }
 
 type Params = Request["params"];
-type Query = Request["query"];
+
+/**
+ * Query type for request query parameters.
+ * Does currently not allow nested objects, although
+ * underlying express Request does allow it.
+ */
+type Query = Record<string, string | string[] | undefined>;
 
 /**
  * Flink request extends express Request but adds reqId and user object.
  */
-export type FlinkRequest<T = any, P = Params, Q = Query> = Request<
-  P,
-  any,
-  T,
-  Q
-> & { reqId: string; user?: any };
+export type FlinkRequest<T = any, P = Params, Q = Query> = Request<P, any, T, Q> & { reqId: string; user?: any };
 
 /**
  * Route props to control routing.
@@ -31,66 +32,69 @@ export type FlinkRequest<T = any, P = Params, Q = Query> = Request<
  * instructs express web server how to route traffic.
  */
 export interface RouteProps {
-  /**
-   * HTTP method which this handlers responds to.
-   *
-   * Will if not set attempt to extract HTTP method based
-   * on handler file name prefix, for example `GetFoo.ts` will assume
-   * HTTP method `GET`.
-   */
-  method?: HttpMethod;
-
-  /**
-   * Route path including any path params.
-   * Example: `/user/:id`
-   */
-  path: string;
-
-  /**
-   * Generates mock response based on handlers response schema.
-   *
-   * Will be ignored if handler does not have any response schema defined.
-   *
-   * This should only be used during development 💥
-   */
-  mockApi?: boolean;
-
-  /**
-   * Set permissions needed to access route if route requires authentication.
-   */
-  permissions?: string | string[];
-
-  /**
-   * Optional documentation of endpoint. Can be used for example in API docs.
-   * Supports markdown strings.
-   */
-  docs?: string; // TODO
-
-  /**
-   * If handler should not be auto registered
-   */
-  skipAutoRegister?: boolean;
-
-  /**
-   * I.e. filename or plugin name that describes where handler origins from
-   */
-  origin?: string;
+    /**
+     * HTTP method which this handlers responds to.
+     *
+     * Will if not set attempt to extract HTTP method based
+     * on handler file name prefix, for example `GetFoo.ts` will assume
+     * HTTP method `GET`.
+     */
+    method?: HttpMethod;
+
+    /**
+     * Route path including any path params.
+     * Example: `/user/:id`
+     */
+    path: string;
+
+    /**
+     * Generates mock response based on handlers response schema.
+     *
+     * Will be ignored if handler does not have any response schema defined.
+     *
+     * This should only be used during development 💥
+     */
+    mockApi?: boolean;
+
+    /**
+     * Set permissions needed to access route if route requires authentication.
+     */
+    permissions?: string | string[];
+
+    /**
+     * Optional documentation of endpoint. Can be used for example in API docs.
+     * Supports markdown strings.
+     */
+    docs?: string; // TODO
+
+    /**
+     * If handler should not be auto registered
+     */
+    skipAutoRegister?: boolean;
+
+    /**
+     * I.e. filename or plugin name that describes where handler origins from
+     */
+    origin?: string;
+
+    /**
+     * Order handler should be registered in.
+     *
+     * By default all handlers has order 0 and in most cases this is fine,
+     * but if for example you want to register a handler before all others
+     * to avoid conflicts you can set a negative order.
+     */
+    order?: number;
 }
 
 /**
  * Http handler function that handlers implements in order to
  * handle HTTP requests and return a JSON response.
  */
-export type Handler<
-  Ctx extends FlinkContext,
-  ReqSchema = any,
-  ResSchema = any,
-  P extends Params = Params,
-  Q extends Query = Query
-> = (props: {
-  req: FlinkRequest<ReqSchema, P, Q>;
-  ctx: Ctx;
-  origin?: string;
+export type Handler<Ctx extends FlinkContext, ReqSchema = any, ResSchema = any, P extends Params = Params, Q extends Query = Query> = (props: {
+    req: FlinkRequest<ReqSchema, P, Q>;
+    ctx: Ctx;
+    origin?: string;
 }) => Promise<FlinkResponse<ResSchema | FlinkError>>;
 
 /**
@@ -99,12 +103,7 @@ export type Handler<
  *
  * Just syntactic sugar on top op `HandlerFn`
  */
-export type GetHandler<
-  Ctx extends FlinkContext,
-  ResSchema = any,
-  P extends Params = Params,
-  Q extends Query = Query
-> = Handler<Ctx, any, ResSchema, P, Q>;
+export type GetHandler<Ctx extends FlinkContext, ResSchema = any, P extends Params = Params, Q extends Query = Query> = Handler<Ctx, any, ResSchema, P, Q>;
 
 /**
  * Type for Handler file. Describes shape of exports when using
@@ -113,32 +112,32 @@ export type GetHandler<
  * `import * as FooHandler from "./src/handlers/FooHandler"
  */
 export type HandlerFile = {
-  default: Handler<any, any, any, any, any>;
-  Route?: RouteProps;
-  /**
-   * Name of schemas, is set at compile time by Flink compiler.
-   */
-  __schemas?: {
-    reqSchema?: JSONSchema;
-    resSchema?: JSONSchema;
-  };
-  /**
-   * Typescript source file name, is set at compile time by Flink compiler.
-   */
-  __file?: string;
-
-  /**
-   * Description of query params, is set at compile time by Flink compiler.
-   */
-  __query?: QueryParamMetadata[];
-
-  /**
-   * Description of path params, is set at compile time by Flink compiler.
-   */
-  __params?: QueryParamMetadata[];
+    default: Handler<any, any, any, any, any>;
+    Route?: RouteProps;
+    /**
+     * Name of schemas, is set at compile time by Flink compiler.
+     */
+    __schemas?: {
+        reqSchema?: JSONSchema;
+        resSchema?: JSONSchema;
+    };
+    /**
+     * Typescript source file name, is set at compile time by Flink compiler.
+     */
+    __file?: string;
+
+    /**
+     * Description of query params, is set at compile time by Flink compiler.
+     */
+    __query?: QueryParamMetadata[];
+
+    /**
+     * Description of path params, is set at compile time by Flink compiler.
+     */
+    __params?: QueryParamMetadata[];
 };
 
 export type QueryParamMetadata = {
-  name: string;
-  description: string;
+    name: string;
+    description: string;
 };

package/src/FlinkRepo.ts

@@ -1,6 +1,12 @@
-import { Collection, Db, Document, InsertOneResult, ObjectId } from "mongodb";
+import { Collection, Db, Document, InsertOneResult, MongoClient, ObjectId } from "mongodb";
 import { FlinkContext } from "./FlinkContext";
 
+/**
+ * Partial model to have intellisense for partial updates but
+ * also allow any other properties to be set such as nested objects etc.
+ */
+type PartialModel<Model> = Partial<Model> & { [x: string]: any };
+
 export abstract class FlinkRepo<C extends FlinkContext, Model extends Document> {
     collection: Collection;
 
@@ -15,7 +21,7 @@ export abstract class FlinkRepo<C extends FlinkContext, Model extends Document>
         return this._ctx;
     }
 
-    constructor(private collectionName: string, private db: Db) {
+    constructor(public collectionName: string, public db: Db, public client?: MongoClient) {
         this.collection = db.collection(this.collectionName);
     }
 
@@ -45,10 +51,12 @@ export abstract class FlinkRepo<C extends FlinkContext, Model extends Document>
         return { ...model, _id: result.insertedId.toString() };
     }
 
-    async updateOne(id: string | ObjectId, model: Partial<Model>): Promise<Model | null> {
+    async updateOne(id: string | ObjectId, model: PartialModel<Model>): Promise<Model | null> {
         const oid = this.buildId(id);
 
-        await this.collection.updateOne({ _id: oid }, { $set: model });
+        const { _id, ...modelWithoutId } = model;
+
+        await this.collection.updateOne({ _id: oid }, { $set: modelWithoutId });
 
         const res = await this.collection.findOne<Model>({ _id: oid });
 
@@ -58,9 +66,11 @@ export abstract class FlinkRepo<C extends FlinkContext, Model extends Document>
         return null;
     }
 
-    async updateMany<U = Partial<Model>>(query: any, model: U): Promise<number> {
+    async updateMany<U = PartialModel<Model>>(query: any, model: U): Promise<number> {
+        const { _id, ...modelWithoutId } = model as any;
+
         const { modifiedCount } = await this.collection.updateMany(query, {
-            $set: model as any,
+            $set: modelWithoutId as any,
         });
         return modifiedCount;
     }
@@ -72,7 +82,14 @@ export abstract class FlinkRepo<C extends FlinkContext, Model extends Document>
         return deletedCount || 0;
     }
 
-    private buildId(id: string | ObjectId) {
+    /**
+     * Helper to ensure the id is always an ObjectId.
+     * If a string is passed, it will be converted to an ObjectId.
+     * If an ObjectId is passed, it will be returned as is.
+     * @param id
+     * @returns
+     */
+    buildId(id: string | ObjectId) {
         let oid: ObjectId | string;
 
         if (typeof id === "string") {

package/src/TypeScriptCompiler.ts

@@ -1,8 +1,8 @@
-import { promises as fsPromises } from "fs";
+import fs, { promises as fsPromises } from "fs";
 import { JSONSchema7 } from "json-schema";
 import { join } from "path";
 import glob from "tiny-glob";
-import { CompletedConfig, Config, createFormatter, createParser, Schema, SchemaGenerator } from "ts-json-schema-generator";
+import { CompletedConfig, createFormatter, createParser, Schema, SchemaGenerator } from "ts-json-schema-generator";
 import {
     ArrayLiteralExpression,
     DiagnosticCategory,
@@ -24,6 +24,7 @@ import { getCollectionNameForRepo, getHttpMethodFromHandlerName, getRepoInstance
 class TypeScriptCompiler {
     private project: Project;
     private schemaGenerator?: SchemaGenerator;
+    private isEsm: boolean;
 
     /**
      * Parsed typescript schemas that will be added to intermediate
@@ -41,16 +42,68 @@ class TypeScriptCompiler {
     private tsSchemasSymbolsToImports: Symbol[] = [];
 
     constructor(private cwd: string) {
+        // Detect if project is using ESM based solely on package.json "type": "module"
+        this.isEsm = this.isEsmProject(cwd);
+
+        const compilerOptions: ts.CompilerOptions = {
+            noEmit: false, // We need to emit files
+            outDir: join(cwd, "dist"),
+        };
+
+        // Set appropriate module settings based on detected module system
+        if (this.isEsm) {
+            // For ESM projects, use ESNext module with Node resolution
+            compilerOptions.module = ts.ModuleKind.ESNext;
+            compilerOptions.moduleResolution = ts.ModuleResolutionKind.NodeJs;
+            compilerOptions.esModuleInterop = true;
+        } else {
+            // For CommonJS projects, use CommonJS module with Node resolution
+            compilerOptions.module = ts.ModuleKind.CommonJS;
+            compilerOptions.moduleResolution = ts.ModuleResolutionKind.NodeJs;
+        }
+
         this.project = new Project({
             tsConfigFilePath: join(cwd, "tsconfig.json"),
-            compilerOptions: {
-                noEmit: false,
-                outDir: join(cwd, "dist"),
-                // incremental: true,
-            },
+            compilerOptions,
         });
 
         console.log("Loaded", this.project.getSourceFiles().length, "source file(s) from", cwd);
+        console.log("Module system:", this.isEsm ? "ESM" : "CommonJS");
+        console.log("Using module:", compilerOptions.module === ts.ModuleKind.ESNext ? "ESNext" : "CommonJS");
+    }
+
+    /**
+     * Detects if the project is using ESM (ECMAScript Modules)
+     * by checking type in package.json.
+     */
+    private isEsmProject(cwd: string): boolean {
+        try {
+            // Check package.json for "type": "module"
+            const packageJsonPath = join(cwd, "package.json");
+            if (fs.existsSync(packageJsonPath)) {
+                const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, "utf8"));
+                return packageJson.type === "module";
+            }
+        } catch (error) {
+            // If we can't determine, default to CommonJS
+            console.warn("Error detecting module system, defaulting to CommonJS:", error);
+        }
+
+        return false;
+    }
+
+    /**
+     * Gets the module specifier for imports, adding .js extension for ESM
+     */
+    private getModuleSpecifier(fromFile: SourceFile, toFile: SourceFile): string {
+        let moduleSpecifier = fromFile.getRelativePathAsModuleSpecifierTo(toFile);
+
+        // Add .js extension for ESM imports (only for relative paths)
+        if (this.isEsm && !moduleSpecifier.startsWith("@") && !moduleSpecifier.endsWith(".js")) {
+            moduleSpecifier += ".js";
+        }
+
+        return moduleSpecifier;
     }
 
     /**
@@ -173,7 +226,7 @@ autoRegisteredHandlers.push(...handlers);
 
             imports.push({
                 defaultImport: "* as " + namespaceImport,
-                moduleSpecifier: generatedFile.getRelativePathAsModuleSpecifierTo(sf),
+                moduleSpecifier: this.getModuleSpecifier(generatedFile, sf),
             });
 
             const assumedHttpMethod = getHttpMethodFromHandlerName(sf.getBaseName());
@@ -252,7 +305,7 @@ autoRegisteredHandlers.push(...handlers);
 
             imports.push({
                 defaultImport: sf.getBaseNameWithoutExtension(),
-                moduleSpecifier: generatedFile.getRelativePathAsModuleSpecifierTo(sf),
+                moduleSpecifier: this.getModuleSpecifier(generatedFile, sf),
             });
 
             reposArr.insertElement(
@@ -288,10 +341,11 @@ autoRegisteredHandlers.push(...handlers);
         const sf = this.createSourceFile(
             ["start.ts"],
             `// Generated ${new Date()}
-import "./generatedHandlers";
-import "./generatedRepos";
-import "./generatedJobs";
-import "..${appEntryScript.replace(/\.ts/g, "")}";
+import "./generatedHandlers${this.isEsm ? ".js" : ""}";
+import "./generatedRepos${this.isEsm ? ".js" : ""}";
+import "./generatedJobs${this.isEsm ? ".js" : ""}";
+import "..${appEntryScript.replace(/\.ts/g, "")}${this.isEsm ? ".js" : ""}";
+export default {}; // Export an empty object to make it a module
 `
         );
 
@@ -660,7 +714,7 @@ autoRegisteredJobs.push(...jobs);
 
             imports.push({
                 defaultImport: "* as " + namespaceImport,
-                moduleSpecifier: generatedFile.getRelativePathAsModuleSpecifierTo(sf),
+                moduleSpecifier: this.getModuleSpecifier(generatedFile, sf),
             });
 
             // Append metadata to source file that will be part of emitted dist bundle (javascript)