astro-d2 0.1.0 → 0.2.0

package/config.ts

@@ -15,6 +15,18 @@ export const AstroD2ConfigSchema = z
      * @default 'd2'
      */
     output: z.string().default('d2'),
+    /**
+     * The padding (in pixels) around the rendered diagrams.
+     *
+     * @default 100
+     */
+    pad: z.number().default(100),
+    /**
+     * Whether to render the diagrams as if they were sketched by hand.
+     *
+     * @default false
+     */
+    sketch: z.boolean().default(false),
     /**
      * Whether the Astro D2 integration should skip the generation of diagrams.
      *

package/index.ts

@@ -24,7 +24,7 @@ export default function astroD2Integration(userConfig?: AstroD2UserConfig): Astr
   return {
     name: 'astro-d2-integration',
     hooks: {
-      'astro:config:setup': async ({ command, logger, updateConfig }) => {
+      'astro:config:setup': async ({ command, config: astroConfig, logger, updateConfig }) => {
         if (command !== 'build' && command !== 'dev') {
           return
         }
@@ -45,7 +45,7 @@ export default function astroD2Integration(userConfig?: AstroD2UserConfig): Astr
 
         updateConfig({
           markdown: {
-            remarkPlugins: [[remarkAstroD2, config]],
+            remarkPlugins: [[remarkAstroD2, { ...config, base: astroConfig.base }]],
           },
         })
       },

package/libs/attributes.ts

@@ -19,17 +19,16 @@ export const AttributesSchema = z
       .optional()
       .transform((value) => (value === 'false' ? false : value)),
     /**
-     * The padding (in pixels) around the rendered diagram.
-     *
-     * @default 100
+     * Overrides the global `pad` configuration for the diagram.
      */
-    pad: z.coerce.number().default(100),
+    pad: z.coerce.number().optional(),
     /**
-     * Whether to render the diagram as if it was sketched by hand.
-     *
-     * @default 'false'
+     * Overrides the global `sketch` configuration for the diagram.
      */
-    sketch: z.union([z.literal('true'), z.literal('false')]).default('false'),
+    sketch: z
+      .union([z.literal('true'), z.literal('false')])
+      .optional()
+      .transform((value) => (value === 'false' ? false : value)),
     /**
      * Defines the target board to render when using composition.
      * Use `root` to target the root board.

package/libs/d2.ts

@@ -47,8 +47,8 @@ export async function generateD2Diagram(
       [
         `--layout=${config.layout}`,
         `--theme=${attributes.theme ?? config.theme.default}`,
-        `--sketch=${attributes.sketch}`,
-        `--pad=${attributes.pad}`,
+        `--sketch=${attributes.sketch ?? config.sketch}`,
+        `--pad=${attributes.pad ?? config.pad}`,
         ...extraArgs,
         '-',
         outputPath,
@@ -85,7 +85,7 @@ async function getD2Version() {
   try {
     const [version] = await exec('d2', ['--version'])
 
-    if (!version || !/^\d+\.\d+\.\d+$/.test(version)) {
+    if (!version || !/^v?\d+\.\d+\.\d+/.test(version)) {
       throw new Error(`Invalid D2 version, got '${version}'.`)
     }
 

package/libs/remark.ts

@@ -10,7 +10,7 @@ import { type DiagramAttributes, getAttributes } from './attributes'
 import { generateD2Diagram, type D2Size, getD2DiagramSize } from './d2'
 import { throwErrorWithHint } from './integration'
 
-export function remarkAstroD2(config: AstroD2Config) {
+export function remarkAstroD2(config: RemarkAstroD2Config) {
   return async function transformer(tree: Root, file: VFile) {
     const d2Nodes: [node: Code, context: VisitorContext][] = []
 
@@ -70,7 +70,7 @@ function makHtmlImgNode(attributes: DiagramAttributes, imgPath: string, size: D2
   }
 }
 
-function getOutputPaths(config: AstroD2Config, file: VFile, nodeIndex: number) {
+function getOutputPaths(config: RemarkAstroD2Config, file: VFile, nodeIndex: number) {
   const relativePath = path.relative(file.cwd, file.path).replace(/^src\/(content|pages)\//, '')
   const parsedRelativePath = path.parse(relativePath)
 
@@ -78,7 +78,7 @@ function getOutputPaths(config: AstroD2Config, file: VFile, nodeIndex: number) {
 
   return {
     fsPath: path.join(file.cwd, 'public', config.output, relativeOutputPath),
-    imgPath: path.posix.join('/', config.output, relativeOutputPath),
+    imgPath: path.posix.join(config.base, config.output, relativeOutputPath),
   }
 }
 
@@ -100,3 +100,7 @@ interface VisitorContext {
   index: number | undefined
   parent: Parent | undefined
 }
+
+interface RemarkAstroD2Config extends AstroD2Config {
+  base: string
+}

package/package.json

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