@travetto/runtime 5.0.2 → 5.0.4

package/README.md

@@ -70,15 +70,15 @@ class $Runtime {
 ```
 
 ## Environment Support
-The functionality we support for testing and retrieving environment information for known environment variables. They can be accessed directly on the [Env](https://github.com/travetto/travetto/tree/main/module/runtime/src/env.ts#L109) object, and will return a scoped [EnvProp](https://github.com/travetto/travetto/tree/main/module/runtime/src/env.ts#L6), that is compatible with the property definition.  E.g. only showing boolean related fields when the underlying flag supports `true` or `false`
+The functionality we support for testing and retrieving environment information for known environment variables. They can be accessed directly on the [Env](https://github.com/travetto/travetto/tree/main/module/runtime/src/env.ts#L111) object, and will return a scoped [EnvProp](https://github.com/travetto/travetto/tree/main/module/runtime/src/env.ts#L8), that is compatible with the property definition.  E.g. only showing boolean related fields when the underlying flag supports `true` or `false`
 
 **Code: Base Known Environment Flags**
 ```typescript
-interface TravettoEnv {
+interface EnvData {
     /** 
-     * The node environment we are running in
-     * @default development
-     */
+ * The node environment we are running in
+ * @default development
+ */
     NODE_ENV: 'development' | 'production';
     /** 
      * Outputs all console.debug messages, defaults to `local` in dev, and `off` in prod. 
@@ -132,7 +132,7 @@ interface TravettoEnv {
 ```
 
 ### Environment Property
-For a given [EnvProp](https://github.com/travetto/travetto/tree/main/module/runtime/src/env.ts#L6), we support the ability to access different properties as a means to better facilitate environment variable usage.
+For a given [EnvProp](https://github.com/travetto/travetto/tree/main/module/runtime/src/env.ts#L8), we support the ability to access different properties as a means to better facilitate environment variable usage.
 
 **Code: EnvProp Shape**
 ```typescript
@@ -256,7 +256,7 @@ The primary access patterns for resources, is to directly request a file, and to
 
 The [FileLoader](https://github.com/travetto/travetto/tree/main/module/runtime/src/file-loader.ts#L11) allows for accessing information about the resources, and subsequently reading the file as text/binary or to access the resource as a `Readable` stream.  If a file is not found, it will throw an [AppError](https://github.com/travetto/travetto/tree/main/module/runtime/src/error.ts#L15) with a category of 'notfound'.  
 
-The [FileLoader](https://github.com/travetto/travetto/tree/main/module/runtime/src/file-loader.ts#L11) also supports tying itself to [Env](https://github.com/travetto/travetto/tree/main/module/runtime/src/env.ts#L109)'s `TRV_RESOURCES` information on where to attempt to find a requested resource.
+The [FileLoader](https://github.com/travetto/travetto/tree/main/module/runtime/src/file-loader.ts#L11) also supports tying itself to [Env](https://github.com/travetto/travetto/tree/main/module/runtime/src/env.ts#L111)'s `TRV_RESOURCES` information on where to attempt to find a requested resource.
 
 ## Common Utilities
 Common utilities used throughout the framework. Currently [Util](https://github.com/travetto/travetto/tree/main/module/runtime/src/util.ts#L17) includes:

package/__index__.ts

@@ -1,5 +1,4 @@
-/// <reference path="./src/trv.d.ts" />
-/// <reference path="./src/global.d.ts" />
+import type { } from './src/global';
 export * from './src/binary';
 export * from './src/console';
 export * from './src/context';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/runtime",
-  "version": "5.0.2",
+  "version": "5.0.4",
   "description": "Runtime for travetto applications.",
   "keywords": [
     "console-manager",
@@ -28,13 +28,13 @@
     "node": ">=22.0.0"
   },
   "dependencies": {
-    "@travetto/manifest": "^5.0.1",
+    "@travetto/manifest": "^5.0.3",
     "@types/debug": "^4.1.12",
-    "@types/node": "^22.5.1",
+    "@types/node": "^22.5.4",
     "debug": "^4.3.6"
   },
   "peerDependencies": {
-    "@travetto/transformer": "^5.0.2"
+    "@travetto/transformer": "^5.0.4"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/context.ts

@@ -1,4 +1,5 @@
 import { existsSync } from 'node:fs';
+import fs from 'node:fs/promises';
 import path from 'node:path';
 
 import { type ManifestIndex, type ManifestContext, ManifestModuleUtil } from '@travetto/manifest';
@@ -111,9 +112,24 @@ class $Runtime {
     if (existsSync(file)) {
       imp = this.#idx.getFromSource(file)?.import;
     }
+
     if (!imp) {
       throw new Error(`Unable to find ${imp}, not in the manifest`);
+    } else if (imp.endsWith('.json')) {
+      imp = this.#idx.getFromImport(imp)?.sourceFile ?? imp;
+      return fs.readFile(imp, 'utf8').then(JSON.parse);
+    }
+
+    if (!/[.][cm]?[tj]sx?$/.test(imp)) {
+      if (imp.startsWith('@')) {
+        if (/[/].*?[/]/.test(imp)) {
+          imp = `${imp}.ts`;
+        }
+      } else {
+        imp = `${imp}.ts`;
+      }
     }
+
     imp = ManifestModuleUtil.withOutputExtension(imp);
     return import(imp);
   }

package/src/env.ts

@@ -3,6 +3,8 @@ import { castKey, castTo } from './types';
 const IS_TRUE = /^(true|yes|on|1)$/i;
 const IS_FALSE = /^(false|no|off|0)$/i;
 
+export interface EnvData { }
+
 export class EnvProp<T> {
   constructor(public readonly key: string) { }
 
@@ -86,11 +88,11 @@ export class EnvProp<T> {
 }
 
 type AllType = {
-  [K in keyof TravettoEnv]: Pick<EnvProp<TravettoEnv[K]>, 'key' | 'export' | 'val' | 'set' | 'clear' | 'isSet' |
-    (TravettoEnv[K] extends unknown[] ? 'list' | 'add' : never) |
-    (Extract<TravettoEnv[K], object> extends never ? never : 'object') |
-    (Extract<TravettoEnv[K], number> extends never ? never : 'int') |
-    (Extract<TravettoEnv[K], boolean> extends never ? never : 'bool' | 'isTrue' | 'isFalse')
+  [K in keyof EnvData]: Pick<EnvProp<EnvData[K]>, 'key' | 'export' | 'val' | 'set' | 'clear' | 'isSet' |
+    (EnvData[K] extends unknown[] ? 'list' | 'add' : never) |
+    (Extract<EnvData[K], object> extends never ? never : 'object') |
+    (Extract<EnvData[K], number> extends never ? never : 'int') |
+    (Extract<EnvData[K], boolean> extends never ? never : 'bool' | 'isTrue' | 'isFalse')
   >
 };
 

package/src/trv.d.ts

@@ -1,16 +1,13 @@
-import type { ManifestModuleRole } from '@travetto/manifest';
-
-import type { TimeSpan } from './time';
-
+import { type ManifestModuleRole } from '@travetto/manifest';
+import { type TimeSpan } from './time';
 type Role = Exclude<ManifestModuleRole, 'std' | 'compile'>;
 
-
-declare global {
-  interface TravettoEnv {
+declare module "@travetto/runtime" {
+  interface EnvData {
     /** 
-     * The node environment we are running in
-     * @default development
-     */
+ * The node environment we are running in
+ * @default development
+ */
     NODE_ENV: 'development' | 'production';
     /** 
      * Outputs all console.debug messages, defaults to `local` in dev, and `off` in prod. 

package/support/transformer.console-log.ts

@@ -6,7 +6,6 @@ import {
 } from '@travetto/transformer';
 
 const CONSOLE_IMPORT = '@travetto/runtime/src/console';
-const MANIFEST_MOD = '@travetto/manifest';
 
 type CustomState = TransformerState & {
   scope: { type: 'method' | 'class' | 'function', name: string }[];
@@ -75,7 +74,7 @@ export class ConsoleLogTransformer {
 
   @OnCall()
   static onLogCall(state: CustomState, node: ts.CallExpression): typeof node | ts.Identifier {
-    if (!ts.isPropertyAccessExpression(node.expression) || state.importName.startsWith(MANIFEST_MOD)) {
+    if (!ts.isPropertyAccessExpression(node.expression)) {
       return node;
     }
 

package/support/transformer.dynamic-import.ts

@@ -0,0 +1,32 @@
+import ts from 'typescript';
+
+import { LiteralUtil, OnCall, TransformerState } from '@travetto/transformer';
+
+/**
+ * Dynamic Import Transformer
+ */
+export class DynamicImportTransformer {
+
+  static #rewriteModuleSpecifier(state: TransformerState, spec: ts.LiteralExpression | ts.Expression | undefined): ts.Expression | undefined {
+    if (spec && ts.isStringLiteral(spec) && state.isUntypedImport(spec)) {
+      return LiteralUtil.fromLiteral(state.factory, `${spec.text.replace(/['"]/g, '')}.js`);
+    }
+    return spec;
+  }
+
+  @OnCall()
+  static onLogCall(state: TransformerState, node: ts.CallExpression): typeof node | ts.Identifier {
+    if (
+      ts.isCallExpression(node) &&
+      node.expression.kind === ts.SyntaxKind.ImportKeyword &&
+      node.arguments.length &&
+      ts.isLiteralExpression(node.arguments[0])
+    ) {
+      const lit = this.#rewriteModuleSpecifier(state, node.arguments[0])!;
+      if (lit !== node.arguments[0]) {
+        return state.factory.updateCallExpression(node, node.expression, node.typeArguments, [lit, ...node.arguments.slice(1)]);
+      }
+    }
+    return node;
+  }
+}

package/support/transformer.rewrite-path-import.ts

@@ -4,7 +4,6 @@ import { TransformerState, OnFile } from '@travetto/transformer';
 
 const PATH_REGEX = /^['"](node:)?path['"]$/;
 const PATH_TARGET = '@travetto/manifest/src/path';
-const SKIP_SRC = /^@travetto\/manifest\/(src|support)/;
 
 /**
  * Rewriting path imports to use manifest's path
@@ -16,10 +15,6 @@ export class PathImportTransformer {
    */
   @OnFile()
   static rewritePathImport(state: TransformerState, node: ts.SourceFile): ts.SourceFile {
-    if (SKIP_SRC.test(state.importName)) {
-      return node;
-    }
-
     const stmt = node.statements.find((x): x is ts.ImportDeclaration =>
       ts.isImportDeclaration(x) && PATH_REGEX.test(x.moduleSpecifier?.getText() ?? ''));
     if (stmt) {