@travetto/registry 4.0.1 → 4.0.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/registry",
-  "version": "4.0.1",
+  "version": "4.0.3",
   "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/base": "^4.0.1"
+    "@travetto/base": "^4.0.2"
   },
   "peerDependencies": {
-    "@travetto/cli": "^4.0.1",
-    "@travetto/transformer": "^4.0.1"
+    "@travetto/cli": "^4.0.4",
+    "@travetto/transformer": "^4.0.2"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/internal/commonjs-loader.ts

@@ -42,10 +42,11 @@ export class DynamicCommonjsLoader {
         }
       }
 
-      const fileName = Module._resolveFilename!(request, parent);
+      const file = Module._resolveFilename!(request, parent);
+      const src = RuntimeIndex.getEntry(file)?.sourceFile;
       // Only proxy workspace modules
-      if (RuntimeIndex.getModuleFromSource(fileName)?.workspace) {
-        return proxyModuleLoad ? proxyModuleLoad(fileName, mod) : mod;
+      if (src && RuntimeIndex.getModuleFromSource(src)?.workspace) {
+        return proxyModuleLoad ? proxyModuleLoad(file, mod) : mod;
       } else {
         return mod;
       }

package/src/registry.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'node:events';
-import { Class } from '@travetto/base';
+import { Class, Env } from '@travetto/base';
 import { ChangeSource, ChangeEvent, ChangeHandler } from './types';
 
 /**
@@ -32,6 +32,11 @@ export abstract class Registry implements ChangeSource<Class> {
    */
   #uid: string;
 
+  /**
+   * Are we in a mode that should have enhanced debug info
+   */
+  trace = Env.DEBUG.val?.includes('@travetto/registry');
+
   /**
    * Creates a new registry, with it's parents specified
    */
@@ -56,7 +61,9 @@ export abstract class Registry implements ChangeSource<Class> {
   async #runInit(): Promise<void> {
     try {
       this.#resolved = false;
-      console.debug('Initializing', { id: this.constructor.Ⲑid, uid: this.#uid });
+      if (this.trace) {
+        console.debug('Initializing', { id: this.constructor.Ⲑid, uid: this.#uid });
+      }
 
       // Handle top level when dealing with non-registry
       const waitFor = this.#parents.filter(x => !(x instanceof Registry));
@@ -100,7 +107,9 @@ export abstract class Registry implements ChangeSource<Class> {
    * Initialize, with a built-in latch to prevent concurrent initializations
    */
   async init(): Promise<unknown> {
-    console.debug('Trying to initialize', { id: this.constructor.Ⲑid, uid: this.#uid, initialized: !!this.#initialized });
+    if (this.trace) {
+      console.debug('Trying to initialize', { id: this.constructor.Ⲑid, uid: this.#uid, initialized: !!this.#initialized });
+    }
 
     if (!this.#initialized) {
       this.#initialized = this.#runInit();
@@ -150,7 +159,9 @@ export abstract class Registry implements ChangeSource<Class> {
    * Listen for events from the parent
    */
   onEvent(event: ChangeEvent<Class>): void {
-    console.debug('Received', { id: this.constructor.Ⲑid, type: event.type, targetId: (event.curr ?? event.prev)!.Ⲑid });
+    if (this.trace) {
+      console.debug('Received', { id: this.constructor.Ⲑid, type: event.type, targetId: (event.curr ?? event.prev)!.Ⲑid });
+    }
 
     switch (event.type) {
       case 'removing':

package/src/service/metadata.ts

@@ -157,7 +157,9 @@ export abstract class MetadataRegistry<C extends { class: Class }, M = unknown,
    */
   onInstall(cls: Class, e: ChangeEvent<Class>): void {
     if (this.pending.has(cls.Ⲑid) || this.pendingFields.has(cls.Ⲑid)) {
-      console.debug('Installing', { service: this.constructor.name, id: cls.Ⲑid });
+      if (this.trace) {
+        console.debug('Installing', { service: this.constructor.name, id: cls.Ⲑid });
+      }
       const result = this.onInstallFinalize(cls);
       this.pendingFields.delete(cls.Ⲑid);
       this.pending.delete(cls.Ⲑid);
@@ -172,7 +174,9 @@ export abstract class MetadataRegistry<C extends { class: Class }, M = unknown,
    */
   onUninstall(cls: Class, e: ChangeEvent<Class>): void {
     if (this.entries.has(cls.Ⲑid)) {
-      console.debug('Uninstalling', { service: this.constructor.name, id: cls.Ⲑid });
+      if (this.trace) {
+        console.debug('Uninstalling', { service: this.constructor.name, id: cls.Ⲑid });
+      }
       this.expired.set(cls.Ⲑid, this.entries.get(cls.Ⲑid)!);
       this.entries.delete(cls.Ⲑid);
       this.onUninstallFinalize(cls);

package/src/source/class-source.ts

@@ -28,6 +28,11 @@ export class ClassSource implements ChangeSource<Class> {
   #classes = new Map<string, Map<string, Class>>();
   #emitter = new EventEmitter();
 
+  /**
+   * Are we in a mode that should have enhanced debug info
+   */
+  trace = Env.DEBUG.val?.includes('@travetto/registry');
+
   /**
    * Flush classes
    */
@@ -96,7 +101,9 @@ export class ClassSource implements ChangeSource<Class> {
    * Emit a change event
    */
   emit(e: ChangeEvent<Class>): void {
-    console.debug('Emitting change', { type: e.type, curr: e.curr?.Ⲑid, prev: e.prev?.Ⲑid });
+    if (this.trace) {
+      console.debug('Emitting change', { type: e.type, curr: e.curr?.Ⲑid, prev: e.prev?.Ⲑid });
+    }
     this.#emitter.emit('change', e);
   }