@malloydata/malloy 0.0.403 → 0.0.404

package/dist/api/foundation/core.js

@@ -131,7 +131,7 @@ var JoinRelationship;
 // =============================================================================
 class Explore extends Entity {
     constructor(structDef, parentExplore, source) {
-        super(structDef.as || structDef.name, parentExplore, source);
+        super((0, model_1.activeName)(structDef), parentExplore, source);
         this._structDef = structDef;
         this._parentExplore = parentExplore;
         this.sourceExplore = source;
@@ -167,14 +167,14 @@ class Explore extends Entity {
      * @return The name of the entity.
      */
     get name() {
-        return this.structDef.as || this.structDef.name;
+        return (0, model_1.activeName)(this.structDef);
     }
     getQueryByName(name) {
         const structRef = this.sourceStructDef;
         if (!structRef) {
             throw new Error(`Cannot get query by name from a struct of type ${this.structDef.type}`);
         }
-        const view = structRef.fields.find(f => { var _a; return ((_a = f.as) !== null && _a !== void 0 ? _a : f.name) === name; });
+        const view = structRef.fields.find(f => (0, model_1.activeName)(f) === name);
         if (view === undefined) {
             throw new Error(`No such view named \`${name}\``);
         }
@@ -204,7 +204,7 @@ class Explore extends Entity {
         if (this._fieldMap === undefined) {
             const sourceFields = ((_a = this.source) === null || _a === void 0 ? void 0 : _a.fieldMap) || new Map();
             this._fieldMap = new Map(this.structDef.fields.map(fieldDef => {
-                const name = fieldDef.as || fieldDef.name;
+                const name = (0, model_1.activeName)(fieldDef);
                 const sourceField = sourceFields.get(fieldDef.name);
                 if ((0, model_1.isJoined)(fieldDef)) {
                     return [name, new ExploreField(fieldDef, this, sourceField)];
@@ -431,7 +431,7 @@ exports.Explore = Explore;
 // =============================================================================
 class AtomicField extends Entity {
     constructor(fieldTypeDef, parent, source) {
-        super(fieldTypeDef.as || fieldTypeDef.name, parent, source);
+        super((0, model_1.activeName)(fieldTypeDef), parent, source);
         this.fieldTypeDef = fieldTypeDef;
         this.parent = parent;
     }
@@ -651,7 +651,7 @@ exports.StringField = StringField;
 // =============================================================================
 class Query extends Entity {
     constructor(turtleDef, parent, source) {
-        super(turtleDef.as || turtleDef.name, parent, source);
+        super((0, model_1.activeName)(turtleDef), parent, source);
         this.turtleDef = turtleDef;
     }
     get source() {

package/dist/api/foundation/result.js

@@ -412,10 +412,9 @@ function walkQueryData(data, structDef, normalizers) {
  * Walk a QueryRecord and normalize values according to the given normalizers.
  */
 function walkQueryRecord(row, structDef, normalizers) {
-    var _a;
     const result = {};
     for (const fieldDef of structDef.fields) {
-        const fieldName = (_a = fieldDef.as) !== null && _a !== void 0 ? _a : fieldDef.name;
+        const fieldName = (0, model_1.activeName)(fieldDef);
         const value = row[fieldName];
         result[fieldName] = walkValue(value, fieldDef, normalizers);
     }

package/dist/dialect/dialect.d.ts

@@ -230,6 +230,13 @@ export declare abstract class Dialect {
      * - `EscapeStyle.Unset` (default): base method throws if reached.
      */
     identifierEscapeStyle: EscapeStyleValue;
+    /**
+     * Escape the body of a backslash-style quoted token (`EscapeStyle.Backslash`
+     * dialects) — the backslash, the closing `delim`, and newline/CR/tab. The
+     * newline matters: BigQuery rejects a raw one ("Unclosed string literal").
+     * `\0` / U+2028 / U+2029 are passed through (no evidence they break a lexer).
+     */
+    protected escapeBackslashStyle(body: string, delim: string): string;
     /**
      * Wrap an identifier in the dialect's quote character, escaping any
      * embedded quote characters per the dialect's `identifierEscapeStyle`.
@@ -446,10 +453,8 @@ export declare abstract class Dialect {
      */
     sqlLiteralString(literal: string): string;
     /**
-     * Render a Malloy regex literal as a SQL string literal. Defaults to
-     * `sqlLiteralString` — the regex engine receives whatever bytes the
-     * SQL parser decodes, and `sqlLiteralString` already produces a
-     * correctly decoding literal for both escape styles.
+     * Render a Malloy regex literal. Defaults to `sqlLiteralString`: the regex
+     * engine receives whatever the SQL parser decodes, which is already correct.
      */
     sqlLiteralRegexp(literal: string): string;
     abstract sqlLiteralArray(lit: ArrayLiteralNode): string;

package/dist/dialect/dialect.js

@@ -323,6 +323,37 @@ class Dialect {
     sqlDateToString(sqlDateExp) {
         return this.castToString(`DATE(${sqlDateExp})`);
     }
+    /**
+     * Escape the body of a backslash-style quoted token (`EscapeStyle.Backslash`
+     * dialects) — the backslash, the closing `delim`, and newline/CR/tab. The
+     * newline matters: BigQuery rejects a raw one ("Unclosed string literal").
+     * `\0` / U+2028 / U+2029 are passed through (no evidence they break a lexer).
+     */
+    escapeBackslashStyle(body, delim) {
+        let out = '';
+        for (const ch of body) {
+            switch (ch) {
+                case '\\':
+                    out += '\\\\';
+                    break;
+                case '\n':
+                    out += '\\n';
+                    break;
+                case '\r':
+                    out += '\\r';
+                    break;
+                case '\t':
+                    out += '\\t';
+                    break;
+                case delim:
+                    out += '\\' + delim;
+                    break;
+                default:
+                    out += ch;
+            }
+        }
+        return out;
+    }
     /**
      * Wrap an identifier in the dialect's quote character, escaping any
      * embedded quote characters per the dialect's `identifierEscapeStyle`.
@@ -340,11 +371,7 @@ class Dialect {
             return q + identifier.split(q).join(q + q) + q;
         }
         if (this.identifierEscapeStyle === exports.EscapeStyle.Backslash) {
-            const escaped = identifier
-                .replace(/\\/g, '\\\\')
-                .split(q)
-                .join('\\' + q);
-            return q + escaped + q;
+            return q + this.escapeBackslashStyle(identifier, q) + q;
         }
         throw new Error(`${this.name}: identifierEscapeStyle is not set. ` +
             'Set it to EscapeStyle.Doubled or EscapeStyle.Backslash on the dialect, ' +
@@ -458,18 +485,15 @@ class Dialect {
             return "'" + literal.split("'").join("''") + "'";
         }
         if (this.stringLiteralStyle === 'backslash') {
-            const escaped = literal.replace(/\\/g, '\\\\').replace(/'/g, "\\'");
-            return "'" + escaped + "'";
+            return "'" + this.escapeBackslashStyle(literal, "'") + "'";
         }
         throw new Error(`${this.name}: stringLiteralStyle is not set. ` +
             'Set it to EscapeStyle.Doubled or EscapeStyle.Backslash on the dialect, ' +
             'or override sqlLiteralString.');
     }
     /**
-     * Render a Malloy regex literal as a SQL string literal. Defaults to
-     * `sqlLiteralString` — the regex engine receives whatever bytes the
-     * SQL parser decodes, and `sqlLiteralString` already produces a
-     * correctly decoding literal for both escape styles.
+     * Render a Malloy regex literal. Defaults to `sqlLiteralString`: the regex
+     * engine receives whatever the SQL parser decodes, which is already correct.
      */
     sqlLiteralRegexp(literal) {
         return this.sqlLiteralString(literal);

package/dist/dialect/pg_impl.d.ts

@@ -12,6 +12,7 @@ export declare abstract class PostgresBase extends Dialect {
     stringLiteralStyle: "doubled";
     identifierEscapeStyle: "doubled";
     identifierQuoteChar: string;
+    sqlLiteralString(literal: string): string;
     sqlNowExpr(): string;
     sqlTimeExtractExpr(qi: QueryInfo, from: TimeExtractExpr): string;
     sqlCast(qi: QueryInfo, cast: TypecastExpr): string;

package/dist/dialect/pg_impl.js

@@ -30,6 +30,14 @@ class PostgresBase extends dialect_1.Dialect {
         this.identifierEscapeStyle = dialect_1.EscapeStyle.Doubled;
         this.identifierQuoteChar = '"';
     }
+    // A raw newline in a doubled literal is valid SQL but gets mangled by the
+    // SQL indenter (indent() in model/utils.ts), so encode it. Postgres/DuckDB
+    // use an E'...' escape string; Trino/Presto override with U&'...'.
+    sqlLiteralString(literal) {
+        return literal.includes('\n')
+            ? `E'${this.escapeBackslashStyle(literal, "'")}'`
+            : super.sqlLiteralString(literal);
+    }
     sqlNowExpr() {
         return 'LOCALTIMESTAMP';
     }

package/dist/dialect/snowflake/snowflake.js

@@ -439,9 +439,8 @@ ${(0, utils_1.indent)(sql)}
         }
         else if (malloyType.type === 'record' || (0, malloy_types_1.isRepeatedRecord)(malloyType)) {
             const sqlFields = malloyType.fields.reduce((ret, f) => {
-                var _a;
                 if ((0, malloy_types_1.isAtomic)(f)) {
-                    const name = (_a = f.as) !== null && _a !== void 0 ? _a : f.name;
+                    const name = (0, malloy_types_1.activeName)(f);
                     const oneSchema = `${this.sqlQuoteIdentifier(name)} ${this.malloyTypeToSQLType(f)}`;
                     ret.push(oneSchema);
                 }
@@ -502,11 +501,11 @@ ${(0, utils_1.indent)(sql)}
         return sqlType.match(/^[A-Za-z\s(),[\]0-9]*$/) !== null;
     }
     sqlLiteralRecord(lit) {
-        var _a, _b, _c;
+        var _a, _b;
         const rowVals = [];
         for (const f of lit.typeDef.fields) {
-            const name = (_a = f.as) !== null && _a !== void 0 ? _a : f.name;
-            const propVal = (_c = (_b = (0, malloy_types_1.safeRecordGet)(lit.kids, name)) === null || _b === void 0 ? void 0 : _b.sql) !== null && _c !== void 0 ? _c : 'internal-error-record-literal';
+            const name = (0, malloy_types_1.activeName)(f);
+            const propVal = (_b = (_a = (0, malloy_types_1.safeRecordGet)(lit.kids, name)) === null || _a === void 0 ? void 0 : _a.sql) !== null && _b !== void 0 ? _b : 'internal-error-record-literal';
             rowVals.push(`${this.sqlLiteralString(name)},${propVal}`);
         }
         return `OBJECT_CONSTRUCT_KEEP_NULL(${rowVals.join(',')})`;

package/dist/dialect/trino/trino.d.ts

@@ -30,6 +30,7 @@ export declare class TrinoDialect extends PostgresBase {
     supportsTempTables: boolean;
     supportsCountApprox: boolean;
     supportsHyperLogLog: boolean;
+    sqlLiteralString(literal: string): string;
     sqlGroupSetTable(groupSetCount: number): string;
     exprToSQL(qi: QueryInfo, df: Expr): string | undefined;
     sqlAnyValue(groupSet: number, fieldName: string): string;

package/dist/dialect/trino/trino.js

@@ -200,9 +200,30 @@ class TrinoDialect extends pg_impl_1.PostgresBase {
   WITH
   WITHIN`.split(/\s/);
     }
-    // Trino bare identifier is strict ANSI (`[A-Za-z_][A-Za-z0-9_]*`),
-    // which matches the Dialect default — no override needed. Verified
-    // against the live engine.
+    // Trino bare identifier is strict ANSI, matching the Dialect default.
+    // Trino/Presto have no E'...' escape string, so encode a newline-bearing
+    // literal as U&'...'. Inside it the quote doubles (''), the backslash
+    // escape-introducer doubles (\\), and a control char becomes \XXXX.
+    sqlLiteralString(literal) {
+        if (!literal.includes('\n')) {
+            return super.sqlLiteralString(literal);
+        }
+        const body = literal.replace(/['\\\n\r\t]/g, ch => {
+            switch (ch) {
+                case "'":
+                    return "''";
+                case '\\':
+                    return '\\\\';
+                case '\n':
+                    return '\\000A';
+                case '\r':
+                    return '\\000D';
+                default: // '\t'
+                    return '\\0009';
+            }
+        });
+        return `U&'${body}'`;
+    }
     sqlGroupSetTable(groupSetCount) {
         return `CROSS JOIN (SELECT row_number() OVER() -1  group_set FROM UNNEST(SEQUENCE(0,${groupSetCount})))`;
     }
@@ -582,13 +603,13 @@ ${(0, utils_1.indent)(sql)}
         return from.units === 'day_of_week' ? `mod(${extracted}+1,7)` : extracted;
     }
     sqlLiteralRecord(lit) {
-        var _a, _b, _c;
+        var _a, _b;
         const rowVals = [];
         const rowTypes = [];
         for (const f of lit.typeDef.fields) {
             if ((0, malloy_types_1.isAtomic)(f)) {
-                const name = (_a = f.as) !== null && _a !== void 0 ? _a : f.name;
-                rowVals.push((_c = (_b = (0, malloy_types_1.safeRecordGet)(lit.kids, name)) === null || _b === void 0 ? void 0 : _b.sql) !== null && _c !== void 0 ? _c : 'internal-error-record-literal');
+                const name = (0, malloy_types_1.activeName)(f);
+                rowVals.push((_b = (_a = (0, malloy_types_1.safeRecordGet)(lit.kids, name)) === null || _a === void 0 ? void 0 : _a.sql) !== null && _b !== void 0 ? _b : 'internal-error-record-literal');
                 const elType = this.malloyTypeToSQLType(f);
                 rowTypes.push(`${this.sqlQuoteIdentifier(name)} ${elType}`);
             }

package/dist/lang/ast/expressions/expr-func.js

@@ -532,7 +532,7 @@ function parseSQLInterpolation(template) {
     return parts;
 }
 function isDataTypeMatch(genericsAlreadySelected, genericTypes, arg, paramT) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     if (malloy_types_1.TD.eq(paramT, arg) ||
         paramT.type === 'any' ||
         // TODO We should consider whether `nulls` should always be allowed. It probably
@@ -569,10 +569,10 @@ function isDataTypeMatch(genericsAlreadySelected, genericTypes, arg, paramT) {
         const genericsSet = [];
         const paramFieldsByName = new Map();
         for (const field of paramT.fields) {
-            paramFieldsByName.set((_a = field.as) !== null && _a !== void 0 ? _a : field.name, field);
+            paramFieldsByName.set((0, malloy_types_1.activeName)(field), field);
         }
         for (const field of arg.fields) {
-            const match = paramFieldsByName.get((_b = field.as) !== null && _b !== void 0 ? _b : field.name);
+            const match = paramFieldsByName.get((0, malloy_types_1.activeName)(field));
             if (match === undefined) {
                 return { dataTypeMatch: false, genericsSet: [] };
             }
@@ -591,7 +591,7 @@ function isDataTypeMatch(genericsAlreadySelected, genericTypes, arg, paramT) {
             alreadySelected.type !== 'error') {
             return isDataTypeMatch(genericsAlreadySelected, genericTypes, arg, alreadySelected);
         }
-        const allowedTypes = (_d = (_c = genericTypes.find(t => t.name === paramT.generic)) === null || _c === void 0 ? void 0 : _c.acceptibleTypes) !== null && _d !== void 0 ? _d : [];
+        const allowedTypes = (_b = (_a = genericTypes.find(t => t.name === paramT.generic)) === null || _a === void 0 ? void 0 : _a.acceptibleTypes) !== null && _b !== void 0 ? _b : [];
         for (const type of allowedTypes) {
             const result = isDataTypeMatch(genericsAlreadySelected, genericTypes, arg, type);
             if (result.dataTypeMatch) {

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

@@ -167,7 +167,7 @@ class DynamicSpace extends static_space_1.StaticSpace {
             }
             // Add access modifiers at the end so views don't obey them
             for (const [name, access] of this.newAccessModifiers) {
-                const index = this.sourceDef.fields.findIndex(f => { var _a; return ((_a = f.as) !== null && _a !== void 0 ? _a : f.name) === name; });
+                const index = this.sourceDef.fields.findIndex(f => (0, malloy_types_1.activeName)(f) === name);
                 if (index === -1) {
                     throw new Error(`Can't find field '${name}' to set access modifier`);
                 }
@@ -184,7 +184,7 @@ class DynamicSpace extends static_space_1.StaticSpace {
             // TODO does this need to be done when the space is instantiated?
             // e.g. if a field had a compiler flag on it...
             for (const [name, note] of this.newNotes) {
-                const index = this.sourceDef.fields.findIndex(f => { var _a; return (_a = f.as) !== null && _a !== void 0 ? _a : f.name === name; });
+                const index = this.sourceDef.fields.findIndex(f => (0, malloy_types_1.activeName)(f) === name);
                 if (index === -1) {
                     throw new Error(`Can't find field '${name}' to set access modifier`);
                 }

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

@@ -15,7 +15,7 @@ const composite_source_utils_1 = require("../../composite-source-utils");
 function getJoinFields(from, joinPath, logTo) {
     let fields = from.fields;
     for (const joinName of joinPath) {
-        const join = fields.find(f => { var _a; return ((_a = f.as) !== null && _a !== void 0 ? _a : f.name) === joinName; });
+        const join = fields.find(f => (0, malloy_types_1.activeName)(f) === joinName);
         if (join === undefined) {
             logTo.logError('field-not-found', `\`${joinName}\` not found`);
             return [];
@@ -52,11 +52,11 @@ function getOrCreateIncludeStateForJoin(joinPath, state, from, logTo) {
         return joinState.state;
     else {
         const fromFields = getJoinFields(from, joinPath, logTo);
-        const allFields = new Set(fromFields.map(f => { var _a; return (_a = f.as) !== null && _a !== void 0 ? _a : f.name; }));
-        const joinNames = new Set(fromFields.filter(f => (0, malloy_types_1.isJoined)(f)).map(f => { var _a; return (_a = f.as) !== null && _a !== void 0 ? _a : f.name; }));
+        const allFields = new Set(fromFields.map(f => (0, malloy_types_1.activeName)(f)));
+        const joinNames = new Set(fromFields.filter(f => (0, malloy_types_1.isJoined)(f)).map(f => (0, malloy_types_1.activeName)(f)));
         const alreadyPrivateFields = new Set(fromFields
             .filter(f => f.accessModifier === 'private')
-            .map(f => { var _a; return (_a = f.as) !== null && _a !== void 0 ? _a : f.name; }));
+            .map(f => (0, malloy_types_1.activeName)(f)));
         const joinState = {
             star: undefined,
             joinNames,

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

@@ -212,7 +212,6 @@ exports.QueryOperationSpace = QueryOperationSpace;
 // Project and Reduce or "QuerySegments" are built from a QuerySpace
 class QuerySpace extends QueryOperationSpace {
     addRefineFromFields(refineThis) {
-        var _a;
         if (!model.isQuerySegment(refineThis)) {
             // TODO mtoy raw,partial,index
             return;
@@ -233,7 +232,7 @@ class QuerySpace extends QueryOperationSpace {
             }
             else {
                 const entry = new refine_from_space_field_1.RefineFromSpaceField(field);
-                const name = (_a = field.as) !== null && _a !== void 0 ? _a : field.name;
+                const name = model.activeName(field);
                 this.setEntry(name, entry);
                 this.addValidatedCompositeFieldUserFromEntry(name, entry);
             }
@@ -257,7 +256,7 @@ class QuerySpace extends QueryOperationSpace {
         return fields.map(f => f.queryFieldDef);
     }
     getOutputFieldDef(queryFieldDef, typeDesc) {
-        var _a, _b, _c;
+        var _a, _b;
         let location = undefined;
         let name;
         if (queryFieldDef.type === 'fieldref') {
@@ -265,14 +264,14 @@ class QuerySpace extends QueryOperationSpace {
             location = queryFieldDef.at;
         }
         else {
-            name = (_a = queryFieldDef.as) !== null && _a !== void 0 ? _a : queryFieldDef.name;
+            name = model.activeName(queryFieldDef);
             location = queryFieldDef.location;
         }
         let ret;
         if (typeDesc.type === 'turtle') {
             const pipeline = typeDesc.pipeline;
             const lastSegment = pipeline[pipeline.length - 1];
-            const outputStruct = (_b = lastSegment === null || lastSegment === void 0 ? void 0 : lastSegment.outputStruct) !== null && _b !== void 0 ? _b : this.exprSpace.emptyStructDef();
+            const outputStruct = (_a = lastSegment === null || lastSegment === void 0 ? void 0 : lastSegment.outputStruct) !== null && _a !== void 0 ? _a : this.exprSpace.emptyStructDef();
             const isRepeated = lastSegment
                 ? model.isQuerySegment(lastSegment)
                     ? lastSegment.isRepeated
@@ -308,7 +307,7 @@ class QuerySpace extends QueryOperationSpace {
         else {
             throw new Error('Invalid type for fieldref');
         }
-        ret.location = (_c = ret.location) !== null && _c !== void 0 ? _c : this.astEl.location;
+        ret.location = (_b = ret.location) !== null && _b !== void 0 ? _b : this.astEl.location;
         if (queryFieldDef.annotations) {
             ret.annotations = queryFieldDef.annotations;
         }
@@ -317,7 +316,6 @@ class QuerySpace extends QueryOperationSpace {
     // Gets the primary key field for the output struct of this query;
     // If there is exactly one scalar field, that is the primary key
     getPrimaryKey(fields) {
-        var _a;
         const dimensions = fields.filter(f => model.TD.isAtomic(f.typeDesc) &&
             model.expressionIsScalar(f.typeDesc.expressionType));
         if (dimensions.length !== 1)
@@ -327,7 +325,7 @@ class QuerySpace extends QueryOperationSpace {
             return primaryKeyField.path[primaryKeyField.path.length - 1];
         }
         else {
-            return (_a = primaryKeyField.as) !== null && _a !== void 0 ? _a : primaryKeyField.name;
+            return model.activeName(primaryKeyField);
         }
     }
     // This returns the OUTPUT struct of this query space

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

@@ -132,13 +132,13 @@ class RefinedSpace extends dynamic_space_1.DynamicSpace {
 }
 exports.RefinedSpace = RefinedSpace;
 function editJoinsFromIncludeState(path, from, includeState) {
-    var _a, _b, _c;
+    var _a;
     let fields;
     const joinedState = (0, include_utils_1.getIncludeStateForJoin)(path, includeState);
     const isJoin = path.length > 0;
     if (isJoin) {
         if (joinedState.fieldsToInclude) {
-            fields = from.fields.filter(f => { var _a, _b; return (_a = joinedState.fieldsToInclude) === null || _a === void 0 ? void 0 : _a.has((_b = f.as) !== null && _b !== void 0 ? _b : f.name); });
+            fields = from.fields.filter(f => { var _a; return (_a = joinedState.fieldsToInclude) === null || _a === void 0 ? void 0 : _a.has((0, malloy_types_1.activeName)(f)); });
         }
         else {
             fields = from.fields;
@@ -150,11 +150,11 @@ function editJoinsFromIncludeState(path, from, includeState) {
     // const fields = from.fields;
     const updatedFields = [];
     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);
         // TODO ensure you can't make it more permissive here...
-        const accessModifier = (_b = joinedState.modifiers.get(name)) !== null && _b !== void 0 ? _b : field.accessModifier;
+        const accessModifier = (_a = joinedState.modifiers.get(name)) !== null && _a !== void 0 ? _a : field.accessModifier;
         const notes = joinedState.notes.get(name);
-        const rename = joinedState.renames.find(r => { var _a; return r.name.nameString === ((_a = field.as) !== null && _a !== void 0 ? _a : field.name); });
+        const rename = joinedState.renames.find(r => r.name.nameString === (0, malloy_types_1.activeName)(field));
         const editedField = isJoin
             ? {
                 ...field,
@@ -172,7 +172,7 @@ function editJoinsFromIncludeState(path, from, includeState) {
         if ((0, malloy_types_1.isJoined)(editedField)) {
             updatedFields.push({
                 ...editedField,
-                fields: editJoinsFromIncludeState([...path, (_c = field.as) !== null && _c !== void 0 ? _c : field.name], editedField, includeState),
+                fields: editJoinsFromIncludeState([...path, (0, malloy_types_1.activeName)(field)], editedField, includeState),
             });
         }
         else {

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

@@ -53,15 +53,12 @@ class RenameSpaceField extends space_field_1.SpaceField {
             ...returnFieldDef,
             as: this.newName,
             location: this.location,
-            refSummary: (0, malloy_types_1.mapFieldUsage)(returnFieldDef.refSummary, u => {
-                var _a;
-                return ({
-                    ...u,
-                    path: u.path[0] === ((_a = returnFieldDef.as) !== null && _a !== void 0 ? _a : returnFieldDef.name)
-                        ? [this.newName, ...u.path.slice(1)]
-                        : u.path,
-                });
-            }),
+            refSummary: (0, malloy_types_1.mapFieldUsage)(returnFieldDef.refSummary, u => ({
+                ...u,
+                path: u.path[0] === (0, malloy_types_1.activeName)(returnFieldDef)
+                    ? [this.newName, ...u.path.slice(1)]
+                    : u.path,
+            })),
         };
     }
     typeDesc() {

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

@@ -64,7 +64,7 @@ class StaticSpace {
         if (this.memoMap === undefined) {
             this.memoMap = new Map();
             for (const f of this.fromStruct.fields) {
-                const name = f.as || f.name;
+                const name = (0, malloy_types_1.activeName)(f);
                 this.memoMap.set(name, this.defToSpaceField(f));
             }
             if ((0, malloy_types_1.isSourceDef)(this.fromStruct)) {

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

@@ -69,7 +69,7 @@ class StructSpaceFieldBase extends space_field_1.SpaceField {
     }
     get joinPathElement() {
         return {
-            name: this.structDef.as || this.structDef.name,
+            name: (0, malloy_types_1.activeName)(this.structDef),
             joinType: this.structDef.join,
             joinElementType: this.structDef.type,
         };

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

@@ -114,7 +114,6 @@ class Drill extends filters_1.Filter {
             }
             const segmentDimensions = segment.queryFields
                 .map(f => {
-                var _a;
                 let fieldDef = undefined;
                 if (f.type === 'fieldref') {
                     const morePathFieldNames = f.path.map(n => new field_space_1.FieldName(n));
@@ -131,7 +130,7 @@ class Drill extends filters_1.Filter {
                 }
                 else {
                     if ((0, malloy_types_1.isAtomic)(f) && (0, malloy_types_1.expressionIsScalar)(f.expressionType))
-                        return (_a = f.as) !== null && _a !== void 0 ? _a : f.name;
+                        return (0, malloy_types_1.activeName)(f);
                 }
             })
                 .filter(utils_1.isNotUndefined);
@@ -159,12 +158,11 @@ class Drill extends filters_1.Filter {
                 }
             }
             const field = segment.queryFields.find(f => {
-                var _a;
                 if (f.type === 'fieldref') {
                     return f.path[f.path.length - 1] === name.refString;
                 }
                 else {
-                    return (_a = f.as) !== null && _a !== void 0 ? _a : f.name === name.refString;
+                    return (0, malloy_types_1.activeName)(f) === name.refString;
                 }
             });
             if (field === undefined) {
@@ -360,11 +358,10 @@ function attachDrillPaths(pipeline, nestName) {
                 filterView: nestName,
             })),
             queryFields: pipeline[0].queryFields.map(f => {
-                var _a;
                 if (f.type === 'turtle') {
                     return updateNestedDrillPaths(f, nestName);
                 }
-                const fieldName = f.type === 'fieldref' ? f.path[f.path.length - 1] : ((_a = f.as) !== null && _a !== void 0 ? _a : f.name);
+                const fieldName = f.type === 'fieldref' ? f.path[f.path.length - 1] : (0, malloy_types_1.activeName)(f);
                 return {
                     ...f,
                     drillExpression: {

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

@@ -40,7 +40,6 @@ function composeSources(sources, compositeCodeSource) {
     const fieldsByName = new Map();
     const joinsToCompose = new Map();
     sources.forEach(source => {
-        var _a;
         const sourceDef = source.sourceDef;
         // Check that connections all match; don't bother checking dialect, since it will
         // match if the connection matches.
@@ -48,7 +47,7 @@ function composeSources(sources, compositeCodeSource) {
             source.logTo.logError('composite-source-connection-mismatch', `All sources in a composite source must share the same connection; connection \`${sourceDef.connection}\` differs from previous connection \`${connection}\``);
         }
         for (const field of sourceDef.fields) {
-            const fieldName = (_a = field.as) !== null && _a !== void 0 ? _a : field.name;
+            const fieldName = (0, malloy_types_1.activeName)(field);
             if (field.accessModifier === 'private') {
                 continue;
             }

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

@@ -23,6 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SQLSource = void 0;
+const malloy_types_1 = require("../../../model/malloy_types");
 const source_def_utils_1 = require("../../../model/source_def_utils");
 const sql_block_1 = require("../../../model/sql_block");
 const source_1 = require("./source");
@@ -132,14 +133,11 @@ class SQLSource extends source_1.Source {
             // Create a base struct with updated fields (adding location and refSummary)
             const baseStruct = {
                 ...lookup.value,
-                fields: lookup.value.fields.map(f => {
-                    var _a;
-                    return ({
-                        ...f,
-                        location,
-                        refSummary: { fieldUsage: [{ path: [(_a = f.as) !== null && _a !== void 0 ? _a : f.name], at: location }] },
-                    });
-                }),
+                fields: lookup.value.fields.map(f => ({
+                    ...f,
+                    location,
+                    refSummary: { fieldUsage: [{ path: [(0, malloy_types_1.activeName)(f)], at: location }] },
+                })),
                 location: this.location,
             };
             // Use factory to create SQLSourceDef without propagating sourceID/extends

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

@@ -23,6 +23,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TableMethodSource = exports.TableSource = void 0;
+const malloy_types_1 = require("../../../model/malloy_types");
 const find_external_references_1 = require("../../parse-tree-walkers/find-external-references");
 const source_1 = require("./source");
 const error_factory_1 = require("../error-factory");
@@ -60,16 +61,13 @@ class TableSource extends source_1.Source {
                 });
                 const ret = {
                     ...tableDefEntry.value,
-                    fields: tableDefEntry.value.fields.map(field => {
-                        var _a;
-                        return ({
-                            ...field,
-                            location: this.location,
-                            refSummary: {
-                                fieldUsage: [{ path: [(_a = field.as) !== null && _a !== void 0 ? _a : field.name], at: this.location }],
-                            },
-                        });
-                    }),
+                    fields: tableDefEntry.value.fields.map(field => ({
+                        ...field,
+                        location: this.location,
+                        refSummary: {
+                            fieldUsage: [{ path: [(0, malloy_types_1.activeName)(field)], at: this.location }],
+                        },
+                    })),
                     location: this.location,
                 };
                 (_d = this.document()) === null || _d === void 0 ? void 0 : _d.rememberToAddModelAnnotations(ret);