@nanoporetech-digital/components 4.8.0 → 4.9.1

package/hydrate/index.js

@@ -29099,17 +29099,17 @@ function nativeMatch(element, keyword) {
  * RecursiveMatch.
  *
  * @param element - String | number | Record<string, string>.
- * @param criterium - Criterion.
+ * @param criterion - Criterion.
  * @param keys - String[].
  * @param options - Object.
  * @param options.ignorePaths - RegExp[].
  * @returns Boolean.
  */
-function recursiveMatch(element, criterium, keys, options) {
+function recursiveMatch(element, criterion, keys, options) {
     if (typeof element === 'object') {
         if (Array.isArray(element)) {
             for (const elm of element) {
-                if (recursiveMatch(elm, criterium, keys, options)) {
+                if (recursiveMatch(elm, criterion, keys, options)) {
                     return true;
                 }
             }
@@ -29117,16 +29117,16 @@ function recursiveMatch(element, criterium, keys, options) {
         else {
             for (const i in element) {
                 keys.push(i);
-                const didMatch = recursiveMatch(element[i], criterium, keys, options);
+                const didMatch = recursiveMatch(element[i], criterion, keys, options);
                 keys.pop();
                 if (didMatch)
                     return true;
             }
         }
     }
-    else if (criterium.is) {
+    else if (criterion.type === 'exists') {
         // we check for the presence of a key (jpath)
-        if (criterium.is.test(keys.join('.'))) {
+        if (criterion.key.test(keys.join('.'))) {
             return !!element;
         }
         else {
@@ -29151,11 +29151,11 @@ function recursiveMatch(element, criterium, keys, options) {
             if (!included)
                 return false;
         }
-        if (criterium.key) {
-            if (!criterium.key.test(joinedKeys))
+        if (criterion.key) {
+            if (!criterion.key.test(joinedKeys))
                 return false;
         }
-        return nativeMatch(element, criterium);
+        return nativeMatch(element, criterion);
     }
     return false;
 }
@@ -29297,7 +29297,7 @@ function getCheckNumber(keyword) {
  * @internal
  */
 function splitNumberOperator(keyword) {
-    const match = /^\s*\(?\s*(?<startOperator><=|>=|<|=|>|\.\.)?(?<firstValue>-?\d*\.?\d+)(?:(?<afterDots>\.\.)(?<secondValue>-?\d*\.?\d*))?\s*\)?\s*$/.exec(keyword);
+    const match = /^\s*\(?\s*(?<startOperator><=|>=|<|=|>|\.\.\s*)?\s*(?<firstValue>-?\d*\.?\d+)\s*(?:(?<afterDots>\.\.)\s*(?<secondValue>-?\d*\.?\d*))?\s*\)?\s*$/.exec(keyword);
     if (!match) {
         return {
             operator: '=',
@@ -29416,7 +29416,7 @@ function splitStringOperator(keyword) {
         throw new Error('unreachable');
     }
     let { operator, value } = match.groups;
-    let secondQuery = parts[1];
+    let secondQuery = parts[1]?.trim();
     let values = [value];
     if (parts.length > 1) {
         operator = '..';
@@ -29440,48 +29440,55 @@ function splitStringOperator(keyword) {
 /**
  * @internal
  */
-function convertKeywordsToCriteria(keywords, options) {
-    const { insensitive, pathAlias } = options;
-    return keywords.map((keyword) => {
-        const criterion = {};
-        if (keyword.startsWith('-')) {
-            criterion.negate = true;
-            keyword = keyword.substring(1);
-        }
-        const colon = keyword.indexOf(':');
-        if (colon > -1) {
-            const value = keyword.substring(colon + 1);
-            if (colon > 0) {
-                const key = keyword.substring(0, colon);
-                if (key === 'is') {
-                    // a property path exists
-                    criterion.is = new RegExp(`(^|\\.)${lodash_escaperegexp(value)}(\\.|$)`, insensitive);
-                }
-                if (pathAlias[key]) {
-                    criterion.key = pathAlias[key];
-                }
-                else {
-                    criterion.key = new RegExp(`(^|\\.)${lodash_escaperegexp(key)}(\\.|$)`, insensitive);
-                }
+function convertKeywordToCriterion(keyword, options = {
+    pathAlias: {},
+}) {
+    const { caseSensitive, pathAlias } = options;
+    const regexpFlags = caseSensitive ? '' : 'i';
+    let negate = false;
+    if (keyword.startsWith('-')) {
+        negate = true;
+        keyword = keyword.substring(1);
+    }
+    const colon = keyword.indexOf(':');
+    if (colon > -1) {
+        const value = keyword.substring(colon + 1);
+        if (colon > 0) {
+            const key = keyword.substring(0, colon);
+            if (key === 'is') {
+                // a property path exists
+                return {
+                    type: 'exists',
+                    negate,
+                    key: new RegExp(`(^|\\.)${lodash_escaperegexp(value)}(\\.|$)`, regexpFlags),
+                };
+            }
+            else {
+                return {
+                    type: 'matches',
+                    negate,
+                    key: pathAlias[key]
+                        ? pathAlias[key]
+                        : new RegExp(`(^|\\.)${lodash_escaperegexp(key)}(\\.|$)`, regexpFlags),
+                    checkNumber: getCheckNumber(value),
+                    checkString: getCheckString(value, regexpFlags),
+                };
             }
-            fillCriterion(criterion, value, insensitive);
-        }
-        else {
-            fillCriterion(criterion, keyword, insensitive);
         }
-        return criterion;
-    });
+    }
+    return {
+        type: 'matches',
+        negate,
+        checkNumber: getCheckNumber(keyword),
+        checkString: getCheckString(keyword, regexpFlags),
+    };
 }
-/**
- * FillCriterion.
- *
- * @param criterion - Criterion.
- * @param keyword - String.
- * @param insensitive - String.
- */
-function fillCriterion(criterion, keyword, insensitive) {
-    criterion.checkString = getCheckString(keyword, insensitive);
-    criterion.checkNumber = getCheckNumber(keyword);
+function convertKeywordsToCriteria(keywords, options = {
+    pathAlias: {},
+}) {
+    return keywords.map((keyword) => {
+        return convertKeywordToCriterion(keyword, options);
+    });
 }
 
 /**
@@ -29540,7 +29547,7 @@ function filter$1(data, options = {}) {
         keywords = charSplit(keywords, /[ \t\r\n]/);
     }
     const criteria = convertKeywordsToCriteria(keywords, {
-        insensitive,
+        caseSensitive: options.caseSensitive,
         pathAlias,
     });
     let matched = 0;
@@ -29572,21 +29579,7 @@ function filter$1(data, options = {}) {
     }
 }
 
-// we'll do ordering and filtering in here
-// https://fusejs.io/demo.html
-//https://github.com/bvaughn/js-search
-// https://github.com/cheminfo/smart-array-filter
-// https://github.com/thundermiracle/filter-data
-function colsFromStore(safeColumns) {
-  return safeColumns.map((c) => {
-    if (!!c.sortCompareFn) {
-      c.sortCompareFn = new Function('return ' + c.sortCompareFn)();
-    }
-    return c;
-  });
-}
 const dataWorkers = new Map();
-/** SETUP / SYNC */
 function uid() {
   return Date.now().toString(36) + Math.random().toString(36).substring(2);
 }
@@ -29613,6 +29606,82 @@ async function syncConfigToWorker(workerId, columns) {
     destroyWorkerStore(workerId);
   return true;
 }
+/** SEARCH */
+/**
+ * A general text search across all table columns.
+ * Search is the first thing we do. Cache the result for filtering / sorting
+ * @param workerId
+ * @param term
+ * @returns the searched for data rows - with col filters / sorts also applied
+ */
+async function workerSearch(workerId, term) {
+  const workerStore = dataWorkers.get(workerId);
+  if (!workerStore)
+    throw 'cannot find worker with ID ' + workerId;
+  workerStore.searchTerm = term;
+  if (!term || !term.length) {
+    workerStore.filterRows = workerStore.rows;
+    return applyFiltersAndSort(workerStore, workerStore.rows);
+  }
+  const availCols = workerStore.columns.filter((c) => c.searchable !== false);
+  // cache result
+  workerStore.filterRows = filter$1(workerStore.rows, {
+    keywords: term,
+    predicate: 'OR',
+    includePaths: [...availCols.map((c) => c.prop)],
+    ignorePaths: ['__uuid', '__index'],
+  });
+  // apply filter and sort
+  return applyFiltersAndSort(workerStore, workerStore.filterRows);
+}
+/** FILTER */
+/**
+ * Finds any currently applied filter conditions from the column config
+ * @param workerStore
+ * @returns the found column filter object array
+ */
+function getCurrentFilters(workerStore) {
+  return workerStore.columns
+    .filter((c) => c.filter !== undefined && c.filter !== null)
+    .reduce((filters, col) => {
+    const { prop, filter } = col;
+    filters.push({ prop, filter });
+    return filters;
+  }, []);
+}
+function filter(workerStore, rows, filters = []) {
+  if (!filters || !filters.length)
+    filters = getCurrentFilters(workerStore);
+  if (!filters || !filters.length)
+    return rows;
+  filters.forEach((filter) => {
+    if (typeof filter.filter === 'boolean') {
+      rows = rows.filter((row) => row[filter.prop] === filter.filter);
+    }
+    else {
+      rows = filter$1(rows, {
+        keywords: filter.filter,
+        includePaths: [filter.prop],
+        ignorePaths: ['__uuid', '__index'],
+      });
+    }
+  });
+  return rows;
+}
+async function workerFilter(workerId, filters) {
+  const workerStore = dataWorkers.get(workerId);
+  if (!workerStore)
+    throw 'cannot find worker with ID ' + workerId;
+  // get cached results from a search
+  const data = (!filters || !filters.length) && workerStore.searchTerm
+    ? await workerSearch(workerId, workerStore.searchTerm)
+    : workerStore.searchTerm
+      ? workerStore.filterRows
+      : workerStore.rows;
+  workerStore.filterRows = filter(workerStore, data, filters);
+  // apply sort
+  return sort(workerStore, workerStore.filterRows);
+}
 /** SORT */
 /**
  * Finds any currently applied sort conditions from the column config
@@ -29678,62 +29747,20 @@ async function workerSort(workerId, prop, order) {
   const data = workerStore.filterRows || workerStore.rows;
   return sort(workerStore, data, prop, order);
 }
-/** FILTER */
-function filter(rows, filters = []) {
-  if (!filters)
-    return rows;
-  filters.forEach((filter) => {
-    rows = filter$1(rows, {
-      keywords: filter.filter,
-      includePaths: [filter.prop],
-      ignorePaths: ['__uuid', '__index'],
-    });
-  });
-  return rows;
-}
+/** UTILS */
+// used after a search, it only sorts rn
+// (search acting like a filter 'reset' atm)
 function applyFiltersAndSort(workerStore, rows) {
-  rows = filter(rows);
+  rows = filter(workerStore, rows);
   return sort(workerStore, rows);
 }
-async function workerFilter(workerId, filters) {
-  const workerStore = dataWorkers.get(workerId);
-  if (!workerStore)
-    throw 'cannot find worker with ID ' + workerId;
-  // get cached results from a search
-  const data = !filters || !filters.length
-    ? await workerSearch(workerId, workerStore.searchTerm)
-    : workerStore.filterRows || workerStore.rows;
-  workerStore.filterRows = filter(data, filters);
-  // apply sort
-  return sort(workerStore, workerStore.filterRows);
-}
-/** SEARCH */
-/**
- * A general text search across all table columns.
- * Search is the first thing we do. Cache the result for filtering / sorting
- * @param workerId
- * @param term
- * @returns the searched for data rows - with col filters / sorts also applied
- */
-async function workerSearch(workerId, term) {
-  const workerStore = dataWorkers.get(workerId);
-  if (!workerStore)
-    throw 'cannot find worker with ID ' + workerId;
-  workerStore.searchTerm = term;
-  if (!term || !term.length) {
-    workerStore.filterRows = workerStore.rows;
-    return applyFiltersAndSort(workerStore, workerStore.rows);
-  }
-  const availCols = workerStore.columns.filter((c) => c.searchable !== false);
-  // cache result
-  workerStore.filterRows = filter$1(workerStore.rows, {
-    keywords: term,
-    predicate: 'OR',
-    includePaths: [...availCols.map((c) => c.prop)],
-    ignorePaths: ['__uuid', '__index'],
+function colsFromStore(safeColumns) {
+  return safeColumns.map((c) => {
+    if (!!c.sortCompareFn) {
+      c.sortCompareFn = new Function('return ' + c.sortCompareFn)();
+    }
+    return c;
   });
-  // apply filter and sort
-  return applyFiltersAndSort(workerStore, workerStore.filterRows);
 }
 /**
  * Clean up
@@ -29793,7 +29820,7 @@ function getDataType(value) {
   if (value instanceof Date) {
     return 'date';
   }
-  if (['number', 'string'].includes(typeof value)) {
+  if (['number', 'string', 'boolean'].includes(typeof value)) {
     return typeof value;
   }
   return 'unknown';
@@ -29809,7 +29836,7 @@ function storeSetData(host, rows) {
     return [...prev, curr.prop];
   }, []);
   const unknownCols = cols.filter((col) => !col.type);
-  // augments data with some internal.
+  // augments data with some internal props.
   // discern unknown column types
   // convert dates to numbers for worker
   rows = rows.map((row, i) => {
@@ -30237,7 +30264,7 @@ const TableColHead = ({ column, headRenderer, onColumnSortClick, onColumnPinned,
     extraProps = column.columnProperties(column) || extraProps;
   }
   const baseProps = {
-    class: Object.assign(Object.assign({}, headerPinClasses('th', headRenderer === null || headRenderer === void 0 ? void 0 : headRenderer.pinned)), { [`${CSSNAMESPACE}__pin--start`]: column.pinned === 'start', [`${CSSNAMESPACE}__pin--end`]: column.pinned === 'end', [`${CSSNAMESPACE}__ordered`]: !!column.order, [`${CSSNAMESPACE}__filtered`]: !!column.filter }),
+    class: Object.assign(Object.assign({}, headerPinClasses('th', headRenderer === null || headRenderer === void 0 ? void 0 : headRenderer.pinned)), { [`${CSSNAMESPACE}__pin--start`]: column.pinned === 'start', [`${CSSNAMESPACE}__pin--end`]: column.pinned === 'end', [`${CSSNAMESPACE}__ordered`]: !!column.order, [`${CSSNAMESPACE}__filtered`]: column.filter !== undefined && column.filter !== null }),
   };
   let props = extraProps ? mergeProperties(baseProps, extraProps) : baseProps;
   const content = colheadFootRender(column);
@@ -30278,13 +30305,13 @@ const TableColHead = ({ column, headRenderer, onColumnSortClick, onColumnPinned,
         [`${CSSNAMESPACE}__cell-content`]: true,
       }, onClick: handleColumnSortClick },
       colheadFootRender(column),
-      !!column.filter && hAsync("nano-icon", { name: "light/filter" }),
+      column.filter !== undefined && column.filter !== null && (hAsync("nano-icon", { name: "light/filter" })),
       !!column.order &&
         (column.order === 'desc' ? (hAsync("nano-icon", { name: "solid/long-arrow-down" })) : (hAsync("nano-icon", { name: "solid/long-arrow-up" }))),
       hAsync("div", { class: `${CSSNAMESPACE}__status-icons` },
         hAsync("nano-icon", { name: "light/chevron-down" })))) : (hAsync("div", { class: `${CSSNAMESPACE}__cell-content` },
       colheadFootRender(column),
-      !!column.filter && hAsync("nano-icon", { name: "light/bars-filter" })))));
+      column.filter !== undefined && column.filter !== null && (hAsync("nano-icon", { name: "light/bars-filter" }))))));
 };
 
 // TABLE CELL
@@ -30309,7 +30336,7 @@ function cellRender(rowIndex, colIndex) {
         : d;
     }
   }
-  return tpl ? (tpl(hAsync, model)) : model.cellModel ? (hAsync(Fragment, null, (_b = model.cellModel) === null || _b === void 0 ? void 0 : _b.toString())) : ('');
+  return tpl ? (tpl(hAsync, model)) : model.cellModel !== undefined && model.cellModel !== null ? (hAsync(Fragment, null, (_b = model.cellModel) === null || _b === void 0 ? void 0 : _b.toString())) : ('');
 }
 const baseCellClasses = (colIndex, toString = false) => {
   const store = fetchStores();
@@ -30895,6 +30922,8 @@ class Table {
       const cFilter = this.filters.find((f) => f.prop === c.prop);
       if (cFilter)
         c.filter = cFilter.filter;
+      else if (c.filter !== null && c.filter !== undefined)
+        c.filter = undefined;
       return c;
     });
     this.nanoTblAfterFilter.emit({ filters: this.filters });
@@ -30958,7 +30987,7 @@ class Table {
   /** Apply initial columns settings */
   async columnInit() {
     this.filters = this.columns
-      .filter((c) => !!c.filter)
+      .filter((c) => c.filter !== undefined && c.filter !== null)
       .map((c) => {
       const { filter, prop } = c;
       return { filter, prop };
@@ -31094,7 +31123,7 @@ class Table {
           sortable: this.defaultSort,
           draggable: this.defaultColDraggable,
         } }),
-    ]))), this._loading && !this.blocks.length && (hAsync("tbody", { class: `${CSSNAMESPACE}__active` }, [...Array(10).keys()].map((rowIndex) => (hAsync("tr", null, this.store.config.state.columns.map((_colModel, colIndex) => (hAsync(TableCell, { rowIndex: rowIndex, colIndex: colIndex, nestedContent: () => hAsync("nano-skeleton", null) })))))))), !this._loading && !this.blocks.length && (hAsync("tr", null, hAsync("th", { class: `${CSSNAMESPACE}__th`, colSpan: this.store.config.state.columns.length }, hAsync("div", { class: "nano-tbl__cell-content nano-tbl__cell-content--no-result" }, hAsync("slot", { name: "no-results" }, "No results found"))))), this.blocks.map((block, blockIndex) => (hAsync("tbody", { key: block.__uuid, id: `tbody-${this.renderId}-${blockIndex}`, ref: (tb) => {
+    ]))), this._loading && !this.blocks.length && (hAsync("tbody", { class: `${CSSNAMESPACE}__active` }, [...Array(10).keys()].map((rowIndex) => (hAsync("tr", null, this.store.config.state.columns.map((_colModel, colIndex) => (hAsync(TableCell, { rowIndex: rowIndex, colIndex: colIndex, nestedContent: () => hAsync("nano-skeleton", null) })))))))), hAsync("tr", { hidden: !!this._loading || !!this.blocks.length }, hAsync("th", { class: `${CSSNAMESPACE}__th`, colSpan: this.store.config.state.columns.length }, hAsync("div", { class: "nano-tbl__cell-content nano-tbl__cell-content--no-result" }, hAsync("slot", { name: "no-results" }, "No results found")))), this.blocks.map((block, blockIndex) => (hAsync("tbody", { key: block.__uuid, id: `tbody-${this.renderId}-${blockIndex}`, ref: (tb) => {
         this.blockElements.push(tb);
       }, class: {
         [`${CSSNAMESPACE}__inactive`]: !this.activeBlocks.includes(blockIndex),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nanoporetech-digital/components",
-  "version": "4.8.0",
+  "version": "4.9.1",
   "repository": {
     "type": "git",
     "url": "https://git.oxfordnanolabs.local/Digital/nano-components"
@@ -64,7 +64,7 @@
     "flickity": "^2.2.1",
     "focus-options-polyfill": "^1.4.0",
     "qs": "^6.9.4",
-    "smart-array-filter": "^4.0.0",
+    "smart-array-filter": "^4.0.2",
     "squirrelly": "^8",
     "stencil-wormhole": "3.2.1"
   },
@@ -131,7 +131,7 @@
     "nanopore",
     "digital"
   ],
-  "gitHead": "d65087c0710a69432fffc3d923ebb9514f7177d4",
+  "gitHead": "9bb5cb1dbbbd3cad4d4fd594054659a180a5e48e",
   "volta": {
     "node": "14.18.1",
     "npm": "8.6.0"