@flink-app/flink 0.12.1-alpha.9 → 0.13.0

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) {
@@ -20,8 +43,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -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,65 @@ 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;
+        }
+        var tsConfigPath = (0, path_1.join)(cwd, "tsconfig.json");
+        console.log("TypeScript config path:", require("path").resolve(tsConfigPath));
+        console.log("TypeScript version:", ts_morph_1.ts.version);
         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,
-            },
+            tsConfigFilePath: tsConfigPath,
+            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
@@ -182,7 +254,7 @@ var TypeScriptCompiler = /** @class */ (function () {
      */
     TypeScriptCompiler.prototype.parseHandlers = function () {
         return __awaiter(this, arguments, void 0, function (excludeDirs) {
-            var generatedFile, handlersArr, handlers, jsonSchemas;
+            var generatedFile, handlersArr, handlers, schemaFilePath, jsonSchemas;
             if (excludeDirs === void 0) { excludeDirs = []; }
             return __generator(this, function (_a) {
                 switch (_a.label) {
@@ -198,8 +270,8 @@ var TypeScriptCompiler = /** @class */ (function () {
                         _a.sent();
                         return [4 /*yield*/, this.createIntermediateSchemaFile()];
                     case 3:
-                        _a.sent();
-                        return [4 /*yield*/, this.generateAndSaveJsonSchemas(handlers.schemasToGenerate)];
+                        schemaFilePath = _a.sent();
+                        return [4 /*yield*/, this.generateAndSaveJsonSchemas(handlers.schemasToGenerate, schemaFilePath)];
                     case 4:
                         jsonSchemas = _a.sent();
                         this.appendSchemasToHandlerSourceFiles(handlers.schemasToGenerate, jsonSchemas);
@@ -213,32 +285,44 @@ var TypeScriptCompiler = /** @class */ (function () {
      */
     TypeScriptCompiler.prototype.parseHandlerDir = function (generatedFile, handlersArr) {
         return __awaiter(this, void 0, void 0, function () {
-            var imports, i, schemasToGenerate, _i, _a, sf, isAutoRegister, namespaceImport, assumedHttpMethod, schemaTypes;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var imports, i, schemasToGenerate, _i, _a, sf, isAutoRegister, namespaceImport, assumedHttpMethod, schemaTypes, _b, existingVars;
+            return __generator(this, function (_c) {
+                switch (_c.label) {
                     case 0:
                         imports = [];
                         i = 0;
                         schemasToGenerate = [];
                         _i = 0, _a = this.project.getSourceFiles();
-                        _b.label = 1;
+                        _c.label = 1;
                     case 1:
-                        if (!(_i < _a.length)) return [3 /*break*/, 4];
+                        if (!(_i < _a.length)) return [3 /*break*/, 6];
                         sf = _a[_i];
                         if (!sf.getFilePath().includes("src/handlers/")) {
-                            return [3 /*break*/, 3];
+                            return [3 /*break*/, 5];
                         }
                         isAutoRegister = this.isAutoRegisterableHandler(sf);
                         console.log("Detected handler ".concat(sf.getBaseName(), " ").concat(!isAutoRegister ? "(requires manual registration)" : ""));
                         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());
+                        if (!isAutoRegister) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.extractSchemasFromHandlerSourceFile(sf)];
                     case 2:
-                        schemaTypes = _b.sent();
+                        _b = _c.sent();
+                        return [3 /*break*/, 4];
+                    case 3:
+                        _b = undefined;
+                        _c.label = 4;
+                    case 4:
+                        schemaTypes = _b;
+                        existingVars = sf.getVariableStatements().filter(function (vs) {
+                            var varNames = vs.getDeclarations().map(function (d) { return d.getName(); });
+                            return varNames.some(function (name) { return ["__assumedHttpMethod", "__file", "__query", "__params"].includes(name); });
+                        });
+                        existingVars.forEach(function (v) { return v.remove(); });
                         // Append schemas and metadata to source file that will be part of emitted dist bundle (javascript)
                         sf.addVariableStatement({
                             declarationKind: ts_morph_1.VariableDeclarationKind.Const,
@@ -275,15 +359,16 @@ var TypeScriptCompiler = /** @class */ (function () {
                         if (isAutoRegister) {
                             handlersArr.insertElement(i, "{handler: ".concat(namespaceImport, ", assumedHttpMethod: ").concat(assumedHttpMethod ? "HttpMethod." + assumedHttpMethod : undefined, "}"));
                             i++;
+                            // Add schemas to generate list
+                            if (schemaTypes) {
+                                schemasToGenerate.push(__assign(__assign({}, schemaTypes), { sourceFile: sf }));
+                            }
                         }
-                        if (schemaTypes) {
-                            schemasToGenerate.push(__assign(__assign({}, schemaTypes), { sourceFile: sf }));
-                        }
-                        _b.label = 3;
-                    case 3:
+                        _c.label = 5;
+                    case 5:
                         _i++;
                         return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/, {
+                    case 6: return [2 /*return*/, {
                             imports: imports,
                             schemasToGenerate: schemasToGenerate,
                         }];
@@ -309,7 +394,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 +426,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();
@@ -397,7 +482,7 @@ var TypeScriptCompiler = /** @class */ (function () {
     };
     TypeScriptCompiler.prototype.saveIntermediateTsSchema = function (schema, handlerFile, suffix) {
         return __awaiter(this, void 0, void 0, function () {
-            var handlerFileName, generatedSchemaInterfaceStr, schemaInterfaceName, schemaSymbol, interfaceName, declaration, _i, _a, typeToImport, arrayTypeArg, schemaSymbol, interfaceName, declaration, props, _b, _c, typeToImport, declaration, typeRefIdentifiers;
+            var handlerFileName, generatedSchemaInterfaceStr, schemaInterfaceName, schemaSymbol, interfaceName, declaration, _i, _a, typeToImport, arrayTypeArg, schemaSymbol, interfaceName, declaration, props, _b, _c, typeToImport, declarations, declaration, typeRefIdentifiers;
             var _this = this;
             return __generator(this, function (_d) {
                 if (schema.isAny()) {
@@ -454,13 +539,17 @@ var TypeScriptCompiler = /** @class */ (function () {
                     }
                 }
                 else if (schema.isObject()) {
-                    declaration = schema.getSymbolOrThrow().getDeclarations()[0];
-                    typeRefIdentifiers = declaration
-                        .getDescendantsOfKind(ts_morph_1.SyntaxKind.TypeReference)
-                        .map(function (typeRef) { return typeRef.getFirstChildByKindOrThrow(ts_morph_1.SyntaxKind.Identifier); });
-                    typeRefIdentifiers.forEach(function (tr) {
-                        _this.tsSchemasSymbolsToImports.push(tr.getSymbolOrThrow().getDeclaredType().getSymbolOrThrow());
-                    });
+                    declarations = schema.getSymbolOrThrow().getDeclarations();
+                    declaration = declarations[0];
+                    // Only extract type references if declaration exists (won't exist for empty object literals like {})
+                    if (declaration) {
+                        typeRefIdentifiers = declaration
+                            .getDescendantsOfKind(ts_morph_1.SyntaxKind.TypeReference)
+                            .map(function (typeRef) { return typeRef.getFirstChildByKindOrThrow(ts_morph_1.SyntaxKind.Identifier); });
+                        typeRefIdentifiers.forEach(function (tr) {
+                            _this.tsSchemasSymbolsToImports.push(tr.getSymbolOrThrow().getDeclaredType().getSymbolOrThrow());
+                        });
+                    }
                     generatedSchemaInterfaceStr = "export interface ".concat(schemaInterfaceName, " { ").concat(schema
                         .getProperties()
                         .map(function (p) { return p.getValueDeclarationOrThrow().getText(); })
@@ -477,8 +566,10 @@ var TypeScriptCompiler = /** @class */ (function () {
             });
         });
     };
-    TypeScriptCompiler.prototype.initJsonSchemaGenerator = function () {
+    TypeScriptCompiler.prototype.initJsonSchemaGenerator = function (schemaFilePath) {
+        var tsconfigPath = (0, path_1.join)(this.cwd, "tsconfig.json");
         var conf = {
+            path: schemaFilePath, // Point to the intermediate schema file
             expose: "none", // Do not create shared $ref definitions.
             topRef: false, // Removes the wrapper object around the schema.
             additionalProperties: false,
@@ -492,27 +583,38 @@ var TypeScriptCompiler = /** @class */ (function () {
             extraTags: [],
             functions: "fail",
             discriminatorType: "json-schema",
+            // tsconfig: tsconfigPath,
         };
+        console.log("Creating TypeScript program for schema generation:");
+        console.log("  Schema file:", schemaFilePath);
+        console.log("  tsconfig:", tsconfigPath);
+        // Create a fresh TypeScript Program that includes the schema file
+        // This ensures ts-json-schema-generator can find the types we just generated
+        var program = (0, ts_json_schema_generator_1.createProgram)(conf);
+        console.log("  TypeScript version:", ts_morph_1.ts.version);
+        console.log("  Program root files:", program.getRootFileNames().length);
         var formatter = (0, ts_json_schema_generator_1.createFormatter)(conf);
-        var parser = (0, ts_json_schema_generator_1.createParser)(this.project.getProgram().compilerObject, conf);
-        var generator = new ts_json_schema_generator_1.SchemaGenerator(this.project.getProgram().compilerObject, parser, formatter, conf);
+        var parser = (0, ts_json_schema_generator_1.createParser)(program, conf);
+        var generator = new ts_json_schema_generator_1.SchemaGenerator(program, parser, formatter, conf);
         return generator;
     };
-    TypeScriptCompiler.prototype.generateAndSaveJsonSchemas = function (schemas) {
+    TypeScriptCompiler.prototype.generateAndSaveJsonSchemas = function (schemas, schemaFilePath) {
         return __awaiter(this, void 0, void 0, function () {
             var jsonSchemas, _i, schemas_1, _a, reqSchemaType, resSchemaType, mergedSchemas, filePath;
             var _b, _c;
             return __generator(this, function (_d) {
                 switch (_d.label) {
                     case 0:
+                        // Reset schema generator to use the newly created intermediate schema file
+                        this.schemaGenerator = undefined;
                         jsonSchemas = [];
                         for (_i = 0, schemas_1 = schemas; _i < schemas_1.length; _i++) {
                             _a = schemas_1[_i], reqSchemaType = _a.reqSchemaType, resSchemaType = _a.resSchemaType;
                             if (reqSchemaType) {
-                                jsonSchemas.push({ definitions: (_b = {}, _b[reqSchemaType] = this.generateJsonSchema(reqSchemaType), _b) });
+                                jsonSchemas.push({ definitions: (_b = {}, _b[reqSchemaType] = this.generateJsonSchema(reqSchemaType, schemaFilePath), _b) });
                             }
                             if (resSchemaType) {
-                                jsonSchemas.push({ definitions: (_c = {}, _c[resSchemaType] = this.generateJsonSchema(resSchemaType), _c) });
+                                jsonSchemas.push({ definitions: (_c = {}, _c[resSchemaType] = this.generateJsonSchema(resSchemaType, schemaFilePath), _c) });
                             }
                         }
                         mergedSchemas = jsonSchemas.reduce(function (out, schema) {
@@ -535,9 +637,9 @@ var TypeScriptCompiler = /** @class */ (function () {
             });
         });
     };
-    TypeScriptCompiler.prototype.generateJsonSchema = function (typeName) {
+    TypeScriptCompiler.prototype.generateJsonSchema = function (typeName, schemaFilePath) {
         if (!this.schemaGenerator) {
-            this.schemaGenerator = this.initJsonSchemaGenerator();
+            this.schemaGenerator = this.initJsonSchemaGenerator(schemaFilePath);
         }
         return this.schemaGenerator.createSchema(typeName);
     };
@@ -595,9 +697,16 @@ var TypeScriptCompiler = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             var schemaSourceFile;
             return __generator(this, function (_a) {
-                schemaSourceFile = this.createSourceFile(["schemas", "schemas.ts"], "// Generated ".concat(new Date(), "\n").concat(this.parsedTsSchemas.join("\n\n")));
-                (0, TypeScriptUtils_1.addImports)(schemaSourceFile, this.tsSchemasSymbolsToImports);
-                return [2 /*return*/, schemaSourceFile.save()];
+                switch (_a.label) {
+                    case 0:
+                        schemaSourceFile = this.createSourceFile(["schemas", "schemas.ts"], "// Generated ".concat(new Date(), "\n").concat(this.parsedTsSchemas.join("\n\n")));
+                        (0, TypeScriptUtils_1.addImports)(schemaSourceFile, this.tsSchemasSymbolsToImports);
+                        return [4 /*yield*/, schemaSourceFile.save()];
+                    case 1:
+                        _a.sent();
+                        // Return the file path so it can be used by ts-json-schema-generator
+                        return [2 /*return*/, schemaSourceFile.getFilePath()];
+                }
             });
         });
     };
@@ -637,6 +746,12 @@ var TypeScriptCompiler = /** @class */ (function () {
             }
             var reqJsonSchema = JSON.stringify(reqSchemaType ? jsonSchemaDefs[reqSchemaType] : undefined);
             var resJsonSchema = JSON.stringify(resSchemaType ? jsonSchemaDefs[resSchemaType] : undefined);
+            // Remove existing __schemas variable if it exists (to avoid redeclaration errors)
+            var existingSchemas = sourceFile.getVariableStatements().filter(function (vs) {
+                var varNames = vs.getDeclarations().map(function (d) { return d.getName(); });
+                return varNames.includes("__schemas");
+            });
+            existingSchemas.forEach(function (v) { return v.remove(); });
             sourceFile.addVariableStatement({
                 declarationKind: ts_morph_1.VariableDeclarationKind.Const,
                 isExported: true,
@@ -655,7 +770,7 @@ var TypeScriptCompiler = /** @class */ (function () {
      */
     TypeScriptCompiler.prototype.parseJobs = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var generatedFile, jobsArr, imports, i, _i, _a, sf, namespaceImport;
+            var generatedFile, jobsArr, imports, i, _i, _a, sf, namespaceImport, existingFile;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -672,8 +787,13 @@ var TypeScriptCompiler = /** @class */ (function () {
                             namespaceImport = sf.getBaseNameWithoutExtension().replace(/\./g, "_") + "_" + i;
                             imports.push({
                                 defaultImport: "* as " + namespaceImport,
-                                moduleSpecifier: generatedFile.getRelativePathAsModuleSpecifierTo(sf),
+                                moduleSpecifier: this.getModuleSpecifier(generatedFile, sf),
+                            });
+                            existingFile = sf.getVariableStatements().filter(function (vs) {
+                                var varNames = vs.getDeclarations().map(function (d) { return d.getName(); });
+                                return varNames.includes("__file");
                             });
+                            existingFile.forEach(function (v) { return v.remove(); });
                             // Append metadata to source file that will be part of emitted dist bundle (javascript)
                             sf.addVariableStatement({
                                 declarationKind: ts_morph_1.VariableDeclarationKind.Const,

package/dist/src/TypeScriptUtils.js

@@ -1,6 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getTypeMetadata = exports.getSymbolOrAlias = exports.getInterfaceName = exports.getDefaultExport = exports.addImports = exports.addImport = exports.getTypesToImport = void 0;
+exports.getTypesToImport = getTypesToImport;
+exports.addImport = addImport;
+exports.addImports = addImports;
+exports.getDefaultExport = getDefaultExport;
+exports.getInterfaceName = getInterfaceName;
+exports.getSymbolOrAlias = getSymbolOrAlias;
+exports.getTypeMetadata = getTypeMetadata;
 var ts_morph_1 = require("ts-morph");
 var utils_1 = require("./utils");
 /**
@@ -34,7 +40,6 @@ function getTypesToImport(node) {
     }
     return typesToImport;
 }
-exports.getTypesToImport = getTypesToImport;
 function addImport(toSourceFile, symbol) {
     var symbolDeclaration = symbol.getDeclarations()[0];
     if (!symbolDeclaration) {
@@ -66,7 +71,6 @@ function addImport(toSourceFile, symbol) {
         });
     }
 }
-exports.addImport = addImport;
 /**
  * Adds imports to modules where provided symbols resides.
  * Imports are added to provided source file.
@@ -110,7 +114,6 @@ function addImports(toSourceFile, symbols) {
         });
     }));
 }
-exports.addImports = addImports;
 /**
  * Helper to get the default export, if any, from a source file.
  * @param sf
@@ -128,7 +131,6 @@ function getDefaultExport(sf) {
         }
     }
 }
-exports.getDefaultExport = getDefaultExport;
 /**
  * Returns name of interface from interface symbol.
  *
@@ -142,11 +144,9 @@ function getInterfaceName(symbol) {
     }
     return declaration.getFirstChildByKindOrThrow(ts_morph_1.SyntaxKind.Identifier).getText();
 }
-exports.getInterfaceName = getInterfaceName;
 function getSymbolOrAlias(type) {
     return type.getAliasSymbol() || type.getSymbol();
 }
-exports.getSymbolOrAlias = getSymbolOrAlias;
 function getTypeMetadata(type) {
     if (!type || ["void", "any"].includes(type.getText())) {
         return [];
@@ -168,4 +168,3 @@ function getTypeMetadata(type) {
         };
     });
 }
-exports.getTypeMetadata = getTypeMetadata;

package/dist/src/index.d.ts

@@ -9,3 +9,4 @@ export * from "./FlinkPlugin";
 export * from "./FlinkJob";
 export * from "./auth/FlinkAuthUser";
 export * from "./auth/FlinkAuthPlugin";
+export type { Request as ExpressRequest, Response as ExpressResponse, NextFunction as ExpressNextFunction, RequestHandler as ExpressRequestHandler, ErrorRequestHandler as ExpressErrorRequestHandler, Express, static as expressStatic, } from "express";

package/dist/src/utils.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 var __generator = (this && this.__generator) || function (thisArg, body) {
-    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
-    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g = Object.create((typeof Iterator === "function" ? Iterator : Object).prototype);
+    return g.next = verb(0), g["throw"] = verb(1), g["return"] = verb(2), typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
@@ -39,7 +39,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPathParams = exports.getJsDocComment = exports.getHttpMethodFromHandlerName = exports.getRepoInstanceName = exports.getCollectionNameForRepo = exports.getSchemaFiles = exports.getHandlerFiles = exports.isError = exports.isRouteMatch = exports.schemasPath = exports.handlersPath = void 0;
+exports.handlersPath = handlersPath;
+exports.schemasPath = schemasPath;
+exports.isRouteMatch = isRouteMatch;
+exports.isError = isError;
+exports.getHandlerFiles = getHandlerFiles;
+exports.getSchemaFiles = getSchemaFiles;
+exports.getCollectionNameForRepo = getCollectionNameForRepo;
+exports.getRepoInstanceName = getRepoInstanceName;
+exports.getHttpMethodFromHandlerName = getHttpMethodFromHandlerName;
+exports.getJsDocComment = getJsDocComment;
+exports.getPathParams = getPathParams;
 var path_1 = require("path");
 var tiny_glob_1 = __importDefault(require("tiny-glob"));
 var FlinkHttpHandler_1 = require("./FlinkHttpHandler");
@@ -47,11 +57,9 @@ var FlinkLog_1 = require("./FlinkLog");
 function handlersPath(appRoot) {
     return (0, path_1.join)(appRoot, "src", "handlers");
 }
-exports.handlersPath = handlersPath;
 function schemasPath(appRoot) {
     return (0, path_1.join)(appRoot, "src", "schemas");
 }
-exports.schemasPath = schemasPath;
 function isRouteMatch(req, routes) {
     var match = routes.find(function (_a) {
         var method = _a.method, path = _a.path;
@@ -61,11 +69,9 @@ function isRouteMatch(req, routes) {
     });
     return !!match;
 }
-exports.isRouteMatch = isRouteMatch;
 function isError(message) {
     return message.status && message.status > 399;
 }
-exports.isError = isError;
 function getHandlerFiles(appRoot) {
     return __awaiter(this, void 0, void 0, function () {
         var err_1;
@@ -87,7 +93,6 @@ function getHandlerFiles(appRoot) {
         });
     });
 }
-exports.getHandlerFiles = getHandlerFiles;
 function getSchemaFiles(appRoot) {
     return __awaiter(this, void 0, void 0, function () {
         var err_2;
@@ -108,16 +113,13 @@ function getSchemaFiles(appRoot) {
         });
     });
 }
-exports.getSchemaFiles = getSchemaFiles;
 function getCollectionNameForRepo(repoFilename) {
     return repoFilename.replace("Repo.ts", "").toLowerCase();
 }
-exports.getCollectionNameForRepo = getCollectionNameForRepo;
 function getRepoInstanceName(fn) {
     var name = fn.split(".ts")[0];
     return name.charAt(0).toLowerCase() + name.substr(1);
 }
-exports.getRepoInstanceName = getRepoInstanceName;
 /**
  * Get http method from props or convention based on file name
  * if it starts with i.e "GetFoo"
@@ -137,7 +139,6 @@ function getHttpMethodFromHandlerName(handlerFilename) {
     if (handlerFilename.startsWith(FlinkHttpHandler_1.HttpMethod.delete))
         return FlinkHttpHandler_1.HttpMethod.delete;
 }
-exports.getHttpMethodFromHandlerName = getHttpMethodFromHandlerName;
 function getJsDocComment(comment) {
     var rows = comment.split("\n").map(function (line) {
         line = line.trim();
@@ -148,7 +149,6 @@ function getJsDocComment(comment) {
     });
     return rows.join("\n").trim();
 }
-exports.getJsDocComment = getJsDocComment;
 var pathParamsRegex = /:([a-zA-Z0-9]+)/g;
 /**
  * Returns array of path params from path string.
@@ -160,4 +160,3 @@ function getPathParams(path) {
     var _a;
     return ((_a = path.match(pathParamsRegex)) === null || _a === void 0 ? void 0 : _a.map(function (match) { return match.slice(1); })) || [];
 }
-exports.getPathParams = getPathParams;