@codemirror/language 6.9.2 → 6.9.3

package/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 6.9.3 (2023-11-27)
+
+### Bug fixes
+
+Fix an issue in `StreamLanguage` where it ran out of node type ids if you repeatedly redefined a language with the same token table.
+
 ## 6.9.2 (2023-10-24)
 
 ### Bug fixes

package/dist/index.cjs

@@ -2452,6 +2452,8 @@ const noTokens = Object.create(null);
 const typeArray = [common.NodeType.none];
 const nodeSet = new common.NodeSet(typeArray);
 const warned = [];
+// Cache of node types by name and tags
+const byTag = Object.create(null);
 const defaultTable = Object.create(null);
 for (let [legacyName, name] of [
     ["variable", "variableName"],
@@ -2511,7 +2513,11 @@ function createTokenType(extra, tagStr) {
     }
     if (!tags.length)
         return 0;
-    let name = tagStr.replace(/ /g, "_"), type = common.NodeType.define({
+    let name = tagStr.replace(/ /g, "_"), key = name + " " + tags.map(t => t.id);
+    let known = byTag[key];
+    if (known)
+        return known.id;
+    let type = byTag[key] = common.NodeType.define({
         id: typeArray.length,
         name,
         props: [highlight.styleTags({ [name]: tags })]

package/dist/index.js

@@ -2450,6 +2450,8 @@ const noTokens = /*@__PURE__*/Object.create(null);
 const typeArray = [NodeType.none];
 const nodeSet = /*@__PURE__*/new NodeSet(typeArray);
 const warned = [];
+// Cache of node types by name and tags
+const byTag = /*@__PURE__*/Object.create(null);
 const defaultTable = /*@__PURE__*/Object.create(null);
 for (let [legacyName, name] of [
     ["variable", "variableName"],
@@ -2509,7 +2511,11 @@ function createTokenType(extra, tagStr) {
     }
     if (!tags$1.length)
         return 0;
-    let name = tagStr.replace(/ /g, "_"), type = NodeType.define({
+    let name = tagStr.replace(/ /g, "_"), key = name + " " + tags$1.map(t => t.id);
+    let known = byTag[key];
+    if (known)
+        return known.id;
+    let type = byTag[key] = NodeType.define({
         id: typeArray.length,
         name,
         props: [styleTags({ [name]: tags$1 })]

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@codemirror/language",
-  "version": "6.9.2",
+  "version": "6.9.3",
   "description": "Language support infrastructure for the CodeMirror code editor",
   "scripts": {
     "test": "cm-runtests",