4.0.26

.gitlab-ci.yml

@@ -13,7 +13,6 @@ stages:
   - metadata
 
 before_script:
-  - apt-get update && apt-get install -y libcurl3 libssl-dev openssl libssl1.0.0 mongodb
   - npm install -g @shipzone/npmci
 
 # ====================

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@pushrocks/smartdata",
-  "version": "4.0.20",
+  "version": "4.0.26",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@pushrocks/smartdata",
-      "version": "4.0.20",
+      "version": "4.0.26",
       "license": "MIT",
       "dependencies": {
         "@pushrocks/lik": "^5.0.0",

package.json

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

test/test.easystore.ts

@@ -31,6 +31,15 @@ tap.test('should create a testinstance as database', async () => {
   await testDb.init();
 });
 
+tap.skip.test('should connect to atlas', async (tools) => {
+  const databaseName = `test-smartdata-${smartunique.shortId()}`;
+  testDb = new smartdata.SmartdataDb({
+    mongoDbUrl: testQenv.getEnvVarOnDemand('MONGO_URL'),
+    mongoDbName: databaseName,
+  });
+  await testDb.init();
+});
+
 let easyStore: smartdata.EasyStore<{
   key1: string;
   key2: string;
@@ -44,11 +53,12 @@ tap.test('should create an easystore', async () => {
 });
 
 tap.test('close', async () => {
-  testDb.close();
-  mongod.stop();
-  setTimeout(() => {
-    process.exit(0);
-  }, 1000);
+  if (mongod) {
+    await mongod.stop();
+  } else {
+    await testDb.mongoDb.dropDatabase();
+  }
+  await testDb.close();
 });
 
 tap.start();

test/test.ts

@@ -21,7 +21,7 @@ let mongod: mongoPlugin.MongoMemoryServer;
 
 const totalCars = 2000;
 
-tap.skip.test('should create a testinstance as database', async () => {
+tap.test('should create a testinstance as database', async () => {
   mongod = await mongoPlugin.MongoMemoryServer.create();
   console.log('created mongod instance');
   console.log('mongod started');
@@ -30,17 +30,15 @@ tap.skip.test('should create a testinstance as database', async () => {
   };
   console.log(smartdataOptions);
   testDb = new smartdata.SmartdataDb(smartdataOptions);
+  await testDb.init();
 });
 
-tap.test('should connect to atlas', async (tools) => {
+tap.skip.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();
 });
 
@@ -204,7 +202,7 @@ tap.test('should store a new Truck', async () => {
 
 tap.test('should use a cursor', async () => {
   const cursor = await Truck.getCursor({});
-  cursor.forEach(async truckArg => {
+  cursor.forEach(async (truckArg) => {
     console.log(truckArg.id);
   });
 });
@@ -212,12 +210,13 @@ tap.test('should use a cursor', async () => {
 // =======================================
 // close the database connection
 // =======================================
-tap.test('should drop the db and close the database connection', async (tools) => {
-  await testDb.mongoDb.dropDatabase();
-  await testDb.close();
-  try {
+tap.test('close', async () => {
+  if (mongod) {
     await mongod.stop();
-  } catch (e) {}
+  } else {
+    await testDb.mongoDb.dropDatabase();
+  }
+  await testDb.close();
 });
 
 tap.start({ throwOnError: true });

test/test.typescript.ts

@@ -21,7 +21,7 @@ let mongod: mongoPlugin.MongoMemoryServer;
 
 const totalCars = 2000;
 
-tap.skip.test('should create a testinstance as database', async () => {
+tap.test('should create a testinstance as database', async () => {
   mongod = await mongoPlugin.MongoMemoryServer.create();
   console.log('created mongod instance');
   console.log('mongod started');
@@ -30,17 +30,15 @@ tap.skip.test('should create a testinstance as database', async () => {
   };
   console.log(smartdataOptions);
   testDb = new smartdata.SmartdataDb(smartdataOptions);
+  await testDb.init();
 });
 
-tap.test('should connect to atlas', async (tools) => {
+tap.skip.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();
 });
 
@@ -94,12 +92,13 @@ tap.test('should get a car', async () => {
 // =======================================
 // close the database connection
 // =======================================
-tap.test('should close the database connection', async (tools) => {
-  await testDb.mongoDb.dropDatabase();
-  await testDb.close();
-  try {
+tap.test('close', async () => {
+  if (mongod) {
     await mongod.stop();
-  } catch (e) {}
+  } else {
+    await testDb.mongoDb.dropDatabase();
+  }
+  await testDb.close();
 });
 
 tap.start({ throwOnError: true });

ts/smartdata.classes.collection.ts

@@ -85,7 +85,7 @@ export function Manager<TManager extends IManager>(managerArg?: TManager | TDela
       public static get manager() {
         let manager: TManager;
         if (!managerArg) {
-          manager = this.prototype.defaultManager
+          manager = this.prototype.defaultManager;
         } else if (managerArg['db']) {
           manager = managerArg as TManager;
         } else {
@@ -96,7 +96,7 @@ export function Manager<TManager extends IManager>(managerArg?: TManager | TDela
       public get manager() {
         let manager: TManager;
         if (!managerArg) {
-          manager = this.defaultManager
+          manager = this.defaultManager;
         } else if (managerArg['db']) {
           manager = managerArg as TManager;
         } else {
@@ -171,7 +171,7 @@ export class SmartdataCollection<T> {
   /**
    * finds an object in the DbCollection
    */
-   public async findOne(filterObject: any): Promise<any> {
+  public async findOne(filterObject: any): Promise<any> {
     await this.init();
     const cursor = this.mongoDbCollection.find(filterObject);
     const result = await cursor.next();

ts/smartdata.classes.cursor.ts

@@ -1,7 +1,7 @@
 import * as plugins from './smartdata.plugins';
 
 /**
- * a wrapper for the native mongodb cursor. Exposes better 
+ * a wrapper for the native mongodb cursor. Exposes better
  */
 export class SmartdataDbCursor<T = any> {
   // STATIC
@@ -9,16 +9,16 @@ export class SmartdataDbCursor<T = any> {
   // INSTANCE
   public mongodbCursor: plugins.mongodb.FindCursor<T>;
   constructor(cursorArg: plugins.mongodb.FindCursor<T>) {
-    this.mongodbCursor = cursorArg
-  };
+    this.mongodbCursor = cursorArg;
+  }
 
   public async next(closeAtEnd = true) {
     const result = await this.mongodbCursor.next();
     if (!result && closeAtEnd) {
       await this.close();
-    };
+    }
     return result;
-  };
+  }
 
   public async forEach(forEachFuncArg: (itemArg: T) => Promise<any>, closeCursorAtEnd = true) {
     let currentValue: T;
@@ -36,4 +36,4 @@ export class SmartdataDbCursor<T = any> {
   public async close() {
     await this.mongodbCursor.close();
   }
-}
+}

ts/smartdata.classes.doc.ts

@@ -165,7 +165,9 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
     this: plugins.tsclass.typeFest.Class<T>,
     filterArg: plugins.tsclass.typeFest.PartialDeep<T>
   ) {
-    const cursor: SmartdataDbCursor<T> = await (this as any).collection.getCursor(convertFilterForMongoDb(filterArg));
+    const cursor: SmartdataDbCursor<T> = await (this as any).collection.getCursor(
+      convertFilterForMongoDb(filterArg)
+    );
     return cursor;
   }
 
@@ -179,7 +181,7 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
     forEachFunction: (itemArg: T) => Promise<any>
   ) {
     const cursor: SmartdataDbCursor<T> = await (this as any).getCursor(filterArg);
-    await cursor.forEach(forEachFunction)
+    await cursor.forEach(forEachFunction);
   }
 
   /**