3.1.46

.gitlab-ci.yml

@@ -56,7 +56,6 @@ auditDevDependencies:
 testStable:
   stage: test
   script:
-    - apt-get install lsb-core
     - npmci npm prepare
     - npmci node install stable
     - npmci npm install

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartdata",
-  "version": "3.1.32",
+  "version": "3.1.46",
   "private": false,
   "description": "do more with data",
   "main": "dist_ts/index.js",
@@ -22,25 +22,26 @@
   "homepage": "https://gitlab.com/pushrocks/smartdata#README",
   "dependencies": {
     "@pushrocks/lik": "^4.0.17",
-    "@pushrocks/smartlog": "^2.0.36",
+    "@pushrocks/smartlog": "^2.0.39",
     "@pushrocks/smartpromise": "^3.0.6",
     "@pushrocks/smartstring": "^3.0.18",
-    "@pushrocks/smartunique": "^3.0.3",
-    "@types/lodash": "^4.14.159",
-    "@types/mongodb": "^3.5.26",
+    "@tsclass/tsclass": "^3.0.25",
+    "@types/lodash": "^4.14.161",
+    "@types/mongodb": "^3.5.27",
     "lodash": "^4.17.20",
-    "mongodb": "^3.6.0",
+    "mongodb": "^3.6.1",
     "runtime-type-checks": "0.0.4"
   },
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.25",
     "@gitzone/tstest": "^1.0.44",
     "@pushrocks/qenv": "^4.0.10",
+    "@pushrocks/smartunique": "^3.0.3",
     "@pushrocks/tapbundle": "^3.2.9",
     "@types/mongodb-memory-server": "^2.3.0",
-    "@types/node": "^14.6.0",
+    "@types/node": "^14.6.4",
     "@types/shortid": "0.0.29",
-    "mongodb-memory-server": "^6.6.4",
+    "mongodb-memory-server": "^6.7.0",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },

test/test.ts

@@ -5,10 +5,9 @@ const 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 smartunique from '@pushrocks/smartunique';
 
 import * as mongoPlugin from 'mongodb-memory-server';
+import { smartunique } from '../ts/smartdata.plugins';
 
 // =======================================
 // Connecting to the database server
@@ -18,8 +17,13 @@ let testDb: smartdata.SmartdataDb;
 let smartdataOptions: smartdata.IMongoDescriptor;
 let mongod: mongoPlugin.MongoMemoryServer;
 
-tap.test('should create a testinstance as database', async () => {
-  mongod = new mongoPlugin.MongoMemoryServer();
+tap.skip.test('should create a testinstance as database', async () => {
+  mongod = new mongoPlugin.MongoMemoryServer({});
+  console.log('created mongod instance');
+  await mongod._startUpInstance().catch((err) => {
+    console.log(err);
+  });
+  console.log('mongod started');
   smartdataOptions = {
     mongoDbName: await mongod.getDbName(),
     mongoDbPass: '',
@@ -29,7 +33,15 @@ tap.test('should create a testinstance as database', async () => {
   testDb = new smartdata.SmartdataDb(smartdataOptions);
 });
 
-tap.test('should establish a connection to the rethink Db cluster', async () => {
+tap.test('should connect to atlas', async (tools) => {
+  const databaseName = `test-smartdata-${smartunique.shortId()}`;
+  testDb = new smartdata.SmartdataDb({
+    mongoDbUrl: testQenv.getEnvVarOnDemand('MONGO_URL'),
+    mongoDbName: databaseName,
+  });
+});
+
+tap.test('should establish a connection to mongod', async () => {
   await testDb.init();
 });
 
@@ -54,6 +66,11 @@ class Car extends smartdata.SmartDataDbDoc<Car, Car> {
   @smartdata.svDb()
   public brand: string;
 
+  @smartdata.svDb()
+  deepData = {
+    sodeep: 'yes'
+  };
+
   constructor(colorArg: string, brandArg: string) {
     super();
     this.color = colorArg;
@@ -68,15 +85,38 @@ tap.test('should save the car to the db', async () => {
   const myCar2 = new Car('red', 'Volvo');
   await myCar2.save();
 
+  
+
+  let counter = 0;
+  do {
     const myCar3 = new Car('red', 'Renault');
     await myCar3.save();
+    counter++;
+  } while (counter < 2000);
 });
 
 tap.test('expect to get instance of Car', async () => {
+  let counter = 0;
+  do {
+    const timeStart = Date.now();
     const myCars = await Car.getInstances<Car>({
       brand: 'Volvo',
     });
-  expect(myCars[0].color).to.equal('red');
+    console.log(`took ${Date.now() - timeStart}`);
+    counter++;
+  } while (counter < 2000);
+});
+
+tap.test('expect to get instance of Car', async () => {
+  let counter = 0;
+  do {
+    const timeStart = Date.now();
+    const myCars2 = await Car.getInstances<Car>({
+      'deepData.sodeep': 'yes',
+    } as any);
+    console.log(`took ${Date.now() - timeStart}`);
+    counter++;
+  } while (counter < 2000);
 });
 
 tap.test('expect to get instance of Car and update it', async () => {
@@ -137,7 +177,9 @@ tap.test('should store a new Truck', async () => {
 // =======================================
 tap.test('should close the database connection', async (tools) => {
   await testDb.close();
+  try {
     await mongod.stop();
+  } catch (e) {}
 });
 
 tap.start({ throwOnError: true });

ts/smartdata.classes.collection.ts

@@ -63,9 +63,9 @@ export class SmartdataCollection<T> {
       });
       if (!wantedCollection) {
         await this.smartdataDb.mongoDb.createCollection(this.collectionName);
+        console.log(`Successfully initiated Collection ${this.collectionName}`);
       }
-      this.mongoDbCollection = await this.smartdataDb.mongoDb.collection(this.collectionName);
-      // console.log(`Successfully initiated Collection ${this.collectionName}`);
+      this.mongoDbCollection = this.smartdataDb.mongoDb.collection(this.collectionName);
     }
   }
 

ts/smartdata.classes.db.ts

@@ -40,6 +40,8 @@ export class SmartdataDb {
     this.mongoDbClient = await plugins.mongodb.MongoClient.connect(finalConnectionUrl, {
       useNewUrlParser: true,
       useUnifiedTopology: true,
+      maxPoolSize: 100,
+      maxIdleTimeMS: 10
     });
     this.mongoDb = this.mongoDbClient.db(this.smartdataOptions.mongoDbName);
     this.status = 'connected';

ts/smartdata.classes.doc.ts

@@ -89,7 +89,9 @@ export class SmartDataDbDoc<T, TImplements> {
     }
   }
 
-  public static async getInstances<T>(filterArg: Partial<T>): Promise<T[]> {
+  public static async getInstances<T>(
+    filterArg: plugins.tsclass.typeFest.PartialDeep<T>
+  ): Promise<T[]> {
     const self: any = this; // fool typesystem
     let referenceMongoDBCollection: SmartdataCollection<T>;
 
@@ -111,7 +113,9 @@ export class SmartDataDbDoc<T, TImplements> {
     return returnArray;
   }
 
-  public static async getInstance<T>(filterArg: Partial<T>): Promise<T> {
+  public static async getInstance<T>(
+    filterArg: plugins.tsclass.typeFest.PartialDeep<T>
+  ): Promise<T> {
     const result = await this.getInstances<T>(filterArg);
     if (result && result.length > 0) {
       return result[0];

ts/smartdata.plugins.ts

@@ -1,4 +1,9 @@
-import * as assert from 'assert';
+// tsclass scope
+import * as tsclass from '@tsclass/tsclass';
+
+export { tsclass };
+
+// @pushrocks scope
 import * as smartlog from '@pushrocks/smartlog';
 import * as lodash from 'lodash';
 import * as mongodb from 'mongodb';
@@ -6,4 +11,4 @@ import * as smartq from '@pushrocks/smartpromise';
 import * as smartstring from '@pushrocks/smartstring';
 import * as smartunique from '@pushrocks/smartunique';
 
-export { assert, smartlog, lodash, smartq, mongodb, smartstring, smartunique };
+export { smartlog, lodash, smartq, mongodb, smartstring, smartunique };