@travetto/runtime 7.0.0-rc.4 → 7.0.0-rc.5

package/README.md

@@ -51,6 +51,8 @@ class $Runtime {
   get monoRoot(): boolean;
   /** Main source path */
   get mainSourcePath(): string;
+  /** Get trv entrypoint */
+  get trvEntryPoint(): string;
   /** Produce a workspace relative path */
   workspaceRelative(...parts: string[]): string;
   /** Strip off the workspace path from a file */
@@ -62,11 +64,11 @@ class $Runtime {
   /** Resolve resource paths */
   resourcePaths(paths: string[] = []): string[];
   /** Get source for function */
-  getSourceFile(fn: Function): string;
+  getSourceFile(handle: Function): string;
   /** Get import for function */
-  getImport(fn: Function): string;
+  getImport(handle: Function): string;
   /** Import from a given path */
-  async importFrom<T = unknown>(imp?: string): Promise<T>;
+  async importFrom<T = unknown>(location?: string): Promise<T>;
 }
 ```
 
@@ -210,14 +212,10 @@ export function work() {
 
 **Code: Sample After Transpilation**
 ```javascript
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.work = work;
-const tslib_1 = require("tslib");
-const Δfunction = tslib_1.__importStar(require("@travetto/runtime/src/function.js"));
-const Δconsole = tslib_1.__importStar(require("@travetto/runtime/src/console.js"));
+import * as Δfunction from "@travetto/runtime/src/function.js";
+import * as Δconsole from "@travetto/runtime/src/console.js";
 var mod_1 = ["@travetto/runtime", "doc/transpile.ts"];
-function work() {
+export function work() {
     Δconsole.log({ level: "debug", import: mod_1, line: 2, scope: "work", args: ['Start Work'] });
     try {
         1 / 0;

package/package.json

@@ -1,6 +1,7 @@
 {
   "name": "@travetto/runtime",
-  "version": "7.0.0-rc.4",
+  "version": "7.0.0-rc.5",
+  "type": "module",
   "description": "Runtime for travetto applications.",
   "keywords": [
     "console-manager",
@@ -25,12 +26,12 @@
     "directory": "module/runtime"
   },
   "dependencies": {
-    "@travetto/manifest": "^7.0.0-rc.2",
+    "@travetto/manifest": "^7.0.0-rc.3",
     "@types/debug": "^4.1.12",
     "debug": "^4.4.3"
   },
   "peerDependencies": {
-    "@travetto/transformer": "^7.0.0-rc.3"
+    "@travetto/transformer": "^7.0.0-rc.4"
   },
   "peerDependenciesMeta": {
     "@travetto/transformer": {

package/src/context.ts

@@ -6,7 +6,6 @@ import { type ManifestIndex, type ManifestContext, ManifestModuleUtil } from '@t
 import { Env } from './env.ts';
 import { RuntimeIndex } from './manifest-index.ts';
 import { describeFunction } from './function.ts';
-import { castTo } from './types.ts';
 import { JSONUtil } from './json.ts';
 
 /** Constrained version of {@type ManifestContext} */
@@ -72,6 +71,11 @@ class $Runtime {
     return this.#idx.mainModule.sourcePath;
   }
 
+  /** Get trv entrypoint */
+  get trvEntryPoint(): string {
+    return this.workspaceRelative('node_modules', '.bin', 'trv');
+  }
+
   /** Produce a workspace relative path */
   workspaceRelative(...parts: string[]): string {
     return path.resolve(this.workspace.path, ...parts);
@@ -103,49 +107,41 @@ class $Runtime {
   }
 
   /** Get source for function */
-  getSourceFile(fn: Function): string {
-    return this.#idx.getFromImport(this.getImport(fn))?.sourceFile!;
+  getSourceFile(handle: Function): string {
+    return this.#idx.getFromImport(this.getImport(handle))?.sourceFile!;
   }
 
   /** Get import for function */
-  getImport(fn: Function): string {
-    return describeFunction(fn).import;
+  getImport(handle: Function): string {
+    return describeFunction(handle).import;
   }
 
   /** Import from a given path */
-  async importFrom<T = unknown>(imp?: string): Promise<T> {
-    const file = path.resolve(this.#idx.mainModule.sourcePath, imp!);
+  async importFrom<T = unknown>(location?: string): Promise<T> {
+    const file = path.resolve(this.#idx.mainModule.sourcePath, location!);
     if (await fs.stat(file).catch(() => false)) {
-      imp = this.#idx.getFromSource(file)?.import;
+      location = 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(JSONUtil.parseSafe<T>);
+    if (!location) {
+      throw new Error(`Unable to find ${location}, not in the manifest`);
+    } else if (location.endsWith('.json')) {
+      location = this.#idx.getFromImport(location)?.sourceFile ?? location;
+      return fs.readFile(location, 'utf8').then(JSONUtil.parseSafe<T>);
     }
 
-    if (!ManifestModuleUtil.SOURCE_EXT_REGEX.test(imp)) {
-      if (imp.startsWith('@')) {
-        if (/[/].*?[/]/.test(imp)) {
-          imp = `${imp}.ts`;
+    if (!ManifestModuleUtil.SOURCE_EXT_REGEX.test(location)) {
+      if (location.startsWith('@')) {
+        if (/[/].*?[/]/.test(location)) {
+          location = `${location}.ts`;
         }
       } else {
-        imp = `${imp}.ts`;
+        location = `${location}.ts`;
       }
     }
 
-    imp = ManifestModuleUtil.withOutputExtension(imp);
-    const imported = await import(imp);
-    if (imported?.default?.default) {
-      // Unpack default.default, typescript does this in a way that requires recreating the whole object
-      const def = imported?.default?.default;
-      return Object.defineProperties(castTo({}), {
-        ...Object.getOwnPropertyDescriptors(imported),
-        default: { get: () => def, configurable: false }
-      });
-    }
+    location = ManifestModuleUtil.withOutputExtension(location);
+    const imported = await import(location);
     return imported;
   }
 }

package/src/exec.ts

@@ -1,8 +1,8 @@
-import { type ChildProcess, spawn, type SpawnOptions } from 'node:child_process';
+import { type ChildProcess } from 'node:child_process';
 import type { Readable } from 'node:stream';
 import { createInterface } from 'node:readline/promises';
 
-import { castTo, type Any } from './types.ts';
+import { castTo } from './types.ts';
 
 const ResultSymbol = Symbol();
 
@@ -39,14 +39,6 @@ type ExecutionBaseResult = Omit<ExecutionResult, 'stdout' | 'stderr'>;
  */
 export class ExecUtil {
 
-  /**
-   * Spawn wrapper that ensures performant invocation of trv commands
-   */
-  static spawnTrv(cmd: string, args: string[], options: SpawnOptions): ChildProcess {
-    const entry = (globalThis as Any).__entry_point__ ?? process.argv.at(1);
-    return spawn(process.argv0, [entry, cmd, ...args], options);
-  }
-
   /**
    * Take a child process, and some additional options, and produce a promise that
    * represents the entire execution.  On successful completion the promise will resolve, and

package/support/transformer.console-log.ts

@@ -42,7 +42,6 @@ export class ConsoleLogTransformer {
     return node;
   }
 
-
   @OnStaticMethod()
   @OnMethod()
   static startMethodForLog(state: CustomState, node: ts.MethodDeclaration): typeof node {