nodester 0.1.5 → 0.2.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nodester",
-  "version": "0.1.5",
+  "version": "0.2.1",
   "description": "A boilerplate framework for Node.js",
   "exports": {
     ".": "./lib/application/index.js",
@@ -16,7 +16,7 @@
     "./database/migration": "./lib/database/migration.js",
     "./database/utils": "./lib/database/utils.js",
 
-    "./enum": "./lib/enums/Enum.js",
+    "./enum": "./lib/structures/Enum.js",
 
     "./facades/methods": "./lib/facades/methods/index.js",
     "./facades/mixins": "./lib/facades/mixins/index.js",
@@ -24,7 +24,7 @@
     "./factories/errors": "./lib/factories/errors/index.js",
     "./factories/responses/rest": "./lib/factories/responses/rest/index.js",
 
-    "./filter": "./lib/filters/Filter.js",
+    "./filter": "./lib/structures/Filter.js",
 
     "./http/codes": "./lib/http/codes/index.js",
     "./http/codes/descriptions": "./lib/http/codes/descriptions.js",
@@ -33,19 +33,24 @@
     "./loggers/console": "./lib/loggers/console.js",
     "./loggers/dev": "./lib/loggers/dev.js",
 
+    "./middlewares/cookies": "./lib/middlewares/cookies/index.js",
     "./middlewares/formidable": "./lib/middlewares/formidable/index.js",
+    "./middlewares/SearchParams": "./lib/middlewares/SearchParams/index.js",
 
     "./models/associate": "./lib/models/associate.js",
     "./models/define": "./lib/models/define.js",
 
-    "./params": "./lib/params/Params.js",
+    "./params": "./lib/structures/Params.js",
 
-    "./ql/sequelize": "./lib/middlewares/ql/sequelize",
+    "./ql/sequelize": "./lib/middlewares/ql/sequelize/index.js",
     "./query/traverse": "./lib/query/traverse.js",
 
     "./route": "./lib/router/route.js",
     "./router": "./lib/router/index.js",
 
+    "./stacks/markers": "./lib/stacks/MarkersStack.js",
+    "./stacks/middlewares": "./lib/stacks/MiddlewaresStack.js",
+
     "./utils/sql": "./lib/utils/sql.util.js",
     "./utils/strings": "./lib/utils/strings.util.js",
     "./utils/sanitizations": "./lib/utils/sanitizations.util.js"
@@ -84,8 +89,6 @@
     "accepts": "^1.3.8",
     "body-parser": "^1.20.2",
     "common-js-file-extensions": "^1.0.4",
-    "content-disposition": "^0.5.4",
-    "content-type": "^1.0.5",
     "cookie": "^0.5.0",
     "cookie-signature": "^1.2.0",
     "debug": "^4.3.4",
@@ -95,13 +98,13 @@
     "fresh": "^0.5.2",
     "http-errors": "^2.0.0",
     "inflection": "^2.0.1",
+    "mime": "^3.0.0",
     "mysql2": "^3.6.0",
     "pg": "^8.11.3",
     "pg-hstore": "^2.3.4",
     "proxy-addr": "^2.0.7",
     "qs": "^6.11.0",
     "range-parser": "^1.2.1",
-    "send": "^0.18.0",
     "sequelize": "^6.6.5",
     "type-is": "^1.6.18",
     "vary": "^1.1.2"

package/tests/index.test.js

@@ -27,13 +27,13 @@ describe('nodester application', () => {
 	test('Application start', () => {
 		app.listen(PORT, function() {
 			expect(app.port).toBe(PORT);
-			expect(app.router._middlewares.isLocked).toBe(true);
-			expect(app.router._middlewares.length).toBe(2);
+			expect(app.isLocked).toBe(true);
+			expect(app.isListening).toBe(true);
+			expect(app.middlewaresStack.length).toBe(4);
 
 			app.stop();
 
-			expect(app.router._middlewares.length).toBe(0);
-			expect(app.router._middlewares.isLocked).toBe(false);
+			expect(app.isLocked).toBe(false);
 			expect(app.isListening).toBe(false);
 		});
 	});

package/tests/nql.test.js

@@ -49,6 +49,9 @@ describe('nodester Query Language', () => {
 
 		// Like simple.
 		'title=like(some_text)',
+
+		// Subinclude and isolated Horizontal.
+		'in=comments.user,likes',
 	];
 
 	it('query "Simple where"', () => {
@@ -262,7 +265,6 @@ describe('nodester Query Language', () => {
 
 		expect(result).toMatchObject(expected);
 	});
-	
 
 	test('Token "Like" simple', () => {
 		const lexer = new QueryLexer( queryStrings[14] );
@@ -274,4 +276,19 @@ describe('nodester Query Language', () => {
 
 		expect(result).toMatchObject(expected);
 	});
+
+	it('query "Subinclude and isolated Horizontal"', () => {
+		const lexer = new QueryLexer( queryStrings[15] );
+		result = lexer.query;
+
+		const tree = new ModelsTree();
+		tree.include('comments').use('comments');
+		tree.include('user');
+		tree.up();
+		tree.include('likes');
+		const expected = tree.root.toObject();
+
+		expect(result).toMatchObject(expected);
+	});
+
 });

package/lib/database/utils.js

@@ -1,19 +0,0 @@
-
-module.exports = {
-	associateModels: _associateModels
-}
-
-async function _associateModels(models) {
-	return new Promise((resolve, reject) => {
-		try {
-			Object.keys(models).map(modelName => (
-				models[modelName].associate(models)
-			));
-
-			return resolve(models);
-		}
-		catch(error) {
-			reject(error);
-		}
-	});
-}

package/lib/enums/Enum.js

@@ -1,16 +0,0 @@
-
-module.exports = Enum;
-
-function Enum(constantsList = {}, writable=false) {
-	const def = (key, value) => Object.defineProperty(this, key, { value, writable: !!writable });
-
-	// Set list.
-	def('list', constantsList);
-
-	// Set getters:
-	Object.keys(constantsList)
-				.forEach(key => def(key, constantsList[key]) );
-
-	// Set constants in static array.
-	def('asArray', Object.values(constantsList) );
-}

package/lib/filters/Filter.js

@@ -1,109 +0,0 @@
-/*!
- * /nodester
- * MIT Licensed
- */
-'use strict';
-
-const CLAUSES = ['limit', 'skip', 'order', 'order_by'];
-
-const { isModel } = require('../utils/models');
-
-
-module.exports = class Filter {
-
-	/*
-	 *
-	 * @param {Model} model
-	 * @param {Object} opts
-	 * - @param {Array} fields
-	 * - @param {Array} clauses
-	 * - @param {Object} includes
-	 * - @param {Object} statics
-	 * -- @param {Object} attributes
-	 * -- @param {Object} clauses
-	 *
-	 * @param {Boolean} noLimit
-	 *
-	 */
-	constructor(model=null, opts=null) {
-		this._model = model;
-
-		this._fields = [];
-		this._clauses = [];
-		this._includes = {};
-		
-		this._statics = {
-			attributes: {},
-			clauses: {}
-		}
-
-		// noLimit=false
-		// if (noLimit === true) {
-		// 	delete this._statics.clauses.limit;
-		// }
-
-		// If model is present:
-		if (isModel(this._model)) {
-			this._fields = Object.keys(this._model.tableAttributes);
-			this._clauses = CLAUSES;
-
-			// ...and no options are provided,
-			// set default statics:
-			if (!opts) {
-				this.statics.clauses.limit = 3;
-			}
-		}
-		
-		// If options are defined:
-		if (!!opts) {
-			const {
-				fields,
-				clauses,
-				includes,
-				statics,
-			} = opts;
-
-
-			// If fields are array:
-			if (Array.isArray(fields)) {
-				this._fields = fields;
-			}
-
-			if (Array.isArray(clauses)) {
-				this._clauses = clauses;
-			}
-
-			if (typeof includes === 'object') {
-				this._includes = includes;
-			}
-
-			if (typeof statics === 'object') {
-				if (typeof statics.attributes === 'object') {
-					this._statics.attributes = statics.attributes;
-				}
-
-				if (typeof statics.clauses === 'object') {
-					this._statics.clauses = statics.clauses;
-				}
-			}
-		}
-	}
-
-	// Getters:
-	get fields() {
-		return this._fields;
-	}
-
-	get clauses() {
-		return this._clauses;
-	}
-
-	get includes() {
-		return this._includes;
-	}
-
-	get statics() {
-		return this._statics;
-	}
-	// Getters\
-}