@tenjuu99/blog 0.1.6 → 0.1.7

package/lib/filter.js

@@ -1,8 +1,7 @@
-import * as helper from '../helper/index.js'
+import helper from '../lib/helper.js'
 import includeFilter from './includeFilter.js'
 import { srcDir } from './dir.js'
 import config from './config.js'
-console.log(config)
 
 /**
  * @param {string} text
@@ -10,19 +9,23 @@ console.log(config)
  * @return {text}
  */
 const replaceVariablesFilter = (text, variables) => {
-  const matched = [...text.matchAll(/{{\s?([\w\d-_\(\)]+)\s?}}/g)]
-  const replace = Object.fromEntries(matched.map(match => [match[1].toLowerCase(), match[0]]))
+  const matched = [...text.matchAll(/(\\)?{{\s?([\w\d\s,-_\(\)]+)\s?}}/g)]
+  const replace = Object.fromEntries(matched.map(match => [match[2].toLowerCase(), {replace: match[0], backslash: match[1]}]))
   let replaced = text
   for (const elm in replace) {
-    const toBeReplace = replace[elm]
-    const toBeReplaceScript = toBeReplace.match(/([\w\d_-]+)\((.+)\)/)
-    if (toBeReplaceScript) {
+    const toBeReplace = replace[elm].replace
+    const toBeReplaceScript = toBeReplace.match(/([\w\d_]+)\((.*)\)/)
+   
+    if (replace[elm].backslash) { // escape variable syntax
+      const removeBackslash = replace[elm].replace.replace(/\\/, '')
+      replaced = replaced.replaceAll(toBeReplace, removeBackslash)
+    } else if (toBeReplaceScript) { // execute helper
       const func = toBeReplaceScript[1]
-      const variable = toBeReplaceScript[2]
+      const args = toBeReplaceScript[2].split(',').map(v => variables[v.trim()] ?? undefined)
       if (!helper[func]) {
-        throw new Exception('helper function is missing. function name: ' + func);
+        throw new Error('helper function is missing. function name: ' + func);
       }
-      const replaceText = helper[func](variables[variable.toLowerCase()])
+      const replaceText = helper[func].call(null, ...args)
       replaced = replaced.replaceAll(toBeReplace, replaceText)
     } else {
       replaced = replaced.replaceAll(toBeReplace, variables[elm])
@@ -129,13 +132,7 @@ const replaceScriptFilter = async (text, variables) => {
     }
   })
   for (const script of scripts) {
-    let helperMerged = {...helper}
-    // env.HELPER が定義されていれば追加ヘルパーとして扱う
-    if (config.helper) {
-      const additional = await import(`${srcDir}/${config.helper}`)
-      helperMerged = Object.assign(helperMerged, additional)
-    }
-    let result = new Function('helper', 'variables', script.script)(helperMerged, variables)
+    let result = new Function('helper', 'variables', script.script)(helper, variables)
     if (result instanceof Promise) {
       result = await result
     }

package/lib/helper.js

@@ -0,0 +1,12 @@
+import * as helperDefault from '../helper/index.js'
+import config from './config.js'
+import { srcDir } from './dir.js'
+
+let helper = {...helperDefault}
+
+if (config['helper']) {
+  const helperAdditional = await import(`${srcDir}/${config.helper}`)
+  helper = Object.assign(helper, helperAdditional)
+}
+
+export default helper

package/lib/render.js

@@ -16,6 +16,7 @@ const render = async (templateName, data) => {
   markdown = await includeFilter(markdown)
   markdown = await replaceIfFilter(markdown, data)
   markdown = await replaceScriptFilter(markdown, data)
+  markdown = replaceVariablesFilter(markdown, data)
   data.markdown = data.__filetype === 'md' ? marked.parse(markdown) : markdown
 
   return replaceVariablesFilter(template, data)

package/package.json

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

package/src-sample/pages/sample.md

@@ -113,7 +113,7 @@ return variables.someVariable
 {/script}
 ```
 
-## 追加ヘルパー
+## ヘルパー
 
 ヘルパー関数を作成します。
 ```
@@ -132,14 +132,10 @@ HELPER=helper/index.js
 追加したヘルパーを利用できます。
 <pre>
 // src-sample/pages/sample.md
-&lt;script type="ssg">
-return helper.additionalHelper()
-&lt;/script>
+\{{ additionalHelper() }}
 </pre>
 
 実際に出力させると次の行のとおりです。
 ```
-<script type="ssg">
-return helper.additionalHelper()
-</script>
+{{additionalHelper()}}
 ```