@malloydata/db-trino 0.0.359 → 0.0.360

package/dist/index.js

@@ -31,20 +31,37 @@ var trino_executor_1 = require("./trino_executor");
 Object.defineProperty(exports, "TrinoExecutor", { enumerable: true, get: function () { return trino_executor_1.TrinoExecutor; } });
 const malloy_1 = require("@malloydata/malloy");
 const trino_connection_2 = require("./trino_connection");
-function configToTrinoConfig(config) {
+const trinoPassThroughKeys = [
+    'ssl',
+    'session',
+    'extraCredential',
+    'extraHeaders',
+];
+function configToBaseConfig(config) {
     return {
-        name: config.name,
-        trinoConfig: {
-            server: typeof config['server'] === 'string' ? config['server'] : undefined,
-            port: typeof config['port'] === 'number' ? config['port'] : undefined,
-            catalog: typeof config['catalog'] === 'string' ? config['catalog'] : undefined,
-            schema: typeof config['schema'] === 'string' ? config['schema'] : undefined,
-            user: typeof config['user'] === 'string' ? config['user'] : undefined,
-            password: typeof config['password'] === 'string' ? config['password'] : undefined,
-            setupSQL: typeof config['setupSQL'] === 'string' ? config['setupSQL'] : undefined,
-        },
+        server: typeof config['server'] === 'string' ? config['server'] : undefined,
+        port: typeof config['port'] === 'number' ? config['port'] : undefined,
+        catalog: typeof config['catalog'] === 'string' ? config['catalog'] : undefined,
+        schema: typeof config['schema'] === 'string' ? config['schema'] : undefined,
+        user: typeof config['user'] === 'string' ? config['user'] : undefined,
+        password: typeof config['password'] === 'string' ? config['password'] : undefined,
+        setupSQL: typeof config['setupSQL'] === 'string' ? config['setupSQL'] : undefined,
+        source: typeof config['source'] === 'string' ? config['source'] : undefined,
     };
 }
+function configToTrinoConfig(config) {
+    const base = configToBaseConfig(config);
+    const extraConfig = {};
+    for (const key of trinoPassThroughKeys) {
+        if (config[key] !== undefined) {
+            extraConfig[key] = config[key];
+        }
+    }
+    if (Object.keys(extraConfig).length > 0) {
+        base.extraConfig = extraConfig;
+    }
+    return base;
+}
 const trinoProperties = [
     { name: 'server', displayName: 'Server', type: 'string', optional: true },
     { name: 'port', displayName: 'Port', type: 'number', optional: true },
@@ -59,21 +76,69 @@ const trinoProperties = [
         optional: true,
         description: 'SQL statements to run when the connection is established',
     },
+    {
+        name: 'source',
+        displayName: 'Source',
+        type: 'string',
+        optional: true,
+        description: 'Source name for the Trino client',
+    },
+    {
+        name: 'ssl',
+        displayName: 'SSL',
+        type: 'json',
+        optional: true,
+        description: 'TLS/SSL configuration (e.g. {"rejectUnauthorized": false})',
+    },
+    {
+        name: 'session',
+        displayName: 'Session',
+        type: 'json',
+        optional: true,
+        description: 'Session properties as key-value pairs',
+    },
+    {
+        name: 'extraCredential',
+        displayName: 'Extra Credential',
+        type: 'json',
+        optional: true,
+        description: 'Extra credentials as key-value pairs',
+    },
+    {
+        name: 'extraHeaders',
+        displayName: 'Extra Headers',
+        type: 'json',
+        optional: true,
+        description: 'Additional HTTP headers as key-value pairs',
+    },
+];
+const prestoProperties = [
+    { name: 'server', displayName: 'Server', type: 'string', optional: true },
+    { name: 'port', displayName: 'Port', type: 'number', optional: true },
+    { name: 'catalog', displayName: 'Catalog', type: 'string', optional: true },
+    { name: 'schema', displayName: 'Schema', type: 'string', optional: true },
+    { name: 'user', displayName: 'User', type: 'string', optional: true },
+    { name: 'password', displayName: 'Password', type: 'password', optional: true },
+    {
+        name: 'setupSQL',
+        displayName: 'Setup SQL',
+        type: 'text',
+        optional: true,
+        description: 'SQL statements to run when the connection is established',
+    },
 ];
 (0, malloy_1.registerConnectionType)('trino', {
     displayName: 'Trino',
     factory: async (config) => {
-        const { name, trinoConfig } = configToTrinoConfig(config);
-        return new trino_connection_2.TrinoConnection(name, undefined, trinoConfig);
+        return new trino_connection_2.TrinoConnection(config.name, undefined, configToTrinoConfig(config));
     },
     properties: trinoProperties,
 });
 (0, malloy_1.registerConnectionType)('presto', {
     displayName: 'Presto',
     factory: async (config) => {
-        const { name, trinoConfig } = configToTrinoConfig(config);
-        return new trino_connection_2.PrestoConnection(name, undefined, trinoConfig);
+        return new trino_connection_2.PrestoConnection(config.name, undefined, configToBaseConfig(config));
     },
-    properties: trinoProperties,
+    properties: prestoProperties,
 });
 //# sourceMappingURL=index.js.map

package/dist/trino_connection.d.ts

@@ -1,7 +1,6 @@
 import type { ConnectionConfig, MalloyQueryData, PersistSQLResults, QueryData, QueryOptionsReader, QueryRunStats, RunSQLOptions, StructDef, TableSourceDef, SQLSourceDef, AtomicTypeDef, Dialect, FieldDef, TestableConnection, SQLSourceRequest } from '@malloydata/malloy';
 import { TrinoDialect } from '@malloydata/malloy';
 import { BaseConnection } from '@malloydata/malloy/connection';
-import type { ConnectionOptions } from 'trino-client';
 export interface TrinoManagerOptions {
     credentials?: {
         clientId: string;
@@ -11,6 +10,7 @@ export interface TrinoManagerOptions {
     projectId?: string | undefined;
     userAgent: string;
 }
+export type TrinoExtraConfigKey = 'ssl' | 'session' | 'extraCredential' | 'extraHeaders';
 export interface TrinoConnectionConfiguration {
     server?: string;
     port?: number;
@@ -19,7 +19,8 @@ export interface TrinoConnectionConfiguration {
     user?: string;
     password?: string;
     setupSQL?: string;
-    extraConfig?: Partial<Omit<ConnectionOptions, keyof TrinoConnectionConfiguration>>;
+    source?: string;
+    extraConfig?: Partial<Record<TrinoExtraConfigKey, unknown>>;
 }
 export type TrinoConnectionOptions = ConnectionConfig;
 export interface BaseRunner {

package/dist/trino_connection.js

@@ -89,6 +89,7 @@ class TrinoRunner {
         }
         this.client = trino_client_1.Trino.create({
             ...config.extraConfig,
+            source: config.source,
             catalog: config.catalog,
             server,
             schema: config.schema,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@malloydata/db-trino",
-  "version": "0.0.359",
+  "version": "0.0.360",
   "license": "MIT",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -22,7 +22,7 @@
     "prepublishOnly": "npm run build"
   },
   "dependencies": {
-    "@malloydata/malloy": "0.0.359",
+    "@malloydata/malloy": "0.0.360",
     "@prestodb/presto-js-client": "^1.0.0",
     "gaxios": "^4.2.0",
     "luxon": "^3.5.0",