2.0.3

.gitlab-ci.yml

@@ -11,28 +11,13 @@ stages:
 - release
 - trigger
 - pages
-
-testLEGACY:
-  stage: test
-  script:
-    - npmci test legacy
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
-  allow_failure: true
-
-testLTS:
-  stage: test
-  script:
-    - npmci test lts
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-    - docker
     
 testSTABLE:
   stage: test
   script:
-    - npmci test stable
+    - npmci node install stable
+    - npmci npm install
+    - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
@@ -40,7 +25,8 @@ testSTABLE:
 release:
   stage: release
   script:
-    - npmci publish
+    - npmci npm prepare
+    - npmci npm publish
   only:
     - tags
   tags:

.prettierrc

@@ -0,0 +1,3 @@
+{
+  "parser": "typescript"
+}

README.md

@@ -1,29 +1,122 @@
 # smartdata
-do more with data
+
+do more with data and RethinkDB
 
 ## Availabililty
+
 [![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartdata)
 [![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartdata)
 [![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartdata)
 [![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartdata/)
 
 ## Status for master
+
 [![build status](https://GitLab.com/pushrocks/smartdata/badges/master/build.svg)](https://GitLab.com/pushrocks/smartdata/commits/master)
 [![coverage report](https://GitLab.com/pushrocks/smartdata/badges/master/coverage.svg)](https://GitLab.com/pushrocks/smartdata/commits/master)
 [![npm downloads per month](https://img.shields.io/npm/dm/smartdata.svg)](https://www.npmjs.com/package/smartdata)
 [![Dependency Status](https://david-dm.org/pushrocks/smartdata.svg)](https://david-dm.org/pushrocks/smartdata)
 [![bitHound Dependencies](https://www.bithound.io/github/pushrocks/smartdata/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/smartdata/master/dependencies/npm)
 [![bitHound Code](https://www.bithound.io/github/pushrocks/smartdata/badges/code.svg)](https://www.bithound.io/github/pushrocks/smartdata)
+[![Known Vulnerabilities](https://snyk.io/test/npm/smartdata/badge.svg)](https://snyk.io/test/npm/smartdata)
 [![TypeScript](https://img.shields.io/badge/TypeScript-2.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
 [![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
 [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
 
 ## Usage
+
 Use TypeScript for best in class instellisense.
 
+smartdata is an ODM that adheres to TypeScript practices and uses classes to organize data.
+It uses RethinkDB as persistent storage.
+
+## Intention
+
+There are many ODMs out there, however when we searched for an ODM that uses TypeScript,
+acts smart while still embracing the NoSQL idea we didn't find a matching solution.
+This is why we started smartdata.
+
+How RethinkDB's terms map to the ones of smartdata:
+
+| RethinkDB term | smartdata class   |
+| -------------- | ----------------- |
+| Database       | smartdata.Db      |
+| Table          | smartdata.DbTable |
+| Document       | smartdata.DbDoc   |
+
+### class Db
+
+represents a Database. Naturally it has .connect() etc. methods on it.
+
+```javascript
+import * as smartdata from "smartdata";
+
+let myRethinkDb1 = new smartdata.Db({
+  // rethinkDb connection options here
+});
+
+myDb1.connect();
+```
+
+### class DbCollection
+
+represents a collection of objects.
+A collection is defined by the object class (that is extending smartdata.dbdoc) it respresents
+
+So to get to get access to a specific collection you document
+
+```javascript
+// continues from the block before...
+
+@Collection(myRethinkDb1)
+class MyObject extends smartdata.DbDoc<myObject> {
+  // read the next block about DbDoc
+  @smartdata.svDb() property1: string; // @smartdata.svDb() marks the property for db save
+  property2: number; // this one is not marked, so it won't be save upon calling this.save()
+  constructor(optionsArg: { property1: string, property2: number }) {
+    super();
+  }
+}
+let myCollection = myRethinkDb1.getCollectionByName < myObject > myObject;
+
+// start to instantiate instances of classes from scratch or database
+
+let localObject = new MyObject({
+  property1: "hi",
+  property2: 2
+});
+localObject.save(); // saves the object to the database
+```
+
+> Alert: You NEVER instantiate a collection.
+> This is done for you!!!
+
+### class DbDoc
+
+represents a individual document in a collection
+and thereby is ideally suited to extend the class you want to actually store.
+
+DbDoc extends your class with the following methods:
+
+* `.save()` will save (or update) the object you call it on only. Any referenced non-savable objects will not get stored.
+* `.saveDeep()` does the same like `.save()`.
+  In addition it will look for properties that reference an object
+  that extends DbDoc as well and call .saveDeep() on them as well.
+  Loops are prevented
+
+So now we can **store** instances of classes to Db...
+How do we **get** a new class instance from a Doc in the DB?
+
+## TypeScript
+
+How does TypeScript play into this?
+Since you define your classes in TypeScript and types flow through smartdata in a generic way
+you should get all the Intellisense and type checking you love when using smartdata.
+smartdata itself also bundles typings.
+So you don't need to install any additional types when importing smartdata.
+
 For further information read the linked docs at the top of this README.
 
 > MIT licensed | **&copy;** [Lossless GmbH](https://lossless.gmbh)
-| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
+> | By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
 
 [![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)

dist/index.d.ts

@@ -1,3 +1,3 @@
-export * from './smartdata.classes.db';
+export * from "./smartdata.classes.db";
-export * from './smartdata.classes.dbcollection';
+export * from "./smartdata.classes.dbtable";
-export * from './smartdata.classes.dbdoc';
+export * from "./smartdata.classes.dbdoc";

dist/index.js

@@ -4,6 +4,6 @@ function __export(m) {
 }
 Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./smartdata.classes.db"));
-__export(require("./smartdata.classes.dbcollection"));
+__export(require("./smartdata.classes.dbtable"));
 __export(require("./smartdata.classes.dbdoc"));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDRDQUFzQztBQUN0QyxzREFBZ0Q7QUFDaEQsK0NBQXlDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDRDQUF1QztBQUN2QyxpREFBNEM7QUFDNUMsK0NBQTBDIn0=

dist/smartdata.classes.db.d.ts

@@ -1,17 +1,22 @@
-import * as plugins from './smartdata.plugins';
+import * as plugins from "./smartdata.plugins";
-import { Objectmap } from 'lik';
+import { Objectmap } from "lik";
-import { DbCollection } from './smartdata.classes.dbcollection';
+import { DbTable } from "./smartdata.classes.dbtable";
+import { ConnectionOptions } from "rethinkdb";
 /**
  * interface - indicates the connection status of the db
  */
-export declare type TConnectionStatus = 'disconnected' | 'connected' | 'failed';
+export declare type TConnectionStatus = "initial" | "disconnected" | "connected" | "failed";
 export declare class Db {
-    dbUrl: string;
+    dbName: string;
-    db: plugins.mongodb.Db;
+    connectionOptions: plugins.rethinkDb.ConnectionOptions;
+    dbConnection: plugins.rethinkDb.Connection;
     status: TConnectionStatus;
-    classCollections: Objectmap<DbCollection<any>>;
+    dbTablesMap: Objectmap<DbTable<any>>;
-    objectCollections: Objectmap<DbCollection<any>>;
+    constructor(connectionOptionsArg: ConnectionOptions);
-    constructor(dbUrlArg: string);
+    /**
+     * supply additional SSl options needed to connect to certain Rethink DB servers (e.g. compose.io)
+     */
+    setSsl(certificateStringArg: string, formatArg: "base64" | "clearText"): void;
     /**
      * connects to the database that was specified during instance creation
      */
@@ -20,13 +25,11 @@ export declare class Db {
      * closes the connection to the databse
      */
     close(): Promise<any>;
+    addTable(dbTableArg: DbTable<any>): void;
     /**
-     * gets a class based collection by name: string
+     * Gets a table's name and returns smartdata's DbTable class
+     * @param nameArg
+     * @returns DbTable
      */
-    getClassCollectionByName<T>(nameArg: string): Promise<DbCollection<T>>;
+    getDbTableByName<T>(nameArg: string): Promise<DbTable<T>>;
-    /**
-     * gets an object collection by name
-     */
-    getObjectCollectionByName<T>(nameArg: string, dbArg: Db, makeNewArg?: boolean): Promise<DbCollection<T>>;
-    addCollection(dbCollectionArg: DbCollection<any>): void;
 }

dist/smartdata.classes.db.js

@@ -10,72 +10,67 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const plugins = require("./smartdata.plugins");
 const lik_1 = require("lik");
-const smartdata_classes_dbobjectdoc_1 = require("./smartdata.classes.dbobjectdoc");
 class Db {
-    constructor(dbUrlArg) {
+    constructor(connectionOptionsArg) {
-        this.classCollections = new lik_1.Objectmap();
+        this.dbTablesMap = new lik_1.Objectmap();
-        this.objectCollections = new lik_1.Objectmap();
+        this.dbName = connectionOptionsArg.db;
-        this.dbUrl = dbUrlArg;
+        this.connectionOptions = connectionOptionsArg;
+        this.status = "initial";
+    }
+    /**
+     * supply additional SSl options needed to connect to certain Rethink DB servers (e.g. compose.io)
+     */
+    setSsl(certificateStringArg, formatArg) {
+        let certificateString;
+        if ((formatArg = "base64")) {
+            certificateString = plugins.smartstring.base64.decode(certificateStringArg);
+        }
+        else {
+            certificateString = certificateStringArg;
+        }
+        this.connectionOptions["ssl"] = {
+            ca: Buffer.from(certificateString)
+        };
     }
     // basic connection stuff ----------------------------------------------
     /**
      * connects to the database that was specified during instance creation
      */
     connect() {
-        let done = plugins.smartq.defer();
+        return __awaiter(this, void 0, void 0, function* () {
-        plugins.mongodb.MongoClient.connect(this.dbUrl, (err, db) => {
+            this.dbConnection = yield plugins.rethinkDb.connect(this.connectionOptions);
-            if (err) {
+            this.dbConnection.use(this.dbName);
-                console.log(err);
+            this.status = "connected";
-            }
+            plugins.beautylog.ok(`Connected to database ${this.dbName}`);
-            plugins.assert.equal(null, err);
-            this.db = db;
-            plugins.beautylog.success(`connected to database at ${this.dbUrl}`);
-            done.resolve(this.db);
         });
-        return done.promise;
     }
     /**
      * closes the connection to the databse
      */
     close() {
-        let done = plugins.smartq.defer();
-        this.db.close();
-        plugins.beautylog.ok(`disconnected to database at ${this.dbUrl}`);
-        done.resolve();
-        return done.promise;
-    }
-    // advanced communication with the database --------------------------------
-    /**
-     * gets a class based collection by name: string
-     */
-    getClassCollectionByName(nameArg) {
         return __awaiter(this, void 0, void 0, function* () {
-            let resultCollection = this.classCollections.find((dbCollectionArg) => {
+            yield this.dbConnection.close();
-                return dbCollectionArg.name === nameArg;
+            this.status = "disconnected";
+            plugins.beautylog.ok(`disconnected from database ${this.dbName}`);
+        });
+    }
+    // handle table to class distribution
+    addTable(dbTableArg) {
+        this.dbTablesMap.add(dbTableArg);
+    }
+    /**
+     * Gets a table's name and returns smartdata's DbTable class
+     * @param nameArg
+     * @returns DbTable
+     */
+    getDbTableByName(nameArg) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let resultCollection = this.dbTablesMap.find(dbTableArg => {
+                return dbTableArg.tableName === nameArg;
             });
             return resultCollection;
         });
     }
-    /**
-     * gets an object collection by name
-     */
-    getObjectCollectionByName(nameArg, dbArg, makeNewArg = false) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let resultCollection = this.objectCollections.find((dbCollectionArg) => {
-                return dbCollectionArg.name === nameArg;
-            });
-            if (!resultCollection && makeNewArg) {
-                resultCollection = smartdata_classes_dbobjectdoc_1.getObjectDoc(nameArg, this).collection;
-                return resultCollection;
-            }
-            else {
-                return resultCollection;
-            }
-        });
-    }
-    addCollection(dbCollectionArg) {
-        this.classCollections.add(dbCollectionArg);
-    }
 }
 exports.Db = Db;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLmNsYXNzZXMuZGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGRhdGEuY2xhc3Nlcy5kYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEsK0NBQThDO0FBQzlDLDZCQUErQjtBQUcvQixtRkFBOEQ7QUFPOUQ7SUFPRSxZQUFhLFFBQWdCO1FBSDdCLHFCQUFnQixHQUFHLElBQUksZUFBUyxFQUFxQixDQUFBO1FBQ3JELHNCQUFpQixHQUFHLElBQUksZUFBUyxFQUFxQixDQUFBO1FBR3BELElBQUksQ0FBQyxLQUFLLEdBQUcsUUFBUSxDQUFBO0lBQ3ZCLENBQUM7SUFFRCx3RUFBd0U7SUFFeEU7O09BRUc7SUFDSCxPQUFPO1FBQ0wsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLEVBQUUsQ0FBQTtRQUNqQyxPQUFPLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDLEdBQUcsRUFBRSxFQUFFLEVBQUUsRUFBRTtZQUMxRCxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO2dCQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUE7WUFBQyxDQUFDO1lBQzdCLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxDQUFDLElBQUksRUFBRSxHQUFHLENBQUMsQ0FBQTtZQUMvQixJQUFJLENBQUMsRUFBRSxHQUFHLEVBQUUsQ0FBQTtZQUNaLE9BQU8sQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLDRCQUE0QixJQUFJLENBQUMsS0FBSyxFQUFFLENBQUMsQ0FBQTtZQUNuRSxJQUFJLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQTtRQUN2QixDQUFDLENBQUMsQ0FBQTtRQUNGLE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3JCLENBQUM7SUFFRDs7T0FFRztJQUNILEtBQUs7UUFDSCxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQ2pDLElBQUksQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUE7UUFDZixPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQywrQkFBK0IsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUE7UUFDakUsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFBO1FBQ2QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7SUFDckIsQ0FBQztJQUVELDRFQUE0RTtJQUU1RTs7T0FFRztJQUNHLHdCQUF3QixDQUFLLE9BQWU7O1lBQ2hELElBQUksZ0JBQWdCLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixDQUFDLElBQUksQ0FBQyxDQUFDLGVBQWUsRUFBRSxFQUFFO2dCQUNwRSxNQUFNLENBQUMsZUFBZSxDQUFDLElBQUksS0FBSyxPQUFPLENBQUE7WUFDekMsQ0FBQyxDQUFDLENBQUE7WUFDRixNQUFNLENBQUMsZ0JBQWdCLENBQUE7UUFDekIsQ0FBQztLQUFBO0lBRUQ7O09BRUc7SUFDRyx5QkFBeUIsQ0FBSyxPQUFlLEVBQUUsS0FBUyxFQUFHLGFBQXNCLEtBQUs7O1lBQzFGLElBQUksZ0JBQWdCLEdBQUcsSUFBSSxDQUFDLGlCQUFpQixDQUFDLElBQUksQ0FBQyxDQUFDLGVBQWUsRUFBRSxFQUFFO2dCQUNyRSxNQUFNLENBQUMsZUFBZSxDQUFDLElBQUksS0FBSyxPQUFPLENBQUE7WUFDekMsQ0FBQyxDQUFDLENBQUE7WUFDRixFQUFFLENBQUMsQ0FBQyxDQUFDLGdCQUFnQixJQUFJLFVBQVUsQ0FBQyxDQUFDLENBQUM7Z0JBQ3BDLGdCQUFnQixHQUFHLDRDQUFZLENBQUMsT0FBTyxFQUFFLElBQUksQ0FBQyxDQUFDLFVBQVUsQ0FBQTtnQkFDekQsTUFBTSxDQUFDLGdCQUFnQixDQUFBO1lBQ3pCLENBQUM7WUFBQyxJQUFJLENBQUMsQ0FBQztnQkFDTixNQUFNLENBQUMsZ0JBQWdCLENBQUE7WUFDekIsQ0FBQztRQUNILENBQUM7S0FBQTtJQUVELGFBQWEsQ0FBRSxlQUFrQztRQUMvQyxJQUFJLENBQUMsZ0JBQWdCLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxDQUFBO0lBQzVDLENBQUM7Q0FFRjtBQXRFRCxnQkFzRUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLmNsYXNzZXMuZGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGRhdGEuY2xhc3Nlcy5kYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEsK0NBQStDO0FBQy9DLDZCQUFnQztBQWVoQztJQU9FLFlBQVksb0JBQXVDO1FBRm5ELGdCQUFXLEdBQUcsSUFBSSxlQUFTLEVBQWdCLENBQUM7UUFHMUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxvQkFBb0IsQ0FBQyxFQUFFLENBQUM7UUFDdEMsSUFBSSxDQUFDLGlCQUFpQixHQUFHLG9CQUFvQixDQUFDO1FBQzlDLElBQUksQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFDO0lBQzFCLENBQUM7SUFFRDs7T0FFRztJQUNILE1BQU0sQ0FBQyxvQkFBNEIsRUFBRSxTQUFpQztRQUNwRSxJQUFJLGlCQUF5QixDQUFDO1FBQzlCLEVBQUUsQ0FBQyxDQUFDLENBQUMsU0FBUyxHQUFHLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQztZQUMzQixpQkFBaUIsR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQ25ELG9CQUFvQixDQUNyQixDQUFDO1FBQ0osQ0FBQztRQUFDLElBQUksQ0FBQyxDQUFDO1lBQ04saUJBQWlCLEdBQUcsb0JBQW9CLENBQUM7UUFDM0MsQ0FBQztRQUNELElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxLQUFLLENBQUMsR0FBRztZQUM5QixFQUFFLEVBQUUsTUFBTSxDQUFDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQztTQUNuQyxDQUFDO0lBQ0osQ0FBQztJQUVELHdFQUF3RTtJQUV4RTs7T0FFRztJQUNHLE9BQU87O1lBQ1gsSUFBSSxDQUFDLFlBQVksR0FBRyxNQUFNLE9BQU8sQ0FBQyxTQUFTLENBQUMsT0FBTyxDQUFDLElBQUksQ0FBQyxpQkFBaUIsQ0FBQyxDQUFDO1lBQzVFLElBQUksQ0FBQyxZQUFZLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUNuQyxJQUFJLENBQUMsTUFBTSxHQUFHLFdBQVcsQ0FBQztZQUMxQixPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyx5QkFBeUIsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUM7UUFDL0QsQ0FBQztLQUFBO0lBRUQ7O09BRUc7SUFDRyxLQUFLOztZQUNULE1BQU0sSUFBSSxDQUFDLFlBQVksQ0FBQyxLQUFLLEVBQUUsQ0FBQztZQUNoQyxJQUFJLENBQUMsTUFBTSxHQUFHLGNBQWMsQ0FBQztZQUM3QixPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQyw4QkFBOEIsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDLENBQUM7UUFDcEUsQ0FBQztLQUFBO0lBRUQscUNBQXFDO0lBRXJDLFFBQVEsQ0FBQyxVQUF3QjtRQUMvQixJQUFJLENBQUMsV0FBVyxDQUFDLEdBQUcsQ0FBQyxVQUFVLENBQUMsQ0FBQztJQUNuQyxDQUFDO0lBRUQ7Ozs7T0FJRztJQUNHLGdCQUFnQixDQUFJLE9BQWU7O1lBQ3ZDLElBQUksZ0JBQWdCLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxJQUFJLENBQUMsVUFBVSxDQUFDLEVBQUU7Z0JBQ3hELE1BQU0sQ0FBQyxVQUFVLENBQUMsU0FBUyxLQUFLLE9BQU8sQ0FBQztZQUMxQyxDQUFDLENBQUMsQ0FBQztZQUNILE1BQU0sQ0FBQyxnQkFBZ0IsQ0FBQztRQUMxQixDQUFDO0tBQUE7Q0FDRjtBQXBFRCxnQkFvRUMifQ==

dist/smartdata.classes.dbcollection.d.ts

@@ -1,42 +0,0 @@
-import * as plugins from './smartdata.plugins';
-import { Db } from './smartdata.classes.db';
-import { DbDoc } from './smartdata.classes.dbdoc';
-export interface IFindOptions {
-    limit?: number;
-}
-export interface IDocValidation<T> {
-    (doc: T): boolean;
-}
-export declare function Collection(db: Db): (constructor: any) => void;
-export declare class DbCollection<T> {
-    /**
-     * the collection that is used, defaults to mongodb collection,
-     * can be nedb datastore (sub api of mongodb)
-     */
-    collection: plugins.mongodb.Collection;
-    collectedClass: T & DbDoc<T>;
-    objectValidation: IDocValidation<T>;
-    name: string;
-    db: Db;
-    constructor(collectedClassArg: T & DbDoc<T>, dbArg: Db);
-    /**
-     * adds a validation function that all newly inserted and updated objects have to pass
-     */
-    addDocValidation(funcArg: IDocValidation<T>): void;
-    /**
-     * finds an object in the DbCollection
-     */
-    find(docMatchArg: T | any, optionsArg?: IFindOptions): Promise<T[]>;
-    /**
-     * inserts object into the DbCollection
-     */
-    insertOne(docArg: T): Promise<void>;
-    /**
-     * inserts many objects at once into the DbCollection
-     */
-    insertMany(docArrayArg: T[]): Promise<void>;
-    /**
-     * checks a Doc for constraints
-     */
-    private checkDoc(docArg);
-}

dist/smartdata.classes.dbcollection.js

@@ -1,95 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const plugins = require("./smartdata.plugins");
-function Collection(db) {
-    return function (constructor) {
-        constructor['dbCollection'] = new DbCollection(constructor, db);
-    };
-}
-exports.Collection = Collection;
-class DbCollection {
-    constructor(collectedClassArg, dbArg) {
-        this.objectValidation = null;
-        // tell the collection where it belongs
-        this.collectedClass = collectedClassArg;
-        this.name = collectedClassArg.name;
-        this.db = dbArg;
-        // make sure it actually exists
-        this.collection = dbArg.db.collection(this.name);
-        // tell the db class about it (important since Db uses different systems under the hood)
-        this.db.addCollection(this);
-    }
-    /**
-     * adds a validation function that all newly inserted and updated objects have to pass
-     */
-    addDocValidation(funcArg) {
-        this.objectValidation = funcArg;
-    }
-    /**
-     * finds an object in the DbCollection
-     */
-    find(docMatchArg, optionsArg) {
-        let done = plugins.smartq.defer();
-        let findCursor = this.collection.find(docMatchArg);
-        if (optionsArg) {
-            if (optionsArg.limit) {
-                findCursor = findCursor.limit(1);
-            }
-        }
-        findCursor.toArray((err, docs) => {
-            if (err) {
-                done.reject(err);
-                throw err;
-            }
-            done.resolve(docs);
-        });
-        return done.promise;
-    }
-    /**
-     * inserts object into the DbCollection
-     */
-    insertOne(docArg) {
-        let done = plugins.smartq.defer();
-        this.checkDoc(docArg).then(() => {
-            this.collection.insertOne(docArg)
-                .then(() => { done.resolve(); });
-        }, () => {
-            done.reject(new Error('one the docs did not pass validation'));
-        });
-        return done.promise;
-    }
-    /**
-     * inserts many objects at once into the DbCollection
-     */
-    insertMany(docArrayArg) {
-        let done = plugins.smartq.defer();
-        let checkDocPromiseArray = [];
-        for (let docArg of docArrayArg) {
-            checkDocPromiseArray.push(this.checkDoc(docArg));
-        }
-        Promise.all(checkDocPromiseArray).then(() => {
-            this.collection.insertMany(docArrayArg)
-                .then(() => { done.resolve(); });
-        });
-        return done.promise;
-    }
-    /**
-     * checks a Doc for constraints
-     */
-    checkDoc(docArg) {
-        let done = plugins.smartq.defer();
-        let validationResult = true;
-        if (this.objectValidation) {
-            validationResult = this.objectValidation(docArg);
-        }
-        if (validationResult) {
-            done.resolve();
-        }
-        else {
-            done.reject('validation of object did not pass');
-        }
-        return done.promise;
-    }
-}
-exports.DbCollection = DbCollection;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLmNsYXNzZXMuZGJjb2xsZWN0aW9uLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vdHMvc21hcnRkYXRhLmNsYXNzZXMuZGJjb2xsZWN0aW9uLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0NBQThDO0FBWTlDLG9CQUE0QixFQUFNO0lBQ2hDLE1BQU0sQ0FBQyxVQUFVLFdBQVc7UUFDMUIsV0FBVyxDQUFFLGNBQWMsQ0FBRSxHQUFHLElBQUksWUFBWSxDQUFDLFdBQVcsRUFBRSxFQUFFLENBQUMsQ0FBQTtJQUNuRSxDQUFDLENBQUE7QUFDSCxDQUFDO0FBSkQsZ0NBSUM7QUFFRDtJQVdFLFlBQWEsaUJBQStCLEVBQUUsS0FBUztRQUp2RCxxQkFBZ0IsR0FBc0IsSUFBSSxDQUFBO1FBS3hDLHVDQUF1QztRQUN2QyxJQUFJLENBQUMsY0FBYyxHQUFHLGlCQUFpQixDQUFBO1FBQ3ZDLElBQUksQ0FBQyxJQUFJLEdBQUcsaUJBQWlCLENBQUMsSUFBSSxDQUFBO1FBQ2xDLElBQUksQ0FBQyxFQUFFLEdBQUcsS0FBSyxDQUFBO1FBRWYsK0JBQStCO1FBQy9CLElBQUksQ0FBQyxVQUFVLEdBQUcsS0FBSyxDQUFDLEVBQUUsQ0FBQyxVQUFVLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFBO1FBRWhELHdGQUF3RjtRQUN4RixJQUFJLENBQUMsRUFBRSxDQUFDLGFBQWEsQ0FBQyxJQUFJLENBQUMsQ0FBQTtJQUM3QixDQUFDO0lBRUQ7O09BRUc7SUFDSCxnQkFBZ0IsQ0FBRSxPQUEwQjtRQUMxQyxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsT0FBTyxDQUFBO0lBQ2pDLENBQUM7SUFFRDs7T0FFRztJQUNILElBQUksQ0FBRSxXQUFvQixFQUFFLFVBQXlCO1FBQ25ELElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxNQUFNLENBQUMsS0FBSyxFQUFPLENBQUE7UUFDdEMsSUFBSSxVQUFVLEdBQUcsSUFBSSxDQUFDLFVBQVUsQ0FB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

dist/smartdata.classes.dbdoc.d.ts

@@ -1,6 +1,6 @@
-import { Objectmap } from 'lik';
+import { Objectmap } from "lik";
-import { DbCollection } from './smartdata.classes.dbcollection';
+import { DbTable } from "./smartdata.classes.dbtable";
-export declare type TDocCreation = 'db' | 'new' | 'mixed';
+export declare type TDocCreation = "db" | "new" | "mixed";
 /**
  * saveable - saveable decorator to be used on class properties
  */
@@ -9,11 +9,11 @@ export declare class DbDoc<T> {
     /**
      * the collection object an Doc belongs to
      */
-    collection: DbCollection<T>;
+    collection: DbTable<T>;
     /**
      * how the Doc in memory was created, may prove useful later.
      */
-    creationType: TDocCreation;
+    creationStatus: TDocCreation;
     /**
      * an array of saveable properties of a doc
      */
@@ -22,18 +22,24 @@ export declare class DbDoc<T> {
      * name
      */
     name: string;
+    /**
+     * primary id in the database
+     */
+    dbId: string;
     /**
      * class constructor
      */
     constructor();
+    static getInstances<T>(filterArg: any): Promise<T[]>;
     /**
      * saves this instance but not any connected items
      * may lead to data inconsistencies, but is faster
      */
-    save(): void;
+    save(): Promise<void>;
     /**
      * also store any referenced objects to DB
      * better for data consistency
      */
     saveDeep(savedMapArg?: Objectmap<DbDoc<any>>): void;
+    createSavableObject(): any;
 }

dist/smartdata.classes.dbdoc.js

@@ -1,4 +1,12 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    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) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const lik_1 = require("lik");
 /**
@@ -6,7 +14,7 @@ const lik_1 = require("lik");
  */
 function svDb() {
     return (target, key) => {
-        console.log('called sva');
+        console.log("called sva");
         if (!target.saveableProperties) {
             target.saveableProperties = [];
         }
@@ -19,25 +27,50 @@ class DbDoc {
      * class constructor
      */
     constructor() {
-        this.name = this.constructor['name'];
+        /**
-        this.collection = this.constructor['dbCollection'];
+         * how the Doc in memory was created, may prove useful later.
+         */
+        this.creationStatus = "new";
+        this.name = this.constructor["name"];
+        this.collection = this.constructor["dbTable"];
+    }
+    static getInstances(filterArg) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let self = this; // fool typesystem
+            let referenceTable = self.dbTable;
+            const foundDocs = yield referenceTable.find(filterArg);
+            const returnArray = [];
+            for (let item of foundDocs) {
+                let newInstance = new this();
+                for (let key in item) {
+                    if (key !== 'id') {
+                        newInstance[key] = item[key];
+                    }
+                }
+                returnArray.push(newInstance);
+            }
+            return returnArray;
+        });
     }
     /**
      * saves this instance but not any connected items
      * may lead to data inconsistencies, but is faster
      */
     save() {
-        let saveableObject = {}; // is not exposed to outside, so any is ok here
+        return __awaiter(this, void 0, void 0, function* () {
-        for (let propertyNameString of this.saveableProperties) {
+            let self = this;
-            saveableObject[propertyNameString] = this[propertyNameString];
+            switch (this.creationStatus) {
-        }
+                case "db":
-        switch (this.creationType) {
+                    yield this.collection.update(self);
-            case 'db':
+                    break;
-                this.collection; // TODO implement collection.update()
+                case "new":
-                break;
+                    let writeResult = yield this.collection.insert(self);
-            case 'new':
+                    this.creationStatus = "db";
-                this.collection.insertOne(saveableObject);
+                    break;
-        }
+                default:
+                    console.error("neither new nor in db?");
+            }
+        });
     }
     /**
      * also store any referenced objects to DB
@@ -56,6 +89,13 @@ class DbDoc {
             }
         }
     }
+    createSavableObject() {
+        let saveableObject = {}; // is not exposed to outside, so any is ok here
+        for (let propertyNameString of this.saveableProperties) {
+            saveableObject[propertyNameString] = this[propertyNameString];
+        }
+        return saveableObject;
+    }
 }
 exports.DbDoc = DbDoc;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLmNsYXNzZXMuZGJkb2MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGRhdGEuY2xhc3Nlcy5kYmRvYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUVBLDZCQUErQjtBQU8vQjs7R0FFRztBQUNIO0lBQ0UsTUFBTSxDQUFDLENBQUMsTUFBa0IsRUFBRSxHQUFXLEVBQUUsRUFBRTtRQUN6QyxPQUFPLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFBO1FBQ3pCLEVBQUUsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQztZQUFDLE1BQU0sQ0FBQyxrQkFBa0IsR0FBRyxFQUFFLENBQUE7UUFBQyxDQUFDO1FBQ2xFLE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDckMsQ0FBQyxDQUFBO0FBQ0gsQ0FBQztBQU5ELG9CQU1DO0FBRUQ7SUFzQkU7O09BRUc7SUFDSDtRQUNFLElBQUksQ0FBQyxJQUFJLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsQ0FBQTtRQUNwQyxJQUFJLENBQUMsVUFBVSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUUsY0FBYyxDQUFFLENBQUE7SUFDdEQsQ0FBQztJQUVEOzs7T0FHRztJQUNILElBQUk7UUFDRixJQUFJLGNBQWMsR0FBUSxFQUFFLENBQUEsQ0FBQywrQ0FBK0M7UUFDNUUsR0FBRyxDQUFDLENBQUMsSUFBSSxrQkFBa0IsSUFBSSxJQUFJLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDO1lBQ3ZELGNBQWMsQ0FBRSxrQkFBa0IsQ0FBRSxHQUFHLElBQUksQ0FBRSxrQkFBa0IsQ0FBRSxDQUFBO1FBQ25FLENBQUM7UUFDRCxNQUFNLENBQUMsQ0FBQyxJQUFJLENBQUMsWUFBWSxDQUFDLENBQUMsQ0FBQztZQUMxQixLQUFLLElBQUk7Z0JBQ1AsSUFBSSxDQUFDLFVBQVUsQ0FBQSxDQUFDLHFDQUFxQztnQkFDckQsS0FBSyxDQUFBO1lBQ1AsS0FBSyxLQUFLO2dCQUNSLElBQUksQ0FBQyxVQUFVLENBQUMsU0FBUyxDQUFDLGNBQWMsQ0FBQyxDQUFBO1FBQzdDLENBQUM7SUFDSCxDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsUUFBUSxDQUFFLGNBQXFDLElBQUk7UUFDakQsRUFBRSxDQUFDLENBQUMsQ0FBQyxXQUFXLENBQUMsQ0FBQyxDQUFDO1lBQ2pCLFdBQVcsR0FBRyxJQUFJLGVBQVMsRUFBYyxDQUFBO1FBQzNDLENBQUM7UUFDRCxXQUFXLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFBO1FBQ3JCLElBQUksQ0FBQyxJQUFJLEVBQUUsQ0FBQTtRQUNYLEdBQUcsQ0FBQyxDQUFDLElBQUksV0FBVyxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUM7WUFDN0IsSUFBSSxRQUFRLEdBQVEsSUFBSSxDQUFFLFdBQVcsQ0FBRSxDQUFBO1lBQ3ZDLEVBQUUsQ0FBQyxDQUFDLFFBQVEsWUFBWSxLQUFLLElBQUksQ0FBQyxXQUFXLENBQUMsY0FBYyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsQ0FBQztnQkFDdkUsUUFBUSxDQUFDLFFBQVEsQ0FBQyxXQUFXLENBQUMsQ0FBQTtZQUNoQyxDQUFDO1FBQ0gsQ0FBQztJQUNILENBQUM7Q0FDRjtBQWpFRCxzQkFpRUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLmNsYXNzZXMuZGJkb2MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGRhdGEuY2xhc3Nlcy5kYmRvYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBRUEsNkJBQWdDO0FBT2hDOztHQUVHO0FBQ0g7SUFDRSxNQUFNLENBQUMsQ0FBQyxNQUFrQixFQUFFLEdBQVcsRUFBRSxFQUFFO1FBQ3pDLE9BQU8sQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDMUIsRUFBRSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDO1lBQy9CLE1BQU0sQ0FBQyxrQkFBa0IsR0FBRyxFQUFFLENBQUM7UUFDakMsQ0FBQztRQUNELE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDdEMsQ0FBQyxDQUFDO0FBQ0osQ0FBQztBQVJELG9CQVFDO0FBRUQ7SUEwQkU7O09BRUc7SUFDSDtRQXZCQTs7V0FFRztRQUNILG1CQUFjLEdBQWlCLEtBQUssQ0FBQztRQXFCbkMsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3JDLElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNoRCxDQUFDO0lBRUQsTUFBTSxDQUFPLFlBQVksQ0FBSSxTQUFTOztZQUNwQyxJQUFJLElBQUksR0FBUSxJQUFJLENBQUMsQ0FBQyxrQkFBa0I7WUFDeEMsSUFBSSxjQUFjLEdBQWUsSUFBSSxDQUFDLE9BQU8sQ0FBQztZQUM5QyxNQUFNLFNBQVMsR0FBRyxNQUFNLGNBQWMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7WUFDdkQsTUFBTSxXQUFXLEdBQUcsRUFBRSxDQUFDO1lBQ3ZCLEdBQUcsQ0FBQyxDQUFDLElBQUksSUFBSSxJQUFJLFNBQVMsQ0FBQyxDQUFDLENBQUM7Z0JBQzNCLElBQUksV0FBVyxHQUFHLElBQUksSUFBSSxFQUFFLENBQUM7Z0JBQzdCLEdBQUcsQ0FBQyxDQUFDLElBQUksR0FBRyxJQUFJLElBQUksQ0FBQyxDQUFDLENBQUM7b0JBQ3JCLEVBQUUsQ0FBQSxDQUFDLEdBQUcsS0FBSyxJQUFJLENBQUMsQ0FBQyxDQUFDO3dCQUNoQixXQUFXLENBQUMsR0FBRyxDQUFDLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUFDO29CQUMvQixDQUFDO2dCQUNILENBQUM7Z0JBQ0QsV0FBVyxDQUFDLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztZQUNoQyxDQUFDO1lBQ0QsTUFBTSxDQUFDLFdBQVcsQ0FBQztRQUNyQixDQUFDO0tBQUE7SUFFRDs7O09BR0c7SUFDRyxJQUFJOztZQUNSLElBQUksSUFBSSxHQUFRLElBQUksQ0FBQztZQUNyQixNQUFNLENBQUMsQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztnQkFDNUIsS0FBSyxJQUFJO29CQUNQLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUM7b0JBQ25DLEtBQUssQ0FBQztnQkFDUixLQUFLLEtBQUs7b0JBQ1IsSUFBSSxXQUFXLEdBQUcsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQztvQkFDckQsSUFBSSxDQUFDLGNBQWMsR0FBRyxJQUFJLENBQUM7b0JBQzNCLEtBQUssQ0FBQztnQkFDUjtvQkFDRSxPQUFPLENBQUMsS0FBSyxDQUFDLHdCQUF3QixDQUFDLENBQUM7WUFDNUMsQ0FBQztRQUNILENBQUM7S0FBQTtJQUVEOzs7T0FHRztJQUNILFFBQVEsQ0FBQyxjQUFxQyxJQUFJO1FBQ2hELEVBQUUsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQztZQUNqQixXQUFXLEdBQUcsSUFBSSxlQUFTLEVBQWMsQ0FBQztRQUM1QyxDQUFDO1FBQ0QsV0FBVyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQztRQUN0QixJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7UUFDWixHQUFHLENBQUMsQ0FBQyxJQUFJLFdBQVcsSUFBSSxJQUFJLENBQUMsQ0FBQyxDQUFDO1lBQzdCLElBQUksUUFBUSxHQUFRLElBQUksQ0FBQyxXQUFXLENBQUMsQ0FBQztZQUN0QyxFQUFFLENBQUMsQ0FBQyxRQUFRLFlBQVksS0FBSyxJQUFJLENBQUMsV0FBVyxDQUFDLGNBQWMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ3ZFLFFBQVEsQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUM7WUFDakMsQ0FBQztRQUNILENBQUM7SUFDSCxDQUFDO0lBRUQsbUJBQW1CO1FBQ2pCLElBQUksY0FBYyxHQUFRLEVBQUUsQ0FBQyxDQUFDLCtDQUErQztRQUM3RSxHQUFHLENBQUMsQ0FBQyxJQUFJLGtCQUFrQixJQUFJLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUM7WUFDdkQsY0FBYyxDQUFDLGtCQUFrQixDQUFDLEdBQUcsSUFBSSxDQUFDLGtCQUFrQixDQUFDLENBQUM7UUFDaEUsQ0FBQztRQUNELE1BQU0sQ0FBQyxjQUFjLENBQUM7SUFDeEIsQ0FBQztDQUNGO0FBL0ZELHNCQStGQyJ9

dist/smartdata.classes.dbobjectdoc.d.ts

@@ -1,3 +0,0 @@
-import { Db } from './smartdata.classes.db';
-import { DbDoc } from './smartdata.classes.dbdoc';
-export declare let getObjectDoc: (nameArg: any, dbArg: Db) => DbDoc<{}>;

dist/smartdata.classes.dbobjectdoc.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const smartdata_classes_dbdoc_1 = require("./smartdata.classes.dbdoc");
-const smartdata_classes_dbcollection_1 = require("./smartdata.classes.dbcollection");
-exports.getObjectDoc = (nameArg, dbArg) => {
-    let objectDoc = new smartdata_classes_dbdoc_1.DbDoc();
-    objectDoc.name = nameArg;
-    objectDoc.collection = new smartdata_classes_dbcollection_1.DbCollection(objectDoc, dbArg);
-    return objectDoc;
-};
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLmNsYXNzZXMuZGJvYmplY3Rkb2MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGRhdGEuY2xhc3Nlcy5kYm9iamVjdGRvYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUdBLHVFQUFpRDtBQUNqRCxxRkFBK0Q7QUFFcEQsUUFBQSxZQUFZLEdBQUcsQ0FBQyxPQUFPLEVBQUMsS0FBUyxFQUFFLEVBQUU7SUFDOUMsSUFBSSxTQUFTLEdBQUcsSUFBSSwrQkFBSyxFQUFFLENBQUE7SUFDM0IsU0FBUyxDQUFDLElBQUksR0FBRyxPQUFPLENBQUE7SUFDeEIsU0FBUyxDQUFDLFVBQVUsR0FBRyxJQUFJLDZDQUFZLENBQUMsU0FBUyxFQUFFLEtBQUssQ0FBQyxDQUFBO0lBQ3pELE1BQU0sQ0FBQyxTQUFTLENBQUE7QUFDbEIsQ0FBQyxDQUFBIn0=

dist/smartdata.classes.dbtable.d.ts

@@ -0,0 +1,51 @@
+import * as plugins from "./smartdata.plugins";
+import { Db } from "./smartdata.classes.db";
+import { DbDoc } from "./smartdata.classes.dbdoc";
+import { WriteResult } from "rethinkdb";
+export interface IFindOptions {
+    limit?: number;
+}
+/**
+ *
+ */
+export interface IDocValidationFunc<T> {
+    (doc: T): boolean;
+}
+/**
+ * This is a decorator that will tell the decorated class what dbTable to use
+ * @param db
+ */
+export declare function Table(db: Db): (constructor: any) => void;
+export declare class DbTable<T> {
+    /**
+     * the collection that is used
+     */
+    table: plugins.rethinkDb.Table;
+    objectValidation: IDocValidationFunc<T>;
+    tableName: string;
+    db: Db;
+    constructor(collectedClassArg: T & DbDoc<T>, dbArg: Db);
+    init(): Promise<void>;
+    /**
+     * adds a validation function that all newly inserted and updated objects have to pass
+     */
+    addDocValidation(funcArg: IDocValidationFunc<T>): void;
+    /**
+     * finds an object in the DbCollection
+     */
+    find(filterObject: any): Promise<any>;
+    /**
+     * create an object in the database
+     */
+    insert(dbDocArg: T & DbDoc<T>): Promise<WriteResult>;
+    /**
+     * inserts object into the DbCollection
+     */
+    update(dbDocArg: T & DbDoc<T>): Promise<WriteResult>;
+    /**
+     * checks a Doc for constraints
+     * if this.objectValidation is not set it passes.
+     */
+    private checkDoc(docArg);
+    extractKey(writeResult: WriteResult): void;
+}

dist/smartdata.classes.dbtable.js

@@ -0,0 +1,116 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    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) : new P(function (resolve) { resolve(result.value); }).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const plugins = require("./smartdata.plugins");
+/**
+ * This is a decorator that will tell the decorated class what dbTable to use
+ * @param db
+ */
+function Table(db) {
+    return function (constructor) {
+        constructor["dbTable"] = new DbTable(constructor, db);
+    };
+}
+exports.Table = Table;
+class DbTable {
+    constructor(collectedClassArg, dbArg) {
+        this.objectValidation = null;
+        // tell the collection where it belongs
+        this.tableName = collectedClassArg.name;
+        this.db = dbArg;
+        // tell the db class about it (important since Db uses different systems under the hood)
+        this.db.addTable(this);
+    }
+    init() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!this.table) {
+                // connect this instance to a RethinkDB table
+                const availableTables = yield plugins.rethinkDb
+                    .db(this.db.dbName)
+                    .tableList()
+                    .run(this.db.dbConnection);
+                if (availableTables.indexOf(this.tableName)) {
+                    yield plugins.rethinkDb
+                        .db(this.db.dbName)
+                        .tableCreate(this.tableName)
+                        .run(this.db.dbConnection);
+                }
+            }
+            this.table = plugins.rethinkDb.table(this.tableName);
+        });
+    }
+    /**
+     * adds a validation function that all newly inserted and updated objects have to pass
+     */
+    addDocValidation(funcArg) {
+        this.objectValidation = funcArg;
+    }
+    /**
+     * finds an object in the DbCollection
+     */
+    find(filterObject) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.init();
+            let cursor = yield plugins.rethinkDb
+                .table(this.tableName)
+                .filter(filterObject)
+                .run(this.db.dbConnection);
+            return yield cursor.toArray();
+        });
+    }
+    /**
+     * create an object in the database
+     */
+    insert(dbDocArg) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.init();
+            yield this.checkDoc(dbDocArg);
+            return yield plugins.rethinkDb
+                .table(this.tableName)
+                .insert(dbDocArg.createSavableObject())
+                .run(this.db.dbConnection);
+        });
+    }
+    /**
+     * inserts object into the DbCollection
+     */
+    update(dbDocArg) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.init();
+            yield this.checkDoc(dbDocArg);
+            console.log(this.tableName, dbDocArg.createSavableObject());
+            return yield plugins.rethinkDb
+                .table(this.tableName)
+                .update(dbDocArg.createSavableObject())
+                .run(this.db.dbConnection);
+        });
+    }
+    /**
+     * checks a Doc for constraints
+     * if this.objectValidation is not set it passes.
+     */
+    checkDoc(docArg) {
+        let done = plugins.smartq.defer();
+        let validationResult = true;
+        if (this.objectValidation) {
+            validationResult = this.objectValidation(docArg);
+        }
+        if (validationResult) {
+            done.resolve();
+        }
+        else {
+            done.reject("validation of object did not pass");
+        }
+        return done.promise;
+    }
+    extractKey(writeResult) { }
+}
+exports.DbTable = DbTable;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLmNsYXNzZXMuZGJ0YWJsZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uL3RzL3NtYXJ0ZGF0YS5jbGFzc2VzLmRidGFibGUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLCtDQUErQztBQWtCL0M7OztHQUdHO0FBQ0gsZUFBc0IsRUFBTTtJQUMxQixNQUFNLENBQUMsVUFBUyxXQUFXO1FBQ3pCLFdBQVcsQ0FBQyxTQUFTLENBQUMsR0FBRyxJQUFJLE9BQU8sQ0FBQyxXQUFXLEVBQUUsRUFBRSxDQUFDLENBQUM7SUFDeEQsQ0FBQyxDQUFDO0FBQ0osQ0FBQztBQUpELHNCQUlDO0FBRUQ7SUFTRSxZQUFZLGlCQUErQixFQUFFLEtBQVM7UUFKdEQscUJBQWdCLEdBQTBCLElBQUksQ0FBQztRQUs3Qyx1Q0FBdUM7UUFDdkMsSUFBSSxDQUFDLFNBQVMsR0FBRyxpQkFBaUIsQ0FBQyxJQUFJLENBQUM7UUFDeEMsSUFBSSxDQUFDLEVBQUUsR0FBRyxLQUFLLENBQUM7UUFFaEIsd0ZBQXdGO1FBQ3hGLElBQUksQ0FBQyxFQUFFLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3pCLENBQUM7SUFFSyxJQUFJOztZQUNSLEVBQUUsQ0FBQyxDQUFDLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7Z0JBQ2hCLDZDQUE2QztnQkFDN0MsTUFBTSxlQUFlLEdBQUcsTUFBTSxPQUFPLENBQUMsU0FBUztxQkFDNUMsRUFBRSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDO3FCQUNsQixTQUFTLEVBQUU7cUJBQ1gsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLENBQUM7Z0JBQzdCLEVBQUUsQ0FBQyxDQUFDLGVBQWUsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQztvQkFDNUMsTUFBTSxPQUFPLENBQUMsU0FBUzt5QkFDcEIsRUFBRSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsTUFBTSxDQUFDO3lCQUNsQixXQUFXLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQzt5QkFDM0IsR0FBRyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLENBQUM7Z0JBQy9CLENBQUM7WUFDSCxDQUFDO1lBQ0QsSUFBSSxDQUFDLEtBQUssR0FBRyxPQUFPLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7UUFDdkQsQ0FBQztLQUFBO0lBRUQ7O09BRUc7SUFDSCxnQkFBZ0IsQ0FBQyxPQUE4QjtRQUM3QyxJQUFJLENBQUMsZ0JBQWdCLEdBQUcsT0FBTyxDQUFDO0lBQ2xDLENBQUM7SUFFRDs7T0FFRztJQUNHLElBQUksQ0FBQyxZQUFpQjs7WUFDMUIsTUFBTSxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDbEIsSUFBSSxNQUFNLEdBQUcsTUFBTSxPQUFPLENBQUMsU0FBUztpQkFDakMsS0FBSyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUM7aUJBQ3JCLE1BQU0sQ0FBQyxZQUFZLENBQUM7aUJBQ3BCLEdBQUcsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLFlBQVksQ0FBQyxDQUFDO1lBQzdCLE1BQU0sQ0FBQyxNQUFNLE1BQU0sQ0FBQyxPQUFPLEVBQUUsQ0FBQztRQUNoQyxDQUFDO0tBQUE7SUFFRDs7T0FFRztJQUNHLE1BQU0sQ0FBQyxRQUFzQjs7WUFDakMsTUFBTSxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDbEIsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQzlCLE1BQU0sQ0FBQyxNQUFNLE9BQU8sQ0FBQyxTQUFTO2lCQUMzQixLQUFLLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQztpQkFDckIsTUFBTSxDQUFDLFFBQVEsQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO2lCQUN0QyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUMvQixDQUFDO0tBQUE7SUFFRDs7T0FFRztJQUNHLE1BQU0sQ0FBQyxRQUFzQjs7WUFDakMsTUFBTSxJQUFJLENBQUMsSUFBSSxFQUFFLENBQUM7WUFDbEIsTUFBTSxJQUFJLENBQUMsUUFBUSxDQUFDLFFBQVEsQ0FBQyxDQUFDO1lBQzlCLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsRUFBRSxRQUFRLENBQUMsbUJBQW1CLEVBQUUsQ0FBQyxDQUFDO1lBQzVELE1BQU0sQ0FBQyxNQUFNLE9BQU8sQ0FBQyxTQUFTO2lCQUMzQixLQUFLLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQztpQkFDckIsTUFBTSxDQUFDLFFBQVEsQ0FBQyxtQkFBbUIsRUFBRSxDQUFDO2lCQUN0QyxHQUFHLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsQ0FBQztRQUMvQixDQUFDO0tBQUE7SUFFRDs7O09BR0c7SUFDSyxRQUFRLENBQUMsTUFBUztRQUN4QixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsTUFBTSxDQUFDLEtBQUssRUFBUSxDQUFDO1FBQ3hDLElBQUksZ0JBQWdCLEdBQUcsSUFBSSxDQUFDO1FBQzVCLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLENBQUM7WUFDMUIsZ0JBQWdCLEdBQUcsSUFBSSxDQUFDLGdCQUFnQixDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ25ELENBQUM7UUFDRCxFQUFFLENBQUMsQ0FBQyxnQkFBZ0IsQ0FBQyxDQUFDLENBQUM7WUFDckIsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFDO1FBQ2pCLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNOLElBQUksQ0FBQyxNQUFNLENBQUMsbUNBQW1DLENBQUMsQ0FBQztRQUNuRCxDQUFDO1FBQ0QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUM7SUFDdEIsQ0FBQztJQUVELFVBQVUsQ0FBQyxXQUF3QixJQUFHLENBQUM7Q0FDeEM7QUFsR0QsMEJBa0dDIn0=

dist/smartdata.plugins.d.ts

@@ -1,7 +1,7 @@
-import 'typings-global';
+import * as assert from "assert";
-import * as assert from 'assert';
+import * as beautylog from "beautylog";
-import * as beautylog from 'beautylog';
+import * as lodash from "lodash";
-import * as lodash from 'lodash';
+import * as rethinkDb from "rethinkdb";
-import * as mongodb from 'mongodb';
+import * as smartq from "smartq";
-import * as smartq from 'smartq';
+import * as smartstring from "smartstring";
-export { assert, beautylog, lodash, mongodb, smartq };
+export { assert, beautylog, lodash, smartq, rethinkDb, smartstring };

dist/smartdata.plugins.js

@@ -1,14 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-require("typings-global");
 const assert = require("assert");
 exports.assert = assert;
 const beautylog = require("beautylog");
 exports.beautylog = beautylog;
 const lodash = require("lodash");
 exports.lodash = lodash;
-const mongodb = require("mongodb");
+const rethinkDb = require("rethinkdb");
-exports.mongodb = mongodb;
+exports.rethinkDb = rethinkDb;
 const smartq = require("smartq");
 exports.smartq = smartq;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGRhdGEucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLDBCQUF1QjtBQUN2QixpQ0FBZ0M7QUFPNUIsd0JBQU07QUFOVix1Q0FBc0M7QUFPbEMsOEJBQVM7QUFOYixpQ0FBZ0M7QUFPNUIsd0JBQU07QUFOVixtQ0FBa0M7QUFPOUIsMEJBQU87QUFOWCxpQ0FBZ0M7QUFPNUIsd0JBQU0ifQ==
+const smartstring = require("smartstring");
+exports.smartstring = smartstring;
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGRhdGEucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGlDQUFpQztBQU94Qix3QkFBTTtBQU5mLHVDQUF1QztBQU10Qiw4QkFBUztBQUwxQixpQ0FBaUM7QUFLTCx3QkFBTTtBQUpsQyx1Q0FBdUM7QUFJSyw4QkFBUztBQUhyRCxpQ0FBaUM7QUFHRyx3QkFBTTtBQUYxQywyQ0FBMkM7QUFFWSxrQ0FBVyJ9

docs/index.md

@@ -18,99 +18,6 @@ do more with data
 [![node](https://img.shields.io/badge/node->=%206.x.x-blue.svg)](https://nodejs.org/dist/latest-v6.x/docs/api/)
 [![JavaScript Style Guide](https://img.shields.io/badge/code%20style-standard-brightgreen.svg)](http://standardjs.com/)
 
-## Usage
-Use TypeScript for best in class instellisense.
-
-smartdata is an ODM that adheres to TypeScript practices and uses classes to organize data.
-It uses MongoDB or NeDb as persistent storage.
-
-## Intention
-There are many ODMs out there, however when we searched for an ODM that uses TypeScript,
-acts smart while still embracing the NoSQL idea we didn't find a matching solution.
-This is why we started smartdata.
-
-How MongoDB terms map to smartdata classes
-
-MongoDB term | smartdata class
---- | ---
-Database | smartdata.Db
-Collection | smartdata.DbCollection
-Document | smartdata.DbDoc
-
-### class Db
-represents a Database. Naturally it has .connect() etc. methods on it.
-Since it is a class you can have multiple DBs defined.
-```javascript
-import * as smartdata from 'smartdata'
-
-// mongodb
-let myDb1 = new smartdata.Db('someConnectionUrl')
-let myDb2 = new smartdata.Db('someConnectionUrl')
-
-// nedb
-let myDb3 = new smartdata('/some/path/for/persistence', 'nedb') // you may set first argument to null for just in memory db
-
-myDb1.connect()
-myDb2.connect()
-
-// continues in next block... 
-```
-
-### class DbCollection
-represents a collection of objects.
-A collection is defined by the object class (that is extending smartdata.dbdoc) it respresents
-
-So to get to get access to a specific collection you document
-```javascript
-// continues from the block before...
-
-@Collection(myDb1)
-class MyObject extends smartdata.DbDoc<myObject> { // read the next block about DbDoc
-    @smartdata.svDb() property1: string // @smartdata.svDb() marks the property for db save
-    property2: number // this one is not marked, so it won't be save upon calling this.save() 
-    constructor(optionsArg:{
-        property1: string,
-        property2: number
-    }) {
-        super()
-    }
-}
-let myCollection = myDb1.getCollectionByName<myObject>(myObject)
-
-// start to instantiate instances of classes from scratch or database
-
-let localObject = new MyObject({
-    property1: 'hi',
-    property2: 2
-})
-localObject.save() // saves the object to the database
-``` 
-
-> Alert: You NEVER instantiate a collection.
-This is done for you!!!
-
-### class DbDoc
-represents a individual document in a collection
-and thereby is ideally suited to extend the class you want to actually store.
-
-DbDoc extends your class with the following methods:
-
-* `.save()` will save (or update) the object you call it on only. Any referenced non-savable objects will not get stored.
-* `.saveDeep()` does the same like `.save()`.
-  In addition it will look for properties that reference an object
-  that extends DbDoc as well and call .saveDeep() on them as well.
-  Loops are prevented
-
-So now we can **store** instances of classes to Db...
-How do we **get** a new class instance from a Doc in the DB?
-
-## TypeScript
-How does TypeScript play into this?
-Since you define your classes in TypeScript and types flow through smartdata in a generic way
-you should get all the Intellisense and type checking you love when using smartdata.
-smartdata itself also bundles typings.
-So you don't need to install any additional types when importing smartdata.
-
 For further information read the linked docs at the top of this README.
 
 > MIT licensed | **&copy;** [Lossless GmbH](https://lossless.gmbh)

npmextra.json

@@ -5,7 +5,7 @@
     "dockerSock": false
   },
   "npmci": {
-    "globalNpmTools": [
+    "npmGlobalTools": [
       "npmts"
     ]
   },

package-lock.json

@@ -0,0 +1,223 @@
+{
+  "name": "smartdata",
+  "version": "2.0.3",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@types/lodash": {
+      "version": "4.14.92",
+      "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.92.tgz",
+      "integrity": "sha512-cdvY1fyUGYgG7/i07a/sR5PnD6+Z+ljUrD0CNVf0qj645VvEdLNtZPjvCp4siPy3rQ/KRXMfUATIqi3+9x57Sw=="
+    },
+    "@types/minimatch": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.3.tgz",
+      "integrity": "sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA=="
+    },
+    "balanced-match": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.0.tgz",
+      "integrity": "sha1-ibTRmasr7kneFk6gK4nORi1xt2c="
+    },
+    "brace-expansion": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.8.tgz",
+      "integrity": "sha1-wHshHHyVLsH479Uad+8NHTmQopI=",
+      "requires": {
+        "balanced-match": "1.0.0",
+        "concat-map": "0.0.1"
+      }
+    },
+    "concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha1-2Klr13/Wjfd5OnMDajug1UBdR3s="
+    },
+    "conventional-commit-types": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/conventional-commit-types/-/conventional-commit-types-2.2.0.tgz",
+      "integrity": "sha1-XblXOdbCEqy+e29lahG5QLqmiUY=",
+      "dev": true
+    },
+    "cz-conventional-changelog": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/cz-conventional-changelog/-/cz-conventional-changelog-2.1.0.tgz",
+      "integrity": "sha1-L0vHOQ4yROTfKT5ro1Hkx0Cnx2Q=",
+      "dev": true,
+      "requires": {
+        "conventional-commit-types": "2.2.0",
+        "lodash.map": "4.6.0",
+        "longest": "1.0.1",
+        "right-pad": "1.0.1",
+        "word-wrap": "1.2.3"
+      }
+    },
+    "define-properties": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.1.2.tgz",
+      "integrity": "sha1-g6c/L+pWmJj7c3GTyPhzyvbUXJQ=",
+      "requires": {
+        "foreach": "2.0.5",
+        "object-keys": "1.0.11"
+      }
+    },
+    "es-abstract": {
+      "version": "1.10.0",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.10.0.tgz",
+      "integrity": "sha512-/uh/DhdqIOSkAWifU+8nG78vlQxdLckUdI/sPgy0VhuXi2qJ7T8czBmqIYtLQVpCIFYafChnsRsB5pyb1JdmCQ==",
+      "requires": {
+        "es-to-primitive": "1.1.1",
+        "function-bind": "1.1.1",
+        "has": "1.0.1",
+        "is-callable": "1.1.3",
+        "is-regex": "1.0.4"
+      }
+    },
+    "es-to-primitive": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.1.1.tgz",
+      "integrity": "sha1-RTVSSKiJeQNLZ5Lhm7gfK3l13Q0=",
+      "requires": {
+        "is-callable": "1.1.3",
+        "is-date-object": "1.0.1",
+        "is-symbol": "1.0.1"
+      }
+    },
+    "foreach": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.5.tgz",
+      "integrity": "sha1-C+4AUBiusmDQo6865ljdATbsG5k="
+    },
+    "function-bind": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz",
+      "integrity": "sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A=="
+    },
+    "has": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/has/-/has-1.0.1.tgz",
+      "integrity": "sha1-hGFzP1OLCDfJNh45qauelwTcLyg=",
+      "requires": {
+        "function-bind": "1.1.1"
+      }
+    },
+    "is-callable": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.1.3.tgz",
+      "integrity": "sha1-hut1OSgF3cM69xySoO7fdO52BLI="
+    },
+    "is-date-object": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.0.1.tgz",
+      "integrity": "sha1-mqIOtq7rv/d/vTPnTKAbM1gdOhY="
+    },
+    "is-regex": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.0.4.tgz",
+      "integrity": "sha1-VRdIm1RwkbCTDglWVM7SXul+lJE=",
+      "requires": {
+        "has": "1.0.1"
+      }
+    },
+    "is-symbol": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.0.1.tgz",
+      "integrity": "sha1-PMWfAAJRlLarLjjbrmaJJWtmBXI="
+    },
+    "lik": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/lik/-/lik-2.0.2.tgz",
+      "integrity": "sha512-xdNrvQqVLMNkU25Z6tNrJXyOhn0hugZvWZCIPb315M5J4fK2OzgpLacp68J5bYWydRWX4L3Tl/i69BNWHsvcXg==",
+      "requires": {
+        "@types/lodash": "4.14.92",
+        "@types/minimatch": "3.0.3",
+        "lodash": "4.17.4",
+        "minimatch": "3.0.4",
+        "smartq": "1.1.6",
+        "symbol-tree": "3.2.2",
+        "typings-global": "1.0.28"
+      },
+      "dependencies": {
+        "lodash": {
+          "version": "4.17.4",
+          "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.4.tgz",
+          "integrity": "sha1-eCA6TRwyiuHYbcpkYONptX9AVa4="
+        },
+        "smartq": {
+          "version": "1.1.6",
+          "resolved": "https://registry.npmjs.org/smartq/-/smartq-1.1.6.tgz",
+          "integrity": "sha512-W7vTj4kSqN8kHVq+Q6BJTr/UGc36TnO0pzKNU8B4cr7TXG4N98eyubWaaCHPSjCUqDgmUPPru929WXzetai97A==",
+          "requires": {
+            "typings-global": "1.0.28",
+            "util.promisify": "1.0.0"
+          }
+        }
+      }
+    },
+    "lodash.map": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/lodash.map/-/lodash.map-4.6.0.tgz",
+      "integrity": "sha1-dx7Hg540c9nEzeKLGTlMNWL09tM=",
+      "dev": true
+    },
+    "longest": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz",
+      "integrity": "sha1-MKCy2jj3N3DoKUoNIuZiXtd9AJc=",
+      "dev": true
+    },
+    "minimatch": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz",
+      "integrity": "sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==",
+      "requires": {
+        "brace-expansion": "1.1.8"
+      }
+    },
+    "object-keys": {
+      "version": "1.0.11",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.0.11.tgz",
+      "integrity": "sha1-xUYBd4rVYPEULODgG8yotW0TQm0="
+    },
+    "object.getownpropertydescriptors": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz",
+      "integrity": "sha1-h1jIRvW0B62rDyNuCYbxSwUcqhY=",
+      "requires": {
+        "define-properties": "1.1.2",
+        "es-abstract": "1.10.0"
+      }
+    },
+    "right-pad": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/right-pad/-/right-pad-1.0.1.tgz",
+      "integrity": "sha1-jKCMLLtbVedNr6lr9/0aJ9VoyNA=",
+      "dev": true
+    },
+    "symbol-tree": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz",
+      "integrity": "sha1-rifbOPZgp64uHDt9G8KQgZuFGeY="
+    },
+    "typings-global": {
+      "version": "1.0.28",
+      "resolved": "https://registry.npmjs.org/typings-global/-/typings-global-1.0.28.tgz",
+      "integrity": "sha512-6VOwJWEY2971HOMHu/7sURzUXiD4/LiMJPsMAOqkHHAtS3MVpLFE5gzTiHilsH9KY5VE1mBQirWIgWFsDuo90A=="
+    },
+    "util.promisify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/util.promisify/-/util.promisify-1.0.0.tgz",
+      "integrity": "sha512-i+6qA2MPhvoKLuxnJNpXAGhg7HphQOSUq2LKMZD0m15EiskXUkMvKdF4Uui0WYeCUGea+o2cw/ZuwehtfsrNkA==",
+      "requires": {
+        "define-properties": "1.1.2",
+        "object.getownpropertydescriptors": "2.0.3"
+      }
+    },
+    "word-wrap": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.3.tgz",
+      "integrity": "sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==",
+      "dev": true
+    }
+  }
+}

package.json

@@ -1,6 +1,6 @@
 {
   "name": "smartdata",
-  "version": "1.0.28",
+  "version": "2.0.3",
   "description": "do more with data",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
@@ -19,21 +19,27 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartdata#README",
   "dependencies": {
-    "@types/lodash": "^4.14.74",
+    "@types/lodash": "^4.14.92",
-    "@types/mongodb": "^2.2.11",
+    "@types/rethinkdb": "^2.3.8",
     "beautylog": "^6.1.10",
-    "lik": "^1.0.40",
+    "lik": "^2.0.2",
     "lodash": "^4.17.4",
-    "mongodb": "^2.2.31",
+    "rethinkdb": "^2.3.3",
     "runtime-type-checks": "0.0.4",
     "smartq": "^1.1.6",
-    "typings-global": "^1.0.20"
+    "smartstring": "^2.0.28"
   },
   "devDependencies": {
+    "@types/node": "^8.5.7",
     "@types/shelljs": "^0.7.4",
+    "cz-conventional-changelog": "^2.1.0",
     "qenv": "^1.1.7",
     "shelljs": "^0.7.8",
-    "smartstring": "^2.0.24",
     "tapbundle": "^1.1.1"
+  },
+  "config": {
+    "commitizen": {
+      "path": "./node_modules/cz-conventional-changelog"
+    }
   }
 }

qenv.yml

@@ -1,4 +1,7 @@
 vars:
-  - MONGO_USER
+  - RDB_DB
-  - MONGO_PASS
+  - RDB_HOST
-  - MONGO_DATABASE
+  - RDB_USER
+  - RDB_PASS
+  - RDB_PORT
+  - RDB_CERT

test/test.class.ts

@@ -1,53 +0,0 @@
-import { tap, expect } from 'tapbundle'
-import * as smartq from 'smartq'
-import { Qenv } from 'qenv'
-
-let testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit/')
-
-// the tested module
-import * as smartdata from '../ts/index'
-
-let mongoChildProcess
-let testDb: smartdata.Db
-
-tap.test('should establish a connection to mongodb', async () => {
-  // testDb = new smartdata.Db(`mongodb://${process.env.MONGO_USER}:${process.env.MONGO_PASS}@sandbox-shard-00-00-uyw7y.mongodb.net:27017,sandbox-shard-00-01-uyw7y.mongodb.net:27017,sandbox-shard-00-02-uyw7y.mongodb.net:27017/${process.env.MONGO_DATABASE}?ssl=true&replicaSet=sandbox-shard-0&authSource=admin`)
-  testDb = new smartdata.Db(`mongodb://localhost:27017/${process.env.MONGO_DATABASE}`)
-  await testDb.connect()
-})
-
-let testCarInstance
-
-tap.test('should create an extended class', async () => {
-  @smartdata.Collection(testDb)
-  class TestCar extends smartdata.DbDoc<TestCar> {
-    @smartdata.svDb()
-    color: string
-    constructor (optionsArg: {
-      color: string,
-      property2: number
-    }) {
-      super()
-      this.color = optionsArg.color
-    }
-  }
-  testCarInstance = new TestCar({
-    color: 'red',
-    property2: 2
-  })
-  expect(testCarInstance.name).to.equal('TestCar')
-  expect(testCarInstance.saveableProperties[ 0 ]).equal('color')
-  expect(testCarInstance.collection).be.instanceof(smartdata.DbCollection)
-  expect(testCarInstance).be.instanceof(smartdata.DbDoc)
-  if (!process.env.CI) { console.log(TestCar) }
-})
-
-tap.test('should save testCar', async () => {
- await testCarInstance.save()
-})
-
-tap.test('should close the db Connection', async () => {
-  await testDb.close()
-})
-
-tap.start()

test/test.ts

@@ -6,19 +6,23 @@ let testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit/')
 
 // the tested module
 import * as smartdata from '../ts/index'
+import { smartstring } from '../ts/smartdata.plugins';
 
-let mongoChildProcess
+// =======================================
-let testDb: smartdata.Db
+// Connecting to the database server
+// =======================================
 
-interface ITestObject1 {
+let testDb = new smartdata.Db({
-  value1: string
+  db: process.env.RDB_DB,
-  value2?: number
+  host: process.env.RDB_HOST,
-  value3?: string
+  user: process.env.RDB_USER,
-}
+  password: process.env.RDB_PASS,
+  port: parseInt(process.env.RDB_PORT)
+})
+testDb.setSsl(process.env.RDB_CERT, 'base64')
 
-tap.test('should establish a connection to mongodb', async () => {
+tap.test('should establish a connection to the rethink Db cluster', async () => {
-  // testDb = new smartdata.Db(`mongodb://${process.env.MONGO_USER}:${process.env.MONGO_PASS}@sandbox-shard-00-00-uyw7y.mongodb.net:27017,sandbox-shard-00-01-uyw7y.mongodb.net:27017,sandbox-shard-00-02-uyw7y.mongodb.net:27017/${process.env.MONGO_DATABASE}?ssl=true&replicaSet=sandbox-shard-0&authSource=admin`)
+  
-  testDb = new smartdata.Db(`mongodb://localhost:27017/${process.env.MONGO_DATABASE}`)
   await testDb.connect()
 })
 
@@ -29,40 +33,36 @@ tap.test('should establish a connection to mongodb', async () => {
 // ------
 // Collections
 // ------
-let testDbCollection: smartdata.DbCollection<ITestObject1>
 
-tap.test('should give me a collection', async () => {
+@smartdata.Table(testDb)
-  testDbCollection = await testDb.getObjectCollectionByName<ITestObject1>('TestValue', testDb, true)
+class Car extends smartdata.DbDoc<Car> {
+  
+  @smartdata.svDb() color: string
+  @smartdata.svDb() brand: string
+  constructor (colorArg: string, brandArg: string) {
+    super()
+    this.color = colorArg
+    this.brand = brandArg
+  }
+}
+
+tap.test('should save the car to the db', async () => {
+  const myCar = new Car('red','Volvo')
+  await myCar.save()
 })
 
-tap.test('should insert a doc into the collection', async () => {
+tap.test('expect to get instance of Car', async () => {
-  await testDbCollection.insertOne({ value1: 'test' })
+  let myCar = await Car.getInstances<Car>({
-})
+    brand: 'Volvo'
-
-tap.test('should find all docs of testDbCollection', async () => {
-  await testDbCollection.find({}).then(async (resultArray) => {
-    console.log(resultArray)
-    expect(resultArray[ 0 ].value1).equal('test')
-  })
-})
-
-tap.test('should insert many docs into the collection', async () => {
-  await testDbCollection.insertMany([
-    { value1: 'test2' },
-    { value1: 'test', value2: 3, value3: 'hi' }
-  ])
-})
-
-tap.test('should find a specified doc', async () => {
-  await testDbCollection.find({ 'value3': { '$exists': true } }).then((resultArray) => {
-    console.log(resultArray)
-    expect(resultArray[ 0 ].value3).equal('hi')
   })
+  expect(myCar[0].color).to.equal('red')
 })
 
 
-
+// =======================================
-tap.test('should close the db Connection', async () => {
+// close the database connection
+// =======================================
+tap.test('should close the database connection', async (tools) => {
   await testDb.close()
 })
 

ts/index.ts

@@ -1,3 +1,3 @@
-export * from './smartdata.classes.db'
+export * from "./smartdata.classes.db";
-export * from './smartdata.classes.dbcollection'
+export * from "./smartdata.classes.dbtable";
-export * from './smartdata.classes.dbdoc'
+export * from "./smartdata.classes.dbdoc";

ts/smartdata.classes.db.ts

@@ -1,23 +1,47 @@
-import * as plugins from './smartdata.plugins'
+import * as plugins from "./smartdata.plugins";
-import { Objectmap } from 'lik'
+import { Objectmap } from "lik";
 
-import { DbCollection } from './smartdata.classes.dbcollection'
+import { DbTable } from "./smartdata.classes.dbtable";
-import { getObjectDoc } from './smartdata.classes.dbobjectdoc'
+
+import { Connection as dbConnection, ConnectionOptions } from "rethinkdb";
 
 /**
  * interface - indicates the connection status of the db
  */
-export type TConnectionStatus = 'disconnected' | 'connected' | 'failed'
+export type TConnectionStatus =
+  | "initial"
+  | "disconnected"
+  | "connected"
+  | "failed";
 
 export class Db {
-  dbUrl: string
+  dbName: string;
-  db: plugins.mongodb.Db
+  connectionOptions: plugins.rethinkDb.ConnectionOptions;
-  status: TConnectionStatus
+  dbConnection: plugins.rethinkDb.Connection;
-  classCollections = new Objectmap<DbCollection<any>>()
+  status: TConnectionStatus;
-  objectCollections = new Objectmap<DbCollection<any>>()
+  dbTablesMap = new Objectmap<DbTable<any>>();
 
-  constructor (dbUrlArg: string) {
+  constructor(connectionOptionsArg: ConnectionOptions) {
-    this.dbUrl = dbUrlArg
+    this.dbName = connectionOptionsArg.db;
+    this.connectionOptions = connectionOptionsArg;
+    this.status = "initial";
+  }
+
+  /**
+   * supply additional SSl options needed to connect to certain Rethink DB servers (e.g. compose.io)
+   */
+  setSsl(certificateStringArg: string, formatArg: "base64" | "clearText") {
+    let certificateString: string;
+    if ((formatArg = "base64")) {
+      certificateString = plugins.smartstring.base64.decode(
+        certificateStringArg
+      );
+    } else {
+      certificateString = certificateStringArg;
+    }
+    this.connectionOptions["ssl"] = {
+      ca: Buffer.from(certificateString)
+    };
   }
 
   // basic connection stuff ----------------------------------------------
@@ -25,58 +49,37 @@ export class Db {
   /**
    * connects to the database that was specified during instance creation
    */
-  connect (): Promise<any> {
+  async connect(): Promise<any> {
-    let done = plugins.smartq.defer()
+    this.dbConnection = await plugins.rethinkDb.connect(this.connectionOptions);
-    plugins.mongodb.MongoClient.connect(this.dbUrl, (err, db) => {
+    this.dbConnection.use(this.dbName);
-      if (err) { console.log(err) }
+    this.status = "connected";
-      plugins.assert.equal(null, err)
+    plugins.beautylog.ok(`Connected to database ${this.dbName}`);
-      this.db = db
-      plugins.beautylog.success(`connected to database at ${this.dbUrl}`)
-      done.resolve(this.db)
-    })
-    return done.promise
   }
 
   /**
    * closes the connection to the databse
    */
-  close (): Promise<any> {
+  async close(): Promise<any> {
-    let done = plugins.smartq.defer()
+    await this.dbConnection.close();
-    this.db.close()
+    this.status = "disconnected";
-    plugins.beautylog.ok(`disconnected to database at ${this.dbUrl}`)
+    plugins.beautylog.ok(`disconnected from database ${this.dbName}`);
-    done.resolve()
-    return done.promise
   }
 
-  // advanced communication with the database --------------------------------
+  // handle table to class distribution
 
-  /**
+  addTable(dbTableArg: DbTable<any>) {
-   * gets a class based collection by name: string
+    this.dbTablesMap.add(dbTableArg);
-   */
-  async getClassCollectionByName<T> (nameArg: string): Promise<DbCollection<T>> {
-    let resultCollection = this.classCollections.find((dbCollectionArg) => {
-      return dbCollectionArg.name === nameArg
-    })
-    return resultCollection
   }
 
   /**
-   * gets an object collection by name
+   * Gets a table's name and returns smartdata's DbTable class
+   * @param nameArg
+   * @returns DbTable
    */
-  async getObjectCollectionByName<T> (nameArg: string, dbArg: Db , makeNewArg: boolean = false): Promise<DbCollection<T>> {
+  async getDbTableByName<T>(nameArg: string): Promise<DbTable<T>> {
-    let resultCollection = this.objectCollections.find((dbCollectionArg) => {
+    let resultCollection = this.dbTablesMap.find(dbTableArg => {
-      return dbCollectionArg.name === nameArg
+      return dbTableArg.tableName === nameArg;
-    })
+    });
-    if (!resultCollection && makeNewArg) {
+    return resultCollection;
-      resultCollection = getObjectDoc(nameArg, this).collection
-      return resultCollection
-    } else {
-      return resultCollection
-    }
   }
-
-  addCollection (dbCollectionArg: DbCollection<any>) {
-    this.classCollections.add(dbCollectionArg)
-  }
-
 }

ts/smartdata.classes.dbcollection.ts

@@ -1,117 +0,0 @@
-import * as plugins from './smartdata.plugins'
-import { Db } from './smartdata.classes.db'
-import { DbDoc } from './smartdata.classes.dbdoc'
-
-export interface IFindOptions {
-  limit?: number
-}
-
-export interface IDocValidation<T> {
-  (doc: T): boolean
-}
-
-export function Collection (db: Db) {
-  return function (constructor) {
-    constructor[ 'dbCollection' ] = new DbCollection(constructor, db)
-  }
-}
-
-export class DbCollection<T> {
-  /**
-   * the collection that is used, defaults to mongodb collection,
-   * can be nedb datastore (sub api of mongodb)
-   */
-  collection: plugins.mongodb.Collection
-  collectedClass: T & DbDoc<T>
-  objectValidation: IDocValidation<T> = null
-  name: string
-  db: Db
-
-  constructor (collectedClassArg: T & DbDoc<T>, dbArg: Db) {
-    // tell the collection where it belongs
-    this.collectedClass = collectedClassArg
-    this.name = collectedClassArg.name
-    this.db = dbArg
-
-    // make sure it actually exists
-    this.collection = dbArg.db.collection(this.name)
-
-    // tell the db class about it (important since Db uses different systems under the hood)
-    this.db.addCollection(this)
-  }
-
-  /**
-   * adds a validation function that all newly inserted and updated objects have to pass
-   */
-  addDocValidation (funcArg: IDocValidation<T>) {
-    this.objectValidation = funcArg
-  }
-
-  /**
-   * finds an object in the DbCollection
-   */
-  find (docMatchArg: T | any, optionsArg?: IFindOptions): Promise<T[]> {
-    let done = plugins.smartq.defer<T[]>()
-    let findCursor = this.collection.find(docMatchArg)
-    if (optionsArg) {
-      if (optionsArg.limit) { findCursor = findCursor.limit(1) }
-    }
-    findCursor.toArray((err, docs) => {
-      if (err) {
-        done.reject(err)
-        throw err
-      }
-      done.resolve(docs)
-    })
-    return done.promise
-  }
-
-  /**
-   * inserts object into the DbCollection
-   */
-  insertOne (docArg: T): Promise<void> {
-    let done = plugins.smartq.defer<void>()
-    this.checkDoc(docArg).then(
-      () => {
-        this.collection.insertOne(docArg)
-          .then(() => { done.resolve() })
-      },
-      () => {
-        done.reject(new Error('one the docs did not pass validation'))
-      })
-    return done.promise
-  }
-
-  /**
-   * inserts many objects at once into the DbCollection
-   */
-  insertMany (docArrayArg: T[]): Promise<void> {
-    let done = plugins.smartq.defer<void>()
-    let checkDocPromiseArray: Promise<void>[] = []
-    for (let docArg of docArrayArg) {
-      checkDocPromiseArray.push(this.checkDoc(docArg))
-    }
-    Promise.all(checkDocPromiseArray).then(() => {
-      this.collection.insertMany(docArrayArg)
-        .then(() => { done.resolve() })
-    })
-    return done.promise
-  }
-
-  /**
-   * checks a Doc for constraints
-   */
-  private checkDoc (docArg: T): Promise<void> {
-    let done = plugins.smartq.defer<void>()
-    let validationResult = true
-    if (this.objectValidation) {
-      validationResult = this.objectValidation(docArg)
-    }
-    if (validationResult) {
-      done.resolve()
-    } else {
-      done.reject('validation of object did not pass')
-    }
-    return done.promise
-  }
-}

ts/smartdata.classes.dbdoc.ts

@@ -1,68 +1,99 @@
-import * as plugins from './smartdata.plugins'
+import * as plugins from "./smartdata.plugins";
 
-import { Objectmap } from 'lik'
+import { Objectmap } from "lik";
 
-import { Db } from './smartdata.classes.db'
+import { Db } from "./smartdata.classes.db";
-import { DbCollection } from './smartdata.classes.dbcollection'
+import { DbTable } from "./smartdata.classes.dbtable";
 
-export type TDocCreation = 'db' | 'new' | 'mixed'
+export type TDocCreation = "db" | "new" | "mixed";
 
 /**
  * saveable - saveable decorator to be used on class properties
  */
 export function svDb() {
   return (target: DbDoc<any>, key: string) => {
-    console.log('called sva')
+    console.log("called sva");
-    if (!target.saveableProperties) { target.saveableProperties = [] }
+    if (!target.saveableProperties) {
-    target.saveableProperties.push(key)
+      target.saveableProperties = [];
-  }
+    }
+    target.saveableProperties.push(key);
+  };
 }
 
 export class DbDoc<T> {
-
   /**
    * the collection object an Doc belongs to
    */
-  collection: DbCollection<T>
+  collection: DbTable<T>;
 
   /**
    * how the Doc in memory was created, may prove useful later.
    */
-  creationType: TDocCreation
+  creationStatus: TDocCreation = "new";
 
   /**
    * an array of saveable properties of a doc
    */
-  saveableProperties: string[]
+  saveableProperties: string[];
 
   /**
    * name
    */
-  name: string
+  name: string;
+
+  /**
+   * primary id in the database
+   */
+  dbId: string;
 
   /**
    * class constructor
    */
-  constructor () {
+  constructor() {
-    this.name = this.constructor['name']
+    this.name = this.constructor["name"];
-    this.collection = this.constructor[ 'dbCollection' ]
+    this.collection = this.constructor["dbTable"];
+  }
+
+  static async getInstances<T>(filterArg): Promise<T[]> {
+    let self: any = this; // fool typesystem
+    let referenceTable: DbTable<T> = self.dbTable;
+    const foundDocs = await referenceTable.find(filterArg);
+    const returnArray = [];
+    for (let item of foundDocs) {
+      let newInstance = new this();
+      for (let key in item) {
+        if(key !== 'id') {
+          newInstance[key] = item[key];
+        }
+      }
+      returnArray.push(newInstance);
+    }
+    return returnArray;
+  }
+
+  static async getInstance<T>(filterArg): Promise<T> {
+    let result = await this.getInstances<T>(filterArg)
+    if(result && result.length > 0) {
+      return result[0]
+    }
   }
 
   /**
    * saves this instance but not any connected items
    * may lead to data inconsistencies, but is faster
    */
-  save () {
+  async save() {
-    let saveableObject: any = {} // is not exposed to outside, so any is ok here
+    let self: any = this;
-    for (let propertyNameString of this.saveableProperties) {
+    switch (this.creationStatus) {
-      saveableObject[ propertyNameString ] = this[ propertyNameString ]
+      case "db":
-    }
+        await this.collection.update(self);
-    switch (this.creationType) {
+        break;
-      case 'db':
+      case "new":
-        this.collection // TODO implement collection.update()
+        let writeResult = await this.collection.insert(self);
-        break
+        this.creationStatus = "db";
-      case 'new':
+        break;
-        this.collection.insertOne(saveableObject)
+      default:
+        console.error("neither new nor in db?");
     }
   }
 
@@ -70,17 +101,25 @@ export class DbDoc<T> {
    * also store any referenced objects to DB
    * better for data consistency
    */
-  saveDeep (savedMapArg: Objectmap<DbDoc<any>> = null) {
+  saveDeep(savedMapArg: Objectmap<DbDoc<any>> = null) {
     if (!savedMapArg) {
-      savedMapArg = new Objectmap<DbDoc<any>>()
+      savedMapArg = new Objectmap<DbDoc<any>>();
     }
-    savedMapArg.add(this)
+    savedMapArg.add(this);
-    this.save()
+    this.save();
     for (let propertyKey in this) {
-      let property: any = this[ propertyKey ]
+      let property: any = this[propertyKey];
       if (property instanceof DbDoc && !savedMapArg.checkForObject(property)) {
-        property.saveDeep(savedMapArg)
+        property.saveDeep(savedMapArg);
       }
     }
   }
+
+  createSavableObject() {
+    let saveableObject: any = {}; // is not exposed to outside, so any is ok here
+    for (let propertyNameString of this.saveableProperties) {
+      saveableObject[propertyNameString] = this[propertyNameString];
+    }
+    return saveableObject;
+  }
 }

ts/smartdata.classes.dbobjectdoc.ts

@@ -1,12 +0,0 @@
-import * as plugins from './smartdata.plugins'
-
-import { Db } from './smartdata.classes.db'
-import { DbDoc } from './smartdata.classes.dbdoc'
-import { DbCollection } from './smartdata.classes.dbcollection'
-
-export let getObjectDoc = (nameArg,dbArg: Db) => {
-  let objectDoc = new DbDoc()
-  objectDoc.name = nameArg
-  objectDoc.collection = new DbCollection(objectDoc, dbArg)
-  return objectDoc
-}

ts/smartdata.classes.dbtable.ts

@@ -0,0 +1,127 @@
+import * as plugins from "./smartdata.plugins";
+import { Db } from "./smartdata.classes.db";
+import { DbDoc } from "./smartdata.classes.dbdoc";
+
+// RethinkDb Interfaces
+import { WriteResult, Cursor } from "rethinkdb";
+
+export interface IFindOptions {
+  limit?: number;
+}
+
+/**
+ *
+ */
+export interface IDocValidationFunc<T> {
+  (doc: T): boolean;
+}
+
+/**
+ * This is a decorator that will tell the decorated class what dbTable to use
+ * @param db
+ */
+export function Table(db: Db) {
+  return function(constructor) {
+    constructor["dbTable"] = new DbTable(constructor, db);
+  };
+}
+
+export class DbTable<T> {
+  /**
+   * the collection that is used
+   */
+  table: plugins.rethinkDb.Table;
+  objectValidation: IDocValidationFunc<T> = null;
+  tableName: string;
+  db: Db;
+
+  constructor(collectedClassArg: T & DbDoc<T>, dbArg: Db) {
+    // tell the collection where it belongs
+    this.tableName = collectedClassArg.name;
+    this.db = dbArg;
+
+    // tell the db class about it (important since Db uses different systems under the hood)
+    this.db.addTable(this);
+  }
+
+  async init() {
+    if (!this.table) {
+      // connect this instance to a RethinkDB table
+      const availableTables = await plugins.rethinkDb
+        .db(this.db.dbName)
+        .tableList()
+        .run(this.db.dbConnection);
+      if (availableTables.indexOf(this.tableName)) {
+        await plugins.rethinkDb
+          .db(this.db.dbName)
+          .tableCreate(this.tableName)
+          .run(this.db.dbConnection);
+      }
+    }
+    this.table = plugins.rethinkDb.table(this.tableName);
+  }
+
+  /**
+   * adds a validation function that all newly inserted and updated objects have to pass
+   */
+  addDocValidation(funcArg: IDocValidationFunc<T>) {
+    this.objectValidation = funcArg;
+  }
+
+  /**
+   * finds an object in the DbCollection
+   */
+  async find(filterObject: any): Promise<any> {
+    await this.init();
+    let cursor = await plugins.rethinkDb
+      .table(this.tableName)
+      .filter(filterObject)
+      .run(this.db.dbConnection);
+    return await cursor.toArray();
+  }
+
+  /**
+   * create an object in the database
+   */
+  async insert(dbDocArg: T & DbDoc<T>): Promise<WriteResult> {
+    await this.init();
+    await this.checkDoc(dbDocArg);
+    return await plugins.rethinkDb
+      .table(this.tableName)
+      .insert(dbDocArg.createSavableObject())
+      .run(this.db.dbConnection);
+  }
+
+  /**
+   * inserts object into the DbCollection
+   */
+  async update(dbDocArg: T & DbDoc<T>): Promise<WriteResult> {
+    await this.init();
+    await this.checkDoc(dbDocArg);
+    console.log(this.tableName, dbDocArg.createSavableObject());
+    return await plugins.rethinkDb
+      .table(this.tableName)
+      .update(dbDocArg.createSavableObject())
+      .run(this.db.dbConnection);
+  }
+
+  /**
+   * checks a Doc for constraints
+   * if this.objectValidation is not set it passes.
+   */
+  private checkDoc(docArg: T): Promise<void> {
+    let done = plugins.smartq.defer<void>();
+    let validationResult = true;
+    if (this.objectValidation) {
+      validationResult = this.objectValidation(docArg);
+    }
+    if (validationResult) {
+      done.resolve();
+    } else {
+      done.reject("validation of object did not pass");
+    }
+    return done.promise;
+  }
+
+  extractKey(writeResult: WriteResult) {}
+}

ts/smartdata.plugins.ts

@@ -1,14 +1,8 @@
-import 'typings-global'
+import * as assert from "assert";
-import * as assert from 'assert'
+import * as beautylog from "beautylog";
-import * as beautylog from 'beautylog'
+import * as lodash from "lodash";
-import * as lodash from 'lodash'
+import * as rethinkDb from "rethinkdb";
-import * as mongodb from 'mongodb'
+import * as smartq from "smartq";
-import * as smartq from 'smartq'
+import * as smartstring from "smartstring";
 
-export {
+export { assert, beautylog, lodash, smartq, rethinkDb, smartstring };
-    assert,
-    beautylog,
-    lodash,
-    mongodb,
-    smartq
-}

tslint.json

@@ -1,3 +0,0 @@
-{
-    "extends": "tslint-config-standard"
-}

yarn.lock

@@ -2,65 +2,59 @@
 # yarn lockfile v1
 
 
-"@types/bson@*":
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/@types/bson/-/bson-1.0.4.tgz#94260b6b96fa459346959c9216799d8919e95d2b"
-  dependencies:
-    "@types/node" "*"
-
 "@types/code@^4.0.3":
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/@types/code/-/code-4.0.3.tgz#9c4de39f86eb3eba070146d2dab7dbc3f8eac35f"
 
+"@types/events@*":
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/@types/events/-/events-1.1.0.tgz#93b1be91f63c184450385272c47b6496fd028e02"
+
 "@types/fs-extra@4.x.x":
-  version "4.0.5"
+  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-4.0.5.tgz#8aa6033c0e87c653b09a6711686916864b48ec9e"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-4.0.7.tgz#02533262386b5a6b9a49797dc82feffdf269140a"
   dependencies:
     "@types/node" "*"
 
 "@types/glob@*":
-  version "5.0.33"
+  version "5.0.34"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.33.tgz#3dff7c6ce09d65abe919c7961dc3dee016f36ad7"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-5.0.34.tgz#ee626c9be3da877d717911c6101eee0a9871bbf4"
   dependencies:
+    "@types/events" "*"
     "@types/minimatch" "*"
     "@types/node" "*"
 
-"@types/lodash@^4.14.55", "@types/lodash@^4.14.74":
+"@types/lodash@^4.14.55", "@types/lodash@^4.14.74", "@types/lodash@^4.14.92":
-  version "4.14.85"
+  version "4.14.92"
-  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.85.tgz#a16fbf942422f6eca5622b6910492c496c35069b"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.92.tgz#6e3cb0b71a1e12180a47a42a744e856c3ae99a57"
 
 "@types/minimatch@*", "@types/minimatch@3.x.x":
-  version "3.0.1"
+  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.1.tgz#b683eb60be358304ef146f5775db4c0e3696a550"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
 
-"@types/mongodb@^2.2.11":
+"@types/node@*", "@types/node@^8.0.33", "@types/node@^8.5.7":
-  version "2.2.15"
+  version "8.5.7"
-  resolved "https://registry.yarnpkg.com/@types/mongodb/-/mongodb-2.2.15.tgz#42577d8a92b9840dad440acf92fea6435c1fcfb3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.5.7.tgz#9c498c35af354dcfbca3790fb2e81129e93cf0e2"
+
+"@types/rethinkdb@^2.3.8":
+  version "2.3.8"
+  resolved "https://registry.yarnpkg.com/@types/rethinkdb/-/rethinkdb-2.3.8.tgz#961f78f0e731668631891bd1199722bb4a2258a8"
   dependencies:
-    "@types/bson" "*"
     "@types/node" "*"
 
-"@types/node@*", "@types/node@^8.0.33":
-  version "8.0.53"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-8.0.53.tgz#396b35af826fa66aad472c8cb7b8d5e277f4e6d8"
-
 "@types/shelljs@^0.7.4":
-  version "0.7.6"
+  version "0.7.7"
-  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.7.6.tgz#4ac7ca01c191ba65b8e2bf50543c5560084d8d27"
+  resolved "https://registry.yarnpkg.com/@types/shelljs/-/shelljs-0.7.7.tgz#1f7bfa28947661afea06365db9b1135bbc903ec4"
   dependencies:
     "@types/glob" "*"
     "@types/node" "*"
 
 "@types/vinyl@^2.0.1":
-  version "2.0.1"
+  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/@types/vinyl/-/vinyl-2.0.1.tgz#6b414dfdcd4a785e8e76e87565ed29e79490d9b7"
+  resolved "https://registry.yarnpkg.com/@types/vinyl/-/vinyl-2.0.2.tgz#4f3b8dae8f5828d3800ef709b0cff488ee852de3"
   dependencies:
     "@types/node" "*"
 
-"@types/which@^1.0.28":
-  version "1.0.28"
-  resolved "https://registry.yarnpkg.com/@types/which/-/which-1.0.28.tgz#016e387629b8817bed653fe32eab5d11279c8df6"
-
 ansi-256-colors@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/ansi-256-colors/-/ansi-256-colors-1.1.0.tgz#910de50efcc7c09e3d82f2f87abd6b700c18818a"
@@ -107,6 +101,10 @@ bindings@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/bindings/-/bindings-1.3.0.tgz#b346f6ecf6a95f5a815c5839fc7cdb22502f1ed7"
 
+"bluebird@>= 2.3.2 < 3":
+  version "2.11.0"
+  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-2.11.0.tgz#534b9033c022c9579c56ba3b3e5a5caafbb650e1"
+
 brace-expansion@^1.1.7:
   version "1.1.8"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.8.tgz#c07b211c7c952ec1f8efd51a77ef0d1d3990a292"
@@ -114,14 +112,6 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
-bson@~1.0.4:
-  version "1.0.4"
-  resolved "https://registry.yarnpkg.com/bson/-/bson-1.0.4.tgz#93c10d39eaa5b58415cbc4052f3e53e562b0b72c"
-
-buffer-shims@~1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/buffer-shims/-/buffer-shims-1.0.0.tgz#9978ce317388c649ad8793028c3477ef044a8b51"
-
 chalk@^1.0.0, chalk@^1.1.1:
   version "1.1.3"
   resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
@@ -172,6 +162,10 @@ concat-map@0.0.1:
   version "0.0.1"
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
 
+conventional-commit-types@^2.0.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/conventional-commit-types/-/conventional-commit-types-2.2.0.tgz#5db95739d6c212acbe7b6f656a11b940baa68946"
+
 core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -180,6 +174,16 @@ crypto-random-string@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/crypto-random-string/-/crypto-random-string-1.0.0.tgz#a230f64f568310e1498009940790ec99545bca7e"
 
+cz-conventional-changelog@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cz-conventional-changelog/-/cz-conventional-changelog-2.1.0.tgz#2f4bc7390e3244e4df293e6ba351e4c740a7c764"
+  dependencies:
+    conventional-commit-types "^2.0.0"
+    lodash.map "^4.5.1"
+    longest "^1.0.1"
+    right-pad "^1.0.1"
+    word-wrap "^1.0.3"
+
 define-properties@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/define-properties/-/define-properties-1.1.2.tgz#83a73f2fea569898fb737193c8f873caf6d45c94"
@@ -196,8 +200,8 @@ early@^2.1.1:
     typings-global "^1.0.16"
 
 es-abstract@^1.5.1:
-  version "1.9.0"
+  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.9.0.tgz#690829a07cae36b222e7fd9b75c0d0573eb25227"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.10.0.tgz#1ecb36c197842a00d8ee4c2dfd8646bb97d60864"
   dependencies:
     es-to-primitive "^1.1.1"
     function-bind "^1.1.1"
@@ -214,12 +218,8 @@ es-to-primitive@^1.1.1:
     is-symbol "^1.0.1"
 
 es6-error@^4.0.2:
-  version "4.0.2"
+  version "4.1.1"
-  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.0.2.tgz#eec5c726eacef51b7f6b73c20db6e1b13b069c98"
+  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
-
-es6-promise@3.2.1:
-  version "3.2.1"
-  resolved "https://registry.yarnpkg.com/es6-promise/-/es6-promise-3.2.1.tgz#ec56233868032909207170c39448e24449dd1fc4"
 
 escape-string-regexp@^1.0.2:
   version "1.0.5"
@@ -244,8 +244,8 @@ foreach@^2.0.5:
   resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
 
 fs-extra@^4.0.2:
-  version "4.0.2"
+  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.2.tgz#f91704c53d1b461f893452b0c307d9997647ab6b"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
   dependencies:
     graceful-fs "^4.1.2"
     jsonfile "^4.0.0"
@@ -303,13 +303,13 @@ inflight@^1.0.4:
     once "^1.3.0"
     wrappy "1"
 
-inherits@2, inherits@^2.0.1, inherits@~2.0.1, inherits@~2.0.3:
+inherits@2, inherits@^2.0.1, inherits@~2.0.3:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/inherits/-/inherits-2.0.3.tgz#633c2c83e3da42a502f52466022480f4208261de"
 
 interpret@^1.0.0:
-  version "1.0.4"
+  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.0.4.tgz#820cdd588b868ffb191a809506d6c9c8f212b1b0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
 
 is-buffer@^1.1.5:
   version "1.1.6"
@@ -347,13 +347,9 @@ isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
 
-isexe@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10"
-
 js-base64@^2.3.2:
-  version "2.3.2"
+  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.3.2.tgz#a79a923666372b580f8e27f51845c6f7e8fbfbaf"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa"
 
 js-yaml@^3.10.0:
   version "3.10.0"
@@ -391,21 +387,25 @@ leakage@^0.3.0:
     pretty-bytes "^4.0.2"
 
 left-pad@^1.1.3:
-  version "1.1.3"
+  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.1.3.tgz#612f61c033f3a9e08e939f1caebeea41b6f3199a"
+  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.2.0.tgz#d30a73c6b8201d8f7d8e7956ba9616087a68e0ee"
 
-lik@^1.0.40:
+lik@^2.0.2:
-  version "1.0.43"
+  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/lik/-/lik-1.0.43.tgz#e81709290fb85ff61dabfa008791ba9ffed0c666"
+  resolved "https://registry.yarnpkg.com/lik/-/lik-2.0.2.tgz#da4e67458ab81fac9e62848e8e76dc1efe1c646f"
   dependencies:
     "@types/lodash" "^4.14.74"
     "@types/minimatch" "3.x.x"
     lodash "^4.17.4"
     minimatch "^3.0.4"
-    rxjs "^5.4.3"
     smartq "^1.1.6"
+    symbol-tree "^3.2.2"
     typings-global "^1.0.20"
 
+lodash.map@^4.5.1:
+  version "4.6.0"
+  resolved "https://registry.yarnpkg.com/lodash.map/-/lodash.map-4.6.0.tgz#771ec7839e3473d9c4cde28b19394c3562f4f6d3"
+
 lodash@^4.17.4:
   version "4.17.4"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.4.tgz#78203a4d1c328ae1d86dca6460e369b57f4055ae"
@@ -416,6 +416,10 @@ log-symbols@^1.0.2:
   dependencies:
     chalk "^1.0.0"
 
+longest@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/longest/-/longest-1.0.1.tgz#30a0b2da38f73770e8294a0d22e6625ed77d0097"
+
 memwatch-next@^0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/memwatch-next/-/memwatch-next-0.3.0.tgz#2111050f9a906e0aa2d72a4ec0f0089c78726f8f"
@@ -437,21 +441,6 @@ minimist@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
 
-mongodb-core@2.1.17:
-  version "2.1.17"
-  resolved "https://registry.yarnpkg.com/mongodb-core/-/mongodb-core-2.1.17.tgz#a418b337a14a14990fb510b923dee6a813173df8"
-  dependencies:
-    bson "~1.0.4"
-    require_optional "~1.0.0"
-
-mongodb@^2.2.31:
-  version "2.2.33"
-  resolved "https://registry.yarnpkg.com/mongodb/-/mongodb-2.2.33.tgz#b537c471d34a6651b48f36fdbf29750340e08b50"
-  dependencies:
-    es6-promise "3.2.1"
-    mongodb-core "2.1.17"
-    readable-stream "2.2.7"
-
 nan@^2.3.2:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
@@ -531,18 +520,6 @@ randomatic@^1.1.7:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-readable-stream@2.2.7:
-  version "2.2.7"
-  resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.2.7.tgz#07057acbe2467b22042d36f98c5ad507054e95b1"
-  dependencies:
-    buffer-shims "~1.0.0"
-    core-util-is "~1.0.0"
-    inherits "~2.0.1"
-    isarray "~1.0.0"
-    process-nextick-args "~1.0.6"
-    string_decoder "~1.0.0"
-    util-deprecate "~1.0.1"
-
 readable-stream@^2.0.2, readable-stream@^2.1.5:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
@@ -577,17 +554,6 @@ require-reload@0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/require-reload/-/require-reload-0.2.2.tgz#29a7591846caf91b6e8a3cda991683f95f8d7d42"
 
-require_optional@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/require_optional/-/require_optional-1.0.1.tgz#4cf35a4247f64ca3df8c2ef208cc494b1ca8fc2e"
-  dependencies:
-    resolve-from "^2.0.0"
-    semver "^5.1.0"
-
-resolve-from@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-2.0.0.tgz#9480ab20e94ffa1d9e80a804c7ea147611966b57"
-
 resolve@^1.1.6:
   version "1.5.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
@@ -601,26 +567,26 @@ restore-cursor@^2.0.0:
     onetime "^2.0.0"
     signal-exit "^3.0.2"
 
+rethinkdb@^2.3.3:
+  version "2.3.3"
+  resolved "https://registry.yarnpkg.com/rethinkdb/-/rethinkdb-2.3.3.tgz#3dc6586e22fa1dabee0d254e64bd0e379fad2f72"
+  dependencies:
+    bluebird ">= 2.3.2 < 3"
+
+right-pad@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/right-pad/-/right-pad-1.0.1.tgz#8ca08c2cbb5b55e74dafa96bf7fd1a27d568c8d0"
+
 runtime-type-checks@0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/runtime-type-checks/-/runtime-type-checks-0.0.4.tgz#5682baf2ffe53f955fe3e065b40a0a09943845c8"
   dependencies:
     reflect-metadata "^0.1.2"
 
-rxjs@^5.4.3:
-  version "5.5.2"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-5.5.2.tgz#28d403f0071121967f18ad665563255d54236ac3"
-  dependencies:
-    symbol-observable "^1.0.1"
-
 safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.1.tgz#893312af69b2123def71f57889001671eeb2c853"
 
-semver@^5.1.0, semver@^5.3.0:
-  version "5.4.1"
-  resolved "https://registry.yarnpkg.com/semver/-/semver-5.4.1.tgz#e059c09d8571f0540823733433505d3a2f00b18e"
-
 shelljs@^0.7.8:
   version "0.7.8"
   resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
@@ -687,23 +653,12 @@ smartq@^1.1.1, smartq@^1.1.6:
     util.promisify "^1.0.0"
 
 smartrequest@^1.0.6:
-  version "1.0.6"
+  version "1.0.8"
-  resolved "https://registry.yarnpkg.com/smartrequest/-/smartrequest-1.0.6.tgz#a006454332453b0a70d38a003a29963d039a7783"
+  resolved "https://registry.yarnpkg.com/smartrequest/-/smartrequest-1.0.8.tgz#9af18dde34efa7d43b4ecfc92ccb157a98eda3b1"
   dependencies:
     smartq "^1.1.1"
-    typings-global "^1.0.17"
 
-smartshell@^1.0.6:
+smartstring@^2.0.28:
-  version "1.0.19"
-  resolved "https://registry.yarnpkg.com/smartshell/-/smartshell-1.0.19.tgz#459c7a9fab8a25007848ffc711b7a817dd6ffc00"
-  dependencies:
-    "@types/which" "^1.0.28"
-    shelljs "^0.7.8"
-    smartq "^1.1.6"
-    typings-global "^1.0.23"
-    which "^1.3.0"
-
-smartstring@^2.0.24:
   version "2.0.28"
   resolved "https://registry.yarnpkg.com/smartstring/-/smartstring-2.0.28.tgz#384b808dc3780eff0031ce7925c1b1668abbcad5"
   dependencies:
@@ -718,7 +673,7 @@ sprintf-js@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c"
 
-string_decoder@~1.0.0, string_decoder@~1.0.3:
+string_decoder@~1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
   dependencies:
@@ -757,9 +712,9 @@ supports-color@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
 
-symbol-observable@^1.0.1:
+symbol-tree@^3.2.2:
-  version "1.0.4"
+  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.0.4.tgz#29bf615d4aa7121bdd898b22d4b3f9bc4e2aa03d"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
 
 tapbundle@^1.1.1:
   version "1.1.8"
@@ -780,12 +735,9 @@ through2@^2.0.1:
     readable-stream "^2.1.5"
     xtend "~4.0.1"
 
-typings-global@^1.0.14, typings-global@^1.0.16, typings-global@^1.0.17, typings-global@^1.0.19, typings-global@^1.0.20, typings-global@^1.0.23:
+typings-global@^1.0.14, typings-global@^1.0.16, typings-global@^1.0.19, typings-global@^1.0.20:
-  version "1.0.23"
+  version "1.0.28"
-  resolved "https://registry.yarnpkg.com/typings-global/-/typings-global-1.0.23.tgz#cdd085803049dd07d95b2e1475243c6b2db378ab"
+  resolved "https://registry.yarnpkg.com/typings-global/-/typings-global-1.0.28.tgz#e28cc965476564cbc00e438739e0aa0735d323d4"
-  dependencies:
-    semver "^5.3.0"
-    smartshell "^1.0.6"
 
 universalify@^0.1.0:
   version "0.1.1"
@@ -823,11 +775,9 @@ vinyl@^2.0.1:
     remove-trailing-separator "^1.0.1"
     replace-ext "^1.0.0"
 
-which@^1.3.0:
+word-wrap@^1.0.3:
-  version "1.3.0"
+  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
-  dependencies:
-    isexe "^2.0.0"
 
 wrappy@1:
   version "1.0.2"