3.1.26

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartdata",
-  "version": "3.1.23",
+  "version": "3.1.26",
   "private": false,
   "description": "do more with data",
   "main": "dist/index.js",
@@ -21,27 +21,27 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartdata#README",
   "dependencies": {
-    "@pushrocks/lik": "^3.0.11",
-    "@pushrocks/smartlog": "^2.0.19",
-    "@pushrocks/smartpromise": "^3.0.2",
-    "@pushrocks/smartstring": "^3.0.10",
+    "@pushrocks/lik": "^3.0.19",
+    "@pushrocks/smartlog": "^2.0.21",
+    "@pushrocks/smartpromise": "^3.0.6",
+    "@pushrocks/smartstring": "^3.0.18",
     "@pushrocks/smartunique": "^3.0.1",
-    "@types/lodash": "^4.14.138",
-    "@types/mongodb": "^3.3.1",
+    "@types/lodash": "^4.14.149",
+    "@types/mongodb": "^3.3.16",
     "lodash": "^4.17.15",
-    "mongodb": "^3.3.2",
+    "mongodb": "^3.5.3",
     "runtime-type-checks": "0.0.4"
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.17",
-    "@gitzone/tstest": "^1.0.24",
-    "@pushrocks/qenv": "^4.0.4",
-    "@pushrocks/tapbundle": "^3.0.13",
-    "@types/mongodb-memory-server": "^1.8.0",
-    "@types/node": "^12.7.3",
+    "@gitzone/tstest": "^1.0.28",
+    "@pushrocks/qenv": "^4.0.6",
+    "@pushrocks/tapbundle": "^3.2.0",
+    "@types/mongodb-memory-server": "^2.3.0",
+    "@types/node": "^13.7.2",
     "@types/shortid": "0.0.29",
-    "mongodb-memory-server": "^5.2.0",
-    "tslint": "^5.19.0",
+    "mongodb-memory-server": "^6.2.4",
+    "tslint": "^6.0.0",
     "tslint-config-prettier": "^1.18.0"
   },
   "files": [

test/test.ts

@@ -29,14 +29,6 @@ tap.test('should create a testinstance as database', async () => {
   testDb = new smartdata.SmartdataDb(smartdataOptions);
 });
 
-tap.skip.test('should create a smartdb', async () => {
-  testDb = new smartdata.SmartdataDb({
-    mongoDbName: testQenv.getEnvVarOnDemand('MONGO_DBNAME'),
-    mongoDbUrl: testQenv.getEnvVarOnDemand('MONGO_URL'),
-    mongoDbPass: testQenv.getEnvVarOnDemand('MONGO_PASS')
-  });
-});
-
 tap.test('should establish a connection to the rethink Db cluster', async () => {
   await testDb.init();
 });
@@ -52,7 +44,7 @@ tap.test('should establish a connection to the rethink Db cluster', async () =>
 @smartdata.Collection(() => {
   return testDb;
 })
-class Car extends smartdata.SmartDataDbDoc<Car> {
+class Car extends smartdata.SmartDataDbDoc<Car, Car> {
   @smartdata.unI()
   public index: string = smartunique.shortId();
 
@@ -115,7 +107,7 @@ tap.test('should be able to delete an instance of car', async () => {
 @smartdata.Collection(() => {
   return testDb;
 })
-class Truck extends smartdata.SmartDataDbDoc<Car> {
+class Truck extends smartdata.SmartDataDbDoc<Car, Car> {
   @smartdata.unI()
   public id: string = smartunique.shortId();
 

ts/smartdata.classes.collection.ts

@@ -42,7 +42,7 @@ export class SmartdataCollection<T> {
   public smartdataDb: SmartdataDb;
   public uniqueIndexes: string[] = [];
 
-  constructor(collectedClassArg: T & SmartDataDbDoc<T>, smartDataDbArg: SmartdataDb) {
+  constructor(collectedClassArg: T & SmartDataDbDoc<T, unknown>, smartDataDbArg: SmartdataDb) {
     // tell the collection where it belongs
     this.collectionName = collectedClassArg.name;
     this.smartdataDb = smartDataDbArg;
@@ -103,7 +103,7 @@ export class SmartdataCollection<T> {
   /**
    * create an object in the database
    */
-  public async insert(dbDocArg: T & SmartDataDbDoc<T>): Promise<any> {
+  public async insert(dbDocArg: T & SmartDataDbDoc<T, unknown>): Promise<any> {
     await this.init();
     await this.checkDoc(dbDocArg);
     this.markUniqueIndexes(dbDocArg.uniqueIndexes);
@@ -115,7 +115,7 @@ export class SmartdataCollection<T> {
   /**
    * inserts object into the DbCollection
    */
-  public async update(dbDocArg: T & SmartDataDbDoc<T>): Promise<any> {
+  public async update(dbDocArg: T & SmartDataDbDoc<T, unknown>): Promise<any> {
     await this.init();
     await this.checkDoc(dbDocArg);
     const identifiableObject = await dbDocArg.createIdentifiableObject();
@@ -134,7 +134,7 @@ export class SmartdataCollection<T> {
     );
   }
 
-  public async delete(dbDocArg: T & SmartDataDbDoc<T>): Promise<any> {
+  public async delete(dbDocArg: T & SmartDataDbDoc<T, unknown>): Promise<any> {
     await this.init();
     await this.checkDoc(dbDocArg);
     const identifiableObject = await dbDocArg.createIdentifiableObject();

ts/smartdata.classes.db.ts

@@ -54,7 +54,8 @@ export class SmartdataDb {
     }
     console.log(`connection Url: ${finalConnectionUrl}`);
     this.mongoDbClient = await plugins.mongodb.MongoClient.connect(finalConnectionUrl, {
-      useNewUrlParser: true
+      useNewUrlParser: true,
+      useUnifiedTopology: true
     });
     this.mongoDb = this.mongoDbClient.db(this.smartdataOptions.mongoDbName);
     this.status = 'connected';

ts/smartdata.classes.doc.ts

@@ -11,7 +11,7 @@ export type TDocCreation = 'db' | 'new' | 'mixed';
  * saveable - saveable decorator to be used on class properties
  */
 export function svDb() {
-  return (target: SmartDataDbDoc<any>, key: string) => {
+  return (target: SmartDataDbDoc<unknown, unknown>, key: string) => {
     console.log(`called svDb() on ${key}`);
     if (!target.saveableProperties) {
       target.saveableProperties = [];
@@ -24,7 +24,7 @@ export function svDb() {
  * unique index - decorator to mark a unique index
  */
 export function unI() {
-  return (target: SmartDataDbDoc<any>, key: string) => {
+  return (target: SmartDataDbDoc<unknown, unknown>, key: string) => {
     console.log('called unI');
 
     // mark the index as unique
@@ -41,7 +41,7 @@ export function unI() {
   };
 }
 
-export class SmartDataDbDoc<T> {
+export class SmartDataDbDoc<T, TImplements> {
   /**
    * the collection object an Doc belongs to
    */
@@ -150,9 +150,9 @@ export class SmartDataDbDoc<T> {
    * also store any referenced objects to DB
    * better for data consistency
    */
-  public saveDeep(savedMapArg: Objectmap<SmartDataDbDoc<any>> = null) {
+  public saveDeep(savedMapArg: Objectmap<SmartDataDbDoc<any, any>> = null) {
     if (!savedMapArg) {
-      savedMapArg = new Objectmap<SmartDataDbDoc<any>>();
+      savedMapArg = new Objectmap<SmartDataDbDoc<any, any>>();
     }
     savedMapArg.add(this);
     this.save();
@@ -167,12 +167,12 @@ export class SmartDataDbDoc<T> {
   /**
    * creates a saveable object so the instance can be persisted as json in the database
    */
-  public async createSavableObject() {
-    const saveableObject: any = {}; // is not exposed to outside, so any is ok here
+  public async createSavableObject(): Promise<TImplements> {
+    const saveableObject: unknown = {}; // is not exposed to outside, so any is ok here
     for (const propertyNameString of this.saveableProperties) {
       saveableObject[propertyNameString] = this[propertyNameString];
     }
-    return saveableObject;
+    return saveableObject as TImplements;
   }
 
   /**