@malloydata/malloy 0.0.38-dev230609221655 → 0.0.38-dev230612191503

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

@@ -74,7 +74,6 @@ import { JoinOnContext } from "./MalloyParser";
 import { MalloyDocumentContext } from "./MalloyParser";
 import { MalloyStatementContext } from "./MalloyParser";
 import { DefineSourceStatementContext } from "./MalloyParser";
-import { ExploreKeywordContext } from "./MalloyParser";
 import { DefineQueryContext } from "./MalloyParser";
 import { TopLevelAnonQueryDefContext } from "./MalloyParser";
 import { DefineSQLStatementContext } from "./MalloyParser";
@@ -1075,16 +1074,6 @@ export interface MalloyParserListener extends ParseTreeListener {
      * @param ctx the parse tree
      */
     exitDefineSourceStatement?: (ctx: DefineSourceStatementContext) => void;
-    /**
-     * Enter a parse tree produced by `MalloyParser.exploreKeyword`.
-     * @param ctx the parse tree
-     */
-    enterExploreKeyword?: (ctx: ExploreKeywordContext) => void;
-    /**
-     * Exit a parse tree produced by `MalloyParser.exploreKeyword`.
-     * @param ctx the parse tree
-     */
-    exitExploreKeyword?: (ctx: ExploreKeywordContext) => void;
     /**
      * Enter a parse tree produced by `MalloyParser.defineQuery`.
      * @param ctx the parse tree

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

@@ -74,7 +74,6 @@ import { JoinOnContext } from "./MalloyParser";
 import { MalloyDocumentContext } from "./MalloyParser";
 import { MalloyStatementContext } from "./MalloyParser";
 import { DefineSourceStatementContext } from "./MalloyParser";
-import { ExploreKeywordContext } from "./MalloyParser";
 import { DefineQueryContext } from "./MalloyParser";
 import { TopLevelAnonQueryDefContext } from "./MalloyParser";
 import { DefineSQLStatementContext } from "./MalloyParser";
@@ -706,12 +705,6 @@ export interface MalloyParserVisitor<Result> extends ParseTreeVisitor<Result> {
      * @return the visitor result
      */
     visitDefineSourceStatement?: (ctx: DefineSourceStatementContext) => Result;
-    /**
-     * Visit a parse tree produced by `MalloyParser.exploreKeyword`.
-     * @param ctx the parse tree
-     * @return the visitor result
-     */
-    visitExploreKeyword?: (ctx: ExploreKeywordContext) => Result;
     /**
      * Visit a parse tree produced by `MalloyParser.defineQuery`.
      * @param ctx the parse tree

package/dist/lang/malloy-to-ast.js

@@ -98,7 +98,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
                 eps.push(el);
             }
             else {
-                this.astError(el, `Expected explore property, not '${el.elementType}'`);
+                this.astError(el, `Expected source property, not '${el.elementType}'`);
             }
         }
         return eps;
@@ -110,7 +110,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
                 eps.push(el);
             }
             else {
-                this.astError(el, `Expected explore property, not '${el.elementType}'`);
+                this.astError(el, `Expected source property, not '${el.elementType}'`);
             }
         }
         return eps;
@@ -244,7 +244,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         if (element instanceof ast.Source) {
             return element;
         }
-        throw this.internalError(pcx, `'${element.elementType}': illegal explore source`);
+        throw this.internalError(pcx, `'${element.elementType}': illegal source`);
     }
     makeSqlString(pcx, sqlStr) {
         var _a;
@@ -472,7 +472,11 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return this.visitTimezoneStatement(cx.timezoneStatement());
     }
     visitTimezoneStatement(cx) {
-        return this.astAt(new ast.TimezoneStatement(this.stripQuotes(cx.STRING_LITERAL().text)), cx);
+        const timezoneStatement = new ast.TimezoneStatement(this.stripQuotes(cx.STRING_LITERAL().text));
+        if (!timezoneStatement.isValid) {
+            this.astError(timezoneStatement, `Invalid timezone: ${timezoneStatement.tz}`);
+        }
+        return this.astAt(timezoneStatement, cx);
     }
     visitQueryProperties(pcx) {
         const qProps = pcx

package/dist/lang/test/document-help-context-walker.spec.js

@@ -44,7 +44,7 @@ test('Supports model properties', () => {
     testHelpContext((0, test_translator_1.markSource) `${source}`, { line: 0, character: 1 }, 'model_property', 'source:');
     testHelpContext((0, test_translator_1.markSource) `${source}`, { line: 8, character: 1 }, 'model_property', 'query:');
 });
-test('Supports explore properties', () => {
+test('Supports source properties', () => {
     testHelpContext((0, test_translator_1.markSource) `${source}`, { line: 1, character: 3 }, 'explore_property', 'where:');
     testHelpContext((0, test_translator_1.markSource) `${source}`, { line: 2, character: 3 }, 'explore_property', 'query:');
 });

package/dist/lang/test/document-symbol-walker.spec.js

@@ -45,64 +45,64 @@ function testSymbol(source, name, type, path) {
         type,
     });
 }
-test('explore symbols are included', () => {
-    testSymbol((0, test_translator_1.markSource) `explore: ${"flights is table('my.table.flights')"}`, 'flights', 'explore', [0]);
+test('source symbols are included', () => {
+    testSymbol((0, test_translator_1.markSource) `source: ${"flights is table('my.table.flights')"}`, 'flights', 'explore', [0]);
 });
 test('query symbols are included', () => {
     testSymbol((0, test_translator_1.markSource) `query: ${'flights_by_carrier is flights -> by_carrier'}`, 'flights_by_carrier', 'query', [0]);
 });
 test('expression field defs are included', () => {
     testSymbol((0, test_translator_1.markSource) `
-      explore: flights is table('my.table.flights') {
+      source: flights is table('my.table.flights') {
         dimension: ${'one is 1'}
       }
     `, 'one', 'field', [0, 0]);
 });
 test('renamed fields are included', () => {
     testSymbol((0, test_translator_1.markSource) `
-      explore: flights is table('my.table.flights') {
+      source: flights is table('my.table.flights') {
         rename: ${'field_two is field_2'}
       }
     `, 'field_two', 'field', [0, 0]);
 });
 test('name only fields are included', () => {
     testSymbol((0, test_translator_1.markSource) `
-      explore: flights is table('my.table.flights') {
+      source: flights is table('my.table.flights') {
         dimension: ${'field_two is field_2'}
       }
     `, 'field_two', 'field', [0, 0]);
 });
 test('turtle fields are included', () => {
     testSymbol((0, test_translator_1.markSource) `
-      explore: flights is table('my.table.flights') {
+      source: flights is table('my.table.flights') {
         query: ${'my_turtle is { group_by: a }'}
       }
     `, 'my_turtle', 'query', [0, 0]);
 });
 test('turtle children fields are included', () => {
     testSymbol((0, test_translator_1.markSource) `
-      explore: flights is table('my.table.flights') {
+      source: flights is table('my.table.flights') {
         query: my_turtle is { group_by: ${'a'} }
       }
     `, 'a', 'field', [0, 0, 0]);
 });
 test('turtle children turtles are included', () => {
     testSymbol((0, test_translator_1.markSource) `
-      explore: flights is table('my.table.flights') {
+      source: flights is table('my.table.flights') {
         query: my_turtle is { nest: ${'inner_turtle is { group_by: a }'} }
       }
     `, 'inner_turtle', 'query', [0, 0, 0]);
 });
 test('join withs are included', () => {
     testSymbol((0, test_translator_1.markSource) `
-      explore: flights is table('my.table.flights') {
+      source: flights is table('my.table.flights') {
         join_one: ${'a is b with c'}
       }
     `, 'a', 'join', [0, 0]);
 });
 test('join ons are included', () => {
     testSymbol((0, test_translator_1.markSource) `
-      explore: flights is table('my.table.flights') {
+      source: flights is table('my.table.flights') {
         join_one: ${'a is b on c'}
       }
     `, 'a', 'join', [0, 0]);

package/dist/lang/test/parse-expects.d.ts

@@ -1,4 +1,5 @@
 import { DocumentLocation } from '../../model';
+declare type ErrorSpec = string | RegExp;
 declare global {
     namespace jest {
         interface Matchers<R> {
@@ -8,8 +9,9 @@ declare global {
             modelCompiled(): R;
             expressionCompiled(): R;
             toReturnType(tp: string): R;
-            compileToFailWith(...expectedErrors: string[]): R;
+            compileToFailWith(...expectedErrors: ErrorSpec[]): R;
             isLocationIn(at: DocumentLocation, txt: string): R;
         }
     }
 }
+export {};

package/dist/lang/test/parse-expects.js

@@ -129,7 +129,7 @@ expect.extend({
         return checkForErrors(trans);
     },
     toReturnType: function (functionCall, returnType) {
-        const exprModel = new test_translator_1.TestTranslator(`explore: x is a { dimension: d is ${functionCall} }`);
+        const exprModel = new test_translator_1.TestTranslator(`source: x is a { dimension: d is ${functionCall} }`);
         expect(exprModel).modelCompiled();
         const x = exprModel.getSourceDef('x');
         expect(x).toBeDefined();
@@ -191,7 +191,10 @@ expect.extend({
             for (i = 0; i < msgs.length && errList[i]; i += 1) {
                 const msg = msgs[i];
                 const err = errList[i];
-                if (msg !== err.message) {
+                const matched = typeof msg === 'string'
+                    ? msg === err.message
+                    : err.message.match(msg);
+                if (!matched) {
                     explain.push(`Expected: ${msg}\nGot: ${err.message}`);
                 }
                 else {