@malloy-publisher/server 0.0.126 → 0.0.128

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@malloy-publisher/server",
   "description": "Malloy Publisher Server",
-  "version": "0.0.126",
+  "version": "0.0.128",
   "main": "dist/server.js",
   "bin": {
     "malloy-publisher": "dist/server.js"

package/src/dto/connection.dto.ts

@@ -1,12 +1,12 @@
-import "reflect-metadata";
+import { Type } from "class-transformer";
 import {
-   IsOptional,
-   IsString,
    IsEnum,
    IsNumber,
+   IsOptional,
+   IsString,
    ValidateNested,
 } from "class-validator";
-import { Type } from "class-transformer";
+import "reflect-metadata";
 import { ApiConnection } from "../service/model";
 
 export class PostgresConnectionDto {
@@ -137,6 +137,10 @@ export class TrinoConnectionDto {
    @IsOptional()
    @IsString()
    password?: string;
+
+   @IsOptional()
+   @IsString()
+   peakaKey?: string;
 }
 
 export class ConnectionDto implements ApiConnection {

package/src/service/connection.ts

@@ -37,29 +37,46 @@ function validateAndBuildTrinoConfig(
       trinoConfig.server = `${trinoConfig.server}:${trinoConfig.port}`;
    }
 
-   if (trinoConfig.server?.startsWith("http://")) {
-      return {
-         server: trinoConfig.server,
-         port: trinoConfig.port,
-         catalog: trinoConfig.catalog,
-         schema: trinoConfig.schema,
-         user: trinoConfig.user,
+   // Build base config
+   const baseConfig: {
+      server: string;
+      port?: number;
+      catalog?: string;
+      schema?: string;
+      user?: string;
+      password?: string;
+      extraConfig?: Record<string, unknown>;
+   } = {
+      server: trinoConfig.server,
+      port: trinoConfig.port,
+      catalog: trinoConfig.catalog,
+      schema: trinoConfig.schema,
+      user: trinoConfig.user,
+   };
+
+   if (trinoConfig.peakaKey) {
+      baseConfig.extraConfig = {
+         extraCredential: {
+            peakaKey: trinoConfig.peakaKey,
+         },
       };
+      delete baseConfig.password;
    } else if (
       trinoConfig.server?.startsWith("https://") &&
       trinoConfig.password
    ) {
-      return {
-         server: trinoConfig.server,
-         port: trinoConfig.port,
-         catalog: trinoConfig.catalog,
-         schema: trinoConfig.schema,
-         user: trinoConfig.user,
-         password: trinoConfig.password,
-      };
+      // Only add password if no peakaKey and HTTPS connection
+      baseConfig.password = trinoConfig.password;
+   }
+
+   if (trinoConfig.server?.startsWith("http://")) {
+      delete baseConfig.password;
+      return baseConfig;
+   } else if (trinoConfig.server?.startsWith("https://")) {
+      return baseConfig;
    } else {
       throw new Error(
-         `Invalid Trino connection: expected "http://server:port" (no password) or "https://server:port" (with username and password).`,
+         `Invalid Trino connection: expected "http://server:port" or "https://server:port".`,
       );
    }
 }

package/src/service/db_utils.ts

@@ -313,7 +313,13 @@ export async function getTablesForSchema(
    // Fetch all table sources in parallel
    const tableSourcePromises = tableNames.map(async (tableName) => {
       try {
-         const tablePath = `${schemaName}.${tableName}`;
+         let tablePath: string;
+
+         if (connection.type === "trino") {
+            tablePath = `${connection.trinoConnection?.catalog}.${schemaName}.${tableName}`;
+         } else {
+            tablePath = `${schemaName}.${tableName}`;
+         }
 
          logger.info(
             `Processing table: ${tableName} in schema: ${schemaName}`,

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

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