astro-d2 0.5.0 → 0.5.2

package/index.ts

@@ -45,7 +45,17 @@ export default function astroD2Integration(userConfig?: AstroD2UserConfig): Astr
 
         updateConfig({
           markdown: {
-            remarkPlugins: [[remarkAstroD2, { ...config, base: astroConfig.base, root: astroConfig.root }]],
+            remarkPlugins: [
+              [
+                remarkAstroD2,
+                {
+                  ...config,
+                  base: astroConfig.base,
+                  publicDir: astroConfig.publicDir,
+                  root: astroConfig.root,
+                },
+              ],
+            ],
           },
         })
       },

package/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) {

package/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 }))
     })

package/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`,
   )
 }

package/libs/remark.ts

@@ -1,4 +1,5 @@
 import path from 'node:path'
+import url from 'node:url'
 
 import type { Code, Html, Parent, Root } from 'mdast'
 import { SKIP, visit } from 'unist-util-visit'
@@ -43,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,
             )
           }
         }
@@ -83,7 +85,7 @@ function getOutputPaths(config: RemarkAstroD2Config, file: VFile, nodeIndex: num
   const relativeOutputPath = path.join(parsedRelativePath.dir, `${parsedRelativePath.name}-${nodeIndex}.svg`)
 
   return {
-    fsPath: path.join(file.cwd, 'public', config.output, relativeOutputPath),
+    fsPath: path.join(url.fileURLToPath(config.publicDir), config.output, relativeOutputPath),
     imgPath: path.posix.join(config.base, config.output, relativeOutputPath),
   }
 }
@@ -109,5 +111,6 @@ interface VisitorContext {
 
 export interface RemarkAstroD2Config extends AstroD2Config {
   base: string
+  publicDir: URL
   root: URL
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-d2",
-  "version": "0.5.0",
+  "version": "0.5.2",
   "license": "MIT",
   "description": "Astro integration and remark plugin to transform D2 Markdown code blocks into diagrams.",
   "author": "HiDeoo <github@hideoo.dev> (https://hideoo.dev)",