@react-foundry/router 0.1.9 → 0.2.1

package/dist/common.js

@@ -1,2 +1 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
+export {};

package/dist/dummy.js

@@ -1,10 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.Link = exports.useParams = exports.useNavigate = exports.useIsActive = exports.useLocation = exports.needSuspense = void 0;
-const react_1 = require("react");
-const is_active_1 = require("./is-active");
-const location_1 = require("./location");
-exports.needSuspense = false;
+import { createElement as h } from 'react';
+import { makeUseIsActive } from './is-active';
+import { makeUseLocation } from './location';
+export const needSuspense = false;
 const _useLocation = () => ({
     state: undefined,
     key: '',
@@ -12,19 +9,16 @@ const _useLocation = () => ({
     search: '',
     hash: ''
 });
-exports.useLocation = (0, location_1.makeUseLocation)(_useLocation);
-exports.useIsActive = (0, is_active_1.makeUseIsActive)(exports.useLocation);
-const useNavigate = () => () => undefined;
-exports.useNavigate = useNavigate;
-const useParams = () => ({});
-exports.useParams = useParams;
-const Link = ({ to, preventScrollReset, replace, ...attrs }) => {
+export const useLocation = makeUseLocation(_useLocation);
+export const useIsActive = makeUseIsActive(useLocation);
+export const useNavigate = () => () => undefined;
+export const useParams = () => ({});
+export const Link = ({ to, preventScrollReset, replace, ...attrs }) => {
     const href = (typeof to === 'string'
         ? to
         : (to.pathname || '') + (to.search || '') + (to.hash || ''));
-    return (0, react_1.createElement)('a', {
+    return h('a', {
         ...attrs,
         href
     });
 };
-exports.Link = Link;

package/dist/index.js

@@ -1,13 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useParams = exports.useNavigate = exports.Link = exports.useIsActive = exports.useLocation = exports.needSuspense = void 0;
-const react_router_1 = require("react-router");
-const is_active_1 = require("./is-active");
-const location_1 = require("./location");
-exports.needSuspense = false;
-exports.useLocation = (0, location_1.makeUseLocation)(react_router_1.useLocation);
-exports.useIsActive = (0, is_active_1.makeUseIsActive)(exports.useLocation);
-var react_router_2 = require("react-router");
-Object.defineProperty(exports, "Link", { enumerable: true, get: function () { return react_router_2.Link; } });
-Object.defineProperty(exports, "useNavigate", { enumerable: true, get: function () { return react_router_2.useNavigate; } });
-Object.defineProperty(exports, "useParams", { enumerable: true, get: function () { return react_router_2.useParams; } });
+import { useLocation as _useLocation } from 'react-router';
+import { makeUseIsActive } from './is-active';
+import { makeUseLocation } from './location';
+export const needSuspense = false;
+export const useLocation = makeUseLocation(_useLocation);
+export const useIsActive = makeUseIsActive(useLocation);
+export { Link, useNavigate, useParams } from 'react-router';

package/dist/is-active.js

@@ -1,17 +1,14 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeUseIsActive = void 0;
-const uri_1 = require("@react-foundry/uri");
+import { URI } from '@react-foundry/uri';
 const includes = (haystack, needle) => {
     const subIncludes = (haystack, needle) => (Array.isArray(needle) ? (needle.length === haystack.length &&
         needle.reduce((acc, cur, idx) => acc && subIncludes(haystack[idx], cur), true)) : (typeof needle === 'object' ? (typeof haystack === 'object' &&
         Object.keys(needle).reduce((acc, cur) => acc && subIncludes(haystack[cur], needle[cur]), true)) : (needle === haystack)));
     return subIncludes(haystack, needle);
 };
-const makeUseIsActive = (useLocation) => () => {
+export const makeUseIsActive = (useLocation) => () => {
     const location = useLocation();
     const isActive = (href, exact = true) => {
-        const target = uri_1.URI.parse(href, location.pathname);
+        const target = URI.parse(href, location.pathname);
         const dir = (target.pathname.endsWith('/')
             ? target.pathname
             : target.pathname + '/');
@@ -28,4 +25,3 @@ const makeUseIsActive = (useLocation) => () => {
     };
     return isActive;
 };
-exports.makeUseIsActive = makeUseIsActive;

package/dist/location.js

@@ -1,11 +1,6 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeUseLocation = exports.enhanceLocation = void 0;
-const uri_1 = require("@react-foundry/uri");
-const enhanceLocation = (location) => ({
+import { qsParse } from '@react-foundry/uri';
+export const enhanceLocation = (location) => ({
     ...location,
-    query: (0, uri_1.qsParse)(location.search)
+    query: qsParse(location.search)
 });
-exports.enhanceLocation = enhanceLocation;
-const makeUseLocation = (useLocation) => () => ((0, exports.enhanceLocation)(useLocation()));
-exports.makeUseLocation = makeUseLocation;
+export const makeUseLocation = (useLocation) => () => (enhanceLocation(useLocation()));

package/dist/next.js

@@ -1,18 +1,12 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useParams = exports.Link = exports.useNavigate = exports.useIsActive = exports.useLocation = exports.needSuspense = void 0;
-const react_1 = require("react");
-const navigation_1 = require("next/navigation");
-const link_1 = __importDefault(require("next/link"));
-const is_active_1 = require("./is-active");
-const location_1 = require("./location");
-exports.needSuspense = true;
+import { createElement as h } from 'react';
+import { usePathname, useRouter, useSearchParams } from 'next/navigation';
+import _Link from 'next/link';
+import { makeUseIsActive } from './is-active';
+import { makeUseLocation } from './location';
+export const needSuspense = true;
 const _useLocation = () => {
-    const pathname = (0, navigation_1.usePathname)();
-    const searchParams = (0, navigation_1.useSearchParams)();
+    const pathname = usePathname();
+    const searchParams = useSearchParams();
     const search = (searchParams.size
         ? '?' + searchParams.toString()
         : '');
@@ -25,10 +19,10 @@ const _useLocation = () => {
     };
     return location;
 };
-exports.useLocation = (0, location_1.makeUseLocation)(_useLocation);
-exports.useIsActive = (0, is_active_1.makeUseIsActive)(exports.useLocation);
-const useNavigate = () => {
-    const router = (0, navigation_1.useRouter)();
+export const useLocation = makeUseLocation(_useLocation);
+export const useIsActive = makeUseIsActive(useLocation);
+export const useNavigate = () => {
+    const router = useRouter();
     const navigate = (to, options = {}) => {
         if (typeof to === 'number') {
             if (to === -1) {
@@ -52,7 +46,6 @@ const useNavigate = () => {
     };
     return navigate;
 };
-exports.useNavigate = useNavigate;
 const prefetchMap = new Map([
     [undefined, null],
     ['none', false],
@@ -60,7 +53,7 @@ const prefetchMap = new Map([
     ['render', true],
     ['viewport', true]
 ]);
-const Link = ({ to, prefetch: _prefetch, preventScrollReset, replace, ...attrs }) => {
+export const Link = ({ to, prefetch: _prefetch, preventScrollReset, replace, ...attrs }) => {
     const href = (typeof to === 'string'
         ? to
         : {
@@ -70,7 +63,7 @@ const Link = ({ to, prefetch: _prefetch, preventScrollReset, replace, ...attrs }
                 : undefined)
         });
     const prefetch = prefetchMap.get(_prefetch);
-    return (0, react_1.createElement)(link_1.default, {
+    return h(_Link, {
         ...attrs,
         href,
         prefetch,
@@ -78,6 +71,4 @@ const Link = ({ to, prefetch: _prefetch, preventScrollReset, replace, ...attrs }
         scroll: !preventScrollReset
     });
 };
-exports.Link = Link;
-var navigation_2 = require("next/navigation");
-Object.defineProperty(exports, "useParams", { enumerable: true, get: function () { return navigation_2.useParams; } });
+export { useParams } from 'next/navigation';

package/dist/remix.js

@@ -1,13 +1,7 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.useParams = exports.useNavigate = exports.Link = exports.useIsActive = exports.useLocation = exports.needSuspense = void 0;
-const react_1 = require("@remix-run/react");
-const is_active_1 = require("./is-active");
-const location_1 = require("./location");
-exports.needSuspense = false;
-exports.useLocation = (0, location_1.makeUseLocation)(react_1.useLocation);
-exports.useIsActive = (0, is_active_1.makeUseIsActive)(exports.useLocation);
-var react_2 = require("@remix-run/react");
-Object.defineProperty(exports, "Link", { enumerable: true, get: function () { return react_2.Link; } });
-Object.defineProperty(exports, "useNavigate", { enumerable: true, get: function () { return react_2.useNavigate; } });
-Object.defineProperty(exports, "useParams", { enumerable: true, get: function () { return react_2.useParams; } });
+import { useLocation as _useLocation } from '@remix-run/react';
+import { makeUseIsActive } from './is-active';
+import { makeUseLocation } from './location';
+export const needSuspense = false;
+export const useLocation = makeUseLocation(_useLocation);
+export const useIsActive = makeUseIsActive(useLocation);
+export { Link, useNavigate, useParams } from '@remix-run/react';

package/package.json

@@ -1,32 +1,29 @@
 {
   "name": "@react-foundry/router",
-  "version": "0.1.9",
+  "version": "0.2.1",
   "description": "An abstraction layer over the routers from react-router and Next.js.",
+  "type": "module",
   "main": "dist/index.js",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
-      "import": "./dist/index.mjs",
-      "require": "./dist/index.js",
-      "default": "./dist/index.mjs"
+      "import": "./dist/index.js",
+      "default": "./dist/index.js"
     },
     "./dummy": {
       "types": "./dist/dummy.d.ts",
-      "import": "./dist/dummy.mjs",
-      "require": "./dist/dummy.js",
-      "default": "./dist/dummy.mjs"
+      "import": "./dist/dummy.js",
+      "default": "./dist/dummy.js"
     },
     "./next": {
       "types": "./dist/next.d.ts",
-      "import": "./dist/next.mjs",
-      "require": "./dist/next.js",
-      "default": "./dist/next.mjs"
+      "import": "./dist/next.js",
+      "default": "./dist/next.js"
     },
     "./remix": {
       "types": "./dist/remix.d.ts",
-      "import": "./dist/remix.mjs",
-      "require": "./dist/remix.js",
-      "default": "./dist/remix.mjs"
+      "import": "./dist/remix.js",
+      "default": "./dist/remix.js"
     }
   },
   "files": [
@@ -38,7 +35,7 @@
     "node": ">=12.0.0"
   },
   "dependencies": {
-    "@react-foundry/uri": "^0.1.9"
+    "@react-foundry/uri": "^0.2.1"
   },
   "peerDependencies": {
     "@remix-run/react": ">2.17",
@@ -61,17 +58,15 @@
     "@types/react": "19.2.14",
     "jest": "30.3.0",
     "jest-environment-jsdom": "30.3.0",
-    "next": "16.2.2",
+    "next": "16.2.3",
     "ts-jest": "29.4.9",
     "typescript": "5.9.3"
   },
   "scripts": {
     "test": "NODE_OPTIONS=--experimental-vm-modules jest",
-    "build": "npm run build:esm && npm run build:cjs",
-    "build:esm": "tsc -m es2022 && find dist -name '*.js' -exec sh -c 'mv \"$0\" \"${0%.js}.mjs\"' {} \\;",
-    "build:cjs": "tsc",
+    "build": "tsc",
     "clean": "rm -rf dist tsconfig.tsbuildinfo"
   },
-  "module": "dist/index.mjs",
+  "module": "dist/index.js",
   "typings": "dist/index.d.ts"
 }

package/dist/common.mjs

@@ -1 +0,0 @@
-export {};

package/dist/dummy.mjs

@@ -1,24 +0,0 @@
-import { createElement as h } from 'react';
-import { makeUseIsActive } from './is-active';
-import { makeUseLocation } from './location';
-export const needSuspense = false;
-const _useLocation = () => ({
-    state: undefined,
-    key: '',
-    pathname: '',
-    search: '',
-    hash: ''
-});
-export const useLocation = makeUseLocation(_useLocation);
-export const useIsActive = makeUseIsActive(useLocation);
-export const useNavigate = () => () => undefined;
-export const useParams = () => ({});
-export const Link = ({ to, preventScrollReset, replace, ...attrs }) => {
-    const href = (typeof to === 'string'
-        ? to
-        : (to.pathname || '') + (to.search || '') + (to.hash || ''));
-    return h('a', {
-        ...attrs,
-        href
-    });
-};

package/dist/index.mjs

@@ -1,7 +0,0 @@
-import { useLocation as _useLocation } from 'react-router';
-import { makeUseIsActive } from './is-active';
-import { makeUseLocation } from './location';
-export const needSuspense = false;
-export const useLocation = makeUseLocation(_useLocation);
-export const useIsActive = makeUseIsActive(useLocation);
-export { Link, useNavigate, useParams } from 'react-router';

package/dist/is-active.mjs

@@ -1,27 +0,0 @@
-import { URI } from '@react-foundry/uri';
-const includes = (haystack, needle) => {
-    const subIncludes = (haystack, needle) => (Array.isArray(needle) ? (needle.length === haystack.length &&
-        needle.reduce((acc, cur, idx) => acc && subIncludes(haystack[idx], cur), true)) : (typeof needle === 'object' ? (typeof haystack === 'object' &&
-        Object.keys(needle).reduce((acc, cur) => acc && subIncludes(haystack[cur], needle[cur]), true)) : (needle === haystack)));
-    return subIncludes(haystack, needle);
-};
-export const makeUseIsActive = (useLocation) => () => {
-    const location = useLocation();
-    const isActive = (href, exact = true) => {
-        const target = URI.parse(href, location.pathname);
-        const dir = (target.pathname.endsWith('/')
-            ? target.pathname
-            : target.pathname + '/');
-        const pathStart = (target.pathname === '' ||
-            location.pathname.startsWith(dir));
-        const pathMatch = (target.pathname === '' ||
-            location.pathname === target.pathname);
-        const queryMatch = includes(location.query, target.query);
-        const activeExact = !!(pathMatch && queryMatch);
-        const active = (exact
-            ? activeExact
-            : !!(activeExact || (pathStart && queryMatch)));
-        return active;
-    };
-    return isActive;
-};

package/dist/location.mjs

@@ -1,6 +0,0 @@
-import { qsParse } from '@react-foundry/uri';
-export const enhanceLocation = (location) => ({
-    ...location,
-    query: qsParse(location.search)
-});
-export const makeUseLocation = (useLocation) => () => (enhanceLocation(useLocation()));

package/dist/next.mjs

@@ -1,74 +0,0 @@
-import { createElement as h } from 'react';
-import { usePathname, useRouter, useSearchParams } from 'next/navigation';
-import _Link from 'next/link';
-import { makeUseIsActive } from './is-active';
-import { makeUseLocation } from './location';
-export const needSuspense = true;
-const _useLocation = () => {
-    const pathname = usePathname();
-    const searchParams = useSearchParams();
-    const search = (searchParams.size
-        ? '?' + searchParams.toString()
-        : '');
-    const location = {
-        state: undefined,
-        key: '',
-        pathname,
-        search,
-        hash: ''
-    };
-    return location;
-};
-export const useLocation = makeUseLocation(_useLocation);
-export const useIsActive = makeUseIsActive(useLocation);
-export const useNavigate = () => {
-    const router = useRouter();
-    const navigate = (to, options = {}) => {
-        if (typeof to === 'number') {
-            if (to === -1) {
-                router.back();
-            }
-        }
-        else {
-            const href = (to === 'string'
-                ? to
-                : to.toString());
-            const nextOptions = {
-                scroll: !options.preventScrollReset
-            };
-            if (options.replace) {
-                router.replace(href, nextOptions);
-            }
-            else {
-                router.push(href, nextOptions);
-            }
-        }
-    };
-    return navigate;
-};
-const prefetchMap = new Map([
-    [undefined, null],
-    ['none', false],
-    ['intent', true],
-    ['render', true],
-    ['viewport', true]
-]);
-export const Link = ({ to, prefetch: _prefetch, preventScrollReset, replace, ...attrs }) => {
-    const href = (typeof to === 'string'
-        ? to
-        : {
-            ...to,
-            hash: (to.hash !== '#'
-                ? to.hash
-                : undefined)
-        });
-    const prefetch = prefetchMap.get(_prefetch);
-    return h(_Link, {
-        ...attrs,
-        href,
-        prefetch,
-        replace,
-        scroll: !preventScrollReset
-    });
-};
-export { useParams } from 'next/navigation';

package/dist/remix.mjs

@@ -1,7 +0,0 @@
-import { useLocation as _useLocation } from '@remix-run/react';
-import { makeUseIsActive } from './is-active';
-import { makeUseLocation } from './location';
-export const needSuspense = false;
-export const useLocation = makeUseLocation(_useLocation);
-export const useIsActive = makeUseIsActive(useLocation);
-export { Link, useNavigate, useParams } from '@remix-run/react';