@malloydata/malloy 0.0.43 → 0.0.44-dev230623185845

package/dist/index.d.ts

@@ -1,4 +1,4 @@
-export type { QueryDataRow, Fragment, StructDef, StructRelationship, NamedStructDefs, MalloyQueryData, AtomicFieldType as AtomicFieldTypeInner, DateUnit, ExtractUnit, TimestampUnit, TimeFieldType, QueryData, FieldTypeDef, Expr, DialectFragment, TimeValue, FilterExpression, SQLBlock, FieldAtomicDef, FieldDef, FilteredAliasedName, PipeSegment, QueryFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryRunStats, NamedQuery, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FieldValueType, ExpressionTypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, } from './model';
+export type { QueryDataRow, Fragment, StructDef, StructRelationship, NamedStructDefs, MalloyQueryData, AtomicFieldType as AtomicFieldTypeInner, DateUnit, ExtractUnit, TimestampUnit, TimeFieldType, QueryData, FieldTypeDef, Expr, DialectFragment, TimeValue, FilterExpression, SQLBlock, FieldAtomicDef, FieldDef, FilteredAliasedName, PipeSegment, QueryFieldDef, TurtleDef, SearchValueMapResult, SearchIndexResult, ModelDef, Query, QueryRunStats, NamedQuery, NamedModelObject, ExpressionType, FunctionDef, FunctionOverloadDef, FunctionParameterDef, ExpressionValueType, TypeDesc, FieldValueType, ExpressionTypeDesc, FunctionParamTypeDesc, DocumentLocation, DocumentRange, DocumentPosition, Annotation, } from './model';
 export { Segment, isFilteredAliasedName, flattenQuery, expressionIsCalculation, } from './model';
 export { HighlightType, MalloyTranslator, } from './lang';
 export type { LogMessage, TranslateResponse } from './lang';
@@ -8,3 +8,4 @@ export type { RunSQLOptions } from './run_sql_options';
 export type { URLReader, InfoConnection, LookupConnection, Connection, QueryString, ModelString, QueryURL, ModelURL, PooledConnection, TestableConnection, PersistSQLResults, StreamingConnection, } from './runtime_types';
 export type { Loggable } from './malloy';
 export { toAsyncGenerator } from './connection_utils';
+export { Tags, type MalloyTags } from './tags';

package/dist/index.js

@@ -22,7 +22,7 @@
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.toAsyncGenerator = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.parseTableURI = exports.Result = 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 = exports.MalloyTranslator = exports.HighlightType = exports.expressionIsCalculation = exports.flattenQuery = exports.isFilteredAliasedName = exports.Segment = void 0;
+exports.Tags = exports.toAsyncGenerator = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.parseTableURI = exports.Result = 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 = exports.MalloyTranslator = exports.HighlightType = exports.expressionIsCalculation = exports.flattenQuery = exports.isFilteredAliasedName = exports.Segment = void 0;
 var model_1 = require("./model");
 // Used in Composer Demo
 Object.defineProperty(exports, "Segment", { enumerable: true, get: function () { return model_1.Segment; } });
@@ -58,4 +58,6 @@ Object.defineProperty(exports, "DataWriter", { enumerable: true, get: function (
 Object.defineProperty(exports, "Explore", { enumerable: true, get: function () { return malloy_1.Explore; } });
 var connection_utils_1 = require("./connection_utils");
 Object.defineProperty(exports, "toAsyncGenerator", { enumerable: true, get: function () { return connection_utils_1.toAsyncGenerator; } });
+var tags_1 = require("./tags");
+Object.defineProperty(exports, "Tags", { enumerable: true, get: function () { return tags_1.Tags; } });
 //# sourceMappingURL=index.js.map

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

@@ -1,14 +1,20 @@
+import { Annotation } from '../../../model/malloy_types';
 import { ModelDataRequest } from '../../translate-response';
 import { DocStatement, Document, MalloyElement, RunList } from '../types/malloy-element';
 import { QueryElement } from '../types/query-element';
-export declare class DefineQuery extends MalloyElement implements DocStatement {
+import { Noteable, extendNoteMethod } from '../types/noteable';
+export declare class DefineQuery extends MalloyElement implements DocStatement, Noteable {
     readonly name: string;
     readonly queryDetails: QueryElement;
     elementType: string;
     constructor(name: string, queryDetails: QueryElement);
+    readonly isNoteableObj = true;
+    extendNote: typeof extendNoteMethod;
+    note?: Annotation;
     execute(doc: Document): ModelDataRequest;
 }
 export declare class DefineQueryList extends RunList implements DocStatement {
+    elementType: string;
     constructor(queryList: DefineQuery[]);
     execute(doc: Document): ModelDataRequest;
 }

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

@@ -24,12 +24,15 @@
 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, queryDetails) {
         super({ queryDetails: queryDetails });
         this.name = name;
         this.queryDetails = queryDetails;
         this.elementType = 'defineQuery';
+        this.isNoteableObj = true;
+        this.extendNote = noteable_1.extendNoteMethod;
     }
     execute(doc) {
         const existing = doc.getEntry(this.name);
@@ -43,13 +46,19 @@ class DefineQuery extends malloy_element_1.MalloyElement {
             name: this.name,
             location: this.location,
         };
+        if (this.note) {
+            entry.annotation = entry.annotation
+                ? { ...this.note, inherits: entry.annotation }
+                : this.note;
+        }
         doc.setEntry(this.name, { entry, exported: true });
     }
 }
 exports.DefineQuery = DefineQuery;
 class DefineQueryList extends malloy_element_1.RunList {
     constructor(queryList) {
-        super('defineQueries', queryList);
+        super(queryList);
+        this.elementType = 'defineQueries';
     }
     execute(doc) {
         return this.executeList(doc);

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

@@ -1,17 +1,23 @@
+import { Annotation } from '../../../model/malloy_types';
 import { ModelDataRequest } from '../../translate-response';
 import { HasParameter } from '../parameters/has-parameter';
 import { DocStatement, Document, MalloyElement, RunList } from '../types/malloy-element';
+import { Noteable, extendNoteMethod } from '../types/noteable';
 import { Source } from './source';
-export declare class DefineSource extends MalloyElement implements DocStatement {
+export declare class DefineSource extends MalloyElement implements DocStatement, Noteable {
     readonly name: string;
     readonly theSource: Source;
     readonly exported: boolean;
     elementType: string;
     readonly parameters?: HasParameter[];
     constructor(name: string, theSource: Source, exported: boolean, params?: MalloyElement[]);
+    readonly isNoteableObj = true;
+    extendNote: typeof extendNoteMethod;
+    note?: Annotation;
     execute(doc: Document): ModelDataRequest;
 }
 export declare class DefineSourceList extends RunList implements DocStatement {
+    elementType: string;
     constructor(sourceList: DefineSource[]);
     execute(doc: Document): ModelDataRequest;
 }

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

@@ -26,6 +26,7 @@ exports.DefineSourceList = exports.DefineSource = void 0;
 const error_factory_1 = require("../error-factory");
 const has_parameter_1 = require("../parameters/has-parameter");
 const malloy_element_1 = require("../types/malloy-element");
+const noteable_1 = require("../types/noteable");
 class DefineSource extends malloy_element_1.MalloyElement {
     constructor(name, theSource, exported, params) {
         super({ explore: theSource });
@@ -33,6 +34,8 @@ class DefineSource extends malloy_element_1.MalloyElement {
         this.theSource = theSource;
         this.exported = exported;
         this.elementType = 'defineSource';
+        this.isNoteableObj = true;
+        this.extendNote = noteable_1.extendNoteMethod;
         if (params) {
             this.parameters = [];
             for (const el of params) {
@@ -55,21 +58,25 @@ class DefineSource extends malloy_element_1.MalloyElement {
             if (error_factory_1.ErrorFactory.isErrorStructDef(structDef)) {
                 return;
             }
-            doc.setEntry(this.name, {
-                entry: {
-                    ...structDef,
-                    as: this.name,
-                    location: this.location,
-                },
-                exported: this.exported,
-            });
+            const entry = {
+                ...structDef,
+                as: this.name,
+                location: this.location,
+            };
+            if (this.note) {
+                entry.annotation = structDef.annotation
+                    ? { ...this.note, inherits: structDef.annotation }
+                    : this.note;
+            }
+            doc.setEntry(this.name, { entry, exported: this.exported });
         }
     }
 }
 exports.DefineSource = DefineSource;
 class DefineSourceList extends malloy_element_1.RunList {
     constructor(sourceList) {
-        super('defineSources', sourceList);
+        super(sourceList);
+        this.elementType = 'defineSources';
     }
     execute(doc) {
         return this.executeList(doc);

package/dist/lang/ast/elements/pipeline-desc.d.ts

@@ -1,4 +1,4 @@
-import { DocumentLocation, PipeSegment, Pipeline, StructDef } from '../../../model/malloy_types';
+import { Annotation, DocumentLocation, PipeSegment, Pipeline, StructDef } from '../../../model/malloy_types';
 import { FieldSpace } from '../types/field-space';
 import { MalloyElement } from '../types/malloy-element';
 import { QOPDesc } from '../query-properties/qop-desc';
@@ -24,6 +24,7 @@ export declare abstract class PipelineDesc extends MalloyElement {
     protected expandTurtle(turtleName: string, fromStruct: StructDef): {
         pipeline: PipeSegment[];
         location: DocumentLocation | undefined;
+        annotation: Annotation | undefined;
     };
     protected getOutputStruct(walkStruct: StructDef, pipeline: PipeSegment[]): StructDef;
 }

package/dist/lang/ast/elements/pipeline-desc.js

@@ -80,6 +80,7 @@ class PipelineDesc extends malloy_element_1.MalloyElement {
     }
     expandTurtle(turtleName, fromStruct) {
         const turtle = (0, struct_utils_1.getStructFieldDef)(fromStruct, turtleName);
+        let annotation;
         if (!turtle) {
             this.log(`Query '${turtleName}' is not defined in source`);
         }
@@ -87,9 +88,12 @@ class PipelineDesc extends malloy_element_1.MalloyElement {
             this.log(`'${turtleName}' is not a query`);
         }
         else {
-            return { pipeline: turtle.pipeline, location: turtle.location };
+            if (turtle.annotation) {
+                annotation = { inherits: turtle.annotation };
+            }
+            return { pipeline: turtle.pipeline, location: turtle.location, annotation };
         }
-        return { pipeline: [], location: undefined };
+        return { pipeline: [], location: undefined, annotation };
     }
     getOutputStruct(walkStruct, pipeline) {
         for (const modelQop of pipeline) {

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

@@ -1,15 +1,16 @@
-import { StructDef } from '../../../model/malloy_types';
+import { Annotation, StructDef } from '../../../model/malloy_types';
 import { HasParameter } from '../parameters/has-parameter';
-import { ExploreDesc } from '../types/explore-desc';
+import { SourceDesc } from '../types/source-desc';
 import { Source } from './source';
 /**
  * A Source made from a source reference and a set of refinements
  */
 export declare class RefinedSource extends Source {
     readonly source: Source;
-    readonly refinement: ExploreDesc;
+    readonly refinement: SourceDesc;
     elementType: string;
-    constructor(source: Source, refinement: ExploreDesc);
+    currentAnnotation?: Annotation;
+    constructor(source: Source, refinement: SourceDesc);
     structDef(): StructDef;
     withParameters(pList: HasParameter[] | undefined): StructDef;
 }

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

@@ -38,6 +38,7 @@ const renames_1 = require("../source-properties/renames");
 const turtles_1 = require("../source-properties/turtles");
 const source_1 = require("./source");
 const timezone_statement_1 = require("../source-properties/timezone-statement");
+const malloy_element_1 = require("../types/malloy-element");
 /**
  * A Source made from a source reference and a set of refinements
  */
@@ -58,6 +59,10 @@ class RefinedSource extends source_1.Source {
         const filters = [];
         let newTimezone;
         for (const el of this.refinement.list) {
+            if (el instanceof malloy_element_1.ObjectAnnotation) {
+                // Silently ignoring unclaimed annotations
+                continue;
+            }
             const errTo = el;
             if (el instanceof primary_key_1.PrimaryKey) {
                 if (primaryKey) {

package/dist/lang/ast/expressions/expr-id-reference.js

@@ -49,10 +49,10 @@ class ExprIdReference extends expression_def_1.ExpressionDef {
             const value = [{ type: def.found.refType, path: this.refString }];
             const td = def.found.typeDesc();
             // We think that aggregates are more 'output' like, but maybe we will reconsider that...
-            if ((0, malloy_types_1.expressionIsAggregate)(td.expressionType)) {
-                td.evalSpace = 'output';
-            }
-            return { ...td, value };
+            const evalSpace = (0, malloy_types_1.expressionIsAggregate)(td.expressionType)
+                ? 'output'
+                : td.evalSpace;
+            return { ...td, value, evalSpace };
         }
         this.log(def.error);
         return (0, ast_utils_1.errorFor)(def.error);

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

@@ -1,7 +1,7 @@
 import { FieldDef, FieldTypeDef, TypeDesc } from '../../../model/malloy_types';
 import { SpaceField } from '../types/space-field';
 export declare class ColumnSpaceField extends SpaceField {
-    protected def: FieldTypeDef;
+    haveFieldDef: FieldDef;
     constructor(def: FieldTypeDef);
     fieldDef(): FieldDef;
     typeDesc(): TypeDesc;

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

@@ -27,13 +27,13 @@ const space_field_1 = require("../types/space-field");
 class ColumnSpaceField extends space_field_1.SpaceField {
     constructor(def) {
         super();
-        this.def = def;
+        this.haveFieldDef = def;
     }
     fieldDef() {
-        return this.def;
+        return this.haveFieldDef;
     }
     typeDesc() {
-        return this.fieldTypeFromFieldDef(this.def);
+        return this.fieldTypeFromFieldDef(this.haveFieldDef);
     }
 }
 exports.ColumnSpaceField = ColumnSpaceField;

package/dist/lang/ast/field-space/field-definition-value.d.ts

@@ -7,10 +7,10 @@ export declare class FieldDefinitionValue extends SpaceField {
     readonly space: FieldSpace;
     readonly exprDef: FieldDeclaration;
     fieldName: string;
-    defType?: TypeDesc;
     constructor(space: FieldSpace, exprDef: FieldDeclaration);
     get name(): string;
     fieldDef(): model.FieldDef;
+    private qfd?;
     getQueryFieldDef(fs: FieldSpace): model.QueryFieldDef;
     typeDesc(): TypeDesc;
 }

package/dist/lang/ast/field-space/field-definition-value.js

@@ -34,21 +34,27 @@ class FieldDefinitionValue extends space_field_1.SpaceField {
     get name() {
         return this.fieldName;
     }
+    // A source will call this when it defines the field
     fieldDef() {
-        const def = this.exprDef.fieldDef(this.space, this.name);
-        this.defType = this.fieldTypeFromFieldDef(def);
-        return def;
+        if (!this.haveFieldDef) {
+            this.haveFieldDef = this.exprDef.fieldDef(this.space, this.name);
+        }
+        return this.haveFieldDef;
     }
     getQueryFieldDef(fs) {
-        const def = this.exprDef.queryFieldDef(fs, this.name);
-        this.defType = this.fieldTypeFromFieldDef(def);
-        return def;
+        if (!this.qfd) {
+            const def = this.exprDef.queryFieldDef(fs, this.name);
+            this.qfd = def;
+        }
+        return this.qfd;
     }
+    // If this is called before the expression has been evaluated, we don't
+    // really know what type we have. However since we have the FieldSpace,
+    // we can compile the expression to find out, this might result in
+    // some expressions being compiled twice.
     typeDesc() {
-        if (this.defType) {
-            return this.defType;
-        }
-        return this.fieldTypeFromFieldDef(this.fieldDef());
+        const typeFrom = this.qfd || this.fieldDef();
+        return this.fieldTypeFromFieldDef(typeFrom);
     }
 }
 exports.FieldDefinitionValue = FieldDefinitionValue;

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

@@ -28,6 +28,7 @@ class QueryFieldStruct extends query_space_field_1.QueryField {
     constructor(fs, turtleDef) {
         super(fs);
         this.turtleDef = turtleDef;
+        this.haveFieldDef = turtleDef;
     }
     rename(name) {
         this.turtleDef = {

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

@@ -261,7 +261,10 @@ class QuerySpace extends refined_space_1.RefinedSpace {
     }
     addQueryItems(...qiList) {
         for (const qi of qiList) {
-            if (qi instanceof field_references_1.FieldReference || qi instanceof nest_reference_1.NestReference) {
+            if (qi instanceof nest_reference_1.NestReference) {
+                this.addReference(qi);
+            }
+            else if (qi instanceof field_references_1.FieldReference) {
                 this.addReference(qi);
             }
             else if (qi instanceof field_declaration_1.FieldDeclaration) {

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

@@ -1,12 +1,18 @@
 import { QueryFieldDef, TypeDesc } from '../../../model/malloy_types';
 import { FieldReference } from '../query-items/field-references';
 import { FieldSpace } from '../types/field-space';
-import { LookupResult } from '../types/lookup-result';
+import { SpaceEntry } from '../types/space-entry';
 import { SpaceField } from '../types/space-field';
 export declare class ReferenceField extends SpaceField {
     readonly fieldRef: FieldReference;
-    res: LookupResult | undefined;
+    res?: SpaceEntry;
+    private queryFieldDef?;
     constructor(fieldRef: FieldReference);
     getQueryFieldDef(fs: FieldSpace): QueryFieldDef | undefined;
     typeDesc(): TypeDesc;
+    /**
+     * If the referenced field has any annotations, replace the reference
+     * with something which can hold an annotation
+     */
+    maybeAnnotate(): QueryFieldDef;
 }

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

@@ -23,30 +23,72 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReferenceField = void 0;
+const malloy_types_1 = require("../../../model/malloy_types");
 const space_field_1 = require("../types/space-field");
 class ReferenceField extends space_field_1.SpaceField {
     constructor(fieldRef) {
         super();
         this.fieldRef = fieldRef;
-        this.res = undefined;
     }
     getQueryFieldDef(fs) {
-        // Lookup string and generate error if it isn't defined.
-        const check = this.fieldRef.getField(fs);
-        if (check.error) {
-            this.fieldRef.log(check.error);
+        if (!this.queryFieldDef) {
+            const check = this.fieldRef.getField(fs);
+            if (check.error) {
+                this.fieldRef.log(check.error);
+            }
+            this.res = check.found;
+            this.queryFieldDef = this.maybeAnnotate();
         }
-        this.res = check;
-        return this.fieldRef.refString;
+        return this.queryFieldDef;
     }
     typeDesc() {
         // Remember the actual type of the field that was looked up so it can be used for
         // type checking.
-        if (this.res !== undefined && this.res.found) {
-            return this.res.found.typeDesc();
+        if (this.res !== undefined) {
+            return this.res.typeDesc();
         }
         return { dataType: 'error', expressionType: 'scalar', evalSpace: 'input' };
     }
+    /**
+     * If the referenced field has any annotations, replace the reference
+     * with something which can hold an annotation
+     */
+    maybeAnnotate() {
+        const path = this.fieldRef.refString;
+        if (this.res instanceof space_field_1.SpaceField &&
+            this.res.haveFieldDef &&
+            typeof this.res.haveFieldDef !== 'string') {
+            const origFd = this.res.haveFieldDef;
+            if ((0, malloy_types_1.isFilteredAliasedName)(origFd)) {
+                return origFd;
+            }
+            const notes = this.fieldRef.note;
+            if (origFd.annotation || notes) {
+                const annotation = notes || {};
+                if (origFd.annotation) {
+                    annotation.inherits = origFd.annotation;
+                }
+                if (this.fieldRef.list.length > 1) {
+                    // This is a field inside a join or a record, create an expression
+                    // and annotate the expression.
+                    if ((0, malloy_types_1.isAtomicFieldType)(origFd.type)) {
+                        const newField = {
+                            name: this.fieldRef.list[-1].refString,
+                            type: origFd.type,
+                            e: [{ type: 'field', path }],
+                            annotation,
+                        };
+                        return newField;
+                    }
+                    // maybe ok, this likely is some field which cannot be referenced
+                    // in a query and will error, so there would be nothing to annotate
+                    return path;
+                }
+                return { ...origFd, annotation };
+            }
+        }
+        return path;
+    }
 }
 exports.ReferenceField = ReferenceField;
 //# sourceMappingURL=reference-field.js.map

package/dist/lang/ast/index.d.ts

@@ -62,7 +62,7 @@ export * from './query-items/field-references';
 export * from './query-properties/aggregate';
 export * from './query-properties/calculate';
 export * from './query-properties/declare-fields';
-export * from './query-properties/dimmensions';
+export * from './query-properties/dimensions';
 export * from './query-properties/filters';
 export * from './query-properties/group-by';
 export * from './query-properties/indexing';
@@ -82,7 +82,7 @@ export * from './sources/table-source';
 export * from './sql-elements/sql-statement';
 export * from './sql-elements/sql-string';
 export * from './types/comparison';
-export * from './types/explore-desc';
+export * from './types/source-desc';
 export * from './types/source-property';
 export * from './types/expression-def';
 export * from './types/field-collection-member';

package/dist/lang/ast/index.js

@@ -100,7 +100,7 @@ __exportStar(require("./query-items/field-references"), exports);
 __exportStar(require("./query-properties/aggregate"), exports);
 __exportStar(require("./query-properties/calculate"), exports);
 __exportStar(require("./query-properties/declare-fields"), exports);
-__exportStar(require("./query-properties/dimmensions"), exports);
+__exportStar(require("./query-properties/dimensions"), exports);
 __exportStar(require("./query-properties/filters"), exports);
 __exportStar(require("./query-properties/group-by"), exports);
 __exportStar(require("./query-properties/indexing"), exports);
@@ -120,7 +120,7 @@ __exportStar(require("./sources/table-source"), exports);
 __exportStar(require("./sql-elements/sql-statement"), exports);
 __exportStar(require("./sql-elements/sql-string"), exports);
 __exportStar(require("./types/comparison"), exports);
-__exportStar(require("./types/explore-desc"), exports);
+__exportStar(require("./types/source-desc"), exports);
 __exportStar(require("./types/source-property"), exports);
 __exportStar(require("./types/expression-def"), exports);
 __exportStar(require("./types/field-collection-member"), exports);

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

@@ -1,9 +1,14 @@
+import { Annotation } from '../../../model';
 import { ModelDataRequest } from '../../translate-response';
 import { DocStatement, Document, MalloyElement } from '../types/malloy-element';
 import { QueryElement } from '../types/query-element';
-export declare class AnonymousQuery extends MalloyElement implements DocStatement {
+import { Noteable, extendNoteMethod } from '../types/noteable';
+export declare class AnonymousQuery extends MalloyElement implements DocStatement, Noteable {
     readonly theQuery: QueryElement;
     elementType: string;
     constructor(theQuery: QueryElement);
+    readonly isNoteableObj = true;
+    extendNote: typeof extendNoteMethod;
+    note?: Annotation;
     execute(doc: Document): ModelDataRequest;
 }

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

@@ -24,15 +24,23 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AnonymousQuery = void 0;
 const malloy_element_1 = require("../types/malloy-element");
+const noteable_1 = require("../types/noteable");
 class AnonymousQuery extends malloy_element_1.MalloyElement {
     constructor(theQuery) {
         super();
         this.theQuery = theQuery;
         this.elementType = 'anonymousQuery';
+        this.isNoteableObj = true;
+        this.extendNote = noteable_1.extendNoteMethod;
         this.has({ query: theQuery });
     }
     execute(doc) {
         const modelQuery = this.theQuery.query();
+        if (this.note) {
+            modelQuery.annotation = modelQuery.annotation
+                ? { ...this.note, inherits: modelQuery.annotation }
+                : this.note;
+        }
         doc.queryList.push(modelQuery);
         return undefined;
     }

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

@@ -69,6 +69,9 @@ class ExistingQuery extends pipeline_desc_1.PipelineDesc {
             structRef: isRefOk ? queryHead.structRef() : queryHead.structDef(),
             location: this.location,
         };
+        if (seedQuery.annotation) {
+            query.annotation = seedQuery.annotation;
+        }
         return { outputStruct: appended.structDef, query };
     }
     query() {

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

@@ -56,11 +56,11 @@ class FullQuery extends turtle_headed_pipe_1.TurtleHeadedPipe {
             };
         }
         if (this.turtleName) {
-            const { error } = this.turtleName.getField(pipeFs);
-            if (error)
-                this.log(error);
+            const lookFor = this.turtleName.getField(pipeFs);
+            if (lookFor.error)
+                this.log(lookFor.error);
             const name = this.turtleName.refString;
-            const { pipeline, location } = this.expandTurtle(name, structDef);
+            const { pipeline, location, annotation } = this.expandTurtle(name, structDef);
             destQuery.location = location;
             const refined = this.refinePipeline(pipeFs, { pipeline }).pipeline;
             if (this.headRefinement) {
@@ -72,6 +72,9 @@ class FullQuery extends turtle_headed_pipe_1.TurtleHeadedPipe {
             else {
                 destQuery.pipeHead = { name };
             }
+            if (annotation) {
+                destQuery.annotation = annotation;
+            }
             const pipeStruct = this.getOutputStruct(structDef, refined);
             pipeFs = new static_space_1.StaticSpace(pipeStruct);
         }

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

@@ -1,12 +1,17 @@
+import { Annotation } from '../../../model';
 import { ModelDataRequest } from '../../translate-response';
 import { DocStatement, Document, MalloyElement, ModelEntryReference } from '../types/malloy-element';
+import { Noteable, extendNoteMethod } from '../types/noteable';
 import { QueryElement } from '../types/query-element';
 declare abstract class RunQuery extends MalloyElement implements DocStatement {
     elementType: string;
     abstract execute(doc: Document): ModelDataRequest;
 }
-export declare class RunQueryDef extends RunQuery {
+export declare class RunQueryDef extends RunQuery implements Noteable {
     readonly theQuery: QueryElement;
+    note?: Annotation;
+    readonly isNoteableObj = true;
+    extendNote: typeof extendNoteMethod;
     constructor(theQuery: QueryElement);
     execute(doc: Document): ModelDataRequest;
 }

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

@@ -24,6 +24,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RunQueryRef = exports.RunQueryDef = void 0;
 const malloy_element_1 = require("../types/malloy-element");
+const noteable_1 = require("../types/noteable");
 class RunQuery extends malloy_element_1.MalloyElement {
     constructor() {
         super(...arguments);
@@ -34,10 +35,19 @@ class RunQueryDef extends RunQuery {
     constructor(theQuery) {
         super();
         this.theQuery = theQuery;
+        this.isNoteableObj = true;
+        this.extendNote = noteable_1.extendNoteMethod;
         this.has({ query: theQuery });
     }
     execute(doc) {
-        const modelQuery = this.theQuery.query();
+        let modelQuery = this.theQuery.query();
+        const annotation = this.note || {};
+        if (modelQuery.annotation) {
+            annotation.inherits = modelQuery.annotation;
+        }
+        if (annotation.notes || annotation.blockNotes || annotation.inherits) {
+            modelQuery = { ...modelQuery, annotation };
+        }
         doc.queryList.push(modelQuery);
         return undefined;
     }