json-react-layouts-data-loader - npm Package Compare versions

Comparing version 4.0.0-beta.7 to 4.0.0-beta.8

CHANGELOG.md

 # json-react-layouts-data-loader
 
+## 4.0.0-beta.8
+
+### Patch Changes
+
+-   de1994c: Fixed crash when using hooks inside useRuntimeParams
+-   Updated dependencies [de1994c]
+    -   json-react-layouts@3.0.0-beta.8
+
 ## 4.0.0-beta.7
@@ -4,0 +12,0 @@

dist/cjs/index.js

@@ -20,9 +20,24 @@ "use strict";
     }, ['dataDefinitionArgs']);
+    function DataLoaderWithRuntimeParams(_a) {
+        var dataDefinition = _a.dataDefinition, componentProps = _a.componentProps, services = _a.services, next = _a.next, middlewareProps = _a.middlewareProps;
+        var dataDefinitionArgs = tslib_1.__assign(tslib_1.__assign({}, componentProps.dataDefinitionArgs), dataDefinition.useRuntimeParams(componentProps.dataDefinitionArgs, services.services));
+        componentProps = tslib_1.__assign(tslib_1.__assign({}, componentProps), { dataDefinitionArgs: dataDefinitionArgs });
+        var renderProps = useComponentData({
+            dataDefinition: dataDefinition,
+            dataDefinitionArgs: dataDefinitionArgs,
+            layout: services.layout,
+        });
+        if (!renderProps.lastAction.success) {
+            // We have failed to load data, use error boundaries
+            // to send error back up and render error page
+            throw renderProps.lastAction.error;
+        }
+        var data = renderProps.data.hasData
+            ? { data: { loaded: true, result: renderProps.data.result } }
+            : { data: { loaded: false } };
+        return (next(tslib_1.__assign(tslib_1.__assign({}, componentProps), data), middlewareProps, services) || null);
+    }
     function WithDataLoad(_a) {
         var dataDefinition = _a.dataDefinition, componentProps = _a.componentProps, services = _a.services, next = _a.next, middlewareProps = _a.middlewareProps;
-        var dataDefinitionArgs = dataDefinition.useRuntimeParams
-            ? tslib_1.__assign(tslib_1.__assign({}, componentProps.dataDefinitionArgs), dataDefinition.useRuntimeParams(componentProps.dataDefinitionArgs, services.services)) : componentProps.dataDefinitionArgs;
-        if (dataDefinition.useRuntimeParams) {
-            componentProps = tslib_1.__assign(tslib_1.__assign({}, componentProps), { dataDefinitionArgs: dataDefinitionArgs });
-        }
+        var dataDefinitionArgs = componentProps.dataDefinitionArgs;
         var renderProps = useComponentData({
@@ -64,2 +79,5 @@ dataDefinition: dataDefinition,
             if (dataDefinition) {
+                if (dataDefinition.useRuntimeParams) {
+                    return (react_1.default.createElement(DataLoaderWithRuntimeParams, { dataDefinition: dataDefinition, componentProps: componentProps, services: services, next: next, middlewareProps: middlewareProps }));
+                }
                 return (react_1.default.createElement(WithDataLoad, { dataDefinition: dataDefinition, componentProps: componentProps, services: services, next: next, middlewareProps: middlewareProps }));
@@ -66,0 +84,0 @@ }

dist/esm/index.js

@@ -16,9 +16,24 @@ import { __assign, __rest } from "tslib";
     }, ['dataDefinitionArgs']);
+    function DataLoaderWithRuntimeParams(_a) {
+        var dataDefinition = _a.dataDefinition, componentProps = _a.componentProps, services = _a.services, next = _a.next, middlewareProps = _a.middlewareProps;
+        var dataDefinitionArgs = __assign(__assign({}, componentProps.dataDefinitionArgs), dataDefinition.useRuntimeParams(componentProps.dataDefinitionArgs, services.services));
+        componentProps = __assign(__assign({}, componentProps), { dataDefinitionArgs: dataDefinitionArgs });
+        var renderProps = useComponentData({
+            dataDefinition: dataDefinition,
+            dataDefinitionArgs: dataDefinitionArgs,
+            layout: services.layout,
+        });
+        if (!renderProps.lastAction.success) {
+            // We have failed to load data, use error boundaries
+            // to send error back up and render error page
+            throw renderProps.lastAction.error;
+        }
+        var data = renderProps.data.hasData
+            ? { data: { loaded: true, result: renderProps.data.result } }
+            : { data: { loaded: false } };
+        return (next(__assign(__assign({}, componentProps), data), middlewareProps, services) || null);
+    }
     function WithDataLoad(_a) {
         var dataDefinition = _a.dataDefinition, componentProps = _a.componentProps, services = _a.services, next = _a.next, middlewareProps = _a.middlewareProps;
-        var dataDefinitionArgs = dataDefinition.useRuntimeParams
-            ? __assign(__assign({}, componentProps.dataDefinitionArgs), dataDefinition.useRuntimeParams(componentProps.dataDefinitionArgs, services.services)) : componentProps.dataDefinitionArgs;
-        if (dataDefinition.useRuntimeParams) {
-            componentProps = __assign(__assign({}, componentProps), { dataDefinitionArgs: dataDefinitionArgs });
-        }
+        var dataDefinitionArgs = componentProps.dataDefinitionArgs;
         var renderProps = useComponentData({
@@ -60,2 +75,5 @@ dataDefinition: dataDefinition,
             if (dataDefinition) {
+                if (dataDefinition.useRuntimeParams) {
+                    return (React.createElement(DataLoaderWithRuntimeParams, { dataDefinition: dataDefinition, componentProps: componentProps, services: services, next: next, middlewareProps: middlewareProps }));
+                }
                 return (React.createElement(WithDataLoad, { dataDefinition: dataDefinition, componentProps: componentProps, services: services, next: next, middlewareProps: middlewareProps }));
@@ -62,0 +80,0 @@ }

package.json

 {
     "name": "json-react-layouts-data-loader",
-    "version": "4.0.0-beta.7",
+    "version": "4.0.0-beta.8",
     "repository": "github:sevenwestmedia-labs/json-react-layouts",
@@ -12,3 +12,3 @@ "author": "Seven West Media WA",
     "dependencies": {
-        "json-react-layouts": "^3.0.0-beta.7"
+        "json-react-layouts": "^3.0.0-beta.8"
     },
@@ -15,0 +15,0 @@ "peerDependencies": {

No alert changes

Improved metrics

Total package byte prevSize

252473

increased by2.24%

Lines of code

1204

increased by7.21%

Dependency changes

• Updatedjson-react-layouts@^3.0.0-beta.8