npm - @malloydata/malloy - Versions diffs - 0.0.237-dev250225144145 → 0.0.237-dev250225213433 - Mend

@malloydata/malloy 0.0.237-dev250225144145 → 0.0.237-dev250225213433

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

package/dist/lang/syntax-errors/custom-error-messages.d.ts CHANGED Viewed

@@ -2,10 +2,12 @@ import { Parser, Token } from 'antlr4ts';
 export interface ErrorCase {
     ruleContextOptions?: string[];
     offendingSymbol?: number;
+    offendingSymbolTextOptions?: string[];
     currentToken?: number;
     precedingTokenOptions?: number[][];
-    lookAheadOptions?: number[][];
+    lookAheadOptions?: (number | string)[][];
     errorMessage: string;
-    lookbackFromOffendingSymbol?: boolean;
+    lookbackSiblingRuleOptions?: number[];
+    predecessorHasAncestorRule?: number;
 }
 export declare const checkCustomErrorMessage: (parser: Parser, offendingSymbol: Token | undefined, errorCases: ErrorCase[]) => string;

package/dist/lang/syntax-errors/custom-error-messages.js CHANGED Viewed

@@ -8,6 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkCustomErrorMessage = void 0;
 const checkCustomErrorMessage = (parser, offendingSymbol, errorCases) => {
+    var _a, _b;
     const currentRuleName = parser.getRuleInvocationStack()[0];
     const currentToken = parser.currentToken;
     for (const errorCase of errorCases) {
@@ -17,52 +18,110 @@ const checkCustomErrorMessage = (parser, offendingSymbol, errorCases) => {
             (offendingSymbol === null || offendingSymbol === void 0 ? void 0 : offendingSymbol.type) === errorCase.offendingSymbol;
         const isRuleContextMatch = !errorCase.ruleContextOptions ||
             errorCase.ruleContextOptions.includes(currentRuleName);
-        if (isCurrentTokenMatch && isOffendingSymbolMatch && isRuleContextMatch) {
+        const isOffendingSymbolTextMatch = !errorCase.offendingSymbolTextOptions ||
+            errorCase.offendingSymbolTextOptions.includes(((_a = offendingSymbol === null || offendingSymbol === void 0 ? void 0 : offendingSymbol.text) === null || _a === void 0 ? void 0 : _a.toLowerCase()) || '');
+        if (isCurrentTokenMatch &&
+            isOffendingSymbolMatch &&
+            isRuleContextMatch &&
+            isOffendingSymbolTextMatch) {
+            if (errorCase.lookbackSiblingRuleOptions) {
+                const siblings = parser.ruleContext.children;
+                if (!siblings) {
+                    continue;
+                }
+                // We use 'any' here because the sibling isn't guaranteed to be a RuleContext,
+                // but we only care if it has a ruleIndex. If it doesn't then .includes() won't
+                // match anyways.
+                // eslint-disable-next-line @typescript-eslint/no-explicit-any
+                const precedingRule = siblings[siblings.length - 1];
+                if (!errorCase.lookbackSiblingRuleOptions.includes(precedingRule.ruleIndex)) {
+                    continue;
+                }
+            }
             // If so, try to check the preceding tokens.
             if (errorCase.precedingTokenOptions) {
-                const hasPrecedingTokenMatch = errorCase.precedingTokenOptions.some(sequence => checkTokenSequenceMatch(parser, sequence, 'lookback', errorCase.lookbackFromOffendingSymbol
-                    ? offendingSymbol === null || offendingSymbol === void 0 ? void 0 : offendingSymbol.tokenIndex
-                    : undefined));
+                const hasPrecedingTokenMatch = errorCase.precedingTokenOptions.some(sequence => checkTokenSequenceMatch(parser, sequence, 'lookback', offendingSymbol === null || offendingSymbol === void 0 ? void 0 : offendingSymbol.tokenIndex));
                 if (!hasPrecedingTokenMatch) {
                     continue; // Continue to check a different error case
                 }
             }
             if (errorCase.lookAheadOptions) {
-                const hasLookaheadTokenMatch = errorCase.lookAheadOptions.some(sequence => checkTokenSequenceMatch(parser, sequence, 'lookahead', errorCase.lookbackFromOffendingSymbol
-                    ? offendingSymbol === null || offendingSymbol === void 0 ? void 0 : offendingSymbol.tokenIndex
-                    : undefined));
+                const hasLookaheadTokenMatch = errorCase.lookAheadOptions.some(sequence => checkTokenSequenceMatch(parser, sequence, 'lookahead', offendingSymbol === null || offendingSymbol === void 0 ? void 0 : offendingSymbol.tokenIndex));
                 if (!hasLookaheadTokenMatch) {
                     continue; // Continue to check a different error case
                 }
             }
+            if (errorCase.predecessorHasAncestorRule) {
+                const precedingSibling = (_b = parser.ruleContext.children) === null || _b === void 0 ? void 0 : _b[0];
+                if (!precedingSibling ||
+                    !doesRightmostBranchContainRule(precedingSibling, errorCase.predecessorHasAncestorRule)) {
+                    continue;
+                }
+            }
             // If all cases match, return the custom error message
-            const message = errorCase.errorMessage.replace('${currentToken}', (offendingSymbol === null || offendingSymbol === void 0 ? void 0 : offendingSymbol.text) || currentToken.text || '');
+            let message = errorCase.errorMessage
+                .replace('${currentToken}', currentToken.text || '')
+                .replace('${offendingSymbol}', (offendingSymbol === null || offendingSymbol === void 0 ? void 0 : offendingSymbol.text) || '');
+            try {
+                const previousToken = parser.inputStream.LT(-1);
+                message = message.replace('${previousToken}', previousToken.text || '');
+            }
+            catch (ex) {
+                // This shouldn't ever occur, but if it does, just leave the untokenized message.
+            }
             return message;
         }
     }
     return '';
 };
 exports.checkCustomErrorMessage = checkCustomErrorMessage;
+// Recursively walk the rightmost branch (the path to the most recent token)
+// to see whether any of those parse tree nodes match the provided rule number.
+const doesRightmostBranchContainRule = (root, ruleNumber, depthLimit = 20) => {
+    var _a;
+    if (root.ruleIndex === ruleNumber) {
+        return true;
+    }
+    if (depthLimit <= 0) {
+        return false;
+    }
+    const childCount = ((_a = root.children) === null || _a === void 0 ? void 0 : _a.length) || 0;
+    if (root.children && childCount > 0) {
+        const rightmostChild = root.children[root.children.length - 1];
+        return doesRightmostBranchContainRule(rightmostChild, ruleNumber, depthLimit - 1);
+    }
+    return false;
+};
 const checkTokenSequenceMatch = (parser, sequence, direction, anchorTokenPosition) => {
+    var _a;
     try {
         for (let i = 0; i < sequence.length; i++) {
             let streamToken = undefined;
             if (typeof anchorTokenPosition === 'number') {
                 const tokenOffset = direction === 'lookahead' ? i + 1 : -1 * (i + 1);
-                streamToken = parser.inputStream.get(anchorTokenPosition + tokenOffset).type;
+                streamToken = parser.inputStream.get(anchorTokenPosition + tokenOffset);
             }
             else {
                 // Note: positive lookahead starts at '2' because '1' is the current token.
                 const tokenOffset = direction === 'lookahead' ? i + 2 : -1 * (i + 1);
-                streamToken = parser.inputStream.LA(tokenOffset);
+                streamToken = parser.inputStream.LT(tokenOffset);
             }
-            // Note: negative checking is < -1 becuase Token.EOF is -1, but below
-            // that we use negatives to indicate "does-not-match" rules.
-            if (sequence[i] >= -1 && streamToken !== sequence[i]) {
-                return false;
+            if (typeof sequence[i] === 'number') {
+                const tokenIndex = sequence[i];
+                // Note: negative checking is < -1 becuase Token.EOF is -1, but below
+                // that we use negatives to indicate "does-not-match" rules.
+                if (tokenIndex >= -1 && streamToken.type !== tokenIndex) {
+                    return false;
+                }
+                if (tokenIndex < -1 && streamToken.type === -1 * tokenIndex) {
+                    return false;
+                }
             }
-            if (sequence[i] < -1 && streamToken === -1 * sequence[i]) {
-                return false;
+            else if (typeof sequence[i] === 'string') {
+                const tokenText = sequence[i];
+                if (tokenText !== ((_a = streamToken.text) === null || _a === void 0 ? void 0 : _a.toLowerCase())) {
+                    return false;
+                }
             }
         }
         return true;

package/dist/lang/syntax-errors/malloy-error-strategy.d.ts CHANGED Viewed

@@ -1,14 +1,12 @@
-import { DefaultErrorStrategy, Parser } from 'antlr4ts';
+import { DefaultErrorStrategy } from 'antlr4ts';
 /**
- * Custom error strategy for the Malloy Parser. This strategy attempts to
- * detect known cases where the default error strategy results in an unhelpful
- * parse tree or misleading messages. In any cases not explicitly handled, this
- * custom error strategy will fall back to the default error strategy.
+ * Custom error strategy for the Malloy Parser.
+ *
+ * This class does not currently override default ANTLR error handling.
  *
  * For more details, read the documentation in DefaultErrorStrategy.d.ts
  * or reference the superclass at:
  * https://github.com/tunnelvisionlabs/antlr4ts/blob/master/src/DefaultErrorStrategy.ts
  */
 export declare class MalloyErrorStrategy extends DefaultErrorStrategy {
-    sync(parser: Parser): void;
 }

package/dist/lang/syntax-errors/malloy-error-strategy.js CHANGED Viewed

@@ -8,35 +8,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MalloyErrorStrategy = void 0;
 const antlr4ts_1 = require("antlr4ts");
-const MalloyParser_1 = require("../lib/Malloy/MalloyParser");
-const custom_error_messages_1 = require("./custom-error-messages");
-const customErrorCases = [
-    {
-        errorMessage: "Missing '{' after 'extend'",
-        currentToken: MalloyParser_1.MalloyParser.EXTEND,
-        ruleContextOptions: ['sqExpr'],
-        lookAheadOptions: [[-MalloyParser_1.MalloyParser.OCURLY]],
-    },
-];
 /**
- * Custom error strategy for the Malloy Parser. This strategy attempts to
- * detect known cases where the default error strategy results in an unhelpful
- * parse tree or misleading messages. In any cases not explicitly handled, this
- * custom error strategy will fall back to the default error strategy.
+ * Custom error strategy for the Malloy Parser.
+ *
+ * This class does not currently override default ANTLR error handling.
  *
  * For more details, read the documentation in DefaultErrorStrategy.d.ts
  * or reference the superclass at:
  * https://github.com/tunnelvisionlabs/antlr4ts/blob/master/src/DefaultErrorStrategy.ts
  */
 class MalloyErrorStrategy extends antlr4ts_1.DefaultErrorStrategy {
-    sync(parser) {
-        const interceptedErrorMessage = (0, custom_error_messages_1.checkCustomErrorMessage)(parser, undefined, customErrorCases);
-        if (interceptedErrorMessage) {
-            parser.notifyErrorListeners(interceptedErrorMessage, parser.currentToken, undefined);
-            return;
-        }
-        super.sync(parser);
-    }
 }
 exports.MalloyErrorStrategy = MalloyErrorStrategy;
 //# sourceMappingURL=malloy-error-strategy.js.map

package/dist/lang/syntax-errors/malloy-parser-error-listener.d.ts CHANGED Viewed

@@ -2,7 +2,7 @@ import { ANTLRErrorListener, Token } from 'antlr4ts';
 import { ErrorCase } from './custom-error-messages';
 import { MessageLogger, MessageCode, MessageParameterType, LogMessageOptions } from '../parse-log';
 import { MalloyTranslation } from '../parse-malloy';
-export declare const commonErrorCases: ErrorCase[];
+export declare const malloyCustomErrorCases: ErrorCase[];
 export declare class MalloyParserErrorListener implements ANTLRErrorListener<Token> {
     readonly translator: MalloyTranslation;
     readonly messages: MessageLogger;

package/dist/lang/syntax-errors/malloy-parser-error-listener.js CHANGED Viewed

@@ -6,11 +6,19 @@
  * LICENSE file in the root directory of this source tree.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MalloyParserErrorListener = exports.commonErrorCases = void 0;
+exports.MalloyParserErrorListener = exports.malloyCustomErrorCases = void 0;
 const MalloyParser_1 = require("../lib/Malloy/MalloyParser");
 const custom_error_messages_1 = require("./custom-error-messages");
 const parse_log_1 = require("../parse-log");
-exports.commonErrorCases = [
+// A set of custom error messages and their triggering cases,
+// used for syntax error message re-writing when ANTLR would
+// otherwise print a standard (and not very useful) error message.
+//
+// Most Malloy errors are detected and generated in language elements
+// inside `src/lang/ast`. These custom error messages are used to
+// cover a variety of cases that are not as straightforward to
+// catch in the AST.
+exports.malloyCustomErrorCases = [
     {
         errorMessage: "'view:' must be followed by '<identifier> is {'",
         ruleContextOptions: ['exploreQueryDef'],
@@ -18,7 +26,7 @@ exports.commonErrorCases = [
         precedingTokenOptions: [[MalloyParser_1.MalloyParser.VIEW], [MalloyParser_1.MalloyParser.COLON]],
     },
     {
-        errorMessage: "Missing '}' at '${currentToken}'",
+        errorMessage: "Missing '}' at '${offendingSymbol}'",
         ruleContextOptions: ['vExpr'],
         offendingSymbol: MalloyParser_1.MalloyParser.VIEW,
         currentToken: MalloyParser_1.MalloyParser.OCURLY,
@@ -30,17 +38,106 @@ exports.commonErrorCases = [
             'queryProperties',
             'exploreStatement',
         ],
-        lookAheadOptions: [
-            [MalloyParser_1.MalloyParser.EOF],
-            [MalloyParser_1.MalloyParser.RUN],
-            [MalloyParser_1.MalloyParser.SOURCE],
-        ],
+        offendingSymbolTextOptions: ['<eof>', 'run:', 'source:'],
     },
     {
         errorMessage: "'aggregate:' entries must include a name (ex: `some_name is count()`)",
         precedingTokenOptions: [[MalloyParser_1.MalloyParser.AGGREGATE]],
         lookAheadOptions: [[-MalloyParser_1.MalloyParser.IS]],
-        lookbackFromOffendingSymbol: true,
+    },
+    {
+        errorMessage: "Expected ':' following 'source'",
+        offendingSymbol: MalloyParser_1.MalloyParser.SOURCE_KW,
+        ruleContextOptions: ['malloyDocument'],
+    },
+    {
+        errorMessage: "Expected ':' following '${offendingSymbol}'",
+        offendingSymbolTextOptions: [
+            'dimension',
+            'measure',
+            'where',
+            'declare',
+            'join_one',
+            'join_many',
+            'join_cross',
+            'primary_key',
+        ],
+        ruleContextOptions: ['exploreStatement'],
+    },
+    {
+        errorMessage: "Expected 'is' or '(' following identifier '${previousToken}'",
+        ruleContextOptions: ['sourceDefinition'],
+        lookbackSiblingRuleOptions: [
+            MalloyParser_1.MalloyParser.RULE_sourceNameDef,
+            MalloyParser_1.MalloyParser.RULE_sourceParameters,
+        ],
+    },
+    {
+        errorMessage: "Unexpected '{' following source expression. Expected: 'extend', 'include', '+' or '->'",
+        offendingSymbol: MalloyParser_1.MalloyParser.OCURLY,
+        ruleContextOptions: ['malloyDocument'],
+        predecessorHasAncestorRule: MalloyParser_1.MalloyParser.RULE_sqExplore,
+    },
+    {
+        errorMessage: "Unexpected 'join:'. Did you mean 'join_one:', 'join_many:' or 'join_cross:'?",
+        ruleContextOptions: ['exploreStatement'],
+        offendingSymbolTextOptions: ['join'],
+        lookAheadOptions: [[MalloyParser_1.MalloyParser.COLON]],
+    },
+    {
+        errorMessage: "Unexpected '${offendingSymbol}'. Did you mean 'primary_key:'?",
+        ruleContextOptions: ['exploreStatement'],
+        offendingSymbolTextOptions: ['primarykey', 'primary'],
+        lookAheadOptions: [
+            [MalloyParser_1.MalloyParser.COLON],
+            ['key', MalloyParser_1.MalloyParser.COLON],
+            ['key', MalloyParser_1.MalloyParser.IDENTIFIER],
+        ],
+    },
+    {
+        errorMessage: "Unexpected '${offendingSymbol}'. Did you mean 'group_by:'?",
+        ruleContextOptions: ['queryStatement'],
+        offendingSymbolTextOptions: ['groupby', 'group'],
+        lookAheadOptions: [
+            [MalloyParser_1.MalloyParser.COLON],
+            ['by', MalloyParser_1.MalloyParser.COLON],
+            ['by', MalloyParser_1.MalloyParser.IDENTIFIER],
+        ],
+    },
+    {
+        errorMessage: "Unexpected '${offendingSymbol}'. Did you mean 'order_by:'?",
+        ruleContextOptions: ['queryStatement'],
+        offendingSymbolTextOptions: ['orderby', 'order'],
+        lookAheadOptions: [
+            [MalloyParser_1.MalloyParser.COLON],
+            ['by', MalloyParser_1.MalloyParser.COLON],
+            ['by', MalloyParser_1.MalloyParser.IDENTIFIER],
+        ],
+    },
+    {
+        errorMessage: "Expected ':' following '${offendingSymbol}'",
+        offendingSymbolTextOptions: [
+            'group_by',
+            'declare',
+            'join_one',
+            'join_many',
+            'join_cross',
+            'extend',
+            'select',
+            'project',
+            'index',
+            'aggregate',
+            'calculate',
+            'top',
+            'limit',
+            'order_by',
+            'where',
+            'having',
+            'nest',
+            'sample',
+            'timezone',
+        ],
+        ruleContextOptions: ['queryStatement'],
     },
 ];
 class MalloyParserErrorListener {
@@ -57,7 +154,7 @@ class MalloyParserErrorListener {
         const range = offendingSymbol
             ? this.translator.rangeFromToken(offendingSymbol)
             : { start: errAt, end: errAt };
-        const overrideMessage = (0, custom_error_messages_1.checkCustomErrorMessage)(recognizer, offendingSymbol, exports.commonErrorCases);
+        const overrideMessage = (0, custom_error_messages_1.checkCustomErrorMessage)(recognizer, offendingSymbol, exports.malloyCustomErrorCases);
         if (overrideMessage) {
             message = overrideMessage;
         }

package/dist/lang/test/syntax-errors.spec.js CHANGED Viewed

@@ -8,62 +8,91 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const test_translator_1 = require("./test-translator");
 require("./parse-expects");
-describe('errors', () => {
-    test('source missing closing curly: EOF', () => {
-        expect('source: x is a extend {').toLogAtLeast((0, test_translator_1.errorMessage)("Missing '}' at '<EOF>'"));
+/**
+ * Unit tests intended to cover the custom error messages defined in
+ * malloy-custom-error-messages.ts.
+ *
+ * These tests are intended to prevent unintended regressions. It is
+ * okay to change or remove tests here as long as you are doing so
+ * for a good reason.
+ */
+describe('custom error messages', () => {
+    describe('source', () => {
+        test('missing alias', () => {
+            expect('source: x extend { }').toLogAtLeast((0, test_translator_1.errorMessage)("Expected 'is' or '(' following identifier 'x'"));
+        });
+        test('missing closing curly: EOF', () => {
+            expect('source: x is a extend {').toLogAtLeast((0, test_translator_1.errorMessage)("Missing '}' at '<EOF>'"));
+        });
+        test('source: missing colon in root context', () => {
+            expect('source x is a extend { }').toLogAtLeast((0, test_translator_1.errorMessage)("Expected ':' following 'source'"));
+        });
+        test('opening curly to EOF', () => {
+            expect(`
+          source: y is x extend {
+        `).toLogAtLeast((0, test_translator_1.errorMessage)("Missing '}' at '<EOF>'"));
+        });
+        test('expression missing operand before curly', () => {
+            expect("source: a is presto.table('malloytest.state_facts') {}").toLogAtLeast((0, test_translator_1.errorMessage)("Unexpected '{' following source expression. Expected: 'extend', 'include', '+' or '->'"));
+        });
+        test('missing opening curly after source extend keyword', () => {
+            expect(`
+        source: x is a extend
+          primary_key: id
+      `).toLogAtLeast((0, test_translator_1.errorMessage)("missing '{' at 'primary_key:'"));
+        });
     });
-    test('view is missing name', () => {
-        expect(`
-      source: x is a extend {
-        view: {
-          group_by: b
+    describe('exploreProperties', () => {
+        test('misspelled "join"', () => {
+            expect(`source: x is a extend {
+        join: data is y on dataId = data.id
+      }`).toLogAtLeast((0, test_translator_1.errorMessage)("Unexpected 'join:'. Did you mean 'join_one:', 'join_many:' or 'join_cross:'?"));
+            expect(`source: x is a extend {
+        primary_key: name
+        join: data is y on dataId = data.id
+      }`).toLogAtLeast((0, test_translator_1.errorMessage)("Unexpected 'join:'. Did you mean 'join_one:', 'join_many:' or 'join_cross:'?"));
+        });
+        test('misspelled "primary_key:"', () => {
+            expect('source: x is a extend { primaryKey: name }').toLogAtLeast((0, test_translator_1.errorMessage)("Unexpected 'primaryKey'. Did you mean 'primary_key:'?"));
+            expect('source: x is a extend { primary key: name }').toLogAtLeast((0, test_translator_1.errorMessage)("Unexpected 'primary'. Did you mean 'primary_key:'?"));
+        });
+        test('explore statement keyword missing colon', () => {
+            expect('source: x is a extend { where x > 5 }').toLogAtLeast((0, test_translator_1.errorMessage)("Expected ':' following 'where'"));
+            expect('source: x is a extend { primary_key name }').toLogAtLeast((0, test_translator_1.errorMessage)("Expected ':' following 'primary_key'"));
+            expect('source: x is a extend { declare total is value.sum() }').toLogAtLeast((0, test_translator_1.errorMessage)("Expected ':' following 'declare'"));
+        });
+        test('incorrect opening curly after dimension', () => {
+            expect(`
+        source: x is a extend {
+          dimension: {
+            test is best
+          }
         }
-      }
-      `).toLogAtLeast((0, test_translator_1.errorMessage)("'view:' must be followed by '<identifier> is {'"));
+        `).toLogAtLeast((0, test_translator_1.errorMessage)("extraneous input '{' expecting {BQ_STRING, IDENTIFIER}"));
+        });
     });
-    test('missing closing curly, source>view', () => {
-        expect(`
-      source: x is a extend {
-        view: y is {
-          group_by: b
+    describe('view', () => {
+        test('view is missing name', () => {
+            expect(`
+        source: x is a extend { view: {
+            group_by: b
+        } }
+        `).toLogAtLeast((0, test_translator_1.errorMessage)("'view:' must be followed by '<identifier> is {'"));
+        });
+        test('missing closing curly, source>view', () => {
+            expect(`
+        source: x is a extend {
+          view: y is {
+            group_by: b
-        view: z is {
-          group_by: c
-        }
-      }
-      `).toLogAtLeast((0, test_translator_1.errorMessage)("Missing '}' at 'view:'"));
-    });
-    test('incorrect opening curly after dimension', () => {
-        expect(`
-      source: x is a extend {
-        dimension: {
-          test is best
+          view: z is {
+            group_by: c
+          }
         }
-      }
-      `).toLogAtLeast((0, test_translator_1.errorMessage)("extraneous input '{' expecting {BQ_STRING, IDENTIFIER}"));
-    });
-    test('misspelled primarykey', () => {
-        expect(`
-      source: x is a extend {
-        primarykey: id
-      }
-    `).toLogAtLeast((0, test_translator_1.errorMessage)("no viable alternative at input 'primarykey'"));
-    });
-    test('missing opening curly after source extend keyword', () => {
-        expect(`
-      source: x is a extend
-        primary_key: id
-    `).toLogAtLeast((0, test_translator_1.errorMessage)("Missing '{' after 'extend'"));
-    });
-    test('missing alias for aggregate entry', () => {
-        expect(`
-        run: x -> {
-          aggregate: count()
-        }
-      `).toLogAtLeast((0, test_translator_1.errorMessage)("'aggregate:' entries must include a name (ex: `some_name is count()`)"));
-    });
-    test('missing alias for aggregate inside source>view', () => {
-        expect(`
+        `).toLogAtLeast((0, test_translator_1.errorMessage)("Missing '}' at 'view:'"));
+        });
+        test('missing alias for aggregate inside source>view', () => {
+            expect(`
       source: x is aa extend {
         measure: airport_count is count()
@@ -73,16 +102,41 @@ describe('errors', () => {
         }
       }
       `).toLogAtLeast((0, test_translator_1.errorMessage)("'aggregate:' entries must include a name (ex: `some_name is count()`)"));
+        });
     });
-    test('run opening curly to EOF', () => {
-        expect(`
-        run: x -> {
-      `).toLogAtLeast((0, test_translator_1.errorMessage)("Missing '}' at '<EOF>'"));
+    describe('queryStatement', () => {
+        test('misspelled group_by:', () => {
+            expect('source: x is a -> { groupBy: name }').toLogAtLeast((0, test_translator_1.errorMessage)("Unexpected 'groupBy'. Did you mean 'group_by:'?"));
+            expect('source: x is a -> { group by: name }').toLogAtLeast((0, test_translator_1.errorMessage)("Unexpected 'group'. Did you mean 'group_by:'?"));
+            expect('source: x is a -> { group by name }').toLogAtLeast((0, test_translator_1.errorMessage)("Unexpected 'group'. Did you mean 'group_by:'?"));
+        });
+        test('misspelled order_by:', () => {
+            expect('source: x is a -> { orderBy: name }').toLogAtLeast((0, test_translator_1.errorMessage)("Unexpected 'orderBy'. Did you mean 'order_by:'?"));
+            expect('source: x is a -> { order by: name }').toLogAtLeast((0, test_translator_1.errorMessage)("Unexpected 'order'. Did you mean 'order_by:'?"));
+            expect('source: x is a -> { order by name }').toLogAtLeast((0, test_translator_1.errorMessage)("Unexpected 'order'. Did you mean 'order_by:'?"));
+        });
+        test('query statement keyword missing colon', () => {
+            expect('source: x is a -> { group_by x > 5 }').toLogAtLeast((0, test_translator_1.errorMessage)("Expected ':' following 'group_by'"));
+            expect('source: x is a -> { declare name is id }').toLogAtLeast((0, test_translator_1.errorMessage)("Expected ':' following 'declare'"));
+            expect('source: x is a -> { select * }').toLogAtLeast((0, test_translator_1.errorMessage)("Expected ':' following 'select'"));
+            expect('source: x is a -> { project i, j, k}').toLogAtLeast((0, test_translator_1.errorMessage)("Expected ':' following 'project'"));
+            expect('source: x is a -> { where val > 5}').toLogAtLeast((0, test_translator_1.errorMessage)("Expected ':' following 'where'"));
+            expect('source: x is a -> { order_by name desc, 2 asc}').toLogAtLeast((0, test_translator_1.errorMessage)("Expected ':' following 'order_by'"));
+        });
     });
-    test('source opening curly to EOF', () => {
-        expect(`
-        source: y is x extend {
-      `).toLogAtLeast((0, test_translator_1.errorMessage)("Missing '}' at '<EOF>'"));
+    describe('run', () => {
+        test('missing alias for aggregate entry', () => {
+            expect(`
+          run: x -> {
+            aggregate: count()
+          }
+        `).toLogAtLeast((0, test_translator_1.errorMessage)("'aggregate:' entries must include a name (ex: `some_name is count()`)"));
+        });
+        test('run opening curly to EOF', () => {
+            expect(`
+          run: x -> {
+        `).toLogAtLeast((0, test_translator_1.errorMessage)("Missing '}' at '<EOF>'"));
+        });
     });
 });
 //# sourceMappingURL=syntax-errors.spec.js.map

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.237-dev250225144145",
+  "version": "0.0.237-dev250225213433",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -41,8 +41,8 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-interfaces": "^0.0.237-dev250225144145",
-    "@malloydata/malloy-tag": "^0.0.237-dev250225144145",
+    "@malloydata/malloy-interfaces": "^0.0.237-dev250225213433",
+    "@malloydata/malloy-tag": "^0.0.237-dev250225213433",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
     "jest-diff": "^29.6.2",