Skip to content

Commit

Permalink
fix(): typo and add peers
Browse files Browse the repository at this point in the history
  • Loading branch information
Diluka committed Mar 26, 2019
1 parent a7d59a5 commit afe21e1
Show file tree
Hide file tree
Showing 4 changed files with 64 additions and 44 deletions.
7 changes: 6 additions & 1 deletion dist/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -25,5 +25,10 @@
"name": "Michael Yali",
"email": "mihon4ik@gmail.com"
},
"license": "MIT"
"license": "MIT",
"peerDependencies": {
"@nestjs/common": "^6",
"@nestjs/core": "^6",
"@nestjs/typeorm": "^6"
}
}
78 changes: 44 additions & 34 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

5 changes: 5 additions & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,11 @@
"prebuild": "npm run clean",
"postbuild": "npm run clean:typeorm && npm run update:typeorm"
},
"peerDependencies": {
"@nestjs/common": "^6",
"@nestjs/core": "^6",
"@nestjs/typeorm": "^6"
},
"dependencies": {
"@nestjs/common": "^6.0.2",
"@nestjs/core": "^6.0.2",
Expand Down
18 changes: 9 additions & 9 deletions src/decorators/crud.decorator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -345,17 +345,17 @@ export const Crud = (dto: any, crudOptions: CrudOptions = {}) => (target: object

// method override
Object.getOwnPropertyNames(prototype).forEach((name) => {
const overrided = getOverrideMetadata(prototype[name]);
const route = baseRoutes[overrided];
const override = getOverrideMetadata(prototype[name]);
const route = baseRoutes[override];

if (overrided && route && route.enable) {
if (override && route && route.enable) {
// get base function metadata
const interceptors = getInterceptors(prototype[name]) || [];
const baseInterceptors = getInterceptors(prototype[overrided]);
const baseAction = getAction(prototype[overrided]);
const baseSwaggerParams = getSwaggerParams(prototype[overrided]);
const baseSwaggerOkResponse = getSwaggeOkResponse(prototype[overrided]);
const baseSwaggerOperation = getSwaggerOperation(prototype[overrided]);
const baseInterceptors = getInterceptors(prototype[override]);
const baseAction = getAction(prototype[override]);
const baseSwaggerParams = getSwaggerParams(prototype[override]);
const baseSwaggerOkResponse = getSwaggeOkResponse(prototype[override]);
const baseSwaggerOperation = getSwaggerOperation(prototype[override]);

// set metadata
setInterceptors([...baseInterceptors, ...interceptors], prototype[name]);
Expand All @@ -365,7 +365,7 @@ export const Crud = (dto: any, crudOptions: CrudOptions = {}) => (target: object
setSwaggerOperationMeta(baseSwaggerOperation, prototype[name]);

// override @ParsedBody() decorator is needed
overrideParsedBody(target, overrided, name);
overrideParsedBody(target, override, name);

// set route
setRoute(route.path, route.method, prototype[name]);
Expand Down

0 comments on commit afe21e1

Please sign in to comment.