@malloy-publisher/server 0.0.161 → 0.0.165

package/src/service/model.ts

@@ -300,31 +300,68 @@ export class Model {
    }> {
       const startTime = performance.now();
       if (this.compilationError) {
-         throw this.compilationError;
+         // Re-throw MalloyError and ModelCompilationError as-is (they map to 400/424)
+         if (
+            this.compilationError instanceof MalloyError ||
+            this.compilationError instanceof ModelCompilationError
+         ) {
+            throw this.compilationError;
+         }
+         // For other compilation errors, wrap as BadRequestError (400)
+         throw new BadRequestError(
+            `Model compilation failed: ${this.compilationError.message}`,
+         );
       }
       let runnable: QueryMaterializer;
       if (!this.modelMaterializer || !this.modelDef || !this.modelInfo)
          throw new BadRequestError("Model has no queryable entities.");
-      if (!sourceName && !queryName && query) {
-         runnable = this.modelMaterializer.loadQuery("\n" + query);
-      } else if (queryName && !query) {
-         runnable = this.modelMaterializer.loadQuery(
-            `\nrun: ${sourceName ? sourceName + "->" : ""}${queryName}`,
-         );
-      } else {
-         const endTime = performance.now();
-         const executionTime = endTime - startTime;
-         this.queryExecutionHistogram.record(executionTime, {
-            "malloy.model.path": this.modelPath,
-            "malloy.model.query.name": queryName,
-            "malloy.model.query.source": sourceName,
-            "malloy.model.query.query": query,
-            "malloy.model.query.status": "error",
+
+      // Wrap loadQuery calls in try-catch to handle query parsing errors
+      try {
+         if (!sourceName && !queryName && query) {
+            runnable = this.modelMaterializer.loadQuery("\n" + query);
+         } else if (queryName && !query) {
+            runnable = this.modelMaterializer.loadQuery(
+               `\nrun: ${sourceName ? sourceName + "->" : ""}${queryName}`,
+            );
+         } else {
+            const endTime = performance.now();
+            const executionTime = endTime - startTime;
+            this.queryExecutionHistogram.record(executionTime, {
+               "malloy.model.path": this.modelPath,
+               "malloy.model.query.name": queryName,
+               "malloy.model.query.source": sourceName,
+               "malloy.model.query.query": query,
+               "malloy.model.query.status": "error",
+            });
+            throw new BadRequestError(
+               "Invalid query request. (Query AND !sourceName) OR (queryName AND sourceName) must be defined.",
+            );
+         }
+      } catch (error) {
+         // Re-throw BadRequestError as-is
+         if (error instanceof BadRequestError) {
+            throw error;
+         }
+         // Re-throw MalloyError as-is (maps to 400)
+         if (error instanceof MalloyError) {
+            throw error;
+         }
+         // For other query parsing errors, wrap as BadRequestError
+         const errorMessage =
+            error instanceof Error ? error.message : String(error);
+         logger.error("Query parsing error", {
+            error,
+            errorMessage,
+            projectName: this.packageName,
+            modelPath: this.modelPath,
+            query,
+            queryName,
+            sourceName,
          });
-         throw new BadRequestError(
-            "Invalid query request. (Query AND !sourceName) OR (queryName AND sourceName) must be defined.",
-         );
+         throw new BadRequestError(`Invalid query: ${errorMessage}`);
       }
+
       const rowLimit =
          (await runnable.getPreparedResult()).resultExplore.limit || ROW_LIMIT;
       const endTime = performance.now();

package/src/service/project_store.ts

@@ -24,6 +24,7 @@ import {
    PackageNotFoundError,
    ProjectNotFoundError,
 } from "../errors";
+import { getOperationalState, markNotReady, markReady } from "../health";
 import { formatDuration, logger } from "../logger";
 import { Connection } from "../storage/DatabaseInterface";
 import { StorageConfig, StorageManager } from "../storage/StorageManager";
@@ -188,11 +189,13 @@ export class ProjectStore {
          }
 
          this.isInitialized = true;
+         markReady();
          const initializationDuration = performance.now() - initialTime;
          logger.info(
             `Project store successfully initialized in ${formatDuration(initializationDuration)}`,
          );
       } catch (error) {
+         markNotReady();
          logger.error("Error initializing project store", { error });
          process.exit(1);
       }
@@ -572,6 +575,8 @@ export class ProjectStore {
          projects: [] as Array<components["schemas"]["Project"]>,
          initialized: this.isInitialized,
          frozenConfig: isPublisherConfigFrozen(this.serverRootPath),
+         operationalState:
+            getOperationalState() as components["schemas"]["ServerStatus"]["operationalState"],
       };
 
       const projects = await this.listProjects(true);

package/dist/app/assets/HomePage-CgSTNEQW.js

@@ -1 +0,0 @@
-import{t as o,j as a,Q as e}from"./index-BoduKqUa.js";function n(){const t=o();return a.jsx(e,{onClickProject:t})}export{n as default};

package/dist/app/assets/PackagePage-BHvPFsmZ.js

@@ -1 +0,0 @@
-import{p as n,t,j as e,A as c,J as o}from"./index-BoduKqUa.js";function l(){const{projectName:s,packageName:a}=n(),r=t();if(s)if(a){const i=c({projectName:s,packageName:a});return e.jsx(o,{onClickPackageFile:r,resourceUri:i})}else return e.jsx("div",{children:e.jsx("h2",{children:"Missing package name"})});else return e.jsx("div",{children:e.jsx("h2",{children:"Missing project name"})})}export{l as default};

package/dist/app/assets/ProjectPage-ndnv5nGp.js

@@ -1 +0,0 @@
-import{t as a,p as n,j as e,A as c,E as o}from"./index-BoduKqUa.js";function j(){const t=a(),{projectName:s}=n();if(s){const r=c({projectName:s});return e.jsx(o,{onSelectPackage:t,resourceUri:r})}else return e.jsx("div",{children:e.jsx("h2",{children:"Missing project name"})})}export{j as default};

package/dist/app/assets/RouteError-CZC9OOKh.js

@@ -1 +0,0 @@
-import{F as o,j as r,z as s,S as n,q as t,T as a}from"./index-BoduKqUa.js";function x(){const e=o();return console.error(e),r.jsx(s,{maxWidth:"lg",component:"main",sx:{display:"flex",flexDirection:"column",my:2,gap:0},children:r.jsxs(n,{sx:{m:"auto",flexDirection:"column"},children:[r.jsx(t,{sx:{height:"300px"}}),r.jsx("img",{src:"/error.png"}),r.jsx(a,{variant:"subtitle1",children:"An unexpected error occurred"})]})})}export{x as default};