@malloydata/malloy 0.0.421 → 0.0.423

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

@@ -9,7 +9,6 @@ const malloy_types_1 = require("../../../model/malloy_types");
 const join_space_field_1 = require("../field-space/join-space-field");
 const definition_list_1 = require("../types/definition-list");
 const malloy_element_1 = require("../types/malloy-element");
-const noteable_1 = require("../types/noteable");
 const error_factory_1 = require("../error-factory");
 const query_property_interface_1 = require("../types/query-property-interface");
 const composite_source_utils_1 = require("../../composite-source-utils");
@@ -17,7 +16,6 @@ class Join extends malloy_element_1.MalloyElement {
     constructor() {
         super(...arguments);
         this.isNoteableObj = true;
-        this.extendNote = noteable_1.extendNoteMethod;
     }
     makeEntry(fs) {
         fs.newEntry(this.name.refString, this, new join_space_field_1.JoinSpaceField(fs.parameterSpace(), this, fs.dialectName(), fs.connectionName()));
@@ -56,8 +54,8 @@ class KeyJoin extends Join {
             onExpression: { node: 'error', message: "('join fixup'='not done yet')" },
             location: this.location,
         };
-        if (this.note) {
-            joinStruct.annotations = { ...this.note };
+        if (this.ownAnnotation) {
+            joinStruct.annotations = { ...this.ownAnnotation };
         }
         return joinStruct;
     }
@@ -148,8 +146,8 @@ class ExpressionJoin extends Join {
             matrixOperation,
             location: this.location,
         };
-        if (this.note) {
-            joinStruct.annotations = { ...this.note };
+        if (this.ownAnnotation) {
+            joinStruct.annotations = { ...this.ownAnnotation };
         }
         return joinStruct;
     }

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

@@ -3,14 +3,13 @@ import type { DynamicSpace } from '../field-space/dynamic-space';
 import { DefinitionList } from '../types/definition-list';
 import type { FieldName } from '../types/field-space';
 import { MalloyElement } from '../types/malloy-element';
-import { extendNoteMethod, type Noteable } from '../types/noteable';
+import { type Noteable } from '../types/noteable';
 import type { MakeEntry } from '../types/space-entry';
 export declare class RenameField extends MalloyElement implements Noteable, MakeEntry {
     readonly newName: string;
     readonly oldName: FieldName;
     elementType: string;
-    note?: AnnotationsDef;
-    extendNote: typeof extendNoteMethod;
+    ownAnnotation?: AnnotationsDef;
     readonly isNoteableObj = true;
     constructor(newName: string, oldName: FieldName);
     makeEntry(fs: DynamicSpace): void;

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

@@ -8,7 +8,6 @@ exports.Renames = exports.RenameField = void 0;
 const rename_space_field_1 = require("../field-space/rename-space-field");
 const definition_list_1 = require("../types/definition-list");
 const malloy_element_1 = require("../types/malloy-element");
-const noteable_1 = require("../types/noteable");
 const space_field_1 = require("../types/space-field");
 class RenameField extends malloy_element_1.MalloyElement {
     constructor(newName, oldName) {
@@ -16,7 +15,6 @@ class RenameField extends malloy_element_1.MalloyElement {
         this.newName = newName;
         this.oldName = oldName;
         this.elementType = 'renameField';
-        this.extendNote = noteable_1.extendNoteMethod;
         this.isNoteableObj = true;
         this.has({ oldName: oldName });
     }
@@ -43,7 +41,7 @@ class RenameField extends malloy_element_1.MalloyElement {
         */
         if (oldValue.found) {
             if (oldValue.found instanceof space_field_1.SpaceField) {
-                fs.renameEntry(this.oldName.refString, this.newName, new rename_space_field_1.RenameSpaceField(oldValue.found, this.newName, this.location, this.note ? { ...this.note } : undefined));
+                fs.renameEntry(this.oldName.refString, this.newName, new rename_space_field_1.RenameSpaceField(oldValue.found, this.newName, this.location, this.ownAnnotation ? { ...this.ownAnnotation } : undefined));
             }
             else {
                 this.logError('failed-rename', `'${this.oldName}' cannot be renamed`);

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

@@ -1,12 +1,10 @@
 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';
 export declare abstract class UserTypeMember extends MalloyElement implements Noteable {
     readonly name: string;
     readonly isNoteableObj = true;
-    extendNote: typeof extendNoteMethod;
-    note?: AnnotationsDef;
+    ownAnnotation?: AnnotationsDef;
     constructor(name: string);
     abstract userTypeFieldDef(): UserTypeFieldDef;
 }

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

@@ -7,13 +7,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserTypeShape = exports.UserTypeMemberIndirect = exports.UserTypeMemberDef = exports.UserTypeMember = void 0;
 const malloy_types_1 = require("../../../model/malloy_types");
 const malloy_element_1 = require("../types/malloy-element");
-const noteable_1 = require("../types/noteable");
 class UserTypeMember extends malloy_element_1.MalloyElement {
     constructor(name) {
         super();
         this.name = name;
         this.isNoteableObj = true;
-        this.extendNote = noteable_1.extendNoteMethod;
     }
 }
 exports.UserTypeMember = UserTypeMember;
@@ -28,8 +26,8 @@ class UserTypeMemberDef extends UserTypeMember {
             name: this.name,
             typeDef: this.typeDef,
         };
-        if (this.note) {
-            field.annotations = { ...this.note };
+        if (this.ownAnnotation) {
+            field.annotations = { ...this.ownAnnotation };
         }
         return field;
     }
@@ -75,13 +73,13 @@ class UserTypeMemberIndirect extends UserTypeMember {
             typeDef = (0, malloy_types_1.mkArrayTypeDef)(typeDef);
         }
         const field = { name: this.name, typeDef };
-        if (this.note) {
+        if (this.ownAnnotation) {
             field.annotations = modelEntry.entry.annotations
                 ? {
-                    ...this.note,
+                    ...this.ownAnnotation,
                     inherits: modelEntry.entry.annotations,
                 }
-                : { ...this.note };
+                : { ...this.ownAnnotation };
         }
         else if (modelEntry.entry.annotations) {
             field.annotations = {

package/dist/lang/ast/source-properties/view-field-declaration.d.ts

@@ -4,15 +4,13 @@ import { MalloyElement } from '../types/malloy-element';
 import type { DynamicSpace } from '../field-space/dynamic-space';
 import type { View } from '../view-elements/view';
 import type { Noteable } from '../types/noteable';
-import { extendNoteMethod } from '../types/noteable';
 import type { MakeEntry } from '../types/space-entry';
 export declare class ViewFieldDeclaration extends MalloyElement implements Noteable, MakeEntry {
     readonly name: string;
     readonly view: View;
     elementType: string;
     readonly isNoteableObj = true;
-    extendNote: typeof extendNoteMethod;
-    note?: model.AnnotationsDef;
+    ownAnnotation?: model.AnnotationsDef;
     constructor(name: string, view: View);
     makeEntry(fs: DynamicSpace): void;
     getName(): string;

package/dist/lang/ast/source-properties/view-field-declaration.js

@@ -6,7 +6,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ViewFieldDeclaration = void 0;
 const malloy_element_1 = require("../types/malloy-element");
-const noteable_1 = require("../types/noteable");
 const query_utils_1 = require("../query-utils");
 const ast_view_field_1 = require("../field-space/ast-view-field");
 class ViewFieldDeclaration extends malloy_element_1.MalloyElement {
@@ -16,7 +15,6 @@ class ViewFieldDeclaration extends malloy_element_1.MalloyElement {
         this.view = view;
         this.elementType = 'view-field-declaration';
         this.isNoteableObj = true;
-        this.extendNote = noteable_1.extendNoteMethod;
     }
     makeEntry(fs) {
         const qf = new ast_view_field_1.ASTViewField(fs, this, this.name);
@@ -33,7 +31,7 @@ class ViewFieldDeclaration extends malloy_element_1.MalloyElement {
             name: this.name,
             pipeline: checkedPipeline,
             annotations: {
-                ...this.note,
+                ...this.ownAnnotation,
                 inherits: annotations,
             },
             location: this.location,

package/dist/lang/ast/source-query-elements/include-item.d.ts

@@ -2,7 +2,6 @@ import { MalloyElement } from '../types/malloy-element';
 import type { AccessModifierFieldReference, FieldReference, WildcardFieldReference } from '../query-items/field-references';
 import type { AnnotationsDef } from '../../../model';
 import type { Noteable } from '../types/noteable';
-import { extendNoteMethod } from '../types/noteable';
 export declare abstract class IncludeItem extends MalloyElement {
     abstract kind: 'private' | 'public' | 'internal' | 'except' | undefined;
 }
@@ -11,8 +10,7 @@ export declare class IncludeAccessItem extends IncludeItem implements Noteable {
     readonly fields: IncludeListItem[];
     elementType: string;
     readonly isNoteableObj = true;
-    extendNote: typeof extendNoteMethod;
-    note?: AnnotationsDef;
+    ownAnnotation?: AnnotationsDef;
     constructor(kind: 'private' | 'public' | 'internal' | undefined, fields: IncludeListItem[]);
 }
 export declare class IncludeExceptItem extends IncludeItem {
@@ -26,7 +24,6 @@ export declare class IncludeListItem extends MalloyElement implements Noteable {
     readonly as: string | undefined;
     elementType: string;
     readonly isNoteableObj = true;
-    extendNote: typeof extendNoteMethod;
-    note?: AnnotationsDef;
+    ownAnnotation?: AnnotationsDef;
     constructor(name: AccessModifierFieldReference | WildcardFieldReference, as: string | undefined);
 }

package/dist/lang/ast/source-query-elements/include-item.js

@@ -6,7 +6,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IncludeListItem = exports.IncludeExceptItem = exports.IncludeAccessItem = exports.IncludeItem = void 0;
 const malloy_element_1 = require("../types/malloy-element");
-const noteable_1 = require("../types/noteable");
 // type RenameSpec = {
 //   as: string;
 //   name: FieldReference;
@@ -22,7 +21,6 @@ class IncludeAccessItem extends IncludeItem {
         this.fields = fields;
         this.elementType = 'include-access-item';
         this.isNoteableObj = true;
-        this.extendNote = noteable_1.extendNoteMethod;
         this.has({ fields });
     }
 }
@@ -44,7 +42,6 @@ class IncludeListItem extends malloy_element_1.MalloyElement {
         this.as = as;
         this.elementType = 'include-list-item';
         this.isNoteableObj = true;
-        this.extendNote = noteable_1.extendNoteMethod;
     }
 }
 exports.IncludeListItem = IncludeListItem;

package/dist/lang/ast/statements/define-given.d.ts

@@ -3,15 +3,13 @@ import type { ConstantExpression } from '../expressions/constant-expression';
 import type { DocStatement, Document } from '../types/malloy-element';
 import { DocStatementList, MalloyElement } from '../types/malloy-element';
 import type { Noteable } from '../types/noteable';
-import { extendNoteMethod } from '../types/noteable';
 export declare class GivenDeclaration extends MalloyElement implements DocStatement, Noteable {
     readonly name: string;
     readonly typeDef: GivenTypeDef;
     readonly inline: boolean;
     elementType: string;
     readonly isNoteableObj = true;
-    extendNote: typeof extendNoteMethod;
-    note?: AnnotationsDef;
+    ownAnnotation?: AnnotationsDef;
     readonly default?: ConstantExpression;
     constructor(name: string, typeDef: GivenTypeDef, defaultExpr?: ConstantExpression, inline?: boolean);
     protected varInfo(): string;

package/dist/lang/ast/statements/define-given.js

@@ -11,7 +11,6 @@ const source_def_utils_1 = require("../../../model/source_def_utils");
 const utils_1 = require("../../../model/utils");
 const expression_def_1 = require("../types/expression-def");
 const malloy_element_1 = require("../types/malloy-element");
-const noteable_1 = require("../types/noteable");
 // `filter<T>` defaults can't be type-checked via TD.eq — the filter
 // expression value shape doesn't match an atomic typeDef. Catch only
 // the gross kind mismatch here; inner-content validation (filter
@@ -60,7 +59,6 @@ class GivenDeclaration extends malloy_element_1.MalloyElement {
         this.inline = inline;
         this.elementType = 'given';
         this.isNoteableObj = true;
-        this.extendNote = noteable_1.extendNoteMethod;
         if (defaultExpr) {
             this.default = defaultExpr;
             this.has({ default: defaultExpr });
@@ -193,7 +191,7 @@ class GivenDeclaration extends malloy_element_1.MalloyElement {
             defaultText,
             givenUsage,
             location: this.location,
-            annotations: this.note ? { ...this.note } : undefined,
+            annotations: this.ownAnnotation ? { ...this.ownAnnotation } : undefined,
             ...(this.inline ? { inline: true } : {}),
         };
         doc.documentGivens.set(id, givenIR);
@@ -215,7 +213,7 @@ class GivenDeclaration extends malloy_element_1.MalloyElement {
             },
             definition: {
                 type: (0, utils_1.typeDefToString)(this.typeDef),
-                annotations: this.note ? { ...this.note } : undefined,
+                annotations: this.ownAnnotation ? { ...this.ownAnnotation } : undefined,
                 location: this.location,
                 defaultText,
             },

package/dist/lang/ast/statements/define-query.d.ts

@@ -2,7 +2,6 @@ import type { AnnotationsDef } from '../../../model/malloy_types';
 import type { DocStatement, Document } from '../types/malloy-element';
 import { MalloyElement, DocStatementList } from '../types/malloy-element';
 import type { Noteable } from '../types/noteable';
-import { extendNoteMethod } from '../types/noteable';
 import type { SourceQueryElement } from '../source-query-elements/source-query-element';
 export declare class DefineQuery extends MalloyElement implements DocStatement, Noteable {
     readonly name: string;
@@ -10,8 +9,7 @@ export declare class DefineQuery extends MalloyElement implements DocStatement,
     elementType: string;
     constructor(name: string, queryExpr: SourceQueryElement);
     readonly isNoteableObj = true;
-    extendNote: typeof extendNoteMethod;
-    note?: AnnotationsDef;
+    ownAnnotation?: AnnotationsDef;
     execute(doc: Document): void;
 }
 export declare class DefineQueryList extends DocStatementList {

package/dist/lang/ast/statements/define-query.js

@@ -6,7 +6,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefineQueryList = exports.DefineQuery = void 0;
 const malloy_element_1 = require("../types/malloy-element");
-const noteable_1 = require("../types/noteable");
 class DefineQuery extends malloy_element_1.MalloyElement {
     constructor(name, queryExpr) {
         super({ queryExpr });
@@ -14,7 +13,6 @@ class DefineQuery extends malloy_element_1.MalloyElement {
         this.queryExpr = queryExpr;
         this.elementType = 'defineQuery';
         this.isNoteableObj = true;
-        this.extendNote = noteable_1.extendNoteMethod;
     }
     execute(doc) {
         const existing = doc.getEntry(this.name);
@@ -33,10 +31,10 @@ class DefineQuery extends malloy_element_1.MalloyElement {
             name: this.name,
             location: this.location,
         };
-        if (this.note) {
+        if (this.ownAnnotation) {
             entry.annotations = entry.annotations
-                ? { ...this.note, inherits: entry.annotations }
-                : { ...this.note };
+                ? { ...this.ownAnnotation, inherits: entry.annotations }
+                : { ...this.ownAnnotation };
         }
         doc.setEntry(this.name, { entry, exported: true });
     }

package/dist/lang/ast/statements/define-source.d.ts

@@ -3,7 +3,6 @@ import type { HasParameter } from '../parameters/has-parameter';
 import type { DocStatement, Document } from '../types/malloy-element';
 import { MalloyElement, DocStatementList } from '../types/malloy-element';
 import type { Noteable } from '../types/noteable';
-import { extendNoteMethod } from '../types/noteable';
 import type { SourceQueryElement } from '../source-query-elements/source-query-element';
 export declare class DefineSource extends MalloyElement implements DocStatement, Noteable {
     readonly name: string;
@@ -13,8 +12,7 @@ export declare class DefineSource extends MalloyElement implements DocStatement,
     elementType: string;
     constructor(name: string, sourceExpr: SourceQueryElement | undefined, exported: boolean, parameters?: HasParameter[] | undefined);
     readonly isNoteableObj = true;
-    extendNote: typeof extendNoteMethod;
-    note?: AnnotationsDef;
+    ownAnnotation?: AnnotationsDef;
     execute(doc: Document): void;
     private deduplicatedParameters;
     private validateParameterShadowing;

package/dist/lang/ast/statements/define-source.js

@@ -10,7 +10,6 @@ const source_def_utils_1 = require("../../../model/source_def_utils");
 const persist_utils_1 = require("../../../model/persist_utils");
 const error_factory_1 = require("../error-factory");
 const malloy_element_1 = require("../types/malloy-element");
-const noteable_1 = require("../types/noteable");
 const composite_source_utils_1 = require("../../composite-source-utils");
 class DefineSource extends malloy_element_1.MalloyElement {
     constructor(name, sourceExpr, exported, parameters) {
@@ -21,7 +20,6 @@ class DefineSource extends malloy_element_1.MalloyElement {
         this.parameters = parameters;
         this.elementType = 'defineSource';
         this.isNoteableObj = true;
-        this.extendNote = noteable_1.extendNoteMethod;
         if (sourceExpr) {
             this.has({ sourceExpr });
         }
@@ -50,13 +48,13 @@ class DefineSource extends malloy_element_1.MalloyElement {
             as: this.name,
             location: this.location,
         };
-        if (this.note) {
+        if (this.ownAnnotation) {
             entry.annotations = structDef.annotations
                 ? {
-                    ...this.note,
+                    ...this.ownAnnotation,
                     inherits: structDef.annotations,
                 }
-                : { ...this.note };
+                : { ...this.ownAnnotation };
         }
         if ((0, malloy_types_1.isSourceDef)(entry)) {
             // Every source gets a stable identity for its own definition. referenceID
@@ -70,7 +68,7 @@ class DefineSource extends malloy_element_1.MalloyElement {
             }
         }
         entry.partitionComposite =
-            (_d = (0, composite_source_utils_1.getPartitionCompositeDesc)(this.note, structDef, (_c = this.sourceExpr) !== null && _c !== void 0 ? _c : this)) !== null && _d !== void 0 ? _d : structDef.partitionComposite;
+            (_d = (0, composite_source_utils_1.getPartitionCompositeDesc)(this.ownAnnotation, structDef, (_c = this.sourceExpr) !== null && _c !== void 0 ? _c : this)) !== null && _d !== void 0 ? _d : structDef.partitionComposite;
         doc.setEntry(this.name, { entry, exported: this.exported });
     }
     deduplicatedParameters() {

package/dist/lang/ast/statements/define-user-type.d.ts

@@ -1,7 +1,6 @@
 import type { DocStatement, Document } from '../types/malloy-element';
 import { MalloyElement, DocStatementList } from '../types/malloy-element';
 import type { Noteable } from '../types/noteable';
-import { extendNoteMethod } from '../types/noteable';
 import type { AnnotationsDef, UserTypeFieldDef } from '../../../model/malloy_types';
 import type { UserTypeMember } from '../source-properties/user-type-shape';
 import { UserTypeShape } from '../source-properties/user-type-shape';
@@ -18,8 +17,7 @@ export declare class DefineUserType extends MalloyElement implements DocStatemen
     elementType: string;
     constructor(name: string, shapeDef: UserTypeShape, exported: boolean);
     readonly isNoteableObj = true;
-    extendNote: typeof extendNoteMethod;
-    note?: AnnotationsDef;
+    ownAnnotation?: AnnotationsDef;
     execute(doc: Document): void;
 }
 export declare class DefineUserTypeList extends DocStatementList {

package/dist/lang/ast/statements/define-user-type.js

@@ -6,7 +6,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DefineUserTypeList = exports.DefineUserType = exports.ExtendedUserTypeShape = void 0;
 const malloy_element_1 = require("../types/malloy-element");
-const noteable_1 = require("../types/noteable");
 const malloy_types_1 = require("../../../model/malloy_types");
 const user_type_shape_1 = require("../source-properties/user-type-shape");
 class ExtendedUserTypeShape extends user_type_shape_1.UserTypeShape {
@@ -47,7 +46,6 @@ class DefineUserType extends malloy_element_1.MalloyElement {
         this.exported = exported;
         this.elementType = 'defineUserType';
         this.isNoteableObj = true;
-        this.extendNote = noteable_1.extendNoteMethod;
         this.has({ shapeDef });
     }
     execute(doc) {
@@ -65,8 +63,8 @@ class DefineUserType extends malloy_element_1.MalloyElement {
             fields,
             location: this.location,
         };
-        if (this.note) {
-            entry.annotations = { ...this.note };
+        if (this.ownAnnotation) {
+            entry.annotations = { ...this.ownAnnotation };
         }
         doc.setEntry(this.name, { entry, exported: this.exported });
     }

package/dist/lang/ast/types/definition-list.d.ts

@@ -4,8 +4,6 @@ import { ListOf } from './malloy-element';
 import type { Noteable } from '../types/noteable';
 export declare abstract class DefinitionList<DT extends MalloyElement> extends ListOf<DT> implements Noteable {
     readonly isNoteableObj = true;
-    note?: AnnotationsDef;
-    extendNote(ext: Partial<AnnotationsDef>): void;
-    distributeAnnotation(): void;
-    protected newContents(): void;
+    ownAnnotation?: AnnotationsDef;
+    afterExtendAnnotation(): void;
 }

package/dist/lang/ast/types/definition-list.js

@@ -12,23 +12,18 @@ class DefinitionList extends malloy_element_1.ListOf {
         super(...arguments);
         this.isNoteableObj = true;
     }
-    extendNote(ext) {
-        (0, noteable_1.extendNoteHelper)(this, ext);
-        this.distributeAnnotation();
-    }
-    distributeAnnotation() {
-        if (this.note) {
+    // Noteable hook: push this list's own (block) annotation down onto its
+    // members. The block annotation is attached after construction, so it has
+    // to distribute here, at attach time, rather than from the constructor.
+    afterExtendAnnotation() {
+        if (this.ownAnnotation) {
             for (const el of this.elements) {
                 if ((0, noteable_1.isNoteable)(el)) {
-                    el.extendNote(this.note);
+                    (0, noteable_1.extendOwnAnnotation)(el, this.ownAnnotation);
                 }
             }
         }
     }
-    newContents() {
-        super.newContents();
-        this.distributeAnnotation();
-    }
 }
 exports.DefinitionList = DefinitionList;
 //# sourceMappingURL=definition-list.js.map

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

@@ -8,7 +8,6 @@ import type { ExprValue } from './expr-value';
 import type { ModelEntry } from './model-entry';
 import type { NameSpace } from './name-space';
 import type { Noteable } from './noteable';
-import { extendNoteMethod } from './noteable';
 export declare abstract class MalloyElement {
     abstract elementType: string;
     codeLocation?: DocumentLocation;
@@ -107,8 +106,7 @@ export declare class DocStatementList extends ListOf<DocStatement | DocStatement
     elementType: string;
     execCursor: number;
     readonly isNoteableObj = true;
-    extendNote: typeof extendNoteMethod;
-    note?: AnnotationsDef;
+    ownAnnotation?: AnnotationsDef;
     noteCursor: number;
     executeList(doc: Document): ModelDataRequest;
 }

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

@@ -364,7 +364,6 @@ class DocStatementList extends ListOf {
         this.elementType = 'topLevelStatements';
         this.execCursor = 0;
         this.isNoteableObj = true;
-        this.extendNote = noteable_1.extendNoteMethod;
         this.noteCursor = 0;
     }
     executeList(doc) {
@@ -373,8 +372,8 @@ class DocStatementList extends ListOf {
             if (this.noteCursor === this.execCursor) {
                 // We only want to set the note on each element once,
                 // but we might execute a element multiple times
-                if (this.note && (0, noteable_1.isNoteable)(el)) {
-                    el.extendNote(this.note);
+                if (this.ownAnnotation && (0, noteable_1.isNoteable)(el)) {
+                    (0, noteable_1.extendOwnAnnotation)(el, this.ownAnnotation);
                 }
                 this.noteCursor += 1;
             }

package/dist/lang/ast/types/noteable.d.ts

@@ -4,9 +4,8 @@ import type { AnnotationsDef } from '../../../model/malloy_types';
  */
 export interface Noteable {
     isNoteableObj: true;
-    note?: AnnotationsDef;
-    extendNote(ext: Partial<AnnotationsDef>): void;
+    ownAnnotation?: AnnotationsDef;
+    afterExtendAnnotation?(): void;
 }
 export declare function isNoteable(el: unknown): el is Noteable;
-export declare function extendNoteMethod(this: Noteable, ext: Partial<AnnotationsDef>): void;
-export declare function extendNoteHelper(to: Noteable, ext: Partial<AnnotationsDef>): void;
+export declare function extendOwnAnnotation(to: Noteable, ext: Partial<AnnotationsDef>): void;

package/dist/lang/ast/types/noteable.js

@@ -5,19 +5,17 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.isNoteable = isNoteable;
-exports.extendNoteMethod = extendNoteMethod;
-exports.extendNoteHelper = extendNoteHelper;
+exports.extendOwnAnnotation = extendOwnAnnotation;
 function isNoteable(el) {
     return el.isNoteableObj;
 }
-function extendNoteMethod(ext) {
-    extendNoteHelper(this, ext);
-}
-function extendNoteHelper(to, ext) {
+function extendOwnAnnotation(to, ext) {
+    var _a;
     if ((ext.notes && ext.notes.length > 0) ||
         (ext.blockNotes && ext.blockNotes.length > 0) ||
         ext.inherits !== undefined) {
-        to.note = { ...to.note, ...ext };
+        to.ownAnnotation = { ...to.ownAnnotation, ...ext };
+        (_a = to.afterExtendAnnotation) === null || _a === void 0 ? void 0 : _a.call(to);
     }
 }
 //# sourceMappingURL=noteable.js.map

package/dist/lang/ast/types/query-property-interface.d.ts

@@ -19,6 +19,7 @@ export declare enum LegalRefinementStage {
 export interface QueryPropertyInterface {
     queryRefinementStage: LegalRefinementStage | undefined;
     forceQueryClass: QueryClass | undefined;
+    statement?: string;
     needsExplicitQueryClass?: boolean;
     queryExecute?: (executeFor: QueryBuilder) => void;
 }

package/dist/lang/composite-source-utils.js

@@ -1217,8 +1217,7 @@ function computeQueryGivenUsage(pipeline) {
 // because composite resolution runs first and `expandRefUsage` is seeded
 // with the resolved branch. If an unresolved `CompositeSourceDef` ever
 // reaches here (e.g. composites in join positions if/when those work),
-// the conservative union over all branches is the safe fallback. See
-// ~/ctx/mp/implementation.md "Composite sources — partial coverage".
+// the conservative union over all branches is the safe fallback.
 function givenUsageOfSource(sd) {
     var _a, _b, _c;
     const fromFilters = ((_a = sd.filterList) !== null && _a !== void 0 ? _a : []).flatMap(f => (0, malloy_types_1.givenUsageFrom)(f.refSummary));