@flink-app/flink 0.12.1-alpha.4 → 0.12.1-alpha.44

package/spec/mock-project/dist/src/handlers/ManuallyAddedHandler2.js

@@ -54,3 +54,5 @@ var manuallyAddedHandler = function (_a) { return __awaiter(void 0, [_a], void 0
 exports.default = manuallyAddedHandler;
 exports.__assumedHttpMethod = "", exports.__file = "ManuallyAddedHandler2.ts", exports.__query = [], exports.__params = [];
 exports.__schemas = { reqSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "model": { "type": "string" }, "metadata": { "type": "object", "properties": { "created": { "type": "string", "format": "date-time" } }, "additionalProperties": false } }, "required": ["model"], "definitions": {} }, resSchema: undefined };
+exports.__assumedHttpMethod = "", exports.__file = "ManuallyAddedHandler2.ts", exports.__query = [], exports.__params = [];
+exports.__schemas = { reqSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "model": { "type": "string" }, "metadata": { "type": "object", "properties": { "created": { "type": "string", "format": "date-time" } }, "additionalProperties": false } }, "required": ["model"], "definitions": {} }, resSchema: undefined };

package/spec/mock-project/dist/src/handlers/PostCar.js

@@ -53,3 +53,5 @@ var PostCar = function (_a) { return __awaiter(void 0, [_a], void 0, function (_
 exports.default = PostCar;
 exports.__assumedHttpMethod = "post", exports.__file = "PostCar.ts", exports.__query = [], exports.__params = [];
 exports.__schemas = { reqSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "model": { "type": "string" }, "metadata": { "type": "object", "properties": { "created": { "type": "string", "format": "date-time" } }, "additionalProperties": false } }, "required": ["model"], "definitions": {} }, resSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "model": { "type": "string" }, "metadata": { "type": "object", "properties": { "created": { "type": "string", "format": "date-time" } }, "additionalProperties": false } }, "required": ["model"], "definitions": {} } };
+exports.__assumedHttpMethod = "post", exports.__file = "PostCar.ts", exports.__query = [], exports.__params = [];
+exports.__schemas = { reqSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "model": { "type": "string" }, "metadata": { "type": "object", "properties": { "created": { "type": "string", "format": "date-time" } }, "additionalProperties": false } }, "required": ["model"], "definitions": {} }, resSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "model": { "type": "string" }, "metadata": { "type": "object", "properties": { "created": { "type": "string", "format": "date-time" } }, "additionalProperties": false } }, "required": ["model"], "definitions": {} } };

package/spec/mock-project/dist/src/handlers/PostLogin.js

@@ -54,3 +54,5 @@ var PostLogin = function (_a) { return __awaiter(void 0, [_a], void 0, function
 exports.default = PostLogin;
 exports.__assumedHttpMethod = "post", exports.__file = "PostLogin.ts", exports.__query = [], exports.__params = [];
 exports.__schemas = { reqSchema: undefined, resSchema: undefined };
+exports.__assumedHttpMethod = "post", exports.__file = "PostLogin.ts", exports.__query = [], exports.__params = [];
+exports.__schemas = { reqSchema: undefined, resSchema: undefined };

package/spec/mock-project/dist/src/handlers/{GetCarWithOmitSchema.js → PostLogout.js}

@@ -14,7 +14,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -38,22 +38,20 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.__schemas = exports.__params = exports.__query = exports.__file = exports.__assumedHttpMethod = exports.Route = void 0;
 exports.Route = {
-    path: "/car-with-omit-schema",
+    path: "/logout",
 };
-// interface CarWithoutId extends Omit<Car, "_id"> {}
-var GetCarWithOmitSchema = function (_a) {
-    var ctx = _a.ctx, req = _a.req;
-    return __awaiter(void 0, void 0, void 0, function () {
-        return __generator(this, function (_b) {
-            return [2 /*return*/, {
-                    data: {
-                        model: "Volvo",
-                        foo: 1,
-                    },
-                }];
-        });
+var PostLogout = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b) {
+    var ctx = _b.ctx, req = _b.req;
+    return __generator(this, function (_c) {
+        return [2 /*return*/, {
+                data: {
+                    success: true,
+                },
+            }];
     });
-};
-exports.default = GetCarWithOmitSchema;
-exports.__assumedHttpMethod = "get", exports.__file = "GetCarWithOmitSchema.ts", exports.__query = [], exports.__params = [];
-exports.__schemas = { reqSchema: undefined, resSchema: undefined };
+}); };
+exports.default = PostLogout;
+exports.__assumedHttpMethod = "post", exports.__file = "PostLogout.ts", exports.__query = [], exports.__params = [];
+exports.__schemas = { reqSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "definitions": {} }, resSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "properties": { "success": { "type": "boolean" } }, "required": ["success"], "additionalProperties": false, "definitions": {} } };
+exports.__assumedHttpMethod = "post", exports.__file = "PostLogout.ts", exports.__query = [], exports.__params = [];
+exports.__schemas = { reqSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "definitions": {} }, resSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "properties": { "success": { "type": "boolean" } }, "required": ["success"], "additionalProperties": false, "definitions": {} } };

package/spec/mock-project/dist/src/handlers/PutCar.js

@@ -53,3 +53,5 @@ var PutCar = function (_a) { return __awaiter(void 0, [_a], void 0, function (_b
 exports.default = PutCar;
 exports.__assumedHttpMethod = "put", exports.__file = "PutCar.ts", exports.__query = [], exports.__params = [];
 exports.__schemas = { reqSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "model": { "type": "string" }, "metadata": { "type": "object", "properties": { "created": { "type": "string", "format": "date-time" } }, "additionalProperties": false } }, "required": ["model"], "definitions": {} }, resSchema: undefined };
+exports.__assumedHttpMethod = "put", exports.__file = "PutCar.ts", exports.__query = [], exports.__params = [];
+exports.__schemas = { reqSchema: { "$schema": "http://json-schema.org/draft-07/schema#", "type": "object", "additionalProperties": false, "properties": { "model": { "type": "string" }, "metadata": { "type": "object", "properties": { "created": { "type": "string", "format": "date-time" } }, "additionalProperties": false } }, "required": ["model"], "definitions": {} }, resSchema: undefined };

package/spec/mock-project/src/handlers/PostLogout.ts

@@ -0,0 +1,19 @@
+import { Handler, RouteProps } from "@flink-app/flink";
+
+interface LogoutResponse {
+  success: boolean;
+}
+
+export const Route: RouteProps = {
+  path: "/logout",
+};
+
+const PostLogout: Handler<any, {}, LogoutResponse> = async ({ ctx, req }) => {
+  return {
+    data: {
+      success: true,
+    },
+  };
+};
+
+export default PostLogout;

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;
@@ -529,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,
                     });
@@ -593,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;
@@ -740,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;
 
@@ -776,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);
@@ -820,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() {
@@ -836,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
 `
         );
 
@@ -410,15 +464,19 @@ import "..${appEntryScript.replace(/\.ts/g, "")}";
              * We need extract `{car: Car}` into its own interface and make sure
              * to import types if needed to
              */
-            const declaration = schema.getSymbolOrThrow().getDeclarations()[0];
-
-            const typeRefIdentifiers = declaration
-                .getDescendantsOfKind(SyntaxKind.TypeReference)
-                .map((typeRef) => typeRef.getFirstChildByKindOrThrow(SyntaxKind.Identifier));
-
-            typeRefIdentifiers.forEach((tr) => {
-                this.tsSchemasSymbolsToImports.push(tr.getSymbolOrThrow().getDeclaredType().getSymbolOrThrow());
-            });
+            const declarations = schema.getSymbolOrThrow().getDeclarations();
+            const declaration = declarations[0];
+
+            // Only extract type references if declaration exists (won't exist for empty object literals like {})
+            if (declaration) {
+                const typeRefIdentifiers = declaration
+                    .getDescendantsOfKind(SyntaxKind.TypeReference)
+                    .map((typeRef) => typeRef.getFirstChildByKindOrThrow(SyntaxKind.Identifier));
+
+                typeRefIdentifiers.forEach((tr) => {
+                    this.tsSchemasSymbolsToImports.push(tr.getSymbolOrThrow().getDeclaredType().getSymbolOrThrow());
+                });
+            }
 
             generatedSchemaInterfaceStr = `export interface ${schemaInterfaceName} { ${schema
                 .getProperties()
@@ -660,7 +718,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)