Mongoose 1.2.1 (#41)

* fix(mongoose): Correct context for the model * fix(mongoose): Changelog
serhiisol · Mar 7, 2017 · 4747393 · 4747393
1 parent 4ebd13f
commit 4747393
Show file tree

Hide file tree

Showing 14 changed files with 124 additions and 46 deletions.
diff --git a/mongoose/CHANGELOG.md b/mongoose/CHANGELOG.md
@@ -1,3 +1,6 @@
+# Mongoose#1.2.1
+* Fixed model ctx for DI
+
 # Mongoose#1.2.0
 * Model DI
 

diff --git a/mongoose/README.md b/mongoose/README.md
@@ -31,26 +31,27 @@ npm install @decorators/mongoose --save
 * **@SchemaField(schemaFieldDefinition)** - registers schema field
 * **@Static()** - registers static property
 * **@Index()** - registers index property
+
 * **@Set()** = **@Option()** (*deprecated* Use options parameter of Model decorator instead)
 
 ### Example Mongoose Model
 ```typescript
-import {
-  SchemaField, Model, bootstrapMongoose,
-  Static, Instance
-} from 'node-decorators/mongoose';
-
-@Model('Test')
-class TestModelClass {
+@Model('Animal')
+class Animal extends ModelClass {
   @SchemaField(String)
-  testField: string;
+  name: string;
 
   @Static()
-  testMethod() {
+  spawn() {
   }
 
   @Instance()
-  instanceMethod() {
+  scream() {
+  }
+
+  @Query()
+  byName(name: string): Promise<Animal> {
+    return this.find({ name });
   }
 }
 

diff --git a/mongoose/index.ts b/mongoose/index.ts
diff --git a/mongoose/package.json b/mongoose/package.json
@@ -1,11 +1,15 @@
 {
   "name": "@decorators/mongoose",
-  "version": "1.2.0",
+  "version": "1.2.1",
   "description": "node decorators",
-  "main": "index.js",
+  "main": "src/index.js",
   "dependencies": {
     "mongoose": "^4.7.0"
   },
+  "devDependencies": {
+    "@types/mongoose": "4.7.2",
+    "typescript": "2.1.1"
+  },
   "keywords": [
     "nodejs",
     "mongoose",

diff --git a/mongoose/src/decorators/index.ts b/mongoose/src/decorators/index.ts
@@ -1,2 +1,11 @@
-export * from './schema';
+export {
+  SchemaField,
+  Static,
+  Query,
+  Instance,
+  Virtual,
+  Index,
+  Set,
+  Option
+} from './schema';
 export { Model } from './model';
diff --git a/mongoose/src/decorators/schema.ts b/mongoose/src/decorators/schema.ts
@@ -5,36 +5,36 @@ import { getMongooseMeta } from '../meta';
  * @param type Field type
  */
 export function SchemaField(type: any): PropertyDecorator {
-  return (target: any, name:string) => {
+  return (target: any, name: string) => {
     Object.assign(getMongooseMeta(target).schema, {[name]: type});
-  }
+  };
 }
 
 /**
  * Defines static method or property
  */
 export function Static() {
-  return (target:any, name:string, descriptor?:TypedPropertyDescriptor<any>) => {
+  return (target: any, name: string, descriptor?: TypedPropertyDescriptor<any>) => {
     getMongooseMeta(target).statics.push(descriptor ? [name, target[name]] : name);
-  }
+  };
 }
 
 /**
  * Defines query method
  */
 export function Query() {
-  return (target: any, name:string, descriptor:TypedPropertyDescriptor<any>) => {
+  return (target: any, name: string, descriptor: TypedPropertyDescriptor<any>) => {
     getMongooseMeta(target).queries.push([name, target[name]]);
-  }
+  };
 }
 
 /**
  * Defines instance method
  */
 export function Instance() {
-  return (target: any, name:string, descriptor:TypedPropertyDescriptor<any>) => {
+  return (target: any, name: string, descriptor: TypedPropertyDescriptor<any>) => {
     getMongooseMeta(target).instances.push([name, target[name]]);
-  }
+  };
 }
 
 /**
@@ -43,27 +43,27 @@ export function Instance() {
 export function Virtual() {
   return (target: any, name: string, descriptor: PropertyDescriptor) => {
     getMongooseMeta(target).virtuals.push([name, descriptor]);
-  }
+  };
 }
 
 /**
  * Defines index
  */
 export function Index() {
-  return (target: any, name:string) => {
+  return (target: any, name: string) => {
     getMongooseMeta(target).indexes.push(name);
-  }
+  };
 }
 
 /**
  * Defines set method - options for model
  */
 export function Set() {
-  console.warn(`Deprecated: This decorator will be removed in a future release. 
+  console.warn(`Deprecated: This decorator will be removed in a future release.
   Use the options parameter of the Model decorator instead.`);
   return (target: any, name: string) => {
     getMongooseMeta(target).options.push(name);
-  }
+  };
 }
 /**
  * Alias of Set

diff --git a/mongoose/src/index.ts b/mongoose/src/index.ts
@@ -1,3 +1,13 @@
-export * from './decorators';
+export {
+  Model,
+  SchemaField,
+  Static,
+  Query,
+  Instance,
+  Virtual,
+  Index,
+  Set,
+  Option
+} from './decorators';
 export { bootstrapMongoose, ref } from './mongoose';
 export { ModelClass } from './model-class';
diff --git a/mongoose/src/mongoose.ts b/mongoose/src/mongoose.ts
@@ -12,6 +12,22 @@ export function ref(collectionRef: string): { type: any, ref: string } {
   return { type: Schema.Types.ObjectId, ref: collectionRef };
 }
 
+/**
+ * Wrap function with correct context
+ *
+ * @param {Function} fn
+ * @param {any} instance
+ * @returns {Function}
+ */
+function wrapFunction(fn: Function, instance): Function {
+  return function(...args) {
+    const fullCtx = Object.assign({}, instance, this);
+    Object.setPrototypeOf(fullCtx, Object.getPrototypeOf(this));
+
+    return fn.apply(fullCtx, args);
+  };
+}
+
 /**
  * Bootstrap decorated class to native mongoose
  * @param DecoratedClass
@@ -30,27 +46,26 @@ export function bootstrapMongoose<T extends Document>(injectable: Injectable | F
 
   meta.statics.forEach((stat: [string, Function] | string) => {
     if (typeof stat[1] === 'function') {
-      schema.statics[<string>stat[0]] = <Function>stat[1]
-    } else {
-      statics[<string>stat] = classInstance[<string>stat];
+      return schema.statics[<string>stat[0]] = wrapFunction(<Function>stat[1], classInstance);
     }
+    statics[<string>stat] = classInstance[<string>stat];
   });
 
-  meta.queries.forEach((query: [string, Function]) => {
-    schema['query'][query[0]] = query[1];
+  meta.queries.forEach(([name, fn]: [string, Function]) => {
+    schema['query'][name] = wrapFunction(fn, classInstance);
   });
 
-  meta.instances.forEach((instance: [string, Function]) => {
-    schema.methods[instance[0]] = instance[1];
+  meta.instances.forEach(([name, fn]: [string, Function]) => {
+    schema.methods[name] = wrapFunction(fn, classInstance);
   });
 
-  meta.virtuals.forEach((virtual: [string, PropertyDescriptor]) => {
-    let v = schema.virtual(virtual[0]);
-    if (virtual[1].get) {
-      v.get(virtual[1].get);
+  meta.virtuals.forEach(([name, descriptor]: [string, PropertyDescriptor]) => {
+    let v = schema.virtual(name);
+    if (descriptor.get) {
+      v.get(wrapFunction(descriptor.get, classInstance));
     }
-    if (virtual[1].set) {
-      v.set(virtual[1].set);
+    if (descriptor.set) {
+      v.set(wrapFunction(descriptor.set, classInstance));
     }
   });
 

diff --git a/mongoose/tsconfig.json b/mongoose/tsconfig.json
@@ -0,0 +1,22 @@
+{
+  "compileOnSave": false,
+  "compilerOptions": {
+    "declaration": true,
+    "emitDecoratorMetadata": true,
+    "experimentalDecorators": true,
+    "module": "commonjs",
+    "moduleResolution": "node",
+    "noEmitOnError": true,
+    "noImplicitAny": false,
+    "rootDir": ".",
+    "sourceMap": true,
+    "target": "es6",
+    "inlineSources": true,
+    "typeRoots": ["node_modules/@types"],
+    "pretty": true
+  },
+  "exclude": ["node_modules"],
+  "files": [
+    "src/index.ts"
+  ]
+}
diff --git a/package.json b/package.json
@@ -9,12 +9,10 @@
   "dependencies": {
     "co": "4.6.0",
     "express": "4.14.0",
-    "mongoose": "4.7.0",
     "socket.io": "1.7.2"
   },
   "devDependencies": {
     "@types/express": "4.0.34",
-    "@types/mongoose": "4.7.2",
     "@types/socket.io": "1.4.27",
     "typescript": "2.1.1"
   },

diff --git a/playground/mongoose/index.ts b/playground/mongoose/index.ts
@@ -4,6 +4,11 @@ import { TestModel } from './model';
 TestModel.staticMethod();
 let test = new TestModel({testField: "Hello World"});
 console.log('Model = ' + test.toString());
+test.setField();
+
 test.instanceMethod();
+
+console.log('Model = ' + test.testField);
+
 process.exit();
 
diff --git a/playground/mongoose/model.ts b/playground/mongoose/model.ts
@@ -20,6 +20,7 @@ mongoose.connect('192.168.99.100:27017/test', {
 interface TestInstance extends mongoose.Document {
   testField: string;
   instanceMethod();
+  setField();
 }
 
 interface TestModelType extends mongoose.Model<TestInstance> {
@@ -33,19 +34,28 @@ class TestModelClass extends ModelClass {
   @SchemaField(String)
   testField: string;
 
+  args: any;
+
   constructor(...args) {
     super();
-    console.log(args);
+    this.args = args;
   }
 
   @Static()
   staticMethod() {
     console.log('static test method');
   }
 
+  @Instance()
+  setField() {
+    this.testField = 'World';
+    console.log(this.testField, this.args);
+  }
+
   @Instance()
   instanceMethod() {
-    console.log(this.testField);
+    console.log(this.testField, this.args);
+
     this.save();
   }
 

diff --git a/playground/mongoose/package.json b/playground/mongoose/package.json
@@ -6,6 +6,9 @@
   "dependencies": {
     "@decorators/mongoose": "../../mongoose"
   },
+  "devDependencies": {
+     "@types/mongoose": "4.7.2"
+  },
   "keywords": [
     "nodejs",
     "socket.io",

diff --git a/tsconfig.json b/tsconfig.json
@@ -24,7 +24,6 @@
   "files": [
     "co/index.ts",
     "express/index.ts",
-    "mongoose/index.ts",
     "socket/index.ts"
   ]
 }