@travetto/registry 5.0.0-rc.0 → 5.0.0-rc.2

package/README.md

@@ -27,7 +27,7 @@ This flow ensures all files are loaded and processed before application starts.
 
 **Code: Sample Registry**
 ```typescript
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 import { MetadataRegistry } from '@travetto/registry';
 
 interface Group {
@@ -112,9 +112,9 @@ As mentioned in [Manifest](https://github.com/travetto/travetto/tree/main/module
           changes += 1;
           this.emit({ type: 'added', curr: next.get(k)! });
         } else {
-          const prevMeta = RuntimeIndex.getFunctionMetadataFromClass(prev.get(k));
-          const nextMeta = RuntimeIndex.getFunctionMetadataFromClass(next.get(k));
-          if (prevMeta?.hash !== nextMeta?.hash) {
+          const prevHash = describeFunction(prev.get(k)!)?.hash;
+          const nextHash = describeFunction(next.get(k)!)?.hash;
+          if (prevHash !== nextHash) {
             changes += 1;
             this.emit({ type: 'changed', curr: next.get(k)!, prev: prev.get(k) });
           }

package/package.json

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

package/src/decorator.ts

@@ -1,5 +1,4 @@
-import { Class } from '@travetto/base';
-import { RuntimeIndex } from '@travetto/manifest';
+import { Class, Runtime } from '@travetto/runtime';
 
 /**
  * Register a class as pending
@@ -12,7 +11,7 @@ class $PendingRegister {
    * Register class as pending
    */
   add(cls: Class): void {
-    const src = RuntimeIndex.getFunctionMetadata(cls)!.source;
+    const src = Runtime.getSource(cls);
     if (!this.map.has(src)) {
       const sub: Class[] = [];
       this.map.set(src, sub);

package/src/internal/commonjs-loader.ts

@@ -1,7 +1,7 @@
 import { Module } from 'node:module';
 
-import { path, RuntimeIndex } from '@travetto/manifest';
-import { Env } from '@travetto/base';
+import { path } from '@travetto/manifest';
+import { Runtime, RuntimeIndex } from '@travetto/runtime';
 
 import { RetargettingProxy } from '../proxy';
 
@@ -32,7 +32,7 @@ export class DynamicCommonjsLoader {
         mod = moduleLoad.apply(null, [request, parent]);
       } catch (err: unknown) {
         const name = Module._resolveFilename!(request, parent);
-        if (err instanceof Error && Env.dynamic && !name.startsWith('test/')) {
+        if (err instanceof Error && Runtime.dynamic && !name.startsWith('test/')) {
           const errMsg = err.message;
           console.debug(`Unable to load ${name}: stubbing out with error proxy.`, errMsg);
           const e = (): never => { throw new Error(errMsg); };

package/src/internal/file-loader.ts

@@ -1,5 +1,5 @@
-import { ManifestModuleUtil, RuntimeIndex, RuntimeContext } from '@travetto/manifest';
-import { watchCompiler, FullWatchEvent, WatchEvent } from '@travetto/base';
+import { ManifestModuleUtil } from '@travetto/manifest';
+import { watchCompiler, WatchEvent, Runtime, RuntimeIndex } from '@travetto/runtime';
 
 interface ModuleLoader {
   init?(): Promise<void>;
@@ -19,12 +19,12 @@ class $DynamicFileLoader {
   #loader: ModuleLoader;
   #initialized = false;
 
-  async dispatch(ev: FullWatchEvent): Promise<void> {
+  async dispatch(ev: WatchEvent): Promise<void> {
     if (ev.action === 'update' || ev.action === 'delete') {
       await this.#loader.unload(ev.output);
     }
     if (ev.action === 'create' || ev.action === 'delete') {
-      RuntimeIndex.reinitForModule(RuntimeContext.main.name);
+      RuntimeIndex.reinitForModule(Runtime.main.name);
     }
     if (ev.action === 'create' || ev.action === 'update') {
       await this.#loader.load(ev.output);
@@ -66,7 +66,7 @@ class $DynamicFileLoader {
 
     // Fire off, and let it run in the bg. Restart on exit
     (async (): Promise<void> => {
-      for await (const ev of watchCompiler<FullWatchEvent>({ restartOnExit: true })) {
+      for await (const ev of watchCompiler({ restartOnExit: true })) {
         if (ev.file && RuntimeIndex.hasModule(ev.module) && VALID_FILE_TYPES.has(ManifestModuleUtil.getFileType(ev.file))) {
           await this.dispatch(ev);
         }

package/src/proxy.ts

@@ -1,6 +1,6 @@
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type ConcreteClass<T = any> = new (...args: any[]) => T;
-const ProxyTargetⲐ = Symbol.for('@travetto/base:proxy-target');
+const ProxyTargetⲐ = Symbol.for('@travetto/runtime:proxy-target');
 
 const AsyncGeneratorFunction = Object.getPrototypeOf(async function* () { });
 const GeneratorFunction = Object.getPrototypeOf(function* () { });

package/src/registry.ts

@@ -1,5 +1,5 @@
 import { EventEmitter } from 'node:events';
-import { Class, Env } from '@travetto/base';
+import { Class, Env } from '@travetto/runtime';
 import { ChangeSource, ChangeEvent, ChangeHandler } from './types';
 
 /**

package/src/service/metadata.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 
 import { Registry } from '../registry';
 import { ChangeEvent } from '../types';

package/src/service/root.ts

@@ -1,4 +1,4 @@
-import { Class } from '@travetto/base';
+import { Class } from '@travetto/runtime';
 
 import { Registry } from '../registry';
 import { ClassSource } from '../source/class-source';

package/src/source/class-source.ts

@@ -1,7 +1,7 @@
 import { EventEmitter } from 'node:events';
 
-import { FindConfig, RuntimeIndex } from '@travetto/manifest';
-import { Class, Env } from '@travetto/base';
+import { type FindConfig } from '@travetto/manifest';
+import { Class, Env, Runtime, RuntimeIndex, describeFunction } from '@travetto/runtime';
 
 import { DynamicFileLoader } from '../internal/file-loader';
 import { ChangeSource, ChangeEvent, ChangeHandler } from '../types';
@@ -11,7 +11,7 @@ const moduleFindConfig: FindConfig = {
   module: (m) => {
     const role = Env.TRV_ROLE.val;
     return m.roles.includes('std') && (
-      !Env.production || m.prod ||
+      !Runtime.production || m.prod ||
       ((role === 'doc' || role === 'test') && m.roles.includes(role))
     );
   },
@@ -43,7 +43,7 @@ export class ClassSource implements ChangeSource<Class> {
       }
       this.#classes.set(file, new Map());
       for (const cls of classes) {
-        const src = RuntimeIndex.getFunctionMetadata(cls)!.source;
+        const src = Runtime.getSource(cls);
         this.#classes.get(src)!.set(cls.Ⲑid, cls);
         this.emit({ type: 'added', curr: cls });
       }
@@ -83,9 +83,9 @@ export class ClassSource implements ChangeSource<Class> {
           changes += 1;
           this.emit({ type: 'added', curr: next.get(k)! });
         } else {
-          const prevMeta = RuntimeIndex.getFunctionMetadataFromClass(prev.get(k));
-          const nextMeta = RuntimeIndex.getFunctionMetadataFromClass(next.get(k));
-          if (prevMeta?.hash !== nextMeta?.hash) {
+          const prevHash = describeFunction(prev.get(k)!)?.hash;
+          const nextHash = describeFunction(next.get(k)!)?.hash;
+          if (prevHash !== nextHash) {
             changes += 1;
             this.emit({ type: 'changed', curr: next.get(k)!, prev: prev.get(k) });
           }
@@ -111,7 +111,7 @@ export class ClassSource implements ChangeSource<Class> {
    * Initialize
    */
   async init(): Promise<void> {
-    if (Env.dynamic) {
+    if (Runtime.dynamic) {
       DynamicFileLoader.onLoadEvent(ev => {
         for (const [file, classes] of PendingRegister.flush(true)) {
           this.#handleFileChanges(file, classes);

package/src/source/method-source.ts

@@ -1,7 +1,6 @@
 import { EventEmitter } from 'node:events';
 
-import { Class } from '@travetto/base';
-import { RuntimeIndex } from '@travetto/manifest';
+import { Class, describeFunction } from '@travetto/runtime';
 
 import { ChangeSource, ChangeEvent, ChangeHandler } from '../types';
 
@@ -30,8 +29,8 @@ export class MethodSource implements ChangeSource<[Class, Function]> {
    * On a class being emitted, check methods
    */
   onClassEvent(e: ChangeEvent<Class>): void {
-    const next = RuntimeIndex.getFunctionMetadataFromClass(e.curr!)?.methods ?? {};
-    const prev = RuntimeIndex.getFunctionMetadataFromClass(e.prev!)?.methods ?? {};
+    const next = describeFunction(e.curr!)?.methods ?? {};
+    const prev = describeFunction(e.prev!)?.methods ?? {};
 
     /**
      * Go through each method, comparing hashes.  To see added/removed and changed

package/support/transformer.register.ts

@@ -3,7 +3,8 @@ import ts from 'typescript';
 import { TransformerState, AfterClass, DecoratorUtil } from '@travetto/transformer';
 
 const REGISTER_MOD = '@travetto/registry/src/decorator';
-const SKIP_SRC = /^@travetto\/(base|manifest)\/(src|support)/;
+const SKIP_SRC = /^@travetto\/(runtime|manifest)\/(src|support)/;
+const SKIP_FUNCTION = /^@travetto\/registry\/src\/function/;
 
 /**
  * Registration of all classes to support the registry
@@ -17,7 +18,8 @@ export class RegisterTransformer {
   static registerClass(state: TransformerState, node: ts.ClassDeclaration): ts.ClassDeclaration {
     if (
       state.importName === REGISTER_MOD ||
-      SKIP_SRC.test(state.importName)
+      SKIP_SRC.test(state.importName) ||
+      SKIP_FUNCTION.test(state.importName)
     ) {  // Cannot process self
       return node;
     }