@malloy-publisher/server 0.0.91 → 0.0.93

package/eslint.config.mjs

@@ -50,6 +50,14 @@ export default [
 
       rules: {
          "react/react-in-jsx-scope": "off",
+         "@typescript-eslint/no-unused-vars": [
+            "error",
+            {
+               argsIgnorePattern: "^_",
+               varsIgnorePattern: "^_",
+               caughtErrorsIgnorePattern: "^_",
+            },
+         ],
       },
    },
 ];

package/package.json

@@ -1,7 +1,7 @@
 {
    "name": "@malloy-publisher/server",
    "description": "Malloy Publisher Server",
-   "version": "0.0.91",
+   "version": "0.0.93",
    "main": "dist/server.js",
    "bin": {
       "malloy-publisher": "dist/server.js"
@@ -63,6 +63,7 @@
       "@eslint/js": "^9.23.0",
       "@faker-js/faker": "^9.4.0",
       "@types/adm-zip": "^0.5.7",
+      "@types/bun": "^1.2.20",
       "@types/cors": "^2.8.12",
       "@types/express": "^4.17.14",
       "@types/morgan": "^1.9.9",

package/publisher.config.json

@@ -1,6 +1,26 @@
 {
-   "frozenConfig": false,
-   "projects": {
-      "malloy-samples": "https://github.com/ms2data/malloy-samples"
-   }
-}
+    "frozenConfig": false,
+    "projects": [
+      {
+        "name": "malloy-samples",
+        "packages": [
+            {
+            "name": "ecommerce",
+            "location": "https://github.com/ms2data/malloy-samples"
+          },
+          {
+            "name": "imdb",
+            "location": "https://github.com/ms2data/malloy-samples"
+          },
+          {
+            "name": "faa",
+            "location": "https://github.com/ms2data/malloy-samples"
+          },
+          {
+            "name": "bigquery-hackernews",
+            "location": "https://github.com/ms2data/malloy-samples"
+          }
+        ]
+      }
+    ]
+  }

package/src/config.ts

@@ -4,14 +4,37 @@ import { PUBLISHER_CONFIG_NAME } from "./constants";
 
 type FilesystemPath = `./${string}` | `../${string}` | `/${string}`;
 type GcsPath = `gs://${string}`;
+
+export type Package = {
+   name: string;
+   location: FilesystemPath | GcsPath;
+};
+
+export type Project = {
+   name: string;
+   packages: Package[];
+};
+
 export type PublisherConfig = {
    frozenConfig: boolean;
-   projects: Record<string, FilesystemPath | GcsPath>;
+   projects: Project[];
 };
 
 export const getPublisherConfig = (serverRoot: string): PublisherConfig => {
    const publisherConfigPath = path.join(serverRoot, PUBLISHER_CONFIG_NAME);
-   return JSON.parse(fs.readFileSync(publisherConfigPath, "utf8"));
+   const rawConfig = JSON.parse(fs.readFileSync(publisherConfigPath, "utf8"));
+
+   if (
+      rawConfig.projects &&
+      typeof rawConfig.projects === "object" &&
+      !Array.isArray(rawConfig.projects)
+   ) {
+      throw new Error(
+         "Config has changed. Please update your config to the new format.",
+      );
+   }
+
+   return rawConfig as PublisherConfig;
 };
 
 export const isPublisherConfigFrozen = (serverRoot: string) => {

package/src/constants.ts

@@ -1,4 +1,6 @@
 import fs from "fs";
+import os from "os";
+import path from "path";
 export const API_PREFIX = "/api/v0";
 export const README_NAME = "README.md";
 export const PUBLISHER_CONFIG_NAME = "publisher.config.json";
@@ -7,10 +9,24 @@ export const CONNECTIONS_MANIFEST_NAME = "publisher.connections.json";
 export const MODEL_FILE_SUFFIX = ".malloy";
 export const NOTEBOOK_FILE_SUFFIX = ".malloynb";
 export const ROW_LIMIT = 1000;
+export const TEMP_DIR_PATH = os.tmpdir();
+export let publisherPath: string;
 
-export let publisherPath = "/etc/publisher";
-try {
-   fs.accessSync(publisherPath, fs.constants.W_OK);
-} catch (e) {
-   publisherPath = "/tmp/publisher";
+if (process.platform === "win32") {
+   publisherPath = path.join(
+      process.env.PROGRAMDATA || "C:\\ProgramData",
+      "publisher",
+   );
+   try {
+      fs.accessSync(publisherPath, fs.constants.W_OK);
+   } catch {
+      publisherPath = path.join(os.tmpdir(), "publisher");
+   }
+} else {
+   publisherPath = "/etc/publisher";
+   try {
+      fs.accessSync(publisherPath, fs.constants.W_OK);
+   } catch {
+      publisherPath = path.join(os.tmpdir(), "publisher");
+   }
 }

package/src/controller/connection.controller.ts

@@ -4,15 +4,15 @@ import {
    TestableConnection,
 } from "@malloydata/malloy";
 import { Connection, PersistSQLResults } from "@malloydata/malloy/connection";
-import { components } from "../api";
-import { ConnectionError } from "../errors";
+import { BadRequestError, ConnectionError } from "../errors";
 import { logger } from "../logger";
+import { components } from "../api";
 import {
    getSchemasForConnection,
    getTablesForSchema,
 } from "../service/db_utils";
 import { ProjectStore } from "../service/project_store";
-
+import { testConnectionConfig } from "../service/connection";
 type ApiConnection = components["schemas"]["Connection"];
 type ApiConnectionStatus = components["schemas"]["ConnectionStatus"];
 type ApiSqlSource = components["schemas"]["SqlSource"];
@@ -189,4 +189,33 @@ export class ConnectionController {
          throw new ConnectionError((error as Error).message);
       }
    }
+
+   public async testConnectionConfiguration(
+      connectionConfig: ApiConnection,
+   ): Promise<ApiConnectionStatus> {
+      if (
+         !connectionConfig ||
+         typeof connectionConfig !== "object" ||
+         Object.keys(connectionConfig).length === 0
+      ) {
+         throw new BadRequestError(
+            "Connection configuration is required and cannot be empty",
+         );
+      }
+
+      if (!connectionConfig.type || typeof connectionConfig.type !== "string") {
+         throw new BadRequestError(
+            "Connection type is required and must be a string",
+         );
+      }
+
+      try {
+         return await testConnectionConfig(connectionConfig);
+      } catch (error) {
+         return {
+            status: "failed",
+            errorMessage: `Connection test failed: ${(error as Error).message}`,
+         };
+      }
+   }
 }

package/src/controller/package.controller.ts

@@ -103,6 +103,7 @@ export class PackageController {
             packageLocation,
             absoluteTargetPath,
             projectName,
+            packageName,
          );
       }
    }

package/src/controller/watch-mode.controller.ts

@@ -7,7 +7,7 @@ import { ProjectStore } from "../service/project_store";
 
 type StartWatchReq = components["schemas"]["StartWatchRequest"];
 type WatchStatusRes = components["schemas"]["WatchStatus"];
-type Handler<Req = {}, Res = void> = RequestHandler<{}, Res, Req>;
+type Handler<Req = object, Res = void> = RequestHandler<object, Res, Req>;
 
 export class WatchModeController {
    watchingPath: string | null;
@@ -19,7 +19,7 @@ export class WatchModeController {
       this.watchingProjectName = null;
    }
 
-   public getWatchStatus: Handler<{}, WatchStatusRes> = async (_req, res) => {
+   public getWatchStatus: Handler<void, WatchStatusRes> = async (_req, res) => {
       return res.json({
          enabled: !!this.watchingPath,
          watchingPath: this.watchingPath,
@@ -27,14 +27,29 @@ export class WatchModeController {
       });
    };
 
-   public startWatching: Handler<StartWatchReq> = async (req, res) => {
+   public startWatching: Handler<StartWatchReq, { error: string }> = async (
+      req,
+      res,
+   ) => {
       const projectManifest = await ProjectStore.reloadProjectManifest(
          this.projectStore.serverRootPath,
       );
       this.watchingProjectName = req.body.projectName;
+
+      // Find the project in the new array structure
+      const project = projectManifest.projects.find(
+         (p) => p.name === req.body.projectName,
+      );
+      if (!project || !project.packages || project.packages.length === 0) {
+         res.status(404).json({
+            error: `Project ${req.body.projectName} not found or has no packages`,
+         });
+         return;
+      }
+
       this.watchingPath = path.join(
          this.projectStore.serverRootPath,
-         projectManifest.projects[req.body.projectName],
+         req.body.projectName,
       );
       this.watcher = chokidar.watch(this.watchingPath, {
          ignored: (path, stats) =>

package/src/data_styles.ts

@@ -1,4 +1,5 @@
 import { URLReader } from "@malloydata/malloy";
+// @ts-expect-error until this gets merged https://github.com/malloydata/malloy/pull/2484
 import { DataStyles } from "@malloydata/render";
 import { logger } from "./logger";
 
@@ -25,7 +26,9 @@ export async function dataStylesForFile(
          //      created, so that the error can be shown there.
          let stylesText;
          try {
-            stylesText = await urlReader.readURL(new URL(fileName, url));
+            stylesText = (await urlReader.readURL(
+               new URL(fileName, url),
+            )) as string;
          } catch (error) {
             logger.error(`Error loading data style '${fileName}': ${error}`);
             stylesText = "{}";
@@ -53,10 +56,14 @@ export class HackyDataStylesAccumulator implements URLReader {
       const contents = await this.urlReader.readURL(url);
       this.dataStyles = {
          ...this.dataStyles,
-         ...(await dataStylesForFile(url.toString(), contents, this.urlReader)),
+         ...(await dataStylesForFile(
+            url.toString(),
+            contents as string,
+            this.urlReader,
+         )),
       };
 
-      return contents;
+      return contents as string;
    }
 
    getHackyAccumulatedDataStyles(): DataStyles {

package/src/mcp/prompts/index.ts

@@ -1,3 +1,11 @@
-export { withVersion, PROMPTS, MALLOY_PROMPTS, ExplainArgsSchema, GenerateQueryArgsSchema, TranslateSqlArgsSchema, SummarizeModelArgsSchema } from "./prompt_definitions";
+export {
+   withVersion,
+   PROMPTS,
+   MALLOY_PROMPTS,
+   ExplainArgsSchema,
+   GenerateQueryArgsSchema,
+   TranslateSqlArgsSchema,
+   SummarizeModelArgsSchema,
+} from "./prompt_definitions";
 export { promptHandlerMap, makePromptHandler } from "./handlers";
 export { registerPromptCapability } from "./prompt_service";

package/src/mcp/resources/package_resource.ts

@@ -38,13 +38,14 @@ async function handleGetPackageContents(
       const packageInstance = await project.getPackage(packageName, false);
 
       // Use listModels() which returns { path: string, type: 'source' | 'notebook' }[]
-      const entries = packageInstance.listModels();
+      const entries = await packageInstance.listModels();
 
       // Use a type that includes metadata explicitly
       const resourceDefinitions: { uri: string; metadata: unknown }[] = [];
 
       for (const entry of entries) {
          const entryPath = entry.path; // e.g., "flights.malloy", "overview.malloynb"
+         // @ts-expect-error TODO: Fix missing type in API
          const entryType = entry.type; // 'source' or 'notebook'
 
          if (typeof entryPath !== "string" || entryPath === "") {

package/src/mcp/resources/source_resource.ts

@@ -91,6 +91,7 @@ export function registerSourceResource(
                   }
                   // Add type annotation for 's'
                   const source = sources.find(
+                     // @ts-expect-error TODO: Fix missing Source type in API
                      (s: components["schemas"]["Source"]) =>
                         s.name === sourceName,
                   );

package/src/mcp/resources/view_resource.ts

@@ -83,6 +83,7 @@ export function registerViewResource(
                      throw new Error("Could not retrieve sources from model.");
                   }
                   const source = sources.find(
+                     // @ts-expect-error TODO: Fix missing Source type in API
                      (s: components["schemas"]["Source"]) =>
                         s.name === sourceName,
                   );

package/src/server.ts

@@ -13,11 +13,7 @@ import { PackageController } from "./controller/package.controller";
 import { QueryController } from "./controller/query.controller";
 import { ScheduleController } from "./controller/schedule.controller";
 import { WatchModeController } from "./controller/watch-mode.controller";
-import {
-   internalErrorToHttpError,
-   NotImplementedError,
-   PackageNotFoundError,
-} from "./errors";
+import { internalErrorToHttpError, NotImplementedError } from "./errors";
 import { logger, loggerMiddleware } from "./logger";
 import { initializeMcpServer } from "./mcp/server";
 import { ProjectStore } from "./service/project_store";
@@ -213,10 +209,14 @@ app.use(cors());
 app.use(bodyParser.json());
 
 app.get(`${API_PREFIX}/status`, async (_req, res) => {
-   res.status(200).json({
-      timestamp: Date.now(),
-      projects: await projectStore.listProjects(),
-   });
+   try {
+      const status = await projectStore.getStatus();
+      res.status(200).json(status);
+   } catch (error) {
+      logger.error("Error getting status", { error });
+      const { json, status } = internalErrorToHttpError(error as Error);
+      res.status(status).json(json);
+   }
 });
 
 app.get(`${API_PREFIX}/watch-mode/status`, watchModeController.getWatchStatus);
@@ -311,6 +311,20 @@ app.get(
    },
 );
 
+app.post(`${API_PREFIX}/connections/test`, async (req, res) => {
+   try {
+      const connectionStatus =
+         await connectionController.testConnectionConfiguration(
+            req.body.connectionConfig,
+         );
+      res.status(200).json(connectionStatus);
+   } catch (error) {
+      logger.error(error);
+      const { json, status } = internalErrorToHttpError(error as Error);
+      res.status(status).json(json);
+   }
+});
+
 app.get(
    `${API_PREFIX}/projects/:projectName/connections/:connectionName/test`,
    async (req, res) => {