improved regex code snippet capturing FIXES #19

Author: alidcast

lib/content/page.js

@@ -36,17 +36,24 @@ export default function prepPage (meta, options) {
       return cached.permalink
     },
 
-    get anchors () {
+    get anchors () { // TODO only for markdown files!
       if (!cached.anchors) {
         const level = options.anchorsLevel
-        const anchorsExp = new RegExp(`(#{${level + 1},})|#{${level}}(.*)`, 'g')
+
+        const anchorsExp = new RegExp([
+          '(`{3}[\\s\\S]*?`{3}|`{1}[^`].*?`{1}[^`])',   // code snippet
+          `(#{${level + 1},})`,                         // other heading
+          `#{${level}}(.*)`,                            // heading text
+        ].join('|'), 'g')
+
         let result
         let anchors = []
         while (result = anchorsExp.exec(source)) {
-          let [match, otherLevel, capturedHeading] = result
-          if (!otherLevel && capturedHeading) {
-            const anchor = `#${paramCase(capturedHeading)}`
-            anchors.push([anchor, capturedHeading])
+          let [match, codeSnippet, otherHeading, headingText] = result
+          if (!(codeSnippet || otherHeading) && headingText) {
+            console.log('headng: ' + headingText)
+            const anchor = `#${paramCase(headingText)}`
+            anchors.push([anchor, headingText])
           }
         }
         cached.anchors = anchors

lib/loader.js

@@ -18,13 +18,17 @@ const mdCompParser = (mdParser) => {
 
 const mdComponent = (source, moduleOpts, dirOpts) => {
   const { srcPath, sitePath, componentsDir, parsers } = moduleOpts
-  // captures code or markdown component  -- '@[]' or '@[]()'
-  const compExp = /(`{3}[a-z]*\n[\s\S]*?\n`{3})|(`{1}.*?`{1})|@\[(.*?)\](?:\((.*?)\))?/g
+
+  const compExp = new RegExp([
+    '(`{3}[\\s\\S]*?`{3}|`{1}[^`].*?`{1}[^`])',  // code snippet
+    '@\\[(.*?)\\](?:\\((.*?)\\))?',              // markdown component - '@[]' or '@[]()'
+  ].join('|'), 'g')
+
   let result
   const comps = {}
   while (result = compExp.exec(source)) {
-    let [match, inlineCode, codeBlock, name, props] = result
-    if (!inlineCode && !codeBlock) {
+    let [match, codeSnippet, name, props] = result
+    if (!codeSnippet) {
       const compName = uppercamelcase(paramCase(name))
       if (!comps[compName]) {
         const basePath = join(sitePath, componentsDir, '/')