@tenjuu99/blog 0.3.0 → 0.3.1

package/lib/cssGenerator.js

@@ -11,6 +11,9 @@ import config from './config.js'
 let cacheBuster = {}
 const cacheBusterQuery = 't'
 
+// 正規表現をモジュールレベルでキャッシュ
+const CSS_LINK_REGEXP = /\${([\w-_/]+\.css)<<([\w-_/,.]+\.css)}/g
+
 /**
  * @param {string} src
  * @param {string} dist
@@ -51,7 +54,7 @@ const cssGenerator = async (src, dist) => {
  * @return {string}
  */
 const applyCss = async (text) => {
-  const target = [...text.matchAll(/\${([\w-_/]+\.css)<<([\w-_/,.]+\.css)}/g)].map(val => {
+  const target = [...text.matchAll(CSS_LINK_REGEXP)].map(val => {
     return { matched: val[0], dist: val[1], src: val[2] }
   })
   for (const cssDist of target) {

package/lib/filter.js

@@ -1,5 +1,12 @@
 import helper from '../lib/helper.js'
 
+// 正規表現をモジュールレベルでキャッシュ
+const IF_REGEXP = /(\{|\<)if\s(?<condition>[\s\S]+?)(}|>)(?<content>[\s\S]*?)((\{|\<)else(\}|\>)(?<elsecontent>[\s\S]*?))?(\{|\<)\/if(\>|})/g
+const SCRIPT_REGEXP = /({script}|\<script\s.*type="ssg".*>)(?<script>[\s\S]*?)(\{\/script}|\<\/script>)/g
+const CONDITION_SEGMENTS_REGEXP = /(?<left>[\S]+)\s(?<operator>!=|==)\s(?<right>[\S]+)/
+const FUNCTION_CALL_REGEXP = /([\w]+)\((.*)\)/
+const FUNCTION_ARG_REGEXP = /^(['"])?\s*([\w]+)(["'])?$/
+
 /**
  * @param {string} condition
  * @params {object} variables
@@ -7,7 +14,7 @@ import helper from '../lib/helper.js'
  */
 const ifConditionEvaluator = (condition, variables) => {
   if (condition.includes('=')) {
-    const segmented = condition.match(/(?<left>[\S]+)\s(?<operator>!=|==)\s(?<right>[\S]+)/)
+    const segmented = condition.match(CONDITION_SEGMENTS_REGEXP)
     let {left, operator, right} = segmented.groups
     if (variables.hasOwnProperty(left)) {
       left = variables[left]
@@ -34,14 +41,14 @@ const ifConditionEvaluator = (condition, variables) => {
         return left != right
     }
   } else {
-    const match = condition.match(/([\w]+)\((.*)\)/)
+    const match = condition.match(FUNCTION_CALL_REGEXP)
     if (match) {
       const func = match[1]
       if (helper[func] instanceof Function) {
         let args = match[2].trim()
         if (args) {
           args = args.split(',').map(arg => {
-            const match = arg.match(/^(['"])?\s*([\w]+)(["'])?$/)
+            const match = arg.match(FUNCTION_ARG_REGEXP)
             if (match) {
               return match[1] ? `${match[2]}` : variables[match[2]]
             }
@@ -64,8 +71,7 @@ const ifConditionEvaluator = (condition, variables) => {
  * @returns {string}
  */
 const replaceIfFilter = (text, variables) => {
-  const ifRegexp = new RegExp(/(\{|\<)if\s(?<condition>[\s\S]+?)(}|>)(?<content>[\s\S]*?)((\{|\<)else(\}|\>)(?<elsecontent>[\s\S]*?))?(\{|\<)\/if(\>|})/g)
-  const matched = [...text.matchAll(ifRegexp)]
+  const matched = [...text.matchAll(IF_REGEXP)]
   for (const item of matched) {
     const target = item[0]
     const content = item.groups.content
@@ -83,8 +89,7 @@ const replaceIfFilter = (text, variables) => {
 
 const replaceScriptFilter = async (text, variables) => {
   let replaced = text
-  const scriptRegexp = new RegExp(/({script}|\<script\s.*type="ssg".*>)(?<script>[\s\S]*?)(\{\/script}|\<\/script>)/g)
-  const scripts = [...text.matchAll(scriptRegexp)].map((matched) => {
+  const scripts = [...text.matchAll(SCRIPT_REGEXP)].map((matched) => {
     return {
       replace: matched[0],
       script: matched.groups.script.trim("\n"),

package/lib/includeFilter.js

@@ -4,11 +4,12 @@ import { staticFile } from './files.js'
 
 const alreadyLoaded = {}
 
-const includeRegexp = new RegExp(/\{\s*include\('(template|css)\/([\w\./-]+)'\)\s*\}/g)
+// 正規表現をモジュールレベルでキャッシュ
+const INCLUDE_REGEXP = /\{\s*include\('(template|css)\/([\w\./-]+)'\)\s*\}/g
 
 const includeFilter = (text) => {
   let replaced = text
-  const include = [...text.matchAll(includeRegexp)].map(matched => {
+  const include = [...text.matchAll(INCLUDE_REGEXP)].map(matched => {
     return { toBeReplace: matched[0], type: matched[1], filename: matched[2] }
   })
   if (include.length === 0) {
@@ -27,7 +28,7 @@ const includeFilter = (text) => {
         throw new Error(cacheKey + ' is invalid')
       }
       // include を再帰的に解決する
-      if (content.match(includeRegexp)) {
+      if (content.match(INCLUDE_REGEXP)) {
         content = includeFilter(content)
       }
       alreadyLoaded[cacheKey] = content

package/lib/pageData.js

@@ -1,15 +1,18 @@
 "use strict"
 import config from './config.js'
 
+// 正規表現をモジュールレベルでキャッシュ
+const FRONTMATTER_REGEXP = /^(<!|-)--(?<variables>[\s\S]*?)--(-|>)/
+const METADATA_KEY_REGEXP = /^([a-zA-Z\d_-]+):/
+
 const makePageData = (filename, content) => {
   const [name, ext] = filename.split('.')
   return parse(content, name, ext)
 }
 
 const parse = (content, name, ext) => {
-  const regexp = new RegExp(/^(<!|-)--(?<variables>[\s\S]*?)--(-|>)/)
-  const matched = content.match(regexp)
-  const markdownReplaced = content.replace(regexp, '')
+  const matched = content.match(FRONTMATTER_REGEXP)
+  const markdownReplaced = content.replace(FRONTMATTER_REGEXP, '')
   const fullUrl = (data) => {
     const base = data.url_base + (data.relative_path ?? '')
     let url = data.url
@@ -64,7 +67,7 @@ const parseMetaData = (data) => {
   let key, value
   for (const line of data.split('\n')) {
     if (!isStringContinue) {
-      const match = line.match(/^([a-zA-Z\d_-]+):/)
+      const match = line.match(METADATA_KEY_REGEXP)
       if (match) {
         key = match[1]
         value = line.slice(line.indexOf(':') + 1).trim()

package/lib/replaceVariablesFilter.js

@@ -1,5 +1,8 @@
 import helper from './helper.js'
 
+// 正規表現をモジュールレベルでキャッシュ
+const VARIABLE_REGEXP = /(\\)?{{[\s]*([^{}]+)[\s]*}}/g
+
 /**
  * テキストに含まれる変数を一括変換する
  * ヘルパー処理もここで行われる
@@ -9,7 +12,7 @@ import helper from './helper.js'
  * @return {text}
  */
 const replaceVariablesFilter = (text, variables) => {
-  const matched = [...text.matchAll(/(\\)?{{[\s]*([^{}]+)[\s]*}}/g)]
+  const matched = [...text.matchAll(VARIABLE_REGEXP)]
   const replace = Object.fromEntries(matched.map(match => [match[0], {variableName: match[2].trim().toLowerCase(), backslash: !!match[1]}]))
   let replaced = text
   for (const elm in replace) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tenjuu99/blog",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "blog template",
   "main": "index.js",
   "scripts": {