limpiar y reducir dependencias circulares

src/App.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { currentRoute } from "./lib/routes";
+  import { currentRoute } from "./lib/router";
 </script>
 
 <main>

src/editor/schema.ts

@@ -1,5 +1,5 @@
 import { Schema, type Attrs } from "prosemirror-model";
-import { parse, inject } from "regexparam";
+import { parse } from "regexparam";
 import { routes } from "../lib/routes";
 
 const hex = (x: string) => ("0" + parseInt(x).toString(16)).slice(-2);

src/lib/router.ts

@@ -0,0 +1,37 @@
+import navaid from "navaid";
+import { writable } from "svelte/store";
+
+import ChooseWorld from "../views/ChooseWorld.svelte";
+import CreateWorld from "../views/CreateWorld.svelte";
+import JoinWorld from "../views/JoinWorld.svelte";
+import NotFound from "../views/NotFound.svelte";
+import Page from "../views/Page.svelte";
+import ShareWorld from "../views/ShareWorld.svelte";
+import { routes } from "./routes";
+
+export let currentRoute = writable<{
+  // XXX: in lack of a better type for Svelte components
+  component: any;
+  params?: Record<string, string>;
+}>({ component: ChooseWorld });
+
+export let router = navaid("/", () =>
+  currentRoute.set({ component: NotFound })
+);
+router.on(routes.ChooseWorld, () =>
+  currentRoute.set({ component: ChooseWorld })
+);
+router.on(routes.CreateWorld, () =>
+  currentRoute.set({ component: CreateWorld })
+);
+router.on(routes.ShareWorld, (params) =>
+  currentRoute.set({ component: ShareWorld, params })
+);
+router.on(routes.JoinWorld, (params) =>
+  currentRoute.set({ component: JoinWorld, params })
+);
+router.on(routes.Page, (params) =>
+  currentRoute.set({ component: Page, params })
+);
+
+router.listen();

src/lib/routes.ts

@@ -1,22 +1,3 @@
-import navaid from "navaid";
-import { writable } from "svelte/store";
-
-import ChooseWorld from "../views/ChooseWorld.svelte";
-import CreateWorld from "../views/CreateWorld.svelte";
-import JoinWorld from "../views/JoinWorld.svelte";
-import NotFound from "../views/NotFound.svelte";
-import Page from "../views/Page.svelte";
-import ShareWorld from "../views/ShareWorld.svelte";
-
-export let router = navaid("/", () =>
-  currentRoute.set({ component: NotFound })
-);
-export let currentRoute = writable<{
-  // XXX: in lack of a better type for Svelte components
-  component: any;
-  params?: Record<string, string>;
-}>({ component: ChooseWorld });
-
 export const routes = {
   ChooseWorld: "/",
   CreateWorld: "/create",
@@ -24,21 +5,3 @@ export const routes = {
   JoinWorld: "/w/:worldId/join", // password as hash
   Page: "/w/:worldId/:pageId",
 };
-
-router.on(routes.ChooseWorld, () =>
-  currentRoute.set({ component: ChooseWorld })
-);
-router.on(routes.CreateWorld, () =>
-  currentRoute.set({ component: CreateWorld })
-);
-router.on(routes.ShareWorld, (params) =>
-  currentRoute.set({ component: ShareWorld, params })
-);
-router.on(routes.JoinWorld, (params) =>
-  currentRoute.set({ component: JoinWorld, params })
-);
-router.on(routes.Page, (params) =>
-  currentRoute.set({ component: Page, params })
-);
-
-router.listen();

src/views/CreateWorld.svelte

@@ -1,6 +1,7 @@
 <script lang="ts">
   import { generateNewWorld } from "../lib/doc";
-  import { router, routes } from "../lib/routes";
+  import { routes } from "../lib/routes";
+  import { router } from "../lib/router";
   import { writeWorlds } from "../lib/worldStorage";
 
   function crear(

src/views/JoinWorld.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
-  import { router, routes } from "../lib/routes";
+  import { routes } from "../lib/routes";
+  import { router } from "../lib/router";
   import { inject } from "regexparam";
   import { writeWorlds } from "../lib/worldStorage";