@malloydata/render 0.0.51-dev230629171920 → 0.0.51-dev230705184641

package/dist/data_styles.d.ts

@@ -50,7 +50,7 @@ export declare type RenderDef = ({
 } & SparkLineRenderOptions) | ({
     renderer: 'bytes';
 } & BytesRenderOptions) | ({
-    renderer: 'link';
+    renderer: 'url';
 } & LinkRenderOptions) | ({
     renderer: 'vega';
 } & VegaRenderOptions);
@@ -80,10 +80,13 @@ export interface TextRenderOptions extends DataRenderOptions {
 export interface BytesRenderOptions extends TextRenderOptions {
     bytes?: Record<string, unknown>;
 }
+export declare enum Currency {
+    Dollars = "usd",
+    Euros = "euro",
+    Pounds = "pound"
+}
 export interface CurrencyRenderOptions extends TextRenderOptions {
-    currency?: {
-        unit?: 'dollars' | 'pounds';
-    };
+    currency?: Currency;
 }
 export interface TimeRenderOptions extends TextRenderOptions {
     time?: Record<string, unknown>;

package/dist/data_styles.js

@@ -22,4 +22,11 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.Currency = void 0;
+var Currency;
+(function (Currency) {
+    Currency["Dollars"] = "usd";
+    Currency["Euros"] = "euro";
+    Currency["Pounds"] = "pound";
+})(Currency = exports.Currency || (exports.Currency = {}));
 //# sourceMappingURL=data_styles.js.map

package/dist/html/currency.d.ts

@@ -1,14 +1,17 @@
-import { DataColumn, Explore, Field } from '@malloydata/malloy';
+import { DataColumn, Explore, Field, MalloyTagProperties } from '@malloydata/malloy';
 import { HTMLTextRenderer } from './text';
 import { RendererFactory } from '../renderer_factory';
 import { CurrencyRenderOptions, StyleDefaults } from '../data_styles';
 import { RendererOptions } from '../renderer_types';
 import { Renderer } from '../renderer';
 export declare class HTMLCurrencyRenderer extends HTMLTextRenderer {
+    readonly options: CurrencyRenderOptions;
+    constructor(document: Document, options: CurrencyRenderOptions);
     getText(data: DataColumn): string | null;
 }
 export declare class CurrencyRendererFactory extends RendererFactory<CurrencyRenderOptions> {
     static readonly instance: CurrencyRendererFactory;
-    create(document: Document, _styleDefaults: StyleDefaults, _rendererOptions: RendererOptions, _field: Field | Explore, _options: CurrencyRenderOptions): Renderer;
+    create(document: Document, _styleDefaults: StyleDefaults, _rendererOptions: RendererOptions, _field: Field | Explore, options: CurrencyRenderOptions): Renderer;
+    parseTagParameters(tags: MalloyTagProperties): CurrencyRenderOptions | undefined;
     get rendererName(): string;
 }

package/dist/html/currency.js

@@ -25,13 +25,28 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CurrencyRendererFactory = exports.HTMLCurrencyRenderer = void 0;
 const text_1 = require("./text");
 const renderer_factory_1 = require("../renderer_factory");
+const data_styles_1 = require("../data_styles");
 class HTMLCurrencyRenderer extends text_1.HTMLTextRenderer {
+    constructor(document, options) {
+        super(document);
+        this.options = options;
+    }
     getText(data) {
         if (data.isNull()) {
             return null;
         }
-        // TODO get this from renderer options
-        const unitText = '$';
+        let unitText = '$';
+        switch (this.options.currency) {
+            case data_styles_1.Currency.Euros:
+                unitText = '€';
+                break;
+            case data_styles_1.Currency.Pounds:
+                unitText = '£';
+                break;
+            case data_styles_1.Currency.Dollars:
+                // Do nothing.
+                break;
+        }
         const numText = data.number.value.toLocaleString('en-US', {
             minimumFractionDigits: 2,
             maximumFractionDigits: 2,
@@ -41,8 +56,14 @@ class HTMLCurrencyRenderer extends text_1.HTMLTextRenderer {
 }
 exports.HTMLCurrencyRenderer = HTMLCurrencyRenderer;
 class CurrencyRendererFactory extends renderer_factory_1.RendererFactory {
-    create(document, _styleDefaults, _rendererOptions, _field, _options) {
-        return new HTMLCurrencyRenderer(document);
+    create(document, _styleDefaults, _rendererOptions, _field, options) {
+        return new HTMLCurrencyRenderer(document, options);
+    }
+    parseTagParameters(tags) {
+        var _a;
+        return {
+            currency: (_a = tags[this.rendererName]) !== null && _a !== void 0 ? _a : data_styles_1.Currency.Dollars,
+        };
     }
     get rendererName() {
         return 'currency';

package/dist/html/html_view.js

@@ -89,7 +89,7 @@ const suffixMap = {
     'dashboard': 'dashboard',
     'line_chart': 'line_chart',
     'scatter_chart': 'scatter_chart',
-    'url': 'link',
+    'url': 'url',
     'list': 'list',
     'list_detail': 'list_detail',
     'sparkline': 'sparkline',
@@ -97,13 +97,7 @@ const suffixMap = {
     'sparkline_column': 'sparkline',
     'sparkline_bar': 'sparkline',
 };
-const atomicFieldTagMap = {
-    'percent': 'percent',
-    'currency': 'currency',
-};
-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 : {};
+function getRendererOptions(field, dataStyles) {
     let renderer = dataStyles[field.name];
     if (!renderer) {
         for (const sourceClass of field.sourceClasses) {
@@ -113,17 +107,7 @@ function getRendererOptions(field, dataStyles, tags) {
         }
     }
     const { name } = field;
-    if (field.hasParentExplore() && field.isAtomicField()) {
-        for (const tag in atomicFieldTagMap) {
-            if (tagProperties[tag]) {
-                return updateOrCreateRenderer(tag, name, atomicFieldTagMap, renderer);
-            }
-        }
-    }
     for (const suffix in suffixMap) {
-        if (tagProperties[suffix]) {
-            return updateOrCreateRenderer(suffix, name, suffixMap, renderer);
-        }
         if (name.endsWith(`_${suffix}`)) {
             const label = name.slice(0, name.length - suffix.length - 1);
             return updateOrCreateRenderer(suffix, label, suffixMap, renderer);
@@ -158,19 +142,19 @@ function isContainer(field) {
     }
 }
 function makeRenderer(field, document, options, styleDefaults, queryTimezone, tags) {
-    const renderDef = getRendererOptions(field, options.dataStyles, tags) || {};
+    const renderDef = getRendererOptions(field, options.dataStyles);
     options.dataStyles[field.name] = renderDef;
-    const renderer = new main_renderer_factory_1.MainRendererFactory().create(document, styleDefaults, options, field, renderDef, queryTimezone);
+    const renderer = new main_renderer_factory_1.MainRendererFactory().create(renderDef, tags === null || tags === void 0 ? void 0 : tags.getMalloyTags(), document, styleDefaults, options, field, queryTimezone);
     if (renderer) {
         return renderer;
     }
-    if (renderDef.renderer === 'dashboard') {
+    if ((renderDef === null || renderDef === void 0 ? void 0 : renderDef.renderer) === 'dashboard') {
         return makeContainerRenderer(dashboard_1.HTMLDashboardRenderer, document, isContainer(field), options);
     }
-    else if (renderDef.renderer === 'list_detail') {
+    else if ((renderDef === null || renderDef === void 0 ? void 0 : renderDef.renderer) === 'list_detail') {
         return makeContainerRenderer(list_detail_1.HTMLListDetailRenderer, document, isContainer(field), options);
     }
-    else if (renderDef.renderer === 'table' ||
+    else if ((renderDef === null || renderDef === void 0 ? void 0 : renderDef.renderer) === 'table' ||
         !field.hasParentExplore() ||
         field.isExploreField()) {
         return makeContainerRenderer(table_1.HTMLTableRenderer, document, isContainer(field), options);

package/dist/main_renderer_factory.d.ts

@@ -1,6 +1,7 @@
-import { Field, Explore } from '@malloydata/malloy';
-import { RenderDef, StyleDefaults } from './data_styles';
+import { Field, Explore, MalloyTags, MalloyTagProperties } from '@malloydata/malloy';
+import { DataRenderOptions, RenderDef, StyleDefaults } from './data_styles';
 import { Renderer } from './renderer';
+import { RendererFactory } from './renderer_factory';
 import { RendererOptions } from './renderer_types';
 import { ShapeMapRendererFactory } from './html/shape_map';
 import { PointMapRendererFactory } from './html/point_map';
@@ -26,5 +27,7 @@ import { UnsupportedRendererFactory } from './html/unsupported';
 import { TextRendererFactory } from './html/text';
 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)[];
-    create(document: Document, styleDefaults: StyleDefaults, rendererOptions: RendererOptions, field: Field | Explore, renderDef: RenderDef, timezone?: string | undefined): Renderer | undefined;
+    create(renderDef: RenderDef | undefined, tags: MalloyTags | 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;
 }

package/dist/main_renderer_factory.js

@@ -24,11 +24,13 @@ const link_1 = require("./html/link");
 const unsupported_1 = require("./html/unsupported");
 const text_1 = require("./html/text");
 class MainRendererFactory {
-    create(document, styleDefaults, rendererOptions, field, renderDef, timezone) {
+    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 ((f.rendererName &&
-                renderDef.renderer === f.rendererName &&
+            if (((this.matchesRenderDef(renderDef, f) ||
+                this.matchesTag(tagProperties, f)) &&
                 f.isValidMatch(field)) ||
                 f.activates(field)) {
                 factory = f;
@@ -36,7 +38,15 @@ class MainRendererFactory {
                 break;
             }
         }
-        return factory === null || factory === void 0 ? void 0 : factory.create(document, styleDefaults, rendererOptions, field, renderDef, timezone);
+        return factory === null || factory === void 0 ? void 0 : factory.create(document, styleDefaults, rendererOptions, field, renderDef || factory.parseTagParameters(tagProperties) || {}, timezone);
+    }
+    matchesRenderDef(renderDef, factory) {
+        return (renderDef &&
+            factory.rendererName &&
+            renderDef.renderer === factory.rendererName);
+    }
+    matchesTag(properties, factory) {
+        return (properties && factory.rendererName && properties[factory.rendererName]);
     }
 }
 exports.MainRendererFactory = MainRendererFactory;

package/dist/renderer_factory.d.ts

@@ -1,4 +1,4 @@
-import { Explore, Field } from '@malloydata/malloy';
+import { Explore, Field, MalloyTagProperties } from '@malloydata/malloy';
 import { Renderer } from './renderer';
 import { DataRenderOptions, RenderDef, StyleDefaults } from './data_styles';
 import { RendererOptions } from './renderer_types';
@@ -6,6 +6,7 @@ export declare abstract class RendererFactory<T extends DataRenderOptions> {
     activates(_field: Field | Explore): boolean;
     isValidMatch(_field: Field | Explore): boolean;
     matches(renderDef: RenderDef): boolean;
+    parseTagParameters(_tags: MalloyTagProperties): T | undefined;
     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

@@ -12,6 +12,9 @@ class RendererFactory {
     matches(renderDef) {
         return renderDef.renderer === this.rendererName;
     }
+    parseTagParameters(_tags) {
+        return undefined;
+    }
 }
 exports.RendererFactory = RendererFactory;
 //# sourceMappingURL=renderer_factory.js.map

package/package.json

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