@travetto/di 3.4.1 → 4.0.0-rc.0

package/README.md

@@ -100,10 +100,10 @@ Given the `static` method `initService`, the function will be provided as a vali
 
 **Code: Example Conditional Dependency**
 ```typescript
-import { GlobalEnv } from '@travetto/base';
+import { Env } from '@travetto/base';
 import { Inject, Injectable } from '@travetto/di';
 
-@Injectable({ enabled: !GlobalEnv.devMode })
+@Injectable({ enabled: Env.production })
 class ProductionLogger {
   async log() {
     console.log('This will only run in production');
@@ -229,8 +229,8 @@ It is also possible to directly reference external types, and they will be conve
 
 **Code: Example External Dependencies**
 ```typescript
-import { EventEmitter } from 'events';
-import { Writable } from 'stream';
+import { EventEmitter } from 'node:events';
+import { Writable } from 'node:stream';
 
 import { Inject, Injectable, InjectableFactory } from '@travetto/di';
 
@@ -288,7 +288,7 @@ import { DependencyRegistry, Inject, Injectable, InjectableFactory } from '@trav
 class TargetConcrete { }
 
 /**
- * @concrete .:TargetConcrete
+ * @concrete #TargetConcrete
  */
 export interface ServiceContract {
   deleteUser(userId: string): Promise<void>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/di",
-  "version": "3.4.1",
+  "version": "4.0.0-rc.0",
   "description": "Dependency registration/management and injection support.",
   "keywords": [
     "ast-transformations",
@@ -27,10 +27,10 @@
     "directory": "module/di"
   },
   "dependencies": {
-    "@travetto/registry": "^3.4.1"
+    "@travetto/registry": "^4.0.0-rc.0"
   },
   "peerDependencies": {
-    "@travetto/transformer": "^3.4.0"
+    "@travetto/transformer": "^4.0.0-rc.0"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/registry.ts

@@ -1,6 +1,6 @@
-import { Class, ClassInstance, ConcreteClass, GlobalEnv } from '@travetto/base';
+import { Class, ClassInstance, ConcreteClass, Env } from '@travetto/base';
 import { MetadataRegistry, RootRegistry, ChangeEvent } from '@travetto/registry';
-import { RootIndex } from '@travetto/manifest';
+import { RuntimeIndex } from '@travetto/manifest';
 
 import { Dependency, InjectableConfig, ClassTarget, InjectableFactoryConfig } from './types';
 import { InjectionError } from './error';
@@ -237,7 +237,7 @@ class $DependencyRegistry extends MetadataRegistry<InjectableConfig> {
 
   override async init(): Promise<void> {
     await super.init();
-    if (GlobalEnv.dynamic) {
+    if (Env.dynamic) {
       const { DependencyRegistration } = await import('../support/dynamic.injection.js');
       DependencyRegistration.init(this);
     }
@@ -435,7 +435,7 @@ class $DependencyRegistry extends MetadataRegistry<InjectableConfig> {
     let parentClass = config.factory ? config.target : Object.getPrototypeOf(cls);
 
     if (config.factory) {
-      while (RootIndex.getFunctionMetadata(Object.getPrototypeOf(parentClass))?.abstract) {
+      while (RuntimeIndex.getFunctionMetadata(Object.getPrototypeOf(parentClass))?.abstract) {
         parentClass = Object.getPrototypeOf(parentClass);
       }
       if (!this.targetToClass.has(classId)) {
@@ -465,7 +465,7 @@ class $DependencyRegistry extends MetadataRegistry<InjectableConfig> {
       }
     }
 
-    if (RootIndex.getFunctionMetadata(cls)?.abstract) { // Skip out early, only needed to inherit
+    if (RuntimeIndex.getFunctionMetadata(cls)?.abstract) { // Skip out early, only needed to inherit
       return config;
     }
 
@@ -500,7 +500,7 @@ class $DependencyRegistry extends MetadataRegistry<InjectableConfig> {
     }
 
     // If targeting self (default @Injectable behavior)
-    if ((classId === targetId || config.factory) && (parentConfig || RootIndex.getFunctionMetadata(parentClass)?.abstract)) {
+    if ((classId === targetId || config.factory) && (parentConfig || RuntimeIndex.getFunctionMetadata(parentClass)?.abstract)) {
       const parentId = parentClass.Ⲑid;
 
       if (!this.targetToClass.has(parentId)) {

package/src/types.ts

@@ -72,7 +72,7 @@ export interface InjectableFactoryConfig<T = unknown> extends Core<T> {
   /**
    * Is this injectable enabled
    */
-  enabled: boolean | (() => boolean);
+  enabled?: boolean | (() => boolean);
   /**
    * Src of the factory method
    */
@@ -88,6 +88,6 @@ export interface InjectableFactoryConfig<T = unknown> extends Core<T> {
 }
 
 /**
- * @concrete ./internal/types:AutoCreateTarget
+ * @concrete ./internal/types#AutoCreateTarget
  */
 export interface AutoCreate { }

package/support/dynamic.injection.ts

@@ -1,5 +1,6 @@
-import { RetargettingProxy, Class, ClassInstance } from '@travetto/base';
-import { RootIndex } from '@travetto/manifest';
+import { Class, ClassInstance } from '@travetto/base';
+import { RuntimeIndex } from '@travetto/manifest';
+import { RetargettingProxy } from '@travetto/registry';
 
 import type { DependencyRegistry, ResolutionType, Resolved } from '../src/registry';
 import type { ClassTarget, InjectableConfig } from '../src/types';
@@ -64,7 +65,7 @@ class $DynamicDependencyRegistry {
     const classId = cls.Ⲑid;
 
     if (
-      !RootIndex.getFunctionMetadata(cls)?.abstract &&
+      !RuntimeIndex.getFunctionMetadata(cls)?.abstract &&
       this.#proxies.has(classId) &&
       this.#proxies.get(classId)!.has(config.qualifier)
     ) {