Merge pull request #43 from shikijs/weakmap

Use a weakmap for the highlighters
shikijs · Jun 26, 2021 · 4df3f98 · 4df3f98
2 parents 04f7989 + 2c63c9c
commit 4df3f98
Show file tree

Hide file tree

Showing 10 changed files with 28 additions and 30 deletions.
diff --git a/packages/docusaurus-preset-shiki-twoslash/package.json b/packages/docusaurus-preset-shiki-twoslash/package.json
@@ -1,6 +1,6 @@
 {
   "name": "docusaurus-preset-shiki-twoslash",
-  "version": "1.1.2",
+  "version": "1.1.3",
   "license": "MIT",
   "homepage": "https://github.com/shikijs/twoslash",
   "repository": {
@@ -22,7 +22,7 @@
     "lint": "echo 'NOOP'"
   },
   "dependencies": {
-    "remark-shiki-twoslash": "1.4.7",
+    "remark-shiki-twoslash": "1.4.8",
     "typescript": ">3"
   }
 }
diff --git a/packages/eleventy-plugin-shiki-twoslash/package.json b/packages/eleventy-plugin-shiki-twoslash/package.json
@@ -1,6 +1,6 @@
 {
   "name": "eleventy-plugin-shiki-twoslash",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "license": "MIT",
   "homepage": "https://github.com/shikijs/twoslash",
   "repository": {
@@ -21,7 +21,7 @@
   },
   "dependencies": {
     "deasync": "^0.1.21",
-    "remark-shiki-twoslash": "1.4.7",
+    "remark-shiki-twoslash": "1.4.8",
     "typescript": ">3"
   },
   "devDependencies": {

diff --git a/packages/gatsby-remark-shiki-twoslash/package.json b/packages/gatsby-remark-shiki-twoslash/package.json
@@ -1,6 +1,6 @@
 {
   "name": "gatsby-remark-shiki-twoslash",
-  "version": "3.0.2",
+  "version": "3.0.3",
   "license": "MIT",
   "homepage": "https://github.com/shikijs/twoslash",
   "repository": {
@@ -23,7 +23,7 @@
     "build": ""
   },
   "dependencies": {
-    "remark-shiki-twoslash": "1.4.7",
+    "remark-shiki-twoslash": "1.4.8",
     "typescript": ">3",
     "unist-util-visit": "^2.0.0"
   },

diff --git a/packages/hexo-shiki-twoslash/package.json b/packages/hexo-shiki-twoslash/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hexo-shiki-twoslash",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "license": "MIT",
   "homepage": "https://github.com/shikijs/twoslash",
   "repository": {
@@ -21,7 +21,7 @@
     "lint": "echo 'NOOP'"
   },
   "dependencies": {
-    "remark-shiki-twoslash": "1.4.7",
+    "remark-shiki-twoslash": "1.4.8",
     "typescript": ">3"
   }
 }
diff --git a/packages/markdown-it-shiki-twoslash/package.json b/packages/markdown-it-shiki-twoslash/package.json
@@ -1,6 +1,6 @@
 {
   "name": "markdown-it-shiki-twoslash",
-  "version": "1.0.6",
+  "version": "1.0.7",
   "license": "MIT",
   "homepage": "https://github.com/shikijs/twoslash",
   "repository": {
@@ -25,7 +25,7 @@
     "prepublishOnly": "npm run build; npm run bootstrap"
   },
   "dependencies": {
-    "remark-shiki-twoslash": "1.4.7"
+    "remark-shiki-twoslash": "1.4.8"
   },
   "devDependencies": {
     "@types/deasync": "^0.1.1",

diff --git a/packages/remark-shiki-twoslash/package.json b/packages/remark-shiki-twoslash/package.json
@@ -1,6 +1,6 @@
 {
   "name": "remark-shiki-twoslash",
-  "version": "1.4.7",
+  "version": "1.4.8",
   "license": "MIT",
   "homepage": "https://github.com/shikijs/twoslash",
   "repository": {

diff --git a/packages/remark-shiki-twoslash/src/index.ts b/packages/remark-shiki-twoslash/src/index.ts
@@ -59,29 +59,27 @@ export const runTwoSlashOnNode = (code: string, lang: string, meta: string, sett
 }
 
 // To make sure we only have one highlighter per theme in a process
-const highlighterCache = new Map<IThemeRegistration, Highlighter>()
+const highlighterCache = new WeakMap<UserConfigSettings, Highlighter[]>()
 
 /** Sets up the highlighters, and cache's for recalls */
 export const highlightersFromSettings = async (settings: UserConfigSettings) => {
   const themes = settings.themes || (settings.theme ? [settings.theme] : ["light-plus"])
+  if (highlighterCache.has(settings)) return highlighterCache.get(settings)!
 
-  return await Promise.all(
+  const highlighters = await Promise.all(
     themes.map(async theme => {
       // You can put a string, a path, or the JSON theme obj
       const themeName = (theme as any).name || theme
-      const cached = highlighterCache.get(themeName)
-      if (cached) {
-        return cached
-      }
-
       const highlighter = await getHighlighter({ ...settings, theme, themes: undefined })
 
       // @ts-ignore - https://github.com/shikijs/shiki/pull/162 will fix this
       highlighter.customName = themeName
-      highlighterCache.set(themeName, highlighter)
       return highlighter
     })
   )
+
+  highlighterCache.set(settings, highlighters)
+  return highlighters
 }
 
 const amendSettingsForDefaults = (settings: UserConfigSettings) => {

diff --git a/packages/twoslash-cli/package.json b/packages/twoslash-cli/package.json
@@ -1,6 +1,6 @@
 {
   "name": "twoslash-cli",
-  "version": "1.2.4",
+  "version": "1.2.5",
   "main": "index.js",
   "bin": {
     "twoslash": "./bin/twoslash.js",
@@ -15,7 +15,7 @@
     "hast-util-to-html": "^7.1.2",
     "mdast-util-to-hast": "^10.0.0",
     "remark": "^13.0.0",
-    "remark-shiki-twoslash": "1.4.7",
+    "remark-shiki-twoslash": "1.4.8",
     "unist-util-visit": "^3.1.0"
   },
   "devDependencies": {

diff --git a/packages/vuepress-plugin-shiki-twoslash/package.json b/packages/vuepress-plugin-shiki-twoslash/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vuepress-plugin-shiki-twoslash",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "license": "MIT",
   "homepage": "https://github.com/shikijs/twoslash",
   "repository": {
@@ -22,7 +22,7 @@
     "lint": "echo 'NOOP'"
   },
   "dependencies": {
-    "remark-shiki-twoslash": "1.4.7",
+    "remark-shiki-twoslash": "1.4.8",
     "typescript": ">3"
   }
 }
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml