@malloydata/malloy 0.0.395 → 0.0.397

package/dist/model/expression_compiler.js

@@ -29,6 +29,7 @@ const field_instance_1 = require("./field_instance");
 const filter_compilers_1 = require("./filter_compilers");
 const utils_1 = require("./utils");
 const query_node_1 = require("./query_node");
+const malloy_compile_error_1 = require("./malloy_compile_error");
 const NUMERIC_DECIMAL_PRECISION = 9;
 function sqlSumDistinct(dialect, sqlExp, sqlDistintKey) {
     const precision = 9;
@@ -186,7 +187,7 @@ function compileExpr(resultSet, context, expr, state = new utils_1.GenerateState
                 return `${expr.kids.e.sql} ${expr.not ? 'NOT IN' : 'IN'} (${oneOf})`;
             }
             case 'inGiven': {
-                const bound = resolveGivenBoundExpr(context, expr.givenRef.id, expr.givenRef.refName);
+                const bound = resolveGivenBoundExpr(context, expr.givenRef);
                 // null binding collapses to empty-set semantics — not the SQL
                 // `IN (NULL)` shape, which has confusing NULL-membership rules.
                 if (bound.node === 'null') {
@@ -280,27 +281,27 @@ function generateAppliedFilter(context, filterMatchExpr, qi) {
             filterExpr = argument.value;
         }
         else {
-            throw new Error(`Parameter ${name} was expected to be a filter expression`);
+            throw new malloy_compile_error_1.MalloyCompileError(`Parameter '${name}' has no value, but a filter expression is required here.`, 'compiler-filter-parameter-no-value', filterExpr.at);
         }
     }
     if (filterExpr.node === 'given') {
-        const id = filterExpr.id;
-        const supplied = (_c = (_b = context.prepareResultOptions) === null || _b === void 0 ? void 0 : _b.resolvedGivens) === null || _c === void 0 ? void 0 : _c.get(id);
+        const supplied = (_c = (_b = context.prepareResultOptions) === null || _b === void 0 ? void 0 : _b.resolvedGivens) === null || _c === void 0 ? void 0 : _c.get(filterExpr.id);
         if (supplied !== undefined) {
             filterExpr = supplied;
         }
         else {
-            const decl = context.getModel().givens[id];
+            const decl = context.getModel().givens[filterExpr.id];
             if ((decl === null || decl === void 0 ? void 0 : decl.default) !== undefined) {
                 filterExpr = decl.default;
             }
             else {
-                throw new Error(unsatisfiedGivenMessage(filterExpr.refName));
+                throw new malloy_compile_error_1.MalloyCompileError(unsatisfiedGivenMessage(filterExpr.refName), 'compiler-given-no-value', filterExpr.at);
             }
         }
     }
     if (filterExpr.node !== 'filterLiteral') {
-        throw new Error('Can only use filter expression literals or parameters as filter expressions');
+        throw new malloy_compile_error_1.MalloyCompileError("Filter context requires a filter-expression literal (e.g., `f'...'`) " +
+            `or a parameter that resolves to one; got node '${filterExpr.node}'.`, 'compiler-filter-not-literal', undefined);
     }
     const filterSrc = filterExpr.filterSrc;
     let fParse;
@@ -320,10 +321,11 @@ function generateAppliedFilter(context, filterMatchExpr, qi) {
             fParse = malloy_filter_1.TemporalFilterExpression.parse(filterSrc);
             break;
         default:
-            throw new Error(`unsupported filter type ${filterMatchExpr.dataType}`);
+            throw new malloy_compile_error_1.MalloyCompileError(`Filter type '${filterMatchExpr.dataType}' is not supported. ` +
+                'Supported filter types: string, number, boolean, date, timestamp, timestamptz.', 'compiler-filter-type-unsupported', undefined);
     }
     if (fParse.log.length > 0) {
-        throw new Error(`Filter expression parse error: ${fParse.log[0]}`);
+        throw new malloy_compile_error_1.MalloyCompileError(`Filter expression parse error: ${fParse.log[0]}.`, 'compiler-filter-parse-error', undefined);
     }
     return filter_compilers_1.FilterCompilers.compile(filterMatchExpr.dataType, fParse.parsed, filterMatchExpr.kids.expr.sql || '', context.dialect, qi);
 }
@@ -581,7 +583,7 @@ function generateFunctionCallExpression(resultSet, context, frag, state) {
 }
 function generateFieldFragment(resultSet, context, expr, state) {
     // find the structDef and return the path to the field...
-    const fieldRef = context.getFieldByName(expr.path);
+    const fieldRef = context.getFieldByName(expr.path, expr.at);
     if ((0, malloy_types_1.hasExpression)(fieldRef.fieldDef)) {
         const ret = exprToSQL(resultSet, fieldRef.parent, fieldRef.fieldDef.e, state);
         return `(${ret})`;
@@ -614,7 +616,7 @@ function generateParameterFragment(resultSet, context, expr, state) {
     if (argument === null || argument === void 0 ? void 0 : argument.value) {
         return exprToSQL(resultSet, context, argument.value, state);
     }
-    throw new Error(`Can't generate SQL, no value for ${expr.path}`);
+    throw new malloy_compile_error_1.MalloyCompileError(`Parameter '${expr.path.join('.')}' has no value supplied.`, 'compiler-parameter-no-value', expr.at);
 }
 /**
  * Resolve a given to the Expr that should stand in for it at SQL emit:
@@ -625,20 +627,20 @@ function generateParameterFragment(resultSet, context, expr, state) {
  * Shared by `generateGivenFragment` ($NAME directly in an expression)
  * and the `'inGiven'` SQL-emit case ($ARR in `expr in $ARR`).
  */
-function resolveGivenBoundExpr(context, id, refName) {
+function resolveGivenBoundExpr(context, ref) {
     var _a, _b;
-    const supplied = (_b = (_a = context.prepareResultOptions) === null || _a === void 0 ? void 0 : _a.resolvedGivens) === null || _b === void 0 ? void 0 : _b.get(id);
+    const supplied = (_b = (_a = context.prepareResultOptions) === null || _a === void 0 ? void 0 : _a.resolvedGivens) === null || _b === void 0 ? void 0 : _b.get(ref.id);
     if (supplied !== undefined)
         return supplied;
-    const decl = context.getModel().givens[id];
+    const decl = context.getModel().givens[ref.id];
     if ((decl === null || decl === void 0 ? void 0 : decl.default) !== undefined)
         return decl.default;
-    throw new Error(unsatisfiedGivenMessage(refName));
+    throw new malloy_compile_error_1.MalloyCompileError(unsatisfiedGivenMessage(ref.refName), 'compiler-given-no-value', ref.at);
 }
 function generateGivenFragment(resultSet, context, expr, state) {
     // The bound expr may itself be a `$OTHER`-bearing expression; recursive
     // compile handles default chains.
-    const bound = resolveGivenBoundExpr(context, expr.id, expr.refName);
+    const bound = resolveGivenBoundExpr(context, expr);
     return exprToSQL(resultSet, context, bound, state);
 }
 function unsatisfiedGivenMessage(refName) {
@@ -663,7 +665,7 @@ function generateDimFragment(resultSet, context, expr, state) {
 }
 function generateUngroupedFragment(resultSet, context, expr, state) {
     if (state.totalGroupSet !== -1) {
-        throw new Error('Already in ALL.  Cannot nest within an all calcuation.');
+        throw new malloy_compile_error_1.MalloyCompileError("Cannot nest 'all()' or 'exclude()' inside another 'all()' calculation.", 'compiler-nested-ungroup', undefined);
     }
     let totalGroupSet;
     let ungroupSet;

package/dist/model/field_instance.js

@@ -6,6 +6,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.FieldInstanceResultRoot = exports.FieldInstanceResult = exports.FieldInstanceField = void 0;
 exports.sqlFullChildReference = sqlFullChildReference;
+const malloy_compile_error_1 = require("./malloy_compile_error");
 const malloy_types_1 = require("./malloy_types");
 const utils_1 = require("./utils");
 const join_instance_1 = require("./join_instance");
@@ -139,7 +140,8 @@ class FieldInstanceResult {
         const fi = this.allFields.get(as);
         if (fi) {
             if (fi.type === 'query') {
-                throw new Error(`Redefinition of field ${field.fieldDef.name} as struct`);
+                throw new malloy_compile_error_1.MalloyCompileError(`Field '${field.fieldDef.name}' is already defined as a nested view; ` +
+                    'cannot also use it as a scalar field in this output.', 'compiler-field-redefined-as-struct', field.fieldDef.location);
             }
             const fif = fi;
             if (fif.fieldUsage.type === 'result') {
@@ -148,7 +150,8 @@ class FieldInstanceResult {
                     return;
                 }
                 else {
-                    throw new Error(`Ambiguous output field name '${field.fieldDef.name}'.`);
+                    throw new malloy_compile_error_1.MalloyCompileError(`Output field name '${field.fieldDef.name}' is ambiguous — ` +
+                        'defined more than once at the query output level.', 'compiler-ambiguous-output-name', field.fieldDef.location);
                 }
             }
         }
@@ -373,7 +376,8 @@ class FieldInstanceResult {
         // verify that all names specified are available in the current scope.
         for (const fieldName of (ungroupSet === null || ungroupSet === void 0 ? void 0 : ungroupSet.fields) || []) {
             if (inScopeFieldNames.indexOf(fieldName) === -1) {
-                throw new Error(`${ungroupSet === null || ungroupSet === void 0 ? void 0 : ungroupSet.type}(): unknown field name "${fieldName}" or name not in scope.`);
+                throw new malloy_compile_error_1.MalloyCompileError(`'${ungroupSet === null || ungroupSet === void 0 ? void 0 : ungroupSet.type}()' references field '${fieldName}', ` +
+                    'which is not defined or not in scope at this nesting level.', 'compiler-ungroup-field-unknown', undefined);
             }
         }
         return ret;

package/dist/model/given_binding.js

@@ -10,6 +10,7 @@ const luxon_1 = require("luxon");
 const closest_match_1 = require("../util/closest_match");
 const inline_expr_1 = require("./inline_expr");
 const malloy_types_1 = require("./malloy_types");
+const malloy_compile_error_1 = require("./malloy_compile_error");
 function resolveSuppliedGivens(supplied, modelDef) {
     var _a;
     const out = new Map();
@@ -20,9 +21,9 @@ function resolveSuppliedGivens(supplied, modelDef) {
     // prototype pollution from e.g. an Object.create(...)-derived input.
     for (const [name, value] of Object.entries(supplied)) {
         if (value === undefined) {
-            throw new Error(`givens.${name}: explicit undefined is not a valid value. ` +
+            throw new malloy_compile_error_1.MalloyCompileError(`givens.${name}: explicit undefined is not a valid value. ` +
                 'Omit the key to defer to declaration default or a lower supply ' +
-                'layer; use null for an explicit null value.');
+                'layer; use null for an explicit null value.', 'runtime-given-undefined', undefined);
         }
         const entry = modelDef.contents[name];
         if (!entry || entry.type !== 'given') {
@@ -33,7 +34,8 @@ function resolveSuppliedGivens(supplied, modelDef) {
             }
             const suggestion = (0, closest_match_1.closestMatch)(name, surfaceNames);
             const hint = suggestion ? ` (did you mean '${suggestion}'?)` : '';
-            throw new Error(`givens: unknown given '${name}'${hint}. Model surfaces [${surfaceNames.join(', ')}]`);
+            throw new malloy_compile_error_1.MalloyCompileError(`givens: unknown given '${name}'${hint}. ` +
+                `Model surfaces [${surfaceNames.join(', ')}]`, 'runtime-given-unknown', undefined);
         }
         const decl = givens[entry.id];
         if (!decl) {
@@ -83,10 +85,13 @@ function valueToExpr(path, type, value) {
     if (value === null) {
         return { node: 'null' };
     }
+    function bad(msg, code = 'runtime-given-bad-value') {
+        throw new malloy_compile_error_1.MalloyCompileError(`givens.${path}: ${msg}`, code, undefined);
+    }
     switch (type.type) {
         case 'string': {
             if (typeof value !== 'string') {
-                throw new TypeError(`givens.${path}: expected string, got ${describeJs(value)}`);
+                bad(`expected string, got ${describeJs(value)}`);
             }
             return { node: 'stringLiteral', literal: value };
         }
@@ -94,7 +99,7 @@ function valueToExpr(path, type, value) {
             let lit;
             if (typeof value === 'number') {
                 if (!Number.isFinite(value)) {
-                    throw new TypeError(`givens.${path}: number must be finite, got ${value}`);
+                    bad(`number must be finite, got ${value}`);
                 }
                 lit = String(value);
             }
@@ -103,27 +108,27 @@ function valueToExpr(path, type, value) {
             }
             else if (typeof value === 'string') {
                 if (!/^-?(\d+(\.\d+)?|\.\d+)([eE][+-]?\d+)?$/.test(value)) {
-                    throw new TypeError(`givens.${path}: number-as-string must be numeric, got '${value}'`);
+                    bad(`number-as-string must be numeric, got '${value}'`);
                 }
                 lit = value;
             }
             else {
-                throw new TypeError(`givens.${path}: expected number | bigint | string, got ${describeJs(value)}`);
+                bad(`expected number | bigint | string, got ${describeJs(value)}`);
             }
             return { node: 'numberLiteral', literal: lit };
         }
         case 'boolean': {
             if (typeof value !== 'boolean') {
-                throw new TypeError(`givens.${path}: expected boolean, got ${describeJs(value)}`);
+                bad(`expected boolean, got ${describeJs(value)}`);
             }
             return { node: value ? 'true' : 'false' };
         }
         case 'date': {
             if (typeof value !== 'string') {
-                throw new TypeError(`givens.${path}: expected ISO date string 'YYYY-MM-DD', got ${describeJs(value)}`);
+                bad(`expected ISO date string 'YYYY-MM-DD', got ${describeJs(value)}`);
             }
             if (!/^\d{4}-\d{2}-\d{2}$/.test(value)) {
-                throw new TypeError(`givens.${path}: date must match 'YYYY-MM-DD', got '${value}'`);
+                bad(`date must match 'YYYY-MM-DD', got '${value}'`);
             }
             return { node: 'dateLiteral', literal: value, typeDef: { type: 'date' } };
         }
@@ -133,17 +138,17 @@ function valueToExpr(path, type, value) {
             // strings (those want 'timestamptz'). Parse the rest with Luxon and
             // emit canonical "YYYY-MM-DD HH:MM:SS.sss" for the dialect.
             if (typeof value !== 'string') {
-                throw new TypeError(`givens.${path}: expected ISO timestamp string (no offset), got ${describeJs(value)}`);
+                bad(`expected ISO timestamp string (no offset), got ${describeJs(value)}`);
             }
             if (/Z$|[+-]\d{2}:?\d{2}$/.test(value)) {
-                throw new TypeError(`givens.${path}: 'timestamp' is naive — use 'timestamptz' for offset/zoned values, got '${value}'`);
+                bad(`'timestamp' is naive — use 'timestamptz' for offset/zoned values, got '${value}'`);
             }
             // ISO uses T-separator; SQL form uses space. Accept both.
             let dt = luxon_1.DateTime.fromISO(value, { zone: 'utc' });
             if (!dt.isValid)
                 dt = luxon_1.DateTime.fromSQL(value, { zone: 'utc' });
             if (!dt.isValid) {
-                throw new TypeError(`givens.${path}: invalid timestamp value '${value}': ${(_a = dt.invalidReason) !== null && _a !== void 0 ? _a : 'unknown'}`);
+                bad(`invalid timestamp value '${value}': ${(_a = dt.invalidReason) !== null && _a !== void 0 ? _a : 'unknown'}`);
             }
             return {
                 node: 'timestampLiteral',
@@ -162,10 +167,10 @@ function valueToExpr(path, type, value) {
                     dt = dt.toUTC();
             }
             else {
-                throw new TypeError(`givens.${path}: expected JS Date or ISO timestamptz string, got ${describeJs(value)}`);
+                bad(`expected JS Date or ISO timestamptz string, got ${describeJs(value)}`);
             }
             if (!dt.isValid) {
-                throw new TypeError(`givens.${path}: invalid timestamptz value '${value}': ${(_b = dt.invalidReason) !== null && _b !== void 0 ? _b : 'unknown'}`);
+                bad(`invalid timestamptz value '${value}': ${(_b = dt.invalidReason) !== null && _b !== void 0 ? _b : 'unknown'}`);
             }
             return {
                 node: 'timestamptzLiteral',
@@ -176,13 +181,13 @@ function valueToExpr(path, type, value) {
         }
         case 'filter expression': {
             if (typeof value !== 'string') {
-                throw new TypeError(`givens.${path}: filter<T> givens require a JS string of Malloy filter source, got ${describeJs(value)}`);
+                bad(`filter<T> givens require a JS string of Malloy filter source, got ${describeJs(value)}`);
             }
             return { node: 'filterLiteral', filterSrc: value };
         }
         case 'array': {
             if (!Array.isArray(value)) {
-                throw new TypeError(`givens.${path}: expected array, got ${describeJs(value)}`);
+                bad(`expected array, got ${describeJs(value)}`);
             }
             // RepeatedRecord (array of records) carries `record_element` as its
             // element type and the record's schema in `fields`. Each element is
@@ -198,19 +203,19 @@ function valueToExpr(path, type, value) {
             if (typeof value !== 'object' ||
                 Array.isArray(value) ||
                 value instanceof Date) {
-                throw new TypeError(`givens.${path}: expected object, got ${describeJs(value)}`);
+                bad(`expected object, got ${describeJs(value)}`);
             }
             const obj = value;
             const declared = new Set(type.fields.map(f => f.name));
             for (const k of Object.keys(obj)) {
                 if (!declared.has(k)) {
-                    throw new TypeError(`givens.${path}.${k}: unexpected key (not in record type [${[...declared].join(', ')}])`);
+                    throw new malloy_compile_error_1.MalloyCompileError(`givens.${path}.${k}: unexpected key (not in record type [${[...declared].join(', ')}])`, 'runtime-given-record-extra-key', undefined);
                 }
             }
             const kids = (0, malloy_types_1.mkSafeRecord)();
             for (const field of type.fields) {
                 if (!(field.name in obj)) {
-                    throw new TypeError(`givens.${path}.${field.name}: missing required key`);
+                    throw new malloy_compile_error_1.MalloyCompileError(`givens.${path}.${field.name}: missing required key`, 'runtime-given-record-missing-key', undefined);
                 }
                 kids[field.name] = valueToExpr(`${path}.${field.name}`, malloy_types_1.TD.atomicDef(field), obj[field.name]);
             }
@@ -219,7 +224,7 @@ function valueToExpr(path, type, value) {
         case 'json':
         case 'sql native':
         case 'error':
-            throw new Error(`givens.${path}: type '${type.type}' is not bindable`);
+            throw new malloy_compile_error_1.MalloyCompileError(`givens.${path}: type '${type.type}' is not bindable as a given value.`, 'runtime-given-type-not-bindable', undefined);
         default: {
             // Exhaustiveness: future GivenTypeDef additions will trip this.
             const _x = type;

package/dist/model/index.d.ts

@@ -7,4 +7,5 @@ export { getResultStructDefForQuery, getResultStructDefForView, } from './query_
 export { indent, composeSQLExpr, makeDigest, mkModelDef, pathToKey, typeDefToString, } from './utils';
 export { constantExprToSQL } from './constant_expression_compiler';
 export { getCompiledSQL } from './sql_compiled';
+export { MalloyCompileError } from './malloy_compile_error';
 export { mkSourceID, mkBuildID, mkQuerySourceDef, mkSQLSourceDef, mkTableSourceDef, resolveSourceID, registerSource, hasSourceRegistryEntry, } from './source_def_utils';

package/dist/model/index.js

@@ -36,7 +36,7 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hasSourceRegistryEntry = exports.registerSource = exports.resolveSourceID = exports.mkTableSourceDef = exports.mkSQLSourceDef = exports.mkQuerySourceDef = exports.mkBuildID = exports.mkSourceID = exports.getCompiledSQL = exports.constantExprToSQL = exports.typeDefToString = exports.pathToKey = exports.mkModelDef = exports.makeDigest = exports.composeSQLExpr = exports.indent = exports.getResultStructDefForView = exports.getResultStructDefForQuery = exports.QueryModel = exports.QueryQuery = exports.QueryStruct = exports.QueryField = void 0;
+exports.hasSourceRegistryEntry = exports.registerSource = exports.resolveSourceID = exports.mkTableSourceDef = exports.mkSQLSourceDef = exports.mkQuerySourceDef = exports.mkBuildID = exports.mkSourceID = exports.MalloyCompileError = exports.getCompiledSQL = exports.constantExprToSQL = exports.typeDefToString = exports.pathToKey = exports.mkModelDef = exports.makeDigest = exports.composeSQLExpr = exports.indent = exports.getResultStructDefForView = exports.getResultStructDefForQuery = exports.QueryModel = exports.QueryQuery = exports.QueryStruct = exports.QueryField = void 0;
 __exportStar(require("./malloy_types"), exports);
 const query_node_1 = require("./query_node");
 Object.defineProperty(exports, "QueryField", { enumerable: true, get: function () { return query_node_1.QueryField; } });
@@ -66,6 +66,8 @@ var constant_expression_compiler_1 = require("./constant_expression_compiler");
 Object.defineProperty(exports, "constantExprToSQL", { enumerable: true, get: function () { return constant_expression_compiler_1.constantExprToSQL; } });
 var sql_compiled_1 = require("./sql_compiled");
 Object.defineProperty(exports, "getCompiledSQL", { enumerable: true, get: function () { return sql_compiled_1.getCompiledSQL; } });
+var malloy_compile_error_1 = require("./malloy_compile_error");
+Object.defineProperty(exports, "MalloyCompileError", { enumerable: true, get: function () { return malloy_compile_error_1.MalloyCompileError; } });
 var source_def_utils_1 = require("./source_def_utils");
 Object.defineProperty(exports, "mkSourceID", { enumerable: true, get: function () { return source_def_utils_1.mkSourceID; } });
 Object.defineProperty(exports, "mkBuildID", { enumerable: true, get: function () { return source_def_utils_1.mkBuildID; } });

package/dist/model/malloy_compile_error.d.ts

@@ -0,0 +1,13 @@
+import type { DocumentLocation } from './malloy_types';
+/**
+ * Thrown by the SQL compiler (`src/model/`) for user-actionable errors the
+ * translator didn't catch. Caught at the materializer boundary and turned
+ * into a `LogMessage`. Singular `at` reflects the fail-fast contract — the
+ * first such error stops compilation. Invariant violations stay as bare
+ * `Error` and surface as `code: 'compiler-bug'` instead.
+ */
+export declare class MalloyCompileError extends Error {
+    readonly code: string;
+    readonly at: DocumentLocation | undefined;
+    constructor(message: string, code: string, at: DocumentLocation | undefined);
+}

package/dist/model/malloy_compile_error.js

@@ -0,0 +1,23 @@
+"use strict";
+/*
+ * Copyright Contributors to the Malloy project
+ * SPDX-License-Identifier: MIT
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.MalloyCompileError = void 0;
+/**
+ * Thrown by the SQL compiler (`src/model/`) for user-actionable errors the
+ * translator didn't catch. Caught at the materializer boundary and turned
+ * into a `LogMessage`. Singular `at` reflects the fail-fast contract — the
+ * first such error stops compilation. Invariant violations stay as bare
+ * `Error` and surface as `code: 'compiler-bug'` instead.
+ */
+class MalloyCompileError extends Error {
+    constructor(message, code, at) {
+        super(message);
+        this.code = code;
+        this.at = at;
+    }
+}
+exports.MalloyCompileError = MalloyCompileError;
+//# sourceMappingURL=malloy_compile_error.js.map

package/dist/model/malloy_types.d.ts

@@ -127,11 +127,13 @@ export interface SourceReferenceNode extends ExprLeaf {
 export interface ParameterNode extends ExprLeaf {
     node: 'parameter';
     path: string[];
+    at?: DocumentLocation;
 }
 export interface GivenRefNode extends ExprLeaf {
     node: 'given';
     id: GivenID;
     refName: string;
+    at?: DocumentLocation;
 }
 export interface NowNode extends ExprLeaf {
     node: 'now';
@@ -1136,6 +1138,13 @@ export interface Annotation {
 export interface Note {
     text: string;
     at: DocumentLocation;
+    /**
+     * For block annotations: characters of leading whitespace removed from each
+     * body line by the dedent pass. Used to map payload-parser error columns
+     * back to source (`source_col = indentStripped + parser_col` for body lines).
+     * Omitted for single-line notes and blocks with no common indent.
+     */
+    indentStripped?: number;
 }
 /** Annotations with a uuid to make it easier to stream */
 export interface ModelAnnotation extends Annotation {

package/dist/model/persist_utils.js

@@ -24,7 +24,7 @@ function resolveSource(modelDef, name) {
 function checkPersistAnnotation(source) {
     if (!source.annotation)
         return { persist: false, log: [] };
-    const { tag, log } = (0, annotation_1.annotationToTag)(source.annotation, { prefix: /^#@ / });
+    const { tag, log } = new annotation_1.Annotations(source.annotation).parseAsTag('@');
     return { persist: tag.has('persist'), log };
 }
 /**

package/dist/model/query_model_impl.js

@@ -14,6 +14,7 @@ const stage_writer_1 = require("./stage_writer");
 const dialect_1 = require("../dialect");
 const query_node_1 = require("./query_node");
 const row_data_utils_1 = require("../api/row_data_utils");
+const malloy_compile_error_1 = require("./malloy_compile_error");
 function makeQueryModel(modelDef) {
     return new QueryModelImpl(modelDef);
 }
@@ -66,7 +67,7 @@ class QueryModelImpl {
         if (s) {
             return s;
         }
-        throw new Error(`Struct ${name} not found in model.`);
+        throw new malloy_compile_error_1.MalloyCompileError(`Source '${name}' is not defined in this model.`, 'compiler-undefined-source', undefined);
     }
     getStructFromRef(structRef, sourceArguments, prepareResultOptions) {
         prepareResultOptions !== null && prepareResultOptions !== void 0 ? prepareResultOptions : (prepareResultOptions = {});

package/dist/model/query_node.d.ts

@@ -1,4 +1,4 @@
-import type { FieldDef, BooleanFieldDef, DateFieldDef, StringFieldDef, JSONFieldDef, NumberFieldDef, ATimestampFieldDef, NativeUnsupportedFieldDef, JoinFieldDef, Argument, Given, GivenID, PrepareResultOptions, AtomicFieldDef, BasicAtomicDef, FilterCondition, RefToField, StructDef, TurtleDef, TurtleDefPlusFilters, SourceDef, Query } from './malloy_types';
+import type { FieldDef, BooleanFieldDef, DateFieldDef, DocumentLocation, StringFieldDef, JSONFieldDef, NumberFieldDef, ATimestampFieldDef, NativeUnsupportedFieldDef, JoinFieldDef, Argument, Given, GivenID, PrepareResultOptions, AtomicFieldDef, BasicAtomicDef, FilterCondition, RefToField, StructDef, TurtleDef, TurtleDefPlusFilters, SourceDef, Query } from './malloy_types';
 import type { EventStream } from '../runtime_types';
 import type { Tag } from '@malloydata/malloy-tag';
 import type { Dialect } from '../dialect';
@@ -106,7 +106,7 @@ export declare class QueryStruct {
     getFullOutputName(): string;
     unnestWithNumbers(): boolean;
     getJoinableParent(): QueryStruct;
-    addFieldToNameMap(as: string, n: QueryField): void;
+    addFieldToNameMap(as: string, n: QueryField, at?: DocumentLocation): void;
     /** the the primary key or throw an error. */
     getPrimaryKeyField(fieldDef: FieldDef): QueryBasicField;
     /**
@@ -126,14 +126,14 @@ export declare class QueryStruct {
     primaryKey(): QueryBasicField | undefined;
     getChildByName(name: string): QueryField | undefined;
     /** convert a path into a field reference */
-    getFieldByName(path: string[]): QueryField;
-    getQueryFieldByName(name: string[]): QueryField;
+    getFieldByName(path: string[], at?: DocumentLocation): QueryField;
+    getQueryFieldByName(name: string[], at?: DocumentLocation): QueryField;
     getQueryFieldReference(f: RefToField): QueryField;
     getDimensionOrMeasureByName(name: string[]): QueryField;
     /** returns a query object for the given name */
     getDimensionByName(name: string[]): QueryBasicField;
     /** returns a query object for the given name */
-    getStructByName(name: string[]): QueryStruct;
+    getStructByName(name: string[], at?: DocumentLocation): QueryStruct;
     getDistinctKey(): QueryBasicField;
     applyStructFiltersToTurtleDef(turtleDef: TurtleDef | TurtleDefPlusFilters): TurtleDef;
 }

package/dist/model/query_node.js

@@ -12,6 +12,7 @@ exports.isBasicAggregate = isBasicAggregate;
 exports.isBasicCalculation = isBasicCalculation;
 exports.isBasicScalar = isBasicScalar;
 const uuid_1 = require("uuid");
+const malloy_compile_error_1 = require("./malloy_compile_error");
 const malloy_types_1 = require("./malloy_types");
 const annotation_1 = require("../annotation");
 const dialect_1 = require("../dialect");
@@ -205,7 +206,7 @@ class QueryStruct {
     modelCompilerFlags() {
         if (this._modelTag === undefined) {
             const annotation = this.structDef.modelAnnotation;
-            const { tag } = (0, annotation_1.annotationToTag)(annotation, { prefix: /^##!\s*/ });
+            const { tag } = new annotation_1.Annotations(annotation).parseAsTag('!');
             this._modelTag = tag;
         }
         return this._modelTag;
@@ -245,7 +246,8 @@ class QueryStruct {
                             ? this.parent.resolveParentParameterReferences(resolved1)
                             : resolved1;
                         if (resolved2.value === null) {
-                            throw new Error('Invalid parameter value');
+                            throw new malloy_compile_error_1.MalloyCompileError(`Parameter '${frag.path[0]}' resolves to a null value chain; ` +
+                                'this parameter was not supplied.', 'compiler-parameter-no-value', undefined);
                         }
                         else {
                             return resolved2.value;
@@ -284,10 +286,10 @@ class QueryStruct {
                 if (!QueryStruct.turtleFieldMaker) {
                     throw new Error('INTERNAL ERROR: QueryQuery must initialize QueryStruct nested factory method');
                 }
-                this.addFieldToNameMap(as, QueryStruct.turtleFieldMaker(field, this));
+                this.addFieldToNameMap(as, QueryStruct.turtleFieldMaker(field, this), field.location);
             }
             else if ((0, malloy_types_1.isAtomic)(field) || (0, malloy_types_1.isJoinedSource)(field)) {
-                this.addFieldToNameMap(as, this.makeQueryField(field));
+                this.addFieldToNameMap(as, this.makeQueryField(field), field.location);
             }
             else {
                 // According to the type system this should be impossible, but we have seen this happen
@@ -413,9 +415,9 @@ class QueryStruct {
         }
         return this;
     }
-    addFieldToNameMap(as, n) {
+    addFieldToNameMap(as, n, at) {
         if (this.nameMap.has(as)) {
-            throw new Error(`Redefinition of ${as}`);
+            throw new malloy_compile_error_1.MalloyCompileError(`Field name '${as}' is defined more than once in this scope.`, 'compiler-name-redefined', at);
         }
         this.nameMap.set(as, n);
     }
@@ -426,7 +428,9 @@ class QueryStruct {
             return pk;
         }
         else {
-            throw new Error(`Missing primary key for ${fieldDef}`);
+            throw new malloy_compile_error_1.MalloyCompileError(`Source '${(0, malloy_types_1.getIdentifier)(this.structDef)}' has no primary key; ` +
+                `cannot compute a unique key for field '${(0, malloy_types_1.getIdentifier)(fieldDef)}'. ` +
+                'Add `primary_key: <field>` to the source definition.', 'compiler-missing-primary-key', fieldDef.location);
         }
     }
     /**
@@ -528,7 +532,7 @@ class QueryStruct {
         return this.nameMap.get(name);
     }
     /** convert a path into a field reference */
-    getFieldByName(path) {
+    getFieldByName(path, at) {
         let found = undefined;
         let lookIn = this;
         let notFound = path[0];
@@ -542,22 +546,23 @@ class QueryStruct {
                 found instanceof QueryFieldStruct ? found.queryStruct : undefined;
         }
         if (found === undefined) {
-            const pathErr = path.length > 1 ? ` in ${path.join('.')}` : '';
-            throw new Error(`${notFound} not found${pathErr}`);
+            const pathErr = path.length > 1 ? ` in path '${path.join('.')}'` : '';
+            throw new malloy_compile_error_1.MalloyCompileError(`Field '${notFound}' not found${pathErr}.`, 'compiler-field-not-found', at);
         }
         return found;
     }
     // structs referenced in queries are converted to fields.
-    getQueryFieldByName(name) {
-        const field = this.getFieldByName(name);
+    getQueryFieldByName(name, at) {
+        const field = this.getFieldByName(name, at);
         if (field instanceof QueryFieldStruct) {
-            throw new Error(`Cannot reference ${name.join('.')} as a scalar'`);
+            throw new malloy_compile_error_1.MalloyCompileError(`'${name.join('.')}' refers to a source or join, not a scalar field. ` +
+                'Use `source.field` to reference fields inside it.', 'compiler-cannot-reference-as-scalar', at);
         }
         return field;
     }
     getQueryFieldReference(f) {
         const { path, annotation, drillExpression } = f;
-        const field = this.getFieldByName(path);
+        const field = this.getFieldByName(path, f.at);
         if (annotation || drillExpression) {
             if (field.parent === undefined) {
                 throw new Error('Inconcievable, field reference to orphaned query field');
@@ -591,15 +596,15 @@ class QueryStruct {
         throw new Error(`${name} is not an atomic scalar field? Inconceivable!`);
     }
     /** returns a query object for the given name */
-    getStructByName(name) {
+    getStructByName(name, at) {
         if (name.length === 0) {
             return this;
         }
-        const struct = this.getFieldByName(name);
+        const struct = this.getFieldByName(name, at);
         if (struct instanceof QueryFieldStruct) {
             return struct.queryStruct;
         }
-        throw new Error(`Error: Path to structure not found '${name.join('.')}'`);
+        throw new malloy_compile_error_1.MalloyCompileError(`'${name.join('.')}' is not a source or join.`, 'compiler-struct-not-found', at);
     }
     getDistinctKey() {
         if (this.structDef.type !== 'record') {