@malloydata/malloy 0.0.236-dev250219154103 → 0.0.236-dev250221173808

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

@@ -6,5 +6,6 @@ export interface ErrorCase {
     precedingTokenOptions?: number[][];
     lookAheadOptions?: number[][];
     errorMessage: string;
+    lookbackFromOffendingSymbol?: boolean;
 }
 export declare const checkCustomErrorMessage: (parser: Parser, offendingSymbol: Token | undefined, errorCases: ErrorCase[]) => string;

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

@@ -20,13 +20,17 @@ const checkCustomErrorMessage = (parser, offendingSymbol, errorCases) => {
         if (isCurrentTokenMatch && isOffendingSymbolMatch && isRuleContextMatch) {
             // If so, try to check the preceding tokens.
             if (errorCase.precedingTokenOptions) {
-                const hasPrecedingTokenMatch = errorCase.precedingTokenOptions.some(sequence => checkTokenSequenceMatch(parser, sequence, 'lookback'));
+                const hasPrecedingTokenMatch = errorCase.precedingTokenOptions.some(sequence => checkTokenSequenceMatch(parser, sequence, 'lookback', errorCase.lookbackFromOffendingSymbol
+                    ? offendingSymbol === null || offendingSymbol === void 0 ? void 0 : offendingSymbol.tokenIndex
+                    : undefined));
                 if (!hasPrecedingTokenMatch) {
                     continue; // Continue to check a different error case
                 }
             }
             if (errorCase.lookAheadOptions) {
-                const hasLookaheadTokenMatch = errorCase.lookAheadOptions.some(sequence => checkTokenSequenceMatch(parser, sequence, 'lookahead'));
+                const hasLookaheadTokenMatch = errorCase.lookAheadOptions.some(sequence => checkTokenSequenceMatch(parser, sequence, 'lookahead', errorCase.lookbackFromOffendingSymbol
+                    ? offendingSymbol === null || offendingSymbol === void 0 ? void 0 : offendingSymbol.tokenIndex
+                    : undefined));
                 if (!hasLookaheadTokenMatch) {
                     continue; // Continue to check a different error case
                 }
@@ -39,12 +43,19 @@ const checkCustomErrorMessage = (parser, offendingSymbol, errorCases) => {
     return '';
 };
 exports.checkCustomErrorMessage = checkCustomErrorMessage;
-const checkTokenSequenceMatch = (parser, sequence, direction) => {
+const checkTokenSequenceMatch = (parser, sequence, direction, anchorTokenPosition) => {
     try {
         for (let i = 0; i < sequence.length; i++) {
-            // Note: positive lookahead starts at '2' because '1' is the current token.
-            const tokenIndex = direction === 'lookahead' ? i + 2 : -1 * (i + 1);
-            const streamToken = parser.inputStream.LA(tokenIndex);
+            let streamToken = undefined;
+            if (typeof anchorTokenPosition === 'number') {
+                const tokenOffset = direction === 'lookahead' ? i + 1 : -1 * (i + 1);
+                streamToken = parser.inputStream.get(anchorTokenPosition + tokenOffset).type;
+            }
+            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);
+            }
             // 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]) {

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

@@ -36,6 +36,12 @@ exports.commonErrorCases = [
             [MalloyParser_1.MalloyParser.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,
+    },
 ];
 class MalloyParserErrorListener {
     constructor(translator, messages) {

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

@@ -55,5 +55,34 @@ describe('errors', () => {
         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(`
+      source: x is aa extend {
+        measure: airport_count is count()
+
+        view: by_state is {
+          where: state is not null
+          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>'"));
+    });
+    test('source opening curly to EOF', () => {
+        expect(`
+        source: y is x extend {
+      `).toLogAtLeast((0, test_translator_1.errorMessage)("Missing '}' at '<EOF>'"));
+    });
 });
 //# sourceMappingURL=syntax-errors.spec.js.map

package/dist/model/composite_source_utils.js

@@ -88,6 +88,7 @@ function _resolveCompositeSources(path, source, compositeFieldUsage, narrowedCom
             return { error: { code: 'not_a_composite_source', data: { path } } };
         }
     }
+    base.arguments = source.arguments;
     const fieldsByName = {};
     const narrowedJoinedSources = (_e = narrowedCompositeFieldResolution === null || narrowedCompositeFieldResolution === void 0 ? void 0 : narrowedCompositeFieldResolution.joined) !== null && _e !== void 0 ? _e : {};
     for (const field of base.fields) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.236-dev250219154103",
+  "version": "0.0.236-dev250221173808",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",