posthtml-component 1.0.0-beta.13 → 1.0.0-beta.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "posthtml-component",
-  "version": "1.0.0-beta.13",
+  "version": "1.0.0-beta.15",
   "description": "PostHTML Components Blade-like with slots, attributes as props and custom tag",
   "license": "MIT",
   "repository": "thewebartisan7/posthtml-components",

package/src/index.js

@@ -120,7 +120,6 @@ module.exports = (options = {}) => tree => {
   });
 
   options.props = {...options.expressions.locals};
-  options.aware = {};
 
   const pushedContent = {};
 
@@ -142,11 +141,11 @@ module.exports = (options = {}) => tree => {
  * @param  {Object} options Plugin options
  * @return {Object} PostHTML tree
  */
+let processCounter = 0;
+
 function processTree(options) {
   const filledSlots = {};
 
-  // let processCounter = 0;
-
   return function (tree) {
     if (options.plugins.length > 0) {
       tree = applyPluginsToTree(tree, options.plugins);
@@ -163,7 +162,7 @@ function processTree(options) {
         return currentNode;
       }
 
-      // console.log(`${++processCounter}) Processing component ${componentPath}`);
+      console.log(`${++processCounter}) Processing "${currentNode.tag}" component from "${componentPath}"`);
 
       // log(currentNode, 'currentNode');
 
@@ -171,7 +170,11 @@ function processTree(options) {
 
       // Set filled slots
       setFilledSlots(currentNode, filledSlots, options);
-      // setFilledSlots(nextNode, filledSlots, options);
+
+      // Reset options.aware when new nested start
+      if (processCounter === 1) {
+        options.aware = {};
+      }
 
       // Reset options.expressions.locals and keep aware locals
       options.expressions.locals = {...options.props, ...options.aware};
@@ -207,15 +210,8 @@ function processTree(options) {
 
       processAttributes(currentNode, attributes, props, options);
 
-      // log(currentNode, 'currentNode', 'currentNode')
-      // currentNode.attrs.counter = processCounter;
-      // currentNode.attrs.data = JSON.stringify({ attributes, props });
-
-      // messages.push({
-      //   type: 'dependency',
-      //   file: componentPath,
-      //   from: options.root
-      // });
+      // Reset counter
+      processCounter = 0;
 
       return currentNode;
     });

package/src/process-attributes.js

@@ -9,6 +9,8 @@ const union = require('lodash/union');
 const each = require('lodash/each');
 const has = require('lodash/has');
 const extend = require('lodash/extend');
+const isString = require('lodash/isString');
+const isObject = require('lodash/isObject');
 
 /**
  * Map component attributes that it's not defined as props to first element of node
@@ -65,6 +67,8 @@ module.exports = (currentNode, attributes, props, options) => {
   each(nodeAttrs, (value, key) => {
     if (['undefined', 'null'].includes(value)) {
       delete nodeAttrs[key];
+    } else if (key !== 'compose' && !isObject(nodeAttrs[key]) && !isString(nodeAttrs[key])) {
+      nodeAttrs[key] = nodeAttrs[key].toString();
     }
   });