feat(markdown): allow omitting start or end of import code lines range

Author: meteorlxy

packages/@vuepress/markdown/__tests__/plugins/importCodePlugin.spec.ts

@@ -62,16 +62,24 @@ ${mdFixtureContent}\
     it('should import partial lines', () => {
       const source = `\
 @[code{1-2}](${jsFixturePathRelative})
+@[code{1-}](${jsFixturePathRelative})
 @[code{4-5}](${mdFixturePathRelative})
+@[code{-5}](${mdFixturePathRelative})
 `
 
       const expected = `\
 <pre><code class="language-js">\
 ${jsFixtureContent.split('\n').slice(0, 2).join('\n')}\
 </code></pre>
+<pre><code class="language-js">\
+${jsFixtureContent.split('\n').slice(0).join('\n')}\
+</code></pre>
 <pre><code class="language-md">\
 ${mdFixtureContent.split('\n').slice(3, 5).join('\n')}\
 </code></pre>
+<pre><code class="language-md">\
+${mdFixtureContent.split('\n').slice(0, 5).join('\n')}\
+</code></pre>
 `
 
       const md = MarkdownIt().use(importCodePlugin)
@@ -81,7 +89,12 @@ ${mdFixtureContent.split('\n').slice(3, 5).join('\n')}\
       const rendered = md.render(source, env)
 
       expect(rendered).toEqual(expected)
-      expect(env.importedFiles).toEqual([jsFixturePath, mdFixturePath])
+      expect(env.importedFiles).toEqual([
+        jsFixturePath,
+        jsFixturePath,
+        mdFixturePath,
+        mdFixturePath,
+      ])
     })
   })
 

packages/@vuepress/markdown/src/plugins/importCodePlugin/createImportCodeBlockRule.ts

@@ -10,7 +10,7 @@ const MIN_LENGTH = 9
 const START_CODES = [64, 91, 99, 111, 100, 101]
 
 // regexp to match the import syntax
-const SYNTAX_RE = /^@\[code(?:{(?:(\d+)-(\d+))})?(?: ([^\]]+))?\]\(([^)]*)\)/
+const SYNTAX_RE = /^@\[code(?:{(?:(\d+)?-(\d+)?)})?(?: ([^\]]+))?\]\(([^)]*)\)/
 
 export const createImportCodeBlockRule = ({
   handleImportPath = (str) => str,
@@ -50,8 +50,8 @@ export const createImportCodeBlockRule = ({
 
   const meta: ImportCodeTokenMeta = {
     importPath: handleImportPath(importPath),
-    lineStart: Number.parseInt(lineStart || '0', 10),
-    lineEnd: Number.parseInt(lineEnd || '0', 10),
+    lineStart: lineStart ? Number.parseInt(lineStart, 10) : 0,
+    lineEnd: lineEnd ? Number.parseInt(lineEnd, 10) : undefined,
   }
 
   // create a import_code token

packages/@vuepress/markdown/src/plugins/importCodePlugin/resolveImportCode.ts

@@ -34,19 +34,12 @@ export const resolveImportCode = (
   // read file content
   const fileContent = fs.readFileSync(importFilePath).toString()
 
-  if (lineStart < 1 || lineEnd < 1 || lineStart > lineEnd) {
-    return {
-      importFilePath,
-      importCode: fileContent,
-    }
-  }
-
   // resolve partial import
   return {
     importFilePath,
     importCode: fileContent
       .split('\n')
-      .slice(lineStart - 1, lineEnd)
+      .slice(lineStart ? lineStart - 1 : lineStart, lineEnd)
       .join('\n'),
   }
 }

packages/@vuepress/markdown/src/plugins/importCodePlugin/types.ts

@@ -1,5 +1,5 @@
 export interface ImportCodeTokenMeta {
   importPath: string
   lineStart: number
-  lineEnd: number
+  lineEnd?: number
 }