fix: apply handleHTML to cached HTML data (#124)

Co-authored-by: Kent C. Dodds <[email protected]>

Author: mono0x

src/__tests__/index.ts

@@ -277,6 +277,37 @@ test('handleHTML gets null', async () => {
   )
 })
 
+test('handleHTML works when requests are cached', async () => {
+  const myCache = new Map()
+  const transformer = getTransformer()
+  const getHTMLMock = transformer.getHTML as Mock
+  await (
+    await import('remark')
+  )
+    .remark()
+    .use(remarkEmbedder, {cache: myCache, transformers: [transformer]})
+    .use((await import('remark-html')).default, {sanitize: false})
+    .process('https://some-site.com')
+
+  expect(getHTMLMock).toHaveBeenCalledTimes(1)
+  getHTMLMock.mockClear()
+
+  const handleHTML = vi.fn(html => `<div>${html}</div>`)
+  const result = await (
+    await import('remark')
+  )
+    .remark()
+    .use(remarkEmbedder, {cache: myCache, transformers: [transformer], handleHTML})
+    .use((await import('remark-html')).default, {sanitize: false})
+    .process(`[https://some-site.com](https://some-site.com)`)
+
+  expect(result.toString()).toMatchInlineSnapshot(
+    `<div><iframe src="https://some-site.com/"></iframe></div>`,
+  )
+
+  expect(getHTMLMock).not.toHaveBeenCalled()
+})
+
 test('can handle errors', async () => {
   consoleError.mockImplementationOnce(() => {})
   const transformer = getTransformer({

src/index.ts

@@ -129,26 +129,26 @@ const remarkEmbedder: Plugin<[RemarkEmbedderOptions]> = ({
           const cacheKey = `remark-embedder:${transformer.name}:${url}`
           let html: GottenHTML | undefined = await cache?.get(cacheKey)
 
-          if (!html) {
-            try {
+          try {
+            if (!html) {
               html = await transformer.getHTML(url, config)
               html = html?.trim() ?? null
               await cache?.set(cacheKey, html)
+            }
 
-              // optional handleHTML transform function
-              if (handleHTML) {
-                html = await handleHTML(html, {url, transformer, config})
-                html = html?.trim() ?? null
-              }
-            } catch (e: unknown) {
-              if (handleError) {
-                const error = e as Error
-                console.error(`${errorMessageBanner}\n\n${error.message}`)
-                html = await handleError({error, url, transformer, config})
-                html = html?.trim() ?? null
-              } else {
-                throw e
-              }
+            // optional handleHTML transform function
+            if (handleHTML) {
+              html = await handleHTML(html, {url, transformer, config})
+              html = html?.trim() ?? null
+            }
+          } catch (e: unknown) {
+            if (handleError) {
+              const error = e as Error
+              console.error(`${errorMessageBanner}\n\n${error.message}`)
+              html = await handleError({error, url, transformer, config})
+              html = html?.trim() ?? null
+            } else {
+              throw e
             }
           }