@malloy-publisher/server 0.2.5 → 0.2.6

package/dist/app/api-doc.yaml

@@ -731,6 +731,8 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/Table"
+        "400":
+          $ref: "#/components/responses/BadRequest"
         "401":
           $ref: "#/components/responses/Unauthorized"
         "404":
@@ -779,6 +781,8 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/SqlSource"
+        "400":
+          $ref: "#/components/responses/BadRequest"
         "401":
           $ref: "#/components/responses/Unauthorized"
         "404":
@@ -1089,6 +1093,8 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/Table"
+        "400":
+          $ref: "#/components/responses/BadRequest"
         "401":
           $ref: "#/components/responses/Unauthorized"
         "404":
@@ -1143,6 +1149,8 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/SqlSource"
+        "400":
+          $ref: "#/components/responses/BadRequest"
         "401":
           $ref: "#/components/responses/Unauthorized"
         "404":
@@ -5347,12 +5355,34 @@ components:
       type: object
       description: Standard error response format
       properties:
+        code:
+          type: integer
+          description: HTTP status code, repeated in the body for convenience
         message:
           type: string
           description: Human-readable error message describing what went wrong
         details:
           type: string
           description: Additional error details or context
+        reason:
+          type: string
+          description: |
+            Machine-readable discriminator, for callers that must branch on
+            which error they got rather than on prose. Absent unless a caller is
+            expected to act on it, so treat absence as "no special handling".
+
+            TABLE_NOT_FOUND distinguishes a table that is not in the database
+            from the other conditions that also answer 404 on these routes --
+            an environment or connection this server does not host. The former
+            says nothing about whether the caller reached the right server; the
+            latter is a routing problem worth retrying elsewhere.
+
+            Deliberately an open string rather than an enum. Generators render
+            an enum closed, so adding a second value here would break every
+            client generated before it -- on the one field whose purpose is to
+            grow. Callers must treat an unrecognized value as absent.
+
+            Known values: TABLE_NOT_FOUND.
       required:
         - message
 

package/dist/package_load_worker.mjs

@@ -2375,6 +2375,8 @@ function internalErrorToHttpError(error) {
     return httpError(404, error.message);
   } else if (error instanceof MalloyError) {
     return httpError(400, error.message);
+  } else if (error instanceof TableNotFoundError) {
+    return httpError(404, error.message, "TABLE_NOT_FOUND");
   } else if (error instanceof ConnectionNotFoundError) {
     return httpError(404, error.message);
   } else if (error instanceof DestinationNotFoundError) {
@@ -2407,16 +2409,17 @@ function internalErrorToHttpError(error) {
     return httpError(500, error.message);
   }
 }
-function httpError(code, message) {
+function httpError(code, message, reason) {
   return {
     status: code,
     json: {
       code,
-      message
+      message,
+      ...reason ? { reason } : {}
     }
   };
 }
-var NotImplementedError, BadRequestError, InvalidArgumentError, EnvironmentNotFoundError, PackageNotFoundError, ModelNotFoundError, DashboardNotFoundError, ConnectionNotFoundError, ConnectionError, DestinationNotFoundError, ConnectionAuthError, UnsupportedCatalogFormatError, ModelCompilationError, MaterializationEligibilityError, PublisherConfigError, FrozenConfigError, AccessDeniedError, NotQueryableError, MaterializationNotFoundError, MaterializationConflictError, InvalidStateTransitionError, ServiceUnavailableError, PayloadTooLargeError, ResponseUnserializableError, QueryTimeoutError;
+var NotImplementedError, BadRequestError, InvalidArgumentError, EnvironmentNotFoundError, PackageNotFoundError, ModelNotFoundError, DashboardNotFoundError, ConnectionNotFoundError, TableNotFoundError, ConnectionError, DestinationNotFoundError, ConnectionAuthError, UnsupportedCatalogFormatError, ModelCompilationError, MaterializationEligibilityError, PublisherConfigError, FrozenConfigError, AccessDeniedError, NotQueryableError, MaterializationNotFoundError, MaterializationConflictError, InvalidStateTransitionError, ServiceUnavailableError, PayloadTooLargeError, ResponseUnserializableError, QueryTimeoutError;
 var init_errors = __esm(() => {
   init_constants();
   NotImplementedError = class NotImplementedError extends Error {
@@ -2456,6 +2459,11 @@ var init_errors = __esm(() => {
       super(message);
     }
   };
+  TableNotFoundError = class TableNotFoundError extends Error {
+    constructor(message) {
+      super(message);
+    }
+  };
   ConnectionError = class ConnectionError extends Error {
     constructor(message) {
       super(message);

package/dist/server.mjs

@@ -156558,6 +156558,8 @@ function internalErrorToHttpError(error) {
     return httpError(404, error.message);
   } else if (error instanceof MalloyError) {
     return httpError(400, error.message);
+  } else if (error instanceof TableNotFoundError) {
+    return httpError(404, error.message, "TABLE_NOT_FOUND");
   } else if (error instanceof ConnectionNotFoundError) {
     return httpError(404, error.message);
   } else if (error instanceof DestinationNotFoundError) {
@@ -156590,16 +156592,17 @@ function internalErrorToHttpError(error) {
     return httpError(500, error.message);
   }
 }
-function httpError(code, message) {
+function httpError(code, message, reason) {
   return {
     status: code,
     json: {
       code,
-      message
+      message,
+      ...reason ? { reason } : {}
     }
   };
 }
-var NotImplementedError, BadRequestError, InvalidArgumentError, EnvironmentNotFoundError, PackageNotFoundError, ModelNotFoundError, DashboardNotFoundError, ConnectionNotFoundError, ConnectionError, DestinationNotFoundError, ConnectionAuthError, UnsupportedCatalogFormatError, ModelCompilationError, MaterializationEligibilityError, PublisherConfigError, FrozenConfigError, AccessDeniedError, NotQueryableError, MaterializationNotFoundError, MaterializationConflictError, InvalidStateTransitionError, ServiceUnavailableError, PayloadTooLargeError, ResponseUnserializableError, QueryTimeoutError;
+var NotImplementedError, BadRequestError, InvalidArgumentError, EnvironmentNotFoundError, PackageNotFoundError, ModelNotFoundError, DashboardNotFoundError, ConnectionNotFoundError, TableNotFoundError, ConnectionError, DestinationNotFoundError, ConnectionAuthError, UnsupportedCatalogFormatError, ModelCompilationError, MaterializationEligibilityError, PublisherConfigError, FrozenConfigError, AccessDeniedError, NotQueryableError, MaterializationNotFoundError, MaterializationConflictError, InvalidStateTransitionError, ServiceUnavailableError, PayloadTooLargeError, ResponseUnserializableError, QueryTimeoutError;
 var init_errors = __esm(() => {
   init_constants();
   NotImplementedError = class NotImplementedError extends Error {
@@ -156639,6 +156642,11 @@ var init_errors = __esm(() => {
       super(message);
     }
   };
+  TableNotFoundError = class TableNotFoundError extends Error {
+    constructor(message) {
+      super(message);
+    }
+  };
   ConnectionError = class ConnectionError extends Error {
     constructor(message) {
       super(message);
@@ -234644,14 +234652,14 @@ var init_connection = __esm(() => {
           });
           const result2 = await super.fetchTableSchema(tableKey, azureUrl);
           if (!result2) {
-            throw new Error(`Azure file not found: ${azureUrl}`);
+            throw new TableNotFoundError(`Azure file not found: ${azureUrl}`);
           }
           return result2;
         }
       }
       const result = await super.fetchTableSchema(tableKey, tablePath);
       if (!result) {
-        throw new Error(`Table ${tablePath} not found`);
+        throw new TableNotFoundError(`Table ${tablePath} not found`);
       }
       return result;
     }
@@ -234703,13 +234711,13 @@ var init_connection = __esm(() => {
         });
         const result2 = await super.fetchTableSchema(tableKey, prefixedPath);
         if (!result2) {
-          throw new Error(`Table ${prefixedPath} not found in connection ${this.connectionName}`);
+          throw new TableNotFoundError(`Table ${prefixedPath} not found in connection ${this.connectionName}`);
         }
         return result2;
       }
       const result = await super.fetchTableSchema(tableKey, tablePath);
       if (!result) {
-        throw new Error(`Table ${tablePath} not found in connection ${this.connectionName}`);
+        throw new TableNotFoundError(`Table ${tablePath} not found in connection ${this.connectionName}`);
       }
       return result;
     }
@@ -277549,6 +277557,26 @@ function validateAdminAuthoredConnection(connectionName, connectionConfig) {
     }
   }
 }
+var BIGQUERY_NOT_FOUND = /^Not found: (Table|Dataset)\b/;
+var BIGQUERY_IMPROPER_PATH = /^Improper table path\b/;
+var DUCKDB_TABLE_NOT_FOUND = /^Catalog Error: Table with name .+ does not exist/;
+var DUCKDB_CATALOG_NOT_FOUND = /^Binder Error: Catalog .+ does not exist/;
+function driverErrorToPublisherError(message) {
+  if (BIGQUERY_NOT_FOUND.test(message) || DUCKDB_TABLE_NOT_FOUND.test(message) || DUCKDB_CATALOG_NOT_FOUND.test(message)) {
+    return new TableNotFoundError(message);
+  }
+  if (BIGQUERY_IMPROPER_PATH.test(message)) {
+    return new InvalidArgumentError(message);
+  }
+  return new ConnectionError(message);
+}
+function classifyDriverFailure(error) {
+  if (error instanceof TableNotFoundError || error instanceof InvalidArgumentError) {
+    return error;
+  }
+  const message = error instanceof Error ? error.message : typeof error === "string" ? error : JSON.stringify(error);
+  return driverErrorToPublisherError(message);
+}
 
 class ConnectionController {
   environmentStore;
@@ -277615,10 +277643,10 @@ class ConnectionController {
     try {
       const source = await malloyConnection.fetchTableSchema(tableKey, tablePath);
       if (!source) {
-        throw new ConnectionError(`Table ${tablePath} not found`);
+        throw new TableNotFoundError(`Table ${tablePath} not found`);
       }
       if (typeof source === "string") {
-        throw new ConnectionError(source);
+        throw driverErrorToPublisherError(source);
       }
       return {
         source: JSON.stringify(source),
@@ -277629,13 +277657,21 @@ class ConnectionController {
         }))
       };
     } catch (error) {
-      const errorMessage = error instanceof Error ? error.message : typeof error === "string" ? error : JSON.stringify(error);
+      const classified = classifyDriverFailure(error);
+      if (!(classified instanceof ConnectionError)) {
+        logger.warn("table not resolvable", {
+          tableKey,
+          tablePath,
+          reason: classified.constructor.name
+        });
+        throw classified;
+      }
       logger.error("fetchTableSchema error", {
         error,
         tableKey,
         tablePath
       });
-      throw new ConnectionError(errorMessage);
+      throw classified;
     }
   }
   async getConnection(environmentName, connectionName) {
@@ -277669,13 +277705,13 @@ class ConnectionController {
         selectStr: sqlStatement
       });
       if (typeof schema === "string") {
-        throw new ConnectionError(schema);
+        throw driverErrorToPublisherError(schema);
       }
       return {
         source: JSON.stringify(schema)
       };
     } catch (error) {
-      throw new ConnectionError(error.message);
+      throw classifyDriverFailure(error);
     }
   }
   async getTable(environmentName, connectionName, schemaName, tablePath, packageName) {

package/package.json

@@ -1,7 +1,7 @@
 {
    "name": "@malloy-publisher/server",
    "description": "Malloy Publisher Server",
-   "version": "0.2.5",
+   "version": "0.2.6",
    "main": "dist/server.mjs",
    "bin": {
       "malloy-publisher": "dist/server.mjs"