3.1.53

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartdata",
-  "version": "3.1.50",
+  "version": "3.1.53",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartdata",
-  "version": "3.1.50",
+  "version": "3.1.53",
   "private": false,
   "description": "do more with data",
   "main": "dist_ts/index.js",

test/test.ts

@@ -27,7 +27,7 @@ tap.skip.test('should create a testinstance as database', async () => {
   smartdataOptions = {
     mongoDbName: await mongod.getDbName(),
     mongoDbPass: '',
-    mongoDbUrl: await mongod.getConnectionString(),
+    mongoDbUrl: await mongod.getUri(),
   };
   console.log(smartdataOptions);
   testDb = new smartdata.SmartdataDb(smartdataOptions);
@@ -88,11 +88,15 @@ tap.test('should save the car to the db', async () => {
   
 
   let counter = 0;
+  const totalCars = 2000;
   do {
     const myCar3 = new Car('red', 'Renault');
     await myCar3.save();
     counter++;
-  } while (counter < 2000);
+    if (counter%100 === 0) {
+      console.log(`Filled database with ${counter} of ${totalCars} Cars`);
+    }
+  } while (counter < totalCars);
 });
 
 tap.test('expect to get instance of Car with shallow match', async () => {
@@ -102,7 +106,7 @@ tap.test('expect to get instance of Car with shallow match', async () => {
     const myCars = await Car.getInstances<Car>({
       brand: 'Renault',
     });
-    console.log(`took ${Date.now() - timeStart}`);
+    console.log(`took ${Date.now() - timeStart}ms to query a set of 2000`);
     expect(myCars[0].deepData.sodeep).to.equal('yes');
     expect(myCars[0].brand).to.equal('Renault');
     counter++;
@@ -116,7 +120,7 @@ tap.test('expect to get instance of Car with deep match', async () => {
     const myCars2 = await Car.getInstances<Car>({
       'deepData.sodeep': 'yes',
     } as any);
-    console.log(`took ${Date.now() - timeStart}`);
+    console.log(`took ${Date.now() - timeStart}ms to query a set of 2000`);
     expect(myCars2[0].deepData.sodeep).to.equal('yes');
     expect(myCars2[0].brand).to.equal('Volvo');
     counter++;
@@ -133,11 +137,15 @@ tap.test('expect to get instance of Car and update it', async () => {
 });
 
 tap.test('should be able to delete an instance of car', async () => {
-  const myCar = await Car.getInstance<Car>({
+  const myCars = await Car.getInstances<Car>({
     brand: 'Volvo',
+    color: 'blue'
   });
-  expect(myCar.color).to.equal('blue');
+  console.log(myCars);
+  expect(myCars[0].color).to.equal('blue');
+  for (const myCar of myCars) {
     await myCar.delete();
+  }
 
   const myCar2 = await Car.getInstance<Car>({
     brand: 'Volvo',

ts/smartdata.classes.collection.ts

@@ -131,11 +131,12 @@ export class SmartdataCollection<T> {
       }
       updateableObject[key] = saveableObject[key];
     }
-    this.mongoDbCollection.updateOne(
+    const result = await this.mongoDbCollection.updateOne(
       identifiableObject,
       { $set: updateableObject },
       { upsert: true }
     );
+    return result;
   }
 
   public async delete(dbDocArg: T & SmartDataDbDoc<T, unknown>): Promise<any> {

ts/smartdata.classes.doc.ts

@@ -12,7 +12,7 @@ export type TDocCreation = 'db' | 'new' | 'mixed';
  */
 export function svDb() {
   return (target: SmartDataDbDoc<unknown, unknown>, key: string) => {
-    console.log(`called svDb() on ${key}`);
+    console.log(`called svDb() on >${target.constructor.name}.${key}<`);
     if (!target.saveableProperties) {
       target.saveableProperties = [];
     }
@@ -25,7 +25,7 @@ export function svDb() {
  */
 export function unI() {
   return (target: SmartDataDbDoc<unknown, unknown>, key: string) => {
-    console.log('called unI');
+    console.log(`called unI on >>${target.constructor.name}.${key}<<`);
 
     // mark the index as unique
     if (!target.uniqueIndexes) {
@@ -41,7 +41,7 @@ export function unI() {
   };
 }
 
-export class SmartDataDbDoc<T, TImplements> {
+export class SmartDataDbDoc<T extends TImplements, TImplements> {
   /**
    * the collection object an Doc belongs to
    */
@@ -110,17 +110,19 @@ export class SmartDataDbDoc<T, TImplements> {
   public async save() {
     // tslint:disable-next-line: no-this-assignment
     const self: any = this;
+    let dbResult: any;
     switch (this.creationStatus) {
       case 'db':
-        await this.collection.update(self);
+        dbResult = await this.collection.update(self);
         break;
       case 'new':
-        const writeResult = await this.collection.insert(self);
+        dbResult = await this.collection.insert(self);
         this.creationStatus = 'db';
         break;
       default:
         console.error('neither new nor in db?');
     }
+    return dbResult;
   }
 
   /**