@malloydata/render 0.0.240-dev250305213425 → 0.0.240-dev250308020308

package/dist/module/index.mjs

@@ -25416,11 +25416,12 @@ ${(0, yn.indent)(h)}) AS ${n.alias}
         const o = [];
         let u = s;
         for (; u; ) {
-          for (const a of u.fieldNames((l) => yr(l.f)))
-            o.push(this.parent.dialect.sqlMaybeQuoteIdentifier(`${a}__${u.groupSet}`));
+          for (const l of u.fieldNames((c) => yr(c.f)))
+            o.push(this.parent.dialect.sqlMaybeQuoteIdentifier(`${l}__${u.groupSet}`));
           u = u.parent;
         }
-        r.push(`MAX(CASE WHEN group_set IN (${s.childGroups.join(",")}) THEN __delete__${s.groupSet} END) OVER(partition by ${o.map(this.parent.dialect.castToString).join(",")}) as __shaving__${s.groupSet}`);
+        let a = "";
+        o.length > 0 && (a = "partition by ", a += o.map(this.parent.dialect.castToString).join(",")), r.push(`MAX(CASE WHEN group_set IN (${s.childGroups.join(",")}) THEN __delete__${s.groupSet} END) OVER(${a}) as __shaving__${s.groupSet}`);
       }
     if (i.length > 0) {
       n = e.addStage(`SELECT

package/dist/module/index.umd.js

@@ -894,7 +894,7 @@ ${(0,mn.indent)(h)}) AS ${n.alias}
 `),this.resultStage=e.addStage(n),this.resultStage}generatePipelinedStages(e,n,r){if(e.length===0)return n;let i;if(this.parent.dialect.supportsSelectReplace)i=`SELECT * replace (${e.map(o=>`${o.pipelineSQL} as ${o.sqlFieldName}`).join(`,
 `)}) FROM ${n}
         `;else{const s=e.map(l=>`${l.pipelineSQL} as ${l.sqlFieldName}`).join(`,
-`),o=e.map(l=>l.sqlFieldName),a=Array.from(this.rootResult.allFields.keys()).map(l=>this.parent.dialect.sqlMaybeQuoteIdentifier(l)).filter(l=>o.indexOf(l)===-1);i=`SELECT ${a.length>0?a.join(", ")+",":""} ${s} FROM ${n}`}return r.addStage(i)}generateStage0Fields(e,n,r){const i=[],s=[];for(const[a,l]of e.allFields)l instanceof oi&&_r(l.f)?i.push([a,l]):s.push([a,l]);const o=[...i,...s];for(const[a,l]of o){const c=this.parent.dialect.sqlMaybeQuoteIdentifier(`${a}__${e.groupSet}`);if(l instanceof oi){if(l.fieldUsage.type==="result"){const f=l.getSQL();if(_r(l.f)){if(this.parent.dialect.cantPartitionWindowFunctionsOnExpressions&&this.rootResult.queryUsesPartitioning){const d=`__lateral_join_bag.${c}`;if(l.analyticalSQL=d,n.lateralJoinSQLExpressions.push(`${f} as ${c}`),n.sql.push(d),l.f.fieldDef.type==="number"){const h=this.parent.dialect.sqlMaybeQuoteIdentifier(`${a}__${e.groupSet}_string`),p=`__lateral_join_bag.${h}`;n.sql.push(p),n.dimensionIndexes.push(n.fieldIndex++),n.lateralJoinSQLExpressions.push(`CAST(${f} as STRING) as ${h}`),l.partitionSQL=p}}else n.sql.push(`${f} as ${c}`);n.dimensionIndexes.push(n.fieldIndex++)}else VA(l.f)&&(n.sql.push(`${f} as ${c}`),n.fieldIndex++)}}else if(l instanceof _u){if(l.firstSegment.type==="reduce")this.generateStage0Fields(l,n,r);else if(l.firstSegment.type==="project"){const f=this.generateTurtleSQL(l,r,c,n.outputPipelinedSQL);n.sql.push(`${f} as ${c}`),n.fieldIndex++}}}const u=this.generateSQLFilters(e,"having");u.empty()||(e.childGroups.length===1?e.root().havings.add(`(group_set<>${e.groupSet} OR (group_set=${e.groupSet} AND ${u.sql()}))`):(e.hasHaving=!0,n.sql.push(`CASE WHEN group_set=${e.groupSet} THEN CASE WHEN ${u.sql()} THEN 0 ELSE 1 END END as __delete__${e.groupSet}`),n.fieldIndex++))}generateSQLWhereChildren(e){const n=new mn.AndChain;for(const[,r]of e.allFields)if(r.type==="query"){const i=r,s=this.generateSQLFilters(i,"where");if(s.present()){const o=i.childGroups.join(",");n.add(`(group_set NOT IN (${o}) OR (group_set IN (${o}) AND ${s.sql()}))`)}n.addChain(this.generateSQLWhereChildren(i))}return n}generateSQLWhereTurtled(){const e=this.generateSQLFilters(this.rootResult,"where");return e.addChain(this.generateSQLWhereChildren(this.rootResult)),e.sql("where")}generateSQLHavingLimit(e,n){const r=[],i=this.rootResult.selectStructs([],s=>s.hasHaving);if(i.length>0)for(const s of i){const o=[];let u=s;for(;u;){for(const a of u.fieldNames(l=>_r(l.f)))o.push(this.parent.dialect.sqlMaybeQuoteIdentifier(`${a}__${u.groupSet}`));u=u.parent}r.push(`MAX(CASE WHEN group_set IN (${s.childGroups.join(",")}) THEN __delete__${s.groupSet} END) OVER(partition by ${o.map(this.parent.dialect.castToString).join(",")}) as __shaving__${s.groupSet}`)}if(i.length>0){n=e.addStage(`SELECT
+`),o=e.map(l=>l.sqlFieldName),a=Array.from(this.rootResult.allFields.keys()).map(l=>this.parent.dialect.sqlMaybeQuoteIdentifier(l)).filter(l=>o.indexOf(l)===-1);i=`SELECT ${a.length>0?a.join(", ")+",":""} ${s} FROM ${n}`}return r.addStage(i)}generateStage0Fields(e,n,r){const i=[],s=[];for(const[a,l]of e.allFields)l instanceof oi&&_r(l.f)?i.push([a,l]):s.push([a,l]);const o=[...i,...s];for(const[a,l]of o){const c=this.parent.dialect.sqlMaybeQuoteIdentifier(`${a}__${e.groupSet}`);if(l instanceof oi){if(l.fieldUsage.type==="result"){const f=l.getSQL();if(_r(l.f)){if(this.parent.dialect.cantPartitionWindowFunctionsOnExpressions&&this.rootResult.queryUsesPartitioning){const d=`__lateral_join_bag.${c}`;if(l.analyticalSQL=d,n.lateralJoinSQLExpressions.push(`${f} as ${c}`),n.sql.push(d),l.f.fieldDef.type==="number"){const h=this.parent.dialect.sqlMaybeQuoteIdentifier(`${a}__${e.groupSet}_string`),p=`__lateral_join_bag.${h}`;n.sql.push(p),n.dimensionIndexes.push(n.fieldIndex++),n.lateralJoinSQLExpressions.push(`CAST(${f} as STRING) as ${h}`),l.partitionSQL=p}}else n.sql.push(`${f} as ${c}`);n.dimensionIndexes.push(n.fieldIndex++)}else VA(l.f)&&(n.sql.push(`${f} as ${c}`),n.fieldIndex++)}}else if(l instanceof _u){if(l.firstSegment.type==="reduce")this.generateStage0Fields(l,n,r);else if(l.firstSegment.type==="project"){const f=this.generateTurtleSQL(l,r,c,n.outputPipelinedSQL);n.sql.push(`${f} as ${c}`),n.fieldIndex++}}}const u=this.generateSQLFilters(e,"having");u.empty()||(e.childGroups.length===1?e.root().havings.add(`(group_set<>${e.groupSet} OR (group_set=${e.groupSet} AND ${u.sql()}))`):(e.hasHaving=!0,n.sql.push(`CASE WHEN group_set=${e.groupSet} THEN CASE WHEN ${u.sql()} THEN 0 ELSE 1 END END as __delete__${e.groupSet}`),n.fieldIndex++))}generateSQLWhereChildren(e){const n=new mn.AndChain;for(const[,r]of e.allFields)if(r.type==="query"){const i=r,s=this.generateSQLFilters(i,"where");if(s.present()){const o=i.childGroups.join(",");n.add(`(group_set NOT IN (${o}) OR (group_set IN (${o}) AND ${s.sql()}))`)}n.addChain(this.generateSQLWhereChildren(i))}return n}generateSQLWhereTurtled(){const e=this.generateSQLFilters(this.rootResult,"where");return e.addChain(this.generateSQLWhereChildren(this.rootResult)),e.sql("where")}generateSQLHavingLimit(e,n){const r=[],i=this.rootResult.selectStructs([],s=>s.hasHaving);if(i.length>0)for(const s of i){const o=[];let u=s;for(;u;){for(const l of u.fieldNames(c=>_r(c.f)))o.push(this.parent.dialect.sqlMaybeQuoteIdentifier(`${l}__${u.groupSet}`));u=u.parent}let a="";o.length>0&&(a="partition by ",a+=o.map(this.parent.dialect.castToString).join(",")),r.push(`MAX(CASE WHEN group_set IN (${s.childGroups.join(",")}) THEN __delete__${s.groupSet} END) OVER(${a}) as __shaving__${s.groupSet}`)}if(i.length>0){n=e.addStage(`SELECT
   *,
   ${r.join(`,
   `)} 

package/dist/register/register.mjs

@@ -26314,11 +26314,12 @@ ${(0, vn.indent)(h)}) AS ${n.alias}
         const o = [];
         let u = s;
         for (; u; ) {
-          for (const a of u.fieldNames((l) => Cr(l.f)))
-            o.push(this.parent.dialect.sqlMaybeQuoteIdentifier(`${a}__${u.groupSet}`));
+          for (const l of u.fieldNames((c) => Cr(c.f)))
+            o.push(this.parent.dialect.sqlMaybeQuoteIdentifier(`${l}__${u.groupSet}`));
           u = u.parent;
         }
-        r.push(`MAX(CASE WHEN group_set IN (${s.childGroups.join(",")}) THEN __delete__${s.groupSet} END) OVER(partition by ${o.map(this.parent.dialect.castToString).join(",")}) as __shaving__${s.groupSet}`);
+        let a = "";
+        o.length > 0 && (a = "partition by ", a += o.map(this.parent.dialect.castToString).join(",")), r.push(`MAX(CASE WHEN group_set IN (${s.childGroups.join(",")}) THEN __delete__${s.groupSet} END) OVER(${a}) as __shaving__${s.groupSet}`);
       }
     if (i.length > 0) {
       n = e.addStage(`SELECT

package/dist/register/register.umd.js

@@ -894,7 +894,7 @@ ${(0,En.indent)(h)}) AS ${n.alias}
 `),this.resultStage=e.addStage(n),this.resultStage}generatePipelinedStages(e,n,r){if(e.length===0)return n;let i;if(this.parent.dialect.supportsSelectReplace)i=`SELECT * replace (${e.map(o=>`${o.pipelineSQL} as ${o.sqlFieldName}`).join(`,
 `)}) FROM ${n}
         `;else{const s=e.map(l=>`${l.pipelineSQL} as ${l.sqlFieldName}`).join(`,
-`),o=e.map(l=>l.sqlFieldName),a=Array.from(this.rootResult.allFields.keys()).map(l=>this.parent.dialect.sqlMaybeQuoteIdentifier(l)).filter(l=>o.indexOf(l)===-1);i=`SELECT ${a.length>0?a.join(", ")+",":""} ${s} FROM ${n}`}return r.addStage(i)}generateStage0Fields(e,n,r){const i=[],s=[];for(const[a,l]of e.allFields)l instanceof di&&Rr(l.f)?i.push([a,l]):s.push([a,l]);const o=[...i,...s];for(const[a,l]of o){const c=this.parent.dialect.sqlMaybeQuoteIdentifier(`${a}__${e.groupSet}`);if(l instanceof di){if(l.fieldUsage.type==="result"){const f=l.getSQL();if(Rr(l.f)){if(this.parent.dialect.cantPartitionWindowFunctionsOnExpressions&&this.rootResult.queryUsesPartitioning){const d=`__lateral_join_bag.${c}`;if(l.analyticalSQL=d,n.lateralJoinSQLExpressions.push(`${f} as ${c}`),n.sql.push(d),l.f.fieldDef.type==="number"){const h=this.parent.dialect.sqlMaybeQuoteIdentifier(`${a}__${e.groupSet}_string`),p=`__lateral_join_bag.${h}`;n.sql.push(p),n.dimensionIndexes.push(n.fieldIndex++),n.lateralJoinSQLExpressions.push(`CAST(${f} as STRING) as ${h}`),l.partitionSQL=p}}else n.sql.push(`${f} as ${c}`);n.dimensionIndexes.push(n.fieldIndex++)}else Qv(l.f)&&(n.sql.push(`${f} as ${c}`),n.fieldIndex++)}}else if(l instanceof ku){if(l.firstSegment.type==="reduce")this.generateStage0Fields(l,n,r);else if(l.firstSegment.type==="project"){const f=this.generateTurtleSQL(l,r,c,n.outputPipelinedSQL);n.sql.push(`${f} as ${c}`),n.fieldIndex++}}}const u=this.generateSQLFilters(e,"having");u.empty()||(e.childGroups.length===1?e.root().havings.add(`(group_set<>${e.groupSet} OR (group_set=${e.groupSet} AND ${u.sql()}))`):(e.hasHaving=!0,n.sql.push(`CASE WHEN group_set=${e.groupSet} THEN CASE WHEN ${u.sql()} THEN 0 ELSE 1 END END as __delete__${e.groupSet}`),n.fieldIndex++))}generateSQLWhereChildren(e){const n=new En.AndChain;for(const[,r]of e.allFields)if(r.type==="query"){const i=r,s=this.generateSQLFilters(i,"where");if(s.present()){const o=i.childGroups.join(",");n.add(`(group_set NOT IN (${o}) OR (group_set IN (${o}) AND ${s.sql()}))`)}n.addChain(this.generateSQLWhereChildren(i))}return n}generateSQLWhereTurtled(){const e=this.generateSQLFilters(this.rootResult,"where");return e.addChain(this.generateSQLWhereChildren(this.rootResult)),e.sql("where")}generateSQLHavingLimit(e,n){const r=[],i=this.rootResult.selectStructs([],s=>s.hasHaving);if(i.length>0)for(const s of i){const o=[];let u=s;for(;u;){for(const a of u.fieldNames(l=>Rr(l.f)))o.push(this.parent.dialect.sqlMaybeQuoteIdentifier(`${a}__${u.groupSet}`));u=u.parent}r.push(`MAX(CASE WHEN group_set IN (${s.childGroups.join(",")}) THEN __delete__${s.groupSet} END) OVER(partition by ${o.map(this.parent.dialect.castToString).join(",")}) as __shaving__${s.groupSet}`)}if(i.length>0){n=e.addStage(`SELECT
+`),o=e.map(l=>l.sqlFieldName),a=Array.from(this.rootResult.allFields.keys()).map(l=>this.parent.dialect.sqlMaybeQuoteIdentifier(l)).filter(l=>o.indexOf(l)===-1);i=`SELECT ${a.length>0?a.join(", ")+",":""} ${s} FROM ${n}`}return r.addStage(i)}generateStage0Fields(e,n,r){const i=[],s=[];for(const[a,l]of e.allFields)l instanceof di&&Rr(l.f)?i.push([a,l]):s.push([a,l]);const o=[...i,...s];for(const[a,l]of o){const c=this.parent.dialect.sqlMaybeQuoteIdentifier(`${a}__${e.groupSet}`);if(l instanceof di){if(l.fieldUsage.type==="result"){const f=l.getSQL();if(Rr(l.f)){if(this.parent.dialect.cantPartitionWindowFunctionsOnExpressions&&this.rootResult.queryUsesPartitioning){const d=`__lateral_join_bag.${c}`;if(l.analyticalSQL=d,n.lateralJoinSQLExpressions.push(`${f} as ${c}`),n.sql.push(d),l.f.fieldDef.type==="number"){const h=this.parent.dialect.sqlMaybeQuoteIdentifier(`${a}__${e.groupSet}_string`),p=`__lateral_join_bag.${h}`;n.sql.push(p),n.dimensionIndexes.push(n.fieldIndex++),n.lateralJoinSQLExpressions.push(`CAST(${f} as STRING) as ${h}`),l.partitionSQL=p}}else n.sql.push(`${f} as ${c}`);n.dimensionIndexes.push(n.fieldIndex++)}else Qv(l.f)&&(n.sql.push(`${f} as ${c}`),n.fieldIndex++)}}else if(l instanceof ku){if(l.firstSegment.type==="reduce")this.generateStage0Fields(l,n,r);else if(l.firstSegment.type==="project"){const f=this.generateTurtleSQL(l,r,c,n.outputPipelinedSQL);n.sql.push(`${f} as ${c}`),n.fieldIndex++}}}const u=this.generateSQLFilters(e,"having");u.empty()||(e.childGroups.length===1?e.root().havings.add(`(group_set<>${e.groupSet} OR (group_set=${e.groupSet} AND ${u.sql()}))`):(e.hasHaving=!0,n.sql.push(`CASE WHEN group_set=${e.groupSet} THEN CASE WHEN ${u.sql()} THEN 0 ELSE 1 END END as __delete__${e.groupSet}`),n.fieldIndex++))}generateSQLWhereChildren(e){const n=new En.AndChain;for(const[,r]of e.allFields)if(r.type==="query"){const i=r,s=this.generateSQLFilters(i,"where");if(s.present()){const o=i.childGroups.join(",");n.add(`(group_set NOT IN (${o}) OR (group_set IN (${o}) AND ${s.sql()}))`)}n.addChain(this.generateSQLWhereChildren(i))}return n}generateSQLWhereTurtled(){const e=this.generateSQLFilters(this.rootResult,"where");return e.addChain(this.generateSQLWhereChildren(this.rootResult)),e.sql("where")}generateSQLHavingLimit(e,n){const r=[],i=this.rootResult.selectStructs([],s=>s.hasHaving);if(i.length>0)for(const s of i){const o=[];let u=s;for(;u;){for(const l of u.fieldNames(c=>Rr(c.f)))o.push(this.parent.dialect.sqlMaybeQuoteIdentifier(`${l}__${u.groupSet}`));u=u.parent}let a="";o.length>0&&(a="partition by ",a+=o.map(this.parent.dialect.castToString).join(",")),r.push(`MAX(CASE WHEN group_set IN (${s.childGroups.join(",")}) THEN __delete__${s.groupSet} END) OVER(${a}) as __shaving__${s.groupSet}`)}if(i.length>0){n=e.addStage(`SELECT
   *,
   ${r.join(`,
   `)} 

package/dist/webcomponent/malloy-render.mjs

@@ -26314,11 +26314,12 @@ ${(0, vn.indent)(h)}) AS ${n.alias}
         const o = [];
         let u = s;
         for (; u; ) {
-          for (const a of u.fieldNames((l) => Cr(l.f)))
-            o.push(this.parent.dialect.sqlMaybeQuoteIdentifier(`${a}__${u.groupSet}`));
+          for (const l of u.fieldNames((c) => Cr(c.f)))
+            o.push(this.parent.dialect.sqlMaybeQuoteIdentifier(`${l}__${u.groupSet}`));
           u = u.parent;
         }
-        r.push(`MAX(CASE WHEN group_set IN (${s.childGroups.join(",")}) THEN __delete__${s.groupSet} END) OVER(partition by ${o.map(this.parent.dialect.castToString).join(",")}) as __shaving__${s.groupSet}`);
+        let a = "";
+        o.length > 0 && (a = "partition by ", a += o.map(this.parent.dialect.castToString).join(",")), r.push(`MAX(CASE WHEN group_set IN (${s.childGroups.join(",")}) THEN __delete__${s.groupSet} END) OVER(${a}) as __shaving__${s.groupSet}`);
       }
     if (i.length > 0) {
       n = e.addStage(`SELECT

package/dist/webcomponent/malloy-render.umd.js

@@ -894,7 +894,7 @@ ${(0,En.indent)(h)}) AS ${n.alias}
 `),this.resultStage=e.addStage(n),this.resultStage}generatePipelinedStages(e,n,r){if(e.length===0)return n;let i;if(this.parent.dialect.supportsSelectReplace)i=`SELECT * replace (${e.map(o=>`${o.pipelineSQL} as ${o.sqlFieldName}`).join(`,
 `)}) FROM ${n}
         `;else{const s=e.map(l=>`${l.pipelineSQL} as ${l.sqlFieldName}`).join(`,
-`),o=e.map(l=>l.sqlFieldName),a=Array.from(this.rootResult.allFields.keys()).map(l=>this.parent.dialect.sqlMaybeQuoteIdentifier(l)).filter(l=>o.indexOf(l)===-1);i=`SELECT ${a.length>0?a.join(", ")+",":""} ${s} FROM ${n}`}return r.addStage(i)}generateStage0Fields(e,n,r){const i=[],s=[];for(const[a,l]of e.allFields)l instanceof di&&Rr(l.f)?i.push([a,l]):s.push([a,l]);const o=[...i,...s];for(const[a,l]of o){const c=this.parent.dialect.sqlMaybeQuoteIdentifier(`${a}__${e.groupSet}`);if(l instanceof di){if(l.fieldUsage.type==="result"){const f=l.getSQL();if(Rr(l.f)){if(this.parent.dialect.cantPartitionWindowFunctionsOnExpressions&&this.rootResult.queryUsesPartitioning){const d=`__lateral_join_bag.${c}`;if(l.analyticalSQL=d,n.lateralJoinSQLExpressions.push(`${f} as ${c}`),n.sql.push(d),l.f.fieldDef.type==="number"){const h=this.parent.dialect.sqlMaybeQuoteIdentifier(`${a}__${e.groupSet}_string`),p=`__lateral_join_bag.${h}`;n.sql.push(p),n.dimensionIndexes.push(n.fieldIndex++),n.lateralJoinSQLExpressions.push(`CAST(${f} as STRING) as ${h}`),l.partitionSQL=p}}else n.sql.push(`${f} as ${c}`);n.dimensionIndexes.push(n.fieldIndex++)}else zv(l.f)&&(n.sql.push(`${f} as ${c}`),n.fieldIndex++)}}else if(l instanceof ku){if(l.firstSegment.type==="reduce")this.generateStage0Fields(l,n,r);else if(l.firstSegment.type==="project"){const f=this.generateTurtleSQL(l,r,c,n.outputPipelinedSQL);n.sql.push(`${f} as ${c}`),n.fieldIndex++}}}const u=this.generateSQLFilters(e,"having");u.empty()||(e.childGroups.length===1?e.root().havings.add(`(group_set<>${e.groupSet} OR (group_set=${e.groupSet} AND ${u.sql()}))`):(e.hasHaving=!0,n.sql.push(`CASE WHEN group_set=${e.groupSet} THEN CASE WHEN ${u.sql()} THEN 0 ELSE 1 END END as __delete__${e.groupSet}`),n.fieldIndex++))}generateSQLWhereChildren(e){const n=new En.AndChain;for(const[,r]of e.allFields)if(r.type==="query"){const i=r,s=this.generateSQLFilters(i,"where");if(s.present()){const o=i.childGroups.join(",");n.add(`(group_set NOT IN (${o}) OR (group_set IN (${o}) AND ${s.sql()}))`)}n.addChain(this.generateSQLWhereChildren(i))}return n}generateSQLWhereTurtled(){const e=this.generateSQLFilters(this.rootResult,"where");return e.addChain(this.generateSQLWhereChildren(this.rootResult)),e.sql("where")}generateSQLHavingLimit(e,n){const r=[],i=this.rootResult.selectStructs([],s=>s.hasHaving);if(i.length>0)for(const s of i){const o=[];let u=s;for(;u;){for(const a of u.fieldNames(l=>Rr(l.f)))o.push(this.parent.dialect.sqlMaybeQuoteIdentifier(`${a}__${u.groupSet}`));u=u.parent}r.push(`MAX(CASE WHEN group_set IN (${s.childGroups.join(",")}) THEN __delete__${s.groupSet} END) OVER(partition by ${o.map(this.parent.dialect.castToString).join(",")}) as __shaving__${s.groupSet}`)}if(i.length>0){n=e.addStage(`SELECT
+`),o=e.map(l=>l.sqlFieldName),a=Array.from(this.rootResult.allFields.keys()).map(l=>this.parent.dialect.sqlMaybeQuoteIdentifier(l)).filter(l=>o.indexOf(l)===-1);i=`SELECT ${a.length>0?a.join(", ")+",":""} ${s} FROM ${n}`}return r.addStage(i)}generateStage0Fields(e,n,r){const i=[],s=[];for(const[a,l]of e.allFields)l instanceof di&&Rr(l.f)?i.push([a,l]):s.push([a,l]);const o=[...i,...s];for(const[a,l]of o){const c=this.parent.dialect.sqlMaybeQuoteIdentifier(`${a}__${e.groupSet}`);if(l instanceof di){if(l.fieldUsage.type==="result"){const f=l.getSQL();if(Rr(l.f)){if(this.parent.dialect.cantPartitionWindowFunctionsOnExpressions&&this.rootResult.queryUsesPartitioning){const d=`__lateral_join_bag.${c}`;if(l.analyticalSQL=d,n.lateralJoinSQLExpressions.push(`${f} as ${c}`),n.sql.push(d),l.f.fieldDef.type==="number"){const h=this.parent.dialect.sqlMaybeQuoteIdentifier(`${a}__${e.groupSet}_string`),p=`__lateral_join_bag.${h}`;n.sql.push(p),n.dimensionIndexes.push(n.fieldIndex++),n.lateralJoinSQLExpressions.push(`CAST(${f} as STRING) as ${h}`),l.partitionSQL=p}}else n.sql.push(`${f} as ${c}`);n.dimensionIndexes.push(n.fieldIndex++)}else zv(l.f)&&(n.sql.push(`${f} as ${c}`),n.fieldIndex++)}}else if(l instanceof ku){if(l.firstSegment.type==="reduce")this.generateStage0Fields(l,n,r);else if(l.firstSegment.type==="project"){const f=this.generateTurtleSQL(l,r,c,n.outputPipelinedSQL);n.sql.push(`${f} as ${c}`),n.fieldIndex++}}}const u=this.generateSQLFilters(e,"having");u.empty()||(e.childGroups.length===1?e.root().havings.add(`(group_set<>${e.groupSet} OR (group_set=${e.groupSet} AND ${u.sql()}))`):(e.hasHaving=!0,n.sql.push(`CASE WHEN group_set=${e.groupSet} THEN CASE WHEN ${u.sql()} THEN 0 ELSE 1 END END as __delete__${e.groupSet}`),n.fieldIndex++))}generateSQLWhereChildren(e){const n=new En.AndChain;for(const[,r]of e.allFields)if(r.type==="query"){const i=r,s=this.generateSQLFilters(i,"where");if(s.present()){const o=i.childGroups.join(",");n.add(`(group_set NOT IN (${o}) OR (group_set IN (${o}) AND ${s.sql()}))`)}n.addChain(this.generateSQLWhereChildren(i))}return n}generateSQLWhereTurtled(){const e=this.generateSQLFilters(this.rootResult,"where");return e.addChain(this.generateSQLWhereChildren(this.rootResult)),e.sql("where")}generateSQLHavingLimit(e,n){const r=[],i=this.rootResult.selectStructs([],s=>s.hasHaving);if(i.length>0)for(const s of i){const o=[];let u=s;for(;u;){for(const l of u.fieldNames(c=>Rr(c.f)))o.push(this.parent.dialect.sqlMaybeQuoteIdentifier(`${l}__${u.groupSet}`));u=u.parent}let a="";o.length>0&&(a="partition by ",a+=o.map(this.parent.dialect.castToString).join(",")),r.push(`MAX(CASE WHEN group_set IN (${s.childGroups.join(",")}) THEN __delete__${s.groupSet} END) OVER(${a}) as __shaving__${s.groupSet}`)}if(i.length>0){n=e.addStage(`SELECT
   *,
   ${r.join(`,
   `)} 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/render",
-  "version": "0.0.240-dev250305213425",
+  "version": "0.0.240-dev250308020308",
   "license": "MIT",
   "main": "dist/module/index.umd.js",
   "types": "dist/index.d.ts",
@@ -31,8 +31,8 @@
     "build-types": "tsc --build --declaration --emitDeclarationOnly"
   },
   "dependencies": {
-    "@malloydata/malloy": "^0.0.240-dev250305213425",
-    "@malloydata/malloy-tag": "^0.0.240-dev250305213425",
+    "@malloydata/malloy": "^0.0.240-dev250308020308",
+    "@malloydata/malloy-tag": "^0.0.240-dev250308020308",
     "@tanstack/solid-virtual": "^3.10.4",
     "component-register": "^0.8.6",
     "lodash": "^4.17.20",