@rpcbase/router 0.28.0 → 0.29.0

package/dist/applyRouteLoaders.d.ts

@@ -0,0 +1,4 @@
+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

@@ -0,0 +1 @@
+{"version":3,"file":"applyRouteLoaders.d.ts","sourceRoot":"","sources":["../../../../pkg/router/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"}

package/dist/applyRouteLoaders.js

@@ -0,0 +1,126 @@
+import { matchRoutes, createPath, parsePath, } from "./index";
+function createKey() {
+    return Math.random().toString(36).substring(2, 10);
+}
+function createLocation(current, to, state = null, key) {
+    const location = {
+        pathname: typeof current === "string" ? current : current.pathname,
+        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 || createKey(),
+    };
+    return location;
+}
+function getShortCircuitMatches(routes) {
+    // Prefer a root layout route if present, otherwise shim in a route object
+    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,
+    };
+}
+export 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: {},
+    };
+    // Match routes to the current location
+    const matches = matchRoutes(dataRoutes, location) || [];
+    // Handle 404 (no matches)
+    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,
+        };
+    }
+    // Skip if anything but GET
+    if (method !== "GET") {
+        return {
+            ...baseContext,
+            matches,
+            loaderData: {},
+            actionData: null,
+            errors: null,
+            statusCode: 200,
+        };
+    }
+    // Collect loader data and errors
+    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) {
+            // Include the route ID in the error for better traceability
+            throw { id: route.id, reason: error };
+        }
+    }));
+    const loaderData = {};
+    // TODO: add i18n error handling
+    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,
+    };
+}

package/dist/index.d.ts

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

package/dist/index.d.ts.map

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

package/dist/index.js

@@ -0,0 +1,4 @@
+export * from "react-router";
+export * from "./applyRouteLoaders";
+export * from "./loadRoute";
+export * from "./useApplyMeta";

package/dist/loadRoute.d.ts

@@ -0,0 +1,13 @@
+import { LoaderFunction } from "react-router";
+import { Loader } from "@rpcbase/client";
+type RouteModule = {
+    default: React.ComponentType<unknown>;
+    loader?: Loader;
+};
+type RouteWithLoader = {
+    Component: React.LazyExoticComponent<React.ComponentType<unknown>>;
+    loader?: LoaderFunction;
+};
+export declare const loadRoute: (importPromise: Promise<RouteModule>) => RouteWithLoader;
+export {};
+//# sourceMappingURL=loadRoute.d.ts.map

package/dist/loadRoute.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loadRoute.d.ts","sourceRoot":"","sources":["../../../../pkg/router/src/loadRoute.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,cAAc,CAAA;AAC7C,OAAO,EAAE,MAAM,EAAc,MAAM,iBAAiB,CAAA;AAGpD,KAAK,WAAW,GAAG;IACjB,OAAO,EAAE,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAA;IACrC,MAAM,CAAC,EAAE,MAAM,CAAA;CAChB,CAAA;AAED,KAAK,eAAe,GAAG;IACrB,SAAS,EAAE,KAAK,CAAC,mBAAmB,CAAC,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC,CAAA;IAClE,MAAM,CAAC,EAAE,cAAc,CAAA;CACxB,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,eAAe,OAAO,CAAC,WAAW,CAAC,KAAG,eAa/D,CAAA"}

package/dist/loadRoute.js

@@ -0,0 +1,14 @@
+import { lazy } from "react";
+export const loadRoute = (importPromise) => {
+    const Component = lazy(async () => {
+        const module = await importPromise;
+        return { default: module.default };
+    });
+    const loader = async (args) => {
+        const module = await importPromise;
+        if (!module.loader)
+            return null;
+        return module.loader(args);
+    };
+    return { Component, loader: loader };
+};

package/dist/useApplyMeta.d.ts

@@ -0,0 +1,2 @@
+export declare const useApplyMeta: () => void;
+//# sourceMappingURL=useApplyMeta.d.ts.map

package/dist/useApplyMeta.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"useApplyMeta.d.ts","sourceRoot":"","sources":["../../../../pkg/router/src/useApplyMeta.tsx"],"names":[],"mappings":"AAkBA,eAAO,MAAM,YAAY,YAoExB,CAAA"}

package/dist/useApplyMeta.js

@@ -0,0 +1,56 @@
+import { useEffect } from "react";
+import { useLocation } from "react-router";
+export const useApplyMeta = () => {
+    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 (import.meta.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 };
+            }
+            document.title = pageMeta.title;
+            // Remove previous dynamically inserted tags
+            document.querySelectorAll("[data-react-meta]").forEach((tag) => tag.remove());
+            // Inject new tags
+            pageMeta.meta.forEach((meta) => {
+                const metaElement = document.createElement("meta");
+                metaElement.setAttribute("data-react-meta", "true");
+                // Set all attributes from the meta object
+                Object.entries(meta).forEach(([key, value]) => {
+                    if (value) {
+                        metaElement.setAttribute(key, value.toString());
+                    }
+                });
+                document.head.appendChild(metaElement);
+            });
+            // Update canonical link
+            const canonicalUrl = `${window.location.origin}${location.pathname}`;
+            const existingCanonical = document.querySelector("link[rel=\"canonical\"]");
+            if (existingCanonical) {
+                existingCanonical.remove();
+            }
+            const canonicalLink = document.createElement("link");
+            canonicalLink.setAttribute("rel", "canonical");
+            canonicalLink.setAttribute("href", canonicalUrl);
+            canonicalLink.setAttribute("data-react-meta", "true");
+            document.head.appendChild(canonicalLink);
+        };
+        loadMeta();
+    }, [location.pathname]);
+};

package/package.json

@@ -1,16 +1,34 @@
 {
   "name": "@rpcbase/router",
-  "version": "0.28.0",
+  "version": "0.29.0",
   "type": "module",
-  "main": "./src/index.ts",
+  "files": [
+    "dist"
+  ],
+  "main": "./dist/index.js",
+  "types": "./dist/index.d.ts",
   "scripts": {
-    "build": "tsc --watch",
+    "build": "wireit",
     "release": "wireit"
   },
   "wireit": {
+    "build": {
+      "command": "node ../../scripts/build-package.js router",
+      "files": [
+        "src/**/*",
+        "../../tsconfig.json",
+        "../../tsconfig.base.json",
+        "../../scripts/build-package.js"
+      ],
+      "output": [
+        "dist/"
+      ]
+    },
     "release": {
       "command": "../../scripts/publish.js",
-      "dependencies": [],
+      "dependencies": [
+        "build"
+      ],
       "files": [
         "package.json",
         "src/**/*"

package/src/applyRouteLoaders.ts

@@ -1,166 +0,0 @@
-/* eslint-disable @typescript-eslint/no-explicit-any */
-import {Request} from "express"
-
-import {
-  StaticHandlerContext,
-  matchRoutes,
-  createPath,
-  Location,
-  parsePath,
-  To,
-} from "./index"
-
-
-function createKey() {
-  return Math.random().toString(36).substring(2, 10)
-}
-
-function createLocation(
-  current: string | Location,
-  to: To,
-  state: any = null,
-  key?: string,
-): Readonly<Location> {
-  const location: Readonly<Location> = {
-    pathname: typeof current === "string" ? current : current.pathname,
-    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 as Location).key) || key || createKey(),
-  }
-  return location
-}
-
-function getShortCircuitMatches(routes: any[]): {
-  matches: any[];
-  route: any;
-} {
-  // Prefer a root layout route if present, otherwise shim in a route object
-  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,
-  }
-}
-
-
-export async function applyRouteLoaders(
-  req: Request,
-  dataRoutes: any[],
-): Promise<StaticHandlerContext> {
-
-  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: {},
-  }
-
-  // Match routes to the current location
-  const matches = matchRoutes(dataRoutes, location) || []
-
-  // Handle 404 (no matches)
-  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,
-    }
-  }
-
-  // Skip if anything but GET
-  if (method !== "GET") {
-    return {
-      ...baseContext,
-      matches,
-      loaderData: {},
-      actionData: null,
-      errors: null,
-      statusCode: 200,
-    }
-  }
-
-  // Collect loader data and errors
-  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) {
-        // Include the route ID in the error for better traceability
-        throw { id: route.id, reason: error }
-      }
-    }),
-  )
-
-  const loaderData: Record<string, any> = {}
-  // TODO: add i18n error handling
-  let errors: Record<string, any> | null = 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,
-  }
-}

package/src/index.ts

@@ -1,4 +0,0 @@
-export * from "react-router"
-export * from "./applyRouteLoaders"
-export * from "./loadRoute"
-export * from "./useApplyMeta"

package/src/loadRoute.tsx

@@ -1,29 +0,0 @@
-import { lazy } from "react"
-import { LoaderFunction } from "react-router"
-import { Loader, LoaderArgs } from "@rpcbase/client"
-
-
-type RouteModule = {
-  default: React.ComponentType<unknown>
-  loader?: Loader
-}
-
-type RouteWithLoader = {
-  Component: React.LazyExoticComponent<React.ComponentType<unknown>>
-  loader?: LoaderFunction
-}
-
-export const loadRoute = (importPromise: Promise<RouteModule>): RouteWithLoader => {
-  const Component = lazy(async () => {
-    const module = await importPromise
-    return { default: module.default }
-  })
-
-  const loader = async (args: LoaderArgs) => {
-    const module = await importPromise
-    if (!module.loader) return null
-    return module.loader(args)
-  }
-
-  return { Component, loader: loader as unknown as LoaderFunction }
-}

package/src/useApplyMeta.tsx

@@ -1,73 +0,0 @@
-import { useEffect } from "react"
-import { useLocation } from "react-router"
-
-
-export const useApplyMeta = () => {
-  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 (import.meta.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 }
-      }
-
-      document.title = pageMeta.title
-
-      // Remove previous dynamically inserted tags
-      document.querySelectorAll("[data-react-meta]").forEach((tag) => tag.remove())
-
-      // Inject new tags
-      pageMeta.meta.forEach((meta) => {
-        const metaElement = document.createElement("meta")
-        metaElement.setAttribute("data-react-meta", "true")
-
-        // Set all attributes from the meta object
-        Object.entries(meta).forEach(([key, value]) => {
-          if (value) {
-            metaElement.setAttribute(key, value.toString())
-          }
-        })
-
-        document.head.appendChild(metaElement)
-      })
-
-      // Update canonical link
-      const canonicalUrl = `${window.location.origin}${location.pathname}`
-
-      const existingCanonical = document.querySelector("link[rel=\"canonical\"]")
-      if (existingCanonical) {
-        existingCanonical.remove()
-      }
-
-      const canonicalLink = document.createElement("link")
-      canonicalLink.setAttribute("rel", "canonical")
-      canonicalLink.setAttribute("href", canonicalUrl)
-      canonicalLink.setAttribute("data-react-meta", "true")
-      document.head.appendChild(canonicalLink)
-    }
-
-    loadMeta()
-  }, [location.pathname])
-}