@malloydata/malloy 0.0.416 → 0.0.418

package/dist/lang/malloy-to-ast.d.ts

@@ -207,7 +207,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     visitExprString(pcx: parse.ExprStringContext): ast.ExprString;
     visitRawString(pcx: parse.RawStringContext): ast.ExprString;
     visitExprRegex(pcx: parse.ExprRegexContext): ast.ExprRegEx;
-    visitExprNow(_pcx: parse.ExprNowContext): ast.ExprNow;
+    visitExprNow(pcx: parse.ExprNowContext): ast.ExprNow;
     visitExprNumber(pcx: parse.ExprNumberContext): ast.ExprNumber;
     visitExprFieldPath(pcx: parse.ExprFieldPathContext): ast.ExprIdReference;
     visitExprGivenRef(pcx: parse.ExprGivenRefContext): ast.GivenReference;

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

@@ -1157,7 +1157,11 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const malloyRegex = pcx.HACKY_REGEX().text;
         return new ast.ExprRegEx(malloyRegex.slice(2, -1));
     }
-    visitExprNow(_pcx) {
+    visitExprNow(pcx) {
+        if (pcx.OPAREN()) {
+            // `now` is a value, not a function; accept `now()`, warn, compile as `now`.
+            this.contextError(pcx, 'now-is-not-a-function', "'now' is a value, not a function; the parentheses are unnecessary. Write 'now'.", { severity: 'warn' });
+        }
         return new ast.ExprNow();
     }
     visitExprNumber(pcx) {

package/dist/lang/parse-log.d.ts

@@ -223,6 +223,7 @@ type MessageParameterTypes = {
     'order-by-not-found-in-output': string;
     'order-by-analytic': string;
     'order-by-bad-reference': string;
+    'now-is-not-a-function': string;
     'illegal-index-operation': string;
     'illegal-project-operation': string;
     'illegal-grouping-operation': string;

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

@@ -1,10 +1,13 @@
-import type { InputMismatchException, Parser } from 'antlr4ts';
+import type { InputMismatchException, NoViableAltException, Parser } from 'antlr4ts';
 import { DefaultErrorStrategy } from 'antlr4ts';
 /**
- * Overrides the three DefaultErrorStrategy methods that paste the parser's
+ * Overrides the DefaultErrorStrategy methods that paste the parser's
  * expected-token set into the message: tokens are named the way the user types
  * them (via describeExpected) and the set is dropped once too large to be a hint.
  *
+ * Each path also checks reservedNameMessage first, so a reserved word used where
+ * a name was expected (`group_by: year`) says "quote it".
+ *
  * Fallback only — MalloyParserErrorListener's custom-error cases run first and
  * override these when they match.
  */
@@ -12,4 +15,5 @@ export declare class MalloyErrorStrategy extends DefaultErrorStrategy {
     protected reportInputMismatch(recognizer: Parser, e: InputMismatchException): void;
     protected reportUnwantedToken(recognizer: Parser): void;
     protected reportMissingToken(recognizer: Parser): void;
+    protected reportNoViableAlternative(recognizer: Parser, e: NoViableAltException): void;
 }

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

@@ -13,18 +13,27 @@ function unexpected(offending, clause) {
         : `unexpected ${offending}`;
 }
 /**
- * Overrides the three DefaultErrorStrategy methods that paste the parser's
+ * Overrides the DefaultErrorStrategy methods that paste the parser's
  * expected-token set into the message: tokens are named the way the user types
  * them (via describeExpected) and the set is dropped once too large to be a hint.
  *
+ * Each path also checks reservedNameMessage first, so a reserved word used where
+ * a name was expected (`group_by: year`) says "quote it".
+ *
  * Fallback only — MalloyParserErrorListener's custom-error cases run first and
  * override these when they match.
  */
 class MalloyErrorStrategy extends antlr4ts_1.DefaultErrorStrategy {
     reportInputMismatch(recognizer, e) {
         var _a, _b;
-        const offending = this.getTokenErrorDisplay(e.getOffendingToken(recognizer));
+        const offendingToken = e.getOffendingToken(recognizer);
         const expected = (_b = (_a = e.expectedTokens) === null || _a === void 0 ? void 0 : _a.toArray()) !== null && _b !== void 0 ? _b : [];
+        const reserved = (0, token_names_1.reservedNameMessage)(offendingToken, expected, recognizer);
+        if (reserved) {
+            this.notifyErrorListeners(recognizer, reserved, e);
+            return;
+        }
+        const offending = this.getTokenErrorDisplay(offendingToken);
         const clause = (0, token_names_1.describeExpected)(expected, recognizer.vocabulary);
         this.notifyErrorListeners(recognizer, unexpected(offending, clause), e);
     }
@@ -34,8 +43,13 @@ class MalloyErrorStrategy extends antlr4ts_1.DefaultErrorStrategy {
         }
         this.beginErrorCondition(recognizer);
         const t = recognizer.currentToken;
-        const offending = this.getTokenErrorDisplay(t);
         const expected = this.getExpectedTokens(recognizer).toArray();
+        const reserved = (0, token_names_1.reservedNameMessage)(t, expected, recognizer);
+        if (reserved) {
+            recognizer.notifyErrorListeners(reserved, t, undefined);
+            return;
+        }
+        const offending = this.getTokenErrorDisplay(t);
         const clause = (0, token_names_1.describeExpected)(expected, recognizer.vocabulary);
         recognizer.notifyErrorListeners(unexpected(offending, clause), t, undefined);
     }
@@ -45,14 +59,32 @@ class MalloyErrorStrategy extends antlr4ts_1.DefaultErrorStrategy {
         }
         this.beginErrorCondition(recognizer);
         const t = recognizer.currentToken;
-        const offending = this.getTokenErrorDisplay(t);
         const expected = this.getExpectedTokens(recognizer).toArray();
+        const reserved = (0, token_names_1.reservedNameMessage)(t, expected, recognizer);
+        if (reserved) {
+            recognizer.notifyErrorListeners(reserved, t, undefined);
+            return;
+        }
+        const offending = this.getTokenErrorDisplay(t);
         const clause = (0, token_names_1.describeExpected)(expected, recognizer.vocabulary);
         const msg = clause
             ? `missing ${clause} before ${offending}`
             : `something is missing before ${offending}`;
         recognizer.notifyErrorListeners(msg, t, undefined);
     }
+    // Dispatched from reportError (already in error condition), unlike the inline-
+    // recovery methods above — an inErrorRecoveryMode guard here would swallow the
+    // error. Short-circuit to the reserved-word hint, else defer to super.
+    reportNoViableAlternative(recognizer, e) {
+        const t = recognizer.currentToken;
+        const expected = this.getExpectedTokens(recognizer).toArray();
+        const reserved = (0, token_names_1.reservedNameMessage)(t, expected, recognizer);
+        if (reserved) {
+            this.notifyErrorListeners(recognizer, reserved, e);
+            return;
+        }
+        super.reportNoViableAlternative(recognizer, e);
+    }
 }
 exports.MalloyErrorStrategy = MalloyErrorStrategy;
 //# sourceMappingURL=malloy-error-strategy.js.map

package/dist/lang/syntax-errors/token-names.d.ts

@@ -1,3 +1,5 @@
-import type { Vocabulary } from 'antlr4ts';
+import type { Parser, Vocabulary } from 'antlr4ts';
+import { Token } from 'antlr4ts';
 export declare function describeToken(type: number, vocabulary: Vocabulary): string;
 export declare function describeExpected(types: number[], vocabulary: Vocabulary): string | undefined;
+export declare function reservedNameMessage(offending: Token | undefined, expected: number[], recognizer: Parser): string | undefined;

package/dist/lang/syntax-errors/token-names.js

@@ -6,7 +6,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.describeToken = describeToken;
 exports.describeExpected = describeExpected;
+exports.reservedNameMessage = reservedNameMessage;
 const antlr4ts_1 = require("antlr4ts");
+const MalloyParser_1 = require("../lib/Malloy/MalloyParser");
 const keyword_display_names_1 = require("../lib/Malloy/keyword-display-names");
 // Pattern tokens have neither a literal nor a keyword spelling to show, so they
 // get hand-written prose instead of their SHOUTING symbolic name.
@@ -63,4 +65,25 @@ function describeExpected(types, vocabulary) {
     }
     return joinOr(displays);
 }
+// When a bare-word reserved token appears where a name (IDENTIFIER) was legal,
+// the user meant it as a field name; return a "quote it" message. undefined
+// otherwise, so the caller keeps its normal message.
+function reservedNameMessage(offending, expected, recognizer) {
+    const text = offending === null || offending === void 0 ? void 0 : offending.text;
+    if (!text || !/^[A-Za-z_][A-Za-z0-9_]*$/.test(text))
+        return undefined;
+    const symbolic = recognizer.vocabulary.getSymbolicName(offending.type);
+    if (symbolic === undefined || keyword_display_names_1.KEYWORD_DISPLAY_NAMES[symbolic] === undefined) {
+        return undefined;
+    }
+    if (!expected.includes(MalloyParser_1.MalloyParser.IDENTIFIER))
+        return undefined;
+    // A reserved word followed by '(' is a function call (count()), not a name.
+    // offending is the current token here, so LA(2) is the next on-channel token;
+    // LA fetches it lazily rather than pre-filling the stream.
+    if (recognizer.inputStream.LA(2) === MalloyParser_1.MalloyParser.OPAREN) {
+        return undefined;
+    }
+    return `'${text}' is a reserved word, so to use it as a name you must quote it: \`${text}\``;
+}
 //# sourceMappingURL=token-names.js.map

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.416";
+export declare const MALLOY_VERSION = "0.0.418";

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.416';
+exports.MALLOY_VERSION = '0.0.418';
 //# sourceMappingURL=version.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.416",
+  "version": "0.0.418",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -51,9 +51,9 @@
     "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.416",
-    "@malloydata/malloy-interfaces": "0.0.416",
-    "@malloydata/malloy-tag": "0.0.416",
+    "@malloydata/malloy-filter": "0.0.418",
+    "@malloydata/malloy-interfaces": "0.0.418",
+    "@malloydata/malloy-tag": "0.0.418",
     "@noble/hashes": "^2.2.0",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",