@levino/shipyard-base 0.9.0 → 0.9.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@levino/shipyard-base",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Core layouts, components, and configuration for shipyard - a composable page builder for Astro",
   "keywords": [
     "astro",
@@ -67,9 +67,11 @@
     "@astrojs/markdown-remark": "^7.2.4",
     "clsx": "^2.1.0",
     "mdast-util-directive": "^3.0.0",
+    "mdast-util-to-hast": "^13.2.1",
     "micromark-extension-directive": "^3.0.0",
     "ramda": "^0.32.0",
     "remark-directive": "^3.0.0",
+    "remark-parse": "^11.0.0",
     "tailwind-merge": "^2.2.0",
     "unified": "^11.0.0",
     "unist-util-visit": "^5.0.0"

package/src/astro.ts

@@ -1,2 +1,2 @@
-export * as components from './astro/components'
-export * as layouts from './astro/layouts'
+export * as components from '../astro/components'
+export * as layouts from '../astro/layouts'

package/src/markdownProcessor.test.ts

@@ -16,6 +16,7 @@ interface ConfigUpdate {
 const baseConfig: Config = {
   title: 'Test',
   brand: 'Test',
+  tagline: 'Test',
   navigation: {},
 }
 
@@ -83,7 +84,7 @@ describe('markdown processor', () => {
     })
 
     expect(logger.warn).toHaveBeenCalledOnce()
-    expect(logger.warn.mock.calls[0][0]).toContain('satteri')
+    expect(logger.warn.mock.calls[0]?.[0]).toContain('satteri')
     expect(update?.markdown?.processor?.name).toBe(unified().name)
     expect(update?.markdown?.processor?.options.remarkPlugins).toHaveLength(
       SHIPYARD_PLUGIN_COUNT,

package/src/remark/remarkAdmonitions.ts

@@ -1,5 +1,9 @@
 import type { Root } from 'mdast'
 import type { ContainerDirective } from 'mdast-util-directive'
+// `mdast-util-to-hast` augments mdast's `Data` with `hName`/`hProperties`, which
+// this plugin sets. Imported explicitly so the augmentation is present when a
+// consumer compiles this file, not just via a transitive dev dependency.
+import type {} from 'mdast-util-to-hast'
 import { includes, pipe, toLower } from 'ramda'
 import type { Plugin } from 'unified'
 import { SKIP, visit } from 'unist-util-visit'
@@ -67,7 +71,11 @@ export const remarkAdmonitions: Plugin<[], Root> = () => {
       }
 
       const type = toLower(directiveName) as AdmonitionType
-      const title = node.label ?? getDefaultTitle(type)
+      // NOTE: container directives carry no `label` field. `:::note[Custom]`
+      // is parsed by mdast-util-directive into a first child paragraph with
+      // `data.directiveLabel === true`, so custom titles are not picked up
+      // here and the default title is used for every admonition.
+      const title = getDefaultTitle(type)
 
       // Set up the data for hast transformation
       if (!node.data) {

package/src/remark/remarkBlockDirective.ts

@@ -1,6 +1,11 @@
 import type { Root } from 'mdast'
 import { directiveFromMarkdown } from 'mdast-util-directive'
 import { directive } from 'micromark-extension-directive'
+// `remark-parse` augments unified's `Data` with `micromarkExtensions` and
+// `fromMarkdownExtensions`. shipyard ships raw TypeScript source, so a consumer
+// compiles this file in their own program — importing the augmentation here
+// keeps it available there instead of relying on a transitive dev dependency.
+import type {} from 'remark-parse'
 import type { Plugin, Processor } from 'unified'
 
 /**

package/src/schemas/config.ts

@@ -1,3 +1,8 @@
+// `astroHTML.JSX` is a global namespace declared by Astro. It is only in scope
+// for files that pull in Astro's JSX types, which `.ts` files in this package
+// do not do implicitly. The reference is erased at compile time.
+/// <reference types="astro/astro-jsx" />
+
 export interface NavigationEntry {
   label?: string
   href?: string

package/src/shiki/index.ts

@@ -3,6 +3,7 @@
  * Supports Docusaurus-style features like line numbers, line highlighting, and code block titles.
  */
 
+import type { ElementContent } from 'hast'
 import {
   complement,
   filter,
@@ -29,7 +30,9 @@ const parseLineRange = (rangeStr: string): number[] => {
   const parseSegment = (segment: string): number[] => {
     const trimmed = trim(segment)
     if (test(/-/, trimmed)) {
-      const [start, end] = split('-', trimmed).map(Number)
+      const [startStr, endStr] = split('-', trimmed)
+      const start = Number(startStr)
+      const end = Number(endStr)
       return Array.from({ length: end - start + 1 }, (_, i) => start + i)
     }
     return [Number(trimmed)]
@@ -79,7 +82,7 @@ const extractCodeMeta = (meta: string | undefined): CodeMeta => {
   const startLineNumber = startLineMatch[1] ? Number(startLineMatch[1]) : 1
 
   return {
-    title,
+    ...(isNil(title) ? {} : { title }),
     highlightLines,
     showLineNumbers,
     startLineNumber,
@@ -198,7 +201,7 @@ export const transformerMagicComments = (): ShikiTransformer => {
       const lines = node.children.filter((child) => child.type === 'element')
       lines.forEach((lineNode, index) => {
         // Extract text content from line
-        const getText = (n: typeof lineNode): string => {
+        const getText = (n: ElementContent): string => {
           if (n.type === 'text') return n.value
           if (n.type === 'element' && n.children) {
             return n.children.map(getText).join('')

package/src/tools/linkChecker.test.ts

@@ -44,8 +44,8 @@ describe('checkLinks', () => {
     const result = checkLinks(testDir)
 
     expect(result.brokenCount).toBe(1)
-    expect(result.brokenLinks[0].href).toBe('/non-existent')
-    expect(result.brokenLinks[0].sourceFile).toBe('index.html')
+    expect(result.brokenLinks[0]?.href).toBe('/non-existent')
+    expect(result.brokenLinks[0]?.sourceFile).toBe('index.html')
   })
 
   test('ignores external links', () => {
@@ -163,7 +163,7 @@ describe('checkLinks', () => {
 
     const result = checkLinks(testDir)
 
-    expect(result.brokenLinks[0].line).toBe(2)
+    expect(result.brokenLinks[0]?.line).toBe(2)
   })
 })
 
@@ -221,7 +221,7 @@ describe('reportBrokenLinks', () => {
     reportBrokenLinks(result, 'log', logger as any)
 
     expect(logger.info).toHaveBeenCalled()
-    const message = logger.info.mock.calls[0][0]
+    const message = logger.info.mock.calls[0]?.[0]
     expect(message).toContain('Found 1 broken link')
     expect(message).toContain('/broken')
     expect(message).toContain('index.html:1')
@@ -238,7 +238,7 @@ describe('reportBrokenLinks', () => {
     reportBrokenLinks(result, 'warn', logger as any)
 
     expect(logger.warn).toHaveBeenCalled()
-    const message = logger.warn.mock.calls[0][0]
+    const message = logger.warn.mock.calls[0]?.[0]
     expect(message).toContain('Found 1 broken link')
   })
 
@@ -269,7 +269,7 @@ describe('reportBrokenLinks', () => {
 
     reportBrokenLinks(result, 'warn', logger as any)
 
-    const message = logger.warn.mock.calls[0][0]
+    const message = logger.warn.mock.calls[0]?.[0]
     expect(message).toContain('Found 3 broken links')
   })
 })

package/src/tools/linkChecker.ts

@@ -52,16 +52,15 @@ function extractInternalLinks(html: string): { href: string; line: number }[] {
 
   const hrefRegex = /href=["']([^"']+)["']/g
 
-  for (let i = 0; i < lines.length; i++) {
-    const line = lines[i]
-
+  for (const [index, line] of lines.entries()) {
     for (const match of line.matchAll(hrefRegex)) {
       const href = match[1]
 
       // Only include internal links (start with /)
       // This automatically excludes external URLs, anchors, and special protocols
-      if (href.startsWith('/')) {
-        links.push({ href, line: i + 1 })
+      // (the capture group is mandatory, so `href` is always a string here)
+      if (href?.startsWith('/')) {
+        links.push({ href, line: index + 1 })
       }
     }
   }
@@ -75,7 +74,10 @@ function extractInternalLinks(html: string): { href: string; line: number }[] {
  */
 function normalizePath(href: string): string[] {
   // Remove query string and hash, and decode URL-encoded characters
-  const path = decodeURIComponent(href.split('?')[0].split('#')[0])
+  // (`split` always yields at least one element, so the defaults never apply)
+  const [beforeQuery = ''] = href.split('?')
+  const [pathname = ''] = beforeQuery.split('#')
+  const path = decodeURIComponent(pathname)
 
   // Generate possible file paths to check
   const paths: string[] = []