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

package/package.json

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

package/src/render/html.ts

@@ -1,7 +1,8 @@
 import fs from 'node:fs/promises';
 
 import { JSXElement } from '@travetto/doc/jsx-runtime';
-import { RuntimeIndex, PackageUtil, RuntimeContext } from '@travetto/manifest';
+import { RuntimeContext } from '@travetto/base';
+import { RuntimeIndex, PackageUtil } from '@travetto/manifest';
 
 import { highlight } from './code-highlight';
 import { RenderProvider, RenderState } from '../types';

package/src/render/markdown.ts

@@ -1,5 +1,6 @@
 import fs from 'node:fs/promises';
-import { PackageUtil, RuntimeIndex, RuntimeContext } from '@travetto/manifest';
+import { RuntimeContext } from '@travetto/base';
+import { PackageUtil, RuntimeIndex } from '@travetto/manifest';
 
 import { RenderProvider } from '../types';
 import { c, getComponentName } from '../jsx';

package/src/render/renderer.ts

@@ -1,6 +1,6 @@
 import path from 'node:path';
 
-import { ManifestContext, PackageUtil, RuntimeIndex } from '@travetto/manifest';
+import { type ManifestContext, PackageUtil, RuntimeIndex } from '@travetto/manifest';
 import { isJSXElement, JSXElement, JSXFragmentType } from '@travetto/doc/jsx-runtime';
 
 import { EMPTY_ELEMENT, getComponentName, JSXElementByFn, c } from '../jsx';

package/src/util/run.ts

@@ -2,8 +2,8 @@ import os from 'node:os';
 import util from 'node:util';
 import { spawn, ChildProcess } from 'node:child_process';
 
-import { path, RuntimeIndex, RuntimeContext } from '@travetto/manifest';
-import { Env, ExecUtil } from '@travetto/base';
+import { path, RuntimeIndex } from '@travetto/manifest';
+import { Env, ExecUtil, RuntimeContext } from '@travetto/base';
 
 export const COMMON_DATE = new Date('2029-03-14T00:00:00.000').getTime();
 
@@ -45,11 +45,16 @@ class DocState {
 export class DocRunUtil {
   static #docState = new DocState();
 
+  /** Build cwd from config */
+  static cwd(cfg: RunConfig): string {
+    return path.toPosix(cfg.module ? RuntimeIndex.getModule(cfg.module)?.sourcePath! : RuntimeContext.mainSourcePath);
+  }
+
   /**
    * Clean run output
    */
   static cleanRunOutput(text: string, cfg: RunConfig): string {
-    const cwd = path.toPosix((cfg.module ? RuntimeIndex.getModule(cfg.module)! : RuntimeIndex.mainModule).sourcePath);
+    const cwd = this.cwd(cfg);
     text = util.stripVTControlCharacters(text.trim())
       .replaceAll(cwd, '.')
       .replaceAll(os.tmpdir(), '/tmp')
@@ -76,7 +81,7 @@ export class DocRunUtil {
    */
   static spawn(cmd: string, args: string[], config: RunConfig = {}): ChildProcess {
     return spawn(cmd, args, {
-      cwd: path.toPosix(config.cwd ?? (config.module ? RuntimeIndex.getModule(config.module)! : RuntimeIndex.mainModule).sourcePath),
+      cwd: config.cwd ?? this.cwd(config),
       shell: '/bin/bash',
       env: {
         ...process.env,
@@ -85,6 +90,7 @@ 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

@@ -2,8 +2,8 @@ import fs from 'node:fs/promises';
 import { spawn } from 'node:child_process';
 import path from 'node:path';
 
-import { PackageUtil, RuntimeIndex, RuntimeContext } from '@travetto/manifest';
-import { ExecUtil, Env, watchCompiler } from '@travetto/base';
+import { PackageUtil } from '@travetto/manifest';
+import { ExecUtil, Env, watchCompiler, RuntimeContext } from '@travetto/base';
 import { CliCommandShape, CliCommand, CliValidationError, CliUtil } from '@travetto/cli';
 import { MinLength } from '@travetto/schema';
 
@@ -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: RuntimeIndex.mainModule.sourcePath,
+          cwd: RuntimeContext.mainSourcePath,
           shell: false,
           env: { ...process.env, ...Env.TRV_QUIET.export(true) },
           stdio: 'inherit'