@vuu-ui/vuu-utils 0.13.116 → 0.13.117

package/cjs/packages/vuu-utils/src/PageVisibilityObserver.js

@@ -18,6 +18,7 @@ class PageVisibilityObserver extends eventEmitter.EventEmitter {
   constructor({
     inactiveTimeout = 0,
     onHidden,
+    onInactiveTimeout,
     onVisibilityChange,
     onVisible
   } = defaultProps) {
@@ -30,6 +31,9 @@ class PageVisibilityObserver extends eventEmitter.EventEmitter {
     });
     __privateSet(this, _hidden, document.hidden);
     __privateSet(this, _inactiveTimeoutMs, inactiveTimeout * 1e3);
+    if (onInactiveTimeout) {
+      this.on("inactive-timeout", onInactiveTimeout);
+    }
     if (onHidden) {
       this.on("hidden", onHidden);
     }

package/cjs/packages/vuu-utils/src/PageVisibilityObserver.js.map

@@ -1 +1 @@
-{"version":3,"file":"PageVisibilityObserver.js","sources":["../../../../../../packages/vuu-utils/src/PageVisibilityObserver.ts"],"sourcesContent":["import { EventEmitter } from \"./event-emitter\";\n\nexport type PageVisibilityEvents = {\n  /**\n   * emits when page has been hidden for this period of time\n   */\n  \"inactive-timeout\": () => void;\n  /**\n   * emits when page is hidden\n   */\n  hidden: () => void;\n  /**\n   * emits when page is made visible\n   */\n  visible: () => void;\n  /**\n   * emits when page visibility status changes\n   */\n  visibilityChange: (hidden: boolean) => void;\n};\n\nexport interface PageVisibilityObserverConstructorProps {\n  /**\n   * timeout period in seconds. Defaults to zero which will never timeout\n   */\n  inactiveTimeout?: number;\n  onHidden?: () => void;\n  onVisible?: () => void;\n  onVisibilityChange?: () => void;\n}\n\nconst defaultProps: PageVisibilityObserverConstructorProps = {};\n\nexport class PageVisibilityObserver extends EventEmitter<PageVisibilityEvents> {\n  #inactiveTimeoutMs?: number;\n  #inactivityTimer?: ReturnType<typeof setTimeout>;\n  #hidden: boolean;\n\n  visibilityChangeHandler = () => {\n    this.hidden = document.hidden;\n  };\n\n  constructor({\n    inactiveTimeout = 0,\n    onHidden,\n    onVisibilityChange,\n    onVisible,\n  } = defaultProps) {\n    super();\n\n    this.#hidden = document.hidden;\n    this.#inactiveTimeoutMs = inactiveTimeout * 1000;\n\n    if (onHidden) {\n      this.on(\"hidden\", onHidden);\n    }\n    if (onVisible) {\n      this.on(\"visible\", onVisible);\n    }\n    if (onVisibilityChange) {\n      this.on(\"visibilityChange\", onVisibilityChange);\n    }\n\n    document.addEventListener(\"visibilitychange\", this.visibilityChangeHandler);\n  }\n\n  clear() {\n    document.removeEventListener(\n      \"visibilitychange\",\n      this.visibilityChangeHandler,\n    );\n  }\n\n  private set hidden(hidden: boolean) {\n    if (hidden !== this.#hidden) {\n      this.#hidden = hidden;\n      if (document.hidden) {\n        this.emit(\"hidden\");\n        if (this.#inactiveTimeoutMs) {\n          this.#inactivityTimer = setTimeout(() => {\n            this.emit(\"inactive-timeout\");\n          }, this.#inactiveTimeoutMs);\n        }\n      } else {\n        this.emit(\"visible\");\n        if (this.#inactivityTimer) {\n          clearTimeout(this.#inactivityTimer);\n          this.#inactivityTimer = undefined;\n        }\n      }\n      this.emit(\"visibilityChange\", hidden);\n    }\n  }\n}\n"],"names":["EventEmitter"],"mappings":";;;;;;;;;;;;;;AAAA,IAAA,kBAAA,EAAA,gBAAA,EAAA,OAAA;AA+BA,MAAM,eAAuD,EAAC;AAEvD,MAAM,+BAA+BA,yBAAmC,CAAA;AAAA,EAS7E,WAAY,CAAA;AAAA,IACV,eAAkB,GAAA,CAAA;AAAA,IAClB,QAAA;AAAA,IACA,kBAAA;AAAA,IACA;AAAA,MACE,YAAc,EAAA;AAChB,IAAM,KAAA,EAAA;AAdR,IAAA,YAAA,CAAA,IAAA,EAAA,kBAAA,CAAA;AACA,IAAA,YAAA,CAAA,IAAA,EAAA,gBAAA,CAAA;AACA,IAAA,YAAA,CAAA,IAAA,EAAA,OAAA,CAAA;AAEA,IAAA,aAAA,CAAA,IAAA,EAAA,yBAAA,EAA0B,MAAM;AAC9B,MAAA,IAAA,CAAK,SAAS,QAAS,CAAA,MAAA;AAAA,KACzB,CAAA;AAUE,IAAA,YAAA,CAAA,IAAA,EAAK,SAAU,QAAS,CAAA,MAAA,CAAA;AACxB,IAAA,YAAA,CAAA,IAAA,EAAK,oBAAqB,eAAkB,GAAA,GAAA,CAAA;AAE5C,IAAA,IAAI,QAAU,EAAA;AACZ,MAAK,IAAA,CAAA,EAAA,CAAG,UAAU,QAAQ,CAAA;AAAA;AAE5B,IAAA,IAAI,SAAW,EAAA;AACb,MAAK,IAAA,CAAA,EAAA,CAAG,WAAW,SAAS,CAAA;AAAA;AAE9B,IAAA,IAAI,kBAAoB,EAAA;AACtB,MAAK,IAAA,CAAA,EAAA,CAAG,oBAAoB,kBAAkB,CAAA;AAAA;AAGhD,IAAS,QAAA,CAAA,gBAAA,CAAiB,kBAAoB,EAAA,IAAA,CAAK,uBAAuB,CAAA;AAAA;AAC5E,EAEA,KAAQ,GAAA;AACN,IAAS,QAAA,CAAA,mBAAA;AAAA,MACP,kBAAA;AAAA,MACA,IAAK,CAAA;AAAA,KACP;AAAA;AACF,EAEA,IAAY,OAAO,MAAiB,EAAA;AAClC,IAAI,IAAA,MAAA,KAAW,mBAAK,OAAS,CAAA,EAAA;AAC3B,MAAA,YAAA,CAAA,IAAA,EAAK,OAAU,EAAA,MAAA,CAAA;AACf,MAAA,IAAI,SAAS,MAAQ,EAAA;AACnB,QAAA,IAAA,CAAK,KAAK,QAAQ,CAAA;AAClB,QAAA,IAAI,mBAAK,kBAAoB,CAAA,EAAA;AAC3B,UAAK,YAAA,CAAA,IAAA,EAAA,gBAAA,EAAmB,WAAW,MAAM;AACvC,YAAA,IAAA,CAAK,KAAK,kBAAkB,CAAA;AAAA,WAC9B,EAAG,mBAAK,kBAAkB,CAAA,CAAA,CAAA;AAAA;AAC5B,OACK,MAAA;AACL,QAAA,IAAA,CAAK,KAAK,SAAS,CAAA;AACnB,QAAA,IAAI,mBAAK,gBAAkB,CAAA,EAAA;AACzB,UAAA,YAAA,CAAa,mBAAK,gBAAgB,CAAA,CAAA;AAClC,UAAA,YAAA,CAAA,IAAA,EAAK,gBAAmB,EAAA,KAAA,CAAA,CAAA;AAAA;AAC1B;AAEF,MAAK,IAAA,CAAA,IAAA,CAAK,oBAAoB,MAAM,CAAA;AAAA;AACtC;AAEJ;AA3DE,kBAAA,GAAA,IAAA,OAAA,EAAA;AACA,gBAAA,GAAA,IAAA,OAAA,EAAA;AACA,OAAA,GAAA,IAAA,OAAA,EAAA;;;;"}
+{"version":3,"file":"PageVisibilityObserver.js","sources":["../../../../../../packages/vuu-utils/src/PageVisibilityObserver.ts"],"sourcesContent":["import { EventEmitter } from \"./event-emitter\";\n\nexport type PageVisibilityEvents = {\n  /**\n   * emits when page has been hidden for this period of time\n   */\n  \"inactive-timeout\": () => void;\n  /**\n   * emits when page is hidden\n   */\n  hidden: () => void;\n  /**\n   * emits when page is made visible\n   */\n  visible: () => void;\n  /**\n   * emits when page visibility status changes\n   */\n  visibilityChange: (hidden: boolean) => void;\n};\n\nexport interface PageVisibilityObserverConstructorProps {\n  /**\n   * timeout period in seconds. Defaults to zero which will never timeout\n   */\n  inactiveTimeout?: number;\n  onHidden?: () => void;\n  onInactiveTimeout?: () => void;\n  onVisible?: () => void;\n  onVisibilityChange?: () => void;\n}\n\nconst defaultProps: PageVisibilityObserverConstructorProps = {};\n\nexport class PageVisibilityObserver extends EventEmitter<PageVisibilityEvents> {\n  #inactiveTimeoutMs?: number;\n  #inactivityTimer?: ReturnType<typeof setTimeout>;\n  #hidden: boolean;\n\n  visibilityChangeHandler = () => {\n    this.hidden = document.hidden;\n  };\n\n  constructor({\n    inactiveTimeout = 0,\n    onHidden,\n    onInactiveTimeout,\n    onVisibilityChange,\n    onVisible,\n  } = defaultProps) {\n    super();\n\n    this.#hidden = document.hidden;\n    this.#inactiveTimeoutMs = inactiveTimeout * 1000;\n\n    if (onInactiveTimeout) {\n      this.on(\"inactive-timeout\", onInactiveTimeout);\n    }\n\n    if (onHidden) {\n      this.on(\"hidden\", onHidden);\n    }\n    if (onVisible) {\n      this.on(\"visible\", onVisible);\n    }\n    if (onVisibilityChange) {\n      this.on(\"visibilityChange\", onVisibilityChange);\n    }\n\n    document.addEventListener(\"visibilitychange\", this.visibilityChangeHandler);\n  }\n\n  clear() {\n    document.removeEventListener(\n      \"visibilitychange\",\n      this.visibilityChangeHandler,\n    );\n  }\n\n  private set hidden(hidden: boolean) {\n    if (hidden !== this.#hidden) {\n      this.#hidden = hidden;\n      if (document.hidden) {\n        this.emit(\"hidden\");\n        if (this.#inactiveTimeoutMs) {\n          this.#inactivityTimer = setTimeout(() => {\n            this.emit(\"inactive-timeout\");\n          }, this.#inactiveTimeoutMs);\n        }\n      } else {\n        this.emit(\"visible\");\n        if (this.#inactivityTimer) {\n          clearTimeout(this.#inactivityTimer);\n          this.#inactivityTimer = undefined;\n        }\n      }\n      this.emit(\"visibilityChange\", hidden);\n    }\n  }\n}\n"],"names":["EventEmitter"],"mappings":";;;;;;;;;;;;;;AAAA,IAAA,kBAAA,EAAA,gBAAA,EAAA,OAAA;AAgCA,MAAM,eAAuD,EAAC;AAEvD,MAAM,+BAA+BA,yBAAmC,CAAA;AAAA,EAS7E,WAAY,CAAA;AAAA,IACV,eAAkB,GAAA,CAAA;AAAA,IAClB,QAAA;AAAA,IACA,iBAAA;AAAA,IACA,kBAAA;AAAA,IACA;AAAA,MACE,YAAc,EAAA;AAChB,IAAM,KAAA,EAAA;AAfR,IAAA,YAAA,CAAA,IAAA,EAAA,kBAAA,CAAA;AACA,IAAA,YAAA,CAAA,IAAA,EAAA,gBAAA,CAAA;AACA,IAAA,YAAA,CAAA,IAAA,EAAA,OAAA,CAAA;AAEA,IAAA,aAAA,CAAA,IAAA,EAAA,yBAAA,EAA0B,MAAM;AAC9B,MAAA,IAAA,CAAK,SAAS,QAAS,CAAA,MAAA;AAAA,KACzB,CAAA;AAWE,IAAA,YAAA,CAAA,IAAA,EAAK,SAAU,QAAS,CAAA,MAAA,CAAA;AACxB,IAAA,YAAA,CAAA,IAAA,EAAK,oBAAqB,eAAkB,GAAA,GAAA,CAAA;AAE5C,IAAA,IAAI,iBAAmB,EAAA;AACrB,MAAK,IAAA,CAAA,EAAA,CAAG,oBAAoB,iBAAiB,CAAA;AAAA;AAG/C,IAAA,IAAI,QAAU,EAAA;AACZ,MAAK,IAAA,CAAA,EAAA,CAAG,UAAU,QAAQ,CAAA;AAAA;AAE5B,IAAA,IAAI,SAAW,EAAA;AACb,MAAK,IAAA,CAAA,EAAA,CAAG,WAAW,SAAS,CAAA;AAAA;AAE9B,IAAA,IAAI,kBAAoB,EAAA;AACtB,MAAK,IAAA,CAAA,EAAA,CAAG,oBAAoB,kBAAkB,CAAA;AAAA;AAGhD,IAAS,QAAA,CAAA,gBAAA,CAAiB,kBAAoB,EAAA,IAAA,CAAK,uBAAuB,CAAA;AAAA;AAC5E,EAEA,KAAQ,GAAA;AACN,IAAS,QAAA,CAAA,mBAAA;AAAA,MACP,kBAAA;AAAA,MACA,IAAK,CAAA;AAAA,KACP;AAAA;AACF,EAEA,IAAY,OAAO,MAAiB,EAAA;AAClC,IAAI,IAAA,MAAA,KAAW,mBAAK,OAAS,CAAA,EAAA;AAC3B,MAAA,YAAA,CAAA,IAAA,EAAK,OAAU,EAAA,MAAA,CAAA;AACf,MAAA,IAAI,SAAS,MAAQ,EAAA;AACnB,QAAA,IAAA,CAAK,KAAK,QAAQ,CAAA;AAClB,QAAA,IAAI,mBAAK,kBAAoB,CAAA,EAAA;AAC3B,UAAK,YAAA,CAAA,IAAA,EAAA,gBAAA,EAAmB,WAAW,MAAM;AACvC,YAAA,IAAA,CAAK,KAAK,kBAAkB,CAAA;AAAA,WAC9B,EAAG,mBAAK,kBAAkB,CAAA,CAAA,CAAA;AAAA;AAC5B,OACK,MAAA;AACL,QAAA,IAAA,CAAK,KAAK,SAAS,CAAA;AACnB,QAAA,IAAI,mBAAK,gBAAkB,CAAA,EAAA;AACzB,UAAA,YAAA,CAAa,mBAAK,gBAAgB,CAAA,CAAA;AAClC,UAAA,YAAA,CAAA,IAAA,EAAK,gBAAmB,EAAA,KAAA,CAAA,CAAA;AAAA;AAC1B;AAEF,MAAK,IAAA,CAAA,IAAA,CAAK,oBAAoB,MAAM,CAAA;AAAA;AACtC;AAEJ;AAhEE,kBAAA,GAAA,IAAA,OAAA,EAAA;AACA,gBAAA,GAAA,IAAA,OAAA,EAAA;AACA,OAAA,GAAA,IAAA,OAAA,EAAA;;;;"}

package/cjs/packages/vuu-utils/src/ScaledDecimal.js

@@ -0,0 +1,39 @@
+'use strict';
+
+const scaledDecimals = (fraction, decimals) => {
+  if (fraction.length > decimals) {
+    return fraction.slice(0, decimals);
+  } else if (fraction.length === decimals) {
+    return fraction;
+  } else {
+    return fraction.padEnd(decimals, "0");
+  }
+};
+class ScaledDecimal {
+  constructor(value, decimals = 6) {
+    this.value = value;
+    this.decimals = decimals;
+    console.log(`create a scaled decimal ${value} (${decimals} decimals)`);
+  }
+  get asLong() {
+    const [integral, fraction = "0"] = this.value.split(".");
+    return `${integral}${scaledDecimals(fraction, this.decimals)}`;
+  }
+  toJSON() {
+    return this.value;
+  }
+  toString() {
+    return this.value;
+  }
+}
+const ScaledDecimal2 = (value) => new ScaledDecimal(value, 2);
+const ScaledDecimal4 = (value) => new ScaledDecimal(value, 4);
+const ScaledDecimal6 = (value) => new ScaledDecimal(value, 6);
+const ScaledDecimal8 = (value) => new ScaledDecimal(value, 8);
+
+exports.ScaledDecimal = ScaledDecimal;
+exports.ScaledDecimal2 = ScaledDecimal2;
+exports.ScaledDecimal4 = ScaledDecimal4;
+exports.ScaledDecimal6 = ScaledDecimal6;
+exports.ScaledDecimal8 = ScaledDecimal8;
+//# sourceMappingURL=ScaledDecimal.js.map

package/cjs/packages/vuu-utils/src/ScaledDecimal.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"ScaledDecimal.js","sources":["../../../../../../packages/vuu-utils/src/ScaledDecimal.ts"],"sourcesContent":["const scaledDecimals = (fraction: string, decimals: number) => {\n  if (fraction.length > decimals) {\n    return fraction.slice(0, decimals);\n  } else if (fraction.length === decimals) {\n    return fraction;\n  } else {\n    return fraction.padEnd(decimals, \"0\");\n  }\n};\n\nexport class ScaledDecimal {\n  constructor(\n    protected readonly value: string,\n    private readonly decimals = 6,\n  ) {\n    console.log(`create a scaled decimal ${value} (${decimals} decimals)`);\n  }\n\n  get asLong() {\n    const [integral, fraction = \"0\"] = this.value.split(\".\");\n    return `${integral}${scaledDecimals(fraction, this.decimals)}`;\n  }\n\n  toJSON() {\n    return this.value;\n  }\n\n  toString() {\n    return this.value;\n  }\n}\n\nexport const ScaledDecimal2 = (value: string): ScaledDecimal =>\n  new ScaledDecimal(value, 2);\nexport const ScaledDecimal4 = (value: string): ScaledDecimal =>\n  new ScaledDecimal(value, 4);\nexport const ScaledDecimal6 = (value: string): ScaledDecimal =>\n  new ScaledDecimal(value, 6);\nexport const ScaledDecimal8 = (value: string): ScaledDecimal =>\n  new ScaledDecimal(value, 8);\n"],"names":[],"mappings":";;AAAA,MAAM,cAAA,GAAiB,CAAC,QAAA,EAAkB,QAAqB,KAAA;AAC7D,EAAI,IAAA,QAAA,CAAS,SAAS,QAAU,EAAA;AAC9B,IAAO,OAAA,QAAA,CAAS,KAAM,CAAA,CAAA,EAAG,QAAQ,CAAA;AAAA,GACnC,MAAA,IAAW,QAAS,CAAA,MAAA,KAAW,QAAU,EAAA;AACvC,IAAO,OAAA,QAAA;AAAA,GACF,MAAA;AACL,IAAO,OAAA,QAAA,CAAS,MAAO,CAAA,QAAA,EAAU,GAAG,CAAA;AAAA;AAExC,CAAA;AAEO,MAAM,aAAc,CAAA;AAAA,EACzB,WAAA,CACqB,KACF,EAAA,QAAA,GAAW,CAC5B,EAAA;AAFmB,IAAA,IAAA,CAAA,KAAA,GAAA,KAAA;AACF,IAAA,IAAA,CAAA,QAAA,GAAA,QAAA;AAEjB,IAAA,OAAA,CAAQ,GAAI,CAAA,CAAA,wBAAA,EAA2B,KAAK,CAAA,EAAA,EAAK,QAAQ,CAAY,UAAA,CAAA,CAAA;AAAA;AACvE,EAEA,IAAI,MAAS,GAAA;AACX,IAAM,MAAA,CAAC,UAAU,QAAW,GAAA,GAAG,IAAI,IAAK,CAAA,KAAA,CAAM,MAAM,GAAG,CAAA;AACvD,IAAA,OAAO,GAAG,QAAQ,CAAA,EAAG,eAAe,QAAU,EAAA,IAAA,CAAK,QAAQ,CAAC,CAAA,CAAA;AAAA;AAC9D,EAEA,MAAS,GAAA;AACP,IAAA,OAAO,IAAK,CAAA,KAAA;AAAA;AACd,EAEA,QAAW,GAAA;AACT,IAAA,OAAO,IAAK,CAAA,KAAA;AAAA;AAEhB;AAEO,MAAM,iBAAiB,CAAC,KAAA,KAC7B,IAAI,aAAA,CAAc,OAAO,CAAC;AACrB,MAAM,iBAAiB,CAAC,KAAA,KAC7B,IAAI,aAAA,CAAc,OAAO,CAAC;AACrB,MAAM,iBAAiB,CAAC,KAAA,KAC7B,IAAI,aAAA,CAAc,OAAO,CAAC;AACrB,MAAM,iBAAiB,CAAC,KAAA,KAC7B,IAAI,aAAA,CAAc,OAAO,CAAC;;;;;;;;"}

package/cjs/packages/vuu-utils/src/datasource/datasource-filter-utils.js

@@ -7,16 +7,33 @@ const combineFilters = ({
   filterSpec,
   ...config
 }) => {
-  const baseFilterQuery = baseFilterSpec?.filter ?? "";
-  const combinedFilter = filterSpec.filter.length > 0 && baseFilterQuery.length > 0 ? `${filterSpec.filter} and ${baseFilterQuery}` : filterSpec.filter || baseFilterQuery;
-  const newConfig = {
-    ...config,
-    filterSpec: {
-      filter: combinedFilter,
-      filterStruct: combinedFilter.length > 0 ? vuuFilterParser.parseFilter(combinedFilter) : void 0
+  if (baseFilterSpec === void 0 || baseFilterSpec.filter === "") {
+    if (filterSpec.filterStruct || filterSpec.filter === "") {
+      return {
+        ...config,
+        filterSpec
+      };
+    } else {
+      return {
+        ...config,
+        filterSpec: {
+          filter: filterSpec.filter,
+          filterStruct: vuuFilterParser.parseFilter(filterSpec.filter)
+        }
+      };
     }
-  };
-  return newConfig;
+  } else {
+    const baseFilterQuery = baseFilterSpec.filter;
+    const combinedFilter = filterSpec.filter.length > 0 && baseFilterQuery.length > 0 ? `${filterSpec.filter} and ${baseFilterQuery}` : filterSpec.filter || baseFilterQuery;
+    const newConfig = {
+      ...config,
+      filterSpec: {
+        filter: combinedFilter,
+        filterStruct: combinedFilter.length > 0 ? vuuFilterParser.parseFilter(combinedFilter) : void 0
+      }
+    };
+    return newConfig;
+  }
 };
 
 exports.combineFilters = combineFilters;

package/cjs/packages/vuu-utils/src/datasource/datasource-filter-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"datasource-filter-utils.js","sources":["../../../../../../../packages/vuu-utils/src/datasource/datasource-filter-utils.ts"],"sourcesContent":["import { WithBaseFilter, WithFullConfig } from \"@vuu-ui/vuu-data-types\";\nimport { parseFilter } from \"@vuu-ui/vuu-filter-parser\";\n\nexport const combineFilters = ({\n  baseFilterSpec,\n  filterSpec,\n  ...config\n}: WithBaseFilter<WithFullConfig>) => {\n  const baseFilterQuery = baseFilterSpec?.filter ?? \"\";\n  const combinedFilter =\n    filterSpec.filter.length > 0 && baseFilterQuery.length > 0\n      ? `${filterSpec.filter} and ${baseFilterQuery}`\n      : filterSpec.filter || baseFilterQuery;\n\n  const newConfig: WithFullConfig = {\n    ...config,\n    filterSpec: {\n      filter: combinedFilter,\n      filterStruct:\n        combinedFilter.length > 0 ? parseFilter(combinedFilter) : undefined,\n    },\n  };\n\n  return newConfig;\n};\n"],"names":["parseFilter"],"mappings":";;;;AAGO,MAAM,iBAAiB,CAAC;AAAA,EAC7B,cAAA;AAAA,EACA,UAAA;AAAA,EACA,GAAG;AACL,CAAsC,KAAA;AACpC,EAAM,MAAA,eAAA,GAAkB,gBAAgB,MAAU,IAAA,EAAA;AAClD,EAAA,MAAM,cACJ,GAAA,UAAA,CAAW,MAAO,CAAA,MAAA,GAAS,KAAK,eAAgB,CAAA,MAAA,GAAS,CACrD,GAAA,CAAA,EAAG,WAAW,MAAM,CAAA,KAAA,EAAQ,eAAe,CAAA,CAAA,GAC3C,WAAW,MAAU,IAAA,eAAA;AAE3B,EAAA,MAAM,SAA4B,GAAA;AAAA,IAChC,GAAG,MAAA;AAAA,IACH,UAAY,EAAA;AAAA,MACV,MAAQ,EAAA,cAAA;AAAA,MACR,cACE,cAAe,CAAA,MAAA,GAAS,CAAI,GAAAA,2BAAA,CAAY,cAAc,CAAI,GAAA,KAAA;AAAA;AAC9D,GACF;AAEA,EAAO,OAAA,SAAA;AACT;;;;"}
+{"version":3,"file":"datasource-filter-utils.js","sources":["../../../../../../../packages/vuu-utils/src/datasource/datasource-filter-utils.ts"],"sourcesContent":["import { WithBaseFilter, WithFullConfig } from \"@vuu-ui/vuu-data-types\";\nimport { parseFilter } from \"@vuu-ui/vuu-filter-parser\";\n\n// TODO as we mugrate to a Filter only API, remove parseFilter\nexport const combineFilters = ({\n  baseFilterSpec,\n  filterSpec,\n  ...config\n}: WithBaseFilter<WithFullConfig>) => {\n  if (baseFilterSpec === undefined || baseFilterSpec.filter === \"\") {\n    if (filterSpec.filterStruct || filterSpec.filter === \"\") {\n      return {\n        ...config,\n        filterSpec,\n      };\n    } else {\n      return {\n        ...config,\n        filterSpec: {\n          filter: filterSpec.filter,\n          filterStruct: parseFilter(filterSpec.filter),\n        },\n      };\n    }\n  } else {\n    const baseFilterQuery = baseFilterSpec.filter;\n    const combinedFilter =\n      filterSpec.filter.length > 0 && baseFilterQuery.length > 0\n        ? `${filterSpec.filter} and ${baseFilterQuery}`\n        : filterSpec.filter || baseFilterQuery;\n\n    const newConfig: WithFullConfig = {\n      ...config,\n      filterSpec: {\n        filter: combinedFilter,\n        filterStruct:\n          combinedFilter.length > 0 ? parseFilter(combinedFilter) : undefined,\n      },\n    };\n\n    return newConfig;\n  }\n};\n"],"names":["parseFilter"],"mappings":";;;;AAIO,MAAM,iBAAiB,CAAC;AAAA,EAC7B,cAAA;AAAA,EACA,UAAA;AAAA,EACA,GAAG;AACL,CAAsC,KAAA;AACpC,EAAA,IAAI,cAAmB,KAAA,KAAA,CAAA,IAAa,cAAe,CAAA,MAAA,KAAW,EAAI,EAAA;AAChE,IAAA,IAAI,UAAW,CAAA,YAAA,IAAgB,UAAW,CAAA,MAAA,KAAW,EAAI,EAAA;AACvD,MAAO,OAAA;AAAA,QACL,GAAG,MAAA;AAAA,QACH;AAAA,OACF;AAAA,KACK,MAAA;AACL,MAAO,OAAA;AAAA,QACL,GAAG,MAAA;AAAA,QACH,UAAY,EAAA;AAAA,UACV,QAAQ,UAAW,CAAA,MAAA;AAAA,UACnB,YAAA,EAAcA,2BAAY,CAAA,UAAA,CAAW,MAAM;AAAA;AAC7C,OACF;AAAA;AACF,GACK,MAAA;AACL,IAAA,MAAM,kBAAkB,cAAe,CAAA,MAAA;AACvC,IAAA,MAAM,cACJ,GAAA,UAAA,CAAW,MAAO,CAAA,MAAA,GAAS,KAAK,eAAgB,CAAA,MAAA,GAAS,CACrD,GAAA,CAAA,EAAG,WAAW,MAAM,CAAA,KAAA,EAAQ,eAAe,CAAA,CAAA,GAC3C,WAAW,MAAU,IAAA,eAAA;AAE3B,IAAA,MAAM,SAA4B,GAAA;AAAA,MAChC,GAAG,MAAA;AAAA,MACH,UAAY,EAAA;AAAA,QACV,MAAQ,EAAA,cAAA;AAAA,QACR,cACE,cAAe,CAAA,MAAA,GAAS,CAAI,GAAAA,2BAAA,CAAY,cAAc,CAAI,GAAA,KAAA;AAAA;AAC9D,KACF;AAEA,IAAO,OAAA,SAAA;AAAA;AAEX;;;;"}

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

@@ -1,5 +1,7 @@
 'use strict';
 
+var ScaledDecimal = require('../ScaledDecimal.js');
+
 const singleValueFilterOps = /* @__PURE__ */ new Set([
   "=",
   "!=",
@@ -15,6 +17,7 @@ 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 isScaledDecimalFilterClause = (f) => f.value instanceof ScaledDecimal.ScaledDecimal;
 const isSerializableFilter = (f) => isSingleValueFilter(f) && "asQuery" in f && typeof f["asQuery"] === "function";
 const isFilter = (f) => typeof f === "object" && f !== null && (isFilterClause(f) || isMultiClauseFilter(f));
 const isFilterClause = (f) => f !== void 0 && (isSingleValueFilter(f) || isMultiValueFilter(f));
@@ -171,6 +174,7 @@ exports.isMultiClauseFilter = isMultiClauseFilter;
 exports.isMultiValueFilter = isMultiValueFilter;
 exports.isNamedFilter = isNamedFilter;
 exports.isOrFilter = isOrFilter;
+exports.isScaledDecimalFilterClause = isScaledDecimalFilterClause;
 exports.isSerializableFilter = isSerializableFilter;
 exports.isSingleValueFilter = isSingleValueFilter;
 exports.isValidFilterClauseOp = isValidFilterClauseOp;

package/cjs/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  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 isFilter = (f: unknown): f is Filter =>\n  typeof f === \"object\" &&\n  f !== null &&\n  (isFilterClause(f) || isMultiClauseFilter(f));\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    }\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 | null | undefined,\n  f2: FilterContainerFilter | null | undefined,\n): boolean => {\n  if (f1 == null && f2 == null) {\n    return true;\n  } else if (f1 == null || f2 == null) {\n    return false;\n  } else 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\";\nimport { ScaledDecimal } from \"../ScaledDecimal\";\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 isScaledDecimalFilterClause = (\n  f: SingleValueFilterClause,\n): f is SingleValueFilterClause<ScaledDecimal> =>\n  f.value instanceof ScaledDecimal;\n\nexport const isSerializableFilter = (f: object): f is SerializableFilter =>\n  isSingleValueFilter(f) &&\n  \"asQuery\" in f &&\n  typeof f[\"asQuery\"] === \"function\";\n\nexport const isFilter = (f: unknown): f is Filter =>\n  typeof f === \"object\" &&\n  f !== null &&\n  (isFilterClause(f) || isMultiClauseFilter(f));\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    }\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 | null | undefined,\n  f2: FilterContainerFilter | null | undefined,\n): boolean => {\n  if (f1 == null && f2 == null) {\n    return true;\n  } else if (f1 == null || f2 == null) {\n    return false;\n  } else 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":["ScaledDecimal","filter"],"mappings":"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"}

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

@@ -2,8 +2,9 @@
 
 var columnUtils = require('../column-utils.js');
 var filterUtils = require('./filter-utils.js');
+var ScaledDecimal = require('../ScaledDecimal.js');
 
-const filterValue = (value) => typeof value === "string" ? `"${value}"` : value;
+const filterValue = (value) => typeof value === "string" ? `"${value}"` : value instanceof ScaledDecimal.ScaledDecimal ? value.toString() : value;
 const quotedStrings = (value) => typeof value === "string" ? `"${value}"` : value;
 const removeOuterMostParentheses = (s) => s.replace(/^\((.*)\)$/, "$1");
 const filterAsQuery = (f, opts) => {

package/cjs/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 { 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":["isMultiClauseFilter","isMultiValueFilter","isSerializableFilter","isDateTimeDataValue"],"mappings":"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"}
+{"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\";\nimport { ScaledDecimal } from \"../ScaledDecimal\";\n\nconst filterValue = (value: string | number | boolean | ScaledDecimal) =>\n  typeof value === \"string\"\n    ? `\"${value}\"`\n    : value instanceof ScaledDecimal\n      ? value.toString()\n      : 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":["ScaledDecimal","isMultiClauseFilter","isMultiValueFilter","isSerializableFilter","isDateTimeDataValue"],"mappings":"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"}

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

@@ -5,6 +5,7 @@ var dateUtils = require('./date/date-utils.js');
 require('./date/dateTimePattern.js');
 require('@internationalized/date');
 var htmlUtils = require('./html-utils.js');
+var ScaledDecimal = require('./ScaledDecimal.js');
 
 const getFieldName = (target) => {
   const saltFormField = htmlUtils.queryClosest(target, "[data-field]");
@@ -42,6 +43,14 @@ function getTypedValue(value, type, throwIfInvalid = false, options) {
         return void 0;
       }
     }
+    case "scaleddecimal2":
+      return ScaledDecimal.ScaledDecimal2(value);
+    case "scaleddecimal4":
+      return ScaledDecimal.ScaledDecimal4(value);
+    case "scaleddecimal6":
+      return ScaledDecimal.ScaledDecimal6(value);
+    case "scaleddecimal8":
+      return ScaledDecimal.ScaledDecimal8(value);
     case "double":
     case "number": {
       if (dataUtils.stringIsValidDecimal(value)) {

package/cjs/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 { 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 (value.length > 0 && Time.isDateInMillis(value)) {\n        //if value previously converted\n        return Number(value);\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":["queryClosest","isValidTimeString","stringIsValidInt","stringIsValidDecimal","Time"],"mappings":";;;;;;;;AAgBa,MAAA,YAAA,GAAe,CAAC,MAA8C,KAAA;AACzE,EAAM,MAAA,aAAA,GAAgBA,sBAAa,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,IAAIC,2BAAkB,CAAA,IAAI,CAAK,IAAAA,2BAAA,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,IAAAC,0BAAA,CAAiB,KAAK,CAAG,EAAA;AAC3B,QAAO,OAAA,QAAA,CAAS,OAAO,EAAE,CAAA;AAAA,OAC3B,MAAA,IAAWD,2BAAkB,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,IAAAE,8BAAA,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,IAAAF,2BAAA,CAAkB,KAAK,CAAG,EAAA;AAG5B,QAAI,IAAA,OAAA,EAAS,SAAS,YAAc,EAAA;AAClC,UAAO,OAAA,KAAA;AAAA,SACF,MAAA;AACL,UAAA,OAAO,CAACG,cAAA,CAAK,KAAK,CAAA,CAAE,MAAO,EAAA;AAAA;AAC7B,iBACS,KAAM,CAAA,MAAA,GAAS,KAAKA,cAAK,CAAA,cAAA,CAAe,KAAK,CAAG,EAAA;AAEzD,QAAA,OAAO,OAAO,KAAK,CAAA;AAAA,iBACV,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\";\nimport {\n  type ScaledDecimal,\n  ScaledDecimal2,\n  ScaledDecimal4,\n  ScaledDecimal6,\n  ScaledDecimal8,\n} from \"./ScaledDecimal\";\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 | ScaledDecimal | 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 \"scaleddecimal2\":\n      return ScaledDecimal2(value);\n    case \"scaleddecimal4\":\n      return ScaledDecimal4(value);\n    case \"scaleddecimal6\":\n      return ScaledDecimal6(value);\n    case \"scaleddecimal8\":\n      return ScaledDecimal8(value);\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 (value.length > 0 && Time.isDateInMillis(value)) {\n        //if value previously converted\n        return Number(value);\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":["queryClosest","isValidTimeString","stringIsValidInt","ScaledDecimal2","ScaledDecimal4","ScaledDecimal6","ScaledDecimal8","stringIsValidDecimal","Time"],"mappings":"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"}

package/cjs/packages/vuu-utils/src/formatting-utils.js

@@ -5,6 +5,7 @@ require('./date/date-utils.js');
 var dateTimePattern = require('./date/dateTimePattern.js');
 var formatter = require('./date/formatter.js');
 var roundDecimal = require('./round-decimal.js');
+var protocolMessageUtils = require('./protocol-message-utils.js');
 
 const DEFAULT_NUMERIC_FORMAT = {};
 const defaultValueFormatter = (value) => value == null ? "" : typeof value === "string" ? value : value.toString();
@@ -81,7 +82,7 @@ const getValueFormatter = (column, serverDataType = column.serverDataType) => {
   const { type } = column;
   if (columnUtils.isTypeDescriptor(type) && columnUtils.isMappedValueTypeRenderer(type?.renderer)) {
     return mapFormatter(type.renderer.map);
-  } else if (serverDataType === "double" || columnUtils.isTypeDescriptor(type) && NumericTypes.includes(type.name)) {
+  } else if (protocolMessageUtils.isNumericType(serverDataType) || columnUtils.isTypeDescriptor(type) && NumericTypes.includes(type.name)) {
     return numericFormatter(column);
   } else if (serverDataType === "string" || serverDataType === "char") {
     return (value) => value;

package/cjs/packages/vuu-utils/src/formatting-utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"formatting-utils.js","sources":["../../../../../../packages/vuu-utils/src/formatting-utils.ts"],"sourcesContent":["import { DataValueDescriptor } from \"@vuu-ui/vuu-data-types\";\nimport {\n  ColumnDescriptor,\n  ColumnTypeFormatting,\n  ColumnTypeValueMap,\n  ValueFormatter,\n} from \"@vuu-ui/vuu-table-types\";\nimport {\n  isDateTimeDataValue,\n  isMappedValueTypeRenderer,\n  isTypeDescriptor,\n} from \"./column-utils\";\nimport { dateTimePattern, formatDate } from \"./date\";\nimport { roundDecimal, roundScaledDecimal } from \"./round-decimal\";\n\nexport type ValueFormatters = {\n  [key: string]: ValueFormatter;\n};\n\nconst DEFAULT_NUMERIC_FORMAT: ColumnTypeFormatting = {};\n\nexport const defaultValueFormatter = (value: unknown) =>\n  value == null ? \"\" : typeof value === \"string\" ? value : value.toString();\n\nconst dateFormatter = (column: DataValueDescriptor) => {\n  const pattern = dateTimePattern(column.type);\n  const formatter = formatDate(pattern);\n\n  return (value: unknown) => {\n    if (typeof value === \"number\" && value !== 0) {\n      return formatter(new Date(value));\n    } else {\n      return \"\";\n    }\n  };\n};\n\nexport const numericFormatter = ({\n  align = \"right\",\n  serverDataType,\n  type,\n}: Partial<ColumnDescriptor>) => {\n  if (type === undefined || typeof type === \"string\") {\n    return defaultValueFormatter;\n  } else {\n    const {\n      alignOnDecimals = false,\n      decimals,\n      roundingRule,\n      useLocaleString,\n      zeroPad = false,\n    } = type.formatting ?? DEFAULT_NUMERIC_FORMAT;\n    return (value: unknown) => {\n      if (serverDataType?.startsWith(\"scaleddecimal\")) {\n        if (typeof value === \"string\") {\n          return roundScaledDecimal(\n            value,\n            align,\n            decimals,\n            zeroPad,\n            alignOnDecimals,\n            useLocaleString,\n            roundingRule,\n          );\n        } else {\n          throw Error(\n            `[formatting-utils] numericFormatter, invalid data for ${serverDataType}: '${value}'`,\n          );\n        }\n      }\n      if (\n        typeof value === \"string\" &&\n        (value.startsWith(\"Σ\") || value.startsWith(\"[\"))\n      ) {\n        return value;\n      }\n      const number =\n        typeof value === \"number\"\n          ? value\n          : typeof value === \"string\"\n            ? parseFloat(value)\n            : undefined;\n      return roundDecimal(\n        number,\n        align,\n        decimals,\n        zeroPad,\n        alignOnDecimals,\n        useLocaleString,\n        roundingRule,\n      );\n    };\n  }\n};\n\nconst mapFormatter = (map: ColumnTypeValueMap) => {\n  return (value: unknown) => {\n    return map[value as string] ?? \"\";\n  };\n};\n\nconst NumericTypes = [\"decimal\", \"number\"];\n\nexport const getValueFormatter = (\n  column: ColumnDescriptor,\n  serverDataType = column.serverDataType,\n): ValueFormatter => {\n  if (isDateTimeDataValue(column)) {\n    return dateFormatter(column);\n  }\n\n  const { type } = column;\n  if (isTypeDescriptor(type) && isMappedValueTypeRenderer(type?.renderer)) {\n    return mapFormatter(type.renderer.map);\n  } else if (\n    serverDataType === \"double\" ||\n    (isTypeDescriptor(type) && NumericTypes.includes(type.name))\n  ) {\n    return numericFormatter(column);\n  } else if (serverDataType === \"string\" || serverDataType === \"char\") {\n    return (value: unknown) => value as string;\n  }\n  return defaultValueFormatter;\n};\n\n/**\n * Lowercases a string and returns as Lowercase typescript type\n *\n * @param str the input string\n * @returns str converted to Lowercase\n */\nexport const lowerCase = (str: string) =>\n  str.toLowerCase() as Lowercase<string>;\n"],"names":["dateTimePattern","formatter","formatDate","roundScaledDecimal","roundDecimal","isDateTimeDataValue","isTypeDescriptor","isMappedValueTypeRenderer"],"mappings":"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"}
+{"version":3,"file":"formatting-utils.js","sources":["../../../../../../packages/vuu-utils/src/formatting-utils.ts"],"sourcesContent":["import { DataValueDescriptor } from \"@vuu-ui/vuu-data-types\";\nimport {\n  ColumnDescriptor,\n  ColumnTypeFormatting,\n  ColumnTypeValueMap,\n  ValueFormatter,\n} from \"@vuu-ui/vuu-table-types\";\nimport {\n  isDateTimeDataValue,\n  isMappedValueTypeRenderer,\n  isTypeDescriptor,\n} from \"./column-utils\";\nimport { dateTimePattern, formatDate } from \"./date\";\nimport { roundDecimal, roundScaledDecimal } from \"./round-decimal\";\nimport { isNumericType } from \"./protocol-message-utils\";\n\nexport type ValueFormatters = {\n  [key: string]: ValueFormatter;\n};\n\nconst DEFAULT_NUMERIC_FORMAT: ColumnTypeFormatting = {};\n\nexport const defaultValueFormatter = (value: unknown) =>\n  value == null ? \"\" : typeof value === \"string\" ? value : value.toString();\n\nconst dateFormatter = (column: DataValueDescriptor) => {\n  const pattern = dateTimePattern(column.type);\n  const formatter = formatDate(pattern);\n\n  return (value: unknown) => {\n    if (typeof value === \"number\" && value !== 0) {\n      return formatter(new Date(value));\n    } else {\n      return \"\";\n    }\n  };\n};\n\nexport const numericFormatter = ({\n  align = \"right\",\n  serverDataType,\n  type,\n}: Partial<ColumnDescriptor>) => {\n  if (type === undefined || typeof type === \"string\") {\n    return defaultValueFormatter;\n  } else {\n    const {\n      alignOnDecimals = false,\n      decimals,\n      roundingRule,\n      useLocaleString,\n      zeroPad = false,\n    } = type.formatting ?? DEFAULT_NUMERIC_FORMAT;\n    return (value: unknown) => {\n      if (serverDataType?.startsWith(\"scaleddecimal\")) {\n        if (typeof value === \"string\") {\n          return roundScaledDecimal(\n            value,\n            align,\n            decimals,\n            zeroPad,\n            alignOnDecimals,\n            useLocaleString,\n            roundingRule,\n          );\n        } else {\n          throw Error(\n            `[formatting-utils] numericFormatter, invalid data for ${serverDataType}: '${value}'`,\n          );\n        }\n      }\n      if (\n        typeof value === \"string\" &&\n        (value.startsWith(\"Σ\") || value.startsWith(\"[\"))\n      ) {\n        return value;\n      }\n      const number =\n        typeof value === \"number\"\n          ? value\n          : typeof value === \"string\"\n            ? parseFloat(value)\n            : undefined;\n      return roundDecimal(\n        number,\n        align,\n        decimals,\n        zeroPad,\n        alignOnDecimals,\n        useLocaleString,\n        roundingRule,\n      );\n    };\n  }\n};\n\nconst mapFormatter = (map: ColumnTypeValueMap) => {\n  return (value: unknown) => {\n    return map[value as string] ?? \"\";\n  };\n};\n\nconst NumericTypes = [\"decimal\", \"number\"];\n\nexport const getValueFormatter = (\n  column: ColumnDescriptor,\n  serverDataType = column.serverDataType,\n): ValueFormatter => {\n  if (isDateTimeDataValue(column)) {\n    return dateFormatter(column);\n  }\n\n  const { type } = column;\n  if (isTypeDescriptor(type) && isMappedValueTypeRenderer(type?.renderer)) {\n    return mapFormatter(type.renderer.map);\n  } else if (\n    isNumericType(serverDataType) ||\n    (isTypeDescriptor(type) && NumericTypes.includes(type.name))\n  ) {\n    return numericFormatter(column);\n  } else if (serverDataType === \"string\" || serverDataType === \"char\") {\n    return (value: unknown) => value as string;\n  }\n  return defaultValueFormatter;\n};\n\n/**\n * Lowercases a string and returns as Lowercase typescript type\n *\n * @param str the input string\n * @returns str converted to Lowercase\n */\nexport const lowerCase = (str: string) =>\n  str.toLowerCase() as Lowercase<string>;\n"],"names":["dateTimePattern","formatter","formatDate","roundScaledDecimal","roundDecimal","isDateTimeDataValue","isTypeDescriptor","isMappedValueTypeRenderer","isNumericType"],"mappings":"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"}