@elliemae/ds-query-builder 2.0.0-next.0 → 2.0.0-next.13

package/cjs/components/format/sqlSafeFormat.js

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+require('core-js/modules/esnext.async-iterator.map.js');
+require('core-js/modules/esnext.iterator.map.js');
 var types = require('../helpers/types.js');
 
-/* eslint-disable complexity */
-
 const specialChar = /[ !@#$%^&*()_+\-=\[\]{};':"\\|,.<>\/?]/;
 
 const conditionSql = (condition, value) => {
@@ -22,17 +22,17 @@ const conditionSql = (condition, value) => {
     START_WITH
   } = types.QB_OPERATOR_TYPES; // eslint-disable-next-line no-restricted-globals
 
-  const valueDisplay = isNaN(value) ? `'${value}'` : value;
-  if (condition === EQUAL) return ` = ${valueDisplay}`;
-  if (condition === NOT_EQUAL) return ` <> ${valueDisplay}`;
-  if (condition === GREATER_THAN) return ` > ${valueDisplay}`;
-  if (condition === LESS_THAN) return ` < ${valueDisplay}`;
-  if (condition === CONTAINS) return ` LIKE '%${value}%'`;
-  if (condition === NOT_CONTAINS) return ` NOT LIKE '%${value}%'`;
-  if (condition === BETWEEN) return ` BETWEEN ${value[0]} AND ${value[1]} `;
-  if (condition === GREATER_THAN_OR_EQUAL) return ` >= ${value}`;
-  if (condition === LESS_THAN_OR_EQUAL) return ` <= ${value}`;
-  if (condition === START_WITH) return ` LIKE '${value}%'`;
+  const valueDisplay = isNaN(value) ? "'".concat(value, "'") : value;
+  if (condition === EQUAL) return " = ".concat(valueDisplay);
+  if (condition === NOT_EQUAL) return " <> ".concat(valueDisplay);
+  if (condition === GREATER_THAN) return " > ".concat(valueDisplay);
+  if (condition === LESS_THAN) return " < ".concat(valueDisplay);
+  if (condition === CONTAINS) return " LIKE '%".concat(value, "%'");
+  if (condition === NOT_CONTAINS) return " NOT LIKE '%".concat(value, "%'");
+  if (condition === BETWEEN) return " BETWEEN ".concat(value[0], " AND ").concat(value[1], " ");
+  if (condition === GREATER_THAN_OR_EQUAL) return " >= ".concat(value);
+  if (condition === LESS_THAN_OR_EQUAL) return " <= ".concat(value);
+  if (condition === START_WITH) return " LIKE '".concat(value, "%'");
   return condition;
 };
 
@@ -44,34 +44,36 @@ const renderFilterSQl = filter => {
   } = filter.element; // eslint-disable-next-line no-restricted-globals
 
   const fieldDisplay = // eslint-disable-next-line no-restricted-globals
-  /[.]/.test(field) || !isNaN(field) ? `\\"${field}\\"` : field;
-  return `${fieldDisplay} ${conditionSql(operator, value) || ''}`;
+  /[.]/.test(field) || !isNaN(field) ? "\\\"".concat(field, "\\\"") : field;
+  return "".concat(fieldDisplay, " ").concat(conditionSql(operator, value) || '');
 };
 
-const sqlSafeFormat = ({
-  main,
-  mapGroups,
-  items
-}) => {
+const sqlSafeFormat = _ref => {
+  let {
+    main,
+    mapGroups,
+    items
+  } = _ref;
+
   const groupSql = (item, idGroup) => {
     if (idGroup === main) {
       const groupCondition = mapGroups[idGroup].condition === true ? 'AND' : 'OR';
-      return ` ( ${filterSql(item, groupCondition)} ) `; // eslint-disable-line
+      return " ( ".concat(filterSql(item, groupCondition), " ) "); // eslint-disable-line
     }
 
     const groupCondition = item.element.condition === true ? 'AND' : 'OR';
-    return ` ( ${filterSql(item.children, groupCondition)} ) `; // eslint-disable-line
+    return " ( ".concat(filterSql(item.children, groupCondition), " ) "); // eslint-disable-line
   };
 
   const filterSql = (filters, groupCondition) => {
     const filterGroup = filters.map(filter => {
-      if (filter.element.type === 'filter') return ` ${renderFilterSQl(filter)} `;
-      return ` ${groupSql(filter) || ''} `;
+      if (filter.element.type === 'filter') return " ".concat(renderFilterSQl(filter), " ");
+      return " ".concat(groupSql(filter) || '', " ");
     });
     return filterGroup.join(groupCondition);
   };
 
-  const sql = ` FROM [TABLE_NAME] WHERE ${groupSql(items, main) || ''} `;
+  const sql = " FROM [TABLE_NAME] WHERE ".concat(groupSql(items, main) || '', " ");
   return sql;
 };
 

package/cjs/components/format/xmlFormat.js

@@ -2,10 +2,10 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+require('core-js/modules/esnext.async-iterator.map.js');
+require('core-js/modules/esnext.iterator.map.js');
 var types = require('../helpers/types.js');
 
-/* eslint-disable complexity */
-
 const conditionSql = (condition, value) => {
   const {
     EQUAL,
@@ -19,16 +19,16 @@ const conditionSql = (condition, value) => {
     LESS_THAN_OR_EQUAL,
     START_WITH
   } = types.QB_OPERATOR_TYPES;
-  if (condition === EQUAL) return `<condition>EQUAL</condition><value>${value}</value>`;
-  if (condition === NOT_EQUAL) return `<condition>NOT_EQUAL</condition><value>${value}</value>`;
-  if (condition === GREATER_THAN) return `<condition>GREATER_THAN</condition><value>${value}</value>`;
-  if (condition === LESS_THAN) return `<condition>LESS_THAN</condition><value>${value}</value>`;
-  if (condition === CONTAINS) return `<condition>LIKE</condition><value>${value}</value>`;
-  if (condition === NOT_CONTAINS) return `<condition>NOT_LIKE</condition><value>${value}</value>`;
-  if (condition === BETWEEN) return `<condition>NOT_LIKE</condition><value><from>${value[0]}</from><to>${value[1]}</to></value>`;
-  if (condition === GREATER_THAN_OR_EQUAL) return `<condition>GREATER_THAN_OR_EQUAL</condition><value>${value}</value>`;
-  if (condition === LESS_THAN_OR_EQUAL) return `<condition>LESS_THAN_OR_EQUAL</condition><value>${value}</value>`;
-  if (condition === START_WITH) return `<condition>GREATER_THAN</condition><value>${value}</value>`;
+  if (condition === EQUAL) return "<condition>EQUAL</condition><value>".concat(value, "</value>");
+  if (condition === NOT_EQUAL) return "<condition>NOT_EQUAL</condition><value>".concat(value, "</value>");
+  if (condition === GREATER_THAN) return "<condition>GREATER_THAN</condition><value>".concat(value, "</value>");
+  if (condition === LESS_THAN) return "<condition>LESS_THAN</condition><value>".concat(value, "</value>");
+  if (condition === CONTAINS) return "<condition>LIKE</condition><value>".concat(value, "</value>");
+  if (condition === NOT_CONTAINS) return "<condition>NOT_LIKE</condition><value>".concat(value, "</value>");
+  if (condition === BETWEEN) return "<condition>NOT_LIKE</condition><value><from>".concat(value[0], "</from><to>").concat(value[1], "</to></value>");
+  if (condition === GREATER_THAN_OR_EQUAL) return "<condition>GREATER_THAN_OR_EQUAL</condition><value>".concat(value, "</value>");
+  if (condition === LESS_THAN_OR_EQUAL) return "<condition>LESS_THAN_OR_EQUAL</condition><value>".concat(value, "</value>");
+  if (condition === START_WITH) return "<condition>GREATER_THAN</condition><value>".concat(value, "</value>");
   return condition;
 };
 
@@ -38,33 +38,35 @@ const renderFilterSQl = filter => {
     operator,
     value
   } = filter.element;
-  return `<filter><field>${field}</field>${conditionSql(operator, value) || ''}</filter>`;
+  return "<filter><field>".concat(field, "</field>").concat(conditionSql(operator, value) || '', "</filter>");
 };
 
-const xmlFormat = ({
-  main,
-  mapGroups,
-  items
-}) => {
+const xmlFormat = _ref => {
+  let {
+    main,
+    mapGroups,
+    items
+  } = _ref;
+
   const groupXML = (item, idGroup) => {
     if (idGroup === main) {
       const groupCondition = mapGroups[idGroup].condition === true ? 'AND' : 'OR';
-      return `<group value="${groupCondition}">${filterXML(item)}</group>`; // eslint-disable-line
+      return "<group value=\"".concat(groupCondition, "\">").concat(filterXML(item), "</group>"); // eslint-disable-line
     }
 
     const groupCondition = item.element.condition === true ? 'AND' : 'OR';
-    return `<group value="${groupCondition}">${filterXML(item.children)}</group>`; // eslint-disable-line
+    return "<group value=\"".concat(groupCondition, "\">").concat(filterXML(item.children), "</group>"); // eslint-disable-line
   };
 
   const filterXML = filters => {
     const filterGroup = filters.map(filter => {
-      if (filter.element.type === 'filter') return `${renderFilterSQl(filter) || ''} `;
-      return ` ${groupXML(filter)} `;
+      if (filter.element.type === 'filter') return "".concat(renderFilterSQl(filter) || '', " ");
+      return " ".concat(groupXML(filter), " ");
     });
     return filterGroup.join('');
   };
 
-  const xml = `<xml><query>${groupXML(items, main) || ''}</query></xml>`;
+  const xml = "<xml><query>".concat(groupXML(items, main) || '', "</query></xml>");
   return xml;
 };
 

package/cjs/components/helpers/actions.js

@@ -3,6 +3,15 @@
 Object.defineProperty(exports, '__esModule', { value: true });
 
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+require('core-js/modules/esnext.async-iterator.find.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.find.js');
+require('core-js/modules/esnext.async-iterator.for-each.js');
+require('core-js/modules/esnext.iterator.for-each.js');
+require('core-js/modules/esnext.async-iterator.filter.js');
+require('core-js/modules/esnext.iterator.filter.js');
+require('core-js/modules/esnext.async-iterator.map.js');
+require('core-js/modules/esnext.iterator.map.js');
 var types = require('./types.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -20,7 +29,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
  */
 
 const createNewFilter = function (idGroup) {
-  const idFilter = `filter_${new Date().getTime()}_${Math.random().toString(36).substring(7)}`;
+  const idFilter = "filter_".concat(new Date().getTime(), "_").concat(Math.random().toString(36).substring(7));
   return {
     idGroup,
     field: '',
@@ -38,7 +47,7 @@ const createNewFilter = function (idGroup) {
  */
 
 const createNewGroup = function (parentIdGroup) {
-  const idGroup = `group_${new Date().getTime()}_${Math.random().toString(36).substring(7)}`;
+  const idGroup = "group_".concat(new Date().getTime(), "_").concat(Math.random().toString(36).substring(7));
   return {
     parentIdGroup,
     idGroup,
@@ -84,9 +93,12 @@ const addFilterToMainItem = function (items, newFilter) {
   });
 };
 const findInChilds = function (childs, filterId) {
-  const found = childs.find(({
-    id
-  }) => id === filterId);
+  const found = childs.find(_ref => {
+    let {
+      id
+    } = _ref;
+    return id === filterId;
+  });
 
   if (!found) {
     let findInChild;
@@ -102,9 +114,12 @@ const findItemFilterById = function (filterId) {
   return findInChilds(this.items, filterId);
 };
 const findParentWithFilterId = function (childs, filterId) {
-  const found = childs.find(({
-    id
-  }) => id === filterId);
+  const found = childs.find(_ref2 => {
+    let {
+      id
+    } = _ref2;
+    return id === filterId;
+  });
 
   if (!found) {
     let findInChild;
@@ -121,17 +136,23 @@ const findParentFilterById = function (filterId) {
 };
 const filterInChildren = function (childs, filterId, mainId) {
   if (childs.children) {
-    childs.children = childs.children.filter(({
-      id
-    }) => id !== filterId);
+    childs.children = childs.children.filter(_ref3 => {
+      let {
+        id
+      } = _ref3;
+      return id !== filterId;
+    });
     childs.children = childs.children.forEach(item => filterInChildren(item.children, filterId));
     return childs;
   } // main
 
 
-  if (childs.length > 1) childs = childs.filter(({
-    id
-  }) => id !== filterId); // https://jira.elliemae.io/browse/PUI-1252
+  if (childs.length > 1) childs = childs.filter(_ref4 => {
+    let {
+      id
+    } = _ref4;
+    return id !== filterId;
+  }); // https://jira.elliemae.io/browse/PUI-1252
 
   if (childs.length === 0 && mainId) {
     const emptyFilter = createNewFilter.call(this, mainId);
@@ -194,19 +215,20 @@ const changeGroupOperator = function (idGroup, value) {
     group.element.condition = value;
   }
 };
-const changeFilterItem = function ({
-  idFilter,
-  field,
-  value,
-  operator,
-  additionalInfo,
-  target,
-  fieldsSharedActions: {
-    onFieldChange,
-    onOperatorChange,
-    onValueChange
-  }
-}) {
+const changeFilterItem = function (_ref5) {
+  let {
+    idFilter,
+    field,
+    value,
+    operator,
+    additionalInfo,
+    target,
+    fieldsSharedActions: {
+      onFieldChange,
+      onOperatorChange,
+      onValueChange
+    }
+  } = _ref5;
   const child = findItemFilterById.call(this, idFilter);
   if (field || field === '' || typeof field === 'boolean') child.element.field = field;
   if (operator) child.element.operator = operator;
@@ -214,21 +236,24 @@ const changeFilterItem = function ({
   if (additionalInfo) child.element.additionalInfo = additionalInfo; // shared fields actions
 
   if (target === 'field') {
-    onFieldChange.forEach(({
-      action
-    }) => {
+    onFieldChange.forEach(_ref6 => {
+      let {
+        action
+      } = _ref6;
       if (action === types.QB_FIELD_SHARED_ACTIONS.RESET_FIELD) child.element.field = null;else if (action === types.QB_FIELD_SHARED_ACTIONS.RESET_OPERATOR) child.element.operator = null;else if (action === types.QB_FIELD_SHARED_ACTIONS.RESET_VALUE) child.element.value = null;
     });
   } else if (target === 'operator') {
-    onOperatorChange.forEach(({
-      action
-    }) => {
+    onOperatorChange.forEach(_ref7 => {
+      let {
+        action
+      } = _ref7;
       if (action === types.QB_FIELD_SHARED_ACTIONS.RESET_FIELD) child.element.field = null;else if (action === types.QB_FIELD_SHARED_ACTIONS.RESET_OPERATOR) child.element.operator = null;else if (action === types.QB_FIELD_SHARED_ACTIONS.RESET_VALUE) child.element.value = null;
     });
   } else if (target === 'value') {
-    onValueChange.forEach(({
-      action
-    }) => {
+    onValueChange.forEach(_ref8 => {
+      let {
+        action
+      } = _ref8;
       if (action === types.QB_FIELD_SHARED_ACTIONS.RESET_FIELD) child.element.field = null;else if (action === types.QB_FIELD_SHARED_ACTIONS.RESET_OPERATOR) child.element.operator = null;else if (action === types.QB_FIELD_SHARED_ACTIONS.RESET_VALUE) child.element.value = null;
     });
   }

package/cjs/components/helpers/dependencies.js

@@ -2,6 +2,13 @@
 
 Object.defineProperty(exports, '__esModule', { value: true });
 
+require('core-js/modules/esnext.async-iterator.every.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.every.js');
+require('core-js/modules/esnext.async-iterator.some.js');
+require('core-js/modules/esnext.iterator.some.js');
+require('core-js/modules/esnext.async-iterator.reduce.js');
+require('core-js/modules/esnext.iterator.reduce.js');
 var lodash = require('lodash');
 var operators = require('@elliemae/ds-utilities/operators');
 var types = require('./types.js');
@@ -26,7 +33,8 @@ function _interopNamespace(e) {
 
 var operators__namespace = /*#__PURE__*/_interopNamespace(operators);
 
-const resolveCondition = (condition, state, resolveBy = types.QB_GROUP_CONDITION_TYPES.AND) => {
+const resolveCondition = function (condition, state) {
+  let resolveBy = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : types.QB_GROUP_CONDITION_TYPES.AND;
   if (condition.length === 0 || !condition) return true; // resolve by AND: all the conditions must be true
 
   if (resolveBy) {
@@ -53,13 +61,14 @@ const resolveCondition = (condition, state, resolveBy = types.QB_GROUP_CONDITION
 };
 
 const resolveDependencies = (state, fields) => {
-  const fieldsToRender = fields.reduce((result, {
-    target,
-    component,
-    condition,
-    resolveBy,
-    validation
-  }) => {
+  const fieldsToRender = fields.reduce((result, _ref) => {
+    let {
+      target,
+      component,
+      condition,
+      resolveBy,
+      validation
+    } = _ref;
     if (resolveCondition(condition, state, resolveBy)) result.push({
       target,
       component,

package/cjs/components/helpers/store.js

@@ -1,6 +1,11 @@
 'use strict';
 
 var _defineProperty = require('@babel/runtime/helpers/defineProperty');
+require('core-js/modules/esnext.async-iterator.for-each.js');
+require('core-js/modules/esnext.iterator.constructor.js');
+require('core-js/modules/esnext.iterator.for-each.js');
+require('core-js/modules/esnext.async-iterator.filter.js');
+require('core-js/modules/esnext.iterator.filter.js');
 var actions = require('./actions.js');
 var format = require('../format/format.js');
 

package/cjs/index.js

@@ -9,8 +9,9 @@ var format = require('./components/format/format.js');
 
 
 
+exports.DSQueryBuilder = DSQueryBuilder.DSQueryBuilder;
 exports.DSQueryBuilderWithSchema = DSQueryBuilder.DSQueryBuilderWithSchema;
-exports["default"] = DSQueryBuilder["default"];
+exports["default"] = DSQueryBuilder.DSQueryBuilder;
 exports.QB_ADD_FILTER_METHOD_TYPES = types.QB_ADD_FILTER_METHOD_TYPES;
 exports.QB_DRAG_LOCATIONS = types.QB_DRAG_LOCATIONS;
 exports.QB_DRAG_TYPES = types.QB_DRAG_TYPES;

package/cjs/propTypes.js

@@ -77,9 +77,7 @@ const props = {
 
   /** remove filter callback */
   onRemoveFilter: reactDesc.PropTypes.func.description('remove filter callback'),
-  displayFixedOutput: reactDesc.PropTypes.string.description(`Label for fixed output.Using this props it will ignore 'displayOutput' and 'displayOutputLabel' 
-  and it will always render the output without the ability to close it. 
-  `).defaultValue(''),
+  displayFixedOutput: reactDesc.PropTypes.string.description("Label for fixed output.Using this props it will ignore 'displayOutput' and 'displayOutputLabel' \n  and it will always render the output without the ability to close it. \n  ").defaultValue(''),
 
   /** show output */
   displayOutput: reactDesc.PropTypes.bool.description('show output'),

package/esm/DSQueryBuilder.js

@@ -8,64 +8,67 @@ export { QB_DEFAULT_VALUES_OPTIONS, QB_FIELD_OPTIONS, QB_LOAN_VALUES_OPTIONS, QB
 export { default as QueryBuilderFormat } from './components/format/format.js';
 import { props } from './propTypes.js';
 
-const DSQueryBuilder = ({
-  containerProps = {},
-  addFilterMethod = QB_ADD_FILTER_METHOD_TYPES.IN_PLACE,
-  groupFilterMethod = QB_GROUP_FILTER_METHOD_TYPES.IN_PLACE,
-  onChange = () => null,
-  fields = [],
-  fieldsSharedActions = {
-    onFieldChange: [],
-    onOperatorChange: [],
-    onValueChange: []
-  },
-  format = QB_EXPORT_FORMAT_TYPES.DEFAULT,
-  init = null,
-  ruleContainerClassName = '',
-  handleDrop = () => null,
-  handleDropFilter = () => null,
-  handleDropGroup = () => null,
-  handleFieldChange = () => null,
-  handleRuleContainerOperator = () => null,
-  handleRuleContainerUnGroup = () => null,
-  onAddFilter = () => null,
-  onAddRuleContainer = () => null,
-  onRemoveFilter = () => null,
-  displayFixedOutput,
-  displayOutput = false,
-  displayOutputLabel = {
-    show: 'Show output',
-    hide: 'Hide output'
-  },
-  singleRow = false,
-  toolTipZIndex = 110
-}) => /*#__PURE__*/_jsx(QueryBuilderImpl, {
-  addFilterMethod: addFilterMethod,
-  containerProps: containerProps,
-  displayFixedOutput: displayFixedOutput,
-  displayOutput: displayOutput,
-  displayOutputLabel: displayOutputLabel,
-  fields: fields,
-  fieldsSharedActions: fieldsSharedActions,
-  format: format,
-  groupFilterMethod: groupFilterMethod,
-  handleDrop: handleDrop,
-  handleDropFilter: handleDropFilter,
-  handleDropGroup: handleDropGroup,
-  handleFieldChange: handleFieldChange,
-  handleRuleContainerOperator: handleRuleContainerOperator,
-  handleRuleContainerUnGroup: handleRuleContainerUnGroup,
-  init: init,
-  onAddFilter: onAddFilter,
-  onAddRuleContainer: onAddRuleContainer,
-  onChange: onChange,
-  onRemoveFilter: onRemoveFilter,
-  ruleContainerClassName: ruleContainerClassName,
-  singleRow: singleRow,
-  toolTipZIndex: toolTipZIndex
-});
+const DSQueryBuilder = _ref => {
+  let {
+    containerProps = {},
+    addFilterMethod = QB_ADD_FILTER_METHOD_TYPES.IN_PLACE,
+    groupFilterMethod = QB_GROUP_FILTER_METHOD_TYPES.IN_PLACE,
+    onChange = () => null,
+    fields = [],
+    fieldsSharedActions = {
+      onFieldChange: [],
+      onOperatorChange: [],
+      onValueChange: []
+    },
+    format = QB_EXPORT_FORMAT_TYPES.DEFAULT,
+    init = null,
+    ruleContainerClassName = '',
+    handleDrop = () => null,
+    handleDropFilter = () => null,
+    handleDropGroup = () => null,
+    handleFieldChange = () => null,
+    handleRuleContainerOperator = () => null,
+    handleRuleContainerUnGroup = () => null,
+    onAddFilter = () => null,
+    onAddRuleContainer = () => null,
+    onRemoveFilter = () => null,
+    displayFixedOutput,
+    displayOutput = false,
+    displayOutputLabel = {
+      show: 'Show output',
+      hide: 'Hide output'
+    },
+    singleRow = false,
+    toolTipZIndex = 110
+  } = _ref;
+  return /*#__PURE__*/_jsx(QueryBuilderImpl, {
+    addFilterMethod: addFilterMethod,
+    containerProps: containerProps,
+    displayFixedOutput: displayFixedOutput,
+    displayOutput: displayOutput,
+    displayOutputLabel: displayOutputLabel,
+    fields: fields,
+    fieldsSharedActions: fieldsSharedActions,
+    format: format,
+    groupFilterMethod: groupFilterMethod,
+    handleDrop: handleDrop,
+    handleDropFilter: handleDropFilter,
+    handleDropGroup: handleDropGroup,
+    handleFieldChange: handleFieldChange,
+    handleRuleContainerOperator: handleRuleContainerOperator,
+    handleRuleContainerUnGroup: handleRuleContainerUnGroup,
+    init: init,
+    onAddFilter: onAddFilter,
+    onAddRuleContainer: onAddRuleContainer,
+    onChange: onChange,
+    onRemoveFilter: onRemoveFilter,
+    ruleContainerClassName: ruleContainerClassName,
+    singleRow: singleRow,
+    toolTipZIndex: toolTipZIndex
+  });
+};
 
 const DSQueryBuilderWithSchema = describe(DSQueryBuilder);
 DSQueryBuilderWithSchema.propTypes = props;
 
-export { DSQueryBuilderWithSchema, DSQueryBuilder as default };
+export { DSQueryBuilder, DSQueryBuilderWithSchema, DSQueryBuilder as default };

package/esm/components/AndOrController/AndOrController.js

@@ -2,14 +2,12 @@ import _jsx from '@babel/runtime/helpers/esm/jsx';
 import _defineProperty from '@babel/runtime/helpers/esm/defineProperty';
 import React, { Component } from 'react';
 import { convertPropToCssClassName } from '@elliemae/ds-classnames';
-import DSTooltip, { TooltipType } from '@elliemae/ds-basic/Tooltip';
-import { PopperInteractions, PopperPositions } from '@elliemae/ds-basic/Popper';
-import DSToggle from '@elliemae/ds-basic/form/Toggle';
-import DSButton from '@elliemae/ds-basic/Button';
-import QueryAdd from '@elliemae/ds-icons/QueryAdd';
-import ParenthesisRemove from '@elliemae/ds-icons/ParenthesisRemove';
-import MoreOptionsVert from '@elliemae/ds-icons/MoreOptionsVert';
-import { DSIconSizes, DSIconColors } from '@elliemae/ds-basic/Icon';
+import DSTooltip, { TooltipType } from '@elliemae/ds-tooltip';
+import { PopperInteractions, PopperPositions } from '@elliemae/ds-popper';
+import { DSToggle } from '@elliemae/ds-form';
+import DSButton from '@elliemae/ds-button';
+import { QueryAdd, ParenthesisRemove, MoreOptionsVert } from '@elliemae/ds-icons';
+import { DSIconSizes, DSIconColors } from '@elliemae/ds-icon';
 import { DELAY_CLOSE, DELAY_OPEN, TOOLBAR_ANIMATION_DURATION } from '../helpers/constants.js';
 import { ToolBarAnimation } from '../ToolBarAnimation/ToolBarAnimation.js';
 import DragContainerController from '../DragContainerController/DragContainerController.js';
@@ -105,12 +103,12 @@ class AndOrController extends Component {
     } = this.state;
     return /*#__PURE__*/jsx("div", {
       ref: this.myRef,
-      className: `${cssClassName} ${mainModifier(condition ? 'active' : 'default')} step-${step}  ${isMain ? 'is-main-group-join' : ''}` // onMouseEnter={this.handleMouseEnterRow}
+      className: "".concat(cssClassName, " ").concat(mainModifier(condition ? 'active' : 'default'), " step-").concat(step, "  ").concat(isMain ? 'is-main-group-join' : '') // onMouseEnter={this.handleMouseEnterRow}
       ,
       onMouseLeave: this.handleMouseLeaveRow // onMouseMove={this.handleMouseMove}
       ,
       children: /*#__PURE__*/_jsx("div", {
-        className: `${classNameBlock('content')} step-${step}`
+        className: "".concat(classNameBlock('content'), " step-").concat(step)
       }, void 0, /*#__PURE__*/_jsx(DSTooltip, {
         delayClose: delayClose,
         delayOpen: delayOpen,
@@ -128,8 +126,8 @@ class AndOrController extends Component {
           style: {
             transition: '0.2s',
             position: 'absolute',
-            top: `${top}px`,
-            right: `${right}px`
+            top: "".concat(top, "px"),
+            right: "".concat(right, "px")
           },
           children: [/*#__PURE__*/_jsx(DSButton, {
             buttonType: buttonActionType,
@@ -163,7 +161,7 @@ class AndOrController extends Component {
         }),
         tooltipType: TooltipType.TOOLBAR,
         triggerComponent: /*#__PURE__*/_jsx("div", {
-          className: `${classNameBlock('trigger-controller')} ${showDragController ? classNameBlockModifier('draggable', 'trigger-controller') : ''} step-${step}`
+          className: "".concat(classNameBlock('trigger-controller'), " ").concat(showDragController ? classNameBlockModifier('draggable', 'trigger-controller') : '', " step-").concat(step)
         }, void 0, /*#__PURE__*/_jsx("div", {
           className: classNameElement('condition-display')
         }, void 0, /*#__PURE__*/_jsx("span", {