@route-forge/core 1.1.0 → 1.2.0

package/dist/index.js

@@ -387,10 +387,11 @@ function toHeaders(raw) {
 }
 async function wrapAxiosAdapter() {
   let axios;
+  const axiosModule = "axios";
   try {
     const mod = await import(
       /* @vite-ignore */
-      'axios'
+      axiosModule
     );
     axios = mod.default ?? mod;
   } catch {
@@ -621,8 +622,16 @@ function createRouteForge(options) {
       effectiveEager = [...union];
     }
   });
-  autoDiscoveryPromise.catch(() => {
+  let autoDiscoveryError = null;
+  autoDiscoveryPromise.catch((e) => {
+    autoDiscoveryError = e;
   });
+  let autoDiscoveryCompleted = false;
+  let resolveReady;
+  const readyPromise = new Promise((resolve) => {
+    resolveReady = resolve;
+  });
+  const levelLoadedListeners = /* @__PURE__ */ new Map();
   const cacheTtl = cacheOpts.ttl ?? DEFAULT_CACHE_TTL;
   const cacheStorage = cacheOpts.storage ?? "memory";
   const cache = new RouteCache({ storage: cacheStorage, ttl: cacheTtl });
@@ -665,11 +674,20 @@ function createRouteForge(options) {
     return adapterObj;
   }
   const inflight = /* @__PURE__ */ new Map();
+  const invalidationGens = /* @__PURE__ */ new Map();
   function assertLevelDeclared(level) {
     if (!effectiveLevels.includes(level)) {
       throw new UnknownLevelError(level);
     }
   }
+  function assertDiscoveryReady() {
+    if (!autoDiscoveryCompleted && !explicitLevels?.length) {
+      throw new ForgeError(
+        "Route data not available. Auto-discovery has not completed. Use onSummaryReady callback to mount app, or await forge.ready / forge.load(level) first.",
+        { code: "RF_FE_010" }
+      );
+    }
+  }
   function buildUrl(level) {
     const base = baseURL.endsWith("/") ? baseURL.slice(0, -1) : baseURL;
     const ep = effectiveEndpoint.startsWith("/") ? effectiveEndpoint : `/${effectiveEndpoint}`;
@@ -704,10 +722,12 @@ function createRouteForge(options) {
     return data;
   }
   async function loadOne(level) {
+    if (autoDiscoveryError) throw autoDiscoveryError;
     assertLevelDeclared(level);
     if (cache.get(level)) return;
     const existing = inflight.get(level);
     if (existing) return existing;
+    const gen = invalidationGens.get(level) ?? 0;
     const p = (async () => {
       try {
         if (level === UNASSIGNED_LEVEL && !backendHasUnassignedLevel && summaryUnassigned) {
@@ -716,10 +736,16 @@ function createRouteForge(options) {
             routes[r.name] = { ...r, level: UNASSIGNED_LEVEL };
           }
           cache.set({ level: UNASSIGNED_LEVEL, routes, cache: null });
+          const listeners = levelLoadedListeners.get(level);
+          if (listeners) listeners.forEach((cb) => cb());
           return;
         }
         const resp = await fetchLevel(level);
-        cache.set(resp);
+        if ((invalidationGens.get(level) ?? 0) === gen) {
+          cache.set(resp);
+          const listeners = levelLoadedListeners.get(level);
+          if (listeners) listeners.forEach((cb) => cb());
+        }
       } finally {
         inflight.delete(level);
       }
@@ -733,6 +759,7 @@ function createRouteForge(options) {
     await Promise.all(list.map(loadOne));
   }
   function route(level, name, params) {
+    assertDiscoveryReady();
     const meta = findRouteMeta(level, name);
     if (!meta) {
       throw new UnknownRouteError(name, level);
@@ -763,12 +790,19 @@ function createRouteForge(options) {
       const optional = raw.endsWith("?");
       const name = optional ? raw.slice(0, -1) : raw;
       if (values[name] !== void 0) {
-        return encodeURIComponent(String(values[name]));
+        const val = values[name];
+        if (typeof val === "object") {
+          throw new ForgeError(
+            `Path parameter "${name}" must be a primitive value (string, number, boolean), got ${typeof val}`,
+            { code: "RF_FE_003", route: meta.name, context: { param: name, value: val } }
+          );
+        }
+        return encodeURIComponent(String(val));
       }
       return optional ? "" : match;
     });
     uri = uri.replace(/\/+/g, "/").replace(/\/$/, "");
-    if (effectiveUrlPrefix.includes("://")) {
+    if (/^[a-zA-Z][a-zA-Z0-9+.-]*:\/\//.test(effectiveUrlPrefix)) {
       const prefix2 = effectiveUrlPrefix.endsWith("/") ? effectiveUrlPrefix.slice(0, -1) : effectiveUrlPrefix;
       return uri.startsWith("/") ? `${prefix2}${uri}` : `${prefix2}/${uri}`;
     }
@@ -864,10 +898,20 @@ function createRouteForge(options) {
   function invalidate(level) {
     if (level === void 0) {
       cache.clear();
+      inflight.clear();
+      for (const lvl of effectiveLevels) {
+        invalidationGens.set(lvl, (invalidationGens.get(lvl) ?? 0) + 1);
+      }
     } else if (Array.isArray(level)) {
-      for (const lvl of level) cache.del(lvl);
+      for (const lvl of level) {
+        cache.del(lvl);
+        inflight.delete(lvl);
+        invalidationGens.set(lvl, (invalidationGens.get(lvl) ?? 0) + 1);
+      }
     } else {
       cache.del(level);
+      inflight.delete(level);
+      invalidationGens.set(level, (invalidationGens.get(level) ?? 0) + 1);
     }
   }
   function isLoaded(level) {
@@ -875,6 +919,7 @@ function createRouteForge(options) {
     return effectiveLevels.length > 0 && effectiveLevels.every((lvl) => cache.get(lvl) !== void 0);
   }
   function hasRoute(level, name) {
+    assertDiscoveryReady();
     return findRouteMeta(level, name) !== void 0;
   }
   function getRoutes(level) {
@@ -883,7 +928,7 @@ function createRouteForge(options) {
       const routes = entry?.routes ?? {};
       const result2 = {};
       for (const [k, v] of Object.entries(routes)) {
-        result2[k] = { ...v };
+        result2[k] = JSON.parse(JSON.stringify(v));
       }
       return result2;
     }
@@ -893,7 +938,7 @@ function createRouteForge(options) {
       if (entry) {
         const levelRoutes = {};
         for (const [k, v] of Object.entries(entry.routes)) {
-          levelRoutes[k] = { ...v };
+          levelRoutes[k] = JSON.parse(JSON.stringify(v));
         }
         result[lvl] = levelRoutes;
       }
@@ -901,11 +946,15 @@ function createRouteForge(options) {
     return result;
   }
   void autoDiscoveryPromise.then(() => {
+    options.onSummaryReady?.();
     if (effectiveEager.length > 0) {
-      void Promise.all(effectiveEager.map((lvl) => load(lvl))).catch((e) => {
+      return Promise.all(effectiveEager.map((lvl) => load(lvl))).catch((e) => {
         console.warn(`[route-forge] eager load failed: ${e.message}`);
       });
     }
+  }).then(() => {
+    autoDiscoveryCompleted = true;
+    resolveReady();
   }).catch(() => {
   });
   return {
@@ -922,6 +971,14 @@ function createRouteForge(options) {
     interceptors: {
       request: requestInterceptors,
       response: responseInterceptors
+    },
+    ready: readyPromise,
+    onLevelLoaded(level, cb) {
+      if (!levelLoadedListeners.has(level)) {
+        levelLoadedListeners.set(level, /* @__PURE__ */ new Set());
+      }
+      levelLoadedListeners.get(level).add(cb);
+      return () => levelLoadedListeners.get(level)?.delete(cb);
     }
   };
 }
@@ -991,6 +1048,25 @@ function isAbortError2(err, signal) {
   return false;
 }
 
-export { AdapterNotFoundError, ForgeError, HTTPError, InterceptorManagerImpl, InvalidInterceptorReturnError, LoadingTracker, MissingRouteParamError, NetworkError, RequestAbortedError, RouteCache, UnknownLevelError, UnknownRouteError, createInterceptorManager, createRouteForge };
+// src/resolveRouteName.ts
+async function resolveRouteName(forge, level, prefix, suffix, separator = ".") {
+  if (!suffix) return prefix;
+  const joined = `${prefix}${separator}${suffix}`;
+  if (!suffix.startsWith(`${prefix}${separator}`)) return joined;
+  await forge.load(level);
+  if (forge.hasRoute(level, joined)) return joined;
+  if (forge.hasRoute(level, suffix)) return suffix;
+  throw new UnknownRouteError(joined, level);
+}
+function resolveRouteNameSync(forge, level, prefix, suffix, separator = ".") {
+  if (!suffix) return prefix;
+  const joined = `${prefix}${separator}${suffix}`;
+  if (!suffix.startsWith(`${prefix}${separator}`)) return joined;
+  if (forge.hasRoute(level, joined)) return joined;
+  if (forge.hasRoute(level, suffix)) return suffix;
+  throw new UnknownRouteError(joined, level);
+}
+
+export { AdapterNotFoundError, ForgeError, HTTPError, InterceptorManagerImpl, InvalidInterceptorReturnError, LoadingTracker, MissingRouteParamError, NetworkError, RequestAbortedError, RouteCache, UnknownLevelError, UnknownRouteError, createInterceptorManager, createRouteForge, resolveRouteName, resolveRouteNameSync };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map