fix(core): update

package.json

@@ -5,6 +5,7 @@
   "description": "do more with data",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "scripts": {
     "test": "(tstest test/)",
     "testLocal": "(npmdocker)",
@@ -21,29 +22,26 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartdata#README",
   "dependencies": {
-    "@pushrocks/lik": "^5.0.0",
+    "@pushrocks/lik": "^5.0.4",
     "@pushrocks/smartlog": "^2.0.44",
-    "@pushrocks/smartpromise": "^3.1.5",
-    "@pushrocks/smartstring": "^3.0.24",
+    "@pushrocks/smartmongo": "^1.0.8",
+    "@pushrocks/smartpromise": "^3.1.7",
+    "@pushrocks/smartrx": "^2.0.25",
+    "@pushrocks/smartstring": "^4.0.2",
     "@pushrocks/smartunique": "^3.0.3",
-    "@tsclass/tsclass": "^3.0.36",
-    "@types/lodash": "^4.14.176",
+    "@tsclass/tsclass": "^4.0.2",
+    "@types/lodash": "^4.14.182",
     "@types/mongodb": "^4.0.7",
     "lodash": "^4.17.21",
-    "mongodb": "^4.1.4",
-    "runtime-type-checks": "0.0.4"
+    "mongodb": "^4.6.0"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.28",
-    "@gitzone/tstest": "^1.0.60",
+    "@gitzone/tsbuild": "^2.1.61",
+    "@gitzone/tstest": "^1.0.71",
     "@pushrocks/qenv": "^4.0.10",
-    "@pushrocks/tapbundle": "^3.2.14",
-    "@types/mongodb-memory-server": "^2.3.0",
-    "@types/node": "^16.11.7",
-    "@types/shortid": "0.0.29",
-    "mongodb-memory-server": "^8.0.2",
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0"
+    "@pushrocks/tapbundle": "^5.0.3",
+    "@types/node": "^17.0.33",
+    "@types/shortid": "0.0.29"
   },
   "files": [
     "ts/**/*",

test/test.easystore.ts

@@ -1,33 +1,25 @@
 import { tap, expect } from '@pushrocks/tapbundle';
 import { Qenv } from '@pushrocks/qenv';
+import * as smartmongo from '@pushrocks/smartmongo';
+import { smartunique } from '../ts/smartdata.plugins.js';
 
 const testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit/');
 
 console.log(process.memoryUsage());
 
 // the tested module
-import * as smartdata from '../ts/index';
-
-import * as mongoPlugin from 'mongodb-memory-server';
-import { smartunique } from '../ts/smartdata.plugins';
+import * as smartdata from '../ts/index.js';
 
 // =======================================
 // Connecting to the database server
 // =======================================
 
+let smartmongoInstance: smartmongo.SmartMongo;
 let testDb: smartdata.SmartdataDb;
-let smartdataOptions: smartdata.IMongoDescriptor;
-let mongod: mongoPlugin.MongoMemoryServer;
 
 tap.test('should create a testinstance as database', async () => {
-  mongod = await mongoPlugin.MongoMemoryServer.create();
-  console.log('created mongod instance');
-  console.log('mongod started');
-  smartdataOptions = {
-    mongoDbUrl: mongod.getUri(),
-  };
-  console.log(smartdataOptions);
-  testDb = new smartdata.SmartdataDb(smartdataOptions);
+  smartmongoInstance = await smartmongo.SmartMongo.createAndStart();
+  testDb = new smartdata.SmartdataDb(await smartmongoInstance.getMongoDescriptor());
   await testDb.init();
 });
 
@@ -49,12 +41,12 @@ tap.test('should create an easystore', async () => {
   easyStore = await testDb.createEasyStore('hellothere');
   await easyStore.writeKey('key1', 'hello');
   const retrievedKey = await easyStore.readKey('key1');
-  expect(retrievedKey).to.equal('hello');
+  expect(retrievedKey).toEqual('hello');
 });
 
 tap.test('close', async () => {
-  if (mongod) {
-    await mongod.stop();
+  if (smartmongoInstance) {
+    await smartmongoInstance.stop();
   } else {
     await testDb.mongoDb.dropDatabase();
   }

test/test.ts

@@ -1,35 +1,27 @@
 import { tap, expect } from '@pushrocks/tapbundle';
 import { Qenv } from '@pushrocks/qenv';
+import * as smartmongo from '@pushrocks/smartmongo';
+import { smartunique } from '../ts/smartdata.plugins.js';
 
 const testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit/');
 
 console.log(process.memoryUsage());
 
 // the tested module
-import * as smartdata from '../ts/index';
-
-import * as mongoPlugin from 'mongodb-memory-server';
-import { smartunique } from '../ts/smartdata.plugins';
+import * as smartdata from '../ts/index.js';
 
 // =======================================
 // Connecting to the database server
 // =======================================
 
+let smartmongoInstance: smartmongo.SmartMongo;
 let testDb: smartdata.SmartdataDb;
-let smartdataOptions: smartdata.IMongoDescriptor;
-let mongod: mongoPlugin.MongoMemoryServer;
 
 const totalCars = 2000;
 
 tap.test('should create a testinstance as database', async () => {
-  mongod = await mongoPlugin.MongoMemoryServer.create();
-  console.log('created mongod instance');
-  console.log('mongod started');
-  smartdataOptions = {
-    mongoDbUrl: mongod.getUri(),
-  };
-  console.log(smartdataOptions);
-  testDb = new smartdata.SmartdataDb(smartdataOptions);
+  smartmongoInstance = await smartmongo.SmartMongo.createAndStart();
+  testDb = new smartdata.SmartdataDb(await smartmongoInstance.getMongoDescriptor());
   await testDb.init();
 });
 
@@ -100,7 +92,7 @@ tap.test('should save the car to the db', async () => {
 });
 
 tap.test('expect to get instance of Car with shallow match', async () => {
-  const totalQueryCycles = totalCars / 4;
+  const totalQueryCycles = totalCars / 2;
   let counter = 0;
   do {
     const timeStart = Date.now();
@@ -114,8 +106,8 @@ tap.test('expect to get instance of Car with shallow match', async () => {
         }ms to query a set of 2000 with memory footprint ${process.memoryUsage().rss / 1e6} MB`
       );
     }
-    expect(myCars[0].deepData.sodeep).to.equal('yes');
-    expect(myCars[0].brand).to.equal('Renault');
+    expect(myCars[0].deepData.sodeep).toEqual('yes');
+    expect(myCars[0].brand).toEqual('Renault');
     counter++;
   } while (counter < totalQueryCycles);
 });
@@ -137,8 +129,8 @@ tap.test('expect to get instance of Car with deep match', async () => {
         }ms to deep query a set of 2000 with memory footprint ${process.memoryUsage().rss / 1e6} MB`
       );
     }
-    expect(myCars2[0].deepData.sodeep).to.equal('yes');
-    expect(myCars2[0].brand).to.equal('Volvo');
+    expect(myCars2[0].deepData.sodeep).toEqual('yes');
+    expect(myCars2[0].brand).toEqual('Volvo');
     counter++;
   } while (counter < totalQueryCycles);
 });
@@ -147,7 +139,7 @@ tap.test('expect to get instance of Car and update it', async () => {
   const myCar = await Car.getInstance<Car>({
     brand: 'Volvo',
   });
-  expect(myCar.color).to.equal('red');
+  expect(myCar.color).toEqual('red');
   myCar.color = 'blue';
   await myCar.save();
 });
@@ -158,7 +150,7 @@ tap.test('should be able to delete an instance of car', async () => {
     color: 'blue',
   });
   console.log(myCars);
-  expect(myCars[0].color).to.equal('blue');
+  expect(myCars[0].color).toEqual('blue');
   for (const myCar of myCars) {
     await myCar.delete();
   }
@@ -166,7 +158,7 @@ tap.test('should be able to delete an instance of car', async () => {
   const myCar2 = await Car.getInstance<Car>({
     brand: 'Volvo',
   });
-  expect(myCar2.color).to.equal('red');
+  expect(myCar2.color).toEqual('red');
 });
 
 // tslint:disable-next-line: max-classes-per-file
@@ -201,9 +193,11 @@ tap.test('should store a new Truck', async () => {
 });
 
 tap.test('should use a cursor', async () => {
-  const cursor = await Truck.getCursor({});
-  cursor.forEach(async (truckArg) => {
-    console.log(truckArg.id);
+  const cursor = await Car.getCursor({});
+  let counter = 0;
+  await cursor.forEach(async (carArg) => {
+    counter++;
+    counter % 50 === 0 ? console.log(`50 more of ${carArg.color}`) : null;
   });
 });
 
@@ -211,8 +205,8 @@ tap.test('should use a cursor', async () => {
 // close the database connection
 // =======================================
 tap.test('close', async () => {
-  if (mongod) {
-    await mongod.stop();
+  if (smartmongoInstance) {
+    await smartmongoInstance.stop();
   } else {
     await testDb.mongoDb.dropDatabase();
   }

test/test.typescript.ts

@@ -1,35 +1,27 @@
 import { tap, expect } from '@pushrocks/tapbundle';
 import { Qenv } from '@pushrocks/qenv';
+import * as smartmongo from '@pushrocks/smartmongo';
+import { smartunique } from '../ts/smartdata.plugins.js';
 
 const testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit/');
 
 console.log(process.memoryUsage());
 
 // the tested module
-import * as smartdata from '../ts/index';
-
-import * as mongoPlugin from 'mongodb-memory-server';
-import { smartunique } from '../ts/smartdata.plugins';
+import * as smartdata from '../ts/index.js';
 
 // =======================================
 // Connecting to the database server
 // =======================================
 
+let smartmongoInstance: smartmongo.SmartMongo;
 let testDb: smartdata.SmartdataDb;
-let smartdataOptions: smartdata.IMongoDescriptor;
-let mongod: mongoPlugin.MongoMemoryServer;
 
 const totalCars = 2000;
 
 tap.test('should create a testinstance as database', async () => {
-  mongod = await mongoPlugin.MongoMemoryServer.create();
-  console.log('created mongod instance');
-  console.log('mongod started');
-  smartdataOptions = {
-    mongoDbUrl: mongod.getUri(),
-  };
-  console.log(smartdataOptions);
-  testDb = new smartdata.SmartdataDb(smartdataOptions);
+  smartmongoInstance = await smartmongo.SmartMongo.createAndStart();
+  testDb = new smartdata.SmartdataDb(await smartmongoInstance.getMongoDescriptor());
   await testDb.init();
 });
 
@@ -93,8 +85,8 @@ tap.test('should get a car', async () => {
 // close the database connection
 // =======================================
 tap.test('close', async () => {
-  if (mongod) {
-    await mongod.stop();
+  if (smartmongoInstance) {
+    await smartmongoInstance.stop();
   } else {
     await testDb.mongoDb.dropDatabase();
   }

test/test.watch.ts

@@ -0,0 +1,62 @@
+import { tap, expect } from '@pushrocks/tapbundle';
+import { Qenv } from '@pushrocks/qenv';
+import * as smartmongo from '@pushrocks/smartmongo';
+import { smartunique } from '../ts/smartdata.plugins.js';
+
+const testQenv = new Qenv(process.cwd(), process.cwd() + '/.nogit/');
+
+console.log(process.memoryUsage());
+
+// the tested module
+import * as smartdata from '../ts/index.js';
+
+// =======================================
+// Connecting to the database server
+// =======================================
+
+let smartmongoInstance: smartmongo.SmartMongo;
+let testDb: smartdata.SmartdataDb;
+
+const totalCars = 2000;
+
+tap.test('should create a testinstance as database', async () => {
+  smartmongoInstance = await smartmongo.SmartMongo.createAndStart();
+  testDb = new smartdata.SmartdataDb(await smartmongoInstance.getMongoDescriptor());
+  await testDb.init();
+});
+
+@smartdata.Collection(() => testDb)
+class House extends smartdata.SmartDataDbDoc<House, House> {
+  @smartdata.svDb()
+  public data = {
+    id: smartunique.shortId(),
+    hello: 'hello'
+  }
+}
+
+tap.skip.test('should watch a collection', async (toolsArg) => {
+  const done = toolsArg.defer();
+  const watcher = await House.watch({});
+  watcher.changeSubject.subscribe(houseArg => {
+    console.log('hey there, we observed a house');
+    watcher.close();
+    done.resolve();
+  });
+  const newHouse = new House();
+  await newHouse.save();
+  await done.promise;
+})
+
+// =======================================
+// close the database connection
+// =======================================
+tap.test('close', async () => {
+  if (smartmongoInstance) {
+    await smartmongoInstance.stop();
+  } else {
+    await testDb.mongoDb.dropDatabase();
+  }
+  await testDb.close();
+});
+
+tap.start({ throwOnError: true });

ts/00_commitinfo_data.ts

@@ -0,0 +1,8 @@
+/**
+ * autocreated commitinfo by @pushrocks/commitinfo
+ */
+export const commitinfo = {
+  name: '@pushrocks/smartdata',
+  version: '4.0.28',
+  description: 'do more with data'
+}

ts/index.ts

@@ -1,7 +1,7 @@
-export * from './smartdata.classes.db';
-export * from './smartdata.classes.collection';
-export * from './smartdata.classes.doc';
-export * from './smartdata.classes.easystore';
-export * from './smartdata.classes.cursor';
+export * from './smartdata.classes.db.js';
+export * from './smartdata.classes.collection.js';
+export * from './smartdata.classes.doc.js';
+export * from './smartdata.classes.easystore.js';
+export * from './smartdata.classes.cursor.js';
 
-export { IMongoDescriptor } from './interfaces';
+export type { IMongoDescriptor } from './interfaces/index.js';

ts/interfaces/index.ts

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

ts/smartdata.classes.collection.ts

@@ -1,8 +1,9 @@
-import * as plugins from './smartdata.plugins';
-import { SmartdataDb } from './smartdata.classes.db';
-import { SmartdataDbCursor } from './smartdata.classes.cursor';
-import { SmartDataDbDoc } from './smartdata.classes.doc';
-import { CollectionFactory } from './smartdata.classes.collectionfactory';
+import * as plugins from './smartdata.plugins.js';
+import { SmartdataDb } from './smartdata.classes.db.js';
+import { SmartdataDbCursor } from './smartdata.classes.cursor.js';
+import { SmartDataDbDoc } from './smartdata.classes.doc.js';
+import { SmartdataDbWatcher } from './smartdata.classes.watcher.js';
+import { CollectionFactory } from './smartdata.classes.collectionfactory.js';
 
 export interface IFindOptions {
   limit?: number;
@@ -196,6 +197,19 @@ export class SmartdataCollection<T> {
     return result;
   }
 
+  /**
+   * watches the collection while applying a filter
+   */
+   public async watch(filterObject: any): Promise<SmartdataDbWatcher> {
+    await this.init();
+    const changeStream = this.mongoDbCollection.watch([
+      {
+        $match: filterObject
+      }
+    ]);
+    return new SmartdataDbWatcher(changeStream);
+  }
+
   /**
    * create an object in the database
    */

ts/smartdata.classes.collectionfactory.ts

@@ -1,6 +1,6 @@
-import * as plugins from './smartdata.plugins';
-import { SmartdataCollection } from './smartdata.classes.collection';
-import { SmartdataDb } from './smartdata.classes.db';
+import * as plugins from './smartdata.plugins.js';
+import { SmartdataCollection } from './smartdata.classes.collection.js';
+import { SmartdataDb } from './smartdata.classes.db.js';
 
 export class CollectionFactory {
   public collections: { [key: string]: SmartdataCollection<any> } = {};

ts/smartdata.classes.cursor.ts

@@ -1,4 +1,4 @@
-import * as plugins from './smartdata.plugins';
+import * as plugins from './smartdata.plugins.js';
 
 /**
  * a wrapper for the native mongodb cursor. Exposes better

ts/smartdata.classes.db.ts

@@ -1,11 +1,11 @@
-import * as plugins from './smartdata.plugins';
+import * as plugins from './smartdata.plugins.js';
 import { ObjectMap } from '@pushrocks/lik';
 
-import { SmartdataCollection } from './smartdata.classes.collection';
-import { EasyStore } from './smartdata.classes.easystore';
+import { SmartdataCollection } from './smartdata.classes.collection.js';
+import { EasyStore } from './smartdata.classes.easystore.js';
 
-import { logger } from './smartdata.logging';
-import { IMongoDescriptor } from './interfaces';
+import { logger } from './smartdata.logging.js';
+import { IMongoDescriptor } from './interfaces/index.js';
 
 /**
  * interface - indicates the connection status of the db

ts/smartdata.classes.doc.ts

@@ -1,10 +1,11 @@
-import * as plugins from './smartdata.plugins';
+import * as plugins from './smartdata.plugins.js';
 
 import { ObjectMap } from '@pushrocks/lik';
 
-import { SmartdataDb } from './smartdata.classes.db';
-import { SmartdataDbCursor } from './smartdata.classes.cursor';
-import { IManager, SmartdataCollection } from './smartdata.classes.collection';
+import { SmartdataDb } from './smartdata.classes.db.js';
+import { SmartdataDbCursor } from './smartdata.classes.cursor.js';
+import { IManager, SmartdataCollection } from './smartdata.classes.collection.js';
+import { SmartdataDbWatcher } from './smartdata.classes.watcher.js';
 
 export type TDocCreation = 'db' | 'new' | 'mixed';
 
@@ -77,36 +78,7 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
   public static manager;
   public manager: TManager;
 
-  /**
-   * how the Doc in memory was created, may prove useful later.
-   */
-  public creationStatus: TDocCreation = 'new';
-
-  /**
-   * unique indexes
-   */
-  public uniqueIndexes: string[];
-
-  /**
-   * an array of saveable properties of a doc
-   */
-  public saveableProperties: string[];
-
-  /**
-   * name
-   */
-  public name: string;
-
-  /**
-   * primary id in the database
-   */
-  public dbDocUniqueId: string;
-
-  /**
-   * class constructor
-   */
-  constructor() {}
-
+  // STATIC
   public static createInstanceFromMongoDbNativeDoc<T>(
     this: plugins.tsclass.typeFest.Class<T>,
     mongoDbNativeDocArg: any
@@ -171,6 +143,23 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
     return cursor;
   }
 
+  /**
+   * watch the collection
+   * @param this 
+   * @param filterArg 
+   * @param forEachFunction 
+   */
+   public static async watch<T>(
+    this: plugins.tsclass.typeFest.Class<T>,
+    filterArg: plugins.tsclass.typeFest.PartialDeep<T>
+  ) {
+    const collection: SmartdataCollection<T> = (this as any).collection;
+    const watcher: SmartdataDbWatcher<T> = await collection.watch(
+      convertFilterForMongoDb(filterArg)
+    );
+    return watcher;
+  }
+
   /**
    * run a function for all instances
    * @returns
@@ -184,6 +173,38 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
     await cursor.forEach(forEachFunction);
   }
 
+  // INSTANCE
+
+  /**
+   * how the Doc in memory was created, may prove useful later.
+   */
+  public creationStatus: TDocCreation = 'new';
+
+  /**
+   * unique indexes
+   */
+  public uniqueIndexes: string[];
+
+  /**
+   * an array of saveable properties of a doc
+   */
+  public saveableProperties: string[];
+
+  /**
+   * name
+   */
+  public name: string;
+
+  /**
+   * primary id in the database
+   */
+  public dbDocUniqueId: string;
+
+  /**
+   * class constructor
+   */
+  constructor() {}
+
   /**
    * saves this instance but not any connected items
    * may lead to data inconsistencies, but is faster

ts/smartdata.classes.easystore.ts

@@ -1,7 +1,7 @@
-import * as plugins from './smartdata.plugins';
-import { Collection } from './smartdata.classes.collection';
-import { SmartdataDb } from './smartdata.classes.db';
-import { SmartDataDbDoc, svDb, unI } from './smartdata.classes.doc';
+import * as plugins from './smartdata.plugins.js';
+import { Collection } from './smartdata.classes.collection.js';
+import { SmartdataDb } from './smartdata.classes.db.js';
+import { SmartDataDbDoc, svDb, unI } from './smartdata.classes.doc.js';
 
 /**
  * EasyStore allows the storage of easy objects. It also allows easy sharing of the object between different instances

ts/smartdata.classes.watcher.ts

@@ -0,0 +1,22 @@
+import * as plugins from './smartdata.plugins.js';
+
+/**
+ * a wrapper for the native mongodb cursor. Exposes better
+ */
+export class SmartdataDbWatcher<T = any> {
+  // STATIC
+
+  // INSTANCE
+  public changeStream: plugins.mongodb.ChangeStream<T>;
+  public changeSubject = new plugins.smartrx.rxjs.Subject<T>();
+  constructor(changeStreamArg: plugins.mongodb.ChangeStream<T>) {
+    this.changeStream = changeStreamArg;
+    this.changeStream.on('change', (item: T) => {
+      this.changeSubject.next(item);
+    })
+  }
+
+  public async close() {
+    await this.changeStream.close();
+  }
+}

ts/smartdata.logging.ts

@@ -1,3 +1,3 @@
-import * as plugins from './smartdata.plugins';
+import * as plugins from './smartdata.plugins.js';
 
 export const logger = new plugins.smartlog.ConsoleLog();

ts/smartdata.plugins.ts

@@ -8,7 +8,8 @@ import * as smartlog from '@pushrocks/smartlog';
 import * as lodash from 'lodash';
 import * as mongodb from 'mongodb';
 import * as smartq from '@pushrocks/smartpromise';
+import * as smartrx from '@pushrocks/smartrx';
 import * as smartstring from '@pushrocks/smartstring';
 import * as smartunique from '@pushrocks/smartunique';
 
-export { smartlog, lodash, smartq, mongodb, smartstring, smartunique };
+export { smartlog, lodash, smartq, smartrx, mongodb, smartstring, smartunique };

tsconfig.json

@@ -1,7 +1,9 @@
 {
   "compilerOptions": {
     "experimentalDecorators": true,
-    "target": "es2017",
-    "module": "commonjs"
+    "useDefineForClassFields": false,
+    "target": "ES2022",
+    "module": "ES2022",
+    "moduleResolution": "nodenext"
   }
 }

tslint.json

@@ -1,17 +0,0 @@
-{
-  "extends": ["tslint:latest", "tslint-config-prettier"],
-  "rules": {
-    "semicolon": [true, "always"],
-    "no-console": false,
-    "ordered-imports": false,
-    "object-literal-sort-keys": false,
-    "member-ordering": {
-      "options":{
-        "order": [
-          "static-method"
-        ]
-      }
-    }
-  },
-  "defaultSeverity": "warning"
-}