not-node 5.0.18 → 5.0.22

package/error.format

@@ -0,0 +1,11 @@
+server returns errors with http codes
+and additional info in form of JSON
+{
+    status: 'error', //<- main marker
+    message: 'short description', //<- could be empty if server is dont want to disclose any information on cause
+    //optional
+    errors: {
+        field_name: ['error1'],
+        field_name2: ['err','fake']
+    }
+}

package/index.js

@@ -37,3 +37,5 @@ module.exports.FormFabric = require('./src/form').FormFabric;
 module.exports.Init = require('./src/init').Init;
 /** Application object */
 module.exports.Application = null;
+/** Application bootstrap helpers */
+module.exports.Bootstrap = require('./src/bootstrap');

package/package.json

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

package/src/bootstrap/form.js

@@ -0,0 +1,18 @@
+const { getIP } = require("../auth"),
+	configInit = require("not-config"),
+	{ sayForModule } = require("not-locale"),
+	LogInit = require("not-log");
+
+module.exports = ({ target, MODULE_NAME, MODEL_NAME, ACTION_NAME }) => {
+	const Log = LogInit(target, `${MODEL_NAME}/Forms'`);
+	const say = sayForModule(MODULE_NAME);
+
+	const config = configInit.readerForModule(MODULE_NAME);
+	return {
+		getIP,
+		FORM_NAME: `${MODULE_NAME}:${ACTION_NAME}Form`,
+		Log,
+		say,
+		config,
+	};
+};

package/src/bootstrap/index.js

@@ -0,0 +1,11 @@
+const notBootstrapLogic = require("./logic");
+const notBootstrapForm = require("./form");
+const notBootstrapRoute = require("./route");
+const notBootstrapModel = require("./model");
+
+module.exports = {
+    notBootstrapLogic,
+    notBootstrapForm,
+    notBootstrapRoute,
+    notBootstrapModel,
+};

package/src/bootstrap/logic.js

@@ -0,0 +1,46 @@
+const getApp = require("../getApp.js"),
+  configInit = require("not-config"),
+  {sayForModule, modulePhrase} = require('not-locale'),
+  LogInit = require("not-log");
+
+
+module.exports = ({target, MODULE_NAME, MODEL_NAME, USER_MODEL_NAME = 'not-user//User'})=>{
+
+  const Log = LogInit(target, `${MODULE_NAME}/Logic/${MODEL_NAME}`);
+  const say = sayForModule(MODULE_NAME);
+  const phrase = modulePhrase(MODULE_NAME);
+  const config = configInit.readerForModule(MODULE_NAME);
+
+  const LogAction = ({action, by, role, ip}, params = {})=>{
+    Log.log({
+      time: new Date(),
+      module: MODULE_NAME,
+      logic: MODEL_NAME,
+      action,
+      by,
+      role,
+      ip,
+      params
+    });
+  };
+
+  return {
+    Log,
+    LogAction,
+    say,
+    phrase,
+    config,
+    getModel(){
+      return getApp().getModel(`${MODULE_NAME}//${MODEL_NAME}`);
+    },
+    getModelSchema(){
+      return getApp().getModelSchema(`${MODULE_NAME}//${MODEL_NAME}`);
+    },
+    getLogic(){
+      return getApp().getLogic(`${MODULE_NAME}//${MODEL_NAME}`);
+    },
+    getModelUser(){
+      return getApp().getModel(USER_MODEL_NAME);
+    }
+  }
+};

package/src/bootstrap/model.js

@@ -0,0 +1,18 @@
+const 
+  configInit = require("not-config"),
+  { sayForModule } = require("not-locale"),
+
+  LogInit = require("not-log");
+
+module.exports = ({ target, MODULE_NAME, MODEL_NAME}) => {
+  const Log = LogInit(target, `${MODEL_NAME}/Models'`);
+  const say = sayForModule(MODULE_NAME);
+
+  const config = configInit.readerForModule(MODULE_NAME);
+  return {
+    Log,
+    say,
+    config
+  };
+
+};

package/src/bootstrap/route.js

@@ -0,0 +1,60 @@
+const getApp = require("../getApp.js"),
+  configInit = require("not-config"),
+  { sayForModule } = require("not-locale"),
+  { objHas } = require("../common"),
+  LogInit = require("not-log");
+
+module.exports = ({ target, MODULE_NAME, MODEL_NAME, USER_MODEL_NAME = 'not-user//User' }) => {
+  const Log = LogInit(target, `${MODEL_NAME}/Routes'`);
+  const say = sayForModule(MODULE_NAME);
+
+  const beforeDecorator = async (req, res, next) => {
+    const name = req.notRouteData.actionName;
+    const FormValidator = getApp().getForm(
+      [MODULE_NAME, name.replace("_", "")].join("//")
+    );
+    if (FormValidator) {
+      return await FormValidator.run(req, res, next);
+    } else {
+      return {};
+    }
+  };
+
+  const afterDecorator = (req, res, next, result) => {
+    const name = req.notRouteData.actionName;
+    if (res.headersSent) {
+      return;
+    }
+    if (result && objHas(result, "__redirect__")) {
+      res.status(200).redirect(result.__redirect__);
+    } else {
+      res.status(200).json({
+        status: "ok",
+        message: say(`action_message_${name}_success`, {}, res.locals.locale),
+        result,
+      });
+    }
+  };
+
+  const config = configInit.readerForModule(MODULE_NAME);
+  return {
+    before: beforeDecorator,
+    after: afterDecorator,
+    Log,
+    say,
+    config,
+    getModel() {
+      return getApp().getModel(`${MODULE_NAME}//${MODEL_NAME}`);
+    },
+    getModelSchema() {
+      return getApp().getModelSchema(`${MODULE_NAME}//${MODEL_NAME}`);
+    },
+    getLogic() {
+      return getApp().getLogic(`${MODULE_NAME}//${MODEL_NAME}`);
+    },
+    getModelUser(){
+      return getApp().getModel(USER_MODEL_NAME);
+    }
+  };
+
+};

package/src/core/locales/en.json

@@ -7,6 +7,8 @@
   "button_cancel_label": "Cancel",
   "button_apply_label": "Apply",
   "field_select_label": "Select",
+  "field_value_is_empty_placeholder": "Empty",
+  "loading_label": "Loading...",
   "field_search_placeholder": "Search...",
   "field_owner_label": "Owner",
   "form_validation_error": "Form validation error",

package/src/core/locales/ru.json

@@ -7,6 +7,8 @@
   "field_select_label": "Выбрать",
   "field_search_placeholder": "Искать...",
   "field_owner_label": "Владелец",
+  "field_value_is_empty_placeholder": "Пусто",
+  "loading_label": "Загрузка...",
   "button_cancel_label": "Отмена",
   "button_apply_label": "Применить",
   "form_validation_error": "Форма заполнена с ошибками",

package/src/fields/index.js

@@ -1,20 +1,29 @@
-const clone = require('rfdc')();
-const notPath = require('not-path');
-const {error} = require('not-log')(module, 'init//fields');
-const {notError} = require('not-error');
+const clone = require("rfdc")();
+const notPath = require("not-path");
+const { error } = require("not-log")(module, "init//fields");
 
-const {
-  objHas,
-} = require('../common');
+const { objHas } = require("../common");
 
-const DEFAULT_TYPE = 'ui';
-const DEFAULT_FROM = ':FIELDS';
-const DEFAULT_TO = ':thisSchema';
+const DEFAULT_TYPE = "ui";
+const DEFAULT_FROM = ":FIELDS";
+const DEFAULT_TO = ":thisSchema";
 
-module.exports.initFileSchemaFromFields = ({app, mod, type = DEFAULT_TYPE, from = DEFAULT_FROM, to = DEFAULT_TO, moduleName = ''})=>{
+module.exports.initFileSchemaFromFields = ({
+  app,
+  mod,
+  type = DEFAULT_TYPE,
+  from = DEFAULT_FROM,
+  to = DEFAULT_TO,
+  moduleName = "",
+}) => {
   const FIELDS = notPath.get(from, mod);
-  if(FIELDS && Array.isArray(FIELDS)){
-    const schema = module.exports.createSchemaFromFields(app, FIELDS, type, moduleName);
+  if (FIELDS && Array.isArray(FIELDS)) {
+    const schema = module.exports.createSchemaFromFields(
+      app,
+      FIELDS,
+      type,
+      moduleName
+    );
     notPath.set(to, mod, schema);
   }
 };
@@ -26,26 +35,40 @@ fields = [
   ['someID', {}, 'ID'],  //copy of standart ID field under name as someID
 ]
 **/
-module.exports.createSchemaFromFields = (app, fields, type = 'ui', moduleName) => {
+module.exports.createSchemaFromFields = (
+  app,
+  fields,
+  type = "ui",
+  moduleName
+) => {
   let schema = {};
   fields.forEach((field) => {
-    let [schemaFieldName, schemaFieldValue] = module.exports.initSchemaField(app, field, false, type, moduleName);
+    let [schemaFieldName, schemaFieldValue] = module.exports.initSchemaField(
+      app,
+      field,
+      false,
+      type,
+      moduleName
+    );
     schema[schemaFieldName] = schemaFieldValue;
   });
   return schema;
 };
 
-
-module.exports.initSchemaField = (app, field, resultOnly = true, type = 'ui', moduleName) => {
+module.exports.initSchemaField = (
+  app,
+  field,
+  resultOnly = true,
+  type = "ui",
+  moduleName
+) => {
   //log(field);
-  let {
-    srcName,
-    destName,
-    mutation
-  } = parseFieldDescription(field);
+  let { srcName, destName, mutation } = parseFieldDescription(field);
   let proto = findFieldPrototype(app, srcName, type);
-  if(!proto){
-    error(`field ${moduleName}//${destName} prototype ${srcName} of ${type} type is not found`);
+  if (!proto) {
+    error(
+      `field ${moduleName}//${destName} prototype ${srcName} of ${type} type is not found`
+    );
   }
   let schemaFieldValue = Object.assign({}, clone(proto), mutation);
   if (resultOnly) {
@@ -56,25 +79,26 @@ module.exports.initSchemaField = (app, field, resultOnly = true, type = 'ui', mo
 };
 
 /**
-* field form
-* 'destFieldNameSameAsSourceFieldName' - form 1
-* ['destFieldName', {full: true, field: 'content'}] - form 2
-* ['destFieldName', 'srcFieldName'] //field alias, form 3
-* ['destFieldName', {mutation: 'content'}, 'srcFieldName']// - form 4
-**/
+ * field form
+ * 'destFieldNameSameAsSourceFieldName' - form 1
+ * ['destFieldName', {full: true, field: 'content'}] - form 2
+ * ['destFieldName', 'srcFieldName'] //field alias, form 3
+ * ['destFieldName', {mutation: 'content'}, 'srcFieldName']// - form 4
+ **/
 const parseFieldDescription = (field) => {
   let srcName,
     destName,
     mutation = {};
   if (Array.isArray(field)) {
     destName = srcName = field[0];
-    if(field.length === 2){
-      if(typeof field[1] === 'string'){
+    if (field.length === 2) {
+      if (typeof field[1] === "string") {
         srcName = field[1]; //form 3
-      }else{
+      } else {
         mutation = field[1]; //form 2
       }
-    }else if (field.length === 3) { //form 4
+    } else if (field.length === 3) {
+      //form 4
       mutation = field[1];
       srcName = field[2];
     }
@@ -84,39 +108,38 @@ const parseFieldDescription = (field) => {
   return {
     srcName,
     destName,
-    mutation
+    mutation,
   };
 };
 
 const findFieldPrototype = (app, name, type) => {
   const fieldPrototype = app.getField(name);
-  if(fieldPrototype && objHas(fieldPrototype, type)){
+  if (fieldPrototype && objHas(fieldPrototype, type)) {
     return fieldPrototype[type];
-  }else{
+  } else {
     return null;
   }
 };
 
 /**
-* Creates fields UI representation schema from list of fields in DB model
-* and library of fields
-* @param {object} app     notApplication instance
-* @param {object} schema  model db schema
-* @param {Array<string|Array>} rawMutationsList     fields mutations, for little tuning
-* @param {Array<string>} privateFields     fields to omit from result
-* @param {string} moduleName     for detailed reports on issues, in which module and what field is faulty
-* @returns {object}       resulting UI rendering schema for fields
-**/
+ * Creates fields UI representation schema from list of fields in DB model
+ * and library of fields
+ * @param {object} app     notApplication instance
+ * @param {object} schema  model db schema
+ * @param {Array<string|Array>} rawMutationsList     fields mutations, for little tuning
+ * @param {Array<string>} privateFields     fields to omit from result
+ * @param {string} moduleName     for detailed reports on issues, in which module and what field is faulty
+ * @returns {object}       resulting UI rendering schema for fields
+ **/
 
 module.exports.initManifestFields = (
-  app,                    //notApplication
-  schema,                 //schema of model
-  rawMutationsList = [],  //fields mutations
-  privateFields = [],     //fields to omit
-  moduleName              //module name for reporting
+  app, //notApplication
+  schema, //schema of model
+  rawMutationsList = [], //fields mutations
+  privateFields = [], //fields to omit
+  moduleName //module name for reporting
 ) => {
-  let
-    //shallow copy of array
+  let //shallow copy of array
     mutationsList = [...rawMutationsList],
     list = [];
   if (schema && Object.keys(schema).length > 0) {
@@ -133,20 +156,20 @@ module.exports.initManifestFields = (
         }
       });
     list.push(...mutationsList);
-    return module.exports.createSchemaFromFields(app, list, 'ui', moduleName);
-  }else{
-    return {};
+  } else {
+    list = mutationsList;
   }
+  return module.exports.createSchemaFromFields(app, list, "ui", moduleName);
 };
 
 /**
-* Returns mutation tuple for a field or false
-* @param {string} name  field name
-* @param {Array} list  fields description lists
-* @return {boolean|item}
-*/
+ * Returns mutation tuple for a field or false
+ * @param {string} name  field name
+ * @param {Array} list  fields description lists
+ * @return {boolean|item}
+ */
 function getMutationForField(name, list) {
-  for(let item of list){
+  for (let item of list) {
     if (Array.isArray(item) && item[0] === name) {
       return item;
     }

package/src/generic/router.js

@@ -0,0 +1,16 @@
+class notGenericRoute {
+	static sadf = "sadf";
+	static create() {}
+
+	static update() {}
+
+	static get() {}
+
+	static getRaw() {}
+
+	static listAll() {}
+
+	static listAndCount() {}
+}
+
+module.exports = notGenericRoute;

package/src/getApp.js

@@ -0,0 +1,2 @@
+const notNode = require('..');
+module.exports = () => notNode.Application;

package/src/model/versioning.js

@@ -36,10 +36,16 @@ class ModelVersioning{
     return a;
   }
 
+  static jsonCopy(a){
+    return JSON.parse(JSON.stringify(a));
+  }
+
   static isThisDocsDifferent(a, b) {
     a = ModelVersioning.stripTechData(a);
     b = ModelVersioning.stripTechData(b);
-    let diffLog = diff(a, b);
+    const plainA = ModelVersioning.jsonCopy(a);
+    const plainB = ModelVersioning.jsonCopy(b);
+    const diffLog = diff(plainA, plainB);
     return (typeof diffLog !== 'undefined');
   }