4.0.10

.vscode/launch.json

@@ -2,28 +2,10 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": "current file",
+      "command": "npm test",
-      "type": "node",
+      "name": "Run npm test",
       "request": "launch",
-      "args": [
+      "type": "node-terminal"
-        "${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"
     }
   ]
 }

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "@pushrocks/smartdata",
-  "version": "4.0.9",
+  "version": "4.0.10",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "@pushrocks/smartdata",
-      "version": "4.0.9",
+      "version": "4.0.10",
       "license": "MIT",
       "dependencies": {
         "@pushrocks/lik": "^4.0.20",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartdata",
-  "version": "4.0.9",
+  "version": "4.0.10",
   "private": false,
   "description": "do more with data",
   "main": "dist_ts/index.js",

test/test.typescript.ts

@@ -56,7 +56,8 @@ tap.test('should establish a connection to mongod', async () => {
 // ------
 // Collections
 // ------
-class CarTemplate extends smartdata.SmartDataDbDoc<CarTemplate, CarTemplate> {
+@smartdata.Manager()
+class Car extends smartdata.SmartDataDbDoc<Car, Car> {
   @smartdata.unI()
   public index: string = smartunique.shortId();
 
@@ -79,20 +80,22 @@ class CarTemplate extends smartdata.SmartDataDbDoc<CarTemplate, CarTemplate> {
 }
 
 const createCarClass = (dbArg: smartdata.SmartdataDb) => {
-  console.log(this);
+  smartdata.setDefaultManagerForDoc({db: dbArg}, Car);
-  @smartdata.Collection(() => {
-    return dbArg;
-  })
-  class Car extends CarTemplate {};
   return Car;
 };
 
-tap.test('should prodice a car', async () => {
+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
 // =======================================

ts/smartdata.classes.collection.ts

@@ -45,16 +45,22 @@ export interface IManager {
   db: SmartdataDb
 }
 
+export const setDefaultManagerForDoc = (managerArg: IManager,  dbDoc: any) => {
+  dbDoc.prototype.defaultManager = managerArg;
+}
+
 /**
  * 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,7 +69,11 @@ export 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;

ts/smartdata.classes.doc.ts

@@ -47,6 +47,7 @@ export class SmartDataDbDoc<T extends TImplements, TImplements, TManager extends
    */
   public static collection: SmartdataCollection<any>;
   public collection: SmartdataCollection<any>;
+  public static defaultManager;
   public static manager;
   public manager: TManager;