@travetto/doc 3.4.1 → 3.4.2

package/README.md

@@ -97,7 +97,7 @@ Usage: doc [options]
 
 Options:
   -i, --input <string>    Input File (default: "DOC.tsx")
-  -o, --outputs <string>  Outputs (default: [])
+  -o, --outputs <string>  Outputs (default: ["README.md"])
   -w, --watch             Watch? (default: false)
   -h, --help              display help for command
 ```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@travetto/doc",
-  "version": "3.4.1",
+  "version": "3.4.2",
   "description": "Documentation support for the Travetto framework",
   "keywords": [
     "docs",
@@ -29,7 +29,7 @@
     "prismjs": "^1.29.0"
   },
   "peerDependencies": {
-    "@travetto/cli": "^3.4.3"
+    "@travetto/cli": "^3.4.6"
   },
   "peerDependenciesMeta": {
     "@travetto/cli": {

package/src/render/markdown.ts

@@ -62,7 +62,7 @@ yarn add ${el.props.pkg}
   Code: async ({ context, el }) => {
     const name = getComponentName(el.type);
     const content = await context.resolveCode(el);
-    let lang = content.language;
+    let lang = el.props.language ?? content.language;
     if (!lang) {
       if (el.type === c.Terminal) {
         lang = 'bash';

package/support/cli.doc.ts

@@ -1,7 +1,7 @@
 import fs from 'fs/promises';
 
 import { PackageUtil, path, RootIndex } from '@travetto/manifest';
-import { ExecUtil, EnvInit, CompilerClient } from '@travetto/base';
+import { ExecUtil, CompilerClient, defineEnv } from '@travetto/base';
 import { CliCommandShape, CliCommand, CliValidationError, CliUtil } from '@travetto/cli';
 import { MinLength } from '@travetto/schema';
 
@@ -21,25 +21,26 @@ export class DocCommand implements CliCommandShape {
   /** Watch? */
   watch = false;
 
-  envInit(): EnvInit {
+  preMain(): void {
     Object.assign(process.env, {
       TRV_CLI_IPC: '',
       TRV_LOG_PLAIN: 'true',
       TRV_CONSOLE_WIDTH: '140',
       FORCE_COLOR: '0',
     });
-    return { debug: false, };
+    defineEnv({ debug: false, });
   }
 
-  finalize(): void {
-    if (this.outputs.length === 0) {
-      const workspacePkg = PackageUtil.readPackage(RootIndex.manifest.workspacePath);
-      this.outputs = workspacePkg.travetto?.docOutputs ?? ['README.md'];
-    }
-    this.input = path.resolve(this.input);
+  preBind(): void {
+    const workspacePkg = PackageUtil.readPackage(RootIndex.manifest.workspacePath);
+    this.outputs = workspacePkg.travetto?.docOutputs ?? ['README.md'];
+  }
+
+  preHelp(): void {
+    this.preBind();
   }
 
-  async validate(...args: unknown[]): Promise<CliValidationError | undefined> {
+  async validate(): Promise<CliValidationError | undefined> {
     const docFile = path.resolve(this.input);
     if (!(await fs.stat(docFile).catch(() => false))) {
       return { message: `input: ${this.input} does not exist`, source: 'flag' };
@@ -84,6 +85,8 @@ export class DocCommand implements CliCommandShape {
   }
 
   main(): Promise<void> {
+    this.input = path.resolve(this.input);
+
     return this.watch ? this.runWatch() : this.render();
   }
 }