@malloydata/render 0.0.79-dev230818134709 → 0.0.79-dev230822184259

package/dist/data_styles.d.ts

@@ -1,9 +1,9 @@
 import * as lite from 'vega-lite';
-export declare type DataStyles = {
+export type DataStyles = {
     [fieldName: string]: RenderDef;
 };
-export declare type ChartSize = 'small' | 'medium' | 'large';
-export declare type RenderDef = ({
+export type ChartSize = 'small' | 'medium' | 'large';
+export type RenderDef = ({
     renderer?: undefined;
 } & DataRenderOptions) | ({
     renderer: 'table';
@@ -61,7 +61,7 @@ export interface DataRenderOptions {
     };
     sheet?: DataStyles;
 }
-export declare type StyleDefaults = {
+export type StyleDefaults = {
     size?: ChartSize;
 };
 export interface TableRenderOptions extends DataRenderOptions {

package/dist/data_styles.js

@@ -28,7 +28,7 @@ var Currency;
     Currency["Dollars"] = "usd";
     Currency["Euros"] = "euro";
     Currency["Pounds"] = "pound";
-})(Currency = exports.Currency || (exports.Currency = {}));
+})(Currency || (exports.Currency = Currency = {}));
 var DataVolumeUnit;
 (function (DataVolumeUnit) {
     DataVolumeUnit["Bytes"] = "bytes";
@@ -36,7 +36,7 @@ var DataVolumeUnit;
     DataVolumeUnit["Megabytes"] = "mb";
     DataVolumeUnit["Gigabytes"] = "gb";
     DataVolumeUnit["Terabytes"] = "tb";
-})(DataVolumeUnit = exports.DataVolumeUnit || (exports.DataVolumeUnit = {}));
+})(DataVolumeUnit || (exports.DataVolumeUnit = DataVolumeUnit = {}));
 var DurationUnit;
 (function (DurationUnit) {
     DurationUnit["Nanoseconds"] = "nanoseconds";
@@ -46,5 +46,5 @@ var DurationUnit;
     DurationUnit["Minutes"] = "minutes";
     DurationUnit["Hours"] = "hours";
     DurationUnit["Days"] = "days";
-})(DurationUnit = exports.DurationUnit || (exports.DurationUnit = {}));
+})(DurationUnit || (exports.DurationUnit = DurationUnit = {}));
 //# sourceMappingURL=data_styles.js.map

package/dist/html/chart.d.ts

@@ -3,7 +3,7 @@ import { DataArray, DataColumn, Field } from '@malloydata/malloy';
 import { Renderer } from '../renderer';
 import { RendererOptions } from '../renderer_types';
 import { ChartRenderOptions, StyleDefaults } from '../data_styles';
-declare type MappedRow = {
+type MappedRow = {
     [p: string]: string | number | Date | undefined | null;
 };
 export declare abstract class HTMLChartRenderer implements Renderer {

package/dist/html/chart.js

@@ -50,13 +50,6 @@ const lite = __importStar(require("vega-lite"));
 const vega = __importStar(require("vega"));
 const utils_1 = require("../html/utils");
 class HTMLChartRenderer {
-    constructor(document, styleDefaults, options, chartOptions = {}, timezone) {
-        this.document = document;
-        this.styleDefaults = styleDefaults;
-        this.options = options;
-        this.timezone = timezone;
-        this.size = chartOptions.size || this.styleDefaults.size || 'medium';
-    }
     mapData(data) {
         const mappedRows = [];
         for (const row of data) {
@@ -80,6 +73,13 @@ class HTMLChartRenderer {
             return { height: 175, width: 250 };
         }
     }
+    constructor(document, styleDefaults, options, chartOptions = {}, timezone) {
+        this.document = document;
+        this.styleDefaults = styleDefaults;
+        this.options = options;
+        this.timezone = timezone;
+        this.size = chartOptions.size || this.styleDefaults.size || 'medium';
+    }
     async render(table) {
         if (!table.isArray()) {
             throw new Error('Invalid type for chart renderer');

package/dist/html/vega_spec.d.ts

@@ -5,7 +5,7 @@ import { StyleDefaults, VegaRenderOptions } from '../data_styles';
 import { RendererOptions } from '../renderer_types';
 import { RendererFactory } from '../renderer_factory';
 import { Renderer } from '../renderer';
-declare type DataContainer = Array<unknown> | Record<string, unknown>;
+type DataContainer = Array<unknown> | Record<string, unknown>;
 export declare const DEFAULT_SPEC: Partial<lite.TopLevelSpec>;
 export declare const vegaSpecs: Record<string, lite.TopLevelSpec>;
 export declare function isDataContainer(a: unknown): a is DataContainer;

package/dist/html/vega_spec.js

@@ -101,7 +101,12 @@ const sizeLarge = {
 };
 // bar with text in the bars.
 const bar_SM = {
-    ...exports.DEFAULT_SPEC,
+    // TODO, the following causes errors in Typescript 5.
+    // config is the only property in DEFAULT_SPEC, just
+    // reference that directly and ponder the madness of
+    // Typescript another day.
+    // ...DEFAULT_SPEC,
+    config: exports.DEFAULT_SPEC.config,
     encoding: {
         y: { field: '#{1}', type: 'nominal', axis: null, sort: null },
     },

package/dist/renderer.d.ts

@@ -1,6 +1,6 @@
 import { DataColumn, Tag } from '@malloydata/malloy';
 import { RendererOptions } from './renderer_types';
-export declare type ChildRenderers = {
+export type ChildRenderers = {
     [fieldName: string]: Renderer;
 };
 export interface Renderer {

package/dist/renderer_factory.d.ts

@@ -2,7 +2,7 @@ import { Explore, Field, Tag } from '@malloydata/malloy';
 import { Renderer } from './renderer';
 import { DataRenderOptions, RenderDef, StyleDefaults } from './data_styles';
 import { RendererOptions } from './renderer_types';
-declare type TagPropertyExtractor<T extends DataRenderOptions> = (options: T, tagObj: Tag | undefined) => void;
+type TagPropertyExtractor<T extends DataRenderOptions> = (options: T, tagObj: Tag | undefined) => void;
 export declare abstract class RendererFactory<T extends DataRenderOptions> {
     readonly tagOptionExtractors: Record<string, TagPropertyExtractor<T>>;
     protected addExtractor(extractor: TagPropertyExtractor<T>, ...tags: string[]): void;

package/dist/renderer_types.d.ts

@@ -6,4 +6,4 @@ export interface RendererOptions {
     titleCase?: boolean;
     queryTimezone?: string;
 }
-export declare type DrillFunction = (drillQuery: string, target: HTMLElement, drillFilters: string[]) => void;
+export type DrillFunction = (drillQuery: string, target: HTMLElement, drillFilters: string[]) => void;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/render",
-  "version": "0.0.79-dev230818134709",
+  "version": "0.0.79-dev230822184259",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,7 +18,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.79-dev230818134709",
+    "@malloydata/malloy": "^0.0.79-dev230822184259",
     "@types/luxon": "^2.4.0",
     "lodash": "^4.17.20",
     "luxon": "^2.4.0",