dn-react-router-toolkit 0.5.2 → 0.5.3

package/dist/crud/crud_loader.d.mts

@@ -1,4 +1,4 @@
-import { LoaderFunctionArgs } from 'react-router';
+import { LoaderFunction, LoaderFunctionArgs } from 'react-router';
 import { TableLoaderOptions } from '../table/loader.mjs';
 import { TableItemLoaderOptions } from '../table/item_loader.mjs';
 import { Table } from 'drizzle-orm';
@@ -12,10 +12,14 @@ import 'dn-react-toolkit/auth/server';
 type CrudHandlerOptions<T extends Table, TSelect> = {
     repository: TableRepository<T, TSelect>;
     apiHandlerOptions: Omit<APIHandlerOptions<T, TSelect>, "repository">;
-    loaderOptions: Omit<TableLoaderOptions<T, TSelect>, "repository">;
-    itemLoaderOptions: Omit<TableItemLoaderOptions<T, TSelect>, "repository">;
+    loaderOptions: Omit<TableLoaderOptions<T, TSelect>, "repository"> & {
+        loader?: LoaderFunction;
+    };
+    itemLoaderOptions: Omit<TableItemLoaderOptions<T, TSelect>, "repository"> & {
+        loader?: LoaderFunction;
+    };
 };
 type CrudHandler = (prefix: string) => (args: LoaderFunctionArgs) => Promise<any>;
-declare function crudHandler<T extends Table, TSelect>({ repository, apiHandlerOptions, loaderOptions, itemLoaderOptions, }: CrudHandlerOptions<T, TSelect>): (prefix: string) => (args: LoaderFunctionArgs) => Promise<any>;
+declare function crudHandler<T extends Table, TSelect>({ repository, apiHandlerOptions, loaderOptions, itemLoaderOptions, }: CrudHandlerOptions<T, TSelect>): (prefix: string) => (args: LoaderFunctionArgs) => Promise<unknown>;
 
 export { type CrudHandler, type CrudHandlerOptions, crudHandler };

package/dist/crud/crud_loader.d.ts

@@ -1,4 +1,4 @@
-import { LoaderFunctionArgs } from 'react-router';
+import { LoaderFunction, LoaderFunctionArgs } from 'react-router';
 import { TableLoaderOptions } from '../table/loader.js';
 import { TableItemLoaderOptions } from '../table/item_loader.js';
 import { Table } from 'drizzle-orm';
@@ -12,10 +12,14 @@ import 'dn-react-toolkit/auth/server';
 type CrudHandlerOptions<T extends Table, TSelect> = {
     repository: TableRepository<T, TSelect>;
     apiHandlerOptions: Omit<APIHandlerOptions<T, TSelect>, "repository">;
-    loaderOptions: Omit<TableLoaderOptions<T, TSelect>, "repository">;
-    itemLoaderOptions: Omit<TableItemLoaderOptions<T, TSelect>, "repository">;
+    loaderOptions: Omit<TableLoaderOptions<T, TSelect>, "repository"> & {
+        loader?: LoaderFunction;
+    };
+    itemLoaderOptions: Omit<TableItemLoaderOptions<T, TSelect>, "repository"> & {
+        loader?: LoaderFunction;
+    };
 };
 type CrudHandler = (prefix: string) => (args: LoaderFunctionArgs) => Promise<any>;
-declare function crudHandler<T extends Table, TSelect>({ repository, apiHandlerOptions, loaderOptions, itemLoaderOptions, }: CrudHandlerOptions<T, TSelect>): (prefix: string) => (args: LoaderFunctionArgs) => Promise<any>;
+declare function crudHandler<T extends Table, TSelect>({ repository, apiHandlerOptions, loaderOptions, itemLoaderOptions, }: CrudHandlerOptions<T, TSelect>): (prefix: string) => (args: LoaderFunctionArgs) => Promise<unknown>;
 
 export { type CrudHandler, type CrudHandlerOptions, crudHandler };

package/dist/crud/crud_loader.js

@@ -69,24 +69,16 @@ function tableLoader({
 
 // src/table/item_loader.tsx
 var tableItemloader = ({
-  loader,
   repository
 }) => {
-  return async ({ params }) => {
-    const body = loader ? await (async () => {
-      const result = await loader({ params });
-      if (result instanceof Response) {
-        return result.json();
-      }
-      return result;
-    })() : {};
+  return async (args) => {
+    const { params } = args;
     if (params["itemId"] === "new") {
-      return { item: void 0, ...body };
+      return { item: void 0 };
     }
     const item = params["itemId"] ? await repository.find(params["itemId"]) : void 0;
     return {
-      item,
-      ...body
+      item
     };
   };
 };
@@ -272,13 +264,35 @@ function crudHandler({
       }
     }
     if (pattern === prefix) {
-      return tableLoader({
+      const body = await tableLoader({
         ...loaderOptions,
         repository
       })(args);
+      if (loaderOptions.loader) {
+        const result = await loaderOptions.loader(args);
+        if (typeof result === "object") {
+          return {
+            ...result,
+            ...body
+          };
+        }
+      }
+      return body;
     }
     if (pattern.startsWith(prefix)) {
-      return tableItemloader({ ...itemLoaderOptions, repository })(args);
+      const body = await tableItemloader({ ...itemLoaderOptions, repository })(
+        args
+      );
+      if (itemLoaderOptions.loader) {
+        const result = await itemLoaderOptions.loader(args);
+        if (typeof result === "object") {
+          return {
+            ...result,
+            ...body
+          };
+        }
+      }
+      return body;
     }
   };
 }

package/dist/crud/crud_loader.mjs

@@ -46,24 +46,16 @@ function tableLoader({
 
 // src/table/item_loader.tsx
 var tableItemloader = ({
-  loader,
   repository
 }) => {
-  return async ({ params }) => {
-    const body = loader ? await (async () => {
-      const result = await loader({ params });
-      if (result instanceof Response) {
-        return result.json();
-      }
-      return result;
-    })() : {};
+  return async (args) => {
+    const { params } = args;
     if (params["itemId"] === "new") {
-      return { item: void 0, ...body };
+      return { item: void 0 };
     }
     const item = params["itemId"] ? await repository.find(params["itemId"]) : void 0;
     return {
-      item,
-      ...body
+      item
     };
   };
 };
@@ -258,13 +250,35 @@ function crudHandler({
       }
     }
     if (pattern === prefix) {
-      return tableLoader({
+      const body = await tableLoader({
         ...loaderOptions,
         repository
       })(args);
+      if (loaderOptions.loader) {
+        const result = await loaderOptions.loader(args);
+        if (typeof result === "object") {
+          return {
+            ...result,
+            ...body
+          };
+        }
+      }
+      return body;
     }
     if (pattern.startsWith(prefix)) {
-      return tableItemloader({ ...itemLoaderOptions, repository })(args);
+      const body = await tableItemloader({ ...itemLoaderOptions, repository })(
+        args
+      );
+      if (itemLoaderOptions.loader) {
+        const result = await itemLoaderOptions.loader(args);
+        if (typeof result === "object") {
+          return {
+            ...result,
+            ...body
+          };
+        }
+      }
+      return body;
     }
   };
 }

package/dist/crud/index.js

@@ -248,24 +248,16 @@ function tableLoader({
 
 // src/table/item_loader.tsx
 var tableItemloader = ({
-  loader,
   repository
 }) => {
-  return async ({ params }) => {
-    const body = loader ? await (async () => {
-      const result = await loader({ params });
-      if (result instanceof Response) {
-        return result.json();
-      }
-      return result;
-    })() : {};
+  return async (args) => {
+    const { params } = args;
     if (params["itemId"] === "new") {
-      return { item: void 0, ...body };
+      return { item: void 0 };
     }
     const item = params["itemId"] ? await repository.find(params["itemId"]) : void 0;
     return {
-      item,
-      ...body
+      item
     };
   };
 };
@@ -451,13 +443,35 @@ function crudHandler({
       }
     }
     if (pattern === prefix2) {
-      return tableLoader({
+      const body = await tableLoader({
         ...loaderOptions,
         repository
       })(args);
+      if (loaderOptions.loader) {
+        const result = await loaderOptions.loader(args);
+        if (typeof result === "object") {
+          return {
+            ...result,
+            ...body
+          };
+        }
+      }
+      return body;
     }
     if (pattern.startsWith(prefix2)) {
-      return tableItemloader({ ...itemLoaderOptions, repository })(args);
+      const body = await tableItemloader({ ...itemLoaderOptions, repository })(
+        args
+      );
+      if (itemLoaderOptions.loader) {
+        const result = await itemLoaderOptions.loader(args);
+        if (typeof result === "object") {
+          return {
+            ...result,
+            ...body
+          };
+        }
+      }
+      return body;
     }
   };
 }

package/dist/crud/index.mjs

@@ -209,24 +209,16 @@ function tableLoader({
 
 // src/table/item_loader.tsx
 var tableItemloader = ({
-  loader,
   repository
 }) => {
-  return async ({ params }) => {
-    const body = loader ? await (async () => {
-      const result = await loader({ params });
-      if (result instanceof Response) {
-        return result.json();
-      }
-      return result;
-    })() : {};
+  return async (args) => {
+    const { params } = args;
     if (params["itemId"] === "new") {
-      return { item: void 0, ...body };
+      return { item: void 0 };
     }
     const item = params["itemId"] ? await repository.find(params["itemId"]) : void 0;
     return {
-      item,
-      ...body
+      item
     };
   };
 };
@@ -421,13 +413,35 @@ function crudHandler({
       }
     }
     if (pattern === prefix2) {
-      return tableLoader({
+      const body = await tableLoader({
         ...loaderOptions,
         repository
       })(args);
+      if (loaderOptions.loader) {
+        const result = await loaderOptions.loader(args);
+        if (typeof result === "object") {
+          return {
+            ...result,
+            ...body
+          };
+        }
+      }
+      return body;
     }
     if (pattern.startsWith(prefix2)) {
-      return tableItemloader({ ...itemLoaderOptions, repository })(args);
+      const body = await tableItemloader({ ...itemLoaderOptions, repository })(
+        args
+      );
+      if (itemLoaderOptions.loader) {
+        const result = await itemLoaderOptions.loader(args);
+        if (typeof result === "object") {
+          return {
+            ...result,
+            ...body
+          };
+        }
+      }
+      return body;
     }
   };
 }

package/dist/table/index.js

@@ -158,24 +158,16 @@ function TablePageButtons({
 
 // src/table/item_loader.tsx
 var tableItemloader = ({
-  loader,
   repository
 }) => {
-  return async ({ params }) => {
-    const body = loader ? await (async () => {
-      const result = await loader({ params });
-      if (result instanceof Response) {
-        return result.json();
-      }
-      return result;
-    })() : {};
+  return async (args) => {
+    const { params } = args;
     if (params["itemId"] === "new") {
-      return { item: void 0, ...body };
+      return { item: void 0 };
     }
     const item = params["itemId"] ? await repository.find(params["itemId"]) : void 0;
     return {
-      item,
-      ...body
+      item
     };
   };
 };

package/dist/table/index.mjs

@@ -123,24 +123,16 @@ function TablePageButtons({
 
 // src/table/item_loader.tsx
 var tableItemloader = ({
-  loader,
   repository
 }) => {
-  return async ({ params }) => {
-    const body = loader ? await (async () => {
-      const result = await loader({ params });
-      if (result instanceof Response) {
-        return result.json();
-      }
-      return result;
-    })() : {};
+  return async (args) => {
+    const { params } = args;
     if (params["itemId"] === "new") {
-      return { item: void 0, ...body };
+      return { item: void 0 };
     }
     const item = params["itemId"] ? await repository.find(params["itemId"]) : void 0;
     return {
-      item,
-      ...body
+      item
     };
   };
 };

package/dist/table/item_loader.d.mts

@@ -4,9 +4,10 @@ import { LoaderFunctionArgs } from 'react-router';
 import 'drizzle-orm/pg-core';
 
 type TableItemLoaderOptions<T extends Table, TSelect> = {
-    loader?: (args: LoaderFunctionArgs) => Promise<any>;
     repository: TableRepository<T, TSelect>;
 };
-declare const tableItemloader: <T extends Table, TSelect>({ loader, repository, }: TableItemLoaderOptions<T, TSelect>) => ({ params }: LoaderFunctionArgs) => Promise<any>;
+declare const tableItemloader: <T extends Table, TSelect>({ repository, }: TableItemLoaderOptions<T, TSelect>) => (args: LoaderFunctionArgs) => Promise<{
+    item: Awaited<TSelect> | undefined;
+}>;
 
 export { type TableItemLoaderOptions, tableItemloader };

package/dist/table/item_loader.d.ts

@@ -4,9 +4,10 @@ import { LoaderFunctionArgs } from 'react-router';
 import 'drizzle-orm/pg-core';
 
 type TableItemLoaderOptions<T extends Table, TSelect> = {
-    loader?: (args: LoaderFunctionArgs) => Promise<any>;
     repository: TableRepository<T, TSelect>;
 };
-declare const tableItemloader: <T extends Table, TSelect>({ loader, repository, }: TableItemLoaderOptions<T, TSelect>) => ({ params }: LoaderFunctionArgs) => Promise<any>;
+declare const tableItemloader: <T extends Table, TSelect>({ repository, }: TableItemLoaderOptions<T, TSelect>) => (args: LoaderFunctionArgs) => Promise<{
+    item: Awaited<TSelect> | undefined;
+}>;
 
 export { type TableItemLoaderOptions, tableItemloader };

package/dist/table/item_loader.js

@@ -24,24 +24,16 @@ __export(item_loader_exports, {
 });
 module.exports = __toCommonJS(item_loader_exports);
 var tableItemloader = ({
-  loader,
   repository
 }) => {
-  return async ({ params }) => {
-    const body = loader ? await (async () => {
-      const result = await loader({ params });
-      if (result instanceof Response) {
-        return result.json();
-      }
-      return result;
-    })() : {};
+  return async (args) => {
+    const { params } = args;
     if (params["itemId"] === "new") {
-      return { item: void 0, ...body };
+      return { item: void 0 };
     }
     const item = params["itemId"] ? await repository.find(params["itemId"]) : void 0;
     return {
-      item,
-      ...body
+      item
     };
   };
 };

package/dist/table/item_loader.mjs

@@ -1,23 +1,15 @@
 // src/table/item_loader.tsx
 var tableItemloader = ({
-  loader,
   repository
 }) => {
-  return async ({ params }) => {
-    const body = loader ? await (async () => {
-      const result = await loader({ params });
-      if (result instanceof Response) {
-        return result.json();
-      }
-      return result;
-    })() : {};
+  return async (args) => {
+    const { params } = args;
     if (params["itemId"] === "new") {
-      return { item: void 0, ...body };
+      return { item: void 0 };
     }
     const item = params["itemId"] ? await repository.find(params["itemId"]) : void 0;
     return {
-      item,
-      ...body
+      item
     };
   };
 };

package/package.json

@@ -1,84 +1,84 @@
 {
-    "name": "dn-react-router-toolkit",
-    "version": "0.5.2",
-    "types": "./dist/index.d.ts",
-    "main": "./dist/index.mjs",
-    "module": "./dist/index.js",
-    "exports": {
-        ".": {
-            "types": "./dist/index.d.ts",
-            "import": "./dist/index.mjs",
-            "require": "./dist/index.js"
-        },
-        "./auth": {
-            "types": "./dist/auth/index.d.ts",
-            "import": "./dist/auth/index.mjs",
-            "require": "./dist/auth/index.js"
-        },
-        "./api": {
-            "types": "./dist/api/index.d.ts",
-            "import": "./dist/api/index.mjs",
-            "require": "./dist/api/index.js"
-        },
-        "./client": {
-            "types": "./dist/client/index.d.ts",
-            "import": "./dist/client/index.mjs",
-            "require": "./dist/client/index.js"
-        },
-        "./seo": {
-            "types": "./dist/seo/index.d.ts",
-            "import": "./dist/seo/index.mjs",
-            "require": "./dist/seo/index.js"
-        },
-        "./db": {
-            "types": "./dist/db/index.d.ts",
-            "import": "./dist/db/index.mjs",
-            "require": "./dist/db/index.js"
-        },
-        "./table": {
-            "types": "./dist/table/index.d.ts",
-            "import": "./dist/table/index.mjs",
-            "require": "./dist/table/index.js"
-        },
-        "./crud": {
-            "types": "./dist/crud/index.d.ts",
-            "import": "./dist/crud/index.mjs",
-            "require": "./dist/crud/index.js"
-        }
+  "name": "dn-react-router-toolkit",
+  "version": "0.5.3",
+  "types": "./dist/index.d.ts",
+  "main": "./dist/index.mjs",
+  "module": "./dist/index.js",
+  "exports": {
+    ".": {
+      "types": "./dist/index.d.ts",
+      "import": "./dist/index.mjs",
+      "require": "./dist/index.js"
     },
-    "scripts": {
-        "build": "tsup",
-        "dev": "tsup --watch"
+    "./auth": {
+      "types": "./dist/auth/index.d.ts",
+      "import": "./dist/auth/index.mjs",
+      "require": "./dist/auth/index.js"
     },
-    "repository": {
-        "type": "git",
-        "url": "git+https://github.com/dndnsoft/dn-react-router-toolkit.git"
+    "./api": {
+      "types": "./dist/api/index.d.ts",
+      "import": "./dist/api/index.mjs",
+      "require": "./dist/api/index.js"
     },
-    "author": "",
-    "license": "MIT",
-    "bugs": {
-        "url": "https://github.com/dndnsoft/dn-react-router-toolkit/issues"
+    "./client": {
+      "types": "./dist/client/index.d.ts",
+      "import": "./dist/client/index.mjs",
+      "require": "./dist/client/index.js"
     },
-    "homepage": "https://github.com/dndnsoft/dn-react-router-toolkit#readme",
-    "description": "",
-    "devDependencies": {
-        "@types/node": "^24.10.1",
-        "@types/react": "^19",
-        "@types/react-dom": "^19",
-        "schema-dts": "^1.1.5",
-        "tsup": "^8.5.1",
-        "typescript": "^5.7.3"
+    "./seo": {
+      "types": "./dist/seo/index.d.ts",
+      "import": "./dist/seo/index.mjs",
+      "require": "./dist/seo/index.js"
     },
-    "dependencies": {
-        "@react-router/dev": "^7.11.0",
-        "dn-react-toolkit": "0.2.36",
-        "pg": "^8.16.3",
-        "uuid": "^13.0.0"
+    "./db": {
+      "types": "./dist/db/index.d.ts",
+      "import": "./dist/db/index.mjs",
+      "require": "./dist/db/index.js"
     },
-    "peerDependencies": {
-        "drizzle-orm": "0.45.1",
-        "react": "^19",
-        "react-dom": "^19",
-        "react-router": "^7"
+    "./table": {
+      "types": "./dist/table/index.d.ts",
+      "import": "./dist/table/index.mjs",
+      "require": "./dist/table/index.js"
+    },
+    "./crud": {
+      "types": "./dist/crud/index.d.ts",
+      "import": "./dist/crud/index.mjs",
+      "require": "./dist/crud/index.js"
     }
+  },
+  "scripts": {
+    "build": "tsup",
+    "dev": "tsup --watch"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/dndnsoft/dn-react-router-toolkit.git"
+  },
+  "author": "",
+  "license": "MIT",
+  "bugs": {
+    "url": "https://github.com/dndnsoft/dn-react-router-toolkit/issues"
+  },
+  "homepage": "https://github.com/dndnsoft/dn-react-router-toolkit#readme",
+  "description": "",
+  "devDependencies": {
+    "@types/node": "^24.10.1",
+    "@types/react": "^19",
+    "@types/react-dom": "^19",
+    "schema-dts": "^1.1.5",
+    "tsup": "^8.5.1",
+    "typescript": "^5.7.3"
+  },
+  "dependencies": {
+    "@react-router/dev": "^7.11.0",
+    "pg": "^8.16.3",
+    "uuid": "^13.0.0"
+  },
+  "peerDependencies": {
+    "dn-react-toolkit": "^0.2.43",
+    "drizzle-orm": "^0.45.1",
+    "react": "^19",
+    "react-dom": "^19",
+    "react-router": "^7"
+  }
 }