@malloydata/malloy 0.0.190 → 0.0.191-dev240925232958

package/dist/lang/ast/expressions/pick-when.js

@@ -24,7 +24,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PickWhen = exports.Pick = void 0;
 const malloy_types_1 = require("../../../model/malloy_types");
-const ast_utils_1 = require("../ast-utils");
 const fragtype_utils_1 = require("../fragtype-utils");
 const expression_def_1 = require("../types/expression-def");
 const malloy_element_1 = require("../types/malloy-element");
@@ -81,9 +80,10 @@ class Pick extends expression_def_1.ExpressionDef {
             anyExpressionType = (0, malloy_types_1.maxExpressionType)(anyExpressionType, (0, malloy_types_1.maxExpressionType)(whenExpr.expressionType, thenExpr.expressionType));
             anyEvalSpace = (0, malloy_types_1.mergeEvalSpaces)(anyEvalSpace, whenExpr.evalSpace, thenExpr.evalSpace);
             if (returnType && !fragtype_utils_1.FT.typeEq(returnType, thenExpr, true)) {
-                const whenType = fragtype_utils_1.FT.inspect(thenExpr);
-                this.log(`pick type '${whenType}', expected '${returnType.dataType}'[pick-values-must-match]`);
-                return (0, ast_utils_1.errorFor)('pick when type');
+                return this.loggedErrorExpr('pick-type-does-not-match', {
+                    pickType: thenExpr.dataType,
+                    returnType: returnType.dataType,
+                });
             }
             returnType = typeCoalesce(returnType, thenExpr);
             caseValue.kids.pickWhen.push(whenExpr.value);
@@ -93,9 +93,18 @@ class Pick extends expression_def_1.ExpressionDef {
         const elseVal = elsePart.getExpression(fs);
         returnType = typeCoalesce(returnType, elseVal);
         if (!fragtype_utils_1.FT.typeEq(returnType, elseVal, true)) {
-            const errSrc = this.elsePick ? 'else' : 'pick default';
-            this.log(`${errSrc} type '${fragtype_utils_1.FT.inspect(elseVal)}', expected '${returnType.dataType}'[pick-values-must-match]`);
-            return (0, ast_utils_1.errorFor)('pick else type');
+            if (this.elsePick) {
+                return this.loggedErrorExpr('pick-else-type-does-not-match', {
+                    elseType: elseVal.dataType,
+                    returnType: returnType.dataType,
+                });
+            }
+            else {
+                return this.loggedErrorExpr('pick-default-type-does-not-match', {
+                    defaultType: elseVal.dataType,
+                    returnType: returnType.dataType,
+                });
+            }
         }
         caseValue.kids.pickElse = elseVal.value;
         return {
@@ -115,19 +124,16 @@ class Pick extends expression_def_1.ExpressionDef {
             },
         };
         if (this.elsePick === undefined) {
-            this.log("pick incomplete, missing 'else'");
-            return (0, ast_utils_1.errorFor)('no value for partial pick');
+            return this.loggedErrorExpr('pick-missing-else', "pick incomplete, missing 'else'");
         }
         const choiceValues = [];
         for (const c of this.choices) {
             if (c.pick === undefined) {
-                this.log('pick with no value can only be used with apply');
-                return (0, ast_utils_1.errorFor)('no value for partial pick');
+                return this.loggedErrorExpr('pick-missing-value', 'pick with no value can only be used with apply');
             }
             const pickWhen = c.when.requestExpression(fs);
             if (pickWhen === undefined) {
-                this.log('pick with partial when can only be used with apply');
-                return (0, ast_utils_1.errorFor)('partial when');
+                this.loggedErrorExpr('pick-illegal-partial', 'pick with partial when can only be used with apply');
             }
             choiceValues.push({
                 pick: c.pick.getExpression(fs),
@@ -139,13 +145,15 @@ class Pick extends expression_def_1.ExpressionDef {
         let anyEvalSpace = 'constant';
         for (const aChoice of choiceValues) {
             if (!fragtype_utils_1.FT.typeEq(aChoice.when, fragtype_utils_1.FT.boolT)) {
-                this.log(`when expression must be boolean, not '${fragtype_utils_1.FT.inspect(aChoice.when)}`);
-                return (0, ast_utils_1.errorFor)('pick when type');
+                return this.loggedErrorExpr('pick-when-must-be-boolean', {
+                    whenType: aChoice.when.dataType,
+                });
             }
             if (returnType && !fragtype_utils_1.FT.typeEq(returnType, aChoice.pick, true)) {
-                const whenType = fragtype_utils_1.FT.inspect(aChoice.pick);
-                this.log(`pick type '${whenType}', expected '${returnType.dataType}'[pick-values-must-match]`);
-                return (0, ast_utils_1.errorFor)('pick value type');
+                return this.loggedErrorExpr('pick-type-does-not-match', {
+                    pickType: aChoice.pick.dataType,
+                    returnType: returnType.dataType,
+                });
             }
             returnType = typeCoalesce(returnType, aChoice.pick);
             anyExpressionType = (0, malloy_types_1.maxExpressionType)(anyExpressionType, (0, malloy_types_1.maxExpressionType)(aChoice.pick.expressionType, aChoice.when.expressionType));
@@ -158,8 +166,10 @@ class Pick extends expression_def_1.ExpressionDef {
         anyEvalSpace = (0, malloy_types_1.mergeEvalSpaces)(anyEvalSpace, defVal.evalSpace);
         returnType = typeCoalesce(returnType, defVal);
         if (!fragtype_utils_1.FT.typeEq(returnType, defVal, true)) {
-            this.elsePick.log(`else type '${fragtype_utils_1.FT.inspect(defVal)}', expected '${returnType.dataType}'[pick-values-must-match]`);
-            return (0, ast_utils_1.errorFor)('pick value type mismatch');
+            return this.elsePick.loggedErrorExpr('pick-else-type-does-not-match', {
+                elseType: defVal.dataType,
+                returnType: returnType.dataType,
+            });
         }
         pick.kids.pickElse = defVal.value;
         return {

package/dist/lang/ast/expressions/range.js

@@ -76,7 +76,7 @@ class Range extends expression_def_1.ExpressionDef {
         return undefined;
     }
     getExpression(_fs) {
-        this.log('A Range is not a value');
+        this.logError('range-as-value', 'A Range is not a value');
         return (0, ast_utils_1.errorFor)('a range is not a value');
     }
 }

package/dist/lang/ast/expressions/top-by.js

@@ -39,7 +39,7 @@ class TopBy extends malloy_element_1.MalloyElement {
         if (this.by instanceof expression_def_1.ExpressionDef) {
             const byExpr = this.by.getExpression(fs);
             if (!(0, malloy_types_1.expressionIsAggregate)(byExpr.expressionType)) {
-                this.log('top by expression must be an aggregate');
+                this.logError('top-by-non-aggregate', 'top by expression must be an aggregate');
             }
             return { by: 'expression', e: byExpr.value };
         }

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

@@ -66,7 +66,7 @@ class DynamicSpace extends static_space_1.StaticSpace {
     }
     newEntry(name, logTo, entry) {
         if (this.entry(name)) {
-            logTo.log(`Cannot redefine '${name}'`);
+            logTo.logError('definition-name-conflict', `Cannot redefine '${name}'`);
             return;
         }
         this.setEntry(name, entry);

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

@@ -43,13 +43,13 @@ class IndexFieldSpace extends query_spaces_1.QueryOperationSpace {
                 this.addWild(indexField);
             }
             else {
-                indexField.log('Internal error, not expected in index query');
+                indexField.logError('invalid-field-in-index-query', 'Internal error, not expected in index query');
             }
         }
     }
     getPipeSegment(refineIndex) {
         if (refineIndex) {
-            this.log('index query operations cannot be refined');
+            this.logError('refinement-of-index-segment', 'index query operations cannot be refined');
             return { type: 'index', indexFields: [] };
         }
         const indexFields = [];
@@ -65,7 +65,7 @@ class IndexFieldSpace extends query_spaces_1.QueryOperationSpace {
                     const fieldRef = field.fieldRef;
                     const check = fieldRef.getField(this.exprSpace);
                     if (check.error) {
-                        fieldRef.log(check.error);
+                        fieldRef.logError(check.error.code, check.error.message);
                     }
                     else {
                         indexFields.push(fieldRef.refToField);
@@ -91,12 +91,12 @@ class IndexFieldSpace extends query_spaces_1.QueryOperationSpace {
                         current = ent.fieldSpace;
                     }
                     else {
-                        pathPart.log(`Field '${part}' does not contain rows and cannot be expanded with '*'`);
+                        pathPart.logError('invalid-wildcard-source', `Field '${part}' does not contain rows and cannot be expanded with '*'`);
                         return;
                     }
                 }
                 else {
-                    pathPart.log(`No such field as '${part}'`);
+                    pathPart.logError('wildcard-source-not-found', `No such field as '${part}'`);
                     return;
                 }
             }
@@ -116,7 +116,7 @@ class IndexFieldSpace extends query_spaces_1.QueryOperationSpace {
             ]);
             if (this.entry(indexName)) {
                 const conflict = (_a = this.expandedWild[indexName]) === null || _a === void 0 ? void 0 : _a.join('.');
-                wild.log(`Cannot expand '${name}' in '${wild.refString}' because a field with that name already exists${conflict ? ` (conflicts with ${conflict})` : ''}`);
+                wild.logError('name-conflict-in-wildcard-expansion', `Cannot expand '${name}' in '${wild.refString}' because a field with that name already exists${conflict ? ` (conflicts with ${conflict})` : ''}`);
             }
             else {
                 const eType = entry.typeDesc();

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

@@ -29,20 +29,31 @@ class ParameterSpace {
         const name = symbol[0];
         if (name === undefined) {
             return {
-                error: 'Invalid reference',
+                error: {
+                    message: 'Invalid reference',
+                    code: 'invalid-parameter-reference',
+                },
                 found: undefined,
             };
         }
         const entry = this.entry(name.refString);
         if (entry === undefined) {
             return {
-                error: `\`${name}\` is not defined`,
+                error: {
+                    message: `\`${name}\` is not defined`,
+                    code: 'parameter-not-found',
+                },
                 found: undefined,
             };
         }
         if (symbol.length > 1) {
             return {
-                error: `\`${name}\` cannot contain a \`${symbol.slice(1).join('.')}\``,
+                error: {
+                    message: `\`${name}\` cannot contain a \`${symbol
+                        .slice(1)
+                        .join('.')}\``,
+                    code: 'invalid-parameter-reference',
+                },
                 found: undefined,
             };
         }

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

@@ -40,7 +40,7 @@ class ProjectFieldSpace extends query_spaces_1.QuerySpace {
         // rather than the whole query.
         if ((0, malloy_types_1.expressionInvolvesAggregate)(typeDesc.expressionType) &&
             (0, malloy_types_1.expressionIsAnalytic)(typeDesc.expressionType)) {
-            this.log('Cannot add aggregate analyics to project');
+            this.logError('aggregate-analytic-in-select', 'Cannot add aggregate analyics to select');
             return false;
         }
         return true;

package/dist/lang/ast/field-space/query-spaces.d.ts

@@ -5,6 +5,7 @@ import { WildcardFieldReference } from '../query-items/field-references';
 import { RefinedSpace } from './refined-space';
 import { LookupResult } from '../types/lookup-result';
 import { QueryInputSpace } from './query-input-space';
+import { LogMessageOptions, MessageCode, MessageParameterType } from '../../parse-log';
 /**
  * The output space of a query operation. It is not named "QueryOutputSpace"
  * because this is the namespace of the Query which is a layer of an output and
@@ -20,7 +21,7 @@ export declare abstract class QueryOperationSpace extends RefinedSpace implement
     expandedWild: Record<string, string[]>;
     constructor(queryInputSpace: FieldSpace, refineThis: model.PipeSegment | undefined, nestParent: QueryOperationSpace | undefined, astEl: MalloyElement);
     abstract addRefineFromFields(refineThis: model.PipeSegment): void;
-    log(s: string): void;
+    logError<T extends MessageCode>(code: T, parameters: MessageParameterType<T>, options?: Omit<LogMessageOptions, 'severity'>): T;
     inputSpace(): QueryInputSpace;
     outputSpace(): QueryOperationSpace;
     protected addWild(wild: WildcardFieldReference): void;

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

@@ -72,10 +72,11 @@ class QueryOperationSpace extends refined_space_1.RefinedSpace {
         if (refineThis)
             this.addRefineFromFields(refineThis);
     }
-    log(s) {
+    logError(code, parameters, options) {
         if (this.astEl) {
-            this.astEl.log(s);
+            this.astEl.logError(code, parameters, options);
         }
+        return code;
     }
     inputSpace() {
         return this.exprSpace;
@@ -98,12 +99,12 @@ class QueryOperationSpace extends refined_space_1.RefinedSpace {
                         current = ent.fieldSpace;
                     }
                     else {
-                        pathPart.log(`Field '${part}' does not contain rows and cannot be expanded with '*'`);
+                        pathPart.logError('invalid-wildcard-source', `Field '${part}' does not contain rows and cannot be expanded with '*'`);
                         return;
                     }
                 }
                 else {
-                    pathPart.log(`No such field as '${part}'`);
+                    pathPart.logError('wildcard-source-not-defined', `No such field as '${part}'`);
                     return;
                 }
             }
@@ -119,7 +120,7 @@ class QueryOperationSpace extends refined_space_1.RefinedSpace {
             }
             if (this.entry(name)) {
                 const conflict = (_a = this.expandedWild[name]) === null || _a === void 0 ? void 0 : _a.join('.');
-                wild.log(`Cannot expand '${name}' in '${wild.refString}' because a field with that name already exists${conflict ? ` (conflicts with ${conflict})` : ''}`);
+                wild.logError('name-conflict-in-wildcard-expansion', `Cannot expand '${name}' in '${wild.refString}' because a field with that name already exists${conflict ? ` (conflicts with ${conflict})` : ''}`);
             }
             else {
                 const eType = entry.typeDesc();
@@ -217,7 +218,7 @@ class QuerySpace extends QueryOperationSpace {
     getPipeSegment(refineFrom) {
         if (this.segmentType === 'index') {
             // come coding error made this "impossible" thing happen
-            this.log('internal error generating index segment from non index query');
+            this.logError('unexpected-index-segment', 'internal error generating index segment from non index query');
             return { type: 'reduce', queryFields: [] };
         }
         if (refineFrom === null || refineFrom === void 0 ? void 0 : refineFrom.extendSource) {

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

@@ -43,7 +43,7 @@ class ReferenceField extends space_field_1.SpaceField {
         if (!this.queryFieldDef) {
             const check = this.fieldRef.getField(fs);
             if (check.error) {
-                this.fieldRef.log(check.error);
+                this.fieldRef.logError(check.error.code, check.error.message);
             }
             // TODO investigate removing 'fieldref' as a type, as it obscures the
             //      actual type of the field and is redundant with the slightly

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

@@ -40,10 +40,10 @@ class RefinedSpace extends dynamic_space_1.DynamicSpace {
                 const existing = oldMap.find(([symb]) => symb === name.refString);
                 if (existing === undefined) {
                     if (parameters === null || parameters === void 0 ? void 0 : parameters.entry(name.refString)) {
-                        name.log(`Illegal \`${choose.edit}:\` of parameter`);
+                        name.logError(`${choose.edit}-parameter`, `Illegal \`${choose.edit}:\` of parameter`);
                     }
                     else {
-                        name.log(`\`${name.refString}\` is not defined`);
+                        name.logError('field-list-edit-not-found', `\`${name.refString}\` is not defined`);
                     }
                 }
             }
@@ -64,7 +64,7 @@ class RefinedSpace extends dynamic_space_1.DynamicSpace {
                 me.makeEntry(this);
             }
             else {
-                me.log(`Internal error, ${me.elementType} not expected in this context`);
+                me.logError('unexpected-element-type', `Internal error, ${me.elementType} not expected in this context`);
             }
         }
     }

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

@@ -96,7 +96,13 @@ class StaticSpace {
         const rest = path.slice(1);
         const found = this.entry(head.refString);
         if (!found) {
-            return { error: `'${head}' is not defined`, found };
+            return {
+                error: {
+                    message: `'${head}' is not defined`,
+                    code: 'field-not-found',
+                },
+                found,
+            };
         }
         if (found instanceof space_field_1.SpaceField) {
             const definition = found.fieldDef();
@@ -133,7 +139,10 @@ class StaticSpace {
                 }
             }
             return {
-                error: `'${head}' cannot contain a '${rest[0]}'`,
+                error: {
+                    message: `'${head}' cannot contain a '${rest[0]}'`,
+                    code: 'invalid-property-access-in-field-reference',
+                },
                 found: undefined,
             };
         }

package/dist/lang/ast/parameters/has-parameter.js

@@ -46,7 +46,7 @@ class HasParameter extends malloy_element_1.MalloyElement {
                 this.type !== constant.dataType &&
                 constant.dataType !== 'null' &&
                 constant.dataType !== 'error') {
-                this.default.log(`Default value for parameter does not match declared type \`${this.type}\``);
+                this.default.logError('parameter-default-does-not-match-declared-type', `Default value for parameter does not match declared type \`${this.type}\``);
             }
             if (constant.dataType === 'null') {
                 if (this.type) {
@@ -57,7 +57,7 @@ class HasParameter extends malloy_element_1.MalloyElement {
                     };
                 }
                 else {
-                    this.default.log('Default value cannot have type `null` unless parameter type is also specified');
+                    this.default.logError('parameter-null-default-without-declared-type', 'Default value cannot have type `null` unless parameter type is also specified');
                     return {
                         value: constant.value,
                         name: this.name,
@@ -66,7 +66,7 @@ class HasParameter extends malloy_element_1.MalloyElement {
                 }
             }
             if (!(0, malloy_types_1.isCastType)(constant.dataType) && constant.dataType !== 'error') {
-                this.default.log(`Default value cannot have type \`${constant.dataType}\``);
+                this.default.logError('parameter-illegal-default-type', `Default value cannot have type \`${constant.dataType}\``);
                 return {
                     value: constant.value,
                     name: this.name,
@@ -80,7 +80,7 @@ class HasParameter extends malloy_element_1.MalloyElement {
             };
         }
         if (this.type === undefined) {
-            this.log('Parameter must have default value or declared type');
+            this.logError('parameter-missing-default-or-type', 'Parameter must have default value or declared type');
         }
         return {
             value: null,

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

@@ -43,7 +43,7 @@ class IndexBuilder {
         }
         else if (qp instanceof limit_1.Limit) {
             if (this.limit) {
-                this.limit.log('Ignored, too many limit: statements');
+                this.limit.logError('index-limit-already-specified', 'Ignored, too many limit: statements');
             }
             this.limit = qp;
         }
@@ -51,7 +51,7 @@ class IndexBuilder {
             this.resultFS.pushFields(...qp.fields.list);
             if (qp.weightBy) {
                 if (this.indexOn) {
-                    this.indexOn.log('Ignoring previous BY');
+                    this.indexOn.logError('index-by-already-specified', 'Ignoring previous BY');
                 }
                 this.indexOn = qp.weightBy;
             }
@@ -60,12 +60,12 @@ class IndexBuilder {
             this.sample = qp.sampling();
         }
         else {
-            qp.log('Not legal in an index query operation');
+            qp.logError('illegal-operation-for-index', 'Not legal in an index query operation');
         }
     }
     finalize(from) {
         if (from && !(0, malloy_types_1.isIndexSegment)(from) && !(0, malloy_types_1.isPartialSegment)(from)) {
-            this.resultFS.log(`Can't refine index with ${from.type}`);
+            this.resultFS.logError('refinement-of-index-segment', `Can't refine index with ${from.type}`);
             return error_factory_1.ErrorFactory.indexSegment;
         }
         const indexSegment = this.resultFS.getPipeSegment(from);

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

@@ -37,7 +37,7 @@ class ProjectBuilder extends reduce_builder_1.QuerySegmentBuilder {
     }
     execute(qp) {
         if (qp.elementType === 'having' || qp instanceof group_by_1.GroupBy) {
-            qp.log('Illegal statement in a select query operation');
+            qp.logError('illegal-operation-in-select-segment', 'Illegal statement in a select query operation');
         }
         else {
             super.execute(qp);
@@ -50,7 +50,7 @@ class ProjectBuilder extends reduce_builder_1.QuerySegmentBuilder {
                 from = fromSeg;
             }
             else {
-                this.resultFS.log(`Can't refine select with ${fromSeg.type}`);
+                this.resultFS.logError('incompatible-segment-for-select-refinement', `Can't refine select with ${fromSeg.type}`);
                 return error_factory_1.ErrorFactory.projectSegment;
             }
         }

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

@@ -49,14 +49,14 @@ class QuerySegmentBuilder {
         }
         else if (qp instanceof top_1.Top) {
             if (this.limit) {
-                qp.log('Query operation already limited');
+                qp.logError('limit-already-specified', 'Query operation already limited');
             }
             else {
                 this.limit = qp.limit;
             }
             if (qp.by) {
                 if (this.order) {
-                    qp.log('Query operation is already sorted');
+                    qp.logError('ordering-already-specified', 'Query operation is already sorted');
                 }
                 else {
                     this.order = qp;
@@ -65,7 +65,7 @@ class QuerySegmentBuilder {
         }
         else if (qp instanceof limit_1.Limit) {
             if (this.limit) {
-                qp.log('Query operation already limited');
+                qp.logError('limit-already-specified', 'Query operation already limited');
             }
             else {
                 this.limit = qp.limit;
@@ -73,7 +73,7 @@ class QuerySegmentBuilder {
         }
         else if (qp instanceof ordering_1.Ordering) {
             if (this.order) {
-                qp.log('Query operation already sorted');
+                qp.logError('ordering-already-specified', 'Query operation already sorted');
             }
             else {
                 this.order = qp;
@@ -130,7 +130,7 @@ class ReduceBuilder extends QuerySegmentBuilder {
                 from = fromSeg;
             }
             else {
-                this.resultFS.log(`Can't refine reduce with ${fromSeg.type}`);
+                this.resultFS.logError('incompatible-segment-for-reduce-refinement', `Can't refine reduce with ${fromSeg.type}`);
                 return error_factory_1.ErrorFactory.reduceSegment;
             }
         }

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

@@ -37,7 +37,7 @@ class AnonymousQuery extends malloy_element_1.MalloyElement {
     execute(doc) {
         const queryObj = this.queryExpr.getQuery();
         if (!queryObj) {
-            this.queryExpr.sqLog('Cannot run this object as a query');
+            this.queryExpr.sqLog('non-query-used-as-query', 'Cannot run this object as a query');
             return;
         }
         const modelQuery = { ...queryObj.query() };

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

@@ -50,7 +50,7 @@ class QueryReference extends malloy_element_1.MalloyElement {
             };
         };
         if (!query) {
-            this.log(`Reference to undefined query '${this.name.refString}'`);
+            this.logError('query-reference-not-found', `Reference to undefined query '${this.name.refString}'`);
             return oops();
         }
         if (query.type === 'query') {
@@ -69,7 +69,7 @@ class QueryReference extends malloy_element_1.MalloyElement {
                 inputStruct,
             };
         }
-        this.log(`Illegal reference to '${this.name}', query expected`);
+        this.logError('non-query-used-as-query', `Illegal reference to '${this.name}', query expected`);
         return oops();
     }
     query() {

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

@@ -67,7 +67,7 @@ class AtomicFieldDeclaration extends malloy_element_1.MalloyElement {
             exprValue = this.expr.getExpression(fs);
         }
         catch (error) {
-            this.log(`Cannot define '${exprName}', ${error.message}`);
+            this.logError('failed-field-definition', `Cannot define '${exprName}', ${error.message}`);
             return {
                 name: exprName,
                 type: 'error',
@@ -75,7 +75,7 @@ class AtomicFieldDeclaration extends malloy_element_1.MalloyElement {
         }
         let retType = exprValue.dataType;
         if (retType === 'null') {
-            this.expr.log('null value defaults to type number, use "null::TYPE" to specify correct type', 'warn');
+            this.expr.logWarning('null-typed-field-definition', 'null value defaults to type number, use "null::TYPE" to specify correct type');
             retType = 'number';
         }
         if ((0, malloy_types_1.isAtomicFieldType)(retType) && retType !== 'error') {
@@ -105,7 +105,7 @@ class AtomicFieldDeclaration extends malloy_element_1.MalloyElement {
         if (!circularDef) {
             if (exprValue.dataType !== 'error') {
                 const badType = fragtype_utils_1.FT.inspect(exprValue);
-                this.log(`Cannot define '${exprName}', unexpected type: ${badType}`);
+                this.logError('invalid-type-for-field-definition', `Cannot define '${exprName}', unexpected type: ${badType}`);
             }
         }
         return {
@@ -214,7 +214,10 @@ class DefSpace {
         if (symbol[0] && symbol[0].refString === this.circular.defineName) {
             this.foundCircle = true;
             return {
-                error: `Circular reference to '${this.circular.defineName}' in definition`,
+                error: {
+                    message: `Circular reference to '${this.circular.defineName}' in definition`,
+                    code: 'circular-reference-in-field-definition',
+                },
                 found: undefined,
             };
         }

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

@@ -37,7 +37,7 @@ class FieldReference extends malloy_element_1.ListOf {
     makeEntry(fs) {
         const refName = this.outputName;
         if (fs.entry(refName)) {
-            this.log(`Output already has a field named '${refName}'`);
+            this.logError('output-name-conflict', `Output already has a field named '${refName}'`);
         }
         else {
             // In a QuerySpace, this needs to be able to find the thing to which it refers