@malloydata/render 0.0.71-dev230811214741 → 0.0.71

package/dist/html/container.d.ts

@@ -1,4 +1,4 @@
-import { Explore, Tags } from '@malloydata/malloy';
+import { Explore, TagParse } from '@malloydata/malloy';
 import { StyleDefaults } from '../data_styles';
 import { ChildRenderers, RenderTree } from '../renderer';
 import { RendererOptions } from '../renderer_types';
@@ -6,5 +6,5 @@ export declare abstract class ContainerRenderer extends RenderTree {
     childRenderers: ChildRenderers;
     protected abstract childrenStyleDefaults: StyleDefaults;
     get defaultStylesForChildren(): StyleDefaults;
-    static make<Type extends ContainerRenderer>(c: new (document: Document, options: RendererOptions, tags?: Tags) => Type, document: Document, exploreField: Explore, options: RendererOptions, tags?: Tags): Type;
+    static make<Type extends ContainerRenderer>(c: new (document: Document, options: RendererOptions, tags?: TagParse) => Type, document: Document, exploreField: Explore, options: RendererOptions, tags?: TagParse): Type;
 }

package/dist/html/currency.js

@@ -58,9 +58,9 @@ exports.HTMLCurrencyRenderer = HTMLCurrencyRenderer;
 class CurrencyRendererFactory extends renderer_factory_1.RendererFactory {
     constructor() {
         super();
-        this.addExtractor((options, value) => {
+        this.addExtractor((options, tag) => {
             var _a;
-            options.currency = (_a = value) !== null && _a !== void 0 ? _a : data_styles_1.Currency.Dollars;
+            options.currency = (_a = tag === null || tag === void 0 ? void 0 : tag.text()) !== null && _a !== void 0 ? _a : data_styles_1.Currency.Dollars;
         }, this.rendererName);
     }
     create(document, _styleDefaults, _rendererOptions, _field, options) {

package/dist/html/data_volume.js

@@ -76,10 +76,10 @@ HTMLDataVolumeRenderer.tbMultiplier = _a.gbMultiplier * _a.kbMultiplier;
 class DataVolumeRendererFactory extends renderer_factory_1.RendererFactory {
     constructor() {
         super();
-        this.addExtractor((options, value) => {
+        this.addExtractor((options, tag) => {
             var _b;
             options.data_volume_unit =
-                (_b = value) !== null && _b !== void 0 ? _b : data_styles_1.DataVolumeUnit.Bytes;
+                (_b = tag === null || tag === void 0 ? void 0 : tag.text()) !== null && _b !== void 0 ? _b : data_styles_1.DataVolumeUnit.Bytes;
         }, this.rendererName);
     }
     create(document, _styleDefaults, _rendererOptions, _field, options) {

package/dist/html/duration.js

@@ -92,7 +92,8 @@ class DurationRendererFactory extends renderer_factory_1.RendererFactory {
         super();
         this.addExtractor((options, value) => {
             var _a;
-            options.duration_unit = (_a = value) !== null && _a !== void 0 ? _a : data_styles_1.DurationUnit.Seconds;
+            options.duration_unit =
+                (_a = value === null || value === void 0 ? void 0 : value.text()) !== null && _a !== void 0 ? _a : data_styles_1.DurationUnit.Seconds;
         }, this.rendererName);
     }
     create(document, _styleDefaults, _rendererOptions, _field, options) {

package/dist/html/html_view.d.ts

@@ -1,4 +1,4 @@
-import { DataArray, Explore, Field, Result, Tags } from '@malloydata/malloy';
+import { DataArray, Explore, Field, Result, TagParse } from '@malloydata/malloy';
 import { StyleDefaults } from '../data_styles';
 import { Renderer } from '../renderer';
 import { RendererOptions } from '../renderer_types';
@@ -12,4 +12,4 @@ export declare class JSONView {
     constructor(document: Document);
     render(table: DataArray): Promise<HTMLElement>;
 }
-export declare function makeRenderer(field: Explore | Field, document: Document, options: RendererOptions, styleDefaults: StyleDefaults, queryTimezone: string | undefined, tags?: Tags): Renderer;
+export declare function makeRenderer(field: Explore | Field, document: Document, options: RendererOptions, styleDefaults: StyleDefaults, queryTimezone: string | undefined, tags?: TagParse): Renderer;

package/dist/html/html_view.js

@@ -39,7 +39,7 @@ class HTMLView {
         const table = result.data;
         const renderer = makeRenderer(table.field, this.document, options, {
             size: 'large',
-        }, table.field.structDef.queryTimezone, result.getTags());
+        }, table.field.structDef.queryTimezone, result.tagParse());
         try {
             // TODO Implement row streaming capability for some renderers: some renderers should be usable
             //      as a builder with `begin(field: StructDef)`, `row(field: StructDef, row: QueryDataRow)`,
@@ -145,7 +145,7 @@ function isContainer(field) {
 function makeRenderer(field, document, options, styleDefaults, queryTimezone, tags) {
     const renderDef = getRendererOptions(field, options.dataStyles);
     options.dataStyles[field.name] = renderDef;
-    const renderer = new main_renderer_factory_1.MainRendererFactory().create(renderDef, tags === null || tags === void 0 ? void 0 : tags.getMalloyTags(), document, styleDefaults, options, field, queryTimezone);
+    const renderer = new main_renderer_factory_1.MainRendererFactory().create(renderDef, tags, document, styleDefaults, options, field, queryTimezone);
     if (renderer) {
         return renderer;
     }
@@ -172,7 +172,7 @@ function makeContainerRenderer(cType, document, explore, options, tags) {
     const c = container_1.ContainerRenderer.make(cType, document, explore, options, tags);
     const result = {};
     explore.intrinsicFields.forEach((field) => {
-        result[field.name] = makeRenderer(field, document, options, c.defaultStylesForChildren, explore.queryTimezone, field.getTags());
+        result[field.name] = makeRenderer(field, document, options, c.defaultStylesForChildren, explore.queryTimezone, field.tagParse());
     });
     c.childRenderers = result;
     return c;

package/dist/html/number.js

@@ -52,9 +52,9 @@ exports.HTMLNumberRenderer = HTMLNumberRenderer;
 class NumberRendererFactory extends renderer_factory_1.RendererFactory {
     constructor() {
         super();
-        this.addExtractor((options, value) => {
-            options.value_format = value;
-        }, this.rendererName, 'value_format');
+        this.addExtractor((options, tagObj) => {
+            options.value_format = tagObj === null || tagObj === void 0 ? void 0 : tagObj.text();
+        }, this.rendererName, 'format');
     }
     activates(field) {
         return (field.hasParentExplore() &&

package/dist/html/table.d.ts

@@ -5,11 +5,11 @@ import { Renderer } from '../renderer';
 export declare class HTMLTableRenderer extends ContainerRenderer {
     protected childrenStyleDefaults: StyleDefaults;
     render(table: DataColumn): Promise<HTMLElement>;
-    calculatePivotDimensions(table: DataColumn): {
+    calculatePivotDimensions(table: DataColumn, userSpecifiedDimensions?: Array<string>): {
         dimensions: SortableField[];
         nonDimensions: SortableField[];
     };
-    generatePivotedCells(table: DataColumn, shouldTranspose: boolean): Promise<Map<string, Map<string, HTMLTableCellElement>>>;
+    generatePivotedCells(table: DataColumn, shouldTranspose: boolean, userSpecifiedDimensions?: Array<string>): Promise<Map<string, Map<string, HTMLTableCellElement>>>;
     generateNoValueCell(field: Field, shouldTranspose: boolean): HTMLTableCellElement;
     createCellAndRender(childRenderer: Renderer, value: DataColumn, shouldTranspose: boolean): Promise<HTMLTableCellElement>;
     createEmptyHeaderCell(): HTMLTableCellElement;

package/dist/html/table.js

@@ -23,6 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.HTMLTableRenderer = void 0;
+const malloy_1 = require("@malloydata/malloy");
 const drill_1 = require("../drill");
 const container_1 = require("./container");
 const number_1 = require("./number");
@@ -44,9 +45,10 @@ class PivotedField {
     }
 }
 class PivotedColumnField {
-    constructor(pivotedField, field) {
+    constructor(pivotedField, field, userDefinedPivotDimensions) {
         this.pivotedField = pivotedField;
         this.field = field;
+        this.userDefinedPivotDimensions = userDefinedPivotDimensions;
     }
     isPivotedColumnField() {
         return this instanceof PivotedColumnField;
@@ -60,7 +62,7 @@ class HTMLTableRenderer extends container_1.ContainerRenderer {
         };
     }
     async render(table) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f;
         if (table.isNull()) {
             return this.document.createElement('span');
         }
@@ -85,9 +87,14 @@ class HTMLTableRenderer extends container_1.ContainerRenderer {
             const shouldPivot = childRenderer instanceof HTMLTableRenderer &&
                 (0, utils_1.tagIsPresent)(childRenderer.tags, 'pivot');
             if (shouldPivot) {
-                const pivotedFields = new Map();
+                const dimensionsTag = (_d = (_c = (_b = (_a = childRenderer.tags) === null || _a === void 0 ? void 0 : _a.tag) === null || _b === void 0 ? void 0 : _b.properties) === null || _c === void 0 ? void 0 : _c['pivot'].properties) === null || _d === void 0 ? void 0 : _d['dimensions'];
+                const userDefinedDimensions = dimensionsTag
+                    ? (_e = new malloy_1.Tag(dimensionsTag)
+                        .array()) === null || _e === void 0 ? void 0 : _e.map(dimension => dimension.text()).filter(dimension => dimension !== undefined).map(dimension => dimension)
+                    : undefined;
                 let dimensions = undefined;
                 let nonDimensions = [];
+                const pivotedFields = new Map();
                 for (const row of table) {
                     const dc = row.cell(field);
                     if (dc.isNull()) {
@@ -97,7 +104,7 @@ class HTMLTableRenderer extends container_1.ContainerRenderer {
                         throw new Error(`Can not pivot field ${field.name}.`);
                     }
                     if (!dimensions) {
-                        const dimensionsResult = childRenderer.calculatePivotDimensions(dc);
+                        const dimensionsResult = childRenderer.calculatePivotDimensions(dc, userDefinedDimensions);
                         dimensions = dimensionsResult.dimensions;
                         nonDimensions = dimensionsResult.nonDimensions;
                     }
@@ -141,7 +148,7 @@ class HTMLTableRenderer extends container_1.ContainerRenderer {
                 });
                 for (const pf of sortedPivotedFields) {
                     for (const nonDimension of nonDimensions) {
-                        columnFields.push(new PivotedColumnField(pf, nonDimension.field));
+                        columnFields.push(new PivotedColumnField(pf, nonDimension.field, userDefinedDimensions));
                         cells[rowIndex][columnIndex] = childRenderer.createHeaderCell(nonDimension.field, shouldTranspose);
                         columnIndex++;
                     }
@@ -223,12 +230,12 @@ class HTMLTableRenderer extends container_1.ContainerRenderer {
                     const childTableRecord = row.cell(field.pivotedField.parentField);
                     await (0, utils_1.yieldTask)();
                     if (field.pivotedField.key !== currentPivotedFieldKey) {
-                        pivotedCells = await childRenderer.generatePivotedCells(childTableRecord, shouldTranspose);
+                        pivotedCells = await childRenderer.generatePivotedCells(childTableRecord, shouldTranspose, field.userDefinedPivotDimensions);
                         currentPivotedFieldKey = field.pivotedField.key;
                     }
                     const pfKey = field.pivotedField.key;
                     if (pivotedCells.has(pfKey) &&
-                        ((_a = pivotedCells.get(pfKey)) === null || _a === void 0 ? void 0 : _a.has(field.field.name))) {
+                        ((_f = pivotedCells.get(pfKey)) === null || _f === void 0 ? void 0 : _f.has(field.field.name))) {
                         cells[rowIndex][columnIndex] = pivotedCells
                             .get(pfKey)
                             .get(field.field.name);
@@ -297,12 +304,11 @@ class HTMLTableRenderer extends container_1.ContainerRenderer {
     `;
         return tableElement;
     }
-    calculatePivotDimensions(table) {
+    calculatePivotDimensions(table, userSpecifiedDimensions) {
         if (!table.isArray() && !table.isRecord()) {
             throw new Error(`Could not pivot ${table.field.name}`);
         }
         let dimensions = undefined;
-        const userSpecifiedDimensions = (0, utils_1.parseCommaSeparatedParameterTagValue)(this.tags, 'pivot_dimensions');
         if (userSpecifiedDimensions) {
             dimensions = table.field.allFieldsWithOrder.filter(f => userSpecifiedDimensions.indexOf(f.field.name) >= 0);
             if (dimensions.length !== userSpecifiedDimensions.length) {
@@ -323,7 +329,7 @@ class HTMLTableRenderer extends container_1.ContainerRenderer {
         }
         return { dimensions, nonDimensions };
     }
-    async generatePivotedCells(table, shouldTranspose) {
+    async generatePivotedCells(table, shouldTranspose, userSpecifiedDimensions) {
         const result = new Map();
         if (table.isNull()) {
             return result;
@@ -331,7 +337,7 @@ class HTMLTableRenderer extends container_1.ContainerRenderer {
         if (!table.isArray() && !table.isRecord()) {
             throw new Error(`Could not pivot ${table.field.name}`);
         }
-        const { dimensions, nonDimensions } = this.calculatePivotDimensions(table);
+        const { dimensions, nonDimensions } = this.calculatePivotDimensions(table, userSpecifiedDimensions);
         for (const row of table) {
             const pf = new PivotedField(table.field, dimensions.map(f => row.cell(f.field.name)), nonDimensions.length);
             const renderedCells = new Map();

package/dist/html/utils.d.ts

@@ -1,4 +1,4 @@
-import { DateTimeframe, Field, Tags, TimestampTimeframe } from '@malloydata/malloy';
+import { DateTimeframe, Field, TagParse, Tags, TimestampTimeframe } from '@malloydata/malloy';
 import { RenderDef } from '../data_styles';
 import { RendererOptions } from '../renderer_types';
 export declare function getColorScale(type: 'temporal' | 'ordinal' | 'quantitative' | 'nominal' | undefined, isRectMark: boolean, hasOverlappingText?: boolean): {
@@ -11,6 +11,6 @@ export declare function createErrorElement(document: Document, error: string | E
 export declare function createNullElement(document: Document): HTMLElement;
 export declare function createDrillIcon(document: Document): HTMLElement;
 export declare function formatTitle(options: RendererOptions, field: Field, renderDef?: RenderDef | undefined, timezone?: string): string;
-export declare function tagIsPresent(tags: Tags | undefined, tagToCheck: string): boolean;
+export declare function tagIsPresent(tags: TagParse | undefined, tagToCheck: string): boolean;
 export declare function parameterTagValue(tags: Tags | undefined, tagToGetValue: string): string | undefined;
 export declare function parseCommaSeparatedParameterTagValue(tags: Tags | undefined, tagToGetValue: string): string[] | undefined;

package/dist/html/utils.js

@@ -228,8 +228,9 @@ function formatTitle(options, field, renderDef, timezone) {
 }
 exports.formatTitle = formatTitle;
 function tagIsPresent(tags, tagToCheck) {
-    const tagProperty = tags === null || tags === void 0 ? void 0 : tags.getMalloyTags().properties[tagToCheck];
-    return tagProperty !== undefined && tagProperty !== false;
+    var _a, _b;
+    const tagProperty = (_b = (_a = tags === null || tags === void 0 ? void 0 : tags.tag) === null || _a === void 0 ? void 0 : _a.properties) === null || _b === void 0 ? void 0 : _b[tagToCheck];
+    return tagProperty !== undefined;
 }
 exports.tagIsPresent = tagIsPresent;
 function parameterTagValue(tags, tagToGetValue) {

package/dist/main_renderer_factory.d.ts

@@ -1,4 +1,4 @@
-import { Field, Explore, MalloyTags, MalloyTagProperties } from '@malloydata/malloy';
+import { Field, Explore, TagParse } from '@malloydata/malloy';
 import { DataRenderOptions, RenderDef, StyleDefaults } from './data_styles';
 import { Renderer } from './renderer';
 import { RendererFactory } from './renderer_factory';
@@ -29,7 +29,7 @@ import { DataVolumeRendererFactory } from './html/data_volume';
 import { DurationRendererFactory } from './html/duration';
 export declare class MainRendererFactory {
     static renderFactories: (JSONRendererFactory | TextRendererFactory | NumberRendererFactory | ShapeMapRendererFactory | PointMapRendererFactory | ImageRendererFactory | SegmentMapRendererFactory | VegaRendererFactory | LineChartRendererFactory | SparkLineRendererFactory | BarChartRendererFactory | BarSparkLineRendererFactory | AreaSparkLineRendererFactory | ColumnSparkLineRendererFactory | ScatterChartRendererFactory | DateRendererFactory | CurrencyRendererFactory | PercentRendererFactory | BytesRendererFactory | BooleanRendererFactory | LinkRendererFactory | UnsupportedRendererFactory | DataVolumeRendererFactory | DurationRendererFactory)[];
-    create(renderDef: RenderDef | undefined, tags: MalloyTags | undefined, document: Document, styleDefaults: StyleDefaults, rendererOptions: RendererOptions, field: Field | Explore, timezone?: string | undefined): Renderer | undefined;
+    create(renderDef: RenderDef | undefined, tags: TagParse | undefined, document: Document, styleDefaults: StyleDefaults, rendererOptions: RendererOptions, field: Field | Explore, timezone?: string | undefined): Renderer | undefined;
     matchesRenderDef(renderDef: RenderDef | undefined, factory: RendererFactory<DataRenderOptions>): boolean | "" | undefined;
-    matchesTag(properties: MalloyTagProperties, factory: RendererFactory<DataRenderOptions>): string | boolean | undefined;
+    matchesTag(tagParse: TagParse | undefined, factory: RendererFactory<DataRenderOptions>): boolean | "" | undefined;
 }

package/dist/main_renderer_factory.js

@@ -27,12 +27,9 @@ const data_volume_1 = require("./html/data_volume");
 const duration_1 = require("./html/duration");
 class MainRendererFactory {
     create(renderDef, tags, document, styleDefaults, rendererOptions, field, timezone) {
-        var _a;
-        const tagProperties = (_a = tags === null || tags === void 0 ? void 0 : tags.properties) !== null && _a !== void 0 ? _a : {};
         let factory;
         for (const f of MainRendererFactory.renderFactories) {
-            if (((this.matchesRenderDef(renderDef, f) ||
-                this.matchesTag(tagProperties, f)) &&
+            if (((this.matchesRenderDef(renderDef, f) || this.matchesTag(tags, f)) &&
                 f.isValidMatch(field)) ||
                 f.activates(field)) {
                 factory = f;
@@ -40,15 +37,19 @@ class MainRendererFactory {
                 break;
             }
         }
-        return factory === null || factory === void 0 ? void 0 : factory.create(document, styleDefaults, rendererOptions, field, renderDef || factory.parseTagParameters(tagProperties) || {}, timezone);
+        return factory === null || factory === void 0 ? void 0 : factory.create(document, styleDefaults, rendererOptions, field, renderDef || factory.parseTagParameters(tags) || {}, timezone);
     }
     matchesRenderDef(renderDef, factory) {
         return (renderDef &&
             factory.rendererName &&
             renderDef.renderer === factory.rendererName);
     }
-    matchesTag(properties, factory) {
-        return (properties && factory.rendererName && properties[factory.rendererName]);
+    matchesTag(tagParse, factory) {
+        var _a;
+        const properties = (_a = tagParse === null || tagParse === void 0 ? void 0 : tagParse.tag) === null || _a === void 0 ? void 0 : _a.properties;
+        return (properties &&
+            factory.rendererName &&
+            properties[factory.rendererName] !== undefined);
     }
 }
 exports.MainRendererFactory = MainRendererFactory;

package/dist/renderer.d.ts

@@ -1,4 +1,4 @@
-import { DataColumn, Tags } from '@malloydata/malloy';
+import { DataColumn, TagParse } from '@malloydata/malloy';
 import { RendererOptions } from './renderer_types';
 export declare type ChildRenderers = {
     [fieldName: string]: Renderer;
@@ -9,8 +9,8 @@ export interface Renderer {
 export declare abstract class RenderTree implements Renderer {
     protected readonly document: Document;
     protected readonly options: RendererOptions;
-    protected readonly tags?: Tags | undefined;
-    constructor(document: Document, options: RendererOptions, tags?: Tags | undefined);
+    protected readonly tags?: TagParse | undefined;
+    constructor(document: Document, options: RendererOptions, tags?: TagParse | undefined);
     protected abstract get childRenderers(): ChildRenderers;
     abstract render(value: DataColumn): Promise<HTMLElement>;
 }

package/dist/renderer_factory.d.ts

@@ -1,15 +1,15 @@
-import { Explore, Field, MalloyTagProperties } from '@malloydata/malloy';
+import { Explore, Field, Tag, TagParse } 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, extractedValue: string | undefined) => void;
+declare 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;
     activates(_field: Field | Explore): boolean;
     isValidMatch(_field: Field | Explore): boolean;
     matches(renderDef: RenderDef): boolean;
-    parseTagParameters(tagProperties: MalloyTagProperties): T;
+    parseTagParameters(tagParse: TagParse | undefined): T;
     abstract get rendererName(): string | undefined;
     abstract create(document: Document, styleDefaults: StyleDefaults, rendererOptions: RendererOptions, field: Field | Explore, renderOptions: T, timezone?: string): Renderer;
 }

package/dist/renderer_factory.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RendererFactory = void 0;
+const malloy_1 = require("@malloydata/malloy");
 class RendererFactory {
     constructor() {
         this.tagOptionExtractors = {};
@@ -20,15 +21,13 @@ class RendererFactory {
     matches(renderDef) {
         return renderDef.renderer === this.rendererName;
     }
-    parseTagParameters(tagProperties) {
+    parseTagParameters(tagParse) {
+        var _a;
         const options = {};
         for (const tag in this.tagOptionExtractors) {
-            let tagValue = undefined;
-            if (tagProperties[tag]) {
-                if (typeof tagProperties[tag] === 'string') {
-                    tagValue = tagProperties[tag];
-                }
-                this.tagOptionExtractors[tag](options, tagValue);
+            const tagValue = (_a = tagParse === null || tagParse === void 0 ? void 0 : tagParse.tag.properties) === null || _a === void 0 ? void 0 : _a[tag];
+            if (tagValue) {
+                this.tagOptionExtractors[tag](options, tagValue ? new malloy_1.Tag(tagValue) : undefined);
             }
         }
         return options;

package/package.json

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