refactor: rm usage of namespace

exuanbo · Oct 21, 2024 · dd98606 · dd98606
1 parent ebde22e
commit dd98606
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 18 deletions.
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -69,6 +69,7 @@ export default tseslint.config(
       "@typescript-eslint/no-unsafe-assignment": "off",
       "@typescript-eslint/no-unsafe-function-type": "off",
       "@typescript-eslint/no-unsafe-return": "off",
+      "no-var": "off",
     },
   },
   {

diff --git a/src/index.ts b/src/index.ts
@@ -2,7 +2,7 @@ export type {ContainerOptions} from "./container";
 export {Container} from "./container";
 export type {ClassDecorator, ClassFieldDecorator, ClassFieldInitializer} from "./decorators";
 export {AutoRegister, Inject, Injectable, InjectAll, Scoped} from "./decorators";
-export {inject, injectAll} from "./inject";
+export {inject, injectAll, injectBy} from "./inject";
 export type {InstanceRef} from "./instance";
 export type {ClassProvider, FactoryProvider, Provider, ValueProvider} from "./provider";
 export type {Registration, RegistrationMap, RegistrationOptions, Registry} from "./registry";

diff --git a/src/inject.ts b/src/inject.ts
@@ -8,20 +8,24 @@ export function inject<Value>(...tokens: Token<Value>[]): Value {
   return context.container.resolve(...tokens);
 }
 
-export namespace inject {
-  export function by<Values extends unknown[]>(thisArg: any, ...tokens: TokenList<Values>): Values[number];
-  export function by<Value>(thisArg: any, ...tokens: Token<Value>[]): Value {
-    const context = ensureInjectionContext(inject);
-    const currentFrame = context.resolution.stack.peek();
-    invariant(currentFrame);
-    const provider = currentFrame.provider;
-    context.resolution.dependents.set(provider, {current: thisArg});
-    try {
-      return inject(...tokens);
-    }
-    finally {
-      context.resolution.dependents.delete(provider);
-    }
+export declare namespace inject {
+  export var by: typeof injectBy;
+}
+
+inject.by = injectBy;
+
+export function injectBy<Values extends unknown[]>(thisArg: any, ...tokens: TokenList<Values>): Values[number];
+export function injectBy<Value>(thisArg: any, ...tokens: Token<Value>[]): Value {
+  const context = ensureInjectionContext(injectBy);
+  const currentFrame = context.resolution.stack.peek();
+  invariant(currentFrame);
+  const provider = currentFrame.provider;
+  context.resolution.dependents.set(provider, {current: thisArg});
+  try {
+    return inject(...tokens);
+  }
+  finally {
+    context.resolution.dependents.delete(provider);
   }
 }
 

diff --git a/src/token.ts b/src/token.ts
@@ -24,11 +24,14 @@ export function Type<T>(typeName: string): Type<T> {
   return type;
 }
 
-export namespace Type {
-  export const Null: Type<null> = Type("null");
-  export const Undefined: Type<undefined> = Type("undefined");
+export declare namespace Type {
+  export var Null: Type<null>;
+  export var Undefined: Type<undefined>;
 }
 
+Type.Null = Type("null");
+Type.Undefined = Type("undefined");
+
 export interface Constructor<Instance extends object> {
   new (...args: []): Instance;
 }