nodester 0.4.6 → 0.4.8

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

@@ -289,7 +289,7 @@ module.exports = class QueryLexer {
 				debug('char', char, { token, node: tree.node });
 
 				// Vertical include:
-				if (!!previousActive) {
+				if (!!previousActive && token.length === 0) {
 					tree.use(previousActive);
 					tree.node.activeParam = PARAM_TOKENS.INCLUDES;
 					token = '';

package/lib/tools/nql.tool.js

@@ -42,13 +42,17 @@ function _AST_ModelsTreeNode(node, spacing=0) {
 	ast += `${ spaces }┣ model: ${ node.model }\n`;
 	ast += `${ spaces }┃\n`;
 
+	if (!!node.fields) {
 	ast += `${ spaces }┣ fields (${ node.fields.length }): [\n${ node.fields.map(f => ` • ${ f },\n`) }`;
 	ast += `${ spaces }┃ ]\n`;
 	ast += `${ spaces }┃\n`;
+	}
 
+	if (!!node.functions) {
 	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`;
 	ast += `${ spaces }┃\n`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodester",
-  "version": "0.4.6",
+  "version": "0.4.8",
   "description": "A versatile REST framework for Node.js",
   "directories": {
     "docs": "docs",
@@ -65,6 +65,8 @@
     "./stacks/markers": "./lib/stacks/MarkersStack.js",
     "./stacks/middlewares": "./lib/stacks/MiddlewaresStack.js",
 
+    "./tools/nql": "./lib/tools/nql.tool.js",
+
     "./utils/dates": "./lib/utils/dates.js",
     "./utils/sql": "./lib/utils/sql.util.js",
     "./utils/strings": "./lib/utils/strings.util.js",

package/tests/index.test.js

@@ -7,7 +7,7 @@ const {
 } = require('@jest/globals');
 
 // Configs.
-const PORT = 8080;
+const PORT = 8100;
 
 // Our lib.
 const Nodester = require('../lib/application');

package/tests/nql.test.js

@@ -64,26 +64,30 @@ describe('nodester Query Language', () => {
 	});
 
 	describe('includes', () => {
-		const queryStrings = [
+		const queryStrings = {
 			// Simple includes.
-			'includes=comments&id=7',
-			// Include with All possible params.
-			'includes=comments(id=10&position=4&limit=3&skip=10&order=desc&order_by=index&a=id,content,position)',
-
-			// 2 horizontals
-			'includes=comments,users&id=1000',
+			'simple-includes': 'includes=comments&id=7',
+			// Include with params.
+			'include-with-params': 'includes=comments(id=10&position=4&limit=3&skip=10&order=desc&order_by=index&a=id,content,position)',
+
+			// 2 horizontals.
+			'2-horizontals': 'includes=comments,users&id=1000',
+			// 4 horizontals with subquery.
+			'4-horizontals': 'in=categories,replies.users,comments(order_by=position&order=desc),users.avatars',
 			
 			// Horizontals queried.
-			'includes=comments(order=desc),users,likes(order=rand),reposts&id=1000',
+			'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-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',
-			'includes=comments(order=rand)&id=7&limit=3&includes=users(a=id,content)',
-		];
+			'horizontals-queried-3': 'in=reactions,comments(user_id=gte(4)&skip=10&limit=2).users,likes,reposts',
+			
+			// Separated includes.
+			'separated-includes': 'includes=comments(order=rand)&id=7&limit=3&includes=users(a=id,content)',
+		};
 
 		test('Simple includes', () => {
-			const lexer = new QueryLexer( queryStrings[0] );
+			const lexer = new QueryLexer( queryStrings['simple-includes'] );
 			const result = lexer.query;
 
 
@@ -96,7 +100,7 @@ describe('nodester Query Language', () => {
 		});
 
 		test('Include with all possible params', () => {
-			const lexer = new QueryLexer( queryStrings[1] );
+			const lexer = new QueryLexer( queryStrings['include-with-params'] );
 			const result = lexer.query;
 
 			const tree = new ModelsTree();
@@ -113,7 +117,7 @@ describe('nodester Query Language', () => {
 		});
 
 		test('2 horizontals', () => {
-			const lexer = new QueryLexer( queryStrings[2] );
+			const lexer = new QueryLexer( queryStrings['2-horizontals'] );
 			const result = lexer.query;
 
 
@@ -126,8 +130,39 @@ describe('nodester Query Language', () => {
 			expect(result).toMatchObject(expected);
 		});
 
+		test('4 horizontals', () => {
+			// in=categories,replies.users,comments(order_by=position&order=desc),users.avatars
+
+			const lexer = new QueryLexer( queryStrings['4-horizontals'] );
+			const result = lexer.query;
+
+
+			const tree = new ModelsTree();
+			tree.include('categories');
+			tree.include('replies');
+			tree.include('comments');
+			tree.include('users');
+
+			tree.use('replies');
+			tree.include('users');
+
+			tree.up();
+
+			tree.use('comments');
+			tree.node.order = 'desc';
+			tree.node.order_by = 'position';
+
+			tree.up();
+			tree.use('users');
+			tree.include('avatars');
+
+			const expected = tree.root.toObject();
+
+			expect(result).toMatchObject(expected);
+		});
+
 		test('Horizontals queried', () => {
-			const lexer = new QueryLexer( queryStrings[3] );
+			const lexer = new QueryLexer( queryStrings['horizontals-queried'] );
 			const result = lexer.query;
 
 
@@ -147,7 +182,7 @@ describe('nodester Query Language', () => {
 		});
 
 		test('Horizontals queried №2', () => {
-			const lexer = new QueryLexer( queryStrings[4] );
+			const lexer = new QueryLexer( queryStrings['horizontals-queried-2'] );
 			const result = lexer.query;
 
 			const tree = new ModelsTree();
@@ -165,7 +200,7 @@ describe('nodester Query Language', () => {
 		});
 
 		test('Horizontals queried №3', () => {
-			const lexer = new QueryLexer( queryStrings[5] );
+			const lexer = new QueryLexer( queryStrings['horizontals-queried-3'] );
 			const result = lexer.query;
 
 			const tree = new ModelsTree();
@@ -192,7 +227,7 @@ describe('nodester Query Language', () => {
 		});
 
 		test('Separated includes"', () => {
-			const lexer = new QueryLexer( queryStrings[6] );
+			const lexer = new QueryLexer( queryStrings['separated-includes'] );
 			const result = lexer.query;
 
 			const tree = new ModelsTree();

package/lib/constants/Operators.js

@@ -1,23 +0,0 @@
-const Enum = require('nodester/enum');
-
-
-module.exports = new Enum({
-	and: Symbol.for('and'),
-	between: Symbol.for('between'),
-	contains: Symbol.for('contains'),
-	eq: Symbol.for('eq'),
-	ne: Symbol.for('ne'),
-	gte: Symbol.for('gte'),
-	gt: Symbol.for('gt'),
-	lte: Symbol.for('lte'),
-	lt: Symbol.for('lt'),
-	not: Symbol.for('not'),
-	is: Symbol.for('is'),
-	in: Symbol.for('in'),
-	notIn: Symbol.for('notIn'),
-	like: Symbol.for('like'),
-	notLike: Symbol.for('notLike'),
-	notBetween: Symbol.for('notBetween'),
-	or: Symbol.for('or'),
-	xor: Symbol.for('xor'),
-});

package/lib/middlewares/404/index.js

@@ -1,38 +0,0 @@
-/**
- * nodester
- * MIT Licensed
- */
- 
-'use strict';
-
-const {
-	HTTP_CODE_NOT_FOUND
-} = require('nodester/http/codes');
-
-const { createErrorResponse } = require('nodester/factories/responses/rest');
-
-
-/**
- * Initialize `404` middleware.
- *
- * @param {Object}  [options]
- *
- * @return {Function}
- *
- * @access public
- */
-module.exports = function init404Middleware(options={}) {
-	const context = {
-		options
-	}
-	return handle.bind(context);
-}
-
-function handle(req, res, next) {
-	const err = new Error('Route not found');
-	
-	return createErrorResponse(res, {
-		error: err,
-		status: HTTP_CODE_NOT_FOUND
-	});
-}

package/lib/middlewares/etag/index.js

@@ -1,81 +0,0 @@
-/**
- * nodester
- * MIT Licensed
- */
-
-'use strict';
-
-const calculate = require('etag');
-const Stream = require('stream');
-
-// Utils:
-const promisify = require('util').promisify;
-const fs = require('fs');
-const getFileStats = promisify(fs.stat);
-
-
-module.exports = initETagMiddleware;
-
-/**
- * Initialize `etag` middleware.
- *
- * @param {Object}  [options]
- * @param {boolean} options.weak
- *
- * @return {Function}
- *
- * @access public
- */
-function initETagMiddleware(options) {
-	const context = {
-		options
-	}
-	return handle.bind(context);
-}
-
-/**
- * Add ETag header field.
- */
-function handle(req, res, next) {
-	// console.log('e', req.headers);
-	return next();
-}
-
-async function _getResponseEntity(res) {
-	// If body is not defined:
-	const { body } = res;
-	if (!body || res.get('etag'))
-		return;
-
-	// Status code.
-	const status = res.statusCode / 100 | 0;
-
-	console.log('getResponseEntity', status, { tag: res.get('etag') });
-
-	// 2xx
-	if (status !== 2)
-		return;
-
-	if (body instanceof Stream) {
-		if (!body.path)
-			return;
-
-		const stats = await getFileStats(body.path);
-		return stats;
-	}
-	else if (typeof body === 'string' || Buffer.isBuffer(body)) {
-		return body;
-	}
-	else {
-		return JSON.stringify(body);
-	}
-}
-
-function _setEtag(res, entity, options) {
-	console.log('setEtag', typeof res, entity);
-
-	if (!entity)
-		return;
-
-	res.etag = calculate(entity, options);
-}

package/lib/middlewares/render/index.js

@@ -1,62 +0,0 @@
-/**
- * nodester
- * MIT Licensed
- */
- 
-'use strict';
-
-
-module.exports = function initRenderMiddleware() {
-	return handle;
-}
-
-
-function handle(req, res, next) {
-	const context = { req, res, next };
-	res.render = _render.bind(context);
-	next();
-}
-
-
-/**
- * Render `view` with the given `options` and optional callback `fn`.
- * When a callback function is given a response will _not_ be made
- * automatically, otherwise a response of _200_ and _text/html_ is given.
- *
- * Options:
- *
- *  - `cache`     boolean hinting to the engine it should cache
- *  - `filename`  filename of the view being rendered
- *
- * @alias render
- * @access public
- */
-function _render(view, options, callback) {
-	const app = this.req.app;
-	let done = callback;
-	let opts = options || {};
-	
-	const req = this.req;
-	const res = this.res;
-	const next = this.next;
-
-	// support callback function as second arg
-	if (typeof options === 'function') {
-		done = options;
-		opts = {};
-	}
-
-	// merge res.locals
-	opts._locals = res.locals;
-
-	// default callback to respond
-	done = done || function (err, str) {
-		if (err)
-			return next(err);
-		
-		res.send(str);
-	};
-
-	// render
-	app.render(view, opts, done);
-};

package/tests/ast.js

@@ -1,18 +0,0 @@
-const { ModelsTree } = require('../lib/middlewares/ql/sequelize/interpreter/ModelsTree');
-const { AST_ModelsTree } = require('../lib/tools/nql.tool');
-
-const tree = new ModelsTree();
-tree.node.addWhere({ id: ['1000'] });
-tree.include('comments').use('comments');
-tree.node.order = 'desc';
-tree.up();
-tree.include('users');
-tree.include('likes') && tree.use('likes');
-tree.node.order = 'rand';
-tree.up();
-tree.include('reposts');
-
-console.debug(
-	AST_ModelsTree(tree)
-);
-