@malloy-publisher/server 0.0.168 → 0.0.170

package/package.json

@@ -1,7 +1,7 @@
 {
    "name": "@malloy-publisher/server",
    "description": "Malloy Publisher Server",
-   "version": "0.0.168",
+   "version": "0.0.170",
    "main": "dist/server.js",
    "bin": {
       "malloy-publisher": "dist/server.js"
@@ -30,15 +30,15 @@
    "dependencies": {
       "@aws-sdk/client-s3": "^3.958.0",
       "@google-cloud/storage": "^7.16.0",
-      "@malloydata/db-bigquery": "^0.0.333",
-      "@malloydata/db-duckdb": "^0.0.333",
-      "@malloydata/db-mysql": "^0.0.333",
-      "@malloydata/db-postgres": "^0.0.333",
-      "@malloydata/db-snowflake": "^0.0.333",
-      "@malloydata/db-trino": "^0.0.333",
-      "@malloydata/malloy": "^0.0.333",
-      "@malloydata/malloy-sql": "^0.0.333",
-      "@malloydata/render": "^0.0.333",
+      "@malloydata/db-bigquery": "^0.0.358",
+      "@malloydata/db-duckdb": "^0.0.358",
+      "@malloydata/db-mysql": "^0.0.358",
+      "@malloydata/db-postgres": "^0.0.358",
+      "@malloydata/db-snowflake": "^0.0.358",
+      "@malloydata/db-trino": "^0.0.358",
+      "@malloydata/malloy": "^0.0.358",
+      "@malloydata/malloy-sql": "^0.0.358",
+      "@malloydata/render-validator": "^0.0.358",
       "@modelcontextprotocol/sdk": "^1.13.2",
       "@opentelemetry/api": "^1.9.0",
       "@opentelemetry/auto-instrumentations-node": "^0.57.0",

package/src/controller/query.controller.ts

@@ -1,3 +1,4 @@
+import { validateRenderTags } from "@malloydata/render-validator";
 import { components } from "../api";
 import { API_PREFIX } from "../constants";
 import { ModelNotFoundError } from "../errors";
@@ -41,11 +42,13 @@ export class QueryController {
             queryName,
             query,
          );
+         const renderLogs = validateRenderTags(result);
          return {
             result: compactJson
                ? JSON.stringify(compactResult, bigIntReplacer)
                : JSON.stringify(result),
             resource: `${API_PREFIX}/projects/${projectName}/packages/${packageName}/models/${modelPath}/query`,
+            renderLogs: renderLogs.length > 0 ? renderLogs : undefined,
          } as ApiQuery;
       }
    }

package/src/mcp/tools/execute_query_tool.ts

@@ -121,8 +121,11 @@ export function registerExecuteQueryTool(
                   undefined,
                   query,
                );
+               const { validateRenderTags } = await import(
+                  "@malloydata/render-validator"
+               );
+               const renderLogs = validateRenderTags(result);
 
-               // --- Format Success Response (Duplicated for now, could refactor) ---
                const baseUriComponents = {
                   project: projectName,
                   package: packageName,
@@ -131,29 +134,43 @@ export function registerExecuteQueryTool(
                };
                const resultUri = buildMalloyUri(baseUriComponents, "result");
                const resultString = JSON.stringify(result, null, 2);
-               return {
-                  isError: false,
-                  content: [
-                     {
-                        type: "resource",
-                        resource: {
-                           type: "application/json",
-                           uri: resultUri,
-                           text: resultString,
-                        },
+
+               const content = [
+                  {
+                     type: "resource" as const,
+                     resource: {
+                        type: "application/json",
+                        uri: resultUri,
+                        text: resultString,
                      },
-                  ],
-               };
+                  },
+               ];
+
+               if (renderLogs.length > 0) {
+                  return {
+                     isError: false,
+                     content: [
+                        ...content,
+                        {
+                           type: "text" as const,
+                           text: `Render tag warnings:\n${JSON.stringify(renderLogs, null, 2)}`,
+                        },
+                     ],
+                  };
+               }
+
+               return { isError: false, content };
             } else if (queryName) {
-               // Otherwise, use sourceName/queryName in 1st/2nd args
                const { result } = await model.getQueryResults(
                   sourceName,
                   queryName,
                   undefined,
                );
+               const { validateRenderTags } = await import(
+                  "@malloydata/render-validator"
+               );
+               const renderLogs = validateRenderTags(result);
 
-               // --- Format Success Response ---
-               // Use the helper function to build valid URIs
                const baseUriComponents = {
                   project: projectName,
                   package: packageName,
@@ -161,22 +178,33 @@ export function registerExecuteQueryTool(
                   resourceName: modelPath,
                };
                const resultUri = buildMalloyUri(baseUriComponents, "result");
-
                const resultString = JSON.stringify(result, null, 2);
 
-               return {
-                  isError: false,
-                  content: [
-                     {
-                        type: "resource",
-                        resource: {
-                           type: "application/json",
-                           uri: resultUri,
-                           text: resultString,
-                        },
+               const content = [
+                  {
+                     type: "resource" as const,
+                     resource: {
+                        type: "application/json",
+                        uri: resultUri,
+                        text: resultString,
                      },
-                  ],
-               };
+                  },
+               ];
+
+               if (renderLogs.length > 0) {
+                  return {
+                     isError: false,
+                     content: [
+                        ...content,
+                        {
+                           type: "text" as const,
+                           text: `Render tag warnings:\n${JSON.stringify(renderLogs, null, 2)}`,
+                        },
+                     ],
+                  };
+               }
+
+               return { isError: false, content };
             }
 
             // If execution reaches this point, something has gone wrong with

package/src/service/model.ts

@@ -10,7 +10,7 @@ import {
    modelDefToModelInfo,
    ModelMaterializer,
    NamedModelObject,
-   NamedQuery,
+   NamedQueryDef,
    QueryData,
    QueryMaterializer,
    Runtime,
@@ -532,7 +532,7 @@ export class Model {
                ROW_LIMIT;
             const result = await cell.runnable.run({ rowLimit });
             const query = (await cell.runnable.getPreparedQuery())._query;
-            queryName = (query as NamedQuery).as || query.name;
+            queryName = (query as NamedQueryDef).as || query.name;
             queryResult =
                result?._queryResult &&
                this.modelInfo &&
@@ -621,11 +621,12 @@ export class Model {
       modelPath: string,
       modelDef: ModelDef,
    ): ApiQuery[] {
-      const isNamedQuery = (object: NamedModelObject): object is NamedQuery =>
-         object.type === "query";
+      const isNamedQuery = (
+         object: NamedModelObject,
+      ): object is NamedQueryDef => object.type === "query";
       return Object.values(modelDef.contents)
          .filter(isNamedQuery)
-         .map((queryObj: NamedQuery) => ({
+         .map((queryObj: NamedQueryDef) => ({
             name: queryObj.as || queryObj.name,
             // What to do when the source is not a string?
             sourceName:
@@ -633,8 +634,10 @@ export class Model {
                   ? queryObj.structRef
                   : undefined,
             annotations: queryObj?.annotation?.blockNotes
-               ?.filter((note) => note.at.url.includes(modelPath))
-               .map((note) => note.text),
+               ?.filter((note: { at: { url: string } }) =>
+                  note.at.url.includes(modelPath),
+               )
+               .map((note: { text: string }) => note.text),
          }));
    }
 
@@ -828,7 +831,7 @@ export class Model {
                   let queryInfo: Malloy.QueryInfo | undefined = undefined;
                   try {
                      const preparedQuery = await runnable.getPreparedQuery();
-                     const query = preparedQuery._query as NamedQuery;
+                     const query = preparedQuery._query as NamedQueryDef;
                      const queryName = query.as || query.name;
                      const anonymousQuery =
                         currentModelInfo.anonymous_queries[