@malloy-publisher/server 0.0.190 → 0.0.192

package/package.json

@@ -1,10 +1,10 @@
 {
    "name": "@malloy-publisher/server",
    "description": "Malloy Publisher Server",
-   "version": "0.0.190",
-   "main": "dist/server.js",
+   "version": "0.0.192",
+   "main": "dist/server.mjs",
    "bin": {
-      "malloy-publisher": "dist/server.js"
+      "malloy-publisher": "dist/server.mjs"
    },
    "repository": {
       "type": "git",
@@ -19,11 +19,11 @@
       "test:integration": "bun test --timeout 100000 tests",
       "build": "bun generate-api-types && bun build:app && NODE_ENV=production bun run build.ts",
       "build:server-only": "bun generate-api-types && NODE_ENV=production bun run build.ts",
-      "start": "NODE_ENV=production node ./dist/server.js",
-      "start:init": "NODE_ENV=production node ./dist/server.js --init",
+      "start": "NODE_ENV=production bun run ./dist/server.mjs",
+      "start:init": "NODE_ENV=production bun run ./dist/server.mjs --init",
       "start:dev": "NODE_ENV=development bun --watch src/server.ts",
       "start:dev:init": "NODE_ENV=development bun --watch src/server.ts --init",
-      "start:instrumented": "node --require ./dist/instrumentation.js ./dist/server.js",
+      "start:instrumented": "bun --preload ./dist/instrumentation.mjs ./dist/server.mjs",
       "lint": "bunx eslint \"./src/**/*.ts\"",
       "format": "bunx prettier --write '**/*.{ts,tsx}'",
       "build:app": "cd ../app && NODE_ENV=production bunx vite build",

package/src/mcp/prompts/handlers.ts

@@ -1,4 +1,4 @@
-import * as Handlebars from "handlebars";
+import Handlebars from "handlebars";
 import { z } from "zod";
 import {
    PromptMessageSchema,

package/src/server.ts

@@ -1,18 +1,14 @@
 // Pre-load the instrumentation module; the instrumentation module must be loaded before the other imports.
-import "./instrumentation";
-import {
-   getPrometheusMetricsHandler,
-   httpMetricsMiddleware,
-} from "./instrumentation";
-
 import { StreamableHTTPServerTransport } from "@modelcontextprotocol/sdk/server/streamableHttp.js";
-import * as bodyParser from "body-parser";
+import bodyParser from "body-parser";
 import cors from "cors";
 import express from "express";
 import * as http from "http";
 import { createProxyMiddleware } from "http-proxy-middleware";
 import { AddressInfo } from "net";
 import * as path from "path";
+import { ParsedQs } from "qs";
+import { fileURLToPath } from "url";
 import { CompileController } from "./controller/compile.controller";
 import { ConnectionController } from "./controller/connection.controller";
 import { DatabaseController } from "./controller/database.controller";
@@ -30,6 +26,11 @@ import {
    registerHealthEndpoints,
    registerSignalHandlers,
 } from "./health";
+import "./instrumentation";
+import {
+   getPrometheusMetricsHandler,
+   httpMetricsMiddleware,
+} from "./instrumentation";
 import { logger, loggerMiddleware } from "./logger";
 
 import { ManifestController } from "./controller/manifest.controller";
@@ -120,15 +121,10 @@ const SHUTDOWN_DRAIN_DURATION_SECONDS = Number(
 const SHUTDOWN_GRACEFUL_CLOSE_TIMEOUT_SECONDS = Number(
    process.env.SHUTDOWN_GRACEFUL_CLOSE_TIMEOUT_SECONDS || 0,
 );
-// Find the app directory - handle NPX vs local execution
-let ROOT: string;
-if (require.main) {
-   // Use the main module's directory (works for NPX and direct execution)
-   ROOT = path.join(path.dirname(require.main.filename), "app");
-} else {
-   // Fallback to current script directory
-   ROOT = path.join(path.dirname(process.argv[1] || __filename), "app");
-}
+// Find the app directory relative to this bundled server file.
+// Works under both ESM (import.meta.url) and when invoked via NPX.
+const __filename_esm = fileURLToPath(import.meta.url);
+const ROOT = path.join(path.dirname(__filename_esm), "app");
 const SERVER_ROOT = path.resolve(process.cwd(), process.env.SERVER_ROOT || ".");
 const API_PREFIX = "/api/v0";
 const isDevelopment = process.env["NODE_ENV"] === "development";
@@ -596,12 +592,21 @@ app.post(
    `${API_PREFIX}/projects/:projectName/connections/:connectionName/sqlQuery`,
    async (req, res) => {
       try {
+         let options: string | ParsedQs | (string | ParsedQs)[] | undefined;
+
+         // Support both body and query parameters for options for backwards compatibility
+         // TODO: To be removed in the future
+         if (req.body?.options) {
+            options = req.body.options;
+         } else {
+            options = req.query.options;
+         }
          res.status(200).json(
             await connectionController.getConnectionQueryData(
                req.params.projectName,
                req.params.connectionName,
                req.body.sqlStatement as string,
-               req.body.options as string,
+               options as string,
             ),
          );
       } catch (error) {

package/src/service/model.ts

@@ -22,7 +22,7 @@ import {
    MalloySQLParser,
    MalloySQLStatementType,
 } from "@malloydata/malloy-sql";
-import malloyPackage from "@malloydata/malloy/package.json";
+import { createRequire } from "module";
 import { DataStyles } from "@malloydata/render";
 import { metrics } from "@opentelemetry/api";
 import * as fs from "fs/promises";
@@ -45,9 +45,9 @@ import { BuildManifest } from "../storage/DatabaseInterface";
 import { URL_READER } from "../utils";
 import {
    buildFilterClause,
+   FilterValidationError,
    injectFilterRefinement,
    parseFilters,
-   FilterValidationError,
    type FilterDefinition,
    type FilterParams,
 } from "./filter";
@@ -65,7 +65,11 @@ export type PostgresConnection = components["schemas"]["PostgresConnection"];
 export type BigqueryConnection = components["schemas"]["BigqueryConnection"];
 export type TrinoConnection = components["schemas"]["TrinoConnection"];
 
-const MALLOY_VERSION = malloyPackage.version;
+const MALLOY_VERSION = (
+   createRequire(import.meta.url)("@malloydata/malloy/package.json") as {
+      version: string;
+   }
+).version;
 
 export type ModelType = "model" | "notebook";
 

package/src/storage/duckdb/DuckDBConnection.ts

@@ -1,5 +1,5 @@
 import { Mutex } from "async-mutex";
-import * as duckdb from "duckdb";
+import duckdb from "duckdb";
 import * as path from "path";
 import { DatabaseConnection } from "../DatabaseInterface";
 

package/tsconfig.json

@@ -2,7 +2,7 @@
    "compilerOptions": {
       "target": "ESNext", // Specifies the JavaScript version to target when transpiling code.
       "lib": ["ESNext", "DOM", "DOM.Iterable"], // Specifies the libraries available for the code.
-      "module": "CommonJS", // Defines the module system to use for code generation.
+      "module": "ESNext", // Emits ESM syntax; Bun bundler handles final module format.
       "skipLibCheck": true, // Skips type checking of declaration files.
       "useDefineForClassFields": true, // Enables the use of 'define' for class fields.
       "experimentalDecorators": true,