@malloydata/render 0.0.225-dev250106171109 → 0.0.225-dev250110175536

package/dist/module/index.mjs

@@ -41129,48 +41129,46 @@ class fme extends ame.StaticSpace {
   structDef() {
     if (this.complete = !0, this.sourceDef === void 0) {
       const e = {};
-      for (const [l, c] of this.entries())
-        c instanceof MP.SpaceParam && (e[l] = c.parameter());
+      for (const [a, l] of this.entries())
+        l instanceof MP.SpaceParam && (e[a] = l.parameter());
       this.sourceDef = { ...this.fromSource, fields: [] }, this.sourceDef.parameters = e;
-      const n = /* @__PURE__ */ new Map(), r = [], i = [], s = [], o = [];
-      for (const [l, c] of this.entries())
-        c instanceof lme.StructSpaceFieldBase ? i.push([l, c]) : c instanceof ume.ViewField ? s.push([l, c]) : c instanceof sme.SpaceField && r.push([l, c]);
-      const u = [...r, ...i, ...s], a = this.parameterSpace();
-      for (const [l, c] of u)
-        if (c instanceof ome.JoinSpaceField) {
-          const f = c.join.structDef(a);
-          ime.ErrorFactory.didCreate(f) || (n.set(l, this.sourceDef.fields.length), this.sourceDef.fields.push(f), o.push([c.join, f]));
+      const n = /* @__PURE__ */ new Map(), r = [], i = [], s = [];
+      for (const [a, l] of this.entries())
+        l instanceof lme.StructSpaceFieldBase ? i.push([a, l]) : l instanceof ume.ViewField ? s.push([a, l]) : l instanceof sme.SpaceField && r.push([a, l]);
+      const o = [...r, ...i, ...s], u = this.parameterSpace();
+      for (const [a, l] of o)
+        if (l instanceof ome.JoinSpaceField) {
+          const c = l.join.structDef(u);
+          ime.ErrorFactory.didCreate(c) || (n.set(a, this.sourceDef.fields.length), this.sourceDef.fields.push(c), l.join.fixupJoinOn(this, c));
         } else {
-          const f = c.fieldDef();
-          f && (n.set(l, this.sourceDef.fields.length), this.sourceDef.fields.push(f));
+          const c = l.fieldDef();
+          c && (n.set(a, this.sourceDef.fields.length), this.sourceDef.fields.push(c));
         }
-      for (const [l, c] of o)
-        l.fixupJoinOn(this, c);
-      for (const [l, c] of this.newAccessModifiers) {
-        const f = this.sourceDef.fields.findIndex((x) => {
-          var h;
-          return (h = x.as) !== null && h !== void 0 ? h : x.name === l;
+      for (const [a, l] of this.newAccessModifiers) {
+        const c = this.sourceDef.fields.findIndex((f) => {
+          var x;
+          return (x = f.as) !== null && x !== void 0 ? x : f.name === a;
         });
-        if (f === -1)
-          throw new Error(`Can't find field '${l}' to set access modifier`);
-        c === "public" ? delete this.sourceDef.fields[f].accessModifier : this.sourceDef.fields[f] = {
-          ...this.sourceDef.fields[f],
-          accessModifier: c
+        if (c === -1)
+          throw new Error(`Can't find field '${a}' to set access modifier`);
+        l === "public" ? delete this.sourceDef.fields[c].accessModifier : this.sourceDef.fields[c] = {
+          ...this.sourceDef.fields[c],
+          accessModifier: l
         };
       }
-      for (const [l, c] of this.newNotes) {
-        const f = this.sourceDef.fields.findIndex((h) => {
-          var p;
-          return (p = h.as) !== null && p !== void 0 ? p : h.name === l;
+      for (const [a, l] of this.newNotes) {
+        const c = this.sourceDef.fields.findIndex((x) => {
+          var h;
+          return (h = x.as) !== null && h !== void 0 ? h : x.name === a;
         });
-        if (f === -1)
-          throw new Error(`Can't find field '${l}' to set access modifier`);
-        const x = this.sourceDef.fields[f];
-        this.sourceDef.fields[f] = {
-          ...x,
+        if (c === -1)
+          throw new Error(`Can't find field '${a}' to set access modifier`);
+        const f = this.sourceDef.fields[c];
+        this.sourceDef.fields[c] = {
+          ...f,
           annotation: {
-            ...c,
-            inherits: x.annotation
+            ...l,
+            inherits: f.annotation
           }
         };
       }