Merge pull request #43 from overlookerjs/cache-reworking

Cache reworking

.babelrc

@@ -0,0 +1,17 @@
+{
+  "presets": [
+    [
+      "@babel/preset-env",
+      {
+        "targets": {
+          "node": "current"
+        }
+      }
+    ],
+    "jest"
+  ],
+  "plugins": [
+    "@babel/plugin-proposal-nullish-coalescing-operator",
+    "@babel/plugin-proposal-optional-chaining"
+  ]
+}

package.json

@@ -48,6 +48,8 @@
   "devDependencies": {
     "@babel/cli": "^7.6.3",
     "@babel/core": "^7.6.3",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.14.2",
+    "@babel/plugin-proposal-optional-chaining": "^7.14.2",
     "@babel/polyfill": "^7.6.0",
     "@babel/preset-env": "^7.6.3",
     "@babel/preset-react": "^7.6.3",

src/__tests__/config.data.js

@@ -37,6 +37,7 @@ module.exports = {
     cpu: 1,
     network: 'WiFi'
   },
+  threads: 2,
   logger: (msg) => console.log(msg),
   buildData: {
     url: '/build.json',

src/__tests__/index.int.test.js

@@ -15,7 +15,7 @@ const thresholds = {
   }
 };
 
-jest.setTimeout(150000);
+jest.setTimeout(300000);
 
 const hasProfile = (profile) => {
   expect(profile).toBeTruthy();

src/aggregation/index.js

@@ -1,12 +1,12 @@
 const { concatNetworks, aggregateNetwork } = require('./aggregation-network.js');
 const { expandNetwork } = require('./../chunks-meta');
-const { deepConcat } = require('./../objects-utils.js');
+const { deepConcat, map } = require('./../objects-utils.js');
 const { objDeepAggregation } = require('./aggregation-utils.js');
 const { concatActions, aggregateActions } = require('./aggregation-actions.js');
 const { aggregateWeighted } = require('./aggregation-weighted.js');
 const { concatWithWeight } = require('./aggregation-utils.js');
 
-const aggregateProfiles = (profiles,
+const aggregateProfilesSeries = (profiles,
                            buildData,
                            mergeRequests,
                            aggregation = objDeepAggregation) => {
@@ -43,6 +43,18 @@ const aggregateProfiles = (profiles,
   };
 };
 
+const aggregateProfiles = async (result, config, buildData) => (
+  map(
+    result,
+    (stats) => aggregateProfilesSeries(
+      stats,
+      buildData,
+      config.requests ? config.requests.merge : null
+    )
+  )
+);
+
 module.exports = {
-  aggregateProfiles
+  aggregateProfiles,
+  aggregateProfilesSeries
 };

src/checker/check.js

@@ -41,7 +41,7 @@ const checkValue = (value, threshold) => {
 const check = (comparison, thresholds) => {
   const comparisonsArray = toArray(comparison);
 
-  return flat(Object.entries(thresholds) // ToDo: it should be more simple
+  return flat(Object.entries(thresholds)
     .map(([thresholdPath, threshold]) => {
       const regExp = pathPatternToRegExp(thresholdPath);
       const matchedPaths = comparisonsArray.filter(([path]) => regExp.test(path));

src/merge/index.js

@@ -1,4 +1,4 @@
-const { aggregateProfiles } = require('./../aggregation');
+const { aggregateProfilesSeries } = require('./../aggregation');
 const { deepMapUntilArray } = require('./../objects-utils');
 const jStat = require('jstat');
 
@@ -10,7 +10,7 @@ const strategies = {
 const getAggregateMerger = (mergeStrategy) => (stats) => deepMapUntilArray(stats, mergeStrategy);
 
 const merge = (data, pages, mergeStrategyName = 'mean') => (
-  aggregateProfiles(
+  aggregateProfilesSeries(
     Object.entries(data)
       .filter(([pageName]) => !pages || pages.includes(pageName))
       .map(([, pageData]) => ({ ...pageData, screenshots: null })),