@travetto/di 5.0.0-rc.1 → 5.0.0-rc.2

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 { Env } from '@travetto/base';
+import { Runtime } from '@travetto/runtime';
 import { Inject, Injectable } from '@travetto/di';
 
-@Injectable({ enabled: Env.production })
+@Injectable({ enabled: Runtime.production })
 class ProductionLogger {
   async log() {
     console.log('This will only run in production');

package/package.json

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

package/src/decorator.ts

@@ -1,4 +1,4 @@
-import type { Class, ClassInstance } from '@travetto/base';
+import type { Class, ClassInstance } from '@travetto/runtime';
 
 import { InjectableFactoryConfig, InjectableConfig, Dependency } from './types';
 import { DependencyRegistry, ResolutionType } from './registry';

package/src/error.ts

@@ -1,4 +1,4 @@
-import { AppError } from '@travetto/base';
+import { AppError } from '@travetto/runtime';
 import { ClassTarget } from './types';
 
 function getName(symbol: symbol): string {

package/src/registry.ts

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

package/src/types.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 
 export type ClassTarget<T = unknown> = Class<T> | Function;
 

package/support/dynamic.injection.ts

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

package/support/test/suite.ts

@@ -1,4 +1,4 @@
-import { Class, ClassInstance } from '@travetto/base';
+import { Class, ClassInstance } from '@travetto/runtime';
 import { RootRegistry } from '@travetto/registry';
 import { SuiteRegistry } from '@travetto/test';