@malloydata/malloy 0.0.70-dev230810160240 → 0.0.70

package/dist/lang/lib/Malloy/MalloyTagVisitor.d.ts

@@ -0,0 +1,105 @@
+import { ParseTreeVisitor } from "antlr4ts/tree/ParseTreeVisitor";
+import { TagEqContext } from "./MalloyTagParser";
+import { TagReplacePropertiesContext } from "./MalloyTagParser";
+import { TagUpdatePropertiesContext } from "./MalloyTagParser";
+import { TagDefContext } from "./MalloyTagParser";
+import { TagLineContext } from "./MalloyTagParser";
+import { TagSpecContext } from "./MalloyTagParser";
+import { StringContext } from "./MalloyTagParser";
+import { PropNameContext } from "./MalloyTagParser";
+import { EqValueContext } from "./MalloyTagParser";
+import { ArrayElementContext } from "./MalloyTagParser";
+import { ReferenceContext } from "./MalloyTagParser";
+import { ArrayValueContext } from "./MalloyTagParser";
+import { PropertiesContext } from "./MalloyTagParser";
+/**
+ * This interface defines a complete generic visitor for a parse tree produced
+ * by `MalloyTagParser`.
+ *
+ * @param <Result> The return type of the visit operation. Use `void` for
+ * operations with no return type.
+ */
+export interface MalloyTagVisitor<Result> extends ParseTreeVisitor<Result> {
+    /**
+     * Visit a parse tree produced by the `tagEq`
+     * labeled alternative in `MalloyTagParser.tagSpec`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitTagEq?: (ctx: TagEqContext) => Result;
+    /**
+     * Visit a parse tree produced by the `tagReplaceProperties`
+     * labeled alternative in `MalloyTagParser.tagSpec`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitTagReplaceProperties?: (ctx: TagReplacePropertiesContext) => Result;
+    /**
+     * Visit a parse tree produced by the `tagUpdateProperties`
+     * labeled alternative in `MalloyTagParser.tagSpec`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitTagUpdateProperties?: (ctx: TagUpdatePropertiesContext) => Result;
+    /**
+     * Visit a parse tree produced by the `tagDef`
+     * labeled alternative in `MalloyTagParser.tagSpec`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitTagDef?: (ctx: TagDefContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyTagParser.tagLine`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitTagLine?: (ctx: TagLineContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyTagParser.tagSpec`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitTagSpec?: (ctx: TagSpecContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyTagParser.string`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitString?: (ctx: StringContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyTagParser.propName`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitPropName?: (ctx: PropNameContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyTagParser.eqValue`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitEqValue?: (ctx: EqValueContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyTagParser.arrayElement`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitArrayElement?: (ctx: ArrayElementContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyTagParser.reference`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitReference?: (ctx: ReferenceContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyTagParser.arrayValue`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitArrayValue?: (ctx: ArrayValueContext) => Result;
+    /**
+     * Visit a parse tree produced by `MalloyTagParser.properties`.
+     * @param ctx the parse tree
+     * @return the visitor result
+     */
+    visitProperties?: (ctx: PropertiesContext) => Result;
+}

package/dist/lang/lib/Malloy/MalloyTagVisitor.js

@@ -0,0 +1,4 @@
+"use strict";
+// Generated from MalloyTag.g4 by ANTLR 4.9.0-SNAPSHOT
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=MalloyTagVisitor.js.map

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

@@ -1,5 +1,5 @@
 import { ParserRuleContext } from 'antlr4ts';
-import { ParseTree } from 'antlr4ts/tree';
+import { ParseTree, TerminalNode } from 'antlr4ts/tree';
 import { AbstractParseTreeVisitor } from 'antlr4ts/tree/AbstractParseTreeVisitor';
 import { MalloyParserVisitor } from './lib/Malloy/MalloyParserVisitor';
 import * as parse from './lib/Malloy/MalloyParser';
@@ -8,12 +8,16 @@ import { LogSeverity, MessageLogger } from './parse-log';
 import { MalloyParseInfo } from './malloy-parse-info';
 import { FieldDeclarationConstructor } from './ast';
 import { HasString, HasID } from './parse-utils';
-import { MalloyTagProperties } from '../tags';
+import { Tag } from '../tags';
+import { DocumentLocation, Note } from '../model/malloy_types';
 declare class IgnoredElement extends ast.MalloyElement {
     elementType: string;
     malloySrc: string;
     constructor(src: string);
 }
+declare type HasAnnotations = ParserRuleContext & {
+    ANNOTATION: () => TerminalNode[];
+};
 /**
  * ANTLR visitor pattern parse tree traversal. Generates a Malloy
  * AST from an ANTLR parse tree.
@@ -21,7 +25,7 @@ declare class IgnoredElement extends ast.MalloyElement {
 export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElement> implements MalloyParserVisitor<ast.MalloyElement> {
     readonly parseInfo: MalloyParseInfo;
     readonly msgLog: MessageLogger;
-    compilerFlags: MalloyTagProperties;
+    compilerFlags: Tag;
     constructor(parseInfo: MalloyParseInfo, msgLog: MessageLogger);
     /**
      * Mostly used to flag a case where the grammar and the type system are
@@ -36,6 +40,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
      * Log an error message relative to an AST node
      */
     protected astError(el: ast.MalloyElement, str: string, sev?: LogSeverity): void;
+    protected getLocation(cx: ParserRuleContext): DocumentLocation;
     /**
      * Log an error message relative to a parse node
      */
@@ -61,6 +66,13 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
      * the parse, make sure it highlights properly
      */
     protected parseTime(pcx: ParserRuleContext, parse: (s: string) => ast.ExpressionDef | undefined): ast.ExpressionDef;
+    /**
+     * Get all the possibly missing annotations from this parse rule
+     * @param cx Any parse context which has an ANNOTATION* rules
+     * @returns Array of texts for the annotations
+     */
+    protected getNotes(cx: HasAnnotations): Note[];
+    protected getIsNotes(cx: parse.IsDefineContext): Note[];
     visitMalloyDocument(pcx: parse.MalloyDocumentContext): ast.Document;
     visitDefineSourceStatement(pcx: parse.DefineSourceStatementContext): ast.DefineSourceList;
     visitSourceDefinition(pcx: parse.SourceDefinitionContext): ast.DefineSource;
@@ -87,7 +99,7 @@ export declare class MalloyToAST extends AbstractParseTreeVisitor<ast.MalloyElem
     protected getJoinList(pcx: parse.JoinListContext): ast.MalloyElement[];
     protected getJoinSource(name: ast.ModelEntryReference, ecx: parse.IsExploreContext | undefined): {
         joinFrom: ast.Source;
-        notes: string[];
+        notes: Note[];
     };
     visitQueryJoinStatement(pcx: parse.QueryJoinStatementContext): ast.MalloyElement;
     visitJoinOn(pcx: parse.JoinOnContext): ast.Join;

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

@@ -52,6 +52,7 @@ const ast = __importStar(require("./ast"));
 const Interval_1 = require("antlr4ts/misc/Interval");
 const ast_1 = require("./ast");
 const parse_utils_1 = require("./parse-utils");
+const tags_1 = require("../tags");
 class IgnoredElement extends ast.MalloyElement {
     constructor(src) {
         super();
@@ -68,7 +69,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         super();
         this.parseInfo = parseInfo;
         this.msgLog = msgLog;
-        this.compilerFlags = {};
+        this.compilerFlags = new tags_1.Tag();
     }
     /**
      * Mostly used to flag a case where the grammar and the type system are
@@ -89,16 +90,19 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     astError(el, str, sev = 'error') {
         this.msgLog.log({ message: str, at: el.location, severity: sev });
     }
+    getLocation(cx) {
+        return {
+            url: this.parseInfo.sourceURL,
+            range: this.parseInfo.rangeFromContext(cx),
+        };
+    }
     /**
      * Log an error message relative to a parse node
      */
     contextError(cx, msg, sev = 'error') {
         this.msgLog.log({
             message: msg,
-            at: {
-                url: this.parseInfo.sourceURL,
-                range: this.parseInfo.rangeFromContext(cx),
-            },
+            at: this.getLocation(cx),
             severity: sev,
         });
     }
@@ -116,7 +120,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return acceptable;
     }
     m4WarningsEnabled() {
-        return !!this.compilerFlags['m4warnings'];
+        return this.compilerFlags.has('m4warnings');
     }
     getNumber(term) {
         return Number.parseInt(term.text);
@@ -230,6 +234,23 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         }
         return this.astAt(def, pcx);
     }
+    /**
+     * Get all the possibly missing annotations from this parse rule
+     * @param cx Any parse context which has an ANNOTATION* rules
+     * @returns Array of texts for the annotations
+     */
+    getNotes(cx) {
+        return cx.ANNOTATION().map(a => {
+            return {
+                text: a.text,
+                at: this.getLocation(cx),
+            };
+        });
+    }
+    getIsNotes(cx) {
+        const before = this.getNotes(cx._beforeIs);
+        return before.concat(this.getNotes(cx._afterIs));
+    }
     visitMalloyDocument(pcx) {
         const stmts = this.only(pcx.malloyStatement().map(scx => this.visit(scx)), x => ast.isDocStatementOrDocStatementList(x) && x, 'statement');
         return new ast.Document(stmts);
@@ -237,14 +258,14 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     visitDefineSourceStatement(pcx) {
         const defsCx = pcx.sourcePropertyList().sourceDefinition();
         const defs = defsCx.map(dcx => this.visitSourceDefinition(dcx));
-        const blockNotes = (0, parse_utils_1.getNotes)(pcx.tags());
+        const blockNotes = this.getNotes(pcx.tags());
         const defList = new ast.DefineSourceList(defs);
         defList.extendNote({ blockNotes });
         return defList;
     }
     visitSourceDefinition(pcx) {
         const exploreDef = new ast.DefineSource((0, parse_utils_1.getId)(pcx.sourceNameDef()), this.getSource(pcx.explore()), true, []);
-        const notes = (0, parse_utils_1.getNotes)(pcx.tags()).concat((0, parse_utils_1.getIsNotes)(pcx.isDefine()));
+        const notes = this.getNotes(pcx.tags()).concat(this.getIsNotes(pcx.isDefine()));
         exploreDef.extendNote({ notes });
         return this.astAt(exploreDef, pcx);
     }
@@ -413,7 +434,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             }
         }
         const joinMany = new ast.Joins(joins);
-        joinMany.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
+        joinMany.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
         return joinMany;
     }
     visitDefJoinOne(pcx) {
@@ -428,7 +449,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             }
         }
         const joinOne = new ast.Joins(joins);
-        joinOne.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
+        joinOne.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
         return joinOne;
     }
     visitDefJoinCross(pcx) {
@@ -446,7 +467,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
             }
         }
         const joinCross = new ast.Joins(joins);
-        joinCross.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
+        joinCross.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
         return joinCross;
     }
     getJoinList(pcx) {
@@ -455,7 +476,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     getJoinSource(name, ecx) {
         if (ecx) {
             const joinSrc = this.getSource(ecx.explore());
-            const notes = (0, parse_utils_1.getNotes)(ecx._before_is).concat((0, parse_utils_1.getNotes)(ecx._after_is));
+            const notes = this.getNotes(ecx._before_is).concat(this.getNotes(ecx._after_is));
             return { joinFrom: joinSrc, notes };
         }
         return { joinFrom: new ast.NamedSource(name), notes: [] };
@@ -475,7 +496,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         if (onCx) {
             join.joinOn = this.getFieldExpr(onCx);
         }
-        join.extendNote({ notes: (0, parse_utils_1.getNotes)(pcx).concat(notes) });
+        join.extendNote({ notes: this.getNotes(pcx).concat(notes) });
         return this.astAt(join, pcx);
     }
     visitJoinWith(pcx) {
@@ -483,7 +504,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const { joinFrom, notes } = this.getJoinSource(joinAs, pcx.isExplore());
         const joinOn = this.getFieldExpr(pcx.fieldExpr());
         const join = new ast.KeyJoin(joinAs, joinFrom, joinOn);
-        join.extendNote({ notes: (0, parse_utils_1.getNotes)(pcx).concat(notes) });
+        join.extendNote({ notes: this.getNotes(pcx).concat(notes) });
         return this.astAt(join, pcx);
     }
     getFieldDef(pcx, makeFieldDef) {
@@ -491,20 +512,20 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const fieldName = (0, parse_utils_1.getId)(pcx.fieldNameDef());
         const valExpr = this.getFieldExpr(defCx);
         const def = new makeFieldDef(valExpr, fieldName, this.getSourceCode(defCx));
-        const notes = (0, parse_utils_1.getNotes)(pcx.tags()).concat((0, parse_utils_1.getIsNotes)(pcx.isDefine()));
+        const notes = this.getNotes(pcx.tags()).concat(this.getIsNotes(pcx.isDefine()));
         def.extendNote({ notes });
         return this.astAt(def, pcx);
     }
     visitDefDimensions(pcx) {
         const defs = this.getFieldDefs(pcx.defList().fieldDef(), ast.DimensionFieldDeclaration);
         const stmt = new ast.Dimensions(defs);
-        stmt.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
+        stmt.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
         return this.astAt(stmt, pcx);
     }
     visitDefMeasures(pcx) {
         const defs = this.getFieldDefs(pcx.defList().fieldDef(), ast.MeasureFieldDeclaration);
         const stmt = new ast.Measures(defs);
-        stmt.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
+        stmt.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
         return this.astAt(stmt, pcx);
     }
     visitQueryExtend(pcx) {
@@ -574,7 +595,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitDefExploreQuery(pcx) {
         const queryDefs = this.visitSubQueryDefList(pcx.subQueryDefList());
-        const blockNotes = (0, parse_utils_1.getNotes)(pcx.tags());
+        const blockNotes = this.getNotes(pcx.tags());
         queryDefs.extendNote({ blockNotes });
         return queryDefs;
     }
@@ -639,17 +660,17 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitAggregateStatement(pcx) {
         const agStmt = new ast.Aggregate(this.getQueryItems(pcx.queryFieldList(), ast.AggregateFieldDeclaration, ast.AggregateFieldReference));
-        agStmt.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
+        agStmt.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
         return agStmt;
     }
     visitGroupByStatement(pcx) {
         const groupBy = new ast.GroupBy(this.getQueryItems(pcx.queryFieldList(), ast.GroupByFieldDeclaration, ast.GroupByFieldReference));
-        groupBy.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
+        groupBy.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
         return groupBy;
     }
     visitCalculateStatement(pcx) {
         const stmt = new ast.Calculate(this.getQueryItems(pcx.queryFieldList(), ast.CalculateFieldDeclaration, ast.CalculateFieldReference));
-        stmt.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
+        stmt.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
         return stmt;
     }
     getTaggedRef(pcx, makeFieldDef, makeFieldRef) {
@@ -673,11 +694,11 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
                 }
             }
             const def = new makeFieldDef(expr, ref.outputName);
-            def.extendNote({ notes: (0, parse_utils_1.getNotes)(pcx.tags()) });
+            def.extendNote({ notes: this.getNotes(pcx.tags()) });
             return def;
         }
         const ref = this.getFieldPath(pcx.fieldPath(), makeFieldRef);
-        ref.extendNote({ notes: (0, parse_utils_1.getNotes)(pcx.tags()) });
+        ref.extendNote({ notes: this.getNotes(pcx.tags()) });
         return ref;
     }
     getFieldCollectionMember(pcx, makeFieldDef, makeFieldRef) {
@@ -704,7 +725,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     }
     visitProjectStatement(pcx) {
         const stmt = this.visitFieldCollection(pcx.fieldCollection());
-        stmt.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
+        stmt.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
         return stmt;
     }
     visitCollectionWildCard(pcx) {
@@ -807,7 +828,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const stmts = pcx
             .topLevelQueryDef()
             .map(cx => this.visitTopLevelQueryDef(cx));
-        const blockNotes = (0, parse_utils_1.getNotes)(pcx.tags());
+        const blockNotes = this.getNotes(pcx.tags());
         const queryDefs = new ast.DefineQueryList(stmts);
         queryDefs.extendNote({ blockNotes });
         return queryDefs;
@@ -816,7 +837,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const queryName = (0, parse_utils_1.getId)(pcx.queryName());
         const queryExpr = this.visit(pcx.query());
         if (ast.isQueryElement(queryExpr)) {
-            const notes = (0, parse_utils_1.getNotes)(pcx.tags()).concat((0, parse_utils_1.getIsNotes)(pcx.isDefine()));
+            const notes = this.getNotes(pcx.tags()).concat(this.getIsNotes(pcx.isDefine()));
             const queryDef = new ast.DefineQuery(queryName, queryExpr);
             queryDef.extendNote({ notes });
             return this.astAt(queryDef, pcx);
@@ -828,8 +849,8 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const query = this.visit(defCx.query());
         if (ast.isQueryElement(query)) {
             const theQuery = this.astAt(new ast.AnonymousQuery(query), defCx);
-            const notes = (0, parse_utils_1.getNotes)(pcx.topLevelAnonQueryDef().tags());
-            const blockNotes = (0, parse_utils_1.getNotes)(pcx.tags());
+            const notes = this.getNotes(pcx.topLevelAnonQueryDef().tags());
+            const blockNotes = this.getNotes(pcx.tags());
             theQuery.extendNote({ notes, blockNotes });
             if (this.m4WarningsEnabled()) {
                 this.astError(theQuery, 'Anonymous `query:` statements are deprecated, use `run:` instead', 'warn');
@@ -842,15 +863,15 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const query = this.visit(pcx.topLevelAnonQueryDef().query());
         if (ast.isQueryElement(query)) {
             const el = new ast.RunQuery(query);
-            el.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx._blockTags) });
-            el.extendNote({ notes: (0, parse_utils_1.getNotes)(pcx._noteTags) });
+            el.extendNote({ blockNotes: this.getNotes(pcx._blockTags) });
+            el.extendNote({ notes: this.getNotes(pcx._noteTags) });
             return this.astAt(el, pcx);
         }
         throw this.internalError(pcx, `Run query matched, but ${query.elementType} found`);
     }
     visitNestStatement(pcx) {
         const nests = this.visitNestedQueryList(pcx.nestedQueryList());
-        nests.extendNote({ blockNotes: (0, parse_utils_1.getNotes)(pcx.tags()) });
+        nests.extendNote({ blockNotes: this.getNotes(pcx.tags()) });
         return nests;
     }
     visitNestedQueryList(pcx) {
@@ -859,7 +880,7 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
     visitNestExisting(pcx) {
         const name = this.getFieldName(pcx.queryName());
         const rcx = pcx.queryRefinement();
-        const notes = (0, parse_utils_1.getNotes)(pcx.tags());
+        const notes = this.getNotes(pcx.tags());
         if (rcx) {
             const nestRefine = new ast.NestRefinement(name);
             const queryDesc = this.getQueryRefinements(rcx);
@@ -876,14 +897,14 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         const nestDef = new ast.NestDefinition(name);
         this.buildPipelineFromName(nestDef, pcx.pipelineFromName());
         nestDef.extendNote({
-            notes: (0, parse_utils_1.getNotes)(pcx.tags()).concat((0, parse_utils_1.getIsNotes)(pcx.isDefine())),
+            notes: this.getNotes(pcx.tags()).concat(this.getIsNotes(pcx.isDefine())),
         });
         return this.astAt(nestDef, pcx);
     }
     visitExploreQueryDef(pcx) {
         const name = (0, parse_utils_1.getId)(pcx.exploreQueryNameDef());
         const queryDef = new ast.TurtleDecl(name);
-        const notes = (0, parse_utils_1.getNotes)(pcx).concat((0, parse_utils_1.getIsNotes)(pcx.isDefine()));
+        const notes = this.getNotes(pcx).concat(this.getIsNotes(pcx.isDefine()));
         queryDef.extendNote({ notes });
         this.buildPipelineFromName(queryDef, pcx.pipelineFromName());
         return this.astAt(queryDef, pcx);
@@ -1219,19 +1240,26 @@ class MalloyToAST extends AbstractParseTreeVisitor_1.AbstractParseTreeVisitor {
         return new ast.SampleProperty({ enable: enabled });
     }
     visitDocAnnotations(pcx) {
-        const allNotes = pcx.DOC_ANNOTATION().map(note => note.text);
+        const allNotes = pcx.DOC_ANNOTATION().map(note => {
+            return {
+                text: note.text,
+                at: this.getLocation(pcx),
+            };
+        });
         const tags = new ast.ModelAnnotation(allNotes);
-        this.compilerFlags = tags.getCompilerFlags(this.compilerFlags);
+        this.compilerFlags = tags.getCompilerFlags(this.compilerFlags, this.msgLog);
         return tags;
     }
     visitIgnoredObjectAnnotations(pcx) {
+        this.contextError(pcx, 'Object annotation not connected to any object');
         return new IgnoredElement(pcx.text);
     }
     visitIgnoredModelAnnotations(pcx) {
+        this.contextError(pcx, 'Model annotations not allowed at this scope');
         return new IgnoredElement(pcx.text);
     }
     visitDefExploreAnnotation(pcx) {
-        const allNotes = pcx.ANNOTATION().map(note => note.text);
+        const allNotes = this.getNotes(pcx);
         return new ast.ObjectAnnotation(allNotes);
     }
 }

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

@@ -4,7 +4,7 @@ import { LogMessage, MessageLog, MessageLogger } from './parse-log';
 import { Zone, ZoneData } from './zone';
 import { ReferenceList } from './reference-list';
 import { ASTResponse, CompletionsResponse, DataRequestResponse, ProblemResponse, FatalResponse, FinalResponse, HelpContextResponse, MetadataResponse, ModelDataRequest, NeedURLData, TranslateResponse } from './translate-response';
-import { MalloyTagProperties } from '../tags';
+import { Tag } from '../tags';
 import { MalloyParseInfo } from './malloy-parse-info';
 export declare type StepResponses = DataRequestResponse | ASTResponse | TranslateResponse | ParseResponse | MetadataResponse;
 /**
@@ -164,7 +164,7 @@ export declare class MalloyTranslator extends MalloyTranslation {
     importZone: Zone<string>;
     sqlQueryZone: Zone<SQLBlockStructDef>;
     logger: MessageLog;
-    compilerFlags: MalloyTagProperties;
+    compilerFlags: Tag;
     readonly root: MalloyTranslator;
     constructor(rootURL: string, preload?: ParseUpdate | null);
     update(dd: ParseUpdate): void;

package/dist/lang/parse-malloy.js

@@ -61,6 +61,7 @@ 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");
 /**
  * This ignores a -> popMode when the mode stack is empty, which is a hack,
  * but it let's us parse }%
@@ -751,7 +752,7 @@ class MalloyTranslator extends MalloyTranslation {
         this.importZone = new zone_1.Zone();
         this.sqlQueryZone = new zone_1.Zone();
         this.logger = new parse_log_1.MessageLog();
-        this.compilerFlags = {};
+        this.compilerFlags = new tags_1.Tag();
         this.root = this;
         if (preload) {
             this.update(preload);

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

@@ -1,6 +1,5 @@
 import { ParserRuleContext } from 'antlr4ts';
-import { StringContext, ShortStringContext, SqlStringContext, IsDefineContext, IdContext } from './lib/Malloy/MalloyParser';
-import { TerminalNode } from 'antlr4ts/tree/TerminalNode';
+import { StringContext, ShortStringContext, SqlStringContext, IdContext } from './lib/Malloy/MalloyParser';
 /**
  * Take the text of a matched string, including the matching quote
  * characters, and return the actual contents of the string after
@@ -26,16 +25,6 @@ export declare function getStringParts(cx: SqlStringContext): Generator<StringPa
  * @returns a string with the \ processing completed
  */
 export declare function parseString(str: string, surround?: string): string;
-declare type HasAnnotations = ParserRuleContext & {
-    ANNOTATION: () => TerminalNode[];
-};
-/**
- * Get all the possibly missing annotations from this parse rule
- * @param cx Any parse context which has an ANNOTATION* rules
- * @returns Array of texts for the annotations
- */
-export declare function getNotes(cx: HasAnnotations): string[];
-export declare function getIsNotes(cx: IsDefineContext): string[];
 export declare type HasID = ParserRuleContext & {
     id: () => IdContext;
 };

package/dist/lang/parse-utils.js

@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.unIndent = exports.getOptionalId = exports.getId = exports.getIsNotes = exports.getNotes = exports.parseString = exports.getStringParts = exports.getStringIfShort = exports.getShortString = void 0;
+exports.unIndent = exports.getOptionalId = exports.getId = exports.parseString = exports.getStringParts = exports.getStringIfShort = exports.getShortString = void 0;
 /**
  * Take the text of a matched string, including the matching quote
  * characters, and return the actual contents of the string after
@@ -145,20 +145,6 @@ function parseString(str, surround = '') {
     return out;
 }
 exports.parseString = parseString;
-/**
- * Get all the possibly missing annotations from this parse rule
- * @param cx Any parse context which has an ANNOTATION* rules
- * @returns Array of texts for the annotations
- */
-function getNotes(cx) {
-    return cx.ANNOTATION().map(a => a.text);
-}
-exports.getNotes = getNotes;
-function getIsNotes(cx) {
-    const before = getNotes(cx._beforeIs);
-    return before.concat(getNotes(cx._afterIs));
-}
-exports.getIsNotes = getIsNotes;
 /**
  * An identifier is either a sequence of id characters or a `quoted`
  * This parses either to simply the resulting text.

package/dist/lang/test/annotation.spec.d.ts

@@ -1 +1,14 @@
 import './parse-expects';
+interface TstAnnotation {
+    inherits?: TstAnnotation;
+    blockNotes?: string[];
+    notes?: string[];
+}
+declare global {
+    namespace jest {
+        interface Matchers<R> {
+            matchesAnnotation(tt: TstAnnotation): R;
+        }
+    }
+}
+export {};