Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: 2.x fix conflicts #458

Merged
merged 4 commits into from
Apr 7, 2020
Merged

fix: 2.x fix conflicts #458

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
19c586c
fix dfs circular depth bug
kurten Apr 6, 2020
3e7af18
remove lodash
kurten Apr 7, 2020
53530fe
Merge branch '2.x' of github.com:midwayjs/midway into 2.x_fix_conflicts
kurten Apr 7, 2020
92ef9da
add isProvide
kurten Apr 7, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 9 additions & 9 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,26 +3,26 @@
"description": "a web framework for complex Node.js application",
"version": "1.0.0",
"devDependencies": {
"@types/chai": "^4.1.7",
"@types/lodash": "^4.14.119",
"@types/mocha": "^5.2.5",
"@types/node": "^10.12.18",
"@types/chai": "^4.2.11",
"@types/lodash": "^4.14.149",
"@types/mocha": "^5.2.7",
"@types/node": "^10.17.18",
"autocannon": "^2.4.1",
"chalk": "^3.0.0",
"debug": "^4.1.1",
"eslint": "^6.1.0",
"gh-pages": "^2.2.0",
"git-hooks": "^1.1.10",
"lerna": "^3.14.1",
"lerna": "^3.20.2",
"lerna-relinker": "^1.4.0",
"node-ab": "0.0.6",
"opencollective": "^1.0.3",
"opencollective-postinstall": "^2.0.2",
"rimraf": "^3.0.0",
"tree-kill": "^1.2.0",
"tslint": "^5.17.0",
"rimraf": "^3.0.2",
"tree-kill": "^1.2.2",
"tslint": "^5.20.1",
"tslint-no-unused-expression-chai": "^0.1.4",
"typescript": "^3.5.1",
"typescript": "^3.8.3",
"vuepress": "^0.14.11"
},
"scripts": {
Expand Down
5 changes: 3 additions & 2 deletions packages/midway-core/src/context/midwayContainer.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,8 @@ import {
ScopeEnum,
PIPELINE_IDENTIFIER,
listModule,
CONFIGURATION_KEY
CONFIGURATION_KEY,
isProvide
} from '@midwayjs/decorator';
import * as is from 'is-type-of';
import { join } from 'path';
Expand Down Expand Up @@ -155,7 +156,7 @@ export class MidwayContainer extends Container implements IMidwayContainer {
}

protected bindModule(module, namespace = '', filePath?: string) {
if (is.class(module)) {
if (is.class(module) && isProvide(module)) {
const providerId = getProviderId(module);
if (providerId) {
this.bind(
Expand Down
7 changes: 7 additions & 0 deletions packages/midway-decorator/src/common/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,3 +171,10 @@ export function saveProviderId(identifier: ObjectIdentifier, target: any, overri

return target;
}
/**
* 是否使用了 saveProviderId
* @param target class
*/
export function isProvide(target: any): boolean {
return Reflect.hasOwnMetadata(TAGGED_CLS, target);
}
4 changes: 3 additions & 1 deletion packages/midway-decorator/test/annotation/provide.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

import { expect } from 'chai';
import { Provide, getProviderId } from '../../src';
import { Provide, getProviderId, isProvide } from '../../src';

@Provide('jjj')
class Test {}
Expand All @@ -9,5 +9,7 @@ describe('/test/annotation/provide.test.ts', () => {
it('provide decorator should be ok', () => {
const id = getProviderId(Test);
expect(id).eq('jjj');

expect(isProvide(Test)).true;
});
});