From 546185f3718944dd6a0416ef769e3ce80fe12476 Mon Sep 17 00:00:00 2001
From: mrkvon <mrkvon@proton.me>
Date: Thu, 1 Oct 2026 13:52:07 +0200
Subject: [PATCH 01/15] Initialize the package

---
 package-lock.json                             | 19 +++++++
 packages/solid-vue/README.md                  |  1 +
 packages/solid-vue/package.json               | 53 +++++++++++++++++++
 .../src/createBrowserSolidVueMethods.ts       | 10 ++++
 packages/solid-vue/src/defaultInstance.ts     | 21 ++++++++
 packages/solid-vue/src/index.ts               |  2 +
 packages/solid-vue/test/SolidAuth.test.ts     |  5 ++
 packages/solid-vue/tsconfig.esm.json          |  9 ++++
 packages/solid-vue/tsdown.config.ts           | 13 +++++
 packages/solid-vue/vitest.config.js           | 29 ++++++++++
 10 files changed, 162 insertions(+)
 create mode 100644 packages/solid-vue/README.md
 create mode 100644 packages/solid-vue/package.json
 create mode 100644 packages/solid-vue/src/createBrowserSolidVueMethods.ts
 create mode 100644 packages/solid-vue/src/defaultInstance.ts
 create mode 100644 packages/solid-vue/src/index.ts
 create mode 100644 packages/solid-vue/test/SolidAuth.test.ts
 create mode 100644 packages/solid-vue/tsconfig.esm.json
 create mode 100644 packages/solid-vue/tsdown.config.ts
 create mode 100644 packages/solid-vue/vitest.config.js

diff --git a/package-lock.json b/package-lock.json
index ae1ebce1..3aceeee2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -18346,6 +18346,10 @@
       "resolved": "packages/solid-type-index",
       "link": true
     },
+    "node_modules/@ldo/solid-vue": {
+      "resolved": "packages/solid-vue",
+      "link": true
+    },
     "node_modules/@ldo/subscribable-dataset": {
       "resolved": "packages/subscribable-dataset",
       "link": true
@@ -41806,6 +41810,21 @@
         "loose-envify": "^1.1.0"
       }
     },
+    "packages/solid-vue": {
+      "name": "@ldo/solid-vue",
+      "version": "1.0.0-alpha.50",
+      "license": "MIT",
+      "dependencies": {
+        "@ldo/connected-solid": "^1.0.0-alpha.50",
+        "@ldo/vue": "^1.0.0-alpha.50"
+      },
+      "devDependencies": {
+        "vue": "^3.5.43"
+      },
+      "peerDependencies": {
+        "vue": "^3.3.0"
+      }
+    },
     "packages/subscribable-dataset": {
       "name": "@ldo/subscribable-dataset",
       "version": "1.0.0-alpha.50",
diff --git a/packages/solid-vue/README.md b/packages/solid-vue/README.md
new file mode 100644
index 00000000..e5719571
--- /dev/null
+++ b/packages/solid-vue/README.md
@@ -0,0 +1 @@
+# @ldo/solid-vue
diff --git a/packages/solid-vue/package.json b/packages/solid-vue/package.json
new file mode 100644
index 00000000..83c140e5
--- /dev/null
+++ b/packages/solid-vue/package.json
@@ -0,0 +1,53 @@
+{
+  "name": "@ldo/solid-vue",
+  "version": "1.0.0-alpha.50",
+  "description": "A Vue library for LDO and Solid",
+  "type": "module",
+  "main": "./dist/index.cjs",
+  "module": "./dist/index.mjs",
+  "types": "./dist/index.d.mts",
+  "exports": {
+    ".": {
+      "import": {
+        "types": "./dist/index.d.mts",
+        "default": "./dist/index.mjs"
+      },
+      "require": {
+        "types": "./dist/index.d.cts",
+        "default": "./dist/index.cjs"
+      }
+    },
+    "./package.json": "./package.json"
+  },
+  "scripts": {
+    "build": "rimraf dist && NODE_OPTIONS=--max-old-space-size=8192 tsdown",
+    "test": "vitest run --coverage"
+  },
+  "keywords": [
+    "ldo",
+    "linked-data-objects",
+    "rdf",
+    "solid-project",
+    "vuejs"
+  ],
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/o-development/ldo.git"
+  },
+  "author": "Jackson Morgan",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/o-development/ldo/issues"
+  },
+  "homepage": "https://github.com/o-development/ldo/tree/main/packages/solid-vue#readme",
+  "dependencies": {
+    "@ldo/connected-solid": "^1.0.0-alpha.50",
+    "@ldo/vue": "^1.0.0-alpha.50"
+  },
+  "peerDependencies": {
+    "vue": "^3.3.0"
+  },
+  "devDependencies": {
+    "vue": "^3.5.43"
+  }
+}
diff --git a/packages/solid-vue/src/createBrowserSolidVueMethods.ts b/packages/solid-vue/src/createBrowserSolidVueMethods.ts
new file mode 100644
index 00000000..215b43cd
--- /dev/null
+++ b/packages/solid-vue/src/createBrowserSolidVueMethods.ts
@@ -0,0 +1,10 @@
+import type { ConnectedLdoDataset, ConnectedPlugin } from "@ldo/connected";
+import type { SolidConnectedPlugin } from "@ldo/connected-solid";
+
+export function createBrowserSolidVueMethods(
+  dataset: ConnectedLdoDataset<(SolidConnectedPlugin | ConnectedPlugin)[]>,
+) {
+  return {
+    useSolidAuth: undefined,
+  };
+}
diff --git a/packages/solid-vue/src/defaultInstance.ts b/packages/solid-vue/src/defaultInstance.ts
new file mode 100644
index 00000000..6bb514ae
--- /dev/null
+++ b/packages/solid-vue/src/defaultInstance.ts
@@ -0,0 +1,21 @@
+import { solidConnectedPlugin } from "@ldo/connected-solid";
+import { createLdoVueMethods } from "@ldo/vue";
+import { createBrowserSolidVueMethods } from "./createBrowserSolidVueMethods";
+
+export const {
+  dataset,
+  useDataset,
+  useLdo,
+  useResource,
+  useSubject,
+  useMatchObject,
+  useMatchSubject,
+  useSubscribeToResource,
+  useLinkQuery,
+  useChangeDataset,
+  useChangeSubject,
+  useChangeMatchObject,
+  useChangeMatchSubject,
+} = createLdoVueMethods([solidConnectedPlugin]);
+
+export const { useSolidAuth } = createBrowserSolidVueMethods(dataset);
diff --git a/packages/solid-vue/src/index.ts b/packages/solid-vue/src/index.ts
new file mode 100644
index 00000000..07aca416
--- /dev/null
+++ b/packages/solid-vue/src/index.ts
@@ -0,0 +1,2 @@
+export * from "./createBrowserSolidVueMethods";
+export * from "./defaultInstance";
diff --git a/packages/solid-vue/test/SolidAuth.test.ts b/packages/solid-vue/test/SolidAuth.test.ts
new file mode 100644
index 00000000..2702fa46
--- /dev/null
+++ b/packages/solid-vue/test/SolidAuth.test.ts
@@ -0,0 +1,5 @@
+import { describe, it } from "vitest";
+
+describe("Solid Auth in Vue + Solid", () => {
+  it.todo("should ...");
+});
diff --git a/packages/solid-vue/tsconfig.esm.json b/packages/solid-vue/tsconfig.esm.json
new file mode 100644
index 00000000..77952ca6
--- /dev/null
+++ b/packages/solid-vue/tsconfig.esm.json
@@ -0,0 +1,9 @@
+{
+  "extends": "../../tsconfig.esm.json",
+  "compilerOptions": {
+    "outDir": "./dist/esm",
+    "rootDir": "./src",
+    "declarationDir": "./dist/types"
+  },
+  "include": ["src"]
+}
diff --git a/packages/solid-vue/tsdown.config.ts b/packages/solid-vue/tsdown.config.ts
new file mode 100644
index 00000000..7f0dfbd9
--- /dev/null
+++ b/packages/solid-vue/tsdown.config.ts
@@ -0,0 +1,13 @@
+import { defineConfig } from "tsdown";
+
+export default defineConfig({
+  entry: ["src/index.ts"],
+  format: ["esm", "cjs"],
+  target: "es2021",
+  unbundle: true,
+  dts: true,
+  clean: true,
+  outDir: "dist",
+  tsconfig: "tsconfig.esm.json",
+  skipNodeModulesBundle: true,
+});
diff --git a/packages/solid-vue/vitest.config.js b/packages/solid-vue/vitest.config.js
new file mode 100644
index 00000000..cc93abb3
--- /dev/null
+++ b/packages/solid-vue/vitest.config.js
@@ -0,0 +1,29 @@
+import { defineConfig } from "vitest/config";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+
+const __dirname = path.dirname(fileURLToPath(import.meta.url));
+
+export default defineConfig({
+  plugins: [],
+  resolve: {
+    alias: [
+      {
+        find: /^@ldo\/([^/]+)$/,
+        replacement: path.resolve(__dirname, "../$1/src/index.ts"),
+      },
+      {
+        find: /^@ldo\/([^/]+)\/(.*)$/,
+        replacement: path.resolve(__dirname, "../$1/$2"),
+      },
+    ],
+  },
+  test: {
+    globals: true,
+    setupFiles: ["../../vitest.jest-compat.ts"],
+    coverage: {
+      provider: "istanbul",
+    },
+    environment: "jsdom",
+  },
+});

From 4198732d0e1faa888fe9818ff8489144d2457f7b Mon Sep 17 00:00:00 2001
From: mrkvon <mrkvon@proton.me>
Date: Sat, 10 Oct 2026 01:19:04 +0200
Subject: [PATCH 02/15] Implement provideSolidAuth and useSolidAuth

and test it on the Vue dev app.
---
 dev/solid-vue-vite-app/package.json           |   4 +-
 dev/solid-vue-vite-app/src/App.vue            |  74 +--
 dev/solid-vue-vite-app/src/Main.vue           |  56 +++
 ...eMatchSubjectTest.vue => MatchSubject.vue} |  35 +-
 dev/solid-vue-vite-app/src/SolidAuth.vue      |  55 +++
 dev/solid-vue-vite-app/src/main.ts            |   3 +-
 dev/solid-vue-vite-app/src/router.ts          |  36 ++
 package-lock.json                             | 422 ++++++++++++++++--
 packages/solid-react/README.md                |   2 +-
 packages/solid-vue/README.md                  |  24 +
 .../src/createBrowserSolidVueMethods.ts       |   4 +-
 packages/solid-vue/src/defaultInstance.ts     |   3 +-
 packages/solid-vue/src/useSolidAuth.ts        | 141 ++++++
 packages/solid-vue/test/test-utils.ts         |  19 +
 14 files changed, 796 insertions(+), 82 deletions(-)
 create mode 100644 dev/solid-vue-vite-app/src/Main.vue
 rename dev/solid-vue-vite-app/src/{useMatchSubjectTest.vue => MatchSubject.vue} (61%)
 create mode 100644 dev/solid-vue-vite-app/src/SolidAuth.vue
 create mode 100644 dev/solid-vue-vite-app/src/router.ts
 create mode 100644 packages/solid-vue/src/useSolidAuth.ts
 create mode 100644 packages/solid-vue/test/test-utils.ts

diff --git a/dev/solid-vue-vite-app/package.json b/dev/solid-vue-vite-app/package.json
index 61d255fe..55b3af6c 100644
--- a/dev/solid-vue-vite-app/package.json
+++ b/dev/solid-vue-vite-app/package.json
@@ -14,8 +14,10 @@
   "dependencies": {
     "@ldo/connected-solid": "^1.0.0-alpha.50",
     "@ldo/ldo": "^1.0.0-alpha.50",
+    "@ldo/solid-vue": "^1.0.0-alpha.50",
     "@ldo/vue": "^1.0.0-alpha.50",
-    "vue": "^3.5.40"
+    "vue": "^3.5.40",
+    "vue-router": "^5.4.0"
   },
   "devDependencies": {
     "@ldo/cli": "^1.0.0-alpha.50",
diff --git a/dev/solid-vue-vite-app/src/App.vue b/dev/solid-vue-vite-app/src/App.vue
index 6a95f755..b2b49efb 100644
--- a/dev/solid-vue-vite-app/src/App.vue
+++ b/dev/solid-vue-vite-app/src/App.vue
@@ -2,8 +2,9 @@
 import { computed, ref } from "vue";
 import { FoafProfileShapeType } from "./_ldo/foafProfile.shapeTypes.js";
 import { useSubject, useResource } from "./ldo.js";
-import UseMatchSubjectTest from "./useMatchSubjectTest.vue";
-import VueReadmeTest from "./vueReadmeTest.vue";
+import { provideSolidAuth } from "@ldo/solid-vue";
+import { RouterView, RouterLink } from "vue-router";
+import { router } from "./router.js";
 
 const isValidUrl = (str: string) => {
   try {
@@ -22,40 +23,45 @@ const validUri = computed(() =>
 const subject = useSubject(FoafProfileShapeType, inputUri);
 console.log(subject);
 useResource(validUri);
+
+provideSolidAuth();
 </script>
 
 <template>
-  <div>
-    <h1>vue Solid auth test</h1>
-    <input v-model="inputUri" placeholder="enter webId" />
-    <div>{{ subject?.name ?? subject?.["@id"] }}</div>
-    <ul>
-      <li v-for="friend in subject?.knows" :key="friend['@id']">
-        {{ friend["@id"] }}
-      </li>
-    </ul>
-
-    <p>checked:</p>
-    <p>active:</p>
-    <p>webId:</p>
-    <p>webId resource:</p>
-
-    <form>
-      <input />
-      <button type="submit">login</button>
-    </form>
-
-    <!-- <button type="button" @onClick="logout">logout</button> -->
-
-    <form>
-      <input />
-      <button type="submit">fetch</button>
-    </form>
-
-    <pre></pre>
-  </div>
-  <UseMatchSubjectTest />
-  <VueReadmeTest />
+  <header class="header">
+    <nav class="navigation">
+      <RouterLink to="/">home</RouterLink>
+      <RouterLink to="/solid-auth">useSolidAuth</RouterLink>
+      <RouterLink to="/match-subject">useMatchSubject</RouterLink>
+    </nav>
+  </header>
+
+  <main>
+    <RouterView />
+  </main>
 </template>
 
-<style scoped></style>
+<style scoped lang="css">
+.header {
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+}
+.navigation {
+  display: flex;
+  gap: 1rem;
+  flex-wrap: wrap;
+  padding: 1rem;
+
+  a {
+    text-decoration: none;
+    color: purple;
+    font-variant: small-caps;
+    cursor: pointer;
+
+    &.router-link-exact-active {
+      color: green;
+    }
+  }
+}
+</style>
diff --git a/dev/solid-vue-vite-app/src/Main.vue b/dev/solid-vue-vite-app/src/Main.vue
new file mode 100644
index 00000000..5463f885
--- /dev/null
+++ b/dev/solid-vue-vite-app/src/Main.vue
@@ -0,0 +1,56 @@
+<script setup lang="ts">
+import { computed, ref } from "vue";
+import { FoafProfileShapeType } from "./_ldo/foafProfile.shapeTypes.js";
+import { useSubject, useResource } from "./ldo.js";
+import VueReadmeTest from "./vueReadmeTest.vue";
+
+const isValidUrl = (str: string) => {
+  try {
+    return Boolean(new URL(str));
+  } catch {
+    return false;
+  }
+};
+
+const inputUri = ref("");
+
+const validUri = computed(() =>
+  isValidUrl(inputUri.value) ? inputUri.value : "",
+);
+
+const subject = useSubject(FoafProfileShapeType, inputUri);
+console.log(subject);
+useResource(validUri);
+</script>
+
+<template>
+  <div>
+    <input v-model="inputUri" placeholder="enter webId" />
+    <div>{{ subject?.name ?? subject?.["@id"] }}</div>
+    <ul>
+      <li v-for="friend in subject?.knows" :key="friend['@id']">
+        {{ friend["@id"] }}
+      </li>
+    </ul>
+
+    <p>checked:</p>
+    <p>active:</p>
+    <p>webId:</p>
+    <p>webId resource:</p>
+
+    <form>
+      <input />
+      <button type="submit">login</button>
+    </form>
+
+    <!-- <button type="button" @onClick="logout">logout</button> -->
+
+    <form>
+      <input />
+      <button type="submit">fetch</button>
+    </form>
+
+    <pre></pre>
+  </div>
+  <VueReadmeTest />
+</template>
diff --git a/dev/solid-vue-vite-app/src/useMatchSubjectTest.vue b/dev/solid-vue-vite-app/src/MatchSubject.vue
similarity index 61%
rename from dev/solid-vue-vite-app/src/useMatchSubjectTest.vue
rename to dev/solid-vue-vite-app/src/MatchSubject.vue
index a77ee401..0cf637e1 100644
--- a/dev/solid-vue-vite-app/src/useMatchSubjectTest.vue
+++ b/dev/solid-vue-vite-app/src/MatchSubject.vue
@@ -2,7 +2,6 @@
 import { computed, ref } from "vue";
 import { FoafProfileShapeType } from "./_ldo/foafProfile.shapeTypes.js";
 import { useResource, useMatchSubject } from "./ldo.js";
-import type { FoafProfile } from "./_ldo/foafProfile.typings.js";
 
 const isValidUrl = (str: string) => {
   try {
@@ -19,7 +18,7 @@ const graphInput = ref("");
 
 const predicate = computed(() => predicateInput.value || undefined);
 const object = computed(() => objectInput.value || undefined);
-const graph = computed(() => graphInput.value || resource.value);
+const graph = computed(() => graphInput.value || undefined); //|| resource.value);
 
 const validResource = computed(() =>
   isValidUrl(resource.value) ? resource.value : "",
@@ -32,29 +31,35 @@ const subjectsSet = useMatchSubject(
   graph,
 );
 
-// const subjects = computed(() => {
-//   return subjectsSet.value.toArray();
-// });
-
 useResource(validResource);
 </script>
 
 <template>
   <div>
-    <h1>useMatchSubject test</h1>
+    <h2>useMatchSubject</h2>
+    <div>
+      <label for="resource">load resource: </label>
+      <input id="resource" v-model="resource" placeholder="resource" />
+    </div>
 
-    <input v-model="resource" placeholder="resource" />
-    <br />
-    <input v-model="predicateInput" placeholder="predicate" />
-    <br />
-    <input v-model="objectInput" placeholder="object" />
-    <br />
-    <input v-model="graphInput" placeholder="graph" />
     <br />
 
+    <div>
+      <input v-model="predicateInput" placeholder="predicate" />
+      <br />
+      <input v-model="objectInput" placeholder="object" />
+      <br />
+      <input v-model="graphInput" placeholder="graph" />
+    </div>
+
     <ul>
       <li v-for="item in subjectsSet">
-        {{ item.knows?.map((p: FoafProfile) => p["@id"]).join(", ") }}
+        {{ item.name ?? item["@id"] }}:
+        <ul>
+          <li v-for="friend in item.knows">
+            {{ friend.name ?? friend["@id"] }}
+          </li>
+        </ul>
       </li>
     </ul>
   </div>
diff --git a/dev/solid-vue-vite-app/src/SolidAuth.vue b/dev/solid-vue-vite-app/src/SolidAuth.vue
new file mode 100644
index 00000000..11803186
--- /dev/null
+++ b/dev/solid-vue-vite-app/src/SolidAuth.vue
@@ -0,0 +1,55 @@
+<script setup lang="ts">
+import { useSolidAuth } from "@ldo/solid-vue";
+
+const solidAuth = useSolidAuth();
+
+const login = async () => {
+  const idp = prompt(
+    "Please select your identity provider:",
+    "https://solidcommunity.net",
+  );
+
+  try {
+    if (!idp) throw new Error("No identity provider specified.");
+    new URL(idp);
+    console.log(
+      "LOGIN",
+      globalThis.location.origin + globalThis.location.pathname,
+    );
+    await solidAuth.login(
+      idp,
+      globalThis.location.origin + globalThis.location.pathname,
+    );
+  } catch (e) {
+    console.error(e, "AUTH ERROR");
+    const message = e instanceof Error ? e.message : "Unexpected Error";
+    alert(`${message} Please specify a valid URL of your identity provider.`);
+  }
+};
+
+async function logout() {
+  await solidAuth.logout();
+}
+
+async function handleHistoryHome() {
+  globalThis.history.pushState({}, document.title, globalThis.location.origin);
+}
+</script>
+
+<template>
+  <h2>Solid Auth</h2>
+  <div v-if="solidAuth.session.value.isActive">
+    {{ solidAuth.session.value.webId }}
+  </div>
+
+  <div v-if="!solidAuth.ranInitialAuthCheck.value">CHECKING AUTH</div>
+
+  <button @click="logout" v-else-if="solidAuth.session.value.isActive">
+    Sign out
+  </button>
+  <button @click="login" v-else="solidAuth.session.value.isActive">
+    Sign in
+  </button>
+
+  <button @click="handleHistoryHome">history home</button>
+</template>
diff --git a/dev/solid-vue-vite-app/src/main.ts b/dev/solid-vue-vite-app/src/main.ts
index b670de8b..8c20d277 100644
--- a/dev/solid-vue-vite-app/src/main.ts
+++ b/dev/solid-vue-vite-app/src/main.ts
@@ -1,4 +1,5 @@
 import { createApp } from "vue";
 import App from "./App.vue";
+import { router } from "./router.ts";
 
-createApp(App).mount("#app");
+createApp(App).use(router).mount("#app");
diff --git a/dev/solid-vue-vite-app/src/router.ts b/dev/solid-vue-vite-app/src/router.ts
new file mode 100644
index 00000000..f8e71fb4
--- /dev/null
+++ b/dev/solid-vue-vite-app/src/router.ts
@@ -0,0 +1,36 @@
+import {
+  createWebHistory,
+  createRouter,
+  createWebHashHistory,
+} from "vue-router";
+import SolidAuth from "./SolidAuth.vue";
+import MatchSubject from "./MatchSubject.vue";
+import Main from "./Main.vue";
+
+export const router = createRouter({
+  history: createWebHistory(),
+  routes: [
+    { path: "", component: Main },
+    { path: "/solid-auth", component: SolidAuth },
+    { path: "/match-subject", component: MatchSubject },
+  ],
+});
+
+// // Log BEFORE any navigation starts
+// router.beforeEach((to, from, next) => {
+//   console.log(`[Router] Attempting move: ${from.fullPath} ➡️ ${to.fullPath}`);
+//   console.log("[Router] Target Route Specs:", to);
+//   next(); // Don't forget to call next()!
+// });
+
+// // Log AFTER a navigation finishes successfully
+// router.afterEach((to, from) => {
+//   console.log(`[Router] Navigation Completed successfully to: ${to.fullPath}`);
+// });
+
+// // Log if something CRASHES or gets rejected during routing
+// router.onError((error) => {
+//   console.error("[Router] Error occurred during routing:", error);
+// });
+
+export default router;
diff --git a/package-lock.json b/package-lock.json
index 3aceeee2..749a661c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1118,8 +1118,10 @@
       "dependencies": {
         "@ldo/connected-solid": "^1.0.0-alpha.50",
         "@ldo/ldo": "^1.0.0-alpha.50",
+        "@ldo/solid-vue": "^1.0.0-alpha.50",
         "@ldo/vue": "^1.0.0-alpha.50",
-        "vue": "^3.5.40"
+        "vue": "^3.5.40",
+        "vue-router": "^5.4.0"
       },
       "devDependencies": {
         "@ldo/cli": "^1.0.0-alpha.50",
@@ -1143,7 +1145,7 @@
       "version": "0.148.0",
       "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.148.0.tgz",
       "integrity": "sha512-Nm4s/jB+4FpFsPhWGEC4h7rzksesmtnMXomo6rCMcg/b8zLQuOziRgkCS1fxDCXOlJB/6Q8oABOZ/OP6RIPj9A==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/oxc-project"
@@ -1187,7 +1189,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/@rolldown/pluginutils/-/pluginutils-1.0.1.tgz",
       "integrity": "sha512-2j9bGt5Jh8hj+vPtgzPtl72j0yRxHAyumoo6TNfAjsLB04UtpSvPbPcDcBMxz7n+9CYB0c1GxQFxYRg2jimqGw==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "dev/solid-vue-vite-app/node_modules/@types/node": {
@@ -1245,18 +1247,25 @@
         "picomatch": "^4.0.4"
       }
     },
+    "dev/solid-vue-vite-app/node_modules/magic-string": {
+      "version": "1.4.3",
+      "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-1.4.3.tgz",
+      "integrity": "sha512-z12OxmaPGE0F4xlpGdjuAUckipLpQlTAuAmyGhNoD7ODpYUzvDfvtxUbjM/jwznyP178oju/KDdyi220wNJ0RQ==",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/sourcemap-codec": "^1.6.0"
+      }
+    },
     "dev/solid-vue-vite-app/node_modules/muggle-string": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz",
       "integrity": "sha512-VNTrAak/KhO2i8dqqnqnAHOa3cYBwXEZe9h+D5h/1ZqFSTEFHdM65lR7RoIqq3tBBYavsOXV84NoHXZ0AkPyqQ==",
-      "dev": true,
       "license": "MIT"
     },
     "dev/solid-vue-vite-app/node_modules/picomatch": {
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz",
       "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -1269,7 +1278,7 @@
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/rolldown/-/rolldown-1.2.7.tgz",
       "integrity": "sha512-g0EtLvBjTUB7jhyV0S/TCup3v/XSVl45vUIGbOGU4QPiyjTenCe4mKuFvW9fEgYmS2Fo42AUssRmNuMziXdrig==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@oxc-project/types": "=0.148.0",
@@ -1320,11 +1329,69 @@
       "dev": true,
       "license": "MIT"
     },
+    "dev/solid-vue-vite-app/node_modules/unplugin": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/unplugin/-/unplugin-3.4.0.tgz",
+      "integrity": "sha512-9skdIFlCsPdFV7wUfZxNsFInlW+7nJmGu2gkTu0OUhF56aXGsHab9x52/QhdJ4lC7ZDPWTxbiC4ANqVlsuaW3w==",
+      "license": "MIT",
+      "dependencies": {
+        "@jridgewell/remapping": "^2.3.5",
+        "picomatch": "^4.0.7",
+        "webpack-virtual-modules": "^0.6.2"
+      },
+      "engines": {
+        "node": "^20.19.0 || >=22.12.0"
+      },
+      "peerDependencies": {
+        "@farmfe/core": "*",
+        "@rsbuild/core": "*",
+        "@rspack/core": "*",
+        "bun-types-no-globals": "*",
+        "esbuild": "*",
+        "rolldown": "*",
+        "rollup": "*",
+        "unloader": "*",
+        "vite": "*",
+        "webpack": "*"
+      },
+      "peerDependenciesMeta": {
+        "@farmfe/core": {
+          "optional": true
+        },
+        "@rsbuild/core": {
+          "optional": true
+        },
+        "@rspack/core": {
+          "optional": true
+        },
+        "bun-types-no-globals": {
+          "optional": true
+        },
+        "esbuild": {
+          "optional": true
+        },
+        "rolldown": {
+          "optional": true
+        },
+        "rollup": {
+          "optional": true
+        },
+        "unloader": {
+          "optional": true
+        },
+        "vite": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
+      }
+    },
     "dev/solid-vue-vite-app/node_modules/vite": {
       "version": "8.2.2",
       "resolved": "https://registry.npmjs.org/vite/-/vite-8.2.2.tgz",
       "integrity": "sha512-cFKLV/PRgAUlIRm5WjMjJ86jrftzpqcgH+Us+DS8mI3CDNiH30Whrz8uHL3+MOLPAgqbMBAqWdAHAphOAM+z/Q==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "lightningcss": "^1.33.0",
@@ -1398,6 +1465,54 @@
         }
       }
     },
+    "dev/solid-vue-vite-app/node_modules/vue-router": {
+      "version": "5.4.0",
+      "resolved": "https://registry.npmjs.org/vue-router/-/vue-router-5.4.0.tgz",
+      "integrity": "sha512-pFvcYcxinDHjZUlf7AzFBrT8r8Xqvv4uMHoJnjc+EqPawXQvHTkF8S4tfSmQLpriVHUGfkaKlI7Et0KRjTMTdw==",
+      "license": "MIT",
+      "dependencies": {
+        "@vue-macros/common": "^3.1.3",
+        "@vue/devtools-api": "^8.1.5",
+        "ast-walker-scope": "^0.10.0",
+        "chokidar": "^5.0.0",
+        "confbox": "^0.3.1",
+        "local-pkg": "^1.2.1",
+        "magic-string": "^1.4.3",
+        "mlly": "^1.8.2",
+        "muggle-string": "^0.4.1",
+        "nostics": "^1.3.0",
+        "pathe": "^2.0.3",
+        "picomatch": "^4.0.7",
+        "scule": "^1.3.0",
+        "tinyglobby": "^0.2.17",
+        "unplugin": "^3.4.0",
+        "unplugin-utils": "^0.3.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/posva"
+      },
+      "peerDependencies": {
+        "@pinia/colada": ">=0.21.2",
+        "@vue/compiler-sfc": "^3.5.34 || ^4.0.0",
+        "pinia": "^3.0.4 || ^4.0.2",
+        "vite": "^7.3.0 || ^8.0.0",
+        "vue": "^3.5.34 || ^4.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@pinia/colada": {
+          "optional": true
+        },
+        "@vue/compiler-sfc": {
+          "optional": true
+        },
+        "pinia": {
+          "optional": true
+        },
+        "vite": {
+          "optional": true
+        }
+      }
+    },
     "dev/solid-vue-vite-app/node_modules/vue-tsc": {
       "version": "3.3.11",
       "resolved": "https://registry.npmjs.org/vue-tsc/-/vue-tsc-3.3.11.tgz",
@@ -17842,7 +17957,6 @@
     },
     "node_modules/@jridgewell/gen-mapping": {
       "version": "0.3.13",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/sourcemap-codec": "^1.5.0",
@@ -17851,7 +17965,6 @@
     },
     "node_modules/@jridgewell/remapping": {
       "version": "2.3.5",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/gen-mapping": "^0.3.5",
@@ -17860,19 +17973,19 @@
     },
     "node_modules/@jridgewell/resolve-uri": {
       "version": "3.1.2",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=6.0.0"
       }
     },
     "node_modules/@jridgewell/sourcemap-codec": {
-      "version": "1.5.5",
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.6.0.tgz",
+      "integrity": "sha512-T7jf+5zgsZHwNJ4lvQ7/aezbyk0nNX+zJVWpmHA7VYsEx7a7qr5Rg5IbtJFqkgze5Y2sruq1RUY8Q837Od7iFw==",
       "license": "MIT"
     },
     "node_modules/@jridgewell/trace-mapping": {
       "version": "0.3.31",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@jridgewell/resolve-uri": "^3.1.0",
@@ -23396,6 +23509,49 @@
         "path-browserify": "^1.0.1"
       }
     },
+    "node_modules/@vue-macros/common": {
+      "version": "3.1.4",
+      "resolved": "https://registry.npmjs.org/@vue-macros/common/-/common-3.1.4.tgz",
+      "integrity": "sha512-/5Fv+6DgIcM9ajY05ZmKBv+LMX1M9A0X+IUwDRVdt67ciw8OV9bvG2r34p3RiEadlsQybjhKPRKNXDC8Bp23cw==",
+      "license": "MIT",
+      "dependencies": {
+        "@vue/compiler-sfc": "^3.5.22",
+        "ast-kit": "^2.1.2",
+        "local-pkg": "^1.1.2",
+        "magic-string-ast": "^1.0.2",
+        "unplugin-utils": "^0.3.0"
+      },
+      "engines": {
+        "node": ">=20.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/vue-macros"
+      },
+      "peerDependencies": {
+        "vue": "^2.7.0 || ^3.2.25"
+      },
+      "peerDependenciesMeta": {
+        "vue": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@vue-macros/common/node_modules/ast-kit": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ast-kit/-/ast-kit-2.2.0.tgz",
+      "integrity": "sha512-m1Q/RaVOnTp9JxPX+F+Zn7IcLYMzM8kZofDImfsKZd8MbR+ikdOzTeztStWqfrqIxZnYWryyI9ePm3NGjnZgGw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^7.28.5",
+        "pathe": "^2.0.3"
+      },
+      "engines": {
+        "node": ">=20.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sxzz"
+      }
+    },
     "node_modules/@vue/babel-helper-vue-transform-on": {
       "version": "1.5.0",
       "resolved": "https://registry.npmjs.org/@vue/babel-helper-vue-transform-on/-/babel-helper-vue-transform-on-1.5.0.tgz",
@@ -23523,6 +23679,15 @@
         "@vue/shared": "3.5.43"
       }
     },
+    "node_modules/@vue/devtools-api": {
+      "version": "8.2.1",
+      "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-8.2.1.tgz",
+      "integrity": "sha512-6u4vXBlIBAC1wMplIZgpyPn7uh/s4Bf6F5bMzvLv+EdJ0aHs/+4B7Ygv864EStQSjRbsRzTko/kUG1A1IejQ3A==",
+      "license": "MIT",
+      "dependencies": {
+        "@vue/devtools-kit": "^8.2.1"
+      }
+    },
     "node_modules/@vue/devtools-core": {
       "version": "8.2.1",
       "resolved": "https://registry.npmjs.org/@vue/devtools-core/-/devtools-core-8.2.1.tgz",
@@ -23541,7 +23706,6 @@
       "version": "8.2.1",
       "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-8.2.1.tgz",
       "integrity": "sha512-FIGIuq3AWReEpbAHY/cRGeHDfI0qOb8OCQ3YjbEAX04uaxIDbGc9rhkbVcG7rnfHPXE3RsU5KrWOu9V/okd8AQ==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@vue/devtools-shared": "^8.2.1",
@@ -23554,7 +23718,6 @@
       "version": "2.9.0",
       "resolved": "https://registry.npmjs.org/birpc/-/birpc-2.9.0.tgz",
       "integrity": "sha512-KrayHS5pBi69Xi9JmvoqrIgYGDkD6mcSe/i6YKi3w5kekCLzrX4+nawcXqrj2tIp50Kw/mT/s3p+GVK0A0sKxw==",
-      "dev": true,
       "license": "MIT",
       "funding": {
         "url": "https://github.com/sponsors/antfu"
@@ -23564,14 +23727,12 @@
       "version": "5.5.3",
       "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz",
       "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@vue/devtools-shared": {
       "version": "8.2.1",
       "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-8.2.1.tgz",
       "integrity": "sha512-Fkac7lUdGReh6pVOi3AYPRGe82LQqRmAfThW7RRligOAP0ZA/Z1z9XLHDM9dv34pV2HRc79DK8uKPeG2fLnA/g==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/@vue/language-core": {
@@ -24178,7 +24339,6 @@
     },
     "node_modules/ast-kit": {
       "version": "3.0.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/parser": "^8.0.0",
@@ -24194,7 +24354,6 @@
     },
     "node_modules/ast-kit/node_modules/@babel/helper-string-parser": {
       "version": "8.0.0",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^22.18.0 || >=24.11.0"
@@ -24202,7 +24361,6 @@
     },
     "node_modules/ast-kit/node_modules/@babel/helper-validator-identifier": {
       "version": "8.0.2",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": "^22.18.0 || >=24.11.0"
@@ -24210,7 +24368,6 @@
     },
     "node_modules/ast-kit/node_modules/@babel/parser": {
       "version": "8.0.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/types": "^8.0.0"
@@ -24224,7 +24381,6 @@
     },
     "node_modules/ast-kit/node_modules/@babel/types": {
       "version": "8.0.0",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@babel/helper-string-parser": "^8.0.0",
@@ -24239,6 +24395,69 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/ast-walker-scope": {
+      "version": "0.10.0",
+      "resolved": "https://registry.npmjs.org/ast-walker-scope/-/ast-walker-scope-0.10.0.tgz",
+      "integrity": "sha512-KzvoxDfXNz2Gm8KYLh47K3qcY3Zza3WKOuh2xoqa7LBu6MDKWAZLovJtU9DuAd/Er+rhQHCRn619lHS5U+qmhw==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/parser": "^8.0.0",
+        "@babel/types": "^8.0.0",
+        "ast-kit": "^3.0.0"
+      },
+      "engines": {
+        "node": "^22.18.0 || >=24.11.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sxzz"
+      }
+    },
+    "node_modules/ast-walker-scope/node_modules/@babel/helper-string-parser": {
+      "version": "8.0.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-8.0.6.tgz",
+      "integrity": "sha512-+6HYEBnsDRZHJtUTAEfMQd0zMDqdFHS7C+5vAsEZqBUr3vEMWOWlHJ0Jz1gS8jJIlCvLsuA6ivmeoqzH936YcA==",
+      "license": "MIT",
+      "engines": {
+        "node": "^22.18.0 || >=24.11.0"
+      }
+    },
+    "node_modules/ast-walker-scope/node_modules/@babel/helper-validator-identifier": {
+      "version": "8.0.6",
+      "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-8.0.6.tgz",
+      "integrity": "sha512-HYx0YmuchRxRSpnjvcNffnPS8DCauKNmnumIuHG3jnQAVewRA7kfJGwF13ayEpSZs7s4R/oBH4eppuXcAQd5JQ==",
+      "license": "MIT",
+      "engines": {
+        "node": "^22.18.0 || >=24.11.0"
+      }
+    },
+    "node_modules/ast-walker-scope/node_modules/@babel/parser": {
+      "version": "8.0.7",
+      "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-8.0.7.tgz",
+      "integrity": "sha512-UkDwEbPO1px2JQSrdh4qIgaH1JgG7GO/pFeJkpxhDxIETkT/QvGpnigXIw75ViHYPtIgKITmVUJqLjiO+JuWjA==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/types": "^8.0.6"
+      },
+      "bin": {
+        "parser": "bin/babel-parser.js"
+      },
+      "engines": {
+        "node": "^22.18.0 || >=24.11.0"
+      }
+    },
+    "node_modules/ast-walker-scope/node_modules/@babel/types": {
+      "version": "8.0.6",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-8.0.6.tgz",
+      "integrity": "sha512-c+xgSWboV2pdwXP67BUWDVRHi2BO5Q3KwxyFVs7taVTY+fsK47/L51ZXQoV9rozHJDNHvJ4v4WEsI/IlxV2l2A==",
+      "license": "MIT",
+      "dependencies": {
+        "@babel/helper-string-parser": "^8.0.6",
+        "@babel/helper-validator-identifier": "^8.0.6"
+      },
+      "engines": {
+        "node": "^22.18.0 || >=24.11.0"
+      }
+    },
     "node_modules/async": {
       "version": "3.2.6",
       "license": "MIT"
@@ -24924,6 +25143,21 @@
         "node": ">= 0.8.0"
       }
     },
+    "node_modules/chokidar": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-5.0.0.tgz",
+      "integrity": "sha512-TQMmc3w+5AxjpL8iIiwebF73dRDF4fBIieAqGn9RGCWaEVwQ6Fb2cGe31Yns0RRIzii5goJ1Y7xbMwo1TxMplw==",
+      "license": "MIT",
+      "dependencies": {
+        "readdirp": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 20.19.0"
+      },
+      "funding": {
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/chownr": {
       "version": "2.0.0",
       "dev": true,
@@ -25456,6 +25690,12 @@
         "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
+    "node_modules/confbox": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.3.1.tgz",
+      "integrity": "sha512-cKUSoKa8YxFZZSmraVi7onONx3amu77ngK3kGpsYHDH7drPwCRkQE1RYMPlLRrMtnciRj274XNRxcHxnKmDSnA==",
+      "license": "MIT"
+    },
     "node_modules/console-control-strings": {
       "version": "1.1.0",
       "dev": true,
@@ -27294,7 +27534,6 @@
     },
     "node_modules/estree-walker": {
       "version": "3.0.3",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "@types/estree": "^1.0.0"
@@ -27408,6 +27647,12 @@
       "dev": true,
       "license": "Apache-2.0"
     },
+    "node_modules/exsolve": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/exsolve/-/exsolve-1.1.3.tgz",
+      "integrity": "sha512-kuzL9zherLQoqDeQaS55AiiIg1kb4KYXaSusTtgZTPlvKP2gGCI82LNmBNh5RjDVUXIcmgx+/Mx7vPwRzBbhJA==",
+      "license": "MIT"
+    },
     "node_modules/fast-deep-equal": {
       "version": "3.1.3",
       "license": "MIT"
@@ -30802,7 +31047,7 @@
       "version": "1.33.0",
       "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.33.0.tgz",
       "integrity": "sha512-WkUDrojuJs0xkgGf2udWxa3yGBRxPtxUkB79i6aCZLRgc7PM8fZe9TosfPDcvEpQZbuFASnHYmRLBLUbmLOIIA==",
-      "dev": true,
+      "devOptional": true,
       "license": "MPL-2.0",
       "dependencies": {
         "detect-libc": "^2.0.3"
@@ -31110,6 +31355,39 @@
         "url": "https://jaywcjlove.github.io/#/sponsor"
       }
     },
+    "node_modules/local-pkg": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/local-pkg/-/local-pkg-1.2.1.tgz",
+      "integrity": "sha512-++gUqRDEvcnN6Zhqrr+y/CkVEHhlrR96vZn3nZZPYzMcBUyBtTKzB9NadClFIsIVSsu+3i9tfk/erqy9kAmt7Q==",
+      "license": "MIT",
+      "dependencies": {
+        "mlly": "^1.7.4",
+        "pkg-types": "^2.3.0",
+        "quansync": "^0.2.11"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antfu"
+      }
+    },
+    "node_modules/local-pkg/node_modules/quansync": {
+      "version": "0.2.11",
+      "resolved": "https://registry.npmjs.org/quansync/-/quansync-0.2.11.tgz",
+      "integrity": "sha512-AifT7QEbW9Nri4tAwR5M/uzpBuqfZf+zwaEM/QkzEjj7NBuFD2rBuy0K3dE+8wltbezDV7JMA0WfnCPYRSYbXA==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/antfu"
+        },
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/sxzz"
+        }
+      ],
+      "license": "MIT"
+    },
     "node_modules/locate-path": {
       "version": "6.0.0",
       "license": "MIT",
@@ -31243,6 +31521,21 @@
         "@jridgewell/sourcemap-codec": "^1.5.5"
       }
     },
+    "node_modules/magic-string-ast": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/magic-string-ast/-/magic-string-ast-1.0.3.tgz",
+      "integrity": "sha512-CvkkH1i81zl7mmb94DsRiFeG9V2fR2JeuK8yDgS8oiZSFa++wWLEgZ5ufEOyLHbvSbD1gTRKv9NdX69Rnvr9JA==",
+      "license": "MIT",
+      "dependencies": {
+        "magic-string": "^0.30.19"
+      },
+      "engines": {
+        "node": ">=20.19.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sxzz"
+      }
+    },
     "node_modules/magicast": {
       "version": "0.3.5",
       "dev": true,
@@ -31854,6 +32147,35 @@
         "node": ">=10"
       }
     },
+    "node_modules/mlly": {
+      "version": "1.8.2",
+      "resolved": "https://registry.npmjs.org/mlly/-/mlly-1.8.2.tgz",
+      "integrity": "sha512-d+ObxMQFmbt10sretNDytwt85VrbkhhUA/JBGm1MPaWJ65Cl4wOgLaB1NYvJSZ0Ef03MMEU/0xpPMXUIQ29UfA==",
+      "license": "MIT",
+      "dependencies": {
+        "acorn": "^8.16.0",
+        "pathe": "^2.0.3",
+        "pkg-types": "^1.3.1",
+        "ufo": "^1.6.3"
+      }
+    },
+    "node_modules/mlly/node_modules/confbox": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/confbox/-/confbox-0.1.8.tgz",
+      "integrity": "sha512-RMtmw0iFkeR4YV+fUOSucriAQNb9g8zFR52MWCtl+cCZOFRNL6zeB395vPzFhEjjn4fMxXudmELnl/KF/WrK6w==",
+      "license": "MIT"
+    },
+    "node_modules/mlly/node_modules/pkg-types": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-1.3.1.tgz",
+      "integrity": "sha512-/Jm5M4RvtBFVkKWRu2BLUTNP8/M2a+UwuAX+ae4770q1qVGtfjG+WTCupoZixokjmHiry8uI+dlY8KXYV5HVVQ==",
+      "license": "MIT",
+      "dependencies": {
+        "confbox": "^0.1.8",
+        "mlly": "^1.7.4",
+        "pathe": "^2.0.1"
+      }
+    },
     "node_modules/modify-values": {
       "version": "1.0.1",
       "dev": true,
@@ -32360,6 +32682,12 @@
         "node": ">=10"
       }
     },
+    "node_modules/nostics": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/nostics/-/nostics-1.3.0.tgz",
+      "integrity": "sha512-wzRsrJwNlFbqIRQt8aCeL2WE8USip/uuvGSOZV1D02CxX8ABTMbw8IywKjH7yWHETMXbWJI4OBpihg9rmz2Vyg==",
+      "license": "MIT"
+    },
     "node_modules/npm-bundled": {
       "version": "1.1.2",
       "dev": true,
@@ -33985,7 +34313,6 @@
     },
     "node_modules/pathe": {
       "version": "2.0.3",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/pathval": {
@@ -34011,7 +34338,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-2.1.0.tgz",
       "integrity": "sha512-LjgdTytVFXeUgtHZr9WYViYSM/g8MkcTPYDlPa3cDqMirHjKiSZPYd6DoL7pK8AJQr+uWkQvCjHNdiMqsrJs+g==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/picocolors": {
@@ -34112,6 +34438,17 @@
         "node": ">=8"
       }
     },
+    "node_modules/pkg-types": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/pkg-types/-/pkg-types-2.3.3.tgz",
+      "integrity": "sha512-j/lCFdcppV0JxWpCEITdbDltBxPP6cHT+yNJ6Go2OgoSA9518X847X9z0p6LtA4Nc16+eQzCZjRrWanTGvHJ5w==",
+      "license": "MIT",
+      "dependencies": {
+        "confbox": "^0.3.1",
+        "exsolve": "^1.1.1",
+        "pathe": "^2.0.3"
+      }
+    },
     "node_modules/possible-typed-array-names": {
       "version": "1.1.0",
       "dev": true,
@@ -35503,6 +35840,19 @@
         "node": ">= 6"
       }
     },
+    "node_modules/readdirp": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-5.1.1.tgz",
+      "integrity": "sha512-Kko+Y5XQ6fM+Ce3dq3m9YGxnacYZYl9cA1wZjaF3Vbry2L3i1qVg8+CAgNPsXRArPMUMCaOR7oa9Nqntc43JKA==",
+      "license": "MIT",
+      "engines": {
+        "node": ">= 20.19.0"
+      },
+      "funding": {
+        "type": "individual",
+        "url": "https://paulmillr.com/funding/"
+      }
+    },
     "node_modules/redent": {
       "version": "3.0.0",
       "dev": true,
@@ -36184,7 +36534,7 @@
     },
     "node_modules/rollup": {
       "version": "4.60.3",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "@types/estree": "1.0.8"
@@ -36410,6 +36760,12 @@
       "version": "0.27.0",
       "license": "MIT"
     },
+    "node_modules/scule": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/scule/-/scule-1.3.0.tgz",
+      "integrity": "sha512-6FtHJEvt+pVMIB9IBY+IcCJ6Z5f1iQnytgyfKMhDKgmzYG+TeH/wx1y3l27rshSbLiSanrR9ffZDrEsmjlQF2g==",
+      "license": "MIT"
+    },
     "node_modules/semver": {
       "version": "7.8.5",
       "license": "ISC",
@@ -39396,6 +39752,12 @@
         "typescript": ">=4.8.4"
       }
     },
+    "node_modules/ufo": {
+      "version": "1.6.4",
+      "resolved": "https://registry.npmjs.org/ufo/-/ufo-1.6.4.tgz",
+      "integrity": "sha512-JFNbkD1Svwe0KvGi8GOeLcP4kAWQ609twvCdcHxq1oSL8svv39ZuSvajcD8B+5D0eL4+s1Is2D/O6KN3qcTeRA==",
+      "license": "MIT"
+    },
     "node_modules/uglify-js": {
       "version": "3.19.3",
       "license": "BSD-2-Clause",
@@ -39536,7 +39898,6 @@
       "version": "0.3.2",
       "resolved": "https://registry.npmjs.org/unplugin-utils/-/unplugin-utils-0.3.2.tgz",
       "integrity": "sha512-xVToRh2CTmLk2HnEG7ac4rl1MJTT3RFkpS8B++/SnB0kXvuaavD+n3m/vrzyWQOdJNSZQACnbz01pnppbwV5BA==",
-      "dev": true,
       "license": "MIT",
       "dependencies": {
         "pathe": "^2.0.3",
@@ -39553,7 +39914,6 @@
       "version": "4.0.7",
       "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.7.tgz",
       "integrity": "sha512-qcJu88Q2IWqJsDD529JKMdwGm/dvInW4HvQnRwiH9JtihJvzGOscDtHE3x1pBKeUOTysQ8kVmLnJ2kJu7yhcGA==",
-      "dev": true,
       "license": "MIT",
       "engines": {
         "node": ">=12"
@@ -40298,6 +40658,12 @@
         "node": ">=12"
       }
     },
+    "node_modules/webpack-virtual-modules": {
+      "version": "0.6.2",
+      "resolved": "https://registry.npmjs.org/webpack-virtual-modules/-/webpack-virtual-modules-0.6.2.tgz",
+      "integrity": "sha512-66/V2i5hQanC51vBQKPH4aI8NMAcBW59FVBs+rC7eGHupMyfn34q7rZIE+ETlJ+XTevqfUhVVBgSUNSW2flEUQ==",
+      "license": "MIT"
+    },
     "node_modules/whatwg-encoding": {
       "version": "3.1.1",
       "dev": true,
diff --git a/packages/solid-react/README.md b/packages/solid-react/README.md
index 09c3be50..ccf4d328 100644
--- a/packages/solid-react/README.md
+++ b/packages/solid-react/README.md
@@ -33,7 +33,7 @@ npm i @ldo/ldo @ldo/solid-react
 
 ## Simple Example
 
-Below is a simple example of @ldo/solid-react in a real use-case. Assume that a ShapeType was previously generated and placed at `./_ldo/foafProfile.shapeTypes.ts`.
+Below is a simple example of `@ldo/solid-react` in a real use-case. Assume that a ShapeType was previously generated and placed at `./_ldo/foafProfile.shapeTypes.ts`.
 
 ```tsx
 import { useCallback, type FunctionComponent } from "react";
diff --git a/packages/solid-vue/README.md b/packages/solid-vue/README.md
index e5719571..9baee2d5 100644
--- a/packages/solid-vue/README.md
+++ b/packages/solid-vue/README.md
@@ -1 +1,25 @@
 # @ldo/solid-vue
+
+`@ldo/solid-vue` provides composables for easily building [Solid](https://solidproject.org) applications using [Vue](https://vuejs.org).
+
+**Note:** If you're building a generic RDF application with Vue, please use [@ldo/vue](https://www.npmjs.com/package/@ldo/vue) instead of this package.
+
+## Guide
+
+TODO
+
+## Installation
+
+TODO
+
+## Example
+
+TODO
+
+## API Details
+
+TODO
+
+## Caveats with `vue-router`
+
+If you're using `vue-router` with `createWebHashHistory` and you authenticate with `useSolidAuth` and `login`, the hash part of the redirect URI will be lost.
diff --git a/packages/solid-vue/src/createBrowserSolidVueMethods.ts b/packages/solid-vue/src/createBrowserSolidVueMethods.ts
index 215b43cd..3fe25da3 100644
--- a/packages/solid-vue/src/createBrowserSolidVueMethods.ts
+++ b/packages/solid-vue/src/createBrowserSolidVueMethods.ts
@@ -1,10 +1,12 @@
 import type { ConnectedLdoDataset, ConnectedPlugin } from "@ldo/connected";
 import type { SolidConnectedPlugin } from "@ldo/connected-solid";
+import { provideSolidAuth, useSolidAuth } from "./useSolidAuth.js";
 
 export function createBrowserSolidVueMethods(
   dataset: ConnectedLdoDataset<(SolidConnectedPlugin | ConnectedPlugin)[]>,
 ) {
   return {
-    useSolidAuth: undefined,
+    provideSolidAuth,
+    useSolidAuth,
   };
 }
diff --git a/packages/solid-vue/src/defaultInstance.ts b/packages/solid-vue/src/defaultInstance.ts
index 6bb514ae..6bb5b695 100644
--- a/packages/solid-vue/src/defaultInstance.ts
+++ b/packages/solid-vue/src/defaultInstance.ts
@@ -18,4 +18,5 @@ export const {
   useChangeMatchSubject,
 } = createLdoVueMethods([solidConnectedPlugin]);
 
-export const { useSolidAuth } = createBrowserSolidVueMethods(dataset);
+export const { useSolidAuth, provideSolidAuth } =
+  createBrowserSolidVueMethods(dataset);
diff --git a/packages/solid-vue/src/useSolidAuth.ts b/packages/solid-vue/src/useSolidAuth.ts
new file mode 100644
index 00000000..6c44c332
--- /dev/null
+++ b/packages/solid-vue/src/useSolidAuth.ts
@@ -0,0 +1,141 @@
+import {
+  inject,
+  onMounted,
+  provide,
+  ref,
+  type Ref,
+  type InjectionKey,
+  shallowRef,
+  triggerRef,
+  onBeforeUnmount,
+  getCurrentInstance,
+} from "vue";
+import { Session, SessionEvents } from "@uvdsl/solid-oidc-client-browser";
+
+type SolidAuthSession = {
+  login: Session["login"];
+  logout: Session["logout"];
+  signUp: Session["login"];
+  fetch: Session["authFetch"];
+  session: Ref<Session>;
+  ranInitialAuthCheck: Ref<boolean>;
+};
+
+const OidcSessionKey: InjectionKey<SolidAuthSession> = Symbol(
+  "solid auth context identifier",
+);
+
+/**
+ * A composable that sets up Solid OIDC authentication session.
+ * It provides the enhanced session to children and returns it.
+ * This composable should be called in the parent / root component of your Vue app.
+ * To access the authentication object in a child component, call `useSolidAuth()` composable in it.
+ */
+export function provideSolidAuth({
+  clientDetails,
+  sessionOptions,
+  waitFor,
+}: {
+  clientDetails?: ConstructorParameters<typeof Session>[0];
+  sessionOptions?: ConstructorParameters<typeof Session>[1];
+  waitFor?: () => Promise<void>;
+} = {}) {
+  const session = new Session(clientDetails, sessionOptions);
+  const sessionRef = shallowRef(session);
+  const ranInitialAuthCheck = ref(false);
+
+  const notify = () => triggerRef(sessionRef);
+
+  const handleStateChange = (event: Event) => {
+    sessionOptions?.onSessionStateChange?.(event);
+    notify();
+  };
+  const handleExpirationWarning = (event: Event) => {
+    sessionOptions?.onSessionExpirationWarning?.(event);
+    notify();
+  };
+  const handleExpiration = (event: Event) => {
+    sessionOptions?.onSessionExpiration?.(event);
+    notify();
+  };
+
+  session.addEventListener(SessionEvents.STATE_CHANGE, handleStateChange);
+  session.addEventListener(
+    SessionEvents.EXPIRATION_WARNING,
+    handleExpirationWarning,
+  );
+  session.addEventListener(SessionEvents.EXPIRATION, handleExpiration);
+
+  onMounted(async () => {
+    // handle quirks of the vue-router
+    const instance = getCurrentInstance();
+    const router = instance?.appContext.config.globalProperties.$router;
+    // wait for the router before we handle incoming redirect
+    // this is to avoid race condition in initial redirect
+    // in particular when the app uses vue-router with web router
+    let hash = "";
+    if (typeof router?.isReady === "function") {
+      await router.isReady();
+      // but hash router also ruins callback URI because of added hash
+      // so we want to remove that hash
+      if (globalThis.location.href.includes("#")) {
+        const uri = new URL(globalThis.location.href);
+        hash = uri.hash;
+        uri.hash = "";
+        globalThis.history.replaceState({}, "", uri);
+      }
+    }
+    await waitFor?.();
+
+    try {
+      await session.handleRedirectFromLogin();
+      if (!session.isActive) await session.restore().catch(() => {});
+    } finally {
+      // put the hash back if we took it
+      if (hash) {
+        const finalUri = new URL(globalThis.location.href);
+        if (!finalUri.hash) {
+          finalUri.hash = hash;
+          globalThis.history.replaceState(
+            globalThis.history.state,
+            "",
+            finalUri,
+          );
+        }
+      }
+      ranInitialAuthCheck.value = true;
+    }
+  });
+
+  onBeforeUnmount(() => {
+    session.removeEventListener(SessionEvents.STATE_CHANGE, handleStateChange);
+    session.removeEventListener(
+      SessionEvents.EXPIRATION_WARNING,
+      handleExpirationWarning,
+    );
+    session.removeEventListener(SessionEvents.EXPIRATION, handleExpiration);
+  });
+
+  const solidAuth: SolidAuthSession = {
+    session: sessionRef,
+    login: session.login.bind(session),
+    logout: session.logout.bind(session),
+    signUp: session.login.bind(session),
+    fetch: session.authFetch.bind(session),
+    ranInitialAuthCheck,
+  };
+
+  provide(OidcSessionKey, solidAuth);
+
+  return solidAuth;
+}
+
+/**
+ * Composable that returns Solid auth session.
+ * In order to use it, you have to run provideSolidAuth in an ancestor component.
+ */
+export function useSolidAuth() {
+  const auth = inject(OidcSessionKey);
+  if (!auth) throw new Error("useSolidAuth must have session provided");
+  return auth;
+}
diff --git a/packages/solid-vue/test/test-utils.ts b/packages/solid-vue/test/test-utils.ts
new file mode 100644
index 00000000..acba303f
--- /dev/null
+++ b/packages/solid-vue/test/test-utils.ts
@@ -0,0 +1,19 @@
+import { createApp, type App } from "vue";
+
+/**
+ * https://vuejs.org/guide/scaling-up/testing.html#testing-composables
+ */
+export function withSetup<T>(composable: () => T): [T, App<Element>] {
+  let result!: T;
+  const app = createApp({
+    setup() {
+      result = composable();
+      // suppress missing template warning
+      return () => {};
+    },
+  });
+  app.mount(document.createElement("div"));
+  // return the result and the app instance
+  // for testing provide/unmount
+  return [result, app];
+}

From 6d20da19f13a7b44fa9913bbcdfeaa51b92fd0d7 Mon Sep 17 00:00:00 2001
From: mrkvon <mrkvon@proton.me>
Date: Tue, 13 Oct 2026 08:23:07 +0200
Subject: [PATCH 03/15] Integrate solid auth and dataset, add the functionality
 to dev app

also add eslint config
---
 CHANGELOG.md                                  |   1 +
 dev/solid-vue-vite-app/eslint.config.js       |  21 +
 dev/solid-vue-vite-app/package.json           |   6 +-
 dev/solid-vue-vite-app/src/App.vue            |  41 +-
 .../src/{Main.vue => LandingPage.vue}         |   0
 .../{MatchSubject.vue => UseMatchSubject.vue} |   4 +-
 dev/solid-vue-vite-app/src/UseResource.vue    |  73 ++
 .../src/{SolidAuth.vue => UseSolidAuth.vue}   |  14 +-
 dev/solid-vue-vite-app/src/ldo.ts             |  17 +-
 dev/solid-vue-vite-app/src/router.ts          |  14 +-
 package-lock.json                             | 734 ++++++++++++++++++
 packages/solid-vue/package.json               |   1 +
 .../src/createBrowserSolidVueMethods.ts       |  68 +-
 packages/solid-vue/src/defaultInstance.ts     |  14 +-
 packages/solid-vue/src/index.ts               |   1 +
 15 files changed, 944 insertions(+), 65 deletions(-)
 create mode 100644 dev/solid-vue-vite-app/eslint.config.js
 rename dev/solid-vue-vite-app/src/{Main.vue => LandingPage.vue} (100%)
 rename dev/solid-vue-vite-app/src/{MatchSubject.vue => UseMatchSubject.vue} (92%)
 create mode 100644 dev/solid-vue-vite-app/src/UseResource.vue
 rename dev/solid-vue-vite-app/src/{SolidAuth.vue => UseSolidAuth.vue} (75%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55d72719..cb54d769 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 - **connected-solid:** Read links from Link header of a Solid resource. (#165)
 - **vue:** Add [Vue](https://vuejs.org) support with `@ldo/vue` package. ([#171](https://github.com/o-development/ldo/pull/171))
+- **solid-vue:** Add Solid + Vue support with `@ldo/solid-vue` package. It provides `@ldo/vue` integration with Solid dataset and Solid auth session and additional Solid-specific Vue composables. ([#173](https://github.com/o-development/ldo/pull/173))
 
 ### Changed
 
diff --git a/dev/solid-vue-vite-app/eslint.config.js b/dev/solid-vue-vite-app/eslint.config.js
new file mode 100644
index 00000000..22ddb3a5
--- /dev/null
+++ b/dev/solid-vue-vite-app/eslint.config.js
@@ -0,0 +1,21 @@
+import { globalIgnores } from "eslint/config";
+import {
+  defineConfigWithVueTs,
+  vueTsConfigs,
+} from "@vue/eslint-config-typescript";
+import pluginVue from "eslint-plugin-vue";
+
+// To allow more languages other than `ts` in `.vue` files, uncomment the following lines:
+// import { configureVueProject } from '@vue/eslint-config-typescript'
+// configureVueProject({ scriptLangs: ['ts', 'tsx'] })
+// More info at https://github.com/vuejs/eslint-config-typescript/#advanced-setup
+
+export default defineConfigWithVueTs(
+  {
+    name: "app/files-to-lint",
+    files: ["**/*.{vue,ts,mts,tsx}"],
+  },
+  globalIgnores(["**/dist/**", "**/dist-ssr/**", "**/coverage/**"]),
+  ...pluginVue.configs["flat/essential"],
+  vueTsConfigs.recommended,
+);
diff --git a/dev/solid-vue-vite-app/package.json b/dev/solid-vue-vite-app/package.json
index 55b3af6c..ef81ae36 100644
--- a/dev/solid-vue-vite-app/package.json
+++ b/dev/solid-vue-vite-app/package.json
@@ -9,7 +9,8 @@
     "preview": "vite preview",
     "build-only": "vite build",
     "type-check": "vue-tsc --build",
-    "build:ldo": "ldo build --input src/_shapes --output src/_ldo"
+    "build:ldo": "ldo build --input src/_shapes --output src/_ldo",
+    "lint": "eslint ."
   },
   "dependencies": {
     "@ldo/connected-solid": "^1.0.0-alpha.50",
@@ -26,7 +27,10 @@
     "@types/node": "^24.13.3",
     "@types/shexj": "^2.1.7",
     "@vitejs/plugin-vue": "^6.0.8",
+    "@vue/eslint-config-typescript": "^14.9.0",
     "@vue/tsconfig": "^0.9.1",
+    "eslint": "^10.12.0",
+    "eslint-plugin-vue": "^10.11.1",
     "npm-run-all2": "^9.0.2",
     "typescript": "~6.0.0",
     "vite": "^8.1.5",
diff --git a/dev/solid-vue-vite-app/src/App.vue b/dev/solid-vue-vite-app/src/App.vue
index b2b49efb..6caad18c 100644
--- a/dev/solid-vue-vite-app/src/App.vue
+++ b/dev/solid-vue-vite-app/src/App.vue
@@ -1,39 +1,23 @@
 <script setup lang="ts">
-import { computed, ref } from "vue";
-import { FoafProfileShapeType } from "./_ldo/foafProfile.shapeTypes.js";
-import { useSubject, useResource } from "./ldo.js";
-import { provideSolidAuth } from "@ldo/solid-vue";
+import { provideSolidLdo } from "./ldo.js";
 import { RouterView, RouterLink } from "vue-router";
-import { router } from "./router.js";
+import SolidAuth from "./UseSolidAuth.vue";
 
-const isValidUrl = (str: string) => {
-  try {
-    return Boolean(new URL(str));
-  } catch {
-    return false;
-  }
-};
-
-const inputUri = ref("");
-
-const validUri = computed(() =>
-  isValidUrl(inputUri.value) ? inputUri.value : "",
-);
-
-const subject = useSubject(FoafProfileShapeType, inputUri);
-console.log(subject);
-useResource(validUri);
-
-provideSolidAuth();
+provideSolidLdo();
 </script>
 
 <template>
   <header class="header">
     <nav class="navigation">
       <RouterLink to="/">home</RouterLink>
+      <RouterLink to="/resource">useResource</RouterLink>
       <RouterLink to="/solid-auth">useSolidAuth</RouterLink>
       <RouterLink to="/match-subject">useMatchSubject</RouterLink>
     </nav>
+
+    <div class="auth">
+      <SolidAuth />
+    </div>
   </header>
 
   <main>
@@ -46,13 +30,18 @@ provideSolidAuth();
   display: flex;
   flex-wrap: wrap;
   align-items: center;
+  justify-content: space-between;
+  margin: 1rem;
 }
-.navigation {
+
+.navigation,
+.auth {
   display: flex;
   gap: 1rem;
   flex-wrap: wrap;
-  padding: 1rem;
+}
 
+.navigation {
   a {
     text-decoration: none;
     color: purple;
diff --git a/dev/solid-vue-vite-app/src/Main.vue b/dev/solid-vue-vite-app/src/LandingPage.vue
similarity index 100%
rename from dev/solid-vue-vite-app/src/Main.vue
rename to dev/solid-vue-vite-app/src/LandingPage.vue
diff --git a/dev/solid-vue-vite-app/src/MatchSubject.vue b/dev/solid-vue-vite-app/src/UseMatchSubject.vue
similarity index 92%
rename from dev/solid-vue-vite-app/src/MatchSubject.vue
rename to dev/solid-vue-vite-app/src/UseMatchSubject.vue
index 0cf637e1..990b4617 100644
--- a/dev/solid-vue-vite-app/src/MatchSubject.vue
+++ b/dev/solid-vue-vite-app/src/UseMatchSubject.vue
@@ -53,10 +53,10 @@ useResource(validResource);
     </div>
 
     <ul>
-      <li v-for="item in subjectsSet">
+      <li v-for="item in subjectsSet" v-bind:key="item['@id']">
         {{ item.name ?? item["@id"] }}:
         <ul>
-          <li v-for="friend in item.knows">
+          <li v-for="friend in item.knows" v-bind:key="friend['@id']">
             {{ friend.name ?? friend["@id"] }}
           </li>
         </ul>
diff --git a/dev/solid-vue-vite-app/src/UseResource.vue b/dev/solid-vue-vite-app/src/UseResource.vue
new file mode 100644
index 00000000..9bbd590d
--- /dev/null
+++ b/dev/solid-vue-vite-app/src/UseResource.vue
@@ -0,0 +1,73 @@
+<script setup lang="ts">
+import { computed, ref, triggerRef } from "vue";
+import { useResource } from "./ldo.js";
+import type { SolidContainerUri, SolidLeafUri } from "@ldo/connected-solid";
+import type { UseResourceOptions } from "@ldo/vue";
+
+const uri = ref<SolidLeafUri | SolidContainerUri>(
+  "https://timbl.solidcommunity.net/profile/",
+);
+const subscribe = ref(false);
+const reloadOnMount = ref(false);
+const suppressInitialRead = ref(true);
+
+const options = computed<UseResourceOptions<"solid">>(() => ({
+  subscribe: subscribe.value,
+  reloadOnMount: reloadOnMount.value,
+  suppressInitialRead: suppressInitialRead.value,
+}));
+
+const resource = useResource(uri, options);
+
+const handleReadManually = async () => {
+  await resource.value.read();
+};
+
+const handleRefresh = () => {
+  triggerRef(resource);
+};
+</script>
+
+<template>
+  <h2>useResource</h2>
+
+  <div class="controls">
+    <label>uri: <input v-model="uri" placeholder="uri" size="50" /></label>
+    <button @click="handleReadManually">read manually</button>
+    <button @click="handleRefresh">refresh resource results</button>
+    <label
+      ><input v-model="suppressInitialRead" type="checkbox" />
+      suppressInitialRead</label
+    >
+    <label
+      ><input v-model="reloadOnMount" type="checkbox" /> reloadOnMount</label
+    >
+    <label><input type="checkbox" v-model="subscribe" /> subscribe</label>
+  </div>
+
+  <div class="results" v-if="resource">
+    <div>isDoingInitialFetch: {{ resource.isDoingInitialFetch() }}</div>
+    <div>isLoading: {{ resource.isLoading() }}</div>
+    <div>isReloading: {{ resource.isReloading() }}</div>
+    <div>isFetched: {{ resource.isFetched() }}</div>
+    <div>isUnfetched: {{ resource.isUnfetched() }}</div>
+    <div>isAbsent: {{ resource.isAbsent() }}</div>
+    <div>isPresent: {{ resource.isPresent() }}</div>
+    <div>status: {{ resource.status.type }}</div>
+    <div>
+      isSubscribedToNotifications: {{ resource.isSubscribedToNotifications() }}
+    </div>
+    <div>{{ (resource as any).notificationSubscription.subscriptions }}</div>
+    <div></div>
+  </div>
+</template>
+
+<style scoped lang="css">
+.controls {
+  display: flex;
+  flex-direction: column;
+  gap: 0.5rem;
+  align-items: flex-start;
+  margin-bottom: 2rem;
+}
+</style>
diff --git a/dev/solid-vue-vite-app/src/SolidAuth.vue b/dev/solid-vue-vite-app/src/UseSolidAuth.vue
similarity index 75%
rename from dev/solid-vue-vite-app/src/SolidAuth.vue
rename to dev/solid-vue-vite-app/src/UseSolidAuth.vue
index 11803186..0a7f8687 100644
--- a/dev/solid-vue-vite-app/src/SolidAuth.vue
+++ b/dev/solid-vue-vite-app/src/UseSolidAuth.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useSolidAuth } from "@ldo/solid-vue";
+import { useSolidAuth } from "./ldo.js";
 
 const solidAuth = useSolidAuth();
 
@@ -30,26 +30,16 @@ const login = async () => {
 async function logout() {
   await solidAuth.logout();
 }
-
-async function handleHistoryHome() {
-  globalThis.history.pushState({}, document.title, globalThis.location.origin);
-}
 </script>
 
 <template>
-  <h2>Solid Auth</h2>
   <div v-if="solidAuth.session.value.isActive">
     {{ solidAuth.session.value.webId }}
   </div>
 
   <div v-if="!solidAuth.ranInitialAuthCheck.value">CHECKING AUTH</div>
-
   <button @click="logout" v-else-if="solidAuth.session.value.isActive">
     Sign out
   </button>
-  <button @click="login" v-else="solidAuth.session.value.isActive">
-    Sign in
-  </button>
-
-  <button @click="handleHistoryHome">history home</button>
+  <button @click="login" v-else>Sign in</button>
 </template>
diff --git a/dev/solid-vue-vite-app/src/ldo.ts b/dev/solid-vue-vite-app/src/ldo.ts
index 54680072..c415d3fa 100644
--- a/dev/solid-vue-vite-app/src/ldo.ts
+++ b/dev/solid-vue-vite-app/src/ldo.ts
@@ -1,5 +1,14 @@
-import { createLdoVueMethods } from "@ldo/vue";
-import { solidConnectedPlugin } from "@ldo/connected-solid";
+import { createLdoVueComposables, createLdoVueMethods } from "@ldo/vue";
+import { createBrowserSolidVueComposables } from "@ldo/solid-vue";
+import { nextGraphConnectedPlugin } from "@ldo/connected-nextgraph";
 
-export const { dataset, useSubject, useResource, useMatchSubject } =
-  createLdoVueMethods([solidConnectedPlugin]);
+export const {
+  provideSolidLdo,
+  useSubject,
+  useResource,
+  useMatchSubject,
+  useSolidAuth,
+} = createBrowserSolidVueComposables([nextGraphConnectedPlugin]);
+
+createLdoVueMethods([nextGraphConnectedPlugin]);
+createLdoVueComposables([nextGraphConnectedPlugin]);
diff --git a/dev/solid-vue-vite-app/src/router.ts b/dev/solid-vue-vite-app/src/router.ts
index f8e71fb4..1703dd76 100644
--- a/dev/solid-vue-vite-app/src/router.ts
+++ b/dev/solid-vue-vite-app/src/router.ts
@@ -1,18 +1,20 @@
 import {
   createWebHistory,
   createRouter,
-  createWebHashHistory,
+  // createWebHashHistory,
 } from "vue-router";
-import SolidAuth from "./SolidAuth.vue";
-import MatchSubject from "./MatchSubject.vue";
-import Main from "./Main.vue";
+import SolidAuth from "./UseSolidAuth.vue";
+import MatchSubject from "./UseMatchSubject.vue";
+import LandingPage from "./LandingPage.vue";
+import UseResource from "./UseResource.vue";
 
 export const router = createRouter({
   history: createWebHistory(),
   routes: [
-    { path: "", component: Main },
+    { path: "", component: LandingPage },
     { path: "/solid-auth", component: SolidAuth },
     { path: "/match-subject", component: MatchSubject },
+    { path: "/resource", component: UseResource },
   ],
 });
 
@@ -32,5 +34,3 @@ export const router = createRouter({
 // router.onError((error) => {
 //   console.error("[Router] Error occurred during routing:", error);
 // });
-
-export default router;
diff --git a/package-lock.json b/package-lock.json
index 749a661c..d4b1405c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1130,7 +1130,10 @@
         "@types/node": "^24.13.3",
         "@types/shexj": "^2.1.7",
         "@vitejs/plugin-vue": "^6.0.8",
+        "@vue/eslint-config-typescript": "^14.9.0",
         "@vue/tsconfig": "^0.9.1",
+        "eslint": "^10.12.0",
+        "eslint-plugin-vue": "^10.11.1",
         "npm-run-all2": "^9.0.2",
         "typescript": "~6.0.0",
         "vite": "^8.1.5",
@@ -1141,6 +1144,71 @@
         "node": "^22.18.0 || >=24.12.0"
       }
     },
+    "dev/solid-vue-vite-app/node_modules/@eslint/config-array": {
+      "version": "0.23.5",
+      "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.23.5.tgz",
+      "integrity": "sha512-Y3kKLvC1dvTOT+oGlqNQ1XLqK6D1HU2YXPc52NmAlJZbMMWDzGYXMiPRJ8TYD39muD/OTjlZmNJ4ib7dvSrMBA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/object-schema": "^3.0.5",
+        "debug": "^4.3.1",
+        "minimatch": "^10.2.4"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      }
+    },
+    "dev/solid-vue-vite-app/node_modules/@eslint/config-helpers": {
+      "version": "0.7.0",
+      "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.7.0.tgz",
+      "integrity": "sha512-DObd/KKUsU+FaFv4PLxSRenpXfQWmPXXP3pPZ6/K1PCrMu2vQpMDMuQe/BqYeoLcz8ro0bVDF1RxOJgfVEdhUw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/core": "^1.2.1"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      }
+    },
+    "dev/solid-vue-vite-app/node_modules/@eslint/core": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/@eslint/core/-/core-1.2.1.tgz",
+      "integrity": "sha512-MwcE1P+AZ4C6DWlpin/OmOA54mmIZ/+xZuJiQd4SyB29oAJjN30UW9wkKNptW2ctp4cEsvhlLY/CsQ1uoHDloQ==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@types/json-schema": "^7.0.15"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      }
+    },
+    "dev/solid-vue-vite-app/node_modules/@eslint/object-schema": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-3.0.5.tgz",
+      "integrity": "sha512-vqTaUEgxzm+YDSdElad6PiRoX4t8VGDjCtt05zn4nU810UIx/uNEV7/lZJ6KwFThKZOzOxzXy48da+No7HZaMw==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      }
+    },
+    "dev/solid-vue-vite-app/node_modules/@eslint/plugin-kit": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.7.3.tgz",
+      "integrity": "sha512-IkO+/KEUvwbVpiURZg+P7zF74z5Jxe0UgJxVni+RtoHQ6IZieXaO02kmadomap/q+l6bc/jdPGGqTjhuZnuz1Q==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "dependencies": {
+        "@eslint/core": "^1.2.1",
+        "levn": "^0.4.1"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      }
+    },
     "dev/solid-vue-vite-app/node_modules/@oxc-project/types": {
       "version": "0.148.0",
       "resolved": "https://registry.npmjs.org/@oxc-project/types/-/types-0.148.0.tgz",
@@ -1202,6 +1270,174 @@
         "undici-types": "~7.18.0"
       }
     },
+    "dev/solid-vue-vite-app/node_modules/@typescript-eslint/parser": {
+      "version": "8.71.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.71.2.tgz",
+      "integrity": "sha512-aTtmZjp/x3gsGHkDs04/1I8kNogBJkpQaeGaN0PfiG43NzDEmW2n+OP5im9wfsvyX0yP1UZWBrAGtDBfH9jEVw==",
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "peer": true,
+      "dependencies": {
+        "@typescript-eslint/scope-manager": "8.71.2",
+        "@typescript-eslint/types": "8.71.2",
+        "@typescript-eslint/typescript-estree": "8.71.2",
+        "@typescript-eslint/visitor-keys": "8.71.2",
+        "debug": "^4.4.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "dev/solid-vue-vite-app/node_modules/@typescript-eslint/project-service": {
+      "version": "8.71.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.71.2.tgz",
+      "integrity": "sha512-Pd68GsLVh5ZXlcEccFPdhSOvtHZ/2WU0XsA8zmXOS3F158lVlcTLhfQ6qvtL1RzbMie0Kp8xtbVwAg4nejKPHw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/tsconfig-utils": "^8.71.2",
+        "@typescript-eslint/types": "^8.71.2",
+        "debug": "^4.4.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "dev/solid-vue-vite-app/node_modules/@typescript-eslint/scope-manager": {
+      "version": "8.71.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-8.71.2.tgz",
+      "integrity": "sha512-YF4wgg5iUX5Obywoac27B56FhozMNFhdJSbh11H5GBAwmBtfyRhmgTQqW9tRNNmHDvsZ2CX6UGzoz+YfYn2Leg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.71.2",
+        "@typescript-eslint/visitor-keys": "8.71.2"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "dev/solid-vue-vite-app/node_modules/@typescript-eslint/tsconfig-utils": {
+      "version": "8.71.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/tsconfig-utils/-/tsconfig-utils-8.71.2.tgz",
+      "integrity": "sha512-jz49TAWokm/7yWD9/o837nYax9DyALxIPOImdImvVzo6canBCZYzin8zJyqNR5k1j9K1DE0bVvr0XYB+99uAdg==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "dev/solid-vue-vite-app/node_modules/@typescript-eslint/types": {
+      "version": "8.71.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.71.2.tgz",
+      "integrity": "sha512-y5Ukl3oVp7e/VGxqIoEXoeb/Roj71PAJ4WG/N/RGj+eeDvKRLM15kGr9MijLbN0i03S52zxu31Z98E5gWChJKw==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
+    "dev/solid-vue-vite-app/node_modules/@typescript-eslint/typescript-estree": {
+      "version": "8.71.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-8.71.2.tgz",
+      "integrity": "sha512-DgNOEsl4pdYzwSL+N/Cl33tX1Hlw3FvId73LnKXfq7jnrF2viOEn7X+P7RBkkSWCVm92gnWd28GIC5vJuLREeA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/project-service": "8.71.2",
+        "@typescript-eslint/tsconfig-utils": "8.71.2",
+        "@typescript-eslint/types": "8.71.2",
+        "@typescript-eslint/visitor-keys": "8.71.2",
+        "debug": "^4.4.3",
+        "minimatch": "^10.2.2",
+        "semver": "^7.7.3",
+        "tinyglobby": "^0.2.15",
+        "ts-api-utils": "^2.5.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "dev/solid-vue-vite-app/node_modules/@typescript-eslint/utils": {
+      "version": "8.71.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-8.71.2.tgz",
+      "integrity": "sha512-RyKa1G1M9rKHDhrk+HJtiF1MvLD5Ux2JW3TSkzw+02pRALdpJb+QzG1Y5em+LvCgzGwgg8H7mBRFKljNz7ImPw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.9.1",
+        "@typescript-eslint/scope-manager": "8.71.2",
+        "@typescript-eslint/types": "8.71.2",
+        "@typescript-eslint/typescript-estree": "8.71.2"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "typescript": ">=4.8.4 <6.1.0"
+      }
+    },
+    "dev/solid-vue-vite-app/node_modules/@typescript-eslint/visitor-keys": {
+      "version": "8.71.2",
+      "resolved": "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-8.71.2.tgz",
+      "integrity": "sha512-zozlN0UA32bSG2zkKAgQyRYSbEISVoyU6vvkKYo2aSny74D8Jh4e+POkJ6Lk0dlezZi5x7TtD+88Xb06IB8nhg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/types": "8.71.2",
+        "eslint-visitor-keys": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/typescript-eslint"
+      }
+    },
     "dev/solid-vue-vite-app/node_modules/@volar/language-core": {
       "version": "2.4.28",
       "resolved": "https://registry.npmjs.org/@volar/language-core/-/language-core-2.4.28.tgz",
@@ -1231,6 +1467,35 @@
         "vscode-uri": "^3.0.8"
       }
     },
+    "dev/solid-vue-vite-app/node_modules/@vue/eslint-config-typescript": {
+      "version": "14.9.0",
+      "resolved": "https://registry.npmjs.org/@vue/eslint-config-typescript/-/eslint-config-typescript-14.9.0.tgz",
+      "integrity": "sha512-E3j9hDlfVf10F30MRcLTPY2IIhWIx1nsvkVukk14kTcuA+oBVot9zsP1hzsO+PAMDxV3Fd9FimBJtUBNBL5KFA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@typescript-eslint/utils": "^8.60.0",
+        "fast-glob": "^3.3.3",
+        "typescript-eslint": "^8.60.0",
+        "vue-eslint-parser": "^10.4.0"
+      },
+      "bin": {
+        "vue-eslint-config-typescript": "dist/bin.js"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "peerDependencies": {
+        "eslint": "^9.10.0 || ^10.0.0",
+        "eslint-plugin-vue": "^9.28.0 || ^10.0.0",
+        "typescript": ">=4.8.4"
+      },
+      "peerDependenciesMeta": {
+        "typescript": {
+          "optional": true
+        }
+      }
+    },
     "dev/solid-vue-vite-app/node_modules/@vue/language-core": {
       "version": "3.3.11",
       "resolved": "https://registry.npmjs.org/@vue/language-core/-/language-core-3.3.11.tgz",
@@ -1247,6 +1512,192 @@
         "picomatch": "^4.0.4"
       }
     },
+    "dev/solid-vue-vite-app/node_modules/balanced-match": {
+      "version": "4.0.4",
+      "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-4.0.4.tgz",
+      "integrity": "sha512-BLrgEcRTwX2o6gGxGOCNyMvGSp35YofuYzw9h1IMTRmKqttAZZVU67bdb9Pr2vUHA8+j3i2tJfjO6C6+4myGTA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": "18 || 20 || >=22"
+      }
+    },
+    "dev/solid-vue-vite-app/node_modules/brace-expansion": {
+      "version": "5.0.12",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-5.0.12.tgz",
+      "integrity": "sha512-YovQ3rzhaLMIrDjNDMkNS01tea93qhEhG5xy8f6+R0l+dw3Ki+5sCoIoI942iuLZTHWogWktgwVDhU09iNEimQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "balanced-match": "^4.0.2"
+      },
+      "engines": {
+        "node": "20 || >=22"
+      }
+    },
+    "dev/solid-vue-vite-app/node_modules/eslint": {
+      "version": "10.12.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-10.12.0.tgz",
+      "integrity": "sha512-npHjrHb2o4ehH3mE+YuxABR+0gyb0aVWCIolgJDArwCiHEIsonBm3ZKjel5b0U5+a+MbEvIyRCGCzD3eKKK2NA==",
+      "dev": true,
+      "license": "MIT",
+      "workspaces": [
+        "packages/*"
+      ],
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.8.0",
+        "@eslint-community/regexpp": "^4.12.2",
+        "@eslint/config-array": "^0.23.5",
+        "@eslint/config-helpers": "^0.7.0",
+        "@eslint/core": "^1.2.1",
+        "@eslint/plugin-kit": "^0.7.3",
+        "@humanfs/node": "^0.16.6",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@humanwhocodes/retry": "^0.4.2",
+        "@types/estree": "^1.0.6",
+        "ajv": "^6.14.0",
+        "cross-spawn": "^7.0.6",
+        "debug": "^4.3.2",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^9.1.2",
+        "eslint-visitor-keys": "^5.0.1",
+        "espree": "^11.2.0",
+        "esquery": "^1.7.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "11.1.5 || >11.1.6 <12",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "minimatch": "^10.2.5",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      },
+      "funding": {
+        "url": "https://eslint.org/donate"
+      },
+      "peerDependencies": {
+        "jiti": "*"
+      },
+      "peerDependenciesMeta": {
+        "jiti": {
+          "optional": true
+        }
+      }
+    },
+    "dev/solid-vue-vite-app/node_modules/eslint-plugin-vue": {
+      "version": "10.11.1",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-vue/-/eslint-plugin-vue-10.11.1.tgz",
+      "integrity": "sha512-pasVXhl7wUmIvhujoqs/m0mJ9r59QW1IR9XXYKGR0FETzSM+Hhlf4qKIYgWiDDP+9YKv4YfbwskD7LqIdVcgQw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.9.1",
+        "natural-compare": "^1.4.0",
+        "nth-check": "^2.1.1",
+        "postcss-selector-parser": "^7.1.4",
+        "semver": "^7.8.5",
+        "xml-name-validator": "^5.0.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "peerDependencies": {
+        "@stylistic/eslint-plugin": "^2.0.0 || ^3.0.0 || ^4.0.0 || ^5.0.0",
+        "@typescript-eslint/parser": "^7.0.0 || ^8.0.0",
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
+        "vue-eslint-parser": "^10.3.0"
+      },
+      "peerDependenciesMeta": {
+        "@stylistic/eslint-plugin": {
+          "optional": true
+        },
+        "@typescript-eslint/parser": {
+          "optional": true
+        }
+      }
+    },
+    "dev/solid-vue-vite-app/node_modules/eslint-scope": {
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-9.1.2.tgz",
+      "integrity": "sha512-xS90H51cKw0jltxmvmHy2Iai1LIqrfbw57b79w/J7MfvDfkIkFZ+kj6zC3BjtUwh150HsSSdxXZcsuv72miDFQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@types/esrecurse": "^4.3.1",
+        "@types/estree": "^1.0.8",
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "dev/solid-vue-vite-app/node_modules/eslint-visitor-keys": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
+      "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "dev/solid-vue-vite-app/node_modules/espree": {
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-11.2.0.tgz",
+      "integrity": "sha512-7p3DrVEIopW1B1avAGLuCSh1jubc01H2JHc8B4qqGblmg5gI9yumBgACjWo4JlIc04ufug4xJ3SQI8HkS/Rgzw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "acorn": "^8.16.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^5.0.1"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "dev/solid-vue-vite-app/node_modules/file-entry-cache": {
+      "version": "11.1.5",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-11.1.5.tgz",
+      "integrity": "sha512-+PFTHITI08JIGhnNpGNI8T8inUpgZfk3GNEqfT9R2zZV2iFXg3CvqzSl/uEhs7TSGujYRELEANyDvS8Fj7+S7Q==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "flat-cache": "^6.1.23"
+      }
+    },
+    "dev/solid-vue-vite-app/node_modules/flat-cache": {
+      "version": "6.1.23",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-6.1.23.tgz",
+      "integrity": "sha512-f++BY9pTk+983xK1FLzlLpmM0i0z+jHmx3QESGkURMXujQZz1k5wzwX6hjnQ8goaD0B+sYnDK1yZ6MTyZfUaqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cacheable": "^2.5.0",
+        "flatted": "^3.4.2",
+        "hookified": "^1.15.0"
+      }
+    },
     "dev/solid-vue-vite-app/node_modules/magic-string": {
       "version": "1.4.3",
       "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-1.4.3.tgz",
@@ -1256,6 +1707,22 @@
         "@jridgewell/sourcemap-codec": "^1.6.0"
       }
     },
+    "dev/solid-vue-vite-app/node_modules/minimatch": {
+      "version": "10.2.6",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.2.6.tgz",
+      "integrity": "sha512-vpLQEs+VLCr1nU0BXS07maYoFwlDAH0gngQuuttxIwutDFEMHq2blX+8vpgxDdK3J1PwjCJiep77OitTZ4Ll1A==",
+      "dev": true,
+      "license": "BlueOak-1.0.0",
+      "dependencies": {
+        "brace-expansion": "^5.0.8"
+      },
+      "engines": {
+        "node": "18 || 20 || >=22"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
     "dev/solid-vue-vite-app/node_modules/muggle-string": {
       "version": "0.4.1",
       "resolved": "https://registry.npmjs.org/muggle-string/-/muggle-string-0.4.1.tgz",
@@ -1308,6 +1775,19 @@
         "@rolldown/binding-win32-x64-msvc": "1.2.7"
       }
     },
+    "dev/solid-vue-vite-app/node_modules/ts-api-utils": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.5.0.tgz",
+      "integrity": "sha512-OJ/ibxhPlqrMM0UiNHJ/0CKQkoKF243/AEmplt3qpRgkW8VG7IfOS41h7V8TjITqdByHzrjcS/2si+y4lIh8NA==",
+      "dev": true,
+      "license": "MIT",
+      "engines": {
+        "node": ">=18.12"
+      },
+      "peerDependencies": {
+        "typescript": ">=4.8.4"
+      }
+    },
     "dev/solid-vue-vite-app/node_modules/typescript": {
       "version": "6.0.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-6.0.3.tgz",
@@ -3197,6 +3677,67 @@
       "dev": true,
       "license": "ISC"
     },
+    "node_modules/@cacheable/memory": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/@cacheable/memory/-/memory-2.2.0.tgz",
+      "integrity": "sha512-CTLKqLItRCEixEAewD3/j9DB3/o96gpTPD4eJ1v+DGOlxZRZncRQkGYqqnAGCscYd6RNeXfGeiuCphsPtqyIfQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cacheable/utils": "^2.5.0",
+        "@keyv/bigmap": "^1.3.1",
+        "hookified": "^1.15.1",
+        "keyv": "^5.6.0"
+      }
+    },
+    "node_modules/@cacheable/memory/node_modules/@keyv/bigmap": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/@keyv/bigmap/-/bigmap-1.3.1.tgz",
+      "integrity": "sha512-WbzE9sdmQtKy8vrNPa9BRnwZh5UF4s1KTmSK0KUVLo3eff5BlQNNWDnFOouNpKfPKDnms9xynJjsMYjMaT/aFQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hashery": "^1.4.0",
+        "hookified": "^1.15.0"
+      },
+      "engines": {
+        "node": ">= 18"
+      },
+      "peerDependencies": {
+        "keyv": "^5.6.0"
+      }
+    },
+    "node_modules/@cacheable/memory/node_modules/keyv": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
+      "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@keyv/serialize": "^1.1.1"
+      }
+    },
+    "node_modules/@cacheable/utils": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/@cacheable/utils/-/utils-2.5.0.tgz",
+      "integrity": "sha512-buipgOVDkkPXNR5+xBpDw7Zk2n1EvU7qBJCNUcL7rhQ//kfpOXPAvQ511Os0vpLYJ1pZnvudNytkQt2hst3wqA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hashery": "^1.5.1",
+        "keyv": "^5.6.0"
+      }
+    },
+    "node_modules/@cacheable/utils/node_modules/keyv": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
+      "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@keyv/serialize": "^1.1.1"
+      }
+    },
     "node_modules/@colors/colors": {
       "version": "1.5.0",
       "dev": true,
@@ -18380,6 +18921,13 @@
         "tslib": "2"
       }
     },
+    "node_modules/@keyv/serialize": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@keyv/serialize/-/serialize-1.1.1.tgz",
+      "integrity": "sha512-dXn3FZhPv0US+7dtJsIi2R+c7qWYiReoEh5zUntWCf4oSpMNib8FDhSoed6m3QyZdx5hK7iLFkYk3rNxwt8vTA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/@koa/cors": {
       "version": "5.0.0",
       "license": "MIT",
@@ -24698,6 +25246,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/boolbase": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
+      "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==",
+      "dev": true,
+      "license": "ISC"
+    },
     "node_modules/brace-expansion": {
       "version": "2.1.0",
       "license": "MIT",
@@ -24962,6 +25517,30 @@
         "node": "*"
       }
     },
+    "node_modules/cacheable": {
+      "version": "2.5.0",
+      "resolved": "https://registry.npmjs.org/cacheable/-/cacheable-2.5.0.tgz",
+      "integrity": "sha512-60cyAOytib/OzBw1JNSoSV/boK1AtHryDIjvVBk7XbN4ugfkM3+Sry7fEjNgPMGgOjuaZPAp8ruZ0Cxafwyq9g==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@cacheable/memory": "^2.2.0",
+        "@cacheable/utils": "^2.5.0",
+        "hookified": "^1.15.0",
+        "keyv": "^5.6.0",
+        "qified": "^0.10.1"
+      }
+    },
+    "node_modules/cacheable/node_modules/keyv": {
+      "version": "5.6.0",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-5.6.0.tgz",
+      "integrity": "sha512-CYDD3SOtsHtyXeEORYRx2qBtpDJFjRTGXUtmNEMGyzYOKj1TE3tycdlho7kA1Ufx9OYWZzg52QFBGALTirzDSw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "@keyv/serialize": "^1.1.1"
+      }
+    },
     "node_modules/call-bind": {
       "version": "1.0.9",
       "dev": true,
@@ -26048,6 +26627,19 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "dev": true,
+      "license": "MIT",
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/cssstyle": {
       "version": "4.6.0",
       "dev": true,
@@ -28718,6 +29310,19 @@
         "minimalistic-assert": "^1.0.1"
       }
     },
+    "node_modules/hashery": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/hashery/-/hashery-1.5.1.tgz",
+      "integrity": "sha512-iZyKG96/JwPz1N55vj2Ie2vXbhu440zfUfJvSwEqEbeLluk7NnapfGqa7LH0mOsnDxTF85Mx8/dyR6HfqcbmbQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hookified": "^1.15.0"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
     "node_modules/hasown": {
       "version": "2.0.3",
       "license": "MIT",
@@ -28766,6 +29371,13 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/hookified": {
+      "version": "1.15.1",
+      "resolved": "https://registry.npmjs.org/hookified/-/hookified-1.15.1.tgz",
+      "integrity": "sha512-MvG/clsADq1GPM2KGo2nyfaWVyn9naPiXrqIe4jYjXNZQt238kWyOGrsyc/DmRAQ+Re6yeo6yX/yoNCG5KAEVg==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/hosted-git-info": {
       "version": "4.1.0",
       "dev": true,
@@ -33317,6 +33929,19 @@
         "node": "^12.13.0 || ^14.15.0 || >=16.0.0"
       }
     },
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "boolbase": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      }
+    },
     "node_modules/nwsapi": {
       "version": "2.2.23",
       "dev": true,
@@ -34485,6 +35110,20 @@
         "node": "^10 || ^12 || >=14"
       }
     },
+    "node_modules/postcss-selector-parser": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.6.tgz",
+      "integrity": "sha512-7qASPzhKF2l2KLboRZux8CCTRMdGiV08vWmyKzPz22qZ7ZjQBOeY7rNzNoCLSUiftJ7HUq0GERHmxw/t0dCdMw==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
     "node_modules/powershell-utils": {
       "version": "0.2.1",
       "resolved": "https://registry.npmjs.org/powershell-utils/-/powershell-utils-0.2.1.tgz",
@@ -34735,6 +35374,26 @@
         "node": ">=6"
       }
     },
+    "node_modules/qified": {
+      "version": "0.10.1",
+      "resolved": "https://registry.npmjs.org/qified/-/qified-0.10.1.tgz",
+      "integrity": "sha512-+Owyggi9IxT1ePKGafcI87ubSmxol6smwJ+RAHDQlx9+9cPwFWDiKFFCPuWhr9ignlGpZ9vDQLw67N4dcTVFEA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "hookified": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=20"
+      }
+    },
+    "node_modules/qified/node_modules/hookified": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/hookified/-/hookified-2.2.0.tgz",
+      "integrity": "sha512-p/LgFzRN5FeoD3DLS6bkUapeye6E4SI6yJs6KetENd18S+FBthqYq2amJUWpt5z0EQwwHemidjY5OqJGEKm5uA==",
+      "dev": true,
+      "license": "MIT"
+    },
     "node_modules/qs": {
       "version": "6.15.1",
       "license": "BSD-3-Clause",
@@ -40588,6 +41247,80 @@
         }
       }
     },
+    "node_modules/vue-eslint-parser": {
+      "version": "10.4.1",
+      "resolved": "https://registry.npmjs.org/vue-eslint-parser/-/vue-eslint-parser-10.4.1.tgz",
+      "integrity": "sha512-Gk6gRDj0n/fkRa3C3l0bBheoBckUq/Rs0F/TvMWIS6nzzx67amAViMe9CkNgsP2tXyQONvGiHQESHwFtZ3aYDA==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "debug": "^4.4.0",
+        "eslint-scope": "^8.2.0 || ^9.0.0",
+        "eslint-visitor-keys": "^4.2.0 || ^5.0.0",
+        "espree": "^10.3.0 || ^11.0.0",
+        "esquery": "^1.6.0",
+        "semver": "^7.6.3"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/mysticatea"
+      },
+      "peerDependencies": {
+        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/eslint-scope": {
+      "version": "9.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-9.1.2.tgz",
+      "integrity": "sha512-xS90H51cKw0jltxmvmHy2Iai1LIqrfbw57b79w/J7MfvDfkIkFZ+kj6zC3BjtUwh150HsSSdxXZcsuv72miDFQ==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "@types/esrecurse": "^4.3.1",
+        "@types/estree": "^1.0.8",
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/eslint-visitor-keys": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-5.0.1.tgz",
+      "integrity": "sha512-tD40eHxA35h0PEIZNeIjkHoDR4YjjJp34biM0mDvplBe//mB+IHCqHDGV7pxF+7MklTvighcCPPZC7ynWyjdTA==",
+      "dev": true,
+      "license": "Apache-2.0",
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/vue-eslint-parser/node_modules/espree": {
+      "version": "11.2.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-11.2.0.tgz",
+      "integrity": "sha512-7p3DrVEIopW1B1avAGLuCSh1jubc01H2JHc8B4qqGblmg5gI9yumBgACjWo4JlIc04ufug4xJ3SQI8HkS/Rgzw==",
+      "dev": true,
+      "license": "BSD-2-Clause",
+      "dependencies": {
+        "acorn": "^8.16.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^5.0.1"
+      },
+      "engines": {
+        "node": "^20.19.0 || ^22.13.0 || >=24"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
     "node_modules/vue-template-compiler": {
       "version": "2.7.16",
       "dev": true,
@@ -42181,6 +42914,7 @@
       "version": "1.0.0-alpha.50",
       "license": "MIT",
       "dependencies": {
+        "@ldo/connected": "^1.0.0-alpha.50",
         "@ldo/connected-solid": "^1.0.0-alpha.50",
         "@ldo/vue": "^1.0.0-alpha.50"
       },
diff --git a/packages/solid-vue/package.json b/packages/solid-vue/package.json
index 83c140e5..ad3cb7e8 100644
--- a/packages/solid-vue/package.json
+++ b/packages/solid-vue/package.json
@@ -41,6 +41,7 @@
   },
   "homepage": "https://github.com/o-development/ldo/tree/main/packages/solid-vue#readme",
   "dependencies": {
+    "@ldo/connected": "^1.0.0-alpha.50",
     "@ldo/connected-solid": "^1.0.0-alpha.50",
     "@ldo/vue": "^1.0.0-alpha.50"
   },
diff --git a/packages/solid-vue/src/createBrowserSolidVueMethods.ts b/packages/solid-vue/src/createBrowserSolidVueMethods.ts
index 3fe25da3..280a7e94 100644
--- a/packages/solid-vue/src/createBrowserSolidVueMethods.ts
+++ b/packages/solid-vue/src/createBrowserSolidVueMethods.ts
@@ -1,12 +1,70 @@
-import type { ConnectedLdoDataset, ConnectedPlugin } from "@ldo/connected";
-import type { SolidConnectedPlugin } from "@ldo/connected-solid";
+import { createLdoVueComposables, type useResourceType } from "@ldo/vue";
 import { provideSolidAuth, useSolidAuth } from "./useSolidAuth.js";
+import {
+  isSolidUri,
+  type SolidConnectedPlugin,
+  solidConnectedPlugin,
+  type SolidContainer,
+  type SolidContainerUri,
+  type SolidLeaf,
+  type SolidLeafUri,
+  type SolidResource,
+} from "@ldo/connected-solid";
+import type { ConnectedPlugin } from "@ldo/connected";
+import { type MaybeRefOrGetter, toValue, triggerRef, watch } from "vue";
+import { nextGraphConnectedPlugin } from "@ldo/connected-nextgraph";
 
-export function createBrowserSolidVueMethods(
-  dataset: ConnectedLdoDataset<(SolidConnectedPlugin | ConnectedPlugin)[]>,
-) {
+export function createBrowserSolidVueComposables<
+  Plugin extends ConnectedPlugin = never,
+>(additionalPlugins: Plugin[] = []) {
+  const { provideDataset, useResource, ...vueComposables } =
+    createLdoVueComposables([solidConnectedPlugin, ...additionalPlugins]);
+  /**
+   * If the uri is Solid uri, we want refetch the resource when session.isActive changes
+   */
+  const useResourceWithAuth: typeof useResource = (
+    uri: Parameters<typeof useResource>[0],
+    options: Parameters<typeof useResource>[1],
+  ) => {
+    const resourceRef = useResource(uri, options);
+    const solidAuth = useSolidAuth();
+    watch([() => solidAuth.session.value.isActive], async ([isActive]) => {
+      const uriValue = toValue(uri);
+      const { suppressInitialRead } = toValue(options) ?? {};
+      if (uriValue && isSolidUri(uriValue)) {
+        const resource = resourceRef.value as SolidLeaf | SolidContainer;
+        // if the read has not been initialized and initial read is suppressed, don't re-read
+        if (
+          !(
+            suppressInitialRead &&
+            resource.status.type === "unfetched" &&
+            !resource.isLoading()
+          )
+        ) {
+          console.log("REFETCHING");
+          await resourceRef.value!.read();
+        }
+      }
+    });
+    return resourceRef;
+  };
+  function provideSolidLdo() {
+    const dataset = provideDataset();
+    const solidAuth = provideSolidAuth();
+    dataset.setContext("solid", { fetch: solidAuth.fetch });
+    return { dataset, solidAuth };
+  }
   return {
+    provideSolidLdo,
+    provideDataset,
+    useResource: useResourceWithAuth,
+    ...vueComposables,
     provideSolidAuth,
     useSolidAuth,
   };
 }
+
+createBrowserSolidVueComposables([
+  solidConnectedPlugin,
+  nextGraphConnectedPlugin,
+]);
diff --git a/packages/solid-vue/src/defaultInstance.ts b/packages/solid-vue/src/defaultInstance.ts
index 6bb5b695..730e5b6c 100644
--- a/packages/solid-vue/src/defaultInstance.ts
+++ b/packages/solid-vue/src/defaultInstance.ts
@@ -1,9 +1,10 @@
-import { solidConnectedPlugin } from "@ldo/connected-solid";
-import { createLdoVueMethods } from "@ldo/vue";
-import { createBrowserSolidVueMethods } from "./createBrowserSolidVueMethods";
+import { createBrowserSolidVueComposables } from "./createBrowserSolidVueMethods";
 
 export const {
-  dataset,
+  provideSolidLdo,
+  provideDataset,
+  provideSolidAuth,
+  useSolidAuth,
   useDataset,
   useLdo,
   useResource,
@@ -16,7 +17,4 @@ export const {
   useChangeSubject,
   useChangeMatchObject,
   useChangeMatchSubject,
-} = createLdoVueMethods([solidConnectedPlugin]);
-
-export const { useSolidAuth, provideSolidAuth } =
-  createBrowserSolidVueMethods(dataset);
+} = createBrowserSolidVueComposables();
diff --git a/packages/solid-vue/src/index.ts b/packages/solid-vue/src/index.ts
index 07aca416..7b19dd41 100644
--- a/packages/solid-vue/src/index.ts
+++ b/packages/solid-vue/src/index.ts
@@ -1,2 +1,3 @@
+export type * from "@ldo/vue";
 export * from "./createBrowserSolidVueMethods";
 export * from "./defaultInstance";

From 8c5c90cbf8b2933a79b16ca48a6760854f47b650 Mon Sep 17 00:00:00 2001
From: mrkvon <mrkvon@proton.me>
Date: Tue, 13 Oct 2026 22:30:20 +0200
Subject: [PATCH 04/15] Implement useRootContainerFor composable

Also test the composable manually via the dev vite app.
And add primary dark mode.
---
 dev/solid-vue-vite-app/src/App.vue            | 10 +--
 .../src/UseRootContainerFor.vue               | 19 ++++++
 dev/solid-vue-vite-app/src/ldo.ts             |  1 +
 dev/solid-vue-vite-app/src/main.css           |  3 +
 dev/solid-vue-vite-app/src/main.ts            |  1 +
 dev/solid-vue-vite-app/src/router.ts          |  8 ++-
 .../src/createBrowserSolidVueMethods.ts       | 66 +++++--------------
 packages/solid-vue/src/useResourceWithAuth.ts | 50 ++++++++++++++
 packages/solid-vue/src/useRootContainerFor.ts | 49 ++++++++++++++
 packages/solid-vue/test/SolidAuth.test.ts     |  5 --
 .../solid-vue/test/SolidComposables.test.ts   | 17 +++++
 11 files changed, 168 insertions(+), 61 deletions(-)
 create mode 100644 dev/solid-vue-vite-app/src/UseRootContainerFor.vue
 create mode 100644 dev/solid-vue-vite-app/src/main.css
 create mode 100644 packages/solid-vue/src/useResourceWithAuth.ts
 create mode 100644 packages/solid-vue/src/useRootContainerFor.ts
 delete mode 100644 packages/solid-vue/test/SolidAuth.test.ts
 create mode 100644 packages/solid-vue/test/SolidComposables.test.ts

diff --git a/dev/solid-vue-vite-app/src/App.vue b/dev/solid-vue-vite-app/src/App.vue
index 6caad18c..119f8b65 100644
--- a/dev/solid-vue-vite-app/src/App.vue
+++ b/dev/solid-vue-vite-app/src/App.vue
@@ -10,9 +10,10 @@ provideSolidLdo();
   <header class="header">
     <nav class="navigation">
       <RouterLink to="/">home</RouterLink>
-      <RouterLink to="/resource">useResource</RouterLink>
-      <RouterLink to="/solid-auth">useSolidAuth</RouterLink>
-      <RouterLink to="/match-subject">useMatchSubject</RouterLink>
+      <RouterLink to="/use-resource">useResource</RouterLink>
+      <RouterLink to="/use-solid-auth">useSolidAuth</RouterLink>
+      <RouterLink to="/use-match-subject">useMatchSubject</RouterLink>
+      <RouterLink to="/use-root-container-for">useRootContainerFor</RouterLink>
     </nav>
 
     <div class="auth">
@@ -44,12 +45,11 @@ provideSolidLdo();
 .navigation {
   a {
     text-decoration: none;
-    color: purple;
     font-variant: small-caps;
     cursor: pointer;
 
     &.router-link-exact-active {
-      color: green;
+      color: red;
     }
   }
 }
diff --git a/dev/solid-vue-vite-app/src/UseRootContainerFor.vue b/dev/solid-vue-vite-app/src/UseRootContainerFor.vue
new file mode 100644
index 00000000..3791a8ac
--- /dev/null
+++ b/dev/solid-vue-vite-app/src/UseRootContainerFor.vue
@@ -0,0 +1,19 @@
+<script setup lang="ts">
+import type { SolidLeafUri, SolidContainerUri } from "@ldo/connected-solid";
+import { ref } from "vue";
+import { useRootContainerFor } from "./ldo.ts";
+
+const uri = ref<SolidLeafUri | SolidContainerUri>(
+  "https://timbl.solidcommunity.net/profile/card",
+);
+
+const rootContainer = useRootContainerFor(uri);
+</script>
+
+<template>
+  <h2>useRootContainerFor(uri, options?)</h2>
+
+  <input v-model="uri" />
+
+  <div>{{ rootContainer?.uri }}</div>
+</template>
diff --git a/dev/solid-vue-vite-app/src/ldo.ts b/dev/solid-vue-vite-app/src/ldo.ts
index c415d3fa..074ea14d 100644
--- a/dev/solid-vue-vite-app/src/ldo.ts
+++ b/dev/solid-vue-vite-app/src/ldo.ts
@@ -8,6 +8,7 @@ export const {
   useResource,
   useMatchSubject,
   useSolidAuth,
+  useRootContainerFor,
 } = createBrowserSolidVueComposables([nextGraphConnectedPlugin]);
 
 createLdoVueMethods([nextGraphConnectedPlugin]);
diff --git a/dev/solid-vue-vite-app/src/main.css b/dev/solid-vue-vite-app/src/main.css
new file mode 100644
index 00000000..9ff04a3c
--- /dev/null
+++ b/dev/solid-vue-vite-app/src/main.css
@@ -0,0 +1,3 @@
+:root {
+  color-scheme: dark light;
+}
diff --git a/dev/solid-vue-vite-app/src/main.ts b/dev/solid-vue-vite-app/src/main.ts
index 8c20d277..f382e72b 100644
--- a/dev/solid-vue-vite-app/src/main.ts
+++ b/dev/solid-vue-vite-app/src/main.ts
@@ -1,5 +1,6 @@
 import { createApp } from "vue";
 import App from "./App.vue";
 import { router } from "./router.ts";
+import "./main.css";
 
 createApp(App).use(router).mount("#app");
diff --git a/dev/solid-vue-vite-app/src/router.ts b/dev/solid-vue-vite-app/src/router.ts
index 1703dd76..01cbc7fb 100644
--- a/dev/solid-vue-vite-app/src/router.ts
+++ b/dev/solid-vue-vite-app/src/router.ts
@@ -7,14 +7,16 @@ import SolidAuth from "./UseSolidAuth.vue";
 import MatchSubject from "./UseMatchSubject.vue";
 import LandingPage from "./LandingPage.vue";
 import UseResource from "./UseResource.vue";
+import UseRootContainerFor from "./UseRootContainerFor.vue";
 
 export const router = createRouter({
   history: createWebHistory(),
   routes: [
     { path: "", component: LandingPage },
-    { path: "/solid-auth", component: SolidAuth },
-    { path: "/match-subject", component: MatchSubject },
-    { path: "/resource", component: UseResource },
+    { path: "/use-solid-auth", component: SolidAuth },
+    { path: "/use-match-subject", component: MatchSubject },
+    { path: "/use-resource", component: UseResource },
+    { path: "/use-root-container-for", component: UseRootContainerFor },
   ],
 });
 
diff --git a/packages/solid-vue/src/createBrowserSolidVueMethods.ts b/packages/solid-vue/src/createBrowserSolidVueMethods.ts
index 280a7e94..904c0208 100644
--- a/packages/solid-vue/src/createBrowserSolidVueMethods.ts
+++ b/packages/solid-vue/src/createBrowserSolidVueMethods.ts
@@ -1,70 +1,40 @@
-import { createLdoVueComposables, type useResourceType } from "@ldo/vue";
+import { createLdoVueComposables } from "@ldo/vue";
 import { provideSolidAuth, useSolidAuth } from "./useSolidAuth.js";
-import {
-  isSolidUri,
-  type SolidConnectedPlugin,
-  solidConnectedPlugin,
-  type SolidContainer,
-  type SolidContainerUri,
-  type SolidLeaf,
-  type SolidLeafUri,
-  type SolidResource,
-} from "@ldo/connected-solid";
+import { solidConnectedPlugin } from "@ldo/connected-solid";
 import type { ConnectedPlugin } from "@ldo/connected";
-import { type MaybeRefOrGetter, toValue, triggerRef, watch } from "vue";
-import { nextGraphConnectedPlugin } from "@ldo/connected-nextgraph";
+import { createUseRootContainerFor } from "./useRootContainerFor.js";
+import { createUseResourceWithAuth } from "./useResourceWithAuth.js";
 
 export function createBrowserSolidVueComposables<
   Plugin extends ConnectedPlugin = never,
 >(additionalPlugins: Plugin[] = []) {
-  const { provideDataset, useResource, ...vueComposables } =
+  const { provideDataset, useResource, useDataset, ...vueComposables } =
     createLdoVueComposables([solidConnectedPlugin, ...additionalPlugins]);
-  /**
-   * If the uri is Solid uri, we want refetch the resource when session.isActive changes
-   */
-  const useResourceWithAuth: typeof useResource = (
-    uri: Parameters<typeof useResource>[0],
-    options: Parameters<typeof useResource>[1],
-  ) => {
-    const resourceRef = useResource(uri, options);
-    const solidAuth = useSolidAuth();
-    watch([() => solidAuth.session.value.isActive], async ([isActive]) => {
-      const uriValue = toValue(uri);
-      const { suppressInitialRead } = toValue(options) ?? {};
-      if (uriValue && isSolidUri(uriValue)) {
-        const resource = resourceRef.value as SolidLeaf | SolidContainer;
-        // if the read has not been initialized and initial read is suppressed, don't re-read
-        if (
-          !(
-            suppressInitialRead &&
-            resource.status.type === "unfetched" &&
-            !resource.isLoading()
-          )
-        ) {
-          console.log("REFETCHING");
-          await resourceRef.value!.read();
-        }
-      }
-    });
-    return resourceRef;
-  };
+
   function provideSolidLdo() {
     const dataset = provideDataset();
     const solidAuth = provideSolidAuth();
     dataset.setContext("solid", { fetch: solidAuth.fetch });
     return { dataset, solidAuth };
   }
+
+  const useResourceWithAuth = createUseResourceWithAuth({
+    useResource,
+    useSolidAuth,
+  });
+
   return {
     provideSolidLdo,
     provideDataset,
     useResource: useResourceWithAuth,
+    useDataset,
     ...vueComposables,
     provideSolidAuth,
     useSolidAuth,
+    useRootContainerFor: createUseRootContainerFor({
+      useSolidAuth,
+      useDataset,
+      useResource: useResourceWithAuth,
+    }),
   };
 }
-
-createBrowserSolidVueComposables([
-  solidConnectedPlugin,
-  nextGraphConnectedPlugin,
-]);
diff --git a/packages/solid-vue/src/useResourceWithAuth.ts b/packages/solid-vue/src/useResourceWithAuth.ts
new file mode 100644
index 00000000..fc3afd7e
--- /dev/null
+++ b/packages/solid-vue/src/useResourceWithAuth.ts
@@ -0,0 +1,50 @@
+import {
+  isSolidUri,
+  type SolidConnectedPlugin,
+  type SolidContainer,
+  type SolidLeaf,
+} from "@ldo/connected-solid";
+import type { useResourceType } from "@ldo/vue";
+import { toValue, watch } from "vue";
+import type { useSolidAuth } from "./useSolidAuth.js";
+
+type UseSolidAuth = typeof useSolidAuth;
+
+/**
+ * If the uri is Solid uri, we want refetch the resource when session.isActive changes
+ */
+export function createUseResourceWithAuth({
+  useResource,
+  useSolidAuth,
+}: {
+  useResource: useResourceType<SolidConnectedPlugin[]>;
+  useSolidAuth: UseSolidAuth;
+}): useResourceType<SolidConnectedPlugin[]> {
+  return function useResourceWithAuth(
+    uri: Parameters<typeof useResource>[0],
+    options?: Parameters<typeof useResource>[1],
+  ) {
+    const resourceRef = useResource(uri, options);
+    const solidAuth = useSolidAuth();
+    watch([() => solidAuth.session.value.isActive], async ([isActive]) => {
+      void isActive;
+      const uriValue = toValue(uri);
+      const { suppressInitialRead } = toValue(options) ?? {};
+      if (uriValue && isSolidUri(uriValue)) {
+        const resource = resourceRef.value as SolidLeaf | SolidContainer;
+        // if the read has not been initialized and initial read is suppressed, don't re-read
+        if (
+          !(
+            suppressInitialRead &&
+            resource.status.type === "unfetched" &&
+            !resource.isLoading()
+          )
+        ) {
+          console.log("REFETCHING");
+          await resourceRef.value!.read();
+        }
+      }
+    });
+    return resourceRef;
+  };
+}
diff --git a/packages/solid-vue/src/useRootContainerFor.ts b/packages/solid-vue/src/useRootContainerFor.ts
new file mode 100644
index 00000000..29c9f93b
--- /dev/null
+++ b/packages/solid-vue/src/useRootContainerFor.ts
@@ -0,0 +1,49 @@
+import {
+  isSolidUri,
+  type SolidConnectedPlugin,
+  type SolidContainerUri,
+  type SolidLeafUri,
+} from "@ldo/connected-solid";
+import type {
+  createUseDataset,
+  createUseResource,
+  UseResourceOptions,
+} from "@ldo/vue";
+import { ref, toValue, watch, type MaybeRefOrGetter } from "vue";
+import type { useSolidAuth } from "./useSolidAuth.js";
+
+export function createUseRootContainerFor({
+  useDataset,
+  useResource,
+  useSolidAuth: useSAuth,
+}: {
+  useDataset: ReturnType<typeof createUseDataset<[SolidConnectedPlugin]>>;
+  useResource: ReturnType<typeof createUseResource<SolidConnectedPlugin[]>>;
+  useSolidAuth: typeof useSolidAuth;
+}) {
+  return function useRootContainerFor(
+    uri?: MaybeRefOrGetter<SolidContainerUri | SolidLeafUri>,
+    options?: UseResourceOptions<"solid">,
+  ) {
+    const dataset = useDataset();
+    const rootContainerUriRef = ref<SolidContainerUri | undefined>();
+    const solidAuth = useSAuth();
+
+    watch(
+      [() => toValue(uri), () => solidAuth.session.value.isActive],
+      async ([newUri, newIsActive], [oldUri, oldIsActive]) => {
+        void newIsActive;
+        if (newUri && isSolidUri(newUri)) {
+          const givenResource = dataset.getResource(newUri);
+          const result = await givenResource.getRootContainer();
+          if (!result.isError) rootContainerUriRef.value = result.uri;
+        } else {
+          rootContainerUriRef.value = undefined;
+        }
+      },
+      { immediate: true },
+    );
+
+    return useResource(rootContainerUriRef, options);
+  };
+}
diff --git a/packages/solid-vue/test/SolidAuth.test.ts b/packages/solid-vue/test/SolidAuth.test.ts
deleted file mode 100644
index 2702fa46..00000000
--- a/packages/solid-vue/test/SolidAuth.test.ts
+++ /dev/null
@@ -1,5 +0,0 @@
-import { describe, it } from "vitest";
-
-describe("Solid Auth in Vue + Solid", () => {
-  it.todo("should ...");
-});
diff --git a/packages/solid-vue/test/SolidComposables.test.ts b/packages/solid-vue/test/SolidComposables.test.ts
new file mode 100644
index 00000000..ffedbef7
--- /dev/null
+++ b/packages/solid-vue/test/SolidComposables.test.ts
@@ -0,0 +1,17 @@
+import { describe, it } from "vitest";
+
+describe("Composables for Solid", () => {
+  describe("useSolidAuth", () => {
+    it.todo("should provide a reactive auth session");
+  });
+  describe("useRootContainerFor", () => {
+    it.todo("should return reactive root container on success");
+    it.todo("should return undefined on failure");
+    it.todo("should retry when authentication state changes");
+  });
+  describe("useResource reacting to auth session", () => {
+    it.todo(
+      "should return reactive resource and refetch it if authentication state changes",
+    );
+  });
+});

From 04642797a492e6bcafd1238f46fb6051e93f3f2c Mon Sep 17 00:00:00 2001
From: mrkvon <mrkvon@proton.me>
Date: Thu, 15 Oct 2026 14:22:43 +0200
Subject: [PATCH 05/15] Add tests for solid-vue methods

---
 dev/solid-vue-vite-app/src/UseResource.vue    |   1 +
 .../src/createBrowserSolidVueMethods.ts       |  17 +-
 packages/solid-vue/src/useResourceWithAuth.ts |   1 -
 packages/solid-vue/src/useRootContainerFor.ts |   7 +-
 packages/solid-vue/src/useSolidAuth.ts        |  13 +-
 .../solid-vue/test/SolidComposables.test.ts   | 210 +++++++++++++++++-
 packages/solid-vue/test/test-utils.ts         |  57 ++++-
 7 files changed, 285 insertions(+), 21 deletions(-)

diff --git a/dev/solid-vue-vite-app/src/UseResource.vue b/dev/solid-vue-vite-app/src/UseResource.vue
index 9bbd590d..fe7f5cda 100644
--- a/dev/solid-vue-vite-app/src/UseResource.vue
+++ b/dev/solid-vue-vite-app/src/UseResource.vue
@@ -46,6 +46,7 @@ const handleRefresh = () => {
   </div>
 
   <div class="results" v-if="resource">
+    <div>uri: {{ resource.uri }}</div>
     <div>isDoingInitialFetch: {{ resource.isDoingInitialFetch() }}</div>
     <div>isLoading: {{ resource.isLoading() }}</div>
     <div>isReloading: {{ resource.isReloading() }}</div>
diff --git a/packages/solid-vue/src/createBrowserSolidVueMethods.ts b/packages/solid-vue/src/createBrowserSolidVueMethods.ts
index 904c0208..e7846d99 100644
--- a/packages/solid-vue/src/createBrowserSolidVueMethods.ts
+++ b/packages/solid-vue/src/createBrowserSolidVueMethods.ts
@@ -1,5 +1,9 @@
 import { createLdoVueComposables } from "@ldo/vue";
-import { provideSolidAuth, useSolidAuth } from "./useSolidAuth.js";
+import {
+  provideSolidAuth,
+  useSolidAuth,
+  solidAuthInjectionKey,
+} from "./useSolidAuth.js";
 import { solidConnectedPlugin } from "@ldo/connected-solid";
 import type { ConnectedPlugin } from "@ldo/connected";
 import { createUseRootContainerFor } from "./useRootContainerFor.js";
@@ -8,8 +12,13 @@ import { createUseResourceWithAuth } from "./useResourceWithAuth.js";
 export function createBrowserSolidVueComposables<
   Plugin extends ConnectedPlugin = never,
 >(additionalPlugins: Plugin[] = []) {
-  const { provideDataset, useResource, useDataset, ...vueComposables } =
-    createLdoVueComposables([solidConnectedPlugin, ...additionalPlugins]);
+  const {
+    provideDataset,
+    useResource,
+    useDataset,
+    datasetInjectionKey,
+    ...vueComposables
+  } = createLdoVueComposables([solidConnectedPlugin, ...additionalPlugins]);
 
   function provideSolidLdo() {
     const dataset = provideDataset();
@@ -24,6 +33,8 @@ export function createBrowserSolidVueComposables<
   });
 
   return {
+    solidAuthInjectionKey,
+    datasetInjectionKey,
     provideSolidLdo,
     provideDataset,
     useResource: useResourceWithAuth,
diff --git a/packages/solid-vue/src/useResourceWithAuth.ts b/packages/solid-vue/src/useResourceWithAuth.ts
index fc3afd7e..cc75af2b 100644
--- a/packages/solid-vue/src/useResourceWithAuth.ts
+++ b/packages/solid-vue/src/useResourceWithAuth.ts
@@ -40,7 +40,6 @@ export function createUseResourceWithAuth({
             !resource.isLoading()
           )
         ) {
-          console.log("REFETCHING");
           await resourceRef.value!.read();
         }
       }
diff --git a/packages/solid-vue/src/useRootContainerFor.ts b/packages/solid-vue/src/useRootContainerFor.ts
index 29c9f93b..885cbe7f 100644
--- a/packages/solid-vue/src/useRootContainerFor.ts
+++ b/packages/solid-vue/src/useRootContainerFor.ts
@@ -22,8 +22,8 @@ export function createUseRootContainerFor({
   useSolidAuth: typeof useSolidAuth;
 }) {
   return function useRootContainerFor(
-    uri?: MaybeRefOrGetter<SolidContainerUri | SolidLeafUri>,
-    options?: UseResourceOptions<"solid">,
+    uri?: MaybeRefOrGetter<SolidContainerUri | SolidLeafUri | undefined>,
+    options?: MaybeRefOrGetter<UseResourceOptions<"solid">>,
   ) {
     const dataset = useDataset();
     const rootContainerUriRef = ref<SolidContainerUri | undefined>();
@@ -33,10 +33,11 @@ export function createUseRootContainerFor({
       [() => toValue(uri), () => solidAuth.session.value.isActive],
       async ([newUri, newIsActive], [oldUri, oldIsActive]) => {
         void newIsActive;
+        if (newUri !== oldUri) rootContainerUriRef.value = undefined;
         if (newUri && isSolidUri(newUri)) {
           const givenResource = dataset.getResource(newUri);
           const result = await givenResource.getRootContainer();
-          if (!result.isError) rootContainerUriRef.value = result.uri;
+          rootContainerUriRef.value = result.isError ? undefined : result.uri;
         } else {
           rootContainerUriRef.value = undefined;
         }
diff --git a/packages/solid-vue/src/useSolidAuth.ts b/packages/solid-vue/src/useSolidAuth.ts
index 6c44c332..993e16d3 100644
--- a/packages/solid-vue/src/useSolidAuth.ts
+++ b/packages/solid-vue/src/useSolidAuth.ts
@@ -12,7 +12,7 @@ import {
 } from "vue";
 import { Session, SessionEvents } from "@uvdsl/solid-oidc-client-browser";
 
-type SolidAuthSession = {
+export type SolidAuthSession = {
   login: Session["login"];
   logout: Session["logout"];
   signUp: Session["login"];
@@ -21,7 +21,7 @@ type SolidAuthSession = {
   ranInitialAuthCheck: Ref<boolean>;
 };
 
-const OidcSessionKey: InjectionKey<SolidAuthSession> = Symbol(
+export const solidAuthInjectionKey: InjectionKey<SolidAuthSession> = Symbol(
   "solid auth context identifier",
 );
 
@@ -125,7 +125,7 @@ export function provideSolidAuth({
     ranInitialAuthCheck,
   };
 
-  provide(OidcSessionKey, solidAuth);
+  provide(solidAuthInjectionKey, solidAuth);
 
   return solidAuth;
 }
@@ -135,7 +135,10 @@ export function provideSolidAuth({
  * In order to use it, you have to run provideSolidAuth in an ancestor component.
  */
 export function useSolidAuth() {
-  const auth = inject(OidcSessionKey);
-  if (!auth) throw new Error("useSolidAuth must have session provided");
+  const auth = inject(solidAuthInjectionKey);
+  if (!auth)
+    throw new Error(
+      "useSolidAuth requires an ancestor provider (provideSolidLdo or provideSolidAuth).",
+    );
   return auth;
 }
diff --git a/packages/solid-vue/test/SolidComposables.test.ts b/packages/solid-vue/test/SolidComposables.test.ts
index ffedbef7..1dfd4008 100644
--- a/packages/solid-vue/test/SolidComposables.test.ts
+++ b/packages/solid-vue/test/SolidComposables.test.ts
@@ -1,17 +1,211 @@
-import { describe, it } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
+import { MockSharedWorker, withParentChildSetup } from "./test-utils.js";
+import { createBrowserSolidVueComposables } from "@ldo/solid-vue";
+import { namedNode } from "@ldo/rdf-utils";
+import { setupServer } from "@ldo/test-solid-server";
+import { type CreateAppFunction, nextTick, type Ref, ref } from "vue";
+import type {
+  SolidConnectedPlugin,
+  SolidContainer,
+  SolidContainerUri,
+  SolidLeafUri,
+} from "@ldo/connected-solid";
+import type { UseResourceOptions } from "../src/index.js";
+import type { ConnectedLdoDataset } from "@ldo/connected";
+import type { SolidAuthSession } from "../src/useSolidAuth.js";
 
 describe("Composables for Solid", () => {
+  let methods: ReturnType<typeof createBrowserSolidVueComposables<never>>;
+  const personResourceUri = "http://localhost:3006/directory/person";
+  const personUri = personResourceUri + "#me";
+  const otherPersonUri = personResourceUri + "#i";
+  const person2ResourceUri = "http://localhost:3006/directory/person2";
+  const person2Uri = person2ResourceUri + "#me";
+  const foafName = namedNode("http://xmlns.com/foaf/0.1/name");
+  const foafKnows = namedNode("http://xmlns.com/foaf/0.1/knows");
+
+  const s = setupServer(3006, {
+    slug: "directory/",
+    isContainer: true,
+    contains: [
+      {
+        slug: "leaf",
+        isContainer: false,
+        data: "<https://example.com/vocab#me> <https://example.com/vocab#is> <https://example.com/vocab#happy> .",
+        mimeType: "text/turtle",
+      },
+      {
+        slug: "person",
+        isContainer: false,
+        data: `
+        @prefix foaf: <http://xmlns.com/foaf/0.1/>.
+        <> a foaf:PersonalProfileDocument.
+        <#me>
+          a foaf:Person;
+          foaf:name "Name";
+          foaf:knows <https://example.com/profile/card#me>, <https://example.org/profile/card#i>.
+
+        <#i> a foaf:Person; foaf:name "myname".
+        `,
+        mimeType: "text/turtle",
+      },
+      {
+        slug: "person2",
+        isContainer: false,
+        data: `
+        @prefix foaf: <http://xmlns.com/foaf/0.1/>.
+        <#me> a foaf:Person; foaf:name "Other Name"; foaf:knows <./person#me>.
+        `,
+        mimeType: "text/turtle",
+      },
+    ],
+  });
+
+  beforeEach(() => {
+    methods = createBrowserSolidVueComposables();
+  });
+
+  beforeEach(() => {
+    Object.defineProperty(globalThis, "SharedWorker", {
+      value: MockSharedWorker,
+      writable: true,
+      configurable: true,
+    });
+  });
+
   describe("useSolidAuth", () => {
-    it.todo("should provide a reactive auth session");
+    it("should provide a reactive auth session", async () => {
+      const [, childResult, app] = withParentChildSetup(
+        () => methods.provideSolidLdo(),
+        () => methods.useSolidAuth(),
+      );
+
+      expect(childResult.fetch).toBeTypeOf("function");
+      expect(childResult.session.value.isActive).toBeTypeOf("boolean");
+
+      app.unmount();
+    });
+
+    it("should throw error when the session is not provided", async () => {
+      expect(() => {
+        withParentChildSetup(
+          () => {},
+          () => methods.useSolidAuth(),
+        );
+      }).toThrow();
+    });
   });
+
   describe("useRootContainerFor", () => {
-    it.todo("should return reactive root container on success");
-    it.todo("should return undefined on failure");
-    it.todo("should retry when authentication state changes");
+    let childResult: Ref<SolidContainer | undefined>,
+      parentResult: {
+        dataset: ConnectedLdoDataset<SolidConnectedPlugin[]>;
+        solidAuth: SolidAuthSession;
+      },
+      app: ReturnType<CreateAppFunction<Element>>,
+      uri: Ref<SolidLeafUri | SolidContainerUri | undefined>,
+      options: Ref<UseResourceOptions<"solid">>;
+
+    beforeEach(() => {
+      uri = ref<SolidLeafUri | SolidContainerUri | undefined>();
+      options = ref({});
+
+      [parentResult, childResult, app] = withParentChildSetup(
+        () => methods.provideSolidLdo(),
+        () => methods.useRootContainerFor(uri, options),
+      );
+    });
+
+    afterEach(() => {
+      app.unmount();
+    });
+
+    it("should return reactive root container on success", async () => {
+      uri.value = person2ResourceUri;
+
+      await vi.waitFor(() => {
+        expect(childResult.value?.uri).toEqual("http://localhost:3006/");
+      });
+    });
+
+    it("should return undefined when URI input changes to undefined", async () => {
+      uri.value = person2ResourceUri;
+
+      await vi.waitFor(() => {
+        expect(childResult.value?.uri).toEqual("http://localhost:3006/");
+      });
+
+      uri.value = undefined;
+
+      await vi.waitFor(() => {
+        expect(childResult.value?.uri).toEqual(undefined);
+      });
+    });
+
+    it("should return undefined on failure", async () => {
+      uri.value = person2ResourceUri;
+
+      await vi.waitFor(() => {
+        expect(childResult.value?.uri).toEqual("http://localhost:3006/");
+      });
+
+      uri.value = "https://some.example";
+
+      await vi.waitFor(() => {
+        expect(childResult.value?.uri).toEqual(undefined);
+      });
+    });
+
+    it("should update result to temporary undefined immediately after URI changes", async () => {
+      uri.value = personResourceUri;
+
+      await vi.waitFor(() => {
+        expect(childResult.value?.uri).toEqual("http://localhost:3006/");
+      });
+
+      uri.value = person2ResourceUri;
+
+      // first the result should clear
+      await nextTick();
+      expect(childResult.value?.uri).toEqual(undefined);
+
+      await vi.waitFor(() => {
+        expect(childResult.value?.uri).toEqual("http://localhost:3006/");
+      });
+    });
   });
+
   describe("useResource reacting to auth session", () => {
-    it.todo(
-      "should return reactive resource and refetch it if authentication state changes",
-    );
+    it("should return reactive resource and refetch it if authentication state changes", async () => {
+      const uri = ref(personResourceUri);
+
+      const [parentResult, childResult, app] = withParentChildSetup(
+        () => methods.provideSolidLdo(),
+        () => methods.useResource(uri),
+      );
+
+      // fetches once
+      await vi.waitFor(() => {
+        expect(childResult.value.isLoading()).toEqual(true);
+      });
+      await vi.waitFor(() => {
+        expect(childResult.value.isLoading()).toEqual(false);
+      });
+
+      // session.isActive changes
+      parentResult.solidAuth.session.value = {
+        isActive: true,
+      } as any; // eslint-disable-line @typescript-eslint/no-explicit-any
+
+      // fetches again
+      await vi.waitFor(() => {
+        expect(childResult.value.isLoading()).toEqual(true);
+      });
+      await vi.waitFor(() => {
+        expect(childResult.value.isLoading()).toEqual(false);
+      });
+
+      app.unmount();
+    });
   });
 });
diff --git a/packages/solid-vue/test/test-utils.ts b/packages/solid-vue/test/test-utils.ts
index acba303f..21339ab5 100644
--- a/packages/solid-vue/test/test-utils.ts
+++ b/packages/solid-vue/test/test-utils.ts
@@ -1,4 +1,4 @@
-import { createApp, type App } from "vue";
+import { createApp, h, type App } from "vue";
 
 /**
  * https://vuejs.org/guide/scaling-up/testing.html#testing-composables
@@ -17,3 +17,58 @@ export function withSetup<T>(composable: () => T): [T, App<Element>] {
   // for testing provide/unmount
   return [result, app];
 }
+
+/**
+ * modified test setup for composables in parent/child relationship (e.g. provide/inject)
+ */
+export function withParentChildSetup<P, C>(
+  parentComposable: () => P,
+  childComposable: () => C,
+): [P, C, App<Element>] {
+  let parentResult!: P;
+  let childResult!: C;
+
+  const app = createApp({
+    setup() {
+      parentResult = parentComposable();
+      return () =>
+        h({
+          setup() {
+            childResult = childComposable();
+            return () => {};
+          },
+        });
+    },
+  });
+
+  app.mount(document.createElement("div"));
+  return [parentResult, childResult, app];
+}
+
+export class MockSharedWorker implements SharedWorker {
+  port: MessagePort;
+  onerror = null;
+
+  constructor(_url, _options) {
+    this.port = {
+      onmessage: null,
+    } as MessagePort;
+  }
+  addEventListener(
+    _type: unknown,
+    _listener: unknown,
+    _options?: unknown,
+  ): void {
+    throw new Error("Method not implemented.");
+  }
+  removeEventListener(
+    _type: unknown,
+    _listener: unknown,
+    _options?: unknown,
+  ): void {
+    throw new Error("Method not implemented.");
+  }
+  dispatchEvent(_event: Event): boolean {
+    throw new Error("Method not implemented.");
+  }
+}

From 2687deee9208deca8604903a196026ab2f24d514 Mon Sep 17 00:00:00 2001
From: mrkvon <mrkvon@proton.me>
Date: Thu, 15 Oct 2026 14:51:43 +0200
Subject: [PATCH 06/15] cleanup

---
 dev/solid-vue-vite-app/src/App.vue              |  2 +-
 dev/solid-vue-vite-app/src/LandingPage.vue      |  6 +++---
 dev/solid-vue-vite-app/src/UseMatchSubject.vue  |  4 ++--
 dev/solid-vue-vite-app/src/UseResource.vue      |  2 +-
 .../src/UseRootContainerFor.vue                 |  2 +-
 dev/solid-vue-vite-app/src/UseSolidAuth.vue     |  2 +-
 .../{vueReadmeTest.vue => VueReadmeTest.vue}    |  4 ++--
 dev/solid-vue-vite-app/src/main.ts              |  2 +-
 dev/solid-vue-vite-app/src/router.ts            | 17 -----------------
 .../src/createBrowserSolidVueMethods.ts         |  6 +++---
 packages/solid-vue/src/useResourceWithAuth.ts   |  2 +-
 packages/solid-vue/src/useRootContainerFor.ts   |  2 +-
 .../solid-vue/test/SolidComposables.test.ts     |  6 +++---
 13 files changed, 20 insertions(+), 37 deletions(-)
 rename dev/solid-vue-vite-app/src/{vueReadmeTest.vue => VueReadmeTest.vue} (93%)

diff --git a/dev/solid-vue-vite-app/src/App.vue b/dev/solid-vue-vite-app/src/App.vue
index 119f8b65..a99aab7d 100644
--- a/dev/solid-vue-vite-app/src/App.vue
+++ b/dev/solid-vue-vite-app/src/App.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { provideSolidLdo } from "./ldo.js";
+import { provideSolidLdo } from "./ldo";
 import { RouterView, RouterLink } from "vue-router";
 import SolidAuth from "./UseSolidAuth.vue";
 
diff --git a/dev/solid-vue-vite-app/src/LandingPage.vue b/dev/solid-vue-vite-app/src/LandingPage.vue
index 5463f885..1f5ecb61 100644
--- a/dev/solid-vue-vite-app/src/LandingPage.vue
+++ b/dev/solid-vue-vite-app/src/LandingPage.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import { computed, ref } from "vue";
-import { FoafProfileShapeType } from "./_ldo/foafProfile.shapeTypes.js";
-import { useSubject, useResource } from "./ldo.js";
-import VueReadmeTest from "./vueReadmeTest.vue";
+import { FoafProfileShapeType } from "./_ldo/foafProfile.shapeTypes";
+import { useSubject, useResource } from "./ldo";
+import VueReadmeTest from "./VueReadmeTest.vue";
 
 const isValidUrl = (str: string) => {
   try {
diff --git a/dev/solid-vue-vite-app/src/UseMatchSubject.vue b/dev/solid-vue-vite-app/src/UseMatchSubject.vue
index 990b4617..231755fe 100644
--- a/dev/solid-vue-vite-app/src/UseMatchSubject.vue
+++ b/dev/solid-vue-vite-app/src/UseMatchSubject.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { computed, ref } from "vue";
-import { FoafProfileShapeType } from "./_ldo/foafProfile.shapeTypes.js";
-import { useResource, useMatchSubject } from "./ldo.js";
+import { FoafProfileShapeType } from "./_ldo/foafProfile.shapeTypes";
+import { useResource, useMatchSubject } from "./ldo";
 
 const isValidUrl = (str: string) => {
   try {
diff --git a/dev/solid-vue-vite-app/src/UseResource.vue b/dev/solid-vue-vite-app/src/UseResource.vue
index fe7f5cda..606cdc71 100644
--- a/dev/solid-vue-vite-app/src/UseResource.vue
+++ b/dev/solid-vue-vite-app/src/UseResource.vue
@@ -1,6 +1,6 @@
 <script setup lang="ts">
 import { computed, ref, triggerRef } from "vue";
-import { useResource } from "./ldo.js";
+import { useResource } from "./ldo";
 import type { SolidContainerUri, SolidLeafUri } from "@ldo/connected-solid";
 import type { UseResourceOptions } from "@ldo/vue";
 
diff --git a/dev/solid-vue-vite-app/src/UseRootContainerFor.vue b/dev/solid-vue-vite-app/src/UseRootContainerFor.vue
index 3791a8ac..da332b61 100644
--- a/dev/solid-vue-vite-app/src/UseRootContainerFor.vue
+++ b/dev/solid-vue-vite-app/src/UseRootContainerFor.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import type { SolidLeafUri, SolidContainerUri } from "@ldo/connected-solid";
 import { ref } from "vue";
-import { useRootContainerFor } from "./ldo.ts";
+import { useRootContainerFor } from "./ldo";
 
 const uri = ref<SolidLeafUri | SolidContainerUri>(
   "https://timbl.solidcommunity.net/profile/card",
diff --git a/dev/solid-vue-vite-app/src/UseSolidAuth.vue b/dev/solid-vue-vite-app/src/UseSolidAuth.vue
index 0a7f8687..c86ae8c7 100644
--- a/dev/solid-vue-vite-app/src/UseSolidAuth.vue
+++ b/dev/solid-vue-vite-app/src/UseSolidAuth.vue
@@ -1,5 +1,5 @@
 <script setup lang="ts">
-import { useSolidAuth } from "./ldo.js";
+import { useSolidAuth } from "./ldo";
 
 const solidAuth = useSolidAuth();
 
diff --git a/dev/solid-vue-vite-app/src/vueReadmeTest.vue b/dev/solid-vue-vite-app/src/VueReadmeTest.vue
similarity index 93%
rename from dev/solid-vue-vite-app/src/vueReadmeTest.vue
rename to dev/solid-vue-vite-app/src/VueReadmeTest.vue
index 4a01df39..6cf4c07b 100644
--- a/dev/solid-vue-vite-app/src/vueReadmeTest.vue
+++ b/dev/solid-vue-vite-app/src/VueReadmeTest.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import { ref, watch } from "vue";
-import { FoafProfileShapeType } from "./_ldo/foafProfile.shapeTypes.js";
-import { useSubject, useResource } from "./ldo.js";
+import { FoafProfileShapeType } from "./_ldo/foafProfile.shapeTypes";
+import { useSubject, useResource } from "./ldo";
 
 const personUri = ref<string>("");
 const subject = useSubject(FoafProfileShapeType, personUri);
diff --git a/dev/solid-vue-vite-app/src/main.ts b/dev/solid-vue-vite-app/src/main.ts
index f382e72b..fcd12c52 100644
--- a/dev/solid-vue-vite-app/src/main.ts
+++ b/dev/solid-vue-vite-app/src/main.ts
@@ -1,6 +1,6 @@
 import { createApp } from "vue";
 import App from "./App.vue";
-import { router } from "./router.ts";
+import { router } from "./router";
 import "./main.css";
 
 createApp(App).use(router).mount("#app");
diff --git a/dev/solid-vue-vite-app/src/router.ts b/dev/solid-vue-vite-app/src/router.ts
index 01cbc7fb..1d0603b5 100644
--- a/dev/solid-vue-vite-app/src/router.ts
+++ b/dev/solid-vue-vite-app/src/router.ts
@@ -19,20 +19,3 @@ export const router = createRouter({
     { path: "/use-root-container-for", component: UseRootContainerFor },
   ],
 });
-
-// // Log BEFORE any navigation starts
-// router.beforeEach((to, from, next) => {
-//   console.log(`[Router] Attempting move: ${from.fullPath} ➡️ ${to.fullPath}`);
-//   console.log("[Router] Target Route Specs:", to);
-//   next(); // Don't forget to call next()!
-// });
-
-// // Log AFTER a navigation finishes successfully
-// router.afterEach((to, from) => {
-//   console.log(`[Router] Navigation Completed successfully to: ${to.fullPath}`);
-// });
-
-// // Log if something CRASHES or gets rejected during routing
-// router.onError((error) => {
-//   console.error("[Router] Error occurred during routing:", error);
-// });
diff --git a/packages/solid-vue/src/createBrowserSolidVueMethods.ts b/packages/solid-vue/src/createBrowserSolidVueMethods.ts
index e7846d99..ed99646a 100644
--- a/packages/solid-vue/src/createBrowserSolidVueMethods.ts
+++ b/packages/solid-vue/src/createBrowserSolidVueMethods.ts
@@ -3,11 +3,11 @@ import {
   provideSolidAuth,
   useSolidAuth,
   solidAuthInjectionKey,
-} from "./useSolidAuth.js";
+} from "./useSolidAuth";
 import { solidConnectedPlugin } from "@ldo/connected-solid";
 import type { ConnectedPlugin } from "@ldo/connected";
-import { createUseRootContainerFor } from "./useRootContainerFor.js";
-import { createUseResourceWithAuth } from "./useResourceWithAuth.js";
+import { createUseRootContainerFor } from "./useRootContainerFor";
+import { createUseResourceWithAuth } from "./useResourceWithAuth";
 
 export function createBrowserSolidVueComposables<
   Plugin extends ConnectedPlugin = never,
diff --git a/packages/solid-vue/src/useResourceWithAuth.ts b/packages/solid-vue/src/useResourceWithAuth.ts
index cc75af2b..f2fd35ec 100644
--- a/packages/solid-vue/src/useResourceWithAuth.ts
+++ b/packages/solid-vue/src/useResourceWithAuth.ts
@@ -6,7 +6,7 @@ import {
 } from "@ldo/connected-solid";
 import type { useResourceType } from "@ldo/vue";
 import { toValue, watch } from "vue";
-import type { useSolidAuth } from "./useSolidAuth.js";
+import type { useSolidAuth } from "./useSolidAuth";
 
 type UseSolidAuth = typeof useSolidAuth;
 
diff --git a/packages/solid-vue/src/useRootContainerFor.ts b/packages/solid-vue/src/useRootContainerFor.ts
index 885cbe7f..cb5cf9e1 100644
--- a/packages/solid-vue/src/useRootContainerFor.ts
+++ b/packages/solid-vue/src/useRootContainerFor.ts
@@ -10,7 +10,7 @@ import type {
   UseResourceOptions,
 } from "@ldo/vue";
 import { ref, toValue, watch, type MaybeRefOrGetter } from "vue";
-import type { useSolidAuth } from "./useSolidAuth.js";
+import type { useSolidAuth } from "./useSolidAuth";
 
 export function createUseRootContainerFor({
   useDataset,
diff --git a/packages/solid-vue/test/SolidComposables.test.ts b/packages/solid-vue/test/SolidComposables.test.ts
index 1dfd4008..0d4c36dc 100644
--- a/packages/solid-vue/test/SolidComposables.test.ts
+++ b/packages/solid-vue/test/SolidComposables.test.ts
@@ -1,5 +1,5 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
-import { MockSharedWorker, withParentChildSetup } from "./test-utils.js";
+import { MockSharedWorker, withParentChildSetup } from "./test-utils";
 import { createBrowserSolidVueComposables } from "@ldo/solid-vue";
 import { namedNode } from "@ldo/rdf-utils";
 import { setupServer } from "@ldo/test-solid-server";
@@ -10,9 +10,9 @@ import type {
   SolidContainerUri,
   SolidLeafUri,
 } from "@ldo/connected-solid";
-import type { UseResourceOptions } from "../src/index.js";
+import type { UseResourceOptions } from "../src/index";
 import type { ConnectedLdoDataset } from "@ldo/connected";
-import type { SolidAuthSession } from "../src/useSolidAuth.js";
+import type { SolidAuthSession } from "../src/useSolidAuth";
 
 describe("Composables for Solid", () => {
   let methods: ReturnType<typeof createBrowserSolidVueComposables<never>>;

From b45873bc9dc502b7d0b6b3656fe24dd8241bfa4a Mon Sep 17 00:00:00 2001
From: mrkvon <mrkvon@proton.me>
Date: Fri, 16 Oct 2026 00:06:55 +0200
Subject: [PATCH 07/15] wip docs

---
 packages/solid-vue/README.md | 62 ++++++++++++++++++++++++++++++++++--
 1 file changed, 60 insertions(+), 2 deletions(-)

diff --git a/packages/solid-vue/README.md b/packages/solid-vue/README.md
index 9baee2d5..a47e96a3 100644
--- a/packages/solid-vue/README.md
+++ b/packages/solid-vue/README.md
@@ -6,14 +6,45 @@
 
 ## Guide
 
-TODO
+A full walkthrough for using the `@ldo/solid-vue` library can be found in the [For Solid + Vue Guide](https://ldo.js.org/latest/guides/solid_vue/).
 
 ## Installation
 
-TODO
+Navigate into your project's root folder and run the following command:
+
+```sh
+cd my_project/
+npx @ldo/cli init
+```
+
+Now install the @ldo/solid-vue library
+
+```sh
+npm i @ldo/solid-vue
+```
+
+### Manual Installation
+
+If you already have generated ShapeTypes, you may install the `@ldo/ldo` and `@ldo/solid-vue` libraries independently.
+
+```sh
+npm i @ldo/ldo @ldo/solid-vue
+```
 
 ## Example
 
+Run `provideSolidLdo()` in your parent Vue component. It provides a dataset and auth session to `@ldo/solid-vue` composables in child components.
+
+```vue
+// App.vue
+<script setup lang="ts">
+import { provideSolidLdo } from "@ldo/solid-vue";
+provideSolidLdo();
+</script>
+
+<template></template>
+```
+
 TODO
 
 ## API Details
@@ -23,3 +54,30 @@ TODO
 ## Caveats with `vue-router`
 
 If you're using `vue-router` with `createWebHashHistory` and you authenticate with `useSolidAuth` and `login`, the hash part of the redirect URI will be lost.
+
+## API Details
+
+Solid + Vue [composables](https://vuejs.org/guide/reusability/composables.html):
+
+- [useLdo](https://ldo.js.org/latest/api/vue/useLdo/)
+- [useResource](https://ldo.js.org/latest/api/vue/useResource/)
+- [useSubject](https://ldo.js.org/latest/api/vue/useSubject/)
+- [useMatchSubject](https://ldo.js.org/latest/api/vue/useMatchSubject/)
+- [useMatchObject](https://ldo.js.org/latest/api/vue/useMatchObject/)
+- [useSubscribeToResource](https://ldo.js.org/latest/api/vue/useSubscribeToResource/)
+- [useLinkQuery](https://ldo.js.org/latest/api/vue/useLinkQuery/)
+- [useChangeDataset](https://ldo.js.org/latest/api/vue/useChangeDataset/)
+- [useChangeSubject](https://ldo.js.org/latest/api/vue/useChangeSubject/)
+- [useChangeMatchSubject](https://ldo.js.org/latest/api/vue/useChangeMatchSubject/)
+- [useChangeMatchObject](https://ldo.js.org/latest/api/vue/useChangeMatchObject/)
+
+## Sponsorship
+
+This project was made possible by a grant from [NGI0 Commons Fund](https://nlnet.nl/commonsfund/) via nlnet. Learn more on the [NLnet project page](https://nlnet.nl/project/LDO-up/).
+
+[<img src="https://nlnet.nl/logo/banner.png" alt="nlnet foundation logo" width="300" />](https://nlnet.nl/)
+[<img src="https://nlnet.nl/image/logos/NGI0CommonsFund_tag.svg" alt="NGI Zero Commons Logo" width="300" />](https://nlnet.nl/commonsfund/)
+
+## License
+
+MIT

From 6c4f8c22a713520e8c00d302289f78ba6f9e2569 Mon Sep 17 00:00:00 2001
From: mrkvon <mrkvon@proton.me>
Date: Fri, 16 Oct 2026 19:16:47 +0200
Subject: [PATCH 08/15] Improve README

---
 dev/solid-vue-vite-app/src/ldo.ts             |  4 -
 packages/solid-vue/README.md                  | 78 +++++++++++++++++--
 ...ts => createBrowserSolidVueComposables.ts} |  0
 packages/solid-vue/src/defaultInstance.ts     |  2 +-
 packages/solid-vue/src/index.ts               |  2 +-
 5 files changed, 73 insertions(+), 13 deletions(-)
 rename packages/solid-vue/src/{createBrowserSolidVueMethods.ts => createBrowserSolidVueComposables.ts} (100%)

diff --git a/dev/solid-vue-vite-app/src/ldo.ts b/dev/solid-vue-vite-app/src/ldo.ts
index 074ea14d..5b07e76c 100644
--- a/dev/solid-vue-vite-app/src/ldo.ts
+++ b/dev/solid-vue-vite-app/src/ldo.ts
@@ -1,4 +1,3 @@
-import { createLdoVueComposables, createLdoVueMethods } from "@ldo/vue";
 import { createBrowserSolidVueComposables } from "@ldo/solid-vue";
 import { nextGraphConnectedPlugin } from "@ldo/connected-nextgraph";
 
@@ -10,6 +9,3 @@ export const {
   useSolidAuth,
   useRootContainerFor,
 } = createBrowserSolidVueComposables([nextGraphConnectedPlugin]);
-
-createLdoVueMethods([nextGraphConnectedPlugin]);
-createLdoVueComposables([nextGraphConnectedPlugin]);
diff --git a/packages/solid-vue/README.md b/packages/solid-vue/README.md
index a47e96a3..d676d550 100644
--- a/packages/solid-vue/README.md
+++ b/packages/solid-vue/README.md
@@ -33,32 +33,87 @@ npm i @ldo/ldo @ldo/solid-vue
 
 ## Example
 
-Run `provideSolidLdo()` in your parent Vue component. It provides a dataset and auth session to `@ldo/solid-vue` composables in child components.
+Run `provideSolidLdo()` in your root Vue component. It provides a dataset and auth session to be injected into the composables in the component tree.
 
 ```vue
-// App.vue
+<!-- App.vue -->
 <script setup lang="ts">
+// Run the provider in the root component
 import { provideSolidLdo } from "@ldo/solid-vue";
 provideSolidLdo();
 </script>
+```
+
+```vue
+<script setup lang="ts">
+import { useSolidAuth, useResource, useSubject } from "@ldo/solid-vue";
+
+const solidAuth = useSolidAuth();
+
+const handleLogin = async () => {
+  // idp is Solid identity provider to sign in with
+  // redirectUri can be e.g. globalThis.location.href if app's client id allows
+  await solidAuth.login(idp, redirectUri);
+};
 
-<template></template>
+const handleLogout = async () => {
+  await solidAuth.logout();
+};
+
+const webId = computed(() => solidAuth.session.value.webId);
+
+// the arguments can usually be passed as a ref or constant
+const resourceResult = useResource(webId, useResourceOptions);
+const person = useSubject(FoafProfileShapeType, webId, useSubjectOptions);
+</script>
+
+<template>
+  <div v-if="!solidAuth.ranInitialAuthCheck.value">Checking authentication</div>
+  <button @click="handleLogout" v-else-if="solidAuth.session.value.isActive">
+    Sign out
+  </button>
+  <button @click="handleLogin" v-else>Sign in</button>
+
+  <div>{{ person.name }}</div>
+</template>
 ```
 
-TODO
+### Additional plugins
 
-## API Details
+To use other connected plugins in addition to Solid, create the composables with the `createBrowserSolidVueComposables` factory.
 
-TODO
+```ts
+import { createBrowserSolidVueComposables } from "@ldo/solid-vue";
+import { nextGraphConnectedPlugin } from "@ldo/connected-nextgraph";
+
+export const {
+  provideSolidLdo,
+  useSubject,
+  useResource,
+  useMatchSubject,
+  useSolidAuth,
+  useRootContainerFor,
+} = createBrowserSolidVueComposables([nextGraphConnectedPlugin]); // additional plugins here
+```
+
+If you don't want to use Solid, use `@ldo/vue` instead of this package.
 
 ## Caveats with `vue-router`
 
-If you're using `vue-router` with `createWebHashHistory` and you authenticate with `useSolidAuth` and `login`, the hash part of the redirect URI will be lost.
+If you're using `vue-router` with `createWebHashHistory` and you authenticate with `useSolidAuth` and `login`, the hash part of the redirect URI and therefore your routing will be lost.
 
 ## API Details
 
 Solid + Vue [composables](https://vuejs.org/guide/reusability/composables.html):
 
+### Providers
+
+- [provideSolidLdo](https://ldo.js.org/latest/api/vue/provideSolidLdo/)
+
+### Composables
+
+Generic `@ldo/vue` composables with integrated Solid connected plugin:
+
 - [useLdo](https://ldo.js.org/latest/api/vue/useLdo/)
 - [useResource](https://ldo.js.org/latest/api/vue/useResource/)
 - [useSubject](https://ldo.js.org/latest/api/vue/useSubject/)
@@ -71,6 +126,15 @@ Solid + Vue [composables](https://vuejs.org/guide/reusability/composables.html):
 - [useChangeMatchSubject](https://ldo.js.org/latest/api/vue/useChangeMatchSubject/)
 - [useChangeMatchObject](https://ldo.js.org/latest/api/vue/useChangeMatchObject/)
 
+Solid-specific composables:
+
+- [useSolidAuth](https://ldo.js.org/latest/api/vue/useLdo/)
+- [useRootContainerFor](https://ldo.js.org/latest/api/vue/useLdo/)
+
+### Composable factory
+
+- [createBrowserSolidVueComposables](https://ldo.js.org/latest/api/vue/createBrowserSolidVueComposables/)
+
 ## Sponsorship
 
 This project was made possible by a grant from [NGI0 Commons Fund](https://nlnet.nl/commonsfund/) via nlnet. Learn more on the [NLnet project page](https://nlnet.nl/project/LDO-up/).
diff --git a/packages/solid-vue/src/createBrowserSolidVueMethods.ts b/packages/solid-vue/src/createBrowserSolidVueComposables.ts
similarity index 100%
rename from packages/solid-vue/src/createBrowserSolidVueMethods.ts
rename to packages/solid-vue/src/createBrowserSolidVueComposables.ts
diff --git a/packages/solid-vue/src/defaultInstance.ts b/packages/solid-vue/src/defaultInstance.ts
index 730e5b6c..b73860ee 100644
--- a/packages/solid-vue/src/defaultInstance.ts
+++ b/packages/solid-vue/src/defaultInstance.ts
@@ -1,4 +1,4 @@
-import { createBrowserSolidVueComposables } from "./createBrowserSolidVueMethods";
+import { createBrowserSolidVueComposables } from "./createBrowserSolidVueComposables";
 
 export const {
   provideSolidLdo,
diff --git a/packages/solid-vue/src/index.ts b/packages/solid-vue/src/index.ts
index 7b19dd41..d511adba 100644
--- a/packages/solid-vue/src/index.ts
+++ b/packages/solid-vue/src/index.ts
@@ -1,3 +1,3 @@
 export type * from "@ldo/vue";
-export * from "./createBrowserSolidVueMethods";
+export * from "./createBrowserSolidVueComposables";
 export * from "./defaultInstance";

From 3caf6d12de0244423525d03e9db35d651a3cb7c8 Mon Sep 17 00:00:00 2001
From: mrkvon <mrkvon@proton.me>
Date: Tue, 27 Oct 2026 14:30:24 +0100
Subject: [PATCH 09/15] fix api doc links

---
 packages/solid-vue/README.md | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/packages/solid-vue/README.md b/packages/solid-vue/README.md
index d676d550..94b53a38 100644
--- a/packages/solid-vue/README.md
+++ b/packages/solid-vue/README.md
@@ -108,32 +108,32 @@ Solid + Vue [composables](https://vuejs.org/guide/reusability/composables.html):
 
 ### Providers
 
-- [provideSolidLdo](https://ldo.js.org/latest/api/vue/provideSolidLdo/)
+- [provideSolidLdo](https://ldo.js.org/latest/api/solid-vue/provideSolidLdo/)
 
 ### Composables
 
 Generic `@ldo/vue` composables with integrated Solid connected plugin:
 
-- [useLdo](https://ldo.js.org/latest/api/vue/useLdo/)
-- [useResource](https://ldo.js.org/latest/api/vue/useResource/)
-- [useSubject](https://ldo.js.org/latest/api/vue/useSubject/)
-- [useMatchSubject](https://ldo.js.org/latest/api/vue/useMatchSubject/)
-- [useMatchObject](https://ldo.js.org/latest/api/vue/useMatchObject/)
-- [useSubscribeToResource](https://ldo.js.org/latest/api/vue/useSubscribeToResource/)
-- [useLinkQuery](https://ldo.js.org/latest/api/vue/useLinkQuery/)
-- [useChangeDataset](https://ldo.js.org/latest/api/vue/useChangeDataset/)
-- [useChangeSubject](https://ldo.js.org/latest/api/vue/useChangeSubject/)
-- [useChangeMatchSubject](https://ldo.js.org/latest/api/vue/useChangeMatchSubject/)
-- [useChangeMatchObject](https://ldo.js.org/latest/api/vue/useChangeMatchObject/)
+- [useLdo](https://ldo.js.org/latest/api/solid-vue/useLdo/)
+- [useResource](https://ldo.js.org/latest/api/solid-vue/useResource/)
+- [useSubject](https://ldo.js.org/latest/api/solid-vue/useSubject/)
+- [useMatchSubject](https://ldo.js.org/latest/api/solid-vue/useMatchSubject/)
+- [useMatchObject](https://ldo.js.org/latest/api/solid-vue/useMatchObject/)
+- [useSubscribeToResource](https://ldo.js.org/latest/api/solid-vue/useSubscribeToResource/)
+- [useLinkQuery](https://ldo.js.org/latest/api/solid-vue/useLinkQuery/)
+- [useChangeDataset](https://ldo.js.org/latest/api/solid-vue/useChangeDataset/)
+- [useChangeSubject](https://ldo.js.org/latest/api/solid-vue/useChangeSubject/)
+- [useChangeMatchSubject](https://ldo.js.org/latest/api/solid-vue/useChangeMatchSubject/)
+- [useChangeMatchObject](https://ldo.js.org/latest/api/solid-vue/useChangeMatchObject/)
 
 Solid-specific composables:
 
-- [useSolidAuth](https://ldo.js.org/latest/api/vue/useLdo/)
-- [useRootContainerFor](https://ldo.js.org/latest/api/vue/useLdo/)
+- [useSolidAuth](https://ldo.js.org/latest/api/solid-vue/useLdo/)
+- [useRootContainerFor](https://ldo.js.org/latest/api/solid-vue/useLdo/)
 
 ### Composable factory
 
-- [createBrowserSolidVueComposables](https://ldo.js.org/latest/api/vue/createBrowserSolidVueComposables/)
+- [createBrowserSolidVueComposables](https://ldo.js.org/latest/api/solid-vue/createBrowserSolidVueComposables/)
 
 ## Sponsorship
 

From 3969fa961a7bb9b20a2ca5ed57b641b814ffc869 Mon Sep 17 00:00:00 2001
From: mrkvon <mrkvon@proton.me>
Date: Tue, 27 Oct 2026 20:12:31 +0100
Subject: [PATCH 10/15] Fix issues from a review

---
 dev/solid-vue-vite-app/package.json            |  1 +
 dev/solid-vue-vite-app/src/UseMatchSubject.vue |  2 +-
 package-lock.json                              | 10 ++++++++--
 packages/solid-vue/package.json                |  5 ++++-
 packages/solid-vue/src/defaultInstance.ts      |  3 +++
 packages/solid-vue/src/useRootContainerFor.ts  |  4 +++-
 6 files changed, 20 insertions(+), 5 deletions(-)

diff --git a/dev/solid-vue-vite-app/package.json b/dev/solid-vue-vite-app/package.json
index ef81ae36..b8eb202f 100644
--- a/dev/solid-vue-vite-app/package.json
+++ b/dev/solid-vue-vite-app/package.json
@@ -13,6 +13,7 @@
     "lint": "eslint ."
   },
   "dependencies": {
+    "@ldo/connected-nextgraph": "^1.0.0-alpha.50",
     "@ldo/connected-solid": "^1.0.0-alpha.50",
     "@ldo/ldo": "^1.0.0-alpha.50",
     "@ldo/solid-vue": "^1.0.0-alpha.50",
diff --git a/dev/solid-vue-vite-app/src/UseMatchSubject.vue b/dev/solid-vue-vite-app/src/UseMatchSubject.vue
index 231755fe..bbf0705c 100644
--- a/dev/solid-vue-vite-app/src/UseMatchSubject.vue
+++ b/dev/solid-vue-vite-app/src/UseMatchSubject.vue
@@ -18,7 +18,7 @@ const graphInput = ref("");
 
 const predicate = computed(() => predicateInput.value || undefined);
 const object = computed(() => objectInput.value || undefined);
-const graph = computed(() => graphInput.value || undefined); //|| resource.value);
+const graph = computed(() => graphInput.value || undefined);
 
 const validResource = computed(() =>
   isValidUrl(resource.value) ? resource.value : "",
diff --git a/package-lock.json b/package-lock.json
index d4b1405c..023c09e5 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1116,6 +1116,7 @@
     "dev/solid-vue-vite-app": {
       "version": "0.0.0",
       "dependencies": {
+        "@ldo/connected-nextgraph": "^1.0.0-alpha.50",
         "@ldo/connected-solid": "^1.0.0-alpha.50",
         "@ldo/ldo": "^1.0.0-alpha.50",
         "@ldo/solid-vue": "^1.0.0-alpha.50",
@@ -23859,7 +23860,9 @@
       ]
     },
     "node_modules/@uvdsl/solid-oidc-client-browser": {
-      "version": "0.2.2",
+      "version": "0.2.3",
+      "resolved": "https://registry.npmjs.org/@uvdsl/solid-oidc-client-browser/-/solid-oidc-client-browser-0.2.3.tgz",
+      "integrity": "sha512-WzVlxv46EUSoqm7ovsWJRZq8KEI/CdpA9O1fXoiP8bihs2cNxPnet3YcqvIYWYMsTrf0zsR031l5s/BzQ9MEgA==",
       "license": "MIT",
       "dependencies": {
         "jose": "^5.9.6"
@@ -42916,9 +42919,12 @@
       "dependencies": {
         "@ldo/connected": "^1.0.0-alpha.50",
         "@ldo/connected-solid": "^1.0.0-alpha.50",
-        "@ldo/vue": "^1.0.0-alpha.50"
+        "@ldo/vue": "^1.0.0-alpha.50",
+        "@uvdsl/solid-oidc-client-browser": "^0.2.3"
       },
       "devDependencies": {
+        "@ldo/rdf-utils": "^1.0.0-alpha.50",
+        "@ldo/test-solid-server": "^1.0.0-alpha.50",
         "vue": "^3.5.43"
       },
       "peerDependencies": {
diff --git a/packages/solid-vue/package.json b/packages/solid-vue/package.json
index ad3cb7e8..c5adc46f 100644
--- a/packages/solid-vue/package.json
+++ b/packages/solid-vue/package.json
@@ -43,12 +43,15 @@
   "dependencies": {
     "@ldo/connected": "^1.0.0-alpha.50",
     "@ldo/connected-solid": "^1.0.0-alpha.50",
-    "@ldo/vue": "^1.0.0-alpha.50"
+    "@ldo/vue": "^1.0.0-alpha.50",
+    "@uvdsl/solid-oidc-client-browser": "^0.2.3"
   },
   "peerDependencies": {
     "vue": "^3.3.0"
   },
   "devDependencies": {
+    "@ldo/rdf-utils": "^1.0.0-alpha.50",
+    "@ldo/test-solid-server": "^1.0.0-alpha.50",
     "vue": "^3.5.43"
   }
 }
diff --git a/packages/solid-vue/src/defaultInstance.ts b/packages/solid-vue/src/defaultInstance.ts
index b73860ee..01d9bf5b 100644
--- a/packages/solid-vue/src/defaultInstance.ts
+++ b/packages/solid-vue/src/defaultInstance.ts
@@ -17,4 +17,7 @@ export const {
   useChangeSubject,
   useChangeMatchObject,
   useChangeMatchSubject,
+  useRootContainerFor,
+  datasetInjectionKey,
+  solidAuthInjectionKey,
 } = createBrowserSolidVueComposables();
diff --git a/packages/solid-vue/src/useRootContainerFor.ts b/packages/solid-vue/src/useRootContainerFor.ts
index cb5cf9e1..8cddf339 100644
--- a/packages/solid-vue/src/useRootContainerFor.ts
+++ b/packages/solid-vue/src/useRootContainerFor.ts
@@ -31,12 +31,14 @@ export function createUseRootContainerFor({
 
     watch(
       [() => toValue(uri), () => solidAuth.session.value.isActive],
-      async ([newUri, newIsActive], [oldUri, oldIsActive]) => {
+      async ([newUri, newIsActive], [oldUri, _oldIsActive]) => {
         void newIsActive;
         if (newUri !== oldUri) rootContainerUriRef.value = undefined;
         if (newUri && isSolidUri(newUri)) {
           const givenResource = dataset.getResource(newUri);
           const result = await givenResource.getRootContainer();
+          // now, proceed only if the newUri is still active, to prevent race condition
+          if (newUri !== toValue(uri)) return;
           rootContainerUriRef.value = result.isError ? undefined : result.uri;
         } else {
           rootContainerUriRef.value = undefined;

From 9822c3bdf62bb39f7e793add6ef30d97b4f341b1 Mon Sep 17 00:00:00 2001
From: mrkvon <mrkvon@proton.me>
Date: Wed, 28 Oct 2026 02:14:40 +0100
Subject: [PATCH 11/15] More fixes

---
 dev/solid-vue-vite-app/src/LandingPage.vue     |  1 -
 dev/solid-vue-vite-app/src/router.ts           |  2 +-
 packages/solid-vue/README.md                   |  4 ++--
 .../src/createBrowserSolidVueComposables.ts    |  8 ++++++++
 packages/solid-vue/src/useResourceWithAuth.ts  | 18 ++++++++++++------
 packages/solid-vue/src/useRootContainerFor.ts  |  9 +++++++++
 6 files changed, 32 insertions(+), 10 deletions(-)

diff --git a/dev/solid-vue-vite-app/src/LandingPage.vue b/dev/solid-vue-vite-app/src/LandingPage.vue
index 1f5ecb61..b2f64423 100644
--- a/dev/solid-vue-vite-app/src/LandingPage.vue
+++ b/dev/solid-vue-vite-app/src/LandingPage.vue
@@ -19,7 +19,6 @@ const validUri = computed(() =>
 );
 
 const subject = useSubject(FoafProfileShapeType, inputUri);
-console.log(subject);
 useResource(validUri);
 </script>
 
diff --git a/dev/solid-vue-vite-app/src/router.ts b/dev/solid-vue-vite-app/src/router.ts
index 1d0603b5..c5e941da 100644
--- a/dev/solid-vue-vite-app/src/router.ts
+++ b/dev/solid-vue-vite-app/src/router.ts
@@ -12,7 +12,7 @@ import UseRootContainerFor from "./UseRootContainerFor.vue";
 export const router = createRouter({
   history: createWebHistory(),
   routes: [
-    { path: "", component: LandingPage },
+    { path: "/", component: LandingPage },
     { path: "/use-solid-auth", component: SolidAuth },
     { path: "/use-match-subject", component: MatchSubject },
     { path: "/use-resource", component: UseResource },
diff --git a/packages/solid-vue/README.md b/packages/solid-vue/README.md
index 94b53a38..d0cf78ed 100644
--- a/packages/solid-vue/README.md
+++ b/packages/solid-vue/README.md
@@ -128,8 +128,8 @@ Generic `@ldo/vue` composables with integrated Solid connected plugin:
 
 Solid-specific composables:
 
-- [useSolidAuth](https://ldo.js.org/latest/api/solid-vue/useLdo/)
-- [useRootContainerFor](https://ldo.js.org/latest/api/solid-vue/useLdo/)
+- [useSolidAuth](https://ldo.js.org/latest/api/solid-vue/useSolidAuth/)
+- [useRootContainerFor](https://ldo.js.org/latest/api/solid-vue/useRootContainerFor/)
 
 ### Composable factory
 
diff --git a/packages/solid-vue/src/createBrowserSolidVueComposables.ts b/packages/solid-vue/src/createBrowserSolidVueComposables.ts
index ed99646a..0ed3a0c5 100644
--- a/packages/solid-vue/src/createBrowserSolidVueComposables.ts
+++ b/packages/solid-vue/src/createBrowserSolidVueComposables.ts
@@ -9,6 +9,12 @@ import type { ConnectedPlugin } from "@ldo/connected";
 import { createUseRootContainerFor } from "./useRootContainerFor";
 import { createUseResourceWithAuth } from "./useResourceWithAuth";
 
+/**
+ * Create LDO Vue composables with Solid protocol support.
+ *
+ * You can optionally also provide an array of additional plugins.
+ * Solid connected plugin is included by default.
+ */
 export function createBrowserSolidVueComposables<
   Plugin extends ConnectedPlugin = never,
 >(additionalPlugins: Plugin[] = []) {
@@ -23,6 +29,8 @@ export function createBrowserSolidVueComposables<
   function provideSolidLdo() {
     const dataset = provideDataset();
     const solidAuth = provideSolidAuth();
+    // Bind the Solid session's authenticate fetch to the LDO dataset
+    // to send Solid-authenticated requests.
     dataset.setContext("solid", { fetch: solidAuth.fetch });
     return { dataset, solidAuth };
   }
diff --git a/packages/solid-vue/src/useResourceWithAuth.ts b/packages/solid-vue/src/useResourceWithAuth.ts
index f2fd35ec..03b06fc6 100644
--- a/packages/solid-vue/src/useResourceWithAuth.ts
+++ b/packages/solid-vue/src/useResourceWithAuth.ts
@@ -11,7 +11,10 @@ import type { useSolidAuth } from "./useSolidAuth";
 type UseSolidAuth = typeof useSolidAuth;
 
 /**
- * If the uri is Solid uri, we want refetch the resource when session.isActive changes
+ * @internal
+ *
+ * Creates a Solid-authentication-aware useResource composable.
+ * If the uri is Solid uri, we want to refetch the resource when session.isActive changes
  */
 export function createUseResourceWithAuth({
   useResource,
@@ -20,6 +23,11 @@ export function createUseResourceWithAuth({
   useResource: useResourceType<SolidConnectedPlugin[]>;
   useSolidAuth: UseSolidAuth;
 }): useResourceType<SolidConnectedPlugin[]> {
+  /**
+   * Solid-authentication-aware useResource method.
+   * It returns a reactive resource and it triggers a rerender.
+   * It re-fetches the resource when auth session status (signin/signout) changes.
+   */
   return function useResourceWithAuth(
     uri: Parameters<typeof useResource>[0],
     options?: Parameters<typeof useResource>[1],
@@ -34,11 +42,9 @@ export function createUseResourceWithAuth({
         const resource = resourceRef.value as SolidLeaf | SolidContainer;
         // if the read has not been initialized and initial read is suppressed, don't re-read
         if (
-          !(
-            suppressInitialRead &&
-            resource.status.type === "unfetched" &&
-            !resource.isLoading()
-          )
+          !suppressInitialRead ||
+          resource.status.type !== "unfetched" ||
+          resource.isLoading()
         ) {
           await resourceRef.value!.read();
         }
diff --git a/packages/solid-vue/src/useRootContainerFor.ts b/packages/solid-vue/src/useRootContainerFor.ts
index 8cddf339..31081f16 100644
--- a/packages/solid-vue/src/useRootContainerFor.ts
+++ b/packages/solid-vue/src/useRootContainerFor.ts
@@ -12,6 +12,11 @@ import type {
 import { ref, toValue, watch, type MaybeRefOrGetter } from "vue";
 import type { useSolidAuth } from "./useSolidAuth";
 
+/**
+ * @internal
+ *
+ * Creates a useRootContainerFor composable
+ */
 export function createUseRootContainerFor({
   useDataset,
   useResource,
@@ -21,6 +26,10 @@ export function createUseRootContainerFor({
   useResource: ReturnType<typeof createUseResource<SolidConnectedPlugin[]>>;
   useSolidAuth: typeof useSolidAuth;
 }) {
+  /**
+   * Returns a reactive Solid Pod root container of a given URI
+   * or undefined if the root container of the resource is not found.
+   */
   return function useRootContainerFor(
     uri?: MaybeRefOrGetter<SolidContainerUri | SolidLeafUri | undefined>,
     options?: MaybeRefOrGetter<UseResourceOptions<"solid">>,

From 87922f0bd0fe2ce84c57e2ba9633c6f91b0b8c6c Mon Sep 17 00:00:00 2001
From: mrkvon <mrkvon@proton.me>
Date: Wed, 28 Oct 2026 02:40:04 +0100
Subject: [PATCH 12/15] Fixes of README and @ldo/vue

---
 dev/solid-vue-vite-app/README.md            |  4 ++++
 packages/vue/src/createLdoVueComposables.ts |  3 ++-
 packages/vue/src/index.ts                   |  3 ---
 packages/vue/src/methods/useLinkQuery.ts    | 11 ++++++-----
 packages/vue/src/methods/useSubject.ts      |  5 -----
 5 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/dev/solid-vue-vite-app/README.md b/dev/solid-vue-vite-app/README.md
index 493f8a6f..2ddffe8a 100644
--- a/dev/solid-vue-vite-app/README.md
+++ b/dev/solid-vue-vite-app/README.md
@@ -1,5 +1,9 @@
 # solid-vue-vite-app
 
+Testing app for `@ldo/solid-vue`.
+
+The rest of this file has been generated by `npm create vue@latest`.
+
 This template should help get you started developing with Vue 3 in Vite.
 
 ## Recommended IDE Setup
diff --git a/packages/vue/src/createLdoVueComposables.ts b/packages/vue/src/createLdoVueComposables.ts
index 7ebeba2b..93425238 100644
--- a/packages/vue/src/createLdoVueComposables.ts
+++ b/packages/vue/src/createLdoVueComposables.ts
@@ -15,6 +15,7 @@ import { createUseLinkQuery } from "./methods/useLinkQuery";
 import { createUseChangeDataset } from "./methods/change/useChangeDataset";
 import { createUseChangeMatchObject } from "./methods/change/useChangeMatchObject";
 import { createUseChangeMatchSubject } from "./methods/change/useChangeMatchSubject";
+import { createUseChangeSubject } from "./methods/change/useChangeSubject";
 
 /**
  * Create ldo composables for Vue, where the dataset is isolated and provided/injected.
@@ -85,7 +86,7 @@ export function createLdoVueComposables<Plugin extends ConnectedPlugin>(
     ),
     useChangeSubject: createComposable(
       datasetInjectionKey,
-      createUseSubject<Plugin[]>,
+      createUseChangeSubject<Plugin[]>,
     ),
     useChangeMatchObject: createComposable(
       datasetInjectionKey,
diff --git a/packages/vue/src/index.ts b/packages/vue/src/index.ts
index 9ed3d07e..8925e34e 100644
--- a/packages/vue/src/index.ts
+++ b/packages/vue/src/index.ts
@@ -10,10 +10,7 @@ export * from "./methods/useSubject";
 export * from "./methods/useSubscribeToResource";
 export * from "./methods/useLinkQuery";
 
-// export * from "./methods/change/types";
 export * from "./methods/change/useChangeDataset";
 export * from "./methods/change/useChangeSubject";
 export * from "./methods/change/useChangeMatchObject";
 export * from "./methods/change/useChangeMatchSubject";
-
-export * from "./util/useTrackingProxy";
diff --git a/packages/vue/src/methods/useLinkQuery.ts b/packages/vue/src/methods/useLinkQuery.ts
index d024adb3..14012f26 100644
--- a/packages/vue/src/methods/useLinkQuery.ts
+++ b/packages/vue/src/methods/useLinkQuery.ts
@@ -48,16 +48,17 @@ export function createUseLinkQuery<Plugins extends ConnectedPlugin[]>(
           .usingType(shapeType)
           .startLinkQuery(resource, startingSubjectUri, linkQuery);
 
+        // register cleanup before first await
+        onCleanup(async () => {
+          finished = true;
+          await resourceLinkQuery.unsubscribeAll();
+        });
+
         await resourceLinkQuery.subscribe();
         // if already cleaned up, unsubscribe immediately
         if (finished) {
           await resourceLinkQuery.unsubscribeAll();
         }
-
-        onCleanup(async () => {
-          finished = true;
-          await resourceLinkQuery.unsubscribeAll();
-        });
       },
       { immediate: true },
     );
diff --git a/packages/vue/src/methods/useSubject.ts b/packages/vue/src/methods/useSubject.ts
index 2bbe727c..361c91bc 100644
--- a/packages/vue/src/methods/useSubject.ts
+++ b/packages/vue/src/methods/useSubject.ts
@@ -19,11 +19,6 @@ export type useSubjectType<Plugins extends ConnectedPlugin[]> = {
     subject?: MaybeRefOrGetter<string | SubjectNode | undefined>,
     options?: MaybeRefOrGetter<UseSubjectOptions<Plugins>>,
   ): Ref<Type | undefined>;
-  <Type extends LdoBase>(
-    shapeType: MaybeRefOrGetter<ShapeType<Type>>,
-    subject?: MaybeRefOrGetter<string | SubjectNode | undefined>,
-    options?: MaybeRefOrGetter<UseSubjectOptions<Plugins>>,
-  ): Ref<Type | undefined>;
 };
 
 /**

From 7c42d2e5e852d2bdfd67c45a8f11527bc232210d Mon Sep 17 00:00:00 2001
From: mrkvon <mrkvon@proton.me>
Date: Wed, 28 Oct 2026 04:41:54 +0100
Subject: [PATCH 13/15] Add comment and cleanup unused vars in tests

---
 .../solid-vue/test/SolidComposables.test.ts   | 21 ++++++-------------
 packages/vue/src/createLdoVueMethods.ts       |  3 +++
 2 files changed, 9 insertions(+), 15 deletions(-)

diff --git a/packages/solid-vue/test/SolidComposables.test.ts b/packages/solid-vue/test/SolidComposables.test.ts
index 0d4c36dc..86d1c0f1 100644
--- a/packages/solid-vue/test/SolidComposables.test.ts
+++ b/packages/solid-vue/test/SolidComposables.test.ts
@@ -1,30 +1,21 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { MockSharedWorker, withParentChildSetup } from "./test-utils";
 import { createBrowserSolidVueComposables } from "@ldo/solid-vue";
-import { namedNode } from "@ldo/rdf-utils";
 import { setupServer } from "@ldo/test-solid-server";
 import { type CreateAppFunction, nextTick, type Ref, ref } from "vue";
 import type {
-  SolidConnectedPlugin,
   SolidContainer,
   SolidContainerUri,
   SolidLeafUri,
 } from "@ldo/connected-solid";
 import type { UseResourceOptions } from "../src/index";
-import type { ConnectedLdoDataset } from "@ldo/connected";
-import type { SolidAuthSession } from "../src/useSolidAuth";
 
 describe("Composables for Solid", () => {
   let methods: ReturnType<typeof createBrowserSolidVueComposables<never>>;
   const personResourceUri = "http://localhost:3006/directory/person";
-  const personUri = personResourceUri + "#me";
-  const otherPersonUri = personResourceUri + "#i";
   const person2ResourceUri = "http://localhost:3006/directory/person2";
-  const person2Uri = person2ResourceUri + "#me";
-  const foafName = namedNode("http://xmlns.com/foaf/0.1/name");
-  const foafKnows = namedNode("http://xmlns.com/foaf/0.1/knows");
 
-  const s = setupServer(3006, {
+  setupServer(3006, {
     slug: "directory/",
     isContainer: true,
     contains: [
@@ -98,10 +89,10 @@ describe("Composables for Solid", () => {
 
   describe("useRootContainerFor", () => {
     let childResult: Ref<SolidContainer | undefined>,
-      parentResult: {
-        dataset: ConnectedLdoDataset<SolidConnectedPlugin[]>;
-        solidAuth: SolidAuthSession;
-      },
+      // parentResult: {
+      //   dataset: ConnectedLdoDataset<SolidConnectedPlugin[]>;
+      //   solidAuth: SolidAuthSession;
+      // },
       app: ReturnType<CreateAppFunction<Element>>,
       uri: Ref<SolidLeafUri | SolidContainerUri | undefined>,
       options: Ref<UseResourceOptions<"solid">>;
@@ -110,7 +101,7 @@ describe("Composables for Solid", () => {
       uri = ref<SolidLeafUri | SolidContainerUri | undefined>();
       options = ref({});
 
-      [parentResult, childResult, app] = withParentChildSetup(
+      [, /*parentResult*/ childResult, app] = withParentChildSetup(
         () => methods.provideSolidLdo(),
         () => methods.useRootContainerFor(uri, options),
       );
diff --git a/packages/vue/src/createLdoVueMethods.ts b/packages/vue/src/createLdoVueMethods.ts
index 2cdba671..ce3ce429 100644
--- a/packages/vue/src/createLdoVueMethods.ts
+++ b/packages/vue/src/createLdoVueMethods.ts
@@ -18,6 +18,9 @@ import { createUseDataset } from "./methods/useDataset";
 /**
  * A function that creates all common vue functions given specific plugin.
  *
+ * It keeps a global module-level dataset variable.
+ * To keep injected dataset, use `createLdoVueComposables` instead.
+ *
  * @example
  * `methods.ts`
  * ```tsx

From 544c26196f63a7b409733a2f9407e9b1a9ce325f Mon Sep 17 00:00:00 2001
From: mrkvon <mrkvon@proton.me>
Date: Wed, 28 Oct 2026 04:43:18 +0100
Subject: [PATCH 14/15] DO WE WANT TO USE OR REVERT THIS? TODO WAIT

simplify generic types:
`Plugins extends ConnectedPlugin[]` becomes `Plugin extends
ConnectedPlugin`
---
 packages/solid-vue/src/useResourceWithAuth.ts |  4 +--
 packages/solid-vue/src/useRootContainerFor.ts |  4 +--
 packages/vue/src/createLdoVueComposables.ts   | 30 +++++++---------
 .../src/methods/change/useChangeDataset.ts    | 12 +++----
 .../methods/change/useChangeMatchObject.ts    |  8 ++---
 .../methods/change/useChangeMatchSubject.ts   |  8 ++---
 .../src/methods/change/useChangeSubject.ts    |  8 ++---
 packages/vue/src/methods/useDataset.ts        |  4 +--
 packages/vue/src/methods/useLdo.ts            | 36 +++++++++----------
 packages/vue/src/methods/useLinkQuery.ts      |  4 +--
 packages/vue/src/methods/useMatchObject.ts    | 20 +++++------
 packages/vue/src/methods/useMatchSubject.ts   | 10 +++---
 packages/vue/src/methods/useResource.ts       | 18 +++++-----
 packages/vue/src/methods/useSubject.ts        | 18 +++++-----
 .../vue/src/methods/useSubscribeToResource.ts |  4 +--
 15 files changed, 91 insertions(+), 97 deletions(-)

diff --git a/packages/solid-vue/src/useResourceWithAuth.ts b/packages/solid-vue/src/useResourceWithAuth.ts
index 03b06fc6..20daf7e0 100644
--- a/packages/solid-vue/src/useResourceWithAuth.ts
+++ b/packages/solid-vue/src/useResourceWithAuth.ts
@@ -20,9 +20,9 @@ export function createUseResourceWithAuth({
   useResource,
   useSolidAuth,
 }: {
-  useResource: useResourceType<SolidConnectedPlugin[]>;
+  useResource: useResourceType<SolidConnectedPlugin>;
   useSolidAuth: UseSolidAuth;
-}): useResourceType<SolidConnectedPlugin[]> {
+}): useResourceType<SolidConnectedPlugin> {
   /**
    * Solid-authentication-aware useResource method.
    * It returns a reactive resource and it triggers a rerender.
diff --git a/packages/solid-vue/src/useRootContainerFor.ts b/packages/solid-vue/src/useRootContainerFor.ts
index 31081f16..4610726a 100644
--- a/packages/solid-vue/src/useRootContainerFor.ts
+++ b/packages/solid-vue/src/useRootContainerFor.ts
@@ -22,8 +22,8 @@ export function createUseRootContainerFor({
   useResource,
   useSolidAuth: useSAuth,
 }: {
-  useDataset: ReturnType<typeof createUseDataset<[SolidConnectedPlugin]>>;
-  useResource: ReturnType<typeof createUseResource<SolidConnectedPlugin[]>>;
+  useDataset: ReturnType<typeof createUseDataset<SolidConnectedPlugin>>;
+  useResource: ReturnType<typeof createUseResource<SolidConnectedPlugin>>;
   useSolidAuth: typeof useSolidAuth;
 }) {
   /**
diff --git a/packages/vue/src/createLdoVueComposables.ts b/packages/vue/src/createLdoVueComposables.ts
index 93425238..4050bb49 100644
--- a/packages/vue/src/createLdoVueComposables.ts
+++ b/packages/vue/src/createLdoVueComposables.ts
@@ -51,50 +51,44 @@ export function createLdoVueComposables<Plugin extends ConnectedPlugin>(
   return {
     datasetInjectionKey,
     provideDataset,
-    useDataset: createComposable(
-      datasetInjectionKey,
-      createUseDataset<Plugin[]>,
-    ),
-    useLdo: createComposable(datasetInjectionKey, createUseLdo<Plugin[]>),
+    useDataset: createComposable(datasetInjectionKey, createUseDataset<Plugin>),
+    useLdo: createComposable(datasetInjectionKey, createUseLdo<Plugin>),
     useResource: createComposable(
       datasetInjectionKey,
-      createUseResource<Plugin[]>,
-    ),
-    useSubject: createComposable(
-      datasetInjectionKey,
-      createUseSubject<Plugin[]>,
+      createUseResource<Plugin>,
     ),
+    useSubject: createComposable(datasetInjectionKey, createUseSubject<Plugin>),
     useMatchObject: createComposable(
       datasetInjectionKey,
-      createUseMatchObject<Plugin[]>,
+      createUseMatchObject<Plugin>,
     ),
     useMatchSubject: createComposable(
       datasetInjectionKey,
-      createUseMatchSubject<Plugin[]>,
+      createUseMatchSubject<Plugin>,
     ),
     useSubscribeToResource: createComposable(
       datasetInjectionKey,
-      createUseSubscribeToResource<Plugin[]>,
+      createUseSubscribeToResource<Plugin>,
     ),
     useLinkQuery: createComposable(
       datasetInjectionKey,
-      createUseLinkQuery<Plugin[]>,
+      createUseLinkQuery<Plugin>,
     ),
     useChangeDataset: createComposable(
       datasetInjectionKey,
-      createUseChangeDataset<Plugin[]>,
+      createUseChangeDataset<Plugin>,
     ),
     useChangeSubject: createComposable(
       datasetInjectionKey,
-      createUseChangeSubject<Plugin[]>,
+      createUseChangeSubject<Plugin>,
     ),
     useChangeMatchObject: createComposable(
       datasetInjectionKey,
-      createUseChangeMatchObject<Plugin[]>,
+      createUseChangeMatchObject<Plugin>,
     ),
     useChangeMatchSubject: createComposable(
       datasetInjectionKey,
-      createUseChangeMatchSubject<Plugin[]>,
+      createUseChangeMatchSubject<Plugin>,
     ),
   };
 }
diff --git a/packages/vue/src/methods/change/useChangeDataset.ts b/packages/vue/src/methods/change/useChangeDataset.ts
index b08590b5..158d37c4 100644
--- a/packages/vue/src/methods/change/useChangeDataset.ts
+++ b/packages/vue/src/methods/change/useChangeDataset.ts
@@ -16,8 +16,8 @@ import {
  *
  * Creates a useChangeDataset composable
  */
-export function createUseChangeDataset<Plugins extends ConnectedPlugin[]>(
-  dataset: IConnectedLdoDataset<Plugins>,
+export function createUseChangeDataset<Plugin extends ConnectedPlugin>(
+  dataset: IConnectedLdoDataset<Plugin[]>,
 ) {
   /**
    * Returns a transaction on the dataset that can be modified and committed.
@@ -44,12 +44,12 @@ export function createUseChangeDataset<Plugins extends ConnectedPlugin[]>(
    */
   return function useChangeDataset(
     specificDataset?: MaybeRefOrGetter<
-      IConnectedLdoDataset<Plugins> | undefined
+      IConnectedLdoDataset<Plugin[]> | undefined
     >,
   ) {
     const transactionDataset = shallowRef<
-      ConnectedLdoTransactionDataset<Plugins>
-    >() as Ref<ConnectedLdoTransactionDataset<Plugins>>;
+      ConnectedLdoTransactionDataset<Plugin[]>
+    >() as Ref<ConnectedLdoTransactionDataset<Plugin[]>>;
 
     watch(
       () => toValue(specificDataset),
@@ -60,7 +60,7 @@ export function createUseChangeDataset<Plugins extends ConnectedPlugin[]>(
     );
 
     const setData = (
-      changer: (toChange: ConnectedLdoTransactionDataset<Plugins>) => void,
+      changer: (toChange: ConnectedLdoTransactionDataset<Plugin[]>) => void,
     ) => {
       const subTransaction = transactionDataset.value.startTransaction();
       changer(subTransaction);
diff --git a/packages/vue/src/methods/change/useChangeMatchObject.ts b/packages/vue/src/methods/change/useChangeMatchObject.ts
index 0eec2a15..d7cbbb96 100644
--- a/packages/vue/src/methods/change/useChangeMatchObject.ts
+++ b/packages/vue/src/methods/change/useChangeMatchObject.ts
@@ -14,8 +14,8 @@ import {
  *
  * Creates a useChangeMatchObject composable
  */
-export function createUseChangeMatchObject<Plugins extends ConnectedPlugin[]>(
-  dataset: IConnectedLdoDataset<Plugins>,
+export function createUseChangeMatchObject<Plugin extends ConnectedPlugin>(
+  dataset: IConnectedLdoDataset<Plugin[]>,
 ) {
   const useChangeDataset = createUseChangeDataset(dataset);
   const useMatchObject = createUseMatchObject(dataset);
@@ -28,7 +28,7 @@ export function createUseChangeMatchObject<Plugins extends ConnectedPlugin[]>(
     subject?: MaybeRefOrGetter<QuadMatch[0] | string | undefined>,
     predicate?: MaybeRefOrGetter<QuadMatch[1] | string | undefined>,
     graph?: MaybeRefOrGetter<QuadMatch[3] | string | undefined>,
-    options?: MaybeRefOrGetter<UseMatchObjectOptions<Plugins>>,
+    options?: MaybeRefOrGetter<UseMatchObjectOptions<Plugin>>,
   ) {
     const resolvedDataset = computed(() => toValue(options)?.dataset);
 
@@ -53,7 +53,7 @@ export function createUseChangeMatchObject<Plugins extends ConnectedPlugin[]>(
     const setData = <
       OtherType extends LdoBase | LdSet<LdoBase> | undefined = undefined,
     >(
-      writeResource: Plugins[number]["types"]["resource"],
+      writeResource: Plugin["types"]["resource"],
       changer: (
         toChange: OtherType extends undefined ? LdSet<Type> : OtherType,
       ) => void,
diff --git a/packages/vue/src/methods/change/useChangeMatchSubject.ts b/packages/vue/src/methods/change/useChangeMatchSubject.ts
index 89267ca9..9a3ca315 100644
--- a/packages/vue/src/methods/change/useChangeMatchSubject.ts
+++ b/packages/vue/src/methods/change/useChangeMatchSubject.ts
@@ -14,8 +14,8 @@ import {
  *
  * Creates a useChangeMatchSubject composable
  */
-export function createUseChangeMatchSubject<Plugins extends ConnectedPlugin[]>(
-  dataset: IConnectedLdoDataset<Plugins>,
+export function createUseChangeMatchSubject<Plugin extends ConnectedPlugin>(
+  dataset: IConnectedLdoDataset<Plugin[]>,
 ) {
   const useChangeDataset = createUseChangeDataset(dataset);
   const useMatchSubject = createUseMatchSubject(dataset);
@@ -28,7 +28,7 @@ export function createUseChangeMatchSubject<Plugins extends ConnectedPlugin[]>(
     predicate?: MaybeRefOrGetter<QuadMatch[1] | string | undefined>,
     object?: MaybeRefOrGetter<QuadMatch[2] | string | undefined>,
     graph?: MaybeRefOrGetter<QuadMatch[3] | string | undefined>,
-    options?: MaybeRefOrGetter<UseMatchSubjectOptions<Plugins>>,
+    options?: MaybeRefOrGetter<UseMatchSubjectOptions<Plugin>>,
   ) {
     const resolvedDataset = computed(() => toValue(options)?.dataset);
 
@@ -53,7 +53,7 @@ export function createUseChangeMatchSubject<Plugins extends ConnectedPlugin[]>(
     const setData = <
       OtherType extends LdoBase | LdSet<LdoBase> | undefined = undefined,
     >(
-      writeResource: Plugins[number]["types"]["resource"],
+      writeResource: Plugin["types"]["resource"],
       changer: (
         toChange: OtherType extends undefined ? LdSet<Type> : OtherType,
       ) => void,
diff --git a/packages/vue/src/methods/change/useChangeSubject.ts b/packages/vue/src/methods/change/useChangeSubject.ts
index d42b9f7a..994208c9 100644
--- a/packages/vue/src/methods/change/useChangeSubject.ts
+++ b/packages/vue/src/methods/change/useChangeSubject.ts
@@ -11,8 +11,8 @@ import { createProxyInteractOptions } from "@ldo/jsonld-dataset-proxy";
  *
  * Creates a useChangeSubject composable.
  */
-export function createUseChangeSubject<Plugins extends ConnectedPlugin[]>(
-  dataset: IConnectedLdoDataset<Plugins>,
+export function createUseChangeSubject<Plugin extends ConnectedPlugin>(
+  dataset: IConnectedLdoDataset<Plugin[]>,
 ) {
   const useChangeDataset = createUseChangeDataset(dataset);
   const useSubject = createUseSubject(dataset);
@@ -23,7 +23,7 @@ export function createUseChangeSubject<Plugins extends ConnectedPlugin[]>(
   return function useChangeSubject<Type extends LdoBase>(
     shapeType: MaybeRefOrGetter<ShapeType<Type>>,
     subject: MaybeRefOrGetter<string | SubjectNode | undefined>,
-    options?: MaybeRefOrGetter<UseSubjectOptions<Plugins>>,
+    options?: MaybeRefOrGetter<UseSubjectOptions<Plugin>>,
   ) {
     const resolvedDataset = computed(() => toValue(options)?.dataset);
 
@@ -42,7 +42,7 @@ export function createUseChangeSubject<Plugins extends ConnectedPlugin[]>(
     const setData = <
       OtherType extends LdoBase | LdSet<LdoBase> | undefined = undefined,
     >(
-      writeResource: Plugins[number]["types"]["resource"],
+      writeResource: Plugin["types"]["resource"],
       changer: (
         toChange: OtherType extends undefined ? Type : OtherType,
       ) => void,
diff --git a/packages/vue/src/methods/useDataset.ts b/packages/vue/src/methods/useDataset.ts
index b643dfad..a3c88586 100644
--- a/packages/vue/src/methods/useDataset.ts
+++ b/packages/vue/src/methods/useDataset.ts
@@ -5,8 +5,8 @@ import type { IConnectedLdoDataset, ConnectedPlugin } from "@ldo/connected";
  *
  * Creates a useDataset function
  */
-export function createUseDataset<Plugins extends ConnectedPlugin[]>(
-  dataset: IConnectedLdoDataset<Plugins>,
+export function createUseDataset<Plugin extends ConnectedPlugin>(
+  dataset: IConnectedLdoDataset<Plugin[]>,
 ) {
   /**
    * Returns the global dataset for the application
diff --git a/packages/vue/src/methods/useLdo.ts b/packages/vue/src/methods/useLdo.ts
index 81821ee8..115b80f4 100644
--- a/packages/vue/src/methods/useLdo.ts
+++ b/packages/vue/src/methods/useLdo.ts
@@ -16,11 +16,11 @@ import type { SubjectNode } from "@ldo/rdf-utils";
 /**
  * The methods returned by useLdo
  */
-export interface UseLdoMethods<Plugins extends ConnectedPlugin[]> {
+export interface UseLdoMethods<Plugin extends ConnectedPlugin> {
   /**
    * A ConnectedLdoDataset
    */
-  dataset: ConnectedLdoDataset<Plugins>;
+  dataset: ConnectedLdoDataset<Plugin[]>;
   /**
    * Retrieves a representation of a Resource at the given URI. This resource
    * represents the current state of the resource: whether it is currently
@@ -32,14 +32,14 @@ export interface UseLdoMethods<Plugins extends ConnectedPlugin[]> {
    *
    * @returns a Resource
    */
-  getResource: ConnectedLdoDataset<Plugins>["getResource"];
+  getResource: ConnectedLdoDataset<Plugin[]>["getResource"];
   /**
    * Sets context for a specific plugin
    *
    * @param pluginName - the name of the plugin
    * @param context - the context for this specific plugin
    */
-  setContext: ConnectedLdoDataset<Plugins>["setContext"];
+  setContext: ConnectedLdoDataset<Plugin[]>["setContext"];
   /**
    * Gets a linked data object based on the subject
    */
@@ -59,31 +59,31 @@ export interface UseLdoMethods<Plugins extends ConnectedPlugin[]> {
   createData<Type extends LdoBase>(
     shapeType: ShapeType<Type>,
     subject: string | SubjectNode,
-    resource: Plugins[number]["types"]["resource"],
-    ...additionalResources: Plugins[number]["types"]["resource"][]
+    resource: Plugin["types"]["resource"],
+    ...additionalResources: Plugin["types"]["resource"][]
   ): Type;
   /**
    * Returns a writable LinkedDataObject given a linked data object
    */
   changeData<Type extends LdoBase>(
     input: Type,
-    resource: Plugins[number]["types"]["resource"],
-    ...additionalResources: Plugins[number]["types"]["resource"][]
+    resource: Plugin["types"]["resource"],
+    ...additionalResources: Plugin["types"]["resource"][]
   ): Type;
   /**
    * Commits the data of a writable Linked Data Object back to the remote.
    */
   commitData(
     input: LdoBase,
-  ): ReturnType<ConnectedLdoTransactionDataset<Plugins>["commitToRemote"]>;
+  ): ReturnType<ConnectedLdoTransactionDataset<Plugin[]>["commitToRemote"]>;
 }
 
 /**
  * @internal
  * Creates a useLdo composable
  */
-export function createUseLdo<Plugins extends ConnectedPlugin[]>(
-  dataset: ConnectedLdoDataset<Plugins>,
+export function createUseLdo<Plugin extends ConnectedPlugin>(
+  dataset: ConnectedLdoDataset<Plugin[]>,
 ) {
   const toReturn = {
     dataset,
@@ -117,8 +117,8 @@ export function createUseLdo<Plugins extends ConnectedPlugin[]>(
     createData<Type extends LdoBase>(
       shapeType: ShapeType<Type>,
       subject: string | SubjectNode,
-      resource: Plugins[number]["types"]["resource"],
-      ...additionalResources: Plugins[number]["types"]["resource"][]
+      resource: Plugin["types"]["resource"],
+      ...additionalResources: Plugin["types"]["resource"][]
     ): Type {
       return dataset.createData(
         shapeType,
@@ -139,14 +139,14 @@ export function createUseLdo<Plugins extends ConnectedPlugin[]>(
      */
     commitData(
       input: LdoBase,
-    ): ReturnType<ConnectedLdoTransactionDataset<Plugins>["commitToRemote"]> {
-      const inputDataset = getDataset(
-        input,
-      ) as ConnectedLdoTransactionDataset<Plugins>;
+    ): ReturnType<ConnectedLdoTransactionDataset<Plugin[]>["commitToRemote"]> {
+      const inputDataset = getDataset(input) as ConnectedLdoTransactionDataset<
+        Plugin[]
+      >;
       return inputDataset.commitToRemote();
     },
   };
-  return function useLdo(): UseLdoMethods<Plugins> {
+  return function useLdo(): UseLdoMethods<Plugin> {
     return toReturn;
   };
 }
diff --git a/packages/vue/src/methods/useLinkQuery.ts b/packages/vue/src/methods/useLinkQuery.ts
index 14012f26..2385503d 100644
--- a/packages/vue/src/methods/useLinkQuery.ts
+++ b/packages/vue/src/methods/useLinkQuery.ts
@@ -13,8 +13,8 @@ import { type MaybeRefOrGetter, toValue, watch } from "vue";
  *
  * Creates a useLinkQuery composable.
  */
-export function createUseLinkQuery<Plugins extends ConnectedPlugin[]>(
-  dataset: IConnectedLdoDataset<Plugins>,
+export function createUseLinkQuery<Plugin extends ConnectedPlugin>(
+  dataset: IConnectedLdoDataset<Plugin[]>,
 ) {
   /**
    * Runs a LDO link query.
diff --git a/packages/vue/src/methods/useMatchObject.ts b/packages/vue/src/methods/useMatchObject.ts
index aecd7e79..fa4faccf 100644
--- a/packages/vue/src/methods/useMatchObject.ts
+++ b/packages/vue/src/methods/useMatchObject.ts
@@ -4,17 +4,17 @@ import { useTrackingProxy } from "../util/useTrackingProxy";
 import type { ConnectedPlugin, IConnectedLdoDataset } from "@ldo/connected";
 import { computed, toValue, type MaybeRefOrGetter, type Ref } from "vue";
 
-export interface UseMatchObjectOptions<Plugins extends ConnectedPlugin[]> {
-  dataset?: IConnectedLdoDataset<Plugins>;
+export interface UseMatchObjectOptions<Plugin extends ConnectedPlugin> {
+  dataset?: IConnectedLdoDataset<Plugin[]>;
 }
 
-export interface UseMatchObjectComposable<Plugins extends ConnectedPlugin[]> {
-  <Type extends LdoBase, CustomPlugins extends ConnectedPlugin[] = Plugins>(
+export interface UseMatchObjectComposable<Plugin extends ConnectedPlugin> {
+  <Type extends LdoBase, CustomPlugin extends ConnectedPlugin = Plugin>(
     shapeType: MaybeRefOrGetter<ShapeType<Type>>,
     subject?: MaybeRefOrGetter<QuadMatch[0] | string>,
     predicate?: MaybeRefOrGetter<QuadMatch[1] | string>,
     graph?: MaybeRefOrGetter<QuadMatch[3] | string>,
-    options?: MaybeRefOrGetter<UseMatchObjectOptions<CustomPlugins>>,
+    options?: MaybeRefOrGetter<UseMatchObjectOptions<CustomPlugin>>,
   ): Ref<LdSet<Type>>;
 }
 
@@ -23,22 +23,22 @@ export interface UseMatchObjectComposable<Plugins extends ConnectedPlugin[]> {
  *
  * Creates a useMatchObject composable.
  */
-export function createUseMatchObject<Plugins extends ConnectedPlugin[]>(
-  dataset: IConnectedLdoDataset<Plugins>,
-): UseMatchObjectComposable<Plugins> {
+export function createUseMatchObject<Plugin extends ConnectedPlugin>(
+  dataset: IConnectedLdoDataset<Plugin[]>,
+): UseMatchObjectComposable<Plugin> {
   /**
    * Returns a reactive LDO set of matching items.
    * Triggers a rerender if that data are updated.
    */
   return function useMatchObject<
     Type extends LdoBase,
-    CustomPlugins extends ConnectedPlugin[] = Plugins,
+    CustomPlugin extends ConnectedPlugin = Plugin,
   >(
     shapeType: MaybeRefOrGetter<ShapeType<Type>>,
     subject?: MaybeRefOrGetter<QuadMatch[0] | string>,
     predicate?: MaybeRefOrGetter<QuadMatch[1] | string>,
     graph?: MaybeRefOrGetter<QuadMatch[3] | string>,
-    options?: MaybeRefOrGetter<UseMatchObjectOptions<CustomPlugins>>,
+    options?: MaybeRefOrGetter<UseMatchObjectOptions<CustomPlugin>>,
   ): Ref<LdSet<Type>> {
     const createLdo = computed(() => {
       const subjectValue = toValue(subject);
diff --git a/packages/vue/src/methods/useMatchSubject.ts b/packages/vue/src/methods/useMatchSubject.ts
index 556eb295..0e77c820 100644
--- a/packages/vue/src/methods/useMatchSubject.ts
+++ b/packages/vue/src/methods/useMatchSubject.ts
@@ -4,8 +4,8 @@ import { useTrackingProxy } from "../util/useTrackingProxy";
 import type { ConnectedPlugin, IConnectedLdoDataset } from "@ldo/connected";
 import { computed, toValue, type MaybeRefOrGetter, type Ref } from "vue";
 
-export interface UseMatchSubjectOptions<Plugins extends ConnectedPlugin[]> {
-  dataset?: IConnectedLdoDataset<Plugins>;
+export interface UseMatchSubjectOptions<Plugin extends ConnectedPlugin> {
+  dataset?: IConnectedLdoDataset<Plugin[]>;
 }
 
 /**
@@ -13,8 +13,8 @@ export interface UseMatchSubjectOptions<Plugins extends ConnectedPlugin[]> {
  *
  * Creates a useMatchSubject composable.
  */
-export function createUseMatchSubject<Plugins extends ConnectedPlugin[]>(
-  dataset: IConnectedLdoDataset<Plugins>,
+export function createUseMatchSubject<Plugin extends ConnectedPlugin>(
+  dataset: IConnectedLdoDataset<Plugin[]>,
 ) {
   /**
    * Returns a reactive LDO set of matching linked data objects.
@@ -25,7 +25,7 @@ export function createUseMatchSubject<Plugins extends ConnectedPlugin[]>(
     predicate?: MaybeRefOrGetter<QuadMatch[1] | string>,
     object?: MaybeRefOrGetter<QuadMatch[2] | string>,
     graph?: MaybeRefOrGetter<QuadMatch[3] | string>,
-    options?: MaybeRefOrGetter<UseMatchSubjectOptions<Plugins>>,
+    options?: MaybeRefOrGetter<UseMatchSubjectOptions<Plugin>>,
   ): Ref<LdSet<Type>> {
     const createLdo = computed(() => {
       const predicateValue = toValue(predicate);
diff --git a/packages/vue/src/methods/useResource.ts b/packages/vue/src/methods/useResource.ts
index 3e9d894e..e481613d 100644
--- a/packages/vue/src/methods/useResource.ts
+++ b/packages/vue/src/methods/useResource.ts
@@ -21,18 +21,18 @@ export interface UseResourceOptions<Name> {
   subscribe?: boolean;
 }
 
-export type useResourceType<Plugins extends ConnectedPlugin[]> = {
+export type useResourceType<Plugins extends ConnectedPlugin> = {
   <
-    Name extends Plugins[number]["name"],
-    Plugin extends Extract<Plugins[number], { name: Name }>,
+    Name extends Plugins["name"],
+    Plugin extends Extract<Plugins, { name: Name }>,
     UriType extends string,
   >(
     uri: MaybeRefOrGetter<UriType>,
     options?: MaybeRefOrGetter<UseResourceOptions<Name>>,
   ): Ref<GetResourceReturnType<Plugin, UriType>>;
   <
-    Name extends Plugins[number]["name"],
-    Plugin extends Extract<Plugins[number], { name: Name }>,
+    Name extends Plugins["name"],
+    Plugin extends Extract<Plugins, { name: Name }>,
     UriType extends string,
   >(
     uri?: MaybeRefOrGetter<UriType | undefined>,
@@ -45,15 +45,15 @@ export type useResourceType<Plugins extends ConnectedPlugin[]> = {
  *
  * Creates a useResource composable.
  */
-export function createUseResource<Plugins extends ConnectedPlugin[]>(
-  dataset: IConnectedLdoDataset<Plugins>,
+export function createUseResource<Plugins extends ConnectedPlugin>(
+  dataset: IConnectedLdoDataset<Plugins[]>,
 ): useResourceType<Plugins> {
   /**
    * Returns a reactive resource and triggers a rerender if that resource is updated.
    */
   return function useResource<
-    Name extends Plugins[number]["name"],
-    Plugin extends Extract<Plugins[number], { name: Name }>,
+    Name extends Plugins["name"],
+    Plugin extends Extract<Plugins, { name: Name }>,
     UriType extends string,
   >(
     uri?: MaybeRefOrGetter<UriType>,
diff --git a/packages/vue/src/methods/useSubject.ts b/packages/vue/src/methods/useSubject.ts
index 361c91bc..30ae64e3 100644
--- a/packages/vue/src/methods/useSubject.ts
+++ b/packages/vue/src/methods/useSubject.ts
@@ -4,20 +4,20 @@ import { useTrackingProxy } from "../util/useTrackingProxy";
 import type { ConnectedPlugin, IConnectedLdoDataset } from "@ldo/connected";
 import { computed, toValue, type MaybeRefOrGetter, type Ref } from "vue";
 
-export interface UseSubjectOptions<Plugins extends ConnectedPlugin[]> {
-  dataset?: IConnectedLdoDataset<Plugins>;
+export interface UseSubjectOptions<Plugin extends ConnectedPlugin> {
+  dataset?: IConnectedLdoDataset<Plugin[]>;
 }
 
-export type useSubjectType<Plugins extends ConnectedPlugin[]> = {
+export type useSubjectType<Plugin extends ConnectedPlugin> = {
   <Type extends LdoBase>(
     shapeType: MaybeRefOrGetter<ShapeType<Type>>,
     subject: MaybeRefOrGetter<string | SubjectNode>,
-    options?: MaybeRefOrGetter<UseSubjectOptions<Plugins>>,
+    options?: MaybeRefOrGetter<UseSubjectOptions<Plugin>>,
   ): Ref<Type>;
   <Type extends LdoBase>(
     shapeType: MaybeRefOrGetter<ShapeType<Type>>,
     subject?: MaybeRefOrGetter<string | SubjectNode | undefined>,
-    options?: MaybeRefOrGetter<UseSubjectOptions<Plugins>>,
+    options?: MaybeRefOrGetter<UseSubjectOptions<Plugin>>,
   ): Ref<Type | undefined>;
 };
 
@@ -26,9 +26,9 @@ export type useSubjectType<Plugins extends ConnectedPlugin[]> = {
  *
  * Creates a useSubject composable.
  */
-export function createUseSubject<Plugins extends ConnectedPlugin[]>(
-  dataset: IConnectedLdoDataset<Plugins>,
-): useSubjectType<Plugins> {
+export function createUseSubject<Plugin extends ConnectedPlugin>(
+  dataset: IConnectedLdoDataset<Plugin[]>,
+): useSubjectType<Plugin> {
   /**
    * Returns a reactive Linked Data Object based on the provided subject.
    * Triggers a rerender if the data are updated.
@@ -36,7 +36,7 @@ export function createUseSubject<Plugins extends ConnectedPlugin[]>(
   return function useSubject<Type extends LdoBase>(
     shapeType: MaybeRefOrGetter<ShapeType<Type>>,
     subject?: MaybeRefOrGetter<string | SubjectNode | undefined>,
-    options?: MaybeRefOrGetter<UseSubjectOptions<Plugins>>,
+    options?: MaybeRefOrGetter<UseSubjectOptions<Plugin>>,
   ): Ref<Type | undefined> {
     const createLdo = computed(() => {
       const subjectValue = toValue(subject);
diff --git a/packages/vue/src/methods/useSubscribeToResource.ts b/packages/vue/src/methods/useSubscribeToResource.ts
index 5f314cf8..0c31c80a 100644
--- a/packages/vue/src/methods/useSubscribeToResource.ts
+++ b/packages/vue/src/methods/useSubscribeToResource.ts
@@ -6,8 +6,8 @@ import { onBeforeUnmount, toValue, watch, type MaybeRefOrGetter } from "vue";
  *
  * Creates a useSubscribeToResource composable.
  */
-export function createUseSubscribeToResource<Plugins extends ConnectedPlugin[]>(
-  dataset: IConnectedLdoDataset<Plugins>,
+export function createUseSubscribeToResource<Plugin extends ConnectedPlugin>(
+  dataset: IConnectedLdoDataset<Plugin[]>,
 ) {
   /**
    * Starts and updates subscriptions to a list of resources.

From 3c10f7ec4358ecf8b0d7ea7fec3b933a328873ef Mon Sep 17 00:00:00 2001
From: mrkvon <mrkvon@proton.me>
Date: Wed, 28 Oct 2026 15:14:29 +0100
Subject: [PATCH 15/15] Explicitly type composables and fix dependencies

Explicitly typing composables resolves dependency issue
when dist/packages/... was being generated instead of linking
dependencies directly
---
 package-lock.json                             | 1870 +++++++++++++++--
 packages/solid-vue/package.json               |    1 -
 packages/solid-vue/src/useResourceWithAuth.ts |    6 +-
 .../solid-vue/test/SolidComposables.test.ts   |    2 +-
 .../src/methods/change/useChangeDataset.ts    |   18 +-
 .../methods/change/useChangeMatchObject.ts    |   37 +-
 .../methods/change/useChangeMatchSubject.ts   |   37 +-
 .../src/methods/change/useChangeSubject.ts    |   33 +-
 packages/vue/src/methods/useDataset.ts        |    6 +-
 packages/vue/src/methods/useLdo.ts            |    6 +-
 packages/vue/src/methods/useLinkQuery.ts      |   13 +-
 packages/vue/src/methods/useMatchSubject.ts   |   12 +-
 packages/vue/src/methods/useResource.ts       |    4 +-
 packages/vue/src/methods/useSubject.ts        |    4 +-
 .../vue/src/methods/useSubscribeToResource.ts |    6 +-
 15 files changed, 1818 insertions(+), 237 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 023c09e5..4370bb23 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -682,37 +682,6 @@
         "node": "^20.19.0 || >=22.12.0"
       }
     },
-    "dev/solid-react-vite-app/node_modules/@rolldown/plugin-babel": {
-      "version": "0.2.3",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "picomatch": "^4.0.4"
-      },
-      "engines": {
-        "node": ">=22.12.0 || ^24.0.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.29.0 || ^8.0.0-rc.1",
-        "@babel/plugin-transform-runtime": "^7.29.0 || ^8.0.0-rc.1",
-        "@babel/runtime": "^7.27.0 || ^8.0.0-rc.1",
-        "rolldown": "^1.0.0-rc.5",
-        "vite": "^8.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@babel/plugin-transform-runtime": {
-          "optional": true
-        },
-        "@babel/runtime": {
-          "optional": true
-        },
-        "vite": {
-          "optional": true
-        }
-      }
-    },
     "dev/solid-react-vite-app/node_modules/@rolldown/pluginutils": {
       "version": "1.0.1",
       "dev": true,
@@ -1092,27 +1061,6 @@
         }
       }
     },
-    "dev/solid-vue-app": {
-      "version": "0.0.0",
-      "extraneous": true,
-      "dependencies": {
-        "vue": "^3.5.40"
-      },
-      "devDependencies": {
-        "@tsconfig/node24": "^24.0.4",
-        "@types/node": "^24.13.3",
-        "@vitejs/plugin-vue": "^6.0.8",
-        "@vue/tsconfig": "^0.9.1",
-        "npm-run-all2": "^9.0.2",
-        "typescript": "~6.0.0",
-        "vite": "^8.1.5",
-        "vite-plugin-vue-devtools": "^8.1.5",
-        "vue-tsc": "^3.3.7"
-      },
-      "engines": {
-        "node": "^22.18.0 || >=24.12.0"
-      }
-    },
     "dev/solid-vue-vite-app": {
       "version": "0.0.0",
       "dependencies": {
@@ -1227,7 +1175,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1244,7 +1191,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -1265,39 +1211,12 @@
       "version": "24.13.3",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-24.13.3.tgz",
       "integrity": "sha512-Dh8vAsV36ig5wa9OX4pXvMc9D3Veibfw2wix0CUwYODLD8nkj9UsLjASr49nPg+2eKzxhBV+v7L8pXvT4e639Q==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT",
       "dependencies": {
         "undici-types": "~7.18.0"
       }
     },
-    "dev/solid-vue-vite-app/node_modules/@typescript-eslint/parser": {
-      "version": "8.71.2",
-      "resolved": "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-8.71.2.tgz",
-      "integrity": "sha512-aTtmZjp/x3gsGHkDs04/1I8kNogBJkpQaeGaN0PfiG43NzDEmW2n+OP5im9wfsvyX0yP1UZWBrAGtDBfH9jEVw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@typescript-eslint/scope-manager": "8.71.2",
-        "@typescript-eslint/types": "8.71.2",
-        "@typescript-eslint/typescript-estree": "8.71.2",
-        "@typescript-eslint/visitor-keys": "8.71.2",
-        "debug": "^4.4.3"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/typescript-eslint"
-      },
-      "peerDependencies": {
-        "eslint": "^8.57.0 || ^9.0.0 || ^10.0.0",
-        "typescript": ">=4.8.4 <6.1.0"
-      }
-    },
     "dev/solid-vue-vite-app/node_modules/@typescript-eslint/project-service": {
       "version": "8.71.2",
       "resolved": "https://registry.npmjs.org/@typescript-eslint/project-service/-/project-service-8.71.2.tgz",
@@ -1807,7 +1726,7 @@
       "version": "7.18.2",
       "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.18.2.tgz",
       "integrity": "sha512-AsuCzffGHJybSaRrmr5eHr81mwJU3kjw6M+uprWvCXiNeN9SOGwQ3Jn8jb8m3Z6izVgknn1R0FTCEAP2QrLY/w==",
-      "dev": true,
+      "devOptional": true,
       "license": "MIT"
     },
     "dev/solid-vue-vite-app/node_modules/unplugin": {
@@ -17864,6 +17783,262 @@
         "tslib": "^2.4.0"
       }
     },
+    "node_modules/@esbuild/aix-ppc64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.27.7.tgz",
+      "integrity": "sha512-EKX3Qwmhz1eMdEJokhALr0YiD0lhQNwDqkPYyPhiSwKrh7/4KRjQc04sZ8db+5DVVnZ1LmbNDI1uAMPEUBnQPg==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.27.7.tgz",
+      "integrity": "sha512-jbPXvB4Yj2yBV7HUfE2KHe4GJX51QplCN1pGbYjvsyCZbQmies29EoJbkEc+vYuU5o45AfQn37vZlyXy4YJ8RQ==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.27.7.tgz",
+      "integrity": "sha512-62dPZHpIXzvChfvfLJow3q5dDtiNMkwiRzPylSCfriLvZeq0a1bWChrGx/BbUbPwOrsWKMn8idSllklzBy+dgQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/android-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.27.7.tgz",
+      "integrity": "sha512-x5VpMODneVDb70PYV2VQOmIUUiBtY3D3mPBG8NxVk5CogneYhkR7MmM3yR/uMdITLrC1ml/NV1rj4bMJuy9MCg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.27.7.tgz",
+      "integrity": "sha512-5lckdqeuBPlKUwvoCXIgI2D9/ABmPq3Rdp7IfL70393YgaASt7tbju3Ac+ePVi3KDH6N2RqePfHnXkaDtY9fkw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/darwin-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.27.7.tgz",
+      "integrity": "sha512-rYnXrKcXuT7Z+WL5K980jVFdvVKhCHhUwid+dDYQpH+qu+TefcomiMAJpIiC2EM3Rjtq0sO3StMV/+3w3MyyqQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.27.7.tgz",
+      "integrity": "sha512-B48PqeCsEgOtzME2GbNM2roU29AMTuOIN91dsMO30t+Ydis3z/3Ngoj5hhnsOSSwNzS+6JppqWsuhTp6E82l2w==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/freebsd-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.27.7.tgz",
+      "integrity": "sha512-jOBDK5XEjA4m5IJK3bpAQF9/Lelu/Z9ZcdhTRLf4cajlB+8VEhFFRjWgfy3M1O4rO2GQ/b2dLwCUGpiF/eATNQ==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.27.7.tgz",
+      "integrity": "sha512-RkT/YXYBTSULo3+af8Ib0ykH8u2MBh57o7q/DAs3lTJlyVQkgQvlrPTnjIzzRPQyavxtPtfg0EopvDyIt0j1rA==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.27.7.tgz",
+      "integrity": "sha512-RZPHBoxXuNnPQO9rvjh5jdkRmVizktkT7TCDkDmQ0W2SwHInKCAV95GRuvdSvA7w4VMwfCjUiPwDi0ZO6Nfe9A==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ia32": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.27.7.tgz",
+      "integrity": "sha512-GA48aKNkyQDbd3KtkplYWT102C5sn/EZTY4XROkxONgruHPU72l+gW+FfF8tf2cFjeHaRbWpOYa/uRBz/Xq1Pg==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-loong64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.27.7.tgz",
+      "integrity": "sha512-a4POruNM2oWsD4WKvBSEKGIiWQF8fZOAsycHOt6JBpZ+JN2n2JH9WAv56SOyu9X5IqAjqSIPTaJkqN8F7XOQ5Q==",
+      "cpu": [
+        "loong64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-mips64el": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.27.7.tgz",
+      "integrity": "sha512-KabT5I6StirGfIz0FMgl1I+R1H73Gp0ofL9A3nG3i/cYFJzKHhouBV5VWK1CSgKvVaG4q1RNpCTR2LuTVB3fIw==",
+      "cpu": [
+        "mips64el"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-ppc64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.27.7.tgz",
+      "integrity": "sha512-gRsL4x6wsGHGRqhtI+ifpN/vpOFTQtnbsupUF5R5YTAg+y/lKelYR1hXbnBdzDjGbMYjVJLJTd2OFmMewAgwlQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-riscv64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.27.7.tgz",
+      "integrity": "sha512-hL25LbxO1QOngGzu2U5xeXtxXcW+/GvMN3ejANqXkxZ/opySAZMrc+9LY/WyjAan41unrR3YrmtTsUpwT66InQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/linux-s390x": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.27.7.tgz",
+      "integrity": "sha512-2k8go8Ycu1Kb46vEelhu1vqEP+UeRVj2zY1pSuPdgvbd5ykAw82Lrro28vXUrRmzEsUV0NzCf54yARIK8r0fdw==",
+      "cpu": [
+        "s390x"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@esbuild/linux-x64": {
       "version": "0.27.7",
       "cpu": [
@@ -17878,6 +18053,150 @@
         "node": ">=18"
       }
     },
+    "node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.27.7.tgz",
+      "integrity": "sha512-b6pqtrQdigZBwZxAn1UpazEisvwaIDvdbMbmrly7cDTMFnw/+3lVxxCTGOrkPVnsYIosJJXAsILG9XcQS+Yu6w==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/netbsd-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.27.7.tgz",
+      "integrity": "sha512-OfatkLojr6U+WN5EDYuoQhtM+1xco+/6FSzJJnuWiUw5eVcicbyK3dq5EeV/QHT1uy6GoDhGbFpprUiHUYggrw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.27.7.tgz",
+      "integrity": "sha512-AFuojMQTxAz75Fo8idVcqoQWEHIXFRbOc1TrVcFSgCZtQfSdc1RXgB3tjOn/krRHENUB4j00bfGjyl2mJrU37A==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openbsd-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.27.7.tgz",
+      "integrity": "sha512-+A1NJmfM8WNDv5CLVQYJ5PshuRm/4cI6WMZRg1by1GwPIQPCTs1GLEUHwiiQGT5zDdyLiRM/l1G0Pv54gvtKIg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.27.7.tgz",
+      "integrity": "sha512-+KrvYb/C8zA9CU/g0sR6w2RBw7IGc5J2BPnc3dYc5VJxHCSF1yNMxTV5LQ7GuKteQXZtspjFbiuW5/dOj7H4Yw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/sunos-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.27.7.tgz",
+      "integrity": "sha512-ikktIhFBzQNt/QDyOL580ti9+5mL/YZeUPKU2ivGtGjdTYoqz6jObj6nOMfhASpS4GU4Q/Clh1QtxWAvcYKamA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-arm64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.27.7.tgz",
+      "integrity": "sha512-7yRhbHvPqSpRUV7Q20VuDwbjW5kIMwTHpptuUzV+AA46kiPze5Z7qgt6CLCK3pWFrHeNfDd1VKgyP4O+ng17CA==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-ia32": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.27.7.tgz",
+      "integrity": "sha512-SmwKXe6VHIyZYbBLJrhOoCJRB/Z1tckzmgTLfFYOfpMAx63BJEaL9ExI8x7v0oAO3Zh6D/Oi1gVxEYr5oUCFhw==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/@esbuild/win32-x64": {
+      "version": "0.27.7",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.27.7.tgz",
+      "integrity": "sha512-56hiAJPhwQ1R4i+21FVF7V8kSD5zZTdHcVuRFMW0hn753vVfQN8xlx4uOPT4xoGH0Z/oVATuR82AiqSTDIpaHg==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/@eslint-community/eslint-utils": {
       "version": "4.9.1",
       "license": "MIT",
@@ -19982,6 +20301,114 @@
         "node": ">=10"
       }
     },
+    "node_modules/@nx/nx-darwin-arm64": {
+      "version": "16.10.0",
+      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-arm64/-/nx-darwin-arm64-16.10.0.tgz",
+      "integrity": "sha512-YF+MIpeuwFkyvM5OwgY/rTNRpgVAI/YiR0yTYCZR+X3AAvP775IVlusNgQ3oedTBRUzyRnI4Tknj1WniENFsvQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nx/nx-darwin-x64": {
+      "version": "16.10.0",
+      "resolved": "https://registry.npmjs.org/@nx/nx-darwin-x64/-/nx-darwin-x64-16.10.0.tgz",
+      "integrity": "sha512-ypi6YxwXgb0kg2ixKXE3pwf5myVNUgWf1CsV5OzVccCM8NzheMO51KDXTDmEpXdzUsfT0AkO1sk5GZeCjhVONg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nx/nx-freebsd-x64": {
+      "version": "16.10.0",
+      "resolved": "https://registry.npmjs.org/@nx/nx-freebsd-x64/-/nx-freebsd-x64-16.10.0.tgz",
+      "integrity": "sha512-UeEYFDmdbbDkTQamqvtU8ibgu5jQLgFF1ruNb/U4Ywvwutw2d4ruOMl2e0u9hiNja9NFFAnDbvzrDcMo7jYqYw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nx/nx-linux-arm-gnueabihf": {
+      "version": "16.10.0",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm-gnueabihf/-/nx-linux-arm-gnueabihf-16.10.0.tgz",
+      "integrity": "sha512-WV3XUC2DB6/+bz1sx+d1Ai9q2Cdr+kTZRN50SOkfmZUQyEBaF6DRYpx/a4ahhxH3ktpNfyY8Maa9OEYxGCBkQA==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nx/nx-linux-arm64-gnu": {
+      "version": "16.10.0",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-gnu/-/nx-linux-arm64-gnu-16.10.0.tgz",
+      "integrity": "sha512-aWIkOUw995V3ItfpAi5FuxQ+1e9EWLS1cjWM1jmeuo+5WtaKToJn5itgQOkvSlPz+HSLgM3VfXMvOFALNk125g==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nx/nx-linux-arm64-musl": {
+      "version": "16.10.0",
+      "resolved": "https://registry.npmjs.org/@nx/nx-linux-arm64-musl/-/nx-linux-arm64-musl-16.10.0.tgz",
+      "integrity": "sha512-uO6Gg+irqpVcCKMcEPIQcTFZ+tDI02AZkqkP7koQAjniLEappd8DnUBSQdcn53T086pHpdc264X/ZEpXFfrKWQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/@nx/nx-linux-x64-gnu": {
       "version": "16.10.0",
       "cpu": [
@@ -20011,6 +20438,40 @@
         "node": ">= 10"
       }
     },
+    "node_modules/@nx/nx-win32-arm64-msvc": {
+      "version": "16.10.0",
+      "resolved": "https://registry.npmjs.org/@nx/nx-win32-arm64-msvc/-/nx-win32-arm64-msvc-16.10.0.tgz",
+      "integrity": "sha512-moJkL9kcqxUdJSRpG7dET3UeLIciwrfP08mzBQ12ewo8K8FzxU8ZUsTIVVdNrwt01CXOdXoweGfdQLjJ4qTURA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/@nx/nx-win32-x64-msvc": {
+      "version": "16.10.0",
+      "resolved": "https://registry.npmjs.org/@nx/nx-win32-x64-msvc/-/nx-win32-x64-msvc-16.10.0.tgz",
+      "integrity": "sha512-5iV2NKZnzxJwZZ4DM5JVbRG/nkhAbzEskKaLBB82PmYGKzaDHuMHP1lcPoD/rtYMlowZgNA/RQndfKvPBPwmXA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 10"
+      }
+    },
     "node_modules/@octokit/auth-token": {
       "version": "3.0.4",
       "dev": true,
@@ -20463,7 +20924,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -20480,7 +20940,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -20497,7 +20956,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -20514,7 +20972,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -20531,7 +20988,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -20548,7 +21004,6 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -20565,7 +21020,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -20582,7 +21036,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -20599,7 +21052,6 @@
       "cpu": [
         "ppc64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -20616,7 +21068,6 @@
       "cpu": [
         "s390x"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -20659,7 +21110,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -20695,7 +21145,6 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -20712,7 +21161,6 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -20764,12 +21212,265 @@
         "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
+    "node_modules/@rollup/rollup-android-arm-eabi": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.60.3.tgz",
+      "integrity": "sha512-x35CNW/ANXG3hE/EZpRU8MXX1JDN86hBb2wMGAtltkz7pc6cxgjpy1OMMfDosOQ+2hWqIkag/fGok1Yady9nGw==",
+      "cpu": [
+        "arm"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-android-arm64": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.60.3.tgz",
+      "integrity": "sha512-xw3xtkDApIOGayehp2+Rz4zimfkaX65r4t47iy+ymQB2G4iJCBBfj0ogVg5jpvjpn8UWn/+q9tprxleYeNp3Hw==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-arm64": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.60.3.tgz",
+      "integrity": "sha512-vo6Y5Qfpx7/5EaamIwi0WqW2+zfiusVihKatLvtN1VFVy3D13uERk/6gZLU1UiHRL6fDXqj/ELIeVRGnvcTE1g==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-darwin-x64": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.60.3.tgz",
+      "integrity": "sha512-D+0QGcZhBzTN82weOnsSlY7V7+RMmPuF1CkbxyMAGE8+ZHeUjyb76ZiWmBlCu//AQQONvxcqRbwZTajZKqjuOw==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-arm64": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.60.3.tgz",
+      "integrity": "sha512-6HnvHCT7fDyj6R0Ph7A6x8dQS/S38MClRWeDLqc0MdfWkxjiu1HSDYrdPhqSILzjTIC/pnXbbJbo+ft+gy/9hQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-freebsd-x64": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.60.3.tgz",
+      "integrity": "sha512-KHLgC3WKlUYW3ShFKnnosZDOJ0xjg9zp7au3sIm2bs/tGBeC2ipmvRh/N7JKi0t9Ue20C0dpEshi8WUubg+cnA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-gnueabihf": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.60.3.tgz",
+      "integrity": "sha512-DV6fJoxEYWJOvaZIsok7KrYl0tPvga5OZ2yvKHNNYyk/2roMLqQAbGhr78EQ5YhHpnhLKJD3S1WFusAkmUuV5g==",
+      "cpu": [
+        "arm"
+      ],
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm-musleabihf": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.60.3.tgz",
+      "integrity": "sha512-mQKoJAzvuOs6F+TZybQO4GOTSMUu7v0WdxEk24krQ/uUxXoPTtHjuaUuPmFhtBcM4K0ons8nrE3JyhTuCFtT/w==",
+      "cpu": [
+        "arm"
+      ],
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-gnu": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.60.3.tgz",
+      "integrity": "sha512-Whjj2qoiJ6+OOJMGptTYazaJvjOJm+iKHpXQM1P3LzGjt7Ff++Tp7nH4N8J/BUA7R9IHfDyx4DJIflifwnbmIA==",
+      "cpu": [
+        "arm64"
+      ],
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-arm64-musl": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.60.3.tgz",
+      "integrity": "sha512-4YTNHKqGng5+yiZt3mg77nmyuCfmNfX4fPmyUapBcIk+BdwSwmCWGXOUxhXbBEkFHtoN5boLj/5NON+u5QC9tg==",
+      "cpu": [
+        "arm64"
+      ],
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-gnu": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.60.3.tgz",
+      "integrity": "sha512-SU3kNlhkpI4UqlUc2VXPGK9o886ZsSeGfMAX2ba2b8DKmMXq4AL7KUrkSWVbb7koVqx41Yczx6dx5PNargIrEA==",
+      "cpu": [
+        "loong64"
+      ],
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-loong64-musl": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-musl/-/rollup-linux-loong64-musl-4.60.3.tgz",
+      "integrity": "sha512-6lDLl5h4TXpB1mTf2rQWnAk/LcXrx9vBfu/DT5TIPhvMhRWaZ5MxkIc8u4lJAmBo6klTe1ywXIUHFjylW505sg==",
+      "cpu": [
+        "loong64"
+      ],
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-gnu": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.60.3.tgz",
+      "integrity": "sha512-BMo8bOw8evlup/8G+cj5xWtPyp93xPdyoSN16Zy90Q2QZ0ZYRhCt6ZJSwbrRzG9HApFabjwj2p25TUPDWrhzqQ==",
+      "cpu": [
+        "ppc64"
+      ],
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-ppc64-musl": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-musl/-/rollup-linux-ppc64-musl-4.60.3.tgz",
+      "integrity": "sha512-E0L8X1dZN1/Rph+5VPF6Xj2G7JJvMACVXtamTJIDrVI44Y3K+G8gQaMEAavbqCGTa16InptiVrX6eM6pmJ+7qA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-gnu": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.60.3.tgz",
+      "integrity": "sha512-oZJ/WHaVfHUiRAtmTAeo3DcevNsVvH8mbvodjZy7D5QKvCefO371SiKRpxoDcCxB3PTRTLayWBkvmDQKTcX/sw==",
+      "cpu": [
+        "riscv64"
+      ],
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-riscv64-musl": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.60.3.tgz",
+      "integrity": "sha512-Dhbyh7j9FybM3YaTgaHmVALwA8AkUwTPccyCQ79TG9AJUsMQqgN1DDEZNr4+QUfwiWvLDumW5vdwzoeUF+TNxQ==",
+      "cpu": [
+        "riscv64"
+      ],
+      "libc": [
+        "musl"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
+    "node_modules/@rollup/rollup-linux-s390x-gnu": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.60.3.tgz",
+      "integrity": "sha512-cJd1X5XhHHlltkaypz1UcWLA8AcoIi1aWhsvaWDskD1oz2eKCypnqvTQ8ykMNI0RSmm7NkTdSqSSD7zM0xa6Ig==",
+      "cpu": [
+        "s390x"
+      ],
+      "libc": [
+        "glibc"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ]
+    },
     "node_modules/@rollup/rollup-linux-x64-gnu": {
       "version": "4.60.3",
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
@@ -20781,13 +21482,90 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MIT",
       "optional": true,
       "os": [
         "linux"
       ]
     },
+    "node_modules/@rollup/rollup-openbsd-x64": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openbsd-x64/-/rollup-openbsd-x64-4.60.3.tgz",
+      "integrity": "sha512-QaWcIgRxqEdQdhJqW4DJctsH6HCmo5vHxY0krHSX4jMtOqfzC+dqDGuHM87bu4H8JBeibWx7jFz+h6/4C8wA5Q==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ]
+    },
+    "node_modules/@rollup/rollup-openharmony-arm64": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.60.3.tgz",
+      "integrity": "sha512-AaXwSvUi3QIPtroAUw1t5yHGIyqKEXwH54WUocFolZhpGDruJcs8c+xPNDRn4XiQsS7MEwnYsHW2l0MBLDMkWg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-arm64-msvc": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.60.3.tgz",
+      "integrity": "sha512-65LAKM/bAWDqKNEelHlcHvm2V+Vfb8C6INFxQXRHCvaVN1rJfwr4NvdP4FyzUaLqWfaCGaadf6UbTm8xJeYfEg==",
+      "cpu": [
+        "arm64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-ia32-msvc": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.60.3.tgz",
+      "integrity": "sha512-EEM2gyhBF5MFnI6vMKdX1LAosE627RGBzIoGMdLloPZkXrUN0Ckqgr2Qi8+J3zip/8NVVro3/FjB+tjhZUgUHA==",
+      "cpu": [
+        "ia32"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-gnu": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.60.3.tgz",
+      "integrity": "sha512-E5Eb5H/DpxaoXH++Qkv28RcUJboMopmdDUALBczvHMf7hNIxaDZqwY5lK12UK1BHacSmvupoEWGu+n993Z0y1A==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
+    "node_modules/@rollup/rollup-win32-x64-msvc": {
+      "version": "4.60.3",
+      "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.60.3.tgz",
+      "integrity": "sha512-hPt/bgL5cE+Qp+/TPHBqptcAgPzgj46mPcg/16zNUmbQk0j+mOEQV/+Lqu8QRtDV3Ek95Q6FeFITpuhl6OTsAA==",
+      "cpu": [
+        "x64"
+      ],
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ]
+    },
     "node_modules/@rtsao/scc": {
       "version": "1.1.0",
       "dev": true,
@@ -23575,15 +24353,6 @@
       "version": "10.0.0",
       "license": "MIT"
     },
-    "node_modules/@types/whatwg-mimetype": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/@types/whatwg-mimetype/-/whatwg-mimetype-3.0.2.tgz",
-      "integrity": "sha512-c2AKvDT8ToxLIOUlN51gTiHXflsfIFisS4pO7pDPoKouJCESkhZnEy623gwP9laCy5lnLDAw1vAzu2vM2YLOrA==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/@types/ws": {
       "version": "8.18.1",
       "license": "MIT",
@@ -25340,21 +26109,6 @@
       "version": "1.1.2",
       "license": "MIT"
     },
-    "node_modules/buffer-image-size": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/buffer-image-size/-/buffer-image-size-0.6.4.tgz",
-      "integrity": "sha512-nEh+kZOPY1w+gcCMobZ6ETUp9WfibndnosbpwB1iJk/8Gt5ZF2bhS6+B6bPYz424KtwsR6Rflc3tCz1/ghX2dQ==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@types/node": "*"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
     "node_modules/builtins": {
       "version": "5.1.0",
       "dev": true,
@@ -29173,54 +29927,6 @@
         "uglify-js": "^3.1.4"
       }
     },
-    "node_modules/happy-dom": {
-      "version": "20.14.3",
-      "resolved": "https://registry.npmjs.org/happy-dom/-/happy-dom-20.14.3.tgz",
-      "integrity": "sha512-0KMb/Eh8rsd+aMNkOk5h8LkAjo9Na1aksnEGmsuZf+GXl6UkAdIi0VbUHU7d59lXhNmawODgwwuCMiZpCxwwCw==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "@types/node": ">=20.0.0",
-        "@types/whatwg-mimetype": "^3.0.2",
-        "@types/ws": "^8.18.1",
-        "buffer-image-size": "^0.6.4",
-        "entities": "^7.0.1",
-        "whatwg-mimetype": "^3.0.0",
-        "ws": "^8.21.0"
-      },
-      "engines": {
-        "node": ">=20.0.0"
-      }
-    },
-    "node_modules/happy-dom/node_modules/entities": {
-      "version": "7.0.1",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-7.0.1.tgz",
-      "integrity": "sha512-TWrgLOFUQTH994YUyl1yT4uyavY5nNB5muff+RtWaqNVCAK408b5ZnnbNAUEWLTCpum9w6arT70i1XdQ4UeOPA==",
-      "dev": true,
-      "license": "BSD-2-Clause",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/happy-dom/node_modules/whatwg-mimetype": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-3.0.0.tgz",
-      "integrity": "sha512-nt+N2dzIutVRxARx1nghPKGv1xHikU7HKdfafKkLNLindmPU/ch3U31NOCGGA/dmPcmb1VlofO0vnKAcsm0o/Q==",
-      "dev": true,
-      "license": "MIT",
-      "optional": true,
-      "peer": true,
-      "engines": {
-        "node": ">=12"
-      }
-    },
     "node_modules/hard-rejection": {
       "version": "2.1.0",
       "dev": true,
@@ -31695,13 +32401,11 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
         "android"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -31717,13 +32421,11 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
         "darwin"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -31739,13 +32441,11 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
         "darwin"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -31761,13 +32461,11 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
         "freebsd"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -31783,13 +32481,11 @@
       "cpu": [
         "arm"
       ],
-      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
         "linux"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -31805,13 +32501,11 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
         "linux"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -31827,13 +32521,11 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
         "linux"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -31849,13 +32541,11 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
         "linux"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -31871,13 +32561,11 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
         "linux"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -31893,13 +32581,11 @@
       "cpu": [
         "arm64"
       ],
-      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
         "win32"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -31915,13 +32601,11 @@
       "cpu": [
         "x64"
       ],
-      "dev": true,
       "license": "MPL-2.0",
       "optional": true,
       "os": [
         "win32"
       ],
-      "peer": true,
       "engines": {
         "node": ">= 12.0.0"
       },
@@ -41032,6 +41716,278 @@
         "vite": "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 || ^7.0.0 || ^8.0.0"
       }
     },
+    "node_modules/vite/node_modules/@esbuild/aix-ppc64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.25.12.tgz",
+      "integrity": "sha512-Hhmwd6CInZ3dwpuGTF8fJG6yoWmsToE+vYgD4nytZVxcu1ulHpUQRAB1UJ8+N1Am3Mz4+xOByoQoSZf4D+CpkA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "aix"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/android-arm": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.25.12.tgz",
+      "integrity": "sha512-VJ+sKvNA/GE7Ccacc9Cha7bpS8nyzVv0jdVgwNDaR4gDMC/2TTRc33Ip8qrNYUcpkOHUT5OZ0bUcNNVZQ9RLlg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/android-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.25.12.tgz",
+      "integrity": "sha512-6AAmLG7zwD1Z159jCKPvAxZd4y/VTO0VkprYy+3N2FtJ8+BQWFXU+OxARIwA46c5tdD9SsKGZ/1ocqBS/gAKHg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/android-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.25.12.tgz",
+      "integrity": "sha512-5jbb+2hhDHx5phYR2By8GTWEzn6I9UqR11Kwf22iKbNpYrsmRB18aX/9ivc5cabcUiAT/wM+YIZ6SG9QO6a8kg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.25.12.tgz",
+      "integrity": "sha512-N3zl+lxHCifgIlcMUP5016ESkeQjLj/959RxxNYIthIg+CQHInujFuXeWbWMgnTo4cp5XVHqFPmpyu9J65C1Yg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/darwin-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.25.12.tgz",
+      "integrity": "sha512-HQ9ka4Kx21qHXwtlTUVbKJOAnmG1ipXhdWTmNXiPzPfWKpXqASVcWdnf2bnL73wgjNrFXAa3yYvBSd9pzfEIpA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-gA0Bx759+7Jve03K1S0vkOu5Lg/85dou3EseOGUes8flVOGxbhDDh/iZaoek11Y8mtyKPGF3vP8XhnkDEAmzeg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.25.12.tgz",
+      "integrity": "sha512-TGbO26Yw2xsHzxtbVFGEXBFH0FRAP7gtcPE7P5yP7wGy7cXK2oO7RyOhL5NLiqTlBh47XhmIUXuGciXEqYFfBQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-arm": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.25.12.tgz",
+      "integrity": "sha512-lPDGyC1JPDou8kGcywY0YILzWlhhnRjdof3UlcoqYmS9El818LLfJJc3PXXgZHrHCAKs/Z2SeZtDJr5MrkxtOw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.25.12.tgz",
+      "integrity": "sha512-8bwX7a8FghIgrupcxb4aUmYDLp8pX06rGh5HqDT7bB+8Rdells6mHvrFHHW2JAOPZUbnjUpKTLg6ECyzvas2AQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-ia32": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.25.12.tgz",
+      "integrity": "sha512-0y9KrdVnbMM2/vG8KfU0byhUN+EFCny9+8g202gYqSSVMonbsCfLjUO+rCci7pM0WBEtz+oK/PIwHkzxkyharA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-loong64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.25.12.tgz",
+      "integrity": "sha512-h///Lr5a9rib/v1GGqXVGzjL4TMvVTv+s1DPoxQdz7l/AYv6LDSxdIwzxkrPW438oUXiDtwM10o9PmwS/6Z0Ng==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.25.12.tgz",
+      "integrity": "sha512-iyRrM1Pzy9GFMDLsXn1iHUm18nhKnNMWscjmp4+hpafcZjrr2WbT//d20xaGljXDBYHqRcl8HnxbX6uaA/eGVw==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.25.12.tgz",
+      "integrity": "sha512-9meM/lRXxMi5PSUqEXRCtVjEZBGwB7P/D4yT8UG/mwIdze2aV4Vo6U5gD3+RsoHXKkHCfSxZKzmDssVlRj1QQA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.25.12.tgz",
+      "integrity": "sha512-Zr7KR4hgKUpWAwb1f3o5ygT04MzqVrGEGXGLnj15YQDJErYu/BGg+wmFlIDOdJp0PmB0lLvxFIOXZgFRrdjR0w==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/linux-s390x": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.25.12.tgz",
+      "integrity": "sha512-MsKncOcgTNvdtiISc/jZs/Zf8d0cl/t3gYWX8J9ubBnVOwlk65UIEEvgBORTiljloIWnBzLs4qhzPkJcitIzIg==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/vite/node_modules/@esbuild/linux-x64": {
       "version": "0.25.12",
       "cpu": [
@@ -41047,6 +42003,159 @@
         "node": ">=18"
       }
     },
+    "node_modules/vite/node_modules/@esbuild/netbsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-arm64/-/netbsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-xXwcTq4GhRM7J9A8Gv5boanHhRa/Q9KLVmcyXHCTaM4wKfIpWkdXiMog/KsnxzJ0A1+nD+zoecuzqPmCRyBGjg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.25.12.tgz",
+      "integrity": "sha512-Ld5pTlzPy3YwGec4OuHh1aCVCRvOXdH8DgRjfDy/oumVovmuSzWfnSJg+VtakB9Cm0gxNO9BzWkj6mtO1FMXkQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/openbsd-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-arm64/-/openbsd-arm64-0.25.12.tgz",
+      "integrity": "sha512-fF96T6KsBo/pkQI950FARU9apGNTSlZGsv1jZBAlcLL1MLjLNIWPBkj5NlSz8aAzYKg+eNqknrUJ24QBybeR5A==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.25.12.tgz",
+      "integrity": "sha512-MZyXUkZHjQxUvzK7rN8DJ3SRmrVrke8ZyRusHlP+kuwqTcfWLyqMOE3sScPPyeIXN/mDJIfGXvcMqCgYKekoQw==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/openharmony-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/openharmony-arm64/-/openharmony-arm64-0.25.12.tgz",
+      "integrity": "sha512-rm0YWsqUSRrjncSXGA7Zv78Nbnw4XL6/dzr20cyrQf7ZmRcsovpcRBdhD43Nuk3y7XIoW2OxMVvwuRvk9XdASg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openharmony"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/sunos-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.25.12.tgz",
+      "integrity": "sha512-3wGSCDyuTHQUzt0nV7bocDy72r2lI33QL3gkDNGkod22EsYl04sMf0qLb8luNKTOmgF/eDEDP5BFNwoBKH441w==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/win32-arm64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.25.12.tgz",
+      "integrity": "sha512-rMmLrur64A7+DKlnSuwqUdRKyd3UE7oPJZmnljqEptesKM8wx9J8gx5u0+9Pq0fQQW8vqeKebwNXdfOyP+8Bsg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/win32-ia32": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.25.12.tgz",
+      "integrity": "sha512-HkqnmmBoCbCwxUKKNPBixiWDGCpQGVsrQfJoVGYLPT41XWF8lHuE5N6WhVia2n4o5QK5M4tYr21827fNhi4byQ==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
+    "node_modules/vite/node_modules/@esbuild/win32-x64": {
+      "version": "0.25.12",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.25.12.tgz",
+      "integrity": "sha512-alJC0uCZpTFrSL0CCDjcgleBXPnCrEAhTBILpeAp7M/OFgoqtAetfBzX0xM00MUsVVPpVjlPuMbREqnZCXaTnA==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=18"
+      }
+    },
     "node_modules/vite/node_modules/esbuild": {
       "version": "0.25.12",
       "dev": true,
@@ -41896,22 +43005,6 @@
       "version": "4.0.0",
       "license": "ISC"
     },
-    "node_modules/yaml": {
-      "version": "2.9.0",
-      "dev": true,
-      "license": "ISC",
-      "optional": true,
-      "peer": true,
-      "bin": {
-        "yaml": "bin.mjs"
-      },
-      "engines": {
-        "node": ">= 14.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/eemeli"
-      }
-    },
     "node_modules/yargs": {
       "version": "17.7.2",
       "license": "MIT",
@@ -42923,7 +44016,6 @@
         "@uvdsl/solid-oidc-client-browser": "^0.2.3"
       },
       "devDependencies": {
-        "@ldo/rdf-utils": "^1.0.0-alpha.50",
         "@ldo/test-solid-server": "^1.0.0-alpha.50",
         "vue": "^3.5.43"
       },
@@ -43014,6 +44106,261 @@
         "svelte": "^3.50.0"
       }
     },
+    "packages/svelte/node_modules/@esbuild/android-arm": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.18.20.tgz",
+      "integrity": "sha512-fyi7TDI/ijKKNZTUJAQqiG5T7YjJXgnzkURqmGj13C6dCqckZBLdl4h7bkhHt/t0WP+zO9/zwroDvANaOqO5Sw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/svelte/node_modules/@esbuild/android-arm64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.18.20.tgz",
+      "integrity": "sha512-Nz4rJcchGDtENV0eMKUNa6L12zz2zBDXuhj/Vjh18zGqB44Bi7MBMSXjgunJgjRhCmKOjnPuZp4Mb6OKqtMHLQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/svelte/node_modules/@esbuild/android-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.18.20.tgz",
+      "integrity": "sha512-8GDdlePJA8D6zlZYJV/jnrRAi6rOiNaCC/JclcXpB+KIuvfBN4owLtgzY2bsxnx666XjJx2kDPUmnTtR8qKQUg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/svelte/node_modules/@esbuild/darwin-arm64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.18.20.tgz",
+      "integrity": "sha512-bxRHW5kHU38zS2lPTPOyuyTm+S+eobPUnTNkdJEfAddYgEcll4xkT8DB9d2008DtTbl7uJag2HuE5NZAZgnNEA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/svelte/node_modules/@esbuild/darwin-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.18.20.tgz",
+      "integrity": "sha512-pc5gxlMDxzm513qPGbCbDukOdsGtKhfxD1zJKXjCCcU7ju50O7MeAZ8c4krSJcOIJGFR+qx21yMMVYwiQvyTyQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/svelte/node_modules/@esbuild/freebsd-arm64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.18.20.tgz",
+      "integrity": "sha512-yqDQHy4QHevpMAaxhhIwYPMv1NECwOvIpGCZkECn8w2WFHXjEwrBn3CeNIYsibZ/iZEUemj++M26W3cNR5h+Tw==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/svelte/node_modules/@esbuild/freebsd-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.18.20.tgz",
+      "integrity": "sha512-tgWRPPuQsd3RmBZwarGVHZQvtzfEBOreNuxEMKFcd5DaDn2PbBxfwLcj4+aenoh7ctXcbXmOQIn8HI6mCSw5MQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/svelte/node_modules/@esbuild/linux-arm": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.18.20.tgz",
+      "integrity": "sha512-/5bHkMWnq1EgKr1V+Ybz3s1hWXok7mDFUMQ4cG10AfW3wL02PSZi5kFpYKrptDsgb2WAJIvRcDm+qIvXf/apvg==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/svelte/node_modules/@esbuild/linux-arm64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.18.20.tgz",
+      "integrity": "sha512-2YbscF+UL7SQAVIpnWvYwM+3LskyDmPhe31pE7/aoTMFKKzIc9lLbyGUpmmb8a8AixOL61sQ/mFh3jEjHYFvdA==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/svelte/node_modules/@esbuild/linux-ia32": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.18.20.tgz",
+      "integrity": "sha512-P4etWwq6IsReT0E1KHU40bOnzMHoH73aXp96Fs8TIT6z9Hu8G6+0SHSw9i2isWrD2nbx2qo5yUqACgdfVGx7TA==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/svelte/node_modules/@esbuild/linux-loong64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.18.20.tgz",
+      "integrity": "sha512-nXW8nqBTrOpDLPgPY9uV+/1DjxoQ7DoB2N8eocyq8I9XuqJ7BiAMDMf9n1xZM9TgW0J8zrquIb/A7s3BJv7rjg==",
+      "cpu": [
+        "loong64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/svelte/node_modules/@esbuild/linux-mips64el": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.18.20.tgz",
+      "integrity": "sha512-d5NeaXZcHp8PzYy5VnXV3VSd2D328Zb+9dEq5HE6bw6+N86JVPExrA6O68OPwobntbNJ0pzCpUFZTo3w0GyetQ==",
+      "cpu": [
+        "mips64el"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/svelte/node_modules/@esbuild/linux-ppc64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.18.20.tgz",
+      "integrity": "sha512-WHPyeScRNcmANnLQkq6AfyXRFr5D6N2sKgkFo2FqguP44Nw2eyDlbTdZwd9GYk98DZG9QItIiTlFLHJHjxP3FA==",
+      "cpu": [
+        "ppc64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/svelte/node_modules/@esbuild/linux-riscv64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.18.20.tgz",
+      "integrity": "sha512-WSxo6h5ecI5XH34KC7w5veNnKkju3zBRLEQNY7mv5mtBmrP/MjNBCAlsM2u5hDBlS3NGcTQpoBvRzqBcRtpq1A==",
+      "cpu": [
+        "riscv64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/svelte/node_modules/@esbuild/linux-s390x": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.18.20.tgz",
+      "integrity": "sha512-+8231GMs3mAEth6Ja1iK0a1sQ3ohfcpzpRLH8uuc5/KVDFneH6jtAJLFGafpzpMRO6DzJ6AvXKze9LfFMrIHVQ==",
+      "cpu": [
+        "s390x"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "packages/svelte/node_modules/@esbuild/linux-x64": {
       "version": "0.18.20",
       "cpu": [
@@ -43029,6 +44376,108 @@
         "node": ">=12"
       }
     },
+    "packages/svelte/node_modules/@esbuild/netbsd-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.18.20.tgz",
+      "integrity": "sha512-iO1c++VP6xUBUmltHZoMtCUdPlnPGdBom6IrO4gyKPFFVBKioIImVooR5I83nTew5UOYrk3gIJhbZh8X44y06A==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "netbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/svelte/node_modules/@esbuild/openbsd-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.18.20.tgz",
+      "integrity": "sha512-e5e4YSsuQfX4cxcygw/UCPIEP6wbIL+se3sxPdCiMbFLBWu0eiZOJ7WoD+ptCLrmjZBK1Wk7I6D/I3NglUGOxg==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "openbsd"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/svelte/node_modules/@esbuild/sunos-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.18.20.tgz",
+      "integrity": "sha512-kDbFRFp0YpTQVVrqUd5FTYmWo45zGaXe0X8E1G/LKFC0v8x0vWrhOWSLITcCn63lmZIxfOMXtCfti/RxN/0wnQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "sunos"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/svelte/node_modules/@esbuild/win32-arm64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.18.20.tgz",
+      "integrity": "sha512-ddYFR6ItYgoaq4v4JmQQaAI5s7npztfV4Ag6NrhiaW0RrnOXqBkgwZLofVTlq1daVTQNhtI5oieTvkRPfZrePg==",
+      "cpu": [
+        "arm64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/svelte/node_modules/@esbuild/win32-ia32": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.18.20.tgz",
+      "integrity": "sha512-Wv7QBi3ID/rROT08SABTS7eV4hX26sVduqDOTe1MvGMjNd3EjOz4b7zeexIR62GTIEKrfJXKL9LFxTYgkyeu7g==",
+      "cpu": [
+        "ia32"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "packages/svelte/node_modules/@esbuild/win32-x64": {
+      "version": "0.18.20",
+      "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.18.20.tgz",
+      "integrity": "sha512-kTdfRcSiDfQca/y9QIkng02avJ+NCaQvrMejlsB3RRv5sE9rRoeBPISaZpKxHELzRxZyLvNts1P27W3wV+8geQ==",
+      "cpu": [
+        "x64"
+      ],
+      "dev": true,
+      "license": "MIT",
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">=12"
+      }
+    },
     "packages/svelte/node_modules/@sveltejs/vite-plugin-svelte": {
       "version": "2.5.3",
       "dev": true,
@@ -43352,9 +44801,6 @@
       "peerDependencies": {
         "vue": "^3.3.0"
       }
-    },
-    "packages/wac": {
-      "extraneous": true
     }
   }
 }
diff --git a/packages/solid-vue/package.json b/packages/solid-vue/package.json
index c5adc46f..efd5e656 100644
--- a/packages/solid-vue/package.json
+++ b/packages/solid-vue/package.json
@@ -50,7 +50,6 @@
     "vue": "^3.3.0"
   },
   "devDependencies": {
-    "@ldo/rdf-utils": "^1.0.0-alpha.50",
     "@ldo/test-solid-server": "^1.0.0-alpha.50",
     "vue": "^3.5.43"
   }
diff --git a/packages/solid-vue/src/useResourceWithAuth.ts b/packages/solid-vue/src/useResourceWithAuth.ts
index 20daf7e0..b10444e5 100644
--- a/packages/solid-vue/src/useResourceWithAuth.ts
+++ b/packages/solid-vue/src/useResourceWithAuth.ts
@@ -4,7 +4,7 @@ import {
   type SolidContainer,
   type SolidLeaf,
 } from "@ldo/connected-solid";
-import type { useResourceType } from "@ldo/vue";
+import type { UseResourceComposable } from "@ldo/vue";
 import { toValue, watch } from "vue";
 import type { useSolidAuth } from "./useSolidAuth";
 
@@ -20,9 +20,9 @@ export function createUseResourceWithAuth({
   useResource,
   useSolidAuth,
 }: {
-  useResource: useResourceType<SolidConnectedPlugin>;
+  useResource: UseResourceComposable<SolidConnectedPlugin>;
   useSolidAuth: UseSolidAuth;
-}): useResourceType<SolidConnectedPlugin> {
+}): UseResourceComposable<SolidConnectedPlugin> {
   /**
    * Solid-authentication-aware useResource method.
    * It returns a reactive resource and it triggers a rerender.
diff --git a/packages/solid-vue/test/SolidComposables.test.ts b/packages/solid-vue/test/SolidComposables.test.ts
index 86d1c0f1..c5ff3a1a 100644
--- a/packages/solid-vue/test/SolidComposables.test.ts
+++ b/packages/solid-vue/test/SolidComposables.test.ts
@@ -1,6 +1,6 @@
 import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 import { MockSharedWorker, withParentChildSetup } from "./test-utils";
-import { createBrowserSolidVueComposables } from "@ldo/solid-vue";
+import { createBrowserSolidVueComposables } from "../src/index";
 import { setupServer } from "@ldo/test-solid-server";
 import { type CreateAppFunction, nextTick, type Ref, ref } from "vue";
 import type {
diff --git a/packages/vue/src/methods/change/useChangeDataset.ts b/packages/vue/src/methods/change/useChangeDataset.ts
index 158d37c4..4392ccca 100644
--- a/packages/vue/src/methods/change/useChangeDataset.ts
+++ b/packages/vue/src/methods/change/useChangeDataset.ts
@@ -11,6 +11,22 @@ import {
   type Ref,
 } from "vue";
 
+export interface UseChangeDatasetComposable<Plugin extends ConnectedPlugin> {
+  (
+    specificDataset?: MaybeRefOrGetter<
+      IConnectedLdoDataset<Plugin[]> | undefined
+    >,
+  ): {
+    transactionDataset: Ref<ConnectedLdoTransactionDataset<Plugin[]>>;
+    setData: (
+      changer: (toChange: ConnectedLdoTransactionDataset<Plugin[]>) => void,
+    ) => void;
+    commitData: () => ReturnType<
+      ConnectedLdoTransactionDataset<Plugin[]>["commitToRemote"]
+    >;
+  };
+}
+
 /**
  * @internal
  *
@@ -18,7 +34,7 @@ import {
  */
 export function createUseChangeDataset<Plugin extends ConnectedPlugin>(
   dataset: IConnectedLdoDataset<Plugin[]>,
-) {
+): UseChangeDatasetComposable<Plugin> {
   /**
    * Returns a transaction on the dataset that can be modified and committed.
    *
diff --git a/packages/vue/src/methods/change/useChangeMatchObject.ts b/packages/vue/src/methods/change/useChangeMatchObject.ts
index d7cbbb96..4074097a 100644
--- a/packages/vue/src/methods/change/useChangeMatchObject.ts
+++ b/packages/vue/src/methods/change/useChangeMatchObject.ts
@@ -1,6 +1,10 @@
-import type { IConnectedLdoDataset, ConnectedPlugin } from "@ldo/connected";
+import type {
+  IConnectedLdoDataset,
+  ConnectedPlugin,
+  ConnectedLdoTransactionDataset,
+} from "@ldo/connected";
 import { type LdSet, write, type LdoBase, type ShapeType } from "@ldo/ldo";
-import { computed, toValue, type MaybeRefOrGetter } from "vue";
+import { computed, type Ref, toValue, type MaybeRefOrGetter } from "vue";
 import { createUseChangeDataset } from "./useChangeDataset";
 import type { QuadMatch } from "@ldo/rdf-utils";
 import { createProxyInteractOptions } from "@ldo/jsonld-dataset-proxy";
@@ -9,6 +13,33 @@ import {
   type UseMatchObjectOptions,
 } from "../useMatchObject";
 
+export interface UseChangeMatchObjectComposable<
+  Plugin extends ConnectedPlugin,
+> {
+  <Type extends LdoBase>(
+    shapeType: MaybeRefOrGetter<ShapeType<Type>>,
+    subject?: MaybeRefOrGetter<QuadMatch[0] | string | undefined>,
+    predicate?: MaybeRefOrGetter<QuadMatch[1] | string | undefined>,
+    graph?: MaybeRefOrGetter<QuadMatch[3] | string | undefined>,
+    options?: MaybeRefOrGetter<UseMatchObjectOptions<Plugin>>,
+  ): {
+    ldo: Ref<LdSet<Type>>;
+    transactionDataset: Ref<ConnectedLdoTransactionDataset<Plugin[]>>;
+    setData: <
+      OtherType extends LdoBase | LdSet<LdoBase> | undefined = undefined,
+    >(
+      writeResource: Plugin["types"]["resource"],
+      changer: (
+        toChange: OtherType extends undefined ? LdSet<Type> : OtherType,
+      ) => void,
+      otherType?: OtherType,
+    ) => void;
+    commitData: () => ReturnType<
+      ConnectedLdoTransactionDataset<Plugin[]>["commitToRemote"]
+    >;
+  };
+}
+
 /**
  * @internal
  *
@@ -16,7 +47,7 @@ import {
  */
 export function createUseChangeMatchObject<Plugin extends ConnectedPlugin>(
   dataset: IConnectedLdoDataset<Plugin[]>,
-) {
+): UseChangeMatchObjectComposable<Plugin> {
   const useChangeDataset = createUseChangeDataset(dataset);
   const useMatchObject = createUseMatchObject(dataset);
 
diff --git a/packages/vue/src/methods/change/useChangeMatchSubject.ts b/packages/vue/src/methods/change/useChangeMatchSubject.ts
index 9a3ca315..848a68a7 100644
--- a/packages/vue/src/methods/change/useChangeMatchSubject.ts
+++ b/packages/vue/src/methods/change/useChangeMatchSubject.ts
@@ -1,6 +1,10 @@
-import type { IConnectedLdoDataset, ConnectedPlugin } from "@ldo/connected";
+import type {
+  IConnectedLdoDataset,
+  ConnectedPlugin,
+  ConnectedLdoTransactionDataset,
+} from "@ldo/connected";
 import { type LdSet, write, type LdoBase, type ShapeType } from "@ldo/ldo";
-import { computed, toValue, type MaybeRefOrGetter } from "vue";
+import { computed, type Ref, toValue, type MaybeRefOrGetter } from "vue";
 import { createUseChangeDataset } from "./useChangeDataset";
 import type { QuadMatch } from "@ldo/rdf-utils";
 import { createProxyInteractOptions } from "@ldo/jsonld-dataset-proxy";
@@ -9,6 +13,33 @@ import {
   type UseMatchSubjectOptions,
 } from "../useMatchSubject";
 
+export interface UseChangeMatchSubjectComposable<
+  Plugin extends ConnectedPlugin,
+> {
+  <Type extends LdoBase>(
+    shapeType: MaybeRefOrGetter<ShapeType<Type>>,
+    predicate?: MaybeRefOrGetter<QuadMatch[1] | string | undefined>,
+    object?: MaybeRefOrGetter<QuadMatch[2] | string | undefined>,
+    graph?: MaybeRefOrGetter<QuadMatch[3] | string | undefined>,
+    options?: MaybeRefOrGetter<UseMatchSubjectOptions<Plugin>>,
+  ): {
+    ldo: Ref<LdSet<Type>>;
+    transactionDataset: Ref<ConnectedLdoTransactionDataset<Plugin[]>>;
+    setData: <
+      OtherType extends LdoBase | LdSet<LdoBase> | undefined = undefined,
+    >(
+      writeResource: Plugin["types"]["resource"],
+      changer: (
+        toChange: OtherType extends undefined ? LdSet<Type> : OtherType,
+      ) => void,
+      otherType?: OtherType,
+    ) => void;
+    commitData: () => ReturnType<
+      ConnectedLdoTransactionDataset<Plugin[]>["commitToRemote"]
+    >;
+  };
+}
+
 /**
  * @internal
  *
@@ -16,7 +47,7 @@ import {
  */
 export function createUseChangeMatchSubject<Plugin extends ConnectedPlugin>(
   dataset: IConnectedLdoDataset<Plugin[]>,
-) {
+): UseChangeMatchSubjectComposable<Plugin> {
   const useChangeDataset = createUseChangeDataset(dataset);
   const useMatchSubject = createUseMatchSubject(dataset);
 
diff --git a/packages/vue/src/methods/change/useChangeSubject.ts b/packages/vue/src/methods/change/useChangeSubject.ts
index 994208c9..72264ba7 100644
--- a/packages/vue/src/methods/change/useChangeSubject.ts
+++ b/packages/vue/src/methods/change/useChangeSubject.ts
@@ -1,11 +1,38 @@
-import type { IConnectedLdoDataset, ConnectedPlugin } from "@ldo/connected";
+import type {
+  IConnectedLdoDataset,
+  ConnectedPlugin,
+  ConnectedLdoTransactionDataset,
+} from "@ldo/connected";
 import { type LdSet, write, type LdoBase, type ShapeType } from "@ldo/ldo";
-import { computed, toValue, type MaybeRefOrGetter } from "vue";
+import { computed, type Ref, toValue, type MaybeRefOrGetter } from "vue";
 import { createUseChangeDataset } from "./useChangeDataset";
 import type { SubjectNode } from "@ldo/rdf-utils";
 import { createUseSubject, type UseSubjectOptions } from "../useSubject";
 import { createProxyInteractOptions } from "@ldo/jsonld-dataset-proxy";
 
+export interface UseChangeSubjectComposable<Plugin extends ConnectedPlugin> {
+  <Type extends LdoBase>(
+    shapeType: MaybeRefOrGetter<ShapeType<Type>>,
+    subject: MaybeRefOrGetter<string | SubjectNode | undefined>,
+    options?: MaybeRefOrGetter<UseSubjectOptions<Plugin>>,
+  ): {
+    ldo: Ref<Type | undefined>;
+    transactionDataset: Ref<ConnectedLdoTransactionDataset<Plugin[]>>;
+    setData: <
+      OtherType extends LdoBase | LdSet<LdoBase> | undefined = undefined,
+    >(
+      writeResource: Plugin["types"]["resource"],
+      changer: (
+        toChange: OtherType extends undefined ? Type : OtherType,
+      ) => void,
+      otherType?: OtherType,
+    ) => void;
+    commitData: () => ReturnType<
+      ConnectedLdoTransactionDataset<Plugin[]>["commitToRemote"]
+    >;
+  };
+}
+
 /**
  * @internal
  *
@@ -13,7 +40,7 @@ import { createProxyInteractOptions } from "@ldo/jsonld-dataset-proxy";
  */
 export function createUseChangeSubject<Plugin extends ConnectedPlugin>(
   dataset: IConnectedLdoDataset<Plugin[]>,
-) {
+): UseChangeSubjectComposable<Plugin> {
   const useChangeDataset = createUseChangeDataset(dataset);
   const useSubject = createUseSubject(dataset);
 
diff --git a/packages/vue/src/methods/useDataset.ts b/packages/vue/src/methods/useDataset.ts
index a3c88586..d5fba5de 100644
--- a/packages/vue/src/methods/useDataset.ts
+++ b/packages/vue/src/methods/useDataset.ts
@@ -1,5 +1,9 @@
 import type { IConnectedLdoDataset, ConnectedPlugin } from "@ldo/connected";
 
+export interface UseDatasetComposable<Plugin extends ConnectedPlugin> {
+  (): IConnectedLdoDataset<Plugin[]>;
+}
+
 /**
  * @internal
  *
@@ -7,7 +11,7 @@ import type { IConnectedLdoDataset, ConnectedPlugin } from "@ldo/connected";
  */
 export function createUseDataset<Plugin extends ConnectedPlugin>(
   dataset: IConnectedLdoDataset<Plugin[]>,
-) {
+): UseDatasetComposable<Plugin> {
   /**
    * Returns the global dataset for the application
    */
diff --git a/packages/vue/src/methods/useLdo.ts b/packages/vue/src/methods/useLdo.ts
index 115b80f4..a7948020 100644
--- a/packages/vue/src/methods/useLdo.ts
+++ b/packages/vue/src/methods/useLdo.ts
@@ -78,13 +78,17 @@ export interface UseLdoMethods<Plugin extends ConnectedPlugin> {
   ): ReturnType<ConnectedLdoTransactionDataset<Plugin[]>["commitToRemote"]>;
 }
 
+export interface UseLdoComposable<Plugin extends ConnectedPlugin> {
+  (): UseLdoMethods<Plugin>;
+}
+
 /**
  * @internal
  * Creates a useLdo composable
  */
 export function createUseLdo<Plugin extends ConnectedPlugin>(
   dataset: ConnectedLdoDataset<Plugin[]>,
-) {
+): UseLdoComposable<Plugin> {
   const toReturn = {
     dataset,
     /**
diff --git a/packages/vue/src/methods/useLinkQuery.ts b/packages/vue/src/methods/useLinkQuery.ts
index 2385503d..8483b879 100644
--- a/packages/vue/src/methods/useLinkQuery.ts
+++ b/packages/vue/src/methods/useLinkQuery.ts
@@ -6,7 +6,16 @@ import type {
 import type { LdoBase, ShapeType } from "@ldo/ldo";
 import type { SubjectNode } from "@ldo/rdf-utils";
 import { createUseSubject } from "./useSubject";
-import { type MaybeRefOrGetter, toValue, watch } from "vue";
+import { type MaybeRefOrGetter, type Ref, toValue, watch } from "vue";
+
+export interface UseLinkQueryComposable {
+  <Type extends LdoBase, QueryInput extends LQInput<Type>>(
+    shapeType: MaybeRefOrGetter<ShapeType<Type>>,
+    startingResource: MaybeRefOrGetter<string>,
+    startingSubject: MaybeRefOrGetter<SubjectNode | string>,
+    linkQuery: MaybeRefOrGetter<QueryInput>,
+  ): Ref<Type>;
+}
 
 /**
  * @internal
@@ -15,7 +24,7 @@ import { type MaybeRefOrGetter, toValue, watch } from "vue";
  */
 export function createUseLinkQuery<Plugin extends ConnectedPlugin>(
   dataset: IConnectedLdoDataset<Plugin[]>,
-) {
+): UseLinkQueryComposable {
   /**
    * Runs a LDO link query.
    * Subscribes to related changes.
diff --git a/packages/vue/src/methods/useMatchSubject.ts b/packages/vue/src/methods/useMatchSubject.ts
index 0e77c820..a1cfafec 100644
--- a/packages/vue/src/methods/useMatchSubject.ts
+++ b/packages/vue/src/methods/useMatchSubject.ts
@@ -8,6 +8,16 @@ export interface UseMatchSubjectOptions<Plugin extends ConnectedPlugin> {
   dataset?: IConnectedLdoDataset<Plugin[]>;
 }
 
+export interface UseMatchSubjectComposable<Plugin extends ConnectedPlugin> {
+  <Type extends LdoBase>(
+    shapeType: MaybeRefOrGetter<ShapeType<Type>>,
+    predicate?: MaybeRefOrGetter<QuadMatch[1] | string>,
+    object?: MaybeRefOrGetter<QuadMatch[2] | string>,
+    graph?: MaybeRefOrGetter<QuadMatch[3] | string>,
+    options?: MaybeRefOrGetter<UseMatchSubjectOptions<Plugin>>,
+  ): Ref<LdSet<Type>>;
+}
+
 /**
  * @internal
  *
@@ -15,7 +25,7 @@ export interface UseMatchSubjectOptions<Plugin extends ConnectedPlugin> {
  */
 export function createUseMatchSubject<Plugin extends ConnectedPlugin>(
   dataset: IConnectedLdoDataset<Plugin[]>,
-) {
+): UseMatchSubjectComposable<Plugin> {
   /**
    * Returns a reactive LDO set of matching linked data objects.
    * Triggers a rerender if the data are updated.
diff --git a/packages/vue/src/methods/useResource.ts b/packages/vue/src/methods/useResource.ts
index e481613d..8ebb6390 100644
--- a/packages/vue/src/methods/useResource.ts
+++ b/packages/vue/src/methods/useResource.ts
@@ -21,7 +21,7 @@ export interface UseResourceOptions<Name> {
   subscribe?: boolean;
 }
 
-export type useResourceType<Plugins extends ConnectedPlugin> = {
+export type UseResourceComposable<Plugins extends ConnectedPlugin> = {
   <
     Name extends Plugins["name"],
     Plugin extends Extract<Plugins, { name: Name }>,
@@ -47,7 +47,7 @@ export type useResourceType<Plugins extends ConnectedPlugin> = {
  */
 export function createUseResource<Plugins extends ConnectedPlugin>(
   dataset: IConnectedLdoDataset<Plugins[]>,
-): useResourceType<Plugins> {
+): UseResourceComposable<Plugins> {
   /**
    * Returns a reactive resource and triggers a rerender if that resource is updated.
    */
diff --git a/packages/vue/src/methods/useSubject.ts b/packages/vue/src/methods/useSubject.ts
index 30ae64e3..9eed912a 100644
--- a/packages/vue/src/methods/useSubject.ts
+++ b/packages/vue/src/methods/useSubject.ts
@@ -8,7 +8,7 @@ export interface UseSubjectOptions<Plugin extends ConnectedPlugin> {
   dataset?: IConnectedLdoDataset<Plugin[]>;
 }
 
-export type useSubjectType<Plugin extends ConnectedPlugin> = {
+export type UseSubjectComposable<Plugin extends ConnectedPlugin> = {
   <Type extends LdoBase>(
     shapeType: MaybeRefOrGetter<ShapeType<Type>>,
     subject: MaybeRefOrGetter<string | SubjectNode>,
@@ -28,7 +28,7 @@ export type useSubjectType<Plugin extends ConnectedPlugin> = {
  */
 export function createUseSubject<Plugin extends ConnectedPlugin>(
   dataset: IConnectedLdoDataset<Plugin[]>,
-): useSubjectType<Plugin> {
+): UseSubjectComposable<Plugin> {
   /**
    * Returns a reactive Linked Data Object based on the provided subject.
    * Triggers a rerender if the data are updated.
diff --git a/packages/vue/src/methods/useSubscribeToResource.ts b/packages/vue/src/methods/useSubscribeToResource.ts
index 0c31c80a..f7af4127 100644
--- a/packages/vue/src/methods/useSubscribeToResource.ts
+++ b/packages/vue/src/methods/useSubscribeToResource.ts
@@ -1,6 +1,10 @@
 import type { ConnectedPlugin, IConnectedLdoDataset } from "@ldo/connected";
 import { onBeforeUnmount, toValue, watch, type MaybeRefOrGetter } from "vue";
 
+export interface UseSubscribeToResourceComposable {
+  (uris: MaybeRefOrGetter<string[]>): void;
+}
+
 /**
  * @internal
  *
@@ -8,7 +12,7 @@ import { onBeforeUnmount, toValue, watch, type MaybeRefOrGetter } from "vue";
  */
 export function createUseSubscribeToResource<Plugin extends ConnectedPlugin>(
   dataset: IConnectedLdoDataset<Plugin[]>,
-) {
+): UseSubscribeToResourceComposable {
   /**
    * Starts and updates subscriptions to a list of resources.
    */