@malloydata/malloy 0.0.105-dev231127212430 → 0.0.105

package/dist/malloy.d.ts

@@ -604,6 +604,9 @@ export declare class AtomicField extends Entity implements Taggable {
     isTimestamp(): this is TimestampField;
     isUnsupported(): this is UnsupportedField;
     get parentExplore(): Explore;
+    /**
+     * @return Field name for drill.
+     */
     get expression(): string;
     get location(): DocumentLocation | undefined;
 }

package/dist/malloy.js

@@ -1264,9 +1264,18 @@ class AtomicField extends Entity {
     get parentExplore() {
         return this.parent;
     }
+    /**
+     * @return Field name for drill.
+     */
     get expression() {
-        var _a;
-        return ((_a = this.fieldTypeDef.resultMetadata) === null || _a === void 0 ? void 0 : _a.sourceExpression) || this.name;
+        const dot = '.';
+        const resultMetadata = this.fieldTypeDef.resultMetadata;
+        // If field is joined-in from another table i.e. of type `tableName.columnName`,
+        // return sourceField, else return name because this could be a renamed field.
+        return (resultMetadata === null || resultMetadata === void 0 ? void 0 : resultMetadata.sourceExpression) ||
+            (resultMetadata === null || resultMetadata === void 0 ? void 0 : resultMetadata.sourceField.includes(dot))
+            ? resultMetadata === null || resultMetadata === void 0 ? void 0 : resultMetadata.sourceField
+            : this.name;
     }
     get location() {
         return this.fieldTypeDef.location;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.105-dev231127212430",
+  "version": "0.0.105",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",