starlight-obsidian 0.7.0 → 0.7.1

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # starlight-obsidian
 
+## 0.7.1
+
+### Patch Changes
+
+- [#41](https://github.com/HiDeoo/starlight-obsidian/pull/41) [`ab86671`](https://github.com/HiDeoo/starlight-obsidian/commit/ab8667139930cad8322ed494a760547e896e7a27) Thanks [@HiDeoo](https://github.com/HiDeoo)! - Fixes an issue with custom aside titles including links.
+
 ## 0.7.0
 
 ### Minor Changes

package/libs/remark.ts

@@ -5,7 +5,18 @@ import twitterMatcher from '@astro-community/astro-embed-twitter/matcher'
 import youtubeMatcher from '@astro-community/astro-embed-youtube/matcher'
 import { toHtml } from 'hast-util-to-html'
 import isAbsoluteUrl from 'is-absolute-url'
-import type { BlockContent, Blockquote, Code, Html, Image, Link, Parent, Root, RootContent } from 'mdast'
+import type {
+  BlockContent,
+  Blockquote,
+  Code,
+  Html,
+  Image,
+  Link,
+  Parent,
+  PhrasingContent,
+  Root,
+  RootContent,
+} from 'mdast'
 import { findAndReplace } from 'mdast-util-find-and-replace'
 import { toHast } from 'mdast-util-to-hast'
 import { customAlphabet } from 'nanoid'
@@ -385,7 +396,23 @@ function handleBlockquotes(node: Blockquote, context: VisitorContext) {
     return SKIP
   }
 
-  const asideTitle = title && title.length > 0 ? `[${title.trim()}]` : ''
+  const hasTitle = title && title.length > 0
+  const asideTitle = hasTitle ? `[${title.trim()}` : ''
+  let didEndAsideTitle = false
+
+  let asideFirstLine = `${asideDelimiter}${getStarlightCalloutType(type)}${asideTitle}`
+  if (otherLines.length > 0) {
+    if (hasTitle) {
+      asideFirstLine += ']'
+      didEndAsideTitle = true
+    }
+    asideFirstLine += `\n${otherLines.join('\n')}`
+  } else if (otherGrandChildren.length === 0) {
+    asideFirstLine += ']\n'
+    didEndAsideTitle = true
+  } else {
+    asideFirstLine += ' '
+  }
 
   const aside: RootContent[] = [
     {
@@ -393,9 +420,22 @@ function handleBlockquotes(node: Blockquote, context: VisitorContext) {
       children: [
         {
           type: 'html',
-          value: `${asideDelimiter}${getStarlightCalloutType(type)}${asideTitle}\n${otherLines.join('\n')}`,
+          value: asideFirstLine,
         },
-        ...otherGrandChildren,
+        ...(hasTitle
+          ? otherGrandChildren.flatMap<PhrasingContent>((otherGrandChild) => {
+              if (didEndAsideTitle) return otherGrandChild
+              if (otherGrandChild.type !== 'text') return otherGrandChild
+              const containsNewLine = /\r?\n/.test(otherGrandChild.value)
+              if (!containsNewLine) return otherGrandChild
+              const [firstLine, ...otherLines] = otherGrandChild.value.split(/\r?\n/)
+              didEndAsideTitle = true
+              return [
+                { type: 'text', value: `${firstLine}]\n` },
+                { type: 'text', value: otherLines.join('\n') },
+              ]
+            })
+          : otherGrandChildren),
         ...(otherChildren.length === 0 ? [{ type: 'html', value: `\n${asideDelimiter}` } satisfies RootContent] : []),
       ],
     },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "starlight-obsidian",
-  "version": "0.7.0",
+  "version": "0.7.1",
   "license": "MIT",
   "description": "Starlight plugin to publish Obsidian vaults.",
   "author": "HiDeoo <github@hideoo.dev> (https://hideoo.dev)",