@graphistry/falcor-react-schema - npm Package Compare versions

Comparing version 2.6.26 to 2.6.27

lib/components/withFragment.js

@@ -127,3 +127,3 @@ 'use strict';
 
-                _this.config = config;
+                _this.config = fragmentDesc;
                 _this.Component = Component;
@@ -335,7 +335,6 @@ _this.fragment = fragmentDesc.fragment;
 
-    return {
-        data: data, error: error, props: props,
-        model: model, loading: loading, version: version,
-        hash: data && data.$__hash
-    };
+    var hash = data && data.$__hash;
+    var status = data && data.$__status;
+    loading = loading || status === 'pending';
+    return { hash: hash, data: data, props: props, model: model, error: error, loading: loading, version: version };
 }
@@ -342,0 +341,0 @@

lib/fetchDataUntilSettled.js

@@ -36,4 +36,4 @@ 'use strict';
         model = _ref.model,
-        fragment = _ref.fragment,
-        renderLoading = _ref.renderLoading;
+        version = _ref.version,
+        fragment = _ref.fragment;
 
@@ -43,4 +43,3 @@
         query: null, loading: true,
-        version: model.getVersion(),
-        data: data, props: props, model: model, fragment: fragment
+        data: data, props: props, model: model, version: version, fragment: fragment
     };
@@ -58,24 +57,22 @@ memo.mapNext = handleNext(memo, model);
     var query = memo.query,
-        version = memo.version,
         model = memo.model,
         fragment = memo.fragment;
 
-    if (query !== (memo.query = fragment(memo.data || {}, memo.props || {}))) /*||
-                                                                              (version !== (memo.version = model.getVersion()))*/{
-            var _memoizedQuerySyntax = memoizedQuerySyntax(memo.query),
-                ast = _memoizedQuerySyntax.ast,
-                error = _memoizedQuerySyntax.error;
+    if (query !== (memo.query = fragment(memo.data || {}, memo.props || {}))) {
+        var _memoizedQuerySyntax = memoizedQuerySyntax(memo.query),
+            ast = _memoizedQuerySyntax.ast,
+            error = _memoizedQuerySyntax.error;
 
-            if (error) {
-                if (typeof console !== 'undefined' && typeof console.error === 'function') {
-                    console.error((0, _pegjsUtil.errorMessage)(error));
-                    console.error('Error parsing query: ' + memo.query);
-                }
-                memo.error = error;
-            } else {
-                return _Observable.Observable.from(!memo.renderLoading ? model.get(ast) : model.get(ast).progressively()).map(memo.mapNext).catch(memo.catchError);
+        if (error) {
+            if (typeof console !== 'undefined' && typeof console.error === 'function') {
+                console.error((0, _pegjsUtil.errorMessage)(error));
+                console.error('Error parsing query: ' + memo.query);
             }
+            memo.error = error;
+            memo.version = model.getVersion();
+        } else {
+            return _Observable.Observable.from(model.get(ast).progressively()).map(memo.mapNext).catch(memo.catchError);
         }
+    }
     memo.loading = false;
-    memo.version = model.getVersion();
     return _Observable.Observable.of(memo);
@@ -82,0 +79,0 @@ }

package.json

 {
   "name": "@graphistry/falcor-react-schema",
-  "version": "2.6.26",
+  "version": "2.6.27",
   "description": "",
@@ -30,6 +30,6 @@ "main": "lib/index.js",
   "dependencies": {
-    "@graphistry/falcor": "^2.6.26",
+    "@graphistry/falcor": "^2.6.27",
     "@graphistry/falcor-json-graph": "^2.6.16",
     "@graphistry/falcor-path-utils": "^2.6.16",
-    "@graphistry/falcor-query-syntax": "^2.6.26",
+    "@graphistry/falcor-query-syntax": "^2.6.27",
     "babel-plugin-transform-runtime": "~6.15.0",
@@ -44,3 +44,3 @@ "babel-preset-react": "~6.16.0",
   "devDependencies": {
-    "@graphistry/falcor-router": "^2.6.26",
+    "@graphistry/falcor-router": "^2.6.27",
     "babel-cli": "~6.18.0",
@@ -47,0 +47,0 @@ "babel-plugin-istanbul": "~3.0.0",

src/components/withFragment.js

@@ -54,3 +54,3 @@ import invariant from 'invariant';
                 super(props, context);
-                this.config = config;
+                this.config = fragmentDesc;
                 this.Component = Component;
@@ -205,7 +205,6 @@ this.fragment = fragmentDesc.fragment;
 ) {
-    return {
-        data, error, props,
-        model, loading, version,
-        hash: data && data.$__hash
-    };
+    const hash = data && data.$__hash;
+    const status = data && data.$__status;
+    loading = loading || status === 'pending';
+    return { hash, data, props, model, error, loading, version };
 }
@@ -212,0 +211,0 @@

src/fetchDataUntilSettled.js

@@ -14,3 +14,3 @@ import { errorMessage } from 'pegjs-util';
 export default function fetchDataUntilSettled({
-    data, props, model, fragment, renderLoading
+    data, props, model, version, fragment
 }) {
@@ -20,4 +20,3 @@
         query: null, loading: true,
-        version: model.getVersion(),
-        data, props, model, fragment,
+        data, props, model, version, fragment,
     };
@@ -34,5 +33,4 @@ memo.mapNext = handleNext(memo, model);
     }
-    const { query, version, model, fragment } = memo;
-    if ((query !== (memo.query = fragment(memo.data || {}, memo.props || {}))) /*||
-        (version !== (memo.version = model.getVersion()))*/) {
+    const { query, model, fragment } = memo;
+    if (query !== (memo.query = fragment(memo.data || {}, memo.props || {}))) {
         const { ast, error } = memoizedQuerySyntax(memo.query);
@@ -45,13 +43,10 @@ if (error) {
             memo.error = error;
+            memo.version = model.getVersion();
         } else {
             return Observable
-                .from(!memo.renderLoading ?
-                       model.get(ast) :
-                       model.get(ast).progressively())
-                .map(memo.mapNext)
-                .catch(memo.catchError);
+                .from(model.get(ast).progressively())
+                .map(memo.mapNext).catch(memo.catchError);
         }
     }
     memo.loading = false;
-    memo.version = model.getVersion();
     return Observable.of(memo);
@@ -58,0 +53,0 @@ }

No alert changes

Worsened metrics

Total package byte prevSize

129824

-0.35%

Lines of code

1665

-0.6%

Dependency changes

• Updated

  @graphistry/falcor@^2.6.27

• Updated

  @graphistry/falcor-query-syntax@^2.6.27