not-node 6.5.9 → 6.5.11

package/package.json

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

package/src/form/env_extractors/query.js

@@ -13,8 +13,13 @@ const extractors = Object.freeze({
     [ACTION_DATA_TYPES.SORTER]: (result, req, thisSchema) => {
         result.sorter = notFilter.sorter.process(req, thisSchema);
     },
-    [ACTION_DATA_TYPES.SEARCH]: (result, req, thisSchema) => {
-        result.search = notFilter.search.process(req, thisSchema);
+    [ACTION_DATA_TYPES.SEARCH]: (result, req, thisSchema, formOptions) => {
+        result.search = notFilter.search.process(
+            req,
+            thisSchema,
+            {},
+            formOptions
+        );
     },
     [ACTION_DATA_TYPES.FILTER]: (result, req, thisSchema) => {
         result.filter = notFilter.filter.process(req, thisSchema);
@@ -44,13 +49,15 @@ module.exports = (form, req) => {
     }
     if (thisSchema) {
         let result = {};
+        const formOptions = form.getExtractorsOptions();
         const routeActionDataTypes = form.getActionDataDataTypes(req);
         Object.values(ACTION_DATA_TYPES).forEach((dataType) => {
             if (
                 routeActionDataTypes.includes(dataType) &&
+                // @ts-ignore
                 Object.hasOwn(extractors, dataType)
             ) {
-                extractors[dataType](result, req, thisSchema);
+                extractors[dataType](result, req, thisSchema, formOptions);
             }
         });
 

package/src/form/form.js

@@ -203,6 +203,10 @@ class Form {
         }
     }
 
+    getExtractorsOptions() {
+        return {};
+    }
+
     /**
      *
      *

package/src/logic/actions/standart/listAndCount.js

@@ -13,6 +13,7 @@ module.exports = class ListAndCountAction {
             const result = await logic
                 .getModel()
                 .listAndCount(skip, size, sorter, filter, search, populate);
+            result.list = result.list.map((item) => item.toObject());
             logic.logAction(actionName, identity, {});
             return result;
         } catch (e) {

package/src/model/default.js

@@ -283,6 +283,14 @@ function listAllAndPopulate(populate) {
     return query.exec();
 }
 
+const getPageNumber = (skip, size) => {
+    if (skip === 0) {
+        return 0;
+    } else {
+        return Math.floor(skip / size); //
+    }
+};
+
 /**
  *	List record in collection and populates, with count of total founded records
  *	By default sorts by _id in DESC
@@ -305,11 +313,12 @@ async function listAndCount(skip, size, sorter, filter, search, populate = []) {
         ),
         countQuery = this.countWithFilter(search || filter);
     const [list, count] = await Promise.all([listQuery, countQuery]);
+
     return {
         list,
         skip,
         count,
-        page: Math.floor(skip / size) + (skip % size === 0 ? 1 : 0),
+        page: getPageNumber(skip, size),
         pages: Math.ceil(count / size),
     };
 }

package/src/types.js

@@ -1,6 +1,6 @@
 /**
  * @typedef     {object}    notAppResponse
- * @property    {string}            status      ok or error
+ * @property    {string}            status      'ok' or 'error'
  * @property    {string}            message
  * @property    {Array<string>|Object<string, Array<string>>}     [errors]
  * @property    {object}            [result]

package/test/model/default.js

@@ -907,7 +907,7 @@ module.exports = ({
                 expect(res.list).to.be.deep.equal([1, 2, 3, 4]);
                 expect(res.count).to.be.equal(24);
                 expect(res.skip).to.be.equal(skip);
-                expect(res.page).to.be.equal(2);
+                expect(res.page).to.be.equal(1);
                 expect(res.pages).to.be.equal(2);
             });
         });

package/.eslintrc.json

@@ -1,36 +0,0 @@
-{
-    "parserOptions": {
-        "requireConfigFile": false,
-        "sourceType": "module",
-        "allowImportExportEverywhere": false,
-        "ecmaFeatures": {
-            "globalReturn": false
-        },
-        "ecmaVersion": "latest"
-    },
-    "env": {
-        "es6": true,
-        "node": true,
-        "mongo": true,
-        "mocha": true
-    },
-    "extends": [
-        "eslint:recommended",
-        "plugin:node/recommended",
-        "plugin:sonarjs/recommended"
-    ],
-    "rules": {
-        "node/exports-style": ["error", "module.exports"],
-        "node/file-extension-in-import": ["error", "always"],
-        "node/prefer-global/buffer": ["error", "always"],
-        "node/prefer-global/console": ["error", "always"],
-        "node/prefer-global/process": ["error", "always"],
-        "node/prefer-global/url-search-params": ["error", "always"],
-        "node/prefer-global/url": ["error", "always"],
-        "node/no-unpublished-require": "warn",
-        "indent": ["error", 4, { "SwitchCase": 1 }],
-        "linebreak-style": ["error", "unix"],
-        "semi": ["error", "always"],
-        "no-useless-escape": [0]
-    }
-}