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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/registry",
-  "version": "4.0.0-rc.0",
+  "version": "4.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/base": "^4.0.0-rc.0"
+    "@travetto/base": "^4.0.0-rc.1"
   },
   "peerDependencies": {
-    "@travetto/cli": "^4.0.0-rc.0",
-    "@travetto/transformer": "^4.0.0-rc.0"
+    "@travetto/cli": "^4.0.0-rc.1",
+    "@travetto/transformer": "^4.0.0-rc.1"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/internal/commonjs-loader.ts

@@ -43,8 +43,8 @@ export class DynamicCommonjsLoader {
       }
 
       const fileName = Module._resolveFilename!(request, parent);
-      // Only proxy local modules
-      if (RuntimeIndex.getModuleFromSource(fileName)?.local) {
+      // Only proxy workspace modules
+      if (RuntimeIndex.getModuleFromSource(fileName)?.workspace) {
         return proxyModuleLoad ? proxyModuleLoad(fileName, mod) : mod;
       } else {
         return mod;

package/src/internal/file-loader.ts

@@ -65,11 +65,13 @@ class $DynamicFileLoader {
       .on('uncaughtException', handle);
 
     // Fire off, and let it run in the bg. Restart on exit
-    watchCompiler<FullWatchEvent>(ev => {
-      if (ev.file && RuntimeIndex.hasModule(ev.module) && VALID_FILE_TYPES.has(ManifestModuleUtil.getFileType(ev.file))) {
-        return this.dispatch(ev);
+    (async (): Promise<void> => {
+      for await (const ev of watchCompiler<FullWatchEvent>({ restartOnExit: true })) {
+        if (ev.file && RuntimeIndex.hasModule(ev.module) && VALID_FILE_TYPES.has(ManifestModuleUtil.getFileType(ev.file))) {
+          await this.dispatch(ev);
+        }
       }
-    }, { restartOnExit: true });
+    })();
   }
 }
 

package/src/service/metadata.ts

@@ -1,4 +1,4 @@
-import { Class, DataUtil } from '@travetto/base';
+import { Class } from '@travetto/base';
 
 import { Registry } from '../registry';
 import { ChangeEvent } from '../types';
@@ -13,7 +13,6 @@ function id(cls: string | Class): string {
 export abstract class MetadataRegistry<C extends { class: Class }, M = unknown, F = Function> extends Registry {
 
   static id = id;
-
   /**
    * Classes pending removal
    */
@@ -142,7 +141,7 @@ export abstract class MetadataRegistry<C extends { class: Class }, M = unknown,
    */
   register(cls: Class, pConfig: Partial<C> = {}): void {
     const conf = this.getOrCreatePending(cls);
-    DataUtil.deepAssign(conf, pConfig);
+    Object.assign(conf, pConfig);
   }
 
   /**
@@ -150,7 +149,7 @@ export abstract class MetadataRegistry<C extends { class: Class }, M = unknown,
    */
   registerField(cls: Class, field: F, pConfig: Partial<M>): void {
     const conf = this.getOrCreatePendingField(cls, field);
-    DataUtil.deepAssign(conf, pConfig);
+    Object.assign(conf, pConfig);
   }
 
   /**