nodester 0.2.5 → 0.2.8

package/lib/middlewares/cookies/index.js

@@ -1,5 +1,5 @@
-/*!
- * /nodester
+/**
+ * nodester
  * MIT Licensed
  */
  

package/lib/middlewares/etag/index.js

@@ -1,5 +1,5 @@
-/*!
- * /nodester
+/**
+ * nodester
  * MIT Licensed
  */
 
@@ -14,29 +14,31 @@ const fs = require('fs');
 const getFileStats = promisify(fs.stat);
 
 
+module.exports = initETagMiddleware;
+
 /**
  * Initialize `etag` middleware.
  *
- * @param {Object}  options
- * @param {Boolean} options.weak
+ * @param {Object}  [options]
+ * @param {boolean} options.weak
  *
  * @return {Function}
  *
- * @api public
+ * @access public
  */
-module.exports = function initETagMiddleware(options) {
+function initETagMiddleware(options) {
 	const context = {
 		options
 	}
 	return handle.bind(context);
 }
 
-/*
+/**
  * Add ETag header field.
  */
 function handle(req, res, next) {
 	// console.log('e', req.headers);
-	next();
+	return next();
 }
 
 async function _getResponseEntity(res) {

package/lib/middlewares/formidable/index.js

@@ -1,5 +1,5 @@
-/*!
- * /nodester
+/**
+ * nodester
  * MIT Licensed
  */
  

package/lib/middlewares/ql/sequelize/index.js

@@ -1,5 +1,5 @@
-/*!
- * /nodester
+/**
+ * nodester
  * MIT Licensed
  */
  

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

@@ -1,5 +1,5 @@
-/*!
- * /nodester
+/**
+ * nodester
  * MIT Licensed
  */
 
@@ -8,6 +8,11 @@
 const debug = require('debug')('nodester:interpreter:ModelsTree');
 
 
+/**
+ * @class
+ *
+ * @access public
+ */
 class ModelsTreeNode {
 	constructor(model, parent=null, opts={}) {
 		this.model = model;
@@ -17,7 +22,7 @@ class ModelsTreeNode {
 		this.fn = null;
 
 		// for override:
-		this.fields = [];
+		this._attributes = [];
 		this._where = {};
 		this._functions = [];
 		this.skip = 0;
@@ -28,6 +33,11 @@ class ModelsTreeNode {
 		this.order_by = opts.order_by ?? 'id';
 	}
 
+	// Getters:
+	get attributes() {
+		return this._attributes;
+	}
+
 	get where() {
 		return this._where;
 	}
@@ -51,6 +61,12 @@ class ModelsTreeNode {
 	get hasIncludes() {
 		return this.includesCount > 0;
 	}
+	// Getters\
+
+	// Setters:
+	set attributes(array) {
+		this._attributes = array;
+	}
 
 	resetActiveParam() {
 		this.activeParam = null;
@@ -85,7 +101,7 @@ class ModelsTreeNode {
 		return {
 			model: this.model,
 
-			fields: this.fields,
+			attributes: this.attributes,
 			functions: this.functions,
 
 			where: this.where,
@@ -101,6 +117,11 @@ class ModelsTreeNode {
 	}
 }
 
+/**
+ * @class
+ *
+ * @access public
+ */
 class ModelsTree {
 	constructor() {
 		this.root = new ModelsTreeNode('root', null);

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

@@ -1,5 +1,5 @@
-/*!
- * /nodester
+/**
+ * nodester
  * MIT Licensed
  */
 
@@ -12,24 +12,29 @@ const util = require('util');
 const debug = require('debug')('nodester:interpreter:QueryLexer');
 
 const PARAM_TOKENS = new Enum({
-	FIELDS: Symbol('fields'),
-	INCLUDES: Symbol('includes'),
+	ATTRIBUTES: Symbol('attributes'),
+	
 	LIMIT: Symbol('limit'),
 	ORDER: Symbol('order'),
 	ORDER_BY: Symbol('order_by'),
 	SKIP: Symbol('skip'),
+
+	INCLUDES: Symbol('includes'),
 });
 
 const OP_TOKENS = new Enum({
 	AND: 'and',
+
 	BETWEEN: 'between',
 	NOT_BETWEEN: 'notBetween',
 	BETWEEN_MARK: '~',
+
 	OR: 'or',
-	OR_MARK: '|',
+	OR_SHORT: '|',
 	XOR: 'xor',
+
 	NOT: 'not',
-	NOT_MARK: '!',
+	NOT_SHORT: '!',
 
 	IN: 'in',
 	NOT_IN: 'notIn',
@@ -49,6 +54,14 @@ const FN_TOKENS = new Enum({
 });
 
 
+/**
+ * @class
+ * @classdef constructs ModelTree based on the querystring
+ *
+ * @param {string} queryString
+ * 
+ * @access public
+ */
 module.exports = class QueryLexer {
 	constructor(queryString='') {
 		this.tree = new ModelsTree();
@@ -77,7 +90,7 @@ module.exports = class QueryLexer {
 
 		// Token is a String, accumulated char-by-char.
 		let token = '';
-		// Value of param ('id=10' OR 'fields=id,text').
+		// Value of param ('id=10' OR 'attributes=id,text').
 		let value = [];
 		// Model, that was active before a cursor went up in the tree.
 		let previousActive = null;
@@ -489,13 +502,16 @@ module.exports = class QueryLexer {
 
 	parseParamFromToken(token) {
 		switch(token) {
+			case 'attributes':
+			case 'a':
+				return PARAM_TOKENS.ATTRIBUTES;
+
 			case 'limit':
 			case 'l':
 				return PARAM_TOKENS.LIMIT;
 
 			case 'skip':
 			case 's':
-			case 'offset':
 				return PARAM_TOKENS.SKIP;
 
 			case 'order':
@@ -503,13 +519,9 @@ module.exports = class QueryLexer {
 				return PARAM_TOKENS.ORDER;
 
 			case 'order_by':
-			case 'o_by':
+			case 'oby':
 				return PARAM_TOKENS.ORDER_BY;
 
-			case 'fields':
-			case 'f':
-				return PARAM_TOKENS.FIELDS;
-
 			case 'includes':
 			case 'in':
 				return PARAM_TOKENS.INCLUDES;
@@ -525,6 +537,11 @@ module.exports = class QueryLexer {
 		debug(`set param`, { param, token, value });
 
 		switch(param) {
+			case PARAM_TOKENS.ATTRIBUTES:
+				if (token) value.push(token);
+				treeNode.attributes = value;
+				break;
+
 			case PARAM_TOKENS.LIMIT:
 				treeNode.limit = parseInt(token);
 				break;
@@ -541,11 +558,6 @@ module.exports = class QueryLexer {
 				treeNode.order_by = token;
 				break;
 
-			case PARAM_TOKENS.FIELDS:
-				if (token) value.push(token);
-				treeNode.fields = value;
-				break;
-
 			case PARAM_TOKENS.INCLUDES:
 				const node = new ModelsTreeNode(token);
 				treeNode.include(node);

package/lib/middlewares/render/index.js

@@ -1,5 +1,5 @@
-/*!
- * /nodester
+/**
+ * nodester
  * MIT Licensed
  */
  
@@ -29,7 +29,7 @@ function handle(req, res, next) {
  *  - `filename`  filename of the view being rendered
  *
  * @alias render
- * @api public
+ * @access public
  */
 function _render(view, options, callback) {
 	const app = this.req.app;

package/lib/models/associate.js

@@ -1,5 +1,5 @@
-/*!
- * /nodester
+/**
+ * nodester
  * MIT Licensed
  */
  
@@ -11,6 +11,7 @@ module.exports = {
 	associateModelsSync: _associateModelsSync
 }
 
+
 async function _associateModels(databaseConnection) {
 	try {
 		const models = databaseConnection.models;

package/lib/models/define.js

@@ -1,5 +1,5 @@
-/*!
- * /nodester
+/**
+ * nodester
  * MIT Licensed
  */
  
@@ -13,13 +13,15 @@ const { DataTypes } = require('sequelize');
 
 module.exports = defineModel;
 
-/*
+/**
  * @param {SequilizeConnection} databaseConnection
- * @param {String} modelName
+ * @param {string}   modelName
  * @param {Function} definition
- * @param {Object} options
- *   - ... Sequilize model options
- *   - @param {Boolean} noCRUD
+ * @param {Object}   [options]
+ * ... Sequilize model options
+ * @param {Object}   [options.nodester]
+ * @param {boolean}  [options.nodester.noCRUD]
+ * @param {string}   [options.nodester.output]
  */
 function defineModel(
 	databaseConnection,
@@ -46,16 +48,18 @@ function defineModel(
 
 		// Configs related to nodester:
 		nodester: {
+			noCRUD: false,
 			output: 'underscored'
 		},
 
-		// Add user-defined options (they can override upper ones).
+		// Add user-defined options
+		// (they can fully override upper ones).
 		...options
 	};
 
 	const model = databaseConnection.define(modelName, definitionObject, _options);
 
-	if (options.noCRUD !== true) {
+	if (_options.nodester.noCRUD !== true) {
 		// Add:
 		// - createWithIncludes;
 		// - findById;
@@ -67,7 +71,7 @@ function defineModel(
 
 	// Associations:
 	model.associate = (models) => {};
-	model.getIncludesList = _getIncludesList.bind(model);
+	model.getIncludesTree = _getIncludesTree.bind(model);
 
 	// Instance methods:
 	model.prototype.toJSON = function() {
@@ -78,8 +82,22 @@ function defineModel(
 	return model;
 }
 
-/* Association mixins: */
-function _getIncludesList(facadeData=null) {
+// Associations mixins:
+/**
+ * @example
+ * [
+ *    <include_name_0>: {
+ *      <subinclude_name_0>: { ... }
+ *    },
+ *    <include_name_1>: { ... }
+ * ]
+ * @param {Object|null} data
+ *
+ * @return {Array} associationsTree
+ *
+ * @alias getIncludesTree
+ */
+function _getIncludesTree(data=null) {
 	const result = [];
 
 	const associations = this.associations;
@@ -88,15 +106,16 @@ function _getIncludesList(facadeData=null) {
 	for (const [ associationName, associationDefinition ] of associationEntries) {
 		const formatted = { association: associationName };
 
-		if (!!facadeData) {
-			// If facade data is set, go deeper:
-			const keys = Object.keys( facadeData );
+		if (typeof data === 'object') {
+			// If data (for example during create)
+			// is set, go deeper:
+			const keys = Object.keys( data );
 			if (keys.indexOf(associationName) > 0) {
 				const associationModel = associationDefinition.target;
 
 				if (Object.entries(associationModel.associations).length > 0) {
-					const deepData = facadeData[ associationName ];
-					formatted.include = associationModel.getIncludesList(
+					const deepData = data[ associationName ];
+					formatted.include = associationModel.getIncludesTree(
 												Array.isArray(deepData) ? deepData[0] : deepData
 											);
 				}
@@ -108,4 +127,4 @@ function _getIncludesList(facadeData=null) {
 
 	return result;
 }
-/* Association mixins\ */
+// Associations mixins\

package/lib/models/mixins.js

@@ -1,13 +1,14 @@
-/*!
- * /nodester
+/**
+ * nodester
  * MIT Licensed
  */
  
 'use strict';
 
-/*
+/**
  *	CRUD mixins for any model:
  */
+ 
 // Utils:
 const {
 	modelHasAssociations,
@@ -30,8 +31,7 @@ module.exports = {
  *
  * @param {Object} modelDefinition
  *
- *
- * @api public
+ * @access public
  * @alias implementsCRUD
  */
 function _implementsCRUD(modelDefinition) {
@@ -57,7 +57,7 @@ function _implementsCRUD(modelDefinition) {
 }
 
 
-/* Main mixinis: */
+/** Main mixinis: */
 async function _createWithIncludes(
 	data={}
 ) {
@@ -290,9 +290,9 @@ function _deleteById(
 	};
 	return this.destroy(query);
 }
-/* Main mixinis\ */
+/** Main mixinis\ */
 
-/* Subfunctions: */
+/** Subfunctions: */
 async function _updateOrCreateOrDelete(
 	modelDefinition,
 	data
@@ -395,4 +395,4 @@ function _unwrapUpdateOrCreateOrDeleteOperationsResults(
 
 	return result;
 }
-/* Subfunctions\ */
+/** Subfunctions\ */

package/lib/query/traverse.js

@@ -1,5 +1,5 @@
-/*!
- * /nodester
+/**
+ * nodester
  * MIT Licensed
  */
  
@@ -16,6 +16,14 @@ const { ensure } = require('nodester/validators/arguments');
 
 module.exports = traverse;
 
+/**
+ *
+ * @param {ModelsTreeNode} queryNode
+ * @param {NodesterFilter} filter
+ * @param {Model} model
+ *
+ * @access public
+ */
 function traverse(queryNode, filter=null, model=null) {
 	const _model = model ?? filter.model;
 
@@ -35,7 +43,7 @@ function traverse(queryNode, filter=null, model=null) {
 	const rootModelName = _model.options.name;
 	const rootModelAssociations = _model.associations;
 	const { sequelize } = _model;
-	const fieldsAvailable = Object.keys(_model.tableAttributes);
+	const attributesAvailable = Object.keys(_model.tableAttributes);
 
 	const newQuery = {
 		attributes: [],
@@ -44,60 +52,61 @@ function traverse(queryNode, filter=null, model=null) {
 	};
 	
 	const {
+		attributes,
+		clauses,
+		functions,
 		where,
+
 		includes,
-		fields,
-		functions,
-		clauses,
 	} = _disassembleQueryNode(queryNode);
 
 
-	// Fields:
+	// Attribute:
 	//
 	//	If Filter is not set,
-	//	use every available field:
+	//	use every available attribute:
 	if (filter === null) {
-		for (let field of fieldsAvailable) {
-			// If no query filter or field is requested:
-			if (fields.length === 0 || fields.indexOf(field) > -1) {
-				newQuery.attributes.push(field);
+		for (let attribute of attributesAvailable) {
+			// If no query filter or attribute is requested:
+			if (attributes.length === 0 || attributes.indexOf(attribute) > -1) {
+				newQuery.attributes.push(attribute);
 				continue;
 			}
 		}
 	}
 	//	Filter is present:
 	else {
-		// If no query fields were set,
+		// If no query attributes were set,
 		//	use the ones from Filter,
-		// If query fields were set,
+		// If query attributes were set,
 		//	put them through Filter:
-		for (let field of filter.fields) {
-			if (fieldsAvailable.indexOf(field) === -1) {
-				const err = new NodesterQueryError(`Field '${ field }' is not present in model.`);
+		for (let attribute of filter.attributes) {
+			if (attributesAvailable.indexOf(attribute) === -1) {
+				const err = new NodesterQueryError(`Field '${ attribute }' is not present in model.`);
 				Error.captureStackTrace(err, traverse);
 				throw err;
 			}
 
-			// If field is not in available set:
-			// if (filter.fields.indexOf(field) === -1) {
+			// If attribute is not in available set:
+			// if (filter.attributes.indexOf(attribute) === -1) {
 			// 	continue;
 			// }
 
-			// If no query filter or field is requested:
-			if (fields.length === 0 || fields.indexOf(field) > -1) {
-				newQuery.attributes.push(field);
+			// If no query filter or attribute is requested:
+			if (attributes.length === 0 || attributes.indexOf(attribute) > -1) {
+				newQuery.attributes.push(attribute);
 				continue;
 			}
 		}
 	}
 	
-	//	At least 1 field is mandatory:
+	//	At least 1 attribute is mandatory:
 	if (newQuery.attributes.length === 0) {
-		const err = new NodesterQueryError(`No fields were selected.`);
+		const err = new NodesterQueryError(`No attributes were selected.`);
 		Error.captureStackTrace(err, traverse);
 		throw err;
 	}
-	// Fields\
+	// Attribute\
 
 	// Functions:
 	for (const fnParams of functions) {
@@ -312,7 +321,7 @@ function traverse(queryNode, filter=null, model=null) {
  * @param {NodesterFilter} filter
  * @param {Object} resultQuery
  *
- * @api private
+ * @access private
  */
 function _traverseIncludes(includes, rootModel, filter, resultQuery) {
 	const filterIncludesEntries = Object.entries(filter.includes);
@@ -377,20 +386,19 @@ function _parseWhereEntry(attribute, value, whereHolder, staticAttributes) {
 function _disassembleQueryNode(queryNode) {
 	// Disassemble current query node:
 	const {
+		attributes,
+		functions,
 		where,
 		includes,
-		fields,
-		functions,
 		...clauses
 	} = queryNode;
-	// delete queryNode.model;
 
 	return {
+		attributes: attributes ?? [],
+		clauses: clauses ?? [],
+		functions: functions ?? [],
 		where: where ?? {},
 		includes: includes ?? [],
-		fields: fields ?? [],
-		functions: functions ?? [],
-		clauses: clauses ?? []
 	};
 }
 

package/lib/router/handlers.util.js

@@ -1,11 +1,11 @@
-/*!
- * /nodester
+/**
+ * nodester
  * MIT Licensed
  */
  
 'use strict';
 
-const { typeOf } = require('../utils/types.util');
+const { typeOf } = require('nodester/utils/types');
 
 
 module.exports = {
@@ -13,12 +13,12 @@ module.exports = {
 }
 
 
-/*
+/**
  * @param {Object} routeHandler
  * @return {Object} parsedRouteHandler
  *
  * @alias parseRouteHandler
- * @public
+ * @access public
  */
 function _parseRouteHandler(routeHandler={}) {
 	if (!routeHandler) {