@flink-app/flink 0.11.4-next.0 → 0.11.4

package/cli/generate-schemas.ts

@@ -1,14 +1,18 @@
 #!/usr/bin/env node
 import { JSONSchema7, JSONSchema7Definition } from "json-schema";
 import { join } from "path";
-import { createFormatter, createParser, DEFAULT_CONFIG, SchemaGenerator } from "ts-json-schema-generator";
+import {
+  createFormatter,
+  createParser,
+  SchemaGenerator,
+} from "ts-json-schema-generator";
 import { Project, SyntaxKind, ts } from "ts-morph";
 import { writeJsonFile } from "../src/FsUtils";
 import { getOption } from "./cli-utils";
 
 module.exports = async function run(args: string[]) {
-    if (args.includes("--help")) {
-        console.log(`
+  if (args.includes("--help")) {
+    console.log(`
     Description
       Generates JSON schemas for types located in schemas directory or if any other directory
       is specified with option --types-dir. 
@@ -26,93 +30,124 @@ module.exports = async function run(args: string[]) {
       --help        Displays this message
       `);
 
-        process.exit(0);
-    }
-
-    let dir = "./";
-    if (args[0] && !args[0].startsWith("--")) {
-        dir = args[0];
-    }
+    process.exit(0);
+  }
 
-    const verbose = getOption(args, "verbose", false, {
-        isBoolean: true,
-    }) as boolean;
+  let dir = "./";
+  if (args[0] && !args[0].startsWith("--")) {
+    dir = args[0];
+  }
 
-    const typesDir = getOption(args, "types-dir", "./src/schemas") as string;
+  const verbose = getOption(args, "verbose", false, {
+    isBoolean: true,
+  }) as boolean;
 
-    const outFile = getOption(args, "out-file", "./.flink/generated-schemas.json") as string;
+  const typesDir = getOption(args, "types-dir", "./src/schemas") as string;
 
-    const project = new Project({
-        tsConfigFilePath: join(dir, "tsconfig.json"),
-        skipAddingFilesFromTsConfig: true,
-        compilerOptions: {
-            noEmit: true,
-        },
-    });
+  const outFile = getOption(
+    args,
+    "out-file",
+    "./.flink/generated-schemas.json"
+  ) as string;
 
-    project.addSourceFilesAtPaths(join(dir, typesDir, "**/*.ts"));
+  const project = new Project({
+    tsConfigFilePath: join(dir, "tsconfig.json"),
+    skipAddingFilesFromTsConfig: true,
+    compilerOptions: {
+      noEmit: true,
+    },
+  });
 
-    console.log("Found", project.getSourceFiles().length, "files");
+  project.addSourceFilesAtPaths(join(dir, typesDir, "**/*.ts"));
 
-    const schemaDeclarations: ts.Node[] = [];
+  console.log("Found", project.getSourceFiles().length, "files");
 
-    const generator = initJsonSchemaGenerator(project);
+  const schemaDeclarations: ts.Node[] = [];
 
-    const jsonSchemas: JSONSchema7[] = [];
+  const generator = initJsonSchemaGenerator(project);
 
-    for (const sf of project.getSourceFiles()) {
-        if (sf.getDefaultExportSymbol()) {
-            console.warn(`WARN: Schema file ${sf.getBaseName()} has default export, but only named exports are picked up by json schemas parser`);
-        }
+  const jsonSchemas: JSONSchema7[] = [];
 
-        const sourceFileInterfaceDeclarations = sf.getChildrenOfKind(SyntaxKind.InterfaceDeclaration);
+  for (const sf of project.getSourceFiles()) {
+    if (sf.getDefaultExportSymbol()) {
+      console.warn(
+        `WARN: Schema file ${sf.getBaseName()} has default export, but only named exports are picked up by json schemas parser`
+      );
+    }
 
-        const sourceFileEnumDeclarations = sf.getChildrenOfKind(SyntaxKind.EnumDeclaration);
+    const sourceFileInterfaceDeclarations = sf.getChildrenOfKind(
+      SyntaxKind.InterfaceDeclaration
+    );
 
-        const sourceFileDeclarations = [...sourceFileEnumDeclarations, ...sourceFileInterfaceDeclarations];
+    const sourceFileEnumDeclarations = sf.getChildrenOfKind(
+      SyntaxKind.EnumDeclaration
+    );
 
-        schemaDeclarations.push(...sourceFileDeclarations.map((d) => d.compilerNode));
+    const sourceFileDeclarations = [
+      ...sourceFileEnumDeclarations,
+      ...sourceFileInterfaceDeclarations,
+    ];
 
-        verbose && console.log("Found", sourceFileDeclarations.length, "schema(s) in file", sf.getBaseName());
+    schemaDeclarations.push(
+      ...sourceFileDeclarations.map((d) => d.compilerNode)
+    );
 
-        try {
-            const schema = generator.createSchemaFromNodes(sourceFileInterfaceDeclarations.map((d) => d.compilerNode));
-            jsonSchemas.push(schema);
-            // console.log("Created schemas");
-        } catch (err) {
-            console.error("Failed to generate schema in file", sf.getBaseName() + ":", err);
-        }
+    verbose &&
+      console.log(
+        "Found",
+        sourceFileDeclarations.length,
+        "schema(s) in file",
+        sf.getBaseName()
+      );
+
+    try {
+      const schema = generator.createSchemaFromNodes(
+        sourceFileInterfaceDeclarations.map((d) => d.compilerNode)
+      );
+      jsonSchemas.push(schema);
+      // console.log("Created schemas");
+    } catch (err) {
+      console.error(
+        "Failed to generate schema in file",
+        sf.getBaseName() + ":",
+        err
+      );
     }
+  }
 
-    const mergedSchemas = jsonSchemas.reduce(
-        (out, schema) => {
-            if (schema)
-                if (schema.definitions) {
-                    out.definitions = { ...out.definitions, ...schema.definitions };
-                }
-            return out;
-        },
-        {
-            $schema: "http://json-schema.org/draft-07/schema#",
-            $ref: "#/definitions/Schemas",
-            definitions: {},
+  const mergedSchemas = jsonSchemas.reduce(
+    (out, schema) => {
+      if (schema)
+        if (schema.definitions) {
+          out.definitions = { ...out.definitions, ...schema.definitions };
         }
-    );
+      return out;
+    },
+    {
+      $schema: "http://json-schema.org/draft-07/schema#",
+      $ref: "#/definitions/Schemas",
+      definitions: {},
+    }
+  );
 
-    const file = join(dir, outFile);
+  const file = join(dir, outFile);
 
-    await writeJsonFile(file, mergedSchemas, {
-        ensureDir: true,
-    });
+  await writeJsonFile(file, mergedSchemas, {
+    ensureDir: true,
+  });
 
-    console.log("Wrote file", file);
+  console.log("Wrote file", file);
 };
 
 function initJsonSchemaGenerator(project: Project) {
-    const config = { ...DEFAULT_CONFIG };
-    const formatter = createFormatter(config);
-    const parser = createParser(project.getProgram().compilerObject, config);
-    const generator = new SchemaGenerator(project.getProgram().compilerObject, parser, formatter, { expose: "export" });
-
-    return generator;
+  const formatter = createFormatter({});
+  const parser = createParser(project.getProgram().compilerObject, {});
+  const generator = new SchemaGenerator(
+    project.getProgram().compilerObject,
+    parser,
+    formatter,
+    { expose: "export" }
+  );
+
+  return generator;
 }

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

@@ -10,12 +10,12 @@ 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 = 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;
+    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;
     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();
@@ -68,7 +68,7 @@ module.exports = function run(args) {
                     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

@@ -10,12 +10,12 @@ 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 = 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;
+    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;
     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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getOption = getOption;
+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;
@@ -17,3 +17,4 @@ function getOption(args, name, defaultValue, opts) {
     }
     return defaultValue;
 }
+exports.getOption = getOption;

package/dist/cli/generate-schemas.js

@@ -21,12 +21,12 @@ 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 = 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;
+    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;
     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,13 +92,14 @@ 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());
+                        verbose &&
+                            console.log("Found", sourceFileDeclarations.length, "schema(s) in file", sf.getBaseName());
                         try {
                             schema = generator.createSchemaFromNodes(sourceFileInterfaceDeclarations.map(function (d) { return d.compilerNode; }));
                             jsonSchemas.push(schema);
@@ -123,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:
@@ -136,9 +133,8 @@ module.exports = function run(args) {
     });
 };
 function initJsonSchemaGenerator(project) {
-    var config = __assign({}, ts_json_schema_generator_1.DEFAULT_CONFIG);
-    var formatter = (0, ts_json_schema_generator_1.createFormatter)(config);
-    var parser = (0, ts_json_schema_generator_1.createParser)(project.getProgram().compilerObject, config);
+    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

@@ -10,12 +10,12 @@ 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 = 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;
+    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;
     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]) {
@@ -81,7 +81,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();
                     forkedProcess = require("child_process").fork(dir + "/dist/.flink/start.js");
                     forkedProcess.on("exit", function (code) {

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