@malloydata/render 0.0.33 → 0.0.34-dev230523182411

package/dist/data_styles.d.ts

@@ -46,7 +46,7 @@ export declare type RenderDef = ({
 } & PercentRenderOptions) | ({
     renderer: 'boolean';
 } & BooleanRenderOptions) | ({
-    renderer: 'spark_line';
+    renderer: 'sparkline';
 } & SparkLineRenderOptions) | ({
     renderer: 'bytes';
 } & BytesRenderOptions) | ({
@@ -145,14 +145,20 @@ export interface CartesianChartRenderOptions extends ChartRenderOptions {
 export interface BarChartRenderOptions extends DataRenderOptions {
     size?: ChartSize;
 }
+export interface BarSparkLineRenderOptions extends BarChartRenderOptions {
+    size?: ChartSize;
+}
+export interface ColumnSparkLineRenderOptions extends BarChartRenderOptions {
+    size?: ChartSize;
+}
 export interface ScatterChartRenderOptions extends CartesianChartRenderOptions {
     scatter_chart?: Record<string, unknown>;
 }
 export interface LineChartRenderOptions extends CartesianChartRenderOptions {
     line_chart?: Record<string, unknown>;
 }
-export interface SparkLineRenderOptions extends LineChartRenderOptions {
-    spark_line?: Record<string, unknown>;
+export interface SparkLineRenderOptions extends DataRenderOptions {
+    size?: ChartSize;
 }
 export interface PointMapRenderOptions extends ChartRenderOptions {
     chart?: {

package/dist/html/area_sparkline.d.ts

@@ -0,0 +1,6 @@
+import { HTMLSparkLineRenderer } from './sparkline';
+import { DataArray } from '@malloydata/malloy';
+import * as lite from 'vega-lite';
+export declare class HTMLAreaSparkLineRenderer extends HTMLSparkLineRenderer {
+    getVegaLiteSpec(data: DataArray): lite.TopLevelSpec;
+}

package/dist/html/area_sparkline.js

@@ -0,0 +1,104 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HTMLAreaSparkLineRenderer = void 0;
+const sparkline_1 = require("./sparkline");
+const utils_1 = require("./utils");
+const vega_spec_1 = require("./vega_spec");
+class HTMLAreaSparkLineRenderer extends sparkline_1.HTMLSparkLineRenderer {
+    getVegaLiteSpec(data) {
+        const fields = data.field.intrinsicFields;
+        const xField = fields[0];
+        const yField = fields[1];
+        const colorField = fields[2];
+        const xType = this.getDataType(xField);
+        const yType = this.getDataType(yField);
+        const colorType = colorField ? this.getDataType(colorField) : undefined;
+        const colorDef = colorField !== undefined
+            ? {
+                field: colorField.name,
+                type: colorType,
+                axis: { title: null },
+                scale: (0, utils_1.getColorScale)(colorType, false),
+            }
+            : { value: '#4285F4' };
+        const xSort = xType === 'nominal' ? null : undefined;
+        const ySort = yType === 'nominal' ? null : undefined;
+        const xDef = {
+            field: xField.name,
+            type: xType,
+            sort: xSort,
+            axis: {
+                title: null,
+                domain: false,
+                grid: false,
+                lables: false,
+                ticks: false,
+                values: [],
+            },
+            scale: { zero: false },
+        };
+        const yDef = {
+            field: yField.name,
+            type: yType,
+            sort: ySort,
+            axis: {
+                title: null,
+                domain: false,
+                ticks: false,
+                grid: false,
+                lables: false,
+                values: [],
+            },
+            scale: { zero: false },
+        };
+        return {
+            ...vega_spec_1.DEFAULT_SPEC,
+            ...this.getSize(),
+            data: {
+                values: this.mapData(data),
+            },
+            config: {
+                view: {
+                    stroke: 'transparent',
+                },
+            },
+            mark: {
+                type: 'area',
+                line: {
+                    color: '#4285F4',
+                },
+                point: false,
+            },
+            encoding: {
+                x: xDef,
+                y: yDef,
+                color: colorDef,
+            },
+            background: 'transparent',
+        };
+    }
+}
+exports.HTMLAreaSparkLineRenderer = HTMLAreaSparkLineRenderer;
+//# sourceMappingURL=area_sparkline.js.map

package/dist/html/bar_sparkline.d.ts

@@ -0,0 +1,10 @@
+import { DataArray } from '@malloydata/malloy';
+import * as lite from 'vega-lite';
+import { HTMLBarChartRenderer } from './bar_chart';
+export declare class HTMLBarSparkLineRenderer extends HTMLBarChartRenderer {
+    getSize(): {
+        height: number;
+        width: number;
+    };
+    getVegaLiteSpec(data: DataArray): lite.TopLevelSpec;
+}

package/dist/html/bar_sparkline.js

@@ -0,0 +1,105 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HTMLBarSparkLineRenderer = void 0;
+const utils_1 = require("./utils");
+const vega_spec_1 = require("./vega_spec");
+const bar_chart_1 = require("./bar_chart");
+class HTMLBarSparkLineRenderer extends bar_chart_1.HTMLBarChartRenderer {
+    getSize() {
+        if (this.size === 'large') {
+            return { height: 250, width: 100 };
+        }
+        else {
+            return { height: 125, width: 50 };
+        }
+    }
+    getVegaLiteSpec(data) {
+        const fields = data.field.intrinsicFields;
+        const xField = fields[0];
+        const yField = fields[1];
+        const colorField = fields[2];
+        const xType = this.getDataType(xField);
+        const yType = this.getDataType(yField);
+        const colorType = colorField ? this.getDataType(colorField) : undefined;
+        const mark = { type: this.getMark(), tooltip: true };
+        const colorDef = colorField !== undefined
+            ? {
+                field: colorField.name,
+                type: colorType,
+                axis: { title: null },
+                scale: (0, utils_1.getColorScale)(colorType, true),
+            }
+            : { value: '#4285F4' };
+        const xSort = xType === 'nominal' ? null : undefined;
+        const ySort = yType === 'nominal' ? null : undefined;
+        const xDef = {
+            field: xField.name,
+            type: xType,
+            sort: xSort,
+            axis: {
+                title: null,
+                domain: false,
+                grid: false,
+                ticks: false,
+                values: [],
+            },
+            scale: { zero: false },
+        };
+        const yDef = {
+            field: yField.name,
+            type: yType,
+            sort: ySort,
+            axis: {
+                title: null,
+                domain: false,
+                ticks: false,
+                grid: false,
+                values: [],
+            },
+            scale: { zero: false },
+        };
+        return {
+            ...vega_spec_1.DEFAULT_SPEC,
+            ...this.getSize(),
+            data: {
+                values: this.mapData(data),
+            },
+            config: {
+                view: {
+                    stroke: 'transparent',
+                },
+            },
+            mark,
+            encoding: {
+                y: xDef,
+                x: yDef,
+                color: colorDef,
+            },
+            background: 'transparent',
+        };
+    }
+}
+exports.HTMLBarSparkLineRenderer = HTMLBarSparkLineRenderer;
+//# sourceMappingURL=bar_sparkline.js.map

package/dist/html/cartesian_chart.js

@@ -69,12 +69,14 @@ class HTMLCartesianChartRenderer extends chart_1.HTMLChartRenderer {
             type: xType,
             sort: xSort,
             axis: { title: (0, utils_1.formatTitle)(this.options, xField.name) },
+            scale: { zero: false },
         };
         const yDef = {
             field: yField.name,
             type: yType,
             sort: ySort,
             axis: { title: (0, utils_1.formatTitle)(this.options, yField.name) },
+            scale: { zero: false },
         };
         return {
             ...vega_spec_1.DEFAULT_SPEC,

package/dist/html/column_sparkline.d.ts

@@ -0,0 +1,10 @@
+import { DataArray } from '@malloydata/malloy';
+import * as lite from 'vega-lite';
+import { HTMLBarChartRenderer } from './bar_chart';
+export declare class HTMLColumnSparkLineRenderer extends HTMLBarChartRenderer {
+    getSize(): {
+        height: number;
+        width: number;
+    };
+    getVegaLiteSpec(data: DataArray): lite.TopLevelSpec;
+}

package/dist/html/column_sparkline.js

@@ -0,0 +1,106 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HTMLColumnSparkLineRenderer = void 0;
+const utils_1 = require("./utils");
+const vega_spec_1 = require("./vega_spec");
+const bar_chart_1 = require("./bar_chart");
+class HTMLColumnSparkLineRenderer extends bar_chart_1.HTMLBarChartRenderer {
+    getSize() {
+        if (this.size === 'large') {
+            return { height: 100, width: 250 };
+        }
+        else {
+            return { height: 50, width: 125 };
+        }
+    }
+    getVegaLiteSpec(data) {
+        const fields = data.field.intrinsicFields;
+        const xField = fields[0];
+        const yField = fields[1];
+        const colorField = fields[2];
+        const xType = this.getDataType(xField);
+        const yType = this.getDataType(yField);
+        const colorType = colorField ? this.getDataType(colorField) : undefined;
+        // const mark = this.getMark();
+        const mark = { type: this.getMark(), tooltip: true };
+        const colorDef = colorField !== undefined
+            ? {
+                field: colorField.name,
+                type: colorType,
+                axis: { title: null },
+                scale: (0, utils_1.getColorScale)(colorType, true),
+            }
+            : { value: '#4285F4' };
+        const xSort = xType === 'nominal' ? null : undefined;
+        const ySort = yType === 'nominal' ? null : undefined;
+        const xDef = {
+            field: xField.name,
+            type: xType,
+            sort: xSort,
+            axis: {
+                title: null,
+                domain: false,
+                grid: false,
+                ticks: false,
+                values: [],
+            },
+            scale: { zero: false },
+        };
+        const yDef = {
+            field: yField.name,
+            type: yType,
+            sort: ySort,
+            axis: {
+                title: null,
+                domain: false,
+                ticks: false,
+                grid: false,
+                values: [],
+            },
+            scale: { zero: false },
+        };
+        return {
+            ...vega_spec_1.DEFAULT_SPEC,
+            ...this.getSize(),
+            data: {
+                values: this.mapData(data),
+            },
+            config: {
+                view: {
+                    stroke: 'transparent',
+                },
+            },
+            mark,
+            encoding: {
+                x: xDef,
+                y: yDef,
+                color: colorDef,
+            },
+            background: 'transparent',
+        };
+    }
+}
+exports.HTMLColumnSparkLineRenderer = HTMLColumnSparkLineRenderer;
+//# sourceMappingURL=column_sparkline.js.map

package/dist/html/html_view.js

@@ -42,12 +42,16 @@ const point_map_1 = require("./point_map");
 const scatter_chart_1 = require("./scatter_chart");
 const segment_map_1 = require("./segment_map");
 const shape_map_1 = require("./shape_map");
+const sparkline_1 = require("./sparkline");
 const table_1 = require("./table");
 const text_1 = require("./text");
 const vega_spec_1 = require("./vega_spec");
 const container_1 = require("./container");
 const utils_1 = require("./utils");
 const unsupported_1 = require("./unsupported");
+const column_sparkline_1 = require("./column_sparkline");
+const bar_sparkline_1 = require("./bar_sparkline");
+const area_sparkline_1 = require("./area_sparkline");
 class HTMLView {
     constructor(document) {
         this.document = document;
@@ -109,6 +113,10 @@ const suffixMap = {
     _url: 'link',
     _list: 'list',
     _list_detail: 'list_detail',
+    _sparkline: 'sparkline',
+    _sparkline_area: 'sparkline',
+    _sparkline_column: 'sparkline',
+    _sparkline_bar: 'sparkline',
 };
 function getRendererOptions(field, dataStyles) {
     var _a, _b, _c;
@@ -175,6 +183,18 @@ function makeRenderer(field, document, options, styleDefaults) {
     else if (renderDef.renderer === 'line_chart') {
         return new line_chart_1.HTMLLineChartRenderer(document, styleDefaults, options, renderDef);
     }
+    else if (renderDef.renderer === 'sparkline') {
+        if (field.name.endsWith('_column')) {
+            return new column_sparkline_1.HTMLColumnSparkLineRenderer(document, styleDefaults, options, renderDef);
+        }
+        else if (field.name.endsWith('_bar')) {
+            return new bar_sparkline_1.HTMLBarSparkLineRenderer(document, styleDefaults, options, renderDef);
+        }
+        else if (field.name.endsWith('area')) {
+            return new area_sparkline_1.HTMLAreaSparkLineRenderer(document, styleDefaults, options, renderDef);
+        }
+        return new sparkline_1.HTMLSparkLineRenderer(document, styleDefaults, options, renderDef);
+    }
     else if (renderDef.renderer === 'scatter_chart') {
         return new scatter_chart_1.HTMLScatterChartRenderer(document, styleDefaults, options, renderDef);
     }

package/dist/html/sparkline.d.ts

@@ -0,0 +1,10 @@
+import { DataArray } from '@malloydata/malloy';
+import * as lite from 'vega-lite';
+import { HTMLLineChartRenderer } from './line_chart';
+export declare class HTMLSparkLineRenderer extends HTMLLineChartRenderer {
+    getSize(): {
+        height: number;
+        width: number;
+    };
+    getVegaLiteSpec(data: DataArray): lite.TopLevelSpec;
+}

package/dist/html/sparkline.js

@@ -0,0 +1,109 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.HTMLSparkLineRenderer = void 0;
+const line_chart_1 = require("./line_chart");
+const utils_1 = require("./utils");
+const vega_spec_1 = require("./vega_spec");
+class HTMLSparkLineRenderer extends line_chart_1.HTMLLineChartRenderer {
+    getSize() {
+        if (this.size === 'large') {
+            return { height: 100, width: 250 };
+        }
+        else {
+            return { height: 50, width: 125 };
+        }
+    }
+    getVegaLiteSpec(data) {
+        const fields = data.field.intrinsicFields;
+        const xField = fields[0];
+        const yField = fields[1];
+        const colorField = fields[2];
+        const xType = this.getDataType(xField);
+        const yType = this.getDataType(yField);
+        const colorType = colorField ? this.getDataType(colorField) : undefined;
+        const colorDef = colorField !== undefined
+            ? {
+                field: colorField.name,
+                type: colorType,
+                axis: { title: null },
+                scale: (0, utils_1.getColorScale)(colorType, false),
+            }
+            : { value: '#4285F4' };
+        const xSort = xType === 'nominal' ? null : undefined;
+        const ySort = yType === 'nominal' ? null : undefined;
+        const xDef = {
+            field: xField.name,
+            type: xType,
+            sort: xSort,
+            axis: {
+                title: null,
+                domain: false,
+                grid: false,
+                lables: false,
+                ticks: false,
+                values: [],
+            },
+            scale: { zero: false },
+        };
+        const yDef = {
+            field: yField.name,
+            type: yType,
+            sort: ySort,
+            axis: {
+                title: null,
+                domain: false,
+                ticks: false,
+                grid: false,
+                lables: false,
+                values: [],
+            },
+            scale: { zero: false },
+        };
+        return {
+            ...vega_spec_1.DEFAULT_SPEC,
+            ...this.getSize(),
+            data: {
+                values: this.mapData(data),
+            },
+            config: {
+                view: {
+                    stroke: 'transparent',
+                },
+            },
+            mark: {
+                type: 'line',
+                tooltip: true,
+            },
+            encoding: {
+                x: xDef,
+                y: yDef,
+                color: colorDef,
+            },
+            background: 'transparent',
+        };
+    }
+}
+exports.HTMLSparkLineRenderer = HTMLSparkLineRenderer;
+//# sourceMappingURL=sparkline.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/render",
-  "version": "0.0.33",
+  "version": "0.0.34-dev230523182411",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.33",
+    "@malloydata/malloy": "^0.0.34-dev230523182411",
     "lodash": "^4.17.20",
     "us-atlas": "^3.0.0",
     "vega": "^5.21.0",