flowerbi 3.4.2 → 3.5.0

package/dist/QueryColumn.d.ts

@@ -15,6 +15,11 @@ export declare class QueryColumn<T extends FilterValue> {
      * @param filters Optional filters to apply.
      */
     count(filters?: FilterJson[]): AggregationJson;
+    /**
+     * Aggregates the column by counting distinct values.
+     * @param filters Optional filters to apply.
+     */
+    countDistinct(filters?: FilterJson[]): AggregationJson;
     /**
      * Aggregates the column by selecting the minimum value.
      * @param filters Optional filters to apply.

package/dist/QueryColumn.js

@@ -41,6 +41,13 @@ var QueryColumn = /** @class */ (function () {
     QueryColumn.prototype.count = function (filters) {
         return this.aggregation("Count", filters);
     };
+    /**
+     * Aggregates the column by counting distinct values.
+     * @param filters Optional filters to apply.
+     */
+    QueryColumn.prototype.countDistinct = function (filters) {
+        return this.aggregation("CountDistinct", filters);
+    };
     /**
      * Aggregates the column by selecting the minimum value.
      * @param filters Optional filters to apply.

package/dist/QueryColumn.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryColumn.js","sourceRoot":"","sources":["../src/QueryColumn.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"QueryColumn.js","sourceRoot":"","sources":["../src/QueryColumn.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;AAEA;;;GAGG;AACH;IACI;;OAEG;IACH,qBAA4B,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;IAAG,CAAC;IAElC,iCAAW,GAArB,UAAsB,eAAgC,EAAE,OAAsB;QAC1E,OAAO;YACH,MAAM,EAAE,IAAI,CAAC,IAAI;YACjB,QAAQ,EAAE,eAAe;YACzB,OAAO,SAAA;SACV,CAAC;IACN,CAAC;IAED;;;OAGG;IACH,2BAAK,GAAL,UAAM,OAAsB;QACxB,OAAO,IAAI,CAAC,WAAW,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IAC9C,CAAC;IAED;;;OAGG;IACH,mCAAa,GAAb,UAAc,OAAsB;QAChC,OAAO,IAAI,CAAC,WAAW,CAAC,eAAe,EAAE,OAAO,CAAC,CAAC;IACtD,CAAC;IAED;;;OAGG;IACH,yBAAG,GAAH,UAAI,OAAsB;QACtB,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED;;;OAGG;IACH,yBAAG,GAAH,UAAI,OAAsB;QACtB,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IAEO,4BAAM,GAAd,UAAe,QAAwB,EAAE,KAAQ;QAC7C,OAAO;YACH,MAAM,EAAE,IAAI,CAAC,IAAI;YACjB,QAAQ,UAAA;YACR,KAAK,OAAA;SACR,CAAC;IACN,CAAC;IAED;;OAEG;IACH,+BAAS,GAAT;QACI,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,KAAK,EAAE,CAAC;IACpD,CAAC;IAED;;OAEG;IACH,gCAAU,GAAV;QACI,OAAO,EAAE,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,UAAU,EAAE,IAAI,EAAE,CAAC;IACnD,CAAC;IAED;;OAEG;IACH,6BAAO,GAAP,UAAQ,KAAQ;QACZ,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC;IAED;;OAEG;IACH,gCAAU,GAAV,UAAW,KAAQ;QACf,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACpC,CAAC;IAED;;;OAGG;IACH,iCAAW,GAAX,UAAY,KAAQ;QAChB,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC;IAED;;OAEG;IACH,8BAAQ,GAAR,UAAS,KAAQ;QACb,OAAO,IAAI,CAAC,MAAM,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;IACnC,CAAC;IAED;;;OAGG;IACH,0CAAoB,GAApB,UAAqB,KAAQ;QACzB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACpC,CAAC;IAED;;;OAGG;IACH,uCAAiB,GAAjB,UAAkB,KAAQ;QACtB,OAAO,IAAI,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IACpC,CAAC;IAED;;;OAGG;IACH,wBAAE,GAAF,UAAG,KAA8C;QAC7C,OAAO;YACH,MAAM,EAAE,IAAI,CAAC,IAAI;YACjB,QAAQ,EAAE,IAAI;YACd,KAAK,OAAA;SACR,CAAC;IACN,CAAC;IACL,kBAAC;AAAD,CAAC,AA5HD,IA4HC;AA5HY,kCAAW;AA8HxB;IAA0E,sCAAc;IACpF;;OAEG;IACH,4BAA4B,IAAY;QAAxC,YACI,kBAAM,IAAI,CAAC,SACd;QAF2B,UAAI,GAAJ,IAAI,CAAQ;;IAExC,CAAC;IAED;;;OAGG;IACH,gCAAG,GAAH,UAAI,OAAsB;QACtB,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IAED;;;OAGG;IACH,gCAAG,GAAH,UAAI,OAAsB;QACtB,OAAO,IAAI,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC;IAC5C,CAAC;IACL,yBAAC;AAAD,CAAC,AAvBD,CAA0E,WAAW,GAuBpF;AAvBY,gDAAkB"}

package/dist/QueryJson.d.ts

@@ -18,7 +18,7 @@ export interface FilterJson {
 /**
  * The allowed aggregation function names.
  */
-export declare type AggregationType = "Count" | "Sum" | "Avg" | "Min" | "Max";
+export declare type AggregationType = "Count" | "Sum" | "Avg" | "Min" | "Max" | "CountDistinct";
 /**
  * Describes an aggregated values. It is always taken from one column, with
  * a function applied to it. Filters can optionally be supplied to limit

package/dist/arrayHelpers.d.ts

@@ -15,4 +15,4 @@ export declare function distinct<T>(arr: T[]): T[];
  *
  * @param obj The object to obtain keys from.
  */
-export declare function keysOf<T>(obj: T): (keyof T)[];
+export declare function keysOf<T extends object>(obj: T): (keyof T)[];

package/dist/arrayHelpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"arrayHelpers.js","sourceRoot":"","sources":["../src/arrayHelpers.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,SAAgB,QAAQ,CAAI,GAAQ;IAChC,IAAM,GAAG,GAAyB,EAAE,CAAC;IAErC,KAAmB,UAAG,EAAH,WAAG,EAAH,iBAAG,EAAH,IAAG,EAAE;QAAnB,IAAM,IAAI,YAAA;QACX,GAAG,CAAC,UAAG,IAAI,CAAE,CAAC,GAAG,IAAI,CAAC;KACzB;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AARD,4BAQC;AAED;;;;;;;;;GASG;AACH,SAAgB,MAAM,CAAI,GAAM;IAC5B,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAgB,CAAC;AAC3C,CAAC;AAFD,wBAEC"}
+{"version":3,"file":"arrayHelpers.js","sourceRoot":"","sources":["../src/arrayHelpers.ts"],"names":[],"mappings":";;;AAAA;;;;;GAKG;AACH,SAAgB,QAAQ,CAAI,GAAQ;IAChC,IAAM,GAAG,GAAyB,EAAE,CAAC;IAErC,KAAmB,UAAG,EAAH,WAAG,EAAH,iBAAG,EAAH,IAAG,EAAE;QAAnB,IAAM,IAAI,YAAA;QACX,GAAG,CAAC,UAAG,IAAI,CAAE,CAAC,GAAG,IAAI,CAAC;KACzB;IAED,OAAO,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;AAC9B,CAAC;AARD,4BAQC;AAED;;;;;;;;;GASG;AACH,SAAgB,MAAM,CAAmB,GAAM;IAC3C,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,CAAgB,CAAC;AAC3C,CAAC;AAFD,wBAEC"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "flowerbi",
-    "version": "3.4.2",
+    "version": "3.5.0",
     "author": "Daniel Earwicker <dan@earwicker.com>",
     "license": "MIT",
     "description": "FlowerBI: ultra-minimal BI analytics query and UI tools",

package/src/QueryColumn.ts

@@ -26,6 +26,14 @@ export class QueryColumn<T extends FilterValue> {
         return this.aggregation("Count", filters);
     }
 
+    /**
+     * Aggregates the column by counting distinct values.
+     * @param filters Optional filters to apply.
+     */
+    countDistinct(filters?: FilterJson[]) {
+        return this.aggregation("CountDistinct", filters);
+    }
+
     /**
      * Aggregates the column by selecting the minimum value.
      * @param filters Optional filters to apply.

package/src/QueryJson.ts

@@ -9,7 +9,7 @@ export type FilterOperator = "=" | "<>" | ">" | "<" | ">=" | "<=" | "IN";
 export type FilterValue = string | number | boolean | Date | unknown | string[] | number[];
 
 /**
- * Specifies a filter criterion. The column is specified by a string of the 
+ * Specifies a filter criterion. The column is specified by a string of the
  * form `table.column`.
  */
 export interface FilterJson {
@@ -21,10 +21,10 @@ export interface FilterJson {
 /**
  * The allowed aggregation function names.
  */
-export type AggregationType = "Count" | "Sum" | "Avg" | "Min" | "Max";
+export type AggregationType = "Count" | "Sum" | "Avg" | "Min" | "Max" | "CountDistinct";
 
 /**
- * Describes an aggregated values. It is always taken from one column, with 
+ * Describes an aggregated values. It is always taken from one column, with
  * a function applied to it. Filters can optionally be supplied to limit
  * the set of rows included in the aggregation. The column is specified by a
  * string of the form `table.column`.
@@ -37,7 +37,7 @@ export interface AggregationJson {
 
 /**
  * Specifies an ordering criteria: which column to sort by, and optionally
- * whether it is descending (the default is ascending). The column is 
+ * whether it is descending (the default is ascending). The column is
  * specified by a string of the form `table.column`.
  */
 export interface OrderingJson {

package/src/arrayHelpers.ts

@@ -2,7 +2,7 @@
  * Returns the distinct (unique) values from an array. The comparison
  * method is very simplistic: all values are converted to strings
  * before comparison.
- * @param arr 
+ * @param arr
  */
 export function distinct<T>(arr: T[]) {
     const map: { [key: string]: T } = {};
@@ -18,12 +18,12 @@ export function distinct<T>(arr: T[]) {
  * Returns the names of properties (i.e. the keys) in an object, statically
  * typed so each has the string literal type of one of the properties. This
  * is not always correct, because the type will include properties inherited
- * from the prototype, where as the values returned at runtime will never 
+ * from the prototype, where as the values returned at runtime will never
  * include inherited properties. But it's a useful approximation in situations
  * where prototype inheritance can be ignored.
- * 
+ *
  * @param obj The object to obtain keys from.
  */
-export function keysOf<T>(obj: T) {
+export function keysOf<T extends object>(obj: T) {
     return Object.keys(obj) as (keyof T)[];
 }