@malloydata/malloy 0.0.194-dev241001154534 → 0.0.194-dev241001212731

package/dist/malloy.d.ts

@@ -621,6 +621,11 @@ export declare class AtomicField extends Entity implements Taggable {
     isCalculation(): boolean;
     get sourceField(): Field;
     get sourceClasses(): string[];
+    /**
+     * A unique ID of this field within the context of a result; undefined
+     * for fields that are not derived from a Result.
+     */
+    get referenceId(): string | undefined;
     sourceWasMeasure(): boolean;
     sourceWasMeasureLike(): boolean;
     sourceWasDimension(): boolean;

package/dist/malloy.js

@@ -1268,6 +1268,14 @@ class AtomicField extends Entity {
         const sourceField = this.fieldTypeDef.name || this.fieldTypeDef.as;
         return sourceField ? [sourceField] : [];
     }
+    /**
+     * A unique ID of this field within the context of a result; undefined
+     * for fields that are not derived from a Result.
+     */
+    get referenceId() {
+        var _a;
+        return (_a = this.fieldTypeDef.resultMetadata) === null || _a === void 0 ? void 0 : _a.referenceId;
+    }
     // was the field generated from a measure in the previous query
     sourceWasMeasure() {
         var _a;

package/dist/model/malloy_query.d.ts

@@ -63,7 +63,8 @@ declare abstract class QueryNode {
 declare class QueryField extends QueryNode {
     fieldDef: FieldDef;
     parent: QueryStruct;
-    constructor(fieldDef: FieldDef, parent: QueryStruct);
+    readonly referenceId: string;
+    constructor(fieldDef: FieldDef, parent: QueryStruct, referenceId?: string);
     uniqueKeyPossibleUse(): UniqueKeyPossibleUse | undefined;
     getJoinableParent(): QueryStruct;
     caseGroup(groupSets: number[], s: string): string;
@@ -324,7 +325,7 @@ declare class QueryStruct extends QueryNode {
     getModel(): QueryModel;
     setParent(parent: ParentQueryStruct | ParentQueryModel): void;
     /** makes a new queryable field object from a fieldDef */
-    makeQueryField(field: FieldDef): QueryField;
+    makeQueryField(field: FieldDef, referenceId?: string): QueryField;
     structSourceSQL(stageWriter: StageWriter): string;
     root(): QueryStruct;
     primaryKey(): QueryAtomicField | undefined;

package/dist/model/malloy_query.js

@@ -1,4 +1,6 @@
 "use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.QueryModel = exports.Segment = void 0;
 /*
  * Copyright 2023 Google LLC
  *
@@ -21,8 +23,7 @@
  * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
  * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.QueryModel = exports.Segment = void 0;
+const uuid_1 = require("uuid");
 const dialect_1 = require("../dialect");
 const standardsql_1 = require("../dialect/standardsql/standardsql");
 const malloy_types_1 = require("./malloy_types");
@@ -215,10 +216,11 @@ class QueryNode {
     }
 }
 class QueryField extends QueryNode {
-    constructor(fieldDef, parent) {
+    constructor(fieldDef, parent, referenceId) {
         super(fieldDef);
         this.parent = parent;
         this.fieldDef = fieldDef;
+        this.referenceId = referenceId !== null && referenceId !== void 0 ? referenceId : (0, uuid_1.v4)();
     }
     uniqueKeyPossibleUse() {
         return undefined;
@@ -1822,22 +1824,25 @@ class QueryQuery extends QueryField {
                     (fieldDef.name || fieldDef.as || 'undefined');
                 const sourceExpression = fieldDef.code;
                 const sourceClasses = [sourceField];
+                const referenceId = fi.f.referenceId;
+                const base = {
+                    sourceField,
+                    sourceExpression,
+                    sourceClasses,
+                    referenceId,
+                };
                 if (isCalculatedField(fi.f)) {
                     filterList = fi.f.getFilterList();
                     return {
-                        sourceField,
-                        sourceExpression,
+                        ...base,
                         filterList,
-                        sourceClasses,
                         fieldKind: 'measure',
                     };
                 }
                 if (isScalarField(fi.f)) {
                     return {
-                        sourceField,
-                        sourceExpression,
+                        ...base,
                         filterList,
-                        sourceClasses,
                         fieldKind: 'dimension',
                     };
                 }
@@ -3229,27 +3234,27 @@ class QueryStruct extends QueryNode {
         }
     }
     /** makes a new queryable field object from a fieldDef */
-    makeQueryField(field) {
+    makeQueryField(field, referenceId) {
         switch (field.type) {
             case 'string':
-                return new QueryFieldString(field, this);
+                return new QueryFieldString(field, this, referenceId);
             case 'date':
-                return new QueryFieldDate(field, this);
+                return new QueryFieldDate(field, this, referenceId);
             case 'timestamp':
-                return new QueryFieldTimestamp(field, this);
+                return new QueryFieldTimestamp(field, this, referenceId);
             case 'number':
-                return new QueryFieldNumber(field, this);
+                return new QueryFieldNumber(field, this, referenceId);
             case 'boolean':
-                return new QueryFieldBoolean(field, this);
+                return new QueryFieldBoolean(field, this, referenceId);
             case 'json':
-                return new QueryFieldJSON(field, this);
+                return new QueryFieldJSON(field, this, referenceId);
             case 'sql native':
-                return new QueryFieldUnsupported(field, this);
+                return new QueryFieldUnsupported(field, this, referenceId);
             // case "reduce":
             // case "project":
             // case "index":
             case 'turtle':
-                return new QueryTurtle(field, this);
+                return new QueryTurtle(field, this, referenceId);
             default:
                 throw new Error(`unknown field definition ${JSON.stringify(field)}`);
         }
@@ -3339,10 +3344,13 @@ class QueryStruct extends QueryNode {
             if (field.parent === undefined) {
                 throw new Error('Expected field to have a parent');
             }
+            if (!(field instanceof QueryField)) {
+                throw new Error('Expected fieldref to reference a QueryField');
+            }
             return field.parent.makeQueryField({
                 ...field.fieldDef,
                 annotation: refAnnoatation,
-            });
+            }, field.referenceId);
         }
         return field;
     }

package/dist/model/malloy_types.d.ts

@@ -285,6 +285,7 @@ export interface ResultMetadataDef {
     sourceClasses: string[];
     filterList?: FilterCondition[];
     fieldKind: 'measure' | 'dimension' | 'struct';
+    referenceId?: string;
 }
 export interface ResultStructMetadataDef extends ResultMetadataDef {
     limit?: number;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloy",
-  "version": "0.0.194-dev241001154534",
+  "version": "0.0.194-dev241001212731",
   "license": "MIT",
   "exports": {
     ".": "./dist/index.js",