Upgrade lighter

Author: pomber

packages/mdx/dev/content/comment-annotations.mdx

@@ -129,7 +129,13 @@ body {
 ```
 
 ```mdx
-# Hello {/* mark */}
+{/* mark(2) */}
+
+# Lorem
+
+## Foo
+
+# Ipsum {/* mark */}
 ```
 
 ```jsonc

packages/mdx/dev/content/simple-code.mdx

@@ -14,6 +14,13 @@ graph LR
     --> End1(End)
 ```
 
+```foobar
+// unknown lang
+function lorem(ipsum, dolor = 1) {
+  return ipsum + dolor;
+}
+```
+
 ```js
 function lorem(ipsum, dolor = 1) {}
 ```

packages/mdx/package.json

@@ -44,7 +44,7 @@
     "coverage": "vitest run --coverage"
   },
   "dependencies": {
-    "@code-hike/lighter": "0.7.0",
+    "@code-hike/lighter": "0.7.3",
     "node-fetch": "^2.0.0"
   },
   "devDependencies": {

packages/mdx/src/highlighter/index.tsx

@@ -1,3 +1 @@
 export { attacher as remarkCodeHike } from "./remark/transform"
-
-export { highlight } from "./highlighter"

packages/mdx/src/index.tsx

@@ -1,4 +1,4 @@
-import { highlight } from "../highlighter"
+import { highlight } from "./lighter"
 import { NodeInfo, splitChildren } from "./unist-utils"
 import { CodeStep } from "../smooth-code"
 import { EditorProps } from "../mini-editor"

packages/mdx/src/remark/code.ts

@@ -1,8 +1,10 @@
 import {
-  highlight,
+  highlight as light,
   extractAnnotations,
   Annotation,
+  LANG_NAMES,
 } from "@code-hike/lighter"
+import { Code } from "utils"
 import { annotationsMap } from "../mdx-client/annotations"
 import { CodeAnnotation } from "../smooth-code"
 
@@ -20,48 +22,11 @@ export async function extractLighterAnnotations(
 ) {
   return await extractAnnotations(
     codeWithAnnotations,
-    lang,
+    warnIfUnknownLang(lang),
     annotationNames
   )
 }
 
-export async function extractAnnotationsFromCode(
-  codeWithAnnotations: string,
-  lang: string,
-  names?: string[]
-) {
-  const { code, annotations } = await extractAnnotations(
-    codeWithAnnotations,
-    lang,
-    names || annotationNames
-  )
-
-  const focusList = [] as string[]
-
-  const codeAnnotations = [] as CodeAnnotation[]
-
-  annotations.forEach(({ name, query, ranges }) => {
-    ranges.forEach(range => {
-      const focus = rangeString(range)
-      if (name === "focus") {
-        focusList.push(focus)
-      } else {
-        const Component = annotationsMap[name]
-        if (Component) {
-          codeAnnotations.push({
-            Component,
-            focus: focus,
-            data: query,
-          })
-        }
-      }
-    })
-  })
-
-  return { code, annotations: codeAnnotations }
-}
-
-// lighter annotations to CodeAnnotations
 export function parseLighterAnnotations(
   annotations: LighterAnnotation[]
 ) {
@@ -102,3 +67,44 @@ function rangeString(range: Annotation["ranges"][0]) {
     return `${range.fromLineNumber}:${range.toLineNumber}`
   }
 }
+
+const warnings = new Set()
+
+function warnIfUnknownLang(lang: string) {
+  if (!LANG_NAMES.includes(lang)) {
+    if (!warnings.has(lang)) {
+      console.warn(
+        "[Code Hike warning]",
+        `${lang} isn't a valid language, no syntax highlighting will be applied.`
+      )
+      warnings.add(lang)
+    }
+    return "text"
+  }
+  return lang
+}
+
+export async function highlight({
+  code,
+  lang,
+  theme,
+}: {
+  code: string
+  lang: string
+  theme: any // TODO type this
+}): Promise<Code> {
+  const r = await light(
+    code,
+    warnIfUnknownLang(lang),
+    theme
+  )
+
+  const lines = r.lines.map(line => ({
+    tokens: line.map(token => ({
+      content: token.content,
+      props: { style: token.style },
+    })),
+  }))
+
+  return { lines, lang: r.lang }
+}

packages/mdx/src/remark/lighter.ts

@@ -1,5 +1,5 @@
 import { visitAsync, toJSX } from "./unist-utils"
-import { highlight } from "../highlighter"
+import { highlight } from "./lighter"
 import { EditorStep } from "../mini-editor"
 import { Code } from "../utils"
 import { SuperNode, visit } from "./nodes"

packages/mdx/src/remark/transform.inline-code.ts

@@ -455,10 +455,10 @@
     "@babel/helper-validator-identifier" "^7.19.1"
     to-fast-properties "^2.0.0"
 
-"@code-hike/[email protected].0":
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/@code-hike/lighter/-/lighter-0.7.0.tgz#7bb7d59631237d7d2e82434c3ea6fe1875813cb0"
-  integrity sha512-64O07rIORKQLB+5T/GKAmKcD9sC0N9yHFJXa0Hs+0Aee1G+I4bSXxTccuDFP6c/G/3h5Pk7yv7PoX9/SpzaeiQ==
+"@code-hike/[email protected].3":
+  version "0.7.3"
+  resolved "https://registry.yarnpkg.com/@code-hike/lighter/-/lighter-0.7.3.tgz#729a7ab484f11069d258c34dfe39be918f093e39"
+  integrity sha512-IW3nBrnQRSoYDY2suXUjNZegCGVH3ljEH5w51chazy30s103CdpwSwvFya3e6GbY/xfbyAVj+Uyg6HH4L5T6tw==
 
 "@codesandbox/sandpack-client@^0.19.0":
   version "0.19.0"