@malloydata/render 0.0.44-dev230623185845 → 0.0.44

package/dist/html/html_view.d.ts

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

package/dist/html/html_view.js

@@ -56,10 +56,11 @@ class HTMLView {
     constructor(document) {
         this.document = document;
     }
-    async render(table, options) {
+    async render(result, options) {
+        const table = result.data;
         const renderer = makeRenderer(table.field, this.document, options, {
             size: 'large',
-        }, table.field.structDef.queryTimezone);
+        }, table.field.structDef.queryTimezone, result.getTags());
         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)`,
@@ -101,26 +102,26 @@ class JSONView {
 }
 exports.JSONView = JSONView;
 const suffixMap = {
-    '_shape_map': 'shape_map',
-    '_point_map': 'point_map',
-    '_bar_chart': 'bar_chart',
-    '_image': 'image',
-    '_json': 'json',
-    '_segment_map': 'segment_map',
-    '_dashboard': 'dashboard',
-    '_line_chart': 'line_chart',
-    '_scatter_chart': 'scatter_chart',
-    '_url': 'link',
-    '_list': 'list',
-    '_list_detail': 'list_detail',
-    '_sparkline': 'sparkline',
-    '_sparkline_area': 'sparkline',
-    '_sparkline_column': 'sparkline',
-    '_sparkline_bar': 'sparkline',
+    'shape_map': 'shape_map',
+    'point_map': 'point_map',
+    'bar_chart': 'bar_chart',
+    'image': 'image',
+    'json': 'json',
+    'segment_map': 'segment_map',
+    'dashboard': 'dashboard',
+    'line_chart': 'line_chart',
+    'scatter_chart': 'scatter_chart',
+    '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;
-    var _d;
+function getRendererOptions(field, dataStyles, tags) {
+    var _a;
+    const tagProperties = (_a = tags === null || tags === void 0 ? void 0 : tags.getMalloyTags().properties) !== null && _a !== void 0 ? _a : {};
     let renderer = dataStyles[field.name];
     if (!renderer) {
         for (const sourceClass of field.sourceClasses) {
@@ -129,26 +130,33 @@ function getRendererOptions(field, dataStyles) {
             }
         }
     }
+    const { name } = field;
     for (const suffix in suffixMap) {
-        const { name } = field;
-        if (name.endsWith(suffix)) {
-            const label = name.slice(0, name.length - suffix.length);
-            if (renderer) {
-                (_a = renderer.renderer) !== null && _a !== void 0 ? _a : (renderer.renderer = suffixMap[suffix]);
-                (_b = renderer.data) !== null && _b !== void 0 ? _b : (renderer.data = {});
-                (_c = (_d = renderer.data).label) !== null && _c !== void 0 ? _c : (_d.label = label);
-            }
-            else {
-                renderer = {
-                    renderer: suffixMap[suffix],
-                    data: {
-                        label,
-                    },
-                };
-            }
-            break;
+        if (tagProperties[suffix] === true) {
+            return updateOrCreateRenderer(suffix, name, renderer);
+        }
+        if (name.endsWith(`_${suffix}`)) {
+            const label = name.slice(0, name.length - suffix.length - 1);
+            return updateOrCreateRenderer(suffix, label, renderer);
         }
     }
+}
+function updateOrCreateRenderer(rendererKey, label, renderer) {
+    var _a, _b, _c;
+    var _d;
+    if (renderer) {
+        (_a = renderer.renderer) !== null && _a !== void 0 ? _a : (renderer.renderer = suffixMap[rendererKey]);
+        (_b = renderer.data) !== null && _b !== void 0 ? _b : (renderer.data = {});
+        (_c = (_d = renderer.data).label) !== null && _c !== void 0 ? _c : (_d.label = label);
+    }
+    else {
+        renderer = {
+            renderer: suffixMap[rendererKey],
+            data: {
+                label,
+            },
+        };
+    }
     return renderer;
 }
 function isContainer(field) {
@@ -159,8 +167,8 @@ 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) {
-    const renderDef = getRendererOptions(field, options.dataStyles) || {};
+function makeRenderer(field, document, options, styleDefaults, queryTimezone, tags) {
+    const renderDef = getRendererOptions(field, options.dataStyles, tags) || {};
     options.dataStyles[field.name] = renderDef;
     if (renderDef.renderer === 'shape_map') {
         return new shape_map_1.HTMLShapeMapRenderer(document, styleDefaults, options, renderDef);
@@ -280,7 +288,7 @@ function makeContainerRenderer(cType, document, explore, options) {
     const c = container_1.ContainerRenderer.make(cType, document, explore, options);
     const result = {};
     explore.intrinsicFields.forEach((field) => {
-        result[field.name] = makeRenderer(field, document, options, c.defaultStylesForChildren, explore.queryTimezone);
+        result[field.name] = makeRenderer(field, document, options, c.defaultStylesForChildren, explore.queryTimezone, field.getTags());
     });
     c.childRenderers = result;
     return c;

package/package.json

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