@malloydata/malloy 0.0.422 → 0.0.424

package/README.md

@@ -34,8 +34,8 @@ In practice, much of this loop is handled by various database plugins:
 - [Postgres](https://github.com/malloydata/malloy/tree/main/packages/malloy-db-postgres)
 - [Snowflake](https://github.com/malloydata/malloy/tree/main/packages/malloy-db-snowflake)
 
-## Do you have any examples?
+## What's built with these libraries?
 
-You can find a (very) simple example of writing a CLI for executing Malloy queries [here](https://github.com/malloydata/malloy/tree/main/demo/malloy-demo-bq-cli)
+The [Malloy CLI](https://github.com/malloydata/malloy-cli) uses them to run Malloy queries from the command line.
 
-A more realistic and complex use case - we use these libraries to power our VSCode Extension. Some examples can be found [here](https://github.com/malloydata/malloy-vscode-extension/tree/main/src/extension/commands)
+For a more complex use case, our [VS Code extension](https://github.com/malloydata/malloy-vscode-extension) uses them to power a full Malloy editing and query experience.

package/dist/dialect/databricks/databricks.js

@@ -389,8 +389,15 @@ class DatabricksDialect extends dialect_1.Dialect {
         throw new Error('Databricks does not support timestamptz');
     }
     sqlMeasureTimeExpr(df) {
-        let lVal = df.kids.left.sql;
-        let rVal = df.kids.right.sql;
+        const from = df.kids.left;
+        const to = df.kids.right;
+        let lVal = from.sql;
+        let rVal = to.sql;
+        if (malloy_types_1.TD.isDate(from.typeDef) &&
+            malloy_types_1.TD.isDate(to.typeDef) &&
+            ['week', 'month', 'quarter', 'year'].includes(df.units)) {
+            return `TIMESTAMPDIFF(${df.units.toUpperCase()}, ${lVal}, ${rVal})`;
+        }
         if (inSeconds[df.units]) {
             lVal = `UNIX_MICROS(CAST(${lVal} AS TIMESTAMP))`;
             rVal = `UNIX_MICROS(CAST(${rVal} AS TIMESTAMP))`;

package/dist/dialect/mysql/mysql.js

@@ -415,8 +415,15 @@ class MySQLDialect extends dialect_1.Dialect {
         throw new Error('MySQL does not support timestamptz');
     }
     sqlMeasureTimeExpr(df) {
-        let lVal = df.kids.left.sql;
-        let rVal = df.kids.right.sql;
+        const from = df.kids.left;
+        const to = df.kids.right;
+        let lVal = from.sql;
+        let rVal = to.sql;
+        if (malloy_types_1.TD.isDate(from.typeDef) &&
+            malloy_types_1.TD.isDate(to.typeDef) &&
+            ['week', 'month', 'quarter', 'year'].includes(df.units)) {
+            return `TIMESTAMPDIFF(${df.units.toUpperCase()}, ${lVal}, ${rVal})`;
+        }
         if (inSeconds[df.units]) {
             lVal = `UNIX_TIMESTAMP(${lVal})`;
             rVal = `UNIX_TIMESTAMP(${rVal})`;

package/dist/dialect/postgres/postgres.js

@@ -228,6 +228,32 @@ class PostgresDialect extends pg_impl_1.PostgresBase {
         const to = df.kids.right;
         let lVal = from.sql;
         let rVal = to.sql;
+        if (malloy_types_1.TD.isDate(from.typeDef) &&
+            malloy_types_1.TD.isDate(to.typeDef) &&
+            ['week', 'month', 'quarter', 'year'].includes(df.units)) {
+            const earlier = `LEAST(${lVal}, ${rVal})`;
+            const later = `GREATEST(${lVal}, ${rVal})`;
+            const age = `AGE(${later}, ${earlier})`;
+            const months = `(EXTRACT(YEAR FROM ${age}) * 12 + EXTRACT(MONTH FROM ${age}))`;
+            let measured;
+            if (df.units === 'week') {
+                measured = `TRUNC((${later} - ${earlier}) / 7.0)`;
+            }
+            else if (df.units === 'month') {
+                measured = months;
+            }
+            else if (df.units === 'quarter') {
+                measured = `TRUNC(${months} / 3.0)`;
+            }
+            else {
+                measured = `EXTRACT(YEAR FROM ${age})`;
+            }
+            return `CASE
+        WHEN ${lVal} IS NULL OR ${rVal} IS NULL THEN NULL
+        WHEN ${rVal} >= ${lVal} THEN ${measured}
+        ELSE -(${measured})
+      END`;
+        }
         if (inSeconds[df.units]) {
             lVal = `EXTRACT(EPOCH FROM ${lVal})`;
             rVal = `EXTRACT(EPOCH FROM ${rVal})`;

package/dist/dialect/snowflake/snowflake.js

@@ -52,7 +52,12 @@ const snowflakeToMalloyTypes = {
     'timestamptz': { type: 'timestamptz' },
     'timestamp_tz': { type: 'timestamptz' },
     'timestamp with time zone': { type: 'timestamptz' },
-    /* timestamp_ltz is not supported in malloy snowflake dialect */
+    // TIMESTAMP_LTZ is a genuine instant (persisted UTC); under Malloy's UTC
+    // session pin it is indistinguishable from NTZ, so it maps to `timestamp`
+    // like NTZ. malloyTypeToSQLType writes instants here too.
+    'timestampltz': { type: 'timestamp' },
+    'timestamp_ltz': { type: 'timestamp' },
+    'timestamp with local time zone': { type: 'timestamp' },
 };
 class SnowflakeDialect extends dialect_1.Dialect {
     constructor() {
@@ -374,6 +379,22 @@ ${(0, utils_1.indent)(sql)}
     sqlMeasureTimeExpr(df) {
         const from = df.kids.left;
         const to = df.kids.right;
+        if (malloy_types_1.TD.isDate(from.typeDef) &&
+            malloy_types_1.TD.isDate(to.typeDef) &&
+            ['week', 'month', 'quarter', 'year'].includes(df.units)) {
+            const lVal = from.sql;
+            const rVal = to.sql;
+            const earlier = `LEAST(${lVal}, ${rVal})`;
+            const later = `GREATEST(${lVal}, ${rVal})`;
+            const candidate = `DATEDIFF(${df.units}, ${earlier}, ${later})`;
+            const anniversary = `DATEADD(${df.units}, ${candidate}, ${earlier})`;
+            const measured = `(${candidate} - CASE WHEN ${anniversary} > ${later} THEN 1 ELSE 0 END)`;
+            return `CASE
+        WHEN ${lVal} IS NULL OR ${rVal} IS NULL THEN NULL
+        WHEN ${rVal} >= ${lVal} THEN ${measured}
+        ELSE -(${measured})
+      END`;
+        }
         let extractUnits = 'nanoseconds';
         if (malloy_types_1.TD.isDate(from.typeDef) || malloy_types_1.TD.isDate(to.typeDef)) {
             extractUnits = 'seconds';
@@ -447,6 +468,14 @@ ${(0, utils_1.indent)(sql)}
         else if (malloyType.type === 'timestamptz') {
             return 'TIMESTAMP_TZ';
         }
+        else if (malloyType.type === 'timestamp') {
+            // A Malloy `timestamp` is an instant, and TIMESTAMP_LTZ is Snowflake's
+            // instant type. Emit it explicitly rather than the bare word TIMESTAMP,
+            // whose type is decided per account (TIMESTAMP_TYPE_MAPPING: NTZ or LTZ).
+            // NTZ only reads as an instant under the UTC session pin; LTZ is correct
+            // without it, and leaves NTZ for the future `datetime` type.
+            return 'TIMESTAMP_LTZ';
+        }
         return malloyType.type;
     }
     sqlTypeToMalloyType(sqlType) {

package/dist/dialect/standardsql/standardsql.js

@@ -341,6 +341,21 @@ ${(0, utils_1.indent)(sql)}
         const to = measure.kids.right;
         let lVal = from.sql;
         let rVal = to.sql;
+        if (malloy_types_1.TD.isDate(from.typeDef) &&
+            malloy_types_1.TD.isDate(to.typeDef) &&
+            ['week', 'month', 'quarter', 'year'].includes(measure.units)) {
+            const earlier = `LEAST(${lVal},${rVal})`;
+            const later = `GREATEST(${lVal},${rVal})`;
+            const unit = measure.units.toUpperCase();
+            const candidate = `DATE_DIFF(${later},${earlier},${unit})`;
+            const anniversary = `DATE_ADD(${earlier}, INTERVAL ${candidate} ${unit})`;
+            const measured = `(${candidate} - CASE WHEN ${anniversary} > ${later} THEN 1 ELSE 0 END)`;
+            return `CASE
+        WHEN ${lVal} IS NULL OR ${rVal} IS NULL THEN NULL
+        WHEN ${rVal} >= ${lVal} THEN ${measured}
+        ELSE -(${measured})
+      END`;
+        }
         if (measureMap[measure.units]) {
             const { use: measureIn, ratio } = measureMap[measure.units];
             if (!timestampMeasureable(measureIn)) {

package/dist/dialect/trino/trino.js

@@ -439,6 +439,11 @@ ${(0, utils_1.indent)(sql)}
         const to = mf.kids.right;
         let lVal = from.sql;
         let rVal = to.sql;
+        if (malloy_types_1.TD.isDate(from.typeDef) &&
+            malloy_types_1.TD.isDate(to.typeDef) &&
+            ['week', 'month', 'quarter', 'year'].includes(mf.units)) {
+            return `DATE_DIFF('${mf.units}',${lVal},${rVal})`;
+        }
         if (measureMap[mf.units]) {
             const { use: measureIn, ratio } = measureMap[mf.units];
             if (!timestampMeasureable(measureIn)) {

package/dist/lang/ast/expressions/expr-time-extract.js

@@ -70,8 +70,9 @@ class ExprTimeExtract extends expression_def_1.ExpressionDef {
                         return from.first.loggedErrorExpr('invalid-types-for-time-measurement', `Cannot measure from ${first.type} to ${last.type}`);
                     }
                 }
-                if (['week', 'month', 'quarter', 'year'].includes(extractTo)) {
-                    return this.loggedErrorExpr('invalid-timeframe-for-time-measurement', `Cannot measure interval using '${extractTo}'`);
+                if (['week', 'month', 'quarter', 'year'].includes(extractTo) &&
+                    (first.type !== 'date' || last.type !== 'date')) {
+                    return this.loggedErrorExpr('invalid-timeframe-for-time-measurement', `Cannot measure interval using '${extractTo}' for '${first.type}' values; calendar interval measurement requires dates`);
                 }
                 if (!(0, malloy_types_1.isTimestampUnit)(extractTo)) {
                     return this.loggedErrorExpr('invalid-time-extraction-unit', `Cannot extract ${extractTo} from a range`);

package/dist/lang/ast/field-space/include-utils.js

@@ -114,8 +114,8 @@ function processIncludeList(includeItems, from) {
                     else {
                         joinState.star = (_c = item.kind) !== null && _c !== void 0 ? _c : 'inherit';
                         joinState.starNote = {
-                            notes: (_e = (_d = f.note) === null || _d === void 0 ? void 0 : _d.notes) !== null && _e !== void 0 ? _e : [],
-                            blockNotes: (_g = (_f = item.note) === null || _f === void 0 ? void 0 : _f.blockNotes) !== null && _g !== void 0 ? _g : [],
+                            notes: (_e = (_d = f.ownAnnotation) === null || _d === void 0 ? void 0 : _d.notes) !== null && _e !== void 0 ? _e : [],
+                            blockNotes: (_g = (_f = item.ownAnnotation) === null || _f === void 0 ? void 0 : _f.blockNotes) !== null && _g !== void 0 ? _g : [],
                         };
                     }
                 }
@@ -149,10 +149,10 @@ function processIncludeList(includeItems, from) {
                             joinState.modifiers.set((_h = f.as) !== null && _h !== void 0 ? _h : name, item.kind);
                         }
                         joinState.fieldsIncluded.add(name);
-                        if (f.note || item.note) {
+                        if (f.ownAnnotation || item.ownAnnotation) {
                             joinState.notes.set(name, {
-                                notes: (_k = (_j = f.note) === null || _j === void 0 ? void 0 : _j.notes) !== null && _k !== void 0 ? _k : [],
-                                blockNotes: (_m = (_l = item.note) === null || _l === void 0 ? void 0 : _l.blockNotes) !== null && _m !== void 0 ? _m : [],
+                                notes: (_k = (_j = f.ownAnnotation) === null || _j === void 0 ? void 0 : _j.notes) !== null && _k !== void 0 ? _k : [],
+                                blockNotes: (_m = (_l = item.ownAnnotation) === null || _l === void 0 ? void 0 : _l.blockNotes) !== null && _m !== void 0 ? _m : [],
                             });
                         }
                     }

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

@@ -211,6 +211,7 @@ class QuerySpace extends QueryOperationSpace {
         for (const field of refineThis.queryFields) {
             if (field.type === 'fieldref') {
                 const fieldReference = new field_references_1.RefineFromFieldReference(field.path.map(f => new field_space_1.FieldName(f)));
+                fieldReference.ownAnnotation = field.annotations;
                 this.astEl.has({ fieldReference });
                 const referenceField = new reference_field_1.ReferenceField(fieldReference, this.exprSpace);
                 const name = field.path[field.path.length - 1];

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

@@ -94,7 +94,7 @@ class ReferenceField extends space_field_1.SpaceField {
             if (refTo instanceof space_field_1.SpaceField) {
                 const origFd = refTo.constructorFieldDef();
                 if (origFd) {
-                    const notes = this.fieldRef.note;
+                    const notes = this.fieldRef.ownAnnotation;
                     if (origFd.annotations || notes) {
                         const annotations = {
                             ...(notes !== null && notes !== void 0 ? notes : {}),

package/dist/lang/ast/query-builders/project-builder.js

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectBuilder = void 0;
 const malloy_types_1 = require("../../../model/malloy_types");
 const error_factory_1 = require("../error-factory");
-const group_by_1 = require("../query-properties/group-by");
 const project_field_space_1 = require("../field-space/project-field-space");
 const reduce_builder_1 = require("./reduce-builder");
 class ProjectBuilder extends reduce_builder_1.QuerySegmentBuilder {
@@ -18,7 +17,7 @@ class ProjectBuilder extends reduce_builder_1.QuerySegmentBuilder {
         this.inputFS = this.resultFS.inputSpace();
     }
     execute(qp) {
-        if (qp.elementType === 'having' || qp instanceof group_by_1.GroupBy) {
+        if (qp.elementType === 'having') {
             qp.logError('illegal-operation-in-select-segment', 'Illegal statement in a select query operation');
         }
         else {

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

@@ -2,14 +2,12 @@ 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';
-import { extendNoteMethod } from '../types/noteable';
 import type { SourceQueryElement } from '../source-query-elements/source-query-element';
 export declare class AnonymousQuery extends MalloyElement implements DocStatement, Noteable {
     readonly queryExpr: SourceQueryElement;
     elementType: string;
     constructor(queryExpr: SourceQueryElement);
     readonly isNoteableObj = true;
-    extendNote: typeof extendNoteMethod;
-    note?: AnnotationsDef;
+    ownAnnotation?: AnnotationsDef;
     execute(doc: Document): void;
 }

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

@@ -6,14 +6,12 @@
 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(queryExpr) {
         super();
         this.queryExpr = queryExpr;
         this.elementType = 'anonymousQuery';
         this.isNoteableObj = true;
-        this.extendNote = noteable_1.extendNoteMethod;
         this.has({ queryExpr });
     }
     execute(doc) {
@@ -23,7 +21,7 @@ class AnonymousQuery extends malloy_element_1.MalloyElement {
             return;
         }
         const modelQuery = { ...queryObj.query() };
-        const annotation = this.note || {};
+        const annotation = this.ownAnnotation || {};
         if (modelQuery.annotations) {
             annotation.inherits = modelQuery.annotations;
         }

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

@@ -5,7 +5,6 @@ import type { FieldSpace } from '../types/field-space';
 import { MalloyElement } from '../types/malloy-element';
 import type { MakeEntry } from '../types/space-entry';
 import type { Noteable } from '../types/noteable';
-import { extendNoteMethod } from '../types/noteable';
 import type { DynamicSpace } from '../field-space/dynamic-space';
 import { SpaceField } from '../types/space-field';
 export type FieldDeclarationConstructor = new (expr: ExpressionDef, defineName: string, exprSrc?: string) => AtomicFieldDeclaration;
@@ -14,8 +13,7 @@ export declare abstract class AtomicFieldDeclaration extends MalloyElement imple
     readonly defineName: string;
     readonly exprSrc?: string | undefined;
     readonly isNoteableObj = true;
-    extendNote: typeof extendNoteMethod;
-    note?: AnnotationsDef;
+    ownAnnotation?: 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

@@ -43,7 +43,6 @@ const TDU = __importStar(require("../typedesc-utils"));
 const granular_result_1 = require("../types/granular-result");
 const malloy_element_1 = require("../types/malloy-element");
 const typecheck_utils_1 = require("./typecheck_utils");
-const noteable_1 = require("../types/noteable");
 const space_field_1 = require("../types/space-field");
 const def_space_1 = require("../field-space/def-space");
 class AtomicFieldDeclaration extends malloy_element_1.MalloyElement {
@@ -53,7 +52,6 @@ class AtomicFieldDeclaration extends malloy_element_1.MalloyElement {
         this.defineName = defineName;
         this.exprSrc = exprSrc;
         this.isNoteableObj = true;
-        this.extendNote = noteable_1.extendNoteMethod;
     }
     getName() {
         return this.defineName;
@@ -138,8 +136,8 @@ class AtomicFieldDeclaration extends malloy_element_1.MalloyElement {
             if (this.exprSrc) {
                 ret.code = this.exprSrc;
             }
-            if (this.note) {
-                ret.annotations = { ...this.note };
+            if (this.ownAnnotation) {
+                ret.annotations = { ...this.ownAnnotation };
             }
             return ret;
         }

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

@@ -6,15 +6,13 @@ import { FieldName } from '../types/field-space';
 import type { LookupResult } from '../types/lookup-result';
 import { ListOf, MalloyElement } from '../types/malloy-element';
 import type { Noteable } from '../types/noteable';
-import { extendNoteMethod } from '../types/noteable';
 import type { MakeEntry } from '../types/space-entry';
 import type { FieldDeclarationConstructor } from './field-declaration';
 import { AggregateFieldDeclaration, CalculateFieldDeclaration, GroupByFieldDeclaration, ProjectFieldDeclaration } from './field-declaration';
 export type FieldReferenceConstructor = new (names: FieldName[]) => FieldReference;
 export declare abstract class FieldReference extends ListOf<FieldName> implements Noteable, MakeEntry {
     readonly isNoteableObj = true;
-    note?: AnnotationsDef;
-    extendNote: typeof extendNoteMethod;
+    ownAnnotation?: AnnotationsDef;
     constructor(names: FieldName[]);
     protected autoRenameDeclarationCtor(): FieldDeclarationConstructor | undefined;
     makeEntry(fs: DynamicSpace): void;
@@ -106,9 +104,8 @@ export declare class ViewOrScalarFieldReference extends FieldReference {
 export declare class WildcardFieldReference extends MalloyElement implements Noteable {
     readonly joinPath: FieldReference | undefined;
     elementType: string;
-    note?: AnnotationsDef;
+    ownAnnotation?: AnnotationsDef;
     readonly isNoteableObj = true;
-    extendNote: typeof extendNoteMethod;
     except: Set<string>;
     constructor(joinPath: FieldReference | undefined);
     getFieldDef(): FieldDef;

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

@@ -9,7 +9,6 @@ const reference_field_1 = require("../field-space/reference-field");
 const definition_list_1 = require("../types/definition-list");
 const field_space_1 = require("../types/field-space");
 const malloy_element_1 = require("../types/malloy-element");
-const noteable_1 = require("../types/noteable");
 const expr_id_reference_1 = require("../expressions/expr-id-reference");
 const field_declaration_1 = require("./field-declaration");
 const typecheck_utils_1 = require("./typecheck_utils");
@@ -17,7 +16,6 @@ class FieldReference extends malloy_element_1.ListOf {
     constructor(names) {
         super(names);
         this.isNoteableObj = true;
-        this.extendNote = noteable_1.extendNoteMethod;
     }
     // The `name is path` declaration constructor used to auto-resolve an output
     // name collision for this kind of reference, or undefined if this reference
@@ -70,8 +68,8 @@ class FieldReference extends malloy_element_1.ListOf {
             'to set the name explicitly and silence this warning.');
         const renamedRef = new ExpressionFieldReference(this.list.map(n => new field_space_1.FieldName(n.refString)));
         const decl = new declCtor(new expr_id_reference_1.ExprIdReference(renamedRef), autoName);
-        if (this.note) {
-            decl.note = this.note;
+        if (this.ownAnnotation) {
+            decl.ownAnnotation = this.ownAnnotation;
         }
         // Attach under this reference so the synthetic nodes inherit its location
         // and resolve back to the translator for logging.
@@ -320,7 +318,6 @@ class WildcardFieldReference extends malloy_element_1.MalloyElement {
         this.joinPath = joinPath;
         this.elementType = 'wildcardFieldReference';
         this.isNoteableObj = true;
-        this.extendNote = noteable_1.extendNoteMethod;
         this.except = new Set();
         this.has({ joinPath });
     }

package/dist/lang/ast/query-properties/aggregate.d.ts

@@ -6,4 +6,5 @@ export declare class Aggregate extends DefinitionList<QueryItem> implements Quer
     elementType: string;
     readonly queryRefinementStage = LegalRefinementStage.Single;
     readonly forceQueryClass = QueryClass.Grouping;
+    readonly statement = "aggregate:";
 }

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

@@ -13,6 +13,7 @@ class Aggregate extends definition_list_1.DefinitionList {
         this.elementType = 'aggregateList';
         this.queryRefinementStage = query_property_interface_1.LegalRefinementStage.Single;
         this.forceQueryClass = query_property_interface_1.QueryClass.Grouping;
+        this.statement = 'aggregate:';
     }
 }
 exports.Aggregate = Aggregate;

package/dist/lang/ast/query-properties/group-by.d.ts

@@ -6,4 +6,5 @@ export declare class GroupBy extends DefinitionList<QueryItem> implements QueryP
     elementType: string;
     queryRefinementStage: LegalRefinementStage;
     forceQueryClass: QueryClass;
+    statement: string;
 }

package/dist/lang/ast/query-properties/group-by.js

@@ -13,6 +13,7 @@ class GroupBy extends definition_list_1.DefinitionList {
         this.elementType = 'groupBy';
         this.queryRefinementStage = query_property_interface_1.LegalRefinementStage.Single;
         this.forceQueryClass = query_property_interface_1.QueryClass.Grouping;
+        this.statement = 'group_by:';
     }
 }
 exports.GroupBy = GroupBy;

package/dist/lang/ast/query-properties/indexing.d.ts

@@ -8,6 +8,7 @@ export declare class Index extends MalloyElement implements QueryPropertyInterfa
     elementType: string;
     weightBy?: FieldName;
     forceQueryClass: QueryClass;
+    statement: string;
     queryRefinementStage: undefined;
     constructor(fields: FieldReferences);
     useWeight(fn: FieldName): void;

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

@@ -13,6 +13,7 @@ class Index extends malloy_element_1.MalloyElement {
         this.fields = fields;
         this.elementType = 'index';
         this.forceQueryClass = query_property_interface_1.QueryClass.Index;
+        this.statement = 'index:';
         this.queryRefinementStage = undefined;
     }
     useWeight(fn) {

package/dist/lang/ast/query-properties/nest.d.ts

@@ -8,6 +8,7 @@ export declare class NestFieldDeclaration extends ViewFieldDeclaration implement
     elementType: string;
     queryRefinementStage: LegalRefinementStage;
     forceQueryClass: QueryClass;
+    statement: string;
     turtleDef: model.TurtleDef | undefined;
     queryExecute(executeFor: QueryBuilder): void;
     getFieldDef(fs: FieldSpace): model.TurtleDef;

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

@@ -50,6 +50,7 @@ class NestFieldDeclaration extends view_field_declaration_1.ViewFieldDeclaration
         this.elementType = 'nest-field-declaration';
         this.queryRefinementStage = query_property_interface_1.LegalRefinementStage.Single;
         this.forceQueryClass = query_property_interface_1.QueryClass.Grouping;
+        this.statement = 'nest:';
         this.turtleDef = undefined;
     }
     queryExecute(executeFor) {
@@ -84,7 +85,7 @@ class NestFieldDeclaration extends view_field_declaration_1.ViewFieldDeclaration
                 name: this.name,
                 pipeline: pipelineWithDrillPaths,
                 annotations: {
-                    ...this.note,
+                    ...this.ownAnnotation,
                     inherits: annotations,
                 },
                 location: this.location,

package/dist/lang/ast/query-properties/nests.d.ts

@@ -6,5 +6,6 @@ export declare class Nests extends DefinitionList<NestFieldDeclaration> implemen
     elementType: string;
     queryRefinementStage: LegalRefinementStage;
     forceQueryClass: QueryClass;
+    statement: string;
     constructor(nests: NestFieldDeclaration[]);
 }

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

@@ -13,6 +13,7 @@ class Nests extends definition_list_1.DefinitionList {
         this.elementType = 'nestedQueries';
         this.queryRefinementStage = query_property_interface_1.LegalRefinementStage.Single;
         this.forceQueryClass = query_property_interface_1.QueryClass.Grouping;
+        this.statement = 'nest:';
     }
 }
 exports.Nests = Nests;

package/dist/lang/ast/query-properties/project-statement.d.ts

@@ -6,6 +6,7 @@ import { LegalRefinementStage, QueryClass } from '../types/query-property-interf
 export declare class ProjectStatement extends DefinitionList<FieldCollectionMember> implements QueryPropertyInterface {
     elementType: string;
     forceQueryClass: QueryClass;
+    statement: string;
     queryRefinementStage: LegalRefinementStage;
     queryExecute(executeFor: QueryBuilder): void;
 }

package/dist/lang/ast/query-properties/project-statement.js

@@ -12,6 +12,7 @@ class ProjectStatement extends definition_list_1.DefinitionList {
         super(...arguments);
         this.elementType = 'projectStatement';
         this.forceQueryClass = query_property_interface_1.QueryClass.Project;
+        this.statement = 'select:';
         this.queryRefinementStage = query_property_interface_1.LegalRefinementStage.Single;
     }
     queryExecute(executeFor) {

package/dist/lang/ast/query-properties/qop-desc.js

@@ -12,6 +12,11 @@ const malloy_element_1 = require("../types/malloy-element");
 const query_property_interface_1 = require("../types/query-property-interface");
 const partial_builder_1 = require("../query-builders/partial-builder");
 const utils_1 = require("../../utils");
+function queryContextName(queryClass) {
+    const className = (0, utils_1.modernizeTermsForUserText)(queryClass);
+    const article = className === 'index' ? 'an' : 'a';
+    return `${article} ${className} query`;
+}
 class QOpDesc extends malloy_element_1.ListOf {
     constructor() {
         super(...arguments);
@@ -36,7 +41,8 @@ class QOpDesc extends malloy_element_1.ListOf {
             if (el.forceQueryClass) {
                 if (guessType) {
                     if (guessType !== el.forceQueryClass) {
-                        el.logError(`illegal-${guessType}-operation`, `Use of ${(0, utils_1.modernizeTermsForUserText)(el.forceQueryClass)} is not allowed in a ${(0, utils_1.modernizeTermsForUserText)(guessType)} query`);
+                        const operationName = el.statement;
+                        el.logError(`illegal-${guessType}-operation`, `Use of ${operationName} is not allowed in ${queryContextName(guessType)}`);
                     }
                 }
                 else {
@@ -70,6 +76,11 @@ class QOpDesc extends malloy_element_1.ListOf {
     getOp(inputFS, isNestIn) {
         const build = this.getBuilder(inputFS, isNestIn, this);
         for (const qp of this.list) {
+            if (this.opClass &&
+                qp.forceQueryClass &&
+                qp.forceQueryClass !== this.opClass) {
+                continue;
+            }
             build.execute(qp);
         }
         const segment = build.finalize(this.refineThis);

package/dist/lang/ast/query-properties/sampling.d.ts

@@ -7,6 +7,7 @@ export declare class SampleProperty extends MalloyElement implements QueryProper
     elementType: string;
     queryRefinementStage: LegalRefinementStage;
     forceQueryClass: QueryClass;
+    statement: string;
     constructor(sample: Sampling);
     sampling(): Sampling;
 }

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

@@ -14,6 +14,7 @@ class SampleProperty extends malloy_element_1.MalloyElement {
         this.elementType = 'sampleProperty';
         this.queryRefinementStage = query_property_interface_1.LegalRefinementStage.Tail;
         this.forceQueryClass = query_property_interface_1.QueryClass.Index;
+        this.statement = 'sample:';
     }
     sampling() {
         return this.sample;

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

@@ -7,7 +7,6 @@ import type { FieldSpace } from '../types/field-space';
 import type { ModelEntryReference } from '../types/malloy-element';
 import { MalloyElement } from '../types/malloy-element';
 import type { Noteable } from '../types/noteable';
-import { extendNoteMethod } from '../types/noteable';
 import type { MakeEntry } from '../types/space-entry';
 import type { SourceQueryElement } from '../source-query-elements/source-query-element';
 import type { ParameterSpace } from '../field-space/parameter-space';
@@ -18,9 +17,8 @@ export declare abstract class Join extends MalloyElement implements Noteable, Ma
     abstract getStructDef(parameterSpace: ParameterSpace): JoinFieldDef;
     abstract fixupJoinOn(outer: FieldSpace, inStruct: JoinFieldDef): void;
     readonly isNoteableObj = true;
-    extendNote: typeof extendNoteMethod;
     abstract sourceExpr: SourceQueryElement;
-    note?: AnnotationsDef;
+    ownAnnotation?: AnnotationsDef;
     makeEntry(fs: DynamicSpace): void;
     getName(): string;
     protected getStructDefFromExpr(parameterSpace: ParameterSpace): SourceDef;

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;
     }