From 920e7b7ca1f16700eafe85f9497a3fdb433edcdd Mon Sep 17 00:00:00 2001
From: Samuel Andert <samuel@ora.earth>
Date: Wed, 26 Jul 2023 15:16:41 +0200
Subject: [PATCH] added dynamic data loading and mapping towards components.

---
 .../components/HelloEarth/HelloEarth.svelte   | 25 +++++++++++---
 src/lib/core/Composite.svelte                 | 34 +++++++++++++------
 src/lib/core/dataLoader.ts                    | 31 +++++++++++++++++
 src/lib/data/queryMessages.ts                 |  9 +++++
 src/lib/data/queryTodos.ts                    |  9 +++++
 src/routes/+page.svelte                       |  8 ++++-
 6 files changed, 99 insertions(+), 17 deletions(-)
 create mode 100644 src/lib/core/dataLoader.ts
 create mode 100644 src/lib/data/queryMessages.ts
 create mode 100644 src/lib/data/queryTodos.ts

diff --git a/src/lib/components/HelloEarth/HelloEarth.svelte b/src/lib/components/HelloEarth/HelloEarth.svelte
index 18b314d..e4ceaed 100644
--- a/src/lib/components/HelloEarth/HelloEarth.svelte
+++ b/src/lib/components/HelloEarth/HelloEarth.svelte
@@ -3,6 +3,8 @@
 	export let services;
 	export let store;
 
+	// Watch for store changes
+
 	onMount(async () => {
 		if (services && services.helloEarthAlert) {
 			console.log('Alerted by HelloEarthAlert');
@@ -12,10 +14,23 @@
 	});
 </script>
 
-<!-- Only render the div when $store.pkpWallet is defined -->
-{#if $store}
-	<div class="p-12 bg-blue-400">Hello Earth {$store.pkpWallet.address}</div>
+{#if !$store}
+	<div>Loading store...</div>
 {:else}
-	<!-- You can display a loader or placeholder content here -->
-	<div>Loading...</div>
+	<div class="p-12 bg-blue-400">
+		Hello Earth
+		{#if $store.pkpWallet}{$store.pkpWallet.address}{/if}
+		{#if $store.todos && $store.messages}
+			<ul>
+				{#each $store.todos as todo}
+					<li>{todo.name}</li>
+				{/each}
+			</ul>
+			<ul>
+				{#each $store.messages as message}
+					<li>{message.text} - {message.date}</li>
+				{/each}
+			</ul>
+		{/if}
+	</div>
 {/if}
diff --git a/src/lib/core/Composite.svelte b/src/lib/core/Composite.svelte
index ada9583..8a0b072 100644
--- a/src/lib/core/Composite.svelte
+++ b/src/lib/core/Composite.svelte
@@ -1,7 +1,9 @@
 <script lang="ts">
+	import { onDestroy, onMount } from 'svelte';
 	import Composite from './Composite.svelte';
 	import components from '$lib/core/componentLoader';
 	import services from '$lib/core/servicesLoader';
+	import { dataStore } from '$lib/core/dataLoader';
 	import { createCompositeStore, getCompositeStore } from '$lib/core/compositeStores';
 
 	interface IComposite {
@@ -34,6 +36,7 @@
 		`
 		: '';
 
+	// Reactive statement to watch changes in the composite prop
 	$: if (composite?.children) {
 		composite.children.forEach((child) => {
 			initializeCompositeState(child);
@@ -59,21 +62,30 @@
 
 			for (const [localKey, external] of Object.entries(component.map)) {
 				const [externalID, externalKey] = external.split('.').map((item) => item.trim());
-				const externalStore = getCompositeStore(externalID);
-				if (externalStore) {
-					externalStore.subscribe((externalState) => {
-						console.log('External state:', externalState);
-						if (externalState && externalKey in externalState) {
+
+				if (externalID === 'data') {
+					const unsubscribe = dataStore.subscribe((store) => {
+						if (externalKey in store) {
 							localStore.update((storeValue) => {
-								storeValue = storeValue || {};
-								if (storeValue[localKey] !== externalState[externalKey]) {
-									storeValue[localKey] = externalState[externalKey];
-									return storeValue;
-								}
-								return storeValue;
+								return { ...storeValue, [localKey]: store[externalKey] };
 							});
 						}
 					});
+
+					onDestroy(unsubscribe);
+				} else {
+					const externalStore = getCompositeStore(externalID);
+					if (externalStore) {
+						const unsubscribe = externalStore.subscribe((externalState) => {
+							if (externalState && externalKey in externalState) {
+								localStore.update((storeValue) => {
+									return { ...storeValue, [localKey]: externalState[externalKey] };
+								});
+							}
+						});
+
+						onDestroy(unsubscribe);
+					}
 				}
 			}
 		}
diff --git a/src/lib/core/dataLoader.ts b/src/lib/core/dataLoader.ts
new file mode 100644
index 0000000..855738b
--- /dev/null
+++ b/src/lib/core/dataLoader.ts
@@ -0,0 +1,31 @@
+import { writable } from 'svelte/store';
+
+// Using mock data, in a real-world scenario this could be fetched from an API.
+const queryMessagesData = [
+    {
+        text: 'text1',
+        date: 'date1',
+        id: 'id1'
+    },
+    {
+        text: 'text2',
+        date: 'date2',
+        id: 'id2'
+    }
+];
+
+const queryTodosData = [
+    {
+        name: "todo 1"
+    },
+    {
+        name: "todo 2"
+    },
+    { name: "todo 3" }
+];
+
+// The store that holds the data sets
+export const dataStore = writable({
+    queryMessages: queryMessagesData,
+    queryTodos: queryTodosData
+});
diff --git a/src/lib/data/queryMessages.ts b/src/lib/data/queryMessages.ts
new file mode 100644
index 0000000..f568a4a
--- /dev/null
+++ b/src/lib/data/queryMessages.ts
@@ -0,0 +1,9 @@
+// queryMessages.ts
+import { dataStore } from '$lib/core/dataLoader';
+
+const queryMessages = [
+    { text: 'text', date: 'date', id: 'id' },
+    { text: 'text', date: 'date', id: 'id' }
+];
+
+dataStore.registerData('messages', queryMessages);
diff --git a/src/lib/data/queryTodos.ts b/src/lib/data/queryTodos.ts
new file mode 100644
index 0000000..dbb69a7
--- /dev/null
+++ b/src/lib/data/queryTodos.ts
@@ -0,0 +1,9 @@
+// queryTodos.ts
+import { dataStore } from '$lib/core/dataLoader';
+
+const queryTodos = [
+    { name: "todo 1" },
+    { name: "todo 2" }
+];
+
+dataStore.registerData('todos', queryTodos);
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 3a4c95e..6757614 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,5 +1,8 @@
 <script>
 	import Composite from '$lib/core/Composite.svelte';
+	import { dataStore } from '$lib/core/dataLoader';
+
+	$: console.log('Data Store contents:', $dataStore);
 
 	let composite = {
 		id: 'composite',
@@ -29,7 +32,10 @@
 				component: 'HelloEarth',
 				slot: 'top',
 				map: {
-					pkpWallet: 'w.pkpWallet'
+					pkpWallet: 'w.pkpWallet',
+					rpcURL: 'w.rpcURL',
+					messages: 'data.queryMessages',
+					todos: 'data.queryTodos'
 				},
 				services: ['helloEarthAlert']
 			},