@malloydata/malloy 0.0.403 → 0.0.404

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

@@ -50,7 +50,7 @@ class TypedSource extends source_1.Source {
             }
         }
         const isVirtual = sourceDef.type === 'virtual';
-        const sourceFields = new Map(sourceDef.fields.map(f => { var _a; return [(_a = f.as) !== null && _a !== void 0 ? _a : f.name, f]; }));
+        const sourceFields = new Map(sourceDef.fields.map(f => [(0, malloy_types_1.activeName)(f), f]));
         const fieldsToAdd = [];
         // Validate/Enforce that this source matches the shape
         for (const [name, { field, fromShape }] of outputShape) {
@@ -72,8 +72,7 @@ class TypedSource extends source_1.Source {
         // Intrinsic fields not in any shape: mark as hidden.
         // Matching fields inherit annotations from the shape.
         const resultFields = sourceDef.fields.map(f => {
-            var _a;
-            const name = (_a = f.as) !== null && _a !== void 0 ? _a : f.name;
+            const name = (0, malloy_types_1.activeName)(f);
             const shapeEntry = outputShape.get(name);
             if (!shapeEntry || !(0, malloy_types_1.fieldIsIntrinsic)(f)) {
                 return (0, malloy_types_1.fieldIsIntrinsic)(f) && !shapeEntry

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

@@ -69,13 +69,12 @@ class KeyJoin extends Join {
         }
         const joinStruct = {
             ...sourceDef,
-            name: this.name.refString,
+            as: this.name.refString,
             join: 'one',
             matrixOperation: 'left',
             onExpression: { node: 'error', message: "('join fixup'='not done yet')" },
             location: this.location,
         };
-        delete joinStruct.as;
         if (this.note) {
             joinStruct.annotations = this.note;
         }
@@ -85,7 +84,7 @@ class KeyJoin extends Join {
     fixupJoinOn(outer, inStruct) {
         const exprX = this.keyExpr.getExpression(outer);
         if ((0, malloy_types_1.isSourceDef)(inStruct) && inStruct.primaryKey) {
-            const pkey = inStruct.fields.find(f => (f.as || f.name) === inStruct.primaryKey);
+            const pkey = inStruct.fields.find(f => (0, malloy_types_1.activeName)(f) === inStruct.primaryKey);
             if (pkey) {
                 if (pkey.type === exprX.type) {
                     const keyPath = [this.name.refString, inStruct.primaryKey];
@@ -165,12 +164,11 @@ class ExpressionJoin extends Join {
         }
         const joinStruct = {
             ...sourceDef,
-            name: this.name.refString,
+            as: this.name.refString,
             join: this.joinType,
             matrixOperation,
             location: this.location,
         };
-        delete joinStruct.as;
         if (this.note) {
             joinStruct.annotations = this.note;
         }

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

@@ -52,7 +52,7 @@ class SQReference extends source_query_element_1.SourceQueryElement {
                 return query;
             }
             else {
-                const label = entry.type === 'given' ? entry.name : entry.as || entry.name;
+                const label = entry.type === 'given' ? entry.name : (0, model_1.activeName)(entry);
                 this.sqLog('cannot-use-as-query', `Illegal reference to '${label}', query expected`);
             }
         }

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

@@ -97,7 +97,7 @@ class DefineSource extends malloy_element_1.MalloyElement {
     }
     validateParameterShadowing(parameters, structDef) {
         for (const parameter of parameters) {
-            if (structDef.fields.find(field => { var _a; return ((_a = field.as) !== null && _a !== void 0 ? _a : field.name) === parameter.name; })) {
+            if (structDef.fields.find(field => (0, malloy_types_1.activeName)(field) === parameter.name)) {
                 parameter.logError('parameter-shadowing-field', `Illegal shadowing of field \`${parameter.name}\` by parameter with the same name`);
             }
         }

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

@@ -55,6 +55,7 @@ export declare abstract class MalloyElement {
      */
     toString(): string;
     private stringify;
+    allChildren(): Generator<MalloyElement>;
     walk(): Generator<MalloyElement>;
     protected varInfo(): string;
     protected internalError(msg: string): Error;

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

@@ -238,21 +238,23 @@ class MalloyElement {
         }
         return asString;
     }
-    *walk() {
+    *allChildren() {
         for (const kidLabel of Object.keys(this.children)) {
             const kiddle = this.children[kidLabel];
             if (kiddle instanceof MalloyElement) {
                 yield kiddle;
-                yield* kiddle.walk();
             }
             else {
-                for (const k of kiddle) {
-                    yield k;
-                    yield* k.walk();
-                }
+                yield* kiddle;
             }
         }
     }
+    *walk() {
+        for (const child of this.allChildren()) {
+            yield child;
+            yield* child.walk();
+        }
+    }
     varInfo() {
         let extra = '';
         for (const [key, value] of Object.entries(this)) {
@@ -271,7 +273,7 @@ class MalloyElement {
         return new Error(`INTERNAL ERROR IN TRANSLATION: ${msg}`);
     }
     needs(doc) {
-        for (const child of this.walk()) {
+        for (const child of this.allChildren()) {
             const childNeeds = child.needs(doc);
             if (childNeeds)
                 return childNeeds;

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

@@ -37,7 +37,7 @@ const annotation_1 = require("../api/foundation/annotation");
 function _resolveCompositeSources(path, source, rootFields, nests, fieldUsage, 
 // for resolving nested composites; the list of sources to try
 sources) {
-    var _a, _b, _c, _d, _e;
+    var _a, _b, _c, _d;
     // TODO skip all this if the tree doesn't have any composite sources
     let base = { ...source };
     let anyComposites = false;
@@ -65,10 +65,10 @@ sources) {
             const fieldNames = new Set();
             for (const field of inputSource.fields) {
                 if (field.accessModifier !== 'private') {
-                    fieldNames.add((_a = field.as) !== null && _a !== void 0 ? _a : field.name);
+                    fieldNames.add((0, malloy_types_1.activeName)(field));
                 }
             }
-            const fieldUsageWithWheres = (_b = mergeFieldUsage(getFieldUsageFromFilterList(inputSource), fieldUsage)) !== null && _b !== void 0 ? _b : [];
+            const fieldUsageWithWheres = (_a = mergeFieldUsage(getFieldUsageFromFilterList(inputSource), fieldUsage)) !== null && _a !== void 0 ? _a : [];
             const fieldsForLookup = [...nonCompositeFields, ...inputSource.fields];
             const expanded = expandRefUsage({ fieldUsage: fieldUsageWithWheres }, fieldsForLookup);
             if (expanded.missingFields.length > 0) {
@@ -129,7 +129,7 @@ sources) {
                 ...base,
                 fields,
                 arguments: source.arguments,
-                filterList: [...((_c = source.filterList) !== null && _c !== void 0 ? _c : []), ...((_d = base.filterList) !== null && _d !== void 0 ? _d : [])],
+                filterList: [...((_b = source.filterList) !== null && _b !== void 0 ? _b : []), ...((_c = base.filterList) !== null && _c !== void 0 ? _c : [])],
             };
             const joinError = processJoins(path, base, rootFields, nests, expandedCategorized);
             // Fourth point where we abort: if a join failed
@@ -199,7 +199,7 @@ sources) {
         }
         base = {
             ...source,
-            filterList: [...((_e = source.filterList) !== null && _e !== void 0 ? _e : []), partitionFilter],
+            filterList: [...((_d = source.filterList) !== null && _d !== void 0 ? _d : []), partitionFilter],
         };
     }
     if (!joinsProcessed) {
@@ -579,12 +579,12 @@ function getPartitionCompositeDesc(annotations, structDef, logTo) {
         partitions.push({ id, fields });
     }
     for (const field of [partitionField, ...allFields]) {
-        const def = structDef.fields.find(f => { var _a; return ((_a = f.as) !== null && _a !== void 0 ? _a : f.name) === field; });
+        const def = structDef.fields.find(f => (0, malloy_types_1.activeName)(f) === field);
         if (def === undefined) {
             logTo.logError('invalid-partition-composite', `Composite partition field \`${field}\` not present in source`);
         }
     }
-    const compositeFields = structDef.fields.map(f => { var _a; return (_a = f.as) !== null && _a !== void 0 ? _a : f.name; });
+    const compositeFields = structDef.fields.map(f => (0, malloy_types_1.activeName)(f));
     return { partitionField, partitions, compositeFields };
 }
 function composeAnnotations(base, slice) {
@@ -602,17 +602,15 @@ function composeAnnotations(base, slice) {
     };
 }
 function mergeFields(...fields) {
-    var _a;
     const fieldsByName = {};
     for (const list of fields) {
         for (const field of list) {
-            fieldsByName[(_a = field.as) !== null && _a !== void 0 ? _a : field.name] = field;
+            fieldsByName[(0, malloy_types_1.activeName)(field)] = field;
         }
     }
     return Object.values(fieldsByName);
 }
 function genRootFields(rootFields, joinPath, fields, replace = true) {
-    var _a;
     if (joinPath.length === 0) {
         if (replace)
             return [...fields];
@@ -621,7 +619,7 @@ function genRootFields(rootFields, joinPath, fields, replace = true) {
     const headJoinName = joinPath[0];
     const fieldsByName = {};
     for (const field of rootFields) {
-        fieldsByName[(_a = field.as) !== null && _a !== void 0 ? _a : field.name] = field;
+        fieldsByName[(0, malloy_types_1.activeName)(field)] = field;
     }
     const join = fieldsByName[headJoinName];
     if (join === undefined) {
@@ -649,12 +647,11 @@ function getJoinFields(rootFields, joinPath) {
 // Updating its `fields` list with the resolved joins
 // And updating `narrowedJoinedSources` with the narrowed sources for each join
 function processJoins(path, base, rootFields, nests, categorizedFieldUsage) {
-    var _a, _b;
     let anyComposites = false;
     const fieldsByName = {};
     const errors = [];
     for (const field of base.fields) {
-        fieldsByName[(_a = field.as) !== null && _a !== void 0 ? _a : field.name] = field;
+        fieldsByName[(0, malloy_types_1.activeName)(field)] = field;
     }
     for (const [joinName, joinedUsage] of Object.entries(categorizedFieldUsage.joinUsage)) {
         const newPath = [...path, joinName];
@@ -708,7 +705,7 @@ function processJoins(path, base, rootFields, nests, categorizedFieldUsage) {
         fieldsByName[joinName] = {
             ...resolved.success,
             join: join.join,
-            as: (_b = join.as) !== null && _b !== void 0 ? _b : join.name,
+            as: (0, malloy_types_1.activeName)(join),
             onExpression: join.onExpression,
         };
         base.fields = Object.values(fieldsByName);
@@ -1294,13 +1291,12 @@ function pathBegins(path, prefix) {
     return path.length >= prefix.length && prefix.every((s, i) => path[i] === s);
 }
 function buildNamespace(fields) {
-    var _a;
     const namespace = {
         fields: {},
         nested: {},
     };
     for (const field of fields) {
-        const name = (_a = field.as) !== null && _a !== void 0 ? _a : field.name;
+        const name = (0, malloy_types_1.activeName)(field);
         namespace.fields[name] = field;
         // If it's a join with nested fields, recursively build its hierarchy
         if ((0, malloy_types_1.isJoined)(field) && field.fields) {
@@ -1325,7 +1321,7 @@ function inNamespace(path, space) {
 }
 function lookup(field, fields) {
     const [head, ...rest] = field;
-    const def = fields.find(f => { var _a; return ((_a = f.as) !== null && _a !== void 0 ? _a : f.name) === head; });
+    const def = fields.find(f => (0, malloy_types_1.activeName)(f) === head);
     if (def === undefined) {
         throw new Error(`No definition for ${head} when resolving composite source`);
     }

package/dist/lang/field-utils.js

@@ -24,12 +24,12 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.nameFromDef = nameFromDef;
 exports.mergeFields = mergeFields;
+const malloy_types_1 = require("../model/malloy_types");
 function nameFromDef(f1) {
-    var _a;
     if (f1.type === 'fieldref') {
         return f1.path[f1.path.length - 1];
     }
-    return (_a = f1.as) !== null && _a !== void 0 ? _a : f1.name;
+    return (0, malloy_types_1.activeName)(f1);
 }
 function mergeFields(older, newer) {
     if (older === undefined) {

package/dist/lang/test/test-translator.js

@@ -583,16 +583,14 @@ function getModelQuery(modelDef, name) {
     return modelDef.contents[name];
 }
 function getFieldDef(source, name) {
-    var _a;
     for (const f of source.fields) {
-        if ((_a = f.as) !== null && _a !== void 0 ? _a : f.name === name) {
+        if ((0, malloy_types_1.activeName)(f) === name) {
             return f;
         }
     }
     throw new Error(`Compiled source did not contain expected field '${name}'`);
 }
 function getQueryFieldDef(query, name) {
-    var _a;
     if ((0, malloy_types_1.isQuerySegment)(query)) {
         for (const f of query.queryFields) {
             if (f.type === 'fieldref') {
@@ -600,7 +598,7 @@ function getQueryFieldDef(query, name) {
                     return f;
                 }
             }
-            else if ((_a = f.as) !== null && _a !== void 0 ? _a : f.name === name) {
+            else if ((0, malloy_types_1.activeName)(f) === name) {
                 return f;
             }
         }

package/dist/model/field_instance.js

@@ -59,7 +59,7 @@ class FieldInstanceField {
         var _a;
         if (this.f.parent.primaryKey()) {
             const pk = this.f.parent.getPrimaryKeyField(this.f.fieldDef);
-            const pkName = pk.fieldDef.as || pk.fieldDef.name;
+            const pkName = (0, malloy_types_1.activeName)(pk.fieldDef);
             const pkField = this.parent.getField(pkName);
             return pkField.generateExpression();
         }

package/dist/model/malloy_types.d.ts

@@ -444,6 +444,13 @@ export interface AliasedName {
     name: string;
     as?: string;
 }
+/**
+ * The name an `AliasedName` goes by in its current context: its `as` binding
+ * if it has one, otherwise its intrinsic `name`. This is the only correct way
+ * to ask "what is this called here" — see the `name`/`as` invariant in
+ * model/CONTEXT.md.
+ */
+export declare function activeName(an: AliasedName): string;
 /** all named objects have a type an a name (optionally aliased) */
 export interface NamedObject extends AliasedName, HasLocation {
     type: string;
@@ -1092,8 +1099,6 @@ export interface RefToField extends HasAnnotations {
 }
 export type QueryFieldDef = AtomicFieldDef | TurtleDef | RefToField;
 export type TypedDef = AtomicTypeDef | JoinFieldDef | TurtleDef | RefToField | StructDef;
-/** Get the output name for a NamedObject */
-export declare function getIdentifier(n: AliasedName): string;
 export interface UserTypeFieldDef extends HasAnnotations {
     name: string;
     typeDef: AtomicTypeDef;

package/dist/model/malloy_types.js

@@ -36,6 +36,7 @@ exports.isFilterExprType = isFilterExprType;
 exports.isTimeLiteral = isTimeLiteral;
 exports.isParameterType = isParameterType;
 exports.paramHasValue = paramHasValue;
+exports.activeName = activeName;
 exports.expressionIsScalar = expressionIsScalar;
 exports.expressionIsAggregate = expressionIsAggregate;
 exports.expressionIsUngroupedAggregate = expressionIsUngroupedAggregate;
@@ -93,7 +94,6 @@ exports.isBaseTable = isBaseTable;
 exports.isLiteral = isLiteral;
 exports.mergeEvalSpaces = mergeEvalSpaces;
 exports.isBasicAtomic = isBasicAtomic;
-exports.getIdentifier = getIdentifier;
 exports.isUserTypeDef = isUserTypeDef;
 exports.isCompoundArrayData = isCompoundArrayData;
 exports.isTurtle = isTurtle;
@@ -183,6 +183,16 @@ function isParameterType(t) {
 function paramHasValue(p) {
     return p.value !== null;
 }
+/**
+ * The name an `AliasedName` goes by in its current context: its `as` binding
+ * if it has one, otherwise its intrinsic `name`. This is the only correct way
+ * to ask "what is this called here" — see the `name`/`as` invariant in
+ * model/CONTEXT.md.
+ */
+function activeName(an) {
+    var _a;
+    return (_a = an.as) !== null && _a !== void 0 ? _a : an.name;
+}
 function expressionIsScalar(e) {
     return e === undefined || e === 'scalar';
 }
@@ -580,13 +590,6 @@ function isBasicAtomic(fd) {
         fd.type === 'sql native' ||
         fd.type === 'error');
 }
-/** Get the output name for a NamedObject */
-function getIdentifier(n) {
-    if (n.as !== undefined) {
-        return n.as;
-    }
-    return n.name;
-}
 function isUserTypeDef(sd) {
     return sd.type === 'userType';
 }

package/dist/model/query_model_impl.d.ts

@@ -12,7 +12,6 @@ export declare class QueryModelImpl implements QueryModel, ModelRootInterface {
     structs: Map<string, QueryStruct>;
     get givens(): Record<string, Given>;
     constructor(modelDef: ModelDef | undefined);
-    getFinalOutputStruct(query: Query, options: PrepareResultOptions | undefined): SourceDef | undefined;
     loadModelFromDef(modelDef: ModelDef): void;
     getStructByName(name: string): QueryStruct;
     getStructFromRef(structRef: StructRef, sourceArguments: Record<string, Argument> | undefined, prepareResultOptions?: PrepareResultOptions): QueryStruct;

package/dist/model/query_model_impl.js

@@ -33,31 +33,17 @@ class QueryModelImpl {
             this.loadModelFromDef(modelDef);
         }
     }
-    // Another circularity breaking method ... call into QueryQuery
-    // to find the output shape of a query
-    getFinalOutputStruct(query, options) {
-        const result = this.loadQuery(query, undefined, options, false, false);
-        return result.structs.pop();
-    }
     loadModelFromDef(modelDef) {
         this.modelDef = modelDef;
         for (const s of Object.values(this.modelDef.contents)) {
-            let qs;
+            // Only sources become QueryStructs. query/userType/given are namespace
+            // metadata, not queryable, and are skipped.
             if ((0, malloy_types_1.isSourceDef)(s)) {
-                qs = new query_node_1.QueryStruct(s, undefined, { model: this }, {});
-                this.structs.set((0, malloy_types_1.getIdentifier)(s), qs);
-                qs.resolveQueryFields((query, options) => this.getFinalOutputStruct(query, options));
-            }
-            else if (s.type === 'query') {
-                /* TODO */
-            }
-            else if (s.type === 'userType') {
-                // User type definitions are metadata only, not queryable
+                this.structs.set((0, malloy_types_1.activeName)(s), new query_node_1.QueryStruct(s, undefined, { model: this }, {}));
             }
-            else if (s.type === 'given') {
-                // Givens are metadata in the namespace, not queryable structures.
-            }
-            else {
+            else if (s.type !== 'query' &&
+                s.type !== 'userType' &&
+                s.type !== 'given') {
                 throw new Error('Internal Error: Unknown structure type');
             }
         }
@@ -73,10 +59,7 @@ class QueryModelImpl {
         prepareResultOptions !== null && prepareResultOptions !== void 0 ? prepareResultOptions : (prepareResultOptions = {});
         if (typeof structRef === 'string') {
             const ret = this.getStructByName(structRef);
-            if (sourceArguments !== undefined) {
-                return new query_node_1.QueryStruct(ret.structDef, sourceArguments, ret.parent ? { struct: ret.parent } : { model: this }, prepareResultOptions);
-            }
-            return ret;
+            return new query_node_1.QueryStruct(ret.structDef, sourceArguments !== null && sourceArguments !== void 0 ? sourceArguments : ret.sourceArguments, ret.parent ? { struct: ret.parent } : { model: this }, prepareResultOptions);
         }
         return new query_node_1.QueryStruct(structRef, sourceArguments, { model: this }, prepareResultOptions);
     }
@@ -103,7 +86,7 @@ class QueryModelImpl {
         if (emitFinalStage && q.parent.dialect.hasFinalStage) {
             // const fieldNames: string[] = [];
             // for (const f of ret.outputStruct.fields) {
-            //   fieldNames.push(getIdentifier(f));
+            //   fieldNames.push(activeName(f));
             // }
             const fieldNames = [];
             for (const f of ret.outputStruct.fields) {
@@ -156,9 +139,7 @@ class QueryModelImpl {
         const addedDefaultRowLimit = addDefaultRowLimit.addedDefaultRowLimit;
         const ret = this.loadQuery(query, undefined, prepareResultOptions, finalize, false);
         const structRef = (_a = query.compositeResolvedSourceDef) !== null && _a !== void 0 ? _a : query.structRef;
-        const sourceExplore = typeof structRef === 'string'
-            ? structRef
-            : structRef.as || structRef.name;
+        const sourceExplore = typeof structRef === 'string' ? structRef : (0, malloy_types_1.activeName)(structRef);
         const sourceArguments = (_b = query.sourceArguments) !== null && _b !== void 0 ? _b : (typeof structRef === 'string' ? undefined : structRef.arguments);
         // LTNote:  I don't understand why this might be here.  It should have happened in loadQuery...
         if (finalize && this.dialect.hasFinalStage) {

package/dist/model/query_node.d.ts

@@ -1,4 +1,4 @@
-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 { FieldDef, BooleanFieldDef, DateFieldDef, DocumentLocation, StringFieldDef, JSONFieldDef, NumberFieldDef, ATimestampFieldDef, NativeUnsupportedFieldDef, JoinFieldDef, Argument, Given, GivenID, PrepareResultOptions, AtomicFieldDef, BasicAtomicDef, FilterCondition, RefToField, StructDef, TurtleDef, TurtleDefPlusFilters } from './malloy_types';
 import type { EventStream } from '../runtime_types';
 import type { Tag } from '@malloydata/malloy-tag';
 import type { Dialect } from '../dialect';
@@ -109,15 +109,6 @@ export declare class QueryStruct {
     addFieldToNameMap(as: string, n: QueryField, at?: DocumentLocation): void;
     /** the the primary key or throw an error. */
     getPrimaryKeyField(fieldDef: FieldDef): QueryBasicField;
-    /**
-     * called after all structure has been loaded.  Examine this structure to see
-     * if if it is based on a query and if it is, add the output fields (unless
-     * they exist) to the structure.
-     *
-     * finalOutputStruct exists so that query_node doesn't need to
-     * to import query_query
-     */
-    resolveQueryFields(finalOutputStruct: (query: Query, options: PrepareResultOptions | undefined) => SourceDef | undefined): void;
     getModel(): ModelRootInterface;
     get eventStream(): EventStream | undefined;
     /** makes a new queryable field object from a fieldDef */

package/dist/model/query_node.js

@@ -33,7 +33,7 @@ class QueryField extends QueryNode {
         this.fieldDef = fieldDef;
     }
     getIdentifier() {
-        return (0, malloy_types_1.getIdentifier)(this.fieldDef);
+        return (0, malloy_types_1.activeName)(this.fieldDef);
     }
     getJoinableParent() {
         const parent = this.parent;
@@ -281,7 +281,7 @@ class QueryStruct {
     }
     addFieldsFromFieldList(fields) {
         for (const field of fields) {
-            const as = (0, malloy_types_1.getIdentifier)(field);
+            const as = (0, malloy_types_1.activeName)(field);
             if (field.type === 'turtle') {
                 if (!QueryStruct.turtleFieldMaker) {
                     throw new Error('INTERNAL ERROR: QueryQuery must initialize QueryStruct nested factory method');
@@ -313,7 +313,7 @@ class QueryStruct {
         // make a unique alias name
         if (ret === undefined) {
             const aliases = Array.from(this.pathAliasMap.values());
-            const base = identifierNormalize((0, malloy_types_1.getIdentifier)(this.structDef));
+            const base = identifierNormalize((0, malloy_types_1.activeName)(this.structDef));
             let name = `${base}_0`;
             let n = 1;
             while (aliases.includes(name) && n < 1000) {
@@ -338,7 +338,7 @@ class QueryStruct {
         if (this.unnestWithNumbers() && this.parent !== undefined) {
             const x = this.parent.getSQLIdentifier() +
                 '.' +
-                (0, malloy_types_1.getIdentifier)(this.structDef) +
+                (0, malloy_types_1.activeName)(this.structDef) +
                 `[${this.getIdentifier()}.__row_id]`;
             return x;
         }
@@ -386,7 +386,7 @@ class QueryStruct {
         }
         // if this is an inline object, include the parents alias.
         if (this.structDef.type === 'record' && this.parent) {
-            return this.parent.sqlSimpleChildReference((0, malloy_types_1.getIdentifier)(this.structDef));
+            return this.parent.sqlSimpleChildReference((0, malloy_types_1.activeName)(this.structDef));
         }
         // we are somewhere in the join tree.  Make sure the alias is unique.
         return this.getAliasIdentifier();
@@ -394,7 +394,7 @@ class QueryStruct {
     // return the name of the field in Malloy
     getFullOutputName() {
         if (this.parent) {
-            return (this.parent.getFullOutputName() + (0, malloy_types_1.getIdentifier)(this.structDef) + '.');
+            return this.parent.getFullOutputName() + (0, malloy_types_1.activeName)(this.structDef) + '.';
         }
         else {
             return '';
@@ -428,45 +428,11 @@ class QueryStruct {
             return pk;
         }
         else {
-            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)}'. ` +
+            throw new malloy_compile_error_1.MalloyCompileError(`Source '${(0, malloy_types_1.activeName)(this.structDef)}' has no primary key; ` +
+                `cannot compute a unique key for field '${(0, malloy_types_1.activeName)(fieldDef)}'. ` +
                 'Add `primary_key: <field>` to the source definition.', 'compiler-missing-primary-key', fieldDef.location);
         }
     }
-    /**
-     * called after all structure has been loaded.  Examine this structure to see
-     * if if it is based on a query and if it is, add the output fields (unless
-     * they exist) to the structure.
-     *
-     * finalOutputStruct exists so that query_node doesn't need to
-     * to import query_query
-     */
-    resolveQueryFields(finalOutputStruct) {
-        if (this.structDef.type === 'query_source' && finalOutputStruct) {
-            const resultStruct = finalOutputStruct(this.structDef.query, this.prepareResultOptions);
-            // should never happen.
-            if (!resultStruct) {
-                throw new Error("Internal Error, query didn't produce a struct");
-            }
-            const structDef = { ...this.structDef };
-            for (const f of resultStruct.fields) {
-                const as = (0, malloy_types_1.getIdentifier)(f);
-                if (!this.nameMap.has(as)) {
-                    structDef.fields.push(f);
-                    this.nameMap.set(as, this.makeQueryField(f));
-                }
-            }
-            this.structDef = structDef;
-            if (!this.structDef.primaryKey && resultStruct.primaryKey) {
-                this.structDef.primaryKey = resultStruct.primaryKey;
-            }
-        }
-        for (const [, v] of this.nameMap) {
-            if (v instanceof QueryFieldStruct) {
-                v.queryStruct.resolveQueryFields(finalOutputStruct);
-            }
-        }
-    }
     getModel() {
         if (this.model) {
             return this.model;

package/dist/model/query_query.js

@@ -580,7 +580,7 @@ class QueryQuery extends query_node_1.QueryField {
                 return ret.lastStageName;
             }
             default:
-                throw new Error(`Cannot create SQL StageWriter from '${(0, malloy_types_1.getIdentifier)(qs.structDef)}' type '${qs.structDef.type}`);
+                throw new Error(`Cannot create SQL StageWriter from '${(0, malloy_types_1.activeName)(qs.structDef)}' type '${qs.structDef.type}`);
         }
     }
     /**
@@ -635,7 +635,7 @@ class QueryQuery extends query_node_1.QueryField {
         let s = '';
         const qs = ji.queryStruct;
         const qsDef = qs.structDef;
-        (_a = qs.eventStream) === null || _a === void 0 ? void 0 : _a.emit('join-used', { name: (0, malloy_types_1.getIdentifier)(qsDef) });
+        (_a = qs.eventStream) === null || _a === void 0 ? void 0 : _a.emit('join-used', { name: (0, malloy_types_1.activeName)(qsDef) });
         qs.maybeEmitParameterizedSourceUsage();
         if ((0, malloy_types_1.isJoinedSource)(qsDef)) {
             let structSQL = this.getStructSourceSQL(qs, stageWriter);

package/dist/model/utils.js

@@ -270,9 +270,9 @@ function getDialectFieldList(structDef) {
     for (const f of structDef.fields.filter(malloy_types_1.fieldIsIntrinsic)) {
         dialectFieldList.push({
             typeDef: f,
-            sqlExpression: (0, malloy_types_1.getIdentifier)(f),
-            rawName: (0, malloy_types_1.getIdentifier)(f),
-            sqlOutputName: (0, malloy_types_1.getIdentifier)(f),
+            sqlExpression: (0, malloy_types_1.activeName)(f),
+            rawName: (0, malloy_types_1.activeName)(f),
+            sqlOutputName: (0, malloy_types_1.activeName)(f),
         });
     }
     return dialectFieldList;