fix(core): update

.gitlab-ci.yml

@@ -19,23 +19,35 @@ mirror:
   stage: security
   script:
     - npmci git mirror
+  only:
+    - tags
   tags:
     - lossless
     - docker
     - notpriv
 
-audit:
+auditProductionDependencies:
+  image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
+  stage: security
+  script:
+    - npmci npm prepare
+    - npmci command npm install --production --ignore-scripts
+    - npmci command npm config set registry https://registry.npmjs.org
+    - npmci command npm audit --audit-level=high --only=prod --production
+  tags:
+    - docker
+
+auditDevDependencies:
   image: registry.gitlab.com/hosttoday/ht-docker-node:npmci
   stage: security
   script:
     - npmci npm prepare
     - npmci command npm install --ignore-scripts
     - npmci command npm config set registry https://registry.npmjs.org
-    - npmci command npm audit --audit-level=high
+    - npmci command npm audit --audit-level=high --only=dev
   tags:
-    - lossless
     - docker
-    - notpriv
+  allow_failure: true
 
 # ====================
 # test stage
@@ -50,9 +62,7 @@ testStable:
     - npmci npm test
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - priv
 
 testBuild:
   stage: test
@@ -63,9 +73,7 @@ testBuild:
     - npmci command npm run build
   coverage: /\d+.?\d+?\%\s*coverage/
   tags:
-    - lossless
     - docker
-    - notpriv
 
 release:
   stage: release
@@ -85,6 +93,8 @@ release:
 codequality:
   stage: metadata
   allow_failure: true
+  only:
+    - tags
   script:
     - npmci command npm install -g tslint typescript
     - npmci npm prepare

.vscode/settings.json

@@ -15,7 +15,7 @@
             "properties": {
               "projectType": {
                 "type": "string",
-                "enum": ["website", "element", "service", "npm"]
+                "enum": ["website", "element", "service", "npm", "wcc"]
               }
             }
           }

package.json

@@ -21,27 +21,27 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartdata#README",
   "dependencies": {
-    "@pushrocks/lik": "^4.0.13",
-    "@pushrocks/smartlog": "^2.0.35",
+    "@pushrocks/lik": "^4.0.17",
+    "@pushrocks/smartlog": "^2.0.36",
     "@pushrocks/smartpromise": "^3.0.6",
     "@pushrocks/smartstring": "^3.0.18",
     "@pushrocks/smartunique": "^3.0.3",
-    "@types/lodash": "^4.14.155",
-    "@types/mongodb": "^3.5.20",
-    "lodash": "^4.17.15",
-    "mongodb": "^3.5.8",
+    "@types/lodash": "^4.14.159",
+    "@types/mongodb": "^3.5.26",
+    "lodash": "^4.17.20",
+    "mongodb": "^3.6.0",
     "runtime-type-checks": "0.0.4"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.24",
-    "@gitzone/tstest": "^1.0.33",
+    "@gitzone/tsbuild": "^2.1.25",
+    "@gitzone/tstest": "^1.0.44",
     "@pushrocks/qenv": "^4.0.10",
-    "@pushrocks/tapbundle": "^3.2.1",
+    "@pushrocks/tapbundle": "^3.2.9",
     "@types/mongodb-memory-server": "^2.3.0",
-    "@types/node": "^14.0.13",
+    "@types/node": "^14.6.0",
     "@types/shortid": "0.0.29",
-    "mongodb-memory-server": "^6.6.1",
-    "tslint": "^6.1.2",
+    "mongodb-memory-server": "^6.6.4",
+    "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },
   "files": [
@@ -55,5 +55,8 @@
     "cli.js",
     "npmextra.json",
     "readme.md"
+  ],
+  "browserslist": [
+    "last 1 chrome versions"
   ]
-}
+}

readme.md

@@ -54,7 +54,7 @@ import * as smartdata from 'smartdata';
 const smartdataDb = new smartdata.SmartdataDb({
   mongoDbUrl: '//someurl',
   mongoDbName: 'myDatabase',
-  mongoDbPass: 'mypassword'
+  mongoDbPass: 'mypassword',
 });
 
 smartdataDb.connect();
@@ -87,14 +87,14 @@ class MyObject extends smartdata.DbDoc<MyObject> {
 
 const localObject = new MyObject({
   property1: 'hi',
-  property2: 2
+  property2: 2,
 });
 localObject.save(); // saves the object to the database
 
 // start retrieving instances
 
 MyObject.getInstance<MyObject>({
-  property: 'hi'
+  property: 'hi',
 }); // outputs a new instance of MyObject with the values from db assigned
 ```
 
@@ -134,7 +134,6 @@ Since you define your classes in TypeScript and types flow through smartdata in
 you should get all the Intellisense and type checking you love when using smartdata.
 smartdata itself also bundles typings. You don't need to install any additional types for smartdata.
 
-
 ## Contribution
 
 We are always happy for code contributions. If you are not the code contributing type that is ok. Still, maintaining Open Source repositories takes considerable time and thought. If you like the quality of what we do and our modules are useful to you we would appreciate a little monthly contribution: You can [contribute one time](https://lossless.link/contribute-onetime) or [contribute monthly](https://lossless.link/contribute). :)

test/test.ts

@@ -23,7 +23,7 @@ tap.test('should create a testinstance as database', async () => {
   smartdataOptions = {
     mongoDbName: await mongod.getDbName(),
     mongoDbPass: '',
-    mongoDbUrl: await mongod.getConnectionString()
+    mongoDbUrl: await mongod.getConnectionString(),
   };
   console.log(smartdataOptions);
   testDb = new smartdata.SmartdataDb(smartdataOptions);
@@ -74,14 +74,14 @@ tap.test('should save the car to the db', async () => {
 
 tap.test('expect to get instance of Car', async () => {
   const myCars = await Car.getInstances<Car>({
-    brand: 'Volvo'
+    brand: 'Volvo',
   });
   expect(myCars[0].color).to.equal('red');
 });
 
 tap.test('expect to get instance of Car and update it', async () => {
   const myCar = await Car.getInstance<Car>({
-    brand: 'Volvo'
+    brand: 'Volvo',
   });
   expect(myCar.color).to.equal('red');
   myCar.color = 'blue';
@@ -90,13 +90,13 @@ 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>({
-    brand: 'Volvo'
+    brand: 'Volvo',
   });
   expect(myCar.color).to.equal('blue');
   await myCar.delete();
 
   const myCar2 = await Car.getInstance<Car>({
-    brand: 'Volvo'
+    brand: 'Volvo',
   });
   expect(myCar2.color).to.equal('red');
 });
@@ -135,7 +135,7 @@ tap.test('should store a new Truck', async () => {
 // =======================================
 // close the database connection
 // =======================================
-tap.test('should close the database connection', async tools => {
+tap.test('should close the database connection', async (tools) => {
   await testDb.close();
   await mongod.stop();
 });

ts/smartdata.classes.collection.ts

@@ -20,7 +20,7 @@ export type TDelayedDbCreation = () => SmartdataDb;
  * @param dbArg
  */
 export function Collection(dbArg: SmartdataDb | TDelayedDbCreation) {
-  return function(constructor) {
+  return function (constructor) {
     if (dbArg instanceof SmartdataDb) {
       // tslint:disable-next-line: no-string-literal
       constructor['smartdataCollection'] = new SmartdataCollection(constructor, dbArg);
@@ -58,7 +58,7 @@ export class SmartdataCollection<T> {
     if (!this.mongoDbCollection) {
       // connect this instance to a MongoDB collection
       const availableMongoDbCollections = await this.smartdataDb.mongoDb.collections();
-      const wantedCollection = availableMongoDbCollections.find(collection => {
+      const wantedCollection = availableMongoDbCollections.find((collection) => {
         return collection.collectionName === this.collectionName;
       });
       if (!wantedCollection) {
@@ -76,7 +76,7 @@ export class SmartdataCollection<T> {
     for (const key of keyArrayArg) {
       if (!this.uniqueIndexes.includes(key)) {
         this.mongoDbCollection.createIndex(key, {
-          unique: true
+          unique: true,
         });
         // make sure we only call this once and not for every doc we create
         this.uniqueIndexes.push(key);
@@ -139,7 +139,7 @@ export class SmartdataCollection<T> {
     await this.checkDoc(dbDocArg);
     const identifiableObject = await dbDocArg.createIdentifiableObject();
     await this.mongoDbCollection.deleteOne(identifiableObject, {
-      w: 1
+      w: 1,
     });
   }
 

ts/smartdata.classes.db.ts

@@ -3,7 +3,6 @@ import { ObjectMap } from '@pushrocks/lik';
 
 import { SmartdataCollection } from './smartdata.classes.collection';
 
-import * as mongoHelpers from './smartdata.mongohelpers';
 import { logger } from './smartdata.logging';
 
 /**
@@ -20,7 +19,13 @@ export interface ISmartdataOptions {
   /**
    * the db to use for the project
    */
-  mongoDbName: string;
+  mongoDbName?: string;
+
+  /**
+   * a username to use to connect to the database
+   */
+
+  mongoDbUser?: string;
 
   /**
    * an optional password that will be replace <PASSWORD> in the connection string
@@ -46,17 +51,17 @@ export class SmartdataDb {
    * connects to the database that was specified during instance creation
    */
   public async init(): Promise<any> {
-    let finalConnectionUrl = this.smartdataOptions.mongoDbUrl;
-    if (this.smartdataOptions.mongoDbPass) {
-      finalConnectionUrl = mongoHelpers.addPassword(
-        this.smartdataOptions.mongoDbUrl,
-        this.smartdataOptions.mongoDbPass
-      );
-    }
-    console.log(`connection Url: ${finalConnectionUrl}`);
+    const finalConnectionUrl = this.smartdataOptions.mongoDbUrl
+      .replace('<USERNAME>', this.smartdataOptions.mongoDbUser)
+      .replace('<username>', this.smartdataOptions.mongoDbUser)
+      .replace('<PASSWORD>', this.smartdataOptions.mongoDbPass)
+      .replace('<password>', this.smartdataOptions.mongoDbPass)
+      .replace('<DBNAME>', this.smartdataOptions.mongoDbName)
+      .replace('<dbname>', this.smartdataOptions.mongoDbName);
+
     this.mongoDbClient = await plugins.mongodb.MongoClient.connect(finalConnectionUrl, {
       useNewUrlParser: true,
-      useUnifiedTopology: true
+      useUnifiedTopology: true,
     });
     this.mongoDb = this.mongoDbClient.db(this.smartdataOptions.mongoDbName);
     this.status = 'connected';
@@ -84,7 +89,7 @@ export class SmartdataDb {
    * @returns DbTable
    */
   public async getSmartdataCollectionByName<T>(nameArg: string): Promise<SmartdataCollection<T>> {
-    const resultCollection = this.smartdataCollectionMap.find(dbTableArg => {
+    const resultCollection = this.smartdataCollectionMap.find((dbTableArg) => {
       return dbTableArg.collectionName === nameArg;
     });
     return resultCollection;

ts/smartdata.classes.doc.ts

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

ts/smartdata.mongohelpers.ts

@@ -1,7 +0,0 @@
-export const addUsername = (mongoUrlArg: string, usernameArg: string): string => {
-  return mongoUrlArg.replace('<USERNAME>', usernameArg);
-};
-
-export const addPassword = (mongoUrlArg: string, passwordArg: string): string => {
-  return mongoUrlArg.replace('<PASSWORD>', passwordArg);
-};