@malloydata/malloy 0.0.404 → 0.0.405

package/dist/model/malloy_types.d.ts

@@ -671,7 +671,6 @@ export interface Query extends Pipeline, Filtered {
     name?: string;
     structRef: StructRef;
     sourceArguments?: SafeRecord<Argument>;
-    modelAnnotations?: AnnotationsDef;
     compositeResolvedSourceDef?: SourceDef;
     givenUsage?: GivenUsage;
 }
@@ -839,7 +838,6 @@ export interface TurtleDefPlusFilters extends TurtleDef, Filtered {
 }
 interface StructDefBase extends HasLocation, NamedObject, HasAnnotations {
     type: string;
-    modelAnnotations?: ModelAnnotationsDef;
     fields: FieldDef[];
     /** Marker for error placeholder structs created by ErrorFactory */
     errorFactory?: boolean;
@@ -886,6 +884,13 @@ export type SourceID = string;
 export type GivenID = string;
 /** Hash of (connectionDigest, sql) - uniquely identifies a built artifact */
 export type BuildID = string;
+/**
+ * Identifies the model a definition came from. Either a real model URL or a
+ * synthetic `"internal <uuid>"` for URL-less models. The space makes the
+ * synthetic form an illegal URL, so it can never collide with a real model
+ * URL. Created with `mkModelID`.
+ */
+export type ModelID = string;
 /**
  * Reference to a source in modelDef.contents by name.
  * Used in sourceRegistry to avoid duplicating SourceDefs that are in the namespace.
@@ -1115,6 +1120,7 @@ export interface DependencyTree {
 /** Result of parsing a model file */
 export interface ModelDef {
     name: string;
+    modelID: ModelID;
     exports: string[];
     contents: SafeRecord<NamedModelObject>;
     /**
@@ -1125,7 +1131,17 @@ export interface ModelDef {
      */
     sourceRegistry: Record<SourceID, SourceRegistryValue>;
     givens?: Record<GivenID, Given>;
-    annotations?: ModelAnnotationsDef;
+    /**
+     * Model (`##`) annotations of every model involved in this compile, keyed by
+     * {@link ModelID} — this model plus everything it imported or extended (the
+     * whole closure, so any model's annotations are answerable from this
+     * `ModelDef` alone, even after it crosses the wire). Each entry carries that
+     * model's own `##` (`ownNotes`) and its direct import/extend predecessors
+     * (`inheritsFrom`, the DAG of edges, extend-base prepended as `import₀`).
+     * {@link getModelAnnotations} folds `inheritsFrom` from any model to produce
+     * that model's deduped, ordered annotation set.
+     */
+    modelAnnotations: Record<ModelID, ModelAnnotationEntry>;
     queryList: Query[];
     dependencies: DependencyTree;
     references?: DocumentReference[];
@@ -1136,7 +1152,16 @@ export type NamedSourceDefs = SafeRecord<SourceDef>;
 export type NamedModelObjects = SafeRecord<NamedModelObject>;
 /** Bundle of source annotations attached to one object: the `notes` and
  *  `blockNotes` written on it, plus the bundle from the spiritual parent
- *  via `inherits`. The IR shape paired with the `Annotations` view class. */
+ *  via `inherits`. The IR shape paired with the `Annotations` view class.
+ *
+ *  This is the one annotation bundle type for both `#` object annotations (on
+ *  fields, views, sources, queries, …) and `##` model annotations. Object
+ *  annotations carry no model provenance: `##` is model-level, resolved by
+ *  folding {@link ModelDef.modelAnnotations} keyed by {@link ModelID}, not by
+ *  per-object stamping. A model's own `##` is just an `AnnotationsDef` whose
+ *  `inherits` chain is unused as stored (`ModelAnnotationEntry.ownNotes`) and,
+ *  when returned by {@link getModelAnnotations}, *is* the folded order (local at the
+ *  top) so the `Annotations` view / `notesInOrder` read it with no new code. */
 export interface AnnotationsDef {
     inherits?: AnnotationsDef;
     blockNotes?: Note[];
@@ -1155,9 +1180,13 @@ export interface Note {
      */
     indentStripped?: number;
 }
-/** Annotations bundle with a uuid to make it easier to stream. */
-export interface ModelAnnotationsDef extends AnnotationsDef {
-    id: string;
+/** One model's entry in {@link ModelDef.modelAnnotations}: its own `##`
+ *  (`ownNotes`) plus its **direct** import/extend predecessors (`inheritsFrom`),
+ *  in fold order with the extend-base prepended as `import₀`. Direct edges only
+ *  — the lineage DAG, not the resolved order; {@link getModelAnnotations} resolves. */
+export interface ModelAnnotationEntry {
+    ownNotes: AnnotationsDef;
+    inheritsFrom: ModelID[];
 }
 export type QueryScalar = string | boolean | number | bigint | Date | Buffer | null;
 /** One value in one column of returned data. */

package/dist/model/malloy_types.js

@@ -1,26 +1,7 @@
 "use strict";
 /*
- * Copyright 2023 Google LLC
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TD = exports.ValueType = void 0;

package/dist/model/query_node.d.ts

@@ -1,6 +1,5 @@
 import type { FieldDef, BooleanFieldDef, DateFieldDef, DocumentLocation, StringFieldDef, JSONFieldDef, NumberFieldDef, ATimestampFieldDef, NativeUnsupportedFieldDef, JoinFieldDef, Argument, Given, GivenID, PrepareResultOptions, AtomicFieldDef, BasicAtomicDef, FilterCondition, RefToField, StructDef, TurtleDef, TurtleDefPlusFilters } from './malloy_types';
 import type { EventStream } from '../runtime_types';
-import type { Tag } from '@malloydata/malloy-tag';
 import type { Dialect } from '../dialect';
 declare abstract class QueryNode {
     readonly referenceId: string;
@@ -91,8 +90,6 @@ export declare class QueryStruct {
     constructor(structDef: StructDef, sourceArguments: Record<string, Argument> | undefined, parent: ParentQueryStruct | ParentQueryModel, prepareResultOptions: PrepareResultOptions);
     private static turtleFieldMaker;
     static registerTurtleFieldMaker(maker: (field: TurtleDef, parent: QueryStruct) => QueryField): void;
-    private _modelTag;
-    modelCompilerFlags(): Tag;
     protected findFirstDialect(): string;
     maybeEmitParameterizedSourceUsage(): void;
     private resolveParentParameterReferences;

package/dist/model/query_node.js

@@ -14,7 +14,6 @@ exports.isBasicScalar = isBasicScalar;
 const uuid_1 = require("uuid");
 const malloy_compile_error_1 = require("./malloy_compile_error");
 const malloy_types_1 = require("./malloy_types");
-const annotation_1 = require("../api/foundation/annotation");
 const dialect_1 = require("../dialect");
 const utils_1 = require("./utils");
 class QueryNode {
@@ -179,7 +178,6 @@ class QueryStruct {
         this.sourceArguments = sourceArguments;
         this.prepareResultOptions = prepareResultOptions;
         this.nameMap = new Map();
-        this._modelTag = undefined;
         this._arguments = undefined;
         if ('model' in parent) {
             this.model = parent.model;
@@ -203,14 +201,6 @@ class QueryStruct {
     static registerTurtleFieldMaker(maker) {
         QueryStruct.turtleFieldMaker = maker;
     }
-    modelCompilerFlags() {
-        if (this._modelTag === undefined) {
-            const annotation = this.structDef.modelAnnotations;
-            const { tag } = new annotation_1.Annotations(annotation).parseAsTag('!');
-            this._modelTag = tag;
-        }
-        return this._modelTag;
-    }
     findFirstDialect() {
         if ((0, malloy_types_1.isSourceDef)(this.structDef)) {
             return this.structDef.dialect;

package/dist/model/query_query.js

@@ -404,9 +404,6 @@ class QueryQuery extends query_node_1.QueryField {
                         name,
                         fields: structDef.fields,
                         ...(structDef.annotations && { annotations: structDef.annotations }),
-                        ...(structDef.modelAnnotations && {
-                            modelAnnotations: structDef.modelAnnotations,
-                        }),
                         resultMetadata,
                         ...(queryTimezone && { queryTimezone }),
                     };
@@ -419,9 +416,6 @@ class QueryQuery extends query_node_1.QueryField {
                         name,
                         fields: structDef.fields,
                         ...(structDef.annotations && { annotations: structDef.annotations }),
-                        ...(structDef.modelAnnotations && {
-                            modelAnnotations: structDef.modelAnnotations,
-                        }),
                         resultMetadata,
                         ...(queryTimezone && { queryTimezone }),
                     };
@@ -513,9 +507,6 @@ class QueryQuery extends query_node_1.QueryField {
             resultMetadata: this.getResultMetadata(this.rootResult),
             queryTimezone: resultStruct.getQueryInfo().queryTimezone,
         };
-        if (this.parent.structDef.modelAnnotations) {
-            outputStruct.modelAnnotations = this.parent.structDef.modelAnnotations;
-        }
         return outputStruct;
     }
     getStructSourceSQL(qs, stageWriter) {
@@ -1218,11 +1209,9 @@ class QueryQuery extends query_node_1.QueryField {
             outputPipelinedSQL: [],
         };
         this.generateStage0Fields(this.rootResult, f, stageWriter);
-        if (this.firstSegment.type === 'project' &&
-            !this.parent.modelCompilerFlags().has('unsafe_complex_select_query')) {
+        if (this.firstSegment.type === 'project') {
             throw new malloy_compile_error_1.MalloyCompileError("Cannot use 'select:' in a stage that contains nested views. " +
-                'Use `group_by:` or restructure the pipeline. ' +
-                'Set `##! unsafe_complex_select_query` to bypass at your own risk.', 'compiler-project-with-turtles', this.fieldDef.location);
+                'Use `group_by:` or restructure the pipeline.', 'compiler-project-with-turtles', this.fieldDef.location);
         }
         const groupBy = 'GROUP BY ' + f.dimensionIndexes.join(',') + '\n';
         from += this.parent.dialect.sqlGroupSetTable(this.maxGroupSet) + '\n';
@@ -1821,9 +1810,6 @@ class QueryQueryIndex extends QueryQuery {
             ],
             connection: this.parent.connectionName,
         };
-        if (this.parent.structDef.modelAnnotations) {
-            ret.modelAnnotations = this.parent.structDef.modelAnnotations;
-        }
         return ret;
     }
 }

package/dist/model/source_def_utils.js

@@ -45,7 +45,6 @@ function mkQuerySourceDef(base, query, name) {
         location: base.location,
         // StructDefBase
         annotations: base.annotations,
-        modelAnnotations: base.modelAnnotations,
         fields: base.fields,
         // Filtered
         filterList: base.filterList,
@@ -84,7 +83,6 @@ function mkSQLSourceDef(base, selectStr, selectSegments) {
         location: base.location,
         // StructDefBase
         annotations: base.annotations,
-        modelAnnotations: base.modelAnnotations,
         fields: base.fields,
         // Filtered
         filterList: base.filterList,

package/dist/model/sql_block.js

@@ -1,25 +1,7 @@
 "use strict";
 /*
- * Copyright 2023 Google LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getSourceRequest = getSourceRequest;

package/dist/model/utils.d.ts

@@ -1,4 +1,4 @@
-import type { AtomicTypeDef, Expr, FieldDef, GenericSQLExpr, GivenTypeDef, ModelDef, StructDef } from './malloy_types';
+import type { AtomicTypeDef, Expr, FieldDef, GenericSQLExpr, GivenTypeDef, ModelDef, ModelID, StructDef } from './malloy_types';
 import type { DialectFieldList } from '../dialect';
 /**
  * Format a typeDef as user-readable Malloy type syntax. Used in error
@@ -74,8 +74,15 @@ export declare class GenerateState {
     withApply(s: string): GenerateState;
     withTotal(groupSet: number): GenerateState;
 }
+/**
+ * Make a {@link ModelID} for a model. Pass the model's URL for a real model;
+ * omit it for a URL-less model to get a synthetic `"internal <uuid>"` id. The
+ * space makes the synthetic form an illegal URL so it can never collide with a
+ * real model URL.
+ */
+export declare function mkModelID(url?: string): ModelID;
 /**
  * Create an empty ModelDef with the given name.
  * Use this factory to ensure all required fields are present.
  */
-export declare function mkModelDef(name: string): ModelDef;
+export declare function mkModelDef(name: string, modelID?: ModelID): ModelDef;

package/dist/model/utils.js

@@ -1,25 +1,7 @@
 "use strict";
 /*
- * Copyright 2023 Google LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GenerateState = exports.AndChain = void 0;
@@ -38,6 +20,7 @@ exports.getDialectFieldList = getDialectFieldList;
 exports.pathToKey = pathToKey;
 exports.groupingKey = groupingKey;
 exports.caseGroup = caseGroup;
+exports.mkModelID = mkModelID;
 exports.mkModelDef = mkModelDef;
 const uuid_1 = require("uuid");
 const sha256_1 = require("@noble/hashes/sha256");
@@ -326,16 +309,27 @@ class GenerateState {
     }
 }
 exports.GenerateState = GenerateState;
+/**
+ * Make a {@link ModelID} for a model. Pass the model's URL for a real model;
+ * omit it for a URL-less model to get a synthetic `"internal <uuid>"` id. The
+ * space makes the synthetic form an illegal URL so it can never collide with a
+ * real model URL.
+ */
+function mkModelID(url) {
+    return url !== null && url !== void 0 ? url : `internal ${(0, uuid_1.v4)()}`;
+}
 /**
  * Create an empty ModelDef with the given name.
  * Use this factory to ensure all required fields are present.
  */
-function mkModelDef(name) {
+function mkModelDef(name, modelID = mkModelID()) {
     return {
         name,
+        modelID,
         exports: [],
         contents: (0, malloy_types_1.mkSafeRecord)(),
         sourceRegistry: {},
+        modelAnnotations: {},
         queryList: [],
         dependencies: {},
     };

package/dist/run_sql_options.d.ts

@@ -1,10 +1,5 @@
-import type { AnnotationsDef } from './model/malloy_types';
 export interface RunSQLOptions {
     rowLimit?: number;
     abortSignal?: AbortSignal;
-    /** Model annotations forwarded to the adapter (e.g. `##!` dialect flags). */
-    modelAnnotations?: AnnotationsDef;
-    /** Query annotations forwarded to the adapter. */
-    queryAnnotations?: AnnotationsDef;
 }
 export type QueryOptionsReader = RunSQLOptions | (() => RunSQLOptions);

package/dist/run_sql_options.js

@@ -1,25 +1,7 @@
 "use strict";
 /*
- * Copyright 2023 Google LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=run_sql_options.js.map

package/dist/runtime_types.js

@@ -1,25 +1,7 @@
 "use strict";
 /*
- * Copyright 2023 Google LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=runtime_types.js.map

package/dist/test/cellsToObject.js

@@ -1,9 +1,7 @@
 "use strict";
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.cellsToObjects = cellsToObjects;

package/dist/timing.js

@@ -1,9 +1,7 @@
 "use strict";
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Timer = void 0;

package/dist/to_stable.js

@@ -1,9 +1,7 @@
 "use strict";
 /*
- * Copyright (c) Meta Platforms, Inc. and affiliates.
- *
- * This source code is licensed under the MIT license found in the
- * LICENSE file in the root directory of this source tree.
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
  */
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const MALLOY_VERSION = "0.0.404";
+export declare const MALLOY_VERSION = "0.0.405";

package/dist/version.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.404",
+  "version": "0.0.405",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",
@@ -51,9 +51,9 @@
     "generate-version-file": "VERSION=$(npm pkg get version --workspaces=false | tr -d \\\")\necho \"// generated with 'generate-version-file' script; do not edit manually\\nexport const MALLOY_VERSION = '$VERSION';\" > src/version.ts"
   },
   "dependencies": {
-    "@malloydata/malloy-filter": "0.0.404",
-    "@malloydata/malloy-interfaces": "0.0.404",
-    "@malloydata/malloy-tag": "0.0.404",
+    "@malloydata/malloy-filter": "0.0.405",
+    "@malloydata/malloy-interfaces": "0.0.405",
+    "@malloydata/malloy-tag": "0.0.405",
     "@noble/hashes": "^1.8.0",
     "antlr4ts": "^0.5.0-alpha.4",
     "assert": "^2.0.0",

package/dist/lang/parse-tree-walkers/model-annotation-walker.d.ts

@@ -1,5 +0,0 @@
-import type { CommonTokenStream } from 'antlr4ts';
-import type { MalloyTranslation } from '../parse-malloy';
-import type { AnnotationsDef } from '../../model/malloy_types';
-import type { MalloyParseInfo } from '../malloy-parse-info';
-export declare function walkForModelAnnotation(forParse: MalloyTranslation, tokens: CommonTokenStream, parseInfo: MalloyParseInfo): AnnotationsDef;

package/dist/lang/parse-tree-walkers/model-annotation-walker.js

@@ -1,50 +0,0 @@
-"use strict";
-/*
- * Copyright 2023 Google LLC
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this software and associated documentation files
- * (the "Software"), to deal in the Software without restriction,
- * including without limitation the rights to use, copy, modify, merge,
- * publish, distribute, sublicense, and/or sell copies of the Software,
- * and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be
- * included in all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.walkForModelAnnotation = walkForModelAnnotation;
-const ParseTreeWalker_1 = require("antlr4ts/tree/ParseTreeWalker");
-const parse_utils_1 = require("../parse-utils");
-class ModelAnnotationWalker {
-    constructor(translator, tokens, parseInfo) {
-        this.translator = translator;
-        this.tokens = tokens;
-        this.parseInfo = parseInfo;
-        this.notes = [];
-    }
-    enterDocAnnotations(pcx) {
-        for (const a of pcx.docAnnotation()) {
-            this.notes.push((0, parse_utils_1.noteFromAnnotation)(a, this.parseInfo));
-        }
-    }
-    get annotations() {
-        return { notes: this.notes };
-    }
-}
-function walkForModelAnnotation(forParse, tokens, parseInfo) {
-    const finder = new ModelAnnotationWalker(forParse, tokens, parseInfo);
-    const listener = finder;
-    ParseTreeWalker_1.ParseTreeWalker.DEFAULT.walk(listener, parseInfo.root);
-    return finder.annotations;
-}
-//# sourceMappingURL=model-annotation-walker.js.map