starlight-obsidian 0.4.0 → 0.4.2

package/libs/obsidian.ts

@@ -9,7 +9,7 @@ import yaml from 'yaml'
 import type { StarlightObsidianConfig } from '..'
 
 import { isDirectory, isFile } from './fs'
-import { getExtension, isAnchor, slugifyPath, stripExtension } from './path'
+import { getExtension, isAnchor, slashify, slugifyPath, stripExtension } from './path'
 import { throwUserError } from './plugin'
 import { isAssetFile } from './starlight'
 
@@ -56,7 +56,7 @@ export async function getVault(config: StarlightObsidianConfig): Promise<Vault>
 
   return {
     options,
-    path: vaultPath,
+    path: slashify(vaultPath),
   }
 }
 

package/libs/path.ts

@@ -37,3 +37,18 @@ export function slugifyPath(filePath: string) {
     })
     .join('/')
 }
+
+// https://github.com/sindresorhus/slash
+export function slashify(filePath: string) {
+  const isExtendedLengthPath = filePath.startsWith('\\\\?\\')
+
+  if (isExtendedLengthPath) {
+    return filePath
+  }
+
+  return filePath.replaceAll('\\', '/')
+}
+
+export function osPath(filePath: string) {
+  return filePath.replaceAll('/', path.sep)
+}

package/libs/remark.ts

@@ -38,7 +38,7 @@ const commentReplacementRegex = /%%(?<comment>(?:(?!%%).)+)%%/gs
 const wikilinkReplacementRegex = /!?\[\[(?<url>(?:(?![[\]|]).)+)(?:\|(?<maybeText>(?:(?![[\]]).)+))?]]/g
 const tagReplacementRegex = /(?:^|\s)#(?<tag>[\w/-]+)/g
 const calloutRegex = /^\[!(?<type>\w+)][+-]? ?(?<title>.*)$/
-const imageSizeRegex = /^(?<altText>.*)\|(?:(?<widthOnly>\d+)|(?:(?<width>\d+)x(?<height>\d+)))$/
+const imageSizeRegex = /^(?:(?<altText>.*)\|)?(?:(?<widthOnly>\d+)|(?:(?<width>\d+)x(?<height>\d+)))$/
 
 const asideDelimiter = ':::'
 
@@ -358,7 +358,7 @@ function handleBlockquotes(node: Blockquote, context: VisitorContext) {
     return SKIP
   }
 
-  const [firstLine, ...otherLines] = firstGrandChild.value.split('\n')
+  const [firstLine, ...otherLines] = firstGrandChild.value.split(/\r?\n/)
 
   if (!firstLine) {
     return SKIP
@@ -485,7 +485,7 @@ function getRelativeFilePath(file: VFile, relativePath: string) {
 function getAssetPath(file: VFile, relativePath: string) {
   ensureTransformContext(file)
 
-  return path.posix.join('../../..', path.relative(file.dirname, file.data.vault.path), 'assets', relativePath)
+  return path.posix.join('../../..', path.posix.relative(file.dirname, file.data.vault.path), 'assets', relativePath)
 }
 
 function getFilePathFromVaultFile(vaultFile: VaultFile, url: string) {
@@ -534,6 +534,7 @@ function handleImagesWithSize(node: Image, context: VisitorContext, type: 'asset
     return
   }
 
+  const imgAltText = altText ?? ''
   const imgWidth = widthOnly ?? width
   const imgHeight = height ?? 'auto'
   // Workaround Starlight `auto` height default style.
@@ -542,7 +543,7 @@ function handleImagesWithSize(node: Image, context: VisitorContext, type: 'asset
   if (type === 'external') {
     replaceNode(context, {
       type: 'html',
-      value: `<img src="${node.url}" alt="${altText}" width="${imgWidth}" height="${imgHeight}"${imgStyle} />`,
+      value: `<img src="${node.url}" alt="${imgAltText}" width="${imgWidth}" height="${imgHeight}"${imgStyle} />`,
     })
   } else {
     const importId = generateAssetImportId()
@@ -556,7 +557,7 @@ function handleImagesWithSize(node: Image, context: VisitorContext, type: 'asset
     replaceNode(
       context,
       createMdxNode(
-        `<Image src={${importId}} alt="${altText}" width="${imgWidth}" height="${imgHeight}"${imgStyle} />`,
+        `<Image src={${importId}} alt="${imgAltText}" width="${imgWidth}" height="${imgHeight}"${imgStyle} />`,
       ),
     )
   }
@@ -594,8 +595,9 @@ function getMarkdownFileNode(file: VFile, fileUrl: string): RootContent {
     file.data.vault.options.linkFormat === 'relative' ? getRelativeFilePath(file, fileUrl) : fileUrl,
   )
   const url = path.posix.join(path.posix.sep, `${filePath}${fileExt}`)
-
-  const matchingFile = file.data.files.find((vaultFile) => vaultFile.path === url)
+  const matchingFile = file.data.files.find(
+    (vaultFile) => vaultFile.path === url || vaultFile.isEqualStem(filePath) || vaultFile.isEqualFileName(filePath),
+  )
 
   if (!matchingFile) {
     return { type: 'text', value: '' }

package/package.json

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