@sveltekit-i18n/base 3.1.0-next.2 → 3.1.0

package/README.md

@@ -228,11 +228,11 @@ A named capture group in a `RegExp` route is a load parameter: its match reaches
   locale: 'en',
   namespace: 'article',
   routes: [/^\/article\/(?<articleId>[^/]+)/],
-  loader: async ({ locale, params }) => (await fetch(`/api/articles/${params.articleId}/i18n/${locale}`)).json(),
+  loader: async ({ locale, params }) => (await fetch(`${API_ORIGIN}/api/articles/${params.articleId}/i18n/${locale}`)).json(),
 }
 ```
 
-See [route params](./docs/README.md#route-params) for the rules.
+`API_ORIGIN` stands for an origin such as `https://api.example.com`: a loader runs on the server too, where `fetch` takes only an absolute URL. See [route params](./docs/README.md#route-params) for the rules.
 
 A loader whose source does the caching itself — a SvelteKit remote `query`, an SWR layer, an HTTP cache — sets `cache: false`. It then runs on every load trigger that selects it, and `config.cache` does not apply to it; only a hydrated snapshot holds it back, for the locale and route it was rendered for. See [the loader's `cache`](./docs/README.md#cache-optional).
 

package/dist/I18n.svelte.js

@@ -45,7 +45,7 @@ class I18nCore {
     // What each source last put into a namespace, so a loader whose params
     // changed can replace its own part and leave its siblings' in place. Kept
     // apart from the records: invalidation drops those, not what is displayed,
-    // and a reconfiguration hands them on to the loaders with the same id.
+    // and a reconfiguration hands them on to the same loaders of the new config.
     #deliveries = new Map();
     #externalTranslations = {};
     // The params signature the next trigger asks each loader for:
@@ -561,18 +561,31 @@ class I18nCore {
     }
     /**
      * Gives each delivery of the previous config to the loader of the new one
-     * with the same id, so its params can still replace it. What no loader can
-     * take over is kept as data supplied without a loader, so a namespace rebuilt
-     * later keeps it rather than losing it.
+     * with the same id, or else to the one loader that runs the same function
+     * for the same locale and namespace when no other delivery came from that
+     * function there: a `{ ...config, … }` hands its loaders over as they were,
+     * whatever became of their routes. Its params can then still replace it.
+     * What no loader can take over is kept as data supplied without a loader, so
+     * a namespace rebuilt later keeps it rather than losing it.
      */
     #handOnDeliveries(loaders) {
-        const takers = new Map(loaders.flatMap((loader) => (loader.id === null ? [] : [[loader.id, loader]])));
+        const byId = new Map(loaders.flatMap((loader) => (loader.id === null ? [] : [[loader.id, loader]])));
         const deliveries = Array.from(this.#deliveries.values());
-        const orphaned = deliveries.filter(({ loader }) => loader.id === null || !takers.has(loader.id));
-        this.#deliveries = new Map(deliveries.flatMap((delivery) => {
-            const taker = delivery.loader.id === null ? undefined : takers.get(delivery.loader.id);
-            return taker ? [[taker, { ...delivery, loader: taker }]] : [];
+        const byIdTaken = new Map(deliveries.flatMap((delivery) => {
+            const taker = delivery.loader.id === null ? undefined : byId.get(delivery.loader.id);
+            return taker ? [[delivery, taker]] : [];
         }));
+        const free = loaders.filter((loader) => !Array.from(byIdTaken.values()).includes(loader));
+        const rest = deliveries.filter((delivery) => !byIdTaken.has(delivery));
+        const runsAs = (a) => (b) => a.loader === b.loader && a.locale === b.locale && a.namespace === b.namespace;
+        const byFunction = rest.flatMap((delivery) => {
+            const [only, ...more] = free.filter(runsAs(delivery.loader));
+            const alone = rest.filter((other) => runsAs(delivery.loader)(other.loader)).length === 1;
+            return only && !more.length && alone ? [[delivery, only]] : [];
+        });
+        const takers = new Map([...byIdTaken, ...byFunction]);
+        const orphaned = deliveries.filter((delivery) => !takers.has(delivery));
+        this.#deliveries = new Map(Array.from(takers, ([delivery, taker]) => [taker, { ...delivery, loader: taker }]));
         this.#keepExternal(serialize(orphaned.map(({ loader, data }) => ({ ...loader, data }))));
     }
     /**

package/dist/kit/types.d.ts

@@ -53,9 +53,10 @@ export declare namespace Kit {
          * locale matches is skipped; a custom `sanitizeLocales` is applied to it
          * first. It runs on every navigation and every
          * preload, so it must be pure: it reads the event and writes nothing.
-         * With a server load it runs on the server only: a navigation to a
-         * prerendered page takes the locale it gave at build time, and otherwise
-         * keeps the tab's.
+         * With a server load it runs in the browser only on a root error page
+         * rendered without the server's data (an unknown URL a static host answers
+         * with its fallback page): a navigation to a prerendered page takes the
+         * locale it gave at build time, and otherwise keeps the tab's.
          *
          * @example
          * preferredLocale: (event) => event.cookies?.get('lang')

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@sveltekit-i18n/base",
-  "version": "3.1.0-next.2",
+  "version": "3.1.0",
   "description": "Base functionality of sveltekit-i18n library with a support for external message parsers.",
   "type": "module",
   "types": "./dist/index.d.ts",