Skip to content

Commit

Permalink
fix: initializer and interface name (#50)
Browse files Browse the repository at this point in the history
* hotfix/fix_initializer_and_interface_name

* change container to dependency
  • Loading branch information
siyul-park authored Nov 25, 2020
1 parent 24db957 commit 3983db2
Show file tree
Hide file tree
Showing 8 changed files with 18 additions and 18 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@ import ContainerContext from "./container-context";
import * as Token from "./token";
import Initializer from "./initializer";

function container(
function dependency(
initializer: Initializer,
options?: interfaces.EventEmitterOptions
options?: interfaces.ContainerConstructorOptions
): Application.Middleware<DefaultState, Partial<ContainerContext>> {
const rootContainer = new Container(options);
initializer.initRootContainer(rootContainer);
Expand All @@ -26,7 +26,7 @@ function container(
contextContainer.bind(Token.Accepts, () => ctx.accept);
contextContainer.bind(Token.Respond, () => ctx.respond);

initializer.initRootContainer(contextContainer);
initializer.initContextContainer(contextContainer);

ctx.containers = {
root: rootContainer,
Expand All @@ -41,4 +41,4 @@ function container(
};
}

export default container;
export default dependency;
6 changes: 3 additions & 3 deletions packages/@cheeket-koa/lib/index.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import container from "./container.middleware";
import dependency from "./dependency.middleware";
import * as Token from "./token";

export { default as Initializer } from "./initializer";
export { default as ContainerContext } from "./container-context";
export { container };
export { dependency };
export { Token };
export default container;
export default dependency;
4 changes: 2 additions & 2 deletions packages/cheeket/lib/container/child-container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ class ChildContainer extends EventEmitter2 implements interfaces.Container {

constructor(
parentContainerContexts: interfaces.ContainerContext[],
options?: interfaces.EventEmitterOptions
options?: interfaces.ContainerConstructorOptions
) {
super(options);

Expand Down Expand Up @@ -94,7 +94,7 @@ class ChildContainer extends EventEmitter2 implements interfaces.Container {
}

createChildContainer(
options?: interfaces.EventEmitterOptions
options?: interfaces.ContainerConstructorOptions
): interfaces.Container {
return new ChildContainer(this.createContainerContexts(), options);
}
Expand Down
2 changes: 1 addition & 1 deletion packages/cheeket/lib/container/container.ts
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class Container extends EventEmitter2 implements interfaces.Container {
}

createChildContainer(
options?: interfaces.EventEmitterOptions
options?: interfaces.ContainerConstructorOptions
): interfaces.Container {
return new ChildContainer([this.#containerContext], options);
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
import { ConstructorOptions } from "eventemitter2";

type ContainerConstructorOptions = ConstructorOptions;

export default ContainerConstructorOptions;
4 changes: 2 additions & 2 deletions packages/cheeket/lib/interfaces/container.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
import Resolver from "./resolver";
import Binder from "./binder";
import EventEmitter from "./event-emitter";
import EventEmitterOptions from "./event-emitter-options";
import ContainerConstructorOptions from "./container-constructor-options";

interface Container extends Resolver, Binder, EventEmitter {
createChildContainer(options?: EventEmitterOptions): Container;
createChildContainer(options?: ContainerConstructorOptions): Container;
clear(): Promise<void>;
}

Expand Down
5 changes: 0 additions & 5 deletions packages/cheeket/lib/interfaces/event-emitter-options.ts

This file was deleted.

2 changes: 1 addition & 1 deletion packages/cheeket/lib/interfaces/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -44,5 +44,5 @@ export { default as ResolveEventListener } from "./resolve-event-listener";
export { default as CreateEventListener } from "./create-event-listener";
export { default as ClearEventListener } from "./clear-event-listener";
export { default as EventToken } from "./event-token";
export { default as EventEmitterOptions } from "./event-emitter-options";
export { default as ContainerConstructorOptions } from "./container-constructor-options";
export { default as EventEmitter } from "./event-emitter";

0 comments on commit 3983db2

Please sign in to comment.