From 34eb9866e9be34c7c7b32da97a26b0a0771f8e4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lubom=C3=ADr=20Bla=C5=BEek?= <lubomir.blazek@newlogic.cz>
Date: Thu, 25 Aug 2022 15:38:31 +0200
Subject: [PATCH] feat: refactor and cleanup

---
 LICENSE      | 21 ++++++++++++++++
 README.md    | 15 +++++++++++-
 index.js     | 67 ++++++++++++++++++++++++++++++++--------------------
 package.json |  4 ++--
 4 files changed, 78 insertions(+), 29 deletions(-)
 create mode 100644 LICENSE

diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..af58372
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Vituum
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/README.md b/README.md
index bde898f..6444f98 100644
--- a/README.md
+++ b/README.md
@@ -4,26 +4,38 @@
 # ⚡️🌱 ViteTwig
 
 ```js
+import twig from '@vituum/vite-plugin-twig'
+
 export default {
   plugins: [
     twig({
+      reload: true,
+      root: null,
       filters: {},
       functions: {},
       extensions: [],
       namespaces: {}, 
-      data: '*.json',
       globals: {
           template: 'path/to/template.twig'
       },
+      data: '*.json',
       filetypes: {
           html: /.(json.html|twig.json.html|twig.html)$/,
           json: /.(json.twig.html)$/
+      },
+      twig: {
+          compileOptions: {},
+          renderOptions: {}
       }
     })
   ]
 }
 ```
 
+Read the [docs](https://vituum.dev/config/integrations-options.html#vituum-twig) to learn more about plugin options
+
+## Basic usage
+
 ```html
 <!-- index.html -->
 <script type="application/json" data-format="twig">
@@ -50,3 +62,4 @@ or
 ### Requirements
 
 - [Node.js LTS (16.x)](https://nodejs.org/en/download/)
+- [Vite](https://vitejs.dev/) or [Vituum](https://vituum.dev/)
diff --git a/index.js b/index.js
index f5749f0..0cfa813 100644
--- a/index.js
+++ b/index.js
@@ -1,4 +1,4 @@
-import { dirname, extname, resolve, relative } from 'path'
+import { dirname, resolve, relative } from 'path'
 import fs from 'fs'
 import process from 'node:process'
 import FastGlob from 'fast-glob'
@@ -9,15 +9,21 @@ import { fileURLToPath } from 'url'
 
 const { name } = JSON.parse(fs.readFileSync(resolve(dirname((fileURLToPath(import.meta.url))), 'package.json')).toString())
 const defaultOptions = {
+    reload: true,
+    root: null,
     filters: {},
     functions: {},
     extensions: [],
-    globals: {},
     namespaces: {},
+    globals: {},
     data: '',
     filetypes: {
         html: /.(json.html|twig.json.html|twig.html)$/,
         json: /.(json.twig.html)$/
+    },
+    twig: {
+        compileOptions: {},
+        renderOptions: {}
     }
 }
 
@@ -37,7 +43,23 @@ function processData(paths, data = {}) {
 
 const renderTemplate = async(filename, content, options) => {
     const output = {}
-    const context = processData(options.data, options.globals)
+    const context = options.data ? processData(options.data, options.globals) : options.globals
+
+    const isJson = filename.endsWith('.json.html') || filename.endsWith('.json')
+    const isHtml = filename.endsWith('.html') && !filename.endsWith('.json.html')
+
+    if (isJson || isHtml) {
+        lodash.merge(context, isHtml ? content : JSON.parse(fs.readFileSync(filename).toString()))
+
+        content = '{% include template %}'
+        filename = options.root + '/'
+
+        context.template = relative(process.cwd(), context.template).startsWith(relative(process.cwd(), options.root)) ? resolve(process.cwd(), context.template) : resolve(options.root, context.template)
+
+        context.template = relative(options.root, context.template)
+    } else if (fs.existsSync(filename + '.json')) {
+        lodash.merge(context, JSON.parse(fs.readFileSync(filename + '.json').toString()))
+    }
 
     Twig.cache(false)
 
@@ -65,27 +87,13 @@ const renderTemplate = async(filename, content, options) => {
         Twig.extendFilter(name, options.filters[name])
     })
 
-    if (
-        filename.endsWith('.json.html') ||
-        filename.endsWith('.json')
-    ) {
-        lodash.merge(context, JSON.parse(fs.readFileSync(filename).toString()))
-
-        content = '{% include template %}'
-        filename = options.root
-
-        context.template = relative(process.cwd(), context.template)
-    } else if (fs.existsSync(filename + '.json')) {
-        lodash.merge(context, JSON.parse(fs.readFileSync(filename + '.json').toString()))
-    }
-
-    output.content = await Twig.twig({
+    output.content = await Twig.twig(Object.assign({
         allowAsync: true,
         data: content,
         path: filename,
         namespaces: options.namespaces,
         rethrow: true
-    }).renderAsync(context).catch((error) => {
+    }, options.twig.compileOptions)).renderAsync(context, options.twig.renderOptions).catch((error) => {
         output.error = error
     })
 
@@ -98,7 +106,9 @@ const plugin = (options = {}) => {
     return {
         name,
         config: ({ root }) => {
-            options.root = root
+            if (!options.root) {
+                options.root = root
+            }
         },
         transformIndexHtml: {
             enforce: 'pre',
@@ -106,13 +116,17 @@ const plugin = (options = {}) => {
                 if (
                     !options.filetypes.html.test(path) &&
                     !options.filetypes.json.test(path) &&
-                    !content.startsWith('<script type="application/json"')
+                    !content.startsWith('<script type="application/json" data-format="twig"')
                 ) {
                     return content
                 }
 
-                if (content.startsWith('<script type="application/json"') && !content.includes('data-format="twig"')) {
-                    return content
+                if (content.startsWith('<script type="application/json" data-format="twig"')) {
+                    const matches = content.matchAll(/<script\b[^>]*data-format="(?<format>[^>]+)"[^>]*>(?<data>[\s\S]+?)<\/script>/gmi)
+
+                    for (const match of matches) {
+                        content = JSON.parse(match.groups.data)
+                    }
                 }
 
                 const render = await renderTemplate(filename, content, options)
@@ -130,15 +144,16 @@ const plugin = (options = {}) => {
                             plugin: name
                         }
                     })
-
-                    return '<html style="background: #222"><head></head><body></body></html>'
                 }
 
                 return render.content
             }
         },
         handleHotUpdate({ file, server }) {
-            if (extname(file) === '.twig' || extname(file) === '.html' || extname(file) === '.json') {
+            if (
+                (typeof options.reload === 'function' && options.reload(file)) ||
+                (options.reload && (options.filetypes.html.test(file) || options.filetypes.json.test(file)))
+            ) {
                 server.ws.send({ type: 'full-reload' })
             }
         }
diff --git a/package.json b/package.json
index cf4f6a8..30406e8 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@vituum/vite-plugin-twig",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "type": "module",
   "main": "index.js",
   "dependencies": {
@@ -10,7 +10,7 @@
     "fast-glob": "^3.2.11"
   },
   "devDependencies": {
-    "eslint": "^8.21.0",
+    "eslint": "^8.22.0",
     "eslint-config-standard": "^17.0.0"
   },
   "files": [