@travetto/registry 7.1.3 → 8.0.0-alpha.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/registry",
-  "version": "7.1.3",
+  "version": "8.0.0-alpha.0",
   "type": "module",
   "description": "Patterns and utilities for handling registration of metadata and functionality for run-time use",
   "keywords": [
@@ -28,7 +28,7 @@
     "directory": "module/registry"
   },
   "dependencies": {
-    "@travetto/runtime": "^7.1.3"
+    "@travetto/runtime": "^8.0.0-alpha.0"
   },
   "travetto": {
     "displayName": "Registry"

package/src/registry.ts

@@ -1,4 +1,4 @@
-import { AppError, castTo, type Class, Env, flushPendingFunctions, isClass, Runtime, RuntimeIndex } from '@travetto/runtime';
+import { RuntimeError, castTo, type Class, Env, flushPendingFunctions, isClass, Runtime, RuntimeIndex } from '@travetto/runtime';
 
 import type { RegistryIndex, RegistryIndexClass } from './types.ts';
 
@@ -27,7 +27,7 @@ class $Registry {
 
   validateConstructor(source: unknown): void {
     if (source !== this) {
-      throw new AppError('constructor is private');
+      throw new RuntimeError('constructor is private');
     }
   }
 
@@ -100,7 +100,7 @@ class $Registry {
    */
   verifyInitialized(): void {
     if (!this.#resolved) {
-      throw new AppError('Registry not initialized, call init() first');
+      throw new RuntimeError('Registry not initialized, call init() first');
     }
   }
 
@@ -108,12 +108,12 @@ class $Registry {
    * Register a new index
    */
   registerIndex<T extends RegistryIndexClass>(indexCls: T): InstanceType<T> {
-    if (!this.#indexByClass.has(indexCls)) {
+    const result = this.#indexByClass.getOrInsertComputed(indexCls, () => {
       const instance = new indexCls(this);
-      this.#indexByClass.set(indexCls, instance);
       this.#indexes.push(instance);
-    }
-    return castTo(this.#indexByClass.get(indexCls));
+      return instance;
+    });
+    return castTo(result);
   }
 
   /**

package/src/store.ts

@@ -1,4 +1,4 @@
-import { AppError, castTo, type Class, getParentClass } from '@travetto/runtime';
+import { RuntimeError, castTo, type Class, getParentClass } from '@travetto/runtime';
 
 import type { RegistrationMethods, RegistryAdapter, RegistrySimpleStore } from './types.ts';
 
@@ -51,14 +51,14 @@ export class RegistryIndexStore<A extends RegistryAdapter<{}> = RegistryAdapter<
 
   getForRegister(cls: Class, allowFinalized = false): A {
     if (this.#finalized.get(cls) && !allowFinalized) {
-      throw new AppError(`Class ${cls.Ⲑid} is already finalized`);
+      throw new RuntimeError(`Class ${cls.Ⲑid} is already finalized`);
     }
     return this.adapter(cls);
   }
 
   get(cls: Class): Omit<A, RegistrationMethods> {
     if (!this.has(cls)) {
-      throw new AppError(`Class ${cls.Ⲑid} is not registered for ${this.#adapterCls.Ⲑid}`);
+      throw new RuntimeError(`Class ${cls.Ⲑid} is not registered for ${this.#adapterCls.Ⲑid}`);
     }
     return this.adapter(cls);
   }