@jahia/data-helper 1.0.5 → 1.0.7

package/js/hooks/useNodeInfo/useNodeInfo.utils.js

@@ -0,0 +1,60 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.merge = exports.isSubset = void 0;
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
+function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+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 _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+var isObject = function isObject(obj) {
+  return obj !== null && _typeof(obj) === 'object';
+};
+var merge = function merge(target, source) {
+  if (Array.isArray(target) && Array.isArray(source)) {
+    return [].concat(_toConsumableArray(target), _toConsumableArray(source.filter(function (f) {
+      return target.indexOf(f) === -1;
+    })));
+  }
+  if (isObject(target) && isObject(source)) {
+    Object.keys(source).forEach(function (sourceKey) {
+      var sourceValue = source[sourceKey];
+      if (Object.prototype.hasOwnProperty.call(target, sourceKey)) {
+        var targetValue = target[sourceKey];
+        target[sourceKey] = merge(targetValue, sourceValue);
+      } else if (Array.isArray(sourceValue)) {
+        target[sourceKey] = _toConsumableArray(sourceValue);
+      } else if (_typeof(sourceValue) === 'object') {
+        target[sourceKey] = _objectSpread({}, sourceValue);
+      } else {
+        target[sourceKey] = sourceValue;
+      }
+    });
+    return target;
+  }
+  return target;
+};
+exports.merge = merge;
+var isSubset = function isSubset(superObj, subObj) {
+  return Object.keys(subObj).every(function (ele) {
+    var obj1 = subObj[ele];
+    var obj2 = superObj[ele];
+    if (Array.isArray(obj1) && Array.isArray(obj2)) {
+      return obj1.length === obj2.length && obj1.every(function (value, index) {
+        return value === obj2[index];
+      });
+    }
+    if (_typeof(obj1) === 'object' && !Array.isArray(obj1)) {
+      return isSubset(obj2, obj1);
+    }
+    return obj1 === obj2;
+  });
+};
+exports.isSubset = isSubset;

package/js/hooks/useSchemaFields/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _useSchemaFields = require("./useSchemaFields");
-
 Object.keys(_useSchemaFields).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _useSchemaFields[key]) return;

package/js/hooks/useSchemaFields/useSchemaFields.gql-queries.js

@@ -4,22 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SCHEMA_FIELDS_QUERY = void 0;
-
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
-
+var _templateObject;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _templateObject() {
-  var data = _taggedTemplateLiteral(["query schemaFields($type: String!) {\n    __type(name: $type) {\n        fields {\n            name\n            args {\n                name\n                type {\n                    name\n                }\n            }\n        }\n    }\n}"]);
-
-  _templateObject = function _templateObject() {
-    return data;
-  };
-
-  return data;
-}
-
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
-var SCHEMA_FIELDS_QUERY = (0, _graphqlTag["default"])(_templateObject());
+var SCHEMA_FIELDS_QUERY = (0, _graphqlTag["default"])(_templateObject || (_templateObject = _taggedTemplateLiteral(["query schemaFields($type: String!) {\n    __type(name: $type) {\n        fields {\n            name\n            args {\n                name\n                type {\n                    name\n                }\n            }\n        }\n    }\n}"])));
 exports.SCHEMA_FIELDS_QUERY = SCHEMA_FIELDS_QUERY;

package/js/hooks/useSchemaFields/useSchemaFields.jsx

@@ -4,15 +4,11 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useSchemaFields = void 0;
-
 var _reactApollo = require("react-apollo");
-
 var _useSchemaFields = require("./useSchemaFields.gql-queries");
-
 var useSchemaFields = function useSchemaFields(variables) {
   return (0, _reactApollo.useQuery)(_useSchemaFields.SCHEMA_FIELDS_QUERY, {
     variables: variables
   });
 };
-
 exports.useSchemaFields = useSchemaFields;

package/js/hooks/useSiteInfo/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _useSiteInfo = require("./useSiteInfo");
-
 Object.keys(_useSiteInfo).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _useSiteInfo[key]) return;

package/js/hooks/useSiteInfo/useSiteInfo.gql-queries.js

@@ -4,24 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.SITE_INFO_QUERY = void 0;
-
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
-
 var _PredefinedFragments = require("../../fragments/PredefinedFragments");
-
+var _templateObject;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _templateObject() {
-  var data = _taggedTemplateLiteral(["\n    query siteInfo($path: String!, $displayLanguage:String!) {\n        jcr(workspace: LIVE) {\n            result:nodeByPath(path: $path) {\n                site {\n                    ...SiteInfo\n                    ...NodeCacheRequiredFields\n                }\n                ...NodeCacheRequiredFields\n            }\n        }\n        wsDefault:jcr {\n            result:nodeByPath(path: $path) {\n                site {\n                    ...SiteInfo\n                    ...NodeCacheRequiredFields\n                }\n                ...NodeCacheRequiredFields\n            }\n        }\n    }\n    fragment SiteInfo on JCRSite {\n        displayName(language: $displayLanguage)\n        defaultLanguage\n        serverName\n        description\n        languages {\n            displayName\n            language\n            activeInEdit\n        }\n    }\n    ", "\n"]);
-
-  _templateObject = function _templateObject() {
-    return data;
-  };
-
-  return data;
-}
-
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
-var SITE_INFO_QUERY = (0, _graphqlTag["default"])(_templateObject(), _PredefinedFragments.nodeCacheRequiredFields.gql);
+var SITE_INFO_QUERY = (0, _graphqlTag["default"])(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    query siteInfo($path: String!, $displayLanguage:String!) {\n        jcr(workspace: LIVE) {\n            result:nodeByPath(path: $path) {\n                site {\n                    ...SiteInfo\n                    ...NodeCacheRequiredFields\n                }\n                ...NodeCacheRequiredFields\n            }\n        }\n        wsDefault:jcr {\n            result:nodeByPath(path: $path) {\n                site {\n                    ...SiteInfo\n                    ...NodeCacheRequiredFields\n                }\n                ...NodeCacheRequiredFields\n            }\n        }\n    }\n    fragment SiteInfo on JCRSite {\n        displayName(language: $displayLanguage)\n        defaultLanguage\n        serverName\n        description\n        languages {\n            displayName\n            language\n            activeInEdit\n        }\n    }\n    ", "\n"])), _PredefinedFragments.nodeCacheRequiredFields.gql);
 exports.SITE_INFO_QUERY = SITE_INFO_QUERY;

package/js/hooks/useSiteInfo/useSiteInfo.js

@@ -4,34 +4,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useSiteInfo = void 0;
-
 var _reactApollo = require("react-apollo");
-
 var _useSiteInfo = require("./useSiteInfo.gql-queries");
-
 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; }
-
 var adaptSiteInfo = function adaptSiteInfo(data) {
   if (data && (data.jcr || data.wsDefault)) {
     var res = data.jcr ? data.jcr.result : data.wsDefault.result;
-
     if (res) {
       return _objectSpread({}, res.site);
     }
   }
-
   return {
     languages: []
   };
 };
-
 var useSiteInfo = function useSiteInfo(_ref) {
   var siteKey = _ref.siteKey,
-      displayLanguage = _ref.displayLanguage;
+    displayLanguage = _ref.displayLanguage;
   var variables = {
     path: '/sites/' + siteKey,
     displayLanguage: displayLanguage
@@ -40,9 +31,8 @@ var useSiteInfo = function useSiteInfo(_ref) {
     variables: variables,
     errorPolicy: 'ignore'
   });
-  return _objectSpread({}, res, {
+  return _objectSpread(_objectSpread({}, res), {}, {
     siteInfo: adaptSiteInfo(res.data)
   });
 };
-
 exports.useSiteInfo = useSiteInfo;

package/js/hooks/useSiteInfo/useSiteInfo.spec.js

@@ -1,9 +1,7 @@
 "use strict";
 
 var _index = require("./index.js");
-
 var _reactApollo = require("react-apollo");
-
 jest.mock('react-apollo', function () {
   return {
     useQuery: jest.fn(function () {
@@ -41,7 +39,6 @@ describe('useSiteInfo', function () {
         }
       }
     };
-
     _reactApollo.useQuery.mockImplementation(function () {
       return {
         loading: false,
@@ -49,7 +46,6 @@ describe('useSiteInfo', function () {
         data: data
       };
     });
-
     expect((0, _index.useSiteInfo)({})).toEqual({
       loading: false,
       error: null,

package/js/hooks/useTreeEntries/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _useTreeEntries = require("./useTreeEntries");
-
 Object.keys(_useTreeEntries).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _useTreeEntries[key]) return;

package/js/hooks/useTreeEntries/useTreeEntries.gql-queries.js

@@ -4,24 +4,10 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.TREE_QUERY = void 0;
-
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
-
 var _PredefinedFragments = require("../../fragments/PredefinedFragments");
-
+var _templateObject;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _templateObject() {
-  var data = _taggedTemplateLiteral(["\n    query PickerQuery($rootPaths:[String!]!, $selectable:[String]!, $openable:[String]!, $openPaths:[String!]!, $types:[String]!, $recursionTypesFilter: InputNodeTypesInput, $sortBy: InputFieldSorterInput, $fieldGrouping: InputFieldGroupingInput) {\n        jcr {\n            rootNodes:nodesByPath(paths: $rootPaths) {\n                name\n                children: descendants(typesFilter:{types: $types}, recursionTypesFilter: $recursionTypesFilter, limit:1) {\n                    pageInfo {\n                        nodesCount\n                    }\n                }\n                selectable : isNodeType(type: {types:$selectable})\n                openable : isNodeType(type: {types:$openable})\n                ... NodeCacheRequiredFields\n                ... node\n            },\n            openNodes:nodesByPath(paths: $openPaths) {\n                ... NodeCacheRequiredFields\n                children:descendants(typesFilter:{types: $types}, recursionTypesFilter: $recursionTypesFilter, fieldSorter: $sortBy, fieldGrouping: $fieldGrouping) {\n                    nodes {\n                        name\n                        children: descendants(typesFilter:{types: $types}, recursionTypesFilter: $recursionTypesFilter, limit:1) {\n                            pageInfo {\n                                nodesCount\n                            }\n                        }\n                        selectable : isNodeType(type: {types:$selectable})\n                        openable : isNodeType(type: {types:$openable})\n                        ... NodeCacheRequiredFields\n                        ... node\n                    }\n                }\n            }\n        }\n    }\n", ""]);
-
-  _templateObject = function _templateObject() {
-    return data;
-  };
-
-  return data;
-}
-
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
-var TREE_QUERY = (0, _graphqlTag["default"])(_templateObject(), _PredefinedFragments.nodeCacheRequiredFields.gql);
+var TREE_QUERY = (0, _graphqlTag["default"])(_templateObject || (_templateObject = _taggedTemplateLiteral(["\n    query PickerQuery($rootPaths:[String!]!, $selectable:[String]!, $openable:[String]!, $openPaths:[String!]!, $types:[String]!, $recursionTypesFilter: InputNodeTypesInput, $sortBy: InputFieldSorterInput, $fieldGrouping: InputFieldGroupingInput) {\n        jcr {\n            rootNodes:nodesByPath(paths: $rootPaths) {\n                name\n                children: descendants(typesFilter:{types: $types}, recursionTypesFilter: $recursionTypesFilter, limit:1) {\n                    pageInfo {\n                        nodesCount\n                    }\n                }\n                selectable : isNodeType(type: {types:$selectable})\n                openable : isNodeType(type: {types:$openable})\n                ... NodeCacheRequiredFields\n                ... node\n            },\n            openNodes:nodesByPath(paths: $openPaths) {\n                ... NodeCacheRequiredFields\n                children:descendants(typesFilter:{types: $types}, recursionTypesFilter: $recursionTypesFilter, fieldSorter: $sortBy, fieldGrouping: $fieldGrouping) {\n                    nodes {\n                        name\n                        children: descendants(typesFilter:{types: $types}, recursionTypesFilter: $recursionTypesFilter, limit:1) {\n                            pageInfo {\n                                nodesCount\n                            }\n                        }\n                        selectable : isNodeType(type: {types:$selectable})\n                        openable : isNodeType(type: {types:$openable})\n                        ... NodeCacheRequiredFields\n                        ... node\n                    }\n                }\n            }\n        }\n    }\n", ""])), _PredefinedFragments.nodeCacheRequiredFields.gql);
 exports.TREE_QUERY = TREE_QUERY;

package/js/hooks/useTreeEntries/useTreeEntries.js

@@ -4,62 +4,42 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useTreeEntries = void 0;
-
-var _react = require("react");
-
 var _reactApollo = require("react-apollo");
-
 var _fragments = require("../../fragments/fragments.utils");
-
 var _useTreeEntries = require("./useTreeEntries.gql-queries");
-
+var _excluded = ["data"];
 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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
-
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread 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 _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
-
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
-
 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; }
-
 var useTreeEntries = function useTreeEntries(_ref, queryOptions) {
   var fragments = _ref.fragments,
-      rootPaths = _ref.rootPaths,
-      openPaths = _ref.openPaths,
-      selectedPaths = _ref.selectedPaths,
-      openableTypes = _ref.openableTypes,
-      selectableTypes = _ref.selectableTypes,
-      recursionTypesFilter = _ref.recursionTypesFilter,
-      queryVariables = _ref.queryVariables,
-      hideRoot = _ref.hideRoot,
-      sortBy = _ref.sortBy;
-  var query = (0, _react.useRef)((0, _fragments.replaceFragmentsInDocument)(_useTreeEntries.TREE_QUERY, fragments));
-
+    rootPaths = _ref.rootPaths,
+    openPaths = _ref.openPaths,
+    selectedPaths = _ref.selectedPaths,
+    openableTypes = _ref.openableTypes,
+    selectableTypes = _ref.selectableTypes,
+    recursionTypesFilter = _ref.recursionTypesFilter,
+    queryVariables = _ref.queryVariables,
+    hideRoot = _ref.hideRoot,
+    sortBy = _ref.sortBy;
+  var query = (0, _fragments.replaceFragmentsInDocument)(_useTreeEntries.TREE_QUERY, fragments);
   var getTreeEntries = function getTreeEntries(data, selectedPaths, openPaths) {
     var treeEntries = [];
     var nodesById = {};
     var jcr = data ? data.jcr : {};
-
     var addNode = function addNode(node, depth, index) {
       var selected = false;
-
       if (node.selectable) {
         selected = selectedPaths.indexOf(node.path) !== -1;
       }
-
       var treeEntry = {
         name: node.name,
         path: node.path,
@@ -77,7 +57,6 @@ var useTreeEntries = function useTreeEntries(_ref, queryOptions) {
       nodesById[node.uuid] = treeEntry;
       return treeEntry;
     };
-
     if (jcr) {
       if (jcr.rootNodes) {
         jcr.rootNodes.forEach(function (rootNode) {
@@ -85,25 +64,22 @@ var useTreeEntries = function useTreeEntries(_ref, queryOptions) {
           root.hidden = hideRoot;
         });
       }
-
       if (jcr.openNodes) {
         _toConsumableArray(jcr.openNodes).sort(function (a, b) {
           return a.path.localeCompare(b.path);
         }).forEach(function (node) {
           var parent = nodesById[node.uuid];
-
           if (parent) {
             var parentIndex = treeEntries.indexOf(parent);
-
             _toConsumableArray(node.children.nodes).reverse().forEach(function (child) {
               addNode(child, parent.depth + 1, parentIndex + 1);
             });
           }
         });
       }
-    } // Nodes loaded, fill selection list
-
+    }
 
+    // Nodes loaded, fill selection list
     selectedPaths = treeEntries.filter(function (node) {
       return node.selected;
     }).map(function (node) {
@@ -113,7 +89,6 @@ var useTreeEntries = function useTreeEntries(_ref, queryOptions) {
       return !treeNode.hidden;
     });
   };
-
   var vars = _objectSpread({
     rootPaths: rootPaths,
     types: Array.from(new Set([].concat(_toConsumableArray(openableTypes || []), _toConsumableArray(selectableTypes || [])))),
@@ -126,16 +101,13 @@ var useTreeEntries = function useTreeEntries(_ref, queryOptions) {
     openPaths: openPaths,
     sortBy: sortBy
   }, queryVariables);
-
-  var _useQuery = (0, _reactApollo.useQuery)(query.current, _objectSpread({}, queryOptions, {
-    variables: vars
-  })),
-      data = _useQuery.data,
-      others = _objectWithoutProperties(_useQuery, ["data"]);
-
+  var _useQuery = (0, _reactApollo.useQuery)(query, _objectSpread(_objectSpread({}, queryOptions), {}, {
+      variables: vars
+    })),
+    data = _useQuery.data,
+    others = _objectWithoutProperties(_useQuery, _excluded);
   return _objectSpread({
     treeEntries: getTreeEntries(data, selectedPaths, openPaths)
   }, others);
 };
-
 exports.useTreeEntries = useTreeEntries;

package/js/hooks/useTreeEntries/useTreeEntries.spec.js

@@ -1,11 +1,8 @@
 "use strict";
 
 var _index = require("./index.js");
-
 var _reactApollo = require("react-apollo");
-
 var _printer = require("graphql/language/printer");
-
 jest.mock('react-apollo', function () {
   return {
     useQuery: jest.fn(function () {

package/js/index.js

@@ -3,9 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-
 var _fragments = require("./fragments");
-
 Object.keys(_fragments).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _fragments[key]) return;
@@ -16,9 +14,7 @@ Object.keys(_fragments).forEach(function (key) {
     }
   });
 });
-
 var _hooks = require("./hooks");
-
 Object.keys(_hooks).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _hooks[key]) return;
@@ -29,9 +25,7 @@ Object.keys(_hooks).forEach(function (key) {
     }
   });
 });
-
 var _legacy = require("./legacy");
-
 Object.keys(_legacy).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
   if (key in exports && exports[key] === _legacy[key]) return;

package/js/legacy/Picker.gql-fragments.js

@@ -4,58 +4,25 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.PickerItemsFragment = void 0;
-
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
-
+var _templateObject, _templateObject2, _templateObject3;
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
-function _templateObject3() {
-  var data = _taggedTemplateLiteral(["fragment PrimaryNodeTypeName on JCRNode {\n            primaryNodeType {\n                name\n            }\n        }"]);
-
-  _templateObject3 = function _templateObject3() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject2() {
-  var data = _taggedTemplateLiteral(["fragment PublicationStatus on JCRNode {\n            publicationStatus: aggregatedPublicationInfo(language: $language) {\n                publicationStatus\n            }\n        }"]);
-
-  _templateObject2 = function _templateObject2() {
-    return data;
-  };
-
-  return data;
-}
-
-function _templateObject() {
-  var data = _taggedTemplateLiteral(["fragment MixinTypes on JCRNode {\n            mixinTypes {\n                name\n            }\n        }"]);
-
-  _templateObject = function _templateObject() {
-    return data;
-  };
-
-  return data;
-}
-
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
-
 var PickerItemsFragment = {
   mixinTypes: {
     applyFor: 'node',
-    gql: (0, _graphqlTag["default"])(_templateObject())
+    gql: (0, _graphqlTag["default"])(_templateObject || (_templateObject = _taggedTemplateLiteral(["fragment MixinTypes on JCRNode {\n            mixinTypes {\n                name\n            }\n        }"])))
   },
   isPublished: {
     applyFor: 'node',
     variables: {
       language: 'String!'
     },
-    gql: (0, _graphqlTag["default"])(_templateObject2())
+    gql: (0, _graphqlTag["default"])(_templateObject2 || (_templateObject2 = _taggedTemplateLiteral(["fragment PublicationStatus on JCRNode {\n            publicationStatus: aggregatedPublicationInfo(language: $language) {\n                publicationStatus\n            }\n        }"])))
   },
   primaryNodeType: {
     applyFor: 'node',
-    gql: (0, _graphqlTag["default"])(_templateObject3())
+    gql: (0, _graphqlTag["default"])(_templateObject3 || (_templateObject3 = _taggedTemplateLiteral(["fragment PrimaryNodeTypeName on JCRNode {\n            primaryNodeType {\n                name\n            }\n        }"])))
   }
 };
 exports.PickerItemsFragment = PickerItemsFragment;