not-node 5.1.36 → 5.1.39

package/package.json

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

package/src/bootstrap/route.js

@@ -1,8 +1,14 @@
 const getApp = require("../getApp.js"),
+    Form = require("../form").Form,
     HttpExceptions = require("../exceptions/http"),
     configInit = require("not-config"),
     { sayForModule } = require("not-locale"),
-    { objHas, isFunc, executeFunctionAsAsync } = require("../common"),
+    {
+        objHas,
+        isFunc,
+        executeFunctionAsAsync,
+        firstLetterToUpper,
+    } = require("../common"),
     LogInit = require("not-log");
 
 module.exports = ({
@@ -79,6 +85,23 @@ module.exports = ({
         }
     };
 
+    const createDefaultForm = function ({ actionName }) {
+        const FIELDS = [
+            ["activeUser", "not-node//requiredObject"],
+            ["data", `${MODULE_NAME}//_data`],
+            ["ip", "not-node//ip"],
+        ];
+        const FORM_NAME = `${MODULE_NAME}:${firstLetterToUpper(
+            actionName
+        )}Form`;
+        const cls = class extends Form {
+            constructor({ app }) {
+                super({ FIELDS, FORM_NAME, app, MODULE_NAME });
+            }
+        };
+        return new cls({ app: getApp() });
+    };
+
     const getForm = (actionName) => {
         const form = getApp().getForm(
             [MODULE_NAME, `${MODEL_NAME}.${actionName}`].join("//")
@@ -86,7 +109,11 @@ module.exports = ({
         if (form) {
             return form;
         }
-        return getApp().getForm([MODULE_NAME, actionName].join("//"));
+        const form2 = getApp().getForm([MODULE_NAME, actionName].join("//"));
+        if (form2) {
+            return form2;
+        }
+        return createDefaultForm({ actionName, MODULE_NAME });
     };
 
     const beforeDecorator = async (req, res, next) => {

package/src/core/fields/ID.js

@@ -5,4 +5,8 @@ module.exports = {
         label: "not-node:field_ID_label",
         readonly: true,
     },
+    model: {
+        type: Number,
+        required: true,
+    },
 };

package/src/fields/index.js

@@ -63,7 +63,7 @@ module.exports.initSchemaField = (
     let proto = findFieldPrototype(app, srcName, type);
     if (!proto) {
         error(
-            `field ${moduleName}//${destName} prototype ${srcName} of ${type} type is not found`
+            `${type} field ${moduleName}//${destName} prototype ${srcName}  is not found`
         );
     }
     let schemaFieldValue = Object.assign({}, clone(proto), mutation);
@@ -102,7 +102,7 @@ const parseFieldDescription = (field) => {
     } else {
         if (field.includes(DEFAULT_SPLITER)) {
             //form 5
-            destName = field.split(DEFAULT_SPLITER)[0];
+            destName = field.split(DEFAULT_SPLITER)[1];
             srcName = field;
         } else {
             destName = srcName = field; //form 1

package/src/manifest/module.js

@@ -208,11 +208,16 @@ class notModule {
     }
 
     getStatus() {
+        const fieldsList = Object.keys(this.fields);
         const formsList = Object.keys(this.forms);
         const modelsList = Object.keys(this.models);
         const routesList = Object.keys(this.routes);
         const actionsList = this.getActionsList();
         return {
+            fields: {
+                count: fieldsList.length,
+                list: fieldsList,
+            },
             forms: {
                 count: formsList.length,
                 list: formsList,
@@ -373,6 +378,19 @@ class notModule {
             this.routesWS[collectionType][collectionName][endPointType] = {};
         }
     }
+
+    printOutModuleContent() {
+        const status = this.getStatus();
+        Object.keys(status).forEach((contentType) => {
+            if (status[contentType].count) {
+                log.log(
+                    `${this.getName()} ${contentType}(${
+                        status[contentType].count
+                    }): ${status[contentType].list.join(", ")}`
+                );
+            }
+        });
+    }
 }
 
 module.exports = notModule;

package/src/model/exceptions.js

@@ -7,13 +7,13 @@ class VersioningExceptionSameOldData extends notError {
 }
 module.exports.VersioningExceptionSameOldData = VersioningExceptionSameOldData;
 
-class VersioningExceptionNoPpreviousVersions extends notError {
+class VersioningExceptioNoPreviousVersions extends notError {
     constructor() {
         super("not-node:versioning_error_no_previous_versions");
     }
 }
-module.exports.VersioningExceptionNoPpreviousVersions =
-    VersioningExceptionNoPpreviousVersions;
+module.exports.VersioningExceptioNoPreviousVersions =
+    VersioningExceptioNoPreviousVersions;
 
 class IncrementExceptionIDGeneratorRebaseFailed extends notError {
     constructor() {

package/src/model/routine.js

@@ -2,7 +2,7 @@
 
 const incrementNext = require("./increment");
 const { DBExceptionUpdateOneWasNotSuccessful } = require("../exceptions/db");
-const { updateResponseSuccess } = require("./utils");
+//const { updateResponseSuccess } = require("./utils");
 class ModelRoutine {
     static incremental(model) {
         return model.schema.statics.__incField;
@@ -57,6 +57,7 @@ class ModelRoutine {
         return model
             .findOneAndUpdate(filter, data, {
                 returnOriginal: false,
+                returnDocument: "fater",
                 new: true,
             })
             .exec();
@@ -65,11 +66,15 @@ class ModelRoutine {
     static async updateWithVersion(model, filter, data) {
         filter.__latest = true;
         filter.__closed = false;
-        const result = await model.updateOne(filter, data, {
-            returnOriginal: false,
-        });
-        if (updateResponseSuccess(result, 1)) {
-            return model.saveVersion(filter._id);
+        const result = await model
+            .findOneAndUpdate(filter, data, {
+                returnOriginal: false,
+                returnDocument: "fater",
+                new: true,
+            })
+            .exec();
+        if (result) {
+            return model.saveVersion(result._id);
         } else {
             throw new DBExceptionUpdateOneWasNotSuccessful();
         }

package/src/model/versioning.js

@@ -12,7 +12,7 @@ const TECH_FIELDS = [
 ];
 
 const {
-    VersioningExceptioNoPpreviousVersions,
+    VersioningExceptioNoPreviousVersions,
     VersioningExceptionSameOldData,
 } = require("./exceptions.js");
 
@@ -74,7 +74,7 @@ class ModelVersioning {
                 previous.toObject()
             );
         } else {
-            throw new VersioningExceptioNoPpreviousVersions();
+            throw new VersioningExceptioNoPreviousVersions();
         }
     }