4.0.13

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
-      "type": "node",
+      "command": "npm test",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
-        "${relativeFile}"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
-    },
-    {
-      "name": "test.ts",
-      "type": "node",
-      "request": "launch",
-      "args": [
-        "test/test.ts"
-      ],
-      "runtimeArgs": ["-r", "@gitzone/tsrun"],
-      "cwd": "${workspaceRoot}",
-      "protocol": "inspector",
-      "internalConsoleOptions": "openOnSessionStart"
+      "type": "node-terminal"
     }
   ]
 }

package-lock.json

@@ -1,18 +1,19 @@
 {
   "name": "@pushrocks/smartdata",
-  "version": "4.0.3",
+  "version": "4.0.13",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@pushrocks/smartdata",
-      "version": "4.0.3",
+      "version": "4.0.13",
       "license": "MIT",
       "dependencies": {
         "@pushrocks/lik": "^4.0.20",
         "@pushrocks/smartlog": "^2.0.39",
         "@pushrocks/smartpromise": "^3.1.5",
         "@pushrocks/smartstring": "^3.0.24",
+        "@pushrocks/smartunique": "^3.0.3",
         "@tsclass/tsclass": "^3.0.33",
         "@types/lodash": "^4.14.169",
         "@types/mongodb": "^3.6.12",
@@ -24,7 +25,6 @@
         "@gitzone/tsbuild": "^2.1.25",
         "@gitzone/tstest": "^1.0.54",
         "@pushrocks/qenv": "^4.0.10",
-        "@pushrocks/smartunique": "^3.0.3",
         "@pushrocks/tapbundle": "^3.2.14",
         "@types/mongodb-memory-server": "^2.3.0",
         "@types/node": "^15.3.0",
@@ -2622,7 +2622,6 @@
       "version": "3.0.3",
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartunique/-/smartunique-3.0.3.tgz",
       "integrity": "sha512-f+c3s2WzzjASoRHyYTLU0kHDVWREg4sZVdi5L42bTA3CTUWNrcGUC62h4wP4U4BiPl3bopTr3LPhClZHJ738oA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/shortid": "0.0.29",
@@ -3195,7 +3194,6 @@
       "version": "0.0.29",
       "resolved": "https://verdaccio.lossless.one/@types%2fshortid/-/shortid-0.0.29.tgz",
       "integrity": "sha1-gJPuBBam4r8qpjOBCRFLP7/6Dps=",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/through2": {
@@ -3239,7 +3237,6 @@
       "version": "7.0.4",
       "resolved": "https://verdaccio.lossless.one/@types%2fuuid/-/uuid-7.0.4.tgz",
       "integrity": "sha512-WGZCqBZZ0mXN2RxvLHL6/7RCu+OWs28jgQMP04LWfpyJlQUMTR6YU9CNJAKDgbw+EV/u687INXuLUc7FuML/4g==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@types/which": {
@@ -9442,7 +9439,6 @@
       "version": "2.1.11",
       "resolved": "https://verdaccio.lossless.one/nanoid/-/nanoid-2.1.11.tgz",
       "integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/nanomatch": {
@@ -12714,7 +12710,6 @@
       "version": "2.2.16",
       "resolved": "https://verdaccio.lossless.one/shortid/-/shortid-2.2.16.tgz",
       "integrity": "sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "nanoid": "^2.1.0"
@@ -14621,7 +14616,6 @@
       "version": "7.0.3",
       "resolved": "https://verdaccio.lossless.one/uuid/-/uuid-7.0.3.tgz",
       "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
-      "dev": true,
       "license": "MIT",
       "bin": {
         "uuid": "dist/bin/uuid"
@@ -17058,7 +17052,6 @@
       "version": "3.0.3",
       "resolved": "https://verdaccio.lossless.one/@pushrocks%2fsmartunique/-/smartunique-3.0.3.tgz",
       "integrity": "sha512-f+c3s2WzzjASoRHyYTLU0kHDVWREg4sZVdi5L42bTA3CTUWNrcGUC62h4wP4U4BiPl3bopTr3LPhClZHJ738oA==",
-      "dev": true,
       "requires": {
         "@types/shortid": "0.0.29",
         "@types/uuid": "^7.0.0",
@@ -17527,8 +17520,7 @@
     "@types/shortid": {
       "version": "0.0.29",
       "resolved": "https://verdaccio.lossless.one/@types%2fshortid/-/shortid-0.0.29.tgz",
-      "integrity": "sha1-gJPuBBam4r8qpjOBCRFLP7/6Dps=",
-      "dev": true
+      "integrity": "sha1-gJPuBBam4r8qpjOBCRFLP7/6Dps="
     },
     "@types/through2": {
       "version": "2.0.36",
@@ -17565,8 +17557,7 @@
     "@types/uuid": {
       "version": "7.0.4",
       "resolved": "https://verdaccio.lossless.one/@types%2fuuid/-/uuid-7.0.4.tgz",
-      "integrity": "sha512-WGZCqBZZ0mXN2RxvLHL6/7RCu+OWs28jgQMP04LWfpyJlQUMTR6YU9CNJAKDgbw+EV/u687INXuLUc7FuML/4g==",
-      "dev": true
+      "integrity": "sha512-WGZCqBZZ0mXN2RxvLHL6/7RCu+OWs28jgQMP04LWfpyJlQUMTR6YU9CNJAKDgbw+EV/u687INXuLUc7FuML/4g=="
     },
     "@types/which": {
       "version": "1.3.2",
@@ -22144,8 +22135,7 @@
     "nanoid": {
       "version": "2.1.11",
       "resolved": "https://verdaccio.lossless.one/nanoid/-/nanoid-2.1.11.tgz",
-      "integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA==",
-      "dev": true
+      "integrity": "sha512-s/snB+WGm6uwi0WjsZdaVcuf3KJXlfGl2LcxgwkEwJF0D/BWzVWAZW/XY4bFaiR7s0Jk3FPvlnepg1H1b1UwlA=="
     },
     "nanomatch": {
       "version": "1.2.13",
@@ -24584,7 +24574,6 @@
       "version": "2.2.16",
       "resolved": "https://verdaccio.lossless.one/shortid/-/shortid-2.2.16.tgz",
       "integrity": "sha512-Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g==",
-      "dev": true,
       "requires": {
         "nanoid": "^2.1.0"
       }
@@ -25976,8 +25965,7 @@
     "uuid": {
       "version": "7.0.3",
       "resolved": "https://verdaccio.lossless.one/uuid/-/uuid-7.0.3.tgz",
-      "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg==",
-      "dev": true
+      "integrity": "sha512-DPSke0pXhTZgoF/d+WSt2QaKMCFSfx7QegxEWT+JOuHF5aWrKEn0G+ztjuJg/gG8/ItK+rbPCD/yNv8yyih6Cg=="
     },
     "v8-compile-cache": {
       "version": "2.3.0",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartdata",
-  "version": "4.0.3",
+  "version": "4.0.13",
   "private": false,
   "description": "do more with data",
   "main": "dist_ts/index.js",
@@ -25,6 +25,7 @@
     "@pushrocks/smartlog": "^2.0.39",
     "@pushrocks/smartpromise": "^3.1.5",
     "@pushrocks/smartstring": "^3.0.24",
+    "@pushrocks/smartunique": "^3.0.3",
     "@tsclass/tsclass": "^3.0.33",
     "@types/lodash": "^4.14.169",
     "@types/mongodb": "^3.6.12",
@@ -36,7 +37,6 @@
     "@gitzone/tsbuild": "^2.1.25",
     "@gitzone/tstest": "^1.0.54",
     "@pushrocks/qenv": "^4.0.10",
-    "@pushrocks/smartunique": "^3.0.3",
     "@pushrocks/tapbundle": "^3.2.14",
     "@types/mongodb-memory-server": "^2.3.0",
     "@types/node": "^15.3.0",

test/test.ts

@@ -213,6 +213,7 @@ tap.test('should ', async () => {})
 // close the database connection
 // =======================================
 tap.test('should close the database connection', async (tools) => {
+  await testDb.mongoDb.dropDatabase();
   await testDb.close();
   try {
     await mongod.stop();

test/test.typescript.ts

@@ -0,0 +1,110 @@
+import { tap, expect } from '@pushrocks/tapbundle';
+import { Qenv } from '@pushrocks/qenv';
+
+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';
+
+// =======================================
+// Connecting to the database server
+// =======================================
+
+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 () => {
+  mongod = new mongoPlugin.MongoMemoryServer({});
+  console.log('created mongod instance');
+  await mongod._startUpInstance().catch((err) => {
+    console.log(err);
+  });
+  console.log('mongod started');
+  smartdataOptions = {
+    mongoDbName: await mongod.getDbName(),
+    mongoDbPass: '',
+    mongoDbUrl: await mongod.getUri(),
+  };
+  console.log(smartdataOptions);
+  testDb = new smartdata.SmartdataDb(smartdataOptions);
+});
+
+tap.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();
+});
+
+// =======================================
+// The actual tests
+// =======================================
+
+// ------
+// Collections
+// ------
+@smartdata.Manager()
+class Car extends smartdata.SmartDataDbDoc<Car, Car> {
+  @smartdata.unI()
+  public index: string = smartunique.shortId();
+
+  @smartdata.svDb()
+  public color: string;
+
+  @smartdata.svDb()
+  public brand: string;
+
+  @smartdata.svDb()
+  deepData = {
+    sodeep: 'yes',
+  };
+
+  constructor(colorArg: string, brandArg: string) {
+    super();
+    this.color = colorArg;
+    this.brand = brandArg;
+  }
+}
+
+const createCarClass = (dbArg: smartdata.SmartdataDb) => {
+  smartdata.setDefaultManagerForDoc({db: dbArg}, Car);
+  return Car;
+};
+
+tap.test('should produce a car', async () => {
+  const CarClass = createCarClass(testDb);
+  const carInstance = new CarClass('red', 'Mercedes');
+  await carInstance.save();
+});
+
+tap.test('should get a car', async () => {
+  const car = Car.getInstance({
+    color: 'red'
+  })
+})
+
+// =======================================
+// close the database connection
+// =======================================
+tap.test('should close the database connection', async (tools) => {
+  await testDb.mongoDb.dropDatabase();
+  await testDb.close();
+  try {
+    await mongod.stop();
+  } catch (e) {}
+});
+
+tap.start({ throwOnError: true });

ts/smartdata.classes.collection.ts

@@ -41,20 +41,27 @@ export function Collection(dbArg: SmartdataDb | TDelayed<SmartdataDb>) {
   };
 }
 
-interface IManager {
+export interface IManager {
   db: SmartdataDb
 }
 
+export const setDefaultManagerForDoc = <T>(managerArg: IManager,  dbDocArg: T): T => {
+  (dbDocArg as any).prototype.defaultManager = managerArg;
+  return dbDocArg;
+}
+
 /**
  * This is a decorator that will tell the decorated class what dbTable to use
  * @param dbArg
  */
  export function Manager<TManager extends IManager>(managerArg?: TManager | TDelayed<TManager>) {
-  return function classDecorator<T extends { new (...args: any[]): {} }>(constructor: T) {
+  return function classDecorator<T extends { new (...args: any[]): any }>(constructor: T) {
     return class extends constructor {
       public static get collection() {
         let dbArg: SmartdataDb;
-        if (managerArg['db']) {
+        if (!managerArg) {
+          dbArg = this.prototype.defaultManager.db;
+        } else if (managerArg['db']) {
           dbArg = (managerArg as TManager).db
         } else {
           dbArg = (managerArg as TDelayed<TManager>)().db;
@@ -63,13 +70,26 @@ interface IManager {
       }
       public get collection() {
         let dbArg: SmartdataDb;
-        if (managerArg['db']) {
+        if (!managerArg) {
+          //console.log(this.defaultManager.db);
+          //process.exit(0)
+          dbArg = this.defaultManager.db;
+        } else if (managerArg['db']) {
           dbArg = (managerArg as TManager).db
         } else {
           dbArg = (managerArg as TDelayed<TManager>)().db;
         }
         return collectionFactory.getCollection(constructor.name, dbArg);
       }
+      public static get manager() {
+        let manager: TManager;
+        if (managerArg['db']) {
+          manager = (managerArg as TManager);
+        } else {
+          manager = (managerArg as TDelayed<TManager>)();
+        }
+        return manager;
+      }
       public get manager() {
         let manager: TManager;
         if (managerArg['db']) {

ts/smartdata.classes.doc.ts

@@ -3,7 +3,7 @@ import * as plugins from './smartdata.plugins';
 import { ObjectMap } from '@pushrocks/lik';
 
 import { SmartdataDb } from './smartdata.classes.db';
-import { SmartdataCollection } from './smartdata.classes.collection';
+import { IManager, SmartdataCollection } from './smartdata.classes.collection';
 
 export type TDocCreation = 'db' | 'new' | 'mixed';
 
@@ -41,12 +41,15 @@ export function unI() {
   };
 }
 
-export class SmartDataDbDoc<T extends TImplements, TImplements> {
+export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends IManager = any> {
   /**
    * the collection object an Doc belongs to
    */
   public static collection: SmartdataCollection<any>;
   public collection: SmartdataCollection<any>;
+  public static defaultManager;
+  public static manager;
+  public manager: TManager;
 
   /**
    * how the Doc in memory was created, may prove useful later.