2.0.0

.gitignore

@@ -1,5 +1,4 @@
 node_modules/
-test/data
-pages/
-coverage/
 public/
+coverage/
+.nogit/

.gitlab-ci.yml

@@ -1,19 +1,22 @@
-image: hosttoday/ht-docker-node:npmts
+# gitzone standard
+image: hosttoday/ht-docker-node:npmci
+
+cache:
+  paths:
+  - .yarn/
+  key: "$CI_BUILD_STAGE"
 
 stages:
 - test
 - release
-
+- trigger
-before_script:
+- pages
-  - apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv EA312927
-  - echo "deb http://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.2 multiverse" | tee /etc/apt/sources.list.d/mongodb-org-3.2.list
-  - apt-get update
-  - apt-get install -y mongodb-org
 
 testLEGACY:
   stage: test
   script:
     - npmci test legacy
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
   allow_failure: true
@@ -22,6 +25,7 @@ testLTS:
   stage: test
   script:
     - npmci test lts
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
     
@@ -29,15 +33,40 @@ testSTABLE:
   stage: test
   script:
     - npmci test stable
+  coverage: /\d+.?\d+?\%\s*coverage/
   tags:
     - docker
 
 release:
   stage: release
-  environment: npm_registry
   script:
     - npmci publish
   only:
     - tags
   tags:
-    - docker
+    - docker
+
+trigger:
+  stage: trigger
+  script:
+    - npmci trigger
+  only:
+    - tags
+  tags:
+    - docker
+
+pages:
+  image: hosttoday/ht-docker-node:npmci
+  stage: pages
+  script:
+    - npmci command yarn global add npmpage
+    - npmci command npmpage
+  tags:
+    - docker
+  only:
+    - tags
+  artifacts:
+    expire_in: 1 week
+    paths:
+    - public
+  allow_failure: true

README.md

@@ -1,56 +1,53 @@
 # smartdata
-
+do more with data and RethinkDB
-> Note: Still in Beta
 
 ## Availabililty
-[![npm](https://push.rocks/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartdata)
+[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartdata)
-[![git](https://push.rocks/assets/repo-button-git.svg)](https://gitlab.com/pushrocks/smartdata)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartdata)
-[![git](https://push.rocks/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartdata)
+[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartdata)
-[![docs](https://push.rocks/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/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)
+[![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)
+[![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 MongoDB or NeDb as persistent storage.
+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 MongoDB terms map to smartdata classes
+How RethinkDB's terms map to the ones of smartdata:
 
-MongoDB term | smartdata class
+RethinkDB term | smartdata class
 --- | ---
 Database | smartdata.Db
-Collection | smartdata.DbCollection
+Table | smartdata.DbTable
 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 myRethinkDb1 = new smartdata.Db({
-let myDb1 = new smartdata.Db('someConnectionUrl')
+  // rethinkDb connection options here
-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
@@ -58,11 +55,12 @@ 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)
+@Collection(myRethinkDb1)
-class myObject extends smartdata.DbDoc<myObject> { // read the next block about DbDoc
+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:{
@@ -72,9 +70,15 @@ class myObject extends smartdata.DbDoc<myObject> { // read the next block about
         super()
     }
 }
-let myCollection = myDb1.getCollectionByName<myObject>(myObject)
+let myCollection = myRethinkDb1.getCollectionByName<myObject>(myObject)
 
-// start to instantiate classes from scratch or database
+// 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.
@@ -100,6 +104,11 @@ 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. 
+So you don't need to install any additional types when importing smartdata.
 
-[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)
+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)
+
+[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)

dist/index.js

@@ -2,7 +2,8 @@
 function __export(m) {
     for (var p in m) if (!exports.hasOwnProperty(p)) exports[p] = m[p];
 }
+Object.defineProperty(exports, "__esModule", { value: true });
 __export(require("./smartdata.classes.db"));
 __export(require("./smartdata.classes.dbcollection"));
 __export(require("./smartdata.classes.dbdoc"));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBRUEsNENBQXNDO0FBQ3RDLHNEQUFnRDtBQUNoRCwrQ0FBeUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDRDQUFzQztBQUN0QyxzREFBZ0Q7QUFDaEQsK0NBQXlDIn0=

dist/smartdata.classes.db.d.ts

@@ -1,33 +1,35 @@
-/// <reference types="q" />
 import * as plugins from './smartdata.plugins';
 import { Objectmap } from 'lik';
-import { DbCollection } from './smartdata.classes.dbcollection';
+import { DbTable } from './smartdata.classes.dbcollection';
-/**
+import { ConnectionOptions } from 'rethinkdb';
- * interface - indicates the database type
- */
-export declare type TDbType = 'mongodb' | 'nedb';
 /**
  * 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 {
-    dbType: TDbType;
+    dbName: string;
-    dbUrl: string;
+    connectionOptions: plugins.rethinkDb.ConnectionOptions;
-    db: plugins.mongodb.Db;
+    dbConnection: plugins.rethinkDb.Connection;
     status: TConnectionStatus;
-    collections: Objectmap<DbCollection<any>>;
+    dbTablesMap: Objectmap<DbTable<any>>;
-    constructor(dbUrlArg: string, dbTypeArg?: TDbType);
+    constructor(connectionOptionsArg: ConnectionOptions);
+    /**
+     * supply additional SSl options
+     */
+    setSsl(certificateStringArg: string, formatArg: 'base64' | 'clearText'): void;
     /**
      * connects to the database that was specified during instance creation
      */
-    connect(): plugins.q.Promise<any>;
+    connect(): Promise<any>;
     /**
      * closes the connection to the databse
      */
-    close(): plugins.q.Promise<any>;
+    close(): Promise<any>;
     /**
-     * gets a collection by name: string
+     * Gets a table's name and returns smartdata's DbTable class
+     * @param nameArg
+     * @returns DbTable
      */
-    getCollectionByName<T>(nameArg: string): plugins.q.Promise<DbCollection<T>>;
+    getDbTableByName<T>(nameArg: string): Promise<DbTable<T>>;
-    addCollection(dbCollectionArg: DbCollection<any>): void;
+    addTable(dbCollectionArg: DbTable<any>): void;
 }

dist/smartdata.classes.db.js

@@ -1,64 +1,76 @@
 "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");
 const lik_1 = require("lik");
 class Db {
-    constructor(dbUrlArg, dbTypeArg = 'mongodb') {
+    constructor(connectionOptionsArg) {
-        this.collections = new lik_1.Objectmap();
+        this.dbTablesMap = new lik_1.Objectmap();
-        this.dbType = dbTypeArg;
+        this.dbName = connectionOptionsArg.db;
-        this.dbUrl = dbUrlArg;
+        this.connectionOptions = connectionOptionsArg;
+        this.status = 'initial';
+    }
+    /**
+     * supply additional SSl options
+     */
+    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.q.defer();
+        return __awaiter(this, void 0, void 0, function* () {
-        if (this.dbType === 'mongodb') {
+            this.dbConnection = yield plugins.rethinkDb.connect(this.connectionOptions);
-            plugins.mongodb.MongoClient.connect(this.dbUrl, (err, db) => {
+            this.dbConnection.use(this.dbName);
-                if (err) {
+            this.status = 'connected';
-                    console.log(err);
+            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);
-            });
-        }
-        else if (this.dbType === 'nedb') {
-            this.db = null;
-        }
-        return done.promise;
     }
     /**
      * closes the connection to the databse
      */
     close() {
-        let done = plugins.q.defer();
+        return __awaiter(this, void 0, void 0, function* () {
-        if (this.dbType === 'mongodb') {
+            yield this.dbConnection.close();
-            this.db.close();
+            this.status = 'disconnected';
-        }
+            plugins.beautylog.ok(`disconnected from database ${this.dbName}`);
-        plugins.beautylog.ok(`disconnected to database at ${this.dbUrl}`);
-        done.resolve();
-        return done.promise;
-    }
-    // advanced communication with the database --------------------------------
-    /**
-     * gets a collection by name: string
-     */
-    getCollectionByName(nameArg) {
-        let done = plugins.q.defer();
-        let resultCollection = this.collections.find((dbCollectionArg) => {
-            return dbCollectionArg.name === nameArg;
         });
-        if (resultCollection !== null) {
-            done.resolve(resultCollection);
-        }
-        return done.promise;
     }
-    ;
+    // handle table to class distribution
-    addCollection(dbCollectionArg) {
+    /**
-        this.collections.add(dbCollectionArg);
+     * 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((dbCollectionArg) => {
+                return dbCollectionArg.tableName === nameArg;
+            });
+            return resultCollection;
+        });
+    }
+    addTable(dbCollectionArg) {
+        this.dbTablesMap.add(dbCollectionArg);
     }
 }
 exports.Db = Db;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLmNsYXNzZXMuZGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGRhdGEuY2xhc3Nlcy5kYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsK0NBQThDO0FBQzlDLDZCQUErQjtBQWMvQjtJQU9JLFlBQVksUUFBZ0IsRUFBRSxZQUFxQixTQUFTO1FBRjVELGdCQUFXLEdBQUcsSUFBSSxlQUFTLEVBQXFCLENBQUE7UUFHNUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxTQUFTLENBQUE7UUFDdkIsSUFBSSxDQUFDLEtBQUssR0FBRyxRQUFRLENBQUE7SUFDekIsQ0FBQztJQUVELHdFQUF3RTtJQUV4RTs7T0FFRztJQUNILE9BQU87UUFDSCxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQzVCLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQztZQUM1QixPQUFPLENBQUMsT0FBTyxDQUFDLFdBQVcsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDLEdBQUcsRUFBRSxFQUFFO2dCQUNwRCxFQUFFLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDO29CQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUE7Z0JBQUMsQ0FBQztnQkFDN0IsT0FBTyxDQUFDLE1BQU0sQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLEdBQUcsQ0FBQyxDQUFBO2dCQUMvQixJQUFJLENBQUMsRUFBRSxHQUFHLEVBQUUsQ0FBQTtnQkFDWixPQUFPLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyw0QkFBNEIsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUE7Z0JBQ25FLElBQUksQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFBO1lBQ3pCLENBQUMsQ0FBQyxDQUFBO1FBQ04sQ0FBQztRQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxJQUFJLENBQUMsTUFBTSxLQUFLLE1BQU0sQ0FBQyxDQUFDLENBQUM7WUFDaEMsSUFBSSxDQUFDLEVBQUUsR0FBRyxJQUFJLENBQUE7UUFDbEIsQ0FBQztRQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3ZCLENBQUM7SUFFRDs7T0FFRztJQUNILEtBQUs7UUFDRCxJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQzVCLEVBQUUsQ0FBQyxDQUFDLElBQUksQ0FBQyxNQUFNLEtBQUssU0FBUyxDQUFDLENBQUMsQ0FBQztZQUM1QixJQUFJLENBQUMsRUFBRSxDQUFDLEtBQUssRUFBRSxDQUFBO1FBQ25CLENBQUM7UUFDRCxPQUFPLENBQUMsU0FBUyxDQUFDLEVBQUUsQ0FBQywrQkFBK0IsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDLENBQUE7UUFDakUsSUFBSSxDQUFDLE9BQU8sRUFBRSxDQUFBO1FBQ2QsTUFBTSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUE7SUFDdkIsQ0FBQztJQUVELDRFQUE0RTtJQUU1RTs7T0FFRztJQUNILG1CQUFtQixDQUFJLE9BQWU7UUFDbEMsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLEVBQXFCLENBQUE7UUFDL0MsSUFBSSxnQkFBZ0IsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDLGVBQWU7WUFDekQsTUFBTSxDQUFDLGVBQWUsQ0FBQyxJQUFJLEtBQUssT0FBTyxDQUFBO1FBQzNDLENBQUMsQ0FBQyxDQUFBO1FBQ0YsRUFBRSxDQUFDLENBQUMsZ0JBQWdCLEtBQUssSUFBSSxDQUFDLENBQUMsQ0FBQztZQUM1QixJQUFJLENBQUMsT0FBTyxDQUFDLGdCQUFnQixDQUFDLENBQUE7UUFDbEMsQ0FBQztRQUNELE1BQU0sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFBO0lBQ3ZCLENBQUM7SUFBQSxDQUFDO0lBRUYsYUFBYSxDQUFDLGVBQWtDO1FBQzVDLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxDQUFBO0lBQ3pDLENBQUM7Q0FFSjtBQWxFRCxnQkFrRUMifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLmNsYXNzZXMuZGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGRhdGEuY2xhc3Nlcy5kYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEsK0NBQThDO0FBQzlDLDZCQUErQjtBQVcvQjtJQU9FLFlBQVksb0JBQXVDO1FBRm5ELGdCQUFXLEdBQUcsSUFBSSxlQUFTLEVBQWdCLENBQUE7UUFHekMsSUFBSSxDQUFDLE1BQU0sR0FBRyxvQkFBb0IsQ0FBQyxFQUFFLENBQUE7UUFDckMsSUFBSSxDQUFDLGlCQUFpQixHQUFHLG9CQUFvQixDQUFBO1FBQzdDLElBQUksQ0FBQyxNQUFNLEdBQUcsU0FBUyxDQUFBO0lBQ3pCLENBQUM7SUFFRDs7T0FFRztJQUNILE1BQU0sQ0FBRSxvQkFBNEIsRUFBRSxTQUFpQztRQUNyRSxJQUFJLGlCQUF5QixDQUFBO1FBQzdCLEVBQUUsQ0FBQSxDQUFDLFNBQVMsR0FBRyxRQUFRLENBQUMsQ0FBQyxDQUFDO1lBQ3hCLGlCQUFpQixHQUFHLE9BQU8sQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLE1BQU0sQ0FBQyxvQkFBb0IsQ0FBQyxDQUFBO1FBQzdFLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNOLGlCQUFpQixHQUFHLG9CQUFvQixDQUFBO1FBQzFDLENBQUM7UUFDRCxJQUFJLENBQUMsaUJBQWlCLENBQUMsS0FBSyxDQUFDLEdBQUc7WUFDOUIsRUFBRSxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUM7U0FDbkMsQ0FBQTtJQUNILENBQUM7SUFFRCx3RUFBd0U7SUFFeEU7O09BRUc7SUFDRyxPQUFPOztZQUNYLElBQUksQ0FBQyxZQUFZLEdBQUcsTUFBTSxPQUFPLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsQ0FBQTtZQUMzRSxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUE7WUFDbEMsSUFBSSxDQUFDLE1BQU0sR0FBRyxXQUFXLENBQUE7WUFDekIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMseUJBQXlCLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFBO1FBQzlELENBQUM7S0FBQTtJQUVEOztPQUVHO0lBQ0csS0FBSzs7WUFDVCxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxFQUFFLENBQUE7WUFDL0IsSUFBSSxDQUFDLE1BQU0sR0FBRyxjQUFjLENBQUE7WUFDNUIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsOEJBQThCLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFBO1FBQ25FLENBQUM7S0FBQTtJQUVELHFDQUFxQztJQUVyQzs7OztPQUlHO0lBQ0csZ0JBQWdCLENBQUksT0FBZTs7WUFDdkMsSUFBSSxnQkFBZ0IsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLElBQUksQ0FBQyxDQUFDLGVBQWUsRUFBRSxFQUFFO2dCQUMvRCxNQUFNLENBQUMsZUFBZSxDQUFDLFNBQVMsS0FBSyxPQUFPLENBQUE7WUFDOUMsQ0FBQyxDQUFDLENBQUE7WUFDRixNQUFNLENBQUMsZ0JBQWdCLENBQUE7UUFDekIsQ0FBQztLQUFBO0lBRUQsUUFBUSxDQUFFLGVBQTZCO1FBQ3JDLElBQUksQ0FBQyxXQUFXLENBQUMsR0FBRyxDQUFDLGVBQWUsQ0FBQyxDQUFBO0lBQ3ZDLENBQUM7Q0FDRjtBQWxFRCxnQkFrRUMifQ==

dist/smartdata.classes.dbcollection.d.ts

@@ -1,6 +1,7 @@
-/// <reference types="q" />
 import * as plugins from './smartdata.plugins';
 import { Db } from './smartdata.classes.db';
+import { DbDoc } from './smartdata.classes.dbdoc';
+import { WriteResult, Cursor } from 'rethinkdb';
 export interface IFindOptions {
     limit?: number;
 }
@@ -8,16 +9,17 @@ export interface IDocValidation<T> {
     (doc: T): boolean;
 }
 export declare function Collection(db: Db): (constructor: any) => void;
-export declare class DbCollection<T> {
+export declare class DbTable<T> {
     /**
      * the collection that is used, defaults to mongodb collection,
      * can be nedb datastore (sub api of mongodb)
      */
-    collection: plugins.mongodb.Collection;
+    table: plugins.rethinkDb.Table;
-    name: string;
-    db: Db;
     objectValidation: IDocValidation<T>;
-    constructor(nameArg: string, dbArg: Db);
+    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
      */
@@ -25,17 +27,19 @@ export declare class DbCollection<T> {
     /**
      * finds an object in the DbCollection
      */
-    find(docMatchArg: T | any, optionsArg?: IFindOptions): plugins.q.Promise<T[]>;
+    find(): Promise<Cursor>;
+    /**
+     * create an object in the database
+     */
+    insert(dbDocArg: T & DbDoc<T>): Promise<WriteResult>;
     /**
      * inserts object into the DbCollection
      */
-    insertOne(docArg: T): plugins.q.Promise<void>;
+    update(dbDocArg: T & DbDoc<T>): Promise<WriteResult>;
-    /**
-     * inserts many objects at once into the DbCollection
-     */
-    insertMany(docArrayArg: T[]): plugins.q.Promise<void>;
     /**
      * checks a Doc for constraints
+     * if this.objectValidation is not set it passes.
      */
     private checkDoc(docArg);
+    extractKey(writeResult: WriteResult): void;
 }

dist/smartdata.classes.dbdoc.d.ts

@@ -1,4 +1,5 @@
-import { DbCollection } from './smartdata.classes.dbcollection';
+import { Objectmap } from 'lik';
+import { DbTable } from './smartdata.classes.dbcollection';
 export declare type TDocCreation = 'db' | 'new' | 'mixed';
 /**
  * saveable - saveable decorator to be used on class properties
@@ -8,15 +9,23 @@ 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
      */
     saveableProperties: string[];
+    /**
+     * name
+     */
+    name: string;
+    /**
+     * primary id in the database
+     */
+    dbId: string;
     /**
      * class constructor
      */
@@ -25,10 +34,11 @@ export declare class DbDoc<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(): void;
+    saveDeep(savedMapArg?: Objectmap<DbDoc<any>>): void;
+    createSavableObject(): any;
 }

dist/smartdata.classes.dbdoc.js

@@ -1,4 +1,14 @@
 "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");
 /**
  * saveable - saveable decorator to be used on class properties
  */
@@ -17,6 +27,11 @@ class DbDoc {
      * class constructor
      */
     constructor() {
+        /**
+         * how the Doc in memory was created, may prove useful later.
+         */
+        this.creationStatus = 'new';
+        this.name = this.constructor['name'];
         this.collection = this.constructor['dbCollection'];
     }
     /**
@@ -24,25 +39,45 @@ class DbDoc {
      * may lead to data inconsistencies, but is faster
      */
     save() {
-        let saveableObject = {};
+        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
      * better for data consistency
      */
-    saveDeep() {
+    saveDeep(savedMapArg = null) {
+        if (!savedMapArg) {
+            savedMapArg = new lik_1.Objectmap();
+        }
+        savedMapArg.add(this);
         this.save();
+        for (let propertyKey in this) {
+            let property = this[propertyKey];
+            if (property instanceof DbDoc && !savedMapArg.checkForObject(property)) {
+                property.saveDeep(savedMapArg);
+            }
+        }
+    }
+    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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLmNsYXNzZXMuZGJkb2MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGRhdGEuY2xhc3Nlcy5kYmRvYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBT0E7O0dBRUc7QUFDSDtJQUNJLE1BQU0sQ0FBQyxDQUFDLE1BQWtCLEVBQUUsR0FBVztRQUNuQyxPQUFPLENBQUMsR0FBRyxDQUFDLFlBQVksQ0FBQyxDQUFBO1FBQ3pCLEVBQUUsQ0FBQyxDQUFDLENBQUMsTUFBTSxDQUFDLGtCQUFrQixDQUFDLENBQUMsQ0FBQztZQUFDLE1BQU0sQ0FBQyxrQkFBa0IsR0FBRyxFQUFFLENBQUE7UUFBQyxDQUFDO1FBQ2xFLE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUE7SUFDdkMsQ0FBQyxDQUFBO0FBQ0wsQ0FBQztBQU5ELG9CQU1DO0FBRUQ7SUFpQkk7O09BRUc7SUFDSDtRQUNJLElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxjQUFjLENBQUMsQ0FBQTtJQUN0RCxDQUFDO0lBRUQ7OztPQUdHO0lBQ0gsSUFBSTtRQUNBLElBQUksY0FBYyxHQUFHLEVBQUUsQ0FBQTtRQUN2QixHQUFHLENBQUMsQ0FBQyxJQUFJLGtCQUFrQixJQUFJLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUM7WUFDckQsY0FBYyxDQUFDLGtCQUFrQixDQUFDLEdBQUcsSUFBSSxDQUFDLGtCQUFrQixDQUFDLENBQUE7UUFDakUsQ0FBQztRQUNELE1BQU0sQ0FBQyxDQUFDLElBQUksQ0FBQyxZQUFZLENBQUMsQ0FBQyxDQUFDO1lBQ3hCLEtBQUssSUFBSTtnQkFDTCxJQUFJLENBQUMsVUFBVSxDQUFBLENBQUMscUNBQXFDO2dCQUNyRCxLQUFLLENBQUE7WUFDVCxLQUFLLEtBQUs7Z0JBQ04sSUFBSSxDQUFDLFVBQVUsQ0FBQyxTQUFTLENBQUMsY0FBYyxDQUFDLENBQUE7UUFDakQsQ0FBQztJQUNMLENBQUM7SUFFRDs7O09BR0c7SUFDSCxRQUFRO1FBQ0osSUFBSSxDQUFDLElBQUksRUFBRSxDQUFBO0lBQ2YsQ0FBQztDQUNKO0FBakRELHNCQWlEQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLmNsYXNzZXMuZGJkb2MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGRhdGEuY2xhc3Nlcy5kYmRvYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBRUEsNkJBQStCO0FBTy9COztHQUVHO0FBQ0g7SUFDRSxNQUFNLENBQUMsQ0FBQyxNQUFrQixFQUFFLEdBQVcsRUFBRSxFQUFFO1FBQ3pDLE9BQU8sQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLENBQUE7UUFDekIsRUFBRSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDO1lBQUMsTUFBTSxDQUFDLGtCQUFrQixHQUFHLEVBQUUsQ0FBQTtRQUFDLENBQUM7UUFDbEUsTUFBTSxDQUFDLGtCQUFrQixDQUFDLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQTtJQUNyQyxDQUFDLENBQUE7QUFDSCxDQUFDO0FBTkQsb0JBTUM7QUFFRDtJQTJCRTs7T0FFRztJQUNIO1FBdkJBOztXQUVHO1FBQ0gsbUJBQWMsR0FBaUIsS0FBSyxDQUFBO1FBcUJsQyxJQUFJLENBQUMsSUFBSSxHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsTUFBTSxDQUFDLENBQUE7UUFDcEMsSUFBSSxDQUFDLFVBQVUsR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFFLGNBQWMsQ0FBRSxDQUFBO0lBQ3RELENBQUM7SUFFRDs7O09BR0c7SUFDRyxJQUFJOztZQUNSLElBQUksSUFBSSxHQUFRLElBQUksQ0FBQTtZQUNwQixNQUFNLENBQUMsQ0FBQyxJQUFJLENBQUMsY0FBYyxDQUFDLENBQUMsQ0FBQztnQkFDNUIsS0FBSyxJQUFJO29CQUNQLE1BQU0sSUFBSSxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLENBQUE7b0JBQ2xDLEtBQUssQ0FBQTtnQkFDUCxLQUFLLEtBQUs7b0JBQ1IsSUFBSSxXQUFXLEdBQUcsTUFBTSxJQUFJLENBQUMsVUFBVSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQTtvQkFDcEQsSUFBSSxDQUFDLGNBQWMsR0FBRyxJQUFJLENBQUE7b0JBQzFCLEtBQUssQ0FBQztnQkFDUjtvQkFDRSxPQUFPLENBQUMsS0FBSyxDQUFDLHdCQUF3QixDQUFDLENBQUE7WUFDM0MsQ0FBQztRQUNILENBQUM7S0FBQTtJQUVEOzs7T0FHRztJQUNILFFBQVEsQ0FBRSxjQUFxQyxJQUFJO1FBQ2pELEVBQUUsQ0FBQyxDQUFDLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQztZQUNqQixXQUFXLEdBQUcsSUFBSSxlQUFTLEVBQWMsQ0FBQTtRQUMzQyxDQUFDO1FBQ0QsV0FBVyxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsQ0FBQTtRQUNyQixJQUFJLENBQUMsSUFBSSxFQUFFLENBQUE7UUFDWCxHQUFHLENBQUMsQ0FBQyxJQUFJLFdBQVcsSUFBSSxJQUFJLENBQUMsQ0FBQyxDQUFDO1lBQzdCLElBQUksUUFBUSxHQUFRLElBQUksQ0FBRSxXQUFXLENBQUUsQ0FBQTtZQUN2QyxFQUFFLENBQUMsQ0FBQyxRQUFRLFlBQVksS0FBSyxJQUFJLENBQUMsV0FBVyxDQUFDLGNBQWMsQ0FBQyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0JBQ3ZFLFFBQVEsQ0FBQyxRQUFRLENBQUMsV0FBVyxDQUFDLENBQUE7WUFDaEMsQ0FBQztRQUNILENBQUM7SUFDSCxDQUFDO0lBRUQsbUJBQW1CO1FBQ2pCLElBQUksY0FBYyxHQUFRLEVBQUUsQ0FBQSxDQUFDLCtDQUErQztRQUM1RSxHQUFHLENBQUMsQ0FBQyxJQUFJLGtCQUFrQixJQUFJLElBQUksQ0FBQyxrQkFBa0IsQ0FBQyxDQUFDLENBQUM7WUFDdkQsY0FBYyxDQUFFLGtCQUFrQixDQUFFLEdBQUcsSUFBSSxDQUFFLGtCQUFrQixDQUFFLENBQUE7UUFDbkUsQ0FBQztRQUNELE1BQU0sQ0FBQyxjQUFjLENBQUE7SUFDdkIsQ0FBQztDQUNGO0FBL0VELHNCQStFQyJ9

dist/smartdata.plugins.d.ts

@@ -1,8 +1,7 @@
-import 'typings-global';
 import * as assert from 'assert';
 import * as beautylog from 'beautylog';
 import * as lodash from 'lodash';
-import * as mongodb from 'mongodb';
+import * as rethinkDb from 'rethinkdb';
-import * as q from 'q';
+import * as smartq from 'smartq';
-declare let nedb: any;
+import * as smartstring from 'smartstring';
-export { assert, beautylog, lodash, mongodb, q, nedb };
+export { assert, beautylog, lodash, smartq, rethinkDb, smartstring };

dist/smartdata.plugins.js

@@ -1,15 +1,15 @@
 "use strict";
-require("typings-global");
+Object.defineProperty(exports, "__esModule", { value: true });
 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 q = require("q");
+const smartq = require("smartq");
-exports.q = q;
+exports.smartq = smartq;
-let nedb = require('nedb');
+const smartstring = require("smartstring");
-exports.nedb = nedb;
+exports.smartstring = smartstring;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGRhdGEucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsMEJBQXVCO0FBQ3ZCLGlDQUFnQztBQVE1Qix3QkFBTTtBQVBWLHVDQUFzQztBQVFsQyw4QkFBUztBQVBiLGlDQUFnQztBQVE1Qix3QkFBTTtBQVBWLG1DQUFrQztBQVE5QiwwQkFBTztBQVBYLHVCQUFzQjtBQVFsQixjQUFDO0FBUEwsSUFBSSxJQUFJLEdBQUcsT0FBTyxDQUFDLE1BQU0sQ0FBQyxDQUFBO0FBUXRCLG9CQUFJIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGRhdGEucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGlDQUFnQztBQVE1Qix3QkFBTTtBQVBWLHVDQUFzQztBQVFsQyw4QkFBUztBQVBiLGlDQUFnQztBQVE1Qix3QkFBTTtBQVBWLHVDQUFzQztBQVNsQyw4QkFBUztBQVJiLGlDQUFnQztBQU81Qix3QkFBTTtBQU5WLDJDQUEwQztBQVF0QyxrQ0FBVyJ9

docs/index.md

@@ -1,19 +1,26 @@
 # smartdata
+do more with data
 
-smartdata is a ODM that adheres to TypeScript practices and uses classes to organize data.
+## Availabililty
-It uses MongoDB as persistent storage.
+[![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/)
 
-## Intention
+## Status for master
-There are many ODMs out there, however when we searched for a ODM that uses TypeScript,
+[![build status](https://GitLab.com/pushrocks/smartdata/badges/master/build.svg)](https://GitLab.com/pushrocks/smartdata/commits/master)
-acts smart while still embracing an easy the NoSQL idea we didn't find a matching solution.
+[![coverage report](https://GitLab.com/pushrocks/smartdata/badges/master/coverage.svg)](https://GitLab.com/pushrocks/smartdata/commits/master)
-This is why we started smartdata
+[![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)
+[![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/)
 
-How MongoDB terms map to smartdata classes
+For further information read the linked docs at the top of this README.
 
-MongoDB term | smartdata class
+> MIT licensed | **©** [Lossless GmbH](https://lossless.gmbh)
---- | ---
+| By using this npm module you agree to our [privacy policy](https://lossless.gmbH/privacy.html)
-Database | smartdata.DbConnection
-Collection | smartdata.DbCollection
-Document | smartdata.DbDoc
 
-[![npm](https://push.rocks/assets/repo-header.svg)](https://push.rocks)
+[![repo-footer](https://pushrocks.gitlab.io/assets/repo-footer.svg)](https://push.rocks)

npmextra.json

@@ -0,0 +1,17 @@
+{
+  "npmdocker": {
+    "baseImage": "hosttoday/ht-docker-node:mongo",
+    "command": "npmci test stable",
+    "dockerSock": false
+  },
+  "npmci": {
+    "globalNpmTools": [
+      "npmts"
+    ]
+  },
+  "npmts": {
+    "testConfig": {
+      "parallel": false
+    }
+  }
+}

package-lock.json

@@ -0,0 +1,223 @@
+{
+  "name": "smartdata",
+  "version": "2.0.0",
+  "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,12 +1,12 @@
 {
   "name": "smartdata",
-  "version": "1.0.22",
+  "version": "2.0.0",
   "description": "do more with data",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "(npm run prepareMongo && npmts)",
+    "test": "(npmts)",
-    "prepareMongo": "(rm -rf ./test/data && mkdir ./test/data/)"
+    "testLocal": "(npmdocker)"
   },
   "repository": {
     "type": "git",
@@ -19,25 +19,27 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartdata#README",
   "dependencies": {
-    "@types/lodash": "^4.14.39",
+    "@types/lodash": "^4.14.92",
-    "@types/mongodb": "^2.1.34",
+    "@types/rethinkdb": "^2.3.8",
-    "@types/nedb": "0.0.31",
+    "beautylog": "^6.1.10",
-    "@types/q": "0.0.32",
+    "lik": "^2.0.2",
-    "beautylog": "^6.0.0",
+    "lodash": "^4.17.4",
-    "lik": "^1.0.24",
+    "rethinkdb": "^2.3.3",
-    "lodash": "^4.17.2",
-    "mongodb": "^2.2.11",
-    "nedb": "^1.8.0",
-    "q": "^1.4.1",
     "runtime-type-checks": "0.0.4",
-    "typings-global": "^1.0.14"
+    "smartq": "^1.1.6",
+    "smartstring": "^2.0.28"
   },
   "devDependencies": {
-    "@types/shelljs": "^0.3.32",
+    "@types/node": "^8.5.7",
-    "@types/should": "^8.1.30",
+    "@types/shelljs": "^0.7.4",
-    "shelljs": "^0.7.5",
+    "cz-conventional-changelog": "^2.1.0",
-    "should": "^11.1.1",
+    "qenv": "^1.1.7",
-    "smartstring": "^2.0.22",
+    "shelljs": "^0.7.8",
-    "typings-test": "^1.0.3"
+    "tapbundle": "^1.1.1"
+  },
+  "config": {
+    "commitizen": {
+      "path": "./node_modules/cz-conventional-changelog"
+    }
   }
 }

qenv.yml

@@ -0,0 +1,7 @@
+vars:
+  - RDB_DB
+  - RDB_HOST
+  - RDB_USER
+  - RDB_PASS
+  - RDB_PORT
+  - RDB_CERT

test/test.d.ts

@@ -1 +0,0 @@
-import 'typings-test';

test/test.ts

@@ -1,133 +1,61 @@
-import 'typings-test'
+import { tap, expect } from 'tapbundle'
+import * as smartq from 'smartq'
+import { Qenv } from 'qenv'
 
-import * as shelljs from 'shelljs'
+let testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit/')
-import * as should from 'should'
-import * as smartstring from 'smartstring'
 
 // the tested module
-import * as smartdata from '../dist/index'
+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 the rethink Db cluster', async () => {
+  
+  await testDb.connect()
+})
+
+// =======================================
+// The actual tests
+// =======================================
+
+// ------
+// Collections
+// ------
+
+@smartdata.Collection(testDb)
+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
+  }
 }
 
-let testDbCollection: smartdata.DbCollection<ITestObject1>
+tap.test('should save the car to the db', async () => {
-
+  const myCar = new Car('red','Volvo')
-describe('mongodb', function () {
+  await myCar.save()
-    it('should start mongodb', function (done) {
-        this.timeout(30000)
-        mongoChildProcess = shelljs.exec('mongod --dbpath=./test/data --port 27017', { async: true, silent: true })
-        let doneCalled = false
-        mongoChildProcess.stdout.on('data', function (data) {
-            console.log(smartstring.indent.indentWithPrefix(data, '*** MongoDB Process *** : '))
-            if (!doneCalled) {
-                if (/waiting for connections on port 27017/.test(data)) {
-                    doneCalled = true
-                    done()
-                }
-            }
-        })
-    })
 })
 
-describe('smartdata', function () {
-    it('should establish a connection to mongodb', function (done) {
-        testDb = new smartdata.Db('mongodb://localhost:27017/smartdata')
-        testDb.connect().then(() => { done() })
-    })
-    it('should create a collection', function () {
-        testDbCollection = new smartdata.DbCollection<ITestObject1>('something', testDb)
-    })
-    it('should insert a doc into the collection', function (done) {
-        testDbCollection.insertOne({ value1: 'test' }).then(() => { done() })
-    })
-    it('should find all docs of testDbCollection', function (done) {
-        testDbCollection.find({}).then((resultArray) => {
-            console.log(resultArray)
-            should(resultArray[0].value1).equal('test')
-            done()
-        })
-    })
-    it('should insert many docs into the collection', function (done) {
-        testDbCollection.insertMany([
-            { value1: 'test2' },
-            { value1: 'test', value2: 3, value3: 'hi' }
-        ]).then(() => { done() })
-    })
-    it('should find a specified doc', function (done) {
-        testDbCollection.find({ 'value3': { '$exists': true } }).then((resultArray) => {
-            console.log(resultArray)
-            should(resultArray[0].value3).equal('hi')
-            done()
-        }).catch(console.log)
-    })
-    it('should close the db Connection', function () {
-        testDb.close()
-    })
-    it('should create an extended class', function () {
-        @smartdata.Collection(testDb)
-        class TestCar extends smartdata.DbDoc<TestCar> {
-            @smartdata.svDb()
-            color: string
-            constructor(optionsArg: {
-                color: string,
-                property2: number
-            }) {
-                super()
-                this.color = optionsArg.color
-            }
-        };
-        let testCarInstance = new TestCar({
-            color: 'red',
-            property2: 2
-        })
 
-        should(testCarInstance.saveableProperties[0]).equal('color')
+// =======================================
-        console.log(TestCar)
+// close the database connection
-        should(testCarInstance.collection).be.instanceof(smartdata.DbCollection)
+// =======================================
-        should(testCarInstance).be.instanceof(smartdata.DbDoc)
+tap.test('should close the database connection', async (tools) => {
-        testCarInstance.save()
+  await testDb.close()
-        it('should get a collection for testCar', function () {
-
-        })
-    })
 })
 
-describe('mongodb', function () {
+tap.start()
-    it('should kill mongodb', function (done) {
-        this.timeout(30000)
-        mongoChildProcess.stdout.on('data', function (data) {
-            if (/dbexit:  rc: 0/.test(data)) {
-                done()
-            }
-        })
-        shelljs.exec('mongod --dbpath=./test/data --shutdown')
-        mongoChildProcess.kill('SIGTERM')
-    })
-})
-
-describe('smartdata with nedb', function () {
-    let testDb: smartdata.Db
-    let testCollection: smartdata.DbCollection<ITestObject1>
-    it('should create a DB with nedb', function () {
-        testDb = new smartdata.Db('any', 'nedb')
-        testDb.connect()
-        testCollection = new smartdata.DbCollection<ITestObject1>('anyName', testDb)
-    })
-
-    it('should insert a doc', function(done){
-        testCollection.insertOne({ value1: 'hi' }).then(() => {done()})
-    })
-
-    it('should find the inserted document', function(done){
-        testCollection.find({ value1: 'hi' }).then(x => {
-            console.log(x)
-            done()
-        })
-    })
-})

ts/index.ts

@@ -1,5 +1,3 @@
-import * as plugins from './smartdata.plugins'
-
 export * from './smartdata.classes.db'
 export * from './smartdata.classes.dbcollection'
 export * from './smartdata.classes.dbdoc'

ts/smartdata.classes.db.ts

@@ -1,82 +1,79 @@
 import * as plugins from './smartdata.plugins'
 import { Objectmap } from 'lik'
 
-import { DbCollection } from './smartdata.classes.dbcollection'
+import { DbTable } from './smartdata.classes.dbcollection'
 
-/**
+import { Connection as dbConnection, ConnectionOptions } from 'rethinkdb'
- * interface - indicates the database type
- */
-export type TDbType = 'mongodb' | 'nedb'
 
 /**
  * interface - indicates the connection status of the db
  */
-export type TConnectionStatus = 'disconnected' | 'connected' | 'failed'
+export type TConnectionStatus = 'initial' | 'disconnected' | 'connected' | 'failed'
 
 export class Db {
-    dbType: TDbType
+  dbName: string
-    dbUrl: string
+  connectionOptions: plugins.rethinkDb.ConnectionOptions
-    db: plugins.mongodb.Db
+  dbConnection: plugins.rethinkDb.Connection
-    status: TConnectionStatus
+  status: TConnectionStatus
-    collections = new Objectmap<DbCollection<any>>()
+  dbTablesMap = new Objectmap<DbTable<any>>()
 
-    constructor(dbUrlArg: string, dbTypeArg: TDbType = 'mongodb') {
+  constructor(connectionOptionsArg: ConnectionOptions) {
-        this.dbType = dbTypeArg
+    this.dbName = connectionOptionsArg.db
-        this.dbUrl = dbUrlArg
+    this.connectionOptions = connectionOptionsArg
+    this.status = 'initial'
+  }
+
+  /**
+   * supply additional SSl options
+   */
+  setSsl (certificateStringArg: string, formatArg: 'base64' | 'clearText') {
+    let certificateString: string
+    if(formatArg = 'base64') {
+      certificateString = plugins.smartstring.base64.decode(certificateStringArg)
+    } else {
+      certificateString = certificateStringArg
     }
-
+    this.connectionOptions['ssl'] = {
-    // basic connection stuff ----------------------------------------------
+      ca: Buffer.from(certificateString)
-
-    /**
-     * connects to the database that was specified during instance creation
-     */
-    connect(): plugins.q.Promise<any> {
-        let done = plugins.q.defer()
-        if (this.dbType === 'mongodb') {
-            plugins.mongodb.MongoClient.connect(this.dbUrl, (err, db) => {
-                if (err) { console.log(err) }
-                plugins.assert.equal(null, err)
-                this.db = db
-                plugins.beautylog.success(`connected to database at ${this.dbUrl}`)
-                done.resolve(this.db)
-            })
-        } else if (this.dbType === 'nedb') {
-            this.db = null
-        }
-        return done.promise
     }
+  }
 
-    /**
+  // basic connection stuff ----------------------------------------------
-     * closes the connection to the databse
-     */
-    close(): plugins.q.Promise<any> {
-        let done = plugins.q.defer()
-        if (this.dbType === 'mongodb') {
-            this.db.close()
-        }
-        plugins.beautylog.ok(`disconnected to database at ${this.dbUrl}`)
-        done.resolve()
-        return done.promise
-    }
 
-    // advanced communication with the database --------------------------------
+  /**
+   * connects to the database that was specified during instance creation
+   */
+  async connect (): Promise<any> {
+    this.dbConnection = await plugins.rethinkDb.connect(this.connectionOptions)
+    this.dbConnection.use(this.dbName)
+    this.status = 'connected'
+    plugins.beautylog.ok(`Connected to database ${this.dbName}`)
+  }
 
-    /**
+  /**
-     * gets a collection by name: string
+   * closes the connection to the databse
-     */
+   */
-    getCollectionByName<T>(nameArg: string): plugins.q.Promise<DbCollection<T>> {
+  async close (): Promise<any> {
-        let done = plugins.q.defer<DbCollection<any>>()
+    await this.dbConnection.close()
-        let resultCollection = this.collections.find((dbCollectionArg) => {
+    this.status = 'disconnected'
-            return dbCollectionArg.name === nameArg
+    plugins.beautylog.ok(`disconnected from database ${this.dbName}`)
-        })
+  }
-        if (resultCollection !== null) {
-            done.resolve(resultCollection)
-        }
-        return done.promise
-    };
 
-    addCollection(dbCollectionArg: DbCollection<any>) {
+  // handle table to class distribution
-        this.collections.add(dbCollectionArg)
+
-    }
+  /**
-    
+   * Gets a table's name and returns smartdata's DbTable class
+   * @param nameArg
+   * @returns DbTable
+   */
+  async getDbTableByName<T>(nameArg: string): Promise<DbTable<T>> {
+    let resultCollection = this.dbTablesMap.find((dbCollectionArg) => {
+      return dbCollectionArg.tableName === nameArg
+    })
+    return resultCollection
+  }
+
+  addTable (dbCollectionArg: DbTable<any>) {
+    this.dbTablesMap.add(dbCollectionArg)
+  }
 }

ts/smartdata.classes.dbcollection.ts

@@ -1,144 +1,119 @@
 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
+  limit?: number
 }
 
 export interface IDocValidation<T> {
-    (doc: T): boolean
+  (doc: T): boolean
 }
 
-export function Collection(db: Db) {
+export function Collection (db: Db) {
-    return function (constructor) {
+  return function (constructor) {
-        constructor['dbCollection'] = new DbCollection(constructor.name, db)
+    constructor[ 'dbCollection' ] = new DbTable(constructor, db)
-    }
+  }
 }
 
-export class DbCollection<T> {
+export class DbTable<T> {
-    /**
+  /**
-     * the collection that is used, defaults to mongodb collection,
+   * the collection that is used, defaults to mongodb collection,
-     * can be nedb datastore (sub api of mongodb)
+   * can be nedb datastore (sub api of mongodb)
-     */
+   */
-    collection: plugins.mongodb.Collection
+  table: plugins.rethinkDb.Table
-    name: string
+  objectValidation: IDocValidation<T> = null
-    db: Db
+  tableName: string
-    objectValidation: IDocValidation<T> = null
+  db: Db
 
+  constructor (collectedClassArg: T & DbDoc<T>, dbArg: Db) {
+    // tell the collection where it belongs
+    this.tableName = collectedClassArg.name
+    this.db = dbArg
 
-    constructor(nameArg: string, dbArg: Db) {
+    // tell the db class about it (important since Db uses different systems under the hood)
-        this.name = nameArg
+    this.db.addTable(this)
-        this.db = dbArg
+  }
-        if (this.db.dbType === 'mongodb') {
+
-            this.collection = dbArg.db.collection(nameArg)
+  async init() {
-        } else {
+    if(!this.table) {
-            this.collection = new plugins.nedb()
+      // 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
+   * adds a validation function that all newly inserted and updated objects have to pass
-     */
+   */
-    addDocValidation(funcArg: IDocValidation<T>) {
+  addDocValidation (funcArg: IDocValidation<T>) {
-        this.objectValidation = funcArg
+    this.objectValidation = funcArg
-    }
+  }
 
-    /**
+  /**
-     * finds an object in the DbCollection
+   * finds an object in the DbCollection
-     */
+   */
-    find(docMatchArg: T | any, optionsArg?: IFindOptions): plugins.q.Promise<T[]> {
+  async find (): Promise<Cursor> {
-        let done = plugins.q.defer<T[]>()
+    await this.init()
-        if (this.db.dbType === 'mongodb') {
+    return await plugins.rethinkDb.table(this.tableName).filter({
-            let findCursor = this.collection.find(docMatchArg)
+      /* TODO: */
-            if (optionsArg) {
+    }).run(this.db.dbConnection)
-                if (optionsArg.limit) { findCursor = findCursor.limit(1) }
+  }
-            }
-            findCursor.toArray((err, docs) => {
-                if (err) {
-                    done.reject(err)
-                    throw err
-                }
-                done.resolve(docs)
-            })
-        } else if (this.db.dbType === 'nedb') {
-            this.collection.find(docMatchArg, (err, docs) => {
-                if (err) {
-                    done.reject(err)
-                    throw err
-                }
-                done.resolve(docs)
-            })
-        }
-        return done.promise
-    }
 
-    /**
+  /**
-     * inserts object into the DbCollection
+   * create an object in the database
-     */
+   */
-    insertOne(docArg: T): plugins.q.Promise<void> {
+  async insert (dbDocArg: T & DbDoc<T>): Promise<WriteResult> {
-        let done = plugins.q.defer<void>()
+    await this.init()
-        this.checkDoc(docArg).then(
+    await this.checkDoc(dbDocArg)
-            () => {
+    return await plugins.rethinkDb.table(this.tableName).insert(
-                if (this.db.dbType === 'mongodb') {
+      dbDocArg.createSavableObject()
-                    this.collection.insertOne(docArg)
+    ).run(this.db.dbConnection)
-                        .then(() => { done.resolve() })
+  }
-                } else if (this.db.dbType === 'nedb') {
-                    this.collection.insert(docArg, (err, newDoc) => {
-                        if (err) {
-                            done.reject(err)
-                            throw err
-                        }
-                        done.resolve()
-                    })
-                }
-            },
-            () => {
-                done.reject(new Error('one the docs did not pass validation'))
-            })
-        return done.promise
-    }
 
-    /**
+  /**
-     * inserts many objects at once into the DbCollection
+   * inserts object into the DbCollection
-     */
+   */
-    insertMany(docArrayArg: T[]): plugins.q.Promise<void> {
+  async update (dbDocArg: T & DbDoc<T>): Promise<WriteResult> {
-        let done = plugins.q.defer<void>()
+    await this.init()
-        let checkDocPromiseArray: plugins.q.Promise<void>[] = []
+    await this.checkDoc(dbDocArg)
-        for (let docArg of docArrayArg) {
+    console.log(this.tableName, dbDocArg.createSavableObject())
-            checkDocPromiseArray.push(this.checkDoc(docArg))
+    return await plugins.rethinkDb.table(this.tableName).update(
-        }
+      dbDocArg.createSavableObject()
-        plugins.q.all(checkDocPromiseArray).then(() => {
+    ).run(this.db.dbConnection)
-            if (this.db.dbType === 'mongodb') {
+  }
-                this.collection.insertMany(docArrayArg)
-                    .then(() => { done.resolve() })
-            } else if (this.db.dbType === 'nedb') {
-                let paramArray = plugins.lodash.concat<any>(docArrayArg, (err, newDoc) => {
-                    if (err) {
-                        done.reject(err)
-                        throw err
-                    }
-                    done.resolve()
-                })
-                this.collection.insert.apply(null, paramArray)
-            }
-        })
-        return done.promise
-    }
 
-    /**
+  /**
-     * checks a Doc for constraints
+   * checks a Doc for constraints
-     */
+   * if this.objectValidation is not set it passes.
-    private checkDoc(docArg: T): plugins.q.Promise<void> {
+   */
-        let done = plugins.q.defer<void>()
+  private checkDoc (docArg: T): Promise<void> {
-        let validationResult = true
+    let done = plugins.smartq.defer<void>()
-        if (this.objectValidation) {
+    let validationResult = true
-            validationResult = this.objectValidation(docArg)
+    if (this.objectValidation) {
-        }
+      validationResult = this.objectValidation(docArg)
-        if (validationResult) {
-            done.resolve()
-        } else {
-            done.reject('validation of object did not pass')
-        }
-        return done.promise
     }
+    if (validationResult) {
+      done.resolve()
+    } else {
+      done.reject('validation of object did not pass')
+    }
+    return done.promise
+  }
+
+  extractKey (writeResult: WriteResult) {
+
+  }
 }

ts/smartdata.classes.dbdoc.ts

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

ts/smartdata.plugins.ts

@@ -1,16 +1,15 @@
-import 'typings-global'
 import * as assert from 'assert'
 import * as beautylog from 'beautylog'
 import * as lodash from 'lodash'
-import * as mongodb from 'mongodb'
+import * as rethinkDb from 'rethinkdb'
-import * as q from 'q'
+import * as smartq from 'smartq'
-let nedb = require('nedb')
+import * as smartstring from 'smartstring'
 
 export {
     assert,
     beautylog,
     lodash,
-    mongodb,
+    smartq,
-    q,
+    rethinkDb,
-    nedb
+    smartstring
 }

tsconfig.json

@@ -1,5 +1,8 @@
 {
     "compilerOptions": {
-        "experimentalDecorators": true
+        "experimentalDecorators": true,
+        "lib": [
+            "es2015"
+        ]
     }
 }

yarn.lock

@@ -0,0 +1,788 @@
+# THIS IS AN AUTOGENERATED FILE. DO NOT EDIT THIS FILE DIRECTLY.
+# yarn lockfile v1
+
+
+"@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.7"
+  resolved "https://registry.yarnpkg.com/@types/fs-extra/-/fs-extra-4.0.7.tgz#02533262386b5a6b9a49797dc82feffdf269140a"
+  dependencies:
+    "@types/node" "*"
+
+"@types/glob@*":
+  version "5.0.34"
+  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.92":
+  version "4.14.92"
+  resolved "https://registry.yarnpkg.com/@types/lodash/-/lodash-4.14.92.tgz#6e3cb0b71a1e12180a47a42a744e856c3ae99a57"
+
+"@types/minimatch@*", "@types/minimatch@3.x.x":
+  version "3.0.3"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
+
+"@types/node@*", "@types/node@^8.0.33", "@types/node@^8.5.7":
+  version "8.5.7"
+  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/node" "*"
+
+"@types/shelljs@^0.7.4":
+  version "0.7.7"
+  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.2"
+  resolved "https://registry.yarnpkg.com/@types/vinyl/-/vinyl-2.0.2.tgz#4f3b8dae8f5828d3800ef709b0cff488ee852de3"
+  dependencies:
+    "@types/node" "*"
+
+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"
+
+ansi-regex@^2.0.0:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
+
+ansi-styles@^2.2.1:
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
+
+argparse@^1.0.7:
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.9.tgz#73d83bc263f86e97f8cc4f6bae1b0e90a7d22c86"
+  dependencies:
+    sprintf-js "~1.0.2"
+
+balanced-match@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
+
+beautycolor@^1.0.7:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/beautycolor/-/beautycolor-1.0.11.tgz#71c5568d5a7ed5c144d3a54f753ad1b08862aea5"
+  dependencies:
+    ansi-256-colors "^1.1.0"
+    typings-global "^1.0.14"
+
+beautylog@^6.1.10:
+  version "6.1.10"
+  resolved "https://registry.yarnpkg.com/beautylog/-/beautylog-6.1.10.tgz#9c27e566937684cb689f9372d98cfa5415d50b72"
+  dependencies:
+    "@types/lodash" "^4.14.55"
+    beautycolor "^1.0.7"
+    figlet "^1.2.0"
+    lodash "^4.17.4"
+    ora "^1.1.0"
+    smartenv "^2.0.0"
+    smartq "^1.1.1"
+    typings-global "^1.0.14"
+
+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"
+  dependencies:
+    balanced-match "^1.0.0"
+    concat-map "0.0.1"
+
+chalk@^1.0.0, chalk@^1.1.1:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-1.1.3.tgz#a8115c55e4a702fe4d150abd3872822a7e09fc98"
+  dependencies:
+    ansi-styles "^2.2.1"
+    escape-string-regexp "^1.0.2"
+    has-ansi "^2.0.0"
+    strip-ansi "^3.0.0"
+    supports-color "^2.0.0"
+
+cli-cursor@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-2.1.0.tgz#b35dac376479facc3e94747d41d0d0f5238ffcb5"
+  dependencies:
+    restore-cursor "^2.0.0"
+
+cli-spinners@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-1.1.0.tgz#f1847b168844d917a671eb9d147e3df497c90d06"
+
+clone-buffer@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clone-buffer/-/clone-buffer-1.0.0.tgz#e3e25b207ac4e701af721e2cb5a16792cac3dc58"
+
+clone-stats@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/clone-stats/-/clone-stats-1.0.0.tgz#b3782dff8bb5474e18b9b6bf0fdfe782f8777680"
+
+clone@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/clone/-/clone-2.1.1.tgz#d217d1e961118e3ac9a4b8bba3285553bf647cdb"
+
+cloneable-readable@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/cloneable-readable/-/cloneable-readable-1.0.0.tgz#a6290d413f217a61232f95e458ff38418cfb0117"
+  dependencies:
+    inherits "^2.0.1"
+    process-nextick-args "^1.0.6"
+    through2 "^2.0.1"
+
+code@^5.1.0:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/code/-/code-5.1.2.tgz#e3310c2078ca7dc0b49b9c39a8b0a7b06bd75efe"
+  dependencies:
+    hoek "5.x.x"
+
+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"
+
+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"
+  dependencies:
+    foreach "^2.0.5"
+    object-keys "^1.0.8"
+
+early@^2.1.1:
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/early/-/early-2.1.1.tgz#841e23254ea5dc54d8afaeee82f5ab65c00ee23c"
+  dependencies:
+    beautycolor "^1.0.7"
+    smartq "^1.1.1"
+    typings-global "^1.0.16"
+
+es-abstract@^1.5.1:
+  version "1.10.0"
+  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"
+    has "^1.0.1"
+    is-callable "^1.1.3"
+    is-regex "^1.0.4"
+
+es-to-primitive@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/es-to-primitive/-/es-to-primitive-1.1.1.tgz#45355248a88979034b6792e19bb81f2b7975dd0d"
+  dependencies:
+    is-callable "^1.1.1"
+    is-date-object "^1.0.1"
+    is-symbol "^1.0.1"
+
+es6-error@^4.0.2:
+  version "4.1.1"
+  resolved "https://registry.yarnpkg.com/es6-error/-/es6-error-4.1.1.tgz#9e3af407459deed47e9a91f9b885a84eb05c561d"
+
+escape-string-regexp@^1.0.2:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
+
+esprima@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.0.tgz#4499eddcd1110e0b218bacf2fa7f7f59f55ca804"
+
+figlet@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/figlet/-/figlet-1.2.0.tgz#6c46537378fab649146b5a6143dda019b430b410"
+
+first-chunk-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/first-chunk-stream/-/first-chunk-stream-2.0.0.tgz#1bdecdb8e083c0664b91945581577a43a9f31d70"
+  dependencies:
+    readable-stream "^2.0.2"
+
+foreach@^2.0.5:
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/foreach/-/foreach-2.0.5.tgz#0bee005018aeb260d0a3af3ae658dd0136ec1b99"
+
+fs-extra@^4.0.2:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-4.0.3.tgz#0d852122e5bc5beb453fb028e9c0c9bf36340c94"
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.0"
+
+fs.realpath@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
+
+function-bind@^1.0.2, function-bind@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
+
+glob@^7.0.0, glob@^7.1.2:
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
+  dependencies:
+    fs.realpath "^1.0.0"
+    inflight "^1.0.4"
+    inherits "2"
+    minimatch "^3.0.4"
+    once "^1.3.0"
+    path-is-absolute "^1.0.0"
+
+graceful-fs@^4.1.2, graceful-fs@^4.1.6:
+  version "4.1.11"
+  resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.1.11.tgz#0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"
+
+has-ansi@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/has-ansi/-/has-ansi-2.0.0.tgz#34f5049ce1ecdf2b0649af3ef24e45ed35416d91"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+has@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+  dependencies:
+    function-bind "^1.0.2"
+
+hoek@5.x.x:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/hoek/-/hoek-5.0.2.tgz#d2f2c95d36fe7189cf8aa8c237abc1950eca1378"
+
+home@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/home/-/home-1.0.1.tgz#96a423ceb49b98378ff5ef3ceae059a557f9dd35"
+  dependencies:
+    os-homedir "^1.0.1"
+
+inflight@^1.0.4:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/inflight/-/inflight-1.0.6.tgz#49bd6331d7d02d0c09bc910a1075ba8165b56df9"
+  dependencies:
+    once "^1.3.0"
+    wrappy "1"
+
+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.1.0"
+  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.1.0.tgz#7ed1b1410c6a0e0f78cf95d3b8440c63f78b8614"
+
+is-buffer@^1.1.5:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
+
+is-callable@^1.1.1, is-callable@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.3.tgz#86eb75392805ddc33af71c92a0eedf74ee7604b2"
+
+is-date-object@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.1.tgz#9aa20eb6aeebbff77fbd33e74ca01b33581d3a16"
+
+is-number@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
+  dependencies:
+    kind-of "^3.0.2"
+
+is-regex@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.4.tgz#5517489b547091b0930e095654ced25ee97e9491"
+  dependencies:
+    has "^1.0.1"
+
+is-symbol@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.1.tgz#3cc59f00025194b6ab2e38dbae6689256b660572"
+
+is-utf8@^0.2.0, is-utf8@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
+
+isarray@~1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
+
+js-base64@^2.3.2:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/js-base64/-/js-base64-2.4.0.tgz#9e566fee624751a1d720c966cd6226d29d4025aa"
+
+js-yaml@^3.10.0:
+  version "3.10.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.10.0.tgz#2e78441646bd4682e963f22b6e92823c309c62dc"
+  dependencies:
+    argparse "^1.0.7"
+    esprima "^4.0.0"
+
+jsonfile@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
+  optionalDependencies:
+    graceful-fs "^4.1.6"
+
+kind-of@^3.0.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-3.2.2.tgz#31ea21a734bab9bbb0f32466d893aea51e4a3c64"
+  dependencies:
+    is-buffer "^1.1.5"
+
+kind-of@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-4.0.0.tgz#20813df3d712928b207378691a45066fae72dd57"
+  dependencies:
+    is-buffer "^1.1.5"
+
+leakage@^0.3.0:
+  version "0.3.0"
+  resolved "https://registry.yarnpkg.com/leakage/-/leakage-0.3.0.tgz#15d698abdc76bbc6439601f4f3020e77e2d50c39"
+  dependencies:
+    es6-error "^4.0.2"
+    left-pad "^1.1.3"
+    memwatch-next "^0.3.0"
+    minimist "^1.2.0"
+    pretty-bytes "^4.0.2"
+
+left-pad@^1.1.3:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/left-pad/-/left-pad-1.2.0.tgz#d30a73c6b8201d8f7d8e7956ba9616087a68e0ee"
+
+lik@^2.0.2:
+  version "2.0.2"
+  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"
+    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"
+
+log-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-1.0.2.tgz#376ff7b58ea3086a0f09facc74617eca501e1a18"
+  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"
+  dependencies:
+    bindings "^1.2.1"
+    nan "^2.3.2"
+
+mimic-fn@^1.0.0:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-1.1.0.tgz#e667783d92e89dbd342818b5230b9d62a672ad18"
+
+minimatch@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
+  dependencies:
+    brace-expansion "^1.1.7"
+
+minimist@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.0.tgz#a35008b20f41383eec1fb914f4cd5df79a264284"
+
+nan@^2.3.2:
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/nan/-/nan-2.8.0.tgz#ed715f3fe9de02b57a5e6252d90a96675e1f085a"
+
+normalize-newline@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/normalize-newline/-/normalize-newline-3.0.0.tgz#1cbea804aba436001f83938ab21ec039d69ae9d3"
+
+object-keys@^1.0.8:
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/object-keys/-/object-keys-1.0.11.tgz#c54601778ad560f1142ce0e01bcca8b56d13426d"
+
+object.getownpropertydescriptors@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.0.3.tgz#8758c846f5b407adab0f236e0986f14b051caa16"
+  dependencies:
+    define-properties "^1.1.2"
+    es-abstract "^1.5.1"
+
+once@^1.3.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
+  dependencies:
+    wrappy "1"
+
+onetime@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/onetime/-/onetime-2.0.1.tgz#067428230fd67443b2794b22bba528b6867962d4"
+  dependencies:
+    mimic-fn "^1.0.0"
+
+ora@^1.1.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-1.3.0.tgz#80078dd2b92a934af66a3ad72a5b910694ede51a"
+  dependencies:
+    chalk "^1.1.1"
+    cli-cursor "^2.1.0"
+    cli-spinners "^1.0.0"
+    log-symbols "^1.0.2"
+
+os-homedir@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
+
+path-is-absolute@^1.0.0:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"
+
+path-parse@^1.0.5:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.5.tgz#3c1adf871ea9cd6c9431b6ea2bd74a0ff055c4c1"
+
+pify@^2.3.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/pify/-/pify-2.3.0.tgz#ed141a6ac043a849ea588498e7dca8b15330e90c"
+
+pretty-bytes@^4.0.2:
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-4.0.2.tgz#b2bf82e7350d65c6c33aa95aaa5a4f6327f61cd9"
+
+process-nextick-args@^1.0.6, process-nextick-args@~1.0.6:
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-1.0.7.tgz#150e20b756590ad3f91093f25a4f2ad8bff30ba3"
+
+qenv@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/qenv/-/qenv-1.1.7.tgz#d03f8bf8fe37494cf08d0919fe765dca84d9afae"
+  dependencies:
+    lodash "^4.17.4"
+    smartfile "^4.2.11"
+    typings-global "^1.0.16"
+
+randomatic@^1.1.7:
+  version "1.1.7"
+  resolved "https://registry.yarnpkg.com/randomatic/-/randomatic-1.1.7.tgz#c7abe9cc8b87c0baa876b19fde83fd464797e38c"
+  dependencies:
+    is-number "^3.0.0"
+    kind-of "^4.0.0"
+
+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"
+  dependencies:
+    core-util-is "~1.0.0"
+    inherits "~2.0.3"
+    isarray "~1.0.0"
+    process-nextick-args "~1.0.6"
+    safe-buffer "~5.1.1"
+    string_decoder "~1.0.3"
+    util-deprecate "~1.0.1"
+
+rechoir@^0.6.2:
+  version "0.6.2"
+  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
+  dependencies:
+    resolve "^1.1.6"
+
+reflect-metadata@^0.1.2:
+  version "0.1.10"
+  resolved "https://registry.yarnpkg.com/reflect-metadata/-/reflect-metadata-0.1.10.tgz#b4f83704416acad89988c9b15635d47e03b9344a"
+
+remove-trailing-separator@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz#c24bce2a283adad5bc3f58e0d48249b92379d8ef"
+
+replace-ext@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.0.tgz#de63128373fcbf7c3ccfa4de5a480c45a67958eb"
+
+require-reload@0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/require-reload/-/require-reload-0.2.2.tgz#29a7591846caf91b6e8a3cda991683f95f8d7d42"
+
+resolve@^1.1.6:
+  version "1.5.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.5.0.tgz#1f09acce796c9a762579f31b2c1cc4c3cddf9f36"
+  dependencies:
+    path-parse "^1.0.5"
+
+restore-cursor@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-2.0.0.tgz#9f7ee287f82fd326d4fd162923d62129eee0dfaf"
+  dependencies:
+    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"
+
+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"
+
+shelljs@^0.7.8:
+  version "0.7.8"
+  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.7.8.tgz#decbcf874b0d1e5fb72e14b164a9683048e9acb3"
+  dependencies:
+    glob "^7.0.0"
+    interpret "^1.0.0"
+    rechoir "^0.6.2"
+
+signal-exit@^3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz#b5fdc08f1287ea1178628e415e25132b73646c6d"
+
+smartchai@^1.0.3:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/smartchai/-/smartchai-1.0.8.tgz#a074836f4ddd4b98c50f1e7ae9e8e8ad9f6f1902"
+  dependencies:
+    "@types/code" "^4.0.3"
+    code "^5.1.0"
+    typings-global "^1.0.20"
+
+smartdelay@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/smartdelay/-/smartdelay-1.0.4.tgz#791c1a4ee6770494064c10b1d2d2b8e6f3105b82"
+  dependencies:
+    smartq "^1.1.1"
+    typings-global "^1.0.16"
+
+smartenv@^2.0.0:
+  version "2.0.6"
+  resolved "https://registry.yarnpkg.com/smartenv/-/smartenv-2.0.6.tgz#b38c679b0c151b9af548f68c3a072c29d1417e8d"
+  dependencies:
+    lodash "^4.17.4"
+    smartq "^1.1.1"
+    typings-global "^1.0.14"
+
+smartfile@^4.2.11:
+  version "4.2.26"
+  resolved "https://registry.yarnpkg.com/smartfile/-/smartfile-4.2.26.tgz#800f08b1089e153b7fd8e0ba165da465a071d407"
+  dependencies:
+    "@types/fs-extra" "4.x.x"
+    "@types/vinyl" "^2.0.1"
+    fs-extra "^4.0.2"
+    glob "^7.1.2"
+    js-yaml "^3.10.0"
+    require-reload "0.2.2"
+    smartpath "^3.2.8"
+    smartq "^1.1.6"
+    smartrequest "^1.0.6"
+    typings-global "^1.0.20"
+    vinyl-file "^3.0.0"
+
+smartpath@^3.2.8:
+  version "3.2.8"
+  resolved "https://registry.yarnpkg.com/smartpath/-/smartpath-3.2.8.tgz#4834bd3a8bae2295baacadba23c87a501952f940"
+  dependencies:
+    home "^1.0.1"
+    typings-global "^1.0.14"
+
+smartq@^1.1.1, smartq@^1.1.6:
+  version "1.1.6"
+  resolved "https://registry.yarnpkg.com/smartq/-/smartq-1.1.6.tgz#0c1ff4336d95e95b4f1fdd8ccd7e2c5a323b8412"
+  dependencies:
+    typings-global "^1.0.19"
+    util.promisify "^1.0.0"
+
+smartrequest@^1.0.6:
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/smartrequest/-/smartrequest-1.0.8.tgz#9af18dde34efa7d43b4ecfc92ccb157a98eda3b1"
+  dependencies:
+    smartq "^1.1.1"
+
+smartstring@^2.0.28:
+  version "2.0.28"
+  resolved "https://registry.yarnpkg.com/smartstring/-/smartstring-2.0.28.tgz#384b808dc3780eff0031ce7925c1b1668abbcad5"
+  dependencies:
+    crypto-random-string "^1.0.0"
+    js-base64 "^2.3.2"
+    normalize-newline "^3.0.0"
+    randomatic "^1.1.7"
+    strip-indent "^2.0.0"
+    typings-global "^1.0.20"
+
+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.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.0.3.tgz#0fc67d7c141825de94282dd536bec6b9bce860ab"
+  dependencies:
+    safe-buffer "~5.1.0"
+
+strip-ansi@^3.0.0:
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-3.0.1.tgz#6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"
+  dependencies:
+    ansi-regex "^2.0.0"
+
+strip-bom-buf@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom-buf/-/strip-bom-buf-1.0.0.tgz#1cb45aaf57530f4caf86c7f75179d2c9a51dd572"
+  dependencies:
+    is-utf8 "^0.2.1"
+
+strip-bom-stream@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom-stream/-/strip-bom-stream-2.0.0.tgz#f87db5ef2613f6968aa545abfe1ec728b6a829ca"
+  dependencies:
+    first-chunk-stream "^2.0.0"
+    strip-bom "^2.0.0"
+
+strip-bom@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
+  dependencies:
+    is-utf8 "^0.2.0"
+
+strip-indent@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-2.0.0.tgz#5ef8db295d01e6ed6cbf7aab96998d7822527b68"
+
+supports-color@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7"
+
+symbol-tree@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.2.tgz#ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"
+
+tapbundle@^1.1.1:
+  version "1.1.8"
+  resolved "https://registry.yarnpkg.com/tapbundle/-/tapbundle-1.1.8.tgz#e08aee0e100a830d8a26a583a85d37ce53312e02"
+  dependencies:
+    "@types/node" "^8.0.33"
+    early "^2.1.1"
+    leakage "^0.3.0"
+    smartchai "^1.0.3"
+    smartdelay "^1.0.3"
+    smartq "^1.1.1"
+    typings-global "^1.0.19"
+
+through2@^2.0.1:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.3.tgz#0004569b37c7c74ba39c43f3ced78d1ad94140be"
+  dependencies:
+    readable-stream "^2.1.5"
+    xtend "~4.0.1"
+
+typings-global@^1.0.14, typings-global@^1.0.16, typings-global@^1.0.19, typings-global@^1.0.20:
+  version "1.0.28"
+  resolved "https://registry.yarnpkg.com/typings-global/-/typings-global-1.0.28.tgz#e28cc965476564cbc00e438739e0aa0735d323d4"
+
+universalify@^0.1.0:
+  version "0.1.1"
+  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.1.tgz#fa71badd4437af4c148841e3b3b165f9e9e590b7"
+
+util-deprecate@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
+
+util.promisify@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.0.tgz#440f7165a459c9a16dc145eb8e72f35687097030"
+  dependencies:
+    define-properties "^1.1.2"
+    object.getownpropertydescriptors "^2.0.3"
+
+vinyl-file@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/vinyl-file/-/vinyl-file-3.0.0.tgz#b104d9e4409ffa325faadd520642d0a3b488b365"
+  dependencies:
+    graceful-fs "^4.1.2"
+    pify "^2.3.0"
+    strip-bom-buf "^1.0.0"
+    strip-bom-stream "^2.0.0"
+    vinyl "^2.0.1"
+
+vinyl@^2.0.1:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.1.0.tgz#021f9c2cf951d6b939943c89eb5ee5add4fd924c"
+  dependencies:
+    clone "^2.1.1"
+    clone-buffer "^1.0.0"
+    clone-stats "^1.0.0"
+    cloneable-readable "^1.0.0"
+    remove-trailing-separator "^1.0.1"
+    replace-ext "^1.0.0"
+
+word-wrap@^1.0.3:
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
+
+wrappy@1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
+
+xtend@~4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.1.tgz#a5c6d532be656e23db820efb943a1f04998d63af"