Skip to content

Commit

Permalink
Issue 706 (#718)
Browse files Browse the repository at this point in the history
* Fixes 706

* Test coverage back to 100%

* Preparing release

* Preparing release
  • Loading branch information
remojansen authored Dec 16, 2017
1 parent d015952 commit 7897f45
Show file tree
Hide file tree
Showing 6 changed files with 41 additions and 7 deletions.
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "inversify",
"version": "4.6.1",
"version": "4.7.0",
"description": "A powerful and lightweight inversion of control container for JavaScript and Node.js apps powered by TypeScript.",
"main": "lib/inversify.js",
"jsnext:main": "es/inversify.js",
"typings": "./dts/inversify.d.ts",
"types": "./dts/inversify.d.ts",
"directories": {
"test": "gulp"
},
Expand Down
1 change: 1 addition & 0 deletions src/inversify.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
import * as keys from "./constants/metadata_keys";
export const METADATA_KEY = keys;
export { Container } from "./container/container";
export { BindingScopeEnum, BindingTypeEnum, TargetTypeEnum } from "./constants/literal_types";
export { ContainerModule } from "./container/container_module";
export { injectable } from "./annotation/injectable";
export { tagged } from "./annotation/tagged";
Expand Down
6 changes: 3 additions & 3 deletions src/resolution/resolver.ts
Original file line number Diff line number Diff line change
Expand Up @@ -80,19 +80,19 @@ const _resolveRequest = (requestScope: interfaces.RequestScope) =>
result = invokeFactory(
"toDynamicValue",
binding.serviceIdentifier,
() => binding.dynamicValue ? binding.dynamicValue(request.parentContext) : undefined
() => (binding.dynamicValue as (context: interfaces.Context) => any)(request.parentContext)
);
} else if (binding.type === BindingTypeEnum.Factory && binding.factory !== null) {
result = invokeFactory(
"toFactory",
binding.serviceIdentifier,
() => binding.factory ? binding.factory(request.parentContext) : undefined
() => (binding.factory as interfaces.FactoryCreator<any>)(request.parentContext)
);
} else if (binding.type === BindingTypeEnum.Provider && binding.provider !== null) {
result = invokeFactory(
"toProvider",
binding.serviceIdentifier,
() => binding.provider ? binding.provider(request.parentContext) : undefined
() => (binding.provider as interfaces.Provider<any>)(request.parentContext)
);
} else if (binding.type === BindingTypeEnum.Instance && binding.implementationType !== null) {
result = resolveInstance(
Expand Down
2 changes: 1 addition & 1 deletion test/bugs/issue_543.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { expect } from "chai";
import * as ERROR_MSGS from "../../src/constants/error_msgs";
import { Container, inject, injectable } from "../../src/inversify";

describe("issue 543", () => {
describe("Issue 543", () => {

it("Should throw correct circular dependency path", () => {

Expand Down
2 changes: 1 addition & 1 deletion test/bugs/issue_549.test.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import * as ERROR_MSGS from "../../src/constants/error_msgs";
import { Container, inject, injectable } from "../../src/inversify";

describe("issue 549", () => {
describe("Issue 549", () => {

it("Should throw if circular dependencies found with dynamics", () => {

Expand Down
33 changes: 33 additions & 0 deletions test/bugs/issue_706.test.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
import { expect } from "chai";
import { BindingScopeEnum, Container, injectable } from "../../src/inversify";

describe("Issue 706", () => {

it("Should expose BindingScopeEnum as part of the public API", () => {

@injectable()
class SomeClass {
public time: number;
public constructor() {
this.time = new Date().getTime();
}
}

const container = new Container({
defaultScope: BindingScopeEnum.Singleton,
});

const TYPE = {
SomeClass: Symbol.for("SomeClass")
};

container.bind<SomeClass>(TYPE.SomeClass).to(SomeClass);

const instanceOne = container.get<SomeClass>(TYPE.SomeClass);
const instanceTwo = container.get<SomeClass>(TYPE.SomeClass);

expect(instanceOne.time).to.eq(instanceTwo.time);

});

});

0 comments on commit 7897f45

Please sign in to comment.