not-node 6.5.50 → 6.5.53

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "not-node",
-	"version": "6.5.50",
+	"version": "6.5.53",
 	"description": "node complimentary part for client side notFramework.",
 	"main": "index.js",
 	"scripts": {
@@ -136,4 +136,4 @@
 			]
 		}
 	}
-}
+}

package/src/auth/const.js

@@ -11,6 +11,16 @@ const ACTION_SIGNATURE_UPDATE = "update";
 const ACTION_SIGNATURE_DELETE = "delete";
 const ACTION_SIGNATURE_ANY = "any";
 
+const ACCESS_SPECIAL_ALL = "@*";
+const ACCESS_SPECIAL_OWNER = "@owner";
+const ACCESS_SPECIAL_SYSTEM = "@system";
+
+const ACCESS_SPECIALS = {
+    ALL: ACCESS_SPECIAL_ALL,
+    OWNER: ACCESS_SPECIAL_OWNER,
+    SYSTEM: ACCESS_SPECIAL_SYSTEM,
+};
+
 const ACTION_SIGNATURES = {
     CREATE: ACTION_SIGNATURE_CREATE,
     READ: ACTION_SIGNATURE_READ,
@@ -45,4 +55,5 @@ module.exports = {
     DOCUMENT_SESSION_FIELD_NAME,
     ACTION_SIGNATURES,
     METHOD_SIGNAURES,
+    ACCESS_SPECIALS,
 };

package/src/auth/fields.js

@@ -43,16 +43,16 @@ function isOwner(
 }
 
 /**
- * Checks if safe field rule is some sort variant of wild card
+ * Checks if safe field rule is some sort variant of wild card "@*" or "*"
  * @param {string|Array<string>}   safeFor safe field rule
  * @return {boolean}               if it's wildcard
  *
  */
 function ruleIsWildcard(safeFor) {
     if (Array.isArray(safeFor)) {
-        return safeFor.includes("*");
+        return safeFor.includes("@*") || safeFor.includes("*");
     } else {
-        return safeFor === "*";
+        return safeFor === "@*" || safeFor === "*";
     }
 }
 

package/src/core/safety.protocols.js

@@ -1,4 +1,4 @@
-const { ACTION_SIGNATURES } = require("../auth/const");
+const { ACTION_SIGNATURES, ACCESS_SPECIALS } = require("../auth/const");
 
 module.exports.rootAdmin = Object.freeze({
     [ACTION_SIGNATURES.CREATE]: ["root", "admin"],
@@ -9,14 +9,14 @@ module.exports.rootAdmin = Object.freeze({
 
 module.exports.rootAdminCRUD_ownerR = Object.freeze({
     [ACTION_SIGNATURES.CREATE]: ["root", "admin"],
-    [ACTION_SIGNATURES.READ]: ["root", "admin", "@owner"],
+    [ACTION_SIGNATURES.READ]: ["root", "admin", ACCESS_SPECIALS.OWNER],
     [ACTION_SIGNATURES.UPDATE]: ["root", "admin"],
     [ACTION_SIGNATURES.DELETE]: ["root", "admin"],
 });
 
 module.exports.rootAdminCRUD_allR = Object.freeze({
     [ACTION_SIGNATURES.CREATE]: ["root", "admin"],
-    [ACTION_SIGNATURES.READ]: ["root", "admin", "@*"],
+    [ACTION_SIGNATURES.READ]: ["root", "admin", ACCESS_SPECIALS.ALL],
     [ACTION_SIGNATURES.UPDATE]: ["root", "admin"],
     [ACTION_SIGNATURES.DELETE]: ["root", "admin"],
 });
@@ -26,20 +26,25 @@ module.exports.rootAdminCRUD_allR = Object.freeze({
  * root, admin - any own and any of client, user, guest
  */
 module.exports.ownerRootAdmin = Object.freeze({
-    [ACTION_SIGNATURES.CREATE]: ["@owner", "root", "admin"],
-    [ACTION_SIGNATURES.READ]: ["@owner", "root", "admin"],
-    [ACTION_SIGNATURES.UPDATE]: ["@owner", "root", "admin"],
-    [ACTION_SIGNATURES.DELETE]: ["@owner", "root", "admin"],
+    [ACTION_SIGNATURES.CREATE]: [ACCESS_SPECIALS.OWNER, "root", "admin"],
+    [ACTION_SIGNATURES.READ]: [ACCESS_SPECIALS.OWNER, "root", "admin"],
+    [ACTION_SIGNATURES.UPDATE]: [ACCESS_SPECIALS.OWNER, "root", "admin"],
+    [ACTION_SIGNATURES.DELETE]: [ACCESS_SPECIALS.OWNER, "root", "admin"],
 });
 
 /**
  *  same as above but client can create new documents
  */
 module.exports.ownerRootAdminCRUD_clientC = Object.freeze({
-    [ACTION_SIGNATURES.CREATE]: ["@owner", "root", "admin", "client"],
-    [ACTION_SIGNATURES.READ]: ["@owner", "root", "admin"],
-    [ACTION_SIGNATURES.UPDATE]: ["@owner", "root", "admin"],
-    [ACTION_SIGNATURES.DELETE]: ["@owner", "root", "admin"],
+    [ACTION_SIGNATURES.CREATE]: [
+        ACCESS_SPECIALS.OWNER,
+        "root",
+        "admin",
+        "client",
+    ],
+    [ACTION_SIGNATURES.READ]: [ACCESS_SPECIALS.OWNER, "root", "admin"],
+    [ACTION_SIGNATURES.UPDATE]: [ACCESS_SPECIALS.OWNER, "root", "admin"],
+    [ACTION_SIGNATURES.DELETE]: [ACCESS_SPECIALS.OWNER, "root", "admin"],
 });
 
 /**
@@ -47,17 +52,22 @@ module.exports.ownerRootAdminCRUD_clientC = Object.freeze({
  * owner, root, admin could read
  */
 module.exports.systemManageable = Object.freeze({
-    [ACTION_SIGNATURES.CREATE]: ["@system"],
-    [ACTION_SIGNATURES.READ]: ["@system", "@owner", "root", "admin"],
-    [ACTION_SIGNATURES.UPDATE]: ["@system"],
-    [ACTION_SIGNATURES.DELETE]: ["@system"],
+    [ACTION_SIGNATURES.CREATE]: [ACCESS_SPECIALS.SYSTEM],
+    [ACTION_SIGNATURES.READ]: [
+        ACCESS_SPECIALS.SYSTEM,
+        ACCESS_SPECIALS.OWNER,
+        "root",
+        "admin",
+    ],
+    [ACTION_SIGNATURES.UPDATE]: [ACCESS_SPECIALS.SYSTEM],
+    [ACTION_SIGNATURES.DELETE]: [ACCESS_SPECIALS.SYSTEM],
 });
 
 module.exports.systemManageableSecret = Object.freeze({
-    [ACTION_SIGNATURES.CREATE]: ["@system"],
-    [ACTION_SIGNATURES.READ]: ["@system"],
-    [ACTION_SIGNATURES.UPDATE]: ["@system"],
-    [ACTION_SIGNATURES.DELETE]: ["@system"],
+    [ACTION_SIGNATURES.CREATE]: [ACCESS_SPECIALS.SYSTEM],
+    [ACTION_SIGNATURES.READ]: [ACCESS_SPECIALS.SYSTEM],
+    [ACTION_SIGNATURES.UPDATE]: [ACCESS_SPECIALS.SYSTEM],
+    [ACTION_SIGNATURES.DELETE]: [ACCESS_SPECIALS.SYSTEM],
 });
 
 /**
@@ -65,7 +75,7 @@ module.exports.systemManageableSecret = Object.freeze({
  */
 module.exports.publicReadable = Object.freeze({
     [ACTION_SIGNATURES.CREATE]: [],
-    [ACTION_SIGNATURES.READ]: ["@*"],
+    [ACTION_SIGNATURES.READ]: [ACCESS_SPECIALS.ALL],
     [ACTION_SIGNATURES.UPDATE]: [],
     [ACTION_SIGNATURES.DELETE]: [],
 });

package/src/domain.js

@@ -9,6 +9,8 @@ const {
     objHas,
     firstLetterToUpper,
 } = require("./common");
+
+const { RESOURCES_PATH_SPLITTER } = require("./manifest/const");
 const { error } = require("not-log")(module, "domain");
 const Env = require("./env");
 const notModule = require("./manifest/module"),
@@ -142,7 +144,9 @@ class notDomain extends EventEmitter {
      **/
     getRoute(name) {
         if (name.indexOf("//") > 0) {
-            let [moduleName, routeName, routeFunctionName] = name.split("//");
+            let [moduleName, routeName, routeFunctionName] = name.split(
+                RESOURCES_PATH_SPLITTER
+            );
             if (this.modules && objHas(this.modules, moduleName)) {
                 let route = this.getModule(moduleName).getRoute(routeName);
                 if (objHas(route, routeFunctionName)) {
@@ -186,8 +190,20 @@ class notDomain extends EventEmitter {
         return this.getByPath(name, type);
     }
 
+    getModelsNames(full = false) {
+        const list = [];
+        Object.values(this.modules).forEach((mod) => {
+            list.push(...mod.getModelsNames(full));
+        });
+        return list;
+    }
+
+    getFullModelsNames() {
+        return this.getModelsNames(true);
+    }
+
     getByFullPath(name, type) {
-        let [moduleName, resourceName] = name.split("//");
+        let [moduleName, resourceName] = name.split(RESOURCES_PATH_SPLITTER);
         if (this.modules && objHas(this.modules, moduleName)) {
             return this.getModule(moduleName)[`get${firstLetterToUpper(type)}`](
                 resourceName
@@ -255,7 +271,7 @@ class notDomain extends EventEmitter {
     }
 
     getByPath(name, type) {
-        if (name.indexOf("//") > 0) {
+        if (name.indexOf(RESOURCES_PATH_SPLITTER) > 0) {
             return this.getByFullPath(name, type);
         } else {
             return this.getByShortPath(name, type);
@@ -471,7 +487,8 @@ class notDomain extends EventEmitter {
             for (let t of ["routes", "models", "actions", "forms"]) {
                 stats[t].list.push(
                     ...modStatus[t].list.map(
-                        (itmName) => `${modName}//${itmName}`
+                        (itmName) =>
+                            `${modName}${RESOURCES_PATH_SPLITTER}${itmName}`
                     )
                 );
             }

package/src/fields/index.js

@@ -138,7 +138,7 @@ const filterOutPrivateFieldsFromNormalizedFieldDescription = (
     };
 };
 
-const normalizeFieldsDescriptionsList = (list) => {
+const normalizeFieldsDescriptionsList = (list = []) => {
     return list.map(parseFieldDescription);
 };
 module.exports.normalizeFieldsDescriptionsList =

package/src/manifest/const.js

@@ -5,6 +5,7 @@ const ACTION_DATA_TYPE_FILTER = "filter";
 const ACTION_DATA_TYPE_SEARCH = "search";
 const ACTION_DATA_TYPE_RETURN = "return";
 
+
 const ACTION_DATA_TYPES = Object.freeze({
     DATA: ACTION_DATA_TYPE_DATA,
     PAGER: ACTION_DATA_TYPE_PAGER,
@@ -16,3 +17,7 @@ const ACTION_DATA_TYPES = Object.freeze({
 
 module.exports.ACTION_DATA_TYPES = ACTION_DATA_TYPES;
 module.exports.ACTION_DATA_TYPES_VALUES = Object.values(ACTION_DATA_TYPES);
+
+
+const RESOURCES_PATH_SPLITTER = "//";
+module.exports.RESOURCES_PATH_SPLITTER = RESOURCES_PATH_SPLITTER;

package/src/manifest/module.js

@@ -8,6 +8,8 @@ const fs = require("fs"),
     notModuleInitializator = require("./initializator"),
     { objHas, mapBind, executeObjectFunction } = require("../common");
 
+const {RESOURCES_PATH_SPLITTER} = require('./const.js');
+
 /**
  * Standart splitter of module resources paths
  * @constant
@@ -146,6 +148,16 @@ class notModule {
         return this.models;
     }
 
+    getModelsNames(full = false){
+        const list = Object.keys(this.models);
+        if(full){
+            const moduleName = this.getName();
+            return list.map(name=> `${moduleName}${RESOURCES_PATH_SPLITTER}${name}`);
+        }else{
+            return list;
+        }
+    }
+
     getLogicFile(logicName) {
         if (this.logics && objHas(this.logics, logicName)) {
             return this.logics[logicName];

package/src/manifest/route.js

@@ -231,7 +231,7 @@ class notRoute {
         try {
             let prepared = undefined;
             //waiting preparation
-            if (modRoute[CONST_AFTER_ACTION]) {
+            if (modRoute[CONST_BEFORE_ACTION]) {
                 prepared = await this.executeFunction(
                     modRoute,
                     CONST_BEFORE_ACTION,
@@ -255,6 +255,11 @@ class notRoute {
                         itm && itm.toObject ? itm.toObject() : itm
                     );
                 }
+                if (Object.hasOwn(result, 'list') && Array.isArray(result.list)) {
+                    result.list = result.list.map((itm) =>
+                        itm && itm.toObject ? itm.toObject() : itm
+                    );
+                }
                 notManifestRouteResultFilter.filter(
                     req.notRouteData,
                     result,

package/src/model/default.js

@@ -273,11 +273,15 @@ function listAll(filter = null) {
  *	By default sorts by _id in DESC
  *	@static
  *	@param	{object|array} 	populate	populate rules
+ *	@param	{object|array} 	filter		filter rules
  *	@return {Promise}					Promise
  */
-function listAllAndPopulate(populate) {
-    let by = defaultFilter(this),
-        query = this.find(by);
+function listAllAndPopulate(populate, filter = null) {
+    let by = defaultFilter(this);
+    if (filter) {
+        by = notQuery.filter.modifyRules(by, filter);
+    }
+    const query = this.find(by);
     query.sort(defaultSorter());
     populateQuery(query, populate, this.schema.statics.__versioning);
     return query.exec();

package/src/model/routine.js

@@ -81,7 +81,6 @@ class ModelRoutine {
             {
                 returnOriginal: false,
                 returnDocument: "after",
-                new: true,
             }
         )
             .exec()
@@ -104,10 +103,8 @@ class ModelRoutine {
                 const updateResult = await ModelConstructor.findOneAndUpdate(
                     filter,
                     { $set: data },
-                    {
-                        returnOriginal: false,
-                        returnDocument: "after",
-                        new: true,
+                    {                        
+                        returnDocument: "after"
                     }
                 );
                 if (updateResult) {

package/src/model/versioning.js

@@ -103,7 +103,7 @@ class ModelVersioning {
             await versionDoc.save();
             //updating history
             let originalDoc = await ModelConstructor.findOne({ _id: id });
-            originalDoc.__version = preservedVersionNumber + 1;
+            originalDoc.__version = preservedVersionNumber + 1;            
             ModelVersioning.addVersionToHistory(originalDoc, versionDoc);
             return await originalDoc.save();
         }
@@ -128,7 +128,7 @@ class ModelVersioning {
         //const findById = getFunc(thisModel,'findById');
         let originalDoc = await ModelConstructor.findOne({ _id: id });
         //first version
-        originalDoc.__version = 1;
+        originalDoc.__version = 1;        
         //adding to history
         ModelVersioning.addVersionToHistory(originalDoc, versionDoc);
         return await originalDoc.save();

package/test/filter.js

@@ -22,7 +22,7 @@ const SCHEMA = () => {
             type: String,
             safe: {
                 update: ["@system", "@owner", "root", "admin"],
-                read: ["*"],
+                read: ["@*"],
             },
         },
         salt: {
@@ -66,10 +66,13 @@ const SCHEMA = () => {
             required: false,
             searchable: true,
             default: "ru",
-            safe: {
-                update: ["@system", "@owner", "root", "admin"],
-                read: ["*"],
-            },
+            safe: notFieldsFilter.mergeSafetyProtocols(
+                {
+                    update: ["@system", "@owner", "root", "admin"],
+                    read: "*",
+                },
+                safetyProtocols.publicReadable
+            ),
         },
         email: {
             type: String,

package/test/notManifestFilter.js

@@ -98,7 +98,7 @@ const rawRoutesManifest = {
 describe("notManifestFilter", function () {
     describe("clearActionFromRules", function () {
         const spGuestC = Object.freeze({
-            [ACTION_SIGNATURES.CREATE]: ["root", "admin", "@*"],
+            [ACTION_SIGNATURES.CREATE]: ["root", "admin", "*"],
             [ACTION_SIGNATURES.READ]: ["root", "admin"],
             [ACTION_SIGNATURES.UPDATE]: ["root", "admin"],
             [ACTION_SIGNATURES.DELETE]: ["root", "admin"],