@jahia/data-helper 1.0.5 → 1.0.7

package/esm/hooks/useNodeInfo/useNodeInfo.gql-queries.js

@@ -1,117 +1,63 @@
-function _templateObject4() {
-  var data = _taggedTemplateLiteral(["\n            query NodeByPathInfoQuery($path:String!) {\n                jcr {\n                    nodeByPath(path:$path) {\n                        name\n                        ...node\n                        ...NodeCacheRequiredFields\n                    }\n                }\n            }\n            ", "\n        "]);
-
-  _templateObject4 = function _templateObject4() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject3() {
-  var data = _taggedTemplateLiteral(["\n                query NodesByUuidInfoQuery($uuids:[String!]!) {\n                    jcr {\n                        nodesById(uuids:$uuids) {\n                            name\n                            ...node\n                            ...NodeCacheRequiredFields\n                        }\n                    }\n                }\n                ", "\n            "]);
-
-  _templateObject3 = function _templateObject3() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject2() {
-  var data = _taggedTemplateLiteral(["\n                query NodeByUuidInfoQuery($uuid:String!) {\n                    jcr {\n                        nodeById(uuid:$uuid) {\n                            name\n                            ...node\n                            ...NodeCacheRequiredFields\n                        }\n                    }\n                }\n                ", "\n            "]);
-
-  _templateObject2 = function _templateObject2() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject() {
-  var data = _taggedTemplateLiteral(["\n                query NodesByPathInfoQuery($paths:[String!]!) {\n                    jcr {\n                        nodesByPath(paths:$paths) {\n                            name\n                            ...node\n                            ...NodeCacheRequiredFields\n                        }\n                    }\n                }\n                ", "\n            "]);
-
-  _templateObject = function _templateObject() {
-    return data;
-  };
-
-  return data;
-}
-
+var _templateObject, _templateObject2, _templateObject3, _templateObject4;
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
 import gql from 'graphql-tag';
 import { aggregatedPublicationInfoWithExistInLive, aggregatedPublicationInfo, childNodeTypes, contentRestrictions, displayableNode, displayName, getProperties, installedModules, lockInfo, mimeTypes, nodeCacheRequiredFields, operationSupport, parentNode, primaryNodeType, replaceFragmentsInDocument, siteLanguages, subNodesCount } from '../../fragments';
 import { getPermissionFragment, getSitePermissionFragment } from '../../fragments/getPermissionFragment';
 import { getNodeTypeFragment } from '../../fragments/getIsNodeTypeFragment';
-
 var getBaseQueryAndVariables = function getBaseQueryAndVariables(variables) {
   if (variables.paths) {
     return {
-      baseQuery: gql(_templateObject(), nodeCacheRequiredFields.gql),
+      baseQuery: gql(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n                query NodesByPathInfoQuery($paths:[String!]!) {\n                    jcr {\n                        nodesByPath(paths:$paths) {\n                            name\n                            ...node\n                            ...NodeCacheRequiredFields\n                        }\n                    }\n                }\n                ", "\n            "])), nodeCacheRequiredFields.gql),
       generatedVariables: {
         paths: variables.paths
       },
       skip: false
     };
   }
-
   if (variables.uuid && variables.uuid.length > 0) {
     return {
-      baseQuery: gql(_templateObject2(), nodeCacheRequiredFields.gql),
+      baseQuery: gql(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["\n                query NodeByUuidInfoQuery($uuid:String!) {\n                    jcr {\n                        nodeById(uuid:$uuid) {\n                            name\n                            ...node\n                            ...NodeCacheRequiredFields\n                        }\n                    }\n                }\n                ", "\n            "])), nodeCacheRequiredFields.gql),
       generatedVariables: {
         uuid: variables.uuid
       },
       skip: false
     };
   }
-
   if (variables.uuids) {
     return {
-      baseQuery: gql(_templateObject3(), nodeCacheRequiredFields.gql),
+      baseQuery: gql(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["\n                query NodesByUuidInfoQuery($uuids:[String!]!) {\n                    jcr {\n                        nodesById(uuids:$uuids) {\n                            name\n                            ...node\n                            ...NodeCacheRequiredFields\n                        }\n                    }\n                }\n                ", "\n            "])), nodeCacheRequiredFields.gql),
       generatedVariables: {
         uuids: variables.uuids
       },
       skip: false
     };
   }
-
   return {
-    baseQuery: gql(_templateObject4(), nodeCacheRequiredFields.gql),
+    baseQuery: gql(_templateObject4 || (_templateObject4 = _taggedTemplateLiteral(["\n            query NodeByPathInfoQuery($path:String!) {\n                jcr {\n                    nodeByPath(path:$path) {\n                        name\n                        ...node\n                        ...NodeCacheRequiredFields\n                    }\n                }\n            }\n            ", "\n        "])), nodeCacheRequiredFields.gql),
     generatedVariables: {
       path: variables.path
     },
     skip: !variables.path || variables.path.length === 0
   };
 };
-
+export var validOptions = ['getDisplayName', 'getPrimaryNodeType', 'getParent', 'getAggregatedPublicationInfo', 'getOperationSupport', 'getPermissions', 'getSitePermissions', 'getIsNodeTypes', 'getProperties', 'getSiteInstalledModules', 'getSiteLanguages', 'getDisplayableNodePath', 'getLockInfo', 'getChildNodeTypes', 'getContributeTypesRestrictions', 'getSubNodesCount', 'getMimeType'];
 export var getQuery = function getQuery(variables, schemaResult) {
   var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {};
   var fragments = [];
-
   var _getBaseQueryAndVaria = getBaseQueryAndVariables(variables),
-      baseQuery = _getBaseQueryAndVaria.baseQuery,
-      generatedVariables = _getBaseQueryAndVaria.generatedVariables,
-      skip = _getBaseQueryAndVaria.skip;
-
-  var error = schemaResult.error,
-      loading = schemaResult.loading,
-      data = schemaResult.data;
-
+    baseQuery = _getBaseQueryAndVaria.baseQuery,
+    generatedVariables = _getBaseQueryAndVaria.generatedVariables,
+    skip = _getBaseQueryAndVaria.skip;
   if (!skip) {
     if (options.getDisplayName) {
       fragments.push(displayName);
-
       if (!variables.language) {
         throw Error('language is required');
       }
-
       generatedVariables.language = variables.language;
     }
-
     if (options.getPrimaryNodeType) {
       fragments.push(primaryNodeType);
-
       if (!variables.displayLanguage) {
         generatedVariables.displayLanguageSet = false;
         generatedVariables.displayLanguage = '';
@@ -120,119 +66,92 @@ export var getQuery = function getQuery(variables, schemaResult) {
         generatedVariables.displayLanguage = variables.displayLanguage;
       }
     }
-
     if (options.getParent) {
       fragments.push(parentNode);
     }
-
     if (options.getAggregatedPublicationInfo) {
-      if (!error && !loading && data) {
-        var supportsExistsInLive = data.__type && data.__type.fields && data.__type.fields.find(function (field) {
-          return field.name === 'existsInLive';
-        }) !== undefined;
-
-        if (supportsExistsInLive) {
-          fragments.push(aggregatedPublicationInfoWithExistInLive);
-        } else {
-          fragments.push(aggregatedPublicationInfo);
-        }
+      var supportsExistsInLive = schemaResult && schemaResult.__type && schemaResult.__type.fields && schemaResult.__type.fields.find(function (field) {
+        return field.name === 'existsInLive';
+      }) !== undefined;
+      if (supportsExistsInLive) {
+        fragments.push(aggregatedPublicationInfoWithExistInLive);
+      } else {
+        fragments.push(aggregatedPublicationInfo);
       }
-
       if (!variables.language) {
         throw Error('language is required');
       }
-
       generatedVariables.language = variables.language;
       generatedVariables.aggregatedPublicationInfoSubNodes = Boolean(options.getAggregatedPublicationInfo.subNodes);
       generatedVariables.aggregatedPublicationInfoIncludeReference = Boolean(options.getAggregatedPublicationInfo.reference);
     }
-
     if (options.getOperationSupport) {
       fragments.push(operationSupport);
     }
-
     if (options.getPermissions) {
       options.getPermissions.forEach(function (name) {
         var _getPermissionFragmen = getPermissionFragment(name),
-            fragment = _getPermissionFragmen.fragment,
-            variables = _getPermissionFragmen.variables;
-
+          fragment = _getPermissionFragmen.fragment,
+          variables = _getPermissionFragmen.variables;
         fragments.push(fragment);
         Object.assign(generatedVariables, variables);
       });
     }
-
     if (options.getSitePermissions) {
       options.getSitePermissions.forEach(function (name) {
         var _getSitePermissionFra = getSitePermissionFragment(name),
-            fragment = _getSitePermissionFra.fragment,
-            variables = _getSitePermissionFra.variables;
-
+          fragment = _getSitePermissionFra.fragment,
+          variables = _getSitePermissionFra.variables;
         fragments.push(fragment);
         Object.assign(generatedVariables, variables);
       });
     }
-
     if (options.getIsNodeTypes) {
       options.getIsNodeTypes.forEach(function (name) {
         var _getNodeTypeFragment = getNodeTypeFragment(name),
-            fragment = _getNodeTypeFragment.fragment,
-            variables = _getNodeTypeFragment.variables;
-
+          fragment = _getNodeTypeFragment.fragment,
+          variables = _getNodeTypeFragment.variables;
         fragments.push(fragment);
         Object.assign(generatedVariables, variables);
       });
     }
-
     if (options.getProperties) {
       fragments.push(getProperties);
       generatedVariables.getPropertiesNames = options.getProperties;
-
       if (!variables.language) {
         throw Error('language is required');
       }
-
       generatedVariables.language = variables.language;
     }
-
     if (options.getSiteInstalledModules) {
       fragments.push(installedModules);
     }
-
     if (options.getSiteLanguages) {
       fragments.push(siteLanguages);
     }
-
     if (options.getDisplayableNodePath) {
       fragments.push(displayableNode);
     }
-
     if (options.getLockInfo) {
       fragments.push(lockInfo);
     }
-
     if (options.getChildNodeTypes) {
       fragments.push(childNodeTypes);
     }
-
     if (options.getContributeTypesRestrictions) {
       fragments.push(contentRestrictions);
     }
-
     if (options.getSubNodesCount) {
       fragments.push(subNodesCount);
       generatedVariables.subNodesCountTypes = options.getSubNodesCount.types ? options.getSubNodesCount.types : ['nt:base'];
     }
-
     if (options.getMimeType) {
       fragments.push(mimeTypes);
     }
   }
-
   return {
     query: replaceFragmentsInDocument(baseQuery, fragments),
     generatedVariables: generatedVariables,
-    skip: skip,
-    loading: loading
+    skip: skip
   };
 };

package/esm/hooks/useNodeInfo/useNodeInfo.js

@@ -1,84 +1,170 @@
+var _excluded = ["data"];
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
+function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
-function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
-function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
-import { useMemo } from 'react';
-import { useQuery } from 'react-apollo';
+import { useEffect, useState } from 'react';
+import { useApolloClient } from 'react-apollo';
 import { getQuery } from './useNodeInfo.gql-queries';
-import { useDeepCompareMemoize } from '../useDeepCompareMemo';
 import { getEncodedPermissionName } from '../../fragments/getPermissionFragment';
 import { getEncodedNodeTypeName } from '../../fragments/getIsNodeTypeFragment';
-import { useSchemaFields } from '../useSchemaFields';
+import { SCHEMA_FIELDS_QUERY } from '../useSchemaFields/useSchemaFields.gql-queries';
+import { isSubset, merge } from './useNodeInfo.utils';
+import { useMemoRequest } from './useMemoRequest';
+import deepEquals from 'fast-deep-equal';
+var queue = [];
+var schemaResult;
+var timeout;
+var observedQueries = [];
+function scheduleQueue(client) {
+  if (!timeout && schemaResult) {
+    timeout = setTimeout(function () {
+      timeoutHandler(client);
+      clearTimeout(timeout);
+      timeout = null;
+    }, 0);
+  }
+}
+var timeoutHandler = function timeoutHandler(client) {
+  var mergedQueue = [];
+  queue.forEach(function (request) {
+    var toInsert = {
+      variables: request.variables,
+      queryOptions: request.queryOptions,
+      options: request.options,
+      originals: [request]
+    };
+    var mergeable = mergedQueue.find(function (q) {
+      return JSON.stringify(q.queryOptions) === JSON.stringify(toInsert.queryOptions) && (isSubset(q.variables, toInsert.variables) || isSubset(toInsert.variables, q.variables));
+    });
+    if (mergeable) {
+      merge(mergeable, toInsert);
+    } else {
+      mergedQueue.push({
+        variables: toInsert.variables && _objectSpread({}, toInsert.variables),
+        queryOptions: toInsert.queryOptions && _objectSpread({}, toInsert.queryOptions),
+        options: toInsert.options && _objectSpread({}, toInsert.options),
+        originals: toInsert.originals
+      });
+    }
+  });
+  observedQueries.forEach(function (obs) {
+    return obs.unsubscribe();
+  });
+  observedQueries = [];
+  mergedQueue.forEach(function (mergedRequest) {
+    var variables = mergedRequest.variables,
+      queryOptions = mergedRequest.queryOptions,
+      options = mergedRequest.options,
+      originals = mergedRequest.originals;
+    var _getQuery = getQuery(variables, schemaResult, options),
+      query = _getQuery.query,
+      generatedVariables = _getQuery.generatedVariables,
+      skip = _getQuery.skip;
+    if (skip) {
+      // No query to execute
+      originals.forEach(function (request) {
+        request.setResult({
+          loading: false
+        });
+      });
+    } else {
+      var watchedQuery = client.watchQuery(_objectSpread(_objectSpread({
+        query: query,
+        errorPolicy: 'ignore'
+      }, queryOptions), {}, {
+        variables: generatedVariables
+      })).subscribe(function (_ref) {
+        var data = _ref.data,
+          others = _objectWithoutProperties(_ref, _excluded);
+        var result = getResult(data, others, options, query, generatedVariables);
+        originals.forEach(function (request) {
+          if (!deepEquals(request.result, result)) {
+            request.result = result;
+            request.setResult(_objectSpread(_objectSpread({}, result), {}, {
+              refetch: function refetch() {
+                client.refetchQueries({
+                  include: [query]
+                });
+              }
+            }));
+          }
+        });
+      });
+      observedQueries.push(watchedQuery);
+    }
+  });
+};
 export var useNodeInfo = function useNodeInfo(variables, options, queryOptions) {
-  var schemaResult = useSchemaFields({
-    type: 'GqlPublicationInfo'
-  }); // Use ref to avoid infinite loop, as query object will be regenerated every time
-
-  var memoizedVariables = useDeepCompareMemoize(variables);
-  var memoizedOptions = useDeepCompareMemoize(options);
-
-  var _useMemo = useMemo(function () {
-    return getQuery(memoizedVariables, schemaResult, memoizedOptions);
-  }, [memoizedVariables, schemaResult, memoizedOptions]),
-      query = _useMemo.query,
-      generatedVariables = _useMemo.generatedVariables,
-      skip = _useMemo.skip,
-      loading = _useMemo.loading;
-
-  var _useQuery = useQuery(query, _objectSpread({
-    errorPolicy: 'ignore'
-  }, queryOptions, {
-    variables: generatedVariables,
-    skip: skip || loading
-  })),
-      data = _useQuery.data,
-      others = _objectWithoutProperties(_useQuery, ["data"]);
+  var _useState = useState({
+      loading: true
+    }),
+    _useState2 = _slicedToArray(_useState, 2),
+    result = _useState2[0],
+    setResult = _useState2[1];
+  var client = useApolloClient();
+  if (!schemaResult) {
+    client.query({
+      query: SCHEMA_FIELDS_QUERY,
+      variables: {
+        type: 'GqlPublicationInfo'
+      }
+    }).then(function (_ref2) {
+      var data = _ref2.data;
+      schemaResult = data;
+      scheduleQueue(client);
+    });
+  }
 
+  // Normalize and memoize request
+  var _useMemoRequest = useMemoRequest(variables, queryOptions, options, setResult),
+    _useMemoRequest2 = _slicedToArray(_useMemoRequest, 1),
+    currentRequest = _useMemoRequest2[0];
+  useEffect(function () {
+    queue.push(currentRequest);
+    scheduleQueue(client);
+    return function () {
+      queue.splice(queue.indexOf(currentRequest), 1);
+    };
+  }, [currentRequest]);
+  return result;
+};
+var getResult = function getResult(data, others, options, query, generatedVariables) {
   var node = data && data.jcr && (data.jcr.nodeByPath || data.jcr.nodeById) || null;
   var nodes = data && data.jcr && (data.jcr.nodesByPath || data.jcr.nodesById) || null;
-
-  if (loading) {
-    return {
-      loading: loading
-    };
-  }
-
+  var result = others;
   if (node) {
-    return _objectSpread({
-      node: decodeResult(node, memoizedOptions)
-    }, others, {
+    result = _objectSpread(_objectSpread({
+      node: decodeResult(node, options)
+    }, others), {}, {
       query: query,
       variables: generatedVariables
     });
   }
-
   if (nodes) {
-    return _objectSpread({
+    result = _objectSpread(_objectSpread({
       nodes: nodes.map(function (n) {
-        return decodeResult(n, memoizedOptions);
+        return decodeResult(n, options);
       })
-    }, others, {
+    }, others), {}, {
       query: query,
       variables: generatedVariables
     });
   }
-
-  return _objectSpread({}, others);
+  return result;
 };
-
 var decodeResult = function decodeResult(nodeOrig, options) {
   var node = _objectSpread({}, nodeOrig);
-
   if (node.site) {
     node.site = _objectSpread({}, node.site);
   }
-
   if (node && options) {
     if (options.getPermissions) {
       options.getPermissions.forEach(function (name) {
@@ -87,7 +173,6 @@ var decodeResult = function decodeResult(nodeOrig, options) {
         node[name] = res;
       });
     }
-
     if (options.getSitePermissions) {
       options.getSitePermissions.forEach(function (name) {
         var res = node.site[getEncodedPermissionName(name)];
@@ -95,7 +180,6 @@ var decodeResult = function decodeResult(nodeOrig, options) {
         node.site[name] = res;
       });
     }
-
     if (options.getIsNodeTypes) {
       options.getIsNodeTypes.forEach(function (name) {
         var res = node[getEncodedNodeTypeName(name)];
@@ -103,13 +187,11 @@ var decodeResult = function decodeResult(nodeOrig, options) {
         node[name] = res;
       });
     }
-
     if (options.getMimeType) {
       var nodes = node.resourceChildren.nodes;
       node.mimeType = nodes.length !== 0 && nodes[0].mimeType.value || null;
       delete node.resourceChildren;
     }
   }
-
   return node;
 };