Merge pull request #2889 from evidence-dev/fix/environment-variables-…

…in-deployment-section

fix: environemnt variables appear in the deploy section again

.changeset/odd-fans-accept.md

@@ -0,0 +1,6 @@
+---
+'@evidence-dev/evidence': patch
+'@evidence-dev/sdk': patch
+---
+
+fix environment variable display in settings page

packages/lib/sdk/src/plugins/datasources/index.js

@@ -3,3 +3,4 @@ export * from './loadSources.js';
 export * from './loadSourcePlugins.js';
 export * from './writeSourceConfig.js';
 export * from './cli/edit/Options.js';
+export { getDatasourceConfigAsEnvironmentVariables } from './loadSourceConfig.js';

packages/lib/sdk/src/plugins/datasources/loadSourceConfig.js

@@ -120,3 +120,28 @@ export const loadSourceConfig = async (sourceDir) => {
 		options
 	};
 };
+
+/**
+ * @param {import('./schemas/datasource.schema.js').DatasourceSpec} datasource
+ */
+export const getDatasourceConfigAsEnvironmentVariables = (datasource) => {
+	/** @type {Record<string,string>} */
+	const environmentVariables = {};
+	/**
+	 * @param {any} obj
+	 * @param {string} [currentKey]
+	 */
+	const generateNestedEnvVars = (obj, currentKey = '') => {
+		for (const [key, value] of Object.entries(obj)) {
+			const newKey = currentKey ? `${currentKey}__${key}` : key;
+			if (typeof value === 'object') {
+				generateNestedEnvVars(value, newKey);
+			} else {
+				environmentVariables[`EVIDENCE_SOURCE__${datasource.name}__${newKey}`] = value.toString();
+			}
+		}
+	};
+	generateNestedEnvVars(datasource.options);
+
+	return environmentVariables;
+};

sites/example-project/src/pages/settings/+page.server.js

@@ -6,7 +6,8 @@ import {
 	loadSourcePlugins,
 	DatasourceSpecFileSchema,
 	Options,
-	writeSourceConfig
+	writeSourceConfig,
+	getDatasourceConfigAsEnvironmentVariables
 } from '@evidence-dev/sdk/plugins';
 
 export const load = async () => {
@@ -15,12 +16,18 @@ export const load = async () => {
 		const datasources = await loadSourcePlugins();
 
 		const plugins = Object.entries(datasources.bySource).reduce((acc, [name, v]) => {
-			acc[name] = { package: { package: v[0] }, options: v[1].options };
+			acc[name] = {
+				package: { package: v[0] },
+				options: v[1].options
+			};
 			return acc;
 		}, {});
 
 		return {
-			sources,
+			sources: sources.map((source) => ({
+				...source,
+				environmentVariables: getDatasourceConfigAsEnvironmentVariables(source)
+			})),
 			plugins
 		};
 	}

sites/example-project/src/pages/settings/+page.svelte

@@ -6,8 +6,6 @@
 	let { settings, customFormattingSettings, sources, plugins } = data;
 	$: ({ settings, customFormattingSettings, sources, plugins } = data);
 
-	console.log({ settings, sources, plugins });
-
 	import { dev } from '$app/environment';
 
 	import {