Fix server side memory leak (fixes #40)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "isomorphic-relay-router",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "Adds server side rendering support to react-router-relay",
   "author": "Denis Nedelyaev",
   "homepage": "https://github.com/denvned/isomorphic-relay",
@@ -35,7 +35,7 @@
   },
   "dependencies": {
     "babel-runtime": "^6.3.19",
-    "react-router-relay": "0.13.2"
+    "react-router-relay": "0.13.2 - 0.13.3"
   },
   "devDependencies": {
     "babel-cli": "^6.3.17",

src/AggregateContainer.js

@@ -0,0 +1,34 @@
+function filterVariables(component, variableMapping) {
+  const result = {};
+  for (const [name, value] of Object.entries(variableMapping)) {
+    if (component.hasVariable(name)) {
+      result[name] = value;
+    }
+  }
+
+  return result;
+}
+
+export default class AggregateContainer {
+  constructor(fragmentSpecs) {
+    this.fragmentSpecs = fragmentSpecs;
+  }
+
+  getFragmentNames() {
+    return Object.keys(this.fragmentSpecs);
+  }
+
+  getFragment(fragmentName, variableMapping) {
+    const { component, queryName } = this.fragmentSpecs[fragmentName];
+
+    return component.getFragment(queryName, filterVariables(component, variableMapping));
+  }
+
+  hasFragment(fragmentName) {
+    return !!this.fragmentSpecs[fragmentName];
+  }
+
+  hasVariable(variableName) {
+    return true;
+  }
+}

src/IsomorphicQueryAggregator.js

@@ -0,0 +1,10 @@
+import QueryAggregator from 'react-router-relay/lib/QueryAggregator';
+import getAggregateContainer from './getAggregateContainer';
+
+export default class IsomorphicQueryAggregator extends QueryAggregator {
+  updateQueryConfig(routerProps) {
+    super.updateQueryConfig(routerProps);
+
+    this.Container = getAggregateContainer(this.fragmentSpecs);
+  }
+}

src/IsomorphicRelayRouterContext.js

@@ -14,7 +14,7 @@ export default class IsomorphicRelayRouterContext extends RelayRouterContext {
     return (
       <IsomorphicRelay.Renderer
         {...this.props}
-        Container={this.queryAggregator}
+        Container={this.queryAggregator.Container}
         queryConfig={this.queryAggregator.queryConfig}
         render={this.renderCallback}
       />

src/getAggregateContainer.js

@@ -0,0 +1,38 @@
+import AggregateContainer from './AggregateContainer';
+
+const containerIds = new WeakMap;
+let nextContainerId = 0;
+
+function getContainerId(container) {
+  let id = containerIds.get(container);
+  if (id === void 0) {
+    id = nextContainerId++;
+    containerIds.set(container, id);
+  }
+
+  return id;
+}
+
+function getCacheKey(fragmentSpecs) {
+  return JSON.stringify(
+    Object.entries(fragmentSpecs)
+      .map(([fragmentName, { component, queryName }]) =>
+        [fragmentName, getContainerId(component), queryName]
+      )
+      .sort(([a], [b]) => a.localeCompare(b))
+  );
+}
+
+const containerCache = new Map;
+
+export default function getAggregateContainer(fragmentSpecs) {
+  const cacheKey = getCacheKey(fragmentSpecs);
+
+  let container = containerCache.get(cacheKey);
+  if (!container) {
+    container = new AggregateContainer(fragmentSpecs);
+    containerCache.set(cacheKey, container);
+  }
+
+  return container;
+}

src/prepareData.js

@@ -1,13 +1,13 @@
 import IsomorphicRelay from 'isomorphic-relay';
-import QueryAggregator from 'react-router-relay/lib/QueryAggregator';
+import IsomorphicQueryAggregator from './IsomorphicQueryAggregator';
 import render from './render';
 
 export default function prepareData(renderProps, networkLayer) {
-  const queryAggregator = new QueryAggregator(renderProps);
+  const queryAggregator = new IsomorphicQueryAggregator(renderProps);
 
   return IsomorphicRelay.prepareData(
     {
-      Container: queryAggregator,
+      Container: queryAggregator.Container,
       queryConfig: queryAggregator.queryConfig,
     },
     networkLayer

src/prepareInitialRender.js

@@ -1,13 +1,13 @@
 import IsomorphicRelay from 'isomorphic-relay';
-import QueryAggregator from 'react-router-relay/lib/QueryAggregator';
+import IsomorphicQueryAggregator from './IsomorphicQueryAggregator';
 import render from './render';
 
 export default function prepareInitialRender(environment, renderProps) {
-  const queryAggregator = new QueryAggregator(renderProps);
+  const queryAggregator = new IsomorphicQueryAggregator(renderProps);
 
   return IsomorphicRelay.prepareInitialRender({
     environment,
-    Container: queryAggregator,
+    Container: queryAggregator.Container,
     queryConfig: queryAggregator.queryConfig,
   }).then(({ initialReadyState }) => ({
     ...renderProps,