V2.4.0

CHANGELOG.md

@@ -10,6 +10,14 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Fixed
 ### Removed
 
+## [2.4.0] - 2020-06-07
+
+### Added
+- feat(Selector): Add cleanDependenciesCache method. [Issue #79](https://github.com/data-provider/core/issues/79)
+
+### Changed
+- chore(deps): Update dependencies
+
 ## [2.3.0] - 2020-06-06
 
 ### Added

jest.config.js

@@ -26,7 +26,7 @@ module.exports = {
 
   // The glob patterns Jest uses to detect test files
   testMatch: ["<rootDir>/test/**/*.js"],
-  // testMatch: ["**/test/storeManager.js"],
+  // testMatch: ["**/test/selector/cache-dependencies-clean.js"],
 
   // The test environment that will be used for testing
   testEnvironment: "node",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@data-provider/core",
-  "version": "2.3.0",
+  "version": "2.4.0",
   "description": "Async Data Provider agnostic about data origins",
   "keywords": [
     "data",
@@ -68,7 +68,7 @@
     "babel-eslint": "10.1.0",
     "babel-polyfill": "6.26.0",
     "coveralls": "3.0.9",
-    "eslint": "7.1.0",
+    "eslint": "7.2.0",
     "eslint-config-prettier": "6.11.0",
     "eslint-plugin-prettier": "3.1.3",
     "eslint-plugin-react": "7.20.0",
@@ -78,7 +78,7 @@
     "lint-staged": "10.2.9",
     "prettier": "2.0.5",
     "redux": "4.0.5",
-    "rollup": "2.13.1",
+    "rollup": "2.14.0",
     "rollup-plugin-terser": "6.1.0",
     "sinon": "9.0.2"
   },

sonar-project.properties

@@ -1,6 +1,6 @@
 sonar.organization=data-provider
 sonar.projectKey=data-provider-core
-sonar.projectVersion=2.3.0
+sonar.projectVersion=2.4.0
 
 sonar.sources=src,test
 sonar.exclusions=node_modules/**

src/Selector.js

@@ -17,6 +17,10 @@ export function catchDependency(dependency, catchMethod) {
   return new CatchDependency(dependency, catchMethod);
 }
 
+const isSelector = (objectToCheck) => {
+  return objectToCheck && objectToCheck instanceof SelectorBase;
+};
+
 const isDataProvider = (objectToCheck) => {
   return objectToCheck && objectToCheck instanceof Provider;
 };
@@ -53,15 +57,19 @@ class SelectorBase extends Provider {
   constructor(id, options, query) {
     super(id, options, query);
     this._dependencies = options._dependencies;
+    this._resolvedDependencies = [];
     this._selector = options._selector;
+    this._inProgressDependencies = null;
   }
 
+  // Private methods
+
   _readAllDependenciesAndSelect() {
     let dependenciesResults;
     let dependencies;
     let dependenciesListeners;
     let hasToReadAgain = false;
-    const inProgressDependencies = new Set();
+    this._inProgressDependencies = new Set();
     const inProgressListeners = [];
 
     const markToReadAgain = () => {
@@ -70,6 +78,8 @@ class SelectorBase extends Provider {
 
     const removeInProgressListenerFuncs = () => {
       inProgressListeners.forEach((removeListener) => removeListener());
+      this._resolvedDependencies = Array.from(this._inProgressDependencies);
+      this._inProgressDependencies = null;
     };
 
     const cleanCache = () => {
@@ -94,8 +104,8 @@ class SelectorBase extends Provider {
         return resolveResult(dependencyToRead);
       }
       dependencies.push(dependencyToRead);
-      if (!inProgressDependencies.has(dependencyToRead)) {
-        inProgressDependencies.add(dependencyToRead);
+      if (!this._inProgressDependencies.has(dependencyToRead)) {
+        this._inProgressDependencies.add(dependencyToRead);
         inProgressListeners.push(dependencyToRead.on(CLEAN_CACHE, markToReadAgain));
       }
 
@@ -165,6 +175,8 @@ class SelectorBase extends Provider {
     return readAndReturn();
   }
 
+  // Overwrite Provider methods
+
   readMethod() {
     return this._readAllDependenciesAndSelect();
   }
@@ -177,6 +189,28 @@ class SelectorBase extends Provider {
     }
   }
 
+  // Public methods
+
+  _cleanCaches(dependencies) {
+    dependencies.forEach((dependency) => {
+      if (isSelector(dependency)) {
+        dependency.cleanDependenciesCache();
+      } else {
+        dependency.cleanCache();
+      }
+    });
+  }
+
+  cleanDependenciesCache() {
+    if (this._inProgressDependencies) {
+      this._cleanCaches(Array.from(this._inProgressDependencies));
+    } else {
+      this._cleanCaches(this._resolvedDependencies);
+    }
+  }
+
+  // Methods to be used for testing
+
   get dependencies() {
     return this._dependencies;
   }
@@ -186,6 +220,8 @@ class SelectorBase extends Provider {
   }
 }
 
+// Expose a different interface for Selectors the first time, but children are built with the same interface than providers internally
+
 class Selector extends SelectorBase {
   constructor(...args) {
     const lastIndex = args.length - 1;
@@ -202,6 +238,8 @@ class Selector extends SelectorBase {
     super(options.id, options, undefined);
   }
 
+  // Overwrite Provider methods
+
   createChildMethod(id, options, query) {
     return new SelectorBase(id, options, query);
   }

test-e2e/browser/react-app/package.json

@@ -32,7 +32,7 @@
   "devDependencies": {
     "react-scripts": "3.4.1",
     "react-app-rewired": "2.1.6",
-    "serve": "11.3.1",
+    "serve": "11.3.2",
     "start-server-and-test": "1.11.0"
   }
 }