@deepnote/database-integrations 1.0.0 → 1.1.1

package/dist/index.js

@@ -1,4 +1,3 @@
-import buildUrl from "build-url-ts";
 import { z } from "zod";
 
 //#region src/sql-integration-auth-methods.ts
@@ -39,30 +38,35 @@ function isFederatedAuthMetadata(metadata) {
 
 //#endregion
 //#region src/snowflake-integration-env-vars.ts
+/**
+* Build a URL with path and query parameters using native URL API
+*/
+function buildUrl(baseUrl, options) {
+	const url = new URL(baseUrl.replace(/^(\w+):\/\//, "http://"));
+	if (options.path) url.pathname = options.path;
+	if (options.queryParams) {
+		for (const [key, value] of Object.entries(options.queryParams)) if (value !== void 0) url.searchParams.set(key, value);
+	}
+	return url.href.replace(/^http:\/\//, baseUrl.match(/^(\w+):\/\//)?.[0] || "http://");
+}
 function getSnowflakeSqlAlchemyInput(metadata, params) {
 	if (isFederatedAuthMetadata(metadata)) return null;
 	const { username, accountName, database, authMethod } = metadata;
-	if (authMethod === SnowflakeAuthMethods.ServiceAccountKeyPair) {
-		const url$1 = buildUrl(`snowflake://${encodeURIComponent(username)}@${encodeURIComponent(accountName)}`, {
-			path: database,
-			queryParams: {
-				...createBaseQueryParams(metadata, params.snowflakePartnerIdentifier),
-				authenticator: "snowflake_jwt"
-			}
-		});
-		if (!url$1) throw new Error("getSnowflakeEnvVar URL must be defined");
-		return createSqlAlchemyInputFromUrl(url$1, {
-			privateKey: metadata.privateKey,
-			password: metadata.privateKeyPassphrase,
-			username: metadata.username
-		});
-	}
-	const url = buildUrl(`snowflake://${encodeURIComponent(username)}:${encodeURIComponent(metadata.password)}@${encodeURIComponent(accountName)}`, {
+	if (authMethod === SnowflakeAuthMethods.ServiceAccountKeyPair) return createSqlAlchemyInputFromUrl(buildUrl(`snowflake://${encodeURIComponent(username)}@${encodeURIComponent(accountName)}`, {
 		path: database,
-		queryParams: { ...createBaseQueryParams(metadata, params.snowflakePartnerIdentifier) }
+		queryParams: {
+			...createBaseQueryParams(metadata, params.snowflakePartnerIdentifier),
+			authenticator: "snowflake_jwt"
+		}
+	}), {
+		privateKey: metadata.privateKey,
+		password: metadata.privateKeyPassphrase,
+		username: metadata.username
 	});
-	if (!url) throw new Error("getSnowflakeEnvVar URL must be defined");
-	return createSqlAlchemyInputFromUrl(url);
+	return createSqlAlchemyInputFromUrl(buildUrl(`snowflake://${encodeURIComponent(username)}:${encodeURIComponent(metadata.password)}@${encodeURIComponent(accountName)}`, {
+		path: database,
+		queryParams: { ...createBaseQueryParams(metadata, params.snowflakePartnerIdentifier) }
+	}));
 }
 function createBaseQueryParams(metadata, snowflakePartnerIdentifier) {
 	return {
@@ -75,8 +79,8 @@ function createSqlAlchemyInputFromUrl(url, keyPair) {
 	return {
 		url,
 		params: keyPair ? {
-			snowflake_private_key: Buffer.from(keyPair.privateKey).toString("base64"),
-			snowflake_private_key_passphrase: keyPair.password || void 0
+			snowflake_private_key: btoa(keyPair.privateKey),
+			...keyPair.password ? { snowflake_private_key_passphrase: keyPair.password } : {}
 		} : {},
 		param_style: "pyformat"
 	};
@@ -84,10 +88,10 @@ function createSqlAlchemyInputFromUrl(url, keyPair) {
 
 //#endregion
 //#region src/database-integration-env-vars.ts
-function getIntegrationListEnv(sqlIntegrations, params) {
+function getEnvironmentVariablesForIntegrations(integrations, params) {
 	const envVars = [];
 	const errors = [];
-	sqlIntegrations.forEach((integration) => {
+	integrations.forEach((integration) => {
 		const namePrefix = convertToEnvironmentVariableName(integration.name);
 		const envVarsForThisIntegration = Object.entries(integration.metadata).map(([key, rawValue]) => {
 			const name = `${namePrefix}_${key.toUpperCase()}`;
@@ -114,11 +118,6 @@ function getIntegrationListEnv(sqlIntegrations, params) {
 		errors
 	};
 }
-const duckDbEnvVar = {
-	url: `deepnote+duckdb:///:memory:`,
-	params: {},
-	param_style: "qmark"
-};
 function addSslOptionsToMongoConnectionString(projectRoot, connectionString, integrationId, metadata) {
 	const [base, paramString] = connectionString.split("?");
 	const params = new URLSearchParams(paramString);
@@ -137,7 +136,7 @@ function getEnvVarForSqlCells(integration, params) {
 	const sqlAlchemyInput = getSqlAlchemyInput(integration, params);
 	if (!sqlAlchemyInput) return null;
 	return {
-		name: convertToEnvironmentVariableName(getSqlEnvVarName(integration.id)),
+		name: getSqlEnvVarName(integration.id),
 		value: JSON.stringify({
 			integration_id: integration.id,
 			...sqlAlchemyInput
@@ -168,7 +167,11 @@ function getSqlAlchemyInput(integration, params) {
 		case "mindsdb":
 		case "mysql": return getMySqlSqlAlchemyInput(integration.id, params.projectRootDirectory, integration.metadata);
 		case "materialize": return getMaterializePostgresSqlAlchemyInput(integration.id, params.projectRootDirectory, integration.metadata);
-		case "pandas-dataframe": return { ...duckDbEnvVar };
+		case "pandas-dataframe": return {
+			url: `deepnote+duckdb:///:memory:`,
+			params: {},
+			param_style: "qmark"
+		};
 		case "redshift": return getRedshiftSqlAlchemyInput(integration.id, params.projectRootDirectory, integration.metadata);
 		case "snowflake": return getSnowflakeSqlAlchemyInput(integration.metadata, { snowflakePartnerIdentifier: params.snowflakePartnerIdentifier });
 		case "spanner": return getSpannerSqlAlchemyInput(integration.metadata);
@@ -187,7 +190,7 @@ const getDatabricksSqlAlchemyInput = ({ httpPath, host, token, port, schema, cat
 		} },
 		param_style: "pyformat",
 		ssh_options: {
-			enabled: String(sshEnabled),
+			enabled: sshEnabled == null ? void 0 : String(sshEnabled),
 			host: sshHost,
 			port: sshPort,
 			user: sshUser
@@ -195,7 +198,7 @@ const getDatabricksSqlAlchemyInput = ({ httpPath, host, token, port, schema, cat
 	};
 };
 const getDremioSqlAlchemyInput = ({ port, host, token, schema, sshEnabled, sshHost, sshPort, sshUser }) => {
-	const url = new URL(`dremio+flight://${host}:${port}${schema ? "/" + schema : ""}`);
+	const url = new URL(`dremio+flight://${host}:${port}${schema ? `/${schema}` : ""}`);
 	url.searchParams.set("UseEncryption", "true");
 	url.searchParams.set("Token", token);
 	return {
@@ -203,7 +206,7 @@ const getDremioSqlAlchemyInput = ({ port, host, token, schema, sshEnabled, sshHo
 		params: {},
 		param_style: "pyformat",
 		ssh_options: {
-			enabled: String(sshEnabled),
+			enabled: sshEnabled == null ? void 0 : String(sshEnabled),
 			host: sshHost,
 			port: sshPort,
 			user: sshUser
@@ -217,7 +220,7 @@ const getSQLServerVar = ({ user, password, host, port, database, sshEnabled, ssh
 		params: {},
 		param_style: "pyformat",
 		ssh_options: {
-			enabled: String(sshEnabled),
+			enabled: sshEnabled == null ? void 0 : String(sshEnabled),
 			host: sshHost,
 			port: sshPort,
 			user: sshUser
@@ -243,7 +246,7 @@ const getPostgresSqlAlchemyInput = (integrationId, projectRootDirectory, { user,
 		} },
 		param_style: "pyformat",
 		ssh_options: {
-			enabled: String(sshEnabled),
+			enabled: sshEnabled == null ? void 0 : String(sshEnabled),
 			host: sshHost,
 			port: sshPort,
 			user: sshUser
@@ -271,7 +274,7 @@ const getRedshiftSqlAlchemyInput = (integrationId, projectRootDirectory, metadat
 		} },
 		param_style: "pyformat",
 		ssh_options: {
-			enabled: String(metadata.sshEnabled),
+			enabled: metadata.sshEnabled == null ? void 0 : String(metadata.sshEnabled),
 			host: metadata.sshHost,
 			port: metadata.sshPort,
 			user: metadata.sshUser
@@ -303,7 +306,7 @@ const getMaterializePostgresSqlAlchemyInput = (integrationId, projectRootDirecto
 		} },
 		param_style: "pyformat",
 		ssh_options: {
-			enabled: String(sshEnabled),
+			enabled: sshEnabled == null ? void 0 : String(sshEnabled),
 			host: sshHost,
 			port: sshPort,
 			user: sshUser
@@ -356,7 +359,7 @@ const getClickHouseSqlAlchemyInput = (integrationId, projectRootDirectory, { use
 		params: {},
 		param_style: "pyformat",
 		ssh_options: {
-			enabled: String(sshEnabled),
+			enabled: sshEnabled == null ? void 0 : String(sshEnabled),
 			host: sshHost,
 			port: sshPort,
 			user: sshUser
@@ -422,7 +425,7 @@ const getMySqlSqlAlchemyInput = (integrationId, projectRootDirectory, { user, pa
 		params: { connect_args: { ssl } },
 		param_style: "pyformat",
 		ssh_options: {
-			enabled: String(sshEnabled),
+			enabled: sshEnabled == null ? void 0 : String(sshEnabled),
 			host: sshHost,
 			port: sshPort,
 			user: sshUser
@@ -430,13 +433,13 @@ const getMySqlSqlAlchemyInput = (integrationId, projectRootDirectory, { user, pa
 	};
 };
 function getCACertificatePath({ projectRoot, integrationId, caCertificateName }) {
-	return `${projectRoot ?? ""}/.deepnote/${integrationId}/${caCertificateName}`;
+	return `${projectRoot}/.deepnote/${integrationId}/${caCertificateName}`;
 }
 function convertToEnvironmentVariableName(str) {
 	return (/^\d/.test(str) ? `_${str}` : str).toUpperCase().replace(/[^\w]/g, "_");
 }
 function getSqlEnvVarName(integrationId) {
-	return `SQL_${integrationId}`;
+	return convertToEnvironmentVariableName(`SQL_${integrationId}`);
 }
 function assertNever(value) {
 	throw new Error(`Unexpected value: ${value}`);
@@ -693,4 +696,4 @@ const databaseIntegrationTypesWithSslSupport = [
 ];
 
 //#endregion
-export { AwsAuthMethods, BigQueryAuthMethods, BigQueryServiceAccountParseError, DatabaseAuthMethods, SnowflakeAuthMethods, SpannerServiceAccountParseError, databaseIntegrationTypes, databaseIntegrationTypesWithSslSupport, databaseMetadataSchemasByType, getIntegrationListEnv, getSqlAlchemyInput, isFederatedAuthMetadata, isFederatedAuthMethod, sqlIntegrationTypes };
+export { AwsAuthMethods, BigQueryAuthMethods, BigQueryServiceAccountParseError, DatabaseAuthMethods, SnowflakeAuthMethods, SpannerServiceAccountParseError, databaseIntegrationTypes, databaseIntegrationTypesWithSslSupport, databaseMetadataSchemasByType, getEnvironmentVariablesForIntegrations, getSqlAlchemyInput, isFederatedAuthMetadata, isFederatedAuthMethod, sqlIntegrationTypes };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@deepnote/database-integrations",
-  "version": "1.0.0",
+  "version": "1.1.1",
   "description": "Deepnote database integration definitions",
   "keywords": [],
   "repository": {
@@ -26,17 +26,16 @@
     "LICENSE",
     "package.json"
   ],
-  "scripts": {
-    "build": "tsdown --format esm --format cjs --dts",
-    "test": "vitest",
-    "watch": "tsdown --watch --format esm --format cjs --dts"
-  },
   "dependencies": {
-    "build-url-ts": "^6.1.7",
-    "zod": "^4.1.12"
+    "zod": "3.25.76"
   },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org"
+  },
+  "scripts": {
+    "build": "tsdown --format esm --format cjs --dts",
+    "test": "vitest",
+    "watch": "tsdown --watch --format esm --format cjs --dts"
   }
-}
+}