@malloydata/render 0.0.292 → 0.0.294

package/dist/module/plugins/bar-chart/bar-chart-plugin.d.ts

@@ -0,0 +1,14 @@
+import { RenderPluginFactory, CoreVizPluginInstance } from '../../api/plugin-types';
+import { NestField } from '../../data_tree';
+import { BarChartSettings } from './get-bar_chart-settings';
+export interface BarChartPluginInstance extends CoreVizPluginInstance<BarChartPluginMetadata> {
+    getTopNSeries?: (maxSeries: number) => (string | number | boolean)[];
+    field: NestField;
+}
+interface BarChartPluginMetadata {
+    type: 'bar';
+    field: NestField;
+    settings: BarChartSettings;
+}
+export declare const BarChartPluginFactory: RenderPluginFactory<BarChartPluginInstance>;
+export {};

package/dist/module/plugins/bar-chart/bar-chart-settings.d.ts

@@ -0,0 +1,49 @@
+import { Channel, SeriesChannel, YChannel } from '../../component/types';
+import { JSONSchemaObject, JSONSchemaArray, JSONSchemaString, JSONSchemaBoolean, JSONSchemaOneOf } from '../../api/json-schema-types';
+export interface BarChartSettings extends Record<string, unknown> {
+    xChannel: Channel;
+    yChannel: YChannel;
+    seriesChannel: SeriesChannel;
+    isStack: boolean;
+    interactive: boolean;
+    hideReferences: boolean;
+    disableEmbedded: boolean;
+}
+export declare const defaultBarChartSettings: BarChartSettings;
+export interface IBarChartSettingsSchema extends JSONSchemaObject {
+    properties: {
+        xChannel: JSONSchemaObject & {
+            properties: {
+                fields: JSONSchemaArray & {
+                    items: JSONSchemaString;
+                };
+                type: JSONSchemaString;
+                independent: JSONSchemaString;
+            };
+        };
+        yChannel: JSONSchemaObject & {
+            properties: {
+                fields: JSONSchemaArray & {
+                    items: JSONSchemaString;
+                };
+                type: JSONSchemaString;
+                independent: JSONSchemaBoolean;
+            };
+        };
+        seriesChannel: JSONSchemaObject & {
+            properties: {
+                fields: JSONSchemaArray & {
+                    items: JSONSchemaString;
+                };
+                type: JSONSchemaString;
+                independent: JSONSchemaString;
+                limit: JSONSchemaOneOf;
+            };
+        };
+        isStack: JSONSchemaBoolean;
+        interactive: JSONSchemaBoolean;
+        hideReferences: JSONSchemaBoolean;
+        disableEmbedded: JSONSchemaBoolean;
+    };
+}
+export declare const barChartSettingsSchema: IBarChartSettingsSchema;

package/dist/module/plugins/bar-chart/generate-bar_chart-vega-spec.d.ts

@@ -0,0 +1,4 @@
+import { VegaChartProps } from '../../component/types';
+import { RenderMetadata } from '../../component/render-result-metadata';
+import { BarChartPluginInstance } from './bar-chart-plugin';
+export declare function generateBarChartVegaSpecV2(metadata: RenderMetadata, plugin: BarChartPluginInstance): VegaChartProps;

package/dist/module/plugins/bar-chart/get-bar_chart-settings.d.ts

@@ -0,0 +1,5 @@
+import { Tag } from '@malloydata/malloy-tag';
+import { NestField } from '../../data_tree';
+import { BarChartSettings } from './bar-chart-settings';
+export type { BarChartSettings };
+export declare function getBarChartSettings(explore: NestField, tagOverride?: Tag): BarChartSettings;

package/dist/module/plugins/bar-chart/settings-to-tag.d.ts

@@ -0,0 +1,3 @@
+import { Tag } from '@malloydata/malloy-tag';
+import { BarChartSettings } from './bar-chart-settings';
+export declare function barChartSettingsToTag(settings: BarChartSettings): Tag;

package/dist/module/plugins/dummy-dom-plugin.d.ts

@@ -0,0 +1,8 @@
+import { RenderPluginFactory, DOMRenderPluginInstance } from '../api/plugin-types';
+interface DummyDOMPluginMetadata {
+    type: 'dummy_dom';
+    fieldName: string;
+}
+type DummyDOMPluginInstance = DOMRenderPluginInstance<DummyDOMPluginMetadata>;
+export declare const DummyDOMPluginFactory: RenderPluginFactory<DummyDOMPluginInstance>;
+export {};

package/dist/module/plugins/dummy-plugin.d.ts

@@ -0,0 +1,8 @@
+import { RenderPluginFactory, SolidJSRenderPluginInstance } from '../api/plugin-types';
+interface DummyPluginMetadata {
+    type: 'dummy';
+    fieldName: string;
+}
+type DummyPluginInstance = SolidJSRenderPluginInstance<DummyPluginMetadata>;
+export declare const DummyPluginFactory: RenderPluginFactory<DummyPluginInstance>;
+export {};

package/dist/module/plugins/index.d.ts

@@ -0,0 +1,3 @@
+export { type ILineChartSettingsSchema, lineChartSettingsSchema, defaultLineChartSettings, type LineChartSettings, } from './line-chart/line-chart-settings';
+export { type IBarChartSettingsSchema, barChartSettingsSchema, defaultBarChartSettings, type BarChartSettings, } from './bar-chart/bar-chart-settings';
+export { BarChartPluginFactory, type BarChartPluginInstance, } from './bar-chart/bar-chart-plugin';

package/dist/module/plugins/line-chart/generate-line_chart-vega-spec.d.ts

@@ -0,0 +1,17 @@
+import { VegaChartProps } from '../../component/types';
+import { RenderMetadata } from '../../component/render-result-metadata';
+import { LineChartPluginInstance } from './line-chart-plugin';
+export interface LineChartSettings {
+    xChannel: {
+        fields: string[];
+    };
+    yChannel: {
+        fields: string[];
+    };
+    seriesChannel: {
+        fields: string[];
+    };
+    zeroBaseline: boolean;
+    interactive: boolean;
+}
+export declare function generateLineChartVegaSpecV2(metadata: RenderMetadata, plugin: LineChartPluginInstance): VegaChartProps;

package/dist/module/plugins/line-chart/get-line_chart-settings.d.ts

@@ -0,0 +1,5 @@
+import { Tag } from '@malloydata/malloy-tag';
+import { NestField } from '../../data_tree';
+import { LineChartSettings, LineChartPluginOptions } from './line-chart-settings';
+export type { LineChartSettings, LineChartPluginOptions };
+export declare function getLineChartSettings(explore: NestField, tagOverride?: Tag, jsDefaults?: Partial<LineChartSettings>, modelTag?: Tag): LineChartSettings;

package/dist/module/plugins/line-chart/line-chart-plugin.d.ts

@@ -0,0 +1,21 @@
+import { RenderPluginFactory, CoreVizPluginInstance } from '../../api/plugin-types';
+import { Field, NestField } from '../../data_tree';
+import { LineChartSettings } from './get-line_chart-settings';
+interface LineChartPluginMetadata {
+    type: 'line';
+    field: NestField;
+    settings: LineChartSettings;
+}
+interface SeriesStats {
+    sum: number;
+    count: number;
+    avg: number;
+}
+interface LineChartPluginInstance extends CoreVizPluginInstance<LineChartPluginMetadata> {
+    field: NestField;
+    seriesStats: Map<string, SeriesStats>;
+    getTopNSeries: (maxSeries: number) => (string | number | boolean)[];
+    syntheticSeriesField?: Field;
+}
+export declare const LineChartPluginFactory: RenderPluginFactory<LineChartPluginInstance>;
+export type { LineChartPluginInstance };

package/dist/module/plugins/line-chart/line-chart-settings.d.ts

@@ -0,0 +1,52 @@
+import { Channel, SeriesChannel, YChannel } from '../../component/types';
+import { JSONSchemaObject, JSONSchemaArray, JSONSchemaString, JSONSchemaBoolean, JSONSchemaOneOf, JSONSchemaFieldString } from '../../api/json-schema-types';
+export interface LineChartSettings extends Record<string, unknown> {
+    xChannel: Channel;
+    yChannel: YChannel;
+    seriesChannel: SeriesChannel;
+    zeroBaseline: boolean;
+    interactive: boolean;
+    disableEmbedded: boolean;
+    mode?: 'yoy' | 'normal';
+}
+export interface LineChartPluginOptions {
+    defaults?: Partial<LineChartSettings>;
+}
+export declare const defaultLineChartSettings: LineChartSettings;
+export interface ILineChartSettingsSchema extends JSONSchemaObject {
+    properties: {
+        xChannel: JSONSchemaObject & {
+            properties: {
+                fields: JSONSchemaArray & {
+                    items: JSONSchemaFieldString;
+                };
+                type: JSONSchemaString;
+                independent: JSONSchemaString;
+            };
+        };
+        yChannel: JSONSchemaObject & {
+            properties: {
+                fields: JSONSchemaArray & {
+                    items: JSONSchemaFieldString;
+                };
+                type: JSONSchemaString;
+                independent: JSONSchemaBoolean;
+            };
+        };
+        seriesChannel: JSONSchemaObject & {
+            properties: {
+                fields: JSONSchemaArray & {
+                    items: JSONSchemaFieldString;
+                };
+                type: JSONSchemaString;
+                independent: JSONSchemaString;
+                limit: JSONSchemaOneOf;
+            };
+        };
+        zeroBaseline: JSONSchemaBoolean;
+        interactive: JSONSchemaBoolean;
+        disableEmbedded: JSONSchemaBoolean;
+        mode: JSONSchemaString;
+    };
+}
+export declare const lineChartSettingsSchema: ILineChartSettingsSchema;

package/dist/module/plugins/line-chart/settings-to-tag.d.ts

@@ -0,0 +1,3 @@
+import { Tag } from '@malloydata/malloy-tag';
+import { LineChartSettings } from './line-chart-settings';
+export declare function lineChartSettingsToTag(settings: LineChartSettings): Tag;

package/dist/module/registry/types.d.ts

@@ -0,0 +1,15 @@
+import { Field } from '../data_tree';
+import { RenderPluginInstance } from '../api/plugin-types';
+export type RenderFieldProps<T = unknown> = {
+    field: Field;
+    renderAs: string;
+    sizingStrategy: string;
+    properties: T;
+    errors: Error[];
+};
+export type RenderFieldRegistryEntry = {
+    field: Field;
+    renderProperties: RenderFieldProps;
+    plugins: RenderPluginInstance[];
+};
+export type RenderFieldRegistry = Map<string, RenderFieldRegistryEntry>;

package/dist/module/render-field-metadata.d.ts

@@ -0,0 +1,18 @@
+import { Field, RootField } from './data_tree';
+import { RenderPluginFactory, RenderPluginInstance } from './api/plugin-types';
+import { RenderFieldRegistryEntry } from './registry/types';
+import type * as Malloy from '@malloydata/malloy-interfaces';
+export declare class RenderFieldMetadata {
+    private registry;
+    private rootField;
+    private pluginRegistry;
+    private pluginOptions;
+    constructor(result: Malloy.Result, pluginRegistry?: RenderPluginFactory[], pluginOptions?: Record<string, unknown>);
+    private instantiatePluginsForField;
+    private registerFields;
+    private populateRenderFieldProperties;
+    getAllFields(): Field[];
+    getRootField(): RootField;
+    getPluginsForField(fieldKey: string): RenderPluginInstance[];
+    getFieldEntry(fieldKey: string): RenderFieldRegistryEntry | undefined;
+}

package/dist/{stories → module/stories}/themes.stories.d.ts

@@ -1,5 +1,4 @@
-import type { Meta } from '@storybook/html';
-import './themes.css';
+import { Meta } from '@storybook/html';
 declare const meta: Meta;
 export default meta;
 export declare const ModelThemeOverride: {

package/dist/{stories → module/stories}/util.d.ts

@@ -1,6 +1,6 @@
-import type { LoaderFunction, Args } from '@storybook/types';
-import type { HtmlRenderer } from '@storybook/html';
-import type { DuckDBWASMConnection } from '@malloydata/db-duckdb/wasm';
+import { LoaderFunction, Args } from '@storybook/types';
+import { HtmlRenderer } from '@storybook/html';
+import { DuckDBWASMConnection } from '@malloydata/db-duckdb/wasm';
 import type * as Malloy from '@malloydata/malloy-interfaces';
 export type QueryOptions = {
     script: string;
@@ -12,7 +12,7 @@ export declare function createLoader(script: string): LoaderFunction<HtmlRendere
 export declare function loadModel({ script, connection, }: {
     script: string;
     connection: Promise<DuckDBWASMConnection>;
-}): Promise<import("@malloydata/malloy").ModelMaterializer>;
+}): Promise<import('@malloydata/malloy').ModelMaterializer>;
 export declare function runQuery({ script, source, view, connection, }: QueryOptions): Promise<Malloy.Result>;
 type RenderOptions = QueryOptions & {
     classes?: '';

package/dist/{stories → module/stories}/vega-config-override.stories.d.ts

@@ -1,5 +1,4 @@
-import type { Meta } from '@storybook/html';
-import './themes.css';
+import { Meta } from '@storybook/html';
 declare const meta: Meta;
 export default meta;
 export declare const BarChart: {

package/dist/module/stories/wrapped-table.stories.d.ts

@@ -0,0 +1,9 @@
+import { Meta } from '@storybook/html';
+declare const meta: Meta;
+export default meta;
+export declare const WrappedTable: {
+    args: {
+        source: string;
+        view: string;
+    };
+};

package/dist/{util.d.ts → module/util.d.ts}

@@ -1,9 +1,10 @@
-import type * as Malloy from '@malloydata/malloy-interfaces';
 import { Tag } from '@malloydata/malloy-tag';
 import { DurationUnit } from './html/data_styles';
-import type { Cell, NestField } from './data_tree';
-import { Field } from './data_tree';
+import { Cell, NestField, Field } from './data_tree';
+import type * as Malloy from '@malloydata/malloy-interfaces';
 export declare const NULL_SYMBOL = "\u2205";
+type UnionToIntersection<U> = (U extends unknown ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
+export declare function deepMerge<T extends Record<string, unknown>[]>(...sources: [...T]): UnionToIntersection<T[number]>;
 export declare function tagFromAnnotations(annotations: Malloy.Annotation[] | undefined, prefix?: string): Tag;
 export declare function renderTagFromAnnotations(annotations: Malloy.Annotation[] | undefined): Tag;
 export declare function getTextWidthCanvas(text: string, font: string, canvasToUse?: HTMLCanvasElement): number;
@@ -17,7 +18,13 @@ export declare function formatTimeUnit(value: number, unit: DurationUnit, option
 export declare function getText(field: Field, value: number, options: {
     durationUnit?: string;
 }): string | null;
-export declare function renderTimeString(value: Date, isDate: boolean, timeframe?: string): string;
+export interface RenderTimeStringOptions {
+    isDate?: boolean;
+    timeframe?: string;
+    extractFormat?: 'month-day' | 'quarter' | 'month' | 'week' | 'day';
+}
+export declare function renderTimeString(value: Date, options?: RenderTimeStringOptions): string;
 export declare function valueToMalloy(value: Cell): string;
 export declare function walkFields(e: NestField, cb: (f: Field) => void): void;
 export declare function notUndefined<T>(x: T | undefined): x is T;
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/render",
-  "version": "0.0.292",
+  "version": "0.0.294",
   "license": "MIT",
   "main": "dist/module/index.umd.js",
   "types": "dist/index.d.ts",
@@ -14,26 +14,24 @@
   },
   "exports": {
     ".": {
-      "types": "./dist/index.d.ts",
+      "types": "./dist/module/index.d.ts",
       "default": "./dist/module/index.umd.js"
     }
   },
   "scripts": {
     "test": "jest --config=../../jest.config.js",
-    "build": "npm run build-types && npm run build-source",
     "clean": "tsc --build --clean",
     "prepublishOnly": "npm run build",
     "storybook": "rm -rf ./node_modules/.cache && storybook dev -p 6006",
     "storybook-windows": "del /s /q .\\node_modules\\.cache && storybook dev -p 6006",
     "build-storybook": "storybook build",
-    "build-source": "vite build --outDir 'dist/module' --config vite.config.ts",
-    "build-types": "tsc --build --declaration --emitDeclarationOnly",
+    "build": "vite build --outDir 'dist/module' --config vite.config.mts",
     "generate-flow": "ts-node ../../scripts/gen-flow.ts"
   },
   "dependencies": {
-    "@malloydata/malloy": "0.0.292",
-    "@malloydata/malloy-interfaces": "0.0.292",
-    "@malloydata/malloy-tag": "0.0.292",
+    "@malloydata/malloy": "0.0.294",
+    "@malloydata/malloy-interfaces": "0.0.294",
+    "@malloydata/malloy-tag": "0.0.294",
     "@tanstack/solid-virtual": "^3.10.4",
     "lodash": "^4.17.20",
     "luxon": "^2.4.0",
@@ -44,7 +42,7 @@
     "vega-lite": "^5.2.0"
   },
   "devDependencies": {
-    "@malloydata/db-duckdb": "0.0.292",
+    "@malloydata/db-duckdb": "0.0.294",
     "@storybook/addon-essentials": "^8.5.8",
     "@storybook/addon-interactions": "^8.5.8",
     "@storybook/addon-links": "^8.5.8",
@@ -60,6 +58,8 @@
     "esbuild": "0.19.11",
     "storybook": "^8.5.8",
     "vite": "^5.1.5",
-    "vite-plugin-solid": "^2.10.1"
+    "vite-plugin-dts": "^4.5.4",
+    "vite-plugin-solid": "^2.10.1",
+    "vite-tsconfig-paths": "^5.1.4"
   }
 }

package/{vite.config.base.ts → vite.config.base.mts}

@@ -1,10 +1,19 @@
 import type {PluginOption} from 'vite';
 import {defineConfig} from 'vite';
 import solidPlugin from 'vite-plugin-solid';
+import tsconfigPaths from 'vite-tsconfig-paths';
+import dts from 'vite-plugin-dts';
 import path from 'path';
 
 export default defineConfig({
-  plugins: [viteStripMalloyDevToolsPlugin(), solidPlugin()],
+  plugins: [
+    viteStripMalloyDevToolsPlugin(),
+    solidPlugin(),
+    tsconfigPaths(),
+    dts({
+      insertTypesEntry: true,
+    }),
+  ],
   optimizeDeps: {
     include: ['@malloydata/malloy'],
   },
@@ -21,6 +30,7 @@ export default defineConfig({
     commonjsOptions: {
       include: [/malloy/, /node_modules/],
     },
+    sourcemap: process.env.NODE_ENV === 'development',
   },
   define: {
     'process.env': {},

package/{vite.config.ts → vite.config.mts}

@@ -1,5 +1,5 @@
 import {mergeConfig} from 'vite';
-import baseViteConfig from './vite.config.base';
+import baseViteConfig from './vite.config.base.mts';
 
 export default mergeConfig(baseViteConfig, {
   build: {

package/dist/component/bar-chart/generate-bar_chart-vega-spec.d.ts

@@ -1,4 +0,0 @@
-import type { VegaChartProps } from '../types';
-import type { RepeatedRecordField } from '../../data_tree';
-import type { RenderMetadata } from '../render-result-metadata';
-export declare function generateBarChartVegaSpec(explore: RepeatedRecordField, metadata: RenderMetadata): VegaChartProps;

package/dist/component/line-chart/generate-line_chart-vega-spec.d.ts

@@ -1,4 +0,0 @@
-import type { VegaChartProps } from '../types';
-import type { NestField } from '../../data_tree';
-import type { RenderMetadata } from '../render-result-metadata';
-export declare function generateLineChartVegaSpec(explore: NestField, metadata: RenderMetadata): VegaChartProps;

package/dist/component/line-chart/get-line_chart-settings.d.ts

@@ -1,11 +0,0 @@
-import type { Tag } from '@malloydata/malloy-tag';
-import type { Channel } from '../types';
-import type { NestField } from '../../data_tree';
-export type LineChartSettings = {
-    xChannel: Channel;
-    yChannel: Channel;
-    seriesChannel: Channel;
-    zeroBaseline: boolean;
-    interactive: boolean;
-};
-export declare function getLineChartSettings(explore: NestField, tagOverride?: Tag): LineChartSettings;

package/dist/component/result-context.d.ts

@@ -1,4 +0,0 @@
-import type { Accessor } from 'solid-js';
-import type { RenderMetadata } from './render-result-metadata';
-export declare const ResultContext: import("solid-js").Context<Accessor<RenderMetadata> | undefined>;
-export declare const useResultContext: () => RenderMetadata;

package/dist/data_tree/plugins.d.ts

@@ -1,14 +0,0 @@
-import type { Tag } from '@malloydata/malloy-tag';
-import type { Field, NestField } from './fields';
-import type { NestCell } from './cells';
-import type { FieldType } from './types';
-export type RenderPluginInstance = {
-    name: string;
-    processData(field: NestField, cell: NestCell): void;
-};
-export type RenderPlugin<T extends RenderPluginInstance = RenderPluginInstance> = {
-    name: string;
-    matches: (fieldTag: Tag, fieldType: FieldType) => boolean;
-    plugin: RenderPluginFactory<T>;
-};
-export type RenderPluginFactory<T extends RenderPluginInstance> = (field: Field) => T;

package/dist/index.d.ts

@@ -1,7 +0,0 @@
-export { HTMLView, JSONView } from './html/html_view';
-export * from './html/data_styles';
-export type { MalloyRenderProps } from './component/render';
-export { MalloyRenderer } from '@/api/malloy-renderer';
-export type { MalloyViz } from '@/api/malloy-viz';
-export type { MalloyRendererOptions, RenderFieldMetadata } from '@/api/types';
-export type { DrillData, MalloyClickEventPayload, TableConfig, DashboardConfig, VegaConfigHandler, } from '@/component/types';

package/dist/plugins/line-chart-series-plugin.d.ts

@@ -1,7 +0,0 @@
-import type { RenderPlugin, RenderPluginInstance } from '../data_tree';
-type LineChartPluginInstance = {
-    getTopNSeries: (n: number) => (string | number | boolean)[];
-} & RenderPluginInstance;
-export declare const LineChartSeriesPluginFactory: RenderPlugin<LineChartPluginInstance>;
-export type LineChartSeriesPluginInstance = ReturnType<typeof LineChartSeriesPluginFactory.plugin>;
-export {};

package/dist/render-field-metadata.d.ts

@@ -1,33 +0,0 @@
-import { type Field, RootField, RecordField, ArrayField, type NestField, RepeatedRecordField, type FieldRegistry as DataTreeFieldRegistry } from '@/data_tree';
-import type * as Malloy from '@malloydata/malloy-interfaces';
-type RenderFieldProps<T = unknown> = {
-    field: Field;
-    renderAs: string;
-    sizingStrategy: string;
-    properties: T;
-    errors: Error[];
-};
-type RenderFieldRegistryEntry = {
-    field: Field;
-    renderProperties: RenderFieldProps;
-    plugins: never[];
-};
-interface FieldRegistry extends DataTreeFieldRegistry {
-    rendererFields: Map<string, RenderFieldRegistryEntry>;
-}
-export declare class RenderFieldMetadata {
-    private registry;
-    private legacyRegistry;
-    private rootField;
-    constructor(result: Malloy.Result);
-    private registerFields;
-    private populateRenderFieldProperties;
-    getField(path: string[]): Field | undefined;
-    getAllFields(): Field[];
-    getRootField(): RootField;
-    getFieldsByType<T extends Field, F extends Malloy.DimensionInfo>(type: new (field: F, parent: NestField | undefined, registry?: FieldRegistry) => T): T[];
-    getRecordFields(): RecordField[];
-    getArrayFields(): ArrayField[];
-    getRepeatedRecordFields(): RepeatedRecordField[];
-}
-export {};