@malloydata/malloy 0.0.237-dev250224215546 → 0.0.237-dev250225144145

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/test/literals.spec.js

@@ -23,7 +23,6 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 const test_translator_1 = require("./test-translator");
-const parse_utils_1 = require("../parse-utils");
 require("./parse-expects");
 const granular_result_1 = require("../ast/types/granular-result");
 describe('literals', () => {
@@ -154,39 +153,6 @@ describe('literals', () => {
     test('regex', () => {
         expect((0, test_translator_1.expr) `r'RegularExpression'`).toTranslate();
     });
-    describe('quote comprehension inside strings', () => {
-        test('\\b', () => {
-            expect((0, parse_utils_1.parseString)('\\b')).toEqual('\b');
-        });
-        test('\\f', () => {
-            expect((0, parse_utils_1.parseString)('\\f')).toEqual('\f');
-        });
-        test('\\n', () => {
-            expect((0, parse_utils_1.parseString)('\\n')).toEqual('\n');
-        });
-        test('\\r', () => {
-            expect((0, parse_utils_1.parseString)('\\r')).toEqual('\r');
-        });
-        test('\\t', () => {
-            expect((0, parse_utils_1.parseString)('\\t')).toEqual('\t');
-        });
-        test('unicode ?', () => {
-            expect((0, parse_utils_1.parseString)('\\u003f')).toEqual('?');
-            expect((0, parse_utils_1.parseString)('\\u003F')).toEqual('?');
-        });
-        test('normal stuff', () => {
-            expect((0, parse_utils_1.parseString)('normal stuff')).toEqual('normal stuff');
-        });
-        test('stuff & nonsense', () => {
-            expect((0, parse_utils_1.parseString)('stuff \\u0026 nonsense')).toEqual('stuff & nonsense');
-        });
-        test('one thing\\nnext thing', () => {
-            expect((0, parse_utils_1.parseString)('one thing\\nnext thing')).toEqual('one thing\nnext thing');
-        });
-        test('quote stripping works', () => {
-            expect((0, parse_utils_1.parseString)('|42|', '|')).toEqual('42');
-        });
-    });
     describe('string parsing in language', () => {
         const tz = 'America/Mexico_City';
         test('multi-line indent increasing', () => {

package/dist/malloy.d.ts

@@ -6,9 +6,14 @@ import { DocumentHelpContext } from './lang/parse-tree-walkers/document-help-con
 import { CompiledQuery, DocumentLocation, DocumentReference, BooleanFieldDef, JSONFieldDef, NumberFieldDef, StringFieldDef, FilterCondition, Query as InternalQuery, ModelDef, DocumentPosition as ModelDocumentPosition, NamedQuery, QueryData, QueryDataRow, QueryResult, SearchIndexResult, SearchValueMapResult, StructDef, TurtleDef, NativeUnsupportedFieldDef, QueryRunStats, ImportLocation, Annotation, SQLSentence, SQLSourceDef, AtomicFieldDef, DateFieldDef, TimestampFieldDef, SourceDef, QueryToMaterialize } from './model';
 import { EventStream, InvalidationKey, ModelString, ModelURL, QueryString, QueryURL, URLReader } from './runtime_types';
 import { Connection, FetchSchemaOptions, InfoConnection, LookupConnection } from './connection/types';
-import { Tag, TagParse, TagParseSpec, Taggable } from './tags';
+import { Tag } from '@malloydata/malloy-tag';
 import { Dialect } from './dialect';
 import { PathInfo } from './lang/parse-tree-walkers/find-table-path-walker';
+import { MalloyTagParse, TagParseSpec } from './annotation';
+export interface Taggable {
+    tagParse: (spec?: TagParseSpec) => MalloyTagParse;
+    getTaglines: (prefix?: RegExp) => string[];
+}
 export interface Loggable {
     debug: (message?: any, ...optionalParams: any[]) => void;
     info: (message?: any, ...optionalParams: any[]) => void;
@@ -185,7 +190,7 @@ export declare class Model implements Taggable {
     _referenceAt: (location: ModelDocumentPosition) => DocumentReference | undefined;
     _importAt: (location: ModelDocumentPosition) => ImportLocation | undefined;
     constructor(modelDef: ModelDef, problems: LogMessage[], fromSources: string[], referenceAt?: (location: ModelDocumentPosition) => DocumentReference | undefined, importAt?: (location: ModelDocumentPosition) => ImportLocation | undefined);
-    tagParse(spec?: TagParseSpec): TagParse;
+    tagParse(spec?: TagParseSpec): MalloyTagParse;
     getTaglines(prefix?: RegExp): string[];
     /**
      * Retrieve a document reference for the token at the given position within
@@ -260,7 +265,7 @@ export declare class PreparedQuery implements Taggable {
     _modelDef: ModelDef;
     _query: InternalQuery | NamedQuery;
     constructor(query: InternalQuery, model: ModelDef, problems: LogMessage[], name?: string | undefined);
-    tagParse(spec?: TagParseSpec): TagParse;
+    tagParse(spec?: TagParseSpec): MalloyTagParse;
     getTaglines(prefix?: RegExp): string[];
     /**
      * Generate the SQL for this query.
@@ -457,7 +462,7 @@ export declare class PreparedResult implements Taggable {
     protected inner: CompiledQuery;
     constructor(query: CompiledQuery, modelDef: ModelDef);
     static fromJson({ query, modelDef, }: PreparedResultJSON): PreparedResult;
-    tagParse(spec?: TagParseSpec): TagParse;
+    tagParse(spec?: TagParseSpec): MalloyTagParse;
     getTaglines(prefix?: RegExp): string[];
     get annotation(): Annotation | undefined;
     get modelAnnotation(): Annotation | undefined;
@@ -587,7 +592,7 @@ export declare class Explore extends Entity implements Taggable {
     get source(): Explore | undefined;
     isIntrinsic(): boolean;
     isExploreField(): this is ExploreField;
-    tagParse(spec?: TagParseSpec): TagParse;
+    tagParse(spec?: TagParseSpec): MalloyTagParse;
     getTaglines(prefix?: RegExp): string[];
     private parsedModelTag?;
     get modelTag(): Tag;
@@ -632,7 +637,7 @@ export declare class AtomicField extends Entity implements Taggable {
     protected parent: Explore;
     constructor(fieldTypeDef: AtomicFieldDef, parent: Explore, source?: AtomicField);
     get type(): AtomicFieldType;
-    tagParse(spec?: TagParseSpec): TagParse;
+    tagParse(spec?: TagParseSpec): MalloyTagParse;
     getTaglines(prefix?: RegExp): string[];
     isIntrinsic(): boolean;
     isQueryField(): this is QueryField;
@@ -723,7 +728,7 @@ export declare class Query extends Entity {
 export declare class QueryField extends Query implements Taggable {
     protected parent: Explore;
     constructor(turtleDef: TurtleDef, parent: Explore, source?: Query);
-    tagParse(spec?: TagParseSpec): TagParse;
+    tagParse(spec?: TagParseSpec): MalloyTagParse;
     getTaglines(prefix?: RegExp): string[];
     isQueryField(): this is QueryField;
     isExploreField(): this is ExploreField;
@@ -744,7 +749,7 @@ export declare class ExploreField extends Explore {
     get joinRelationship(): JoinRelationship;
     get isRecord(): boolean;
     get isArray(): boolean;
-    tagParse(spec?: TagParseSpec): TagParse;
+    tagParse(spec?: TagParseSpec): MalloyTagParse;
     isQueryField(): this is QueryField;
     isExploreField(): this is ExploreField;
     isAtomicField(): this is AtomicField;

package/dist/malloy.js

@@ -26,10 +26,10 @@ exports.InMemoryModelCache = exports.CacheManager = exports.CSVWriter = exports.
 const lang_1 = require("./lang");
 const model_1 = require("./model");
 const luxon_1 = require("luxon");
-const tags_1 = require("./tags");
 const dialect_1 = require("./dialect");
 const version_1 = require("./version");
 const uuid_1 = require("uuid");
+const annotation_1 = require("./annotation");
 const MALLOY_INTERNAL_URL = 'internal://internal.malloy';
 class Malloy {
     static get version() {
@@ -446,10 +446,10 @@ class Model {
         this._importAt = importAt;
     }
     tagParse(spec) {
-        return tags_1.Tag.annotationToTag(this.modelDef.annotation, spec);
+        return (0, annotation_1.annotationToTag)(this.modelDef.annotation, spec);
     }
     getTaglines(prefix) {
-        return tags_1.Tag.annotationToTaglines(this.modelDef.annotation, prefix);
+        return (0, annotation_1.annotationToTaglines)(this.modelDef.annotation, prefix);
     }
     /**
      * Retrieve a document reference for the token at the given position within
@@ -569,12 +569,12 @@ class PreparedQuery {
         this._modelDef = model;
     }
     tagParse(spec) {
-        const modelScope = tags_1.Tag.annotationToTag(this._modelDef.annotation).tag;
-        spec = tags_1.Tag.addModelScope(spec, modelScope);
-        return tags_1.Tag.annotationToTag(this._query.annotation, spec);
+        const modelScope = (0, annotation_1.annotationToTag)(this._modelDef.annotation).tag;
+        spec = (0, annotation_1.addModelScope)(spec, modelScope);
+        return (0, annotation_1.annotationToTag)(this._query.annotation, spec);
     }
     getTaglines(prefix) {
-        return tags_1.Tag.annotationToTaglines(this._query.annotation, prefix);
+        return (0, annotation_1.annotationToTaglines)(this._query.annotation, prefix);
     }
     /**
      * Generate the SQL for this query.
@@ -831,12 +831,12 @@ class PreparedResult {
         return new PreparedResult(query, modelDef);
     }
     tagParse(spec) {
-        const modelScope = tags_1.Tag.annotationToTag(this.modelDef.annotation).tag;
-        spec = tags_1.Tag.addModelScope(spec, modelScope);
-        return tags_1.Tag.annotationToTag(this.inner.annotation, spec);
+        const modelScope = (0, annotation_1.annotationToTag)(this.modelDef.annotation).tag;
+        spec = (0, annotation_1.addModelScope)(spec, modelScope);
+        return (0, annotation_1.annotationToTag)(this.inner.annotation, spec);
     }
     getTaglines(prefix) {
-        return tags_1.Tag.annotationToTaglines(this.inner.annotation, prefix);
+        return (0, annotation_1.annotationToTaglines)(this.inner.annotation, prefix);
     }
     get annotation() {
         return this.inner.annotation;
@@ -845,7 +845,7 @@ class PreparedResult {
         return this.modelDef.annotation;
     }
     get modelTag() {
-        return tags_1.Tag.annotationToTag(this.modelDef.annotation).tag;
+        return (0, annotation_1.annotationToTag)(this.modelDef.annotation).tag;
     }
     /**
      * @return The name of the connection this query should be run against.
@@ -1096,13 +1096,13 @@ class Explore extends Entity {
         return false;
     }
     tagParse(spec) {
-        return tags_1.Tag.annotationToTag(this._structDef.annotation, spec);
+        return (0, annotation_1.annotationToTag)(this._structDef.annotation, spec);
     }
     getTaglines(prefix) {
-        return tags_1.Tag.annotationToTaglines(this._structDef.annotation, prefix);
+        return (0, annotation_1.annotationToTaglines)(this._structDef.annotation, prefix);
     }
     get modelTag() {
-        this.parsedModelTag || (this.parsedModelTag = tags_1.Tag.annotationToTag(this._structDef.modelAnnotation).tag);
+        this.parsedModelTag || (this.parsedModelTag = (0, annotation_1.annotationToTag)(this._structDef.modelAnnotation).tag);
         return this.parsedModelTag;
     }
     /**
@@ -1343,11 +1343,11 @@ class AtomicField extends Entity {
         }
     }
     tagParse(spec) {
-        spec = tags_1.Tag.addModelScope(spec, this.parent.modelTag);
-        return tags_1.Tag.annotationToTag(this.fieldTypeDef.annotation, spec);
+        spec = (0, annotation_1.addModelScope)(spec, this.parent.modelTag);
+        return (0, annotation_1.annotationToTag)(this.fieldTypeDef.annotation, spec);
     }
     getTaglines(prefix) {
-        return tags_1.Tag.annotationToTaglines(this.fieldTypeDef.annotation, prefix);
+        return (0, annotation_1.annotationToTaglines)(this.fieldTypeDef.annotation, prefix);
     }
     isIntrinsic() {
         return (0, model_1.fieldIsIntrinsic)(this.fieldTypeDef);
@@ -1573,11 +1573,11 @@ class QueryField extends Query {
         this.parent = parent;
     }
     tagParse(spec) {
-        spec = tags_1.Tag.addModelScope(spec, this.parent.modelTag);
-        return tags_1.Tag.annotationToTag(this.turtleDef.annotation, spec);
+        spec = (0, annotation_1.addModelScope)(spec, this.parent.modelTag);
+        return (0, annotation_1.annotationToTag)(this.turtleDef.annotation, spec);
     }
     getTaglines(prefix) {
-        return tags_1.Tag.annotationToTaglines(this.turtleDef.annotation, prefix);
+        return (0, annotation_1.annotationToTaglines)(this.turtleDef.annotation, prefix);
     }
     isQueryField() {
         return true;
@@ -1633,8 +1633,8 @@ class ExploreField extends Explore {
         return this.joinRelationship !== JoinRelationship.OneToOne;
     }
     tagParse(spec) {
-        spec = tags_1.Tag.addModelScope(spec, this._parentExplore.modelTag);
-        return tags_1.Tag.annotationToTag(this._structDef.annotation, spec);
+        spec = (0, annotation_1.addModelScope)(spec, this._parentExplore.modelTag);
+        return (0, annotation_1.annotationToTag)(this._structDef.annotation, spec);
     }
     isQueryField() {
         return false;