@malloydata/malloy 0.0.98 → 0.0.99-dev231101201548

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

@@ -89,6 +89,9 @@ class ReferenceField extends space_field_1.SpaceField {
                             e: [{ type: 'field', path }],
                             annotation,
                         };
+                        if ((0, malloy_types_1.hasExpression)(origFd)) {
+                            newField.expressionType = origFd.expressionType;
+                        }
                         return newField;
                     }
                     // maybe ok, this likely is some field which cannot be referenced

package/dist/lang/test/annotation.spec.js

@@ -616,5 +616,26 @@ describe('query operation annotations', () => {
             expect(note_b === null || note_b === void 0 ? void 0 : note_b.annotation).matchesAnnotation({ inherits: defaultTags });
         }
     });
+    test('annotated references to measures on join preserve expression type', () => {
+        const m = (0, test_translator_1.model) `
+    source: na is a extend {
+      measure:
+          one_count is sum(pick 1 when ai = 1 else 0)
+          pct_one is one_count / count();
+    }
+
+    run: na extend {
+      join_many: na on ai = na.ai
+    } -> {
+      group_by: ai
+      aggregate:
+        # percent
+        na.pct_one
+    }`;
+        expect(m).toTranslate();
+        const q = m.translator.queryList[0];
+        const fields = q.pipeline[0].fields;
+        expect(fields[1]).toMatchObject({ expressionType: 'aggregate' });
+    });
 });
 //# sourceMappingURL=annotation.spec.js.map

package/dist/model/malloy_types.d.ts

@@ -269,10 +269,9 @@ export declare function expressionIsAnalytic(e: ExpressionType | undefined): boo
 export declare function isExpressionTypeLEQ(e1: ExpressionType, e2: ExpressionType): boolean;
 export declare function maxExpressionType(e1: ExpressionType, e2: ExpressionType): ExpressionType;
 export declare function maxOfExpressionTypes(types: ExpressionType[]): ExpressionType;
-interface JustExpression {
+type HasExpression = FieldDef & Expression & {
     e: Expr;
-}
-type HasExpression = FieldDef & JustExpression;
+};
 /**  Grants access to the expression property of a FieldDef */
 export declare function hasExpression(f: FieldDef): f is HasExpression;
 export type TimeFieldType = 'date' | 'timestamp';

package/package.json

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