Add the possibility to use instance methods in sub schemas (#199)

Add the possibility to use instance methods in sub schemas
szokodiakos · Feb 4, 2019 · 9141ed9 · 9141ed9
1 parent 3496dcc
commit 9141ed9
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/src/prop.ts b/src/prop.ts
@@ -1,7 +1,7 @@
 import * as mongoose from 'mongoose';
 import * as _ from 'lodash';
 
-import { schema, virtuals } from './data';
+import { schema, virtuals, methods } from './data';
 import { isPrimitive, initAsObject, initAsArray, isString, isNumber, isObject } from './utils';
 import { InvalidPropError, NotNumberTypeError, NotStringTypeError, NoMetadataError } from './errors';
 import { ObjectID } from 'bson';
@@ -181,10 +181,17 @@ const baseProp = (rawOptions, Type, target, key, isArray = false) => {
   const Schema = mongoose.Schema;
 
   const supressSubschemaId = rawOptions._id === false;
+  const virtualSchema = new Schema({ ...subSchema }, supressSubschemaId ? { _id: false } : {});
+
+  const schemaInstanceMethods = methods.instanceMethods[instance.constructor.name];
+  if (schemaInstanceMethods) {
+    virtualSchema.methods = schemaInstanceMethods;
+  }
+
   schema[name][key] = {
     ...schema[name][key],
     ...options,
-    type: new Schema({ ...subSchema }, supressSubschemaId ? { _id: false } : {}),
+    type: virtualSchema,
   };
   return;
 };

diff --git a/src/test/index.test.ts b/src/test/index.test.ts
@@ -79,6 +79,7 @@ describe('Typegoose', () => {
       expect(foundUser.job).to.have.property('position', 'Lead');
       expect(foundUser.job).to.have.property('startedAt').to.be.instanceof(Date);
       expect(foundUser.job.jobType).to.not.have.property('_id');
+      expect(foundUser.job.titleInUppercase()).to.eq("Developer".toUpperCase());
       expect(foundUser.job.jobType).to.have.property('salery', 5000);
       expect(foundUser.job.jobType).to.have.property('field', 'IT');
       expect(foundUser.job.jobType).to.have.property('salery').to.be.a('number');

diff --git a/src/test/models/job.ts b/src/test/models/job.ts
@@ -1,4 +1,4 @@
-import { prop } from '../../typegoose';
+import { instanceMethod, prop } from '../../typegoose';
 
 export class JobType {
   @prop({ required: true })
@@ -20,4 +20,9 @@ export class Job {
 
   @prop({ _id: false })
   jobType?: JobType;
+
+  @instanceMethod
+  titleInUppercase?() {
+    return this.title.toUpperCase();
+  }
 }