refactor(cli): optimize md parser (#1068)

google · Jan 8, 2025 · 828c7eb · 828c7eb
1 parent 3798607
commit 828c7eb
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 21 deletions.
diff --git a/src/cli.ts b/src/cli.ts
@@ -219,39 +219,42 @@ export function injectGlobalRequire(origin: string) {
 export function transformMarkdown(buf: Buffer | string): string {
   const source = buf.toString()
   const output = []
+  const tabRe = /^(  +|\t)/
+  const codeBlockRe =
+    /^(?<fence>(`{3,20}|~{3,20}))(?:(?<js>(js|javascript|ts|typescript))|(?<bash>(sh|shell|bash))|.*)$/
   let state = 'root'
   let codeBlockEnd = ''
   let prevLineIsEmpty = true
-  const jsCodeBlock = /^(```{1,20}|~~~{1,20})(js|javascript|ts|typescript)$/
-  const shCodeBlock = /^(```{1,20}|~~~{1,20})(sh|shell|bash)$/
-  const otherCodeBlock = /^(```{1,20}|~~~{1,20})(.*)$/
   for (const line of source.split(/\r?\n/)) {
     switch (state) {
       case 'root':
-        if (/^( {4}|\t)/.test(line) && prevLineIsEmpty) {
+        if (tabRe.test(line) && prevLineIsEmpty) {
           output.push(line)
           state = 'tab'
-        } else if (jsCodeBlock.test(line)) {
-          output.push('')
+          continue
+        }
+        const { fence, js, bash } = line.match(codeBlockRe)?.groups || {}
+        if (!fence) {
+          prevLineIsEmpty = line === ''
+          output.push('// ' + line)
+          continue
+        }
+        codeBlockEnd = fence
+        if (js) {
           state = 'js'
-          codeBlockEnd = line.match(jsCodeBlock)![1]
-        } else if (shCodeBlock.test(line)) {
-          output.push('await $`')
-          state = 'bash'
-          codeBlockEnd = line.match(shCodeBlock)![1]
-        } else if (otherCodeBlock.test(line)) {
           output.push('')
-          state = 'other'
-          codeBlockEnd = line.match(otherCodeBlock)![1]
+        } else if (bash) {
+          state = 'bash'
+          output.push('await $`')
         } else {
-          prevLineIsEmpty = line === ''
-          output.push('// ' + line)
+          state = 'other'
+          output.push('')
         }
         break
       case 'tab':
         if (line === '') {
           output.push('')
-        } else if (/^( +|\t)/.test(line)) {
+        } else if (tabRe.test(line)) {
           output.push(line)
         } else {
           output.push('// ' + line)

diff --git a/src/core.ts b/src/core.ts
@@ -13,11 +13,11 @@
 // limitations under the License.
 
 import {
-  type StdioOptions,
+  type ChildProcess,
   type IOType,
+  type StdioOptions,
   spawn,
   spawnSync,
-  type ChildProcess,
 } from 'node:child_process'
 import { type Encoding } from 'node:crypto'
 import { type AsyncHook, AsyncLocalStorage, createHook } from 'node:async_hooks'

diff --git a/test/cli.test.js b/test/cli.test.js
@@ -338,14 +338,32 @@ describe('cli', () => {
 # Title
     
 ~~~js
-await $\`echo "tilde"\`
+await $\`echo "js"\`
+~~~
+
+typescript code block
+~~~~~ts
+await $\`echo "ts"\`
+~~~~~
+
+~~~
+unknown code block
 ~~~
 
 `), `// 
 // # Title
 //     
 
-await $\`echo "tilde"\`
+await $\`echo "js"\`
+
+// 
+// typescript code block
+
+await $\`echo "ts"\`
+
+// 
+
+// unknown code block
 
 // 
 // `)