@flink-app/flink 0.4.2 → 0.4.5

package/cli/build.ts

@@ -3,10 +3,10 @@ import TypeScriptCompiler from "../src/TypeScriptCompiler";
 import { getOption } from "./cli-utils";
 
 module.exports = async function run(args: string[]) {
-  const startTime = Date.now();
+    const startTime = Date.now();
 
-  if (args.includes("--help")) {
-    console.log(`
+    if (args.includes("--help")) {
+        console.log(`
     Description
       Builds the application.
       Will generate intermediates files in .flink and compile/transpile
@@ -22,31 +22,27 @@ module.exports = async function run(args: string[]) {
       --help    Displays this message
       `);
 
-    process.exit(0);
-  }
+        process.exit(0);
+    }
 
-  let dir = "./";
-  if (args[0] && !args[0].startsWith("--")) {
-    dir = args[0];
-  }
+    let dir = "./";
+    if (args[0] && !args[0].startsWith("--")) {
+        dir = args[0];
+    }
 
-  const exclude = getOption(args, "exclude", "/spec") as string;
+    const exclude = getOption(args, "exclude", "/spec") as string;
 
-  await TypeScriptCompiler.clean(dir);
+    await TypeScriptCompiler.clean(dir);
 
-  const compiler = new TypeScriptCompiler(dir);
+    const compiler = new TypeScriptCompiler(dir);
 
-  if (!compiler.getPreEmitDiagnostics()) {
-    process.exit(1);
-  }
+    if (!compiler.getPreEmitDiagnostics()) {
+        process.exit(1);
+    }
 
-  await Promise.all([
-    compiler.parseRepos(),
-    compiler.parseHandlers(exclude.split(",")),
-    compiler.generateStartScript(),
-  ]);
+    await Promise.all([compiler.parseRepos(), compiler.parseHandlers(exclude.split(",")), compiler.parseJobs(), compiler.generateStartScript()]);
 
-  console.log(`Compilation done, took ${Date.now() - startTime}ms`);
+    console.log(`Compilation done, took ${Date.now() - startTime}ms`);
 
-  compiler.emit();
+    compiler.emit();
 };

package/cli/run.ts

@@ -16,8 +16,9 @@ module.exports = async function run(args: string[]) {
     If no directory is provided, the current directory will be used.
       
     Options      
-      --entry   Entry script for app, default "/src/index.ts"
-      --help    Displays this message
+      --entry         Entry script for app, default "/src/index.ts"
+      --help          Displays this message
+      --precompiled   Will run a precompiled app, default false
       `);
 
         process.exit(0);
@@ -34,6 +35,15 @@ module.exports = async function run(args: string[]) {
         entry = entry.startsWith("/") ? entry : "/" + entry;
     }
 
+    if (args.includes("--precompiled")) {
+        if (args.includes("--entry")) {
+            console.warn("WARNING: --entry is ignored when using --precompiled");
+        }
+
+        require("child_process").fork(dir + "/dist/.flink/start.js");
+        return;
+    }
+
     await TypeScriptCompiler.clean(dir);
 
     const compiler = new TypeScriptCompiler(dir);

package/dist/bin/flink.js

@@ -12,11 +12,11 @@ var commands = [
 var argv = process.argv.slice(2);
 var argCommand = argv[0];
 if (!argCommand || argv[0] === "help") {
-    console.log("Usage: flink [".concat(commands.join("|"), "]"));
+    console.log("Usage: flink [" + commands.join("|") + "]");
     process.exit();
 }
 if (!commands.includes(argv[0])) {
-    console.log("Invalid command: ".concat(argCommand));
+    console.log("Invalid command: " + argCommand);
     process.exit(1);
 }
 if (argCommand === "generate") {

package/dist/cli/build.js

@@ -15,7 +15,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 (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) 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]) {
@@ -57,7 +57,7 @@ module.exports = function run(args) {
                     if (args[0] && !args[0].startsWith("--")) {
                         dir = args[0];
                     }
-                    exclude = (0, cli_utils_1.getOption)(args, "exclude", "/spec");
+                    exclude = cli_utils_1.getOption(args, "exclude", "/spec");
                     return [4 /*yield*/, TypeScriptCompiler_1.default.clean(dir)];
                 case 1:
                     _a.sent();
@@ -65,14 +65,10 @@ module.exports = function run(args) {
                     if (!compiler.getPreEmitDiagnostics()) {
                         process.exit(1);
                     }
-                    return [4 /*yield*/, Promise.all([
-                            compiler.parseRepos(),
-                            compiler.parseHandlers(exclude.split(",")),
-                            compiler.generateStartScript(),
-                        ])];
+                    return [4 /*yield*/, Promise.all([compiler.parseRepos(), compiler.parseHandlers(exclude.split(",")), compiler.parseJobs(), compiler.generateStartScript()])];
                 case 2:
                     _a.sent();
-                    console.log("Compilation done, took ".concat(Date.now() - startTime, "ms"));
+                    console.log("Compilation done, took " + (Date.now() - startTime) + "ms");
                     compiler.emit();
                     return [2 /*return*/];
             }

package/dist/cli/clean.js

@@ -15,7 +15,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 (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) 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]) {
@@ -58,7 +58,7 @@ module.exports = function run(args) {
                     return [4 /*yield*/, TypeScriptCompiler_1.default.clean(dir)];
                 case 1:
                     cleanedFolder = _a.sent();
-                    console.log("Cleaned directory ".concat(cleanedFolder));
+                    console.log("Cleaned directory " + cleanedFolder);
                     return [2 /*return*/];
             }
         });

package/dist/cli/cli-utils.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getOption = void 0;
 function getOption(args, name, defaultValue, opts) {
     if (opts === void 0) { opts = {}; }
-    var option = "--".concat(name);
+    var option = "--" + name;
     if (args.includes(option)) {
         if (opts.isBoolean && args[args.indexOf(option) + 1] !== "false") {
             return true;

package/dist/cli/forked-compiler.d.ts

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+export {};

package/dist/cli/forked-compiler.js

@@ -0,0 +1,33 @@
+#!/usr/bin/env node
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+var TypeScriptCompiler_1 = __importDefault(require("../src/TypeScriptCompiler"));
+var startTime = Date.now();
+var args = process.argv.slice(2);
+var dir = args[0];
+var actions = args[1];
+console.log("Parallel compilation enabled, will fork 3 processes");
+var compiler = new TypeScriptCompiler_1.default(dir);
+if (actions.includes("preEmit")) {
+    // Only emit diagnostics for the first compiler
+    if (!compiler.getPreEmitDiagnostics()) {
+        process.exit(1);
+    }
+}
+if (actions.includes("parseRepos")) {
+    compiler.parseRepos();
+}
+if (actions.includes("parseHandlers")) {
+    compiler.parseHandlers();
+}
+if (actions.includes("parseJobs")) {
+    compiler.parseJobs();
+}
+if (actions.includes("generateStartScript")) {
+    compiler.generateStartScript();
+}
+console.log("Forked compiler done with ".concat(actions.replaceAll(",", ", "), ", took ").concat(Date.now() - startTime, "ms"));
+compiler.emit();

package/dist/cli/generate-schemas.js

@@ -26,7 +26,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 (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) 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]) {
@@ -47,14 +47,10 @@ 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 __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
+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];
+    return to;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 var path_1 = require("path");
@@ -76,19 +72,19 @@ module.exports = function run(args) {
                     if (args[0] && !args[0].startsWith("--")) {
                         dir = args[0];
                     }
-                    verbose = (0, cli_utils_1.getOption)(args, "verbose", false, {
+                    verbose = cli_utils_1.getOption(args, "verbose", false, {
                         isBoolean: true,
                     });
-                    typesDir = (0, cli_utils_1.getOption)(args, "types-dir", "./src/schemas");
-                    outFile = (0, cli_utils_1.getOption)(args, "out-file", "./.flink/generated-schemas.json");
+                    typesDir = cli_utils_1.getOption(args, "types-dir", "./src/schemas");
+                    outFile = cli_utils_1.getOption(args, "out-file", "./.flink/generated-schemas.json");
                     project = new ts_morph_1.Project({
-                        tsConfigFilePath: (0, path_1.join)(dir, "tsconfig.json"),
+                        tsConfigFilePath: path_1.join(dir, "tsconfig.json"),
                         skipAddingFilesFromTsConfig: true,
                         compilerOptions: {
                             noEmit: true,
                         },
                     });
-                    project.addSourceFilesAtPaths((0, path_1.join)(dir, typesDir, "**/*.ts"));
+                    project.addSourceFilesAtPaths(path_1.join(dir, typesDir, "**/*.ts"));
                     console.log("Found", project.getSourceFiles().length, "files");
                     schemaDeclarations = [];
                     generator = initJsonSchemaGenerator(project);
@@ -96,11 +92,11 @@ module.exports = function run(args) {
                     for (_i = 0, _a = project.getSourceFiles(); _i < _a.length; _i++) {
                         sf = _a[_i];
                         if (sf.getDefaultExportSymbol()) {
-                            console.warn("WARN: Schema file ".concat(sf.getBaseName(), " has default export, but only named exports are picked up by json schemas parser"));
+                            console.warn("WARN: Schema file " + sf.getBaseName() + " has default export, but only named exports are picked up by json schemas parser");
                         }
                         sourceFileInterfaceDeclarations = sf.getChildrenOfKind(ts_morph_1.SyntaxKind.InterfaceDeclaration);
                         sourceFileEnumDeclarations = sf.getChildrenOfKind(ts_morph_1.SyntaxKind.EnumDeclaration);
-                        sourceFileDeclarations = __spreadArray(__spreadArray([], sourceFileEnumDeclarations, true), sourceFileInterfaceDeclarations, true);
+                        sourceFileDeclarations = __spreadArray(__spreadArray([], sourceFileEnumDeclarations), sourceFileInterfaceDeclarations);
                         schemaDeclarations.push.apply(schemaDeclarations, sourceFileDeclarations.map(function (d) { return d.compilerNode; }));
                         verbose &&
                             console.log("Found", sourceFileDeclarations.length, "schema(s) in file", sf.getBaseName());
@@ -124,8 +120,8 @@ module.exports = function run(args) {
                         $ref: "#/definitions/Schemas",
                         definitions: {},
                     });
-                    file = (0, path_1.join)(dir, outFile);
-                    return [4 /*yield*/, (0, FsUtils_1.writeJsonFile)(file, mergedSchemas, {
+                    file = path_1.join(dir, outFile);
+                    return [4 /*yield*/, FsUtils_1.writeJsonFile(file, mergedSchemas, {
                             ensureDir: true,
                         })];
                 case 1:
@@ -137,8 +133,8 @@ module.exports = function run(args) {
     });
 };
 function initJsonSchemaGenerator(project) {
-    var formatter = (0, ts_json_schema_generator_1.createFormatter)({});
-    var parser = (0, ts_json_schema_generator_1.createParser)(project.getProgram().compilerObject, {});
+    var formatter = ts_json_schema_generator_1.createFormatter({});
+    var parser = ts_json_schema_generator_1.createParser(project.getProgram().compilerObject, {});
     var generator = new ts_json_schema_generator_1.SchemaGenerator(project.getProgram().compilerObject, parser, formatter, { expose: "export" });
     return generator;
 }

package/dist/cli/run.js

@@ -15,7 +15,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 (g && (g = 0, op[0] && (_ = 0)), _) try {
+        while (_) 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]) {
@@ -49,7 +49,7 @@ module.exports = function run(args) {
                 case 0:
                     startTime = Date.now();
                     if (args.includes("--help")) {
-                        console.log("\n    Description\n      Compiles and starts the application.\n\n    Usage\n      $ flink run <dir>\n\n    <dir> represents the directory of the Flink application.\n    If no directory is provided, the current directory will be used.\n      \n    Options      \n      --entry   Entry script for app, default \"/src/index.ts\"\n      --help    Displays this message\n      ");
+                        console.log("\n    Description\n      Compiles and starts the application.\n\n    Usage\n      $ flink run <dir>\n\n    <dir> represents the directory of the Flink application.\n    If no directory is provided, the current directory will be used.\n      \n    Options      \n      --entry         Entry script for app, default \"/src/index.ts\"\n      --help          Displays this message\n      --precompiled   Will run a precompiled app, default false\n      ");
                         process.exit(0);
                     }
                     dir = "./";
@@ -61,6 +61,13 @@ module.exports = function run(args) {
                         entry = args[args.indexOf("--entry") + 1];
                         entry = entry.startsWith("/") ? entry : "/" + entry;
                     }
+                    if (args.includes("--precompiled")) {
+                        if (args.includes("--entry")) {
+                            console.warn("WARNING: --entry is ignored when using --precompiled");
+                        }
+                        require("child_process").fork(dir + "/dist/.flink/start.js");
+                        return [2 /*return*/];
+                    }
                     return [4 /*yield*/, TypeScriptCompiler_1.default.clean(dir)];
                 case 1:
                     _a.sent();
@@ -71,7 +78,7 @@ module.exports = function run(args) {
                     return [4 /*yield*/, Promise.all([compiler.parseRepos(), compiler.parseHandlers(), compiler.parseJobs(), compiler.generateStartScript(entry)])];
                 case 2:
                     _a.sent();
-                    console.log("Compilation done, took ".concat(Date.now() - startTime, "ms"));
+                    console.log("Compilation done, took " + (Date.now() - startTime) + "ms");
                     compiler.emit();
                     require("child_process").fork(dir + "/dist/.flink/start.js");
                     return [2 /*return*/];

package/dist/src/FlinkApp.d.ts

@@ -9,7 +9,7 @@ import { HandlerFile, HttpMethod, QueryParamMetadata, RouteProps } from "./Flink
 import { FlinkJobFile } from "./FlinkJob";
 import { FlinkPlugin } from "./FlinkPlugin";
 import { FlinkRepo } from "./FlinkRepo";
-export type JSONSchema = JSONSchema7;
+export declare type JSONSchema = JSONSchema7;
 /**
  * This will be populated at compile time when the apps handlers
  * are picked up by TypeScript compiler