not-node 6.5.28 → 6.5.30

package/package.json

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

package/src/core/const.js

@@ -0,0 +1 @@
+module.exports.MODULE_NAME = 'not-node';

package/src/core/fields/__closed.js

@@ -1,8 +1,3 @@
 module.exports = {
-    ui: {
-        component: "UIHidden",
-    },
-    model: {
-        safe: require("../safety.protocols").systemManageable,
-    },
+    parent: 'not-node//boolean.system',
 };

package/src/core/fields/__latest.js

@@ -1,8 +1,6 @@
 module.exports = {
-    ui: {
-        component: "UIHidden",
-    },
-    model: {
-        safe: require("../safety.protocols").systemManageable,
-    },
+    parent: 'not-node//boolean.system',
+    model:{
+        default: true
+    }
 };

package/src/core/fields/__version.js

@@ -4,5 +4,9 @@ module.exports = {
     },
     model: {
         safe: require("../safety.protocols").systemManageable,
+        type: Number,
+        default: 0,
+        required: true,
+        validate: require('./validators/ID')
     },
 };

package/src/core/fields/__versions.js

@@ -4,5 +4,6 @@ module.exports = {
     },
     model: {
         safe: require("../safety.protocols").systemManageable,
+        validate: require('./validators/objectId.list')
     },
 };

package/src/core/fields/_id.js

@@ -1,3 +1,5 @@
+const ObjectId = require('mongoose').SchemaTypes.ObjectId;
+
 module.exports = {
     ui: {
         component: "UIHidden",
@@ -6,6 +8,8 @@ module.exports = {
         readonly: true,
     },
     model: {
+        type: ObjectId,
         safe: require("../safety.protocols").systemManageable,
+        validate: require('./validators/objectId')
     },
 };

package/src/core/fields/active.js

@@ -1,13 +1,6 @@
 module.exports = {
+    parent: 'not-node//boolean',
     ui: {
-        component: "UISwitch",
         label: "not-node:field_active_label",
-        default: false,
-    },
-    model: {
-        type: Boolean,
-        default: false,
-        required: true,
-        safe: require("../safety.protocols").ownerRootAdmin,
-    },
+    }
 };

package/src/core/fields/boolean.system.js

@@ -0,0 +1,11 @@
+module.exports = {   
+    ui: {
+        component: "UIHidden",
+    },
+    model: {
+        type: Boolean,
+        default: false,
+        required: true,
+        safe: require("not-node/src/core/safety.protocols").systemManageable,
+    },
+};

package/src/core/fields/createdAt.js

@@ -12,5 +12,6 @@ module.exports = {
         searchable: true,
         sortable: true,
         safe: require("../safety.protocols").systemManageable,
+        validate: require('./validators/date')
     },
 };

package/src/core/fields/default.js

@@ -1,13 +1,5 @@
+const { MODULE_NAME } = require("../const");
+
 module.exports = {
-    ui: {
-        component: "UISwitch",
-        label: "not-node:field_default_label",
-        default: false,
-    },
-    model: {
-        type: Boolean,
-        default: false,
-        required: true,
-        safe: require("../safety.protocols").ownerRootAdmin,
-    },
+    parent: `${MODULE_NAME}//boolean`
 };

package/src/core/fields/enabled.js

@@ -1,13 +1,11 @@
+const { MODULE_NAME } = require("../const");
+
 module.exports = {
-    ui: {
-        component: "UISwitch",
-        label: "not-node:field_enabled_label",
-        default: false,
+    parent: `${MODULE_NAME}//boolean`,
+    ui: {        
+        label: "not-node:field_enabled_label",        
     },
-    model: {
-        type: Boolean,
+    model: {        
         default: true,
-        required: true,
-        safe: require("../safety.protocols").ownerRootAdmin,
     },
 };

package/src/core/fields/expiredAt.js

@@ -11,5 +11,6 @@ module.exports = {
         searchable: true,
         sortable: true,
         safe: require("../safety.protocols").ownerRootAdmin,
+        validate: require('./validators/date')
     },
 };

package/src/core/fields/height.js

@@ -11,5 +11,6 @@ module.exports = {
         searchable: true,
         sortable: true,
         safe: require("../safety.protocols").ownerRootAdmin,
+        validate: require('./validators/positive.or.zero.number')
     },
 };

package/src/core/fields/owner.js

@@ -1,13 +1,13 @@
-const Schema = require("mongoose").Schema;
 const notFieldsFilter = require("../../fields/filter");
 const { ownerRootAdmin } = require("../safety.protocols");
 const { ACTION_SIGNATURES } = require("../../auth/const");
 
 module.exports = {
-    model: {
-        type: Schema.Types.ObjectId,
+    parent: 'not-node//objectId',
+    model: {        
         refPath: "ownerModel",
         required: false,
+        //owner cant change
         safe: notFieldsFilter.mergeSafetyProtocols(ownerRootAdmin, {
             [ACTION_SIGNATURES.CREATE]: ["-@owner"],
             [ACTION_SIGNATURES.UPDATE]: ["-@owner"],

package/src/core/fields/ownerModel.js

@@ -4,6 +4,7 @@ module.exports = {
         required: false,
         safe: require("../safety.protocols").ownerRootAdmin,
         transformers: ["xss"],
+        validate: require('./validators/modelName')
     },
     ui: {
         component: "UIHidden",

package/src/core/fields/price.js

@@ -11,5 +11,6 @@ module.exports = {
         searchable: true,
         sortable: true,
         safe: require("../safety.protocols").ownerRootAdmin,
+        validate: require('./validators/positive.or.zero.number')
     },
 };

package/src/core/fields/size.js

@@ -11,5 +11,6 @@ module.exports = {
         searchable: true,
         sortable: true,
         safe: require("../safety.protocols").ownerRootAdmin,
+        validate: require('./validators/positive.or.zero.number')
     },
 };

package/src/core/fields/updatedAt.js

@@ -11,7 +11,7 @@ module.exports = {
         type: Date,
         required: true,
         default: Date.now,
-
+        validate: require('./validators/date'),
         safe: require("../safety.protocols").systemManageable,
     },
 };

package/src/core/fields/userId.js

@@ -1,16 +1,15 @@
-const Schema = require("mongoose").Schema;
 
 module.exports = {
+    parent: 'not-node//objectId',
     ui: {
         component: "UITextfield",
         label: "not-node:field_userId_label",
         placeholder: "not-node:field_userId_placeholder",
         readonly: true,
     },
-    model: {
-        type: Schema.Types.ObjectId,
+    model: {        
         ref: "User",
         required: false,
-        safe: require("../safety.protocols").ownerRootAdmin,
+        default: undefined,        
     },
 };

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

@@ -0,0 +1,20 @@
+module.exports = [
+    {
+        validator(val) {
+            return !isNaN(val);
+        },
+        message: "not-node:value_is_not_number",
+    },
+    {
+        validator(val) {
+            return val.toString() === Math.round(val).toString;
+        },
+        message: "not-node:value_is_not_integer",
+    },    
+    {
+        validator(val) {
+            return val > 0;
+        },
+        message: "not-node:value_should_be_greater_than_zero",
+    },
+];

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

@@ -0,0 +1 @@
+module.exports = require('./boolean.system');

package/src/core/fields/validators/boolean.system.js

@@ -0,0 +1,8 @@
+module.exports = [
+    {
+        validator(val) {
+            return typeof val === 'boolean';
+        },
+        message: "not-node:value_is_not_boolean",
+    },
+];

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

@@ -0,0 +1,16 @@
+const { MODULE_NAME } = require("../../const");
+
+module.exports = [
+    {
+        validator: (val) => {
+            return typeof val === "string";
+        },
+        message: `${MODULE_NAME}:codeName_value_is_not_string`,
+    },
+    {
+        validator: (val) => {
+            return val.length;
+        },
+        message: `${MODULE_NAME}:codeName_value_is_empty`,
+    },
+];

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

@@ -0,0 +1,8 @@
+module.exports = [
+    {
+        validator(val, {validator}) {
+            return (val instanceof Date) || validator.isISO8601(val);
+        },
+        message: "not-node:value_is_not_date",
+    },
+];

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

@@ -0,0 +1,33 @@
+const { MODULE_NAME } = require("../../const");
+
+const DEFAULT_DESCRIPTION_MIN_LENGTH = 10;
+const DEFAULT_DESCRIPTION_MAX_LENGTH = 10000;
+
+module.exports = [
+    {
+        validator: (val) => {
+            return typeof val === "string";
+        },
+        message: `${MODULE_NAME}:description_value_is_not_string`,
+    },
+    {
+        validator: (val, { config }) => {
+            const MIN_LEN = config.get("fields.description.minLength") || DEFAULT_DESCRIPTION_MIN_LENGTH;
+            if (val.length < MIN_LEN) {
+                return false;
+            }
+            return true;
+        },
+        message: `${MODULE_NAME}:description_value_is_too_short`,
+    },
+    {
+        validator: (val, { config }) => {
+            const MAX_LEN = config.get("fields.description.maxLength") || DEFAULT_DESCRIPTION_MAX_LENGTH;
+            if (val.length > MAX_LEN) {
+                return false;
+            }
+            return true;
+        },
+        message: `${MODULE_NAME}:description_value_is_too_long`,
+    },
+];

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

@@ -0,0 +1,8 @@
+module.exports = [
+    {
+        validator(val, {validator}) {
+            return validator.isIP(val);
+        },
+        message: "not-node:value_is_not_ip_address",
+    },
+];

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

@@ -0,0 +1,16 @@
+const { MODULE_NAME } = require("not-node/src/core/const");
+
+module.exports = [
+    {
+        validator: (val) => {
+            return typeof val === "string";
+        },
+        message: `${MODULE_NAME}:modelName_value_is_not_string`,
+    },
+    {
+        validator: (val) => {
+            return val.length;
+        },
+        message: `${MODULE_NAME}:modelName_value_is_empty`,
+    },
+];

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

@@ -0,0 +1,10 @@
+
+
+module.exports = [    
+    {
+        validator: (val, { validator }) => {
+            return val.every((itm) => validator.isMongoId(itm));
+        },
+        message: `not-node:value_item_format_is_not_objectId`,
+    },
+];

package/src/core/fields/validators/objectId.list.js

@@ -0,0 +1,14 @@
+module.exports = [
+    {
+        validator: (val) => {
+            return Array.isArray(val);
+        },
+        message: `not-node:value_is_not_array`,
+    },    
+    {
+        validator: (val, { validator }) => {
+            return val.every((itm) => validator.isMongoId(itm));
+        },
+        message: `not-node:value_item_format_is_not_objectId`,
+    },
+];

package/src/core/fields/validators/positive.or.zero.number.js

@@ -0,0 +1,14 @@
+module.exports = [
+    {
+        validator(val) {
+            return !isNaN(val);
+        },
+        message: "not-node:value_is_not_number",
+    },      
+    {
+        validator(val) {
+            return (val > 0) && (val === 0);
+        },
+        message: "not-node:value_should_be_greater_than_zero",
+    },
+];

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

@@ -0,0 +1,10 @@
+const { MODULE_NAME } = require("not-node/src/core/const");
+
+module.exports = [
+    {
+        validator: (val) => {
+            return typeof val === "object";
+        },
+        message: `${MODULE_NAME}:requiredObject_value_is_not_object`,
+    },
+];

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

@@ -0,0 +1,16 @@
+const { MODULE_NAME } = require("not-node/src/core/const");
+
+module.exports = [
+    {
+        validator: (val) => {
+            return typeof val === "string";
+        },
+        message: `${MODULE_NAME}:session_value_is_not_string`,
+    },
+    {
+        validator: (val) => {
+            return val.length;
+        },
+        message: `${MODULE_NAME}:session_value_is_empty`,
+    },
+];

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

@@ -0,0 +1,8 @@
+module.exports = [
+    {
+        validator(val, { validator }) {
+            return validator.isMobilePhone(val);
+        },
+        message: "not-node:telephone_is_not_valid",
+    },
+];

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

@@ -0,0 +1,16 @@
+const { MODULE_NAME } = require("not-node/src/core/const");
+
+module.exports = [
+    {
+        validator: (val) => {
+            return typeof val === "string";
+        },
+        message: `${MODULE_NAME}:title_value_is_not_string`,
+    },
+    {
+        validator: (val) => {
+            return val.length;
+        },
+        message: `${MODULE_NAME}:title_value_is_empty`,
+    },
+];

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

@@ -0,0 +1,8 @@
+module.exports = [
+    {
+        validator(val, { validator }) {
+            return validator.isUUID(val);
+        },
+        message: "not-node:uuid_is_not_valid",
+    },
+];

package/src/core/fields/width.js

@@ -11,5 +11,6 @@ module.exports = {
         searchable: true,
         sortable: true,
         safe: require("../safety.protocols").ownerRootAdmin,
+        validate: require('./validators/positive.or.zero.number')
     },
 };

package/src/core/index.js

@@ -1,6 +1,6 @@
 const { generatePaths } = require("../common");
-
+const {MODULE_NAME} = require('./const.js');
 module.exports = {
-    name: "not-node",
+    name: MODULE_NAME,
     paths: generatePaths(["fields", "locales"], __dirname),
 };

package/src/init/lib/app.js

@@ -80,9 +80,12 @@ module.exports = class InitApp {
     }
 
     printReportByPostponedFieldsRegistrator() {
-        const report = notAppPostponedFieldsRegistrator.report();
-        if (Object.keys(report).length) {
-            log?.error(report);
+        const report = notAppPostponedFieldsRegistrator.state();
+        if (Object.keys(report.unresolved).length) {
+            log?.error(report.unresolved);
+        }
+        if (report.insecure.length) {
+            log?.error(`List of insecure fields (${report.insecure.length}): `, report.insecure.join(', '));
         }
     }
 };

package/src/manifest/registrator/fields.js

@@ -52,13 +52,27 @@ module.exports = class notModuleRegistratorFields {
      */
     static registerField({ nModule, name, field, fromPath }) {
         const MODULE_NAME = nModule.getName();
-        if (notAppPostponedFieldsRegistrator.fieldShouldBePostponed(field)) {
+        if (
+            notAppPostponedFieldsRegistrator.fieldShouldBePostponed(
+                field,
+                nModule
+            )
+        ) {
             notAppPostponedFieldsRegistrator.add(
                 field.parent,
                 MODULE_NAME,
                 fromPath
             );
             return;
+        } else if (field.parent) {
+            const parentFieldValue =
+                notAppPostponedFieldsRegistrator.findParentField(
+                    field.parent,
+                    nModule
+                );
+            if (parentFieldValue) {
+                field = Fields.mutateField(parentFieldValue, field);
+            }
         }
         const fieldValidatorsCount = this.extendByFrontValidators({
             name,
@@ -66,14 +80,31 @@ module.exports = class notModuleRegistratorFields {
             fromPath: path.dirname(fromPath),
         });
         nModule.setField(name, field);
-        log(`${MODULE_NAME}//${name} with ${fieldValidatorsCount} validators`);
+        log(
+            `${MODULE_NAME}//${name} with ${fieldValidatorsCount ?? 0}/${
+                field?.model?.validate?.length ?? 0
+            } validators`
+        );
+        this.registerFieldIfInsecure(field, nModule, name);
         notAppPostponedFieldsRegistrator.registerPostponedChildren(
+            nModule,
             this,
             MODULE_NAME,
             `${MODULE_NAME}//${name}`
         );
     }
 
+    static registerFieldIfInsecure(field, nModule, name) {
+        if (
+            field.model &&
+            (!field.model.validate || field.model.validate.length === 0)
+        ) {
+            notAppPostponedFieldsRegistrator.registerInsecureField(
+                `${nModule.getName()}//${name}`
+            );
+        }
+    }
+
     static findValidatorsFile(
         name,
         fromPath,

package/src/manifest/registrator/fields.postponed.js

@@ -1,5 +1,7 @@
 const path = require("path");
 const getApp = require("../../getApp");
+const { mutateField } = require("../../fields");
+const { log } = require("not-log")(module, "register//fields.postponed");
 
 /**
  * @typedef     {object}    WaitingField
@@ -15,6 +17,7 @@ class notAppPostponedFieldsRegistrator {
      * @memberof notModuleRegistratorFields
      */
     static #waitingList = {};
+    static #insecureList = [];
 
     /**
      *
@@ -26,6 +29,10 @@ class notAppPostponedFieldsRegistrator {
      * @memberof notModuleRegistratorFields
      */
     static add(parentFieldName, moduleName, pathToField) {
+        const parts = path.parse(pathToField);
+        log(
+            `field ${parentFieldName} not registered yet, field ${moduleName}//${parts.name} postponed`
+        );
         if (!Object.hasOwn(this.#waitingList, parentFieldName)) {
             this.#waitingList[parentFieldName] = [];
         }
@@ -63,6 +70,15 @@ class notAppPostponedFieldsRegistrator {
         }
     }
 
+    static findParentField(fielName, nModule) {
+        const [parentFieldModule, parentFieldName] = fielName.split("//");
+        if (parentFieldModule === nModule.getName()) {
+            return nModule.getField(parentFieldName);
+        } else {
+            return getApp().getField(fielName);
+        }
+    }
+
     /**
      * If parent fields exists in childField description and
      * parent field is not registered yet - returns true
@@ -72,7 +88,7 @@ class notAppPostponedFieldsRegistrator {
      * @return {boolean}
      * @memberof notAppPostponedFieldsRegistrator
      */
-    static fieldShouldBePostponed(childField) {
+    static fieldShouldBePostponed(childField, nModule) {
         if (Object.hasOwn(childField, "parent")) {
             if (
                 childField.parent &&
@@ -80,8 +96,13 @@ class notAppPostponedFieldsRegistrator {
                 childField.parent.length > 4 &&
                 childField.parent.indexOf("//") > 0
             ) {
-                const parentField = getApp().getField(childField.parent);
-                return !parentField;
+                const parentField = this.findParentField(
+                    childField.parent,
+                    nModule
+                );
+                if (!parentField) {
+                    return true;
+                }
             }
         }
         return false;
@@ -95,15 +116,30 @@ class notAppPostponedFieldsRegistrator {
      * @memberof notAppPostponedFieldsRegistrator
      */
     static state() {
+        return {
+            unresolved: this.getStateUnresolved(),
+            insecure: this.getStateInsecure(),
+        };
+    }
+
+    static getStateUnresolved() {
         const result = {};
         Object.keys(this.#waitingList).forEach((parentField) => {
-            result[parentField] = this.#waitingList.map(
+            result[parentField] = this.#waitingList[parentField].map(
                 (itm) => itm.pathToField
             );
         });
         return result;
     }
 
+    static getStateInsecure() {
+        return this.#insecureList;
+    }
+
+    static registerInsecureField(fullFieldName) {
+        this.#insecureList.push(fullFieldName);
+    }
+
     /**
      *
      *
@@ -113,21 +149,46 @@ class notAppPostponedFieldsRegistrator {
      * @param {string} fullFieldName
      * @memberof notAppPostponedFieldsRegistrator
      */
-    static registerPostponedChildren(registrator, MODULE_NAME, fullFieldName) {
+    static registerPostponedChildren(
+        nModuleNotRegistred,
+        registrator,
+        MODULE_NAME,
+        fullFieldName
+    ) {
         const list = this.getChildren(fullFieldName);
-        list.forEach((childField) => {
-            const nModule = getApp().getModule(MODULE_NAME);
-            const fieldFile = registrator.reopenCached(childField.pathToField);
-            const parts = path.parse(childField.pathToField);
-            registrator.registerField({
-                nModule,
-                name: parts.name, //fields name
-                field: fieldFile, //field description
-                fromPath: childField.pathToField,
+
+        if (list.length) {
+            const nModule =
+                (getApp && getApp().getModule(MODULE_NAME)) ||
+                nModuleNotRegistred;
+            log(
+                `running registration of fields (${list.length}) derived from ${fullFieldName}`
+            );
+            list.forEach((childField) => {
+                const fieldFile = registrator.reopenCached(
+                    childField.pathToField
+                );
+                const resultedField = this.mutateOriginal(
+                    fullFieldName,
+                    nModule,
+                    fieldFile
+                );
+                const parts = path.parse(childField.pathToField);
+                registrator.registerField({
+                    nModule,
+                    name: parts.name, //fields name
+                    field: resultedField, //field description
+                    fromPath: childField.pathToField,
+                });
             });
-        });
+        }
         this.clearList(fullFieldName);
     }
+
+    static mutateOriginal(fullFieldName, nModule, mutator) {
+        const parentField = this.findParentField(fullFieldName, nModule);
+        return mutateField(parentField, mutator);
+    }
 }
 
 module.exports = notAppPostponedFieldsRegistrator;

package/test/module/fields.js

@@ -169,6 +169,7 @@ module.exports = ({ expect }) => {
                 let FIELDS = {};
                 const ctx = {
                     extendByFrontValidators() {},
+                    registerFieldIfInsecure() {},
                 };
                 const param = {
                     name: "single",