@malloydata/malloy 0.0.414 → 0.0.416

package/dist/lang/ast/expressions/expr-granular-time.js

@@ -78,6 +78,7 @@ class ExprGranularTime extends expression_def_1.ExpressionDef {
         };
     }
     getExpression(fs) {
+        var _a;
         const timeframe = this.units;
         const exprVal = this.expr.getExpression(fs);
         let timeType;
@@ -113,7 +114,21 @@ class ExprGranularTime extends expression_def_1.ExpressionDef {
             return tsVal;
         }
         if (exprVal.type !== 'error') {
-            this.logError('unsupported-type-for-time-truncation', `Cannot do time truncation on type '${exprVal.type}'`);
+            if (!(0, malloy_types_1.isBasicAtomicType)(exprVal.type)) {
+                // The truncation target has fields (a join/struct/record/array), so it
+                // can't be a time value. The likely intent is a field whose name is a
+                // time unit (e.g. `flight.year`); since `.year` parses as a truncation
+                // and time units are reserved words, that field has to be quoted.
+                const ref = this.expr.drillExpression();
+                const lhs = (ref === null || ref === void 0 ? void 0 : ref.kind) === 'field_reference'
+                    ? [...((_a = ref.path) !== null && _a !== void 0 ? _a : []), ref.name].join('.')
+                    : undefined;
+                const quoted = lhs ? `${lhs}.\`${timeframe}\`` : `\`${timeframe}\``;
+                this.logError('unsupported-type-for-time-truncation', `'.${timeframe}' is a time truncation, but ${lhs ? `'${lhs}'` : 'the left side'} is type '${exprVal.type}', not a time value. If '${timeframe}' is a field name it must be quoted, because it is a reserved word: ${quoted}`);
+            }
+            else {
+                this.logError('unsupported-type-for-time-truncation', `Cannot do time truncation on type '${exprVal.type}'`);
+            }
         }
         const returnType = { ...exprVal };
         if (exprVal.type === 'error') {

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

@@ -312,65 +312,67 @@ export declare class MalloyParser extends Parser {
     static readonly RULE_orderByStatement = 123;
     static readonly RULE_ordering = 124;
     static readonly RULE_orderBySpec = 125;
-    static readonly RULE_limitStatement = 126;
-    static readonly RULE_bySpec = 127;
-    static readonly RULE_topStatement = 128;
-    static readonly RULE_indexElement = 129;
-    static readonly RULE_indexFields = 130;
-    static readonly RULE_indexStatement = 131;
-    static readonly RULE_sampleStatement = 132;
-    static readonly RULE_timezoneStatement = 133;
-    static readonly RULE_queryAnnotation = 134;
-    static readonly RULE_sampleSpec = 135;
-    static readonly RULE_aggregate = 136;
-    static readonly RULE_malloyType = 137;
-    static readonly RULE_malloyBasicType = 138;
-    static readonly RULE_malloyRecordType = 139;
-    static readonly RULE_malloyRecordField = 140;
-    static readonly RULE_compareOp = 141;
-    static readonly RULE_string = 142;
-    static readonly RULE_shortString = 143;
-    static readonly RULE_rawString = 144;
-    static readonly RULE_numericLiteral = 145;
-    static readonly RULE_literal = 146;
-    static readonly RULE_dateLiteral = 147;
-    static readonly RULE_tablePath = 148;
-    static readonly RULE_tableURI = 149;
-    static readonly RULE_id = 150;
-    static readonly RULE_timeframe = 151;
-    static readonly RULE_ungroup = 152;
-    static readonly RULE_malloyOrSQLType = 153;
-    static readonly RULE_fieldExpr = 154;
-    static readonly RULE_partialCompare = 155;
-    static readonly RULE_partialTest = 156;
-    static readonly RULE_partialAllowedFieldExpr = 157;
-    static readonly RULE_fieldExprList = 158;
-    static readonly RULE_pickStatement = 159;
-    static readonly RULE_pick = 160;
-    static readonly RULE_caseStatement = 161;
-    static readonly RULE_caseWhen = 162;
-    static readonly RULE_recordKey = 163;
-    static readonly RULE_recordElement = 164;
-    static readonly RULE_argumentList = 165;
-    static readonly RULE_fieldNameList = 166;
-    static readonly RULE_fieldCollection = 167;
-    static readonly RULE_collectionWildCard = 168;
-    static readonly RULE_starQualified = 169;
-    static readonly RULE_taggedRef = 170;
-    static readonly RULE_refExpr = 171;
-    static readonly RULE_collectionMember = 172;
-    static readonly RULE_fieldPath = 173;
-    static readonly RULE_joinName = 174;
-    static readonly RULE_fieldName = 175;
-    static readonly RULE_sqlExploreNameRef = 176;
-    static readonly RULE_nameSQLBlock = 177;
-    static readonly RULE_connectionName = 178;
-    static readonly RULE_tripFilterString = 179;
-    static readonly RULE_tickFilterString = 180;
-    static readonly RULE_filterString = 181;
-    static readonly RULE_debugExpr = 182;
-    static readonly RULE_debugPartial = 183;
-    static readonly RULE_experimentalStatementForTesting = 184;
+    static readonly RULE_possibleBadPath = 126;
+    static readonly RULE_badWord = 127;
+    static readonly RULE_limitStatement = 128;
+    static readonly RULE_bySpec = 129;
+    static readonly RULE_topStatement = 130;
+    static readonly RULE_indexElement = 131;
+    static readonly RULE_indexFields = 132;
+    static readonly RULE_indexStatement = 133;
+    static readonly RULE_sampleStatement = 134;
+    static readonly RULE_timezoneStatement = 135;
+    static readonly RULE_queryAnnotation = 136;
+    static readonly RULE_sampleSpec = 137;
+    static readonly RULE_aggregate = 138;
+    static readonly RULE_malloyType = 139;
+    static readonly RULE_malloyBasicType = 140;
+    static readonly RULE_malloyRecordType = 141;
+    static readonly RULE_malloyRecordField = 142;
+    static readonly RULE_compareOp = 143;
+    static readonly RULE_string = 144;
+    static readonly RULE_shortString = 145;
+    static readonly RULE_rawString = 146;
+    static readonly RULE_numericLiteral = 147;
+    static readonly RULE_literal = 148;
+    static readonly RULE_dateLiteral = 149;
+    static readonly RULE_tablePath = 150;
+    static readonly RULE_tableURI = 151;
+    static readonly RULE_id = 152;
+    static readonly RULE_timeframe = 153;
+    static readonly RULE_ungroup = 154;
+    static readonly RULE_malloyOrSQLType = 155;
+    static readonly RULE_fieldExpr = 156;
+    static readonly RULE_partialCompare = 157;
+    static readonly RULE_partialTest = 158;
+    static readonly RULE_partialAllowedFieldExpr = 159;
+    static readonly RULE_fieldExprList = 160;
+    static readonly RULE_pickStatement = 161;
+    static readonly RULE_pick = 162;
+    static readonly RULE_caseStatement = 163;
+    static readonly RULE_caseWhen = 164;
+    static readonly RULE_recordKey = 165;
+    static readonly RULE_recordElement = 166;
+    static readonly RULE_argumentList = 167;
+    static readonly RULE_fieldNameList = 168;
+    static readonly RULE_fieldCollection = 169;
+    static readonly RULE_collectionWildCard = 170;
+    static readonly RULE_starQualified = 171;
+    static readonly RULE_taggedRef = 172;
+    static readonly RULE_refExpr = 173;
+    static readonly RULE_collectionMember = 174;
+    static readonly RULE_fieldPath = 175;
+    static readonly RULE_joinName = 176;
+    static readonly RULE_fieldName = 177;
+    static readonly RULE_sqlExploreNameRef = 178;
+    static readonly RULE_nameSQLBlock = 179;
+    static readonly RULE_connectionName = 180;
+    static readonly RULE_tripFilterString = 181;
+    static readonly RULE_tickFilterString = 182;
+    static readonly RULE_filterString = 183;
+    static readonly RULE_debugExpr = 184;
+    static readonly RULE_debugPartial = 185;
+    static readonly RULE_experimentalStatementForTesting = 186;
     static readonly ruleNames: string[];
     private static readonly _LITERAL_NAMES;
     private static readonly _SYMBOLIC_NAMES;
@@ -510,6 +512,8 @@ export declare class MalloyParser extends Parser {
     orderByStatement(): OrderByStatementContext;
     ordering(): OrderingContext;
     orderBySpec(): OrderBySpecContext;
+    possibleBadPath(): PossibleBadPathContext;
+    badWord(): BadWordContext;
     limitStatement(): LimitStatementContext;
     bySpec(): BySpecContext;
     topStatement(): TopStatementContext;
@@ -2200,7 +2204,7 @@ export declare class OrderingContext extends ParserRuleContext {
 }
 export declare class OrderBySpecContext extends ParserRuleContext {
     INTEGER_LITERAL(): TerminalNode | undefined;
-    fieldName(): FieldNameContext | undefined;
+    possibleBadPath(): PossibleBadPathContext | undefined;
     ASC(): TerminalNode | undefined;
     DESC(): TerminalNode | undefined;
     constructor(parent: ParserRuleContext | undefined, invokingState: number);
@@ -2209,6 +2213,84 @@ export declare class OrderBySpecContext extends ParserRuleContext {
     exitRule(listener: MalloyParserListener): void;
     accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
 }
+export declare class PossibleBadPathContext extends ParserRuleContext {
+    badWord(): BadWordContext[];
+    badWord(i: number): BadWordContext;
+    DOT(): TerminalNode[];
+    DOT(i: number): TerminalNode;
+    constructor(parent: ParserRuleContext | undefined, invokingState: number);
+    get ruleIndex(): number;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
+}
+export declare class BadWordContext extends ParserRuleContext {
+    fieldName(): FieldNameContext | undefined;
+    timeframe(): TimeframeContext | undefined;
+    ALL(): TerminalNode | undefined;
+    AND(): TerminalNode | undefined;
+    AS(): TerminalNode | undefined;
+    AVG(): TerminalNode | undefined;
+    BOOLEAN(): TerminalNode | undefined;
+    BY(): TerminalNode | undefined;
+    CASE(): TerminalNode | undefined;
+    CAST(): TerminalNode | undefined;
+    COUNT(): TerminalNode | undefined;
+    COMPOSE(): TerminalNode | undefined;
+    DATE(): TerminalNode | undefined;
+    DISTINCT(): TerminalNode | undefined;
+    ELSE(): TerminalNode | undefined;
+    END(): TerminalNode | undefined;
+    EXCLUDE(): TerminalNode | undefined;
+    EXPORT(): TerminalNode | undefined;
+    EXTEND(): TerminalNode | undefined;
+    FALSE(): TerminalNode | undefined;
+    FILTER(): TerminalNode | undefined;
+    FULL(): TerminalNode | undefined;
+    FOR(): TerminalNode | undefined;
+    FROM(): TerminalNode | undefined;
+    HAS(): TerminalNode | undefined;
+    IMPORT(): TerminalNode | undefined;
+    INCLUDE(): TerminalNode | undefined;
+    INNER(): TerminalNode | undefined;
+    IS(): TerminalNode | undefined;
+    IN(): TerminalNode | undefined;
+    INTERNAL_KW(): TerminalNode | undefined;
+    JSON(): TerminalNode | undefined;
+    LEFT(): TerminalNode | undefined;
+    LIKE(): TerminalNode | undefined;
+    MAX(): TerminalNode | undefined;
+    MIN(): TerminalNode | undefined;
+    NOT(): TerminalNode | undefined;
+    NOW(): TerminalNode | undefined;
+    NULL(): TerminalNode | undefined;
+    NUMBER(): TerminalNode | undefined;
+    ON(): TerminalNode | undefined;
+    OR(): TerminalNode | undefined;
+    PICK(): TerminalNode | undefined;
+    PRIVATE_KW(): TerminalNode | undefined;
+    PUBLIC_KW(): TerminalNode | undefined;
+    RIGHT(): TerminalNode | undefined;
+    STRING(): TerminalNode | undefined;
+    SOURCE_KW(): TerminalNode | undefined;
+    SUM(): TerminalNode | undefined;
+    SQL(): TerminalNode | undefined;
+    TABLE(): TerminalNode | undefined;
+    THEN(): TerminalNode | undefined;
+    THIS(): TerminalNode | undefined;
+    TIMESTAMPTZ(): TerminalNode | undefined;
+    TIMESTAMP(): TerminalNode | undefined;
+    TO(): TerminalNode | undefined;
+    TRUE(): TerminalNode | undefined;
+    WHEN(): TerminalNode | undefined;
+    WITH(): TerminalNode | undefined;
+    VIRTUAL(): TerminalNode | undefined;
+    constructor(parent: ParserRuleContext | undefined, invokingState: number);
+    get ruleIndex(): number;
+    enterRule(listener: MalloyParserListener): void;
+    exitRule(listener: MalloyParserListener): void;
+    accept<Result>(visitor: MalloyParserVisitor<Result>): Result;
+}
 export declare class LimitStatementContext extends ParserRuleContext {
     LIMIT(): TerminalNode;
     INTEGER_LITERAL(): TerminalNode;