Merge pull request #25 from HiDeoo/hd-fix-nested-target

docs/src/content/docs/examples/Attributes/target.md

@@ -4,23 +4,28 @@ title: Target
 
 Use the [`target` attribute](/attributes/#target) to define the target board to render when using [composition](https://d2lang.com/tour/composition).
 
-````md title="src/content/docs/example.md" "target=starlight"
-```d2 target=starlight
+````md title="src/content/docs/example.md" 'target="storefront"'
+```d2 target="storefront"
 # Root board
 Content -> Website: Astro
 
 layers: {
-  # A different board named "starlight"
+  # Board named "starlight" that does not inherit anything from root
   starlight: {
     Documentation -> Website: Starlight
   }
+
+  # Board named "storefront" that does not inherit anything from root
+  storefront: {
+    E-commerce -> Website: Storefront
+  }
 }
 ```
 ````
 
-The above code block will be rendered as the following diagram with only the `starlight` board being visible:
+The above code block will be rendered as the following diagram with only the `storefront` board being visible:
 
-```d2 target=starlight
+```d2 target="storefront"
 # Root board
 Content -> Website: Astro
 
@@ -29,6 +34,11 @@ layers: {
   starlight: {
     Documentation -> Website: Starlight
   }
+
+  # Board named "storefront" that does not inherit anything from root
+  storefront: {
+    E-commerce -> Website: Storefront
+  }
 }
 ```
 

packages/astro-d2/libs/d2.ts

@@ -39,7 +39,7 @@ export async function generateD2Diagram(
   }
 
   if (attributes.target !== undefined) {
-    extraArgs.push(`--target='${attributes.target}'`)
+    extraArgs.push(`--target=${attributes.target}`)
   }
 
   if (config.fonts?.regular) {

packages/astro-d2/libs/exec.ts

@@ -8,7 +8,7 @@ export function exec(command: string, args: string[], stdin?: string, cwd?: stri
     })
 
     const output: string[] = []
-    const errorMessage = `Unable to run command: '${command} ${args.join(' ')}'.`
+    let errorMessage = `Unable to run command: '${command} ${args.join(' ')}'.`
 
     child.stdout.on('data', (data: Buffer) => {
       const lines = data
@@ -19,6 +19,10 @@ export function exec(command: string, args: string[], stdin?: string, cwd?: stri
       output.push(...lines)
     })
 
+    child.stderr.on('data', (data: Buffer) => {
+      errorMessage += `\n${data.toString()}`
+    })
+
     child.on('error', (error) => {
       reject(new Error(errorMessage, { cause: error }))
     })

packages/astro-d2/libs/integration.ts

@@ -1,8 +1,8 @@
 import { AstroError } from 'astro/errors'
 
-export function throwErrorWithHint(message: string): never {
+export function throwErrorWithHint(message: string, cause?: Error): never {
   throw new AstroError(
-    message,
+    message + (cause ? `\n\n${cause.message}` : ''),
     `See the error report above for more informations.\n\nIf you believe this is a bug, please file an issue at https://github.com/HiDeoo/astro-d2/issues/new/choose`,
   )
 }

packages/astro-d2/libs/remark.ts

@@ -44,9 +44,10 @@ export function remarkAstroD2(config: RemarkAstroD2Config) {
               outputPath.fsPath,
               file.history[0] ? path.dirname(file.history[0]) : file.cwd,
             )
-          } catch {
+          } catch (error) {
             throwErrorWithHint(
               `Failed to generate the D2 diagram at ${node.position?.start.line ?? 0}:${node.position?.start.column ?? 0}.`,
+              error instanceof Error ? (error.cause instanceof Error ? error.cause : error) : undefined,
             )
           }
         }

packages/astro-d2/tests/remark.test.ts

@@ -240,12 +240,12 @@ ${defaultDiagram}
 })
 
 test('uses the `target` attribute if specified', async () => {
-  await transformMd(`\`\`\`d2 target=root
+  await transformMd(`\`\`\`d2 target=test
 ${defaultDiagram}
 \`\`\`
 `)
 
-  expectD2ToHaveBeenCalledWithArg("--target=''")
+  expectD2ToHaveBeenCalledWithArg('--target=test')
 })
 
 test('uses the `width` attribute if specified and computes the height', async () => {