@malloydata/malloy 0.0.34-dev230523182411 → 0.0.34

package/dist/lang/ast/field-space/dynamic-space.js

@@ -82,6 +82,9 @@ class DynamicSpace extends static_space_1.StaticSpace {
     addFieldDef(fd) {
         this.setEntry((0, field_utils_1.nameOf)(fd), this.defToSpaceField(fd));
     }
+    setTimezone(tz) {
+        this.newTimezone = tz;
+    }
     structDef() {
         const parameters = this.fromStruct.parameters || {};
         if (this.final === undefined) {
@@ -135,6 +138,9 @@ class DynamicSpace extends static_space_1.StaticSpace {
                 join.fixupJoinOn(this, missingOn);
             }
         }
+        if (this.newTimezone) {
+            this.final.queryTimezone = this.newTimezone;
+        }
         this.isComplete();
         return this.final;
     }

package/dist/lang/ast/field-space/query-spaces.js

@@ -218,6 +218,9 @@ class QuerySpace extends refined_space_1.RefinedSpace {
             }
             segment.extendSource = (0, field_utils_1.mergeFields)(segment.extendSource, newExtends);
         }
+        if (this.newTimezone) {
+            segment.queryTimezone = this.newTimezone;
+        }
         this.isComplete();
         return segment;
     }

package/dist/lang/ast/index.d.ts

@@ -7,6 +7,7 @@ export * from './source-properties/field-list-edit';
 export * from './source-properties/primary-key';
 export * from './source-properties/renames';
 export * from './source-properties/turtles';
+export * from './source-properties/timezone-statement';
 export * from './expressions/apply';
 export * from './expressions/binary-numeric';
 export * from './expressions/boolean';

package/dist/lang/ast/index.js

@@ -45,6 +45,7 @@ __exportStar(require("./source-properties/field-list-edit"), exports);
 __exportStar(require("./source-properties/primary-key"), exports);
 __exportStar(require("./source-properties/renames"), exports);
 __exportStar(require("./source-properties/turtles"), exports);
+__exportStar(require("./source-properties/timezone-statement"), exports);
 __exportStar(require("./expressions/apply"), exports);
 __exportStar(require("./expressions/binary-numeric"), exports);
 __exportStar(require("./expressions/boolean"), exports);

package/dist/lang/ast/source-properties/timezone-statement.d.ts

@@ -0,0 +1,6 @@
+import { MalloyElement } from '../types/malloy-element';
+export declare class TimezoneStatement extends MalloyElement {
+    readonly tz: string;
+    elementType: string;
+    constructor(tz: string);
+}

package/dist/lang/ast/source-properties/timezone-statement.js

@@ -0,0 +1,35 @@
+"use strict";
+/*
+ * Copyright 2023 Google LLC
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files
+ * (the "Software"), to deal in the Software without restriction,
+ * including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software,
+ * and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.TimezoneStatement = void 0;
+const malloy_element_1 = require("../types/malloy-element");
+class TimezoneStatement extends malloy_element_1.MalloyElement {
+    constructor(tz) {
+        super();
+        this.tz = tz;
+        this.elementType = 'timezone';
+    }
+}
+exports.TimezoneStatement = TimezoneStatement;
+//# sourceMappingURL=timezone-statement.js.map

package/dist/lang/ast/sources/named-source.js

@@ -123,7 +123,7 @@ class NamedSource extends source_1.Source {
                         const pVal = pExpr.constantValue();
                         let value = pVal.value;
                         if (pVal.dataType !== decl.type) {
-                            value = (0, time_utils_1.castTo)(decl.type, pVal.value, true);
+                            value = (0, time_utils_1.castTo)(decl.type, pVal.value, pVal.dataType, true);
                         }
                         decl.value = value;
                     }

package/dist/lang/ast/sources/sql-source.js

@@ -49,6 +49,10 @@ class SQLSource extends named_source_1.NamedSource {
             const { declaredSQLBlock, ...newEntry } = entry;
             return newEntry;
         }
+        else if (!(0, malloy_types_1.isSQLBlockStruct)(entry)) {
+            this.log(`Cannot use 'from_sql()' to explore '${this.refName}'`);
+            return;
+        }
         this.log(`Cannot use 'from_sql()' to explore '${this.refName}'`);
     }
 }

package/dist/lang/ast/time-utils.d.ts

@@ -1,7 +1,8 @@
 import { AtomicFieldType, Expr, Fragment, TimeFieldType, TimestampUnit } from '../../model/malloy_types';
 import { TimeResult } from './types/time-result';
+import { FieldValueType } from './types/type-desc';
 export declare function timeOffset(timeType: TimeFieldType, from: Expr, op: '+' | '-', n: Expr, timeframe: TimestampUnit): Expr;
-export declare function castTo(castType: AtomicFieldType, from: Expr, safe?: boolean): Expr;
+export declare function castTo(castType: AtomicFieldType, from: Expr, fromType: FieldValueType, safe?: boolean): Expr;
 export declare function castTimestampToDate(from: Expr, safe?: boolean): Expr;
 export declare function castDateToTimestamp(from: Expr, safe?: boolean): Expr;
 export declare function resolution(timeframe: string): TimeFieldType;

package/dist/lang/ast/time-utils.js

@@ -23,6 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dateOffset = exports.timestampOffset = exports.timeResult = exports.resolution = exports.castDateToTimestamp = exports.castTimestampToDate = exports.castTo = exports.timeOffset = void 0;
+const malloy_types_1 = require("../../model/malloy_types");
 const utils_1 = require("./expressions/utils");
 function timeOffset(timeType, from, op, n, timeframe) {
     return [
@@ -37,7 +38,7 @@ function timeOffset(timeType, from, op, n, timeframe) {
     ];
 }
 exports.timeOffset = timeOffset;
-function castTo(castType, from, safe = false) {
+function castTo(castType, from, fromType, safe = false) {
     const cast = {
         type: 'dialect',
         function: 'cast',
@@ -45,6 +46,9 @@ function castTo(castType, from, safe = false) {
         expr: from,
         safe,
     };
+    if ((0, malloy_types_1.isAtomicFieldType)(fromType)) {
+        cast.srcType = fromType;
+    }
     return [cast];
 }
 exports.castTo = castTo;

package/dist/lang/ast/types/expression-def.d.ts

@@ -1,6 +1,7 @@
 import { TimestampUnit } from '../../../model/malloy_types';
 import { ExprValue } from './expr-value';
 import { FieldSpace } from './field-space';
+import { FieldValueType } from './type-desc';
 import { MalloyElement } from './malloy-element';
 /**
  * Root node for any element in an expression. These essentially
@@ -55,6 +56,7 @@ export declare class ExprDuration extends ExpressionDef {
     apply(fs: FieldSpace, op: string, left: ExpressionDef): ExprValue;
     getExpression(_fs: FieldSpace): ExprValue;
 }
+export declare function getMorphicValue(mv: ExprValue, mt: FieldValueType): ExprValue | undefined;
 /**
  * All of the magic of malloy expressions eventually flows to here,
  * where an operator is applied to two values. Depending on the

package/dist/lang/ast/types/expression-def.js

@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.applyBinary = exports.ExprDuration = exports.ExpressionDef = void 0;
+exports.applyBinary = exports.getMorphicValue = exports.ExprDuration = exports.ExpressionDef = void 0;
 const malloy_types_1 = require("../../../model/malloy_types");
 const ast_utils_1 = require("../ast-utils");
 const utils_1 = require("../expressions/utils");
@@ -120,11 +120,17 @@ class ExprDuration extends ExpressionDef {
                     value: result,
                 }, resultGranularity);
             }
-            return (0, time_utils_1.timeResult)({
-                dataType: 'date',
-                expressionType: (0, malloy_types_1.maxExpressionType)(lhs.expressionType, num.expressionType),
-                value: (0, time_utils_1.timeOffset)('date', lhs.value, op, num.value, this.timeframe),
-            }, resultGranularity);
+            if ((0, malloy_types_1.isDateUnit)(this.timeframe)) {
+                return (0, time_utils_1.timeResult)({
+                    dataType: 'date',
+                    expressionType: (0, malloy_types_1.maxExpressionType)(lhs.expressionType, num.expressionType),
+                    value: (0, time_utils_1.timeOffset)('date', lhs.value, op, num.value, this.timeframe),
+                }, resultGranularity);
+            }
+            else {
+                this.log(`Cannot offset date by ${this.timeframe}`);
+                return (0, ast_utils_1.errorFor)('ofsset date error');
+            }
         }
         return super.apply(fs, op, left);
     }
@@ -137,19 +143,43 @@ class ExprDuration extends ExpressionDef {
     }
 }
 exports.ExprDuration = ExprDuration;
-function timeCompare(lhs, op, rhs) {
-    if ((0, malloy_types_1.isTimeFieldType)(lhs.dataType) && (0, malloy_types_1.isTimeFieldType)(rhs.dataType)) {
+function willMorphTo(ev, t) {
+    if (ev.dataType === t) {
+        return ev.value;
+    }
+    return ev.morphic && ev.morphic[t];
+}
+function getMorphicValue(mv, mt) {
+    if (mv.dataType === mt) {
+        return mv;
+    }
+    if (mv.morphic && mv.morphic[mt]) {
+        return {
+            ...mv,
+            dataType: mt,
+            value: mv.morphic[mt],
+        };
+    }
+}
+exports.getMorphicValue = getMorphicValue;
+function timeCompare(left, lhs, op, rhs) {
+    const leftIsTime = (0, malloy_types_1.isTimeFieldType)(lhs.dataType);
+    const rightIsTime = (0, malloy_types_1.isTimeFieldType)(rhs.dataType);
+    if (leftIsTime && rightIsTime) {
         if (lhs.dataType !== rhs.dataType) {
-            let lval = lhs.value;
-            let rval = rhs.value;
-            if (lhs.dataType === 'timestamp') {
-                lval = (0, time_utils_1.castTimestampToDate)(lval);
+            const lval = willMorphTo(lhs, 'timestamp');
+            const rval = willMorphTo(rhs, 'timestamp');
+            if (lval && rval) {
+                return (0, utils_1.compose)(lval, op, rval);
             }
-            else {
-                rval = (0, time_utils_1.castTimestampToDate)(rval);
-            }
-            return (0, utils_1.compose)(lval, op, rval);
         }
+        else {
+            return (0, utils_1.compose)(lhs.value, op, rhs.value);
+        }
+    }
+    if (leftIsTime || rightIsTime) {
+        left.log(`Cannot compare a ${lhs.dataType} to a ${rhs.dataType}`);
+        return ['false'];
     }
     return undefined;
 }
@@ -209,7 +239,7 @@ function equality(fs, left, op, right) {
             }
         }
     }
-    let value = timeCompare(lhs, op, rhs) || (0, utils_1.compose)(lhs.value, op, rhs.value);
+    let value = timeCompare(left, lhs, op, rhs) || (0, utils_1.compose)(lhs.value, op, rhs.value);
     if (lhs.dataType !== 'unknown' && rhs.dataType !== 'unknown') {
         switch (op) {
             case '~':
@@ -254,7 +284,7 @@ function compare(fs, left, op, right) {
     if (noCompare) {
         return { ...noCompare, dataType: 'boolean' };
     }
-    const value = timeCompare(lhs, op, rhs) || (0, utils_1.compose)(lhs.value, op, rhs.value);
+    const value = timeCompare(left, lhs, op, rhs) || (0, utils_1.compose)(lhs.value, op, rhs.value);
     return {
         dataType: 'boolean',
         expressionType,

package/dist/lang/ast/types/query-property.d.ts

@@ -13,5 +13,6 @@ import { Ordering } from '../query-properties/ordering';
 import { ProjectStatement } from '../query-properties/project-statement';
 import { SampleProperty } from '../query-properties/sampling';
 import { Top } from '../query-properties/top';
-export declare type QueryProperty = Ordering | Top | Limit | Filter | Index | SampleProperty | Joins | DeclareFields | ProjectStatement | NestReference | NestDefinition | NestReference | Nests | Aggregate | GroupBy;
+import { TimezoneStatement } from '../source-properties/timezone-statement';
+export declare type QueryProperty = Ordering | Top | Limit | Filter | Index | SampleProperty | Joins | DeclareFields | ProjectStatement | NestReference | NestDefinition | NestReference | Nests | Aggregate | GroupBy | TimezoneStatement;
 export declare function isQueryProperty(q: MalloyElement): q is QueryProperty;

package/dist/lang/ast/types/query-property.js

@@ -36,6 +36,7 @@ const ordering_1 = require("../query-properties/ordering");
 const project_statement_1 = require("../query-properties/project-statement");
 const sampling_1 = require("../query-properties/sampling");
 const top_1 = require("../query-properties/top");
+const timezone_statement_1 = require("../source-properties/timezone-statement");
 function isQueryProperty(q) {
     return (q instanceof ordering_1.Ordering ||
         q instanceof top_1.Top ||
@@ -49,7 +50,8 @@ function isQueryProperty(q) {
         q instanceof aggregate_1.Aggregate ||
         q instanceof nests_1.Nests ||
         (0, nest_1.isNestedQuery)(q) ||
-        q instanceof group_by_1.GroupBy);
+        q instanceof group_by_1.GroupBy ||
+        q instanceof timezone_statement_1.TimezoneStatement);
 }
 exports.isQueryProperty = isQueryProperty;
 //# sourceMappingURL=query-property.js.map

package/dist/lang/ast/types/source-property.d.ts

@@ -6,5 +6,6 @@ import { Renames } from '../source-properties/renames';
 import { PrimaryKey } from '../source-properties/primary-key';
 import { Turtles } from '../source-properties/turtles';
 import { MalloyElement } from './malloy-element';
-export declare type SourceProperty = Filter | Joins | DeclareFields | FieldListEdit | Renames | PrimaryKey | Turtles;
+import { TimezoneStatement } from '../source-properties/timezone-statement';
+export declare type SourceProperty = Filter | Joins | DeclareFields | FieldListEdit | Renames | PrimaryKey | Turtles | TimezoneStatement;
 export declare function isSourceProperty(p: MalloyElement): p is SourceProperty;

package/dist/lang/ast/types/source-property.js

@@ -30,6 +30,7 @@ const field_list_edit_1 = require("../source-properties/field-list-edit");
 const renames_1 = require("../source-properties/renames");
 const primary_key_1 = require("../source-properties/primary-key");
 const turtles_1 = require("../source-properties/turtles");
+const timezone_statement_1 = require("../source-properties/timezone-statement");
 function isSourceProperty(p) {
     return (p instanceof filters_1.Filter ||
         p instanceof joins_1.Joins ||
@@ -37,7 +38,8 @@ function isSourceProperty(p) {
         p instanceof field_list_edit_1.FieldListEdit ||
         p instanceof renames_1.Renames ||
         p instanceof primary_key_1.PrimaryKey ||
-        p instanceof turtles_1.Turtles);
+        p instanceof turtles_1.Turtles ||
+        p instanceof timezone_statement_1.TimezoneStatement);
 }
 exports.isSourceProperty = isSourceProperty;
 //# sourceMappingURL=source-property.js.map

package/dist/lang/lib/Malloy/MalloyLexer.d.ts

@@ -29,9 +29,9 @@ export declare class MalloyLexer extends Lexer {
     static readonly SELECT = 24;
     static readonly SOURCE = 25;
     static readonly SQL = 26;
-    static readonly FANCYSQL = 27;
-    static readonly TOP = 28;
-    static readonly WHERE = 29;
+    static readonly TOP = 27;
+    static readonly WHERE = 28;
+    static readonly TIMEZONE = 29;
     static readonly ALL = 30;
     static readonly AND = 31;
     static readonly AS = 32;