@fluojs/di 1.0.0-beta.1 → 1.0.0-beta.3

package/README.ko.md

@@ -83,6 +83,10 @@ const requestContainer = container.createRequestScope();
 const scopedService = await requestContainer.resolve(RequestScopedService);
 ```
 
+request scope 컨테이너는 부모 체인의 provider를 해석할 수 있지만, request가 소유하는 등록은 새 singleton provider를 만들 수 없습니다. singleton provider는 request scope를 만들기 전에 루트 컨테이너에 등록하세요. request scope에 로컬 provider를 추가해야 한다면 `scope: 'request'`/`Scope.REQUEST`를 명시하거나 `override()`로 의도적인 request-local 교체를 표현하세요. multi provider에도 같은 규칙이 적용됩니다. 기본 scope의 multi provider는 루트 컨테이너에 등록하고, request-local multi provider는 request scope를 명시하거나 `override()`로 교체해야 합니다.
+
+provider 객체는 등록 시점에 검증됩니다. 모든 객체 provider는 null이 아닌 `provide` 토큰과 정확히 하나의 전략(`useClass`, `useValue`, `useFactory`, `useExisting`)을 포함해야 합니다. 잘못된 provider 형태는 컨테이너 그래프에 영향을 주기 전에 `InvalidProviderError`를 발생시킵니다.
+
 ## 순환 의존성 처리
 
 컨테이너는 순환 의존성을 자동으로 감지하고 `CircularDependencyError`를 발생시켜 무한 루프를 방지합니다. 여기에는 직접 참조(A→A), 이중 노드(A→B→A), 깊은 순환(A→B→C→A)이 모두 포함됩니다.

package/README.md

@@ -83,6 +83,10 @@ const requestContainer = container.createRequestScope();
 const scopedService = await requestContainer.resolve(RequestScopedService);
 ```
 
+Request-scope containers may resolve providers from their parent chain, but request-owned registrations must not introduce new singleton providers. Register singleton providers on the root container before creating request scopes. If a request scope needs local additions, declare them with `scope: 'request'`/`Scope.REQUEST` or use `override()` for an explicit request-local replacement. The same rule applies to multi providers: default-scope multi providers belong on the root container, while request-local multi providers must opt into request scope or be replaced through `override()`.
+
+Provider objects are validated at registration time: every object provider must include a non-null `provide` token and exactly one strategy (`useClass`, `useValue`, `useFactory`, or `useExisting`). Invalid provider shapes throw `InvalidProviderError` before they can affect the container graph.
+
 ## Circular Dependency Handling
 
 The container automatically detects circular dependencies and throws a `CircularDependencyError` to prevent infinite loops. This includes direct (A→A), two-node (A→B→A), and deep (A→B→C→A) cycles.

package/dist/container.d.ts

@@ -15,6 +15,7 @@ export declare class Container {
     private readonly staleDisposalTasks;
     private readonly staleDisposalErrors;
     private readonly singletonCache;
+    private readonly forwardRefTokenCache;
     private readonly childScopes;
     private disposePromise;
     private disposed;
@@ -94,6 +95,7 @@ export declare class Container {
     private resolveMultiProviderInstance;
     private resolveExistingProviderTarget;
     private resolveScopedOrSingletonInstance;
+    private getCachedScopedOrSingletonInstance;
     private shouldResolveFromRoot;
     private shouldResolveMultiProviderFromRoot;
     private resolveDepToken;
@@ -127,6 +129,7 @@ export declare class Container {
     private assertSingletonDependencyScopes;
     private resolveEffectiveProvider;
     private resolveProviderDependencyToken;
+    private resolveForwardRefToken;
     private resolveProviderDeps;
     private invalidateCachedEntry;
 }

package/dist/container.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../src/container.ts"],"names":[],"mappings":"AAAA,OAAO,EAAmC,KAAK,KAAK,EAAE,MAAM,cAAc,CAAC;AAW3E,OAAO,KAAK,EASV,QAAQ,EAET,MAAM,YAAY,CAAC;AA8FpB;;GAEG;AACH,qBAAa,SAAS;IAelB,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;IACxB,OAAO,CAAC,QAAQ,CAAC,mBAAmB;IAftC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAwC;IACtE,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA0C;IAC7E,OAAO,CAAC,QAAQ,CAAC,qBAAqB,CAAoB;IAC1D,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAsC;IACnE,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAmD;IACrF,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAmD;IACvF,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAA4B;IAC/D,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAiB;IACrD,OAAO,CAAC,QAAQ,CAAC,cAAc,CAA+B;IAC9D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAwB;IACpD,OAAO,CAAC,cAAc,CAA4B;IAClD,OAAO,CAAC,QAAQ,CAAS;gBAGN,MAAM,CAAC,EAAE,SAAS,YAAA,EAClB,mBAAmB,UAAQ,EAC5C,cAAc,CAAC,EAAE,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,OAAO,CAAC,CAAC;IAK/C;;;;;;;;;OASG;IACH,QAAQ,CAAC,GAAG,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAI;IAyCxC;;;;;;;;;;;;;OAaG;IACH,QAAQ,CAAC,GAAG,SAAS,EAAE,QAAQ,EAAE,GAAG,IAAI;IA6BxC;;;;;OAKG;IACH,GAAG,CAAC,KAAK,EAAE,KAAK,GAAG,OAAO;IAI1B;;;;;OAKG;IACH,kBAAkB,IAAI,SAAS;IAa/B;;;;;;;;;OASG;IACG,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAW7C;;;;;OAKG;IACG,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;YAiBhB,UAAU;IAgBxB,OAAO,CAAC,QAAQ;IAMhB,OAAO,CAAC,4BAA4B;IAsBpC,OAAO,CAAC,6BAA6B;IAIrC,OAAO,CAAC,qBAAqB;IAM7B,OAAO,CAAC,4BAA4B;IAIpC,OAAO,CAAC,oBAAoB;IAM5B,OAAO,CAAC,qBAAqB;YAgBf,gBAAgB;YAehB,8BAA8B;IA+B5C,OAAO,CAAC,eAAe;YAgBT,kBAAkB;IAMhC,OAAO,CAAC,mCAAmC;YAoB7B,6BAA6B;YAc7B,4BAA4B;IA4B1C,OAAO,CAAC,6BAA6B;YAQvB,gCAAgC;IAuB9C,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,kCAAkC;YAI5B,eAAe;YAwBf,gBAAgB;IAiB9B,OAAO,CAAC,IAAI;IAIZ,OAAO,CAAC,cAAc;IAUtB;;;;;;;;;;OAUG;IACH,OAAO,CAAC,QAAQ;IAuBhB,OAAO,CAAC,aAAa;IAuBrB,OAAO,CAAC,qBAAqB;IAI7B,OAAO,CAAC,oBAAoB;YAkBd,YAAY;YAaZ,0BAA0B;YA0B1B,8BAA8B;IAc5C,OAAO,CAAC,mBAAmB;YAWb,yBAAyB;IAMvC,OAAO,CAAC,qBAAqB;IAoB7B,OAAO,CAAC,mBAAmB;IAU3B,OAAO,CAAC,YAAY;YAIN,WAAW;IA+BzB,OAAO,CAAC,+BAA+B;IAsBvC,OAAO,CAAC,wBAAwB;IA6BhC,OAAO,CAAC,8BAA8B;YAYxB,mBAAmB;IAUjC,OAAO,CAAC,qBAAqB;CA6C9B"}
+{"version":3,"file":"container.d.ts","sourceRoot":"","sources":["../src/container.ts"],"names":[],"mappings":"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"}

package/dist/container.js

@@ -17,6 +17,21 @@ function isClassProvider(value) {
 function isExistingProvider(value) {
   return typeof value === 'object' && value !== null && 'useExisting' in value;
 }
+function assertProviderToken(provider) {
+  if (!('provide' in provider) || provider.provide == null) {
+    throw new InvalidProviderError('Provider object must include a non-null provide token.');
+  }
+}
+function assertProviderStrategy(provider) {
+  const strategyCount = Number('useValue' in provider) + Number('useFactory' in provider) + Number('useClass' in provider) + Number('useExisting' in provider);
+  if (strategyCount !== 1) {
+    throw new InvalidProviderError('Provider object must declare exactly one of useValue, useFactory, useClass, or useExisting.');
+  }
+}
+function assertObjectProvider(provider) {
+  assertProviderToken(provider);
+  assertProviderStrategy(provider);
+}
 function normalizeInjectToken(token) {
   if (token == null) {
     throw new InvalidProviderError('Inject token must not be null or undefined. Check that all tokens in @Inject(...) are defined at the point of decoration (forward-reference cycles require forwardRef()).');
@@ -35,6 +50,7 @@ function normalizeProvider(provider) {
     };
   }
   if (isValueProvider(provider)) {
+    assertObjectProvider(provider);
     return {
       inject: [],
       multi: provider.multi,
@@ -45,6 +61,12 @@ function normalizeProvider(provider) {
     };
   }
   if (isFactoryProvider(provider)) {
+    assertObjectProvider(provider);
+    if (typeof provider.useFactory !== 'function') {
+      throw new InvalidProviderError('Factory provider useFactory must be a function.', {
+        token: provider.provide
+      });
+    }
     const metadata = provider.resolverClass ? getClassDiMetadata(provider.resolverClass) : undefined;
     return {
       inject: (provider.inject ?? []).map(normalizeInjectToken),
@@ -56,6 +78,12 @@ function normalizeProvider(provider) {
     };
   }
   if (isClassProvider(provider)) {
+    assertObjectProvider(provider);
+    if (typeof provider.useClass !== 'function') {
+      throw new InvalidProviderError('Class provider useClass must be a constructor.', {
+        token: provider.provide
+      });
+    }
     const metadata = getClassDiMetadata(provider.useClass);
     return {
       inject: (provider.inject ?? metadata?.inject ?? []).map(normalizeInjectToken),
@@ -67,6 +95,12 @@ function normalizeProvider(provider) {
     };
   }
   if (isExistingProvider(provider)) {
+    assertObjectProvider(provider);
+    if (provider.useExisting == null) {
+      throw new InvalidProviderError('Alias provider useExisting must be a non-null token.', {
+        token: provider.provide
+      });
+    }
     return {
       inject: [],
       provide: provider.provide,
@@ -91,6 +125,7 @@ export class Container {
   staleDisposalTasks = new Set();
   staleDisposalErrors = [];
   singletonCache;
+  forwardRefTokenCache = new WeakMap();
   childScopes = new Set();
   disposePromise;
   disposed = false;
@@ -118,7 +153,7 @@ export class Container {
     }
     for (const provider of providers) {
       const normalized = normalizeProvider(provider);
-      if (this.requestScopeEnabled && normalized.scope === Scope.DEFAULT && normalized.multi !== true) {
+      if (this.requestScopeEnabled && normalized.scope === Scope.DEFAULT) {
         throw new ScopeMismatchError(`Singleton provider ${String(normalized.provide)} cannot be registered on a request-scope container.`, {
           token: normalized.provide,
           scope: 'singleton',
@@ -328,6 +363,10 @@ export class Container {
     if (provider.scope === 'transient') {
       return await this.withTokenInChain(token, chain, activeTokens, async (c, at) => this.instantiate(provider, c, at));
     }
+    const cachedInstance = this.getCachedScopedOrSingletonInstance(provider);
+    if (cachedInstance) {
+      return await cachedInstance;
+    }
     return await this.withTokenInChain(token, chain, activeTokens, async (c, at) => this.resolveScopedOrSingletonInstance(provider, c, at));
   }
   requireProvider(token) {
@@ -397,6 +436,15 @@ export class Container {
     }
     return cache.get(provider.provide);
   }
+  getCachedScopedOrSingletonInstance(provider) {
+    if (provider.scope !== Scope.DEFAULT) {
+      return undefined;
+    }
+    if (this.shouldResolveFromRoot(provider)) {
+      return this.root().getCachedScopedOrSingletonInstance(provider);
+    }
+    return this.cacheFor(provider).get(provider.provide);
+  }
   shouldResolveFromRoot(provider) {
     return provider.scope === Scope.DEFAULT && this.requestScopeEnabled && !this.registrations.has(provider.provide);
   }
@@ -412,7 +460,7 @@ export class Container {
       return this.resolveWithChain(innerToken, chain, activeTokens);
     }
     if (isForwardRef(depEntry)) {
-      const resolvedToken = depEntry.forwardRef();
+      const resolvedToken = this.resolveForwardRefToken(depEntry);
       return this.resolveWithChain(resolvedToken, chain, activeTokens, /* allowForwardRef */true);
     }
     return this.resolveWithChain(depEntry, chain, activeTokens);
@@ -645,13 +693,21 @@ export class Container {
   }
   resolveProviderDependencyToken(depEntry) {
     if (isForwardRef(depEntry)) {
-      return depEntry.forwardRef();
+      return this.resolveForwardRefToken(depEntry);
     }
     if (isOptionalToken(depEntry)) {
       return depEntry.token;
     }
     return depEntry;
   }
+  resolveForwardRefToken(forwardRefEntry) {
+    if (this.forwardRefTokenCache.has(forwardRefEntry)) {
+      return this.forwardRefTokenCache.get(forwardRefEntry);
+    }
+    const resolvedToken = forwardRefEntry.forwardRef();
+    this.forwardRefTokenCache.set(forwardRefEntry, resolvedToken);
+    return resolvedToken;
+  }
   async resolveProviderDeps(provider, chain, activeTokens) {
     const deps = new Array(provider.inject.length);
     for (const [index, entry] of provider.inject.entries()) {

package/package.json

@@ -9,7 +9,7 @@
     "container",
     "provider"
   ],
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.3",
   "private": false,
   "license": "MIT",
   "repository": {
@@ -36,7 +36,7 @@
     "dist"
   ],
   "dependencies": {
-    "@fluojs/core": "^1.0.0-beta.1"
+    "@fluojs/core": "^1.0.0-beta.2"
   },
   "devDependencies": {
     "vitest": "^3.2.4"