@flink-app/flink 0.12.1-alpha.0 → 0.12.1-alpha.10

package/dist/src/FlinkLog.d.ts

@@ -5,19 +5,19 @@ export declare const log: {
     error: (...args: any[]) => void;
     json: (...args: any) => void;
     bgColorLog: (ticket: "black" | "red" | "green" | "yellow" | "blue" | "magenta" | "cyan" | "white", text: string, setting?: {
+        reverse?: boolean | undefined;
         bold?: boolean | undefined;
         italic?: boolean | undefined;
         dim?: boolean | undefined;
         underscore?: boolean | undefined;
-        reverse?: boolean | undefined;
         strikethrough?: boolean | undefined;
     } | undefined) => void;
     fontColorLog: (ticket: "black" | "red" | "green" | "yellow" | "blue" | "magenta" | "cyan" | "white", text: string, setting?: {
+        reverse?: boolean | undefined;
         bold?: boolean | undefined;
         italic?: boolean | undefined;
         dim?: boolean | undefined;
         underscore?: boolean | undefined;
-        reverse?: boolean | undefined;
         strikethrough?: boolean | undefined;
     } | undefined) => void;
     setLevel: (level: "debug" | "info" | "warn" | "error") => void;

package/dist/src/FlinkRepo.d.ts

@@ -1,22 +1,31 @@
-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
+ * also allow any other properties to be set such as nested objects etc.
+ */
+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<any>;
-    getOne(query?: {}): Promise<any>;
+    getById(id: string | ObjectId): Promise<Model | null>;
+    getOne(query?: {}): Promise<Model | null>;
     create<C = Omit<Model, "_id">>(model: C): Promise<C & {
         _id: string;
     }>;
-    updateOne(id: string | ObjectId, model: Partial<Model>): Promise<Model | null>;
-    updateMany<U = Partial<Model>>(query: any, model: U): Promise<number>;
+    updateOne(id: string | ObjectId, model: PartialModel<Model>): Promise<Model | null>;
+    updateMany<U = PartialModel<Model>>(query: any, model: U): Promise<number>;
     deleteById(id: string | ObjectId): Promise<number>;
     private buildId;
     private objectIdToString;
 }
+export {};

package/dist/src/FlinkRepo.js

@@ -25,7 +25,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 (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {
@@ -46,13 +46,25 @@ 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;
+};
 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", {
@@ -67,10 +79,10 @@ var FlinkRepo = /** @class */ (function () {
         enumerable: false,
         configurable: true
     });
-    FlinkRepo.prototype.findAll = function (query) {
-        if (query === void 0) { query = {}; }
-        return __awaiter(this, void 0, void 0, function () {
+    FlinkRepo.prototype.findAll = function () {
+        return __awaiter(this, arguments, void 0, function (query) {
             var res;
+            if (query === void 0) { query = {}; }
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.collection.find(query).toArray()];
@@ -89,21 +101,27 @@ var FlinkRepo = /** @class */ (function () {
                     case 0: return [4 /*yield*/, this.collection.findOne({ _id: this.buildId(id) })];
                     case 1:
                         res = _a.sent();
-                        return [2 /*return*/, this.objectIdToString(res)];
+                        if (res) {
+                            return [2 /*return*/, this.objectIdToString(res)];
+                        }
+                        return [2 /*return*/, null];
                 }
             });
         });
     };
-    FlinkRepo.prototype.getOne = function (query) {
-        if (query === void 0) { query = {}; }
-        return __awaiter(this, void 0, void 0, function () {
+    FlinkRepo.prototype.getOne = function () {
+        return __awaiter(this, arguments, void 0, function (query) {
             var res;
+            if (query === void 0) { query = {}; }
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0: return [4 /*yield*/, this.collection.findOne(query)];
                     case 1:
                         res = _a.sent();
-                        return [2 /*return*/, this.objectIdToString(res)];
+                        if (res) {
+                            return [2 /*return*/, this.objectIdToString(res)];
+                        }
+                        return [2 /*return*/, null];
                 }
             });
         });
@@ -123,32 +141,38 @@ var FlinkRepo = /** @class */ (function () {
     };
     FlinkRepo.prototype.updateOne = function (id, model) {
         return __awaiter(this, void 0, void 0, function () {
-            var oid, res;
+            var oid, _id, modelWithoutId, res;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         oid = this.buildId(id);
-                        return [4 /*yield*/, this.collection.updateOne({ _id: oid }, { $set: model })];
+                        _id = model._id, modelWithoutId = __rest(model, ["_id"]);
+                        return [4 /*yield*/, this.collection.updateOne({ _id: oid }, { $set: modelWithoutId })];
                     case 1:
                         _a.sent();
                         return [4 /*yield*/, this.collection.findOne({ _id: oid })];
                     case 2:
                         res = _a.sent();
-                        return [2 /*return*/, this.objectIdToString(res)];
+                        if (res) {
+                            return [2 /*return*/, this.objectIdToString(res)];
+                        }
+                        return [2 /*return*/, null];
                 }
             });
         });
     };
     FlinkRepo.prototype.updateMany = function (query, model) {
         return __awaiter(this, void 0, void 0, function () {
-            var modifiedCount;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
-                    case 0: return [4 /*yield*/, this.collection.updateMany(query, {
-                            $set: model,
-                        })];
+            var _a, _id, modelWithoutId, modifiedCount;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
+                    case 0:
+                        _a = model, _id = _a._id, modelWithoutId = __rest(_a, ["_id"]);
+                        return [4 /*yield*/, this.collection.updateMany(query, {
+                                $set: modelWithoutId,
+                            })];
                     case 1:
-                        modifiedCount = (_a.sent()).modifiedCount;
+                        modifiedCount = (_b.sent()).modifiedCount;
                         return [2 /*return*/, modifiedCount];
                 }
             });

package/dist/src/FlinkResponse.d.ts

@@ -37,5 +37,5 @@ export interface FlinkResponse<T = any> {
         [x: string]: string;
     };
 }
-export declare type ExpressResponse = Response;
-export declare type ExpressRequest = Request;
+export type ExpressResponse = Response;
+export type ExpressRequest = Request;

package/dist/src/FsUtils.js

@@ -14,7 +14,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 (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) 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]) {
@@ -70,7 +70,7 @@ function readJsonFiles(globPattern) {
         var files, readPromises;
         return __generator(this, function (_a) {
             switch (_a.label) {
-                case 0: return [4 /*yield*/, tiny_glob_1.default(globPattern)];
+                case 0: return [4 /*yield*/, (0, tiny_glob_1.default)(globPattern)];
                 case 1:
                     files = _a.sent();
                     readPromises = files.map(function (file) {
@@ -78,7 +78,7 @@ function readJsonFiles(globPattern) {
                             .readFile(file)
                             .then(function (data) { return JSON.parse(data.toString()); })
                             .catch(function (err) {
-                            FlinkLog_1.log.error("Failed reading file " + file + ": " + err);
+                            FlinkLog_1.log.error("Failed reading file ".concat(file, ": ").concat(err));
                             return {};
                         });
                     });
@@ -89,17 +89,17 @@ function readJsonFiles(globPattern) {
     });
 }
 exports.readJsonFiles = readJsonFiles;
-function writeJsonFile(path, content, opts) {
-    if (opts === void 0) { opts = {}; }
-    return __awaiter(this, void 0, void 0, function () {
+function writeJsonFile(path_2, content_1) {
+    return __awaiter(this, arguments, void 0, function (path, content, opts) {
         var i, jsonStr;
+        if (opts === void 0) { opts = {}; }
         return __generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     if (!opts.ensureDir) return [3 /*break*/, 2];
                     i = path.lastIndexOf(path_1.sep);
                     if (!(i > 0 && i < path.length - 1)) return [3 /*break*/, 2];
-                    return [4 /*yield*/, fs_extra_1.ensureDir(path.substr(0, i))];
+                    return [4 /*yield*/, (0, fs_extra_1.ensureDir)(path.substr(0, i))];
                 case 1:
                     _a.sent();
                     _a.label = 2;