@malloydata/malloy 0.0.259 → 0.0.260-dev250410011722

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

@@ -9,5 +9,9 @@ export interface ErrorCase {
     errorMessage: string;
     lookbackSiblingRuleOptions?: number[];
     predecessorHasAncestorRule?: number;
+    alternatives?: {
+        replace: string;
+        with: string[];
+    };
 }
 export declare const checkCustomErrorMessage: (parser: Parser, offendingSymbol: Token | undefined, errorCases: ErrorCase[]) => string;

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

@@ -5,8 +5,12 @@
  * This source code is licensed under the MIT license found in the
  * LICENSE file in the root directory of this source tree.
  */
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.checkCustomErrorMessage = void 0;
+const jaro_winkler_1 = __importDefault(require("jaro-winkler"));
 const checkCustomErrorMessage = (parser, offendingSymbol, errorCases) => {
     var _a, _b;
     const currentRuleName = parser.getRuleInvocationStack()[0];
@@ -58,16 +62,29 @@ const checkCustomErrorMessage = (parser, offendingSymbol, errorCases) => {
                     continue;
                 }
             }
+            const errReplace = (s) => {
+                const rs = s
+                    .replace('${currentToken}', currentToken.text || '')
+                    .replace('${offendingSymbol}', (offendingSymbol === null || offendingSymbol === void 0 ? void 0 : offendingSymbol.text) || '');
+                try {
+                    const previousToken = parser.inputStream.LT(-1);
+                    return rs.replace('${previousToken}', previousToken.text || '');
+                }
+                catch (ex) {
+                    // This shouldn't ever occur, but if it does, just leave the untokenized message.
+                }
+                return rs;
+            };
             // If all cases match, return the custom error message
-            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.
+            let message = errReplace(errorCase.errorMessage);
+            if (errorCase.alternatives) {
+                const badWord = errReplace(errorCase.alternatives.replace);
+                const distances = {};
+                for (const w of errorCase.alternatives.with) {
+                    distances[w] = (0, jaro_winkler_1.default)(w, badWord);
+                }
+                const picks = errorCase.alternatives.with.sort((a, b) => distances[b] - distances[a]);
+                message += ` Did you mean '${picks[0]}'?`;
             }
             return message;
         }

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

@@ -140,6 +140,36 @@ exports.malloyCustomErrorCases = [
         ],
         ruleContextOptions: ['queryStatement'],
     },
+    {
+        errorMessage: "Expected a query statement, '${offendingSymbol}:' is not a keyword.",
+        ruleContextOptions: ['queryStatement'],
+        offendingSymbol: MalloyParser_1.MalloyParser.IDENTIFIER,
+        lookAheadOptions: [[MalloyParser_1.MalloyParser.COLON, MalloyParser_1.MalloyParser.IDENTIFIER]],
+        alternatives: {
+            replace: '${offendingSymbol}:',
+            with: ['group_by:', 'select:', 'aggregate:', 'calculate:', 'nest:'],
+        },
+    },
+    {
+        errorMessage: "Expected a source statement, '${offendingSymbol}:' is not a keyword.",
+        ruleContextOptions: ['exploreStatement'],
+        offendingSymbol: MalloyParser_1.MalloyParser.IDENTIFIER,
+        lookAheadOptions: [[MalloyParser_1.MalloyParser.COLON, MalloyParser_1.MalloyParser.IDENTIFIER]],
+        alternatives: {
+            replace: '${offendingSymbol}:',
+            with: ['dimension:', 'measure:', 'primary_key:', 'view:', 'join:'],
+        },
+    },
+    {
+        errorMessage: "Expected a statement, '${offendingSymbol}:' is not a keyword.",
+        ruleContextOptions: ['malloyDocument'],
+        offendingSymbol: MalloyParser_1.MalloyParser.IDENTIFIER,
+        lookAheadOptions: [[MalloyParser_1.MalloyParser.COLON, MalloyParser_1.MalloyParser.IDENTIFIER]],
+        alternatives: {
+            replace: '${offendingSymbol}:',
+            with: ['run:', 'query:', 'source:'],
+        },
+    },
 ];
 class MalloyParserErrorListener {
     constructor(

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.259";
+export declare const MALLOY_VERSION = "0.0.260";

package/dist/version.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.MALLOY_VERSION = void 0;
 // generated with 'generate-version-file' script; do not edit manually
-exports.MALLOY_VERSION = '0.0.259';
+exports.MALLOY_VERSION = '0.0.260';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.259",
+  "version": "0.0.260-dev250410011722",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -41,17 +41,19 @@
     "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-filter": "^0.0.259",
-    "@malloydata/malloy-interfaces": "^0.0.259",
-    "@malloydata/malloy-tag": "^0.0.259",
+    "@malloydata/malloy-filter": "^0.0.260-dev250410011722",
+    "@malloydata/malloy-interfaces": "^0.0.260-dev250410011722",
+    "@malloydata/malloy-tag": "^0.0.260-dev250410011722",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",
+    "jaro-winkler": "^0.2.8",
     "jest-diff": "^29.6.2",
     "lodash": "^4.17.20",
     "luxon": "^2.4.0",
     "uuid": "^8.3.2"
   },
   "devDependencies": {
+    "@types/jaro-winkler": "^0.2.3",
     "@types/lodash": "^4.14.165",
     "@types/luxon": "^2.4.0",
     "antlr4ts-cli": "^0.5.0-alpha.4"