@riboseinc/paneron-registry-kit 2.0.0-dev9 → 2.0.0

package/views/FilterCriteria/criteriaGroupToSummary.js

@@ -5,9 +5,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = criteriaGroupToSummary;
 
-var _core = require("@emotion/core");
+var _react = require("@emotion/react");
 
-var _react = _interopRequireDefault(require("react"));
+var _react2 = _interopRequireDefault(require("react"));
 
 var _models = require("./models");
 
@@ -34,26 +34,26 @@ function criteriaGroupToSummary(cg, opts) {
         throw new Error("Missing criterion configuration");
       }
 
-      exps.push((0, _core.jsx)(_react.default.Fragment, null, cfg.label, " ", (0, _core.jsx)("em", null, cfg.toSummary(cfg.fromQuery(c.query, opts), opts))));
+      exps.push((0, _react.jsx)(_react2.default.Fragment, null, cfg.label, " ", (0, _react.jsx)("em", null, cfg.toSummary(cfg.fromQuery(c.query, opts), opts))));
     }
   }
 
   let result;
 
   if (exps.length < 1) {
-    result = (0, _core.jsx)(_react.default.Fragment, null, "(no-op)");
+    result = (0, _react.jsx)(_react2.default.Fragment, null, "(no criteria)");
   } else {
     switch (cg.require) {
       case 'all':
-        result = (0, _core.jsx)(_react.default.Fragment, null, exps.reduce((acc, current, index) => [...acc, index ? ', ' : '', current], []));
+        result = (0, _react.jsx)(_react2.default.Fragment, null, exps.reduce((acc, current, index) => [...acc, index ? ', ' : '', current], []));
         break;
 
       case 'any':
-        result = (0, _core.jsx)(_react.default.Fragment, null, exps.reduce((acc, current, index) => [...acc, index ? ' or ' : '', current], []));
+        result = (0, _react.jsx)(_react2.default.Fragment, null, exps.reduce((acc, current, index) => [...acc, index ? ' or ' : '', current], []));
         break;
 
       case 'none':
-        result = (0, _core.jsx)(_react.default.Fragment, null, "neither ", exps.reduce((acc, current, index) => [...acc, index ? ' nor ' : '', current], []));
+        result = (0, _react.jsx)(_react2.default.Fragment, null, "neither ", exps.reduce((acc, current, index) => [...acc, index ? ' nor ' : '', current], []));
         break;
     }
   }

package/views/FilterCriteria/criteriaGroupToSummary.js.map

@@ -1 +1 @@
-{"version":3,"file":"criteriaGroupToSummary.js","sourceRoot":"","sources":["../../../src/views/FilterCriteria/criteriaGroupToSummary.tsx"],"names":[],"mappings":"AAAA,eAAe;AACf,8BAA8B;AAE9B,OAAO,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AACpC,OAAO,KAAoC,MAAM,OAAO,CAAC;AACzD,OAAO,EAA6B,eAAe,EAAE,MAAM,UAAU,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,4BAA4B;AAG5B,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAAiB,EAAE,IAAgB;IAChF,MAAM,IAAI,GAAkB,EAAE,CAAC;IAE/B,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;QAC3B,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE;YACtB,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;SAC5C;aAAM;YACL,MAAM,GAAG,GAAG,sBAAsB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,CAAC,GAAG,EAAE;gBACR,OAAO,CAAC,KAAK,CAAC,yCAAyC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;gBAChE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;aACpD;YACD,IAAI,CAAC,IAAI,CAAC;gBAAG,GAAG,CAAC,KAAK;;gBAAE,gBAAK,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAM,CAAG,CAAC,CAAC;SAC1F;KACF;IAED,IAAI,MAAmB,CAAC;IACxB,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnB,MAAM,GAAG,oCAAY,CAAC;KACvB;SAAM;QACL,QAAQ,EAAE,CAAC,OAAO,EAAE;YAClB,KAAK,KAAK;gBACR,MAAM,GAAG,0BAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAmB,EAAE,OAAkB,EAAE,KAAa,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAI,CAAC;gBAClI,MAAM;YACR,KAAK,KAAK;gBACR,MAAM,GAAG,0BAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAmB,EAAE,OAAkB,EAAE,KAAa,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAI,CAAC;gBACpI,MAAM;YACR,KAAK,MAAM;gBACT,MAAM,GAAG;;oBAAW,IAAI,CAAC,MAAM,CAAC,CAAC,GAAmB,EAAE,OAAkB,EAAE,KAAa,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAI,CAAC;gBAC7I,MAAM;SACT;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["/** @jsx jsx */\n/** @jsxFrag React.Fragment */\n\nimport { jsx } from '@emotion/core';\nimport React, { ReactNode, ReactNodeArray } from 'react';\nimport { CriteriaGroup, CommonOpts, isCriteriaGroup } from './models';\nimport { CRITERIA_CONFIGURATION } from \"./CRITERIA_CONFIGURATION\";\n\n/* Building query summary */\n\n\nexport default function criteriaGroupToSummary(cg: CriteriaGroup, opts: CommonOpts): JSX.Element {\n  const exps: JSX.Element[] = [];\n\n  for (const c of cg.criteria) {\n    if (isCriteriaGroup(c)) {\n      exps.push(criteriaGroupToSummary(c, opts));\n    } else {\n      const cfg = CRITERIA_CONFIGURATION[c.key];\n      if (!cfg) {\n        console.error(\"Missing criterion configuration for key\", c.key);\n        throw new Error(\"Missing criterion configuration\");\n      }\n      exps.push(<>{cfg.label} <em>{cfg.toSummary(cfg.fromQuery(c.query, opts), opts)}</em></>);\n    }\n  }\n\n  let result: JSX.Element;\n  if (exps.length < 1) {\n    result = <>(no-op)</>;\n  } else {\n    switch (cg.require) {\n      case 'all':\n        result = <>{exps.reduce((acc: ReactNodeArray, current: ReactNode, index: number) => [...acc, index ? ', ' : '', current], [])}</>;\n        break;\n      case 'any':\n        result = <>{exps.reduce((acc: ReactNodeArray, current: ReactNode, index: number) => [...acc, index ? ' or ' : '', current], [])}</>;\n        break;\n      case 'none':\n        result = <>neither {exps.reduce((acc: ReactNodeArray, current: ReactNode, index: number) => [...acc, index ? ' nor ' : '', current], [])}</>;\n        break;\n    }\n  }\n\n  return result;\n}\n"]}
+{"version":3,"file":"criteriaGroupToSummary.js","sourceRoot":"","sources":["../../../src/views/FilterCriteria/criteriaGroupToSummary.tsx"],"names":[],"mappings":"AAAA,eAAe;AACf,8BAA8B;AAE9B,OAAO,EAAE,GAAG,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,KAAoC,MAAM,OAAO,CAAC;AACzD,OAAO,EAA6B,eAAe,EAAE,MAAM,UAAU,CAAC;AACtE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,4BAA4B;AAG5B,MAAM,CAAC,OAAO,UAAU,sBAAsB,CAAC,EAAiB,EAAE,IAAgB;IAChF,MAAM,IAAI,GAAkB,EAAE,CAAC;IAE/B,KAAK,MAAM,CAAC,IAAI,EAAE,CAAC,QAAQ,EAAE;QAC3B,IAAI,eAAe,CAAC,CAAC,CAAC,EAAE;YACtB,IAAI,CAAC,IAAI,CAAC,sBAAsB,CAAC,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC;SAC5C;aAAM;YACL,MAAM,GAAG,GAAG,sBAAsB,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC;YAC1C,IAAI,CAAC,GAAG,EAAE;gBACR,OAAO,CAAC,KAAK,CAAC,yCAAyC,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC;gBAChE,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;aACpD;YACD,IAAI,CAAC,IAAI,CAAC;gBAAG,GAAG,CAAC,KAAK;;gBAAE,gBAAK,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAM,CAAG,CAAC,CAAC;SAC1F;KACF;IAED,IAAI,MAAmB,CAAC;IACxB,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;QACnB,MAAM,GAAG,0CAAkB,CAAC;KAC7B;SAAM;QACL,QAAQ,EAAE,CAAC,OAAO,EAAE;YAClB,KAAK,KAAK;gBACR,MAAM,GAAG,0BAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAmB,EAAE,OAAkB,EAAE,KAAa,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAI,CAAC;gBAClI,MAAM;YACR,KAAK,KAAK;gBACR,MAAM,GAAG,0BAAG,IAAI,CAAC,MAAM,CAAC,CAAC,GAAmB,EAAE,OAAkB,EAAE,KAAa,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAI,CAAC;gBACpI,MAAM;YACR,KAAK,MAAM;gBACT,MAAM,GAAG;;oBAAW,IAAI,CAAC,MAAM,CAAC,CAAC,GAAmB,EAAE,OAAkB,EAAE,KAAa,EAAE,EAAE,CAAC,CAAC,GAAG,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,CAAI,CAAC;gBAC7I,MAAM;SACT;KACF;IAED,OAAO,MAAM,CAAC;AAChB,CAAC","sourcesContent":["/** @jsx jsx */\n/** @jsxFrag React.Fragment */\n\nimport { jsx } from '@emotion/react';\nimport React, { ReactNode, ReactNodeArray } from 'react';\nimport { CriteriaGroup, CommonOpts, isCriteriaGroup } from './models';\nimport { CRITERIA_CONFIGURATION } from \"./CRITERIA_CONFIGURATION\";\n\n/* Building query summary */\n\n\nexport default function criteriaGroupToSummary(cg: CriteriaGroup, opts: CommonOpts): JSX.Element {\n  const exps: JSX.Element[] = [];\n\n  for (const c of cg.criteria) {\n    if (isCriteriaGroup(c)) {\n      exps.push(criteriaGroupToSummary(c, opts));\n    } else {\n      const cfg = CRITERIA_CONFIGURATION[c.key];\n      if (!cfg) {\n        console.error(\"Missing criterion configuration for key\", c.key);\n        throw new Error(\"Missing criterion configuration\");\n      }\n      exps.push(<>{cfg.label} <em>{cfg.toSummary(cfg.fromQuery(c.query, opts), opts)}</em></>);\n    }\n  }\n\n  let result: JSX.Element;\n  if (exps.length < 1) {\n    result = <>(no criteria)</>;\n  } else {\n    switch (cg.require) {\n      case 'all':\n        result = <>{exps.reduce((acc: ReactNodeArray, current: ReactNode, index: number) => [...acc, index ? ', ' : '', current], [])}</>;\n        break;\n      case 'any':\n        result = <>{exps.reduce((acc: ReactNodeArray, current: ReactNode, index: number) => [...acc, index ? ' or ' : '', current], [])}</>;\n        break;\n      case 'none':\n        result = <>neither {exps.reduce((acc: ReactNodeArray, current: ReactNode, index: number) => [...acc, index ? ' nor ' : '', current], [])}</>;\n        break;\n    }\n  }\n\n  return result;\n}\n"]}

package/views/FilterCriteria/criteriaToNodes.d.ts

@@ -3,9 +3,18 @@
 import { TreeNodeInfo } from '@blueprintjs/core';
 import { ItemClassConfigurationSet, Subregisters } from '../../types';
 import { CriteriaGroup, Criterion } from './models';
+/**
+ * Builds Blueprint’s tree nodes given criteria,
+ * callbacks and relevant register configuration.
+ */
 export default function criteriaToNodes(cs: (CriteriaGroup | Criterion)[], opts: {
     path?: number[];
+    /** XXX: This seems to be obsolete. Don’t use, investigate for usefulness. */
     implied?: true;
+    /**
+     * Called when criteria is being edited. `commit` is set to true
+     * when change should take effect.
+     */
     onEditItem?: (parent: number[], idx: number, newItem: CriteriaGroup | Criterion, commit?: true) => void;
     onDeleteItem?: (parent: number[], idx: number) => void;
     onAddGroup?: (parent: number[]) => void;

package/views/FilterCriteria/criteriaToNodes.js

@@ -5,11 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = criteriaToNodes;
 
-var _core = require("@emotion/core");
+var _react = require("@emotion/react");
 
-var _react = _interopRequireDefault(require("react"));
+var _react2 = _interopRequireDefault(require("react"));
 
-var _core2 = require("@blueprintjs/core");
+var _core = require("@blueprintjs/core");
+
+var _PropertyView = require("@riboseinc/paneron-extension-kit/widgets/Sidebar/PropertyView");
 
 var _models = require("./models");
 
@@ -23,50 +25,58 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { de
 
 /** @jsxFrag React.Fragment */
 
-/* Building tree nodes */
+/**
+ * Builds Blueprint’s tree nodes given criteria,
+ * callbacks and relevant register configuration.
+ */
 function criteriaToNodes(cs, opts) {
-  var _a;
-
-  const path = (_a = opts.path) !== null && _a !== void 0 ? _a : [];
+  const path = opts.path ?? [];
   return [...cs.entries()].map(([idx, c]) => {
     const isRoot = path.length < 1;
-    const icon = isRoot && opts.implied === true ? 'manual' : undefined;
+    const defaultIcon = isRoot && opts.implied === true ? 'manual' : undefined;
     const disabled = opts.implied === true;
-    const deleteButton = idx < cs.length - 1 && opts.onDeleteItem && !isRoot ? (0, _core.jsx)(_core2.Button, {
+    const deleteButton = idx < cs.length - 1 && opts.onDeleteItem ? (0, _react.jsx)(_core.Button, {
       minimal: true,
       small: true,
       onClick: () => opts.onDeleteItem(path, idx),
+      title: "Delete this criterion or criteria block",
+      disabled: isRoot,
       icon: "cross"
     }) : null;
+    const addGroupButton = opts.onAddGroup ? (0, _react.jsx)(_core.Button, {
+      minimal: true,
+      small: true,
+      title: "Add nested criteria block",
+      icon: "add-to-artifact",
+      onClick: () => opts.onAddGroup([...path, idx])
+    }) : null;
 
     if ((0, _models.isCriteriaGroup)(c)) {
+      // Render criteria group recursively
       const cg = c;
       return {
         id: `${path.join('-')}-${idx}-${opts.implied}`,
         disabled,
         hasCaret: true,
         isExpanded: true,
-        icon,
-        label: (0, _core.jsx)(_index.CriteriaGroupLabel, {
+        icon: defaultIcon,
+        label: (0, _react.jsx)(_index.CriteriaGroupLabel, {
+          css: (0, _react.css)`margin: 2.5px 0`,
           criteriaGroup: cg,
-          onUpdate: opts.onEditItem ? op => opts.onEditItem(path, idx, Object.assign(Object.assign({}, cg), {
+          onUpdate: opts.onEditItem ? op => opts.onEditItem(path, idx, { ...cg,
             require: op
-          }), true) : undefined
+          }, true) : undefined
         }),
-        secondaryLabel: (0, _core.jsx)(_core2.ButtonGroup, null, opts.implied && isRoot ? (0, _core.jsx)(_react.default.Fragment, null, "(implied from plan)") : null, opts.onAddGroup ? (0, _core.jsx)(_core2.Button, {
-          minimal: true,
-          small: true,
-          onClick: () => opts.onAddGroup([...path, idx]),
-          icon: "more"
-        }) : null, deleteButton),
+        secondaryLabel: (0, _react.jsx)(_core.ButtonGroup, null, opts.implied && isRoot ? (0, _react.jsx)(_react2.default.Fragment, null, "(implied)") : null, addGroupButton, deleteButton),
         childNodes: criteriaToNodes(opts.onEditItem ? [...cg.criteria, {
           key: 'custom',
           query: ''
-        }] : cg.criteria, Object.assign(Object.assign({}, opts), {
+        }] : cg.criteria, { ...opts,
           path: [...path, idx]
-        }))
+        })
       };
     } else {
+      // Render leaf criterion
       const ci = c;
       const {
         subregisters,
@@ -96,19 +106,24 @@ function criteriaToNodes(cs, opts) {
           label: cfg.label
         };
       });
-      const label = ci.key === 'custom' && ci.query === '' ? (0, _core.jsx)(_core2.Button, {
+      const isPlaceholder = ci.key === 'custom' && ci.query === '';
+      const label = isPlaceholder ? (0, _react.jsx)(_core.Button, {
         small: true,
+        minimal: true,
+        icon: "plus",
         onClick: () => opts.onEditItem(path, idx, {
           key: 'custom',
           query: cfg.toQuery({
-            customExpression: 'true'
+            customExpression: 'false'
           }, {
             subregisters,
             itemClasses
           })
         }, true)
-      }, "Add\u2026") : (0, _core.jsx)(_core2.ControlGroup, null, (0, _core.jsx)(_core2.HTMLSelect, {
-        minimal: true,
+      }, "criteria") : (0, _react.jsx)(_core.ControlGroup, {
+        vertical: true,
+        css: (0, _react.css)`margin-bottom: 2.5px;`
+      }, (0, _react.jsx)(_PropertyView.Select, {
         options: criterionTypeOptions,
         value: ci.key,
         disabled: !opts.onEditItem,
@@ -120,7 +135,7 @@ function criteriaToNodes(cs, opts) {
             });
           }
         } : undefined
-      }), (0, _core.jsx)(Widget, {
+      }), (0, _react.jsx)(Widget, {
         itemClasses: opts.itemClasses,
         availableClassIDs: opts.availableClassIDs,
         subregisters: opts.subregisters,
@@ -136,9 +151,8 @@ function criteriaToNodes(cs, opts) {
       return {
         id: `${path.join('-')}-${idx}-${opts.implied ? 'implied' : ''}`,
         disabled,
-        icon,
         label,
-        secondaryLabel: (0, _core.jsx)(_core2.ButtonGroup, null, deleteButton)
+        secondaryLabel: (0, _react.jsx)(_core.ButtonGroup, null, deleteButton)
       };
     }
   });

package/views/FilterCriteria/criteriaToNodes.js.map

@@ -1 +1 @@
-{"version":3,"file":"criteriaToNodes.js","sourceRoot":"","sources":["../../../src/views/FilterCriteria/criteriaToNodes.tsx"],"names":[],"mappings":"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","sourcesContent":["/** @jsx jsx */\n/** @jsxFrag React.Fragment */\n\nimport { jsx } from '@emotion/core';\nimport React from 'react';\nimport { Button, ButtonGroup, HTMLSelect, OptionProps, TreeNodeInfo, ControlGroup } from '@blueprintjs/core';\nimport { ItemClassConfigurationSet, Subregisters } from '../../types';\nimport { CriteriaGroup, Criterion, isCriteriaGroup, isCriteriaKey } from './models';\nimport { CriteriaGroupLabel } from './index';\nimport { CRITERIA_CONFIGURATION } from \"./CRITERIA_CONFIGURATION\";\n\n\n/* Building tree nodes */\nexport default function criteriaToNodes(\n  cs: (CriteriaGroup | Criterion)[],\n  opts: {\n    path?: number[];\n    implied?: true;\n    onEditItem?: (parent: number[], idx: number, newItem: CriteriaGroup | Criterion, commit?: true) => void;\n    onDeleteItem?: (parent: number[], idx: number) => void;\n    onAddGroup?: (parent: number[]) => void;\n\n    itemClasses: ItemClassConfigurationSet;\n    availableClassIDs: string[];\n    subregisters?: Subregisters;\n  }): TreeNodeInfo[] {\n  const path = opts.path ?? [];\n\n  return [...cs.entries()].map(([idx, c]): TreeNodeInfo => {\n    const isRoot = path.length < 1;\n    const icon = isRoot && opts.implied === true ? 'manual' : undefined;\n    const disabled = opts.implied === true;\n    const deleteButton: JSX.Element | null = idx < (cs.length - 1) &&\n      opts.onDeleteItem &&\n      !isRoot\n      ? <Button minimal small\n        onClick={() => opts.onDeleteItem!(path, idx)}\n        icon=\"cross\" />\n      : null;\n\n    if (isCriteriaGroup(c)) {\n      const cg = c as CriteriaGroup;\n      return {\n        id: `${path.join('-')}-${idx}-${opts.implied}`,\n        disabled,\n        hasCaret: true,\n        isExpanded: true,\n        icon,\n        label: <CriteriaGroupLabel\n          criteriaGroup={cg}\n          onUpdate={opts.onEditItem\n            ? ((op) => opts.onEditItem!(path, idx, { ...cg, require: op }, true))\n            : undefined} />,\n        secondaryLabel: <ButtonGroup>\n          {opts.implied && isRoot ? <>(implied from plan)</> : null}\n          {opts.onAddGroup\n            ? <Button minimal small\n              onClick={() => opts.onAddGroup!([...path, idx])}\n              icon=\"more\" />\n            : null}\n          {deleteButton}\n        </ButtonGroup>,\n        childNodes: criteriaToNodes(\n          opts.onEditItem\n            ? [...cg.criteria, { key: 'custom', query: '' }]\n            : cg.criteria,\n          { ...opts, path: [...path, idx] }),\n      };\n    } else {\n      const ci = c as Criterion;\n      const { subregisters, itemClasses } = opts;\n      if (!isCriteriaKey(ci.key)) {\n        console.error(\"Invalid criteria key encountered\", ci.key);\n        throw new Error(\"Invalid criteria key encountered\");\n      }\n      const cfg = CRITERIA_CONFIGURATION[ci.key];\n      if (!cfg) {\n        console.error(\"Missing criterion configuration for key\", ci.key);\n        throw new Error(\"Missing criterion configuration\");\n      }\n      const Widget = cfg.widget;\n      const data = cfg.fromQuery(ci.query, { subregisters, itemClasses });\n      const criterionTypeOptions: OptionProps[] = Object.entries(CRITERIA_CONFIGURATION).\n        map(([key, cfg]) => {\n          return { value: key, label: cfg.label };\n        });\n      const label = ci.key === 'custom' && ci.query === ''\n        ? <Button\n          small\n          onClick={() => opts.onEditItem!(\n            path,\n            idx,\n            { key: 'custom', query: cfg.toQuery({ customExpression: 'true' }, { subregisters, itemClasses }) },\n            true)}>\n          Add…\n          </Button>\n        : <ControlGroup>\n          <HTMLSelect\n            minimal\n            options={criterionTypeOptions}\n            value={ci.key}\n            disabled={!opts.onEditItem}\n            onChange={opts.onEditItem\n              ? (evt) => {\n                if (evt.currentTarget.value !== '' && isCriteriaKey(evt.currentTarget.value)) {\n                  opts.onEditItem!(\n                    path,\n                    idx,\n                    { key: evt.currentTarget.value, query: '' }\n                  );\n                }\n              }\n              : undefined} />\n          <Widget\n            itemClasses={opts.itemClasses}\n            availableClassIDs={opts.availableClassIDs}\n            subregisters={opts.subregisters}\n            data={data}\n            onChange={(val) => opts.onEditItem!(\n              path,\n              idx,\n              { key: ci.key, query: cfg.toQuery(val, { subregisters, itemClasses }) },\n              true)} />\n        </ControlGroup>;\n      return {\n        id: `${path.join('-')}-${idx}-${opts.implied ? 'implied' : ''}`,\n        disabled,\n        icon,\n        label,\n        secondaryLabel: <ButtonGroup>\n          {deleteButton}\n        </ButtonGroup>,\n      };\n    }\n  });\n}\n"]}
+{"version":3,"file":"criteriaToNodes.js","sourceRoot":"","sources":["../../../src/views/FilterCriteria/criteriaToNodes.tsx"],"names":[],"mappings":"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","sourcesContent":["/** @jsx jsx */\n/** @jsxFrag React.Fragment */\n\nimport { jsx, css } from '@emotion/react';\nimport React from 'react';\nimport { Button, ButtonGroup, OptionProps, TreeNodeInfo, ControlGroup } from '@blueprintjs/core';\nimport { Select } from '@riboseinc/paneron-extension-kit/widgets/Sidebar/PropertyView';\nimport { ItemClassConfigurationSet, Subregisters } from '../../types';\nimport { CriteriaGroup, Criterion, isCriteriaGroup, isCriteriaKey } from './models';\nimport { CriteriaGroupLabel } from './index';\nimport { CRITERIA_CONFIGURATION } from './CRITERIA_CONFIGURATION';\n\n\n/**\n * Builds Blueprint’s tree nodes given criteria,\n * callbacks and relevant register configuration.\n */\nexport default function criteriaToNodes(\n  cs: (CriteriaGroup | Criterion)[],\n  opts: {\n    path?: number[];\n\n    /** XXX: This seems to be obsolete. Don’t use, investigate for usefulness. */\n    implied?: true;\n\n    /**\n     * Called when criteria is being edited. `commit` is set to true\n     * when change should take effect.\n     */\n    onEditItem?: (parent: number[], idx: number, newItem: CriteriaGroup | Criterion, commit?: true) => void;\n    onDeleteItem?: (parent: number[], idx: number) => void;\n    onAddGroup?: (parent: number[]) => void;\n\n    itemClasses: ItemClassConfigurationSet;\n    availableClassIDs: string[];\n    subregisters?: Subregisters;\n  }): TreeNodeInfo[] {\n  const path = opts.path ?? [];\n\n  return [...cs.entries()].map(([idx, c]): TreeNodeInfo => {\n    const isRoot = path.length < 1;\n    const defaultIcon = isRoot && opts.implied === true\n      ? 'manual'\n      : undefined;\n\n    const disabled = opts.implied === true;\n    const deleteButton: JSX.Element | null =\n      idx < (cs.length - 1) && opts.onDeleteItem\n        ? <Button minimal small\n            onClick={() => opts.onDeleteItem!(path, idx)}\n            title=\"Delete this criterion or criteria block\"\n            disabled={isRoot}\n            icon=\"cross\" />\n        : null;\n    const addGroupButton: JSX.Element | null = opts.onAddGroup\n      ? <Button\n          minimal\n          small\n          title=\"Add nested criteria block\"\n          icon=\"add-to-artifact\"\n          onClick={() => opts.onAddGroup!([...path, idx])} />\n      : null;\n\n    if (isCriteriaGroup(c)) {\n\n      // Render criteria group recursively\n\n      const cg = c as CriteriaGroup;\n      return {\n        id: `${path.join('-')}-${idx}-${opts.implied}`,\n        disabled,\n        hasCaret: true,\n        isExpanded: true,\n        icon: defaultIcon,\n        label: <CriteriaGroupLabel\n          css={css`margin: 2.5px 0`}\n          criteriaGroup={cg}\n          onUpdate={opts.onEditItem\n            ? ((op) => opts.onEditItem!(path, idx, { ...cg, require: op }, true))\n            : undefined} />,\n        secondaryLabel: <ButtonGroup>\n          {opts.implied && isRoot ? <>(implied)</> : null}\n          {addGroupButton}\n          {deleteButton}\n        </ButtonGroup>,\n        childNodes: criteriaToNodes(\n          opts.onEditItem\n            ? [...cg.criteria, { key: 'custom', query: '' }]\n            : cg.criteria,\n          { ...opts, path: [...path, idx] }),\n      };\n\n    } else {\n\n      // Render leaf criterion\n\n      const ci = c as Criterion;\n      const { subregisters, itemClasses } = opts;\n      if (!isCriteriaKey(ci.key)) {\n        console.error(\"Invalid criteria key encountered\", ci.key);\n        throw new Error(\"Invalid criteria key encountered\");\n      }\n      const cfg = CRITERIA_CONFIGURATION[ci.key];\n      if (!cfg) {\n        console.error(\"Missing criterion configuration for key\", ci.key);\n        throw new Error(\"Missing criterion configuration\");\n      }\n      const Widget = cfg.widget;\n      const data = cfg.fromQuery(ci.query, { subregisters, itemClasses });\n      const criterionTypeOptions: OptionProps[] = Object.entries(CRITERIA_CONFIGURATION).\n        map(([key, cfg]) => {\n          return { value: key, label: cfg.label };\n        });\n      const isPlaceholder = ci.key === 'custom' && ci.query === '';\n      const label = isPlaceholder\n        ? <Button\n              small\n              minimal\n              icon=\"plus\"\n              onClick={() => opts.onEditItem!(\n                path,\n                idx,\n                { key: 'custom', query: cfg.toQuery({ customExpression: 'false' }, { subregisters, itemClasses }) },\n                true)}>\n            criteria\n          </Button>\n        : <ControlGroup vertical css={css`margin-bottom: 2.5px;`}>\n            <Select\n              options={criterionTypeOptions}\n              value={ci.key}\n              disabled={!opts.onEditItem}\n              onChange={opts.onEditItem\n                ? (evt) => {\n                  if (evt.currentTarget.value !== '' && isCriteriaKey(evt.currentTarget.value)) {\n                    opts.onEditItem!(\n                      path,\n                      idx,\n                      { key: evt.currentTarget.value, query: '' }\n                    );\n                  }\n                }\n                : undefined} />\n            <Widget\n              itemClasses={opts.itemClasses}\n              availableClassIDs={opts.availableClassIDs}\n              subregisters={opts.subregisters}\n              data={data}\n              onChange={(val) => opts.onEditItem!(\n                path,\n                idx,\n                { key: ci.key, query: cfg.toQuery(val, { subregisters, itemClasses }) },\n                true)} />\n          </ControlGroup>;\n      return {\n        id: `${path.join('-')}-${idx}-${opts.implied ? 'implied' : ''}`,\n        disabled,\n        label,\n        secondaryLabel: <ButtonGroup>\n          {deleteButton}\n        </ButtonGroup>,\n      };\n\n    }\n\n  });\n}\n"]}

package/views/FilterCriteria/index.d.ts

@@ -18,5 +18,6 @@ export default CriteriaTree;
 interface CriteriaGroupLabelProps {
     criteriaGroup: CriteriaGroup;
     onUpdate?: (op: CompositionOperator) => void;
+    className?: string;
 }
 export declare const CriteriaGroupLabel: React.FC<CriteriaGroupLabelProps>;

package/views/FilterCriteria/index.js

@@ -5,11 +5,11 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.CriteriaGroupLabel = exports.default = exports.CriteriaTree = exports.SUBREGISTER_PATH_PREFIX = void 0;
 
-var _core = require("@emotion/core");
+var _react = require("@emotion/react");
 
-var _react = _interopRequireWildcard(require("react"));
+var _react2 = require("react");
 
-var _core2 = require("@blueprintjs/core");
+var _core = require("@blueprintjs/core");
 
 var _models = require("./models");
 
@@ -19,10 +19,6 @@ var _criteriaToNodes = _interopRequireDefault(require("./criteriaToNodes"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
-
 /** @jsx jsx */
 
 /** @jsxFrag React.Fragment */
@@ -38,14 +34,13 @@ const CriteriaTree = function ({
   subregisters,
   className
 }) {
-  const [crit, updateCriteria] = (0, _react.useState)(criteria);
-  (0, _react.useEffect)(() => {
+  const [crit, updateCriteria] = (0, _react2.useState)(criteria);
+  (0, _react2.useEffect)(() => {
     updateCriteria(criteria);
   }, [JSON.stringify(criteria)]);
 
   function onAddGroup(parent) {
-    var p = JSON.parse(JSON.stringify(parent));
-    p.reverse();
+    const p = reverseArray(parent);
     var newCriteria = JSON.parse(JSON.stringify([crit]));
     const newGroup = (0, _models.makeBlankCriteria)();
     (0, _mutateGroup.default)(newCriteria, p, {
@@ -57,8 +52,7 @@ const CriteriaTree = function ({
   }
 
   function onDelete(parent, idx) {
-    var p = JSON.parse(JSON.stringify(parent));
-    p.reverse();
+    const p = reverseArray(parent);
     var newCriteria = JSON.parse(JSON.stringify([crit]));
     (0, _mutateGroup.default)(newCriteria, p, {
       action: 'delete',
@@ -69,8 +63,7 @@ const CriteriaTree = function ({
   }
 
   function onEditItem(parent, idx, newItem, commit) {
-    var p = JSON.parse(JSON.stringify(parent));
-    p.reverse();
+    const p = reverseArray(parent);
     var newCriteria = JSON.parse(JSON.stringify([crit]));
     (0, _mutateGroup.default)(newCriteria, p, {
       action: 'edit',
@@ -98,8 +91,14 @@ const CriteriaTree = function ({
     subregisters,
     availableClassIDs
   }) : [];
-  return (0, _core.jsx)(_core2.Tree, {
-    contents: [...implied, ...nodes]
+  return (0, _react.jsx)(_core.Tree, {
+    contents: [...implied, ...nodes],
+    className: className,
+    css: (0, _react.css)`
+        .bp4-tree-node-content { height: unset; }
+        .bp4-tree-node-label { overflow: unset; }
+        .bp4-tree-node-caret, .bp4-tree-node-caret-none { display: none; }
+      `
   });
 };
 
@@ -109,14 +108,23 @@ exports.default = _default;
 
 const CriteriaGroupLabel = function ({
   criteriaGroup,
-  onUpdate
+  onUpdate,
+  className
 }) {
-  return (0, _core.jsx)(_react.default.Fragment, null, onUpdate ? (0, _core.jsx)(_core2.ButtonGroup, null, _models.COMPOSITION_OPERATORS.map(op => (0, _core.jsx)(_core2.Button, {
+  return (0, _react.jsx)("div", {
+    className: className
+  }, onUpdate ? (0, _react.jsx)(_core.ButtonGroup, null, _models.COMPOSITION_OPERATORS.map(op => (0, _react.jsx)(_core.Button, {
     key: op,
     small: true,
     onClick: () => onUpdate ? onUpdate(op) : void 0,
     active: criteriaGroup.require === op
-  }, op))) : (0, _core.jsx)("strong", null, criteriaGroup.require), " ", "of:");
+  }, op))) : (0, _react.jsx)("strong", null, criteriaGroup.require), " ", "of:");
 };
 
-exports.CriteriaGroupLabel = CriteriaGroupLabel;
+exports.CriteriaGroupLabel = CriteriaGroupLabel;
+
+function reverseArray(arr) {
+  var copy = JSON.parse(JSON.stringify(arr));
+  copy.reverse();
+  return copy;
+}

package/views/FilterCriteria/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/views/FilterCriteria/index.tsx"],"names":[],"mappings":"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","sourcesContent":["/** @jsx jsx */\n/** @jsxFrag React.Fragment */\n\nimport { jsx } from '@emotion/core';\nimport React, { useEffect, useState } from 'react';\nimport { Button, ButtonGroup, TreeNodeInfo, Tree } from '@blueprintjs/core';\nimport { ItemClassConfigurationSet, Subregisters } from '../../types';\nimport { CriteriaGroup, makeBlankCriteria, Criterion, CompositionOperator, COMPOSITION_OPERATORS } from './models';\nimport mutateGroup from './mutateGroup';\nimport criteriaToNodes from './criteriaToNodes';\n\n\nexport const SUBREGISTER_PATH_PREFIX = '/subregisters/';\n\n\ninterface CriteriaTreeProps {\n  impliedCriteria?: CriteriaGroup\n  criteria: CriteriaGroup\n  onChange?: (criteria: CriteriaGroup) => void\n  className?: string\n  availableClassIDs: string[]\n\n  // TODO: move to context\n  itemClasses: ItemClassConfigurationSet\n  subregisters?: Subregisters\n}\n\n\nexport const CriteriaTree: React.FC<CriteriaTreeProps> =\nfunction ({ criteria, impliedCriteria, onChange, availableClassIDs, itemClasses, subregisters, className }) {\n  const [crit, updateCriteria] = useState<CriteriaGroup>(criteria);\n\n  useEffect(() => {\n    updateCriteria(criteria);\n  }, [JSON.stringify(criteria)]);\n\n  function onAddGroup(parent: number[]) {\n    var p = JSON.parse(JSON.stringify(parent));\n    p.reverse();\n    var newCriteria = JSON.parse(JSON.stringify([crit]));\n    const newGroup: CriteriaGroup = makeBlankCriteria();\n    mutateGroup(newCriteria, p, { action: 'insert', item: newGroup });\n    updateCriteria(newCriteria[0]);\n    onChange!(newCriteria[0]);\n  }\n\n  function onDelete(parent: number[], idx: number) {\n    var p = JSON.parse(JSON.stringify(parent));\n    p.reverse();\n    var newCriteria = JSON.parse(JSON.stringify([crit]));\n    mutateGroup(newCriteria, p, { action: 'delete', idx });\n    updateCriteria(newCriteria[0]);\n    onChange!(newCriteria[0]);\n  }\n\n  function onEditItem(parent: number[], idx: number, newItem: CriteriaGroup | Criterion, commit?: true) {\n    var p = JSON.parse(JSON.stringify(parent));\n    p.reverse();\n    var newCriteria = JSON.parse(JSON.stringify([crit]));\n    mutateGroup(newCriteria, p, { action: 'edit', idx, item: newItem });\n    updateCriteria(newCriteria[0]);\n    if (commit) {\n      onChange!(newCriteria[0]);\n    }\n  }\n\n  const nodes: TreeNodeInfo[] = criteriaToNodes([crit], {\n    onEditItem: onChange ? onEditItem : undefined,\n    onAddGroup: onChange ? onAddGroup : undefined,\n    onDeleteItem: onChange ? onDelete : undefined,\n    itemClasses,\n    subregisters,\n    availableClassIDs,\n  });\n\n  const implied: TreeNodeInfo[] = impliedCriteria !== undefined\n    ? criteriaToNodes([impliedCriteria], {\n        implied: true,\n        itemClasses,\n        subregisters,\n        availableClassIDs,\n      })\n    : [];\n\n  return (\n    <Tree contents={[ ...implied, ...nodes ]} />\n  );\n}\n\nexport default CriteriaTree;\n\n\n/* Displaying criteria group labels */\n\ninterface CriteriaGroupLabelProps {\n  criteriaGroup: CriteriaGroup\n  onUpdate?: (op: CompositionOperator) => void\n}\nexport const CriteriaGroupLabel: React.FC<CriteriaGroupLabelProps> = function ({ criteriaGroup, onUpdate }) {\n  return <>\n    {onUpdate\n      ? <ButtonGroup>\n          {COMPOSITION_OPERATORS.map(op =>\n            <Button\n                key={op}\n                small\n                onClick={() => onUpdate ? onUpdate(op) : void 0}\n                active={criteriaGroup.require === op}>\n              {op}\n            </Button>\n          )}\n        </ButtonGroup>\n      : <strong>{criteriaGroup.require}</strong>}\n    {\" \"}\n    of:\n  </>;\n}\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/views/FilterCriteria/index.tsx"],"names":[],"mappings":"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","sourcesContent":["/** @jsx jsx */\n/** @jsxFrag React.Fragment */\n\nimport { jsx, css } from '@emotion/react';\nimport React, { useEffect, useState } from 'react';\nimport { Button, ButtonGroup, TreeNodeInfo, Tree } from '@blueprintjs/core';\nimport { ItemClassConfigurationSet, Subregisters } from '../../types';\nimport { CriteriaGroup, makeBlankCriteria, Criterion, CompositionOperator, COMPOSITION_OPERATORS } from './models';\nimport mutateGroup from './mutateGroup';\nimport criteriaToNodes from './criteriaToNodes';\n\n\nexport const SUBREGISTER_PATH_PREFIX = '/subregisters/';\n\n\ninterface CriteriaTreeProps {\n  impliedCriteria?: CriteriaGroup\n  criteria: CriteriaGroup\n  onChange?: (criteria: CriteriaGroup) => void\n  className?: string\n  availableClassIDs: string[]\n\n  // TODO: move to context\n  itemClasses: ItemClassConfigurationSet\n  subregisters?: Subregisters\n}\n\n\nexport const CriteriaTree: React.FC<CriteriaTreeProps> =\nfunction ({ criteria, impliedCriteria, onChange, availableClassIDs, itemClasses, subregisters, className }) {\n  const [crit, updateCriteria] = useState<CriteriaGroup>(criteria);\n\n  useEffect(() => {\n    updateCriteria(criteria);\n  }, [JSON.stringify(criteria)]);\n\n  function onAddGroup(parent: number[]) {\n    const p = reverseArray(parent);\n    var newCriteria = JSON.parse(JSON.stringify([crit]));\n    const newGroup: CriteriaGroup = makeBlankCriteria();\n    mutateGroup(newCriteria, p, { action: 'insert', item: newGroup });\n    updateCriteria(newCriteria[0]);\n    onChange!(newCriteria[0]);\n  }\n\n  function onDelete(parent: number[], idx: number) {\n    const p = reverseArray(parent);\n    var newCriteria = JSON.parse(JSON.stringify([crit]));\n    mutateGroup(newCriteria, p, { action: 'delete', idx });\n    updateCriteria(newCriteria[0]);\n    onChange!(newCriteria[0]);\n  }\n\n  function onEditItem(parent: number[], idx: number, newItem: CriteriaGroup | Criterion, commit?: true) {\n    const p = reverseArray(parent);\n    var newCriteria = JSON.parse(JSON.stringify([crit]));\n    mutateGroup(newCriteria, p, { action: 'edit', idx, item: newItem });\n    updateCriteria(newCriteria[0]);\n    if (commit) {\n      onChange!(newCriteria[0]);\n    }\n  }\n\n  const nodes: TreeNodeInfo[] = criteriaToNodes([crit], {\n    onEditItem: onChange ? onEditItem : undefined,\n    onAddGroup: onChange ? onAddGroup : undefined,\n    onDeleteItem: onChange ? onDelete : undefined,\n    itemClasses,\n    subregisters,\n    availableClassIDs,\n  });\n\n  const implied: TreeNodeInfo[] = impliedCriteria !== undefined\n    ? criteriaToNodes([impliedCriteria], {\n        implied: true,\n        itemClasses,\n        subregisters,\n        availableClassIDs,\n      })\n    : [];\n\n  return (\n    <Tree\n      contents={[ ...implied, ...nodes ]}\n      className={className}\n      css={css`\n        .bp4-tree-node-content { height: unset; }\n        .bp4-tree-node-label { overflow: unset; }\n        .bp4-tree-node-caret, .bp4-tree-node-caret-none { display: none; }\n      `}\n    />\n  );\n}\n\nexport default CriteriaTree;\n\n\n/* Displaying criteria group labels */\n\ninterface CriteriaGroupLabelProps {\n  criteriaGroup: CriteriaGroup\n  onUpdate?: (op: CompositionOperator) => void\n  className?: string\n}\nexport const CriteriaGroupLabel: React.FC<CriteriaGroupLabelProps> =\nfunction ({ criteriaGroup, onUpdate, className }) {\n  return <div className={className}>\n    {onUpdate\n      ? <ButtonGroup>\n          {COMPOSITION_OPERATORS.map(op =>\n            <Button\n                key={op}\n                small\n                onClick={() => onUpdate ? onUpdate(op) : void 0}\n                active={criteriaGroup.require === op}>\n              {op}\n            </Button>\n          )}\n        </ButtonGroup>\n      : <strong>{criteriaGroup.require}</strong>}\n    {\" \"}\n    of:\n  </div>;\n}\n\n\nfunction reverseArray<T>(arr: T[]): T[] {\n  var copy = JSON.parse(JSON.stringify(arr));\n  copy.reverse();\n  return copy;\n}\n"]}

package/views/FilterCriteria/models.d.ts

@@ -1,18 +1,40 @@
 import type React from 'react';
+import { IconName } from '@blueprintjs/core';
 import type { ItemClassConfigurationSet, Subregisters } from '../../types';
+/**
+ * Defines how to display a search criterion.
+ * T: criteria data structure.
+ */
 export interface CriterionConfiguration<T extends Record<string, any>> {
+    icon?: IconName;
     label: string;
+    /**
+     * Widget that displays and optionally allows editing
+     * criteria data structure.
+     */
     widget: CriteriaWidget<T>;
+    /**
+     * Determines whether to enable this search criteria based on
+     * registry configuration.
+     */
+    isEnabled?: (opts: CommonOpts) => boolean;
+    /** Summarizes criteria in a human-readable way. */
     toSummary: (data: T, opts: CommonOpts) => string | JSX.Element;
+    /**
+     * Coverts criteria structure to a string
+     * that can be passed to filtering backend.
+     */
     toQuery: (data: T, opts: CommonOpts) => string;
+    /** Converts a query string to criteria structure. */
     fromQuery: (query: string, opts: CommonOpts) => T;
 }
 export declare type CriteriaConfiguration = {
     [key in CriterionKey]: CriterionConfiguration<Record<string, unknown>>;
 };
+export declare type CriteriaTransformer = (existing: CriteriaGroup) => CriteriaGroup;
 export declare const COMPOSITION_OPERATORS: readonly ["all", "any", "none"];
 export declare type CompositionOperator = typeof COMPOSITION_OPERATORS[number];
-declare const CRITERIA_KEYS: readonly ["item-class", "custom"];
+declare const CRITERIA_KEYS: readonly ["item-class", "subregister", "custom", "raw-substring"];
 declare type CriterionKey = typeof CRITERIA_KEYS[number];
 export declare function isCriteriaKey(val: string): val is CriterionKey;
 declare type CriteriaWidget<T extends Record<string, any>> = React.FC<{
@@ -25,9 +47,12 @@ declare type CriteriaWidget<T extends Record<string, any>> = React.FC<{
     style?: React.CSSProperties;
 }>;
 export interface Criterion {
-    key: CriterionKey;
+    /** Specific criterion as a string. */
     query: string;
+    /** Key in criteria configuration that defines how to work with this criterion. */
+    key: CriterionKey;
 }
+/** Register metadata that may be needed to display filter criteria. */
 export interface CommonOpts {
     subregisters?: Subregisters;
     itemClasses: ItemClassConfigurationSet;
@@ -38,4 +63,6 @@ export interface CriteriaGroup {
 }
 export declare function isCriteriaGroup(val: any): val is CriteriaGroup;
 export declare function makeBlankCriteria(): CriteriaGroup;
+/** Useful as no-op default where a valid criteria is required. */
+export declare const BLANK_CRITERIA: CriteriaGroup;
 export {};

package/views/FilterCriteria/models.js

@@ -6,22 +6,29 @@ Object.defineProperty(exports, "__esModule", {
 exports.isCriteriaKey = isCriteriaKey;
 exports.isCriteriaGroup = isCriteriaGroup;
 exports.makeBlankCriteria = makeBlankCriteria;
-exports.COMPOSITION_OPERATORS = void 0;
-const COMPOSITION_OPERATORS = ['all', 'any', 'none'];
+exports.BLANK_CRITERIA = exports.COMPOSITION_OPERATORS = void 0;
+const COMPOSITION_OPERATORS = ['all', 'any', 'none']; // TODO: Can we not hard-code keys here? Would require some smart generic typing.
+
 exports.COMPOSITION_OPERATORS = COMPOSITION_OPERATORS;
-const CRITERIA_KEYS = ['item-class', 'custom'];
+const CRITERIA_KEYS = ['item-class', 'subregister', 'custom', 'raw-substring'];
 
 function isCriteriaKey(val) {
   return CRITERIA_KEYS.indexOf(val) >= 0;
 }
 
 function isCriteriaGroup(val) {
-  return val.hasOwnProperty('require');
-}
+  return val && val.hasOwnProperty('require') && val.hasOwnProperty('criteria');
+} // TODO: Deprecate in favour of `BLANK_CRITERIA`?
+
 
 function makeBlankCriteria() {
-  return {
-    require: 'all',
-    criteria: []
-  };
-}
+  return BLANK_CRITERIA;
+}
+/** Useful as no-op default where a valid criteria is required. */
+
+
+const BLANK_CRITERIA = {
+  require: 'all',
+  criteria: []
+};
+exports.BLANK_CRITERIA = BLANK_CRITERIA;

package/views/FilterCriteria/models.js.map

@@ -1 +1 @@
-{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/views/FilterCriteria/models.ts"],"names":[],"mappings":"AAgBA,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,KAAK;IACL,KAAK;IACL,MAAM;CACE,CAAC;AAGX,MAAM,aAAa,GAAG;IACpB,YAAY;IACZ,QAAQ;CACA,CAAC;AAGX,MAAM,UAAU,aAAa,CAAC,GAAW;IACvC,OAAO,aAAa,CAAC,OAAO,CAAC,GAAmB,CAAC,IAAI,CAAC,CAAC;AACzD,CAAC;AA2BD,MAAM,UAAU,eAAe,CAAC,GAAQ;IACtC,OAAO,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;AACvC,CAAC;AAED,MAAM,UAAU,iBAAiB;IAC/B,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;AAC1C,CAAC","sourcesContent":["import type React from 'react';\nimport type { ItemClassConfigurationSet, Subregisters } from '../../types';\n\n\nexport interface CriterionConfiguration<T extends Record<string, any>> {\n  label: string;\n  widget: CriteriaWidget<T>;\n  toSummary: (data: T, opts: CommonOpts) => string | JSX.Element;\n  toQuery: (data: T, opts: CommonOpts) => string;\n  fromQuery: (query: string, opts: CommonOpts) => T;\n}\n\nexport type CriteriaConfiguration = {\n  [key in CriterionKey]: CriterionConfiguration<Record<string, unknown>>;\n};\n\nexport const COMPOSITION_OPERATORS = [\n  'all',\n  'any',\n  'none',\n] as const;\nexport type CompositionOperator = typeof COMPOSITION_OPERATORS[number];\n\nconst CRITERIA_KEYS = [\n  'item-class',\n  'custom',\n] as const;\ntype CriterionKey = typeof CRITERIA_KEYS[number];\n\nexport function isCriteriaKey(val: string): val is CriterionKey {\n  return CRITERIA_KEYS.indexOf(val as CriterionKey) >= 0;\n}\n\ntype CriteriaWidget<T extends Record<string, any>> = React.FC<{\n  data: T;\n  onChange?: (newData: T) => void;\n  availableClassIDs: string[];\n  itemClasses: ItemClassConfigurationSet;\n  subregisters?: Subregisters;\n  className?: string;\n  style?: React.CSSProperties;\n}>;\n\nexport interface Criterion {\n  key: CriterionKey;\n  query: string;\n}\n\nexport interface CommonOpts {\n  subregisters?: Subregisters;\n  itemClasses: ItemClassConfigurationSet;\n}\n\nexport interface CriteriaGroup {\n  require: 'all' | 'any' | 'none';\n  criteria: (CriteriaGroup | Criterion)[];\n}\n\nexport function isCriteriaGroup(val: any): val is CriteriaGroup {\n  return val.hasOwnProperty('require');\n}\n\nexport function makeBlankCriteria(): CriteriaGroup {\n  return { require: 'all', criteria: [] };\n}\n"]}
+{"version":3,"file":"models.js","sourceRoot":"","sources":["../../../src/views/FilterCriteria/models.ts"],"names":[],"mappings":"AA4CA,MAAM,CAAC,MAAM,qBAAqB,GAAG;IACnC,KAAK;IACL,KAAK;IACL,MAAM;CACE,CAAC;AAGX,iFAAiF;AACjF,MAAM,aAAa,GAAG;IACpB,YAAY;IACZ,aAAa;IACb,QAAQ;IACR,eAAe;CACP,CAAC;AAGX,MAAM,UAAU,aAAa,CAAC,GAAW;IACvC,OAAO,aAAa,CAAC,OAAO,CAAC,GAAmB,CAAC,IAAI,CAAC,CAAC;AACzD,CAAC;AA+BD,MAAM,UAAU,eAAe,CAAC,GAAQ;IACtC,OAAO,GAAG,IAAI,GAAG,CAAC,cAAc,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,cAAc,CAAC,UAAU,CAAC,CAAC;AAChF,CAAC;AAED,iDAAiD;AACjD,MAAM,UAAU,iBAAiB;IAC/B,OAAO,cAAc,CAAC;AACxB,CAAC;AAED,kEAAkE;AAClE,MAAM,CAAC,MAAM,cAAc,GAAkB;IAC3C,OAAO,EAAE,KAAK;IACd,QAAQ,EAAE,EAAE;CACb,CAAC","sourcesContent":["import type React from 'react';\nimport { IconName } from '@blueprintjs/core';\nimport type { ItemClassConfigurationSet, Subregisters } from '../../types';\n\n\n/**\n * Defines how to display a search criterion.\n * T: criteria data structure.\n */\nexport interface CriterionConfiguration<T extends Record<string, any>> {\n  icon?: IconName\n  label: string;\n\n  /**\n   * Widget that displays and optionally allows editing\n   * criteria data structure.\n   */\n  widget: CriteriaWidget<T>;\n\n  /**\n   * Determines whether to enable this search criteria based on \n   * registry configuration.\n   */\n  isEnabled?: (opts: CommonOpts) => boolean\n\n  /** Summarizes criteria in a human-readable way. */\n  toSummary: (data: T, opts: CommonOpts) => string | JSX.Element;\n\n  /**\n   * Coverts criteria structure to a string\n   * that can be passed to filtering backend.\n   */\n  toQuery: (data: T, opts: CommonOpts) => string;\n\n  /** Converts a query string to criteria structure. */\n  fromQuery: (query: string, opts: CommonOpts) => T;\n}\n\nexport type CriteriaConfiguration = {\n  [key in CriterionKey]: CriterionConfiguration<Record<string, unknown>>;\n};\n\nexport type CriteriaTransformer = (existing: CriteriaGroup) => CriteriaGroup;\n\nexport const COMPOSITION_OPERATORS = [\n  'all',\n  'any',\n  'none',\n] as const;\nexport type CompositionOperator = typeof COMPOSITION_OPERATORS[number];\n\n// TODO: Can we not hard-code keys here? Would require some smart generic typing.\nconst CRITERIA_KEYS = [\n  'item-class',\n  'subregister',\n  'custom',\n  'raw-substring',\n] as const;\ntype CriterionKey = typeof CRITERIA_KEYS[number];\n\nexport function isCriteriaKey(val: string): val is CriterionKey {\n  return CRITERIA_KEYS.indexOf(val as CriterionKey) >= 0;\n}\n\ntype CriteriaWidget<T extends Record<string, any>> = React.FC<{\n  data: T;\n  onChange?: (newData: T) => void;\n  availableClassIDs: string[];\n  itemClasses: ItemClassConfigurationSet;\n  subregisters?: Subregisters;\n  className?: string;\n  style?: React.CSSProperties;\n}>;\n\nexport interface Criterion {\n  /** Specific criterion as a string. */\n  query: string;\n\n  /** Key in criteria configuration that defines how to work with this criterion. */\n  key: CriterionKey;\n}\n\n/** Register metadata that may be needed to display filter criteria. */\nexport interface CommonOpts {\n  subregisters?: Subregisters;\n  itemClasses: ItemClassConfigurationSet;\n}\n\nexport interface CriteriaGroup {\n  require: 'all' | 'any' | 'none';\n  criteria: (CriteriaGroup | Criterion)[];\n}\n\nexport function isCriteriaGroup(val: any): val is CriteriaGroup {\n  return val && val.hasOwnProperty('require') && val.hasOwnProperty('criteria');\n}\n\n// TODO: Deprecate in favour of `BLANK_CRITERIA`?\nexport function makeBlankCriteria(): CriteriaGroup {\n  return BLANK_CRITERIA;\n}\n\n/** Useful as no-op default where a valid criteria is required. */\nexport const BLANK_CRITERIA: CriteriaGroup = {\n  require: 'all',\n  criteria: [],\n};\n"]}

package/views/FilterCriteria/mutateGroup.d.ts

@@ -10,5 +10,8 @@ declare type TreeMutation<T> = {
     idx: number;
     item: T;
 };
-export default function mutateGroup(criteria: (CriteriaGroup | Criterion)[], path: number[], mutation: TreeMutation<CriteriaGroup | Criterion>): void;
+/** Mutates given criteria tree in place. */
+export default function mutateGroup(criteria: (CriteriaGroup | Criterion)[], 
+/** Here path must be parent node path in reverse (top-level index coming last). */
+path: number[], mutation: TreeMutation<CriteriaGroup | Criterion>): void;
 export {};

package/views/FilterCriteria/mutateGroup.js

@@ -5,9 +5,10 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = mutateGroup;
 
-/* Mutating criteria tree */
-function mutateGroup(criteria, path, // Here path must be parent node path in reverse (top-level index coming last).
-mutation) {
+/** Mutates given criteria tree in place. */
+function mutateGroup(criteria,
+/** Here path must be parent node path in reverse (top-level index coming last). */
+path, mutation) {
   if (path.length < 1 && mutation.action === 'edit') {
     criteria[0].require = mutation.item.require;
   }

package/views/FilterCriteria/mutateGroup.js.map

@@ -1 +1 @@
-{"version":3,"file":"mutateGroup.js","sourceRoot":"","sources":["../../../src/views/FilterCriteria/mutateGroup.ts"],"names":[],"mappings":"AASA,4BAA4B;AAC5B,MAAM,CAAC,OAAO,UAAU,WAAW,CACjC,QAAuC,EACvC,IAAc;AACd,+EAA+E;AAC/E,QAAiD;IAEjD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,MAAM,EAAE;QAChD,QAAQ,CAAC,CAAC,CAAmB,CAAC,OAAO,GAAI,QAAQ,CAAC,IAAsB,CAAC,OAAO,CAAC;KACnF;IACD,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE;QAC5C,IAAI,MAAM,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE;YACpC,IAAI,CAAC,GAAG,EAAE,CAAC;YAEX,IAAI,EAAiB,CAAC;YACtB,IAAI,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE;gBAChC,2DAA2D;gBAC3D,EAAE,GAAG,CAAkB,CAAC;aACzB;iBAAM;gBACL,sEAAsE;gBACtE,MAAM,IAAI,KAAK,CAAC,0CAA0C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC,CAAC;aAC7F;YAED,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;gBACnB,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;aAC1C;iBAAM;gBACL,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,EAAE;oBAChC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;iBACrC;qBAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,EAAE;oBACvC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;iBACjC;qBAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,MAAM,EAAE;oBACrC,IAAI,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,QAAQ,CAAC,GAAG,KAAK,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE;wBAClF,IAAI,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;4BAC3C,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;4BACrC,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;yBAChD;wBACD,8CAA8C;wBAC9C,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;qBACjC;oBACD,MAAM,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;oBACpE,IAAI,OAAO,EAAE;wBACX,gFAAgF;wBAC/E,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAmB,CAAC,OAAO;4BACjD,QAAQ,CAAC,IAAsB,CAAC,OAAO,CAAC;qBAC5C;yBAAM;wBACL,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC;qBAC3C;iBACF;aACF;SACF;KACF;AACH,CAAC","sourcesContent":["import { CriteriaGroup, Criterion } from './models';\n\n\ntype TreeMutation<T> =\n  { action: 'delete'; idx: number; } |\n  { action: 'insert'; item: T; } |\n  { action: 'edit'; idx: number; item: T; };\n\n\n/* Mutating criteria tree */\nexport default function mutateGroup(\n  criteria: (CriteriaGroup | Criterion)[],\n  path: number[],\n  // Here path must be parent node path in reverse (top-level index coming last).\n  mutation: TreeMutation<CriteriaGroup | Criterion>) {\n\n  if (path.length < 1 && mutation.action === 'edit') {\n    (criteria[0] as CriteriaGroup).require = (mutation.item as CriteriaGroup).require;\n  }\n  for (const [curIdx, c] of criteria.entries()) {\n    if (curIdx === path[path.length - 1]) {\n      path.pop();\n\n      let cg: CriteriaGroup;\n      if (c.hasOwnProperty('criteria')) {\n        // This item is a group, let’s go in and delete descendants\n        cg = c as CriteriaGroup;\n      } else {\n        // This item is a predicate string, can’t go in and delete descendants\n        throw new Error(`Cannot enter item: not a group at path ${path.join('/')}/${curIdx}: ${c}`);\n      }\n\n      if (path.length > 0) {\n        mutateGroup(cg.criteria, path, mutation);\n      } else {\n        if (mutation.action === 'delete') {\n          cg.criteria.splice(mutation.idx, 1);\n        } else if (mutation.action === 'insert') {\n          cg.criteria.push(mutation.item);\n        } else if (mutation.action === 'edit') {\n          if (cg.criteria[mutation.idx] === undefined && mutation.idx === cg.criteria.length) {\n            if (mutation.item.hasOwnProperty('require')) {\n              console.error(cg.criteria, mutation);\n              throw new Error(\"Won’t auto-insert new group\");\n            }\n            // It may be that a new item is being appended\n            cg.criteria.push(mutation.item);\n          }\n          const isGroup = cg.criteria[mutation.idx].hasOwnProperty('require');\n          if (isGroup) {\n            // If it’s a group, only change the predicate operator to preserve nested items:\n            (cg.criteria[mutation.idx] as CriteriaGroup).require =\n              (mutation.item as CriteriaGroup).require;\n          } else {\n            cg.criteria[mutation.idx] = mutation.item;\n          }\n        }\n      }\n    }\n  }\n}\n"]}
+{"version":3,"file":"mutateGroup.js","sourceRoot":"","sources":["../../../src/views/FilterCriteria/mutateGroup.ts"],"names":[],"mappings":"AASA,4CAA4C;AAC5C,MAAM,CAAC,OAAO,UAAU,WAAW,CACjC,QAAuC;AAEvC,mFAAmF;AACnF,IAAc,EAEd,QAAiD;IAGjD,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,IAAI,QAAQ,CAAC,MAAM,KAAK,MAAM,EAAE;QAChD,QAAQ,CAAC,CAAC,CAAmB,CAAC,OAAO,GAAI,QAAQ,CAAC,IAAsB,CAAC,OAAO,CAAC;KACnF;IACD,KAAK,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,IAAI,QAAQ,CAAC,OAAO,EAAE,EAAE;QAC5C,IAAI,MAAM,KAAK,IAAI,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,EAAE;YACpC,IAAI,CAAC,GAAG,EAAE,CAAC;YAEX,IAAI,EAAiB,CAAC;YACtB,IAAI,CAAC,CAAC,cAAc,CAAC,UAAU,CAAC,EAAE;gBAChC,2DAA2D;gBAC3D,EAAE,GAAG,CAAkB,CAAC;aACzB;iBAAM;gBACL,sEAAsE;gBACtE,MAAM,IAAI,KAAK,CAAC,0CAA0C,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,MAAM,KAAK,CAAC,EAAE,CAAC,CAAC;aAC7F;YAED,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;gBACnB,WAAW,CAAC,EAAE,CAAC,QAAQ,EAAE,IAAI,EAAE,QAAQ,CAAC,CAAC;aAC1C;iBAAM;gBACL,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,EAAE;oBAChC,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;iBACrC;qBAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,QAAQ,EAAE;oBACvC,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;iBACjC;qBAAM,IAAI,QAAQ,CAAC,MAAM,KAAK,MAAM,EAAE;oBACrC,IAAI,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,SAAS,IAAI,QAAQ,CAAC,GAAG,KAAK,EAAE,CAAC,QAAQ,CAAC,MAAM,EAAE;wBAClF,IAAI,QAAQ,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,EAAE;4BAC3C,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;4BACrC,MAAM,IAAI,KAAK,CAAC,6BAA6B,CAAC,CAAC;yBAChD;wBACD,8CAA8C;wBAC9C,EAAE,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;qBACjC;oBACD,MAAM,OAAO,GAAG,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;oBACpE,IAAI,OAAO,EAAE;wBACX,gFAAgF;wBAC/E,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAmB,CAAC,OAAO;4BACjD,QAAQ,CAAC,IAAsB,CAAC,OAAO,CAAC;qBAC5C;yBAAM;wBACL,EAAE,CAAC,QAAQ,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC;qBAC3C;iBACF;aACF;SACF;KACF;AACH,CAAC","sourcesContent":["import { CriteriaGroup, Criterion } from './models';\n\n\ntype TreeMutation<T> =\n  { action: 'delete'; idx: number; } |\n  { action: 'insert'; item: T; } |\n  { action: 'edit'; idx: number; item: T; };\n\n\n/** Mutates given criteria tree in place. */\nexport default function mutateGroup(\n  criteria: (CriteriaGroup | Criterion)[],\n\n  /** Here path must be parent node path in reverse (top-level index coming last). */\n  path: number[],\n\n  mutation: TreeMutation<CriteriaGroup | Criterion>,\n) {\n\n  if (path.length < 1 && mutation.action === 'edit') {\n    (criteria[0] as CriteriaGroup).require = (mutation.item as CriteriaGroup).require;\n  }\n  for (const [curIdx, c] of criteria.entries()) {\n    if (curIdx === path[path.length - 1]) {\n      path.pop();\n\n      let cg: CriteriaGroup;\n      if (c.hasOwnProperty('criteria')) {\n        // This item is a group, let’s go in and delete descendants\n        cg = c as CriteriaGroup;\n      } else {\n        // This item is a predicate string, can’t go in and delete descendants\n        throw new Error(`Cannot enter item: not a group at path ${path.join('/')}/${curIdx}: ${c}`);\n      }\n\n      if (path.length > 0) {\n        mutateGroup(cg.criteria, path, mutation);\n      } else {\n        if (mutation.action === 'delete') {\n          cg.criteria.splice(mutation.idx, 1);\n        } else if (mutation.action === 'insert') {\n          cg.criteria.push(mutation.item);\n        } else if (mutation.action === 'edit') {\n          if (cg.criteria[mutation.idx] === undefined && mutation.idx === cg.criteria.length) {\n            if (mutation.item.hasOwnProperty('require')) {\n              console.error(cg.criteria, mutation);\n              throw new Error(\"Won’t auto-insert new group\");\n            }\n            // It may be that a new item is being appended\n            cg.criteria.push(mutation.item);\n          }\n          const isGroup = cg.criteria[mutation.idx].hasOwnProperty('require');\n          if (isGroup) {\n            // If it’s a group, only change the predicate operator to preserve nested items:\n            (cg.criteria[mutation.idx] as CriteriaGroup).require =\n              (mutation.item as CriteriaGroup).require;\n          } else {\n            cg.criteria[mutation.idx] = mutation.item;\n          }\n        }\n      }\n    }\n  }\n}\n"]}

package/views/GenericRelatedItemView.d.ts

@@ -1,6 +1,6 @@
 /** @jsx jsx */
 /** @jsxFrag React.Fragment */
 import React from 'react';
-import { GenericRelatedItemViewProps } from '../types';
+import { type GenericRelatedItemViewProps } from '../types';
 export declare const GenericRelatedItemView: React.FC<GenericRelatedItemViewProps>;
 export default GenericRelatedItemView;