@jahia/data-helper 1.0.4 → 1.0.5

package/esm/fragments/fragments.utils.js

@@ -1,19 +1,29 @@
-import _assign from "lodash/assign";
-import _reduce from "lodash/reduce";
-import _find from "lodash/find";
-import _map from "lodash/map";
-import _filter from "lodash/filter";
-import _concat from "lodash/concat";
-import _without from "lodash/without";
-import _each from "lodash/each";
 import _cloneDeep from "lodash/cloneDeep";
-import _flatMap from "lodash/flatMap";
+
+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 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; }
+
 import { parseType } from 'graphql';
 import { PredefinedFragments } from '../fragments';
 
 function findParametersInDocument(doc) {
   if (doc && doc.definitions) {
-    return _flatMap(doc.definitions, function (def) {
+    return doc.definitions.flatMap(function (def) {
       return findParametersInSelectionSet(def.selectionSet);
     });
   }
@@ -42,11 +52,9 @@ function replaceFragmentsInDocument(doc, fragments) {
 
   if (doc && doc.definitions) {
     clonedQuery = _cloneDeep(doc);
-
-    _each(clonedQuery.definitions, function (def) {
+    clonedQuery.definitions.forEach(function (def) {
       return replaceFragmentsInSelectionSet(def.selectionSet, fragments, def, clonedQuery);
     });
-
     clonedQuery.definitions[0].name.value = key;
   }
 
@@ -56,12 +64,14 @@ function replaceFragmentsInDocument(doc, fragments) {
 
 function findParametersInSelectionSet(selectionSet) {
   if (selectionSet && selectionSet.selections) {
-    return _flatMap(selectionSet.selections, function (sel) {
-      return _without(_concat(_flatMap(_filter(sel.arguments, function (arg) {
+    return selectionSet.selections.flatMap(function (sel) {
+      return sel.arguments.filter(function (arg) {
         return arg.value.kind === 'Variable';
-      }), function (arg) {
+      }).flatMap(function (arg) {
         return arg.value.name.value;
-      }), findParametersInSelectionSet(sel.selectionSet)), undefined);
+      }).concat(findParametersInSelectionSet(sel.selectionSet)).filter(function (f) {
+        return typeof f !== 'undefined';
+      });
     });
   }
 
@@ -70,11 +80,11 @@ function findParametersInSelectionSet(selectionSet) {
 
 function findFragmentsInSelectionSet(selectionSet) {
   if (selectionSet && selectionSet.selections) {
-    return _concat(_map(_filter(selectionSet.selections, function (sel) {
+    return selectionSet.selections.filter(function (sel) {
       return sel.kind === 'FragmentSpread';
-    }), function (sel) {
+    }).map(function (sel) {
       return sel.name.value;
-    }), _flatMap(selectionSet.selections, function (sel) {
+    }).concat(selectionSet.selections.flatMap(function (sel) {
       return findFragmentsInSelectionSet(sel.selectionSet);
     }));
   }
@@ -89,13 +99,13 @@ function replaceFragmentsInSelectionSet(selectionSet, fragments, def, document)
     var newFragmentsSpreads = [];
     var removedFragmentSpreads = []; // Look for all existing fragment spreads in selection set
 
-    _each(_filter(selectionSet.selections, function (sel) {
+    selectionSet.selections.filter(function (sel) {
       return sel.kind === 'FragmentSpread';
-    }), function (sel) {
+    }).forEach(function (sel) {
       // Handle only named fragments
       if (sel.name.value) {
         // Check if spread exists in current doc - if not, we replace or remove it
-        var existing = _find(document.definitions, function (definition) {
+        var existing = document.definitions.find(function (definition) {
           return definition.kind === 'FragmentDefinition' && definition.name.value === sel.name.value;
         });
 
@@ -104,25 +114,21 @@ function replaceFragmentsInSelectionSet(selectionSet, fragments, def, document)
           removedFragmentSpreads.push(sel); // Check if a replacement is provided for this pseudo-fragment, then insert spreads and definitions
 
           if (fragments) {
-            fragments = _map(fragments, function (frag) {
+            fragments = fragments.map(function (frag) {
               return typeof frag === 'string' ? PredefinedFragments[frag] : frag;
             });
-
-            var applyableFragments = _filter(fragments, function (frag) {
+            var applyableFragments = fragments.filter(function (frag) {
               return frag.applyFor === sel.name.value;
             });
-
-            var allFragmentsDefinitions = _flatMap(applyableFragments, function (fragment) {
+            applyableFragments.flatMap(function (fragment) {
               return fragment.gql.definitions;
-            });
-
-            _each(allFragmentsDefinitions, function (frag) {
+            }).forEach(function (frag) {
               var newSpread = _cloneDeep(sel);
 
               newSpread.name.value = frag.name.value;
               newFragmentsSpreads.push(newSpread); // Add the new fragment definition in document if it has not already been added
 
-              var existing = _find(document.definitions, function (definition) {
+              var existing = document.definitions.find(function (definition) {
                 return definition.kind === 'FragmentDefinition' && definition.name.value === frag.name.value;
               });
 
@@ -131,13 +137,15 @@ function replaceFragmentsInSelectionSet(selectionSet, fragments, def, document)
               }
             }); // Adds the associated variables to the query
 
-
-            var allVariables = _reduce(applyableFragments, function (result, n) {
-              return _assign(result, n.variables);
+            var allVariables = applyableFragments.reduce(function (result, n) {
+              return _objectSpread({}, result, {}, n.variables);
             }, {});
+            Object.entries(allVariables).forEach(function (_ref) {
+              var _ref2 = _slicedToArray(_ref, 2),
+                  name = _ref2[0],
+                  value = _ref2[1];
 
-            _each(allVariables, function (value, name) {
-              var existing = _find(def.variableDefinitions, function (def) {
+              var existing = def.variableDefinitions.find(function (def) {
                 return def.variable.name.value === name;
               });
 
@@ -163,15 +171,14 @@ function replaceFragmentsInSelectionSet(selectionSet, fragments, def, document)
       }
     }); // Removed replaced spreads
 
-
-    selectionSet.selections = _filter(selectionSet.selections, function (sel) {
+    selectionSet.selections = selectionSet.selections.filter(function (sel) {
       return removedFragmentSpreads.indexOf(sel) === -1;
     }); // Add all new spreads
 
     (_selectionSet$selecti = selectionSet.selections).push.apply(_selectionSet$selecti, newFragmentsSpreads); // Recursively call on sub-selections set
 
 
-    _each(selectionSet.selections, function (sel) {
+    selectionSet.selections.forEach(function (sel) {
       return replaceFragmentsInSelectionSet(sel.selectionSet, fragments, def, document);
     });
   }

package/esm/hooks/useNodeChecks/useNodeChecks.js

@@ -1,6 +1,6 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 

package/esm/hooks/useNodeInfo/useNodeInfo.js

@@ -1,6 +1,6 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 

package/esm/hooks/useSiteInfo/useSiteInfo.js

@@ -1,6 +1,6 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 

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

@@ -1,5 +1,5 @@
 function _templateObject() {
-  var data = _taggedTemplateLiteral(["\n    query PickerQuery($rootPaths:[String!]!, $selectable:[String]!, $openable:[String]!, $openPaths:[String!]!, $types:[String]!, $sortBy: InputFieldSorterInput) {\n        jcr {\n            rootNodes:nodesByPath(paths: $rootPaths) {\n                name\n                children(typesFilter:{types:$types}, 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(typesFilter:{types:$types}, fieldSorter: $sortBy) {\n                    nodes {\n                        name\n                        children(typesFilter:{types:$types}, 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", ""]);
+  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;
@@ -10,7 +10,6 @@ function _templateObject() {
 
 function _taggedTemplateLiteral(strings, raw) { if (!raw) { raw = strings.slice(0); } return Object.freeze(Object.defineProperties(strings, { raw: { value: Object.freeze(raw) } })); }
 
-// TODO BACKLOG-12393 - refactor Legacy Picker into hook without lodash
 import gql from 'graphql-tag';
 import { nodeCacheRequiredFields } from '../../fragments/PredefinedFragments';
 export var TREE_QUERY = gql(_templateObject(), nodeCacheRequiredFields.gql);

package/esm/hooks/useTreeEntries/useTreeEntries.js

@@ -1,22 +1,24 @@
-import _assign from "lodash/assign";
-import _union from "lodash/union";
-import _map from "lodash/map";
-import _filter from "lodash/filter";
-import _forEachRight from "lodash/forEachRight";
-import _sortBy from "lodash/sortBy";
-import _forEach from "lodash/forEach";
-import _repeat from "lodash/repeat";
-import _indexOf from "lodash/indexOf";
+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); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
-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 _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; }
 
 import { useRef } from 'react';
 import { useQuery } from 'react-apollo';
@@ -29,6 +31,7 @@ export var useTreeEntries = function useTreeEntries(_ref, queryOptions) {
       selectedPaths = _ref.selectedPaths,
       openableTypes = _ref.openableTypes,
       selectableTypes = _ref.selectableTypes,
+      recursionTypesFilter = _ref.recursionTypesFilter,
       queryVariables = _ref.queryVariables,
       hideRoot = _ref.hideRoot,
       sortBy = _ref.sortBy;
@@ -43,18 +46,18 @@ export var useTreeEntries = function useTreeEntries(_ref, queryOptions) {
       var selected = false;
 
       if (node.selectable) {
-        selected = _indexOf(selectedPaths, node.path) !== -1;
+        selected = selectedPaths.indexOf(node.path) !== -1;
       }
 
       var treeEntry = {
         name: node.name,
         path: node.path,
-        open: node.openable && _indexOf(openPaths, node.path) !== -1,
+        open: node.openable && openPaths.indexOf(node.path) !== -1,
         selected: selected,
         openable: node.openable,
         selectable: node.selectable,
         depth: depth,
-        prefix: _repeat('&nbsp;', depth * 3),
+        prefix: '&nbsp;'.repeat(depth * 3),
         node: node,
         hidden: false,
         hasChildren: node.children.pageInfo.nodesCount > 0
@@ -66,20 +69,22 @@ export var useTreeEntries = function useTreeEntries(_ref, queryOptions) {
 
     if (jcr) {
       if (jcr.rootNodes) {
-        _forEach(jcr.rootNodes, function (rootNode) {
+        jcr.rootNodes.forEach(function (rootNode) {
           var root = addNode(rootNode, 0, 0);
           root.hidden = hideRoot;
         });
       }
 
       if (jcr.openNodes) {
-        _sortBy(jcr.openNodes, ['path']).forEach(function (node) {
+        _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 = _indexOf(treeEntries, parent);
+            var parentIndex = treeEntries.indexOf(parent);
 
-            _forEachRight(node.children.nodes, function (child) {
+            _toConsumableArray(node.children.nodes).reverse().forEach(function (child) {
               addNode(child, parent.depth + 1, parentIndex + 1);
             });
           }
@@ -88,35 +93,28 @@ export var useTreeEntries = function useTreeEntries(_ref, queryOptions) {
     } // Nodes loaded, fill selection list
 
 
-    var selectedNodes = _filter(treeEntries, function (node) {
+    selectedPaths = treeEntries.filter(function (node) {
       return node.selected;
     }).map(function (node) {
-      return node.node;
+      return node.node.path;
     });
-
-    selectedPaths = _map(selectedNodes, 'path');
-    treeEntries = _filter(treeEntries, function (treeNode) {
+    return treeEntries.filter(function (treeNode) {
       return !treeNode.hidden;
     });
-    return treeEntries;
   };
 
-  var vars = {
+  var vars = _objectSpread({
     rootPaths: rootPaths,
-    types: _union(openableTypes, selectableTypes),
+    types: Array.from(new Set([].concat(_toConsumableArray(openableTypes || []), _toConsumableArray(selectableTypes || [])))),
+    recursionTypesFilter: recursionTypesFilter || {
+      types: 'nt:base',
+      multi: 'NONE'
+    },
     selectable: selectableTypes,
     openable: openableTypes,
-    openPaths: openPaths
-  };
-
-  if (sortBy) {
-    // Add the sortBy if it is not null or undefined
-    vars.sortBy = sortBy;
-  }
-
-  if (queryVariables) {
-    _assign(vars, queryVariables);
-  }
+    openPaths: openPaths,
+    sortBy: sortBy
+  }, queryVariables);
 
   var _useQuery = useQuery(query.current, _objectSpread({}, queryOptions, {
     variables: vars

package/esm/legacy/Picker.js

@@ -1,3 +1,5 @@
+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); }
+
 import _includes from "lodash/includes";
 import _startsWith from "lodash/startsWith";
 import _split from "lodash/split";
@@ -15,21 +17,23 @@ import _eq from "lodash/eq";
 import _clone from "lodash/clone";
 import _filter from "lodash/filter";
 
-function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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) || _nonIterableSpread(); }
+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 _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 
-function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
+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 _templateObject() {
   var data = _taggedTemplateLiteral(["\n            query PickerQuery($rootPaths:[String!]!, $selectable:[String]!, $openable:[String]!, $openPaths:[String!]!, $types:[String]!) {\n                jcr {\n                    rootNodes:nodesByPath(paths: $rootPaths) {\n                        name\n                        children(typesFilter:{types:$types}, 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(typesFilter:{types:$types}) {\n                            nodes {\n                                name\n                                children(typesFilter:{types:$types}, 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        ", ""]);
@@ -47,17 +51,17 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 // TODO BACKLOG-12393 - refactor Legacy Picker into hook without lodash
 import React from 'react';
@@ -66,9 +70,7 @@ import gql from 'graphql-tag';
 import PropTypes from 'prop-types';
 import { displayName, nodeCacheRequiredFields, replaceFragmentsInDocument } from '../fragments';
 import { PickerItemsFragment } from './Picker.gql-fragments';
-export var Picker =
-/*#__PURE__*/
-function (_React$Component) {
+export var Picker = /*#__PURE__*/function (_React$Component) {
   _inherits(Picker, _React$Component);
 
   function Picker(props) {

package/js/fragments/PredefinedFragments.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.PredefinedFragments = exports.mimeTypes = exports.nodeTypeSubTypes = exports.nodeTypeDisplayName = exports.nodeCacheRequiredFields = exports.siteHomePage = exports.contentRestrictions = exports.childNodeTypes = exports.subNodesCount = exports.lockInfo = exports.displayableNode = exports.siteLanguages = exports.installedModules = exports.getProperties = exports.allProperties = exports.operationSupport = exports.aggregatedPublicationInfoWithExistInLive = exports.aggregatedPublicationInfo = exports.parentNode = exports.primaryNodeType = exports.displayName = void 0;
+exports.subNodesCount = exports.siteLanguages = exports.siteHomePage = exports.primaryNodeType = exports.parentNode = exports.operationSupport = exports.nodeTypeSubTypes = exports.nodeTypeDisplayName = exports.nodeCacheRequiredFields = exports.mimeTypes = exports.lockInfo = exports.installedModules = exports.getProperties = exports.displayableNode = exports.displayName = exports.contentRestrictions = exports.childNodeTypes = exports.allProperties = exports.aggregatedPublicationInfoWithExistInLive = exports.aggregatedPublicationInfo = exports.PredefinedFragments = void 0;
 
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 

package/js/fragments/fragments.utils.js

@@ -3,39 +3,39 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.replaceFragmentsInDocument = replaceFragmentsInDocument;
-exports.findParametersInDocument = findParametersInDocument;
 exports.findFragmentsInSelectionSet = findFragmentsInSelectionSet;
+exports.findParametersInDocument = findParametersInDocument;
+exports.replaceFragmentsInDocument = replaceFragmentsInDocument;
 
-var _assign2 = _interopRequireDefault(require("lodash/assign"));
+var _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
 
-var _reduce2 = _interopRequireDefault(require("lodash/reduce"));
+var _graphql = require("graphql");
 
-var _find2 = _interopRequireDefault(require("lodash/find"));
+var _fragments = require("../fragments");
 
-var _map2 = _interopRequireDefault(require("lodash/map"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-var _filter2 = _interopRequireDefault(require("lodash/filter"));
+function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 
-var _concat2 = _interopRequireDefault(require("lodash/concat"));
+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."); }
 
-var _without2 = _interopRequireDefault(require("lodash/without"));
+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); }
 
-var _each2 = _interopRequireDefault(require("lodash/each"));
+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 _cloneDeep2 = _interopRequireDefault(require("lodash/cloneDeep"));
+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; }
 
-var _flatMap2 = _interopRequireDefault(require("lodash/flatMap"));
+function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-var _graphql = require("graphql");
+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; }
 
-var _fragments = require("../fragments");
+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 _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+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 findParametersInDocument(doc) {
   if (doc && doc.definitions) {
-    return (0, _flatMap2["default"])(doc.definitions, function (def) {
+    return doc.definitions.flatMap(function (def) {
       return findParametersInSelectionSet(def.selectionSet);
     });
   }
@@ -64,7 +64,7 @@ function replaceFragmentsInDocument(doc, fragments) {
 
   if (doc && doc.definitions) {
     clonedQuery = (0, _cloneDeep2["default"])(doc);
-    (0, _each2["default"])(clonedQuery.definitions, function (def) {
+    clonedQuery.definitions.forEach(function (def) {
       return replaceFragmentsInSelectionSet(def.selectionSet, fragments, def, clonedQuery);
     });
     clonedQuery.definitions[0].name.value = key;
@@ -76,12 +76,14 @@ function replaceFragmentsInDocument(doc, fragments) {
 
 function findParametersInSelectionSet(selectionSet) {
   if (selectionSet && selectionSet.selections) {
-    return (0, _flatMap2["default"])(selectionSet.selections, function (sel) {
-      return (0, _without2["default"])((0, _concat2["default"])((0, _flatMap2["default"])((0, _filter2["default"])(sel.arguments, function (arg) {
+    return selectionSet.selections.flatMap(function (sel) {
+      return sel.arguments.filter(function (arg) {
         return arg.value.kind === 'Variable';
-      }), function (arg) {
+      }).flatMap(function (arg) {
         return arg.value.name.value;
-      }), findParametersInSelectionSet(sel.selectionSet)), undefined);
+      }).concat(findParametersInSelectionSet(sel.selectionSet)).filter(function (f) {
+        return typeof f !== 'undefined';
+      });
     });
   }
 
@@ -90,11 +92,11 @@ function findParametersInSelectionSet(selectionSet) {
 
 function findFragmentsInSelectionSet(selectionSet) {
   if (selectionSet && selectionSet.selections) {
-    return (0, _concat2["default"])((0, _map2["default"])((0, _filter2["default"])(selectionSet.selections, function (sel) {
+    return selectionSet.selections.filter(function (sel) {
       return sel.kind === 'FragmentSpread';
-    }), function (sel) {
+    }).map(function (sel) {
       return sel.name.value;
-    }), (0, _flatMap2["default"])(selectionSet.selections, function (sel) {
+    }).concat(selectionSet.selections.flatMap(function (sel) {
       return findFragmentsInSelectionSet(sel.selectionSet);
     }));
   }
@@ -109,13 +111,13 @@ function replaceFragmentsInSelectionSet(selectionSet, fragments, def, document)
     var newFragmentsSpreads = [];
     var removedFragmentSpreads = []; // Look for all existing fragment spreads in selection set
 
-    (0, _each2["default"])((0, _filter2["default"])(selectionSet.selections, function (sel) {
+    selectionSet.selections.filter(function (sel) {
       return sel.kind === 'FragmentSpread';
-    }), function (sel) {
+    }).forEach(function (sel) {
       // Handle only named fragments
       if (sel.name.value) {
         // Check if spread exists in current doc - if not, we replace or remove it
-        var existing = (0, _find2["default"])(document.definitions, function (definition) {
+        var existing = document.definitions.find(function (definition) {
           return definition.kind === 'FragmentDefinition' && definition.name.value === sel.name.value;
         });
 
@@ -124,21 +126,20 @@ function replaceFragmentsInSelectionSet(selectionSet, fragments, def, document)
           removedFragmentSpreads.push(sel); // Check if a replacement is provided for this pseudo-fragment, then insert spreads and definitions
 
           if (fragments) {
-            fragments = (0, _map2["default"])(fragments, function (frag) {
+            fragments = fragments.map(function (frag) {
               return typeof frag === 'string' ? _fragments.PredefinedFragments[frag] : frag;
             });
-            var applyableFragments = (0, _filter2["default"])(fragments, function (frag) {
+            var applyableFragments = fragments.filter(function (frag) {
               return frag.applyFor === sel.name.value;
             });
-            var allFragmentsDefinitions = (0, _flatMap2["default"])(applyableFragments, function (fragment) {
+            applyableFragments.flatMap(function (fragment) {
               return fragment.gql.definitions;
-            });
-            (0, _each2["default"])(allFragmentsDefinitions, function (frag) {
+            }).forEach(function (frag) {
               var newSpread = (0, _cloneDeep2["default"])(sel);
               newSpread.name.value = frag.name.value;
               newFragmentsSpreads.push(newSpread); // Add the new fragment definition in document if it has not already been added
 
-              var existing = (0, _find2["default"])(document.definitions, function (definition) {
+              var existing = document.definitions.find(function (definition) {
                 return definition.kind === 'FragmentDefinition' && definition.name.value === frag.name.value;
               });
 
@@ -147,11 +148,15 @@ function replaceFragmentsInSelectionSet(selectionSet, fragments, def, document)
               }
             }); // Adds the associated variables to the query
 
-            var allVariables = (0, _reduce2["default"])(applyableFragments, function (result, n) {
-              return (0, _assign2["default"])(result, n.variables);
+            var allVariables = applyableFragments.reduce(function (result, n) {
+              return _objectSpread({}, result, {}, n.variables);
             }, {});
-            (0, _each2["default"])(allVariables, function (value, name) {
-              var existing = (0, _find2["default"])(def.variableDefinitions, function (def) {
+            Object.entries(allVariables).forEach(function (_ref) {
+              var _ref2 = _slicedToArray(_ref, 2),
+                  name = _ref2[0],
+                  value = _ref2[1];
+
+              var existing = def.variableDefinitions.find(function (def) {
                 return def.variable.name.value === name;
               });
 
@@ -177,14 +182,14 @@ function replaceFragmentsInSelectionSet(selectionSet, fragments, def, document)
       }
     }); // Removed replaced spreads
 
-    selectionSet.selections = (0, _filter2["default"])(selectionSet.selections, function (sel) {
+    selectionSet.selections = selectionSet.selections.filter(function (sel) {
       return removedFragmentSpreads.indexOf(sel) === -1;
     }); // Add all new spreads
 
     (_selectionSet$selecti = selectionSet.selections).push.apply(_selectionSet$selecti, newFragmentsSpreads); // Recursively call on sub-selections set
 
 
-    (0, _each2["default"])(selectionSet.selections, function (sel) {
+    selectionSet.selections.forEach(function (sel) {
       return replaceFragmentsInSelectionSet(sel.selectionSet, fragments, def, document);
     });
   }

package/js/fragments/getIsNodeTypeFragment.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getEncodedNodeTypeName = exports.getNodeTypeFragment = void 0;
+exports.getNodeTypeFragment = exports.getEncodedNodeTypeName = void 0;
 
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 

package/js/fragments/getPermissionFragment.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getEncodedPermissionName = exports.getSitePermissionFragment = exports.getPermissionFragment = void 0;
+exports.getSitePermissionFragment = exports.getPermissionFragment = exports.getEncodedPermissionName = void 0;
 
 var _graphqlTag = _interopRequireDefault(require("graphql-tag"));
 

package/js/fragments/index.js

@@ -8,6 +8,7 @@ var _PredefinedFragments = require("./PredefinedFragments");
 
 Object.keys(_PredefinedFragments).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _PredefinedFragments[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
@@ -20,6 +21,7 @@ var _fragments = require("./fragments.utils");
 
 Object.keys(_fragments).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _fragments[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {

package/js/hooks/index.js

@@ -8,6 +8,7 @@ var _useContentPreview = require("./useContentPreview");
 
 Object.keys(_useContentPreview).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _useContentPreview[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
@@ -20,6 +21,7 @@ var _useNodeChecks = require("./useNodeChecks");
 
 Object.keys(_useNodeChecks).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _useNodeChecks[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
@@ -32,6 +34,7 @@ var _useNodeInfo = require("./useNodeInfo");
 
 Object.keys(_useNodeInfo).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _useNodeInfo[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
@@ -44,6 +47,7 @@ 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;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
@@ -56,6 +60,7 @@ 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;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {

package/js/hooks/useContentPreview/index.js

@@ -8,6 +8,7 @@ var _useContentPreview = require("./useContentPreview");
 
 Object.keys(_useContentPreview).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _useContentPreview[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {

package/js/hooks/useDeepCompareMemo/index.js

@@ -8,6 +8,7 @@ var _useDeepCompareMemo = require("./useDeepCompareMemo");
 
 Object.keys(_useDeepCompareMemo).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _useDeepCompareMemo[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {

package/js/hooks/useNodeChecks/index.js

@@ -8,6 +8,7 @@ var _useNodeChecks = require("./useNodeChecks");
 
 Object.keys(_useNodeChecks).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _useNodeChecks[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {

package/js/hooks/useNodeChecks/useNodeChecks.js

@@ -7,9 +7,9 @@ exports.useNodeChecks = void 0;
 
 var _useNodeInfo2 = require("../useNodeInfo");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 

package/js/hooks/useNodeInfo/index.js

@@ -8,6 +8,7 @@ var _useNodeInfo = require("./useNodeInfo");
 
 Object.keys(_useNodeInfo).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _useNodeInfo[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {

package/js/hooks/useNodeInfo/useNodeInfo.js

@@ -19,9 +19,9 @@ var _getIsNodeTypeFragment = require("../../fragments/getIsNodeTypeFragment");
 
 var _useSchemaFields = require("../useSchemaFields");
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 

package/js/hooks/useSchemaFields/index.js

@@ -8,6 +8,7 @@ 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;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {

package/js/hooks/useSiteInfo/index.js

@@ -8,6 +8,7 @@ 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;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {

package/js/hooks/useSiteInfo/useSiteInfo.js

@@ -9,9 +9,9 @@ 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); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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; }
 

package/js/hooks/useTreeEntries/index.js

@@ -8,6 +8,7 @@ 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;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {

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

@@ -12,7 +12,7 @@ var _PredefinedFragments = require("../../fragments/PredefinedFragments");
 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]!, $sortBy: InputFieldSorterInput) {\n        jcr {\n            rootNodes:nodesByPath(paths: $rootPaths) {\n                name\n                children(typesFilter:{types:$types}, 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(typesFilter:{types:$types}, fieldSorter: $sortBy) {\n                    nodes {\n                        name\n                        children(typesFilter:{types:$types}, 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", ""]);
+  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;

package/js/hooks/useTreeEntries/useTreeEntries.js

@@ -5,24 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.useTreeEntries = void 0;
 
-var _assign2 = _interopRequireDefault(require("lodash/assign"));
-
-var _union2 = _interopRequireDefault(require("lodash/union"));
-
-var _map2 = _interopRequireDefault(require("lodash/map"));
-
-var _filter2 = _interopRequireDefault(require("lodash/filter"));
-
-var _forEachRight2 = _interopRequireDefault(require("lodash/forEachRight"));
-
-var _sortBy2 = _interopRequireDefault(require("lodash/sortBy"));
-
-var _forEach2 = _interopRequireDefault(require("lodash/forEach"));
-
-var _repeat2 = _interopRequireDefault(require("lodash/repeat"));
-
-var _indexOf2 = _interopRequireDefault(require("lodash/indexOf"));
-
 var _react = require("react");
 
 var _reactApollo = require("react-apollo");
@@ -31,17 +13,27 @@ var _fragments = require("../../fragments/fragments.utils");
 
 var _useTreeEntries = require("./useTreeEntries.gql-queries");
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": 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; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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 _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
-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 _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,
@@ -50,6 +42,7 @@ var useTreeEntries = function useTreeEntries(_ref, queryOptions) {
       selectedPaths = _ref.selectedPaths,
       openableTypes = _ref.openableTypes,
       selectableTypes = _ref.selectableTypes,
+      recursionTypesFilter = _ref.recursionTypesFilter,
       queryVariables = _ref.queryVariables,
       hideRoot = _ref.hideRoot,
       sortBy = _ref.sortBy;
@@ -64,18 +57,18 @@ var useTreeEntries = function useTreeEntries(_ref, queryOptions) {
       var selected = false;
 
       if (node.selectable) {
-        selected = (0, _indexOf2["default"])(selectedPaths, node.path) !== -1;
+        selected = selectedPaths.indexOf(node.path) !== -1;
       }
 
       var treeEntry = {
         name: node.name,
         path: node.path,
-        open: node.openable && (0, _indexOf2["default"])(openPaths, node.path) !== -1,
+        open: node.openable && openPaths.indexOf(node.path) !== -1,
         selected: selected,
         openable: node.openable,
         selectable: node.selectable,
         depth: depth,
-        prefix: (0, _repeat2["default"])('&nbsp;', depth * 3),
+        prefix: '&nbsp;'.repeat(depth * 3),
         node: node,
         hidden: false,
         hasChildren: node.children.pageInfo.nodesCount > 0
@@ -87,19 +80,22 @@ var useTreeEntries = function useTreeEntries(_ref, queryOptions) {
 
     if (jcr) {
       if (jcr.rootNodes) {
-        (0, _forEach2["default"])(jcr.rootNodes, function (rootNode) {
+        jcr.rootNodes.forEach(function (rootNode) {
           var root = addNode(rootNode, 0, 0);
           root.hidden = hideRoot;
         });
       }
 
       if (jcr.openNodes) {
-        (0, _sortBy2["default"])(jcr.openNodes, ['path']).forEach(function (node) {
+        _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 = (0, _indexOf2["default"])(treeEntries, parent);
-            (0, _forEachRight2["default"])(node.children.nodes, function (child) {
+            var parentIndex = treeEntries.indexOf(parent);
+
+            _toConsumableArray(node.children.nodes).reverse().forEach(function (child) {
               addNode(child, parent.depth + 1, parentIndex + 1);
             });
           }
@@ -108,34 +104,28 @@ var useTreeEntries = function useTreeEntries(_ref, queryOptions) {
     } // Nodes loaded, fill selection list
 
 
-    var selectedNodes = (0, _filter2["default"])(treeEntries, function (node) {
+    selectedPaths = treeEntries.filter(function (node) {
       return node.selected;
     }).map(function (node) {
-      return node.node;
+      return node.node.path;
     });
-    selectedPaths = (0, _map2["default"])(selectedNodes, 'path');
-    treeEntries = (0, _filter2["default"])(treeEntries, function (treeNode) {
+    return treeEntries.filter(function (treeNode) {
       return !treeNode.hidden;
     });
-    return treeEntries;
   };
 
-  var vars = {
+  var vars = _objectSpread({
     rootPaths: rootPaths,
-    types: (0, _union2["default"])(openableTypes, selectableTypes),
+    types: Array.from(new Set([].concat(_toConsumableArray(openableTypes || []), _toConsumableArray(selectableTypes || [])))),
+    recursionTypesFilter: recursionTypesFilter || {
+      types: 'nt:base',
+      multi: 'NONE'
+    },
     selectable: selectableTypes,
     openable: openableTypes,
-    openPaths: openPaths
-  };
-
-  if (sortBy) {
-    // Add the sortBy if it is not null or undefined
-    vars.sortBy = sortBy;
-  }
-
-  if (queryVariables) {
-    (0, _assign2["default"])(vars, queryVariables);
-  }
+    openPaths: openPaths,
+    sortBy: sortBy
+  }, queryVariables);
 
   var _useQuery = (0, _reactApollo.useQuery)(query.current, _objectSpread({}, queryOptions, {
     variables: vars

package/js/index.js

@@ -8,6 +8,7 @@ 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;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
@@ -20,6 +21,7 @@ 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;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
@@ -32,6 +34,7 @@ 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;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {

package/js/legacy/Picker.js

@@ -1,5 +1,7 @@
 "use strict";
 
+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); }
+
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
@@ -51,21 +53,23 @@ var _Picker = require("./Picker.gql-fragments");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
-function _typeof(obj) { if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
-
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); keys.push.apply(keys, symbols); } return keys; }
+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 = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(source, true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(source).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+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) || _nonIterableSpread(); }
+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 _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance"); }
+function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 
-function _iterableToArray(iter) { if (Symbol.iterator in Object(iter) || Object.prototype.toString.call(iter) === "[object Arguments]") return Array.from(iter); }
+function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 
-function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) { for (var i = 0, arr2 = new Array(arr.length); i < arr.length; i++) { arr2[i] = arr[i]; } return arr2; } }
+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 _templateObject() {
   var data = _taggedTemplateLiteral(["\n            query PickerQuery($rootPaths:[String!]!, $selectable:[String]!, $openable:[String]!, $openPaths:[String!]!, $types:[String]!) {\n                jcr {\n                    rootNodes:nodesByPath(paths: $rootPaths) {\n                        name\n                        children(typesFilter:{types:$types}, 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(typesFilter:{types:$types}) {\n                            nodes {\n                                name\n                                children(typesFilter:{types:$types}, 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        ", ""]);
@@ -83,21 +87,19 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
 
 function _defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } }
 
-function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); return Constructor; }
+function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
-function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } return _assertThisInitialized(self); }
+function _possibleConstructorReturn(self, call) { if (call && (_typeof(call) === "object" || typeof call === "function")) { return call; } else if (call !== void 0) { throw new TypeError("Derived constructors may only return object or undefined"); } return _assertThisInitialized(self); }
 
-function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
+function _getPrototypeOf(o) { _getPrototypeOf = Object.setPrototypeOf ? Object.getPrototypeOf.bind() : function _getPrototypeOf(o) { return o.__proto__ || Object.getPrototypeOf(o); }; return _getPrototypeOf(o); }
 
 function _assertThisInitialized(self) { if (self === void 0) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return self; }
 
-function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); if (superClass) _setPrototypeOf(subClass, superClass); }
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function"); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, writable: true, configurable: true } }); Object.defineProperty(subClass, "prototype", { writable: false }); if (superClass) _setPrototypeOf(subClass, superClass); }
 
-function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf || function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
-var Picker =
-/*#__PURE__*/
-function (_React$Component) {
+var Picker = /*#__PURE__*/function (_React$Component) {
   _inherits(Picker, _React$Component);
 
   function Picker(props) {

package/js/legacy/index.js

@@ -8,6 +8,7 @@ var _Picker = require("./Picker");
 
 Object.keys(_Picker).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _Picker[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {
@@ -20,6 +21,7 @@ var _Picker2 = require("./Picker.gql-fragments");
 
 Object.keys(_Picker2).forEach(function (key) {
   if (key === "default" || key === "__esModule") return;
+  if (key in exports && exports[key] === _Picker2[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
     get: function get() {

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@jahia/data-helper",
-    "version": "1.0.4",
+    "version": "1.0.5",
     "scripts": {
         "babel:js": "jahia-babel-js",
         "babel:module": "jahia-babel-module",