nodester 0.4.3 → 0.4.5

package/lib/middlewares/ql/sequelize/interpreter/QueryLexer.js

@@ -293,6 +293,7 @@ module.exports = class QueryLexer {
 					tree.use(previousActive);
 					tree.node.activeParam = PARAM_TOKENS.INCLUDES;
 					token = '';
+					previousActive = null;
 					continue;
 				}
 

package/lib/models/define.js

@@ -106,7 +106,7 @@ function _getIncludesTree(data=null) {
 	for (const [ associationName, associationDefinition ] of associationEntries) {
 		const formatted = { association: associationName };
 
-		if (typeof data === 'object') {
+		if (!!data && typeof data === 'object') {
 			// If data (for example during create)
 			// is set, go deeper:
 			const keys = Object.keys( data );

package/lib/query/traverse/index.js

@@ -34,10 +34,11 @@ module.exports = traverse;
  * @param {ModelsTreeNode} queryNode
  * @param {NodesterFilter} filter
  * @param {Model} model
+ * @param {Object} association (optional)
  *
  * @access public
  */
-function traverse(queryNode, filter=null, model=null) {
+function traverse(queryNode, filter=null, model=null, association=null) {
 	const _model = model ?? filter.model;
 
 	try {
@@ -236,21 +237,25 @@ function traverse(queryNode, filter=null, model=null) {
 		const staticClausesEntries = Object.entries(filter.statics.clauses);
 
 		for (let entry of staticClausesEntries) {
-			const [clauseName, staticClauseValue] = entry;
+			const [ clauseName, staticClauseValue ] = entry;
 
 			switch(clauseName) {
 				case 'limit':
 					newQuery.limit = staticClauseValue;
 					continue;
+				
 				case 'skip':
 					newQuery.offset = staticClauseValue;
 					continue;
+
 				case 'order':
 					order.order = staticClauseValue;
 					continue;
+
 				case 'order_by':
 					order.by = staticClauseValue;
 					continue;
+
 				default:
 					break;
 			}
@@ -378,7 +383,7 @@ function _traverseIncludes(includes, rootModel, filter, resultQuery) {
 
 		const includeModel = association.target;
 		// Build query for this include.
-		const associationQuery = traverse(include, filter.includes[includeName], includeModel);
+		const associationQuery = traverse(include, filter.includes[includeName], includeModel, association);
 
 		addAssociationQuery(associationQuery, includeName, resultQuery);
 	}
@@ -392,23 +397,24 @@ function _traverseIncludedOrders(resultQuery, rootModel) {
 			continue;
 		}
 
-		if (!resultQuery.order) {
-			resultQuery.order = [];
-		}
+		// if (!resultQuery.order) {
+		// 	resultQuery.order = [];
+		// }
 
 		const { association } = include;
 		const {
-			associatedModel,
+			// associatedModel,
 			associationType
 		} = getModelAssociationProps(rootModel.associations[association]);
 
 		switch(associationType) {
 			case 'HasMany': {
-				resultQuery.order.push([
-					{ association },
-					...include.order[0]
-				]);
-				delete resultQuery.include[i].order;
+				include.separate = true;
+				// resultQuery.order.push([
+				// 	path,
+				// 	...include.order[0]
+				// ]);
+				// delete resultQuery.include[i].order;
 				break;
 			}
 			default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodester",
-  "version": "0.4.3",
+  "version": "0.4.5",
   "description": "A versatile REST framework for Node.js",
   "directories": {
     "docs": "docs",

package/tests/nql.test.js

@@ -76,9 +76,9 @@ describe('nodester Query Language', () => {
 			// Horizontals queried.
 			'includes=comments(order=desc),users,likes(order=rand),reposts&id=1000',
 			// Horizontals queried №2.
+			'in=comments(order_by=index&order=asc).users.karma',
+			// Horizontals queried №3.
 			'in=reactions,comments(user_id=gte(4)&skip=10&limit=2).users,likes,reposts',
-
-			// Separated includes.
 			'includes=comments(order=rand)&id=7&limit=3&includes=users(a=id,content)',
 		];
 
@@ -150,6 +150,24 @@ describe('nodester Query Language', () => {
 			const lexer = new QueryLexer( queryStrings[4] );
 			const result = lexer.query;
 
+			const tree = new ModelsTree();
+			tree.include('comments').use('comments');
+
+			tree.node.order_by = 'index';
+			tree.node.order = 'asc';
+
+			tree.include('users') && tree.use('users');
+			tree.include('karma');
+
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+
+		test('Horizontals queried №3', () => {
+			const lexer = new QueryLexer( queryStrings[5] );
+			const result = lexer.query;
+
 			const tree = new ModelsTree();
 			tree.include('reactions');
 
@@ -174,7 +192,7 @@ describe('nodester Query Language', () => {
 		});
 
 		test('Separated includes"', () => {
-			const lexer = new QueryLexer( queryStrings[5] );
+			const lexer = new QueryLexer( queryStrings[6] );
 			const result = lexer.query;
 
 			const tree = new ModelsTree();