posthtml-component 1.0.0-beta.1 → 1.0.0-beta.3

package/changelog.md

@@ -1,48 +1,3 @@
-## 1.0.0-beta.1 (2022-10-20)
-
-* Added examples ([60a86fd](https://github.com/thewebartisan7/posthtml-components/commit/60a86fd))
-* Added support for works with the same extends and modules syntax together with x-tag for easy migrat ([d5f665e](https://github.com/thewebartisan7/posthtml-components/commit/d5f665e))
-* Allow to check if slot is defined via slots locals ([05582e6](https://github.com/thewebartisan7/posthtml-components/commit/05582e6))
-* Apply expressions to initial tree and set nextNode after expression process ([112ccde](https://github.com/thewebartisan7/posthtml-components/commit/112ccde))
-* Aware locals ([c78d53b](https://github.com/thewebartisan7/posthtml-components/commit/c78d53b))
-* Before new ([4dc77d7](https://github.com/thewebartisan7/posthtml-components/commit/4dc77d7))
-* Build examples script ([8fedbcc](https://github.com/thewebartisan7/posthtml-components/commit/8fedbcc))
-* Check shorthand block name ([d87b379](https://github.com/thewebartisan7/posthtml-components/commit/d87b379))
-* Cleaner find-path.js and more readme about namespace ([e15411d](https://github.com/thewebartisan7/posthtml-components/commit/e15411d))
-* Complete refactor WIP ([45f00f5](https://github.com/thewebartisan7/posthtml-components/commit/45f00f5))
-* Computed attributes ([049f153](https://github.com/thewebartisan7/posthtml-components/commit/049f153))
-* Default slots without slot ([3fe6368](https://github.com/thewebartisan7/posthtml-components/commit/3fe6368))
-* Examples site and docs ([9b853e6](https://github.com/thewebartisan7/posthtml-components/commit/9b853e6))
-* Fix and enhance parseLocals ([b89c90a](https://github.com/thewebartisan7/posthtml-components/commit/b89c90a))
-* Fix hardcoded slot tag name ([6f83229](https://github.com/thewebartisan7/posthtml-components/commit/6f83229))
-* Fix merge attributes ([da41fdb](https://github.com/thewebartisan7/posthtml-components/commit/da41fdb))
-* Fix parse attributes ([8321415](https://github.com/thewebartisan7/posthtml-components/commit/8321415))
-* Fix tests ([252aa45](https://github.com/thewebartisan7/posthtml-components/commit/252aa45))
-* Fix typo readme ([03f2e2f](https://github.com/thewebartisan7/posthtml-components/commit/03f2e2f))
-* Initial commit ([ec6eae5](https://github.com/thewebartisan7/posthtml-components/commit/ec6eae5))
-* More readme ([b5d9f86](https://github.com/thewebartisan7/posthtml-components/commit/b5d9f86))
-* More readme ([2201df2](https://github.com/thewebartisan7/posthtml-components/commit/2201df2))
-* More tests ([5ebaee4](https://github.com/thewebartisan7/posthtml-components/commit/5ebaee4))
-* More tests ([2163943](https://github.com/thewebartisan7/posthtml-components/commit/2163943))
-* Nested component tested ([8a1d117](https://github.com/thewebartisan7/posthtml-components/commit/8a1d117))
-* Nested testing ([44a6154](https://github.com/thewebartisan7/posthtml-components/commit/44a6154))
-* Push once and prepend ([1cfe598](https://github.com/thewebartisan7/posthtml-components/commit/1cfe598))
-* Readme ([96ff607](https://github.com/thewebartisan7/posthtml-components/commit/96ff607))
-* Readme ([4c8e4b8](https://github.com/thewebartisan7/posthtml-components/commit/4c8e4b8))
-* Readme ([5e7b754](https://github.com/thewebartisan7/posthtml-components/commit/5e7b754))
-* Readme update ([c02a781](https://github.com/thewebartisan7/posthtml-components/commit/c02a781))
-* Readme update ([66a6213](https://github.com/thewebartisan7/posthtml-components/commit/66a6213))
-* Readme update ([6ccf1ab](https://github.com/thewebartisan7/posthtml-components/commit/6ccf1ab))
-* Readme updated ([3c5ac7e](https://github.com/thewebartisan7/posthtml-components/commit/3c5ac7e))
-* Remove comments ([9f4216f](https://github.com/thewebartisan7/posthtml-components/commit/9f4216f))
-* Shorthands slot names and other enhancements ([a091cc2](https://github.com/thewebartisan7/posthtml-components/commit/a091cc2))
-* Slot is fill and fill is slot ([fc4283c](https://github.com/thewebartisan7/posthtml-components/commit/fc4283c))
-* Slot locals ([6d4b3dc](https://github.com/thewebartisan7/posthtml-components/commit/6d4b3dc))
-* Split in multiple files ([9f660c7](https://github.com/thewebartisan7/posthtml-components/commit/9f660c7))
-* Unique default slot name from filename ([25259ef](https://github.com/thewebartisan7/posthtml-components/commit/25259ef))
-* update ([827fe7f](https://github.com/thewebartisan7/posthtml-components/commit/827fe7f))
-* Update readme ([19ef893](https://github.com/thewebartisan7/posthtml-components/commit/19ef893))
-* Update readme ([42fa034](https://github.com/thewebartisan7/posthtml-components/commit/42fa034))
-
-
+## 1.0.0-beta.2 (2022-10-20)
 
+* First beta release

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "posthtml-component",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.3",
   "description": "PostHTML Components Blade-like with slots, attributes as props and custom tag",
   "license": "MIT",
   "repository": "thewebartisan7/posthtml-components",
@@ -26,7 +26,6 @@
     "deepmerge": "^4.2.2",
     "posthtml-attrs-parser": "^0.1.1",
     "posthtml-expressions": "^1.9.0",
-    "posthtml-match-helper": "^1.0.3",
     "posthtml-parser": "^0.11.0",
     "posthtml-render": "^3.0.0",
     "style-to-object": "^0.3.0"
@@ -46,6 +45,7 @@
     "markdown-it-toc-done-right": "^4.2.0",
     "posthtml": "^0.16.6",
     "posthtml-beautify": "^0.7.0",
+    "posthtml-include": "^1.7.4",
     "posthtml-markdownit": "^1.3.0",
     "xo": "^0.37.1"
   }

package/readme.md

@@ -11,7 +11,7 @@
 ## Installation
 
 ```bash
-npm i -D posthtml-components
+npm i -D posthtml-component
 ```
 
 ## Introduction

package/src/index.js

@@ -65,9 +65,6 @@ module.exports = (options = {}) => tree => {
   }
 
   options.roots = Array.isArray(options.folders) ? options.folders : [options.folders];
-  // options.roots.forEach((root, index) => {
-  //   options.roots[index] = path.resolve(options.root, root);
-  // });
   options.namespaces = Array.isArray(options.namespaces) ? options.namespaces : [options.namespaces];
   options.namespaces.forEach((namespace, index) => {
     options.namespaces[index].root = path.resolve(namespace.root);
@@ -109,6 +106,10 @@ function processTree(options) {
   let processCounter = 0;
 
   return function (tree) {
+    if (options.plugins.length > 0) {
+      tree = applyPluginsToTree(tree, options.plugins);
+    }
+
     match.call(tree, options.matcher, currentNode => {
       if (!currentNode.attrs) {
         currentNode.attrs = {};
@@ -149,6 +150,10 @@ function processTree(options) {
       // const plugins = [...options.plugins, expressions(options.expressions)];
       nextNode = expressions(options.expressions)(nextNode);
 
+      if (options.plugins.length > 0) {
+        nextNode = applyPluginsToTree(nextNode, options.plugins);
+      }
+
       // Process <yield> tag
       const content = match.call(nextNode, {tag: options.yield}, nextNode => {
         // Fill <yield> with current node content or default <yield> content or empty
@@ -183,3 +188,10 @@ function processTree(options) {
     return tree;
   };
 }
+
+function applyPluginsToTree(tree, plugins) {
+  return plugins.reduce((tree, plugin) => {
+    tree = plugin(tree);
+    return tree;
+  }, tree);
+}

package/test/templates/components/component-with-include.html

@@ -0,0 +1 @@
+<div><include src="components/included-file.html"></include></div>

package/test/templates/components/component-with-module.html

@@ -0,0 +1 @@
+<module href="/components/module.html"><p>Module file</p></module>

package/test/templates/components/included-file.html

@@ -0,0 +1 @@
+<p>Included file</p>

package/test/test-plugins.js

@@ -1,9 +1,9 @@
 'use strict';
 
-// const test = require('ava');
-// const plugin = require('../src');
-// const posthtml = require('posthtml');
-// const clean = html => html.replace(/(\n|\t)/g, '').trim();
+const test = require('ava');
+const plugin = require('../src');
+const posthtml = require('posthtml');
+const clean = html => html.replace(/(\n|\t)/g, '').trim();
 
 // test('Must work with posthtml-extend syntax', async t => {
 //   const actual = `<extends src="layouts/extend.html"><block name="content">My Content</block></extends>`;
@@ -31,3 +31,22 @@
 //
 //   t.is(html, expected);
 // });
+
+test('Must include file using posthtml-include', async t => {
+  const actual = `<component src="components/component-with-include.html"></component>`;
+  const expected = `<div><p>Included file</p></div>`;
+
+  const html = await posthtml([plugin({root: './test/templates', tag: 'component', attribute: 'src', plugins: [require('posthtml-include')({root: './test/templates', encoding: 'utf8'})]})]).process(actual).then(result => clean(result.html));
+
+  t.is(html, expected);
+});
+
+// Unfortunately it's not working
+// test('Must include file using posthtml-modules', async t => {
+//   const actual = `<component src="components/component-with-module.html"></component>`;
+//   const expected = `<div><p>Module file</p></div>`;
+//
+//   const html = await posthtml([plugin({root: './test/templates', tag: 'component', attribute: 'src', plugins: [require('posthtml-modules')({root: './test/templates'})]})]).process(actual).then(result => clean(result.html));
+//
+//   t.is(html, expected);
+// });