@travetto/registry 7.0.0-rc.0 → 7.0.0-rc.1

package/README.md

@@ -98,7 +98,7 @@ export class SampleRegistryIndex implements RegistryIndex {
 }
 ```
 
-The registry index is a [RegistryIndex](https://github.com/travetto/travetto/tree/main/module/registry/src/service/types.ts#L34) that similar to the [Schema](https://github.com/travetto/travetto/tree/main/module/schema#readme "Data type registry for runtime validation, reflection and binding.")'s Schema registry and [Dependency Injection](https://github.com/travetto/travetto/tree/main/module/di#readme "Dependency registration/management and injection support.")'s Dependency registry.
+The registry index is a [RegistryIndex](https://github.com/travetto/travetto/tree/main/module/registry/src/service/types.ts#L36) that similar to the [Schema](https://github.com/travetto/travetto/tree/main/module/schema#readme "Data type registry for runtime validation, reflection and binding.")'s Schema registry and [Dependency Injection](https://github.com/travetto/travetto/tree/main/module/di#readme "Dependency registration/management and injection support.")'s Dependency registry.
 
 ### Live Flow
 At runtime, the registry is designed to listen for changes and to propagate the changes as necessary. In many cases the same file is handled by multiple registries. 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/registry",
-  "version": "7.0.0-rc.0",
+  "version": "7.0.0-rc.1",
   "description": "Patterns and utilities for handling registration of metadata and functionality for run-time use",
   "keywords": [
     "ast-transformations",
@@ -27,11 +27,11 @@
     "directory": "module/registry"
   },
   "dependencies": {
-    "@travetto/runtime": "^7.0.0-rc.0"
+    "@travetto/runtime": "^7.0.0-rc.1"
   },
   "peerDependencies": {
-    "@travetto/cli": "^7.0.0-rc.0",
-    "@travetto/transformer": "^7.0.0-rc.0"
+    "@travetto/cli": "^7.0.0-rc.1",
+    "@travetto/transformer": "^7.0.0-rc.1"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/service/registry.ts

@@ -4,7 +4,7 @@ import { AppError, castTo, Class, Util } from '@travetto/runtime';
 import { ClassSource } from '../source/class-source';
 import { ChangeEvent } from '../types';
 import { MethodSource } from '../source/method-source';
-import { RegistryIndex, RegistryIndexClass } from './types';
+import { RegistryIndex, RegistryIndexClass, EXPIRED_CLASS } from './types';
 
 class $Registry {
 
@@ -27,6 +27,8 @@ class $Registry {
       for (const idx of this.#indexOrder) {
         this.instance(idx).store.remove(cls);
       }
+      // Tag expired classes
+      Object.assign(cls, { [EXPIRED_CLASS]: true });
     }
   }
 

package/src/service/store.ts

@@ -1,6 +1,22 @@
-import { AppError, castTo, Class, getParentClass } from '@travetto/runtime';
+import { Any, AppError, castTo, Class, getParentClass, Runtime } from '@travetto/runtime';
 
-import { RegistrationMethods, RegistryAdapter } from './types';
+import { EXPIRED_CLASS, RegistrationMethods, RegistryAdapter } from './types';
+
+function ExchangeExpired<R = unknown>() {
+  return function (
+    target: Any,
+    propertyKey: string | symbol,
+    descriptor: TypedPropertyDescriptor<(this: RegistryIndexStore, cls: Class) => R>
+  ): void {
+    if (Runtime.dynamic) {
+      const original = descriptor.value!;
+      descriptor.value = function (this: RegistryIndexStore, cls: Class): R {
+        const resolved = EXPIRED_CLASS in cls ? this.getClassById(cls.Ⲑid) : cls;
+        return original.apply(this, [resolved]);
+      };
+    }
+  };
+}
 
 /**
  * Base registry index implementation
@@ -15,16 +31,13 @@ export class RegistryIndexStore<A extends RegistryAdapter<{}> = RegistryAdapter<
 
   constructor(adapterCls: new (cls: Class) => A) {
     this.#adapterCls = adapterCls;
+    this.getClassById = this.getClassById.bind(this);
   }
 
   getClasses(): Class[] {
     return Array.from(this.#adapters.keys());
   }
 
-  has(cls: Class): boolean {
-    return this.#adapters.has(cls);
-  }
-
   getClassById(id: string): Class {
     return this.#idToCls.get(id)!;
   }
@@ -38,6 +51,17 @@ export class RegistryIndexStore<A extends RegistryAdapter<{}> = RegistryAdapter<
     this.#finalized.set(cls, true);
   }
 
+  remove(cls: Class): void {
+    this.#adapters.delete(cls);
+    this.#finalized.delete(cls);
+  }
+
+  @ExchangeExpired()
+  has(cls: Class): boolean {
+    return this.#adapters.has(cls);
+  }
+
+  @ExchangeExpired()
   adapter(cls: Class): A {
     if (!this.#adapters.has(cls)!) {
       const adapter = new this.#adapterCls(cls);
@@ -48,11 +72,7 @@ export class RegistryIndexStore<A extends RegistryAdapter<{}> = RegistryAdapter<
     return castTo(this.#adapters.get(cls));
   }
 
-  remove(cls: Class): void {
-    this.#adapters.delete(cls);
-    this.#finalized.delete(cls);
-  }
-
+  @ExchangeExpired()
   getForRegister(cls: Class, allowFinalized = false): A {
     if (this.#finalized.get(cls) && !allowFinalized) {
       throw new AppError(`Class ${cls.Ⲑid} is already finalized`);
@@ -60,6 +80,7 @@ export class RegistryIndexStore<A extends RegistryAdapter<{}> = RegistryAdapter<
     return this.adapter(cls);
   }
 
+  @ExchangeExpired()
   get(cls: Class): Omit<A, RegistrationMethods> {
     if (!this.has(cls)) {
       throw new AppError(`Class ${cls.Ⲑid} is not registered for ${this.#adapterCls.Ⲑid}`);
@@ -67,6 +88,7 @@ export class RegistryIndexStore<A extends RegistryAdapter<{}> = RegistryAdapter<
     return this.adapter(cls);
   }
 
+  @ExchangeExpired()
   getOptional(cls: Class): Omit<A, RegistrationMethods> | undefined {
     if (!this.has(cls)) {
       return undefined;
@@ -74,6 +96,7 @@ export class RegistryIndexStore<A extends RegistryAdapter<{}> = RegistryAdapter<
     return this.adapter(cls);
   }
 
+  @ExchangeExpired()
   finalized(cls: Class): boolean {
     return this.#finalized.has(cls);
   }

package/src/service/types.ts

@@ -3,6 +3,8 @@ import { ChangeEvent } from '../types';
 
 export type RegistrationMethods = `register${string}` | `finalize${string}`;
 
+export const EXPIRED_CLASS = Symbol();
+
 /**
  * Interface for registry adapters to implement
  */