@vituum/vite-plugin-latte 0.1.9 → 0.1.12

package/README.md

@@ -4,6 +4,8 @@
 # ⚡️☕ ViteLatte
 
 ```js
+import latte from '@vituum/vite-plugin-latte'
+
 export default {
   plugins: [
     latte({
@@ -16,12 +18,22 @@ export default {
       tags: {},
       globals: {
           template: 'playground/templates/Layout/Main.latte'
+      },
+      data: '*.json',
+      isStringFilter: undefined,
+      filetypes: {
+          html: /.(json.html|latte.json.html|latte.html)$/,
+          json: /.(json.latte.html)$/
       }
     })
   ]
 }
 ```
 
+Read the [docs](https://vituum.dev/config/integrations-options.html#vituum-latte) to learn more about the plugin options.
+
+## Basic usage
+
 ```html
 <!-- index.html -->
 <script type="application/json">
@@ -31,9 +43,22 @@ export default {
   }
 </script>
 ```
+or
+```html
+<!-- index.latte.html with index.latte.json -->
+{$title}
+```
+or
+```html
+<!-- index.latte.html or index.latte.json.html  -->
+{
+  "template": "path/to/template.latte",
+  "title": "Hello world"
+}
+```
 
 ### Requirements
 
 - [Node.js LTS (16.x)](https://nodejs.org/en/download/)
-- [NPM (8.x)](https://www.npmjs.com/package/npm) or [Yarn (2.x)](https://yarnpkg.com/)
 - [PHP (8.x)](https://www.php.net/) or [Docker PHP (8.x)](https://hub.docker.com/_/php)
+- [Vite](https://vitejs.dev/) or [Vituum](https://vituum.dev/)

package/handler.js

@@ -1,9 +1,12 @@
 import { resolve } from 'path'
 
 const vite = (await import(resolve(process.cwd(), 'vite.config.js'))).default
-const params = JSON.parse(process.argv[2])
-const name = params[0]
+let params = JSON.parse(process.argv[4])
+const name = process.argv[2]
+const type = process.argv[3]
 
-params.shift()
+params = params.map(value => Buffer.from(value, 'base64').toString('utf-8'))
 
-vite.plugins.filter(({ name }) => name === '@vituum/vite-plugin-latte')[0]._params.filters[name](...params)
+const output = await vite.plugins.filter(({ name }) => name === '@vituum/vite-plugin-latte')[0]._params[type][name](...params)
+
+console.log(Buffer.from(output.toString(), 'utf-8').toString('base64'))

package/index.js

@@ -1,12 +1,15 @@
-import { extname, resolve, dirname } from 'path'
+import { resolve, dirname } from 'path'
 import { fileURLToPath } from 'url'
 import fs from 'fs'
 import process from 'node:process'
 import * as childProcess from 'child_process'
 import FastGlob from 'fast-glob'
 import lodash from 'lodash'
+import chalk from 'chalk'
 
 const defaultParams = {
+    reload: true,
+    root: null,
     bin: 'php',
     filters: {},
     functions: {},
@@ -84,23 +87,26 @@ const latte = (params = {}) => {
         _params: params,
         name: '@vituum/vite-plugin-latte',
         config: ({ root }) => {
-            params.root = root
+            if (!params.root) {
+                params.root = root
+            }
         },
         transformIndexHtml: {
             enforce: 'pre',
             async transform(content, { path, filename, server }) {
+                path = path.replace('?raw', '')
+                filename = filename.replace('?raw', '')
+
+                const start = new Date()
+
                 if (
                     !params.filetypes.html.test(path) &&
                     !params.filetypes.json.test(path) &&
-                    !content.startsWith('<script type="application/json"')
+                    !content.startsWith('<script type="application/json" data-format="latte"')
                 ) {
                     return content
                 }
 
-                if (content.startsWith('<script type="application/json"') && !content.includes('data-format="latte"')) {
-                    return content
-                }
-
                 if (typeof params.isStringFilter === 'function' && params.isStringFilter(filename)) {
                     params.isString = true
                 } else {
@@ -108,17 +114,22 @@ const latte = (params = {}) => {
                 }
 
                 const renderLatte = renderTemplate(path, params, content)
+                const warningLog = renderLatte.output.includes('Warning: Undefined')
 
-                if (renderLatte.error) {
+                console.info(`${chalk.cyan('@vituum/vite-plugin-latte')} ${chalk.green(`finished in ${chalk.grey(new Date() - start + 'ms')}`)}`)
+
+                if (renderLatte.error || warningLog) {
                     if (!server) {
                         console.error(renderLatte.output)
                         return
                     }
 
+                    const message = warningLog ? 'Warning: Undefined' + renderLatte.output.split('Warning: Undefined').pop() : renderLatte.output
+
                     server.ws.send({
                         type: 'error',
                         err: {
-                            message: renderLatte.output,
+                            message,
                             plugin: '@vituum/vite-plugin-latte'
                         }
                     })
@@ -130,7 +141,10 @@ const latte = (params = {}) => {
             }
         },
         handleHotUpdate({ file, server }) {
-            if (extname(file) === '.latte' || extname(file) === '.html' || extname(file) === '.json') {
+            if (
+                (typeof params.reload === 'function' && params.reload(file)) ||
+                (typeof params.reload === 'boolean' && params.reload && (params.filetypes.html.test(file) || params.filetypes.json.test(file)))
+            ) {
                 server.ws.send({ type: 'full-reload' })
             }
         }

package/index.php

@@ -32,12 +32,12 @@ define("PACKAGE_DIR", str_replace($config->cwd, ROOT_DIR, $config->packageRoot))
 /**
  * @throws JsonException
  */
-function NodeHandler($name, ...$params) : string {
-    array_unshift($params, $name);
+function NodeHandler($name, $type, ...$params) : string {
+	$params = array_map(static function($value) { return base64_encode((string)$value); }, $params);
 
-    exec('node '. PACKAGE_DIR .'/handler.js ' . json_encode(json_encode($params, JSON_THROW_ON_ERROR), JSON_THROW_ON_ERROR), $output);
+	exec('node '. PACKAGE_DIR .'/handler.js ' . $name . ' ' . $type .' ' . json_encode(json_encode($params, JSON_HEX_QUOT | JSON_HEX_TAG), JSON_THROW_ON_ERROR), $output);
 
-    return $output[0] ?? $params[1];
+	return base64_decode($output[0] ?? '') ?? $params[1];
 }
 
 if (!file_exists(__DIR__ . '/temp') && !mkdir($concurrentDirectory = __DIR__ . '/temp') && !is_dir($concurrentDirectory)) {
@@ -127,7 +127,7 @@ foreach ($config->filters  as $filter => $path) {
         $latte->addFilter($filter, 'App\Latte\\' . ucfirst($filter) . 'Filter::execute');
     } elseif (!$isDocker) {
         $latte->addFilter($filter, function (...$params) use ($filter) : string {
-            return NodeHandler($filter, ...$params);
+            return NodeHandler($filter, 'filters', ...$params);
         });
     }
 }
@@ -138,7 +138,7 @@ foreach ($config->functions  as $function => $path) {
         $latte->addFunction($function, 'App\Latte\\' . ucfirst($function) . 'Function::execute');
     }  elseif (!$isDocker) {
         $latte->addFunction($function, function (...$params) use ($function) : string {
-            return NodeHandler($function, ...$params);
+            return NodeHandler($function, 'functions', ...$params);
         });
     }
 }

package/latte/AssetFilter.php

@@ -6,6 +6,6 @@ class AssetFilter
 {
     public static function execute($source): string
     {
-        return $source;
+        return str_starts_with($source, 'http') ? $source : str_replace("/src/", "/", $source);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vituum/vite-plugin-latte",
-  "version": "0.1.9",
+  "version": "0.1.12",
   "type": "module",
   "main": "index.js",
   "scripts": {
@@ -10,11 +10,12 @@
   },
   "dependencies": {
     "fast-glob": "^3.2.11",
-    "lodash": "^4.17.21"
+    "lodash": "^4.17.21",
+    "chalk": "^5.0.1"
   },
   "devDependencies": {
-    "vite": "^3.0.4",
-    "eslint": "^8.21.0",
+    "vite": "^3.0.9",
+    "eslint": "^8.23.0",
     "eslint-config-standard": "^17.0.0"
   },
   "files": [