@malloydata/render 0.0.224-dev241217171758 → 0.0.224-dev241217194410

package/dist/module/index.mjs

@@ -42121,18 +42121,20 @@ Object.defineProperty(Hm, "__esModule", { value: !0 });
 Hm.QueryBase = void 0;
 const o6 = rt, zP = We, vye = $h, Cye = Ge;
 class Sye extends Cye.MalloyElement {
-  query() {
-    var e;
-    const { inputStruct: n, query: r } = this.queryComp(!0);
-    let i;
-    if (r.pipeline[0] && ((0, zP.isQuerySegment)(r.pipeline[0]) || (0, zP.isIndexSegment)(r.pipeline[0]))) {
-      const s = (e = r.pipeline[0].compositeFieldUsage) !== null && e !== void 0 ? e : (0, o6.emptyCompositeFieldUsage)();
-      (!(0, o6.isEmptyCompositeFieldUsage)(s) || n.type === "composite") && (i = (0, o6.resolveCompositeSources)(n, s).sourceDef);
+  resolveCompositeSource(e, n) {
+    var r;
+    const i = n.pipeline[0];
+    if (i && ((0, zP.isQuerySegment)(i) || (0, zP.isIndexSegment)(i))) {
+      const s = (r = i.compositeFieldUsage) !== null && r !== void 0 ? r : (0, o6.emptyCompositeFieldUsage)();
+      if (!(0, o6.isEmptyCompositeFieldUsage)(s) || e.type === "composite")
+        return (0, o6.resolveCompositeSources)(e, s).sourceDef;
     }
+  }
+  query() {
+    const { query: e } = this.queryComp(!0);
     return {
-      ...r,
-      compositeResolvedSourceDef: i,
-      pipeline: (0, vye.detectAndRemovePartialStages)(r.pipeline, this)
+      ...e,
+      pipeline: (0, vye.detectAndRemovePartialStages)(e.pipeline, this)
     };
   }
 }
@@ -42145,29 +42147,33 @@ class Oye extends Rye.QueryBase {
     super({ source: e, view: n }), this.source = e, this.view = n, this.elementType = "arrow";
   }
   queryComp(e) {
-    let n, r, i;
+    var n;
+    let r, i, s;
     if (this.source instanceof Tye.Source) {
-      const l = e ? this.source.structRef(void 0) : { structRef: this.source.getSourceDef(void 0) };
-      r = {
+      const x = e ? this.source.structRef(void 0) : { structRef: this.source.getSourceDef(void 0) };
+      i = {
         type: "query",
-        ...l,
+        ...x,
         pipeline: [],
         location: this.location
-      }, n = (0, bye.refIsStructDef)(l.structRef) ? l.structRef : this.source.getSourceDef(void 0), i = new QP.StaticSourceSpace(n);
+      }, r = (0, bye.refIsStructDef)(x.structRef) ? x.structRef : this.source.getSourceDef(void 0), s = new QP.StaticSourceSpace(r);
     } else {
-      const l = this.source.queryComp(e);
-      r = l.query, n = l.outputStruct, i = new QP.StaticSourceSpace(l.outputStruct);
+      const x = this.source.queryComp(e);
+      i = x.query, r = x.outputStruct, s = new QP.StaticSourceSpace(x.outputStruct);
     }
-    const { pipeline: s, annotation: o, outputStruct: u, name: a } = this.view.pipelineComp(i);
+    const { pipeline: o, annotation: u, outputStruct: a, name: l } = this.view.pipelineComp(s), c = {
+      ...i,
+      name: l,
+      annotation: u,
+      pipeline: [...i.pipeline, ...o]
+    }, f = (n = c.compositeResolvedSourceDef) !== null && n !== void 0 ? n : this.resolveCompositeSource(r, c);
     return {
       query: {
-        ...r,
-        name: a,
-        annotation: o,
-        pipeline: [...r.pipeline, ...s]
+        ...c,
+        compositeResolvedSourceDef: f
       },
-      outputStruct: u,
-      inputStruct: n
+      outputStruct: a,
+      inputStruct: r
     };
   }
 }
@@ -42242,11 +42248,14 @@ class Mye extends Pye.QueryBase {
     super({ base: e, refinement: n }), this.base = e, this.refinement = n, this.elementType = "query-refine";
   }
   queryComp(e) {
-    const n = this.base.queryComp(e), r = new $ye.StaticSourceSpace(n.inputStruct), i = this.refinement.refine(r, n.query.pipeline, void 0);
+    const n = this.base.queryComp(e), r = new $ye.StaticSourceSpace(n.inputStruct), i = this.refinement.refine(r, n.query.pipeline, void 0), s = {
+      ...n.query,
+      pipeline: i
+    }, o = this.resolveCompositeSource(n.inputStruct, s);
     return {
       query: {
-        ...n.query,
-        pipeline: i
+        ...s,
+        compositeResolvedSourceDef: o
       },
       outputStruct: (0, kye.getFinalStruct)(this.refinement, n.inputStruct, i),
       inputStruct: n.inputStruct