@flink-app/flink 0.7.0-alpha.0 → 0.11.0

package/dist/src/FlinkApp.d.ts

@@ -5,7 +5,7 @@ import { Db } from "mongodb";
 import { ToadScheduler } from "toad-scheduler";
 import { FlinkAuthPlugin } from "./auth/FlinkAuthPlugin";
 import { FlinkContext } from "./FlinkContext";
-import { FlinkCompileTimeHandlerDetails, HandlerFile, HttpMethod, QueryParamMetadata, RouteProps } from "./FlinkHttpHandler";
+import { HandlerFile, HttpMethod, QueryParamMetadata, RouteProps } from "./FlinkHttpHandler";
 import { FlinkJobFile } from "./FlinkJob";
 import { FlinkPlugin } from "./FlinkPlugin";
 import { FlinkRepo } from "./FlinkRepo";
@@ -14,11 +14,10 @@ export declare type JSONSchema = JSONSchema7;
  * This will be populated at compile time when the apps handlers
  * are picked up by TypeScript compiler
  */
-export declare const autoRegisteredHandlers: ({
+export declare const autoRegisteredHandlers: {
     handler: HandlerFile;
     assumedHttpMethod: HttpMethod;
-    Route?: RouteProps;
-} & FlinkCompileTimeHandlerDetails)[];
+}[];
 /**
  * This will be populated at compile time when the apps repos
  * are picked up by TypeScript compiler
@@ -183,7 +182,7 @@ export declare class FlinkApp<C extends FlinkContext> {
      * Typescript compiler will scan handler function and set schemas
      * which are derived from handler function type arguments.
      */
-    addHandler(handler: HandlerFile & FlinkCompileTimeHandlerDetails, routePropsOverride?: Partial<HandlerConfig["routeProps"]>): void;
+    addHandler(handler: HandlerFile, routePropsOverride?: Partial<HandlerConfig["routeProps"]>): void;
     private registerHandler;
     /**
      * Register handlers found within the `/src/handlers`

package/dist/src/FlinkApp.js

@@ -400,40 +400,41 @@ var FlinkApp = /** @class */ (function () {
      * Will not register any handlers added programmatically.
      */
     FlinkApp.prototype.registerAutoRegisterableHandlers = function () {
+        var _a, _b, _c;
         return __awaiter(this, void 0, void 0, function () {
-            var _i, autoRegisteredHandlers_1, _a, handler, assumedHttpMethod, __file, __params, __query, __schemas, pathParams, _b, __params_1, param;
-            return __generator(this, function (_c) {
+            var _i, autoRegisteredHandlers_1, _d, handler, assumedHttpMethod, pathParams, _e, _f, param;
+            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, __file = _a.__file, __params = _a.__params, __query = _a.__query, __schemas = _a.__schemas;
+                    _d = autoRegisteredHandlers_1[_i], handler = _d.handler, assumedHttpMethod = _d.assumedHttpMethod;
                     if (!handler.Route) {
-                        FlinkLog_1.log.error("Missing Props in handler " + __file);
+                        FlinkLog_1.log.error("Missing Props in handler " + handler.__file);
                         continue;
                     }
                     if (!handler.default) {
-                        FlinkLog_1.log.error("Missing exported handler function in handler " + __file);
+                        FlinkLog_1.log.error("Missing exported handler function in handler " + handler.__file);
                         continue;
                     }
-                    if (!!(__params === null || __params === void 0 ? void 0 : __params.length)) {
+                    if (!!((_a = handler.__params) === null || _a === void 0 ? void 0 : _a.length)) {
                         pathParams = utils_1.getPathParams(handler.Route.path);
-                        for (_b = 0, __params_1 = __params; _b < __params_1.length; _b++) {
-                            param = __params_1[_b];
+                        for (_e = 0, _f = handler.__params; _e < _f.length; _e++) {
+                            param = _f[_e];
                             if (!pathParams.includes(param.name)) {
-                                FlinkLog_1.log.error("Handler " + __file + " has param " + param.name + " but it is not present in the path '" + handler.Route.path + "'");
+                                FlinkLog_1.log.error("Handler " + handler.__file + " has param " + param.name + " but it is not present in the path '" + handler.Route.path + "'");
                                 throw new Error("Invalid/missing handler path param");
                             }
                         }
-                        if (pathParams.length !== __params.length) {
-                            FlinkLog_1.log.warn("Handler " + __file + " has " + __params.length + " typed params but the path '" + handler.Route.path + "' has " + pathParams.length + " params");
+                        if (pathParams.length !== handler.__params.length) {
+                            FlinkLog_1.log.warn("Handler " + handler.__file + " has " + handler.__params.length + " typed params but the path '" + handler.Route.path + "' has " + pathParams.length + " params");
                         }
                     }
                     this.registerHandler({
                         routeProps: __assign(__assign({}, handler.Route), { method: handler.Route.method || assumedHttpMethod, origin: this.name }),
                         schema: {
-                            reqSchema: __schemas === null || __schemas === void 0 ? void 0 : __schemas.reqSchema,
-                            resSchema: __schemas === null || __schemas === void 0 ? void 0 : __schemas.resSchema,
+                            reqSchema: (_b = handler.__schemas) === null || _b === void 0 ? void 0 : _b.reqSchema,
+                            resSchema: (_c = handler.__schemas) === null || _c === void 0 ? void 0 : _c.resSchema,
                         },
-                        queryMetadata: __query || [],
-                        paramsMetadata: __params || [],
+                        queryMetadata: handler.__query || [],
+                        paramsMetadata: handler.__params || [],
                     }, handler.default);
                 }
                 return [2 /*return*/];

package/dist/src/FlinkHttpHandler.d.ts

@@ -89,12 +89,6 @@ export declare type GetHandler<Ctx extends FlinkContext, ResSchema = any, P exte
 export declare type HandlerFile = {
     default: Handler<any, any, any, any, any>;
     Route?: RouteProps;
-};
-export declare type QueryParamMetadata = {
-    name: string;
-    description: string;
-};
-export declare type FlinkCompileTimeHandlerDetails = {
     /**
      * Name of schemas, is set at compile time by Flink compiler.
      */
@@ -115,4 +109,8 @@ export declare type FlinkCompileTimeHandlerDetails = {
      */
     __params?: QueryParamMetadata[];
 };
+export declare type QueryParamMetadata = {
+    name: string;
+    description: string;
+};
 export {};

package/dist/src/TypeScriptCompiler.d.ts

@@ -103,7 +103,7 @@ declare class TypeScriptCompiler {
      * @param handlers
      * @param jsonSchemas
      */
-    private appendSchemasToHandlers;
+    private appendSchemasToHandlerSourceFiles;
     /**
      * Scans project for jobs so they can be registered during start.
      */

package/dist/src/TypeScriptCompiler.js

@@ -46,17 +46,6 @@ 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;
-};
 var __spreadArray = (this && this.__spreadArray) || function (to, from) {
     for (var i = 0, il = from.length, j = to.length; i < il; i++, j++)
         to[j] = from[i];
@@ -190,37 +179,26 @@ var TypeScriptCompiler = /** @class */ (function () {
     TypeScriptCompiler.prototype.parseHandlers = function (excludeDirs) {
         if (excludeDirs === void 0) { excludeDirs = []; }
         return __awaiter(this, void 0, void 0, function () {
-            var generatedFile, parseResult, schemas, jsonSchemas, handlersArr;
+            var generatedFile, handlersArr, handlers, jsonSchemas;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         generatedFile = this.createSourceFile(["generatedHandlers.ts"], "// Generated " + new Date() + "\nimport { autoRegisteredHandlers, HttpMethod } from \"@flink-app/flink\";\nexport const handlers = [];\nautoRegisteredHandlers.push(...handlers);\n    ");
-                        return [4 /*yield*/, this.parseHandlerDir(generatedFile)];
+                        handlersArr = generatedFile.getVariableDeclarationOrThrow("handlers").getFirstDescendantByKindOrThrow(ts_morph_1.SyntaxKind.ArrayLiteralExpression);
+                        return [4 /*yield*/, this.parseHandlerDir(generatedFile, handlersArr)];
                     case 1:
-                        parseResult = _a.sent();
-                        return [4 /*yield*/, this.createIntermediateSchemaFile()];
+                        handlers = _a.sent();
+                        generatedFile.addImportDeclarations(handlers.imports);
+                        return [4 /*yield*/, generatedFile.save()];
                     case 2:
                         _a.sent();
-                        schemas = parseResult.map(function (h) { return h.schemasToGenerate; }).filter(function (s) { return s; });
-                        return [4 /*yield*/, this.generateAndSaveJsonSchemas(schemas)];
+                        return [4 /*yield*/, this.createIntermediateSchemaFile()];
                     case 3:
-                        jsonSchemas = _a.sent();
-                        this.appendSchemasToHandlers(parseResult, jsonSchemas);
-                        generatedFile.addImportDeclarations(parseResult.map(function (h) { return ({ namespaceImport: h.importName, moduleSpecifier: h.moduleSpecifier }); }));
-                        if (parseResult.length > 0) {
-                            handlersArr = generatedFile.getVariableDeclarationOrThrow("handlers").getFirstDescendantByKindOrThrow(ts_morph_1.SyntaxKind.ArrayLiteralExpression);
-                            handlersArr.insertElements(0, parseResult.map(function (parsedHandler) {
-                                // Do some hairy string bending to generate valid typescript from json string
-                                var assumedHttpMethod = parsedHandler.assumedHttpMethod, rest = __rest(parsedHandler, ["assumedHttpMethod"]);
-                                var restStringified = JSON.stringify(rest);
-                                // Now append handler reference the assumedHttpMethod with type (not json strings)
-                                return (restStringified.substring(0, restStringified.length - 1) +
-                                    (",\"assumedHttpMethod\":" + assumedHttpMethod + ",\"handler\":" + parsedHandler.importName + ",\"Route\":" + parsedHandler.importName + ".Route}"));
-                            }));
-                        }
-                        return [4 /*yield*/, generatedFile.save()];
-                    case 4:
                         _a.sent();
+                        return [4 /*yield*/, this.generateAndSaveJsonSchemas(handlers.schemasToGenerate)];
+                    case 4:
+                        jsonSchemas = _a.sent();
+                        this.appendSchemasToHandlerSourceFiles(handlers.schemasToGenerate, jsonSchemas);
                         return [2 /*return*/, generatedFile];
                 }
             });
@@ -229,14 +207,15 @@ var TypeScriptCompiler = /** @class */ (function () {
     /**
      * Scan `/src/handlers/*.ts` for handler files and register those.
      */
-    TypeScriptCompiler.prototype.parseHandlerDir = function (generatedFile) {
+    TypeScriptCompiler.prototype.parseHandlerDir = function (generatedFile, handlersArr) {
         return __awaiter(this, void 0, void 0, function () {
-            var i, parseRes, _i, _a, sf, isAutoRegister, importName, assumedHttpMethod, schemaTypes;
+            var imports, i, schemasToGenerate, _i, _a, sf, isAutoRegister, namespaceImport, assumedHttpMethod, schemaTypes;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
+                        imports = [];
                         i = 0;
-                        parseRes = [];
+                        schemasToGenerate = [];
                         _i = 0, _a = this.project.getSourceFiles();
                         _b.label = 1;
                     case 1:
@@ -247,39 +226,70 @@ var TypeScriptCompiler = /** @class */ (function () {
                         }
                         isAutoRegister = this.isAutoRegisterableHandler(sf);
                         console.log("Detected handler " + sf.getBaseName() + " " + (!isAutoRegister ? "(requires manual registration)" : ""));
-                        importName = sf.getBaseNameWithoutExtension().replace(/\./g, "_") + "_" + i;
+                        namespaceImport = sf.getBaseNameWithoutExtension().replace(/\./g, "_") + "_" + i;
+                        imports.push({
+                            defaultImport: "* as " + namespaceImport,
+                            moduleSpecifier: generatedFile.getRelativePathAsModuleSpecifierTo(sf),
+                        });
                         assumedHttpMethod = utils_1.getHttpMethodFromHandlerName(sf.getBaseName());
                         return [4 /*yield*/, this.extractSchemasFromHandlerSourceFile(sf)];
                     case 2:
                         schemaTypes = _b.sent();
+                        // Append schemas and metadata to source file that will be part of emitted dist bundle (javascript)
+                        sf.addVariableStatement({
+                            declarationKind: ts_morph_1.VariableDeclarationKind.Const,
+                            isExported: true,
+                            declarations: [
+                                {
+                                    name: "__assumedHttpMethod",
+                                    initializer: "\"" + (assumedHttpMethod || "") + "\"",
+                                },
+                                {
+                                    name: "__file",
+                                    initializer: "\"" + sf.getBaseName() + "\"",
+                                },
+                                {
+                                    name: "__query",
+                                    initializer: "[" + ((schemaTypes === null || schemaTypes === void 0 ? void 0 : schemaTypes.queryMetadata) || [])
+                                        .map(function (_a) {
+                                        var description = _a.description, name = _a.name;
+                                        return "{description: \"" + description + "\", name: \"" + name + "\"}";
+                                    })
+                                        .join(",") + "]",
+                                },
+                                {
+                                    name: "__params",
+                                    initializer: "[" + ((schemaTypes === null || schemaTypes === void 0 ? void 0 : schemaTypes.paramsMetadata) || [])
+                                        .map(function (_a) {
+                                        var description = _a.description, name = _a.name;
+                                        return "{description: \"" + description + "\", name: \"" + name + "\"}";
+                                    })
+                                        .join(",") + "]",
+                                },
+                            ],
+                        });
                         if (isAutoRegister) {
-                            parseRes.push({
-                                importName: importName,
-                                moduleSpecifier: generatedFile.getRelativePathAsModuleSpecifierTo(sf),
-                                schemasToGenerate: schemaTypes
-                                    ? {
-                                        reqSchemaType: schemaTypes === null || schemaTypes === void 0 ? void 0 : schemaTypes.reqSchemaType,
-                                        resSchemaType: schemaTypes === null || schemaTypes === void 0 ? void 0 : schemaTypes.resSchemaType,
-                                    }
-                                    : undefined,
-                                assumedHttpMethod: "HttpMethod." + assumedHttpMethod,
-                                __file: sf.getBaseName(),
-                                __query: schemaTypes === null || schemaTypes === void 0 ? void 0 : schemaTypes.queryMetadata,
-                                __params: schemaTypes === null || schemaTypes === void 0 ? void 0 : schemaTypes.paramsMetadata,
-                            });
+                            handlersArr.insertElement(i, "{handler: " + namespaceImport + ", assumedHttpMethod: " + (assumedHttpMethod ? "HttpMethod." + assumedHttpMethod : undefined) + "}");
+                            i++;
+                        }
+                        if (schemaTypes) {
+                            schemasToGenerate.push(__assign(__assign({}, schemaTypes), { sourceFile: sf }));
                         }
                         _b.label = 3;
                     case 3:
                         _i++;
                         return [3 /*break*/, 1];
-                    case 4: return [2 /*return*/, parseRes];
+                    case 4: return [2 /*return*/, {
+                            imports: imports,
+                            schemasToGenerate: schemasToGenerate,
+                        }];
                 }
             });
         });
     };
     TypeScriptCompiler.prototype.parseRepos = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var generatedFile, reposArr, imports, i, reposToInsert, _i, _a, sf;
+            var generatedFile, reposArr, imports, i, _i, _a, sf;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -287,7 +297,6 @@ var TypeScriptCompiler = /** @class */ (function () {
                         reposArr = generatedFile.getVariableDeclarationOrThrow("repos").getFirstDescendantByKindOrThrow(ts_morph_1.SyntaxKind.ArrayLiteralExpression);
                         imports = [];
                         i = 0;
-                        reposToInsert = [];
                         for (_i = 0, _a = this.project.getSourceFiles(); _i < _a.length; _i++) {
                             sf = _a[_i];
                             if (!sf.getFilePath().includes("src/repos/")) {
@@ -298,12 +307,9 @@ var TypeScriptCompiler = /** @class */ (function () {
                                 defaultImport: sf.getBaseNameWithoutExtension(),
                                 moduleSpecifier: generatedFile.getRelativePathAsModuleSpecifierTo(sf),
                             });
-                            reposToInsert.push("{collectionName: \"" + utils_1.getCollectionNameForRepo(sf.getBaseName()) + "\", repoInstanceName: \"" + utils_1.getRepoInstanceName(sf.getBaseName()) + "\", Repo: " + sf.getBaseNameWithoutExtension() + "}");
+                            reposArr.insertElement(i, "{collectionName: \"" + utils_1.getCollectionNameForRepo(sf.getBaseName()) + "\", repoInstanceName: \"" + utils_1.getRepoInstanceName(sf.getBaseName()) + "\", Repo: " + sf.getBaseNameWithoutExtension() + "}");
                             i++;
                         }
-                        if (reposToInsert.length > 0) {
-                            reposArr.insertElements(0, reposToInsert);
-                        }
                         generatedFile.addImportDeclarations(imports);
                         return [4 /*yield*/, generatedFile.save()];
                     case 1:
@@ -602,34 +608,39 @@ var TypeScriptCompiler = /** @class */ (function () {
      * @param handlers
      * @param jsonSchemas
      */
-    TypeScriptCompiler.prototype.appendSchemasToHandlers = function (parseResult, jsonSchemas) {
-        var _a, _b, _c, _d;
+    TypeScriptCompiler.prototype.appendSchemasToHandlerSourceFiles = function (handlers, jsonSchemas) {
         var jsonSchemaDefs = jsonSchemas.definitions || {};
-        for (var _i = 0, parseResult_1 = parseResult; _i < parseResult_1.length; _i++) {
-            var handler = parseResult_1[_i];
-            if (((_a = handler.schemasToGenerate) === null || _a === void 0 ? void 0 : _a.reqSchemaType) && !jsonSchemaDefs[handler.schemasToGenerate.reqSchemaType]) {
-                console.error("Handler " + handler.__file + " has request schema\u00A0(" + handler.schemasToGenerate.reqSchemaType + ") defined, but no JSON schema has been generated");
+        for (var _i = 0, handlers_1 = handlers; _i < handlers_1.length; _i++) {
+            var _a = handlers_1[_i], sourceFile = _a.sourceFile, reqSchemaType = _a.reqSchemaType, resSchemaType = _a.resSchemaType;
+            if (reqSchemaType && !jsonSchemaDefs[reqSchemaType]) {
+                console.error("Handler " + sourceFile.getBaseName() + " has request schema\u00A0(" + reqSchemaType + ") defined, but no JSON schema has been generated");
                 continue;
             }
-            if (((_b = handler.schemasToGenerate) === null || _b === void 0 ? void 0 : _b.resSchemaType) && !jsonSchemaDefs[handler.schemasToGenerate.resSchemaType]) {
-                console.error("Handler " + handler.__file + " has response schema\u00A0(" + handler.schemasToGenerate.resSchemaType + ") defined, but no JSON schema has been generated");
+            if (resSchemaType && !jsonSchemaDefs[resSchemaType]) {
+                console.error("Handler " + sourceFile.getBaseName() + " has response schema\u00A0(" + resSchemaType + ") defined, but no JSON schema has been generated");
                 continue;
             }
-            var reqJsonSchema = ((_c = handler.schemasToGenerate) === null || _c === void 0 ? void 0 : _c.reqSchemaType) ? jsonSchemaDefs[handler.schemasToGenerate.reqSchemaType] : undefined;
-            var resJsonSchema = ((_d = handler.schemasToGenerate) === null || _d === void 0 ? void 0 : _d.resSchemaType) ? jsonSchemaDefs[handler.schemasToGenerate.resSchemaType] : undefined;
-            handler.__schemas = {
-                reqSchema: reqJsonSchema,
-                resSchema: resJsonSchema,
-            };
+            var reqJsonSchema = JSON.stringify(reqSchemaType ? jsonSchemaDefs[reqSchemaType] : undefined);
+            var resJsonSchema = JSON.stringify(resSchemaType ? jsonSchemaDefs[resSchemaType] : undefined);
+            sourceFile.addVariableStatement({
+                declarationKind: ts_morph_1.VariableDeclarationKind.Const,
+                isExported: true,
+                declarations: [
+                    {
+                        name: "__schemas",
+                        type: "any",
+                        initializer: "{ reqSchema: " + reqJsonSchema + ", resSchema: " + resJsonSchema + " }",
+                    },
+                ],
+            });
         }
-        return parseResult;
     };
     /**
      * Scans project for jobs so they can be registered during start.
      */
     TypeScriptCompiler.prototype.parseJobs = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var generatedFile, jobsArr, imports, i, jobsToInsert, _i, _a, sf, importName;
+            var generatedFile, jobsArr, imports, i, _i, _a, sf, namespaceImport;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -637,16 +648,15 @@ var TypeScriptCompiler = /** @class */ (function () {
                         jobsArr = generatedFile.getVariableDeclarationOrThrow("jobs").getFirstDescendantByKindOrThrow(ts_morph_1.SyntaxKind.ArrayLiteralExpression);
                         imports = [];
                         i = 0;
-                        jobsToInsert = [];
                         for (_i = 0, _a = this.project.getSourceFiles(); _i < _a.length; _i++) {
                             sf = _a[_i];
                             if (!sf.getFilePath().includes("src/jobs/")) {
                                 continue;
                             }
                             console.log("Detected job " + sf.getBaseName());
-                            importName = sf.getBaseNameWithoutExtension().replace(/\./g, "_") + "_" + i;
+                            namespaceImport = sf.getBaseNameWithoutExtension().replace(/\./g, "_") + "_" + i;
                             imports.push({
-                                importName: importName,
+                                defaultImport: "* as " + namespaceImport,
                                 moduleSpecifier: generatedFile.getRelativePathAsModuleSpecifierTo(sf),
                             });
                             // Append metadata to source file that will be part of emitted dist bundle (javascript)
@@ -660,12 +670,9 @@ var TypeScriptCompiler = /** @class */ (function () {
                                     },
                                 ],
                             });
-                            jobsToInsert.push(importName);
+                            jobsArr.insertElement(i, namespaceImport);
                             i++;
                         }
-                        if (jobsToInsert.length > 0) {
-                            jobsArr.insertElements(0, jobsToInsert);
-                        }
                         generatedFile.addImportDeclarations(imports);
                         return [4 /*yield*/, generatedFile.save()];
                     case 1:

package/dist/src/utils.js

@@ -161,20 +161,3 @@ function getPathParams(path) {
     return ((_a = path.match(pathParamsRegex)) === null || _a === void 0 ? void 0 : _a.map(function (match) { return match.slice(1); })) || [];
 }
 exports.getPathParams = getPathParams;
-// export function stringifyWithoutQuotes(obj: Record<string, any>): string {
-//     let result = "{";
-//     let isFirstProp = true;
-//     for (let key in obj) {
-//         if (Object.prototype.hasOwnProperty.call(obj, key)) {
-//             const value = obj[key];
-//             if (isFirstProp) {
-//                 isFirstProp = false;
-//             } else {
-//                 result += ",";
-//             }
-//             result += `${key}:${JSON.stringify(value)}`;
-//         }
-//     }
-//     result += "}";
-//     return result;
-// }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flink-app/flink",
-    "version": "0.7.0-alpha.0",
+    "version": "0.11.0",
     "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",
@@ -67,5 +67,5 @@
         "rimraf": "^3.0.2",
         "ts-node": "^9.1.1"
     },
-    "gitHead": "1e656eeb0e76d6ad8c6cc48200161aa445e365df"
+    "gitHead": "3869def3e7e7e7105373ad31bc23a8ed68108015"
 }

package/spec/TypeScriptCompiler.spec.ts

@@ -1,43 +1,46 @@
 import TypeScriptCompiler from "../src/TypeScriptCompiler";
 
 describe("TypeScriptCompiler", () => {
-    let compiler: TypeScriptCompiler;
-
-    beforeAll(async () => {
-        await TypeScriptCompiler.clean("spec/mock-project");
-        compiler = new TypeScriptCompiler("spec/mock-project");
-    });
-
-    it("should get premit diagnostics", () => {
-        expect(compiler.getPreEmitDiagnostics()).toBeTrue();
-    });
-
-    it("should parse repos and generate file", async () => {
-        const generatedFile = await compiler.parseRepos();
-        expect(generatedFile.getText()).toContain("CarRepo");
-    });
-
-    it("should parse handlers and generate file", async () => {
-        const generatedFile = await compiler.parseHandlers();
-        compiler.emit();
-
-        expect(generatedFile.getText()).toContain(`import { autoRegisteredHandlers, HttpMethod } from "@flink-app/flink"`);
-        expect(generatedFile.getText()).toContain(`import * as GetCar_0 from "../src/handlers/GetCar"`);
-        expect(generatedFile.getText()).toContain(`export const handlers =`);
-
-        expect(generatedFile.getText()).toContain(`"importName":"GetCar_0"`);
-        expect(generatedFile.getText()).toContain(`"moduleSpecifier":"../src/handlers/GetCar"`);
-        expect(generatedFile.getText()).toContain(`"schemasToGenerate":{"reqSchemaType":"","resSchemaType":"GetCar_16_ResSchema"}`);
-        expect(generatedFile.getText()).toContain(`"__file":"GetCar.ts"`);
-        expect(generatedFile.getText()).toContain(`"__query":[{"description":"For pagination","name":"page"}]`);
-        expect(generatedFile.getText()).toContain(`"__params":[{"description":"","name":"id"}]`);
-    });
-
-    it("should generate start script", async () => {
-        const startScript = await compiler.generateStartScript();
-
-        expect(startScript.getText()).toContain(`import "./generatedHandlers";`);
-        expect(startScript.getText()).toContain(`import "./generatedRepos";`);
-        expect(startScript.getText()).toContain(`import "../src/index";`);
-    });
+  let compiler: TypeScriptCompiler;
+
+  beforeAll(async () => {
+    await TypeScriptCompiler.clean("spec/mock-project");
+    compiler = new TypeScriptCompiler("spec/mock-project");
+  });
+
+  it("should get premit diagnostics", () => {
+    expect(compiler.getPreEmitDiagnostics()).toBeTrue();
+  });
+
+  it("should parse repos and generate file", async () => {
+    const generatedFile = await compiler.parseRepos();
+    expect(generatedFile.getText()).toContain("CarRepo");
+  });
+
+  it("should parse handlers and generate file", async () => {
+    const generatedFile = await compiler.parseHandlers();
+    compiler.emit();
+
+    expect(generatedFile.getText()).toContain(
+      `import { autoRegisteredHandlers, HttpMethod } from "@flink-app/flink"`
+    );
+    expect(generatedFile.getText()).toContain(
+      `import * as GetCar_0 from "../src/handlers/GetCar"`
+    );
+    expect(generatedFile.getText()).toContain(`export const handlers =`);
+    expect(generatedFile.getText()).toContain(
+      `{handler: GetCar_0, assumedHttpMethod: HttpMethod.get}`
+    );
+    // expect(generatedFile.getText()).toContain(
+    //   `{routeProps: PostCar_5.Route, handlerFn: PostCar_5.default, assumedHttpMethod: HttpMethod.post}`
+    // );
+  });
+
+  it("should generate start script", async () => {
+    const startScript = await compiler.generateStartScript();
+
+    expect(startScript.getText()).toContain(`import "./generatedHandlers";`);
+    expect(startScript.getText()).toContain(`import "./generatedRepos";`);
+    expect(startScript.getText()).toContain(`import "../src/index";`);
+  });
 });

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 { FlinkCompileTimeHandlerDetails, Handler, HandlerFile, HttpMethod, QueryParamMetadata, RouteProps } from "./FlinkHttpHandler";
+import { Handler, HandlerFile, HttpMethod, QueryParamMetadata, RouteProps } from "./FlinkHttpHandler";
 import { FlinkJobFile } from "./FlinkJob";
 import { log } from "./FlinkLog";
 import { FlinkPlugin } from "./FlinkPlugin";
@@ -36,11 +36,10 @@ export type JSONSchema = JSONSchema7;
  * This will be populated at compile time when the apps handlers
  * are picked up by TypeScript compiler
  */
-export const autoRegisteredHandlers: ({
+export const autoRegisteredHandlers: {
     handler: HandlerFile;
     assumedHttpMethod: HttpMethod;
-    Route?: RouteProps;
-} & FlinkCompileTimeHandlerDetails)[] = [];
+}[] = [];
 
 /**
  * This will be populated at compile time when the apps repos
@@ -365,7 +364,7 @@ export class FlinkApp<C extends FlinkContext> {
      * Typescript compiler will scan handler function and set schemas
      * which are derived from handler function type arguments.
      */
-    public addHandler(handler: HandlerFile & FlinkCompileTimeHandlerDetails, routePropsOverride?: Partial<HandlerConfig["routeProps"]>) {
+    public addHandler(handler: HandlerFile, routePropsOverride?: Partial<HandlerConfig["routeProps"]>) {
         if (this.routingConfigured) {
             throw new Error("Cannot add handler after routes has been registered, make sure to invoke earlier");
         }
@@ -553,29 +552,31 @@ export class FlinkApp<C extends FlinkContext> {
      * Will not register any handlers added programmatically.
      */
     private async registerAutoRegisterableHandlers() {
-        for (const { handler, assumedHttpMethod, __file, __params, __query, __schemas } of autoRegisteredHandlers) {
+        for (const { handler, assumedHttpMethod } of autoRegisteredHandlers) {
             if (!handler.Route) {
-                log.error(`Missing Props in handler ${__file}`);
+                log.error(`Missing Props in handler ${handler.__file}`);
                 continue;
             }
 
             if (!handler.default) {
-                log.error(`Missing exported handler function in handler ${__file}`);
+                log.error(`Missing exported handler function in handler ${handler.__file}`);
                 continue;
             }
 
-            if (!!__params?.length) {
+            if (!!handler.__params?.length) {
                 const pathParams = getPathParams(handler.Route.path);
 
-                for (const param of __params) {
+                for (const param of handler.__params) {
                     if (!pathParams.includes(param.name)) {
-                        log.error(`Handler ${__file} has param ${param.name} but it is not present in the path '${handler.Route.path}'`);
+                        log.error(`Handler ${handler.__file} has param ${param.name} but it is not present in the path '${handler.Route.path}'`);
                         throw new Error("Invalid/missing handler path param");
                     }
                 }
 
-                if (pathParams.length !== __params.length) {
-                    log.warn(`Handler ${__file} has ${__params.length} typed params but the path '${handler.Route.path}' has ${pathParams.length} params`);
+                if (pathParams.length !== handler.__params.length) {
+                    log.warn(
+                        `Handler ${handler.__file} has ${handler.__params.length} typed params but the path '${handler.Route.path}' has ${pathParams.length} params`
+                    );
                 }
             }
 
@@ -587,11 +588,11 @@ export class FlinkApp<C extends FlinkContext> {
                         origin: this.name,
                     },
                     schema: {
-                        reqSchema: __schemas?.reqSchema,
-                        resSchema: __schemas?.resSchema,
+                        reqSchema: handler.__schemas?.reqSchema,
+                        resSchema: handler.__schemas?.resSchema,
                     },
-                    queryMetadata: __query || [],
-                    paramsMetadata: __params || [],
+                    queryMetadata: handler.__query || [],
+                    paramsMetadata: handler.__params || [],
                 },
                 handler.default
             );