@malloydata/malloyyo 0.2.6 → 0.2.7

package/dist/index.js

@@ -1449,6 +1449,29 @@ function srcNudge(modelRef, source) {
     };
   };
 }
+function definedNamesIn(malloy) {
+  const names = /* @__PURE__ */ new Set();
+  const re = /\b([A-Za-z_]\w*)\s+is\b/g;
+  let m;
+  while ((m = re.exec(malloy)) !== null) names.add(m[1]);
+  return names;
+}
+function queryFieldFix(modelRef, source, malloy) {
+  const defined = definedNamesIn(malloy);
+  const nudge = srcNudge(modelRef, source);
+  return (p) => {
+    if (p.code !== "field-not-found") return p;
+    const name = /'([^']+)'/.exec(p.message)?.[1];
+    if (name && defined.has(name)) {
+      return {
+        ...p,
+        message: `'${name}' is defined in this query, but one field can't reference another in the same stage. To build a value from other aggregates (a ratio, a share), declare the parts in an \`extend:\` block (measures can reference each other), then use them.`,
+        help_topic: "explore/query-examples"
+      };
+    }
+    return nudge(p);
+  };
+}
 function sourceAsMalloy(s) {
   return s?.body ? `source: ${s.body}` : "";
 }
@@ -1638,7 +1661,12 @@ function exploreQueryTool(host, opts) {
       }
       try {
         return await host.withModel(modelRef, async (m) => {
-          const res = await executeQuery(m, args, srcNudge(modelRef, source), opts.result);
+          const res = await executeQuery(
+            m,
+            args,
+            queryFieldFix(modelRef, source, argString(args, "malloy")),
+            opts.result
+          );
           if (!execute) return { ...res, model_ref: modelRef };
           const { sql, ...rest } = res;
           const out = { ...rest, model_ref: modelRef };
@@ -1849,7 +1877,7 @@ async function serveMcp(opts) {
 }
 
 // package.json
-var version = "0.2.6";
+var version = "0.2.7";
 
 // src/index.ts
 function shortSha(sha) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/malloyyo",
-  "version": "0.2.6",
+  "version": "0.2.7",
   "description": "Publish Malloy models to a Malloyyo instance",
   "license": "MIT",
   "repository": {