not-node 4.0.17 → 4.0.21

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "not-node",
-  "version": "4.0.17",
+  "version": "4.0.21",
   "description": "node complimentary part for client side notFramework.",
   "main": "index.js",
   "scripts": {

package/src/common.js

@@ -1,4 +1,5 @@
 const fs = require('fs');
+const path = require('path');
 const notPath = require('not-path');
 
 /** @module Common */
@@ -8,7 +9,7 @@ const notPath = require('not-path');
  * @return {string}        result
  */
 
-module.exports.firstLetterToLower = function (string) {
+module.exports.firstLetterToLower = function(string) {
   return string.charAt(0).toLowerCase() + string.slice(1);
 };
 
@@ -18,7 +19,7 @@ module.exports.firstLetterToLower = function (string) {
  * @return {string}        result
  */
 
-module.exports.firstLetterToUpper = function (string) {
+module.exports.firstLetterToUpper = function(string) {
   return string.charAt(0).toUpperCase() + string.slice(1);
 };
 
@@ -27,10 +28,10 @@ module.exports.firstLetterToUpper = function (string) {
  *  @param  {string}  id   ObjectId string to validate
  *  @return {booelean}  true if check is not failed
  */
-module.exports.validateObjectId = (id)=>{
-  try{
-    return id.match(/^[0-9a-fA-F]{24}$/)?true:false;
-  }catch(e){
+module.exports.validateObjectId = (id) => {
+  try {
+    return id.match(/^[0-9a-fA-F]{24}$/) ? true : false;
+  } catch (e) {
     return false;
   }
 };
@@ -41,24 +42,24 @@ module.exports.validateObjectId = (id)=>{
  *  @param  {string|ObjectId}  secondId   second id
  *  @return {booelean}        true if equal
  */
-module.exports.compareObjectIds = (firstId, secondId)=>{
-  try{
-    let a = firstId, b = secondId;
-    if(typeof firstId !== 'string'){
+module.exports.compareObjectIds = (firstId, secondId) => {
+  try {
+    let a = firstId,
+      b = secondId;
+    if (typeof firstId !== 'string') {
       a = a.toString();
     }
-    if(typeof secondId !== 'string'){
+    if (typeof secondId !== 'string') {
       b = b.toString();
     }
-    if(
-      !module.exports.validateObjectId(a)
-      ||
+    if (
+      !module.exports.validateObjectId(a) ||
       !module.exports.validateObjectId(b)
-    ){
+    ) {
       return false;
     }
     return a === b;
-  }catch(e){
+  } catch (e) {
     return false;
   }
 };
@@ -67,9 +68,9 @@ module.exports.compareObjectIds = (firstId, secondId)=>{
  *  Returns today Date object without hours, minutes, seconds
  *  @return {number}  current date with 00:00:00 in ms of unix time
  */
-module.exports.getTodayDate = ()=>{
+module.exports.getTodayDate = () => {
   let t = new Date();
-  return (new Date(t.getFullYear(), t.getMonth(),t.getDate())).getTime();
+  return (new Date(t.getFullYear(), t.getMonth(), t.getDate())).getTime();
 };
 
 
@@ -84,22 +85,22 @@ module.exports.objHas = objHas;
 
 
 /**
-* Copies object to secure it from changes
-* @param {object}   obj     original object
-* @return {object}          copy of object
-**/
+ * Copies object to secure it from changes
+ * @param {object}   obj     original object
+ * @return {object}          copy of object
+ **/
 module.exports.copyObj = (obj) => {
   return JSON.parse(JSON.stringify(obj));
 };
 
 /**
-* Copies object to secure it from changes
-* @param {object}   obj     original object
-* @return {object}          copy of object
-**/
+ * Copies object to secure it from changes
+ * @param {object}   obj     original object
+ * @return {object}          copy of object
+ **/
 module.exports.partCopyObj = (obj, list) => {
-  let partObj =  Object.keys(obj).reduce((prev, curr)=>{
-    if(list.includes(curr)){
+  let partObj = Object.keys(obj).reduce((prev, curr) => {
+    if (list.includes(curr)) {
       prev[curr] = obj[curr];
     }
     return prev;
@@ -109,38 +110,38 @@ module.exports.partCopyObj = (obj, list) => {
 
 
 /**
-* Test argument type to be 'function'
-* @param {any}  func    possible function
-* @return {boolean}     if this is a function
-**/
+ * Test argument type to be 'function'
+ * @param {any}  func    possible function
+ * @return {boolean}     if this is a function
+ **/
 const isFunc = module.exports.isFunc = (func) => {
   return typeof func === 'function';
 };
 
 /**
-* Returns true if argument is Async function
-* @param {function} func  to test
-* @return {boolean}       if this function is constructed as AsyncFunction
-**/
+ * Returns true if argument is Async function
+ * @param {function} func  to test
+ * @return {boolean}       if this function is constructed as AsyncFunction
+ **/
 const isAsync = module.exports.isAsync = (func) => {
   return func.constructor.name === 'AsyncFunction';
 };
 
 
 /**
-*  Executes method of object in appropriate way inside Promise
-* @param {object}   obj     original object
-* @param {string}   name    method name to execute
-* @param {Array}     params  array of params
-* @return {Promise}          results of method execution
-**/
+ *  Executes method of object in appropriate way inside Promise
+ * @param {object}   obj     original object
+ * @param {string}   name    method name to execute
+ * @param {Array}     params  array of params
+ * @return {Promise}          results of method execution
+ **/
 module.exports.executeObjectFunction = async (obj, name, params) => {
-  if (obj){
+  if (obj) {
     const proc = notPath.get(':' + name, obj);
-    if(isFunc(proc)){
-      if(isAsync(proc)){
+    if (isFunc(proc)) {
+      if (isAsync(proc)) {
         return await proc(...params);
-      }else{
+      } else {
         return proc(...params);
       }
     }
@@ -149,14 +150,14 @@ module.exports.executeObjectFunction = async (obj, name, params) => {
 
 
 /**
-*  Executes method of object in apropriate way inside Promise
-* @param {Object}   from     original object
-* @param {Object}   name    method name to execute
-* @param {Array}     list  array of params
-* @return {Promise}          results of method execution
-**/
+ *  Executes method of object in apropriate way inside Promise
+ * @param {Object}   from     original object
+ * @param {Object}   name    method name to execute
+ * @param {Array}     list  array of params
+ * @return {Promise}          results of method execution
+ **/
 module.exports.mapBind = (from, to, list) => {
-  list.forEach((item)=>{
+  list.forEach((item) => {
     if (typeof from[item] === 'function') {
       to[item] = from[item].bind(from);
     }
@@ -165,10 +166,10 @@ module.exports.mapBind = (from, to, list) => {
 
 
 /**
-*  Synchronously check file existence and if it's really a file
-* @param {string}     filePath  full path to file
-* @return {boolean}            true if path exists and it's a file
-**/
+ *  Synchronously check file existence and if it's really a file
+ * @param {string}     filePath  full path to file
+ * @return {boolean}            true if path exists and it's a file
+ **/
 module.exports.tryFile = (filePath) => {
   try {
     const stat = fs.lstatSync(filePath);
@@ -177,3 +178,18 @@ module.exports.tryFile = (filePath) => {
     return false;
   }
 };
+
+/**
+ * Generates paths object for module/index.js files based on content and relative
+ * path
+ * @param {Array<string>}  content  list of module components ['models', 'logics', 'routes',...]
+ * @param {string}         relative  path to parent folder of components
+ * @param {Object}         paths object for module/index.js
+ **/
+module.exports.generatePaths = (content = [], relative = 'src') => {
+  const toPath = (name) => path.join(relative, name);
+  return content.reduce((prev, cur) => {
+    prev[cur] = toPath(cur);
+    return prev;
+  }, {});
+};

package/src/core/fields/owner.js

@@ -5,7 +5,7 @@ module.exports = {
     refPath: 'ownerModel',
     required: false,
     safe: {
-      update: ['@owner', 'root', 'admin'],
+      update: ['root', 'admin'],
       read: ['@owner', 'root', 'admin']
     }
   }

package/src/core/fields/validators/owner.js

@@ -0,0 +1,4 @@
+module.exports = [{
+  validator: 'isMongoId',
+  message: 'owner_is_not_valid'
+}];

package/src/manifest/registrator/fields.js

@@ -36,14 +36,30 @@ module.exports = class notModuleRegistratorFields{
     );
   }
 
-  registerField({name, field, fieldsImportRules}){
+  registerField({name, field, fieldsImportRules, fromPath}){
+    this.extendByFrontValidators({name, field, fromPath});
     notModuleRegistratorFields.fieldsManager.registerField(
-      name, //field name
-      field,       //field description
+      name,             //field name
+      field,            //field description
       fieldsImportRules //global import rules
     );
   }
 
+  /**
+  *
+  **/
+  extendByFrontValidators({name, field, fromPath}){
+    if(!(field && objHas(field, 'model'))){ return; }
+    //load validators
+    const validatorName = path.join(fromPath, 'validators', name + '.js');
+    if(!tryFile(validatorName)){return;}
+    const validators = notModuleRegistratorFields.openFile(validatorName);
+    //inject into field.model
+    if(!objHas(field.model, 'validate')){
+      field.model.validate = [];
+    }
+    field.model.validate.push(...validators);
+  }
 
 
   /**
@@ -72,11 +88,10 @@ module.exports = class notModuleRegistratorFields{
       this.registerField({
         name: parts.name, //fields name
         field: fields,       //field description
-        fieldsImportRules: nModule.fieldsImportRules //global import rules
+        fieldsImportRules: nModule.fieldsImportRules, //global import rules
+        fromPath
       });
     }
   }
 
-
-
 };

package/src/model/buildValidator.js

@@ -12,7 +12,11 @@ function extractValidationEnvGetter(options){
 }
 
 function extendObsolete(rule){
-  return validate(rule);
+  const result = {...rule};
+  if(objHas(result, 'arguments') && !Array.isArray(result.arguments)){
+    result.arguments = Object.values(result.arguments);
+  }
+  return validate(result);
 }
 
 function extendModern(rule, options){

package/test/module/fields.js

@@ -24,7 +24,8 @@ module.exports = ({
     describe('run', function() {
       it('path to fields is not defined', function() {
         const ctx = {
-          findAll() {}
+          findAll() {},
+          extendByFrontValidators(){}
         };
         const param = {
           nModule: {
@@ -39,7 +40,8 @@ module.exports = ({
 
       it('paths to fields is defined', function() {
         const ctx = {
-          findAll() {}
+          findAll() {},
+          extendByFrontValidators(){}
         };
         const param = {
           nModule: {
@@ -149,7 +151,9 @@ module.exports = ({
 
     describe('registerField', function() {
       it('file is a single field', () => {
-        const ctx = {};
+        const ctx = {
+          extendByFrontValidators(){}
+      };
         const param = {
           name: 'single',
           field: require(path.resolve(__dirname, '../testies/module/fields/single.js')),