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

package/dist/cli/generate-schemas.d.ts

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

package/dist/cli/generate-schemas.js

@@ -0,0 +1,140 @@
+#!/usr/bin/env node
+"use strict";
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
+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) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        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]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        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) {
+    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");
+var ts_json_schema_generator_1 = require("ts-json-schema-generator");
+var ts_morph_1 = require("ts-morph");
+var FsUtils_1 = require("../src/FsUtils");
+var cli_utils_1 = require("./cli-utils");
+module.exports = function run(args) {
+    return __awaiter(this, void 0, void 0, function () {
+        var dir, verbose, typesDir, outFile, project, schemaDeclarations, generator, jsonSchemas, _i, _a, sf, sourceFileInterfaceDeclarations, sourceFileEnumDeclarations, sourceFileDeclarations, schema, mergedSchemas, file;
+        return __generator(this, function (_b) {
+            switch (_b.label) {
+                case 0:
+                    if (args.includes("--help")) {
+                        console.log("\n    Description\n      Generates JSON schemas for types located in schemas directory or if any other directory\n      is specified with option --types-dir. \n\n      Outputs generated file(s) to dir '.flink' or if any other --out-dir is specified.\n\n    Usage\n      $ flink generate-schemas <dir> --types-dir <types-dir> --out-file <out-file>\n\n      <dir> is project root as directory where tsconfig.son resides.\n       \n    Options            \n      --types-dir   Directory where typescript types are located relative to <dir>, default \"./src/schemas\"\n      --out-file    Path to file that will contain generated json schemas relative to <dir>, default \"./.flink/generated-schemas.json\"\n      --help        Displays this message\n      ");
+                        process.exit(0);
+                    }
+                    dir = "./";
+                    if (args[0] && !args[0].startsWith("--")) {
+                        dir = args[0];
+                    }
+                    verbose = cli_utils_1.getOption(args, "verbose", false, {
+                        isBoolean: true,
+                    });
+                    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: path_1.join(dir, "tsconfig.json"),
+                        skipAddingFilesFromTsConfig: true,
+                        compilerOptions: {
+                            noEmit: true,
+                        },
+                    });
+                    project.addSourceFilesAtPaths(path_1.join(dir, typesDir, "**/*.ts"));
+                    console.log("Found", project.getSourceFiles().length, "files");
+                    schemaDeclarations = [];
+                    generator = initJsonSchemaGenerator(project);
+                    jsonSchemas = [];
+                    for (_i = 0, _a = project.getSourceFiles(); _i < _a.length; _i++) {
+                        sf = _a[_i];
+                        if (sf.getDefaultExportSymbol()) {
+                            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), sourceFileInterfaceDeclarations);
+                        schemaDeclarations.push.apply(schemaDeclarations, sourceFileDeclarations.map(function (d) { return d.compilerNode; }));
+                        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);
+                            // console.log("Created schemas");
+                        }
+                        catch (err) {
+                            console.error("Failed to generate schema in file", sf.getBaseName() + ":", err);
+                        }
+                    }
+                    mergedSchemas = jsonSchemas.reduce(function (out, schema) {
+                        if (schema)
+                            if (schema.definitions) {
+                                out.definitions = __assign(__assign({}, out.definitions), schema.definitions);
+                            }
+                        return out;
+                    }, {
+                        $schema: "http://json-schema.org/draft-07/schema#",
+                        $ref: "#/definitions/Schemas",
+                        definitions: {},
+                    });
+                    file = path_1.join(dir, outFile);
+                    return [4 /*yield*/, FsUtils_1.writeJsonFile(file, mergedSchemas, {
+                            ensureDir: true,
+                        })];
+                case 1:
+                    _b.sent();
+                    console.log("Wrote file", file);
+                    return [2 /*return*/];
+            }
+        });
+    });
+};
+function initJsonSchemaGenerator(project) {
+    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/src/FlinkApp.d.ts

@@ -1,7 +1,7 @@
 import { OptionsJson } from "body-parser";
 import { Express } from "express";
 import { JSONSchema7 } from "json-schema";
-import { Db } from "mongodb";
+import { Db, MongoClient } from "mongodb";
 import { ToadScheduler } from "toad-scheduler";
 import { FlinkAuthPlugin } from "./auth/FlinkAuthPlugin";
 import { FlinkContext } from "./FlinkContext";
@@ -156,6 +156,7 @@ export declare class FlinkApp<C extends FlinkContext> {
     name: string;
     expressApp?: Express;
     db?: Db;
+    dbClient?: MongoClient;
     handlers: HandlerConfig[];
     port?: number;
     started: boolean;

package/dist/src/FlinkApp.js

@@ -629,6 +629,7 @@ var FlinkApp = /** @class */ (function () {
                     case 2:
                         client = _a.sent();
                         this.db = client.db();
+                        this.dbClient = client;
                         return [3 /*break*/, 4];
                     case 3:
                         err_2 = _a.sent();

package/dist/src/FlinkRepo.d.ts

@@ -1,4 +1,4 @@
-import { Collection, Db, Document, ObjectId } from "mongodb";
+import { Collection, Db, Document, MongoClient, ObjectId } from "mongodb";
 import { FlinkContext } from "./FlinkContext";
 /**
  * Partial model to have intellisense for partial updates but
@@ -8,13 +8,14 @@ type PartialModel<Model> = Partial<Model> & {
     [x: string]: any;
 };
 export declare abstract class FlinkRepo<C extends FlinkContext, Model extends Document> {
-    private collectionName;
-    private db;
+    collectionName: string;
+    db: Db;
+    client?: MongoClient | undefined;
     collection: Collection;
     private _ctx?;
     set ctx(ctx: FlinkContext);
     get ctx(): FlinkContext;
-    constructor(collectionName: string, db: Db);
+    constructor(collectionName: string, db: Db, client?: MongoClient | undefined);
     findAll(query?: {}): Promise<Model[]>;
     getById(id: string | ObjectId): Promise<Model | null>;
     getOne(query?: {}): Promise<Model | null>;

package/dist/src/FlinkRepo.js

@@ -61,9 +61,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.FlinkRepo = void 0;
 var mongodb_1 = require("mongodb");
 var FlinkRepo = /** @class */ (function () {
-    function FlinkRepo(collectionName, db) {
+    function FlinkRepo(collectionName, db, client) {
         this.collectionName = collectionName;
         this.db = db;
+        this.client = client;
         this.collection = db.collection(this.collectionName);
     }
     Object.defineProperty(FlinkRepo.prototype, "ctx", {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@flink-app/flink",
-    "version": "0.12.1-alpha.6",
+    "version": "0.12.1-alpha.9",
     "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",
@@ -9,7 +9,7 @@
         "test": "jasmine-ts --preserve-symlinks --config=./spec/support/jasmine.json",
         "test:watch": "nodemon --ext ts --exec 'jasmine-ts  --config=./spec/support/jasmine.json'",
         "start": "ts-node src/index.ts",
-        "prepublish": "npm run build",
+        "prepare": "npm run build",
         "build": "tsc --project tsconfig.dist.json",
         "watch": "nodemon --exec 'tsc --project tsconfig.dist.json'",
         "clean": "rimraf dist"
@@ -66,5 +66,5 @@
         "rimraf": "^3.0.2",
         "ts-node": "^9.1.1"
     },
-    "gitHead": "ac1dabd317c41e0fee321e574f6aa97c5fed7830"
+    "gitHead": "3007ad036607014176930446fde56203bde8d6f5"
 }

package/src/FlinkApp.ts

@@ -217,6 +217,7 @@ export class FlinkApp<C extends FlinkContext> {
     public name: string;
     public expressApp?: Express;
     public db?: Db;
+    public dbClient?: MongoClient;
     public handlers: HandlerConfig[] = [];
     public port?: number;
     public started = false;
@@ -778,6 +779,7 @@ export class FlinkApp<C extends FlinkContext> {
                 log.debug("Connecting to db");
                 const client = await MongoClient.connect(this.dbOpts.uri, this.getMongoConnectionOptions());
                 this.db = client.db();
+                this.dbClient = client;
             } catch (err) {
                 log.error("Failed to connect to db: " + err);
                 process.exit(1);

package/src/FlinkRepo.ts

@@ -1,4 +1,4 @@
-import { Collection, Db, Document, InsertOneResult, ObjectId } from "mongodb";
+import { Collection, Db, Document, InsertOneResult, MongoClient, ObjectId } from "mongodb";
 import { FlinkContext } from "./FlinkContext";
 
 /**
@@ -21,7 +21,7 @@ export abstract class FlinkRepo<C extends FlinkContext, Model extends Document>
         return this._ctx;
     }
 
-    constructor(private collectionName: string, private db: Db) {
+    constructor(public collectionName: string, public db: Db, public client?: MongoClient) {
         this.collection = db.collection(this.collectionName);
     }