Merge pull request #19 from XbyOrange/v1.1.0-beta.2

Add helper for registering sources that should be loaded during serve…

Author: javierbrea

CHANGELOG.md

@@ -11,6 +11,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Removed
 ### BREAKING CHANGES
 
+## [1.1.0-beta.2] - 2019-08-19
+### Added
+- Add helper for registering sources that should be loaded during server side data rendering.
+
+### Fixed
+- Fix server side data connect. Load data in client when no server data is available
+
 ## [1.1.0-beta.1] - 2019-08-13
 ### Added
 - Add server side data feature

jest.config.js

@@ -17,8 +17,8 @@ module.exports = {
   // An object that configures minimum threshold enforcement for coverage results
   coverageThreshold: {
     global: {
-      branches: 80,
-      functions: 80,
+      branches: 75,
+      functions: 75,
       lines: 80,
       statements: 80
     }

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@xbyorange/react-mercury",
-  "version": "1.1.0-beta.1",
+  "version": "1.1.0-beta.2",
   "description": "Plugin for connecting React components with Mercury origins or selectors",
   "keywords": [
     "reactive",

package.json

@@ -137,8 +137,12 @@ export const connect = (mapSourcesToProps, parseProps) => {
       }
 
       dispatchRead(source, sourceKey) {
-        // Source has server side data
-        if (this.context && this.context.clientSide) {
+        if (
+          this.context &&
+          (this.context.clientSide ||
+            !this.context.data ||
+            !this.context.data[this.sourcePropsIds[sourceKey]])
+        ) {
           return source
             .dispatch()
             .catch(error => {

src/connect.js

@@ -1,3 +1,3 @@
 export { connect } from "./connect";
-export { readServerSideData } from "./readServerSideData";
+export { readServerSideData, addServerSideData } from "./readServerSideData";
 export { ServerSideData } from "./ServerSideData";

src/index.js

@@ -1,5 +1,8 @@
+import { isArray } from "lodash";
 import { getSourceId } from "./helpers";
 
+const serverSideData = new Set();
+
 const getSourceData = source => {
   return source.read().then(result => {
     return Promise.resolve({
@@ -18,5 +21,16 @@ const resultsToObject = results => {
   );
 };
 
-export const readServerSideData = (...args) =>
-  Promise.all(args.map(getSourceData)).then(resultsToObject);
+export const addServerSideData = sources => {
+  const sourcesToAdd = isArray(sources) ? sources : [sources];
+  sourcesToAdd.forEach(source => {
+    serverSideData.add(source);
+  });
+};
+
+export const readServerSideData = (...args) => {
+  args.forEach(source => {
+    addServerSideData(source);
+  });
+  return Promise.all(Array.from(serverSideData).map(getSourceData)).then(resultsToObject);
+};