@malloydata/render 0.0.73 → 0.0.74-dev230815162117

package/dist/html/container.d.ts

@@ -1,4 +1,4 @@
-import { Explore, TagParse } from '@malloydata/malloy';
+import { Explore, Tag } 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?: TagParse) => Type, document: Document, exploreField: Explore, options: RendererOptions, tags?: TagParse): Type;
+    static make<Type extends ContainerRenderer>(c: new (document: Document, options: RendererOptions, tags: Tag) => Type, document: Document, exploreField: Explore, options: RendererOptions, tagged: Tag): Type;
 }

package/dist/html/container.js

@@ -35,8 +35,8 @@ class ContainerRenderer extends renderer_1.RenderTree {
     // We can't use a normal constructor here because we need
     //  we need to be fully constructed before we construct
     //  our children.
-    static make(c, document, exploreField, options, tags) {
-        const n = new c(document, options, tags);
+    static make(c, document, exploreField, options, tagged) {
+        const n = new c(document, options, tagged);
         return n;
     }
 }

package/dist/html/html_view.d.ts

@@ -1,4 +1,4 @@
-import { DataArray, Explore, Field, Result, TagParse } from '@malloydata/malloy';
+import { DataArray, Explore, Field, Result, Tag } 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?: TagParse): Renderer;
+export declare function makeRenderer(field: Explore | Field, document: Document, options: RendererOptions, styleDefaults: StyleDefaults, queryTimezone: string | undefined, tagged: Tag): 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.tagParse());
+        }, table.field.structDef.queryTimezone, result.tagParse().tag);
         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)`,
@@ -142,37 +142,37 @@ function isContainer(field) {
         throw new Error(`${field.name} does not contain fields and cannot be rendered this way`);
     }
 }
-function makeRenderer(field, document, options, styleDefaults, queryTimezone, tags) {
+function makeRenderer(field, document, options, styleDefaults, queryTimezone, tagged) {
     const renderDef = getRendererOptions(field, options.dataStyles);
     options.dataStyles[field.name] = renderDef;
-    const renderer = new main_renderer_factory_1.MainRendererFactory().create(renderDef, tags, document, styleDefaults, options, field, queryTimezone);
+    const renderer = new main_renderer_factory_1.MainRendererFactory().create(renderDef, tagged, document, styleDefaults, options, field, queryTimezone);
     if (renderer) {
         return renderer;
     }
-    if ((renderDef === null || renderDef === void 0 ? void 0 : renderDef.renderer) === 'dashboard' || (0, utils_1.tagIsPresent)(tags, 'dashboard')) {
-        return makeContainerRenderer(dashboard_1.HTMLDashboardRenderer, document, isContainer(field), options, tags);
+    if ((renderDef === null || renderDef === void 0 ? void 0 : renderDef.renderer) === 'dashboard' || tagged.has('dashboard')) {
+        return makeContainerRenderer(dashboard_1.HTMLDashboardRenderer, document, isContainer(field), options, tagged);
     }
-    else if ((renderDef === null || renderDef === void 0 ? void 0 : renderDef.renderer) === 'list' || (0, utils_1.tagIsPresent)(tags, 'list')) {
-        return makeContainerRenderer(list_1.HTMLListRenderer, document, isContainer(field), options, tags);
+    else if ((renderDef === null || renderDef === void 0 ? void 0 : renderDef.renderer) === 'list' || tagged.has('list')) {
+        return makeContainerRenderer(list_1.HTMLListRenderer, document, isContainer(field), options, tagged);
     }
     else if ((renderDef === null || renderDef === void 0 ? void 0 : renderDef.renderer) === 'list_detail' ||
-        (0, utils_1.tagIsPresent)(tags, 'list_detail')) {
-        return makeContainerRenderer(list_detail_1.HTMLListDetailRenderer, document, isContainer(field), options, tags);
+        tagged.has('list_detail')) {
+        return makeContainerRenderer(list_detail_1.HTMLListDetailRenderer, document, isContainer(field), options, tagged);
     }
     else if ((renderDef === null || renderDef === void 0 ? void 0 : renderDef.renderer) === 'table' ||
-        (0, utils_1.tagIsPresent)(tags, 'table') ||
+        tagged.has('table') ||
         !field.hasParentExplore() ||
         field.isExploreField()) {
-        return makeContainerRenderer(table_1.HTMLTableRenderer, document, isContainer(field), options, tags);
+        return makeContainerRenderer(table_1.HTMLTableRenderer, document, isContainer(field), options, tagged);
     }
     throw new Error(`Could not find a proper renderer for field ${field.name}`);
 }
 exports.makeRenderer = makeRenderer;
-function makeContainerRenderer(cType, document, explore, options, tags) {
-    const c = container_1.ContainerRenderer.make(cType, document, explore, options, tags);
+function makeContainerRenderer(cType, document, explore, options, tagged) {
+    const c = container_1.ContainerRenderer.make(cType, document, explore, options, tagged);
     const result = {};
     explore.intrinsicFields.forEach((field) => {
-        result[field.name] = makeRenderer(field, document, options, c.defaultStylesForChildren, explore.queryTimezone, field.tagParse());
+        result[field.name] = makeRenderer(field, document, options, c.defaultStylesForChildren, explore.queryTimezone, field.tagParse().tag);
     });
     c.childRenderers = result;
     return c;

package/dist/html/table.js

@@ -23,7 +23,6 @@
  */
 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");
@@ -62,14 +61,14 @@ class HTMLTableRenderer extends container_1.ContainerRenderer {
         };
     }
     async render(table) {
-        var _a, _b, _c, _d, _e, _f;
+        var _a;
         if (table.isNull()) {
             return this.document.createElement('span');
         }
         if (!table.isArray() && !table.isRecord()) {
             throw new Error('Invalid type for Table Renderer');
         }
-        const shouldTranspose = (0, utils_1.tagIsPresent)(this.tags, 'transpose');
+        const shouldTranspose = this.tagged.has('transpose');
         if (shouldTranspose && table.field.intrinsicFields.length > 20) {
             throw new Error('Transpose limit of 20 columns exceeded.');
         }
@@ -85,13 +84,9 @@ class HTMLTableRenderer extends container_1.ContainerRenderer {
             }
             const childRenderer = this.childRenderers[field.name];
             const shouldPivot = childRenderer instanceof HTMLTableRenderer &&
-                (0, utils_1.tagIsPresent)(childRenderer.tags, 'pivot');
+                childRenderer.tagged.has('pivot');
             if (shouldPivot) {
-                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;
+                const userDefinedDimensions = childRenderer.tagged.textArray('pivot', 'dimensions');
                 let dimensions = undefined;
                 let nonDimensions = [];
                 const pivotedFields = new Map();
@@ -235,7 +230,7 @@ class HTMLTableRenderer extends container_1.ContainerRenderer {
                     }
                     const pfKey = field.pivotedField.key;
                     if (pivotedCells.has(pfKey) &&
-                        ((_f = pivotedCells.get(pfKey)) === null || _f === void 0 ? void 0 : _f.has(field.field.name))) {
+                        ((_a = pivotedCells.get(pfKey)) === null || _a === void 0 ? void 0 : _a.has(field.field.name))) {
                         cells[rowIndex][columnIndex] = pivotedCells
                             .get(pfKey)
                             .get(field.field.name);

package/dist/html/utils.d.ts

@@ -1,4 +1,4 @@
-import { DateTimeframe, Field, TagParse, Tags, TimestampTimeframe } from '@malloydata/malloy';
+import { DateTimeframe, Field, 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,3 @@ 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: 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

@@ -25,7 +25,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.parseCommaSeparatedParameterTagValue = exports.parameterTagValue = exports.tagIsPresent = exports.formatTitle = exports.createDrillIcon = exports.createNullElement = exports.createErrorElement = exports.yieldTask = exports.normalizeToTimezone = exports.timeToString = exports.getColorScale = void 0;
+exports.formatTitle = exports.createDrillIcon = exports.createNullElement = exports.createErrorElement = exports.yieldTask = exports.normalizeToTimezone = exports.timeToString = exports.getColorScale = void 0;
 const malloy_1 = require("@malloydata/malloy");
 const startCase_1 = __importDefault(require("lodash/startCase"));
 const luxon_1 = require("luxon");
@@ -227,23 +227,4 @@ function formatTitle(options, field, renderDef, timezone) {
     return title;
 }
 exports.formatTitle = formatTitle;
-function tagIsPresent(tags, tagToCheck) {
-    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) {
-    const tagProperty = tags === null || tags === void 0 ? void 0 : tags.getMalloyTags().properties[tagToGetValue];
-    if (typeof tagProperty === 'string') {
-        return tagProperty;
-    }
-    return undefined;
-}
-exports.parameterTagValue = parameterTagValue;
-function parseCommaSeparatedParameterTagValue(tags, tagToGetValue) {
-    var _a;
-    return (_a = parameterTagValue(tags, tagToGetValue)) === null || _a === void 0 ? void 0 : _a.split(',');
-}
-exports.parseCommaSeparatedParameterTagValue = parseCommaSeparatedParameterTagValue;
 //# sourceMappingURL=utils.js.map

package/dist/main_renderer_factory.d.ts

@@ -1,4 +1,4 @@
-import { Field, Explore, TagParse } from '@malloydata/malloy';
+import { Field, Explore, Tag } 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: TagParse | undefined, document: Document, styleDefaults: StyleDefaults, rendererOptions: RendererOptions, field: Field | Explore, timezone?: string | undefined): Renderer | undefined;
+    create(renderDef: RenderDef | undefined, tagged: Tag, document: Document, styleDefaults: StyleDefaults, rendererOptions: RendererOptions, field: Field | Explore, timezone?: string | undefined): Renderer | undefined;
     matchesRenderDef(renderDef: RenderDef | undefined, factory: RendererFactory<DataRenderOptions>): boolean | "" | undefined;
-    matchesTag(tagParse: TagParse | undefined, factory: RendererFactory<DataRenderOptions>): boolean | "" | undefined;
+    matchesTag(tagged: Tag, factory: RendererFactory<DataRenderOptions>): boolean | "" | undefined;
 }

package/dist/main_renderer_factory.js

@@ -26,10 +26,10 @@ const text_1 = require("./html/text");
 const data_volume_1 = require("./html/data_volume");
 const duration_1 = require("./html/duration");
 class MainRendererFactory {
-    create(renderDef, tags, document, styleDefaults, rendererOptions, field, timezone) {
+    create(renderDef, tagged, document, styleDefaults, rendererOptions, field, timezone) {
         let factory;
         for (const f of MainRendererFactory.renderFactories) {
-            if (((this.matchesRenderDef(renderDef, f) || this.matchesTag(tags, f)) &&
+            if (((this.matchesRenderDef(renderDef, f) || this.matchesTag(tagged, f)) &&
                 f.isValidMatch(field)) ||
                 f.activates(field)) {
                 factory = f;
@@ -37,19 +37,15 @@ class MainRendererFactory {
                 break;
             }
         }
-        return factory === null || factory === void 0 ? void 0 : factory.create(document, styleDefaults, rendererOptions, field, renderDef || factory.parseTagParameters(tags) || {}, timezone);
+        return factory === null || factory === void 0 ? void 0 : factory.create(document, styleDefaults, rendererOptions, field, renderDef || factory.parseTagParameters(tagged) || {}, timezone);
     }
     matchesRenderDef(renderDef, factory) {
         return (renderDef &&
             factory.rendererName &&
             renderDef.renderer === 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);
+    matchesTag(tagged, factory) {
+        return factory.rendererName && tagged.has(factory.rendererName);
     }
 }
 exports.MainRendererFactory = MainRendererFactory;

package/dist/renderer.d.ts

@@ -1,4 +1,4 @@
-import { DataColumn, TagParse } from '@malloydata/malloy';
+import { DataColumn, Tag } 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?: TagParse | undefined;
-    constructor(document: Document, options: RendererOptions, tags?: TagParse | undefined);
+    protected readonly tagged: Tag;
+    constructor(document: Document, options: RendererOptions, tagged: Tag);
     protected abstract get childRenderers(): ChildRenderers;
     abstract render(value: DataColumn): Promise<HTMLElement>;
 }

package/dist/renderer.js

@@ -24,10 +24,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RenderTree = void 0;
 class RenderTree {
-    constructor(document, options, tags) {
+    constructor(document, options, tagged) {
         this.document = document;
         this.options = options;
-        this.tags = tags;
+        this.tagged = tagged;
     }
 }
 exports.RenderTree = RenderTree;

package/dist/renderer_factory.d.ts

@@ -1,4 +1,4 @@
-import { Explore, Field, Tag, TagParse } from '@malloydata/malloy';
+import { Explore, Field, Tag } from '@malloydata/malloy';
 import { Renderer } from './renderer';
 import { DataRenderOptions, RenderDef, StyleDefaults } from './data_styles';
 import { RendererOptions } from './renderer_types';
@@ -9,7 +9,7 @@ export declare abstract class RendererFactory<T extends DataRenderOptions> {
     activates(_field: Field | Explore): boolean;
     isValidMatch(_field: Field | Explore): boolean;
     matches(renderDef: RenderDef): boolean;
-    parseTagParameters(tagParse: TagParse | undefined): T;
+    parseTagParameters(tags: Tag): 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,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RendererFactory = void 0;
-const malloy_1 = require("@malloydata/malloy");
 class RendererFactory {
     constructor() {
         this.tagOptionExtractors = {};
@@ -21,13 +20,12 @@ class RendererFactory {
     matches(renderDef) {
         return renderDef.renderer === this.rendererName;
     }
-    parseTagParameters(tagParse) {
-        var _a;
+    parseTagParameters(tags) {
         const options = {};
-        for (const tag in this.tagOptionExtractors) {
-            const tagValue = (_a = tagParse === null || tagParse === void 0 ? void 0 : tagParse.tag.properties) === null || _a === void 0 ? void 0 : _a[tag];
+        for (const tagName in this.tagOptionExtractors) {
+            const tagValue = tags.tag(tagName);
             if (tagValue) {
-                this.tagOptionExtractors[tag](options, tagValue ? new malloy_1.Tag(tagValue) : undefined);
+                this.tagOptionExtractors[tagName](options, tagValue);
             }
         }
         return options;

package/dist/tags_utils.d.ts

@@ -1,2 +1,2 @@
 import { Field } from '@malloydata/malloy';
-export declare function isFieldHidden(field: Field): string | boolean;
+export declare function isFieldHidden(field: Field): boolean;

package/dist/tags_utils.js

@@ -24,7 +24,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isFieldHidden = void 0;
 function isFieldHidden(field) {
-    return field.getTags().getMalloyTags().properties['hidden'];
+    return field.tagParse().tag.has('hidden');
 }
 exports.isFieldHidden = isFieldHidden;
 //# sourceMappingURL=tags_utils.js.map

package/package.json

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