@malloydata/malloy 0.0.237-dev250225015031 → 0.0.237-dev250225213433

package/dist/annotation.d.ts

@@ -0,0 +1,15 @@
+import { Tag } from '@malloydata/malloy-tag';
+import { Annotation } from './model';
+import { LogMessage } from './lang';
+export interface TagParseSpec {
+    prefix?: RegExp;
+    extending?: Tag;
+    scopes?: Tag[];
+}
+export declare function addModelScope(spec: TagParseSpec | undefined, modelScope: Tag): TagParseSpec;
+export declare function annotationToTaglines(annote: Annotation | undefined, prefix?: RegExp): string[];
+export interface MalloyTagParse {
+    tag: Tag;
+    log: LogMessage[];
+}
+export declare function annotationToTag(annote: Annotation | undefined, spec?: TagParseSpec): MalloyTagParse;

package/dist/annotation.js

@@ -0,0 +1,86 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.annotationToTag = exports.annotationToTaglines = exports.addModelScope = void 0;
+const malloy_tag_1 = require("@malloydata/malloy-tag");
+function addModelScope(spec, modelScope) {
+    const useSpec = spec ? { ...spec } : {};
+    if (useSpec.scopes) {
+        useSpec.scopes = useSpec.scopes.concat(modelScope);
+    }
+    else {
+        useSpec.scopes = [modelScope];
+    }
+    return useSpec;
+}
+exports.addModelScope = addModelScope;
+function annotationToTaglines(annote, prefix) {
+    annote || (annote = {});
+    const tagLines = annote.inherits
+        ? annotationToTaglines(annote.inherits, prefix)
+        : [];
+    function prefixed(na) {
+        const ret = [];
+        for (const n of na || []) {
+            if (prefix === undefined || n.text.match(prefix)) {
+                ret.push(n.text);
+            }
+        }
+        return ret;
+    }
+    return tagLines.concat(prefixed(annote.blockNotes), prefixed(annote.notes));
+}
+exports.annotationToTaglines = annotationToTaglines;
+function annotationToTag(annote, spec = {}) {
+    var _a;
+    let extending = spec.extending || new malloy_tag_1.Tag();
+    const prefix = spec.prefix || /^##? /;
+    annote || (annote = {});
+    const allErrs = [];
+    if (annote.inherits) {
+        const inherits = annotationToTag(annote.inherits, spec);
+        allErrs.push(...inherits.log);
+        extending = inherits.tag;
+    }
+    const allNotes = [];
+    if (annote.blockNotes) {
+        allNotes.push(...annote.blockNotes);
+    }
+    if (annote.notes) {
+        allNotes.push(...annote.notes);
+    }
+    const matchingNotes = [];
+    for (const note of allNotes) {
+        if (note.text.match(prefix)) {
+            matchingNotes.push(note);
+        }
+    }
+    for (let i = 0; i < matchingNotes.length; i++) {
+        const note = matchingNotes[i];
+        if (note.text.match(prefix)) {
+            const noteParse = malloy_tag_1.Tag.fromTagLine(note.text, i, extending, ...((_a = spec.scopes) !== null && _a !== void 0 ? _a : []));
+            extending = noteParse.tag;
+            allErrs.push(...noteParse.log.map((e) => mapMalloyError(e, note)));
+        }
+    }
+    return { tag: extending, log: allErrs };
+}
+exports.annotationToTag = annotationToTag;
+function mapMalloyError(e, note) {
+    const loc = {
+        line: note.at.range.start.line,
+        character: note.at.range.start.character + e.offset,
+    };
+    return {
+        code: 'tag-parse-error',
+        severity: 'error',
+        message: e.message,
+        at: {
+            url: note.at.url,
+            range: {
+                start: loc,
+                end: loc,
+            },
+        },
+    };
+}
+//# sourceMappingURL=annotation.js.map

package/dist/index.d.ts

@@ -10,4 +10,5 @@ export type { QueryOptionsReader, RunSQLOptions } from './run_sql_options';
 export type { EventStream, ModelString, ModelURL, QueryString, QueryURL, URLReader, InvalidationKey, } from './runtime_types';
 export type { Connection, ConnectionConfig, ConnectionFactory, ConnectionParameter, ConnectionParameterValue, ConnectionConfigSchema, FetchSchemaOptions, InfoConnection, LookupConnection, PersistSQLResults, PooledConnection, TestableConnection, StreamingConnection, } from './connection/types';
 export { toAsyncGenerator } from './connection_utils';
-export { type TagParse, Tag, type TagDict } from './tags';
+export { modelDefToModelInfo } from './to_stable';
+export { annotationToTag } from './annotation';

package/dist/index.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.Model = exports.MalloyTranslator = exports.composeSQLExpr = exports.indent = exports.expressionIsUngroupedAggregate = exports.expressionIsScalar = exports.expressionIsCalculation = exports.expressionIsAnalytic = exports.expressionIsAggregate = exports.mkFieldDef = exports.mkArrayDef = exports.isScalarArray = exports.isRepeatedRecord = exports.isSamplingRows = exports.isSamplingPercent = exports.isSamplingEnable = exports.isJoinedSource = exports.isJoined = exports.isLeafAtomic = exports.Segment = exports.isSourceDef = exports.TinyParser = exports.Dialect = exports.spread = exports.literal = exports.variadicParam = exports.param = exports.makeParam = exports.sql = exports.maxScalar = exports.minAggregate = exports.anyExprType = exports.minScalar = exports.overload = exports.qtz = exports.arg = exports.registerDialect = exports.MySQLDialect = exports.SnowflakeDialect = exports.PostgresDialect = exports.TrinoDialect = exports.StandardSQLDialect = exports.DuckDBDialect = void 0;
-exports.Tag = exports.toAsyncGenerator = exports.CacheManager = exports.InMemoryModelCache = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.PreparedResult = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = void 0;
+exports.annotationToTag = exports.modelDefToModelInfo = exports.toAsyncGenerator = exports.CacheManager = exports.InMemoryModelCache = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.PreparedResult = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -98,6 +98,8 @@ Object.defineProperty(exports, "InMemoryModelCache", { enumerable: true, get: fu
 Object.defineProperty(exports, "CacheManager", { enumerable: true, get: function () { return malloy_1.CacheManager; } });
 var connection_utils_1 = require("./connection_utils");
 Object.defineProperty(exports, "toAsyncGenerator", { enumerable: true, get: function () { return connection_utils_1.toAsyncGenerator; } });
-var tags_1 = require("./tags");
-Object.defineProperty(exports, "Tag", { enumerable: true, get: function () { return tags_1.Tag; } });
+var to_stable_1 = require("./to_stable");
+Object.defineProperty(exports, "modelDefToModelInfo", { enumerable: true, get: function () { return to_stable_1.modelDefToModelInfo; } });
+var annotation_1 = require("./annotation");
+Object.defineProperty(exports, "annotationToTag", { enumerable: true, get: function () { return annotation_1.annotationToTag; } });
 //# sourceMappingURL=index.js.map

package/dist/lang/ast/types/annotation-elements.d.ts

@@ -1,5 +1,5 @@
 import { Note } from '../../../model/malloy_types';
-import { Tag } from '../../../tags';
+import { Tag } from '@malloydata/malloy-tag';
 import { MessageLogger } from '../../parse-log';
 import { Document, DocStatement, MalloyElement } from './malloy-element';
 import { QueryPropertyInterface } from './query-property-interface';

package/dist/lang/ast/types/annotation-elements.js

@@ -23,8 +23,8 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModelAnnotation = exports.ObjectAnnotation = void 0;
-const tags_1 = require("../../../tags");
 const malloy_element_1 = require("./malloy-element");
+const annotation_1 = require("../../../annotation");
 class ObjectAnnotation extends malloy_element_1.MalloyElement {
     constructor(notes) {
         super();
@@ -42,7 +42,7 @@ class ModelAnnotation extends ObjectAnnotation {
         this.elementType = 'modelAnnotation';
     }
     getCompilerFlags(existing, logTo) {
-        const tagParse = tags_1.Tag.annotationToTag({ notes: this.notes }, {
+        const tagParse = (0, annotation_1.annotationToTag)({ notes: this.notes }, {
             prefix: /^##! /,
             extending: existing,
         });

package/dist/lang/ast/types/malloy-element.d.ts

@@ -1,5 +1,5 @@
 import { Annotation, DocumentLocation, DocumentReference, ModelDef, ModelAnnotation, NamedModelObject, Query, StructDef } from '../../../model/malloy_types';
-import { Tag } from '../../../tags';
+import { Tag } from '@malloydata/malloy-tag';
 import { LogMessageOptions, MessageLogger, MessageParameterType, MessageCode } from '../../parse-log';
 import { MalloyTranslation } from '../../parse-malloy';
 import { ModelDataRequest } from '../../translate-response';

package/dist/lang/ast/types/malloy-element.js

@@ -25,7 +25,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Document = exports.DocStatementList = exports.ListOf = exports.isDocStatementOrDocStatementList = exports.isDocStatement = exports.ExperimentalExperiment = exports.ModelEntryReference = exports.Unimplemented = exports.MalloyElement = void 0;
 const dialect_1 = require("../../../dialect");
 const malloy_types_1 = require("../../../model/malloy_types");
-const tags_1 = require("../../../tags");
+const malloy_tag_1 = require("@malloydata/malloy-tag");
 const parse_log_1 = require("../../parse-log");
 const ast_utils_1 = require("../ast-utils");
 const dialect_name_space_1 = require("./dialect-name-space");
@@ -432,7 +432,7 @@ class Document extends MalloyElement {
         this.queryList = [];
         this.didInitModel = false;
         this.annotation = {};
-        this.experiments = new tags_1.Tag({});
+        this.experiments = new malloy_tag_1.Tag({});
         this.modelAnnotationTodoList = [];
         this.dialectNameSpaces = new Map();
         this.statements = new DocStatementList(statements);

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

@@ -10,7 +10,7 @@ import { FieldDeclarationConstructor } from './ast';
 import { HasString, HasID } from './parse-utils';
 import { CastType } from '../model';
 import { AccessModifierLabel, DocumentLocation, DocumentRange, Note } from '../model/malloy_types';
-import { Tag } from '../tags';
+import { Tag } from '@malloydata/malloy-tag';
 declare class ErrorNode extends ast.SourceQueryElement {
     elementType: string;
 }

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

@@ -55,7 +55,7 @@ const Interval_1 = require("antlr4ts/misc/Interval");
 const ast_1 = require("./ast");
 const parse_utils_1 = require("./parse-utils");
 const malloy_types_1 = require("../model/malloy_types");
-const tags_1 = require("../tags");
+const malloy_tag_1 = require("@malloydata/malloy-tag");
 const constant_expression_1 = require("./ast/expressions/constant-expression");
 const utils_1 = require("./utils");
 class ErrorNode extends ast.SourceQueryElement {
@@ -83,7 +83,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         this.msgLog = msgLog;
         this.compilerFlags = compilerFlags;
         for (const flag of DEFAULT_COMPILER_FLAGS) {
-            const withNewTag = tags_1.Tag.fromTagline(flag, this.compilerFlags);
+            const withNewTag = malloy_tag_1.Tag.fromTagLine(flag, 0, this.compilerFlags);
             this.compilerFlags = withNewTag.tag;
         }
     }

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

@@ -4,7 +4,7 @@ import { BaseMessageLogger, LogMessage, LogMessageOptions, MessageCode, MessageP
 import { Zone, ZoneData } from './zone';
 import { ReferenceList } from './reference-list';
 import { ASTResponse, CompletionsResponse, DataRequestResponse, ProblemResponse, FatalResponse, FinalResponse, HelpContextResponse, MetadataResponse, ModelDataRequest, NeedURLData, TranslateResponse, ModelAnnotationResponse, TablePathResponse } from './translate-response';
-import { Tag } from '../tags';
+import { Tag } from '@malloydata/malloy-tag';
 import { MalloyParseInfo } from './malloy-parse-info';
 import { EventStream } from '../runtime_types';
 export type StepResponses = DataRequestResponse | ASTResponse | TranslateResponse | ParseResponse | MetadataResponse | PretranslatedResponse;

package/dist/lang/parse-malloy.js

@@ -61,9 +61,10 @@ const document_help_context_walker_1 = require("./parse-tree-walkers/document-he
 const reference_list_1 = require("./reference-list");
 const translate_response_1 = require("./translate-response");
 const utils_1 = require("./utils");
-const tags_1 = require("../tags");
+const malloy_tag_1 = require("@malloydata/malloy-tag");
 const model_annotation_walker_1 = require("./parse-tree-walkers/model-annotation-walker");
 const find_table_path_walker_1 = require("./parse-tree-walkers/find-table-path-walker");
+const annotation_1 = require("../annotation");
 const malloy_error_strategy_1 = require("./syntax-errors/malloy-error-strategy");
 const malloy_parser_error_listener_1 = require("./syntax-errors/malloy-parser-error-listener");
 /**
@@ -470,7 +471,7 @@ class TranslateStep {
         }
         // begin with the compiler flags of the model we are extending
         if (extendingModel && !this.importedAnnotations) {
-            const tagParse = tags_1.Tag.annotationToTag(extendingModel.annotation, {
+            const tagParse = (0, annotation_1.annotationToTag)(extendingModel.annotation, {
                 prefix: /^##! /,
             });
             that.compilerFlags = tagParse.tag;
@@ -530,7 +531,7 @@ class MalloyTranslation {
         this.grammarRule = grammarRule;
         this.sqlSources = [];
         this.imports = [];
-        this.compilerFlags = new tags_1.Tag();
+        this.compilerFlags = new malloy_tag_1.Tag();
         this._urlIsFullPath = undefined;
         /*
          Experimental dialect support, not confident this is how this should work.

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

@@ -14,17 +14,6 @@ export type HasString = {
 };
 type StringPart = ParserRuleContext | string;
 export declare function getStringParts(cx: SqlStringContext): Generator<StringPart>;
-/**
- * Parses the interior of a string, doing all \ substitutions. In most cases
- * a lexical analyzer has already recognized this as a string. As a convenience,
- * strip off the quoting outer chartacters if asked, then parse the interior of
- * the string. The intention is to be compatible with JSON strings, in terms
- * of which \X substitutions are processed.
- * @param str is the string to parse
- * @param surround is the quoting character, default means quotes already stripped
- * @returns a string with the \ processing completed
- */
-export declare function parseString(str: string, surround?: string): string;
 export type HasID = ParserRuleContext & {
     id: () => IdContext;
 };

package/dist/lang/parse-utils.js

@@ -22,7 +22,8 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getPlainString = exports.unIndent = exports.getOptionalId = exports.idToStr = exports.getId = exports.parseString = exports.getStringParts = exports.getStringIfShort = exports.getShortString = void 0;
+exports.getPlainString = exports.unIndent = exports.getOptionalId = exports.idToStr = exports.getId = exports.getStringParts = exports.getStringIfShort = exports.getShortString = void 0;
+const malloy_tag_1 = require("@malloydata/malloy-tag");
 /**
  * Take the text of a matched string, including the matching quote
  * characters, and return the actual contents of the string after
@@ -34,7 +35,7 @@ function getShortString(scx) {
     var _a, _b;
     const str = ((_a = scx.DQ_STRING()) === null || _a === void 0 ? void 0 : _a.text) || ((_b = scx.SQ_STRING()) === null || _b === void 0 ? void 0 : _b.text);
     if (str) {
-        return parseString(str, str[0]);
+        return malloy_tag_1.ParseUtil.parseString(str, str[0]);
     }
     // shortString: DQ_STRING | SQ_STRING; So this will never happen
     return '';
@@ -66,85 +67,6 @@ function* getStringParts(cx) {
     }
 }
 exports.getStringParts = getStringParts;
-var ParseState;
-(function (ParseState) {
-    ParseState[ParseState["Normal"] = 0] = "Normal";
-    ParseState[ParseState["ReverseVirgule"] = 1] = "ReverseVirgule";
-    ParseState[ParseState["Unicode"] = 2] = "Unicode";
-})(ParseState || (ParseState = {}));
-/**
- * Parses the interior of a string, doing all \ substitutions. In most cases
- * a lexical analyzer has already recognized this as a string. As a convenience,
- * strip off the quoting outer chartacters if asked, then parse the interior of
- * the string. The intention is to be compatible with JSON strings, in terms
- * of which \X substitutions are processed.
- * @param str is the string to parse
- * @param surround is the quoting character, default means quotes already stripped
- * @returns a string with the \ processing completed
- */
-function parseString(str, surround = '') {
-    let inner = str.slice(surround.length);
-    let state = ParseState.Normal;
-    if (surround.length) {
-        inner = inner.slice(0, -surround.length);
-    }
-    let out = '';
-    let unicode = '';
-    for (const c of inner) {
-        switch (state) {
-            case ParseState.Normal: {
-                if (c === '\\') {
-                    state = ParseState.ReverseVirgule;
-                }
-                else {
-                    out += c;
-                }
-                break;
-            }
-            case ParseState.ReverseVirgule: {
-                let outc = c;
-                if (c === 'u') {
-                    state = ParseState.Unicode;
-                    unicode = '';
-                    continue;
-                }
-                if (c === 'b') {
-                    outc = '\b';
-                }
-                else if (c === 'f') {
-                    outc = '\f';
-                }
-                else if (c === 'n') {
-                    outc = '\n';
-                }
-                else if (c === 'r') {
-                    outc = '\r';
-                }
-                else if (c === 't') {
-                    outc = '\t';
-                }
-                out += outc;
-                state = ParseState.Normal;
-                break;
-            }
-            case ParseState.Unicode: {
-                if ('ABCDEFabcdef0123456789'.includes(c)) {
-                    unicode += c;
-                    if (unicode.length === 4) {
-                        out += String.fromCharCode(parseInt(unicode, 16));
-                        state = ParseState.Normal;
-                    }
-                }
-                else {
-                    // Don't think we ever get here ...
-                    state = ParseState.Normal;
-                }
-            }
-        }
-    }
-    return out;
-}
-exports.parseString = parseString;
 /**
  * An identifier is either a sequence of id characters or a `quoted`
  * This parses either to simply the resulting text.
@@ -158,7 +80,7 @@ exports.getId = getId;
 function idToStr(cx) {
     const quoted = cx.BQ_STRING();
     if (quoted) {
-        return parseString(quoted.text, '`');
+        return malloy_tag_1.ParseUtil.parseString(quoted.text, '`');
     }
     return cx.text;
 }

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

@@ -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

@@ -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

@@ -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

@@ -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

@@ -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;