Merge pull request #6 from InDIOS/development

Bump to version 0.1.2

CHANGELOG.md

@@ -1,3 +1,13 @@
+0.1.2
+- Added default include pattern to every file with extension html in rollup plugin.
+- Added a validator property to component attributes definition.
+- Component plugins are store globally now.
+- Ignore html files inside node_modules folder by default in cli mode.
+- Fixed bug in output path in cli mode.
+
+0.1.1
+- Fixed issue with file location in cli mode.
+
 0.1.0
 - Added ability to work with `SVG` elements.
 - Added ability to iterate over number and range with `$for` attribute.

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "trebor",
-	"version": "0.1.1",
+	"version": "0.1.2",
 	"description": "A node js module to make standalone web components.",
 	"main": "./build/index.js",
 	"bin": {
@@ -30,13 +30,13 @@
 		"html-entities": "^1.2.1",
 		"html-tag-names": "^1.1.3",
 		"loader-utils": "^1.1.0",
-		"parse5": "^5.0.0",
+		"parse5": "^5.1.0",
 		"rollup-pluginutils": "^2.3.1",
 		"svg-tag-names": "^1.1.1",
 		"tslib": "^1.9.3",
 		"typescript": "^3.0.1",
 		"uglify-es": "^3.3.9",
-		"uglify-js": "^3.4.6",
+		"uglify-js": "^3.4.7",
 		"yargs": "^12.0.1"
 	},
 	"devDependencies": {
@@ -48,7 +48,7 @@
 		"@types/glob": "^5.0.35",
 		"@types/html-entities": "^1.2.16",
 		"@types/html-tag-names": "^1.1.0",
-		"@types/node": "^10.5.7",
+		"@types/node": "^10.7.1",
 		"@types/parse5": "^5.0.0",
 		"@types/uglify-js": "^3.0.3",
 		"eslint-plugin-html": "^4.0.5",

plugin.js

@@ -6,7 +6,7 @@ const { kebabToCamelCases, capitalize } = require('./build/utilities/tools');
 
 module.exports = function ({ include, exclude, comments }) {
   const format = 'es';
-  const filter = createFilter(include, exclude);
+	const filter = createFilter(include || './**/*.html', exclude);
   return {
     name: 'rollup-plugin-trebor',
     transform(code, id) {

src/index.ts

@@ -48,7 +48,7 @@ function compileFile(options: CompilerOptions) {
   options.moduleName = options.moduleName || moduleName;
 	const fileName = `${file}.${options.format}.js`;
   if (!options.out) {
-		options.out = join(dir, fileName);
+    options.out = dir;
   }
   const { compilerOptions, uglifyOptions } = getOptions(options);
   const {imports, source} = genSource(html, options);
@@ -198,10 +198,8 @@ export default function cli(options: CompilerOptions) {
     compileFile(options);
   } else if (info.isDirectory()) {
     glob(`${options.input}/**/*.html`, (err, files) => {
-      if (err) {
-        throw err;
-      }
-      files.forEach(file => {
+      if (err) throw err;
+      files.filter(f => !f.includes('node_modules')).forEach(file => {
         compileFile({ ...options, ...{ input: file } });
       });
     });

tools/index.ts

@@ -15,8 +15,9 @@ interface DirectiveDefObject {
 }
 
 interface AttrDefinition {
-	required?: boolean;
+  required?: boolean;
 	type: string | Function;
+  validator?(value: any): boolean;
 	default?: AttrTypes | (() => AttrTypes | Object);
 }
 
@@ -89,7 +90,7 @@ export function _$CompCtr(attrs: AttrParams, template: TemplateFn, options: Comp
 	const opts: ComponentOptions = self.$options;
 	if (!opts.attrs) opts.attrs = {};
 	if (!opts.children) opts.children = {};
-	_$e(<{ options: ObjectLike<any>, fn: PluginFn }[]>_$CompCtr['_plugins'], (plugin) => {
+	_$e(<{ options: ObjectLike<any>, fn: PluginFn }[]>window['__trebor_plugins__'], (plugin) => {
 		plugin.fn.call(self, _$CompCtr, plugin.options);
 	});
 	if (opts.filters) _$assign(self.$filters, opts.filters);
@@ -108,12 +109,19 @@ export function _$CompCtr(attrs: AttrParams, template: TemplateFn, options: Comp
 						if (value === void 0 && _$hasProp(attrOps, 'default')) {
 							const def = (<AttrDefinition>attrOps).default;
 							value = _$isType(def, 'function') ? (<Function>def)() : def;
-						}
+            }
 						const typ = (<AttrDefinition>attrOps).type;
             if (typ && !_$isType(value, typ) && (<AttrDefinition>attrOps).required) {
-							return console.error(`Attribute '${key}' must be type '${typ}'.`);
-						}
-						return _$toType(value, value === void 0 ? 'undefined' : typ, self, <string>key);
+              return console.error(`Attribute '${key}' must be type '${typ}'.`);
+            }
+            value = _$toType(value, value === void 0 ? 'undefined' : typ, self, <string>key);
+            if (_$hasProp(attrOps, 'validator')) {
+              const validator = (<AttrDefinition>attrOps).validator;
+              if (_$isType(validator, 'function') && !validator(value)) {
+                return console.error(`Attribute '${key}' with value '${JSON.stringify(value)}' is not valid.`);
+              }
+            }
+						return value;
 					}
 				}
 			},
@@ -171,8 +179,8 @@ export function _$CompCtr(attrs: AttrParams, template: TemplateFn, options: Comp
 	});
 }
 export function _$plugin(fn: Function, options?: ObjectLike<any>) {
-	_$CompCtr['_plugins'] = _$CompCtr['_plugins'] || [];
-	_$CompCtr['_plugins'].push({ options, fn });
+	window['__trebor_plugins__'] = window['__trebor_plugins__'] || [];
+	window['__trebor_plugins__'].push({ options, fn });
 }
 _$assign(_$CompCtr.prototype, {
 	$get(path: string) {