@malloydata/render 0.0.119-dev240123183113 → 0.0.119-dev240124170348

package/dist/bundle/bundled_renderer.js

@@ -235,8 +235,8 @@
     "../malloy/dist/model/malloy_types.js"(exports) {
       "use strict";
       Object.defineProperty(exports, "__esModule", { value: true });
-      exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isPartialSegment = exports.isReduceSegment = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.FieldIsIntrinsic = exports.isCastType = exports.isAtomicFieldType = exports.isTimeFieldType = exports.hasExpression = exports.maxOfExpressionTypes = exports.maxExpressionType = exports.isExpressionTypeLEQ = exports.expressionIsAnalytic = exports.expressionIsCalculation = exports.expressionInvolvesAggregate = exports.expressionIsUngroupedAggregate = exports.expressionIsAggregate = exports.expressionIsScalar = exports.mkExpr = exports.isApplyFragment = exports.isApplyValue = exports.isParameterFragment = exports.isSourceReferenceFragment = exports.isSqlStringFragment = exports.isFieldReferenceFragment = exports.isFieldFragment = exports.isSpreadFragment = exports.isSQLExpressionFragment = exports.isFunctionCallFragment = exports.isFunctionParameterFragment = exports.isUngroupFragment = exports.isAsymmetricFragment = exports.isAggregateFragment = exports.isDialectFragment = exports.isFilterFragment = exports.isOutputFieldFragment = exports.isFilteredAliasedName = exports.paramHasValue = exports.isConditionParameter = exports.isValueParameter = void 0;
-      exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = exports.isMeasureLike = exports.getPhysicalFields = exports.getDimensions = exports.isPhysical = exports.isDimensional = exports.isAtomicField = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = exports.isSQLBlockStruct = exports.mergeEvalSpaces = exports.isSQLFragment = exports.isJoinOn = exports.isMatrixOperation = exports.isIndexSegment = exports.isRawSegment = void 0;
+      exports.isIndexSegment = exports.isRawSegment = exports.isSamplingEnable = exports.isSamplingPercent = exports.isSamplingRows = exports.isQuerySegment = exports.isProjectSegment = exports.isPartialSegment = exports.isReduceSegment = exports.refIsStructDef = exports.isByExpression = exports.isByName = exports.ValueType = exports.isExtractUnit = exports.isTimestampUnit = exports.isDateUnit = exports.FieldIsIntrinsic = exports.isCastType = exports.isAtomicFieldType = exports.isTimeFieldType = exports.hasExpression = exports.maxOfExpressionTypes = exports.maxExpressionType = exports.isExpressionTypeLEQ = exports.expressionIsAnalytic = exports.expressionIsCalculation = exports.expressionInvolvesAggregate = exports.expressionIsUngroupedAggregate = exports.expressionIsAggregate = exports.expressionIsScalar = exports.mkExpr = exports.isApplyFragment = exports.isApplyValue = exports.isParameterFragment = exports.isSourceReferenceFragment = exports.isSqlStringFragment = exports.isFieldFragment = exports.isSpreadFragment = exports.isSQLExpressionFragment = exports.isFunctionCallFragment = exports.isFunctionParameterFragment = exports.isUngroupFragment = exports.isAsymmetricFragment = exports.isAggregateFragment = exports.isDialectFragment = exports.isFilterFragment = exports.isOutputFieldFragment = exports.paramHasValue = exports.isConditionParameter = exports.isValueParameter = void 0;
+      exports.isValueDate = exports.isValueTimestamp = exports.isValueBoolean = exports.isValueNumber = exports.isValueString = exports.isMeasureLike = exports.getPhysicalFields = exports.getDimensions = exports.isPhysical = exports.isDimensional = exports.isAtomicField = exports.isTurtleDef = exports.getIdentifier = exports.isFieldStructDef = exports.isFieldTimeBased = exports.isFieldTypeDef = exports.isSQLBlockStruct = exports.mergeEvalSpaces = exports.isSQLFragment = exports.isJoinOn = exports.isMatrixOperation = void 0;
       function isValueParameter(p3) {
         return p3.value !== void 0;
       }
@@ -249,15 +249,6 @@
         return isValueParameter(p3) || p3.condition !== null;
       }
       exports.paramHasValue = paramHasValue;
-      function isFilteredAliasedName(f4) {
-        for (const prop of Object.keys(f4)) {
-          if (!["name", "as", "filterList"].includes(prop)) {
-            return false;
-          }
-        }
-        return true;
-      }
-      exports.isFilteredAliasedName = isFilteredAliasedName;
       function isOutputFieldFragment(f4) {
         return (f4 === null || f4 === void 0 ? void 0 : f4.type) === "outputField";
       }
@@ -303,10 +294,6 @@
         return (f4 === null || f4 === void 0 ? void 0 : f4.type) === "field";
       }
       exports.isFieldFragment = isFieldFragment;
-      function isFieldReferenceFragment(f4) {
-        return (f4 === null || f4 === void 0 ? void 0 : f4.type) === "field-reference";
-      }
-      exports.isFieldReferenceFragment = isFieldReferenceFragment;
       function isSqlStringFragment(f4) {
         return (f4 === null || f4 === void 0 ? void 0 : f4.type) === "sql-string";
       }
@@ -4745,6 +4732,9 @@ ${hackSplitComment}
       var standardsql_1 = require_standardsql();
       var malloy_types_1 = require_malloy_types();
       var utils_1 = require_utils();
+      function pathToCol(path3) {
+        return path3.map((el) => encodeURIComponent(el)).join("/");
+      }
       function generateSQLStringLiteral(sourceString) {
         return `'${sourceString}'`;
       }
@@ -5005,15 +4995,7 @@ ${(0, utils_1.indent)(sql)})
         generateSpread(_resultSet, _context, _frag, _state) {
           throw new Error("Unexpanded spread encountered during SQL generation");
         }
-        generateParameterFragment(resultSet, context3, expr2, state) {
-          const param2 = context3.parameters()[expr2.path];
-          if ((0, malloy_types_1.isValueParameter)(param2)) {
-            if (param2.value) {
-              return this.generateExpressionFromExpr(resultSet, context3, param2.value, state);
-            }
-          } else if (param2.condition) {
-            return this.generateExpressionFromExpr(resultSet, context3, param2.condition, state);
-          }
+        generateParameterFragment(resultSet, context3, expr2, _state) {
           throw new Error(`Can't generate SQL, no value for ${expr2.path}`);
         }
         generateFilterFragment(resultSet, context3, expr2, state) {
@@ -5132,9 +5114,6 @@ ${(0, utils_1.indent)(sql)})
         generateDialect(resultSet, context3, expr2, state) {
           return this.generateExpressionFromExpr(resultSet, context3, context3.dialect.dialectExpr(resultSet.getQueryInfo(), expr2), state);
         }
-        generateFieldReference(resultSet, context3, expr2, state) {
-          return this.generateFieldFragment(resultSet, context3, { type: "field", path: expr2.path }, state);
-        }
         generateSqlString(resultSet, context3, expr2, state) {
           return expr2.e.map((part) => typeof part === "string" ? part : this.generateExpressionFromExpr(resultSet, context3, [part], state)).join("");
         }
@@ -5282,8 +5261,6 @@ ${(0, utils_1.indent)(sql)})
               s8 += this.generateSqlString(resultSet, context3, expr2, state);
             } else if (expr2.type === "source-reference") {
               s8 += this.generateSourceReference(resultSet, context3, expr2);
-            } else if (expr2.type === "field-reference") {
-              s8 += this.generateFieldReference(resultSet, context3, expr2, state);
             } else {
               throw new Error(`Internal Error: Unknown expression fragment ${JSON.stringify(expr2, void 0, 2)}`);
             }
@@ -5309,7 +5286,7 @@ ${(0, utils_1.indent)(sql)})
         return f4 instanceof QueryAtomicField && f4.isAggregate();
       }
       function isScalarField(f4) {
-        return f4 instanceof QueryAtomicField && !f4.isCalculated();
+        return f4 instanceof QueryAtomicField && !f4.isCalculated() && !f4.isAggregate();
       }
       var QueryAtomicField = class extends QueryField {
         includeInWildcard() {
@@ -5355,10 +5332,10 @@ ${(0, utils_1.indent)(sql)})
               onExpression: [
                 {
                   type: "field",
-                  path: this.primaryKey
+                  path: [this.primaryKey]
                 },
                 "=",
-                { type: "field", path: foreignKeyName }
+                { type: "field", path: [foreignKeyName] }
               ]
             }
           };
@@ -5940,99 +5917,12 @@ ${(0, utils_1.indent)(sql)})
         inNestedPipeline() {
           return this.parent.fieldDef.structSource.type === "sql" && this.parent.fieldDef.structSource.method === "nested";
         }
-        getFieldList() {
-          switch (this.firstSegment.type) {
-            case "reduce":
-              return this.firstSegment.fields;
-            case "project":
-              return this.firstSegment.fields;
-            default:
-              throw new Error(`Query contains no fields ${JSON.stringify(this.fieldDef)}`);
-          }
-        }
         // get a field ref and expand it.
         expandField(f4) {
-          let as;
-          let field3;
-          if (typeof f4 === "string") {
-            field3 = this.parent.getQueryFieldByName(f4);
-          } else if ("type" in f4) {
-            field3 = this.parent.makeQueryField(f4);
-          } else if ("name" in f4 && "as" in f4) {
-            field3 = this.parent.getQueryFieldByName(f4.name);
-            as = field3.fieldDef.as || f4.as;
-            if (field3 instanceof QueryFieldStruct) {
-              throw new Error("Syntax currently disallowed. Semantics up for discussion");
-            }
-            if (field3 instanceof _QueryQuery) {
-              const newFieldDef = structuredClone(field3.fieldDef);
-              newFieldDef.as = f4.name;
-              newFieldDef.filterList = f4.filterList;
-              field3 = _QueryQuery.makeQuery(newFieldDef, this.parent, void 0, this.isJoinedSubquery);
-            } else if (!(field3 instanceof QueryFieldTimestamp || field3 instanceof QueryFieldDate)) {
-              throw new Error(`No longer generate code this way. 
- ${JSON.stringify(f4, void 0, 2)}`);
-            }
-          } else {
-            throw new Error(`Unrecognized field definition ${JSON.stringify(f4, void 0, 2)}`);
-          }
-          if (!as) {
-            as = field3.getIdentifier();
-          }
+          const field3 = f4.type === "fieldref" ? this.parent.getQueryFieldReference(f4.path, f4.annotation) : this.parent.makeQueryField(f4);
+          const as = field3.getIdentifier();
           return { as, field: field3 };
         }
-        expandDependantField(resultStruct, fieldRef2) {
-          this.expandField(fieldRef2);
-        }
-        // find all the fieldNames in the struct (and children)
-        //  that match the filter
-        expandWildCardStruct(struct, expandChildren, filter3 = void 0) {
-          let fieldNames2 = [];
-          const structs = [];
-          for (const [_name, f4] of struct.nameMap) {
-            if (f4 instanceof QueryAtomicField && isScalarField(f4) && f4.includeInWildcard() && !this.parent.dialect.ignoreInProject(f4.fieldDef.name) && (!filter3 || filter3(f4))) {
-              fieldNames2.push(f4.getFullOutputName());
-            } else if (f4 instanceof QueryStruct && expandChildren) {
-              structs.push(f4);
-            }
-          }
-          for (const s8 of structs) {
-            fieldNames2 = fieldNames2.concat(this.expandWildCardStruct(s8, expandChildren, filter3));
-          }
-          return fieldNames2;
-        }
-        // Do any '*' expansion.
-        expandWildCards(fields, filter3 = void 0) {
-          let ret = [];
-          for (const f4 of fields) {
-            if (typeof f4 !== "string") {
-              ret.push(f4);
-            } else {
-              const fieldName = f4;
-              const path3 = fieldName.split(".");
-              if (!path3[path3.length - 1].startsWith("*")) {
-                ret.push(f4);
-              } else {
-                const expandChildren = path3.pop() === "**";
-                let struct = this.parent;
-                let pathElementName;
-                while (path3.length > 0 && (pathElementName = path3.shift())) {
-                  const structNode = struct.getChildByName(pathElementName);
-                  if (structNode === void 0) {
-                    throw new Error(`Nested source not found '${pathElementName}'`);
-                  }
-                  if (structNode instanceof QueryStruct) {
-                    struct = structNode;
-                  } else {
-                    throw new Error(`'${pathElementName}' is not a source object`);
-                  }
-                }
-                ret = ret.concat(this.expandWildCardStruct(struct, expandChildren, filter3));
-              }
-            }
-          }
-          return ret;
-        }
         addDependantPath(resultStruct, context3, path3, uniqueKeyPossibleUse, joinStack) {
           const node = context3.getFieldByName(path3);
           let struct;
@@ -6140,9 +6030,13 @@ ${(0, utils_1.indent)(sql)})
             this.addDependantExpr(resultStruct, field3.parent, field3.fieldDef.e, []);
           }
         }
+        getSegmentFields(resultStruct) {
+          const fs = resultStruct.firstSegment;
+          return fs.type === "index" ? fs.indexFields : (0, malloy_types_1.isQuerySegment)(fs) ? fs.queryFields : [];
+        }
         expandFields(resultStruct) {
           let resultIndex = 1;
-          for (const f4 of this.expandWildCards(resultStruct.firstSegment.fields)) {
+          for (const f4 of this.getSegmentFields(resultStruct)) {
             const { as, field: field3 } = this.expandField(f4);
             if (field3 instanceof QueryTurtle || field3 instanceof _QueryQuery) {
               if (this.firstSegment.type === "project") {
@@ -6275,7 +6169,7 @@ ${(0, utils_1.indent)(sql)})
               const resultType = fi.getRepeatedResultType() === "nested" ? "nested" : "inline";
               structDef.name = name;
               structDef.structRelationship = {
-                field: name,
+                fieldName: name,
                 type: resultType,
                 isArray: false
               };
@@ -6439,7 +6333,7 @@ ${(0, utils_1.indent)(select2)}) AS ${ji.alias}
             if (qs.parent === void 0 || ji.parent === void 0) {
               throw new Error("Internal Error, nested structure with no parent.");
             }
-            const fieldExpression = this.parent.dialect.sqlFieldReference(qs.parent.getSQLIdentifier(), structRelationship.field, "struct", qs.parent.fieldDef.structRelationship.type === "nested", this.parent.fieldDef.structRelationship.type === "nested" && this.parent.fieldDef.structRelationship.isArray);
+            const fieldExpression = this.parent.dialect.sqlFieldReference(qs.parent.getSQLIdentifier(), structRelationship.fieldName, "struct", qs.parent.fieldDef.structRelationship.type === "nested", this.parent.fieldDef.structRelationship.type === "nested" && this.parent.fieldDef.structRelationship.isArray);
             s8 += `${this.parent.dialect.sqlUnnestAlias(fieldExpression, ji.alias, ji.getDialectFieldList(), ji.makeUniqueKey, structRelationship.isArray, this.inNestedPipeline())}
 `;
           } else if (structRelationship.type === "inline") {
@@ -6985,20 +6879,21 @@ FROM ${stage0Name}
       var QueryQueryIndexStage = class extends QueryQuery {
         constructor(fieldDef, parent, stageWriter, isJoinedSubquery) {
           super(fieldDef, parent, stageWriter, isJoinedSubquery);
+          this.indexPaths = {};
           this.fieldDef = fieldDef;
         }
-        // get a field ref and expand it.
         expandField(f4) {
-          const field3 = this.parent.getFieldByName(f4);
-          return { as: f4, field: field3 };
+          const as = f4.path.join(".");
+          const field3 = this.parent.getQueryFieldByName(f4.path);
+          return { as, field: field3 };
         }
         expandFields(resultStruct) {
           let resultIndex = 1;
           const groupIndex = resultStruct.groupSet;
           this.maxGroupSet = groupIndex;
-          const fieldNames2 = this.firstSegment.fields || [];
-          for (const f4 of fieldNames2) {
+          for (const f4 of this.firstSegment.indexFields) {
             const { as, field: field3 } = this.expandField(f4);
+            this.indexPaths[as] = f4.path;
             resultStruct.addField(as, field3, {
               resultIndex,
               type: "result"
@@ -7010,7 +6905,7 @@ FROM ${stage0Name}
           }
           const measure2 = this.firstSegment.weightMeasure;
           if (measure2 !== void 0) {
-            const f4 = this.parent.getFieldByName(measure2);
+            const f4 = this.parent.getFieldByName([measure2]);
             resultStruct.addField(measure2, f4, {
               resultIndex,
               type: "result"
@@ -7023,6 +6918,7 @@ FROM ${stage0Name}
           let measureSQL = "COUNT(*)";
           const dialect = this.parent.dialect;
           const fieldNameColumn = dialect.sqlMaybeQuoteIdentifier("fieldName");
+          const fieldPathColumn = dialect.sqlMaybeQuoteIdentifier("fieldPath");
           const fieldValueColumn = dialect.sqlMaybeQuoteIdentifier("fieldValue");
           const fieldTypeColumn = dialect.sqlMaybeQuoteIdentifier("fieldType");
           const fieldRangeColumn = dialect.sqlMaybeQuoteIdentifier("fieldRange");
@@ -7035,7 +6931,8 @@ FROM ${stage0Name}
             const fi = field3;
             if (fi.fieldUsage.type === "result" && isScalarField(fi.f)) {
               const expression3 = fi.f.generateExpression(this.rootResult);
-              fields.push({ name, type: fi.f.fieldDef.type, expression: expression3 });
+              const path3 = this.indexPaths[name] || [];
+              fields.push({ name, path: path3, type: fi.f.fieldDef.type, expression: expression3 });
             }
           }
           let s8 = "SELECT\n  group_set,\n";
@@ -7044,14 +6941,24 @@ FROM ${stage0Name}
             s8 += `    WHEN ${i6} THEN '${fields[i6].name}'
 `;
           }
-          s8 += `  END as ${fieldNameColumn},`;
+          s8 += `  END as ${fieldNameColumn},
+`;
+          s8 += "  CASE group_set\n";
+          for (let i6 = 0; i6 < fields.length; i6++) {
+            const path3 = pathToCol(fields[i6].path);
+            s8 += `    WHEN ${i6} THEN '${path3}'
+`;
+          }
+          s8 += `  END as ${fieldPathColumn},
+`;
           s8 += "  CASE group_set\n";
           for (let i6 = 0; i6 < fields.length; i6++) {
             s8 += `    WHEN ${i6} THEN '${fields[i6].type}'
 `;
           }
           s8 += `  END as ${fieldTypeColumn},`;
-          s8 += "  CASE group_set WHEN 99999 THEN NULL\n";
+          s8 += `  CASE group_set WHEN 99999 THEN ${dialect.castToString("NULL")}
+`;
           for (let i6 = 0; i6 < fields.length; i6++) {
             if (fields[i6].type === "string") {
               s8 += `    WHEN ${i6} THEN ${fields[i6].expression}
@@ -7078,7 +6985,7 @@ FROM ${stage0Name}
           s8 += this.generateSQLJoins(stageWriter);
           s8 += dialect.sqlGroupSetTable(fields.length) + "\n";
           s8 += this.generateSQLFilters(this.rootResult, "where").sql("where");
-          s8 += "GROUP BY 1,2,3,4\n";
+          s8 += "GROUP BY 1,2,3,4,5\n";
           if (!(0, malloy_types_1.isRawSegment)(this.firstSegment) && this.firstSegment.limit) {
             s8 += `LIMIT ${this.firstSegment.limit}
 `;
@@ -7086,6 +6993,7 @@ FROM ${stage0Name}
           const resultStage = stageWriter.addStage(s8);
           this.resultStage = stageWriter.addStage(`SELECT
   ${fieldNameColumn},
+  ${fieldPathColumn},
   ${fieldTypeColumn},
   COALESCE(${fieldValueColumn}, ${fieldRangeColumn}) as ${fieldValueColumn},
   weight
@@ -7115,83 +7023,52 @@ FROM ${resultStage}
       var QueryQueryIndex = class extends QueryQuery {
         constructor(fieldDef, parent, stageWriter, isJoinedSubquery) {
           super(fieldDef, parent, stageWriter, isJoinedSubquery);
-          this.rootFields = [];
-          this.fanPrefixMap = {};
+          this.stages = [];
           this.fieldDef = fieldDef;
-          this.findFanPrefexes(parent);
-        }
-        // we want to generate a different query for each
-        //  nested structure so we don't do a crazy cross product.
-        findFanPrefexes(qs) {
-          for (const [_name, f4] of qs.nameMap) {
-            if (f4 instanceof QueryStruct && (f4.fieldDef.structRelationship.type === "many" || f4.fieldDef.structRelationship.type === "nested") && f4.fieldDef.fields.length > 1 && // leave arrays in parent.
-            this.parent.dialect.dontUnionIndex === false) {
-              const key2 = f4.getFullOutputName();
-              this.fanPrefixMap[key2] = [];
-              this.findFanPrefexes(f4);
-            }
-          }
-        }
-        expandIndexWildCards() {
-          let fieldNames2 = this.firstSegment.fields || [];
-          if (fieldNames2.length === 0) {
-            fieldNames2.push("**");
-          }
-          fieldNames2 = this.expandWildCards(fieldNames2, (qf) => ["string", "number", "timestamp", "date"].indexOf(qf.fieldDef.type) !== -1);
-          return fieldNames2;
+          this.fieldsToStages();
         }
-        // return the number of stages it is going to take to generate this index.
-        getStageFields() {
-          const s8 = [];
-          if (this.rootFields.length > 0) {
-            s8.push(this.rootFields);
-          }
-          for (const fieldList of Object.values(this.fanPrefixMap)) {
-            if (fieldList.length > 0) {
-              s8.push(fieldList);
-            }
+        fieldsToStages() {
+          const indexSeg = this.firstSegment;
+          if (this.parent.dialect.dontUnionIndex) {
+            this.stages = [indexSeg.indexFields];
+            return;
           }
-          return s8;
-        }
-        // Map fields into stages based on their level of repeated nesting
-        //
-        mapFieldsIntoStages(fieldNames2) {
-          const fannedPrefixes = Object.keys(this.fanPrefixMap).sort((k1, k2) => {
-            if (k1.length < k2.length) {
-              return 1;
-            }
-            if (k1.length > k2.length) {
-              return -1;
-            }
-            return 0;
-          });
-          for (const fn of fieldNames2) {
-            let found = false;
-            for (const prefix of fannedPrefixes) {
-              if (fn.startsWith(prefix)) {
-                this.fanPrefixMap[prefix].push(fn);
-                found = true;
+          const stageMap = {};
+          for (const fref of indexSeg.indexFields) {
+            if (fref.path.length > 1) {
+              const stageRoot = pathToCol(fref.path.slice(0, fref.path.length - 1));
+              const stage = stageMap[stageRoot];
+              if (stage === void 0) {
+                const f4 = this.parent.nameMap.get(fref.path[0]);
+                if (f4 instanceof QueryStruct && (f4.fieldDef.structRelationship.type === "many" || f4.fieldDef.structRelationship.type === "nested") && f4.fieldDef.fields.length > 1) {
+                  const toStage = [fref];
+                  stageMap[stageRoot] = toStage;
+                  this.stages.push(toStage);
+                  continue;
+                }
+              } else {
+                stage.push(fref);
+                continue;
               }
             }
-            if (!found) {
-              this.rootFields.push(fn);
+            if (this.stages[0] === void 0) {
+              this.stages[0] = [];
             }
+            this.stages[0].push(fref);
           }
         }
         expandFields(_resultStruct) {
-          const fieldNames2 = this.expandIndexWildCards();
-          this.mapFieldsIntoStages(fieldNames2);
         }
         generateSQL(stageWriter) {
-          const stages = this.getStageFields();
+          const indexSeg = this.firstSegment;
           const outputStageNames = [];
-          for (const fields of stages) {
+          for (const fields of this.stages) {
             const q = new QueryQueryIndexStage({
               ...this.fieldDef,
               pipeline: [
                 {
-                  ...this.fieldDef.pipeline[0],
-                  fields
+                  ...indexSeg,
+                  indexFields: fields
                 }
               ]
             }, this.parent, stageWriter, this.isJoinedSubquery);
@@ -7207,7 +7084,11 @@ FROM ${resultStage}
           }
           return this.resultStage;
         }
-        /**  All Indexes have the same output schema */
+        /**
+         * All Indexes have the same output schema.
+         *   fieldName is deprecated, dots in fieldName may or may not be join nodes
+         *   fieldPath is a URL encoded slash separated path
+         */
         getResultStructDef() {
           const ret = {
             type: "struct",
@@ -7215,6 +7096,7 @@ FROM ${resultStage}
             dialect: this.parent.fieldDef.dialect,
             fields: [
               { type: "string", name: "fieldName" },
+              { type: "string", name: "fieldPath" },
               { type: "string", name: "fieldValue" },
               { type: "string", name: "fieldType" },
               { type: "number", name: "weight", numberType: "integer" }
@@ -7304,32 +7186,6 @@ FROM ${resultStage}
             return ret;
           }
         }
-        // when structs are referenced in queries, incorporate the
-        //  primary key of struct and add the struct as a join to the result.
-        getAsQueryField() {
-          if (this.fieldDef.primaryKey === void 0) {
-            throw new Error(`Joined explores can only be included in queries if a primary key is defined: '${this.getFullOutputName()}' has no primary key`);
-          }
-          const pkField = this.getPrimaryKeyField(this.fieldDef);
-          const pkType = pkField.fieldDef.type;
-          if (pkType !== "string" && pkType !== "number") {
-            throw new Error(`Unknown Primary key data type for ${pkField.fieldDef.name}`);
-          }
-          const aliasName = (0, malloy_types_1.getIdentifier)(this.fieldDef);
-          const pkName = this.fieldDef.primaryKey;
-          const fieldDef = {
-            type: pkType,
-            name: `${aliasName}_id`,
-            e: [
-              {
-                type: "field",
-                // path: pkField.getFullOutputName(),
-                path: pkField.getIdentifier()
-              }
-            ]
-          };
-          return new QueryFieldStruct(fieldDef, this, `${aliasName}.${pkName}`);
-        }
         getSQLIdentifier() {
           if (this.unnestWithNumbers() && this.parent !== void 0) {
             const x6 = this.parent.getSQLIdentifier() + "." + (0, malloy_types_1.getIdentifier)(this.fieldDef) + `[${this.getIdentifier()}.__row_id]`;
@@ -7469,25 +7325,6 @@ FROM ${resultStage}
               throw new Error(`unknown field definition ${JSON.stringify(field3)}`);
           }
         }
-        /**
-         * return a field if it exists, make one if we are passed a field definition.
-         */
-        getOrMakeField(fieldRef2) {
-          if (typeof fieldRef2 === "string") {
-            return this.getFieldByName(fieldRef2);
-          } else {
-            return this.makeQueryField(fieldRef2);
-          }
-        }
-        /** returns a dimension for the given name  or make one. */
-        getOrMakeDimension(fieldRef2) {
-          const dim = this.getOrMakeField(fieldRef2);
-          if (dim instanceof QueryAtomicField && isScalarField(dim)) {
-            return dim;
-          } else {
-            throw new Error(`${fieldRef2} is not of type a scalar'`);
-          }
-        }
         structSourceSQL(stageWriter) {
           switch (this.fieldDef.structSource.type) {
             case "table": {
@@ -7534,36 +7371,38 @@ FROM ${resultStage}
         }
         primaryKey() {
           if (this.fieldDef.primaryKey) {
-            return this.getDimensionByName(this.fieldDef.primaryKey);
+            return this.getDimensionByName([this.fieldDef.primaryKey]);
           } else {
             return void 0;
           }
         }
-        /** get the componennts of a field path */
-        static resolvePath(name) {
-          return name.split(".");
-        }
         getChildByName(name) {
           return this.nameMap.get(name);
         }
-        /** convert a name into a field reference */
-        getFieldByName(name) {
-          const path3 = _QueryStruct.resolvePath(name);
-          let ret = this;
-          for (const n7 of path3) {
-            const r8 = ret.getChildByName(n7);
+        /** convert a path into a field reference */
+        getFieldByName(path3) {
+          return path3.reduce((lookIn, childName) => {
+            const r8 = lookIn.getChildByName(childName);
             if (r8 === void 0) {
-              throw new Error(`Path not found ${name}`);
+              throw new Error(path3.length === 1 ? `'${childName}' not found` : `'${childName}' not found in '${path3.join(".")}'`);
             }
-            ret = r8;
-          }
-          return ret;
+            return r8;
+          }, this);
         }
         // structs referenced in queries are converted to fields.
         getQueryFieldByName(name) {
-          let field3 = this.getFieldByName(name);
+          const field3 = this.getFieldByName(name);
           if (field3 instanceof _QueryStruct) {
-            field3 = field3.getAsQueryField();
+            throw new Error(`Cannot reference ${name} as a scalar'`);
+          }
+          return field3;
+        }
+        getQueryFieldReference(name, refAnnoatation) {
+          const field3 = this.getQueryFieldByName(name);
+          if (refAnnoatation) {
+            const newDef = { ...field3.fieldDef };
+            newDef.annotation = refAnnoatation;
+            field3.fieldDef = newDef;
           }
           return field3;
         }
@@ -7590,12 +7429,12 @@ FROM ${resultStage}
           if (struct instanceof _QueryStruct) {
             return struct;
           } else {
-            throw new Error(`Error: Path to structure not found '${name}'`);
+            throw new Error(`Error: Path to structure not found '${name.join(".")}'`);
           }
         }
         getDistinctKey() {
           if (this.fieldDef.structRelationship.type !== "inline") {
-            return this.getDimensionByName("__distinct_key");
+            return this.getDimensionByName(["__distinct_key"]);
           } else if (this.parent) {
             return this.parent.getDistinctKey();
           } else {
@@ -7642,20 +7481,6 @@ FROM ${resultStage}
             }
           }
         }
-        parseQueryPath(name) {
-          const path3 = name.split(".");
-          let struct;
-          if (struct = this.structs.get(path3[0])) {
-            if (path3.length > 1) {
-              path3.shift();
-            } else {
-              throw new Error(`No query specified in Struct '${path3[0]}'`);
-            }
-            return { queryName: path3.join("."), struct };
-          } else {
-            throw new Error(`Cannot find Struct '${path3[0]}' Model`);
-          }
-        }
         getStructByName(name) {
           let s8;
           if (s8 = this.structs.get(name)) {
@@ -7732,17 +7557,27 @@ FROM ${resultStage}
             return void 0;
           }
           const struct = this.getStructByName(explore);
+          let indexStar = [];
+          for (const [fn, fv] of struct.nameMap) {
+            if (!(fv instanceof QueryStruct)) {
+              if (isScalarField(fv) && fv.includeInWildcard()) {
+                indexStar.push({ type: "fieldref", path: [fn] });
+              }
+            }
+          }
+          indexStar = indexStar.sort((a5, b4) => a5.path[0].localeCompare(b4.path[0]));
           const indexQuery = {
             structRef: explore,
             pipeline: [
               {
                 type: "index",
-                fields: ["*"],
+                indexFields: indexStar,
                 sample: struct.dialect.defaultSampling
               }
             ]
           };
           const fieldNameColumn = struct.dialect.sqlMaybeQuoteIdentifier("fieldName");
+          const fieldPathColumn = struct.dialect.sqlMaybeQuoteIdentifier("fieldPath");
           const fieldValueColumn = struct.dialect.sqlMaybeQuoteIdentifier("fieldValue");
           const fieldTypeColumn = struct.dialect.sqlMaybeQuoteIdentifier("fieldType");
           let sqlPDT = this.exploreSearchSQLMap.get(explore);
@@ -7752,10 +7587,11 @@ FROM ${resultStage}
           }
           let query = `SELECT
               ${fieldNameColumn},
+              ${fieldPathColumn},
               ${fieldValueColumn},
               ${fieldTypeColumn},
               weight,
-              CASE WHEN lower(${fieldValueColumn}) LIKE  lower(${generateSQLStringLiteral(searchValue + "%")}) THEN 1 ELSE 0 END as match_first
+              CASE WHEN lower(${fieldValueColumn}) LIKE lower(${generateSQLStringLiteral(searchValue + "%")}) THEN 1 ELSE 0 END as match_first
             FROM  ${await connection.manifestTemporaryTable(sqlPDT)}
             WHERE lower(${fieldValueColumn}) LIKE lower(${generateSQLStringLiteral("%" + searchValue + "%")}) ${searchField !== void 0 ? ` AND ${fieldNameColumn} = '` + searchField + "' \n" : ""}
             ORDER BY CASE WHEN lower(${fieldValueColumn}) LIKE  lower(${generateSQLStringLiteral(searchValue + "%")}) THEN 1 ELSE 0 END DESC, weight DESC
@@ -7767,6 +7603,7 @@ ${query}
 )
 ${struct.dialect.sqlFinalStage("__stage0", [
               fieldNameColumn,
+              fieldPathColumn,
               fieldValueColumn,
               fieldTypeColumn,
               "weight",
@@ -49926,6 +49763,20 @@ ${spaces}}`;
           };
           this.log.push(logMsg);
         }
+        semanticError(cx, msg) {
+          const errAt = {
+            line: this.atLine,
+            // mtoy TODO get this right
+            character: 0
+          };
+          const range6 = { start: errAt, end: errAt };
+          const logMsg = {
+            message: msg,
+            at: { url: this.sourceURL, range: range6 },
+            severity: "error"
+          };
+          this.log.push(logMsg);
+        }
       };
       function getBuildOn(ctx) {
         const buildOn = ctx["buildOn"];
@@ -49969,19 +49820,20 @@ ${spaces}}`;
         const inputStream = antlr4ts_1.CharStreams.fromString(source3);
         const lexer = new MalloyTagLexer_1.MalloyTagLexer(inputStream);
         const tokenStream = new antlr4ts_1.CommonTokenStream(lexer);
+        const pLog = new TagErrorListener(sourceURL, onLine, atChar);
         const taglineParser = new MalloyTagParser_1.MalloyTagParser(tokenStream);
         taglineParser.removeErrorListeners();
-        const pLog = new TagErrorListener(sourceURL, onLine, atChar);
         taglineParser.addErrorListener(pLog);
         const tagTree = taglineParser.tagLine();
-        const treeWalker = new TaglineParser(outerScope);
+        const treeWalker = new TaglineParser(outerScope, pLog);
         const tag = treeWalker.tagLineToTag(tagTree, extending);
         return { tag, log: pLog.log };
       }
       var TaglineParser = class extends tree_1.AbstractParseTreeVisitor {
-        constructor(outerScopes = []) {
+        constructor(outerScopes = [], msgLog) {
           super();
           this.scopes = [];
+          this.msgLog = msgLog;
           this.scopes.unshift(...outerScopes);
         }
         defaultResult() {
@@ -50051,6 +49903,7 @@ ${spaces}}`;
               break;
             }
           }
+          this.msgLog.semanticError(ctx, `Reference to undefined property ${path3.join(".")}`);
           return this.defaultResult();
         }
         visitTagEq(ctx) {
@@ -50889,13 +50742,13 @@ ${left}  `;
           };
         }
         static get reduceSegment() {
-          return { type: "reduce", fields: [] };
+          return { type: "reduce", queryFields: [] };
         }
         static get projectSegment() {
-          return { type: "project", fields: [] };
+          return { type: "project", queryFields: [] };
         }
         static get indexSegment() {
-          return { type: "index", fields: [] };
+          return { type: "index", indexFields: [] };
         }
       };
       exports.ErrorFactory = ErrorFactory;
@@ -51106,20 +50959,21 @@ ${left}  `;
     "../malloy/dist/lang/field-utils.js"(exports) {
       "use strict";
       Object.defineProperty(exports, "__esModule", { value: true });
-      exports.mergeFields = exports.nameOf = void 0;
-      function nameOf(qfd) {
-        if (typeof qfd === "string") {
-          return qfd;
+      exports.mergeFields = exports.nameFromDef = void 0;
+      function nameFromDef(f1) {
+        var _a;
+        if (f1.type === "fieldref") {
+          return f1.path[f1.path.length - 1];
         }
-        return qfd.as || qfd.name;
+        return (_a = f1.as) !== null && _a !== void 0 ? _a : f1.name;
       }
-      exports.nameOf = nameOf;
+      exports.nameFromDef = nameFromDef;
       function mergeFields(older, newer) {
         if (older === void 0) {
           return newer;
         }
-        const redefined = new Set(newer.map((f4) => nameOf(f4)));
-        const merged = older.filter((f4) => !redefined.has(nameOf(f4)));
+        const redefined = new Set(newer.map((f4) => nameFromDef(f4)));
+        const merged = older.filter((f4) => !redefined.has(nameFromDef(f4)));
         merged.push(...newer);
         return merged;
       }
@@ -51495,7 +51349,7 @@ ${left}  `;
           this.setEntry(newName, entry2);
         }
         addFieldDef(fd) {
-          this.setEntry((0, field_utils_1.nameOf)(fd), this.defToSpaceField(fd));
+          this.setEntry((0, field_utils_1.nameFromDef)(fd), this.defToSpaceField(fd));
         }
         setTimezone(tz) {
           this.newTimezone = tz;
@@ -51867,7 +51721,7 @@ ${left}  `;
                   onExpression: [
                     {
                       type: "field",
-                      path: `${this.name}.${inStruct.primaryKey}`
+                      path: [this.name.refString, inStruct.primaryKey]
                     },
                     "=",
                     ...exprX.value
@@ -54121,7 +53975,6 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
       "use strict";
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.ReferenceField = void 0;
-      var malloy_types_1 = require_malloy_types();
       var space_field_1 = require_space_field();
       var ReferenceField = class extends space_field_1.SpaceField {
         constructor(fieldRef2, inFS) {
@@ -54143,7 +53996,22 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
             if (check.error) {
               this.fieldRef.log(check.error);
             }
-            this.queryFieldDef = this.maybeAnnotate();
+            this.queryFieldDef = {
+              type: "fieldref",
+              path: this.fieldRef.list.map((f4) => f4.name)
+            };
+            const refTo = this.referenceTo;
+            if (refTo instanceof space_field_1.SpaceField && refTo.haveFieldDef) {
+              const origFd = refTo.haveFieldDef;
+              const notes = this.fieldRef.note;
+              if (origFd.annotation || notes) {
+                const annotation = notes || {};
+                if (origFd.annotation) {
+                  annotation.inherits = origFd.annotation;
+                }
+                this.queryFieldDef.annotation = annotation;
+              }
+            }
           }
           return this.queryFieldDef;
         }
@@ -54157,44 +54025,6 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
           }
           return { dataType: "error", expressionType: "scalar", evalSpace: "input" };
         }
-        /**
-         * If the referenced field has any annotations, replace the reference
-         * with something which can hold an annotation
-         */
-        maybeAnnotate() {
-          const path3 = this.fieldRef.refString;
-          const refTo = this.referenceTo;
-          if (refTo instanceof space_field_1.SpaceField && refTo.haveFieldDef && typeof refTo.haveFieldDef !== "string") {
-            const origFd = refTo.haveFieldDef;
-            if ((0, malloy_types_1.isFilteredAliasedName)(origFd)) {
-              return origFd;
-            }
-            const notes = this.fieldRef.note;
-            if (origFd.annotation || notes) {
-              const annotation = notes || {};
-              if (origFd.annotation) {
-                annotation.inherits = origFd.annotation;
-              }
-              if (this.fieldRef.list.length > 1) {
-                if ((0, malloy_types_1.isAtomicFieldType)(origFd.type)) {
-                  const newField = {
-                    name: this.fieldRef.list[this.fieldRef.list.length - 1].refString,
-                    type: origFd.type,
-                    e: [{ type: "field", path: path3 }],
-                    annotation
-                  };
-                  if ((0, malloy_types_1.hasExpression)(origFd)) {
-                    newField.expressionType = origFd.expressionType;
-                  }
-                  return newField;
-                }
-                return path3;
-              }
-              return { ...origFd, annotation };
-            }
-          }
-          return path3;
-        }
       };
       exports.ReferenceField = ReferenceField;
     }
@@ -54364,8 +54194,17 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
             fs.newEntry(refName, this, new reference_field_1.ReferenceField(this, fromFS));
           }
         }
+        get refToField() {
+          return {
+            type: "fieldref",
+            path: this.list.map((n7) => n7.refString)
+          };
+        }
         get refString() {
-          return this.list.map((n7) => n7.refString).join(".");
+          return this.path.join(".");
+        }
+        get path() {
+          return this.list.map((n7) => n7.refString);
         }
         get outputName() {
           const last = this.list[this.list.length - 1];
@@ -54422,7 +54261,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
         }
       };
       exports.CalculateFieldReference = CalculateFieldReference;
-      var IndexFieldReference = class extends FieldReference {
+      var IndexFieldReference = class _IndexFieldReference extends FieldReference {
         constructor() {
           super(...arguments);
           this.elementType = "indexFieldReference";
@@ -54430,6 +54269,13 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
         typecheck(type3) {
           (0, typecheck_utils_1.typecheckIndex)(type3, this);
         }
+        // Index entries are expected to be unique on path
+        static indexOutputName(path3) {
+          return path3.map((pe) => encodeURIComponent(pe)).join("/");
+        }
+        get outputName() {
+          return _IndexFieldReference.indexOutputName(this.path);
+        }
       };
       exports.IndexFieldReference = IndexFieldReference;
       var AggregateFieldReference = class extends FieldReference {
@@ -54560,7 +54406,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
                 value: [{ type: "outputField", name: this.refString }]
               };
             }
-            const value3 = [{ type: def2.found.refType, path: this.refString }];
+            const value3 = [{ type: def2.found.refType, path: this.fieldReference.path }];
             const evalSpace = (0, malloy_types_1.expressionIsAggregate)(td.expressionType) ? "output" : td.evalSpace;
             return { ...td, value: value3, evalSpace };
           }
@@ -54582,7 +54428,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
                   {
                     type: "apply",
                     value: lval.value,
-                    to: [{ type: "parameter", path: this.refString }]
+                    to: [{ type: "parameter", path: this.fieldReference.path }]
                   }
                 ]
               };
@@ -54631,7 +54477,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
           const inputFS = fs.isQueryFieldSpace() ? fs.inputSpace() : fs;
           let expr2 = this.expr;
           let exprVal = (_a = this.expr) === null || _a === void 0 ? void 0 : _a.getExpression(inputFS);
-          let structPath = (_b = this.source) === null || _b === void 0 ? void 0 : _b.refString;
+          let structPath = (_b = this.source) === null || _b === void 0 ? void 0 : _b.path;
           let sourceRelationship = [];
           if (this.source) {
             const result = this.source.getField(inputFS);
@@ -54650,17 +54496,16 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
                       name: this.source.refString
                     } : {
                       type: "field",
-                      path: this.source.refString
+                      path: this.source.path
                     }
                   ],
                   evalSpace: footType.evalSpace
                 };
-                structPath = this.source.sourceString;
+                structPath = this.source.path;
                 const joinUsage = this.getJoinUsage(inputFS);
-                const allUsagePaths = joinUsage.map((x6) => x6.map((y7) => y7.name).join("."));
-                const allUsagesSame = allUsagePaths.length > 0 && allUsagePaths.slice(1).every((x6) => x6 === allUsagePaths[0]);
+                const allUsagesSame = joinUsage.length === 1 || joinUsage.slice(1).every((p3) => joinPathEq(p3, joinUsage[0]));
                 if (allUsagesSame) {
-                  structPath = allUsagePaths[0];
+                  structPath = joinUsage[0].map((p3) => p3.name);
                   sourceRelationship = joinUsage[0];
                 }
               } else {
@@ -54708,7 +54553,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
               function: this.func,
               e: exprVal.value
             };
-            if (structPath) {
+            if (structPath && structPath.length > 0) {
               f4.structPath = structPath;
             }
             return {
@@ -54728,7 +54573,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
           if (this.source) {
             const lookup6 = this.source.getField(fs);
             if (lookup6.found) {
-              const sfd = [{ type: "field", path: this.source.refString }];
+              const sfd = [{ type: "field", path: this.source.path }];
               result.push(...getJoinUsage(fs, sfd));
             }
           }
@@ -54740,18 +54585,30 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
         }
       };
       exports.ExprAggregateFunction = ExprAggregateFunction;
+      function joinPathEq(a1, a22) {
+        let len = a1.length;
+        if (len !== a22.length) {
+          return false;
+        }
+        while (len > 0) {
+          len -= 1;
+          if (a1[len].name !== a22[len].name) {
+            return false;
+          }
+        }
+        return true;
+      }
       function getJoinUsage(fs, expr2) {
         const result = [];
         const lookup6 = (fs2, path3) => {
-          const parts = path3.split(".");
-          const head = parts[0];
-          const rest = parts.slice(1);
+          const head = path3[0];
+          const rest = path3.slice(1);
           const def2 = fs2.entry(head);
           if (def2 === void 0) {
             throw new Error(`Invalid field lookup ${head}`);
           }
           if (def2 instanceof static_space_1.StructSpaceField && rest.length > 0) {
-            const restDef = lookup6(def2.fieldSpace, rest.join("."));
+            const restDef = lookup6(def2.fieldSpace, rest);
             return {
               ...restDef,
               relationship: [
@@ -55067,7 +54924,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
             e: []
           };
           if (this.source) {
-            ret.structPath = this.source.refString;
+            ret.structPath = this.source.path;
           }
           return {
             dataType: "number",
@@ -55207,7 +55064,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
             this.log(`Case insensitivity for function names is deprecated, use '${func.name}' instead`, "warn");
           }
           let implicitExpr = void 0;
-          let structPath = (_d2 = this.source) === null || _d2 === void 0 ? void 0 : _d2.refString;
+          let structPath = (_d2 = this.source) === null || _d2 === void 0 ? void 0 : _d2.path;
           if (this.source) {
             const sourceFoot = this.source.getField(fs).found;
             if (sourceFoot) {
@@ -55216,10 +55073,10 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
                 implicitExpr = {
                   dataType: footType.dataType,
                   expressionType: footType.expressionType,
-                  value: [{ type: "field", path: this.source.refString }],
+                  value: [{ type: "field", path: this.source.path }],
                   evalSpace: footType.evalSpace
                 };
-                structPath = this.source.sourceString;
+                structPath = this.source.path.slice(0, -1);
               } else {
                 if (!(sourceFoot instanceof struct_space_field_base_1.StructSpaceFieldBase)) {
                   const message = `Aggregate source cannot be a ${footType.dataType}`;
@@ -55303,7 +55160,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
               funcCall = [
                 {
                   type: "sql-string",
-                  e: parts.map((part) => part.type === "string" ? part.value : part.name === "TABLE" ? { type: "source-reference" } : { type: "field-reference", path: part.name })
+                  e: parts.map((part) => part.type === "string" ? part.value : part.name === "TABLE" ? { type: "source-reference" } : { type: "field", path: [part.name] })
                 }
               ];
             }
@@ -55915,6 +55772,33 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
     }
   });
 
+  // ../malloy/dist/lang/ast/types/field-space.js
+  var require_field_space = __commonJS({
+    "../malloy/dist/lang/ast/types/field-space.js"(exports) {
+      "use strict";
+      Object.defineProperty(exports, "__esModule", { value: true });
+      exports.FieldName = void 0;
+      var malloy_element_1 = require_malloy_element();
+      var FieldName = class extends malloy_element_1.MalloyElement {
+        constructor(name) {
+          super();
+          this.name = name;
+          this.elementType = "fieldName";
+        }
+        get refString() {
+          return this.name;
+        }
+        toString() {
+          return this.refString;
+        }
+        getField(fs) {
+          return fs.lookup([this]);
+        }
+      };
+      exports.FieldName = FieldName;
+    }
+  });
+
   // ../malloy/dist/lang/ast/field-space/query-input-space.js
   var require_query_input_space = __commonJS({
     "../malloy/dist/lang/ast/field-space/query-input-space.js"(exports) {
@@ -55996,16 +55880,17 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
         return result;
       };
       Object.defineProperty(exports, "__esModule", { value: true });
-      exports.ReduceFieldSpace = exports.QuerySpace = void 0;
+      exports.ReduceFieldSpace = exports.QuerySpace = exports.QueryOperationSpace = void 0;
       var model = __importStar(require_malloy_types());
       var field_utils_1 = require_field_utils();
+      var field_space_1 = require_field_space();
       var space_field_1 = require_space_field();
       var field_references_1 = require_field_references();
       var refined_space_1 = require_refined_space();
       var column_space_field_1 = require_column_space_field();
       var static_space_1 = require_static_space();
       var query_input_space_1 = require_query_input_space();
-      var QuerySpace = class extends refined_space_1.RefinedSpace {
+      var QueryOperationSpace = class extends refined_space_1.RefinedSpace {
         constructor(queryInputSpace, refineThis, nestParent, astEl) {
           super(queryInputSpace.emptyStructDef());
           this.queryInputSpace = queryInputSpace;
@@ -56016,40 +55901,16 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
           if (refineThis)
             this.addRefineFromFields(refineThis);
         }
-        addRefineFromFields(refineThis) {
-          var _a, _b;
-          for (const field3 of refineThis.fields) {
-            if (typeof field3 === "string") {
-              const ent = this.exprSpace.entry(field3);
-              if (ent) {
-                this.setEntry(field3, ent);
-              }
-            } else if (model.isFilteredAliasedName(field3)) {
-              const name = (_a = field3.as) !== null && _a !== void 0 ? _a : field3.name;
-              const ent = this.exprSpace.entry(name);
-              if (ent) {
-                this.setEntry(name, ent);
-              }
-            } else {
-              if (field3.type !== "turtle") {
-                this.setEntry((_b = field3.as) !== null && _b !== void 0 ? _b : field3.name, new column_space_field_1.ColumnSpaceField(field3));
-              }
-            }
-          }
-        }
         log(s8) {
           if (this.astEl) {
             this.astEl.log(s8);
           }
         }
-        pushFields(...defs) {
-          for (const f4 of defs) {
-            if (f4 instanceof field_references_1.WildcardFieldReference) {
-              this.addWild(f4);
-            } else {
-              super.pushFields(f4);
-            }
-          }
+        inputSpace() {
+          return this.exprSpace;
+        }
+        outputSpace() {
+          return this;
         }
         addWild(wild) {
           var _a;
@@ -56074,6 +55935,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
             }
           }
           const dialect = this.dialectObj();
+          const expandEntries = [];
           for (const [name, entry2] of current2.entries()) {
             if (wild.except.has(name)) {
               continue;
@@ -56084,11 +55946,42 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
             } else {
               const eType = entry2.typeDesc();
               if (model.isAtomicFieldType(eType.dataType) && model.expressionIsScalar(eType.expressionType) && (dialect === void 0 || !dialect.ignoreInProject(name))) {
-                this.setEntry(name, entry2);
+                expandEntries.push({ name, entry: entry2 });
                 this.expandedWild[name] = joinPath.concat(name);
               }
             }
           }
+          for (const x6 of expandEntries.sort((a5, b4) => a5.name.localeCompare(b4.name))) {
+            this.setEntry(x6.name, x6.entry);
+          }
+        }
+      };
+      exports.QueryOperationSpace = QueryOperationSpace;
+      var QuerySpace = class extends QueryOperationSpace {
+        addRefineFromFields(refineThis) {
+          var _a;
+          if (!model.isQuerySegment(refineThis)) {
+            return;
+          }
+          for (const field3 of refineThis.queryFields) {
+            if (field3.type === "fieldref") {
+              const refTo = this.exprSpace.lookup(field3.path.map((f4) => new field_space_1.FieldName(f4)));
+              if (refTo.found) {
+                this.setEntry(field3.path[field3.path.length - 1], refTo.found);
+              }
+            } else if (field3.type !== "turtle") {
+              this.setEntry((_a = field3.as) !== null && _a !== void 0 ? _a : field3.name, new column_space_field_1.ColumnSpaceField(field3));
+            }
+          }
+        }
+        pushFields(...defs) {
+          for (const f4 of defs) {
+            if (f4 instanceof field_references_1.WildcardFieldReference) {
+              this.addWild(f4);
+            } else {
+              super.pushFields(f4);
+            }
+          }
         }
         canContain(_typeDesc) {
           return true;
@@ -56099,7 +55992,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
             if (field3 instanceof space_field_1.SpaceField) {
               const wildPath = this.expandedWild[name];
               if (wildPath) {
-                fields.push(wildPath.join("."));
+                fields.push({ type: "fieldref", path: wildPath });
                 continue;
               }
               const fieldQueryDef = field3.getQueryFieldDef(this.exprSpace);
@@ -56123,7 +56016,8 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
         }
         getPipeSegment(refineFrom) {
           if (this.segmentType === "index") {
-            throw new Error("INDEX FIELD PIPE SEGMENT MIS HANDLED");
+            this.log("internal error generating index segment from non index query");
+            return { type: "reduce", queryFields: [] };
           }
           if (refineFrom === null || refineFrom === void 0 ? void 0 : refineFrom.extendSource) {
             for (const xField of refineFrom.extendSource) {
@@ -56132,9 +56026,9 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
           }
           const segment = {
             type: this.segmentType,
-            fields: this.queryFieldDefs()
+            queryFields: this.queryFieldDefs()
           };
-          segment.fields = (0, field_utils_1.mergeFields)(refineFrom === null || refineFrom === void 0 ? void 0 : refineFrom.fields, segment.fields);
+          segment.queryFields = (0, field_utils_1.mergeFields)(refineFrom === null || refineFrom === void 0 ? void 0 : refineFrom.queryFields, segment.queryFields);
           if (refineFrom === null || refineFrom === void 0 ? void 0 : refineFrom.extendSource) {
             segment.extendSource = refineFrom.extendSource;
           }
@@ -56142,7 +56036,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
             const newExtends = [];
             const extendedStruct = this.exprSpace.structDef();
             for (const extendName of this.exprSpace.extendList) {
-              const extendEnt = extendedStruct.fields.find((f4) => (0, field_utils_1.nameOf)(f4) === extendName);
+              const extendEnt = extendedStruct.fields.find((f4) => (0, field_utils_1.nameFromDef)(f4) === extendName);
               if (extendEnt) {
                 newExtends.push(extendEnt);
               }
@@ -56165,12 +56059,6 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
         isQueryFieldSpace() {
           return true;
         }
-        outputSpace() {
-          return this;
-        }
-        inputSpace() {
-          return this.exprSpace;
-        }
       };
       exports.QuerySpace = QuerySpace;
       var ReduceFieldSpace = class extends QuerySpace {
@@ -56181,7 +56069,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
       };
       exports.ReduceFieldSpace = ReduceFieldSpace;
       function isEmptyNest(fd) {
-        return typeof fd !== "string" && !model.isFilteredAliasedName(fd) && fd.type === "turtle" && fd.pipeline.length === 0;
+        return typeof fd !== "string" && fd.type === "turtle" && fd.pipeline.length === 0;
       }
     }
   });
@@ -62983,6 +62871,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.refine = void 0;
       var model_1 = require_model();
+      var field_utils_1 = require_field_utils();
       function refine(logTo, refineTo, refineFrom) {
         var _a, _b;
         if (refineTo.length !== 1) {
@@ -63020,31 +62909,31 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
             }
           }
           to.filterList = to.filterList !== void 0 || from.filterList !== void 0 ? [...(_a = to.filterList) !== null && _a !== void 0 ? _a : [], ...(_b = from.filterList) !== null && _b !== void 0 ? _b : []] : void 0;
-          const overlappingFields = [];
-          const nonOverlappingFields = [];
-          const existingNames = new Map(to.fields.map((f4) => [
-            extractName(f4),
-            f4
-          ]));
-          for (const field3 of from.fields) {
-            if (existingNames.has(extractName(field3))) {
-              overlappingFields.push(field3);
-            } else {
-              nonOverlappingFields.push(field3);
+          if ((0, model_1.isQuerySegment)(from) && (0, model_1.isQuerySegment)(to)) {
+            const overlappingFields = [];
+            const nonOverlappingFields = [];
+            const existingNames = new Map(to.queryFields.map((f4) => [
+              (0, field_utils_1.nameFromDef)(f4),
+              f4
+            ]));
+            for (const field3 of from.queryFields) {
+              if (existingNames.has((0, field_utils_1.nameFromDef)(field3))) {
+                overlappingFields.push(field3);
+              } else {
+                nonOverlappingFields.push(field3);
+              }
             }
-          }
-          to.fields = [...to.fields, ...nonOverlappingFields];
-          if (overlappingFields.length > 0) {
-            logTo.log(`overlapping fields in refinement: ${overlappingFields.map(extractName)}`);
+            to.queryFields = [...to.queryFields, ...nonOverlappingFields];
+            if (overlappingFields.length > 0) {
+              logTo.log(`overlapping fields in refinement: ${overlappingFields.map(field_utils_1.nameFromDef)}`);
+            }
+          } else if (from.type === "index" && to.type === "index") {
+            to.indexFields = [...from.indexFields, ...to.indexFields];
           }
         }
         return [to];
       }
       exports.refine = refine;
-      function extractName(f1) {
-        var _a;
-        return typeof f1 === "string" ? f1 : (_a = f1.as) !== null && _a !== void 0 ? _a : f1.name;
-      }
     }
   });
 
@@ -63142,7 +63031,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
             }
             const newSegment = {
               type: "reduce",
-              fields: [this.reference.refString]
+              queryFields: [this.reference.refToField]
             };
             const { dialect, queryTimezone, structRelationship } = fs.structDef();
             const name = this.reference.nameString;
@@ -63287,40 +63176,102 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
       "use strict";
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.IndexFieldSpace = void 0;
+      var malloy_types_1 = require_malloy_types();
       var field_references_1 = require_field_references();
+      var space_field_1 = require_space_field();
       var query_spaces_1 = require_query_spaces();
-      var IndexFieldSpace = class extends query_spaces_1.QuerySpace {
+      var reference_field_1 = require_reference_field();
+      var static_space_1 = require_static_space();
+      var IndexFieldSpace = class extends query_spaces_1.QueryOperationSpace {
         constructor() {
           super(...arguments);
           this.segmentType = "index";
-          this.fieldList = /* @__PURE__ */ new Set();
         }
         pushFields(...defs) {
           for (const indexField of defs) {
             if (indexField instanceof field_references_1.FieldReference) {
-              if (indexField.getField(this.inputSpace()).found) {
-                this.fieldList.add(indexField.refString);
-              }
+              super.pushFields(indexField);
             } else if (indexField instanceof field_references_1.WildcardFieldReference) {
-              this.fieldList.add(indexField.refString);
+              this.addWild(indexField);
             } else {
               indexField.log("Internal error, not expected in index query");
             }
           }
         }
         getPipeSegment(refineIndex) {
-          if (refineIndex && refineIndex.fields) {
-            for (const exists of refineIndex.fields) {
-              if (typeof exists === "string") {
-                this.fieldList.add(exists);
+          if (refineIndex) {
+            this.log("index query operations cannot be refined");
+            return { type: "index", indexFields: [] };
+          }
+          const indexFields = [];
+          for (const [name, field3] of this.entries()) {
+            if (field3 instanceof space_field_1.SpaceField) {
+              const wildPath = this.expandedWild[name];
+              if (wildPath) {
+                indexFields.push({ type: "fieldref", path: wildPath });
+                continue;
+              }
+              if (field3 instanceof reference_field_1.ReferenceField) {
+                const fieldRef2 = field3.fieldRef;
+                const check = fieldRef2.getField(this.exprSpace);
+                if (check.error) {
+                  fieldRef2.log(check.error);
+                } else {
+                  indexFields.push(fieldRef2.refToField);
+                }
               }
             }
           }
-          this.isComplete();
-          return {
-            type: "index",
-            fields: Array.from(this.fieldList.values())
-          };
+          return { type: "index", indexFields };
+        }
+        addRefineFromFields(_refineThis) {
+        }
+        addWild(wild) {
+          var _a;
+          let current2 = this.exprSpace;
+          const joinPath = [];
+          if (wild.joinPath) {
+            for (const pathPart of wild.joinPath.list) {
+              const part = pathPart.refString;
+              joinPath.push(part);
+              const ent = current2.entry(part);
+              if (ent) {
+                if (ent instanceof static_space_1.StructSpaceField) {
+                  current2 = ent.fieldSpace;
+                } else {
+                  pathPart.log(`Field '${part}' does not contain rows and cannot be expanded with '*'`);
+                  return;
+                }
+              } else {
+                pathPart.log(`No such field as '${part}'`);
+                return;
+              }
+            }
+          }
+          const dialect = this.dialectObj();
+          const expandEntries = [];
+          for (const [name, entry2] of current2.entries()) {
+            if (wild.except.has(name)) {
+              continue;
+            }
+            const indexName = field_references_1.IndexFieldReference.indexOutputName([
+              ...joinPath,
+              name
+            ]);
+            if (this.entry(indexName)) {
+              const conflict = (_a = this.expandedWild[indexName]) === null || _a === void 0 ? void 0 : _a.join(".");
+              wild.log(`Cannot expand '${name}' in '${wild.refString}' because a field with that name already exists${conflict ? ` (conflicts with ${conflict})` : ""}`);
+            } else {
+              const eType = entry2.typeDesc();
+              if ((0, malloy_types_1.isAtomicFieldType)(eType.dataType) && (0, malloy_types_1.expressionIsScalar)(eType.expressionType) && (dialect === void 0 || !dialect.ignoreInProject(name))) {
+                expandEntries.push({ name: indexName, entry: entry2 });
+                this.expandedWild[indexName] = joinPath.concat(name);
+              }
+            }
+          }
+          for (const x6 of expandEntries.sort((a5, b4) => a5.name.localeCompare(b4.name))) {
+            this.setEntry(x6.name, x6.entry);
+          }
         }
       };
       exports.IndexFieldSpace = IndexFieldSpace;
@@ -63451,33 +63402,6 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
     }
   });
 
-  // ../malloy/dist/lang/ast/types/field-space.js
-  var require_field_space = __commonJS({
-    "../malloy/dist/lang/ast/types/field-space.js"(exports) {
-      "use strict";
-      Object.defineProperty(exports, "__esModule", { value: true });
-      exports.FieldName = void 0;
-      var malloy_element_1 = require_malloy_element();
-      var FieldName = class extends malloy_element_1.MalloyElement {
-        constructor(name) {
-          super();
-          this.name = name;
-          this.elementType = "fieldName";
-        }
-        get refString() {
-          return this.name;
-        }
-        toString() {
-          return this.refString;
-        }
-        getField(fs) {
-          return fs.lookup([this]);
-        }
-      };
-      exports.FieldName = FieldName;
-    }
-  });
-
   // ../malloy/dist/lang/ast/query-properties/ordering.js
   var require_ordering = __commonJS({
     "../malloy/dist/lang/ast/query-properties/ordering.js"(exports) {
@@ -63601,7 +63525,7 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
     "../malloy/dist/lang/ast/query-builders/reduce-builder.js"(exports) {
       "use strict";
       Object.defineProperty(exports, "__esModule", { value: true });
-      exports.ReduceBuilder = void 0;
+      exports.ReduceBuilder = exports.QuerySegmentBuilder = void 0;
       var malloy_types_1 = require_malloy_types();
       var error_factory_1 = require_error_factory();
       var filters_1 = require_filters();
@@ -63610,15 +63534,9 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
       var top_1 = require_top();
       var query_spaces_1 = require_query_spaces();
       var definition_list_1 = require_definition_list();
-      var ReduceBuilder = class {
-        constructor(baseFS, refineThis, isNestIn, astEl) {
+      var QuerySegmentBuilder = class {
+        constructor() {
           this.filters = [];
-          this.resultFS = this.getResultSpace(baseFS, refineThis, isNestIn, astEl);
-          this.inputFS = this.resultFS.inputSpace();
-          this.type = "grouping";
-        }
-        getResultSpace(fs, refineThis, isNestIn, astEl) {
-          return new query_spaces_1.ReduceFieldSpace(fs, refineThis, isNestIn, astEl);
         }
         execute(qp) {
           if (qp.queryExecute) {
@@ -63689,6 +63607,15 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
             to.filterList = [...oldFilters, ...this.filters];
           }
         }
+      };
+      exports.QuerySegmentBuilder = QuerySegmentBuilder;
+      var ReduceBuilder = class extends QuerySegmentBuilder {
+        constructor(baseFS, refineThis, isNestIn, astEl) {
+          super();
+          this.type = "grouping";
+          this.resultFS = new query_spaces_1.ReduceFieldSpace(baseFS, refineThis, isNestIn, astEl);
+          this.inputFS = this.resultFS.inputSpace();
+        }
         finalize(fromSeg) {
           let from;
           if (fromSeg) {
@@ -63719,13 +63646,12 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
       var group_by_1 = require_group_by();
       var project_field_space_1 = require_project_field_space();
       var reduce_builder_1 = require_reduce_builder();
-      var ProjectBuilder = class extends reduce_builder_1.ReduceBuilder {
-        constructor() {
-          super(...arguments);
+      var ProjectBuilder = class extends reduce_builder_1.QuerySegmentBuilder {
+        constructor(baseFS, refineThis, isNestIn, astEl) {
+          super();
           this.type = "project";
-        }
-        getResultSpace(fs, refineThis, isNestIn, astEl) {
-          return new project_field_space_1.ProjectFieldSpace(fs, refineThis, isNestIn, astEl);
+          this.resultFS = new project_field_space_1.ProjectFieldSpace(baseFS, refineThis, isNestIn, astEl);
+          this.inputFS = this.resultFS.inputSpace();
         }
         execute(qp) {
           if (qp.elementType === "having" || qp instanceof group_by_1.GroupBy) {
@@ -63759,11 +63685,15 @@ QUERY: ${(0, util_1.inspect)(opDesc, { breakLength: 72, depth: Infinity })}`);
       "use strict";
       Object.defineProperty(exports, "__esModule", { value: true });
       exports.PartialBuilder = void 0;
+      var model_1 = require_model();
       var reduce_builder_1 = require_reduce_builder();
       var PartialBuilder = class extends reduce_builder_1.ReduceBuilder {
         finalize(fromSeg) {
           const seg = super.finalize(fromSeg);
-          return { ...seg, type: "partial" };
+          if ((0, model_1.isQuerySegment)(seg)) {
+            return { ...seg, type: "partial" };
+          }
+          throw new Error(`Partial Builder cannot finalize from ${seg.type}`);
         }
       };
       exports.PartialBuilder = PartialBuilder;
@@ -68926,7 +68856,7 @@ ${errText}`, errors);
             pipeline: [
               {
                 type: "reduce",
-                fields: [name]
+                queryFields: [{ type: "fieldref", path: [name] }]
               }
             ]
           };
@@ -70774,8 +70704,7 @@ ${errText}`, errors);
     "../malloy/dist/index.js"(exports) {
       "use strict";
       Object.defineProperty(exports, "__esModule", { value: true });
-      exports.toAsyncGenerator = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.PreparedResult = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.MalloyTranslator = exports.HighlightType = exports.indent = exports.expressionIsCalculation = exports.mkExpr = exports.isSamplingRows = exports.isSamplingPercent = exports.isSamplingEnable = exports.isFilteredAliasedName = exports.Segment = exports.FUNCTIONS = exports.Dialect = exports.spread = exports.param = exports.sqlFragment = exports.makeParam = exports.sql = exports.maxScalar = exports.minAggregate = exports.anyExprType = exports.minScalar = exports.overload = exports.qtz = exports.arg = exports.registerDialect = exports.PostgresDialect = exports.StandardSQLDialect = exports.DuckDBDialect = void 0;
-      exports.Tag = void 0;
+      exports.Tag = exports.toAsyncGenerator = exports.Explore = exports.DataWriter = exports.Parse = exports.JSONWriter = exports.CSVWriter = exports.QueryMaterializer = exports.Result = exports.PreparedResult = exports.TimestampTimeframe = exports.DateTimeframe = exports.SourceRelationship = exports.JoinRelationship = exports.MalloyError = exports.FixedConnectionMap = exports.InMemoryURLReader = exports.EmptyURLReader = exports.SingleConnectionRuntime = exports.ConnectionRuntime = exports.AtomicFieldType = exports.Runtime = exports.Malloy = exports.MalloyTranslator = exports.HighlightType = exports.indent = exports.expressionIsCalculation = exports.mkExpr = exports.isSamplingRows = exports.isSamplingPercent = exports.isSamplingEnable = exports.Segment = exports.FUNCTIONS = exports.Dialect = exports.spread = exports.param = exports.sqlFragment = exports.makeParam = exports.sql = exports.maxScalar = exports.minAggregate = exports.anyExprType = exports.minScalar = exports.overload = exports.qtz = exports.arg = exports.registerDialect = exports.PostgresDialect = exports.StandardSQLDialect = exports.DuckDBDialect = void 0;
       var dialect_1 = require_dialect2();
       Object.defineProperty(exports, "DuckDBDialect", { enumerable: true, get: function() {
         return dialect_1.DuckDBDialect;
@@ -70835,9 +70764,6 @@ ${errText}`, errors);
       Object.defineProperty(exports, "Segment", { enumerable: true, get: function() {
         return model_1.Segment;
       } });
-      Object.defineProperty(exports, "isFilteredAliasedName", { enumerable: true, get: function() {
-        return model_1.isFilteredAliasedName;
-      } });
       Object.defineProperty(exports, "isSamplingEnable", { enumerable: true, get: function() {
         return model_1.isSamplingEnable;
       } });