5.0.6

.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.json

@@ -1,14 +1,14 @@
 {
   "name": "@pushrocks/smartdata",
-  "version": "4.0.21",
+  "version": "5.0.6",
   "private": false,
   "description": "do more with data",
   "main": "dist_ts/index.js",
   "typings": "dist_ts/index.d.ts",
+  "type": "module",
   "scripts": {
-    "test": "(tstest test/)",
+    "test": "tstest test/",
-    "testLocal": "(npmdocker)",
+    "build": "tsbuild --web --allowimplicitany"
-    "build": "(tsbuild --web)"
   },
   "repository": {
     "type": "git",
@@ -21,29 +21,28 @@
   },
   "homepage": "https://gitlab.com/pushrocks/smartdata#README",
   "dependencies": {
-    "@pushrocks/lik": "^5.0.0",
+    "@pushrocks/lik": "^6.0.0",
+    "@pushrocks/smartdelay": "^2.0.13",
     "@pushrocks/smartlog": "^2.0.44",
-    "@pushrocks/smartpromise": "^3.1.5",
+    "@pushrocks/smartmongo": "^2.0.7",
-    "@pushrocks/smartstring": "^3.0.24",
+    "@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",
+    "@tsclass/tsclass": "^4.0.8",
-    "@types/lodash": "^4.14.176",
+    "@types/lodash": "^4.14.182",
     "@types/mongodb": "^4.0.7",
     "lodash": "^4.17.21",
-    "mongodb": "^4.1.4",
+    "mongodb": "^4.7.0"
-    "runtime-type-checks": "0.0.4"
   },
   "devDependencies": {
-    "@gitzone/tsbuild": "^2.1.28",
+    "@gitzone/tsbuild": "^2.1.63",
-    "@gitzone/tstest": "^1.0.60",
+    "@gitzone/tsrun": "^1.2.37",
+    "@gitzone/tstest": "^1.0.71",
     "@pushrocks/qenv": "^4.0.10",
-    "@pushrocks/tapbundle": "^3.2.14",
+    "@pushrocks/tapbundle": "^5.0.3",
-    "@types/mongodb-memory-server": "^2.3.0",
+    "@types/node": "^17.0.42",
-    "@types/node": "^16.11.7",
+    "@types/shortid": "0.0.29"
-    "@types/shortid": "0.0.29",
-    "mongodb-memory-server": "^8.0.2",
-    "tslint": "^6.1.3",
-    "tslint-config-prettier": "^1.18.0"
   },
   "files": [
     "ts/**/*",

test/test.easystore.ts

@@ -1,42 +1,35 @@
 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 smartdata from '../ts/index.js';
-
-import * as mongoPlugin from 'mongodb-memory-server';
-import { smartunique } from '../ts/smartdata.plugins';
 
 // =======================================
 // Connecting to the database server
 // =======================================
 
+let smartmongoInstance: smartmongo.SmartMongo;
 let testDb: smartdata.SmartdataDb;
-let smartdataOptions: smartdata.IMongoDescriptor;
-let mongod: mongoPlugin.MongoMemoryServer;
 
-tap.skip.test('should create a testinstance as database', async () => {
+tap.test('should create a testinstance as database', async () => {
-  mongod = await mongoPlugin.MongoMemoryServer.create();
+  smartmongoInstance = await smartmongo.SmartMongo.createAndStart();
-  console.log('created mongod instance');
+  testDb = new smartdata.SmartdataDb(await smartmongoInstance.getMongoDescriptor());
-  console.log('mongod started');
-  smartdataOptions = {
-    mongoDbUrl: mongod.getUri(),
-  };
-  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,
   });
+  await testDb.init();
 });
 
 let easyStore: smartdata.EasyStore<{
@@ -48,15 +41,15 @@ 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 () => {
-  testDb.close();
+  await testDb.mongoDb.dropDatabase();
-  mongod.stop();
+  await testDb.close();
-  setTimeout(() => {
+  if (smartmongoInstance) {
-    process.exit(0);
+    await smartmongoInstance.stop();
-  }, 1000);
+  }
 });
 
 tap.start();

test/test.ts

@@ -1,46 +1,36 @@
 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 smartdata from '../ts/index.js';
-
-import * as mongoPlugin from 'mongodb-memory-server';
-import { smartunique } from '../ts/smartdata.plugins';
 
 // =======================================
 // 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.skip.test('should create a testinstance as database', async () => {
+tap.test('should create a testinstance as database', async () => {
-  mongod = await mongoPlugin.MongoMemoryServer.create();
+  smartmongoInstance = await smartmongo.SmartMongo.createAndStart();
-  console.log('created mongod instance');
+  testDb = new smartdata.SmartdataDb(await smartmongoInstance.getMongoDescriptor());
-  console.log('mongod started');
+  await testDb.init();
-  smartdataOptions = {
-    mongoDbUrl: mongod.getUri(),
-  };
-  console.log(smartdataOptions);
-  testDb = new smartdata.SmartdataDb(smartdataOptions);
 });
 
-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();
 });
 
@@ -65,6 +55,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',
@@ -77,7 +70,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();
 
@@ -85,6 +78,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);
   process.memoryUsage();
   do {
     const myCar3 = new Car('red', 'Renault');
@@ -102,7 +98,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 / 6;
   let counter = 0;
   do {
     const timeStart = Date.now();
@@ -116,14 +112,14 @@ 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].deepData.sodeep).toEqual('yes');
-    expect(myCars[0].brand).to.equal('Renault');
+    expect(myCars[0].brand).toEqual('Renault');
     counter++;
   } while (counter < totalQueryCycles);
 });
 
 tap.test('expect to get instance of Car with deep match', async () => {
-  const totalQueryCycles = totalCars / 4;
+  const totalQueryCycles = totalCars / 6;
   let counter = 0;
   do {
     const timeStart = Date.now();
@@ -139,8 +135,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].deepData.sodeep).toEqual('yes');
-    expect(myCars2[0].brand).to.equal('Volvo');
+    expect(myCars2[0].brand).toEqual('Volvo');
     counter++;
   } while (counter < totalQueryCycles);
 });
@@ -149,7 +145,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();
 });
@@ -160,7 +156,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();
   }
@@ -168,7 +164,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
@@ -203,21 +199,23 @@ tap.test('should store a new Truck', async () => {
 });
 
 tap.test('should use a cursor', async () => {
-  const cursor = await Truck.getCursor({});
+  const cursor = await Car.getCursor({});
-  cursor.forEach(async truckArg => {
+  let counter = 0;
-    console.log(truckArg.id);
+  await cursor.forEach(async (carArg) => {
+    counter++;
+    counter % 50 === 0 ? console.log(`50 more of ${carArg.color}`) : null;
   });
 });
 
 // =======================================
 // close the database connection
 // =======================================
-tap.test('should drop the db and close the database connection', async (tools) => {
+tap.test('close', async () => {
   await testDb.mongoDb.dropDatabase();
   await testDb.close();
-  try {
+  if (smartmongoInstance) {
-    await mongod.stop();
+    await smartmongoInstance.stop();
-  } catch (e) {}
+  }
 });
 
 tap.start({ throwOnError: true });

test/test.typescript.ts

@@ -1,46 +1,36 @@
 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 smartdata from '../ts/index.js';
-
-import * as mongoPlugin from 'mongodb-memory-server';
-import { smartunique } from '../ts/smartdata.plugins';
 
 // =======================================
 // 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.skip.test('should create a testinstance as database', async () => {
+tap.test('should create a testinstance as database', async () => {
-  mongod = await mongoPlugin.MongoMemoryServer.create();
+  smartmongoInstance = await smartmongo.SmartMongo.createAndStart();
-  console.log('created mongod instance');
+  testDb = new smartdata.SmartdataDb(await smartmongoInstance.getMongoDescriptor());
-  console.log('mongod started');
+  await testDb.init();
-  smartdataOptions = {
-    mongoDbUrl: mongod.getUri(),
-  };
-  console.log(smartdataOptions);
-  testDb = new smartdata.SmartdataDb(smartdataOptions);
 });
 
-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 +84,12 @@ tap.test('should get a car', async () => {
 // =======================================
 // close the database connection
 // =======================================
-tap.test('should close the database connection', async (tools) => {
+tap.test('close', async () => {
   await testDb.mongoDb.dropDatabase();
   await testDb.close();
-  try {
+  if (smartmongoInstance) {
-    await mongod.stop();
+    await smartmongoInstance.stop();
-  } catch (e) {}
+  }
 });
 
 tap.start({ throwOnError: true });

test/test.watch.ts

@@ -0,0 +1,74 @@
+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();
+});
+
+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();
+});
+
+@smartdata.Collection(() => testDb)
+class House extends smartdata.SmartDataDbDoc<House, House> {
+  @smartdata.unI()
+  public id: string = smartunique.shortId();
+
+  @smartdata.svDb()
+  public data = {
+    id: smartunique.shortId(),
+    hello: 'hello'
+  }
+}
+
+tap.test('should watch a collection', async (toolsArg) => {
+  const done = toolsArg.defer();
+  const watcher = await House.watch({});
+  watcher.changeSubject.subscribe(async houseArg => {
+    console.log('hey there, we observed a house');
+    await watcher.close();
+    done.resolve();
+  });
+  const newHouse = new House();
+  await newHouse.save();
+  console.log('saved a house');
+  await done.promise;
+})
+
+// =======================================
+// close the database connection
+// =======================================
+tap.test('close', async () => {
+  await testDb.mongoDb.dropDatabase();
+  await testDb.close();
+  if (smartmongoInstance) {
+    await smartmongoInstance.stop();
+  }
+});
+
+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: '5.0.6',
+  description: 'do more with data'
+}

ts/index.ts

@@ -1,6 +1,10 @@
-export * from './smartdata.classes.db';
+export * from './smartdata.classes.db.js';
-export * from './smartdata.classes.collection';
+export * from './smartdata.classes.collection.js';
-export * from './smartdata.classes.doc';
+export * from './smartdata.classes.doc.js';
-export * from './smartdata.classes.easystore';
+export * from './smartdata.classes.easystore.js';
+export * from './smartdata.classes.cursor.js';
 
-export { IMongoDescriptor } from './interfaces';
+// 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';

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

@@ -1,8 +1,9 @@
-import * as plugins from './smartdata.plugins';
+import * as plugins from './smartdata.plugins.js';
-import { SmartdataDb } from './smartdata.classes.db';
+import { SmartdataDb } from './smartdata.classes.db.js';
-import { SmartdataDbCursor } from './smartdata.classes.cursor';
+import { SmartdataDbCursor } from './smartdata.classes.cursor.js';
-import { SmartDataDbDoc } from './smartdata.classes.doc';
+import { SmartDataDbDoc } from './smartdata.classes.doc.js';
-import { CollectionFactory } from './smartdata.classes.collectionfactory';
+import { SmartdataDbWatcher } from './smartdata.classes.watcher.js';
+import { CollectionFactory } from './smartdata.classes.collectionfactory.js';
 
 export interface IFindOptions {
   limit?: number;
@@ -85,7 +86,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 +97,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 {
@@ -179,10 +180,10 @@ export class SmartdataCollection<T> {
     return result;
   }
 
-  public async getCursor(filterObject: any): Promise<SmartdataDbCursor<any>> {
+  public async getCursor(filterObjectArg: any, dbDocArg: typeof SmartDataDbDoc): Promise<SmartdataDbCursor<any>> {
     await this.init();
-    const cursor = this.mongoDbCollection.find(filterObject);
+    const cursor = this.mongoDbCollection.find(filterObjectArg);
-    return new SmartdataDbCursor(cursor);
+    return new SmartdataDbCursor(cursor, dbDocArg);
   }
 
   /**
@@ -196,6 +197,23 @@ export class SmartdataCollection<T> {
     return result;
   }
 
+  /**
+   * watches the collection while applying a filter
+   */
+   public async watch(filterObject: any, smartdataDbDocArg: typeof SmartDataDbDoc): Promise<SmartdataDbWatcher> {
+    await this.init();
+    const changeStream = this.mongoDbCollection.watch([
+      {
+        $match: filterObject
+      }
+    ], {
+      fullDocument: 'updateLookup'
+    });
+    const smartdataWatcher =  new SmartdataDbWatcher(changeStream, smartdataDbDocArg);
+    await smartdataWatcher.readyDeferred.promise;
+    return smartdataWatcher;
+  }
+
   /**
    * create an object in the database
    */

ts/smartdata.classes.collectionfactory.ts

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

ts/smartdata.classes.cursor.ts

@@ -1,4 +1,5 @@
-import * as plugins from './smartdata.plugins';
+import { SmartDataDbDoc } from './smartdata.classes.doc.js';
+import * as plugins from './smartdata.plugins.js';
 
 /**
  * a wrapper for the native mongodb cursor. Exposes better
@@ -8,26 +9,29 @@ export class SmartdataDbCursor<T = any> {
 
   // INSTANCE
   public mongodbCursor: plugins.mongodb.FindCursor<T>;
-  constructor(cursorArg: plugins.mongodb.FindCursor<T>) {
+  private smartdataDbDoc: typeof SmartDataDbDoc;
-    this.mongodbCursor = cursorArg
+  constructor(cursorArg: plugins.mongodb.FindCursor<T>, dbDocArg: typeof SmartDataDbDoc) {
-  };
+    this.mongodbCursor = cursorArg;
+    this.smartdataDbDoc = dbDocArg;
+  }
 
   public async next(closeAtEnd = true) {
-    const result = await this.mongodbCursor.next();
+    const result = this.smartdataDbDoc.createInstanceFromMongoDbNativeDoc(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;
-    do {
-      currentValue = await this.mongodbCursor.next();
-      if (currentValue) {
-        await forEachFuncArg(currentValue);
     }
-    } while (currentValue);
+    return result;
+  }
+
+  public async forEach(forEachFuncArg: (itemArg: any) => Promise<any>, closeCursorAtEnd = true) {
+    let nextDocument: any;
+    do {
+      nextDocument = await this.mongodbCursor.next();
+      if (nextDocument) {
+        const nextClassInstance = this.smartdataDbDoc.createInstanceFromMongoDbNativeDoc(nextDocument);
+        await forEachFuncArg(nextClassInstance);
+      }
+    } while (nextDocument);
     if (closeCursorAtEnd) {
       await this.close();
     }

ts/smartdata.classes.db.ts

@@ -1,11 +1,10 @@
-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 { SmartdataCollection } from './smartdata.classes.collection.js';
-import { EasyStore } from './smartdata.classes.easystore';
+import { EasyStore } from './smartdata.classes.easystore.js';
 
-import { logger } from './smartdata.logging';
+import { logger } from './smartdata.logging.js';
-import { IMongoDescriptor } from './interfaces';
 
 /**
  * interface - indicates the connection status of the db
@@ -13,13 +12,13 @@ import { IMongoDescriptor } from './interfaces';
 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.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 { SmartdataDb } from './smartdata.classes.db.js';
-import { SmartdataDbCursor } from './smartdata.classes.cursor';
+import { SmartdataDbCursor } from './smartdata.classes.cursor.js';
-import { IManager, SmartdataCollection } from './smartdata.classes.collection';
+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;
 
-  /**
+  // STATIC
-   * 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() {}
-
   public static createInstanceFromMongoDbNativeDoc<T>(
     this: plugins.tsclass.typeFest.Class<T>,
     mongoDbNativeDocArg: any
@@ -165,10 +137,32 @@ 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 collection: SmartdataCollection<T> = (this as any).collection;
+    const cursor: SmartdataDbCursor<T> = await collection.getCursor(
+      convertFilterForMongoDb(filterArg),
+      this as any as typeof SmartDataDbDoc
+    );
     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),
+      (this as any)
+    );
+    return watcher;
+  }
+
   /**
    * run a function for all instances
    * @returns
@@ -179,9 +173,41 @@ 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);
   }
 
+  // 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 * as plugins from './smartdata.plugins.js';
-import { Collection } from './smartdata.classes.collection';
+import { Collection } from './smartdata.classes.collection.js';
-import { SmartdataDb } from './smartdata.classes.db';
+import { SmartdataDb } from './smartdata.classes.db.js';
-import { SmartDataDbDoc, svDb, unI } from './smartdata.classes.doc';
+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,28 @@
+import { SmartDataDbDoc } from './smartdata.classes.doc.js';
+import * as plugins from './smartdata.plugins.js';
+
+/**
+ * a wrapper for the native mongodb cursor. Exposes better
+ */
+export class SmartdataDbWatcher<T = any> {
+  // STATIC
+  public readyDeferred = plugins.smartpromise.defer();
+
+  // INSTANCE
+  private changeStream: plugins.mongodb.ChangeStream<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) as any as T);
+    })
+    plugins.smartdelay.delayFor(0).then(() => {
+      this.readyDeferred.resolve();
+    });
+  }
+
+  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

@@ -7,8 +7,11 @@ export { tsclass };
 import * as smartlog from '@pushrocks/smartlog';
 import * as lodash from 'lodash';
 import * as mongodb from 'mongodb';
+import * as smartdelay from '@pushrocks/smartdelay'
+import * as smartpromise from '@pushrocks/smartpromise';
 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 { smartdelay, smartpromise, smartlog, lodash, smartq, smartrx, mongodb, smartstring, smartunique };

tsconfig.json

@@ -1,7 +1,9 @@
 {
   "compilerOptions": {
     "experimentalDecorators": true,
-    "target": "es2017",
+    "useDefineForClassFields": false,
-    "module": "commonjs"
+    "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"
-}