Escape {{ after the rehype phase instead of during the remark phase (#…

…1704)
NullVoxPopuli · Mar 11, 2024 · 3cb1179 · 3cb1179
1 parent ae7e596
commit 3cb1179
Show file tree

Hide file tree

Showing 6 changed files with 132 additions and 39 deletions.
diff --git a/packages/ember-repl/addon/src/compile/formats/markdown.ts b/packages/ember-repl/addon/src/compile/formats/markdown.ts
@@ -49,26 +49,6 @@ const ALLOWED_LANGUAGES = ['gjs', 'hbs'] as const;
 type AllowedLanguage = (typeof ALLOWED_LANGUAGES)[number];
 type RelevantCode = Omit<Code, 'lang'> & { lang: AllowedLanguage };
 
-const escapeCurlies = (node: Text | Parent) => {
-  if ('value' in node && node.value) {
-    node.value = node.value.replace(/{{/g, '\\{{');
-  }
-
-  if ('children' in node && node.children) {
-    node.children.forEach((child) => escapeCurlies(child as Parent));
-  }
-
-  if (!node.data) {
-    return;
-  }
-
-  if ('hChildren' in node.data && Array.isArray(node.data['hChildren'])) {
-    node.data['hChildren'].forEach(escapeCurlies);
-
-    return;
-  }
-};
-
 function isLive(meta: string) {
   return meta.includes('live');
 }
@@ -218,6 +198,24 @@ function liveCodeExtraction(options: Options = {}) {
   };
 }
 
+function sanitizeForGlimmer(/* options */) {
+  return (tree: Parent) => {
+    visit(tree, 'element', (node: Parent) => {
+      if ('tagName' in node) {
+        if (node.tagName !== 'pre') return;
+
+        visit(node, 'text', (textNode: Text) => {
+          if ('value' in textNode && textNode.value) {
+            textNode.value = textNode.value.replace(/{{/g, '\\{{');
+          }
+        });
+
+        return 'skip';
+      }
+    });
+  };
+}
+
 function buildCompiler(options: ParseMarkdownOptions) {
   let compiler = unified().use(remarkParse).use(remarkGfm);
 
@@ -261,9 +259,6 @@ function buildCompiler(options: ParseMarkdownOptions) {
       let properties = (node as any).properties;
 
       if (properties?.[GLIMDOWN_PREVIEW]) {
-        // Have to sanitize anything Glimmer could try to render
-        escapeCurlies(node as Parent);
-
         return 'skip';
       }
 
@@ -274,8 +269,6 @@ function buildCompiler(options: ParseMarkdownOptions) {
           return;
         }
 
-        escapeCurlies(node as Parent);
-
         return 'skip';
       }
 
@@ -314,6 +307,8 @@ function buildCompiler(options: ParseMarkdownOptions) {
     });
   });
 
+  compiler = compiler.use(sanitizeForGlimmer);
+
   // Finally convert to string! oofta!
   compiler = compiler.use(rehypeStringify, {
     collapseEmptyAttributes: true,

diff --git a/packages/ember-repl/test-app/app/app.ts b/packages/ember-repl/test-app/app/app.ts
@@ -10,7 +10,8 @@ import config from 'test-app/config/environment';
 // But they aren't used.... so.. that's fun.
 Object.assign(window, {
   process: { env: {} },
-  Buffer: {},
+  // Polyfilled in webpack
+  // Buffer: {},
 });
 
 export default class App extends Application {

diff --git a/packages/ember-repl/test-app/ember-cli-build.js b/packages/ember-repl/test-app/ember-cli-build.js
@@ -51,6 +51,7 @@ module.exports = function (defaults) {
         resolve: {
           fallback: {
             path: 'path-browserify',
+            buffer: require.resolve('buffer/'),
           },
         },
       },

diff --git a/packages/ember-repl/test-app/package.json b/packages/ember-repl/test-app/package.json
@@ -25,7 +25,9 @@
     "lint:prettier": "pnpm -w exec lint prettier"
   },
   "dependencies": {
+    "@shikijs/rehype": "^1.1.7",
     "@types/unist": "^3.0.2",
+    "buffer": "^6.0.3",
     "common-tags": "^1.8.2",
     "ember-repl": "workspace:*",
     "ember-resources": "^7.0.0",

diff --git a/packages/ember-repl/test-app/tests/unit/markdown-test.ts b/packages/ember-repl/test-app/tests/unit/markdown-test.ts
@@ -1,5 +1,6 @@
 import { module, test } from 'qunit';
 
+import rehypeShiki from '@shikijs/rehype';
 import { stripIndent } from 'common-tags';
 import { invocationOf, nameFor } from 'ember-repl';
 import { parseMarkdown } from 'ember-repl/formats/markdown';
@@ -10,13 +11,7 @@ import { visit } from 'unist-util-visit';
  *       indentation are stripped
  */
 function assertOutput(actual: string, expected: string) {
-  let _actual = actual
-    .split('\n')
-    .filter(Boolean)
-    .join('\n')
-    .trim()
-    .replace(/<div class="glimdown-render">/, '')
-    .replace(/<\/div>/, '');
+  let _actual = actual.split('\n').filter(Boolean).join('\n').trim();
   let _expected = expected.split('\n').filter(Boolean).join('\n').trim();
 
   QUnit.assert.equal(_actual, _expected);
@@ -60,7 +55,7 @@ module('Unit | parseMarkdown()', function () {
         <h1>Title</h1>
 
         <div class=\"glimdown-snippet relative\"><pre><code class=\"language-js\">  const two = 2;
-        </code></pre><CopyMenu />
+        </code></pre><CopyMenu /></div>
       `
     );
 
@@ -178,6 +173,38 @@ module('Unit | parseMarkdown()', function () {
 
       assert.deepEqual(result.blocks, []);
     });
+
+    test('rehypePlugins retain {{ }} escaping', async function () {
+      let result = await parseMarkdown(
+        stripIndent`
+        # Title
+
+        \`\`\`gjs
+        const two = 2
+
+        <template>
+          {{two}}
+        </template>
+        \`\`\`
+      `,
+        {
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+          rehypePlugins: [[rehypeShiki as any, { theme: 'github-dark' }]],
+        }
+      );
+
+      assertOutput(
+        result.templateOnlyGlimdown,
+        `<h1>Title</h1>
+<div class="glimdown-snippet relative"><pre class="shiki github-dark" style="background-color:#24292e;color:#e1e4e8" tabindex="0"><code><span class="line"><span style="color:#F97583">const</span><span style="color:#79B8FF"> two</span><span style="color:#F97583"> =</span><span style="color:#79B8FF"> 2</span></span>
+<span class="line"></span>
+<span class="line"><span style="color:#E1E4E8">&#x3C;</span><span style="color:#85E89D">template</span><span style="color:#E1E4E8">></span></span>
+<span class="line"><span style="color:#F97583">  \\{{</span><span style="color:#79B8FF">two</span><span style="color:#F97583">}}</span></span>
+<span class="line"><span style="color:#E1E4E8">&#x3C;/</span><span style="color:#85E89D">template</span><span style="color:#E1E4E8">></span></span>
+<span class="line"></span></code></pre></div>
+        `
+      );
+    });
   });
 
   module('hbs', function () {
@@ -199,7 +226,7 @@ module('Unit | parseMarkdown()', function () {
         stripIndent`
           <h1>Title</h1>
 
-          ${invocationOf(name)}
+          <div class=\"glimdown-render\">${invocationOf(name)}</div>
         `
       );
 
@@ -232,7 +259,7 @@ module('Unit | parseMarkdown()', function () {
           <h1>Title</h1>
 
           <div class=\"glimdown-snippet relative\"><pre><code class=\"language-gjs\">  const two = 2;
-          </code></pre><CopyMenu />
+          </code></pre><CopyMenu /></div>
         `
       );
 
@@ -255,7 +282,7 @@ module('Unit | parseMarkdown()', function () {
         stripIndent`
           <h1>Title</h1>
 
-          ${invocationOf(name)}
+          <div class=\"glimdown-render\">${invocationOf(name)}</div>
         `
       );
 
@@ -268,6 +295,34 @@ module('Unit | parseMarkdown()', function () {
       ]);
     });
 
+    test('Code with preview fence has {{ }} tokens escaped', async function () {
+      let result = await parseMarkdown(stripIndent`
+        # Title
+
+        \`\`\`gjs
+        const two = 2
+
+        <template>
+          {{two}}
+        </template>
+        \`\`\`
+      `);
+
+      assertOutput(
+        result.templateOnlyGlimdown,
+        stripIndent`
+          <h1>Title</h1>
+
+          <div class=\"glimdown-snippet relative\"><pre><code class=\"language-gjs\">const two = 2
+
+          &#x3C;template>
+            \\{{two}}
+          &#x3C;/template>
+          </code></pre></div>
+        `
+      );
+    });
+
     test('Can invoke a component again when defined in a live fence', async function (assert) {
       let snippet = `const two = 2`;
       let name = nameFor(snippet);
@@ -285,7 +340,7 @@ module('Unit | parseMarkdown()', function () {
         stripIndent`
           <h1>Title</h1>
 
-          ${invocationOf(name)}
+          <div class=\"glimdown-render\">${invocationOf(name)}</div>
           <Demo />
         `
       );
@@ -319,7 +374,7 @@ module('Unit | parseMarkdown()', function () {
         stripIndent`
           <p>hi</p>
 
-          ${invocationOf(name)}
+          <div class=\"glimdown-render\">${invocationOf(name)}</div>
           <div class=\"glimdown-snippet relative\"><pre><code class=\"language-gjs\">import Component from '@glimmer/component';
           import { on } from '@ember/modifier';
           &#x3C;template>

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml