From 6895df7e9f8239e27c1603c0006f3f443a09e889 Mon Sep 17 00:00:00 2001
From: Eric Chen <airkro@qq.com>
Date: Sat, 25 Nov 2023 14:48:57 +0800
Subject: [PATCH] refactor: fetch

---
 lib/ast.mjs                    |  20 ++++---------
 lib/fetch.mjs                  |  18 ++++++++++++
 lib/utils.mjs                  |  50 ++++++++++-----------------------
 test/output.mjs                |  32 +++++++++------------
 test/snapshots/output.mjs.md   |  32 ++++++++++-----------
 test/snapshots/output.mjs.snap | Bin 2579 -> 2577 bytes
 6 files changed, 69 insertions(+), 83 deletions(-)
 create mode 100644 lib/fetch.mjs

diff --git a/lib/ast.mjs b/lib/ast.mjs
index f520d07..44f106e 100644
--- a/lib/ast.mjs
+++ b/lib/ast.mjs
@@ -1,15 +1,9 @@
 function attrString(attr) {
-  const buff = [];
-
-  for (const [name, value] of Object.entries(attr)) {
-    buff.push(`${name}="${value}"`);
-  }
-
-  if (buff.length === 0) {
-    return '';
-  }
-
-  return ` ${buff.join(' ')}`;
+  return attr
+    ? Object.entries(attr)
+        .map(([name, value]) => `${name}="${value}"`)
+        .join(' ')
+    : '';
 }
 
 // eslint-disable-next-line consistent-return
@@ -20,9 +14,7 @@ function stringifier(buff, doc) {
     }
     case 'tag': {
       // eslint-disable-next-line no-param-reassign
-      buff += `<${doc.name}${doc.attr ? attrString(doc.attr) : ''}${
-        doc.void ? ' />' : '>'
-      }`;
+      buff += `<${doc.name} ${attrString(doc.attr)}${doc.void ? ' />' : '>'}`;
 
       if (doc.void) {
         return buff;
diff --git a/lib/fetch.mjs b/lib/fetch.mjs
new file mode 100644
index 0000000..35a1d40
--- /dev/null
+++ b/lib/fetch.mjs
@@ -0,0 +1,18 @@
+import nodeFetch from 'node-fetch';
+
+export function httpPost({ url, body, headers }) {
+  return nodeFetch(url, {
+    method: 'POST',
+    body,
+    headers: {
+      ...headers,
+      'Content-Type': 'text/plain',
+    },
+  }).then(async (response) => {
+    if (!response.ok) {
+      throw new Error(await response.text());
+    }
+
+    return response.arrayBuffer();
+  });
+}
diff --git a/lib/utils.mjs b/lib/utils.mjs
index b55c0d1..01b142b 100644
--- a/lib/utils.mjs
+++ b/lib/utils.mjs
@@ -1,9 +1,10 @@
 import { readFileSync } from 'node:fs';
 
 import { parse } from 'markdown-code-block-meta';
-import nodeFetch from 'node-fetch';
 import pMemoize from 'p-memoize';
 
+import { httpPost } from './fetch.mjs';
+
 export function isKroki(alias = []) {
   return ({ type, lang, meta, value }) => {
     return (
@@ -16,52 +17,31 @@ export function isKroki(alias = []) {
   };
 }
 
-const fail = readFileSync(new URL('fail.svg', import.meta.url), 'utf8');
+const failImage = new URL('fail.svg', import.meta.url);
 
-function createFailImageBuffer(message) {
-  return Buffer.from(fail.replace('======', message.slice(0, 500)));
+function createFailImage(message) {
+  return readFileSync(failImage, 'utf8').replace(
+    '======',
+    message.slice(0, 500),
+  );
 }
 
-function Fetch({ server, headers = {}, type, value }) {
-  return nodeFetch(`${server}/${type}/svg`, {
-    method: 'POST',
+function Fetch({ server, headers, type, value }) {
+  return httpPost({
+    url: `${server}/${type}/svg`,
     body: value,
-    headers: {
-      ...headers,
-      'Content-Type': 'text/plain',
-    },
+    headers,
   })
-    .then(
-      (response) => {
-        if (!response.ok || response.statusCode >= 400) {
-          if (response.statusCode === 404) {
-            return 'Error: 404';
-          }
-
-          return response.text();
-        }
-
-        return response.arrayBuffer();
-      },
-      (error) => `Error: ${error.message}`,
-    )
-    .then((data) =>
-      typeof data === 'string'
-        ? createFailImageBuffer(data)
-        : Buffer.from(data),
-    );
+    .catch((error) => createFailImage(error.message))
+    .then((data) => Buffer.from(data));
 }
 
 export const mime = 'image/svg+xml';
 
-function base64Url(base64) {
-  return `data:${mime};base64,${base64}`;
-}
-
 export function toDataURL(buffer) {
   const base64 = buffer.toString('base64');
 
-  return base64Url(base64);
+  return `data:${mime};base64,${base64}`;
 }
 
 export const fetchData = pMemoize(Fetch, {
diff --git a/test/output.mjs b/test/output.mjs
index 52c5a48..111b0df 100644
--- a/test/output.mjs
+++ b/test/output.mjs
@@ -6,25 +6,21 @@ test.before((t) => {
   t.timeout(1000 ** 3);
 });
 
+const source = `
+\`\`\`kroki type=plantuml
+  A --> B
+\`\`\`
+`;
+
 function macro(t, { output }) {
-  return TransformSnapshot(
-    t,
-    `
-  \`\`\`kroki type=plantuml
-    A --> B
-  \`\`\`
-  `,
-    {
-      server: 'https://kroki.io',
-      output,
-    },
-  );
+  return TransformSnapshot(t, source, {
+    server: 'https://kroki.io',
+    output,
+  });
 }
 
-test('inline-svg', macro, { output: 'inline-svg' });
-
-test('img-base64', macro, { output: 'img-base64' });
+const mode = ['inline-svg', 'img-base64', 'img-html-base64', 'object-base64'];
 
-test('img-html-base64', macro, { output: 'img-html-base64' });
-
-test('object-base64', macro, { output: 'object-base64' });
+for (const output of mode) {
+  test(output, macro, { output });
+}
diff --git a/test/snapshots/output.mjs.md b/test/snapshots/output.mjs.md
index c1053d6..c73ef34 100644
--- a/test/snapshots/output.mjs.md
+++ b/test/snapshots/output.mjs.md
@@ -9,10 +9,10 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `␊
-      \`\`\`kroki type=plantuml␊
-        A --> B␊
-      \`\`\`␊
-      `
+    \`\`\`kroki type=plantuml␊
+      A --> B␊
+    \`\`\`␊
+    `
 
 > Snapshot 2
 
@@ -43,10 +43,10 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `␊
-      \`\`\`kroki type=plantuml␊
-        A --> B␊
-      \`\`\`␊
-      `
+    \`\`\`kroki type=plantuml␊
+      A --> B␊
+    \`\`\`␊
+    `
 
 > Snapshot 2
 
@@ -87,10 +87,10 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `␊
-      \`\`\`kroki type=plantuml␊
-        A --> B␊
-      \`\`\`␊
-      `
+    \`\`\`kroki type=plantuml␊
+      A --> B␊
+    \`\`\`␊
+    `
 
 > Snapshot 2
 
@@ -121,10 +121,10 @@ Generated by [AVA](https://avajs.dev).
 > Snapshot 1
 
     `␊
-      \`\`\`kroki type=plantuml␊
-        A --> B␊
-      \`\`\`␊
-      `
+    \`\`\`kroki type=plantuml␊
+      A --> B␊
+    \`\`\`␊
+    `
 
 > Snapshot 2
 
diff --git a/test/snapshots/output.mjs.snap b/test/snapshots/output.mjs.snap
index 4c5224c7478003428c1344858587fe10cea006f4..fa68fd85dee422652c61fa530955598de1751723 100644
GIT binary patch
literal 2577
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

literal 2579
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