@rpcbase/router 0.39.0 → 0.41.0

package/dist/index.d.ts

@@ -1,5 +1,4 @@
 export * from 'react-router';
-export * from './applyRouteLoaders';
 export * from './loadRoute';
 export * from './useApplyMeta';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,qBAAqB,CAAA;AACnC,cAAc,aAAa,CAAA;AAC3B,cAAc,gBAAgB,CAAA"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAA;AAC5B,cAAc,aAAa,CAAA;AAC3B,cAAc,gBAAgB,CAAA"}

package/dist/index.js

@@ -1,118 +1,6 @@
-import { createPath, matchRoutes, parsePath, useLocation } from "react-router";
+import { useLocation } from "react-router";
 export * from "react-router";
 import { lazy, useEffect } from "react";
-function createLocation(current, to, state = null, key) {
-  const location = {
-    pathname: current,
-    search: "",
-    hash: "",
-    ...typeof to === "string" ? parsePath(to) : to,
-    state,
-    // TODO: This could be cleaned up.  push/replace should probably just take
-    // full Locations now and avoid the need to run through this flow at all
-    // But that's a pretty big refactor to the current test suite so going to
-    // keep as is for the time being and just let any incoming keys take precedence
-    key: to && to.key || key
-  };
-  return location;
-}
-function getShortCircuitMatches(routes) {
-  const route = routes.length === 1 ? routes[0] : routes.find((r) => r.index || !r.path || r.path === "/") || {
-    id: "__shim-error-route__"
-  };
-  return {
-    matches: [
-      {
-        params: {},
-        pathname: "",
-        pathnameBase: "",
-        route
-      }
-    ],
-    route
-  };
-}
-async function applyRouteLoaders(req, dataRoutes) {
-  const baseUrl = `${req.protocol}://${req.get("host")}`;
-  const url = new URL(req.originalUrl, baseUrl);
-  const method = req.method;
-  const location = createLocation("", createPath(url), null, "default");
-  const baseContext = {
-    basename: "",
-    location,
-    loaderHeaders: {},
-    actionHeaders: {}
-  };
-  const matches = matchRoutes(dataRoutes, location) || [];
-  if (!matches) {
-    const error = {
-      status: 404,
-      message: `No route matches URL: ${req.originalUrl}`
-    };
-    const { matches: notFoundMatches, route } = getShortCircuitMatches(dataRoutes);
-    return {
-      ...baseContext,
-      matches: notFoundMatches,
-      loaderData: {},
-      actionData: null,
-      errors: { [route.id]: error },
-      statusCode: 404
-    };
-  }
-  if (method !== "GET") {
-    return {
-      ...baseContext,
-      matches,
-      loaderData: {},
-      actionData: null,
-      errors: null,
-      statusCode: 200
-    };
-  }
-  const loaderPromisesResults = await Promise.allSettled(
-    matches.map(async (match) => {
-      const { route, params } = match;
-      if (!route.loader) return null;
-      try {
-        return {
-          id: route.id,
-          data: await route.loader({
-            params,
-            ctx: { req }
-          })
-        };
-      } catch (error) {
-        throw { id: route.id, reason: error };
-      }
-    })
-  );
-  const loaderData = {};
-  let errors = null;
-  for (const result of loaderPromisesResults) {
-    if (result.status === "fulfilled") {
-      if (result.value) {
-        loaderData[result.value.id] = result.value.data;
-      }
-    } else if (result.status === "rejected") {
-      const id = result.reason?.id;
-      if (!id) {
-        throw new Error(`missing route ID in error: ${result.reason}`);
-      }
-      if (!errors) {
-        errors = {};
-      }
-      errors[id] = result.reason;
-    }
-  }
-  return {
-    ...baseContext,
-    matches,
-    loaderData,
-    actionData: null,
-    errors,
-    statusCode: Object.keys(errors || {}).length > 0 ? 500 : 200
-  };
-}
 const loadRoute = (importPromise) => {
   const Component = lazy(async () => {
     const module = await importPromise;
@@ -125,28 +13,14 @@ const loadRoute = (importPromise) => {
   };
   return { Component, loader };
 };
-const useApplyMeta = () => {
+const useApplyMeta = ({
+  defaultTitle = "",
+  defaultMeta = [],
+  pagesMeta = {}
+} = {}) => {
   const location = useLocation();
   useEffect(() => {
     const loadMeta = async () => {
-      let defaultTitle = "";
-      let defaultMeta = [];
-      let pagesMeta = {};
-      try {
-        const importPath = "@/static/meta";
-        const module = await import(importPath);
-        defaultTitle = module.defaultTitle || defaultTitle;
-        defaultMeta = module.defaultMeta || defaultMeta;
-        pagesMeta = module.pagesMeta || pagesMeta;
-      } catch (error) {
-        if (globalThis.__rb_env__.MODE !== "production") {
-          console.warn(
-            "Failed to load meta data from '@/static/meta'.",
-            error
-          );
-        }
-        return;
-      }
       let pageMeta = pagesMeta[location.pathname];
       if (!pageMeta) {
         pageMeta = { title: defaultTitle, meta: defaultMeta };
@@ -175,10 +49,9 @@ const useApplyMeta = () => {
       document.head.appendChild(canonicalLink);
     };
     loadMeta();
-  }, [location.pathname]);
+  }, [location.pathname, defaultTitle, defaultMeta, pagesMeta]);
 };
 export {
-  applyRouteLoaders,
   loadRoute,
   useApplyMeta
 };

package/dist/useApplyMeta.d.ts

@@ -1,2 +1,13 @@
-export declare const useApplyMeta: () => void;
+type MetaAttributeValue = string | number | boolean | undefined;
+type MetaEntry = Record<string, MetaAttributeValue>;
+type PageMeta = {
+    title: string;
+    meta: MetaEntry[];
+};
+export declare const useApplyMeta: ({ defaultTitle, defaultMeta, pagesMeta }?: {
+    defaultTitle?: string;
+    defaultMeta?: MetaEntry[];
+    pagesMeta?: Record<string, PageMeta>;
+}) => void;
+export {};
 //# sourceMappingURL=useApplyMeta.d.ts.map

package/dist/useApplyMeta.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"useApplyMeta.d.ts","sourceRoot":"","sources":["../src/useApplyMeta.tsx"],"names":[],"mappings":"AAkBA,eAAO,MAAM,YAAY,YAoExB,CAAA"}
+{"version":3,"file":"useApplyMeta.d.ts","sourceRoot":"","sources":["../src/useApplyMeta.tsx"],"names":[],"mappings":"AAIA,KAAK,kBAAkB,GAAG,MAAM,GAAG,MAAM,GAAG,OAAO,GAAG,SAAS,CAAA;AAC/D,KAAK,SAAS,GAAG,MAAM,CAAC,MAAM,EAAE,kBAAkB,CAAC,CAAA;AAEnD,KAAK,QAAQ,GAAG;IACd,KAAK,EAAE,MAAM,CAAA;IACb,IAAI,EAAE,SAAS,EAAE,CAAA;CAClB,CAAA;AAGD,eAAO,MAAM,YAAY,GAAI,2CAI1B;IACD,YAAY,CAAC,EAAE,MAAM,CAAA;IACrB,WAAW,CAAC,EAAE,SAAS,EAAE,CAAA;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAA;CAChC,SAiDL,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rpcbase/router",
-  "version": "0.39.0",
+  "version": "0.41.0",
   "type": "module",
   "files": [
     "dist"

package/dist/applyRouteLoaders.d.ts

@@ -1,4 +0,0 @@
-import { Request } from 'express';
-import { StaticHandlerContext } from './index';
-export declare function applyRouteLoaders(req: Request, dataRoutes: any[]): Promise<StaticHandlerContext>;
-//# sourceMappingURL=applyRouteLoaders.d.ts.map

package/dist/applyRouteLoaders.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"applyRouteLoaders.d.ts","sourceRoot":"","sources":["../src/applyRouteLoaders.ts"],"names":[],"mappings":"AACA,OAAO,EAAC,OAAO,EAAC,MAAM,SAAS,CAAA;AAE/B,OAAO,EACL,oBAAoB,EAMrB,MAAM,SAAS,CAAA;AAsDhB,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,OAAO,EACZ,UAAU,EAAE,GAAG,EAAE,GAChB,OAAO,CAAC,oBAAoB,CAAC,CAkG/B"}