dn-react-router-toolkit 0.7.5 → 0.7.7

package/dist/api/create_api_handler.d.mts

@@ -19,8 +19,9 @@ type APIHandlerOptions<T extends Table, TSelect> = {
         [K in keyof InferInsertModel<T>]?: (value: InferInsertModel<T>[K]) => SQLWrapper;
     };
     injectUserId?: boolean;
+    roles?: string[];
 };
-declare function apiHandler<T extends Table, TSelect>({ withAuthAction, repository, validators, existingConditions, injectUserId, }: APIHandlerOptions<T, TSelect>): {
+declare function apiHandler<T extends Table, TSelect>({ withAuthAction, repository, validators, existingConditions, injectUserId, roles, }: APIHandlerOptions<T, TSelect>): {
     loader: ({ request }: LoaderFunctionArgs) => Promise<{}>;
     action: (arg: ActionFunctionArgs<any>) => Promise<unknown> | unknown;
 };

package/dist/api/create_api_handler.d.ts

@@ -19,8 +19,9 @@ type APIHandlerOptions<T extends Table, TSelect> = {
         [K in keyof InferInsertModel<T>]?: (value: InferInsertModel<T>[K]) => SQLWrapper;
     };
     injectUserId?: boolean;
+    roles?: string[];
 };
-declare function apiHandler<T extends Table, TSelect>({ withAuthAction, repository, validators, existingConditions, injectUserId, }: APIHandlerOptions<T, TSelect>): {
+declare function apiHandler<T extends Table, TSelect>({ withAuthAction, repository, validators, existingConditions, injectUserId, roles, }: APIHandlerOptions<T, TSelect>): {
     loader: ({ request }: LoaderFunctionArgs) => Promise<{}>;
     action: (arg: ActionFunctionArgs<any>) => Promise<unknown> | unknown;
 };

package/dist/api/create_api_handler.js

@@ -71,14 +71,15 @@ function apiHandler({
   repository,
   validators,
   existingConditions,
-  injectUserId
+  injectUserId,
+  roles
 }) {
   const loader = async ({ request }) => {
     return {};
   };
   const action = withAuthAction((auth) => async ({ request }) => {
-    if (!auth || auth.role !== "admin") {
-      return (0, import_react_router.redirect)("/login");
+    if (roles && roles.length > 0 && (!auth || !roles.includes(auth.role))) {
+      throw (0, import_http.UNAUTHORIZED)();
     }
     switch (request.method) {
       case "POST":
@@ -128,7 +129,7 @@ function apiHandler({
           }
           const values = {
             id: itemId,
-            userId: injectUserId ? auth.userId : void 0,
+            userId: injectUserId ? auth?.userId : void 0,
             ...params
           };
           const item = await repository.save(values);

package/dist/api/create_api_handler.mjs

@@ -4,14 +4,13 @@ import {
   CONFLICT,
   CREATED,
   INTERNAL_SERVER_ERROR,
-  METHOD_NOT_ALLOWED
+  METHOD_NOT_ALLOWED,
+  UNAUTHORIZED
 } from "dn-react-toolkit/http";
 import {
   and
 } from "drizzle-orm";
-import {
-  redirect
-} from "react-router";
+import "react-router";
 import { v4 } from "uuid";
 
 // src/crud/serialize.ts
@@ -57,14 +56,15 @@ function apiHandler({
   repository,
   validators,
   existingConditions,
-  injectUserId
+  injectUserId,
+  roles
 }) {
   const loader = async ({ request }) => {
     return {};
   };
   const action = withAuthAction((auth) => async ({ request }) => {
-    if (!auth || auth.role !== "admin") {
-      return redirect("/login");
+    if (roles && roles.length > 0 && (!auth || !roles.includes(auth.role))) {
+      throw UNAUTHORIZED();
     }
     switch (request.method) {
       case "POST":
@@ -114,7 +114,7 @@ function apiHandler({
           }
           const values = {
             id: itemId,
-            userId: injectUserId ? auth.userId : void 0,
+            userId: injectUserId ? auth?.userId : void 0,
             ...params
           };
           const item = await repository.save(values);

package/dist/api/index.d.mts

@@ -1,4 +1,11 @@
 export { createAPIHandler } from './create_handler.mjs';
+export { APIHandlerOptions, apiHandler } from './create_api_handler.mjs';
+export { ItemAPIHandlerOptions, itemApiHandler } from './item_api_handler.mjs';
 import 'react-router';
 import 'dn-react-toolkit/auth/server';
 import 'dn-react-toolkit/file/server';
+import 'drizzle-orm';
+import '../table/repository.mjs';
+import 'drizzle-orm/pg-core';
+import '../auth/with_auth.mjs';
+import 'dn-react-toolkit/auth';

package/dist/api/index.d.ts

@@ -1,4 +1,11 @@
 export { createAPIHandler } from './create_handler.js';
+export { APIHandlerOptions, apiHandler } from './create_api_handler.js';
+export { ItemAPIHandlerOptions, itemApiHandler } from './item_api_handler.js';
 import 'react-router';
 import 'dn-react-toolkit/auth/server';
 import 'dn-react-toolkit/file/server';
+import 'drizzle-orm';
+import '../table/repository.js';
+import 'drizzle-orm/pg-core';
+import '../auth/with_auth.js';
+import 'dn-react-toolkit/auth';

package/dist/api/index.js

@@ -20,7 +20,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 // src/api/index.ts
 var api_exports = {};
 __export(api_exports, {
-  createAPIHandler: () => createAPIHandler
+  apiHandler: () => apiHandler,
+  createAPIHandler: () => createAPIHandler,
+  itemApiHandler: () => itemApiHandler
 });
 module.exports = __toCommonJS(api_exports);
 
@@ -237,7 +239,166 @@ var createAPIHandler = ({
   };
   return handler;
 };
+
+// src/api/create_api_handler.ts
+var import_http2 = require("dn-react-toolkit/http");
+var import_drizzle_orm = require("drizzle-orm");
+var import_react_router2 = require("react-router");
+var import_uuid2 = require("uuid");
+
+// src/crud/serialize.ts
+function deserialize(data) {
+  if (data === void 0) {
+    return void 0;
+  }
+  if (typeof data === "object" && data !== null && "type" in data && "value" in data) {
+    const { type, value } = data;
+    switch (type) {
+      case "null":
+        return null;
+      case "string":
+        return value;
+      case "number":
+        return value;
+      case "boolean":
+        return value;
+      case "date":
+        return new Date(value);
+      case "array":
+        return value.map((item) => deserialize(item));
+      case "object":
+        return Object.entries(value).reduce(
+          (acc, [key, value2]) => {
+            return {
+              ...acc,
+              [key]: deserialize(value2)
+            };
+          },
+          {}
+        );
+      default:
+        return void 0;
+    }
+  }
+  return void 0;
+}
+
+// src/api/create_api_handler.ts
+function apiHandler({
+  withAuthAction,
+  repository,
+  validators,
+  existingConditions,
+  injectUserId,
+  roles
+}) {
+  const loader = async ({ request }) => {
+    return {};
+  };
+  const action = withAuthAction((auth) => async ({ request }) => {
+    if (roles && roles.length > 0 && (!auth || !roles.includes(auth.role))) {
+      throw (0, import_http2.UNAUTHORIZED)();
+    }
+    switch (request.method) {
+      case "POST":
+      case "PUT": {
+        try {
+          const serilaizedParams = await request.json();
+          const params = deserialize(serilaizedParams);
+          if (validators) {
+            const paramsForValidation = Object.keys(validators).filter(
+              (key) => Object.prototype.hasOwnProperty.call(validators, key)
+            );
+            for (const paramKey of paramsForValidation) {
+              const value = params[paramKey];
+              const validator = validators[paramKey];
+              if (validator?.validate && !validator.validate(value)) {
+                throw (0, import_http2.BAD_REQUEST)(
+                  validator.message ? validator.message(value) : void 0
+                );
+              }
+            }
+          }
+          const itemId = params.id || (0, import_uuid2.v4)();
+          if (!params.id && existingConditions) {
+            const paramsForExistenceCheck = Object.keys(
+              existingConditions
+            ).filter(
+              (key) => Object.prototype.hasOwnProperty.call(params, key)
+            );
+            if (paramsForExistenceCheck.length > 0) {
+              const where = (0, import_drizzle_orm.and)(
+                ...paramsForExistenceCheck.reduce((acc, key) => {
+                  const condition = existingConditions[key];
+                  if (condition) {
+                    acc.push(condition(params[key]));
+                  }
+                  return acc;
+                }, [])
+              );
+              const existing = await repository.findAll({
+                limit: 1,
+                where
+              });
+              if (existing.length > 0) {
+                throw (0, import_http2.CONFLICT)("\uC790\uB8CC\uAC00 \uC774\uBBF8 \uC874\uC7AC\uD569\uB2C8\uB2E4.");
+              }
+            }
+          }
+          const values = {
+            id: itemId,
+            userId: injectUserId ? auth?.userId : void 0,
+            ...params
+          };
+          const item = await repository.save(values);
+          return (0, import_http2.CREATED)(item);
+        } catch (error) {
+          if (error instanceof Error) {
+            throw (0, import_http2.INTERNAL_SERVER_ERROR)(error.message);
+          }
+          throw error;
+        }
+      }
+      default:
+        throw (0, import_http2.METHOD_NOT_ALLOWED)();
+    }
+  });
+  return {
+    loader,
+    action
+  };
+}
+
+// src/api/item_api_handler.ts
+var import_http3 = require("dn-react-toolkit/http");
+var import_react_router3 = require("react-router");
+function itemApiHandler({
+  withAuthAction,
+  repository
+}) {
+  const loader = async ({ request }) => {
+    return {};
+  };
+  const action = withAuthAction((auth) => async ({ params, request }) => {
+    if (!auth || auth.role !== "admin") {
+      return (0, import_http3.UNAUTHORIZED)();
+    }
+    switch (request.method) {
+      case "DELETE": {
+        const itemId = params.itemId;
+        await repository.delete(itemId);
+        return {};
+      }
+    }
+  });
+  return {
+    loader,
+    action
+  };
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  createAPIHandler
+  apiHandler,
+  createAPIHandler,
+  itemApiHandler
 });

package/dist/api/index.mjs

@@ -225,6 +225,174 @@ var createAPIHandler = ({
   };
   return handler;
 };
+
+// src/api/create_api_handler.ts
+import {
+  BAD_REQUEST,
+  CONFLICT,
+  CREATED,
+  INTERNAL_SERVER_ERROR,
+  METHOD_NOT_ALLOWED,
+  UNAUTHORIZED
+} from "dn-react-toolkit/http";
+import {
+  and
+} from "drizzle-orm";
+import "react-router";
+import { v4 as v42 } from "uuid";
+
+// src/crud/serialize.ts
+function deserialize(data) {
+  if (data === void 0) {
+    return void 0;
+  }
+  if (typeof data === "object" && data !== null && "type" in data && "value" in data) {
+    const { type, value } = data;
+    switch (type) {
+      case "null":
+        return null;
+      case "string":
+        return value;
+      case "number":
+        return value;
+      case "boolean":
+        return value;
+      case "date":
+        return new Date(value);
+      case "array":
+        return value.map((item) => deserialize(item));
+      case "object":
+        return Object.entries(value).reduce(
+          (acc, [key, value2]) => {
+            return {
+              ...acc,
+              [key]: deserialize(value2)
+            };
+          },
+          {}
+        );
+      default:
+        return void 0;
+    }
+  }
+  return void 0;
+}
+
+// src/api/create_api_handler.ts
+function apiHandler({
+  withAuthAction,
+  repository,
+  validators,
+  existingConditions,
+  injectUserId,
+  roles
+}) {
+  const loader = async ({ request }) => {
+    return {};
+  };
+  const action = withAuthAction((auth) => async ({ request }) => {
+    if (roles && roles.length > 0 && (!auth || !roles.includes(auth.role))) {
+      throw UNAUTHORIZED();
+    }
+    switch (request.method) {
+      case "POST":
+      case "PUT": {
+        try {
+          const serilaizedParams = await request.json();
+          const params = deserialize(serilaizedParams);
+          if (validators) {
+            const paramsForValidation = Object.keys(validators).filter(
+              (key) => Object.prototype.hasOwnProperty.call(validators, key)
+            );
+            for (const paramKey of paramsForValidation) {
+              const value = params[paramKey];
+              const validator = validators[paramKey];
+              if (validator?.validate && !validator.validate(value)) {
+                throw BAD_REQUEST(
+                  validator.message ? validator.message(value) : void 0
+                );
+              }
+            }
+          }
+          const itemId = params.id || v42();
+          if (!params.id && existingConditions) {
+            const paramsForExistenceCheck = Object.keys(
+              existingConditions
+            ).filter(
+              (key) => Object.prototype.hasOwnProperty.call(params, key)
+            );
+            if (paramsForExistenceCheck.length > 0) {
+              const where = and(
+                ...paramsForExistenceCheck.reduce((acc, key) => {
+                  const condition = existingConditions[key];
+                  if (condition) {
+                    acc.push(condition(params[key]));
+                  }
+                  return acc;
+                }, [])
+              );
+              const existing = await repository.findAll({
+                limit: 1,
+                where
+              });
+              if (existing.length > 0) {
+                throw CONFLICT("\uC790\uB8CC\uAC00 \uC774\uBBF8 \uC874\uC7AC\uD569\uB2C8\uB2E4.");
+              }
+            }
+          }
+          const values = {
+            id: itemId,
+            userId: injectUserId ? auth?.userId : void 0,
+            ...params
+          };
+          const item = await repository.save(values);
+          return CREATED(item);
+        } catch (error) {
+          if (error instanceof Error) {
+            throw INTERNAL_SERVER_ERROR(error.message);
+          }
+          throw error;
+        }
+      }
+      default:
+        throw METHOD_NOT_ALLOWED();
+    }
+  });
+  return {
+    loader,
+    action
+  };
+}
+
+// src/api/item_api_handler.ts
+import { UNAUTHORIZED as UNAUTHORIZED2 } from "dn-react-toolkit/http";
+import "react-router";
+function itemApiHandler({
+  withAuthAction,
+  repository
+}) {
+  const loader = async ({ request }) => {
+    return {};
+  };
+  const action = withAuthAction((auth) => async ({ params, request }) => {
+    if (!auth || auth.role !== "admin") {
+      return UNAUTHORIZED2();
+    }
+    switch (request.method) {
+      case "DELETE": {
+        const itemId = params.itemId;
+        await repository.delete(itemId);
+        return {};
+      }
+    }
+  });
+  return {
+    loader,
+    action
+  };
+}
 export {
-  createAPIHandler
+  apiHandler,
+  createAPIHandler,
+  itemApiHandler
 };

package/dist/crud/crud_loader.js

@@ -132,14 +132,15 @@ function apiHandler({
   repository,
   validators,
   existingConditions,
-  injectUserId
+  injectUserId,
+  roles
 }) {
   const loader = async ({ request }) => {
     return {};
   };
   const action = withAuthAction((auth) => async ({ request }) => {
-    if (!auth || auth.role !== "admin") {
-      return (0, import_react_router.redirect)("/login");
+    if (roles && roles.length > 0 && (!auth || !roles.includes(auth.role))) {
+      throw (0, import_http.UNAUTHORIZED)();
     }
     switch (request.method) {
       case "POST":
@@ -189,7 +190,7 @@ function apiHandler({
           }
           const values = {
             id: itemId,
-            userId: injectUserId ? auth.userId : void 0,
+            userId: injectUserId ? auth?.userId : void 0,
             ...params
           };
           const item = await repository.save(values);

package/dist/crud/crud_loader.mjs

@@ -66,14 +66,13 @@ import {
   CONFLICT,
   CREATED,
   INTERNAL_SERVER_ERROR,
-  METHOD_NOT_ALLOWED
+  METHOD_NOT_ALLOWED,
+  UNAUTHORIZED
 } from "dn-react-toolkit/http";
 import {
   and as and2
 } from "drizzle-orm";
-import {
-  redirect
-} from "react-router";
+import "react-router";
 import { v4 } from "uuid";
 
 // src/crud/serialize.ts
@@ -119,14 +118,15 @@ function apiHandler({
   repository,
   validators,
   existingConditions,
-  injectUserId
+  injectUserId,
+  roles
 }) {
   const loader = async ({ request }) => {
     return {};
   };
   const action = withAuthAction((auth) => async ({ request }) => {
-    if (!auth || auth.role !== "admin") {
-      return redirect("/login");
+    if (roles && roles.length > 0 && (!auth || !roles.includes(auth.role))) {
+      throw UNAUTHORIZED();
     }
     switch (request.method) {
       case "POST":
@@ -176,7 +176,7 @@ function apiHandler({
           }
           const values = {
             id: itemId,
-            userId: injectUserId ? auth.userId : void 0,
+            userId: injectUserId ? auth?.userId : void 0,
             ...params
           };
           const item = await repository.save(values);
@@ -199,7 +199,7 @@ function apiHandler({
 }
 
 // src/api/item_api_handler.ts
-import { UNAUTHORIZED } from "dn-react-toolkit/http";
+import { UNAUTHORIZED as UNAUTHORIZED2 } from "dn-react-toolkit/http";
 import "react-router";
 function itemApiHandler({
   withAuthAction,
@@ -210,7 +210,7 @@ function itemApiHandler({
   };
   const action = withAuthAction((auth) => async ({ params, request }) => {
     if (!auth || auth.role !== "admin") {
-      return UNAUTHORIZED();
+      return UNAUTHORIZED2();
     }
     switch (request.method) {
       case "DELETE": {

package/dist/crud/index.js

@@ -8038,14 +8038,15 @@ function apiHandler({
   repository,
   validators,
   existingConditions,
-  injectUserId
+  injectUserId,
+  roles
 }) {
   const loader = async ({ request }) => {
     return {};
   };
   const action = withAuthAction((auth) => async ({ request }) => {
-    if (!auth || auth.role !== "admin") {
-      return (0, import_react_router4.redirect)("/login");
+    if (roles && roles.length > 0 && (!auth || !roles.includes(auth.role))) {
+      throw (0, import_http.UNAUTHORIZED)();
     }
     switch (request.method) {
       case "POST":
@@ -8095,7 +8096,7 @@ function apiHandler({
           }
           const values = {
             id: itemId,
-            userId: injectUserId ? auth.userId : void 0,
+            userId: injectUserId ? auth?.userId : void 0,
             ...params
           };
           const item = await repository.save(values);

package/dist/crud/index.mjs

@@ -8018,28 +8018,28 @@ import {
   CONFLICT,
   CREATED,
   INTERNAL_SERVER_ERROR,
-  METHOD_NOT_ALLOWED
+  METHOD_NOT_ALLOWED,
+  UNAUTHORIZED
 } from "dn-react-toolkit/http";
 import {
   and as and2
 } from "drizzle-orm";
-import {
-  redirect
-} from "react-router";
+import "react-router";
 import { v4 } from "uuid";
 function apiHandler({
   withAuthAction,
   repository,
   validators,
   existingConditions,
-  injectUserId
+  injectUserId,
+  roles
 }) {
   const loader = async ({ request }) => {
     return {};
   };
   const action = withAuthAction((auth) => async ({ request }) => {
-    if (!auth || auth.role !== "admin") {
-      return redirect("/login");
+    if (roles && roles.length > 0 && (!auth || !roles.includes(auth.role))) {
+      throw UNAUTHORIZED();
     }
     switch (request.method) {
       case "POST":
@@ -8089,7 +8089,7 @@ function apiHandler({
           }
           const values = {
             id: itemId,
-            userId: injectUserId ? auth.userId : void 0,
+            userId: injectUserId ? auth?.userId : void 0,
             ...params
           };
           const item = await repository.save(values);
@@ -8112,7 +8112,7 @@ function apiHandler({
 }
 
 // src/api/item_api_handler.ts
-import { UNAUTHORIZED } from "dn-react-toolkit/http";
+import { UNAUTHORIZED as UNAUTHORIZED2 } from "dn-react-toolkit/http";
 import "react-router";
 function itemApiHandler({
   withAuthAction,
@@ -8123,7 +8123,7 @@ function itemApiHandler({
   };
   const action = withAuthAction((auth) => async ({ params, request }) => {
     if (!auth || auth.role !== "admin") {
-      return UNAUTHORIZED();
+      return UNAUTHORIZED2();
     }
     switch (request.method) {
       case "DELETE": {

package/dist/post/index.mjs

@@ -8083,18 +8083,17 @@ import {
   CONFLICT,
   CREATED,
   INTERNAL_SERVER_ERROR,
-  METHOD_NOT_ALLOWED
+  METHOD_NOT_ALLOWED,
+  UNAUTHORIZED
 } from "dn-react-toolkit/http";
 import {
   and as and2
 } from "drizzle-orm";
-import {
-  redirect
-} from "react-router";
+import "react-router";
 import { v4 } from "uuid";
 
 // src/api/item_api_handler.ts
-import { UNAUTHORIZED } from "dn-react-toolkit/http";
+import { UNAUTHORIZED as UNAUTHORIZED2 } from "dn-react-toolkit/http";
 import "react-router";
 
 // src/crud/crud_page.tsx

package/dist/post/post_form_page.mjs

@@ -8085,18 +8085,17 @@ import {
   CONFLICT,
   CREATED,
   INTERNAL_SERVER_ERROR,
-  METHOD_NOT_ALLOWED
+  METHOD_NOT_ALLOWED,
+  UNAUTHORIZED
 } from "dn-react-toolkit/http";
 import {
   and as and2
 } from "drizzle-orm";
-import {
-  redirect
-} from "react-router";
+import "react-router";
 import { v4 } from "uuid";
 
 // src/api/item_api_handler.ts
-import { UNAUTHORIZED } from "dn-react-toolkit/http";
+import { UNAUTHORIZED as UNAUTHORIZED2 } from "dn-react-toolkit/http";
 import "react-router";
 
 // src/crud/crud_page.tsx

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dn-react-router-toolkit",
-  "version": "0.7.5",
+  "version": "0.7.7",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.mjs",
   "module": "./dist/index.js",