flowerbi 3.8.3 → 3.9.0

package/dist/QueryJson.d.ts

@@ -32,13 +32,33 @@ 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
- * specified by a string of the form `table.column`.
+ * whether it is descending (the default is ascending). The column can be
+ * specified by a string of the form `table.column`, though this can only
+ * target one of the columns specified in select. More flexibly, specify
+ * a type of column (the type 'Value' refers to aggregations) and its
+ * zero-based position.
  */
-export interface OrderingJson {
-    column: string;
+export declare type OrderingJson = {
     descending?: boolean;
-}
+} & ({
+    column: string;
+} | {
+    type: "Select" | "Value" | "Calculation";
+    index: number;
+});
+/**
+ * Specifies an expression for calculating a derived value based on
+ * the values of aggregations, specified by zero-based position.
+ */
+export declare type CalculationJson = {
+    value: number;
+} | {
+    aggregation: number;
+} | {
+    first: CalculationJson;
+    operator: "+" | "-" | "*" | "/";
+    second: CalculationJson;
+};
 /**
  * Specifies an entire query.
  */
@@ -51,6 +71,10 @@ export interface QueryJson {
      * The aggregated values to fetch.
      */
     aggregations: AggregationJson[];
+    /**
+     * The calculations to perform.
+     */
+    calculations?: CalculationJson[];
     /**
      * Filters to apply. They are always combined with AND.
      */

package/dist/QueryValues.d.ts

@@ -1,25 +1,25 @@
-import { QuerySelect, ExpandedQueryRecord, AggregateValuesOnly, AggregatePropsOnly, ExpandedQueryRecordWithOptionalColumns } from "./queryModel";
+import { QuerySelect, ExpandedQueryRecord, AggregateValuesOnly, AggregatePropsOnly, ExpandedQueryRecordWithOptionalColumns, QueryCalculations, CalculationValues } from "./queryModel";
 /**
  * An abstract interface representing either a row from a dataset or
  * the {@link ExpandedQueryResult.totals} row, so that generic code can
  * format either of them in a consistent way.
  */
-export interface QueryValues<S extends QuerySelect> {
+export interface QueryValues<S extends QuerySelect, C extends QueryCalculations<S>> {
     /**
      * The plain values of columns, which may be `undefined` if this
      * refers to the {@link ExpandedQueryResult.totals} record.
      */
-    values: ExpandedQueryRecordWithOptionalColumns<S>;
+    values: ExpandedQueryRecordWithOptionalColumns<S, C>;
     percentage<K extends AggregatePropsOnly<S>>(key: K): number;
 }
-export declare class QueryValuesRow<S extends QuerySelect> implements QueryValues<S> {
-    readonly values: ExpandedQueryRecord<S>;
-    readonly totals: AggregateValuesOnly<S> | undefined;
-    constructor(values: ExpandedQueryRecord<S>, totals: AggregateValuesOnly<S> | undefined);
+export declare class QueryValuesRow<S extends QuerySelect, C extends QueryCalculations<S>> implements QueryValues<S, C> {
+    readonly values: ExpandedQueryRecord<S, C>;
+    readonly totals: (AggregateValuesOnly<S> & CalculationValues<C>) | undefined;
+    constructor(values: ExpandedQueryRecord<S, C>, totals: (AggregateValuesOnly<S> & CalculationValues<C>) | undefined);
     percentage<K extends AggregatePropsOnly<S>>(key: K): number;
 }
-export declare class QueryValuesTotal<S extends QuerySelect> implements QueryValues<S> {
-    readonly values: ExpandedQueryRecordWithOptionalColumns<S>;
-    constructor(totals: AggregateValuesOnly<S>);
+export declare class QueryValuesTotal<S extends QuerySelect, C extends QueryCalculations<S>> implements QueryValues<S, C> {
+    readonly values: ExpandedQueryRecordWithOptionalColumns<S, C>;
+    constructor(totals: AggregateValuesOnly<S> & CalculationValues<C>);
     percentage(): number;
 }

package/dist/QueryValues.js.map

@@ -1 +1 @@
-{"version":3,"file":"QueryValues.js","sourceRoot":"","sources":["../src/QueryValues.ts"],"names":[],"mappings":";;;AAsBA;IACI,wBACoB,MAA8B,EAC9B,MAA0C;QAD1C,WAAM,GAAN,MAAM,CAAwB;QAC9B,WAAM,GAAN,MAAM,CAAoC;IAAG,CAAC;IAElE,mCAAU,GAAV,UAA4C,GAAM;;QAC9C,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,OAAO,CAAC,CAAC;QAE3B,IAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAClC,IAAM,KAAK,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,mCAAI,CAAC,CAAC;QACpC,IAAM,OAAO,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,KAAK,CAAC,GAAG,GAAG,CAAC;QAC3D,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;IAC3C,CAAC;IACL,qBAAC;AAAD,CAAC,AAbD,IAaC;AAbY,wCAAc;AAe3B;IAGI,0BAAY,MAA8B;QACtC,IAAI,CAAC,MAAM,GAAG,MAAmD,CAAC;IACtE,CAAC;IAED,qCAAU,GAAV;QACI,OAAO,GAAG,CAAC;IACf,CAAC;IACL,uBAAC;AAAD,CAAC,AAVD,IAUC;AAVY,4CAAgB"}
+{"version":3,"file":"QueryValues.js","sourceRoot":"","sources":["../src/QueryValues.ts"],"names":[],"mappings":";;;AAwBA;IACI,wBAA4B,MAAiC,EAAkB,MAAmE;QAAtH,WAAM,GAAN,MAAM,CAA2B;QAAkB,WAAM,GAAN,MAAM,CAA6D;IAAG,CAAC;IAEtJ,mCAAU,GAAV,UAA4C,GAAM;;QAC9C,IAAI,CAAC,IAAI,CAAC,MAAM;YAAE,OAAO,CAAC,CAAC;QAE3B,IAAM,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;QAClC,IAAM,KAAK,GAAG,MAAA,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,mCAAI,CAAC,CAAC;QACpC,IAAM,OAAO,GAAG,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,QAAQ,GAAG,KAAK,CAAC,GAAG,GAAG,CAAC;QAC3D,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,GAAG,GAAG,CAAC,GAAG,GAAG,CAAC;IAC3C,CAAC;IACL,qBAAC;AAAD,CAAC,AAXD,IAWC;AAXY,wCAAc;AAa3B;IAGI,0BAAY,MAAqD;QAC7D,IAAI,CAAC,MAAM,GAAG,MAAsD,CAAC;IACzE,CAAC;IAED,qCAAU,GAAV;QACI,OAAO,GAAG,CAAC;IACf,CAAC;IACL,uBAAC;AAAD,CAAC,AAVD,IAUC;AAVY,4CAAgB"}

package/dist/executeQuery.d.ts

@@ -1,4 +1,4 @@
-import { Query, QuerySelect, ExpandedQueryRecord, AggregateValuesOnly } from "./queryModel";
+import { Query, QuerySelect, ExpandedQueryRecord, AggregateValuesOnly, QueryCalculations, CalculationValues } from "./queryModel";
 import { QueryJson } from "./QueryJson";
 /**
  * The allowed data types for plain columns.
@@ -45,7 +45,7 @@ export declare type QueryFetch = (queryJson: QueryJson) => Promise<QueryResultJs
  * format, ready to be sent to your API.
  * @param query
  */
-export declare function jsonifyQuery<S extends QuerySelect>(query: Query<S>): QueryJson;
+export declare function jsonifyQuery<S extends QuerySelect, C extends QueryCalculations<S>>(query: Query<S, C>): QueryJson;
 /**
  * Converts the `QueryRecordJson` for a single record into a strongly-typed record
  * with named properties, using the {@link Query.select} from the query to perform
@@ -53,7 +53,7 @@ export declare function jsonifyQuery<S extends QuerySelect>(query: Query<S>): Qu
  * @param select The {@link Query.select} property from the query.
  * @param record The record returned from your API.
  */
-export declare function expandQueryRecord<S extends QuerySelect>(select: S, record: QueryRecordJson): ExpandedQueryRecord<S>;
+export declare function expandQueryRecord<S extends QuerySelect, C extends QueryCalculations<S>>(select: S, record: QueryRecordJson, calcs?: C): ExpandedQueryRecord<S, C>;
 /**
  * Converts the `QueryRecordJson` from the `totals` record into a strongly-typed
  * record named properties for the aggregated values only, using the
@@ -62,23 +62,23 @@ export declare function expandQueryRecord<S extends QuerySelect>(select: S, reco
  * @param select The {@link Query.select} property from the query.
  * @param record The {@link QueryResultJson.totals} record returned from your API.
  */
-export declare function getAggregateValuesOnly<S extends QuerySelect>(select: S, record: QueryRecordJson): AggregateValuesOnly<S>;
+export declare function getAggregateValuesOnly<S extends QuerySelect, C extends QueryCalculations<S>>(select: S, record: QueryRecordJson, calcs?: C): AggregateValuesOnly<S> & CalculationValues<C>;
 /**
  * The statically-typed result of a {@link Query}.
  */
-export interface ExpandedQueryResult<S extends QuerySelect> {
+export interface ExpandedQueryResult<S extends QuerySelect, C extends QueryCalculations<S>> {
     /**
      * The set of records returned, each having named properties
      * corresponding to the plain and aggregated columns selected
      * in the query.
      */
-    records: ExpandedQueryRecord<S>[];
+    records: ExpandedQueryRecord<S, C>[];
     /**
      * Optional extra record, only available if {@link QueryJson.totals}
      * was specified as `true` in the query, containing the aggregation
      * totals.
      */
-    totals?: AggregateValuesOnly<S>;
+    totals?: AggregateValuesOnly<S> & CalculationValues<C>;
 }
 /**
  * Converts the payload returned from the API into the statically-typed
@@ -86,4 +86,4 @@ export interface ExpandedQueryResult<S extends QuerySelect> {
  * @param select The {@link Query.select} property from the query.
  * @param result The response payload from the API call.
  */
-export declare function expandQueryResult<S extends QuerySelect>(select: S, result: QueryResultJson): ExpandedQueryResult<S>;
+export declare function expandQueryResult<S extends QuerySelect, C extends QueryCalculations<S>>(select: S, result: QueryResultJson, calcs?: C): ExpandedQueryResult<S, C>;

package/dist/executeQuery.js

@@ -2,23 +2,84 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.expandQueryResult = exports.getAggregateValuesOnly = exports.expandQueryRecord = exports.jsonifyQuery = void 0;
 var queryModel_1 = require("./queryModel");
+var arrayHelpers_1 = require("./arrayHelpers");
+function jsonifyCalculation(calculation, props) {
+    if (typeof calculation === "string") {
+        var aggregation = props.indexOf(calculation);
+        if (aggregation === -1) {
+            throw new Error("Not a valid aggregation name: ".concat(calculation));
+        }
+        return { aggregation: aggregation };
+    }
+    if (typeof calculation === "number") {
+        return {
+            value: calculation,
+        };
+    }
+    if (calculation instanceof Array) {
+        return {
+            first: jsonifyCalculation(calculation[0], props),
+            operator: calculation[1],
+            second: jsonifyCalculation(calculation[2], props),
+        };
+    }
+    throw new Error("Invalid calculation");
+}
+function jsonifyOrdering(ordering, selects, values, calculations) {
+    if ("select" in ordering) {
+        var index = selects.indexOf(ordering.select);
+        if (index !== -1) {
+            return {
+                type: "Select",
+                index: index,
+                descending: ordering.descending,
+            };
+        }
+        index = values.indexOf(ordering.select);
+        if (index !== -1) {
+            return {
+                type: "Value",
+                index: index,
+                descending: ordering.descending,
+            };
+        }
+        throw new Error("Invalid ordering select key: ".concat(String(ordering.select)));
+    }
+    if ("calculation" in ordering) {
+        var index = calculations.indexOf(ordering.calculation);
+        if (index !== -1) {
+            return {
+                type: "Calculation",
+                index: index,
+                descending: ordering.descending,
+            };
+        }
+        throw new Error("Invalid ordering calculation key: ".concat(String(ordering.calculation)));
+    }
+    return ordering;
+}
 /**
  * Converts a statically-typed {@link Query} into the {@link QueryJson}
  * format, ready to be sent to your API.
  * @param query
  */
 function jsonifyQuery(query) {
-    var select = query.select, filters = query.filters, orderBy = query.orderBy, totals = query.totals, take = query.take, skip = query.skip, comment = query.comment, allowDuplicates = query.allowDuplicates;
+    var _a;
+    var select = query.select, filters = query.filters, calculations = query.calculations, orderBy = query.orderBy, totals = query.totals, take = query.take, skip = query.skip, comment = query.comment, allowDuplicates = query.allowDuplicates;
+    var columnProps = (0, queryModel_1.getColumnPropsOnly)(select);
+    var aggregationProps = (0, queryModel_1.getAggregatePropsOnly)(select);
+    var calculationProps = calculations ? (0, arrayHelpers_1.keysOf)(calculations) : [];
     return {
-        select: (0, queryModel_1.getColumnPropsOnly)(select).map(function (key) { return select[key].name; }),
-        aggregations: (0, queryModel_1.getAggregatePropsOnly)(select).map(function (key) { return select[key]; }),
+        select: columnProps.map(function (key) { return select[key].name; }),
+        aggregations: aggregationProps.map(function (key) { return select[key]; }),
+        calculations: calculations ? calculationProps.map(function (key) { return jsonifyCalculation(calculations[key], aggregationProps); }) : undefined,
         filters: filters !== null && filters !== void 0 ? filters : [],
-        orderBy: orderBy !== null && orderBy !== void 0 ? orderBy : [],
+        orderBy: (_a = orderBy === null || orderBy === void 0 ? void 0 : orderBy.map(function (o) { return jsonifyOrdering(o, columnProps, aggregationProps, calculationProps); })) !== null && _a !== void 0 ? _a : [],
         totals: totals !== null && totals !== void 0 ? totals : false,
         skip: skip !== null && skip !== void 0 ? skip : 0,
         take: take !== null && take !== void 0 ? take : 100,
         comment: comment,
-        allowDuplicates: allowDuplicates
+        allowDuplicates: allowDuplicates,
     };
 }
 exports.jsonifyQuery = jsonifyQuery;
@@ -29,16 +90,21 @@ exports.jsonifyQuery = jsonifyQuery;
  * @param select The {@link Query.select} property from the query.
  * @param record The record returned from your API.
  */
-function expandQueryRecord(select, record) {
+function expandQueryRecord(select, record, calcs) {
     var result = {};
     var n = 0;
     for (var _i = 0, _a = (0, queryModel_1.getAggregatePropsOnly)(select); _i < _a.length; _i++) {
         var key = _a[_i];
         result[key] = record.aggregated[n++];
     }
+    var calculationProps = calcs ? (0, arrayHelpers_1.keysOf)(calcs) : [];
+    for (var _b = 0, calculationProps_1 = calculationProps; _b < calculationProps_1.length; _b++) {
+        var key = calculationProps_1[_b];
+        result[key] = record.aggregated[n++];
+    }
     n = 0;
-    for (var _b = 0, _c = (0, queryModel_1.getColumnPropsOnly)(select); _b < _c.length; _b++) {
-        var key = _c[_b];
+    for (var _c = 0, _d = (0, queryModel_1.getColumnPropsOnly)(select); _c < _d.length; _c++) {
+        var key = _d[_c];
         result[key] = record.selected[n++];
     }
     return result;
@@ -52,13 +118,18 @@ exports.expandQueryRecord = expandQueryRecord;
  * @param select The {@link Query.select} property from the query.
  * @param record The {@link QueryResultJson.totals} record returned from your API.
  */
-function getAggregateValuesOnly(select, record) {
+function getAggregateValuesOnly(select, record, calcs) {
     var result = {};
     var n = 0;
     for (var _i = 0, _a = (0, queryModel_1.getAggregatePropsOnly)(select); _i < _a.length; _i++) {
         var key = _a[_i];
         result[key] = record.aggregated[n++];
     }
+    var calculationProps = calcs ? (0, arrayHelpers_1.keysOf)(calcs) : [];
+    for (var _b = 0, calculationProps_2 = calculationProps; _b < calculationProps_2.length; _b++) {
+        var key = calculationProps_2[_b];
+        result[key] = record.aggregated[n++];
+    }
     return result;
 }
 exports.getAggregateValuesOnly = getAggregateValuesOnly;
@@ -68,10 +139,10 @@ exports.getAggregateValuesOnly = getAggregateValuesOnly;
  * @param select The {@link Query.select} property from the query.
  * @param result The response payload from the API call.
  */
-function expandQueryResult(select, result) {
+function expandQueryResult(select, result, calcs) {
     return {
-        records: result.records.map(function (r) { return expandQueryRecord(select, r); }),
-        totals: result.totals && getAggregateValuesOnly(select, result.totals)
+        records: result.records.map(function (r) { return expandQueryRecord(select, r, calcs); }),
+        totals: result.totals && getAggregateValuesOnly(select, result.totals, calcs),
     };
 }
 exports.expandQueryResult = expandQueryResult;

package/dist/executeQuery.js.map

@@ -1 +1 @@
-{"version":3,"file":"executeQuery.js","sourceRoot":"","sources":["../src/executeQuery.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"executeQuery.js","sourceRoot":"","sources":["../src/executeQuery.ts"],"names":[],"mappings":"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"}

package/dist/executeQuery.test.d.ts

@@ -6,4 +6,5 @@ export declare const Customer: {
 export declare const Bug: {
     Id: QueryColumn<number>;
     CustomerId: QueryColumn<number>;
+    Fixed: QueryColumn<boolean>;
 };

package/dist/executeQuery.test.js

@@ -10,20 +10,24 @@ exports.Customer = {
 exports.Bug = {
     Id: new QueryColumn_1.QueryColumn("Bug.Id"),
     CustomerId: new QueryColumn_1.QueryColumn("Bug.CustomerId"),
+    Fixed: new QueryColumn_1.QueryColumn("Bug.Fixed"),
 };
 test("jsonifies mixed columns", function () {
     expect((0, executeQuery_1.jsonifyQuery)({
         select: {
             customer: exports.Customer.CustomerName,
-            bugCount: exports.Bug.Id.count()
-        }
+            bugCount: exports.Bug.Id.count(),
+        },
     })).toStrictEqual({
         select: ["Customer.CustomerName"],
-        aggregations: [{
+        aggregations: [
+            {
                 column: "Bug.Id",
                 function: "Count",
-                filters: undefined
-            }],
+                filters: undefined,
+            },
+        ],
+        calculations: undefined,
         filters: [],
         orderBy: [],
         skip: 0,
@@ -37,10 +41,11 @@ test("jsonifies select", function () {
     expect((0, executeQuery_1.jsonifyQuery)({
         select: {
             customer: exports.Customer.CustomerName,
-        }
+        },
     })).toStrictEqual({
         select: ["Customer.CustomerName"],
         aggregations: [],
+        calculations: undefined,
         filters: [],
         orderBy: [],
         skip: 0,
@@ -61,6 +66,7 @@ test("jsonifies params", function () {
     })).toStrictEqual({
         select: [],
         aggregations: [],
+        calculations: undefined,
         filters: [],
         orderBy: [],
         skip: 3,
@@ -73,29 +79,32 @@ test("jsonifies params", function () {
 test("jsonifies filters", function () {
     expect((0, executeQuery_1.jsonifyQuery)({
         select: {
-            bugCount: exports.Bug.Id.count([
-                exports.Customer.CustomerName.lessThan("z")
-            ])
+            bugCount: exports.Bug.Id.count([exports.Customer.CustomerName.lessThan("z")]),
         },
-        filters: [
-            exports.Customer.CustomerName.greaterThan("a")
-        ]
+        filters: [exports.Customer.CustomerName.greaterThan("a")],
     })).toStrictEqual({
         select: [],
-        aggregations: [{
+        aggregations: [
+            {
                 column: "Bug.Id",
                 function: "Count",
-                filters: [{
+                filters: [
+                    {
                         column: "Customer.CustomerName",
                         operator: "<",
                         value: "z",
-                    }]
-            }],
-        filters: [{
+                    },
+                ],
+            },
+        ],
+        calculations: undefined,
+        filters: [
+            {
                 column: "Customer.CustomerName",
                 operator: ">",
                 value: "a",
-            }],
+            },
+        ],
         orderBy: [],
         skip: 0,
         take: 100,
@@ -107,17 +116,115 @@ test("jsonifies filters", function () {
 test("jsonifies orderBy", function () {
     expect((0, executeQuery_1.jsonifyQuery)({
         select: {},
+        orderBy: [exports.Customer.CustomerName.descending()],
+    })).toStrictEqual({
+        select: [],
+        aggregations: [],
+        calculations: undefined,
+        filters: [],
+        orderBy: [
+            {
+                column: "Customer.CustomerName",
+                descending: true,
+            },
+        ],
+        skip: 0,
+        take: 100,
+        totals: false,
+        allowDuplicates: undefined,
+        comment: undefined,
+    });
+});
+test("jsonifies calculations and ordering by keys", function () {
+    expect((0, executeQuery_1.jsonifyQuery)({
+        select: {
+            customer: exports.Customer.CustomerName,
+            bugCount: exports.Bug.Id.count(),
+            bugsFixed: exports.Bug.Id.count([exports.Bug.Fixed.equalTo(true)]),
+        },
+        calculations: {
+            successRate: [100, "*", ["bugsFixed", "/", "bugCount"]],
+            failureRate: [100, "-", [100, "*", ["bugsFixed", "/", "bugCount"]]],
+        },
+        orderBy: [
+            { select: "customer" },
+            { select: "bugsFixed", descending: true },
+            { calculation: "successRate" },
+            { calculation: "failureRate", descending: true },
+        ],
+    })).toStrictEqual({
+        select: ["Customer.CustomerName"],
+        aggregations: [
+            {
+                column: "Bug.Id",
+                function: "Count",
+                filters: undefined,
+            },
+            {
+                column: "Bug.Id",
+                function: "Count",
+                filters: [
+                    {
+                        column: "Bug.Fixed",
+                        operator: "=",
+                        value: true,
+                    },
+                ],
+            },
+        ],
+        calculations: [
+            {
+                first: { value: 100 },
+                operator: "*",
+                second: {
+                    first: { aggregation: 1 },
+                    operator: "/",
+                    second: { aggregation: 0 },
+                },
+            },
+            {
+                first: { value: 100 },
+                operator: "-",
+                second: {
+                    first: { value: 100 },
+                    operator: "*",
+                    second: {
+                        first: { aggregation: 1 },
+                        operator: "/",
+                        second: { aggregation: 0 },
+                    },
+                },
+            },
+        ],
+        filters: [],
         orderBy: [
-            exports.Customer.CustomerName.descending()
-        ]
+            { type: "Select", index: 0, descending: undefined },
+            { type: "Value", index: 1, descending: true },
+            { type: "Calculation", index: 0, descending: undefined },
+            { type: "Calculation", index: 1, descending: true },
+        ],
+        skip: 0,
+        take: 100,
+        totals: false,
+        allowDuplicates: undefined,
+        comment: undefined,
+    });
+});
+test("passes through JSON orderBy", function () {
+    expect((0, executeQuery_1.jsonifyQuery)({
+        select: {},
+        orderBy: [exports.Customer.CustomerName.descending()],
     })).toStrictEqual({
         select: [],
         aggregations: [],
+        calculations: undefined,
         filters: [],
-        orderBy: [{
+        orderBy: [
+            {
                 column: "Customer.CustomerName",
                 descending: true,
-            }],
+            },
+        ],
         skip: 0,
         take: 100,
         totals: false,
@@ -125,4 +232,71 @@ test("jsonifies orderBy", function () {
         comment: undefined,
     });
 });
+function formatResultsFromQuery(query, result) {
+    return (0, executeQuery_1.expandQueryResult)(query.select, result, query.calculations);
+}
+test("generates typed results", function () {
+    var result = formatResultsFromQuery({
+        select: {
+            customer: exports.Customer.CustomerName,
+            bugCount: exports.Bug.Id.count(),
+            bugsFixed: exports.Bug.Id.count([exports.Bug.Fixed.equalTo(true)]),
+        },
+        calculations: {
+            successRate: [100, "*", ["bugsFixed", "/", "bugCount"]],
+            failureRate: [100, "-", [100, "*", ["bugsFixed", "/", "bugCount"]]],
+        },
+        orderBy: [
+            { select: "customer" },
+            { select: "bugsFixed", descending: true },
+            { calculation: "successRate" },
+            { calculation: "failureRate", descending: true },
+        ],
+    }, {
+        records: [
+            {
+                selected: ["woolworths"],
+                aggregated: [3, 1, 33.33, 66.67],
+            },
+        ],
+    });
+    expect(result).toStrictEqual({
+        records: [{ customer: "woolworths", bugCount: 3, bugsFixed: 1, successRate: 33.33, failureRate: 66.67 }],
+        totals: undefined,
+    });
+});
+test("generates typed results with totals", function () {
+    var result = formatResultsFromQuery({
+        select: {
+            customer: exports.Customer.CustomerName,
+            bugCount: exports.Bug.Id.count(),
+            bugsFixed: exports.Bug.Id.count([exports.Bug.Fixed.equalTo(true)]),
+        },
+        calculations: {
+            successRate: [100, "*", ["bugsFixed", "/", "bugCount"]],
+            failureRate: [100, "-", [100, "*", ["bugsFixed", "/", "bugCount"]]],
+        },
+        orderBy: [
+            { select: "customer" },
+            { select: "bugsFixed", descending: true },
+            { calculation: "successRate" },
+            { calculation: "failureRate", descending: true },
+        ],
+    }, {
+        records: [
+            {
+                selected: ["woolworths"],
+                aggregated: [3, 1, 33.33, 66.67],
+            },
+        ],
+        totals: {
+            selected: [""],
+            aggregated: [4, 2, 50, 50],
+        },
+    });
+    expect(result).toStrictEqual({
+        records: [{ customer: "woolworths", bugCount: 3, bugsFixed: 1, successRate: 33.33, failureRate: 66.67 }],
+        totals: { bugCount: 4, bugsFixed: 2, successRate: 50, failureRate: 50 },
+    });
+});
 //# sourceMappingURL=executeQuery.test.js.map

package/dist/executeQuery.test.js.map

@@ -1 +1 @@
-{"version":3,"file":"executeQuery.test.js","sourceRoot":"","sources":["../src/executeQuery.test.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"executeQuery.test.js","sourceRoot":"","sources":["../src/executeQuery.test.ts"],"names":[],"mappings":"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"}