@travetto/doc 5.0.0-rc.1 → 5.0.0-rc.11

package/__index__.ts

@@ -1,3 +1,4 @@
 export { JSXElement as DocJSXElement, isJSXElement as isDocJSXElement } from './jsx-runtime';
 export { c, d, JSXElementByFn as DocJSXElementByFn } from './src/jsx';
-export { MOD_MAPPING as mod } from './src/mapping/mod-mapping';
+export { MOD_MAPPING as mod } from './src/mapping/mod-mapping';
+export { DocFileUtil } from './src/util/file';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/doc",
-  "version": "5.0.0-rc.1",
+  "version": "5.0.0-rc.11",
   "description": "Documentation support for the Travetto framework",
   "keywords": [
     "docs",
@@ -24,12 +24,12 @@
     "directory": "module/doc"
   },
   "dependencies": {
-    "@travetto/base": "^5.0.0-rc.1",
+    "@travetto/runtime": "^5.0.0-rc.10",
     "@types/prismjs": "^1.26.4",
     "prismjs": "^1.29.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^5.0.0-rc.1"
+    "@travetto/cli": "^5.0.0-rc.11"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/jsx.ts

@@ -1,5 +1,5 @@
 import { createElement, JSXElement, JSXComponentFunction as CompFn } from '@travetto/doc/jsx-runtime';
-import { TypedObject } from '@travetto/base';
+import { castTo, TypedObject } from '@travetto/runtime';
 
 import { LIB_MAPPING } from './mapping/lib-mapping';
 import { MOD_MAPPING } from './mapping/mod-mapping';
@@ -65,7 +65,7 @@ export type JSXElements = { [K in keyof C]: JSXElementByFn<K>; };
 
 export const EMPTY_ELEMENT = EMPTY;
 
-const invertedC = new Map<Function, string>(TypedObject.entries(c).map(p => [p[1], p[0]] as [CompFn, string]));
+const invertedC = new Map<Function, string>(TypedObject.entries(c).map<[Function, string]>(p => [p[1], p[0]]));
 
 export function getComponentName(fn: Function | string): string {
   if (typeof fn === 'string') {
@@ -81,7 +81,7 @@ function CodeLinker(titleOrNode: string | JSXElement, src?: string, startRe?: Re
   if (typeof titleOrNode === 'string') {
     props = { title: titleOrNode, src: src!, startRe: startRe! };
   } else if (titleOrNode.type === Code) {
-    const node = titleOrNode as unknown as JSXElementByFn<'Code'>;
+    const node: JSXElementByFn<'Code'> = castTo(titleOrNode);
     props = {
       title: node.props.title,
       src: node.props.src,
@@ -90,7 +90,7 @@ function CodeLinker(titleOrNode: string | JSXElement, src?: string, startRe?: Re
   } else {
     throw new Error(`Unsupported element type: ${titleOrNode.type}`);
   }
-  return createElement(c.CodeLink, props) as JSXElementByFn<'CodeLink'>;
+  return createElement(c.CodeLink, props);
 }
 
 export const d = {

package/src/mapping/lib-mapping.ts

@@ -82,6 +82,7 @@ export const LIB_MAPPING = {
   ImageMagick: { title: 'ImageMagick', href: 'https://imagemagick.org/index.php' },
   PngQuant: { title: 'pngquant', href: 'https://pngquant.org/' },
   JpegOptim: { title: 'Jpegoptim', href: 'https://github.com/tjko/jpegoptim' },
+  Sharp: { title: 'sharp', href: 'https://sharp.pixelplumbing.com/' },
 
   // Dbs
   MongoDB: { title: 'mongodb', href: 'https://mongodb.com' },

package/src/mapping/mod-mapping.ts

@@ -1,12 +1,4 @@
 export const MOD_MAPPING = {
-  Asset: {
-    name: '@travetto/asset', folder: '@travetto/asset', displayName: 'Asset',
-    description: 'Modular library for storing and retrieving binary assets'
-  },
-  AssetRest: {
-    name: '@travetto/asset-rest', folder: '@travetto/asset-rest', displayName: 'Asset Rest Support',
-    description: 'Provides integration between the travetto asset and rest module.'
-  },
   Auth: {
     name: '@travetto/auth', folder: '@travetto/auth', displayName: 'Authentication',
     description: 'Authentication scaffolding for the Travetto framework'
@@ -31,10 +23,6 @@ export const MOD_MAPPING = {
     name: '@travetto/auth-rest-session', folder: '@travetto/auth-rest-session', displayName: 'Rest Auth Session',
     description: 'Rest authentication session integration support for the Travetto framework'
   },
-  Base: {
-    name: '@travetto/base', folder: '@travetto/base', displayName: 'Base',
-    description: 'Environment config and common utilities for travetto applications.'
-  },
   Cache: {
     name: '@travetto/cache', folder: '@travetto/cache', displayName: 'Caching',
     description: 'Caching functionality with decorators for declarative use.'
@@ -115,10 +103,18 @@ export const MOD_MAPPING = {
     name: '@travetto/model-elasticsearch', folder: '@travetto/model-elasticsearch', displayName: 'Elasticsearch Model Source',
     description: 'Elasticsearch backing for the travetto model module, with real-time modeling support for Elasticsearch mappings.'
   },
+  ModelFile: {
+    name: '@travetto/model-file', folder: '@travetto/model-file', displayName: 'File Model Support',
+    description: 'File system backing for the travetto model module.'
+  },
   ModelFirestore: {
     name: '@travetto/model-firestore', folder: '@travetto/model-firestore', displayName: 'Firestore Model Support',
     description: 'Firestore backing for the travetto model module.'
   },
+  ModelMemory: {
+    name: '@travetto/model-memory', folder: '@travetto/model-memory', displayName: 'Memory Model Support',
+    description: 'Memory backing for the travetto model module.'
+  },
   ModelMongo: {
     name: '@travetto/model-mongo', folder: '@travetto/model-mongo', displayName: 'MongoDB Model Support',
     description: 'Mongo backing for the travetto model module.'
@@ -135,6 +131,10 @@ export const MOD_MAPPING = {
     name: '@travetto/model-query', folder: '@travetto/model-query', displayName: 'Data Model Querying',
     description: 'Datastore abstraction for advanced query support.'
   },
+  ModelQueryLanguage: {
+    name: '@travetto/model-query-language', folder: '@travetto/model-query-language', displayName: 'Data Model Query Language',
+    description: 'Datastore query language.'
+  },
   ModelRedis: {
     name: '@travetto/model-redis', folder: '@travetto/model-redis', displayName: 'Redis Model Support',
     description: 'Redis backing for the travetto model module.'
@@ -219,6 +219,10 @@ export const MOD_MAPPING = {
     name: '@travetto/rest-upload', folder: '@travetto/rest-upload', displayName: 'Rest Upload Support',
     description: 'Provides integration between the travetto asset and rest module.'
   },
+  Runtime: {
+    name: '@travetto/runtime', folder: '@travetto/runtime', displayName: 'Runtime',
+    description: 'Runtime for travetto applications.'
+  },
   Scaffold: {
     name: '@travetto/scaffold', folder: '@travetto/scaffold', displayName: 'App Scaffold',
     description: 'App Scaffold for the Travetto framework'

package/src/render/code-highlight.ts

@@ -1,4 +1,4 @@
-import { default as prismjs } from 'prismjs';
+import { default as prismJs } from 'prismjs';
 
 import 'prismjs/plugins/normalize-whitespace/prism-normalize-whitespace.js';
 import 'prismjs/components/prism-typescript.js';
@@ -12,20 +12,20 @@ import 'prismjs/components/prism-sql.js';
 import 'prismjs/components/prism-properties.js';
 import 'prismjs/components/prism-bash.js';
 
-prismjs.plugins.NormalizeWhitespace.setDefaults({
+prismJs.plugins.NormalizeWhitespace.setDefaults({
   'remove-trailing': true,
   'remove-indent': true,
   'left-trim': true,
   'right-trim': true
 });
 
-const nw = prismjs.plugins.NormalizeWhitespace;
+const nw = prismJs.plugins.NormalizeWhitespace;
 
 const tokenMapping: { [key: string]: string } = {
-  gt: '>',
-  lt: '<',
-  quot: '"',
-  apos: "'"
+  '&gt;': '>',
+  '&lt;': '<',
+  '&quot;': '"',
+  '&apos;': "'"
 };
 
 export function highlight(text: string, lang: string): string | undefined {
@@ -35,10 +35,10 @@ export function highlight(text: string, lang: string): string | undefined {
 
   text = text
     .replace(/&#(\d+);/g, (x, code) => String.fromCharCode(code))
-    .replace(/&([a-z][^;]*);/g, (a, k) => tokenMapping[k] || a);
+    .replace(/&[a-z][^;]*;/g, a => tokenMapping[a] || a);
 
   try {
-    return prismjs.highlight(text, prismjs.languages[lang], lang)
+    return prismJs.highlight(text, prismJs.languages[lang], lang)
       .replace(/(@\s*<span[^>]*)function("\s*>)/g, (a, pre, post) => `${pre}meta${post}`)
       .replace(/[{}]/g, a => `{{'${a}'}}`);
   } catch (err) {

package/src/render/context.ts

@@ -1,6 +1,9 @@
+import path from 'node:path';
+
 import { createElement, JSXRuntimeTag } from '@travetto/doc/jsx-runtime';
 
-import { path, PackageUtil, RuntimeIndex } from '@travetto/manifest';
+import { PackageUtil } from '@travetto/manifest';
+import { castTo, RuntimeIndex } from '@travetto/runtime';
 
 import { JSXElementByFn, c } from '../jsx';
 import { DocResolveUtil, ResolvedCode, ResolvedRef, ResolvedSnippetLink } from '../util/resolve';
@@ -37,7 +40,7 @@ export class RenderContext {
 
     const manifestPkg = PackageUtil.readPackage(RuntimeIndex.getModule('@travetto/manifest')!.sourcePath);
 
-    this.file = path.toPosix(file);
+    this.file = path.resolve(file);
     this.baseUrl = baseUrl;
     this.repoRoot = repoRoot;
     this.travettoBaseUrl = repoRoot.includes('travetto.github') ? repoRoot : manifestPkg.travetto!.doc!.baseUrl!;
@@ -105,18 +108,16 @@ export class RenderContext {
    * Resolve code link
    */
   async resolveCodeLink(node: JSXElementByFn<'CodeLink'>): Promise<ResolvedSnippetLink> {
-    const src = typeof node.props.src === 'string' ? node.props.src : RuntimeIndex.getFunctionMetadata(node.props.src)!.source;
-    return DocResolveUtil.resolveCodeLink(src, node.props.startRe);
+    return DocResolveUtil.resolveCodeLink(node.props.src, node.props.startRe);
   }
 
   /**
    * Resolve code/config
    */
   async resolveCode(node: JSXElementByFn<'Code' | 'Config'>): Promise<ResolvedCode> {
-    const src = typeof node.props.src === 'string' ? node.props.src : RuntimeIndex.getFunctionMetadata(node.props.src)!.source;
     return node.props.startRe ?
-      DocResolveUtil.resolveSnippet(src, node.props.startRe, node.props.endRe, node.props.outline) :
-      DocResolveUtil.resolveCode(src, node.props.language, node.props.outline);
+      DocResolveUtil.resolveSnippet(node.props.src, node.props.startRe, node.props.endRe, node.props.outline) :
+      DocResolveUtil.resolveCode(node.props.src, node.props.language, node.props.outline);
   }
 
   /**
@@ -124,6 +125,6 @@ export class RenderContext {
    */
   createElement<K extends keyof typeof c>(name: K, props: JSXElementByFn<K>['props']): JSXElementByFn<K> {
     // @ts-expect-error
-    return createElement(c[name], props) as JSXElementByFn<K>;
+    return castTo(createElement(c[name], props));
   }
 }

package/src/render/html.ts

@@ -1,8 +1,8 @@
 import fs from 'node:fs/promises';
 
 import { JSXElement } from '@travetto/doc/jsx-runtime';
-import { RuntimeContext } from '@travetto/base';
-import { RuntimeIndex, PackageUtil } from '@travetto/manifest';
+import { Runtime, RuntimeIndex } from '@travetto/runtime';
+import { PackageUtil } from '@travetto/manifest';
 
 import { highlight } from './code-highlight';
 import { RenderProvider, RenderState } from '../types';
@@ -145,7 +145,7 @@ yarn add ${el.props.pkg}
   Header: async ({ props }) => `<h1>${props.title} ${props.description ? `\n<small>${props.description}</small>\n` : ''}</h1>\n`,
 
   StdHeader: async state => {
-    const mod = state.el.props.mod ?? RuntimeContext.main.name;
+    const mod = state.el.props.mod ?? Runtime.main.name;
     const pkg = PackageUtil.readPackage(RuntimeIndex.getModule(mod)!.sourcePath);
     const title = pkg.travetto?.displayName ?? pkg.name;
     const desc = pkg.description;

package/src/render/markdown.ts

@@ -1,6 +1,6 @@
 import fs from 'node:fs/promises';
-import { RuntimeContext } from '@travetto/base';
-import { PackageUtil, RuntimeIndex } from '@travetto/manifest';
+import { Runtime, RuntimeIndex } from '@travetto/runtime';
+import { PackageUtil } from '@travetto/manifest';
 
 import { RenderProvider } from '../types';
 import { c, getComponentName } from '../jsx';
@@ -109,7 +109,7 @@ ${context.cleanText(content.text)}
   Header: async ({ props }) => `# ${props.title}\n${props.description ? `## ${props.description}\n` : ''}\n`,
 
   StdHeader: async state => {
-    const mod = state.el.props.mod ?? RuntimeContext.main.name;
+    const mod = state.el.props.mod ?? Runtime.main.name;
     const pkg = PackageUtil.readPackage(RuntimeIndex.getModule(mod)!.sourcePath);
     const title = pkg.travetto?.displayName ?? pkg.name;
     const desc = pkg.description;

package/src/render/renderer.ts

@@ -1,7 +1,8 @@
 import path from 'node:path';
 
-import { type ManifestContext, PackageUtil, RuntimeIndex } from '@travetto/manifest';
+import { type ManifestContext, PackageUtil } from '@travetto/manifest';
 import { isJSXElement, JSXElement, JSXFragmentType } from '@travetto/doc/jsx-runtime';
+import { castTo, Runtime } from '@travetto/runtime';
 
 import { EMPTY_ELEMENT, getComponentName, JSXElementByFn, c } from '../jsx';
 import { DocumentShape, RenderProvider, RenderState } from '../types';
@@ -19,12 +20,7 @@ const providers = { [Html.ext]: Html, [Markdown.ext]: Markdown };
 export class DocRenderer {
 
   static async get(file: string, manifest: Pick<ManifestContext, 'workspace'>): Promise<DocRenderer> {
-    const mod = RuntimeIndex.getFromSource(file)?.import;
-    if (!mod) {
-      throw new Error(`Unable to render ${file}, not in the manifest`);
-    }
-    const res: DocumentShape = await import(mod);
-
+    const res = await Runtime.importFrom<DocumentShape>(file);
     const pkg = PackageUtil.readPackage(manifest.workspace.path);
     const repoBaseUrl = pkg.travetto?.doc?.baseUrl ?? manifest.workspace.path;
     return new DocRenderer(res,
@@ -59,8 +55,7 @@ export class DocRenderer {
       let final: JSXElement = node;
       // Render simple element if needed
       if (typeof node.type === 'function' && node.type !== JSXFragmentType) {
-        // @ts-expect-error
-        const out = node.type(node.props);
+        const out = castTo<Function>(node.type)(node.props);
         final = out !== EMPTY_ELEMENT ? out : final;
       }
 
@@ -92,12 +87,12 @@ export class DocRenderer {
         case 'number':
         case 'bigint':
         case 'boolean': return `${node}`;
-        default: {
-          const meta = (typeof node === 'function' ? RuntimeIndex.getFunctionMetadata(node) : undefined);
-          if (meta && typeof node === 'function') {
-            const title = (await DocFileUtil.isDecorator(node.name, meta.source)) ? `@${node.name}` : node.name;
+        case 'function': {
+          const source = DocFileUtil.readSource(node);
+          if (source.file) {
+            const title = (await DocFileUtil.isDecorator(node.name, source.file)) ? `@${node.name}` : node.name;
             const el = this.#support.createElement('CodeLink', {
-              src: meta.source,
+              src: source.file,
               startRe: new RegExp(`(class|function)\\s+(${node.name})`),
               title
             });
@@ -109,9 +104,10 @@ export class DocRenderer {
             state.createState = (key, props) => this.createState(state, key, props);
             return await renderer.CodeLink(state);
           }
-          throw new Error(`Unknown object type: ${typeof node}`);
+          break;
         }
       }
+      throw new Error(`Unknown object type: ${typeof node}`);
     }
   }
 

package/src/util/file.ts

@@ -1,7 +1,7 @@
-import fs from 'node:fs/promises';
+import { readFileSync, existsSync } from 'node:fs';
 import path from 'node:path';
 
-import { ManifestModuleUtil, RuntimeIndex } from '@travetto/manifest';
+import { Runtime, RuntimeIndex } from '@travetto/runtime';
 
 const ESLINT_PATTERN = /\s*\/\/ eslint.*$/g;
 const ENV_KEY = /Env.([^.]+)[.]key/g;
@@ -24,58 +24,56 @@ export class DocFileUtil {
     return /^[@:A-Za-z0-9\/\\\-_.]+[.]([a-z]{2,10})$/.test(src);
   }
 
-  /**
-   * Resolve file
-   * @param file
-   * @returns
-   */
-  static async resolveFile(file: string): Promise<string> {
-    let resolved = path.resolve(file);
-    if (!(await fs.stat(resolved).catch(() => false))) {
-      if (ManifestModuleUtil.getFileType(file) === 'ts') {
-        resolved = RuntimeIndex.getSourceFile(file);
-      }
-      if (!(await fs.stat(resolved).catch(() => false))) {
-        throw new Error(`Unknown file to resolve: ${file}`);
+  static readSource(src: string | Function): { content: string, language: string, file: string } {
+    let file: string | undefined;
+    let content: string | undefined;
+
+    if (typeof src === 'string') {
+      if (src.includes('\n') || src.includes(' ')) {
+        content = src;
+      } else {
+        const resolved = path.resolve(src);
+        if (existsSync(resolved)) {
+          content = readFileSync(resolved, 'utf8');
+          file = resolved;
+        } else {
+          file = RuntimeIndex.getSourceFile(src);
+          content = readFileSync(file, 'utf8');
+        }
       }
+    } else {
+      file = Runtime.getSourceFile(src);
+      content = readFileSync(file, 'utf8');
     }
-    return resolved;
-  }
 
-  /**
-   * Read file
-   *
-   * @param file
-   * @returns
-   */
-  static async read(file: string): Promise<{ content: string, language: string, file: string }> {
-    file = await this.resolveFile(file);
-
-    const ext = path.extname(file);
-    const language = this.#extToLang[ext] ?? ext.replace('.', '');
-
-    let text: string | undefined;
-    if (language) {
-      text = await fs.readFile(file, 'utf8');
-
-      text = text.split(/\n/)
+    if (content) {
+      content = content.split(/\n/)
         .map(x => x
           .replace(ESLINT_PATTERN, '')
           .replace(ENV_KEY, (_, k) => `'${k}'`)
         )
-        .filter(x => !x.includes('@doc-exclude'))
-        .join('\n');
+        .join('\n')
+        .replace(/^\/\/# sourceMap.*$/gsm, '')
+        .replace(/[ ]*[/][/][ ]*@ts-expect-error[^\n]*\n/gsm, '') // Excluding errors
+        .replace(/^[ ]*[/][/][ ]*[{][{][^\n]*\n/gsm, '') // Excluding conditional comments, full-line
+        .replace(/[ ]*[/][/][ ]*[{][{][^\n]*/gsm, ''); // Excluding conditional comments
     }
 
-    return { content: text ?? '', language, file };
+    if (file !== undefined) {
+      const ext = path.extname(file);
+      const language = this.#extToLang[ext] ?? ext.replace('.', '');
+      return { content, file, language };
+    } else {
+      return { content, file: '', language: '' };
+    }
   }
 
-  static async readCodeSnippet(file: string, startPattern: RegExp): Promise<{ file: string, startIdx: number, lines: string[], language: string }> {
-    const res = await this.read(file);
-    const lines = res.content.split(/\n/g);
+  static async readCodeSnippet(src: string | Function, startPattern: RegExp): Promise<{ file: string, startIdx: number, lines: string[], language: string }> {
+    const res = this.readSource(src);
+    const lines = res.content.split(/\n/);
     const startIdx = lines.findIndex(l => startPattern.test(l));
     if (startIdx < 0) {
-      throw new Error(`Pattern ${startPattern.source} not found in ${file}`);
+      throw new Error(`Pattern ${startPattern.source} not found in ${src}`);
     }
     return { file: res.file, startIdx, lines, language: res.language };
   }
@@ -84,15 +82,14 @@ export class DocFileUtil {
    * Determine if a file is a decorator
    */
   static async isDecorator(name: string, file: string): Promise<boolean> {
-    file = await this.resolveFile(file);
 
     const key = `${name}:${file}`;
     if (key in this.#decCache) {
       return this.#decCache[key];
     }
 
-    const text = (await fs.readFile(file, 'utf8'))
-      .split(/\n/g);
+    const res = await this.readSource(file);
+    const text = res.content.split(/\n/g);
 
     const start = text.findIndex(x => new RegExp(`function ${name}\\b`).test(x));
     let ret = false;

package/src/util/resolve.ts

@@ -13,7 +13,7 @@ export class DocResolveUtil {
   static async resolveRef(title: string, file: string): Promise<ResolvedRef> {
 
     let line = 0;
-    const res = await DocFileUtil.read(file);
+    const res = await DocFileUtil.readSource(file);
     file = res.file;
 
     if (res.content) {
@@ -31,22 +31,22 @@ export class DocResolveUtil {
     return { title, file, line };
   }
 
-  static async resolveCode(content: string, language?: string, outline = false): Promise<ResolvedCode> {
+  static async resolveCode(content: string | Function, language?: string, outline = false): Promise<ResolvedCode> {
+    const res = DocFileUtil.readSource(content);
+    let text = res.content;
+
     let file: string | undefined;
-    if (DocFileUtil.isFile(content)) {
-      const res = await DocFileUtil.read(content);
+    if (res.file) {
       language = res.language;
       file = res.file;
-      content = res.content;
       if (outline) {
-        content = DocFileUtil.buildOutline(content);
+        text = DocFileUtil.buildOutline(text);
       }
     }
-    content = content.replace(/^\/\/# sourceMap.*$/gm, '');
-    return { text: content, language: language!, file };
+    return { text, language: language!, file };
   }
 
-  static async resolveSnippet(file: string, startPattern: RegExp, endPattern?: RegExp, outline = false): Promise<ResolvedSnippet> {
+  static async resolveSnippet(file: Function | string, startPattern: RegExp, endPattern?: RegExp, outline = false): Promise<ResolvedSnippet> {
     const { lines, startIdx, language, file: resolvedFile } = await DocFileUtil.readCodeSnippet(file, startPattern);
 
     const endIdx = endPattern ? lines.findIndex((l, i) => i > startIdx && endPattern.test(l)) : lines.length;
@@ -59,7 +59,7 @@ export class DocResolveUtil {
     return { text, language, line: startIdx + 1, file: resolvedFile };
   }
 
-  static async resolveCodeLink(file: string, startPattern: RegExp): Promise<ResolvedSnippetLink> {
+  static async resolveCodeLink(file: Function | string, startPattern: RegExp): Promise<ResolvedSnippetLink> {
     const { startIdx, file: resolvedFile } = await DocFileUtil.readCodeSnippet(file, startPattern);
     return { file: resolvedFile, line: startIdx + 1 };
   }

package/src/util/run.ts

@@ -1,9 +1,9 @@
 import os from 'node:os';
 import util from 'node:util';
 import { spawn, ChildProcess } from 'node:child_process';
+import path from 'node:path';
 
-import { path, RuntimeIndex } from '@travetto/manifest';
-import { Env, ExecUtil, RuntimeContext } from '@travetto/base';
+import { Env, ExecUtil, Runtime, RuntimeIndex } from '@travetto/runtime';
 
 export const COMMON_DATE = new Date('2029-03-14T00:00:00.000').getTime();
 
@@ -47,7 +47,7 @@ export class DocRunUtil {
 
   /** Build cwd from config */
   static cwd(cfg: RunConfig): string {
-    return path.toPosix(cfg.module ? RuntimeIndex.getModule(cfg.module)?.sourcePath! : RuntimeContext.mainSourcePath);
+    return path.resolve(cfg.module ? RuntimeIndex.getModule(cfg.module)?.sourcePath! : Runtime.mainSourcePath);
   }
 
   /**
@@ -58,7 +58,7 @@ export class DocRunUtil {
     text = util.stripVTControlCharacters(text.trim())
       .replaceAll(cwd, '.')
       .replaceAll(os.tmpdir(), '/tmp')
-      .replaceAll(RuntimeContext.workspace.path, '<workspace-root>')
+      .replaceAll(Runtime.workspace.path, '<workspace-root>')
       .replace(/[/]tmp[/][a-z_A-Z0-9\/\-]+/g, '/tmp/<temp-folder>')
       .replace(/^(\s*framework:\s*')(\d+[.]\d+)[^']*('[,]?\s*)$/gm, (_, pre, ver, post) => `${pre}${ver}.x${post}`)
       .replace(/^(\s*nodeVersion:\s*'v)(\d+)[^']*('[,]?\s*)$/gm, (_, pre, ver, post) => `${pre}${ver}.x.x${post}`)
@@ -90,7 +90,6 @@ export class DocRunUtil {
         ...Env.TRV_CLI_IPC.export(undefined),
         ...Env.TRV_MANIFEST.export(''),
         ...Env.TRV_BUILD.export('none'),
-        ...Env.TRV_BUILD_REENTRANT.export(true),
         ...Env.TRV_ROLE.export(undefined),
         ...Env.TRV_MODULE.export(config.module ?? ''),
         ...(config.envName ? Env.TRV_ENV.export(config.envName) : {}),

package/support/cli.doc.ts

@@ -3,7 +3,7 @@ import { spawn } from 'node:child_process';
 import path from 'node:path';
 
 import { PackageUtil } from '@travetto/manifest';
-import { ExecUtil, Env, watchCompiler, RuntimeContext } from '@travetto/base';
+import { ExecUtil, Env, watchCompiler, Runtime } from '@travetto/runtime';
 import { CliCommandShape, CliCommand, CliValidationError, CliUtil } from '@travetto/cli';
 import { MinLength } from '@travetto/schema';
 
@@ -32,7 +32,7 @@ export class DocCommand implements CliCommandShape {
   }
 
   preBind(): void {
-    const workspacePkg = PackageUtil.readPackage(RuntimeContext.workspace.path);
+    const workspacePkg = PackageUtil.readPackage(Runtime.workspace.path);
     this.outputs = workspacePkg.travetto?.doc?.outputs ?? ['README.md'];
   }
 
@@ -56,7 +56,7 @@ export class DocCommand implements CliCommandShape {
     for await (const { action, file } of watchCompiler({ restartOnExit: true })) {
       if (action === 'update' && file === this.input) {
         const proc = spawn('npx', ['trv', ...args], {
-          cwd: RuntimeContext.mainSourcePath,
+          cwd: Runtime.mainSourcePath,
           shell: false,
           env: { ...process.env, ...Env.TRV_QUIET.export(true) },
           stdio: 'inherit'
@@ -68,7 +68,7 @@ export class DocCommand implements CliCommandShape {
 
   async render(): Promise<void> {
     const { DocRenderer } = await import('../src/render/renderer');
-    const ctx = await DocRenderer.get(this.input, RuntimeContext);
+    const ctx = await DocRenderer.get(this.input, Runtime);
     const outputs = this.outputs.map(output =>
       output.includes('.') ? [path.extname(output).replace('.', ''), path.resolve(output)] :
         [output, null] as const