@malloydata/malloy 0.0.399 → 0.0.401

package/dist/api/foundation/index.d.ts

@@ -4,7 +4,7 @@ export { EmptyURLReader, InMemoryURLReader, FixedConnectionMap, hashForInvalidat
 export type { ModelCache, CachedModel } from './cache';
 export { CacheManager, InMemoryModelCache } from './cache';
 export { Parse, DocumentTablePath, DocumentRange, DocumentPosition, DocumentSymbol, DocumentCompletion, } from './document';
-export { SourceRelationship, AtomicFieldType, DateTimeframe, TimestampTimeframe, JoinRelationship, type Field, type SerializedExplore, type SortableField, type PreparedResultJSON, type BuildPlan, Explore, ExploreField, AtomicField, DateField, TimestampField, NumberField, BooleanField, JSONField, UnsupportedField, StringField, Query, QueryField, Model, PersistSource, PreparedQuery, PreparedResult, } from './core';
+export { SourceRelationship, AtomicFieldType, DateTimeframe, TimestampTimeframe, JoinRelationship, type Field, type SerializedExplore, type SortableField, type PreparedResultJSON, type BuildPlan, Explore, ExploreField, AtomicField, DateField, TimestampField, NumberField, BooleanField, JSONField, UnsupportedField, StringField, Query, QueryField, Model, PersistSource, PreparedQuery, PreparedResult, Reference, type ReferenceKind, } from './core';
 export { type ResultJSON, type DataColumn, type DataArrayOrRecord, Result, DataArray, DataRecord, } from './result';
 export { type WriteStream, DataWriter, JSONWriter, CSVWriter } from './writers';
 export { Runtime, ConnectionRuntime, SingleConnectionRuntime, ModelMaterializer, QueryMaterializer, PreparedResultMaterializer, ExploreMaterializer, } from './runtime';

package/dist/api/foundation/index.js

@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: MIT
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExploreMaterializer = exports.PreparedResultMaterializer = exports.QueryMaterializer = exports.ModelMaterializer = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.Runtime = exports.CSVWriter = exports.JSONWriter = exports.DataWriter = exports.DataRecord = exports.DataArray = exports.Result = exports.PreparedResult = exports.PreparedQuery = exports.PersistSource = exports.Model = exports.QueryField = exports.Query = exports.StringField = exports.UnsupportedField = exports.JSONField = exports.BooleanField = exports.NumberField = exports.TimestampField = exports.DateField = exports.AtomicField = exports.ExploreField = exports.Explore = exports.JoinRelationship = exports.TimestampTimeframe = exports.DateTimeframe = exports.AtomicFieldType = exports.SourceRelationship = exports.DocumentCompletion = exports.DocumentSymbol = exports.DocumentPosition = exports.DocumentRange = exports.DocumentTablePath = exports.Parse = exports.InMemoryModelCache = exports.CacheManager = exports.getInvalidationKey = exports.readURL = exports.isInternalURL = exports.hashForInvalidationKey = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.EMPTY_BUILD_MANIFEST = void 0;
-exports.MalloyError = exports.Malloy = exports.discoverConfig = exports.defaultConfigOverlays = exports.contextOverlay = exports.envOverlay = exports.MalloyConfig = exports.Manifest = void 0;
+exports.PreparedResultMaterializer = exports.QueryMaterializer = exports.ModelMaterializer = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.Runtime = exports.CSVWriter = exports.JSONWriter = exports.DataWriter = exports.DataRecord = exports.DataArray = exports.Result = exports.Reference = exports.PreparedResult = exports.PreparedQuery = exports.PersistSource = exports.Model = exports.QueryField = exports.Query = exports.StringField = exports.UnsupportedField = exports.JSONField = exports.BooleanField = exports.NumberField = exports.TimestampField = exports.DateField = exports.AtomicField = exports.ExploreField = exports.Explore = exports.JoinRelationship = exports.TimestampTimeframe = exports.DateTimeframe = exports.AtomicFieldType = exports.SourceRelationship = exports.DocumentCompletion = exports.DocumentSymbol = exports.DocumentPosition = exports.DocumentRange = exports.DocumentTablePath = exports.Parse = exports.InMemoryModelCache = exports.CacheManager = exports.getInvalidationKey = exports.readURL = exports.isInternalURL = exports.hashForInvalidationKey = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.EMPTY_BUILD_MANIFEST = void 0;
+exports.MalloyError = exports.Malloy = exports.discoverConfig = exports.defaultConfigOverlays = exports.contextOverlay = exports.envOverlay = exports.MalloyConfig = exports.Manifest = exports.ExploreMaterializer = void 0;
 var types_1 = require("./types");
 Object.defineProperty(exports, "EMPTY_BUILD_MANIFEST", { enumerable: true, get: function () { return types_1.EMPTY_BUILD_MANIFEST; } });
 // URL readers and connection helpers
@@ -53,6 +53,7 @@ Object.defineProperty(exports, "Model", { enumerable: true, get: function () { r
 Object.defineProperty(exports, "PersistSource", { enumerable: true, get: function () { return core_1.PersistSource; } });
 Object.defineProperty(exports, "PreparedQuery", { enumerable: true, get: function () { return core_1.PreparedQuery; } });
 Object.defineProperty(exports, "PreparedResult", { enumerable: true, get: function () { return core_1.PreparedResult; } });
+Object.defineProperty(exports, "Reference", { enumerable: true, get: function () { return core_1.Reference; } });
 // Result and Data classes
 var result_1 = require("./result");
 Object.defineProperty(exports, "Result", { enumerable: true, get: function () { return result_1.Result; } });

package/dist/api/foundation/runtime.js

@@ -873,8 +873,8 @@ exports.ModelMaterializer = ModelMaterializer;
 // =============================================================================
 function runSQLOptionsWithAnnotations(preparedResult, givenOptions) {
     return {
-        queryAnnotation: preparedResult.annotation,
-        modelAnnotation: preparedResult.modelAnnotation,
+        queryAnnotations: preparedResult._rawQuery.annotations,
+        modelAnnotations: preparedResult._modelDef.annotations,
         ...givenOptions,
     };
 }

package/dist/{taggable.d.ts → api/foundation/taggable.d.ts}

@@ -8,17 +8,17 @@ export interface Taggable {
     /**
      * Route-aware annotation access — read annotations by *route*. See
      * `Annotations` for what a route is and which ones are claimed. Unlike
-     * `tagParse`/`getTaglines`, this sees block annotations (`#|`…`|#`).
+     * `tagParse`/`getTaglines`, this sees multi-line annotations (`#|`…`|#`).
      */
     readonly annotations: Annotations;
     /**
-     * @deprecated The RegExp form cannot see block annotations (`#|`…`|#`) and
-     * cannot report content offsets for error mapping. Use
+     * @deprecated The RegExp form cannot see multi-line annotations
+     * (`#|`…`|#`) and cannot report content offsets for error mapping. Use
      * `annotations.parseAsTag(route)` instead.
      */
     tagParse: (spec?: TagParseSpec) => MalloyTagParse;
     /**
-     * @deprecated The RegExp form cannot see block annotations. Use
+     * @deprecated The RegExp form cannot see multi-line annotations. Use
      * `annotations.texts(route)` (raw strings) or `annotations.forRoute(route)`
      * (objects with offsets) instead.
      */

package/dist/api/foundation/types.d.ts

@@ -9,7 +9,7 @@ import type { BuildManifest, GivenValue, VirtualMap } from '../../model';
  * Frozen to prevent accidental mutation of the shared sentinel.
  */
 export declare const EMPTY_BUILD_MANIFEST: BuildManifest;
-export type { Taggable } from '../../taggable';
+export type { Taggable } from './taggable';
 export interface Loggable {
     debug: (message?: any, ...optionalParams: any[]) => void;
     info: (message?: any, ...optionalParams: any[]) => void;

package/dist/connection/types.d.ts

@@ -1,12 +1,13 @@
 import type { RunSQLOptions } from '../run_sql_options';
-import type { Annotation, MalloyQueryData, QueryRecord, QueryRunStats, SQLSourceDef, TableSourceDef } from '../model/malloy_types';
+import type { AnnotationsDef, MalloyQueryData, QueryRecord, QueryRunStats, SQLSourceDef, TableSourceDef } from '../model/malloy_types';
 import type { SQLSourceRequest } from '../lang/translate-response';
 /**
  * Options passed to fetchSchema methods.
  */
 export interface FetchSchemaOptions {
     refreshTimestamp?: number;
-    modelAnnotation?: Annotation;
+    /** Model annotations forwarded to the adapter (e.g. `##!` dialect flags). */
+    modelAnnotations?: AnnotationsDef;
 }
 /**
  * An object capable of reading schemas for given table names.

package/dist/index.d.ts

@@ -1,6 +1,6 @@
 export { DuckDBDialect, StandardSQLDialect, TrinoDialect, PostgresDialect, SnowflakeDialect, MySQLDialect, DatabricksDialect, registerDialect, arg, qtz, overload, minScalar, anyExprType, minAggregate, maxScalar, sql, makeParam, param, variadicParam, literal, spread, Dialect, decodeDottedTablePath, validateDottedTablePath, } from './dialect';
 export type { DialectFieldList, DialectFunctionOverloadDef, QueryInfo, MalloyStandardFunctionImplementations, DefinitionBlueprint, DefinitionBlueprintMap, OverloadedDefinitionBlueprint, DecodeDottedTablePathResult, DottedTablePathOptions, TablePathEscapeStyle, TablePathSegment, ValidateTablePathResult, } from './dialect';
-export type { QueryRecord, StructDef, TableSourceDef, SQLSourceDef, SourceDef, JoinFieldDef, NamedSourceDefs, MalloyQueryData, DateUnit, ExtractUnit, TimestampUnit, TemporalFieldType, QueryData, QueryValue, Expr, FilterCondition, Argument, Parameter, FieldDef, PipeSegment, QueryFieldDef, IndexFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryResult, QueryResultDef, QueryRunStats, QueryScalar, NamedQueryDef, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, Sampling, Annotation, BasicAtomicTypeDef, BasicAtomicDef, AtomicTypeDef, AtomicFieldDef, ArrayDef, ArrayTypeDef, RecordTypeDef, RepeatedRecordTypeDef, RecordDef, RepeatedRecordDef, RecordLiteralNode, StringLiteralNode, ArrayLiteralNode, SourceComponentInfo, DateLiteralNode, TimestampLiteralNode, TimestamptzLiteralNode, TimeLiteralExpr, TypecastExpr, BuildID, BuildManifest, BuildManifestEntry, GivenValue, VirtualMap, } from './model';
+export type { QueryRecord, StructDef, TableSourceDef, SQLSourceDef, SourceDef, JoinFieldDef, NamedSourceDefs, MalloyQueryData, DateUnit, ExtractUnit, TimestampUnit, TemporalFieldType, QueryData, QueryValue, Expr, FilterCondition, Argument, Parameter, FieldDef, PipeSegment, QueryFieldDef, IndexFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryResult, QueryResultDef, QueryRunStats, QueryScalar, NamedQueryDef, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, Sampling, BasicAtomicTypeDef, BasicAtomicDef, AtomicTypeDef, AtomicFieldDef, ArrayDef, ArrayTypeDef, RecordTypeDef, RepeatedRecordTypeDef, RecordDef, RepeatedRecordDef, RecordLiteralNode, StringLiteralNode, ArrayLiteralNode, SourceComponentInfo, DateLiteralNode, TimestampLiteralNode, TimestamptzLiteralNode, TimeLiteralExpr, TypecastExpr, BuildID, BuildManifest, BuildManifestEntry, GivenValue, VirtualMap, } from './model';
 export { isSourceDef, isAtomic, isBasicAtomic, isCompoundArrayData, isJoined, isJoinedSource, isSamplingEnable, isSamplingPercent, isSamplingRows, isRepeatedRecord, isBasicArray, mkArrayDef, mkFieldDef, expressionIsAggregate, expressionIsAnalytic, expressionIsCalculation, expressionIsScalar, expressionIsUngroupedAggregate, indent, composeSQLExpr, isTimestampUnit, isDateUnit, constantExprToSQL, } from './model';
 export { malloyToQuery, MalloyTranslator, } from './lang';
 export type { LogMessage, TranslateResponse } from './lang';
@@ -19,7 +19,14 @@ export { modelDefToModelInfo, sourceDefToSourceInfo } from './to_stable';
 export * as API from './api';
 export type { SQLSourceRequest } from './lang/translate-response';
 export { sqlKey } from './model/sql_block';
-export { annotationToTag, annotationToTaglines } from './annotation';
+export { Annotations, RoutedNote } from './api/foundation/annotation';
+export { routeOf, payloadOf, annotationsForRoute, tagFromAnnotations, } from './api/annotation-utils';
+/** @deprecated — use the `.annotations` view on a Foundation entity
+ *  (`entity.annotations.parseAsTag(route)` / `.texts(route)`). */
+export { annotationToTag, annotationToTaglines, } from './api/foundation/annotation';
 export type { BuildGraph, BuildNode, BuildPlan } from './api/foundation';
 export { PersistSource, EMPTY_BUILD_MANIFEST } from './api/foundation';
+export { Reference } from './api/foundation';
+export type { ReferenceKind } from './api/foundation';
+export type { ImportLocation } from './model';
 export { makeDigest } from './model';

package/dist/index.js

@@ -34,7 +34,8 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Model = exports.MalloyTranslator = exports.malloyToQuery = exports.constantExprToSQL = exports.isDateUnit = exports.isTimestampUnit = exports.composeSQLExpr = exports.indent = exports.expressionIsUngroupedAggregate = exports.expressionIsScalar = exports.expressionIsCalculation = exports.expressionIsAnalytic = exports.expressionIsAggregate = exports.mkFieldDef = exports.mkArrayDef = exports.isBasicArray = exports.isRepeatedRecord = exports.isSamplingRows = exports.isSamplingPercent = exports.isSamplingEnable = exports.isJoinedSource = exports.isJoined = exports.isCompoundArrayData = exports.isBasicAtomic = exports.isAtomic = exports.isSourceDef = exports.validateDottedTablePath = exports.decodeDottedTablePath = 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.DatabricksDialect = exports.MySQLDialect = exports.SnowflakeDialect = exports.PostgresDialect = exports.TrinoDialect = exports.StandardSQLDialect = exports.DuckDBDialect = void 0;
-exports.makeDigest = exports.EMPTY_BUILD_MANIFEST = exports.PersistSource = exports.annotationToTaglines = exports.annotationToTag = exports.sqlKey = exports.API = exports.sourceDefToSourceInfo = exports.modelDefToModelInfo = exports.toAsyncGenerator = exports.createConnectionsFromConfig = exports.getRegisteredConnectionTypes = exports.getConnectionTypeDisplayName = exports.getConnectionProperties = exports.registerConnectionType = exports.discoverConfig = exports.defaultConfigOverlays = exports.contextOverlay = exports.envOverlay = exports.MalloyConfig = exports.Manifest = 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 = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = void 0;
+exports.Reference = exports.EMPTY_BUILD_MANIFEST = exports.PersistSource = exports.annotationToTaglines = exports.annotationToTag = exports.tagFromAnnotations = exports.annotationsForRoute = exports.payloadOf = exports.routeOf = exports.RoutedNote = exports.Annotations = exports.sqlKey = exports.API = exports.sourceDefToSourceInfo = exports.modelDefToModelInfo = exports.toAsyncGenerator = exports.createConnectionsFromConfig = exports.getRegisteredConnectionTypes = exports.getConnectionTypeDisplayName = exports.getConnectionProperties = exports.registerConnectionType = exports.discoverConfig = exports.defaultConfigOverlays = exports.contextOverlay = exports.envOverlay = exports.MalloyConfig = exports.Manifest = 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 = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = void 0;
+exports.makeDigest = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -157,12 +158,24 @@ Object.defineProperty(exports, "sourceDefToSourceInfo", { enumerable: true, get:
 exports.API = __importStar(require("./api"));
 var sql_block_1 = require("./model/sql_block");
 Object.defineProperty(exports, "sqlKey", { enumerable: true, get: function () { return sql_block_1.sqlKey; } });
-var annotation_1 = require("./annotation");
-Object.defineProperty(exports, "annotationToTag", { enumerable: true, get: function () { return annotation_1.annotationToTag; } });
-Object.defineProperty(exports, "annotationToTaglines", { enumerable: true, get: function () { return annotation_1.annotationToTaglines; } });
+var annotation_1 = require("./api/foundation/annotation");
+Object.defineProperty(exports, "Annotations", { enumerable: true, get: function () { return annotation_1.Annotations; } });
+Object.defineProperty(exports, "RoutedNote", { enumerable: true, get: function () { return annotation_1.RoutedNote; } });
+var annotation_utils_1 = require("./api/annotation-utils");
+Object.defineProperty(exports, "routeOf", { enumerable: true, get: function () { return annotation_utils_1.routeOf; } });
+Object.defineProperty(exports, "payloadOf", { enumerable: true, get: function () { return annotation_utils_1.payloadOf; } });
+Object.defineProperty(exports, "annotationsForRoute", { enumerable: true, get: function () { return annotation_utils_1.annotationsForRoute; } });
+Object.defineProperty(exports, "tagFromAnnotations", { enumerable: true, get: function () { return annotation_utils_1.tagFromAnnotations; } });
+/** @deprecated — use the `.annotations` view on a Foundation entity
+ *  (`entity.annotations.parseAsTag(route)` / `.texts(route)`). */
+var annotation_2 = require("./api/foundation/annotation");
+Object.defineProperty(exports, "annotationToTag", { enumerable: true, get: function () { return annotation_2.annotationToTag; } });
+Object.defineProperty(exports, "annotationToTaglines", { enumerable: true, get: function () { return annotation_2.annotationToTaglines; } });
 var foundation_2 = require("./api/foundation");
 Object.defineProperty(exports, "PersistSource", { enumerable: true, get: function () { return foundation_2.PersistSource; } });
 Object.defineProperty(exports, "EMPTY_BUILD_MANIFEST", { enumerable: true, get: function () { return foundation_2.EMPTY_BUILD_MANIFEST; } });
+var foundation_3 = require("./api/foundation");
+Object.defineProperty(exports, "Reference", { enumerable: true, get: function () { return foundation_3.Reference; } });
 var model_2 = require("./model");
 Object.defineProperty(exports, "makeDigest", { enumerable: true, get: function () { return model_2.makeDigest; } });
 //# sourceMappingURL=index.js.map

package/dist/{prefix.js → lang/annotation-prefix.js}

@@ -96,4 +96,4 @@ function parsePrefix(text) {
     // Otherwise: a bare word, or mixed text with no brackets.
     return { route: routing, contentIndex, malformation: 'malformed-route' };
 }
-//# sourceMappingURL=prefix.js.map
+//# sourceMappingURL=annotation-prefix.js.map

package/dist/lang/ast/expressions/expr-given.js

@@ -46,7 +46,7 @@ class GivenReference extends expression_def_1.ExpressionDef {
             location: this.location,
             definition: {
                 type: (0, utils_1.typeDefToString)(given.type),
-                annotation: given.annotation,
+                annotations: given.annotations,
                 location: given.location,
                 defaultText: given.defaultText,
             },

package/dist/lang/ast/field-space/dynamic-space.d.ts

@@ -13,7 +13,7 @@ export declare abstract class DynamicSpace extends StaticSpace implements Source
     private parameters;
     protected newTimezone?: string;
     protected newAccessModifiers: Map<string, model.AccessModifierLabel>;
-    protected newNotes: Map<string, model.Annotation>;
+    protected newNotes: Map<string, model.AnnotationsDef>;
     constructor(extending: SourceDef);
     protected setEntry(name: string, value: SpaceEntry): void;
     addParameters(parameters: HasParameter[]): DynamicSpace;

package/dist/lang/ast/field-space/dynamic-space.js

@@ -191,9 +191,9 @@ class DynamicSpace extends static_space_1.StaticSpace {
                 const field = this.sourceDef.fields[index];
                 this.sourceDef.fields[index] = {
                     ...field,
-                    annotation: {
+                    annotations: {
                         ...note,
-                        inherits: field.annotation,
+                        inherits: field.annotations,
                     },
                 };
             }

package/dist/lang/ast/field-space/include-utils.d.ts

@@ -1,9 +1,9 @@
-import type { AccessModifierLabel, Annotation, DocumentLocation, SourceDef } from '../../../model/malloy_types';
+import type { AccessModifierLabel, AnnotationsDef, DocumentLocation, SourceDef } from '../../../model/malloy_types';
 import type { IncludeItem } from '../source-query-elements/include-item';
 import type { FieldReference } from '../query-items/field-references';
 export interface JoinIncludeProcessingState {
     star: AccessModifierLabel | 'inherit' | 'except' | undefined;
-    starNote: Annotation | undefined;
+    starNote: AnnotationsDef | undefined;
     fieldsIncluded: Set<string>;
     joinNames: Set<string>;
     fieldsExcepted: Set<string>;
@@ -16,7 +16,7 @@ export interface JoinIncludeProcessingState {
         location: DocumentLocation;
     }[];
     fieldsToInclude: Set<string> | undefined;
-    notes: Map<string, Annotation>;
+    notes: Map<string, AnnotationsDef>;
 }
 export interface IncludeProcessingState {
     joins: {

package/dist/lang/ast/field-space/query-spaces.js

@@ -309,8 +309,8 @@ class QuerySpace extends QueryOperationSpace {
             throw new Error('Invalid type for fieldref');
         }
         ret.location = (_c = ret.location) !== null && _c !== void 0 ? _c : this.astEl.location;
-        if (queryFieldDef.annotation) {
-            ret.annotation = queryFieldDef.annotation;
+        if (queryFieldDef.annotations) {
+            ret.annotations = queryFieldDef.annotations;
         }
         return ret;
     }

package/dist/lang/ast/field-space/reference-field.js

@@ -113,12 +113,12 @@ class ReferenceField extends space_field_1.SpaceField {
                 const origFd = refTo.constructorFieldDef();
                 if (origFd) {
                     const notes = this.fieldRef.note;
-                    if (origFd.annotation || notes) {
-                        const annotation = notes || {};
-                        if (origFd.annotation) {
-                            annotation.inherits = origFd.annotation;
+                    if (origFd.annotations || notes) {
+                        const annotations = notes || {};
+                        if (origFd.annotations) {
+                            annotations.inherits = origFd.annotations;
                         }
-                        this.queryFieldDef.annotation = annotation;
+                        this.queryFieldDef.annotations = annotations;
                     }
                 }
             }

package/dist/lang/ast/field-space/refined-space.d.ts

@@ -1,4 +1,4 @@
-import { type AccessModifierLabel, type Annotation, type SourceDef } from '../../../model/malloy_types';
+import { type AccessModifierLabel, type AnnotationsDef, type SourceDef } from '../../../model/malloy_types';
 import type { FieldListEdit } from '../source-properties/field-list-edit';
 import { DynamicSpace } from './dynamic-space';
 import type { MalloyElement } from '../types/malloy-element';
@@ -14,6 +14,6 @@ export declare class RefinedSpace extends DynamicSpace {
     pushFields(...defs: MalloyElement[]): void;
     addField(def: MalloyElement): void;
     addAccessModifiers(ams: Map<string, AccessModifierLabel>): void;
-    addNotes(notes: Map<string, Annotation>): void;
+    addNotes(notes: Map<string, AnnotationsDef>): void;
     accessProtectionLevel(): AccessModifierLabel;
 }

package/dist/lang/ast/field-space/refined-space.js

@@ -160,13 +160,13 @@ function editJoinsFromIncludeState(path, from, includeState) {
                 ...field,
                 as: rename ? rename.name.nameString : field.as,
                 accessModifier: accessModifier === 'public' ? undefined : accessModifier,
-                annotation: notes
+                annotations: notes
                     ? {
-                        inherits: field.annotation,
+                        inherits: field.annotations,
                         blockNotes: notes.blockNotes,
                         notes: notes.notes,
                     }
-                    : field.annotation,
+                    : field.annotations,
             }
             : { ...field };
         if ((0, malloy_types_1.isJoined)(editedField)) {

package/dist/lang/ast/field-space/rename-space-field.d.ts

@@ -1,11 +1,11 @@
-import type { Annotation, DocumentLocation, FieldDef } from '../../../model/malloy_types';
+import type { AnnotationsDef, DocumentLocation, FieldDef } from '../../../model/malloy_types';
 import { SpaceField } from '../types/space-field';
 export declare class RenameSpaceField extends SpaceField {
     private readonly otherField;
     private readonly newName;
     private readonly location;
     private note;
-    constructor(otherField: SpaceField, newName: string, location: DocumentLocation, note: Annotation | undefined);
+    constructor(otherField: SpaceField, newName: string, location: DocumentLocation, note: AnnotationsDef | undefined);
     fieldDef(): FieldDef | undefined;
     typeDesc(): import("../../..").TypeDesc;
 }

package/dist/lang/ast/field-space/rename-space-field.js

@@ -39,14 +39,14 @@ class RenameSpaceField extends space_field_1.SpaceField {
             return undefined;
         }
         if (this.note) {
-            if (returnFieldDef.annotation) {
-                returnFieldDef.annotation = {
+            if (returnFieldDef.annotations) {
+                returnFieldDef.annotations = {
                     ...this.note,
-                    inherits: returnFieldDef.annotation,
+                    inherits: returnFieldDef.annotations,
                 };
             }
             else {
-                returnFieldDef.annotation = this.note;
+                returnFieldDef.annotations = this.note;
             }
         }
         return {

package/dist/lang/ast/field-space/static-space.js

@@ -143,7 +143,7 @@ class StaticSpace {
                         : 'fieldReference',
                     definition: {
                         type: definition.type,
-                        annotation: definition.annotation,
+                        annotations: definition.annotations,
                         location: definition.location,
                     },
                     location: head.location,

package/dist/lang/ast/query-elements/anonymous-query.d.ts

@@ -1,4 +1,4 @@
-import type { Annotation } from '../../../model';
+import type { AnnotationsDef } from '../../../model';
 import type { DocStatement, Document } from '../types/malloy-element';
 import { MalloyElement } from '../types/malloy-element';
 import type { Noteable } from '../types/noteable';
@@ -10,6 +10,6 @@ export declare class AnonymousQuery extends MalloyElement implements DocStatemen
     constructor(queryExpr: SourceQueryElement);
     readonly isNoteableObj = true;
     extendNote: typeof extendNoteMethod;
-    note?: Annotation;
+    note?: AnnotationsDef;
     execute(doc: Document): void;
 }

package/dist/lang/ast/query-elements/anonymous-query.js

@@ -42,11 +42,11 @@ class AnonymousQuery extends malloy_element_1.MalloyElement {
         }
         const modelQuery = { ...queryObj.query() };
         const annotation = this.note || {};
-        if (modelQuery.annotation) {
-            annotation.inherits = modelQuery.annotation;
+        if (modelQuery.annotations) {
+            annotation.inherits = modelQuery.annotations;
         }
         if (annotation.notes || annotation.blockNotes || annotation.inherits) {
-            modelQuery.annotation = annotation;
+            modelQuery.annotations = annotation;
         }
         doc.queryList.push(modelQuery);
     }

package/dist/lang/ast/query-elements/query-arrow.js

@@ -69,11 +69,11 @@ class QueryArrow extends query_base_1.QueryBase {
             inputStruct = lhsQuery.outputStruct;
             fieldSpace = new static_space_1.StaticSourceSpace(lhsQuery.outputStruct, 'public');
         }
-        const { pipeline: rhsPipeline, annotation, outputStruct, name, } = this.view.pipelineComp(fieldSpace);
+        const { pipeline: rhsPipeline, annotations, outputStruct, name, } = this.view.pipelineComp(fieldSpace);
         const query = {
             ...queryBase,
             name,
-            annotation,
+            annotations,
             pipeline: [...queryBase.pipeline, ...rhsPipeline],
         };
         const compositeResolvedSourceDef = (_a = query.compositeResolvedSourceDef) !== null && _a !== void 0 ? _a : this.resolveCompositeSource(inputStruct, rhsPipeline);

package/dist/lang/ast/query-items/field-declaration.d.ts

@@ -1,4 +1,4 @@
-import type { Annotation, TypeDesc, FieldDef, AtomicFieldDef } from '../../../model/malloy_types';
+import type { AnnotationsDef, TypeDesc, FieldDef, AtomicFieldDef } from '../../../model/malloy_types';
 import type { ExprValue } from '../types/expr-value';
 import type { ExpressionDef } from '../types/expression-def';
 import type { FieldSpace } from '../types/field-space';
@@ -15,7 +15,7 @@ export declare abstract class AtomicFieldDeclaration extends MalloyElement imple
     readonly exprSrc?: string | undefined;
     readonly isNoteableObj = true;
     extendNote: typeof extendNoteMethod;
-    note?: Annotation;
+    note?: AnnotationsDef;
     constructor(expr: ExpressionDef, defineName: string, exprSrc?: string | undefined);
     getName(): string;
     fieldDef(fs: FieldSpace, exprName: string): FieldDef;

package/dist/lang/ast/query-items/field-declaration.js

@@ -157,7 +157,7 @@ class AtomicFieldDeclaration extends malloy_element_1.MalloyElement {
                 ret.code = this.exprSrc;
             }
             if (this.note) {
-                ret.annotation = this.note;
+                ret.annotations = this.note;
             }
             return ret;
         }

package/dist/lang/ast/query-items/field-references.d.ts

@@ -1,4 +1,4 @@
-import type { Annotation, FieldDef, RefToField, TypeDesc } from '../../../model/malloy_types';
+import type { AnnotationsDef, FieldDef, RefToField, TypeDesc } from '../../../model/malloy_types';
 import type { DynamicSpace } from '../field-space/dynamic-space';
 import { DefinitionList } from '../types/definition-list';
 import type { FieldName, FieldSpace } from '../types/field-space';
@@ -10,7 +10,7 @@ import type { MakeEntry } from '../types/space-entry';
 export type FieldReferenceConstructor = new (names: FieldName[]) => FieldReference;
 export declare abstract class FieldReference extends ListOf<FieldName> implements Noteable, MakeEntry {
     readonly isNoteableObj = true;
-    note?: Annotation;
+    note?: AnnotationsDef;
     extendNote: typeof extendNoteMethod;
     constructor(names: FieldName[]);
     makeEntry(fs: DynamicSpace): void;
@@ -97,7 +97,7 @@ export declare class ViewOrScalarFieldReference extends FieldReference {
 export declare class WildcardFieldReference extends MalloyElement implements Noteable {
     readonly joinPath: FieldReference | undefined;
     elementType: string;
-    note?: Annotation;
+    note?: AnnotationsDef;
     readonly isNoteableObj = true;
     extendNote: typeof extendNoteMethod;
     except: Set<string>;

package/dist/lang/ast/query-properties/nest.js

@@ -76,7 +76,7 @@ class NestFieldDeclaration extends view_field_declaration_1.ViewFieldDeclaration
         if (this.turtleDef)
             return this.turtleDef;
         if (fs.isQueryFieldSpace()) {
-            const { pipeline, annotation } = this.view.pipelineComp(fs, fs.outputSpace());
+            const { pipeline, annotations } = this.view.pipelineComp(fs, fs.outputSpace());
             const refSummary = pipeline[0] && model.isQuerySegment(pipeline[0])
                 ? pipeline[0].refSummary
                 : undefined;
@@ -86,7 +86,7 @@ class NestFieldDeclaration extends view_field_declaration_1.ViewFieldDeclaration
                 type: 'turtle',
                 name: this.name,
                 pipeline: pipelineWithDrillPaths,
-                annotation: { ...this.note, inherits: annotation },
+                annotations: { ...this.note, inherits: annotations },
                 location: this.location,
                 refSummary,
             };

package/dist/lang/ast/source-elements/composite-source.d.ts

@@ -1,4 +1,4 @@
-import type { Annotation, SourceDef } from '../../../model/malloy_types';
+import type { AnnotationsDef, SourceDef } from '../../../model/malloy_types';
 import type { HasParameter } from '../parameters/has-parameter';
 import { Source } from './source';
 import type { ParameterSpace } from '../field-space/parameter-space';
@@ -9,7 +9,7 @@ import type { ParameterSpace } from '../field-space/parameter-space';
 export declare class CompositeSource extends Source {
     readonly sources: Source[];
     elementType: string;
-    currentAnnotation?: Annotation;
+    currentAnnotation?: AnnotationsDef;
     constructor(sources: Source[]);
     getSourceDef(parameterSpace: ParameterSpace | undefined): SourceDef;
     withParameters(parameterSpace: ParameterSpace | undefined, pList: HasParameter[] | undefined): SourceDef;

package/dist/lang/ast/source-elements/refined-source.d.ts

@@ -1,4 +1,4 @@
-import type { Annotation, SourceDef } from '../../../model/malloy_types';
+import type { AnnotationsDef, SourceDef } from '../../../model/malloy_types';
 import type { HasParameter } from '../parameters/has-parameter';
 import type { SourceDesc } from '../types/source-desc';
 import { Source } from './source';
@@ -12,7 +12,7 @@ export declare class RefinedSource extends Source {
     readonly refinement: SourceDesc;
     readonly includeList: IncludeItem[] | undefined;
     elementType: string;
-    currentAnnotation?: Annotation;
+    currentAnnotation?: AnnotationsDef;
     constructor(source: Source, refinement: SourceDesc, includeList: IncludeItem[] | undefined);
     getSourceDef(parameterSpace: ParameterSpace | undefined): SourceDef;
     withParameters(parameterSpace: ParameterSpace | undefined, pList: HasParameter[] | undefined): SourceDef;

package/dist/lang/ast/source-elements/sql-source.js

@@ -149,7 +149,7 @@ class SQLSource extends source_1.Source {
             const fromDoc = this.document();
             const modelAnnotation = fromDoc === null || fromDoc === void 0 ? void 0 : fromDoc.currentModelAnnotation();
             if (modelAnnotation) {
-                locStruct.modelAnnotation = modelAnnotation;
+                locStruct.modelAnnotations = modelAnnotation;
             }
             return locStruct;
         }

package/dist/lang/ast/source-elements/typed-source.js

@@ -80,11 +80,14 @@ class TypedSource extends source_1.Source {
                     ? { ...f, accessModifier: exports.USER_TYPE_HIDDEN_ACCESS }
                     : f;
             }
-            const shapeAnnotation = shapeEntry.field.annotation;
+            const shapeAnnotation = shapeEntry.field.annotations;
             if (!shapeAnnotation) {
                 return f;
             }
-            return { ...f, annotation: mergeAnnotation(f.annotation, shapeAnnotation) };
+            return {
+                ...f,
+                annotations: mergeAnnotation(f.annotations, shapeAnnotation),
+            };
         });
         return {
             ...sourceDef,
@@ -105,8 +108,8 @@ class TypedSource extends source_1.Source {
             }
             for (const sf of entry.entry.fields) {
                 const field = (0, malloy_types_1.mkFieldDef)(sf.typeDef, sf.name);
-                if (sf.annotation) {
-                    field.annotation = sf.annotation;
+                if (sf.annotations) {
+                    field.annotations = sf.annotations;
                 }
                 next.set(sf.name, { field, fromShape: ref });
             }

package/dist/lang/ast/source-properties/join.d.ts

@@ -1,4 +1,4 @@
-import type { Annotation, JoinFieldDef, JoinType, MatrixOperation, SourceDef, AccessModifierLabel } from '../../../model/malloy_types';
+import type { AnnotationsDef, JoinFieldDef, JoinType, MatrixOperation, SourceDef, AccessModifierLabel } from '../../../model/malloy_types';
 import type { DynamicSpace } from '../field-space/dynamic-space';
 import { DefinitionList } from '../types/definition-list';
 import type { QueryBuilder } from '../types/query-builder';
@@ -20,7 +20,7 @@ export declare abstract class Join extends MalloyElement implements Noteable, Ma
     readonly isNoteableObj = true;
     extendNote: typeof extendNoteMethod;
     abstract sourceExpr: SourceQueryElement;
-    note?: Annotation;
+    note?: AnnotationsDef;
     makeEntry(fs: DynamicSpace): void;
     getName(): string;
     protected getStructDefFromExpr(parameterSpace: ParameterSpace): SourceDef;

package/dist/lang/ast/source-properties/join.js

@@ -77,7 +77,7 @@ class KeyJoin extends Join {
         };
         delete joinStruct.as;
         if (this.note) {
-            joinStruct.annotation = this.note;
+            joinStruct.annotations = this.note;
         }
         (_a = this.document()) === null || _a === void 0 ? void 0 : _a.rememberToAddModelAnnotations(joinStruct);
         return joinStruct;
@@ -172,7 +172,7 @@ class ExpressionJoin extends Join {
         };
         delete joinStruct.as;
         if (this.note) {
-            joinStruct.annotation = this.note;
+            joinStruct.annotations = this.note;
         }
         (_a = this.document()) === null || _a === void 0 ? void 0 : _a.rememberToAddModelAnnotations(joinStruct);
         return joinStruct;

package/dist/lang/ast/source-properties/renames.d.ts

@@ -1,4 +1,4 @@
-import type { AccessModifierLabel, Annotation } from '../../../model';
+import type { AccessModifierLabel, AnnotationsDef } from '../../../model';
 import type { DynamicSpace } from '../field-space/dynamic-space';
 import { DefinitionList } from '../types/definition-list';
 import type { FieldName } from '../types/field-space';
@@ -9,7 +9,7 @@ export declare class RenameField extends MalloyElement implements Noteable, Make
     readonly newName: string;
     readonly oldName: FieldName;
     elementType: string;
-    note?: Annotation;
+    note?: AnnotationsDef;
     extendNote: typeof extendNoteMethod;
     readonly isNoteableObj = true;
     constructor(newName: string, oldName: FieldName);

package/dist/lang/ast/source-properties/user-type-shape.d.ts

@@ -1,4 +1,4 @@
-import type { Annotation, AtomicTypeDef, UserTypeFieldDef } from '../../../model/malloy_types';
+import type { AnnotationsDef, AtomicTypeDef, UserTypeFieldDef } from '../../../model/malloy_types';
 import { ListOf, MalloyElement } from '../types/malloy-element';
 import type { Noteable } from '../types/noteable';
 import { extendNoteMethod } from '../types/noteable';
@@ -6,7 +6,7 @@ export declare abstract class UserTypeMember extends MalloyElement implements No
     readonly name: string;
     readonly isNoteableObj = true;
     extendNote: typeof extendNoteMethod;
-    note?: Annotation;
+    note?: AnnotationsDef;
     constructor(name: string);
     abstract userTypeFieldDef(): UserTypeFieldDef;
 }