@vuu-ui/vuu-utils 0.13.78 → 0.13.79

package/esm/packages/vuu-utils/src/filters/filter-utils.js

@@ -1,13 +1,3 @@
-import { getTypedValue } from '../form-utils.js';
-import { isTypeDescriptor } from '../column-utils.js';
-
-var __typeError = (msg) => {
-  throw TypeError(msg);
-};
-var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot " + msg);
-var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
-var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
-var _filters;
 const singleValueFilterOps = /* @__PURE__ */ new Set([
   "=",
   "!=",
@@ -19,19 +9,22 @@ const singleValueFilterOps = /* @__PURE__ */ new Set([
   "starts",
   "ends"
 ]);
+const isBetweenOperator = (op) => op === "between" || op === "between-inclusive";
 const isValidFilterClauseOp = (op) => op === "in" || singleValueFilterOps.has(op);
 const isNamedFilter = (f) => f !== void 0 && f.name !== void 0;
 const isSingleValueFilter = (f) => f !== void 0 && singleValueFilterOps.has(f.op);
+const isSerializableFilter = (f) => isSingleValueFilter(f) && "asQuery" in f && typeof f["asQuery"] === "function";
 const isFilterClause = (f) => f !== void 0 && (isSingleValueFilter(f) || isMultiValueFilter(f));
 const isMultiValueFilter = (f) => f !== void 0 && f.op === "in";
 const isInFilter = (f) => f.op === "in";
 const isAndFilter = (f) => f?.op === "and";
-const isBetweenFilter = (f) => isAndFilter(f) && f.filters.length === 2 && f.filters[0].column === f.filters[1].column && f.filters[0].op === ">" && f.filters[1].op === "<";
+const isBetweenFilter = (f) => isAndFilter(f) && f.filters.length === 2 && f.filters[0].column === f.filters[1].column && (f.filters[0].op === ">" && f.filters[1].op === "<" || f.filters[0].op === ">=" && f.filters[1].op === "<=");
 const isOrFilter = (f) => f?.op === "or";
 const isCompleteFilter = (filter) => isSingleValueFilter(filter) && filter.column !== void 0 && filter.op !== void 0 && filter.value !== void 0;
 function isMultiClauseFilter(f) {
   return f !== void 0 && (f.op === "and" || f.op === "or");
 }
+const isExtendedFilter = (f) => typeof f.extendedOptions === "object";
 const applyFilterToColumns = (columns, { filterStruct }) => columns.map((column) => {
   const filter = extractFilterForColumn(filterStruct, column.name);
   if (filter !== void 0) {
@@ -85,7 +78,7 @@ const stringifyBoolean = (value) => typeof value === "boolean" ? "${filter.value
 const getColumnValueFromFilter = (column, operator, filter) => {
   if (isSingleValueFilter(filter)) {
     if (filter.column === column.name) {
-      if (operator === "between") {
+      if (operator.startsWith("between")) {
         if (filter.op === "=") {
           return [`${filter.value}`, ""];
         } else if (filter.op === "<") {
@@ -108,12 +101,12 @@ const getColumnValueFromFilter = (column, operator, filter) => {
     );
     if (isSingleValueFilter(filterForColumn)) {
       return stringifyBoolean(filterForColumn.value);
-    } else if (operator === "between" && isBetweenFilter(filterForColumn)) {
+    } else if (operator.startsWith("between") && isBetweenFilter(filterForColumn)) {
       const [{ value: v1 }, { value: v2 }] = filterForColumn.filters;
       return [`${v1}`, `${v2}`];
     }
   }
-  if (operator === "between") {
+  if (operator.startsWith("between")) {
     if (column.type === "time") {
       return ["00:00:00", "23:59:59"];
     } else {
@@ -123,92 +116,6 @@ const getColumnValueFromFilter = (column, operator, filter) => {
     return "";
   }
 };
-class FilterAggregator {
-  constructor(filter) {
-    __privateAdd(this, _filters, /* @__PURE__ */ new Map());
-    if (isSingleValueFilter(filter)) {
-      __privateGet(this, _filters).set(filter.column, filter);
-    } else if (isBetweenFilter(filter)) {
-      __privateGet(this, _filters).set(filter.filters[0].column, filter);
-    } else if (isAndFilter(filter)) {
-      filter.filters.forEach((f) => {
-        if (isBetweenFilter(f)) {
-          __privateGet(this, _filters).set(f.filters[0].column, f);
-        } else {
-          __privateGet(this, _filters).set(f.column, f);
-        }
-      });
-    }
-  }
-  add(column, value) {
-    const { serverDataType = "string", type } = column;
-    const dataType = isTypeDescriptor(type) ? type.name : type ?? serverDataType;
-    if (Array.isArray(value)) {
-      const value1 = getTypedValue(value[0].toString(), dataType);
-      const value2 = getTypedValue(value[1].toString(), dataType);
-      if (value1 !== void 0 && value2 !== void 0) {
-        __privateGet(this, _filters).set(column.name, {
-          op: "and",
-          filters: [
-            { column: column.name, op: ">", value: value1 },
-            { column: column.name, op: "<", value: value2 }
-          ]
-        });
-      } else if (value1 !== void 0) {
-        __privateGet(this, _filters).set(column.name, {
-          column: column.name,
-          op: "=",
-          value: value1
-        });
-      } else if (value2 !== void 0) {
-        __privateGet(this, _filters).set(column.name, {
-          column: column.name,
-          op: "<",
-          value: value2
-        });
-      }
-    } else {
-      const typedValue = getTypedValue(value.toString(), dataType, true);
-      __privateGet(this, _filters).set(column.name, {
-        column: column.name,
-        op: "=",
-        value: typedValue
-      });
-    }
-  }
-  has({ name }) {
-    return __privateGet(this, _filters).has(name);
-  }
-  get({ name }) {
-    return __privateGet(this, _filters).get(name);
-  }
-  /**
-   * Remove filter for this column. Return false if no filter found, otw true
-   */
-  remove(column) {
-    if (__privateGet(this, _filters).has(column.name)) {
-      __privateGet(this, _filters).delete(column.name);
-      return true;
-    } else {
-      return false;
-    }
-  }
-  get filter() {
-    const { size } = __privateGet(this, _filters);
-    if (size === 0) {
-      return void 0;
-    } else if (size === 1) {
-      const [filter] = __privateGet(this, _filters).values();
-      return filter;
-    } else {
-      return {
-        op: "and",
-        filters: Array.from(__privateGet(this, _filters).values())
-      };
-    }
-  }
-}
-_filters = new WeakMap();
 const betweenFiltersAreEqual = (f1, f2) => {
   const [from1, to1] = f1.filters;
   const [from2, to2] = f2.filters;
@@ -242,5 +149,5 @@ const filtersAreEqual = (f1, f2) => {
   return false;
 };
 
-export { FilterAggregator, applyFilterToColumns, extractFilterForColumn, filtersAreEqual, getColumnValueFromFilter, isAndFilter, isBetweenFilter, isCompleteFilter, isFilterClause, isFilteredColumn, isInFilter, isMultiClauseFilter, isMultiValueFilter, isNamedFilter, isOrFilter, isSingleValueFilter, isValidFilterClauseOp, stripFilterFromColumns };
+export { applyFilterToColumns, extractFilterForColumn, filtersAreEqual, getColumnValueFromFilter, isAndFilter, isBetweenFilter, isBetweenOperator, isCompleteFilter, isExtendedFilter, isFilterClause, isFilteredColumn, isInFilter, isMultiClauseFilter, isMultiValueFilter, isNamedFilter, isOrFilter, isSerializableFilter, isSingleValueFilter, isValidFilterClauseOp, stripFilterFromColumns };
 //# sourceMappingURL=filter-utils.js.map

package/esm/packages/vuu-utils/src/filters/filter-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter-utils.js","sources":["../../../../../../../packages/vuu-utils/src/filters/filter-utils.ts"],"sourcesContent":["import type { DataSourceFilter } from \"@vuu-ui/vuu-data-types\";\nimport {\n  ColumnFilterOp,\n  ColumnFilterValue,\n  Filter,\n  FilterClauseOp,\n  FilterContainerFilter,\n  FilterWithPartialClause,\n  MultiClauseFilter,\n  MultiValueFilterClause,\n  SingleValueFilterClause,\n  SingleValueFilterClauseOp,\n} from \"@vuu-ui/vuu-filter-types\";\nimport {\n  ColumnDescriptor,\n  RuntimeColumnDescriptor,\n} from \"@vuu-ui/vuu-table-types\";\nimport { getTypedValue } from \"../form-utils\";\nimport { isTypeDescriptor } from \"../column-utils\";\n\nconst singleValueFilterOps = new Set<SingleValueFilterClauseOp>([\n  \"=\",\n  \"!=\",\n  \">\",\n  \">=\",\n  \"<\",\n  \"<=\",\n  \"contains\",\n  \"starts\",\n  \"ends\",\n]);\n\nexport const isValidFilterClauseOp = (op?: string): op is FilterClauseOp =>\n  op === \"in\" || singleValueFilterOps.has(op as SingleValueFilterClauseOp);\n\nexport const isNamedFilter = (f?: Filter) =>\n  f !== undefined && f.name !== undefined;\n\n// ... with type constraints\nexport const isSingleValueFilter = (\n  f?: Partial<Filter>,\n): f is SingleValueFilterClause =>\n  f !== undefined &&\n  singleValueFilterOps.has(f.op as SingleValueFilterClauseOp);\n\nexport const isFilterClause = (\n  f?: Partial<Filter>,\n): f is SingleValueFilterClause | MultiValueFilterClause =>\n  f !== undefined && (isSingleValueFilter(f) || isMultiValueFilter(f));\n\nexport const isMultiValueFilter = (\n  f?: Partial<Filter>,\n): f is MultiValueFilterClause => f !== undefined && f.op === \"in\";\n\nexport const isInFilter = (f: Partial<Filter>): f is MultiValueFilterClause =>\n  f.op === \"in\";\nexport const isAndFilter = (\n  f?: Partial<Filter>,\n): f is MultiClauseFilter<\"and\"> => f?.op === \"and\";\n\nexport const isBetweenFilter = (\n  f?: Filter,\n): f is MultiClauseFilter<\"and\", SingleValueFilterClause> =>\n  isAndFilter(f) &&\n  f.filters.length === 2 &&\n  f.filters[0].column === f.filters[1].column &&\n  f.filters[0].op === \">\" &&\n  f.filters[1].op === \"<\";\n\nexport const isOrFilter = (f?: Partial<Filter>): f is MultiClauseFilter<\"or\"> =>\n  f?.op === \"or\";\n\nexport const isCompleteFilter = (filter: Partial<Filter>): filter is Filter =>\n  isSingleValueFilter(filter) &&\n  filter.column !== undefined &&\n  filter.op !== undefined &&\n  filter.value !== undefined;\n\nexport function isMultiClauseFilter(\n  f?: Partial<Filter> | FilterWithPartialClause,\n): f is MultiClauseFilter {\n  return f !== undefined && (f.op === \"and\" || f.op === \"or\");\n}\n\nexport const applyFilterToColumns = (\n  columns: RuntimeColumnDescriptor[],\n  { filterStruct }: DataSourceFilter,\n) =>\n  columns.map((column) => {\n    // TODO this gives us a dependency on vuu-filters\n    const filter = extractFilterForColumn(filterStruct, column.name);\n    if (filter !== undefined) {\n      return {\n        ...column,\n        filter,\n      };\n    } else if (column.filter) {\n      return {\n        ...column,\n        filter: undefined,\n      };\n    } else {\n      return column;\n    }\n  });\n\nexport const isFilteredColumn = (column: RuntimeColumnDescriptor) =>\n  column.filter !== undefined;\n\nexport const stripFilterFromColumns = (columns: RuntimeColumnDescriptor[]) =>\n  columns.map((col) => {\n    const { filter, ...rest } = col;\n    return filter ? rest : col;\n  });\n\nexport const extractFilterForColumn = (\n  filter: Filter | undefined,\n  columnName: string,\n) => {\n  if (isMultiClauseFilter(filter)) {\n    return collectFiltersForColumn(filter, columnName);\n  }\n  if (isFilterClause(filter)) {\n    return filter.column === columnName ? filter : undefined;\n  }\n  return undefined;\n};\n\nconst collectFiltersForColumn = (\n  filter: MultiClauseFilter,\n  columnName: string,\n) => {\n  const { filters, op } = filter;\n  const results: Filter[] = [];\n  filters.forEach((filter) => {\n    const ffc = extractFilterForColumn(filter, columnName);\n    if (ffc) {\n      results.push(ffc);\n    }\n  });\n  if (results.length === 0) {\n    return undefined;\n  } else if (results.length === 1) {\n    return results[0];\n  }\n  return {\n    op,\n    filters: results,\n  };\n};\n\n// Just until we fully support bool values in filters\nconst stringifyBoolean = (value: string | number | boolean) =>\n  typeof value === \"boolean\" ? \"${filter.value}\" : value;\n\nexport const getColumnValueFromFilter = (\n  column: ColumnDescriptor,\n  operator: ColumnFilterOp,\n  filter?: FilterContainerFilter,\n): ColumnFilterValue => {\n  if (isSingleValueFilter(filter)) {\n    if (filter.column === column.name) {\n      if (operator === \"between\") {\n        if (filter.op === \"=\") {\n          return [`${filter.value}`, \"\"];\n        } else if (filter.op === \"<\") {\n          return [\"\", `${filter.value}`];\n        }\n      } else {\n        return stringifyBoolean(filter.value);\n      }\n    }\n  } else if (isBetweenFilter(filter)) {\n    if (filter.filters[0].column === column.name) {\n      const [{ value: v1 }, { value: v2 }] = filter.filters;\n      return [`${v1}`, `${v2}`];\n    } else {\n      return [\"\", \"\"];\n    }\n  } else if (isAndFilter(filter)) {\n    const filterForColumn = filter.filters.find((f) =>\n      isBetweenFilter(f)\n        ? f.filters[0].column === column.name\n        : f.column === column.name,\n    );\n    if (isSingleValueFilter(filterForColumn)) {\n      return stringifyBoolean(filterForColumn.value);\n    } else if (operator === \"between\" && isBetweenFilter(filterForColumn)) {\n      const [{ value: v1 }, { value: v2 }] = filterForColumn.filters;\n      return [`${v1}`, `${v2}`];\n    }\n  }\n  if (operator === \"between\") {\n    if (column.type === \"time\") {\n      return [\"00:00:00\", \"23:59:59\"];\n    } else {\n      return [\"\", \"\"];\n    }\n  } else {\n    return \"\";\n  }\n};\n\n/**\n * Manages a filter that can be updated one clause at a time.\n * Works with FilterContainer to aggregate multiple filter\n * clauses edited via individual controls. It is just a wrapper\n * around a Map, does not support switching filters - create a\n * new FilterAggregator for a new filter.\n *\n */\nexport class FilterAggregator {\n  #filters = new Map<string, FilterContainerFilter>();\n\n  constructor(filter?: FilterContainerFilter) {\n    if (isSingleValueFilter(filter)) {\n      this.#filters.set(filter.column, filter);\n    } else if (isBetweenFilter(filter)) {\n      this.#filters.set(filter.filters[0].column, filter);\n    } else if (isAndFilter(filter)) {\n      filter.filters.forEach((f) => {\n        if (isBetweenFilter(f)) {\n          this.#filters.set(f.filters[0].column, f);\n        } else {\n          this.#filters.set(f.column, f);\n        }\n      });\n    }\n  }\n\n  add(column: ColumnDescriptor, value: ColumnFilterValue) {\n    const { serverDataType = \"string\", type } = column;\n    const dataType = isTypeDescriptor(type)\n      ? type.name\n      : (type ?? serverDataType);\n    if (Array.isArray(value)) {\n      const value1 = getTypedValue(value[0].toString(), dataType);\n      const value2 = getTypedValue(value[1].toString(), dataType);\n\n      if (value1 !== undefined && value2 !== undefined) {\n        this.#filters.set(column.name, {\n          op: \"and\",\n          filters: [\n            { column: column.name, op: \">\", value: value1 },\n            { column: column.name, op: \"<\", value: value2 },\n          ],\n        });\n      } else if (value1 !== undefined) {\n        this.#filters.set(column.name, {\n          column: column.name,\n          op: \"=\",\n          value: value1,\n        });\n      } else if (value2 !== undefined) {\n        this.#filters.set(column.name, {\n          column: column.name,\n          op: \"<\",\n          value: value2,\n        });\n      }\n    } else {\n      const typedValue = getTypedValue(value.toString(), dataType, true);\n\n      this.#filters.set(column.name, {\n        column: column.name,\n        op: \"=\",\n        value: typedValue,\n      });\n    }\n  }\n\n  has({ name }: ColumnDescriptor) {\n    return this.#filters.has(name);\n  }\n\n  get({ name }: ColumnDescriptor) {\n    return this.#filters.get(name);\n  }\n\n  /**\n   * Remove filter for this column. Return false if no filter found, otw true\n   */\n  remove(column: ColumnDescriptor) {\n    if (this.#filters.has(column.name)) {\n      this.#filters.delete(column.name);\n      return true;\n    } else {\n      return false;\n    }\n  }\n\n  get filter(): FilterContainerFilter | undefined {\n    const { size } = this.#filters;\n    if (size === 0) {\n      return undefined;\n    } else if (size === 1) {\n      const [filter] = this.#filters.values();\n      return filter;\n    } else {\n      return {\n        op: \"and\",\n        filters: Array.from(this.#filters.values()),\n      } as FilterContainerFilter;\n    }\n  }\n}\n\ntype BetweenFilter = MultiClauseFilter<\"and\", SingleValueFilterClause>;\ntype ChildFilterClause = SingleValueFilterClause | BetweenFilter;\n\nconst betweenFiltersAreEqual = (f1: BetweenFilter, f2: BetweenFilter) => {\n  const [from1, to1] = f1.filters;\n  const [from2, to2] = f2.filters;\n  return filtersAreEqual(from1, from2) && filtersAreEqual(to1, to2);\n};\n\nconst singleValueFilterClausesAreEqual = (\n  f1: SingleValueFilterClause,\n  f2: SingleValueFilterClause,\n) => f1.column === f2.column && f1.op === f2.op && f1.value === f2.value;\n\nconst findEqualFilter =\n  (filters: ChildFilterClause[]) => (filter: ChildFilterClause) => {\n    if (isBetweenFilter(filter)) {\n      const target = filters.find(\n        (f) => isBetweenFilter(f) && betweenFiltersAreEqual(f, filter),\n      );\n      return target !== undefined;\n    } else {\n      // A FilterContainerFilter only has one filter clause per column\n      const target = filters.find((f) => f.column === filter.column);\n      if (target) {\n        return target.op === filter.op && target.value === filter.value;\n      }\n    }\n    return false;\n  };\n\nexport const filtersAreEqual = (\n  f1: FilterContainerFilter,\n  f2: FilterContainerFilter,\n): boolean => {\n  if (isSingleValueFilter(f1) && isSingleValueFilter(f2)) {\n    return singleValueFilterClausesAreEqual(f1, f2);\n  } else if (isBetweenFilter(f1) && isBetweenFilter(f2)) {\n    return betweenFiltersAreEqual(f1, f2);\n  } else if (isAndFilter(f1) && isAndFilter(f2)) {\n    if (f1.filters.length === f2.filters.length) {\n      return f1.filters.every(findEqualFilter(f2.filters));\n    }\n  }\n\n  return false;\n};\n"],"names":["filter"],"mappings":"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"}
+{"version":3,"file":"filter-utils.js","sources":["../../../../../../../packages/vuu-utils/src/filters/filter-utils.ts"],"sourcesContent":["import type { DataSourceFilter } from \"@vuu-ui/vuu-data-types\";\nimport {\n  ColumnFilterOp,\n  ColumnFilterValue,\n  ExtendedFilter,\n  Filter,\n  FilterClauseOp,\n  FilterClauseOpBetween,\n  FilterContainerFilter,\n  FilterWithPartialClause,\n  MultiClauseFilter,\n  MultiValueFilterClause,\n  SingleValueFilterClause,\n  SingleValueFilterClauseOp,\n} from \"@vuu-ui/vuu-filter-types\";\nimport { SerializableFilter } from \"@vuu-ui/vuu-filters/src/filter-container/ExtendedSingleValueFilterClause\";\nimport {\n  ColumnDescriptor,\n  RuntimeColumnDescriptor,\n} from \"@vuu-ui/vuu-table-types\";\n\nconst singleValueFilterOps = new Set<SingleValueFilterClauseOp>([\n  \"=\",\n  \"!=\",\n  \">\",\n  \">=\",\n  \"<\",\n  \"<=\",\n  \"contains\",\n  \"starts\",\n  \"ends\",\n]);\n\nexport const isBetweenOperator = (\n  op: ColumnFilterOp,\n): op is FilterClauseOpBetween =>\n  op === \"between\" || op === \"between-inclusive\";\n\nexport const isValidFilterClauseOp = (op?: string): op is FilterClauseOp =>\n  op === \"in\" || singleValueFilterOps.has(op as SingleValueFilterClauseOp);\n\nexport const isNamedFilter = (f?: Filter) =>\n  f !== undefined && f.name !== undefined;\n\n// ... with type constraints\nexport const isSingleValueFilter = (\n  f?: Partial<Filter>,\n): f is SingleValueFilterClause =>\n  f !== undefined &&\n  singleValueFilterOps.has(f.op as SingleValueFilterClauseOp);\n\nexport const isSerializableFilter = (f: object): f is SerializableFilter =>\n  isSingleValueFilter(f) &&\n  \"asQuery\" in f &&\n  typeof f[\"asQuery\"] === \"function\";\n\nexport const isFilterClause = (\n  f?: Partial<Filter>,\n): f is SingleValueFilterClause | MultiValueFilterClause =>\n  f !== undefined && (isSingleValueFilter(f) || isMultiValueFilter(f));\n\nexport const isMultiValueFilter = (\n  f?: Partial<Filter>,\n): f is MultiValueFilterClause => f !== undefined && f.op === \"in\";\n\nexport const isInFilter = (f: Partial<Filter>): f is MultiValueFilterClause =>\n  f.op === \"in\";\nexport const isAndFilter = (\n  f?: Partial<Filter>,\n): f is MultiClauseFilter<\"and\"> => f?.op === \"and\";\n\nexport const isBetweenFilter = (\n  f?: Filter,\n): f is MultiClauseFilter<\"and\", SingleValueFilterClause> =>\n  isAndFilter(f) &&\n  f.filters.length === 2 &&\n  f.filters[0].column === f.filters[1].column &&\n  ((f.filters[0].op === \">\" && f.filters[1].op === \"<\") ||\n    (f.filters[0].op === \">=\" && f.filters[1].op === \"<=\"));\n\nexport const isOrFilter = (f?: Partial<Filter>): f is MultiClauseFilter<\"or\"> =>\n  f?.op === \"or\";\n\nexport const isCompleteFilter = (filter: Partial<Filter>): filter is Filter =>\n  isSingleValueFilter(filter) &&\n  filter.column !== undefined &&\n  filter.op !== undefined &&\n  filter.value !== undefined;\n\nexport function isMultiClauseFilter(\n  f?: Partial<Filter> | FilterWithPartialClause,\n): f is MultiClauseFilter {\n  return f !== undefined && (f.op === \"and\" || f.op === \"or\");\n}\n\nexport const isExtendedFilter = (f: Filter): f is ExtendedFilter =>\n  typeof (f as ExtendedFilter).extendedOptions === \"object\";\n\nexport const applyFilterToColumns = (\n  columns: RuntimeColumnDescriptor[],\n  { filterStruct }: DataSourceFilter,\n) =>\n  columns.map((column) => {\n    // TODO this gives us a dependency on vuu-filters\n    const filter = extractFilterForColumn(filterStruct, column.name);\n    if (filter !== undefined) {\n      return {\n        ...column,\n        filter,\n      };\n    } else if (column.filter) {\n      return {\n        ...column,\n        filter: undefined,\n      };\n    } else {\n      return column;\n    }\n  });\n\nexport const isFilteredColumn = (column: RuntimeColumnDescriptor) =>\n  column.filter !== undefined;\n\nexport const stripFilterFromColumns = (columns: RuntimeColumnDescriptor[]) =>\n  columns.map((col) => {\n    const { filter, ...rest } = col;\n    return filter ? rest : col;\n  });\n\nexport const extractFilterForColumn = (\n  filter: Filter | undefined,\n  columnName: string,\n) => {\n  if (isMultiClauseFilter(filter)) {\n    return collectFiltersForColumn(filter, columnName);\n  }\n  if (isFilterClause(filter)) {\n    return filter.column === columnName ? filter : undefined;\n  }\n  return undefined;\n};\n\nconst collectFiltersForColumn = (\n  filter: MultiClauseFilter,\n  columnName: string,\n) => {\n  const { filters, op } = filter;\n  const results: Filter[] = [];\n  filters.forEach((filter) => {\n    const ffc = extractFilterForColumn(filter, columnName);\n    if (ffc) {\n      results.push(ffc);\n    }\n  });\n  if (results.length === 0) {\n    return undefined;\n  } else if (results.length === 1) {\n    return results[0];\n  }\n  return {\n    op,\n    filters: results,\n  };\n};\n\n// Just until we fully support bool values in filters\nconst stringifyBoolean = (value: string | number | boolean) =>\n  typeof value === \"boolean\" ? \"${filter.value}\" : value;\n\nexport const getColumnValueFromFilter = (\n  column: ColumnDescriptor,\n  operator: ColumnFilterOp,\n  filter?: FilterContainerFilter,\n): ColumnFilterValue => {\n  if (isSingleValueFilter(filter)) {\n    if (filter.column === column.name) {\n      if (operator.startsWith(\"between\")) {\n        if (filter.op === \"=\") {\n          return [`${filter.value}`, \"\"];\n        } else if (filter.op === \"<\") {\n          return [\"\", `${filter.value}`];\n        }\n      } else {\n        return stringifyBoolean(filter.value);\n      }\n    }\n  } else if (isBetweenFilter(filter)) {\n    if (filter.filters[0].column === column.name) {\n      const [{ value: v1 }, { value: v2 }] = filter.filters;\n      return [`${v1}`, `${v2}`];\n    } else {\n      return [\"\", \"\"];\n    }\n  } else if (isAndFilter(filter)) {\n    const filterForColumn = filter.filters.find((f) =>\n      isBetweenFilter(f)\n        ? f.filters[0].column === column.name\n        : f.column === column.name,\n    );\n    if (isSingleValueFilter(filterForColumn)) {\n      return stringifyBoolean(filterForColumn.value);\n    } else if (\n      operator.startsWith(\"between\") &&\n      isBetweenFilter(filterForColumn)\n    ) {\n      const [{ value: v1 }, { value: v2 }] = filterForColumn.filters;\n      return [`${v1}`, `${v2}`];\n    }\n  }\n  if (operator.startsWith(\"between\")) {\n    if (column.type === \"time\") {\n      return [\"00:00:00\", \"23:59:59\"];\n    } else {\n      return [\"\", \"\"];\n    }\n  } else {\n    return \"\";\n  }\n};\n\ntype BetweenFilter = MultiClauseFilter<\"and\", SingleValueFilterClause>;\ntype ChildFilterClause = SingleValueFilterClause | BetweenFilter;\n\nconst betweenFiltersAreEqual = (f1: BetweenFilter, f2: BetweenFilter) => {\n  const [from1, to1] = f1.filters;\n  const [from2, to2] = f2.filters;\n  return filtersAreEqual(from1, from2) && filtersAreEqual(to1, to2);\n};\n\nconst singleValueFilterClausesAreEqual = (\n  f1: SingleValueFilterClause,\n  f2: SingleValueFilterClause,\n) => f1.column === f2.column && f1.op === f2.op && f1.value === f2.value;\n\nconst findEqualFilter =\n  (filters: ChildFilterClause[]) => (filter: ChildFilterClause) => {\n    if (isBetweenFilter(filter)) {\n      const target = filters.find(\n        (f) => isBetweenFilter(f) && betweenFiltersAreEqual(f, filter),\n      );\n      return target !== undefined;\n    } else {\n      // A FilterContainerFilter only has one filter clause per column\n      const target = filters.find((f) => f.column === filter.column);\n      if (target) {\n        return target.op === filter.op && target.value === filter.value;\n      }\n    }\n    return false;\n  };\n\nexport const filtersAreEqual = (\n  f1: FilterContainerFilter,\n  f2: FilterContainerFilter,\n): boolean => {\n  if (isSingleValueFilter(f1) && isSingleValueFilter(f2)) {\n    return singleValueFilterClausesAreEqual(f1, f2);\n  } else if (isBetweenFilter(f1) && isBetweenFilter(f2)) {\n    return betweenFiltersAreEqual(f1, f2);\n  } else if (isAndFilter(f1) && isAndFilter(f2)) {\n    if (f1.filters.length === f2.filters.length) {\n      return f1.filters.every(findEqualFilter(f2.filters));\n    }\n  }\n\n  return false;\n};\n"],"names":["filter"],"mappings":"AAqBA,MAAM,oBAAA,uBAA2B,GAA+B,CAAA;AAAA,EAC9D,GAAA;AAAA,EACA,IAAA;AAAA,EACA,GAAA;AAAA,EACA,IAAA;AAAA,EACA,GAAA;AAAA,EACA,IAAA;AAAA,EACA,UAAA;AAAA,EACA,QAAA;AAAA,EACA;AACF,CAAC,CAAA;AAEM,MAAM,iBAAoB,GAAA,CAC/B,EAEA,KAAA,EAAA,KAAO,aAAa,EAAO,KAAA;AAEtB,MAAM,wBAAwB,CAAC,EAAA,KACpC,OAAO,IAAQ,IAAA,oBAAA,CAAqB,IAAI,EAA+B;AAElE,MAAM,gBAAgB,CAAC,CAAA,KAC5B,CAAM,KAAA,KAAA,CAAA,IAAa,EAAE,IAAS,KAAA,KAAA;AAGnB,MAAA,mBAAA,GAAsB,CACjC,CAEA,KAAA,CAAA,KAAM,UACN,oBAAqB,CAAA,GAAA,CAAI,EAAE,EAA+B;AAE/C,MAAA,oBAAA,GAAuB,CAAC,CAAA,KACnC,mBAAoB,CAAA,CAAC,CACrB,IAAA,SAAA,IAAa,CACb,IAAA,OAAO,CAAE,CAAA,SAAS,CAAM,KAAA;AAEb,MAAA,cAAA,GAAiB,CAC5B,CAEA,KAAA,CAAA,KAAM,WAAc,mBAAoB,CAAA,CAAC,CAAK,IAAA,kBAAA,CAAmB,CAAC,CAAA;AAE7D,MAAM,qBAAqB,CAChC,CAAA,KACgC,CAAM,KAAA,KAAA,CAAA,IAAa,EAAE,EAAO,KAAA;AAEvD,MAAM,UAAa,GAAA,CAAC,CACzB,KAAA,CAAA,CAAE,EAAO,KAAA;AACJ,MAAM,WAAc,GAAA,CACzB,CACkC,KAAA,CAAA,EAAG,EAAO,KAAA;AAEvC,MAAM,kBAAkB,CAC7B,CAAA,KAEA,YAAY,CAAC,CAAA,IACb,EAAE,OAAQ,CAAA,MAAA,KAAW,KACrB,CAAE,CAAA,OAAA,CAAQ,CAAC,CAAE,CAAA,MAAA,KAAW,EAAE,OAAQ,CAAA,CAAC,EAAE,MACnC,KAAA,CAAA,CAAE,OAAQ,CAAA,CAAC,EAAE,EAAO,KAAA,GAAA,IAAO,EAAE,OAAQ,CAAA,CAAC,EAAE,EAAO,KAAA,GAAA,IAC9C,EAAE,OAAQ,CAAA,CAAC,EAAE,EAAO,KAAA,IAAA,IAAQ,EAAE,OAAQ,CAAA,CAAC,EAAE,EAAO,KAAA,IAAA;AAE9C,MAAM,UAAa,GAAA,CAAC,CACzB,KAAA,CAAA,EAAG,EAAO,KAAA;AAEL,MAAM,gBAAmB,GAAA,CAAC,MAC/B,KAAA,mBAAA,CAAoB,MAAM,CAAA,IAC1B,MAAO,CAAA,MAAA,KAAW,KAClB,CAAA,IAAA,MAAA,CAAO,EAAO,KAAA,KAAA,CAAA,IACd,OAAO,KAAU,KAAA,KAAA;AAEZ,SAAS,oBACd,CACwB,EAAA;AACxB,EAAA,OAAO,MAAM,KAAc,CAAA,KAAA,CAAA,CAAE,EAAO,KAAA,KAAA,IAAS,EAAE,EAAO,KAAA,IAAA,CAAA;AACxD;AAEO,MAAM,gBAAmB,GAAA,CAAC,CAC/B,KAAA,OAAQ,EAAqB,eAAoB,KAAA;AAEtC,MAAA,oBAAA,GAAuB,CAClC,OACA,EAAA,EAAE,cAEF,KAAA,OAAA,CAAQ,GAAI,CAAA,CAAC,MAAW,KAAA;AAEtB,EAAA,MAAM,MAAS,GAAA,sBAAA,CAAuB,YAAc,EAAA,MAAA,CAAO,IAAI,CAAA;AAC/D,EAAA,IAAI,WAAW,KAAW,CAAA,EAAA;AACxB,IAAO,OAAA;AAAA,MACL,GAAG,MAAA;AAAA,MACH;AAAA,KACF;AAAA,GACF,MAAA,IAAW,OAAO,MAAQ,EAAA;AACxB,IAAO,OAAA;AAAA,MACL,GAAG,MAAA;AAAA,MACH,MAAQ,EAAA,KAAA;AAAA,KACV;AAAA,GACK,MAAA;AACL,IAAO,OAAA,MAAA;AAAA;AAEX,CAAC;AAEI,MAAM,gBAAmB,GAAA,CAAC,MAC/B,KAAA,MAAA,CAAO,MAAW,KAAA,KAAA;AAEb,MAAM,yBAAyB,CAAC,OAAA,KACrC,OAAQ,CAAA,GAAA,CAAI,CAAC,GAAQ,KAAA;AACnB,EAAA,MAAM,EAAE,MAAA,EAAQ,GAAG,IAAA,EAAS,GAAA,GAAA;AAC5B,EAAA,OAAO,SAAS,IAAO,GAAA,GAAA;AACzB,CAAC;AAEU,MAAA,sBAAA,GAAyB,CACpC,MAAA,EACA,UACG,KAAA;AACH,EAAI,IAAA,mBAAA,CAAoB,MAAM,CAAG,EAAA;AAC/B,IAAO,OAAA,uBAAA,CAAwB,QAAQ,UAAU,CAAA;AAAA;AAEnD,EAAI,IAAA,cAAA,CAAe,MAAM,CAAG,EAAA;AAC1B,IAAO,OAAA,MAAA,CAAO,MAAW,KAAA,UAAA,GAAa,MAAS,GAAA,KAAA,CAAA;AAAA;AAEjD,EAAO,OAAA,KAAA,CAAA;AACT;AAEA,MAAM,uBAAA,GAA0B,CAC9B,MAAA,EACA,UACG,KAAA;AACH,EAAM,MAAA,EAAE,OAAS,EAAA,EAAA,EAAO,GAAA,MAAA;AACxB,EAAA,MAAM,UAAoB,EAAC;AAC3B,EAAQ,OAAA,CAAA,OAAA,CAAQ,CAACA,OAAW,KAAA;AAC1B,IAAM,MAAA,GAAA,GAAM,sBAAuBA,CAAAA,OAAAA,EAAQ,UAAU,CAAA;AACrD,IAAA,IAAI,GAAK,EAAA;AACP,MAAA,OAAA,CAAQ,KAAK,GAAG,CAAA;AAAA;AAClB,GACD,CAAA;AACD,EAAI,IAAA,OAAA,CAAQ,WAAW,CAAG,EAAA;AACxB,IAAO,OAAA,KAAA,CAAA;AAAA,GACT,MAAA,IAAW,OAAQ,CAAA,MAAA,KAAW,CAAG,EAAA;AAC/B,IAAA,OAAO,QAAQ,CAAC,CAAA;AAAA;AAElB,EAAO,OAAA;AAAA,IACL,EAAA;AAAA,IACA,OAAS,EAAA;AAAA,GACX;AACF,CAAA;AAGA,MAAM,mBAAmB,CAAC,KAAA,KACxB,OAAO,KAAA,KAAU,YAAY,iBAAoB,GAAA,KAAA;AAE5C,MAAM,wBAA2B,GAAA,CACtC,MACA,EAAA,QAAA,EACA,MACsB,KAAA;AACtB,EAAI,IAAA,mBAAA,CAAoB,MAAM,CAAG,EAAA;AAC/B,IAAI,IAAA,MAAA,CAAO,MAAW,KAAA,MAAA,CAAO,IAAM,EAAA;AACjC,MAAI,IAAA,QAAA,CAAS,UAAW,CAAA,SAAS,CAAG,EAAA;AAClC,QAAI,IAAA,MAAA,CAAO,OAAO,GAAK,EAAA;AACrB,UAAA,OAAO,CAAC,CAAA,EAAG,MAAO,CAAA,KAAK,IAAI,EAAE,CAAA;AAAA,SAC/B,MAAA,IAAW,MAAO,CAAA,EAAA,KAAO,GAAK,EAAA;AAC5B,UAAA,OAAO,CAAC,EAAA,EAAI,CAAG,EAAA,MAAA,CAAO,KAAK,CAAE,CAAA,CAAA;AAAA;AAC/B,OACK,MAAA;AACL,QAAO,OAAA,gBAAA,CAAiB,OAAO,KAAK,CAAA;AAAA;AACtC;AACF,GACF,MAAA,IAAW,eAAgB,CAAA,MAAM,CAAG,EAAA;AAClC,IAAA,IAAI,OAAO,OAAQ,CAAA,CAAC,CAAE,CAAA,MAAA,KAAW,OAAO,IAAM,EAAA;AAC5C,MAAM,MAAA,CAAC,EAAE,KAAA,EAAO,EAAG,EAAA,EAAG,EAAE,KAAO,EAAA,EAAA,EAAI,CAAA,GAAI,MAAO,CAAA,OAAA;AAC9C,MAAA,OAAO,CAAC,CAAG,EAAA,EAAE,CAAI,CAAA,EAAA,CAAA,EAAG,EAAE,CAAE,CAAA,CAAA;AAAA,KACnB,MAAA;AACL,MAAO,OAAA,CAAC,IAAI,EAAE,CAAA;AAAA;AAChB,GACF,MAAA,IAAW,WAAY,CAAA,MAAM,CAAG,EAAA;AAC9B,IAAM,MAAA,eAAA,GAAkB,OAAO,OAAQ,CAAA,IAAA;AAAA,MAAK,CAAC,CAAA,KAC3C,eAAgB,CAAA,CAAC,IACb,CAAE,CAAA,OAAA,CAAQ,CAAC,CAAA,CAAE,MAAW,KAAA,MAAA,CAAO,IAC/B,GAAA,CAAA,CAAE,WAAW,MAAO,CAAA;AAAA,KAC1B;AACA,IAAI,IAAA,mBAAA,CAAoB,eAAe,CAAG,EAAA;AACxC,MAAO,OAAA,gBAAA,CAAiB,gBAAgB,KAAK,CAAA;AAAA,eAE7C,QAAS,CAAA,UAAA,CAAW,SAAS,CAC7B,IAAA,eAAA,CAAgB,eAAe,CAC/B,EAAA;AACA,MAAM,MAAA,CAAC,EAAE,KAAA,EAAO,EAAG,EAAA,EAAG,EAAE,KAAO,EAAA,EAAA,EAAI,CAAA,GAAI,eAAgB,CAAA,OAAA;AACvD,MAAA,OAAO,CAAC,CAAG,EAAA,EAAE,CAAI,CAAA,EAAA,CAAA,EAAG,EAAE,CAAE,CAAA,CAAA;AAAA;AAC1B;AAEF,EAAI,IAAA,QAAA,CAAS,UAAW,CAAA,SAAS,CAAG,EAAA;AAClC,IAAI,IAAA,MAAA,CAAO,SAAS,MAAQ,EAAA;AAC1B,MAAO,OAAA,CAAC,YAAY,UAAU,CAAA;AAAA,KACzB,MAAA;AACL,MAAO,OAAA,CAAC,IAAI,EAAE,CAAA;AAAA;AAChB,GACK,MAAA;AACL,IAAO,OAAA,EAAA;AAAA;AAEX;AAKA,MAAM,sBAAA,GAAyB,CAAC,EAAA,EAAmB,EAAsB,KAAA;AACvE,EAAA,MAAM,CAAC,KAAA,EAAO,GAAG,CAAA,GAAI,EAAG,CAAA,OAAA;AACxB,EAAA,MAAM,CAAC,KAAA,EAAO,GAAG,CAAA,GAAI,EAAG,CAAA,OAAA;AACxB,EAAA,OAAO,gBAAgB,KAAO,EAAA,KAAK,CAAK,IAAA,eAAA,CAAgB,KAAK,GAAG,CAAA;AAClE,CAAA;AAEA,MAAM,gCAAmC,GAAA,CACvC,EACA,EAAA,EAAA,KACG,GAAG,MAAW,KAAA,EAAA,CAAG,MAAU,IAAA,EAAA,CAAG,EAAO,KAAA,EAAA,CAAG,EAAM,IAAA,EAAA,CAAG,UAAU,EAAG,CAAA,KAAA;AAEnE,MAAM,eACJ,GAAA,CAAC,OAAiC,KAAA,CAAC,MAA8B,KAAA;AAC/D,EAAI,IAAA,eAAA,CAAgB,MAAM,CAAG,EAAA;AAC3B,IAAA,MAAM,SAAS,OAAQ,CAAA,IAAA;AAAA,MACrB,CAAC,CAAM,KAAA,eAAA,CAAgB,CAAC,CAAK,IAAA,sBAAA,CAAuB,GAAG,MAAM;AAAA,KAC/D;AACA,IAAA,OAAO,MAAW,KAAA,KAAA,CAAA;AAAA,GACb,MAAA;AAEL,IAAM,MAAA,MAAA,GAAS,QAAQ,IAAK,CAAA,CAAC,MAAM,CAAE,CAAA,MAAA,KAAW,OAAO,MAAM,CAAA;AAC7D,IAAA,IAAI,MAAQ,EAAA;AACV,MAAA,OAAO,OAAO,EAAO,KAAA,MAAA,CAAO,EAAM,IAAA,MAAA,CAAO,UAAU,MAAO,CAAA,KAAA;AAAA;AAC5D;AAEF,EAAO,OAAA,KAAA;AACT,CAAA;AAEW,MAAA,eAAA,GAAkB,CAC7B,EAAA,EACA,EACY,KAAA;AACZ,EAAA,IAAI,mBAAoB,CAAA,EAAE,CAAK,IAAA,mBAAA,CAAoB,EAAE,CAAG,EAAA;AACtD,IAAO,OAAA,gCAAA,CAAiC,IAAI,EAAE,CAAA;AAAA,aACrC,eAAgB,CAAA,EAAE,CAAK,IAAA,eAAA,CAAgB,EAAE,CAAG,EAAA;AACrD,IAAO,OAAA,sBAAA,CAAuB,IAAI,EAAE,CAAA;AAAA,aAC3B,WAAY,CAAA,EAAE,CAAK,IAAA,WAAA,CAAY,EAAE,CAAG,EAAA;AAC7C,IAAA,IAAI,EAAG,CAAA,OAAA,CAAQ,MAAW,KAAA,EAAA,CAAG,QAAQ,MAAQ,EAAA;AAC3C,MAAA,OAAO,GAAG,OAAQ,CAAA,KAAA,CAAM,eAAgB,CAAA,EAAA,CAAG,OAAO,CAAC,CAAA;AAAA;AACrD;AAGF,EAAO,OAAA,KAAA;AACT;;;;"}

package/esm/packages/vuu-utils/src/filters/filterAsQuery.js

@@ -1,5 +1,5 @@
 import { isDateTimeDataValue } from '../column-utils.js';
-import { isMultiClauseFilter, isMultiValueFilter } from './filter-utils.js';
+import { isMultiClauseFilter, isMultiValueFilter, isSerializableFilter } from './filter-utils.js';
 
 const filterValue = (value) => typeof value === "string" ? `"${value}"` : value;
 const quotedStrings = (value) => typeof value === "string" ? `"${value}"` : value;
@@ -18,14 +18,18 @@ const filterAsQueryCore = (f, opts) => {
   }
 };
 function singleValueFilterAsQuery(f, opts) {
-  const column = opts?.columnsByName?.[f.column];
-  if (column && isDateTimeDataValue(column)) {
-    return dateFilterAsQuery(f);
+  if (isSerializableFilter(f)) {
+    return f.asQuery();
   } else {
-    return defaultSingleValueFilterAsQuery(f);
+    const column = opts?.columnsByName?.[f.column];
+    if (column && isDateTimeDataValue(column)) {
+      return dateFilterAsQuery(f);
+    } else {
+      return defaultSingleValueFilterAsQuery(f);
+    }
   }
 }
-const ONE_DAY_IN_MILIS = 1e3 * 60 * 60 * 24;
+const ONE_DAY_IN_MILLIS = 1e3 * 60 * 60 * 24;
 function dateFilterAsQuery(f) {
   switch (f.op) {
     case "=": {
@@ -34,7 +38,7 @@ function dateFilterAsQuery(f) {
         {
           op: "<",
           column: f.column,
-          value: f.value + ONE_DAY_IN_MILIS
+          value: f.value + ONE_DAY_IN_MILLIS
         }
       ];
       return filterAsQueryCore({ op: "and", filters });
@@ -45,7 +49,7 @@ function dateFilterAsQuery(f) {
         {
           op: ">=",
           column: f.column,
-          value: f.value + ONE_DAY_IN_MILIS
+          value: f.value + ONE_DAY_IN_MILLIS
         }
       ];
       return filterAsQueryCore({ op: "or", filters });
@@ -55,18 +59,6 @@ function dateFilterAsQuery(f) {
   }
 }
 const defaultSingleValueFilterAsQuery = (f) => `${f.column} ${f.op} ${filterValue(f.value)}`;
-const removeColumnFromFilter = (column, filter) => {
-  if (isMultiClauseFilter(filter)) {
-    const [clause1, clause2] = filter.filters;
-    if (clause1.column === column.name) {
-      return [clause2, filterAsQuery(clause2)];
-    }
-    if (clause2.column === column.name) {
-      return [clause1, filterAsQuery(clause1)];
-    }
-  }
-  return [void 0, ""];
-};
 
-export { dateFilterAsQuery, filterAsQuery, removeColumnFromFilter };
+export { ONE_DAY_IN_MILLIS, dateFilterAsQuery, filterAsQuery };
 //# sourceMappingURL=filterAsQuery.js.map

package/esm/packages/vuu-utils/src/filters/filterAsQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"filterAsQuery.js","sources":["../../../../../../../packages/vuu-utils/src/filters/filterAsQuery.ts"],"sourcesContent":["import {\n  ColumnDescriptorsByName,\n  Filter,\n  SingleValueFilterClause,\n} from \"@vuu-ui/vuu-filter-types\";\nimport type { RuntimeColumnDescriptor } from \"@vuu-ui/vuu-table-types\";\nimport { isDateTimeDataValue } from \"../column-utils\";\nimport { isMultiClauseFilter, isMultiValueFilter } from \"./filter-utils\";\n\nconst filterValue = (value: string | number | boolean) =>\n  typeof value === \"string\" ? `\"${value}\"` : value;\n\nconst quotedStrings = (value: string | number | boolean) =>\n  typeof value === \"string\" ? `\"${value}\"` : value;\n\nconst removeOuterMostParentheses = (s: string) => s.replace(/^\\((.*)\\)$/, \"$1\");\n\nexport const filterAsQuery = (\n  f: Filter,\n  opts?: { columnsByName?: ColumnDescriptorsByName },\n): string => {\n  return removeOuterMostParentheses(filterAsQueryCore(f, opts));\n};\n\nconst filterAsQueryCore = (\n  f: Filter,\n  opts?: { columnsByName?: ColumnDescriptorsByName },\n): string => {\n  if (isMultiClauseFilter(f)) {\n    const multiClauseFilter = f.filters\n      .map((filter) => filterAsQueryCore(filter, opts))\n      .join(` ${f.op} `);\n    return `(${multiClauseFilter})`;\n  } else if (isMultiValueFilter(f)) {\n    return `${f.column} ${f.op} [${f.values.map(quotedStrings).join(\",\")}]`;\n  } else {\n    return singleValueFilterAsQuery(f, opts);\n  }\n};\n\nfunction singleValueFilterAsQuery(\n  f: SingleValueFilterClause,\n  opts?: { columnsByName?: ColumnDescriptorsByName },\n): string {\n  const column = opts?.columnsByName?.[f.column];\n  if (column && isDateTimeDataValue(column)) {\n    return dateFilterAsQuery(f as SingleValueFilterClause<number>);\n  } else {\n    return defaultSingleValueFilterAsQuery(f);\n  }\n}\n\nconst ONE_DAY_IN_MILIS = 1000 * 60 * 60 * 24;\nexport function dateFilterAsQuery(f: SingleValueFilterClause<number>): string {\n  switch (f.op) {\n    case \"=\": {\n      const filters: Array<Filter> = [\n        { op: \">=\", column: f.column, value: f.value },\n        {\n          op: \"<\",\n          column: f.column,\n          value: f.value + ONE_DAY_IN_MILIS,\n        },\n      ];\n      return filterAsQueryCore({ op: \"and\", filters });\n    }\n    case \"!=\": {\n      const filters: Array<Filter> = [\n        { op: \"<\", column: f.column, value: f.value },\n        {\n          op: \">=\",\n          column: f.column,\n          value: f.value + ONE_DAY_IN_MILIS,\n        },\n      ];\n      return filterAsQueryCore({ op: \"or\", filters });\n    }\n    default:\n      return defaultSingleValueFilterAsQuery(f);\n  }\n}\n\nconst defaultSingleValueFilterAsQuery = (f: SingleValueFilterClause) =>\n  `${f.column} ${f.op} ${filterValue(f.value)}`;\n\nexport const removeColumnFromFilter = (\n  column: RuntimeColumnDescriptor,\n  filter: Filter,\n): [Filter | undefined, string] => {\n  if (isMultiClauseFilter(filter)) {\n    const [clause1, clause2] = filter.filters;\n    if (clause1.column === column.name) {\n      return [clause2, filterAsQuery(clause2)];\n    }\n    if (clause2.column === column.name) {\n      return [clause1, filterAsQuery(clause1)];\n    }\n  }\n  return [undefined, \"\"];\n};\n"],"names":[],"mappings":";;;AASA,MAAM,WAAA,GAAc,CAAC,KACnB,KAAA,OAAO,UAAU,QAAW,GAAA,CAAA,CAAA,EAAI,KAAK,CAAM,CAAA,CAAA,GAAA,KAAA;AAE7C,MAAM,aAAA,GAAgB,CAAC,KACrB,KAAA,OAAO,UAAU,QAAW,GAAA,CAAA,CAAA,EAAI,KAAK,CAAM,CAAA,CAAA,GAAA,KAAA;AAE7C,MAAM,6BAA6B,CAAC,CAAA,KAAc,CAAE,CAAA,OAAA,CAAQ,cAAc,IAAI,CAAA;AAEjE,MAAA,aAAA,GAAgB,CAC3B,CAAA,EACA,IACW,KAAA;AACX,EAAA,OAAO,0BAA2B,CAAA,iBAAA,CAAkB,CAAG,EAAA,IAAI,CAAC,CAAA;AAC9D;AAEA,MAAM,iBAAA,GAAoB,CACxB,CAAA,EACA,IACW,KAAA;AACX,EAAI,IAAA,mBAAA,CAAoB,CAAC,CAAG,EAAA;AAC1B,IAAA,MAAM,iBAAoB,GAAA,CAAA,CAAE,OACzB,CAAA,GAAA,CAAI,CAAC,MAAW,KAAA,iBAAA,CAAkB,MAAQ,EAAA,IAAI,CAAC,CAC/C,CAAA,IAAA,CAAK,CAAI,CAAA,EAAA,CAAA,CAAE,EAAE,CAAG,CAAA,CAAA,CAAA;AACnB,IAAA,OAAO,IAAI,iBAAiB,CAAA,CAAA,CAAA;AAAA,GAC9B,MAAA,IAAW,kBAAmB,CAAA,CAAC,CAAG,EAAA;AAChC,IAAA,OAAO,CAAG,EAAA,CAAA,CAAE,MAAM,CAAA,CAAA,EAAI,EAAE,EAAE,CAAA,EAAA,EAAK,CAAE,CAAA,MAAA,CAAO,GAAI,CAAA,aAAa,CAAE,CAAA,IAAA,CAAK,GAAG,CAAC,CAAA,CAAA,CAAA;AAAA,GAC/D,MAAA;AACL,IAAO,OAAA,wBAAA,CAAyB,GAAG,IAAI,CAAA;AAAA;AAE3C,CAAA;AAEA,SAAS,wBAAA,CACP,GACA,IACQ,EAAA;AACR,EAAA,MAAM,MAAS,GAAA,IAAA,EAAM,aAAgB,GAAA,CAAA,CAAE,MAAM,CAAA;AAC7C,EAAI,IAAA,MAAA,IAAU,mBAAoB,CAAA,MAAM,CAAG,EAAA;AACzC,IAAA,OAAO,kBAAkB,CAAoC,CAAA;AAAA,GACxD,MAAA;AACL,IAAA,OAAO,gCAAgC,CAAC,CAAA;AAAA;AAE5C;AAEA,MAAM,gBAAA,GAAmB,GAAO,GAAA,EAAA,GAAK,EAAK,GAAA,EAAA;AACnC,SAAS,kBAAkB,CAA4C,EAAA;AAC5E,EAAA,QAAQ,EAAE,EAAI;AAAA,IACZ,KAAK,GAAK,EAAA;AACR,MAAA,MAAM,OAAyB,GAAA;AAAA,QAC7B,EAAE,IAAI,IAAM,EAAA,MAAA,EAAQ,EAAE,MAAQ,EAAA,KAAA,EAAO,EAAE,KAAM,EAAA;AAAA,QAC7C;AAAA,UACE,EAAI,EAAA,GAAA;AAAA,UACJ,QAAQ,CAAE,CAAA,MAAA;AAAA,UACV,KAAA,EAAO,EAAE,KAAQ,GAAA;AAAA;AACnB,OACF;AACA,MAAA,OAAO,iBAAkB,CAAA,EAAE,EAAI,EAAA,KAAA,EAAO,SAAS,CAAA;AAAA;AACjD,IACA,KAAK,IAAM,EAAA;AACT,MAAA,MAAM,OAAyB,GAAA;AAAA,QAC7B,EAAE,IAAI,GAAK,EAAA,MAAA,EAAQ,EAAE,MAAQ,EAAA,KAAA,EAAO,EAAE,KAAM,EAAA;AAAA,QAC5C;AAAA,UACE,EAAI,EAAA,IAAA;AAAA,UACJ,QAAQ,CAAE,CAAA,MAAA;AAAA,UACV,KAAA,EAAO,EAAE,KAAQ,GAAA;AAAA;AACnB,OACF;AACA,MAAA,OAAO,iBAAkB,CAAA,EAAE,EAAI,EAAA,IAAA,EAAM,SAAS,CAAA;AAAA;AAChD,IACA;AACE,MAAA,OAAO,gCAAgC,CAAC,CAAA;AAAA;AAE9C;AAEA,MAAM,+BAAkC,GAAA,CAAC,CACvC,KAAA,CAAA,EAAG,CAAE,CAAA,MAAM,CAAI,CAAA,EAAA,CAAA,CAAE,EAAE,CAAA,CAAA,EAAI,WAAY,CAAA,CAAA,CAAE,KAAK,CAAC,CAAA,CAAA;AAEhC,MAAA,sBAAA,GAAyB,CACpC,MAAA,EACA,MACiC,KAAA;AACjC,EAAI,IAAA,mBAAA,CAAoB,MAAM,CAAG,EAAA;AAC/B,IAAA,MAAM,CAAC,OAAA,EAAS,OAAO,CAAA,GAAI,MAAO,CAAA,OAAA;AAClC,IAAI,IAAA,OAAA,CAAQ,MAAW,KAAA,MAAA,CAAO,IAAM,EAAA;AAClC,MAAA,OAAO,CAAC,OAAA,EAAS,aAAc,CAAA,OAAO,CAAC,CAAA;AAAA;AAEzC,IAAI,IAAA,OAAA,CAAQ,MAAW,KAAA,MAAA,CAAO,IAAM,EAAA;AAClC,MAAA,OAAO,CAAC,OAAA,EAAS,aAAc,CAAA,OAAO,CAAC,CAAA;AAAA;AACzC;AAEF,EAAO,OAAA,CAAC,QAAW,EAAE,CAAA;AACvB;;;;"}
+{"version":3,"file":"filterAsQuery.js","sources":["../../../../../../../packages/vuu-utils/src/filters/filterAsQuery.ts"],"sourcesContent":["import {\n  ColumnDescriptorsByName,\n  Filter,\n  SingleValueFilterClause,\n} from \"@vuu-ui/vuu-filter-types\";\nimport { isDateTimeDataValue } from \"../column-utils\";\nimport {\n  isMultiClauseFilter,\n  isMultiValueFilter,\n  isSerializableFilter,\n} from \"./filter-utils\";\n\nconst filterValue = (value: string | number | boolean) =>\n  typeof value === \"string\" ? `\"${value}\"` : value;\n\nconst quotedStrings = (value: string | number | boolean) =>\n  typeof value === \"string\" ? `\"${value}\"` : value;\n\nconst removeOuterMostParentheses = (s: string) => s.replace(/^\\((.*)\\)$/, \"$1\");\n\nexport const filterAsQuery = (\n  f: Filter,\n  opts?: { columnsByName?: ColumnDescriptorsByName },\n): string => {\n  return removeOuterMostParentheses(filterAsQueryCore(f, opts));\n};\n\nconst filterAsQueryCore = (\n  f: Filter,\n  opts?: { columnsByName?: ColumnDescriptorsByName },\n): string => {\n  if (isMultiClauseFilter(f)) {\n    const multiClauseFilter = f.filters\n      .map((filter) => filterAsQueryCore(filter, opts))\n      .join(` ${f.op} `);\n    return `(${multiClauseFilter})`;\n  } else if (isMultiValueFilter(f)) {\n    return `${f.column} ${f.op} [${f.values.map(quotedStrings).join(\",\")}]`;\n  } else {\n    return singleValueFilterAsQuery(f, opts);\n  }\n};\n\nfunction singleValueFilterAsQuery(\n  f: SingleValueFilterClause,\n  opts?: { columnsByName?: ColumnDescriptorsByName },\n): string {\n  if (isSerializableFilter(f)) {\n    return f.asQuery();\n  } else {\n    const column = opts?.columnsByName?.[f.column];\n    if (column && isDateTimeDataValue(column)) {\n      return dateFilterAsQuery(f as SingleValueFilterClause<number>);\n    } else {\n      return defaultSingleValueFilterAsQuery(f);\n    }\n  }\n}\n\nexport const ONE_DAY_IN_MILLIS = 1000 * 60 * 60 * 24;\nexport function dateFilterAsQuery(f: SingleValueFilterClause<number>): string {\n  switch (f.op) {\n    case \"=\": {\n      const filters: Array<Filter> = [\n        { op: \">=\", column: f.column, value: f.value },\n        {\n          op: \"<\",\n          column: f.column,\n          value: f.value + ONE_DAY_IN_MILLIS,\n        },\n      ];\n      return filterAsQueryCore({ op: \"and\", filters });\n    }\n    case \"!=\": {\n      const filters: Array<Filter> = [\n        { op: \"<\", column: f.column, value: f.value },\n        {\n          op: \">=\",\n          column: f.column,\n          value: f.value + ONE_DAY_IN_MILLIS,\n        },\n      ];\n      return filterAsQueryCore({ op: \"or\", filters });\n    }\n    default:\n      return defaultSingleValueFilterAsQuery(f);\n  }\n}\n\nconst defaultSingleValueFilterAsQuery = (f: SingleValueFilterClause) =>\n  `${f.column} ${f.op} ${filterValue(f.value)}`;\n"],"names":[],"mappings":"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"}

package/esm/packages/vuu-utils/src/form-utils.js

@@ -1,8 +1,8 @@
-import { queryClosest } from './html-utils.js';
 import { stringIsValidDecimal, stringIsValidInt } from './data-utils.js';
 import { isValidTimeString, Time } from './date/date-utils.js';
 import './date/dateTimePattern.js';
 import '@internationalized/date';
+import { queryClosest } from './html-utils.js';
 
 const getFieldName = (target) => {
   const saltFormField = queryClosest(target, "[data-field]");
@@ -14,7 +14,19 @@ const getFieldName = (target) => {
   }
 };
 const isNumber = (type, value) => type === "number";
-function getTypedValue(value, type, throwIfInvalid = false) {
+const isValidRange = ([val1, val2]) => {
+  if (isValidTimeString(val1) && isValidTimeString(val2)) {
+    return val2 > val1;
+  }
+  return true;
+};
+function getTypedRange([value1, value2], dataType, options) {
+  return [
+    getTypedValue(value1, dataType, false, options),
+    getTypedValue(value2, dataType, false, options)
+  ];
+}
+function getTypedValue(value, type, throwIfInvalid = false, options) {
   switch (type) {
     case "int":
     case "long": {
@@ -42,7 +54,11 @@ function getTypedValue(value, type, throwIfInvalid = false) {
       return value === "true" ? true : false;
     case "time":
       if (isValidTimeString(value)) {
-        return +Time(value).asDate();
+        if (options?.type === "TimeString") {
+          return value;
+        } else {
+          return +Time(value).asDate();
+        }
       } else if (throwIfInvalid) {
         throw Error(`value ${value} is not a valid ${type}`);
       } else {
@@ -53,5 +69,5 @@ function getTypedValue(value, type, throwIfInvalid = false) {
   }
 }
 
-export { getFieldName, getTypedValue, isNumber };
+export { getFieldName, getTypedRange, getTypedValue, isNumber, isValidRange };
 //# sourceMappingURL=form-utils.js.map

package/esm/packages/vuu-utils/src/form-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"form-utils.js","sources":["../../../../../../packages/vuu-utils/src/form-utils.ts"],"sourcesContent":["import {\n  VuuColumnDataType,\n  VuuRowDataItemType,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport { KeyboardEvent, SyntheticEvent } from \"react\";\nimport { queryClosest } from \"./html-utils\";\nimport { stringIsValidDecimal, stringIsValidInt } from \"./data-utils\";\nimport { isValidTimeString, Time } from \"./date\";\nimport { DataValueTypeSimple } from \"@vuu-ui/vuu-data-types\";\n\n/**\n * Use with the following convention:\n *\n * <FormField data-field=\"my-field-name\">\n */\nexport const getFieldName = (target: EventTarget | HTMLElement): string => {\n  const saltFormField = queryClosest(target, \"[data-field]\") as HTMLElement;\n  const fieldName = saltFormField?.dataset.field;\n  if (fieldName) {\n    return fieldName;\n  } else {\n    throw Error(\"named form field not found\");\n  }\n};\n\nexport type InputSource = \"typeahead-suggestion\" | \"text-input\";\n\nexport const isNumber = (\n  type: string,\n  value: VuuRowDataItemType,\n): value is number => type === \"number\";\n\nexport type CommitHandler<\n  E extends HTMLElement = HTMLInputElement,\n  T = VuuRowDataItemType,\n> = (\n  evt: SyntheticEvent<E> | KeyboardEvent<E>,\n  value: T,\n  source?: InputSource,\n) => void;\n\n/**\n * Convert a string value to the type appropriate for the associated\n * column or form field. Can be used when processing a string value\n * from an input used for user editing.\n *\n * @param value\n * @param type\n * @param throwIfInvalid\n */\nexport function getTypedValue(\n  value: string,\n  type: VuuColumnDataType | DataValueTypeSimple,\n  throwIfInvalid?: false,\n): VuuRowDataItemType | undefined;\nexport function getTypedValue(\n  value: string,\n  type: VuuColumnDataType | DataValueTypeSimple,\n  throwIfInvalid: true,\n): VuuRowDataItemType;\nexport function getTypedValue(\n  value: string,\n  type: VuuColumnDataType | DataValueTypeSimple,\n  throwIfInvalid = false,\n): VuuRowDataItemType | undefined {\n  switch (type) {\n    case \"int\":\n    case \"long\": {\n      if (stringIsValidInt(value)) {\n        return parseInt(value, 10);\n      } else if (isValidTimeString(value)) {\n        //TOCHECK\n        return value;\n      } else if (throwIfInvalid) {\n        throw Error(`value ${value} is not a valid ${type}`);\n      } else {\n        return undefined;\n      }\n    }\n\n    case \"double\":\n    case \"number\": {\n      if (stringIsValidDecimal(value)) {\n        return parseFloat(value);\n      } else if (throwIfInvalid) {\n        throw Error(`value ${value} is not a valid ${type}`);\n      } else {\n        return undefined;\n      }\n    }\n\n    case \"boolean\":\n      return value === \"true\" ? true : false;\n\n    case \"time\":\n      if (isValidTimeString(value)) {\n        return +Time(value).asDate();\n      } else if (throwIfInvalid) {\n        throw Error(`value ${value} is not a valid ${type}`);\n      } else {\n        return undefined;\n      }\n    default:\n      return value;\n  }\n}\n"],"names":[],"mappings":";;;;;;AAea,MAAA,YAAA,GAAe,CAAC,MAA8C,KAAA;AACzE,EAAM,MAAA,aAAA,GAAgB,YAAa,CAAA,MAAA,EAAQ,cAAc,CAAA;AACzD,EAAM,MAAA,SAAA,GAAY,eAAe,OAAQ,CAAA,KAAA;AACzC,EAAA,IAAI,SAAW,EAAA;AACb,IAAO,OAAA,SAAA;AAAA,GACF,MAAA;AACL,IAAA,MAAM,MAAM,4BAA4B,CAAA;AAAA;AAE5C;AAIO,MAAM,QAAW,GAAA,CACtB,IACA,EAAA,KAAA,KACoB,IAAS,KAAA;AA8BxB,SAAS,aACd,CAAA,KAAA,EACA,IACA,EAAA,cAAA,GAAiB,KACe,EAAA;AAChC,EAAA,QAAQ,IAAM;AAAA,IACZ,KAAK,KAAA;AAAA,IACL,KAAK,MAAQ,EAAA;AACX,MAAI,IAAA,gBAAA,CAAiB,KAAK,CAAG,EAAA;AAC3B,QAAO,OAAA,QAAA,CAAS,OAAO,EAAE,CAAA;AAAA,OAC3B,MAAA,IAAW,iBAAkB,CAAA,KAAK,CAAG,EAAA;AAEnC,QAAO,OAAA,KAAA;AAAA,iBACE,cAAgB,EAAA;AACzB,QAAA,MAAM,KAAM,CAAA,CAAA,MAAA,EAAS,KAAK,CAAA,gBAAA,EAAmB,IAAI,CAAE,CAAA,CAAA;AAAA,OAC9C,MAAA;AACL,QAAO,OAAA,KAAA,CAAA;AAAA;AACT;AACF,IAEA,KAAK,QAAA;AAAA,IACL,KAAK,QAAU,EAAA;AACb,MAAI,IAAA,oBAAA,CAAqB,KAAK,CAAG,EAAA;AAC/B,QAAA,OAAO,WAAW,KAAK,CAAA;AAAA,iBACd,cAAgB,EAAA;AACzB,QAAA,MAAM,KAAM,CAAA,CAAA,MAAA,EAAS,KAAK,CAAA,gBAAA,EAAmB,IAAI,CAAE,CAAA,CAAA;AAAA,OAC9C,MAAA;AACL,QAAO,OAAA,KAAA,CAAA;AAAA;AACT;AACF,IAEA,KAAK,SAAA;AACH,MAAO,OAAA,KAAA,KAAU,SAAS,IAAO,GAAA,KAAA;AAAA,IAEnC,KAAK,MAAA;AACH,MAAI,IAAA,iBAAA,CAAkB,KAAK,CAAG,EAAA;AAC5B,QAAA,OAAO,CAAC,IAAA,CAAK,KAAK,CAAA,CAAE,MAAO,EAAA;AAAA,iBAClB,cAAgB,EAAA;AACzB,QAAA,MAAM,KAAM,CAAA,CAAA,MAAA,EAAS,KAAK,CAAA,gBAAA,EAAmB,IAAI,CAAE,CAAA,CAAA;AAAA,OAC9C,MAAA;AACL,QAAO,OAAA,KAAA,CAAA;AAAA;AACT,IACF;AACE,MAAO,OAAA,KAAA;AAAA;AAEb;;;;"}
+{"version":3,"file":"form-utils.js","sources":["../../../../../../packages/vuu-utils/src/form-utils.ts"],"sourcesContent":["import { DataValueTypeSimple } from \"@vuu-ui/vuu-data-types\";\nimport {\n  VuuColumnDataType,\n  VuuRowDataItemType,\n} from \"@vuu-ui/vuu-protocol-types\";\nimport { KeyboardEvent, SyntheticEvent } from \"react\";\nimport { stringIsValidDecimal, stringIsValidInt } from \"./data-utils\";\nimport { isValidTimeString, Time } from \"./date\";\nimport { queryClosest } from \"./html-utils\";\nimport { ExtendedFilterOptions } from \"@vuu-ui/vuu-filter-types\";\n\n/**\n * Use with the following convention:\n *\n * <FormField data-field=\"my-field-name\">\n */\nexport const getFieldName = (target: EventTarget | HTMLElement): string => {\n  const saltFormField = queryClosest(target, \"[data-field]\") as HTMLElement;\n  const fieldName = saltFormField?.dataset.field;\n  if (fieldName) {\n    return fieldName;\n  } else {\n    throw Error(\"named form field not found\");\n  }\n};\n\nexport type InputSource = \"typeahead-suggestion\" | \"text-input\";\n\nexport const isNumber = (\n  type: string,\n  value: VuuRowDataItemType,\n): value is number => type === \"number\";\n\nexport type CommitHandler<\n  E extends HTMLElement = HTMLInputElement,\n  T = VuuRowDataItemType,\n> = (\n  evt: SyntheticEvent<E> | KeyboardEvent<E>,\n  value: T,\n  source?: InputSource,\n) => void;\n\nexport const isValidRange = <T>([val1, val2]: [T, T]) => {\n  if (isValidTimeString(val1) && isValidTimeString(val2)) {\n    return val2 > val1;\n  }\n  return true;\n};\n\n/**\n * Convert a pair of string values to the type appropriate for the\n * associated column or form field. Can be used when processing a string value\n * from an input used for user editing.\n *\n */\nexport function getTypedRange(\n  [value1, value2]: [string, string],\n  dataType: VuuColumnDataType | DataValueTypeSimple,\n  options?: ExtendedFilterOptions,\n) {\n  return [\n    getTypedValue(value1, dataType, false, options),\n    getTypedValue(value2, dataType, false, options),\n  ];\n}\n\n/**\n * Convert a string value to the type appropriate for the associated\n * column or form field. Can be used when processing a string value\n * from an input used for user editing.\n *\n * @param value\n * @param type\n * @param throwIfInvalid\n */\nexport function getTypedValue(\n  value: string,\n  type: VuuColumnDataType | DataValueTypeSimple,\n  throwIfInvalid?: false,\n  options?: ExtendedFilterOptions,\n): VuuRowDataItemType | undefined;\nexport function getTypedValue(\n  value: string,\n  type: VuuColumnDataType | DataValueTypeSimple,\n  throwIfInvalid: true,\n  options?: ExtendedFilterOptions,\n): VuuRowDataItemType;\nexport function getTypedValue(\n  value: string,\n  type: VuuColumnDataType | DataValueTypeSimple,\n  throwIfInvalid = false,\n  options?: ExtendedFilterOptions,\n): VuuRowDataItemType | undefined {\n  switch (type) {\n    case \"int\":\n    case \"long\": {\n      if (stringIsValidInt(value)) {\n        return parseInt(value, 10);\n      } else if (isValidTimeString(value)) {\n        //TOCHECK\n        return value;\n      } else if (throwIfInvalid) {\n        throw Error(`value ${value} is not a valid ${type}`);\n      } else {\n        return undefined;\n      }\n    }\n\n    case \"double\":\n    case \"number\": {\n      if (stringIsValidDecimal(value)) {\n        return parseFloat(value);\n      } else if (throwIfInvalid) {\n        throw Error(`value ${value} is not a valid ${type}`);\n      } else {\n        return undefined;\n      }\n    }\n\n    case \"boolean\":\n      return value === \"true\" ? true : false;\n\n    case \"time\":\n      if (isValidTimeString(value)) {\n        // We don't manipulate the values of 'extended' filters, the\n        // ExtendedFilter impementation will do that.\n        if (options?.type === \"TimeString\") {\n          return value;\n        } else {\n          return +Time(value).asDate();\n        }\n      } else if (throwIfInvalid) {\n        throw Error(`value ${value} is not a valid ${type}`);\n      } else {\n        return undefined;\n      }\n    default:\n      return value;\n  }\n}\n"],"names":[],"mappings":";;;;;;AAgBa,MAAA,YAAA,GAAe,CAAC,MAA8C,KAAA;AACzE,EAAM,MAAA,aAAA,GAAgB,YAAa,CAAA,MAAA,EAAQ,cAAc,CAAA;AACzD,EAAM,MAAA,SAAA,GAAY,eAAe,OAAQ,CAAA,KAAA;AACzC,EAAA,IAAI,SAAW,EAAA;AACb,IAAO,OAAA,SAAA;AAAA,GACF,MAAA;AACL,IAAA,MAAM,MAAM,4BAA4B,CAAA;AAAA;AAE5C;AAIO,MAAM,QAAW,GAAA,CACtB,IACA,EAAA,KAAA,KACoB,IAAS,KAAA;AAWxB,MAAM,YAAe,GAAA,CAAI,CAAC,IAAA,EAAM,IAAI,CAAc,KAAA;AACvD,EAAA,IAAI,iBAAkB,CAAA,IAAI,CAAK,IAAA,iBAAA,CAAkB,IAAI,CAAG,EAAA;AACtD,IAAA,OAAO,IAAO,GAAA,IAAA;AAAA;AAEhB,EAAO,OAAA,IAAA;AACT;AAQO,SAAS,cACd,CAAC,MAAA,EAAQ,MAAM,CAAA,EACf,UACA,OACA,EAAA;AACA,EAAO,OAAA;AAAA,IACL,aAAc,CAAA,MAAA,EAAQ,QAAU,EAAA,KAAA,EAAO,OAAO,CAAA;AAAA,IAC9C,aAAc,CAAA,MAAA,EAAQ,QAAU,EAAA,KAAA,EAAO,OAAO;AAAA,GAChD;AACF;AAuBO,SAAS,aACd,CAAA,KAAA,EACA,IACA,EAAA,cAAA,GAAiB,OACjB,OACgC,EAAA;AAChC,EAAA,QAAQ,IAAM;AAAA,IACZ,KAAK,KAAA;AAAA,IACL,KAAK,MAAQ,EAAA;AACX,MAAI,IAAA,gBAAA,CAAiB,KAAK,CAAG,EAAA;AAC3B,QAAO,OAAA,QAAA,CAAS,OAAO,EAAE,CAAA;AAAA,OAC3B,MAAA,IAAW,iBAAkB,CAAA,KAAK,CAAG,EAAA;AAEnC,QAAO,OAAA,KAAA;AAAA,iBACE,cAAgB,EAAA;AACzB,QAAA,MAAM,KAAM,CAAA,CAAA,MAAA,EAAS,KAAK,CAAA,gBAAA,EAAmB,IAAI,CAAE,CAAA,CAAA;AAAA,OAC9C,MAAA;AACL,QAAO,OAAA,KAAA,CAAA;AAAA;AACT;AACF,IAEA,KAAK,QAAA;AAAA,IACL,KAAK,QAAU,EAAA;AACb,MAAI,IAAA,oBAAA,CAAqB,KAAK,CAAG,EAAA;AAC/B,QAAA,OAAO,WAAW,KAAK,CAAA;AAAA,iBACd,cAAgB,EAAA;AACzB,QAAA,MAAM,KAAM,CAAA,CAAA,MAAA,EAAS,KAAK,CAAA,gBAAA,EAAmB,IAAI,CAAE,CAAA,CAAA;AAAA,OAC9C,MAAA;AACL,QAAO,OAAA,KAAA,CAAA;AAAA;AACT;AACF,IAEA,KAAK,SAAA;AACH,MAAO,OAAA,KAAA,KAAU,SAAS,IAAO,GAAA,KAAA;AAAA,IAEnC,KAAK,MAAA;AACH,MAAI,IAAA,iBAAA,CAAkB,KAAK,CAAG,EAAA;AAG5B,QAAI,IAAA,OAAA,EAAS,SAAS,YAAc,EAAA;AAClC,UAAO,OAAA,KAAA;AAAA,SACF,MAAA;AACL,UAAA,OAAO,CAAC,IAAA,CAAK,KAAK,CAAA,CAAE,MAAO,EAAA;AAAA;AAC7B,iBACS,cAAgB,EAAA;AACzB,QAAA,MAAM,KAAM,CAAA,CAAA,MAAA,EAAS,KAAK,CAAA,gBAAA,EAAmB,IAAI,CAAE,CAAA,CAAA;AAAA,OAC9C,MAAA;AACL,QAAO,OAAA,KAAA,CAAA;AAAA;AACT,IACF;AACE,MAAO,OAAA,KAAA;AAAA;AAEb;;;;"}

package/esm/packages/vuu-utils/src/index.js

@@ -21,12 +21,12 @@ export { dateTimePattern, defaultPatternsByType, fallbackDateTimePattern } from
 export { formatDate, getDateFormatter } from './date/formatter.js';
 export { dateTimeLabelByType, isDatePattern, isDateTimePattern, isTimePattern, supportedDateTimePatterns } from './date/types.js';
 export { RangeMonitor } from './debug-utils.js';
-export { FilterAggregator, applyFilterToColumns, extractFilterForColumn, filtersAreEqual, getColumnValueFromFilter, isAndFilter, isBetweenFilter, isCompleteFilter, isFilterClause, isFilteredColumn, isInFilter, isMultiClauseFilter, isMultiValueFilter, isNamedFilter, isOrFilter, isSingleValueFilter, isValidFilterClauseOp, stripFilterFromColumns } from './filters/filter-utils.js';
-export { dateFilterAsQuery, filterAsQuery, removeColumnFromFilter } from './filters/filterAsQuery.js';
+export { applyFilterToColumns, extractFilterForColumn, filtersAreEqual, getColumnValueFromFilter, isAndFilter, isBetweenFilter, isBetweenOperator, isCompleteFilter, isExtendedFilter, isFilterClause, isFilteredColumn, isInFilter, isMultiClauseFilter, isMultiValueFilter, isNamedFilter, isOrFilter, isSerializableFilter, isSingleValueFilter, isValidFilterClauseOp, stripFilterFromColumns } from './filters/filter-utils.js';
+export { ONE_DAY_IN_MILLIS, dateFilterAsQuery, filterAsQuery } from './filters/filterAsQuery.js';
 export { createEl, dispatchCustomEvent, dispatchKeyboardEvent, dispatchMouseEvent, focusFirstFocusableElement, getClosest, getClosestIndexItem, getElementByDataIndex, getElementDataIndex, getFocusableElement, getScrollbarSize, hasOpenOptionList, isDateInput, isInputElement, isSelectableElement, queryClosest } from './html-utils.js';
 export { EventEmitter } from './event-emitter.js';
 export { assertComponentRegistered, assertComponentsRegistered, byModule, env, featureFromJson, getCustomAndTableFeatures, getFilterTableFeatures, hasFilterTableFeatureProps, isCustomFeature, isSameTable, isStaticFeatures, isVuuTables, isWildcardSchema } from './feature-utils.js';
-export { getFieldName, getTypedValue, isNumber } from './form-utils.js';
+export { getFieldName, getTypedRange, getTypedValue, isNumber, isValidRange } from './form-utils.js';
 export { defaultValueFormatter, getValueFormatter, lowerCase, numericFormatter } from './formatting-utils.js';
 export { getUniqueId } from './getUniqueId.js';
 export { addGroupColumn, getGroupStatus, removeGroupColumn } from './group-utils.js';

package/esm/packages/vuu-utils/src/range-utils.js

@@ -8,63 +8,24 @@ var __accessCheck = (obj, member, msg) => member.has(obj) || __typeError("Cannot
 var __privateGet = (obj, member, getter) => (__accessCheck(obj, member, "read from private field"), getter ? getter.call(obj) : member.get(obj));
 var __privateAdd = (obj, member, value) => member.has(obj) ? __typeError("Cannot add the same private member more than once") : member instanceof WeakSet ? member.add(obj) : member.set(obj, value);
 var __privateSet = (obj, member, value, setter) => (__accessCheck(obj, member, "write to private field"), member.set(obj, value), value);
-var _baseFrom, _renderBufferSize, _rowCount, _baseTo;
-const defaultRangeOptions = {
-  renderBufferSize: 0,
-  rowCount: -1
-};
+var _baseFrom, _renderBufferSize, _baseTo;
 const _RangeImpl = class _RangeImpl {
   // We have to keep from and to as simple public properties (not getters) so they survive structuredClone
-  constructor(from, to, rangeOptions = defaultRangeOptions) {
+  constructor(from, to, renderBufferSize = 0) {
     this.from = from;
     this.to = to;
     __privateAdd(this, _baseFrom);
     __privateAdd(this, _renderBufferSize, 0);
-    __privateAdd(this, _rowCount, -1);
     __privateAdd(this, _baseTo);
     __privateSet(this, _baseFrom, from);
     __privateSet(this, _baseTo, to);
-    this.renderBufferSize = rangeOptions.renderBufferSize ?? defaultRangeOptions.renderBufferSize;
-    this.rowCount = rangeOptions.rowCount ?? defaultRangeOptions.rowCount;
-  }
-  get firstRowInViewport() {
-    return __privateGet(this, _baseFrom) + 1;
-  }
-  get lastRowInViewport() {
-    if (__privateGet(this, _rowCount) > 0) {
-      return Math.min(__privateGet(this, _baseTo), __privateGet(this, _rowCount));
-    } else {
-      return __privateGet(this, _baseTo);
-    }
-  }
-  get renderBufferSize() {
-    return __privateGet(this, _renderBufferSize);
-  }
-  set renderBufferSize(value) {
-    __privateSet(this, _renderBufferSize, value);
-    this.from = Math.max(0, __privateGet(this, _baseFrom) - value);
-    if (__privateGet(this, _rowCount) > 0) {
-      this.to = Math.max(__privateGet(this, _baseTo) + __privateGet(this, _renderBufferSize), __privateGet(this, _rowCount));
-    } else {
-      this.to = __privateGet(this, _baseTo) + __privateGet(this, _renderBufferSize);
-    }
-  }
-  get rowCount() {
-    return __privateGet(this, _rowCount);
-  }
-  set rowCount(value) {
-    __privateSet(this, _rowCount, value);
-    if (value > 0) {
-      this.to = Math.min(__privateGet(this, _baseTo) + __privateGet(this, _renderBufferSize), value);
-    } else {
-      this.to = __privateGet(this, _baseTo) + __privateGet(this, _renderBufferSize);
-    }
+    __privateSet(this, _renderBufferSize, renderBufferSize);
   }
   get reset() {
-    return new _RangeImpl(0, __privateGet(this, _baseTo) - __privateGet(this, _baseFrom), {
-      rowCount: __privateGet(this, _rowCount),
-      renderBufferSize: __privateGet(this, _renderBufferSize)
-    });
+    return new _RangeImpl(0, __privateGet(this, _baseTo) - __privateGet(this, _baseFrom));
+  }
+  get withBuffer() {
+    return getFullRange(this, __privateGet(this, _renderBufferSize));
   }
   equals(range) {
     return range.from === __privateGet(this, _baseFrom) && range.to === __privateGet(this, _baseTo);
@@ -75,17 +36,15 @@ const _RangeImpl = class _RangeImpl {
       to: this.to,
       baseFrom: __privateGet(this, _baseFrom),
       baseTo: __privateGet(this, _baseTo),
-      renderBufferSize: __privateGet(this, _renderBufferSize),
-      rowCount: __privateGet(this, _rowCount)
+      renderBufferSize: __privateGet(this, _renderBufferSize)
     };
   }
 };
 _baseFrom = new WeakMap();
 _renderBufferSize = new WeakMap();
-_rowCount = new WeakMap();
 _baseTo = new WeakMap();
 let RangeImpl = _RangeImpl;
-const Range = (from, to, rangeOptions) => new RangeImpl(from, to, rangeOptions);
+const Range = (from, to, renderBufferSize) => new RangeImpl(from, to, renderBufferSize);
 const NULL_RANGE = Range(0, 0);
 function getFullRange({ from, to }, bufferSize = 0, totalRowCount = Number.MAX_SAFE_INTEGER) {
   if (from === 0 && to === 0) {

package/esm/packages/vuu-utils/src/range-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"range-utils.js","sources":["../../../../../../packages/vuu-utils/src/range-utils.ts"],"sourcesContent":["import { VuuRange } from \"@vuu-ui/vuu-protocol-types\";\n\ninterface FromToRange {\n  from: number;\n  to: number;\n}\n\nexport interface Range extends VuuRange {\n  equals: (vuuRange: VuuRange) => boolean;\n  firstRowInViewport: number;\n  lastRowInViewport: number;\n  renderBufferSize?: number;\n  reset: Range;\n  rowCount?: number;\n}\n\nexport interface RangeOptions {\n  renderBufferSize?: number;\n  rowCount?: number;\n}\n\nconst defaultRangeOptions = {\n  renderBufferSize: 0,\n  rowCount: -1,\n};\nclass RangeImpl implements Range {\n  #baseFrom: number;\n  #renderBufferSize = 0;\n  #rowCount = -1;\n  #baseTo: number;\n\n  // We have to keep from and to as simple public properties (not getters) so they survive structuredClone\n  constructor(\n    /** Index position of first visible row in viewport */\n    public from: number,\n    /** Index position of last visible row in viewport + 1 */\n    public to: number,\n    rangeOptions: RangeOptions = defaultRangeOptions,\n  ) {\n    this.#baseFrom = from;\n    this.#baseTo = to;\n    this.renderBufferSize =\n      rangeOptions.renderBufferSize ?? defaultRangeOptions.renderBufferSize;\n    this.rowCount = rangeOptions.rowCount ?? defaultRangeOptions.rowCount;\n  }\n\n  get firstRowInViewport() {\n    return this.#baseFrom + 1;\n  }\n\n  get lastRowInViewport() {\n    if (this.#rowCount > 0) {\n      return Math.min(this.#baseTo, this.#rowCount);\n    } else {\n      return this.#baseTo;\n    }\n  }\n\n  get renderBufferSize() {\n    return this.#renderBufferSize;\n  }\n\n  set renderBufferSize(value: number) {\n    this.#renderBufferSize = value;\n    this.from = Math.max(0, this.#baseFrom - value);\n    if (this.#rowCount > 0) {\n      this.to = Math.max(this.#baseTo + this.#renderBufferSize, this.#rowCount);\n    } else {\n      this.to = this.#baseTo + this.#renderBufferSize;\n    }\n  }\n\n  get rowCount() {\n    return this.#rowCount;\n  }\n\n  set rowCount(value: number) {\n    this.#rowCount = value;\n    if (value > 0) {\n      this.to = Math.min(this.#baseTo + this.#renderBufferSize, value);\n    } else {\n      this.to = this.#baseTo + this.#renderBufferSize;\n    }\n  }\n\n  get reset() {\n    return new RangeImpl(0, this.#baseTo - this.#baseFrom, {\n      rowCount: this.#rowCount,\n      renderBufferSize: this.#renderBufferSize,\n    });\n  }\n\n  equals(range: VuuRange) {\n    return range.from === this.#baseFrom && range.to === this.#baseTo;\n  }\n\n  toJson() {\n    return {\n      from: this.from,\n      to: this.to,\n      baseFrom: this.#baseFrom,\n      baseTo: this.#baseTo,\n      renderBufferSize: this.#renderBufferSize,\n      rowCount: this.#rowCount,\n    };\n  }\n}\n\nexport const Range = (\n  from: number,\n  to: number,\n  rangeOptions?: RangeOptions,\n): Range => new RangeImpl(from, to, rangeOptions);\n\nexport const NULL_RANGE = Range(0, 0);\n\nexport function getFullRange(\n  { from, to }: VuuRange,\n  bufferSize = 0,\n  totalRowCount: number = Number.MAX_SAFE_INTEGER,\n): FromToRange {\n  if (from === 0 && to === 0) {\n    return { from, to };\n  } else if (bufferSize === 0) {\n    if (totalRowCount < from) {\n      return { from: 0, to: 0 };\n    } else {\n      return { from, to: Math.min(to, totalRowCount) };\n    }\n  } else if (from === 0) {\n    return { from, to: Math.min(to + bufferSize, totalRowCount) };\n  } else {\n    const shortfallBefore = from - bufferSize < 0;\n    const shortfallAfter = totalRowCount - (to + bufferSize) < 0;\n    if (shortfallBefore && shortfallAfter) {\n      return { from: 0, to: totalRowCount };\n    } else if (shortfallBefore) {\n      return { from: 0, to: to + bufferSize };\n    } else if (shortfallAfter) {\n      return {\n        from: Math.max(0, from - bufferSize),\n        to: totalRowCount,\n      };\n    } else {\n      return { from: from - bufferSize, to: to + bufferSize };\n    }\n  }\n}\n\nexport const withinRange = (value: number, { from, to }: VuuRange) =>\n  value >= from && value < to;\n\nexport const rangeNewItems = (\n  { from: from1, to: to1 }: VuuRange,\n  newRange: VuuRange,\n): VuuRange => {\n  const { from: from2, to: to2 } = newRange;\n  const noOverlap = from2 >= to1 || to2 <= from1;\n  const newFullySubsumesOld = from2 < from1 && to2 > to1;\n  return noOverlap || newFullySubsumesOld\n    ? newRange\n    : to2 > to1\n      ? { from: to1, to: to2 }\n      : { from: from2, to: from1 };\n};\n\nexport class WindowRange {\n  public from: number;\n  public to: number;\n\n  constructor(from: number, to: number) {\n    this.from = from;\n    this.to = to;\n  }\n\n  public isWithin(index: number) {\n    return withinRange(index, this);\n  }\n\n  //find the overlap of this range and a new one\n  public overlap(from: number, to: number): [number, number] {\n    return from >= this.to || to < this.from\n      ? [0, 0]\n      : [Math.max(from, this.from), Math.min(to, this.to)];\n  }\n\n  public copy(): WindowRange {\n    return new WindowRange(this.from, this.to);\n  }\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"range-utils.js","sources":["../../../../../../packages/vuu-utils/src/range-utils.ts"],"sourcesContent":["import { VuuRange } from \"@vuu-ui/vuu-protocol-types\";\n\ninterface FromToRange {\n  from: number;\n  to: number;\n}\n\nexport interface Range extends VuuRange {\n  equals: (vuuRange: VuuRange) => boolean;\n  reset: Range;\n  withBuffer: VuuRange;\n}\n\nexport interface RangeOptions {\n  renderBufferSize?: number;\n  rowCount?: number;\n}\n\nclass RangeImpl implements Range {\n  #baseFrom: number;\n  #renderBufferSize = 0;\n  #baseTo: number;\n\n  // We have to keep from and to as simple public properties (not getters) so they survive structuredClone\n  constructor(\n    /** Index position of first visible row in viewport */\n    public from: number,\n    /** Index position of last visible row in viewport + 1 */\n    public to: number,\n    renderBufferSize = 0,\n  ) {\n    this.#baseFrom = from;\n    this.#baseTo = to;\n    this.#renderBufferSize = renderBufferSize;\n  }\n\n  get reset() {\n    return new RangeImpl(0, this.#baseTo - this.#baseFrom);\n  }\n\n  get withBuffer() {\n    return getFullRange(this, this.#renderBufferSize);\n  }\n\n  equals(range: VuuRange) {\n    return range.from === this.#baseFrom && range.to === this.#baseTo;\n  }\n\n  toJson() {\n    return {\n      from: this.from,\n      to: this.to,\n      baseFrom: this.#baseFrom,\n      baseTo: this.#baseTo,\n      renderBufferSize: this.#renderBufferSize,\n    };\n  }\n}\n\nexport const Range = (\n  from: number,\n  to: number,\n  renderBufferSize?: number,\n): Range => new RangeImpl(from, to, renderBufferSize);\n\nexport const NULL_RANGE = Range(0, 0);\n\nexport function getFullRange(\n  { from, to }: VuuRange,\n  bufferSize = 0,\n  totalRowCount: number = Number.MAX_SAFE_INTEGER,\n): FromToRange {\n  if (from === 0 && to === 0) {\n    return { from, to };\n  } else if (bufferSize === 0) {\n    if (totalRowCount < from) {\n      return { from: 0, to: 0 };\n    } else {\n      return { from, to: Math.min(to, totalRowCount) };\n    }\n  } else if (from === 0) {\n    return { from, to: Math.min(to + bufferSize, totalRowCount) };\n  } else {\n    const shortfallBefore = from - bufferSize < 0;\n    const shortfallAfter = totalRowCount - (to + bufferSize) < 0;\n    if (shortfallBefore && shortfallAfter) {\n      return { from: 0, to: totalRowCount };\n    } else if (shortfallBefore) {\n      return { from: 0, to: to + bufferSize };\n    } else if (shortfallAfter) {\n      return {\n        from: Math.max(0, from - bufferSize),\n        to: totalRowCount,\n      };\n    } else {\n      return { from: from - bufferSize, to: to + bufferSize };\n    }\n  }\n}\n\nexport const withinRange = (value: number, { from, to }: VuuRange) =>\n  value >= from && value < to;\n\nexport const rangeNewItems = (\n  { from: from1, to: to1 }: VuuRange,\n  newRange: VuuRange,\n): VuuRange => {\n  const { from: from2, to: to2 } = newRange;\n  const noOverlap = from2 >= to1 || to2 <= from1;\n  const newFullySubsumesOld = from2 < from1 && to2 > to1;\n  return noOverlap || newFullySubsumesOld\n    ? newRange\n    : to2 > to1\n      ? { from: to1, to: to2 }\n      : { from: from2, to: from1 };\n};\n\nexport class WindowRange {\n  public from: number;\n  public to: number;\n\n  constructor(from: number, to: number) {\n    this.from = from;\n    this.to = to;\n  }\n\n  public isWithin(index: number) {\n    return withinRange(index, this);\n  }\n\n  //find the overlap of this range and a new one\n  public overlap(from: number, to: number): [number, number] {\n    return from >= this.to || to < this.from\n      ? [0, 0]\n      : [Math.max(from, this.from), Math.min(to, this.to)];\n  }\n\n  public copy(): WindowRange {\n    return new WindowRange(this.from, this.to);\n  }\n}\n"],"names":[],"mappings":"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"}

package/package.json

@@ -1,17 +1,17 @@
 {
-  "version": "0.13.78",
+  "version": "0.13.79",
   "author": "heswell",
   "license": "Apache-2.0",
   "types": "types/index.d.ts",
   "devDependencies": {
-    "@vuu-ui/vuu-data-types": "0.13.78",
-    "@vuu-ui/vuu-table-types": "0.13.78",
-    "@vuu-ui/vuu-filter-types": "0.13.78",
-    "@vuu-ui/vuu-protocol-types": "0.13.78"
+    "@vuu-ui/vuu-data-types": "0.13.79",
+    "@vuu-ui/vuu-table-types": "0.13.79",
+    "@vuu-ui/vuu-filter-types": "0.13.79",
+    "@vuu-ui/vuu-protocol-types": "0.13.79"
   },
   "peerDependencies": {
     "@internationalized/date": "^3.0.0",
-    "@vuu-ui/vuu-filter-parser": "0.13.78",
+    "@vuu-ui/vuu-filter-parser": "0.13.79",
     "clsx": "^2.0.0",
     "react": "^19.1.0",
     "react-dom": "^19.1.0"

package/types/Clock.d.ts

@@ -7,12 +7,12 @@ export interface ClockProps {
     seconds?: number;
     milliseconds?: number;
 }
-export type TimeUnit = "minutes" | "seconds" | "ms";
+export type ClockTimeUnit = "minutes" | "seconds" | "ms";
 export declare class Clock {
     #private;
     constructor(props?: ClockProps);
-    goBack(value: number, units?: TimeUnit): this;
-    advance(value: number, units?: TimeUnit): this;
+    goBack(value: number, units?: ClockTimeUnit): this;
+    advance(value: number, units?: ClockTimeUnit): this;
     set showCurrentTime(value: boolean);
     toString(): string;
     get now(): number;