@travetto/di 7.0.0-rc.2 → 7.0.0-rc.4

package/package.json

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

package/src/registry/registry-index.ts

@@ -1,5 +1,5 @@
-import { ChangeEvent, RegistryIndex, RegistryIndexStore, Registry, RetargettingProxy } from '@travetto/registry';
-import { AppError, castKey, castTo, Class, describeFunction, getParentClass, hasFunction, Runtime, TypedObject, Util } from '@travetto/runtime';
+import { RegistryIndex, RegistryIndexStore, Registry } from '@travetto/registry';
+import { AppError, castKey, castTo, Class, describeFunction, getParentClass, hasFunction, TypedObject } from '@travetto/runtime';
 import { SchemaFieldConfig, SchemaParameterConfig, SchemaRegistryIndex } from '@travetto/schema';
 
 import { Dependency, InjectableCandidate, InjectableClassMetadata, InjectableConfig, ResolutionType } from '../types';
@@ -32,10 +32,6 @@ export class DependencyRegistryIndex implements RegistryIndex {
     return this.#instance.getCandidates<T>(candidateType);
   }
 
-  static getCandidateTypes<T>(candidateType: Class<T>): Class<T>[] {
-    return this.#instance.getCandidates(candidateType).map(candidate => candidate.candidateType);
-  }
-
   static getInstances<T>(candidateType: Class<T>, predicate?: (config: InjectableCandidate<T>) => boolean): Promise<T[]> {
     return this.#instance.getInstances<T>(candidateType, predicate);
   }
@@ -44,10 +40,6 @@ export class DependencyRegistryIndex implements RegistryIndex {
     return this.#instance.injectFields(cls, item, cls);
   }
 
-  static getOptional(cls: Class): InjectableConfig | undefined {
-    return this.#instance.store.getOptional(cls)?.get();
-  }
-
   static registerClassMetadata(cls: Class, metadata: InjectableClassMetadata): void {
     SchemaRegistryIndex.getForRegister(cls).registerMetadata<InjectableClassMetadata>(MetadataSymbol, metadata);
   }
@@ -60,63 +52,10 @@ export class DependencyRegistryIndex implements RegistryIndex {
     SchemaRegistryIndex.getForRegister(cls).registerFieldMetadata(field, MetadataSymbol, metadata);
   }
 
-  #proxies = new Map<string, Map<symbol | undefined, RetargettingProxy<unknown>>>();
   #instances = new Map<Class, Map<symbol, unknown>>();
   #instancePromises = new Map<Class, Map<symbol, Promise<unknown>>>();
   #resolver = new DependencyRegistryResolver();
 
-  #proxyInstance<T>(target: Class<unknown>, qualifier: symbol, instance: T): T {
-    let proxy: RetargettingProxy<unknown>;
-    const targetId = target.Ⲑid;
-
-    if (!this.#proxies.has(targetId)) {
-      this.#proxies.set(targetId, new Map());
-    }
-
-    if (!this.#proxies.get(targetId)!.has(qualifier)) {
-      proxy = new RetargettingProxy(instance);
-      this.#proxies.get(targetId)!.set(qualifier, proxy);
-      console.debug('Registering proxy', { id: target.Ⲑid, qualifier: qualifier.toString() });
-    } else {
-      proxy = this.#proxies.get(targetId)!.get(qualifier)!;
-      proxy.setTarget(instance);
-      console.debug('Updating target', {
-        id: target.Ⲑid, qualifier: qualifier.toString(), instanceType: target.name
-      });
-    }
-
-    return proxy.get();
-  }
-
-  #addClass(cls: Class, forceCreate: boolean = false): void {
-    const adapter = this.store.get(cls);
-
-    for (const config of adapter.getCandidateConfigs()) {
-      const parentClass = getParentClass(config.candidateType);
-      const parentConfig = parentClass ? this.store.getOptional(parentClass) : undefined;
-      const hasParentBase = (parentConfig || (parentClass && !!describeFunction(parentClass)?.abstract));
-      const baseParent = hasParentBase ? parentClass : undefined;
-      this.#resolver.registerClass(config, baseParent);
-      if (config.autoInject || forceCreate) {
-        // Don't wait
-        Util.queueMacroTask().then(() => {
-          this.getInstance(config.candidateType, config.qualifier);
-        });
-      }
-    }
-  }
-
-  #removeClass(cls: Class): void {
-    if (this.#instances.has(cls)) {
-      for (const [qualifier, config] of this.#resolver.getContainerEntries(cls)) {
-        try {
-          this.destroyInstance(config.candidateType, qualifier);
-        } catch { }
-      }
-    }
-  }
-
-
   async #resolveDependencyValue(dependency: Dependency, input: SchemaFieldConfig | SchemaParameterConfig, cls: Class): Promise<unknown> {
     try {
       const target = dependency.target ?? input.type;
@@ -135,17 +74,32 @@ export class DependencyRegistryIndex implements RegistryIndex {
 
   store = new RegistryIndexStore(DependencyRegistryAdapter);
 
+  /** @private */ constructor(source: unknown) { Registry.validateConstructor(source); }
+
   getConfig(cls: Class): InjectableConfig {
     return this.store.get(cls).get();
   }
 
-  process(events: ChangeEvent<Class>[]): void {
-    for (const event of events) {
-      if ('previous' in event) {
-        this.#removeClass(event.previous);
-      }
-      if ('current' in event) {
-        this.#addClass(event.current, 'previous' in event);
+  onCreate(cls: Class): void {
+    const adapter = this.store.get(cls);
+
+    for (const config of adapter.getCandidateConfigs()) {
+      const parentClass = getParentClass(config.candidateType);
+      const parentConfig = parentClass ? this.store.getOptional(parentClass) : undefined;
+      const hasParentBase = (parentConfig || (parentClass && !!describeFunction(parentClass)?.abstract));
+      const baseParent = hasParentBase ? parentClass : undefined;
+      this.#resolver.registerClass(config, baseParent);
+    }
+  }
+
+  // Setup instances after change set complete
+  onChangeSetComplete(classes: Class[]): void {
+    for (const cls of classes) {
+      const adapter = this.store.get(cls);
+      for (const config of adapter.getCandidateConfigs()) {
+        if (config.autoInject) {
+          this.getInstance(config.candidateType, config.qualifier);
+        }
       }
     }
   }
@@ -222,7 +176,7 @@ export class DependencyRegistryIndex implements RegistryIndex {
     }
 
     // Proxy if necessary
-    return Runtime.dynamic ? this.#proxyInstance(targetType, qualifier, inst) : inst;
+    return inst;
   }
 
   /**
@@ -273,7 +227,6 @@ export class DependencyRegistryIndex implements RegistryIndex {
     this.#instancePromises.get(target)?.delete(qualifier);
 
     // May not exist
-    this.#proxies.get(target.Ⲑid)?.get(qualifier)?.setTarget(null);
     console.debug('On uninstall', { id: target, qualifier: qualifier.toString(), classId: target });
   }
 }