nodester 0.2.3 → 0.2.5

package/lib/tools/nql.tool.js

@@ -5,41 +5,54 @@
 
 'use strict';
 
+// Arguments validator.
+const { ensure } = require('nodester/validators/arguments');
+
 
 module.exports = {
-	toAST_ModelsTreeNode: _toAST_ModelsTreeNode
+	AST_ModelsTree: _AST_ModelsTree,
+	AST_ModelsTreeNode: _AST_ModelsTreeNode
+}
+
+function _AST_ModelsTree(modelsTree) {
+	ensure(modelsTree, 'object,required', 'modelsTree');
+	return _AST_ModelsTreeNode(modelsTree.root);
 }
 
-function _toAST_ModelsTreeNode(node, spacing=0) {
-	let spaces = '';
+function _AST_ModelsTreeNode(node, spacing=0) {
+	ensure(node, 'object,required', 'node');
+	ensure(spacing, 'number,required', 'spacing');
+
+	let spaces = ' ';
 	for (let i = 0; i < spacing; i++) {
 		spaces += ' ';
 	}
 
-	let ast = `${ spaces }[TreeNode]\n`;
-
-	spaces += ' ';
+	let ast = `${ spaces }┏ TreeNode\n`;
+	ast += `${ spaces }┃\n`;
 
-	ast += `${ spaces }model: ${ node.model }\n\n`;
+	ast += `${ spaces }┣ model: ${ node.model }\n`;
+	ast += `${ spaces }┃\n`;
 
-	ast += `${ spaces }fields (${ node.fields.length }): [\n${ node.fields.map(f => ` • ${ f },\n`) }`;
-	ast += `${ spaces }]\n\n`;
+	ast += `${ spaces }┣ fields (${ node.fields.length }): [\n${ node.fields.map(f => ` • ${ f },\n`) }`;
+	ast += `${ spaces }┃ ]\n`;
+	ast += `${ spaces }┃\n`;
 
-	ast += `${ spaces }functions (${ node.functions.length }): [\n${ node.functions.map(f => ` • ${ f },\n`) }`;
-	ast += `${ spaces }]\n\n`;
+	ast += `${ spaces }┣ functions (${ node.functions.length }): [\n${ node.functions.map(f => ` • ${ f },\n`) }`;
+	ast += `${ spaces }┃ ]\n`;
+	ast += `${ spaces }┃\n`;
 
-	ast += `${ spaces }where: ${ JSON.stringify(node.where) }\n\n`;
+	ast += `${ spaces }┣ where: ${ JSON.stringify(node.where) }\n`;
+	ast += `${ spaces }┃\n`;
 
-	['skip','limit','order','order_by'].map(
-		c =>  ast += `${ spaces }${ c }: ${ node[c] }\n\n`
-	);
+	['skip','limit','order','order_by'].map(c => {
+		ast += `${ spaces }┣ ${ c }: ${ node[c] }\n`;
+		ast += `${ spaces }┃\n`;
+	});
 	
-	ast += `${ spaces }includes (${ node.includes.length }): [\n`
-	node.includes.map(n => ast += _toAST_ModelsTreeNode(n, spacing + 2));
-	ast += `${ spaces }]\n`;
-
-	spaces.slice(-1);
-	ast += `${ spaces }[TreeNode END]\n\n`;
+	ast += `${ spaces }┗ includes (${ node.includes.length }): [\n`
+	node.includes.map(n => ast += _AST_ModelsTreeNode(n, spacing + 2));
+	ast += `${ spaces }  ]\n`;
 
 	return ast;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodester",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "A versatile REST framework for Node.js",
   "exports": {
     ".": "./lib/application/index.js",

package/tests/{ast.test.js → ast.js}

@@ -1,5 +1,5 @@
 const { ModelsTree } = require('../lib/middlewares/ql/sequelize/interpreter/ModelsTree');
-const { toAST_ModelsTreeNode } = require('../lib/tools/nql.tool');
+const { AST_ModelsTree } = require('../lib/tools/nql.tool');
 
 const tree = new ModelsTree();
 tree.node.addWhere({ id: ['1000'] });
@@ -12,5 +12,7 @@ tree.node.order = 'rand';
 tree.up();
 tree.include('reposts');
 
-console.debug(toAST_ModelsTreeNode(tree.root));
+console.debug(
+	AST_ModelsTree(tree)
+);