3.1.6

.gitlab-ci.yml

@@ -26,6 +26,7 @@ mirror:
 snyk:
   stage: security
   script:
+    - npmci npm prepare
     - npmci command npm install -g snyk
     - npmci command npm install --ignore-scripts
     - npmci command snyk test
@@ -33,24 +34,39 @@ snyk:
   - docker
   - notpriv
 
+sast:
+  stage: security
+  image: registry.gitlab.com/hosttoday/ht-docker-dbase:npmci
+  variables:
+    DOCKER_DRIVER: overlay2
+  allow_failure: true
+  services:
+    - docker:stable-dind
+  script:
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command npm run build
+    - export SP_VERSION=$(echo "$CI_SERVER_VERSION" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+    - docker run
+        --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
+        --volume "$PWD:/code"
+        --volume /var/run/docker.sock:/var/run/docker.sock
+        "registry.gitlab.com/gitlab-org/security-products/sast:$SP_VERSION" /app/bin/run /code
+  artifacts:
+    reports:
+      sast: gl-sast-report.json
+  tags:
+  - docker
+  - priv
+
 # ====================
 # test stage
 # ====================
-testLEGACY:
-  stage: test
-  script:
-  - npmci node install legacy
-  - npmci npm install
-  - npmci npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - docker
-  - notpriv
-  allow_failure: true
 
 testLTS:
   stage: test
   script:
+  - npmci npm prepare
   - npmci node install lts
   - npmci npm install
   - npmci npm test
@@ -62,6 +78,7 @@ testLTS:
 testSTABLE:
   stage: test
   script:
+  - npmci npm prepare
   - npmci node install stable
   - npmci npm install
   - npmci npm test
@@ -117,8 +134,10 @@ pages:
   image: hosttoday/ht-docker-node:npmci
   stage: metadata
   script:
-    - npmci command npm install -g npmpage
-    - npmci command npmpage
+    - npmci command npm install -g typedoc typescript
+    - npmci npm prepare
+    - npmci npm install
+    - npmci command typedoc --module "commonjs" --target "ES2016" --out public/ ts/
   tags:
     - docker
     - notpriv
@@ -129,13 +148,3 @@ pages:
     paths:
     - public
   allow_failure: true
-
-windowsCompatibility:
-  image: stefanscherer/node-windows:10-build-tools
-  stage: metadata
-  script:
-  - npm install & npm test
-  coverage: /\d+.?\d+?\%\s*coverage/
-  tags:
-  - windows
-  allow_failure: true

README.md

@@ -37,11 +37,11 @@ This is why we started smartdata.
 
 How RethinkDB's terms map to the ones of smartdata:
 
-| RethinkDB term | smartdata class   |
-| -------------- | ----------------- |
-| Database       | smartdata.Db      |
-| Table          | smartdata.DbTable |
-| Document       | smartdata.DbDoc   |
+| MongoDb term | smartdata class               |
+| ------------ | ----------------------------- |
+| Database     | smartdata.SmartdataDb         |
+| Collection   | smartdata.SmartdataCollection |
+| Document     | smartdata.SmartadataDoc       |
 
 ### class Db
 
@@ -50,18 +50,13 @@ represents a Database. Naturally it has .connect() etc. methods on it.
 ```typescript
 import * as smartdata from 'smartdata';
 
-let myRethinkDb1 = new smartdata.Db({
-  db: 'test',
-  host: 'https://some',
-  user: 'testuser',
-  password: 'testpass',
-  port: 1234
+const smartdataDb = new smartdata.SmartdataDb({
+  mongoDbUrl: '//someurl',
+  mongoDbName: 'myDatabase',
+  mongoDbPass: 'mypassword'
 });
 
-// in case you need to support a proprietory ssl cert (e.g. compose.com):
-myRethinkDb1.setSsl(process.env.RDB_CERT, 'base64');
-
-myDb1.connect();
+smartdataDb.connect();
 ```
 
 ### class DbCollection
@@ -74,8 +69,8 @@ So to get to get access to a specific collection you document
 ```typescript
 // continues from the block before...
 
-@smartdata.Table(myRethinkDb1)
-class MyObject extends smartdata.DbDoc<myObject> {
+@smartdata.Collection(smartdataDb)
+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()

dist/index.d.ts

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

dist/index.js

@@ -1,9 +0,0 @@
-"use strict";
-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.dbtable"));
-__export(require("./smartdata.classes.dbdoc"));
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLDRDQUF1QztBQUN2QyxpREFBNEM7QUFDNUMsK0NBQTBDIn0=

dist/smartdata.classes.db.d.ts

@@ -1,36 +0,0 @@
-import * as plugins from "./smartdata.plugins";
-import { Objectmap } from "lik";
-import { DbTable } from "./smartdata.classes.dbtable";
-import { ConnectionOptions as IConnectionOptions } from "rethinkdb";
-export { IConnectionOptions };
-/**
- * interface - indicates the connection status of the db
- */
-export declare type TConnectionStatus = "initial" | "disconnected" | "connected" | "failed";
-export declare class Db {
-    dbName: string;
-    connectionOptions: plugins.rethinkDb.ConnectionOptions;
-    dbConnection: plugins.rethinkDb.Connection;
-    status: TConnectionStatus;
-    dbTablesMap: Objectmap<DbTable<any>>;
-    constructor(connectionOptionsArg: IConnectionOptions);
-    /**
-     * supply additional SSl options needed to connect to certain Rethink DB servers (e.g. compose.io)
-     */
-    setSsl(certificateStringArg: string, formatArg: "base64" | "clearText"): void;
-    /**
-     * connects to the database that was specified during instance creation
-     */
-    connect(): Promise<any>;
-    /**
-     * closes the connection to the databse
-     */
-    close(): Promise<any>;
-    addTable(dbTableArg: DbTable<any>): void;
-    /**
-     * Gets a table's name and returns smartdata's DbTable class
-     * @param nameArg
-     * @returns DbTable
-     */
-    getDbTableByName<T>(nameArg: string): Promise<DbTable<T>>;
-}

dist/smartdata.classes.db.js

@@ -1,76 +0,0 @@
-"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(connectionOptionsArg) {
-        this.dbTablesMap = new lik_1.Objectmap();
-        this.dbName = connectionOptionsArg.db;
-        this.connectionOptions = connectionOptionsArg;
-        this.status = "initial";
-    }
-    /**
-     * supply additional SSl options needed to connect to certain Rethink DB servers (e.g. compose.io)
-     */
-    setSsl(certificateStringArg, 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() {
-        return __awaiter(this, void 0, void 0, function* () {
-            this.dbConnection = yield plugins.rethinkDb.connect(this.connectionOptions);
-            this.dbConnection.use(this.dbName);
-            this.status = "connected";
-            plugins.beautylog.ok(`Connected to database ${this.dbName}`);
-        });
-    }
-    /**
-     * closes the connection to the databse
-     */
-    close() {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.dbConnection.close();
-            this.status = "disconnected";
-            plugins.beautylog.ok(`disconnected from database ${this.dbName}`);
-        });
-    }
-    // handle table to class distribution
-    addTable(dbTableArg) {
-        this.dbTablesMap.add(dbTableArg);
-    }
-    /**
-     * Gets a table's name and returns smartdata's DbTable class
-     * @param nameArg
-     * @returns DbTable
-     */
-    getDbTableByName(nameArg) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let resultCollection = this.dbTablesMap.find(dbTableArg => {
-                return dbTableArg.tableName === nameArg;
-            });
-            return resultCollection;
-        });
-    }
-}
-exports.Db = Db;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLmNsYXNzZXMuZGIuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGRhdGEuY2xhc3Nlcy5kYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBQUEsK0NBQStDO0FBQy9DLDZCQUFnQztBQW1CaEM7SUFPRSxZQUFZLG9CQUF3QztRQUZwRCxnQkFBVyxHQUFHLElBQUksZUFBUyxFQUFnQixDQUFDO1FBRzFDLElBQUksQ0FBQyxNQUFNLEdBQUcsb0JBQW9CLENBQUMsRUFBRSxDQUFDO1FBQ3RDLElBQUksQ0FBQyxpQkFBaUIsR0FBRyxvQkFBb0IsQ0FBQztRQUM5QyxJQUFJLENBQUMsTUFBTSxHQUFHLFNBQVMsQ0FBQztJQUMxQixDQUFDO0lBRUQ7O09BRUc7SUFDSCxNQUFNLENBQUMsb0JBQTRCLEVBQUUsU0FBaUM7UUFDcEUsSUFBSSxpQkFBeUIsQ0FBQztRQUM5QixFQUFFLENBQUMsQ0FBQyxDQUFDLFNBQVMsR0FBRyxRQUFRLENBQUMsQ0FBQyxDQUFDLENBQUM7WUFDM0IsaUJBQWlCLEdBQUcsT0FBTyxDQUFDLFdBQVcsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUNuRCxvQkFBb0IsQ0FDckIsQ0FBQztRQUNKLENBQUM7UUFBQyxJQUFJLENBQUMsQ0FBQztZQUNOLGlCQUFpQixHQUFHLG9CQUFvQixDQUFDO1FBQzNDLENBQUM7UUFDRCxJQUFJLENBQUMsaUJBQWlCLENBQUMsS0FBSyxDQUFDLEdBQUc7WUFDOUIsRUFBRSxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUM7U0FDbkMsQ0FBQztJQUNKLENBQUM7SUFFRCx3RUFBd0U7SUFFeEU7O09BRUc7SUFDRyxPQUFPOztZQUNYLElBQUksQ0FBQyxZQUFZLEdBQUcsTUFBTSxPQUFPLENBQUMsU0FBUyxDQUFDLE9BQU8sQ0FBQyxJQUFJLENBQUMsaUJBQWlCLENBQUMsQ0FBQztZQUM1RSxJQUFJLENBQUMsWUFBWSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTSxDQUFDLENBQUM7WUFDbkMsSUFBSSxDQUFDLE1BQU0sR0FBRyxXQUFXLENBQUM7WUFDMUIsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMseUJBQXlCLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQy9ELENBQUM7S0FBQTtJQUVEOztPQUVHO0lBQ0csS0FBSzs7WUFDVCxNQUFNLElBQUksQ0FBQyxZQUFZLENBQUMsS0FBSyxFQUFFLENBQUM7WUFDaEMsSUFBSSxDQUFDLE1BQU0sR0FBRyxjQUFjLENBQUM7WUFDN0IsT0FBTyxDQUFDLFNBQVMsQ0FBQyxFQUFFLENBQUMsOEJBQThCLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDO1FBQ3BFLENBQUM7S0FBQTtJQUVELHFDQUFxQztJQUVyQyxRQUFRLENBQUMsVUFBd0I7UUFDL0IsSUFBSSxDQUFDLFdBQVcsQ0FBQyxHQUFHLENBQUMsVUFBVSxDQUFDLENBQUM7SUFDbkMsQ0FBQztJQUVEOzs7O09BSUc7SUFDRyxnQkFBZ0IsQ0FBSSxPQUFlOztZQUN2QyxJQUFJLGdCQUFnQixHQUFHLElBQUksQ0FBQyxXQUFXLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxFQUFFO2dCQUN4RCxNQUFNLENBQUMsVUFBVSxDQUFDLFNBQVMsS0FBSyxPQUFPLENBQUM7WUFDMUMsQ0FBQyxDQUFDLENBQUM7WUFDSCxNQUFNLENBQUMsZ0JBQWdCLENBQUM7UUFDMUIsQ0FBQztLQUFBO0NBQ0Y7QUFwRUQsZ0JBb0VDIn0=

dist/smartdata.classes.dbdoc.d.ts

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

dist/smartdata.classes.dbdoc.js

@@ -1,109 +0,0 @@
-"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
- */
-function svDb() {
-    return (target, key) => {
-        console.log("called sva");
-        if (!target.saveableProperties) {
-            target.saveableProperties = [];
-        }
-        target.saveableProperties.push(key);
-    };
-}
-exports.svDb = svDb;
-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["dbTable"];
-    }
-    static getInstances(filterArg) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let self = this; // fool typesystem
-            let referenceTable = self.dbTable;
-            const foundDocs = yield referenceTable.find(filterArg);
-            const returnArray = [];
-            for (let item of foundDocs) {
-                let newInstance = new this();
-                for (let key in item) {
-                    if (key !== 'id') {
-                        newInstance[key] = item[key];
-                    }
-                }
-                returnArray.push(newInstance);
-            }
-            return returnArray;
-        });
-    }
-    static getInstance(filterArg) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let result = yield this.getInstances(filterArg);
-            if (result && result.length > 0) {
-                return result[0];
-            }
-        });
-    }
-    /**
-     * saves this instance but not any connected items
-     * may lead to data inconsistencies, but is faster
-     */
-    save() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let self = this;
-            switch (this.creationStatus) {
-                case "db":
-                    yield this.collection.update(self);
-                    break;
-                case "new":
-                    let writeResult = yield this.collection.insert(self);
-                    this.creationStatus = "db";
-                    break;
-                default:
-                    console.error("neither new nor in db?");
-            }
-        });
-    }
-    /**
-     * also store any referenced objects to DB
-     * better for data consistency
-     */
-    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,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLmNsYXNzZXMuZGJkb2MuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGRhdGEuY2xhc3Nlcy5kYmRvYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7O0FBRUEsNkJBQWdDO0FBT2hDOztHQUVHO0FBQ0g7SUFDRSxNQUFNLENBQUMsQ0FBQyxNQUFrQixFQUFFLEdBQVcsRUFBRSxFQUFFO1FBQ3pDLE9BQU8sQ0FBQyxHQUFHLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDMUIsRUFBRSxDQUFDLENBQUMsQ0FBQyxNQUFNLENBQUMsa0JBQWtCLENBQUMsQ0FBQyxDQUFDO1lBQy9CLE1BQU0sQ0FBQyxrQkFBa0IsR0FBRyxFQUFFLENBQUM7UUFDakMsQ0FBQztRQUNELE1BQU0sQ0FBQyxrQkFBa0IsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLENBQUM7SUFDdEMsQ0FBQyxDQUFDO0FBQ0osQ0FBQztBQVJELG9CQVFDO0FBRUQ7SUEwQkU7O09BRUc7SUFDSDtRQXZCQTs7V0FFRztRQUNILG1CQUFjLEdBQWlCLEtBQUssQ0FBQztRQXFCbkMsSUFBSSxDQUFDLElBQUksR0FBRyxJQUFJLENBQUMsV0FBVyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1FBQ3JDLElBQUksQ0FBQyxVQUFVLEdBQUcsSUFBSSxDQUFDLFdBQVcsQ0FBQyxTQUFTLENBQUMsQ0FBQztJQUNoRCxDQUFDO0lBRUQsTUFBTSxDQUFPLFlBQVksQ0FBSSxTQUFTOztZQUNwQyxJQUFJLElBQUksR0FBUSxJQUFJLENBQUMsQ0FBQyxrQkFBa0I7WUFDeEMsSUFBSSxjQUFjLEdBQWUsSUFBSSxDQUFDLE9BQU8sQ0FBQztZQUM5QyxNQUFNLFNBQVMsR0FBRyxNQUFNLGNBQWMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUM7WUFDdkQsTUFBTSxXQUFXLEdBQUcsRUFBRSxDQUFDO1lBQ3ZCLEdBQUcsQ0FBQyxDQUFDLElBQUksSUFBSSxJQUFJLFNBQVMs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

dist/smartdata.classes.dbtable.d.ts

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

dist/smartdata.classes.dbtable.js

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

dist/smartdata.plugins.d.ts

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

dist/smartdata.plugins.js

@@ -1,15 +0,0 @@
-"use strict";
-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 rethinkDb = require("rethinkdb");
-exports.rethinkDb = rethinkDb;
-const smartq = require("smartq");
-exports.smartq = smartq;
-const smartstring = require("smartstring");
-exports.smartstring = smartstring;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic21hcnRkYXRhLnBsdWdpbnMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi90cy9zbWFydGRhdGEucGx1Z2lucy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGlDQUFpQztBQU94Qix3QkFBTTtBQU5mLHVDQUF1QztBQU10Qiw4QkFBUztBQUwxQixpQ0FBaUM7QUFLTCx3QkFBTTtBQUpsQyx1Q0FBdUM7QUFJSyw4QkFBUztBQUhyRCxpQ0FBaUM7QUFHRyx3QkFBTTtBQUYxQywyQ0FBMkM7QUFFWSxrQ0FBVyJ9

docs/index.md

@@ -1,29 +0,0 @@
-# smartdata
-
-do more with data
-
-## Availabililty
-
-[![npm](https://pushrocks.gitlab.io/assets/repo-button-npm.svg)](https://www.npmjs.com/package/smartdata)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-git.svg)](https://GitLab.com/pushrocks/smartdata)
-[![git](https://pushrocks.gitlab.io/assets/repo-button-mirror.svg)](https://github.com/pushrocks/smartdata)
-[![docs](https://pushrocks.gitlab.io/assets/repo-button-docs.svg)](https://pushrocks.gitlab.io/smartdata/)
-
-## Status for master
-
-[![build status](https://GitLab.com/pushrocks/smartdata/badges/master/build.svg)](https://GitLab.com/pushrocks/smartdata/commits/master)
-[![coverage report](https://GitLab.com/pushrocks/smartdata/badges/master/coverage.svg)](https://GitLab.com/pushrocks/smartdata/commits/master)
-[![npm downloads per month](https://img.shields.io/npm/dm/smartdata.svg)](https://www.npmjs.com/package/smartdata)
-[![Dependency Status](https://david-dm.org/pushrocks/smartdata.svg)](https://david-dm.org/pushrocks/smartdata)
-[![bitHound Dependencies](https://www.bithound.io/github/pushrocks/smartdata/badges/dependencies.svg)](https://www.bithound.io/github/pushrocks/smartdata/master/dependencies/npm)
-[![bitHound Code](https://www.bithound.io/github/pushrocks/smartdata/badges/code.svg)](https://www.bithound.io/github/pushrocks/smartdata)
-[![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/)
-
-For further information read the linked docs at the top of this README.
-
-> MIT licensed | **©** [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)

npmextra.json

@@ -5,14 +5,8 @@
     "dockerSock": false
   },
   "npmci": {
-    "npmGlobalTools": [
-      "npmts"
-    ],
-    "npmAccessLevel": "public"
-  },
-  "npmts": {
-    "testConfig": {
-      "parallel": false
-    }
+    "npmGlobalTools": [],
+    "npmAccessLevel": "public",
+    "npmRegistryUrl": "registry.npmjs.org"
   }
 }

package.json

@@ -1,14 +1,14 @@
 {
   "name": "@pushrocks/smartdata",
-  "version": "3.0.1",
+  "version": "3.1.6",
   "private": false,
   "description": "do more with data",
   "main": "dist/index.js",
   "typings": "dist/index.d.ts",
   "scripts": {
-    "test": "(npmts)",
+    "test": "(tstest test/)",
     "testLocal": "(npmdocker)",
-    "build": "echo \"Not needed for now\""
+    "build": "(tsbuild)"
   },
   "repository": {
     "type": "git",
@@ -21,26 +21,26 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartdata#README",
   "dependencies": {
-    "@pushrocks/smartlog": "^1.0.6",
+    "@pushrocks/lik": "^3.0.4",
+    "@pushrocks/smartlog": "^2.0.9",
     "@pushrocks/smartpromise": "^2.0.5",
-    "@types/lodash": "^4.14.110",
-    "@types/mongodb": "^3.1.1",
-    "lik": "^2.0.5",
-    "lodash": "^4.17.10",
-    "mongodb": "^3.1.1",
-    "runtime-type-checks": "0.0.4",
-    "smartstring": "^2.0.28"
+    "@pushrocks/smartstring": "^3.0.5",
+    "@types/lodash": "^4.14.119",
+    "@types/mongodb": "^3.1.18",
+    "lodash": "^4.17.11",
+    "mongodb": "^3.1.10",
+    "runtime-type-checks": "0.0.4"
   },
   "devDependencies": {
-    "@types/node": "^10.5.2",
-    "@types/shelljs": "^0.8.0",
-    "qenv": "^1.1.7",
-    "shelljs": "^0.8.2",
-    "tapbundle": "^2.0.2"
-  },
-  "config": {
-    "commitizen": {
-      "path": "./node_modules/cz-conventional-changelog"
-    }
+    "@gitzone/tsbuild": "^2.1.4",
+    "@gitzone/tstest": "^1.0.18",
+    "@pushrocks/qenv": "^3.0.2",
+    "@pushrocks/tapbundle": "^3.0.7",
+    "@types/node": "^10.12.18",
+    "@types/shortid": "0.0.29",
+    "mongodb-memory-server": "^2.9.1",
+    "shortid": "^2.2.14",
+    "tslint": "^5.12.0",
+    "tslint-config-prettier": "^1.17.0"
   }
 }

qenv.yml

@@ -1,4 +1,4 @@
-vars:
+required:
   - MONGO_URL
   - MONGO_DBNAME
   - MONGO_PASS

test/test.ts

@@ -1,12 +1,13 @@
-import { tap, expect } from 'tapbundle';
+import { tap, expect } from '@pushrocks/tapbundle';
 import * as smartpromise from '@pushrocks/smartpromise';
-import { Qenv } from 'qenv';
+import { Qenv } from '@pushrocks/qenv';
 
 let testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit/');
 
 // the tested module
 import * as smartdata from '../ts/index';
 import { smartstring } from '../ts/smartdata.plugins';
+import * as shortid from 'shortid';
 
 // =======================================
 // Connecting to the database server
@@ -15,7 +16,7 @@ import { smartstring } from '../ts/smartdata.plugins';
 let testDb = new smartdata.SmartdataDb({
   mongoDbName: process.env.MONGO_DBNAME,
   mongoDbUrl: process.env.MONGO_URL,
-  mongoPass: process.env.MONGO_PASS
+  mongoDbPass: process.env.MONGO_PASS
 });
 
 tap.test('should establish a connection to the rethink Db cluster', async () => {
@@ -30,8 +31,9 @@ tap.test('should establish a connection to the rethink Db cluster', async () =>
 // Collections
 // ------
 
-@smartdata.Table(testDb)
-class Car extends smartdata.smartDataDbDoc<Car> {
+@smartdata.Collection(testDb)
+class Car extends smartdata.SmartDataDbDoc<Car> {
+  @smartdata.unI() index: string = shortid();
   @smartdata.svDb() color: string;
   @smartdata.svDb() brand: string;
   constructor(colorArg: string, brandArg: string) {
@@ -47,10 +49,10 @@ tap.test('should save the car to the db', async () => {
 });
 
 tap.test('expect to get instance of Car', async () => {
-  let myCar = await Car.getInstances<Car>({
+  let myCars = await Car.getInstances<Car>({
     brand: 'Volvo'
   });
-  expect(myCar[0].color).to.equal('red');
+  expect(myCars[0].color).to.equal('red');
 });
 
 // =======================================
@@ -60,4 +62,4 @@ tap.test('should close the database connection', async tools => {
   await testDb.close();
 });
 
-tap.start();
+tap.start({ throwOnError: true });

ts/index.ts

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

ts/smartdata.classes.collection.ts

@@ -1,6 +1,6 @@
 import * as plugins from './smartdata.plugins';
 import { SmartdataDb } from './smartdata.classes.db';
-import { smartDataDbDoc } from './smartdata.classes.dbdoc';
+import { SmartDataDbDoc } from './smartdata.classes.doc';
 
 export interface IFindOptions {
   limit?: number;
@@ -17,9 +17,9 @@ export interface IDocValidationFunc<T> {
  * This is a decorator that will tell the decorated class what dbTable to use
  * @param db
  */
-export function Table(db: SmartdataDb) {
+export function Collection(db: SmartdataDb) {
   return function(constructor) {
-    constructor['mongoDbCollection'] = new SmartdataCollection(constructor, db);
+    constructor['smartdataCollection'] = new SmartdataCollection(constructor, db);
   };
 }
 
@@ -31,8 +31,9 @@ export class SmartdataCollection<T> {
   objectValidation: IDocValidationFunc<T> = null;
   collectionName: string;
   smartdataDb: SmartdataDb;
+  uniqueIndexes: string[] = [];
 
-  constructor(collectedClassArg: T & smartDataDbDoc<T>, smartDataDbArg: SmartdataDb) {
+  constructor(collectedClassArg: T & SmartDataDbDoc<T>, smartDataDbArg: SmartdataDb) {
     // tell the collection where it belongs
     this.collectionName = collectedClassArg.name;
     this.smartdataDb = smartDataDbArg;
@@ -55,6 +56,22 @@ export class SmartdataCollection<T> {
         await this.smartdataDb.mongoDb.createCollection(this.collectionName);
       }
       this.mongoDbCollection = await this.smartdataDb.mongoDb.collection(this.collectionName);
+      console.log(`Successfully initiated Collection ${this.collectionName}`);
+    }
+  }
+
+  /**
+   * mark unique index
+   */
+  markUniqueIndexes(keyArrayArg: string[] = []) {
+    for (let key of keyArrayArg) {
+      if (!this.uniqueIndexes.includes(key)) {
+        this.mongoDbCollection.createIndex(key, {
+          unique: true
+        });
+        // make sure we only call this once and not for every doc we create
+        this.uniqueIndexes.push(key);
+      }
     }
   }
 
@@ -70,15 +87,19 @@ export class SmartdataCollection<T> {
    */
   async find(filterObject: any): Promise<any> {
     await this.init();
+    const result = await this.mongoDbCollection.find(filterObject).toArray();
+    return result;
   }
 
   /**
    * create an object in the database
    */
-  async insert(dbDocArg: T & smartDataDbDoc<T>): Promise<any> {
+  async insert(dbDocArg: T & SmartDataDbDoc<T>): Promise<any> {
     await this.init();
     await this.checkDoc(dbDocArg);
+    this.markUniqueIndexes(dbDocArg.uniqueIndexes);
     const saveableObject = await dbDocArg.createSavableObject();
+    console.log(saveableObject);
     const result = await this.mongoDbCollection.insertOne(saveableObject);
     return result;
   }
@@ -86,7 +107,7 @@ export class SmartdataCollection<T> {
   /**
    * inserts object into the DbCollection
    */
-  async update(dbDocArg: T & smartDataDbDoc<T>): Promise<any> {
+  async update(dbDocArg: T & SmartDataDbDoc<T>): Promise<any> {
     await this.init();
     await this.checkDoc(dbDocArg);
     const saveableObject = await dbDocArg.createSavableObject();

ts/smartdata.classes.db.ts

@@ -1,7 +1,7 @@
 import * as plugins from './smartdata.plugins';
-import { Objectmap } from 'lik';
+import { Objectmap } from '@pushrocks/lik';
 
-import { SmartdataCollection } from './smartdata.classes.dbtable';
+import { SmartdataCollection } from './smartdata.classes.collection';
 
 import * as mongoHelpers from './smartdata.mongohelpers';
 
@@ -48,19 +48,20 @@ export class SmartdataDb {
     let finalConnectionUrl = this.smartdataOptions.mongoDbUrl;
     if (this.smartdataOptions.mongoDbPass) {
       finalConnectionUrl = mongoHelpers.addPassword(
-        this.smartdataOptions.mongoDbName,
+        this.smartdataOptions.mongoDbUrl,
         this.smartdataOptions.mongoDbPass
       );
     }
+    console.log(finalConnectionUrl);
     this.mongoDbClient = await plugins.mongodb.MongoClient.connect(
       finalConnectionUrl,
-      {}
+      {
+        useNewUrlParser: true
+      }
     );
     this.mongoDb = this.mongoDbClient.db(this.smartdataOptions.mongoDbName);
     this.status = 'connected';
-    plugins.smartlog
-      .getDefaultLogger()
-      .info(`Connected to database ${this.smartdataOptions.mongoDbName}`);
+    console.log(`Connected to database ${this.smartdataOptions.mongoDbName}`);
   }
 
   /**
@@ -69,9 +70,10 @@ export class SmartdataDb {
   async close(): Promise<any> {
     await this.mongoDbClient.close();
     this.status = 'disconnected';
-    plugins.smartlog
-      .getDefaultLogger()
-      .info(`disconnected from database ${this.smartdataOptions.mongoDbName}`);
+    plugins.smartlog.defaultLogger.log(
+      'info',
+      `disconnected from database ${this.smartdataOptions.mongoDbName}`
+    );
   }
 
   // handle table to class distribution

ts/smartdata.classes.doc.ts

@@ -1,9 +1,9 @@
 import * as plugins from './smartdata.plugins';
 
-import { Objectmap } from 'lik';
+import { Objectmap } from '@pushrocks/lik';
 
 import { SmartdataDb } from './smartdata.classes.db';
-import { SmartdataCollection } from './smartdata.classes.dbtable';
+import { SmartdataCollection } from './smartdata.classes.collection';
 
 export type TDocCreation = 'db' | 'new' | 'mixed';
 
@@ -11,8 +11,8 @@ export type TDocCreation = 'db' | 'new' | 'mixed';
  * saveable - saveable decorator to be used on class properties
  */
 export function svDb() {
-  return (target: smartDataDbDoc<any>, key: string) => {
-    console.log('called sva');
+  return (target: SmartDataDbDoc<any>, key: string) => {
+    console.log(`called svDb() on ${key}`);
     if (!target.saveableProperties) {
       target.saveableProperties = [];
     }
@@ -20,7 +20,28 @@ export function svDb() {
   };
 }
 
-export class smartDataDbDoc<T> {
+/**
+ * unique index - decorator to mark a unique index
+ */
+export function unI() {
+  return (target: SmartDataDbDoc<any>, key: string) => {
+    console.log('called unI');
+
+    // mark the index as unique
+    if (!target.uniqueIndexes) {
+      target.uniqueIndexes = [];
+    }
+    target.uniqueIndexes.push(key);
+
+    // and also save it
+    if (!target.saveableProperties) {
+      target.saveableProperties = [];
+    }
+    target.saveableProperties.push(key);
+  };
+}
+
+export class SmartDataDbDoc<T> {
   /**
    * the collection object an Doc belongs to
    */
@@ -31,6 +52,11 @@ export class smartDataDbDoc<T> {
    */
   creationStatus: TDocCreation = 'new';
 
+  /**
+   * unique indexes
+   */
+  uniqueIndexes: string[];
+
   /**
    * an array of saveable properties of a doc
    */
@@ -51,13 +77,13 @@ export class smartDataDbDoc<T> {
    */
   constructor() {
     this.name = this.constructor['name'];
-    this.collection = this.constructor['dbTable'];
+    this.collection = this.constructor['smartdataCollection'];
   }
 
   static async getInstances<T>(filterArg): Promise<T[]> {
     let self: any = this; // fool typesystem
-    let referenceTable: SmartdataCollection<T> = self.dbTable;
-    const foundDocs = await referenceTable.find(filterArg);
+    let referenceMongoDBCollection: SmartdataCollection<T> = self.smartdataCollection;
+    const foundDocs = await referenceMongoDBCollection.find(filterArg);
     const returnArray = [];
     for (let item of foundDocs) {
       let newInstance = new this();
@@ -101,15 +127,15 @@ export class smartDataDbDoc<T> {
    * also store any referenced objects to DB
    * better for data consistency
    */
-  saveDeep(savedMapArg: Objectmap<smartDataDbDoc<any>> = null) {
+  saveDeep(savedMapArg: Objectmap<SmartDataDbDoc<any>> = null) {
     if (!savedMapArg) {
-      savedMapArg = new Objectmap<smartDataDbDoc<any>>();
+      savedMapArg = new Objectmap<SmartDataDbDoc<any>>();
     }
     savedMapArg.add(this);
     this.save();
     for (let propertyKey in this) {
       let property: any = this[propertyKey];
-      if (property instanceof smartDataDbDoc && !savedMapArg.checkForObject(property)) {
+      if (property instanceof SmartDataDbDoc && !savedMapArg.checkForObject(property)) {
         property.saveDeep(savedMapArg);
       }
     }

ts/smartdata.plugins.ts

@@ -2,7 +2,7 @@ import * as assert from 'assert';
 import * as smartlog from '@pushrocks/smartlog';
 import * as lodash from 'lodash';
 import * as mongodb from 'mongodb';
-import * as smartq from 'smartq';
-import * as smartstring from 'smartstring';
+import * as smartq from '@pushrocks/smartpromise';
+import * as smartstring from '@pushrocks/smartstring';
 
 export { assert, smartlog, lodash, smartq, mongodb, smartstring };

tsconfig.json

@@ -0,0 +1,7 @@
+{
+  "compilerOptions": {
+    "experimentalDecorators": true,
+    "target": "es2017",
+    "module": "commonjs"
+  }
+}

tslint.json

@@ -0,0 +1,17 @@
+{
+  "extends": ["tslint:latest", "tslint-config-prettier"],
+  "rules": {
+    "semicolon": [true, "always"],
+    "no-console": false,
+    "ordered-imports": false,
+    "object-literal-sort-keys": false,
+    "member-ordering": {
+      "options":{
+        "order": [
+          "static-method"
+        ]
+      }
+    }
+  },
+  "defaultSeverity": "warning"
+}