5.0.8

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartdata",
-  "version": "5.0.2",
+  "version": "5.0.8",
   "private": false,
   "description": "do more with data",
   "main": "dist_ts/index.js",
@@ -21,26 +21,27 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartdata#README",
   "dependencies": {
-    "@pushrocks/lik": "^5.0.4",
+    "@pushrocks/lik": "^6.0.0",
     "@pushrocks/smartdelay": "^2.0.13",
-    "@pushrocks/smartlog": "^2.0.44",
+    "@pushrocks/smartlog": "^3.0.1",
-    "@pushrocks/smartmongo": "^2.0.1",
+    "@pushrocks/smartmongo": "^2.0.7",
     "@pushrocks/smartpromise": "^3.1.7",
-    "@pushrocks/smartrx": "^2.0.25",
+    "@pushrocks/smartrx": "^3.0.0",
     "@pushrocks/smartstring": "^4.0.2",
     "@pushrocks/smartunique": "^3.0.3",
-    "@tsclass/tsclass": "^4.0.2",
+    "@tsclass/tsclass": "^4.0.19",
-    "@types/lodash": "^4.14.182",
+    "@types/lodash": "^4.14.185",
     "@types/mongodb": "^4.0.7",
     "lodash": "^4.17.21",
-    "mongodb": "^4.6.0"
+    "mongodb": "^4.9.1"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.61",
+    "@gitzone/tsbuild": "^2.1.65",
-    "@gitzone/tstest": "^1.0.71",
+    "@gitzone/tsrun": "^1.2.37",
-    "@pushrocks/qenv": "^4.0.10",
+    "@gitzone/tstest": "^1.0.73",
-    "@pushrocks/tapbundle": "^5.0.3",
+    "@pushrocks/qenv": "^5.0.2",
-    "@types/node": "^17.0.34",
+    "@pushrocks/tapbundle": "^5.0.4",
+    "@types/node": "^18.7.16",
     "@types/shortid": "0.0.29"
   },
   "files": [

test/test.ts

@@ -3,6 +3,8 @@ import { Qenv } from '@pushrocks/qenv';
 import * as smartmongo from '@pushrocks/smartmongo';
 import { smartunique } from '../ts/smartdata.plugins.js';
 
+import * as mongodb from 'mongodb';
+
 const testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit/');
 
 console.log(process.memoryUsage());
@@ -55,6 +57,9 @@ class Car extends smartdata.SmartDataDbDoc<Car, Car> {
   @smartdata.svDb()
   public brand: string;
 
+  @smartdata.svDb()
+  public testBuffer = Buffer.from('hello');
+
   @smartdata.svDb()
   deepData = {
     sodeep: 'yes',
@@ -67,7 +72,7 @@ class Car extends smartdata.SmartDataDbDoc<Car, Car> {
   }
 }
 
-tap.test('should save the car to the db', async () => {
+tap.test('should save the car to the db', async (toolsArg) => {
   const myCar = new Car('red', 'Volvo');
   await myCar.save();
 
@@ -75,6 +80,9 @@ tap.test('should save the car to the db', async () => {
   await myCar2.save();
 
   let counter = 0;
+
+  const gottenCarInstance = await Car.getInstance({});
+  console.log(gottenCarInstance.testBuffer instanceof mongodb.Binary);
   process.memoryUsage();
   do {
     const myCar3 = new Car('red', 'Renault');

ts/00_commitinfo_data.ts

@@ -3,6 +3,6 @@
  */
 export const commitinfo = {
   name: '@pushrocks/smartdata',
-  version: '5.0.2',
+  version: '5.0.8',
   description: 'do more with data'
 }

ts/index.ts

@@ -4,4 +4,7 @@ export * from './smartdata.classes.doc.js';
 export * from './smartdata.classes.easystore.js';
 export * from './smartdata.classes.cursor.js';
 
-export type { IMongoDescriptor } from './interfaces/index.js';
+// to be removed with the next breaking update
+import * as plugins from './smartdata.plugins.js';
+type IMongoDescriptor = plugins.tsclass.database.IMongoDescriptor;
+export type { IMongoDescriptor }

ts/interfaces/index.ts

@@ -1 +0,0 @@
-export * from './mongodescriptor.js';

ts/interfaces/mongodescriptor.ts

@@ -1,22 +0,0 @@
-export interface IMongoDescriptor {
-  /**
-   * the URL to connect to
-   */
-  mongoDbUrl: string;
-
-  /**
-   * the db to use for the project
-   */
-  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
-   */
-  mongoDbPass?: string;
-}

ts/smartdata.classes.collection.ts

@@ -109,7 +109,6 @@ export function Manager<TManager extends IManager>(managerArg?: TManager | TDela
   };
 }
 
-// tslint:disable-next-line: max-classes-per-file
 export class SmartdataCollection<T> {
   /**
    * the collection that is used

ts/smartdata.classes.db.ts

@@ -5,7 +5,6 @@ import { SmartdataCollection } from './smartdata.classes.collection.js';
 import { EasyStore } from './smartdata.classes.easystore.js';
 
 import { logger } from './smartdata.logging.js';
-import { IMongoDescriptor } from './interfaces/index.js';
 
 /**
  * interface - indicates the connection status of the db
@@ -13,13 +12,13 @@ import { IMongoDescriptor } from './interfaces/index.js';
 export type TConnectionStatus = 'initial' | 'disconnected' | 'connected' | 'failed';
 
 export class SmartdataDb {
-  smartdataOptions: IMongoDescriptor;
+  smartdataOptions: plugins.tsclass.database.IMongoDescriptor;
   mongoDbClient: plugins.mongodb.MongoClient;
   mongoDb: plugins.mongodb.Db;
   status: TConnectionStatus;
   smartdataCollectionMap = new ObjectMap<SmartdataCollection<any>>();
 
-  constructor(smartdataOptions: IMongoDescriptor) {
+  constructor(smartdataOptions: plugins.tsclass.database.IMongoDescriptor) {
     this.smartdataOptions = smartdataOptions;
     this.status = 'initial';
   }

ts/smartdata.classes.watcher.ts

@@ -11,11 +11,11 @@ export class SmartdataDbWatcher<T = any> {
   // INSTANCE
   private changeStream: plugins.mongodb.ChangeStream<T>;
 
-  public changeSubject = new plugins.smartrx.rxjs.Subject<SmartDataDbDoc<T, T>>();
+  public changeSubject = new plugins.smartrx.rxjs.Subject<T>();
   constructor(changeStreamArg: plugins.mongodb.ChangeStream<T>, smartdataDbDocArg: typeof SmartDataDbDoc) {
     this.changeStream = changeStreamArg;
     this.changeStream.on('change', async (item: T) => {
-      this.changeSubject.next(smartdataDbDocArg.createInstanceFromMongoDbNativeDoc(item));
+      this.changeSubject.next(smartdataDbDocArg.createInstanceFromMongoDbNativeDoc(item) as any as T);
     })
     plugins.smartdelay.delayFor(0).then(() => {
       this.readyDeferred.resolve();