shorter id

mbostock · mbostock · commit fe8a2f00dcd6 · 2023-10-13T17:32:24.000-07:00
diff --git a/src/markdown.ts b/src/markdown.ts
@@ -69,7 +69,7 @@ function makeHtmlRenderer(root: string, baseRenderer: RenderRule): RenderRule {
 }
 
 function uniqueCodeId(context: ParseContext, content: string): string {
-  const hash = String(computeHash(content));
+  const hash = computeHash(content).slice(0, 8);
   let id = hash;
   let count = 1;
   while (context.pieces.some((piece) => piece.code.some((code) => code.id === id))) {
diff --git a/test/output/block-expression.html b/test/output/block-expression.html
@@ -1 +1 @@
-<div><span id="cell-6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1"></span></div>
+<div><span id="cell-6212702c"></span></div>
diff --git a/test/output/block-expression.json b/test/output/block-expression.json
@@ -8,15 +8,15 @@
       "type": "html",
       "id": "",
       "cellIds": [
-        "6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1"
+        "6212702c"
       ],
-      "html": "<div><span id=\"cell-6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1\"></span></div>\n"
+      "html": "<div><span id=\"cell-6212702c\"></span></div>\n"
     }
   ],
   "cells": [
     {
       "type": "cell",
-      "id": "6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1",
+      "id": "6212702c",
       "inputs": [
         "display"
       ],
diff --git a/test/output/dollar-expression.html b/test/output/dollar-expression.html
@@ -1 +1 @@
-<p>$<span id="cell-6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1"></span></p>
+<p>$<span id="cell-6212702c"></span></p>
diff --git a/test/output/dollar-expression.json b/test/output/dollar-expression.json
@@ -8,15 +8,15 @@
       "type": "html",
       "id": "",
       "cellIds": [
-        "6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1"
+        "6212702c"
       ],
-      "html": "<p>$<span id=\"cell-6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1\"></span></p>\n"
+      "html": "<p>$<span id=\"cell-6212702c\"></span></p>\n"
     }
   ],
   "cells": [
     {
       "type": "cell",
-      "id": "6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1",
+      "id": "6212702c",
       "inputs": [
         "display"
       ],
diff --git a/test/output/double-quote-expression.html b/test/output/double-quote-expression.html
@@ -1 +1 @@
-<p><span id="cell-56e8b37a90d0b07a884e0445fe2495dee259fe3274d2e75aad25488aba87ea41"></span></p>
+<p><span id="cell-56e8b37a"></span></p>
diff --git a/test/output/double-quote-expression.json b/test/output/double-quote-expression.json
@@ -8,15 +8,15 @@
       "type": "html",
       "id": "",
       "cellIds": [
-        "56e8b37a90d0b07a884e0445fe2495dee259fe3274d2e75aad25488aba87ea41"
+        "56e8b37a"
       ],
-      "html": "<p><span id=\"cell-56e8b37a90d0b07a884e0445fe2495dee259fe3274d2e75aad25488aba87ea41\"></span></p>\n"
+      "html": "<p><span id=\"cell-56e8b37a\"></span></p>\n"
     }
   ],
   "cells": [
     {
       "type": "cell",
-      "id": "56e8b37a90d0b07a884e0445fe2495dee259fe3274d2e75aad25488aba87ea41",
+      "id": "56e8b37a",
       "inputs": [
         "display"
       ],
diff --git a/test/output/embedded-expression.html b/test/output/embedded-expression.html
@@ -1,2 +1,2 @@
 <h1 id="embedded-expression" tabindex="-1"><a class="observablehq-header-anchor" href="#embedded-expression">Embedded expression</a></h1>
-<p>One plus two is <span id="cell-6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1"></span>.</p>
+<p>One plus two is <span id="cell-6212702c"></span>.</p>
diff --git a/test/output/embedded-expression.json b/test/output/embedded-expression.json
@@ -14,15 +14,15 @@
       "type": "html",
       "id": "",
       "cellIds": [
-        "6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1"
+        "6212702c"
       ],
-      "html": "<p>One plus two is <span id=\"cell-6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1\"></span>.</p>\n"
+      "html": "<p>One plus two is <span id=\"cell-6212702c\"></span>.</p>\n"
     }
   ],
   "cells": [
     {
       "type": "cell",
-      "id": "6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1",
+      "id": "6212702c",
       "inputs": [
         "display"
       ],
diff --git a/test/output/fenced-code.html b/test/output/fenced-code.html
@@ -1,5 +1,5 @@
 <h1 id="fenced-code" tabindex="-1"><a class="observablehq-header-anchor" href="#fenced-code">Fenced code</a></h1>
-<div><div id="cell-fe9e095ef56a9999b1b76d6c863ccf89e19a55bcaa854ffc83a6f4390d151971" class="observablehq observablehq--block"></div>
+<div><div id="cell-fe9e095e" class="observablehq observablehq--block"></div>
 <pre><code class="language-js"><span class="hljs-keyword">function</span> <span class="hljs-title function_">add</span>(<span class="hljs-params">a, b</span>) {
   <span class="hljs-keyword">return</span> a + b;
 }
diff --git a/test/output/fenced-code.json b/test/output/fenced-code.json
@@ -14,15 +14,15 @@
       "type": "html",
       "id": "",
       "cellIds": [
-        "fe9e095ef56a9999b1b76d6c863ccf89e19a55bcaa854ffc83a6f4390d151971"
+        "fe9e095e"
       ],
-      "html": "<div><div id=\"cell-fe9e095ef56a9999b1b76d6c863ccf89e19a55bcaa854ffc83a6f4390d151971\" class=\"observablehq observablehq--block\"></div>\n<pre><code class=\"language-js\"><span class=\"hljs-keyword\">function</span> <span class=\"hljs-title function_\">add</span>(<span class=\"hljs-params\">a, b</span>) {\n  <span class=\"hljs-keyword\">return</span> a + b;\n}\n</code></pre>\n</div>"
+      "html": "<div><div id=\"cell-fe9e095e\" class=\"observablehq observablehq--block\"></div>\n<pre><code class=\"language-js\"><span class=\"hljs-keyword\">function</span> <span class=\"hljs-title function_\">add</span>(<span class=\"hljs-params\">a, b</span>) {\n  <span class=\"hljs-keyword\">return</span> a + b;\n}\n</code></pre>\n</div>"
     }
   ],
   "cells": [
     {
       "type": "cell",
-      "id": "fe9e095ef56a9999b1b76d6c863ccf89e19a55bcaa854ffc83a6f4390d151971",
+      "id": "fe9e095e",
       "outputs": [
         "add"
       ],
diff --git a/test/output/heading-expression.html b/test/output/heading-expression.html
@@ -1 +1 @@
-<h1 id="" tabindex="-1"><a class="observablehq-header-anchor" href="#"><span id="cell-6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1"></span></a></h1>
+<h1 id="" tabindex="-1"><a class="observablehq-header-anchor" href="#"><span id="cell-6212702c"></span></a></h1>
diff --git a/test/output/heading-expression.json b/test/output/heading-expression.json
@@ -8,15 +8,15 @@
       "type": "html",
       "id": "",
       "cellIds": [
-        "6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1"
+        "6212702c"
       ],
-      "html": "<h1 id=\"\" tabindex=\"-1\"><a class=\"observablehq-header-anchor\" href=\"#\"><span id=\"cell-6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1\"></span></a></h1>\n"
+      "html": "<h1 id=\"\" tabindex=\"-1\"><a class=\"observablehq-header-anchor\" href=\"#\"><span id=\"cell-6212702c\"></span></a></h1>\n"
     }
   ],
   "cells": [
     {
       "type": "cell",
-      "id": "6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1",
+      "id": "6212702c",
       "inputs": [
         "display"
       ],
diff --git a/test/output/inline-expression.html b/test/output/inline-expression.html
@@ -1 +1 @@
-<p><span><span id="cell-6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1"></span></span></p>
+<p><span><span id="cell-6212702c"></span></span></p>
diff --git a/test/output/inline-expression.json b/test/output/inline-expression.json
@@ -8,15 +8,15 @@
       "type": "html",
       "id": "",
       "cellIds": [
-        "6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1"
+        "6212702c"
       ],
-      "html": "<p><span><span id=\"cell-6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1\"></span></span></p>\n"
+      "html": "<p><span><span id=\"cell-6212702c\"></span></span></p>\n"
     }
   ],
   "cells": [
     {
       "type": "cell",
-      "id": "6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1",
+      "id": "6212702c",
       "inputs": [
         "display"
       ],
diff --git a/test/output/local-fetch.html b/test/output/local-fetch.html
@@ -1,2 +1,2 @@
 <h1 id="local-fetch" tabindex="-1"><a class="observablehq-header-anchor" href="#local-fetch">Local fetch</a></h1>
-<div id="cell-06e1c6cdea7720eb12226af270c5e547a399e16ef935ababdd364c38c9bce5a2" class="observablehq observablehq--block"></div>
+<div id="cell-06e1c6cd" class="observablehq observablehq--block"></div>
diff --git a/test/output/local-fetch.json b/test/output/local-fetch.json
@@ -19,15 +19,15 @@
       "type": "html",
       "id": "",
       "cellIds": [
-        "06e1c6cdea7720eb12226af270c5e547a399e16ef935ababdd364c38c9bce5a2"
+        "06e1c6cd"
       ],
-      "html": "<div id=\"cell-06e1c6cdea7720eb12226af270c5e547a399e16ef935ababdd364c38c9bce5a2\" class=\"observablehq observablehq--block\"></div>\n"
+      "html": "<div id=\"cell-06e1c6cd\" class=\"observablehq observablehq--block\"></div>\n"
     }
   ],
   "cells": [
     {
       "type": "cell",
-      "id": "06e1c6cdea7720eb12226af270c5e547a399e16ef935ababdd364c38c9bce5a2",
+      "id": "06e1c6cd",
       "inputs": [
         "display"
       ],
diff --git a/test/output/single-quote-expression.html b/test/output/single-quote-expression.html
@@ -1 +1 @@
-<p><span id="cell-08961c063c0b84877be3e5cd4b310f7806a71e4d604bff5b13c9c5a7928d0d05"></span></p>
+<p><span id="cell-08961c06"></span></p>
diff --git a/test/output/single-quote-expression.json b/test/output/single-quote-expression.json
@@ -8,15 +8,15 @@
       "type": "html",
       "id": "",
       "cellIds": [
-        "08961c063c0b84877be3e5cd4b310f7806a71e4d604bff5b13c9c5a7928d0d05"
+        "08961c06"
       ],
-      "html": "<p><span id=\"cell-08961c063c0b84877be3e5cd4b310f7806a71e4d604bff5b13c9c5a7928d0d05\"></span></p>\n"
+      "html": "<p><span id=\"cell-08961c06\"></span></p>\n"
     }
   ],
   "cells": [
     {
       "type": "cell",
-      "id": "08961c063c0b84877be3e5cd4b310f7806a71e4d604bff5b13c9c5a7928d0d05",
+      "id": "08961c06",
       "inputs": [
         "display"
       ],
diff --git a/test/output/template-expression.html b/test/output/template-expression.html
@@ -1 +1 @@
-<p><span id="cell-12fd0aea45b27826bcec2281a57e37b29010d52e97aa08f337539d5125668f56"></span></p>
+<p><span id="cell-12fd0aea"></span></p>
diff --git a/test/output/template-expression.json b/test/output/template-expression.json
@@ -8,15 +8,15 @@
       "type": "html",
       "id": "",
       "cellIds": [
-        "12fd0aea45b27826bcec2281a57e37b29010d52e97aa08f337539d5125668f56"
+        "12fd0aea"
       ],
-      "html": "<p><span id=\"cell-12fd0aea45b27826bcec2281a57e37b29010d52e97aa08f337539d5125668f56\"></span></p>\n"
+      "html": "<p><span id=\"cell-12fd0aea\"></span></p>\n"
     }
   ],
   "cells": [
     {
       "type": "cell",
-      "id": "12fd0aea45b27826bcec2281a57e37b29010d52e97aa08f337539d5125668f56",
+      "id": "12fd0aea",
       "inputs": [
         "display"
       ],
diff --git a/test/output/tex-expression.html b/test/output/tex-expression.html
@@ -1,2 +1,2 @@
-<h1 id="hello%2C" tabindex="-1"><a class="observablehq-header-anchor" href="#hello%2C">Hello, <span id="cell-16447e3a96f2563fbb84c9ce40468a79c45c97665de10c5f9c6a001cb8439fed"></span></a></h1>
-<p>My favorite equation is <span id="cell-828eccc1d657511a4ddb4c407fb5c8b528701ea0703eb0a060fc9351471fc26a"></span>.</p>
+<h1 id="hello%2C" tabindex="-1"><a class="observablehq-header-anchor" href="#hello%2C">Hello, <span id="cell-16447e3a"></span></a></h1>
+<p>My favorite equation is <span id="cell-828eccc1"></span>.</p>
diff --git a/test/output/tex-expression.json b/test/output/tex-expression.json
@@ -8,23 +8,23 @@
       "type": "html",
       "id": "",
       "cellIds": [
-        "16447e3a96f2563fbb84c9ce40468a79c45c97665de10c5f9c6a001cb8439fed"
+        "16447e3a"
       ],
-      "html": "<h1 id=\"hello%2C\" tabindex=\"-1\"><a class=\"observablehq-header-anchor\" href=\"#hello%2C\">Hello, <span id=\"cell-16447e3a96f2563fbb84c9ce40468a79c45c97665de10c5f9c6a001cb8439fed\"></span></a></h1>\n"
+      "html": "<h1 id=\"hello%2C\" tabindex=\"-1\"><a class=\"observablehq-header-anchor\" href=\"#hello%2C\">Hello, <span id=\"cell-16447e3a\"></span></a></h1>\n"
     },
     {
       "type": "html",
       "id": "",
       "cellIds": [
-        "828eccc1d657511a4ddb4c407fb5c8b528701ea0703eb0a060fc9351471fc26a"
+        "828eccc1"
       ],
-      "html": "<p>My favorite equation is <span id=\"cell-828eccc1d657511a4ddb4c407fb5c8b528701ea0703eb0a060fc9351471fc26a\"></span>.</p>\n"
+      "html": "<p>My favorite equation is <span id=\"cell-828eccc1\"></span>.</p>\n"
     }
   ],
   "cells": [
     {
       "type": "cell",
-      "id": "16447e3a96f2563fbb84c9ce40468a79c45c97665de10c5f9c6a001cb8439fed",
+      "id": "16447e3a",
       "inputs": [
         "tex",
         "display"
@@ -34,7 +34,7 @@
     },
     {
       "type": "cell",
-      "id": "828eccc1d657511a4ddb4c407fb5c8b528701ea0703eb0a060fc9351471fc26a",
+      "id": "828eccc1",
       "inputs": [
         "tex",
         "display"

Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,7 @@ function makeHtmlRenderer(root: string, baseRenderer: RenderRule): RenderRule {`
`69`	`69`	`}`
`70`	`70`
`71`	`71`	`function uniqueCodeId(context: ParseContext, content: string): string {`
`72`		`- const hash = String(computeHash(content));`
	`72`	`+ const hash = computeHash(content).slice(0, 8);`
`73`	`73`	`let id = hash;`
`74`	`74`	`let count = 1;`
`75`	`75`	`while (context.pieces.some((piece) => piece.code.some((code) => code.id === id))) {`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<div><span id="cell-6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1"></span></div>`
	`1`	`+<div><span id="cell-6212702c"></span></div>`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<p>$<span id="cell-6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1"></span></p>`
	`1`	`+<p>$<span id="cell-6212702c"></span></p>`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-<p><span id="cell-56e8b37a90d0b07a884e0445fe2495dee259fe3274d2e75aad25488aba87ea41"></span></p>`
	`1`	`+<p><span id="cell-56e8b37a"></span></p>`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`<h1 id="embedded-expression" tabindex="-1"><a class="observablehq-header-anchor" href="#embedded-expression">Embedded expression</a></h1>`
`2`		`-<p>One plus two is <span id="cell-6212702c7a0d68f00b8b23b5aecfca631a96c20d2cad78cd874611ac87cdbce1"></span>.</p>`
	`2`	`+<p>One plus two is <span id="cell-6212702c"></span>.</p>`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`<h1 id="fenced-code" tabindex="-1"><a class="observablehq-header-anchor" href="#fenced-code">Fenced code</a></h1>`
`2`		`-<div><div id="cell-fe9e095ef56a9999b1b76d6c863ccf89e19a55bcaa854ffc83a6f4390d151971" class="observablehq observablehq--block"></div>`
	`2`	`+<div><div id="cell-fe9e095e" class="observablehq observablehq--block"></div>`
`3`	`3`	`<pre><code class="language-js"><span class="hljs-keyword">function</span> <span class="hljs-title function_">add</span>(<span class="hljs-params">a, b</span>) {`
`4`	`4`	`<span class="hljs-keyword">return</span> a + b;`
`5`	`5`	`}`