@malloydata/render 0.0.43-dev230616164521 → 0.0.43-dev230620232755

package/dist/html/date.d.ts

@@ -1,9 +1,8 @@
 import { DataColumn } from '@malloydata/malloy';
 import { Renderer } from '../renderer';
-import { RendererOptions } from '../renderer_types';
 export declare class HTMLDateRenderer implements Renderer {
     private readonly document;
-    private readonly options;
-    constructor(document: Document, options: RendererOptions);
+    private readonly queryTimezone;
+    constructor(document: Document, queryTimezone: string | undefined);
     render(data: DataColumn): Promise<HTMLElement>;
 }

package/dist/html/date.js

@@ -26,9 +26,9 @@ exports.HTMLDateRenderer = void 0;
 const malloy_1 = require("@malloydata/malloy");
 const utils_1 = require("./utils");
 class HTMLDateRenderer {
-    constructor(document, options) {
+    constructor(document, queryTimezone) {
         this.document = document;
-        this.options = options;
+        this.queryTimezone = queryTimezone;
     }
     async render(data) {
         if (data.isNull()) {
@@ -39,7 +39,7 @@ class HTMLDateRenderer {
         }
         const timeframe = data.field.timeframe ||
             (data.isTimestamp() ? malloy_1.TimestampTimeframe.Second : malloy_1.DateTimeframe.Day);
-        const timestring = (0, utils_1.timeToString)(data.value, timeframe);
+        const timestring = (0, utils_1.timeToString)(data.value, timeframe, this.queryTimezone);
         const element = this.document.createElement('span');
         element.appendChild(this.document.createTextNode(timestring));
         return element;

package/dist/html/html_view.d.ts

@@ -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): Renderer;
+export declare function makeRenderer(field: Explore | Field, document: Document, options: RendererOptions, styleDefaults: StyleDefaults, queryTimezone: string | undefined): Renderer;

package/dist/html/html_view.js

@@ -59,7 +59,7 @@ class HTMLView {
     async render(table, options) {
         const renderer = makeRenderer(table.field, this.document, options, {
             size: 'large',
-        });
+        }, table.field.structDef.queryTimezone);
         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)`,
@@ -159,7 +159,7 @@ function isContainer(field) {
         throw new Error(`${field.name} does not contain fields and cannot be rendered this way`);
     }
 }
-function makeRenderer(field, document, options, styleDefaults) {
+function makeRenderer(field, document, options, styleDefaults, queryTimezone) {
     const renderDef = getRendererOptions(field, options.dataStyles) || {};
     options.dataStyles[field.name] = renderDef;
     if (renderDef.renderer === 'shape_map') {
@@ -230,7 +230,7 @@ function makeRenderer(field, document, options, styleDefaults) {
                 field.isAtomicField() &&
                 (field.type === malloy_1.AtomicFieldType.Date ||
                     field.type === malloy_1.AtomicFieldType.Timestamp))) {
-            return new date_1.HTMLDateRenderer(document, options);
+            return new date_1.HTMLDateRenderer(document, queryTimezone);
         }
         else if (renderDef.renderer === 'currency') {
             return new currency_1.HTMLCurrencyRenderer(document);
@@ -280,7 +280,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);
+        result[field.name] = makeRenderer(field, document, options, c.defaultStylesForChildren, explore.queryTimezone);
     });
     c.childRenderers = result;
     return c;

package/dist/html/table.js

@@ -27,6 +27,7 @@ const drill_1 = require("../drill");
 const container_1 = require("./container");
 const number_1 = require("./number");
 const utils_1 = require("./utils");
+const date_1 = require("./date");
 class HTMLTableRenderer extends container_1.ContainerRenderer {
     constructor() {
         super(...arguments);
@@ -40,9 +41,10 @@ class HTMLTableRenderer extends container_1.ContainerRenderer {
         }
         const header = this.document.createElement('tr');
         table.field.intrinsicFields.forEach(field => {
-            const name = (0, utils_1.formatTitle)(this.options, field.name, this.options.dataStyles[field.name]);
+            let name = (0, utils_1.formatTitle)(this.options, field.name, this.options.dataStyles[field.name]);
             const childRenderer = this.childRenderers[name];
             const isNumeric = childRenderer instanceof number_1.HTMLNumberRenderer;
+            const isDateTime = childRenderer instanceof date_1.HTMLDateRenderer;
             const headerCell = this.document.createElement('th');
             headerCell.style.cssText = `
         padding: 8px;
@@ -50,7 +52,11 @@ class HTMLTableRenderer extends container_1.ContainerRenderer {
         border-bottom: 1px solid var(--malloy-border-color, #eaeaea);
         text-align: ${isNumeric ? 'right' : 'left'};
       `;
-            headerCell.innerHTML = name.replace(/_/g, '_​');
+            name = name.replace(/_/g, '_​');
+            if (isDateTime && field.parentExplore.structDef.queryTimezone) {
+                name = `${name} (${field.parentExplore.structDef.queryTimezone})`;
+            }
+            headerCell.innerHTML = name;
             header.appendChild(headerCell);
         });
         if (this.options.isDrillingEnabled) {

package/dist/html/utils.d.ts

@@ -4,7 +4,7 @@ import { RendererOptions } from '../renderer_types';
 export declare function getColorScale(type: 'temporal' | 'ordinal' | 'quantitative' | 'nominal' | undefined, isRectMark: boolean, hasOverlappingText?: boolean): {
     range: string[];
 } | undefined;
-export declare function timeToString(time: Date, timeframe: DateTimeframe | TimestampTimeframe): string;
+export declare function timeToString(time: Date, timeframe: DateTimeframe | TimestampTimeframe, timezone?: string): string;
 export declare function yieldTask(): Promise<void>;
 export declare function createErrorElement(document: Document, error: string | Error): HTMLElement;
 export declare function createNullElement(document: Document): HTMLElement;

package/dist/html/utils.js

@@ -28,6 +28,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatTitle = exports.createDrillIcon = exports.createNullElement = exports.createErrorElement = exports.yieldTask = exports.timeToString = exports.getColorScale = void 0;
 const malloy_1 = require("@malloydata/malloy");
 const startCase_1 = __importDefault(require("lodash/startCase"));
+const luxon_1 = require("luxon");
 function getColorScale(type, isRectMark, hasOverlappingText = false) {
     if (type === undefined) {
         return undefined;
@@ -74,61 +75,62 @@ exports.getColorScale = getColorScale;
 function numberFixedDigits(value, digits) {
     return value.toString().padStart(digits, '0');
 }
-function timeToString(time, timeframe) {
+function timeToString(time, timeframe, timezone) {
+    const dateTime = luxon_1.DateTime.fromJSDate(time, { zone: timezone });
     switch (timeframe) {
         case malloy_1.TimestampTimeframe.Year:
         case malloy_1.DateTimeframe.Year: {
-            const year = numberFixedDigits(time.getUTCFullYear(), 4);
+            const year = numberFixedDigits(dateTime.year, 4);
             return `${year}`;
         }
         case malloy_1.TimestampTimeframe.Quarter:
         case malloy_1.DateTimeframe.Quarter: {
-            const year = numberFixedDigits(time.getUTCFullYear(), 4);
-            const quarter = Math.floor(time.getUTCMonth() / 3) + 1;
+            const year = numberFixedDigits(dateTime.year, 4);
+            const quarter = Math.floor(dateTime.month / 3) + 1;
             return `${year}-Q${quarter}`;
         }
         case malloy_1.TimestampTimeframe.Month:
         case malloy_1.DateTimeframe.Month: {
-            const year = numberFixedDigits(time.getUTCFullYear(), 2);
-            const month = numberFixedDigits(time.getUTCMonth() + 1, 2);
+            const year = numberFixedDigits(dateTime.year, 2);
+            const month = numberFixedDigits(dateTime.month, 2);
             return `${year}-${month}`;
         }
         case malloy_1.TimestampTimeframe.Week:
         case malloy_1.DateTimeframe.Week: {
-            const year = numberFixedDigits(time.getUTCFullYear(), 2);
-            const month = numberFixedDigits(time.getUTCMonth() + 1, 2);
-            const day = numberFixedDigits(time.getUTCDate(), 2);
+            const year = numberFixedDigits(dateTime.year, 2);
+            const month = numberFixedDigits(dateTime.month, 2);
+            const day = numberFixedDigits(dateTime.day, 2);
             return `WK${year}-${month}-${day}`;
         }
         case malloy_1.DateTimeframe.Day:
         case malloy_1.TimestampTimeframe.Day: {
-            const year = numberFixedDigits(time.getUTCFullYear(), 2);
-            const month = numberFixedDigits(time.getUTCMonth() + 1, 2);
-            const day = numberFixedDigits(time.getUTCDate(), 2);
+            const year = numberFixedDigits(dateTime.year, 2);
+            const month = numberFixedDigits(dateTime.month, 2);
+            const day = numberFixedDigits(dateTime.day, 2);
             return `${year}-${month}-${day}`;
         }
         case malloy_1.TimestampTimeframe.Hour: {
-            const year = numberFixedDigits(time.getUTCFullYear(), 2);
-            const month = numberFixedDigits(time.getUTCMonth() + 1, 2);
-            const day = numberFixedDigits(time.getUTCDate(), 2);
-            const hour = numberFixedDigits(time.getUTCHours(), 2);
+            const year = numberFixedDigits(dateTime.year, 2);
+            const month = numberFixedDigits(dateTime.month, 2);
+            const day = numberFixedDigits(dateTime.day, 2);
+            const hour = numberFixedDigits(dateTime.hour, 2);
             return `${year}-${month}-${day} ${hour}:00 for 1 hour`;
         }
         case malloy_1.TimestampTimeframe.Minute: {
-            const year = numberFixedDigits(time.getUTCFullYear(), 2);
-            const month = numberFixedDigits(time.getUTCMonth() + 1, 2);
-            const day = numberFixedDigits(time.getUTCDate(), 2);
-            const hour = numberFixedDigits(time.getUTCHours(), 2);
-            const minute = numberFixedDigits(time.getUTCMinutes(), 2);
+            const year = numberFixedDigits(dateTime.year, 2);
+            const month = numberFixedDigits(dateTime.month, 2);
+            const day = numberFixedDigits(dateTime.day, 2);
+            const hour = numberFixedDigits(dateTime.hour, 2);
+            const minute = numberFixedDigits(dateTime.minute, 2);
             return `${year}-${month}-${day} ${hour}:${minute}`;
         }
         case malloy_1.TimestampTimeframe.Second: {
-            const year = numberFixedDigits(time.getUTCFullYear(), 2);
-            const month = numberFixedDigits(time.getUTCMonth() + 1, 2);
-            const day = numberFixedDigits(time.getUTCDate(), 2);
-            const hour = numberFixedDigits(time.getUTCHours(), 2);
-            const minute = numberFixedDigits(time.getUTCMinutes(), 2);
-            const second = numberFixedDigits(time.getUTCSeconds(), 2);
+            const year = numberFixedDigits(dateTime.year, 2);
+            const month = numberFixedDigits(dateTime.month, 2);
+            const day = numberFixedDigits(dateTime.day, 2);
+            const hour = numberFixedDigits(dateTime.hour, 2);
+            const minute = numberFixedDigits(dateTime.minute, 2);
+            const second = numberFixedDigits(dateTime.second, 2);
             return `${year}-${month}-${day} ${hour}:${minute}:${second}`;
         }
         default:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/render",
-  "version": "0.0.43-dev230616164521",
+  "version": "0.0.43-dev230620232755",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -18,8 +18,10 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.43-dev230616164521",
+    "@malloydata/malloy": "^0.0.43-dev230620232755",
+    "@types/luxon": "^2.4.0",
     "lodash": "^4.17.20",
+    "luxon": "^2.4.0",
     "us-atlas": "^3.0.0",
     "vega": "^5.21.0",
     "vega-lite": "^5.2.0"