dn-react-router-toolkit 0.4.2 → 0.5.0

package/dist/api/create_api_handler.d.mts

@@ -0,0 +1,28 @@
+import { Table, InferInsertModel, SQLWrapper } from 'drizzle-orm';
+import { ActionFunctionArgs, LoaderFunctionArgs } from 'react-router';
+import { TableRepository } from '../table/repository.mjs';
+import { WithAuthHandler } from '../auth/with_auth.mjs';
+import 'drizzle-orm/pg-core';
+import 'dn-react-toolkit/auth';
+import 'dn-react-toolkit/auth/server';
+
+type APIHandlerOptions<T extends Table, TSelect> = {
+    withAuthAction: WithAuthHandler<ActionFunctionArgs>;
+    repository: TableRepository<T, TSelect>;
+    validators?: {
+        [K in keyof InferInsertModel<T>]?: {
+            validate?: (value?: InferInsertModel<T>[K]) => boolean;
+            message?: (value?: InferInsertModel<T>[K]) => string;
+        };
+    };
+    existingConditions: {
+        [K in keyof InferInsertModel<T>]?: (value: InferInsertModel<T>[K]) => SQLWrapper;
+    };
+    injectUserId?: boolean;
+};
+declare function apiHandler<T extends Table, TSelect>({ withAuthAction, repository, validators, existingConditions, injectUserId, }: APIHandlerOptions<T, TSelect>): {
+    loader: ({ request }: LoaderFunctionArgs) => Promise<{}>;
+    action: (arg: ActionFunctionArgs<any>) => Promise<unknown> | unknown;
+};
+
+export { type APIHandlerOptions, apiHandler };

package/dist/api/create_api_handler.d.ts

@@ -0,0 +1,28 @@
+import { Table, InferInsertModel, SQLWrapper } from 'drizzle-orm';
+import { ActionFunctionArgs, LoaderFunctionArgs } from 'react-router';
+import { TableRepository } from '../table/repository.js';
+import { WithAuthHandler } from '../auth/with_auth.js';
+import 'drizzle-orm/pg-core';
+import 'dn-react-toolkit/auth';
+import 'dn-react-toolkit/auth/server';
+
+type APIHandlerOptions<T extends Table, TSelect> = {
+    withAuthAction: WithAuthHandler<ActionFunctionArgs>;
+    repository: TableRepository<T, TSelect>;
+    validators?: {
+        [K in keyof InferInsertModel<T>]?: {
+            validate?: (value?: InferInsertModel<T>[K]) => boolean;
+            message?: (value?: InferInsertModel<T>[K]) => string;
+        };
+    };
+    existingConditions: {
+        [K in keyof InferInsertModel<T>]?: (value: InferInsertModel<T>[K]) => SQLWrapper;
+    };
+    injectUserId?: boolean;
+};
+declare function apiHandler<T extends Table, TSelect>({ withAuthAction, repository, validators, existingConditions, injectUserId, }: APIHandlerOptions<T, TSelect>): {
+    loader: ({ request }: LoaderFunctionArgs) => Promise<{}>;
+    action: (arg: ActionFunctionArgs<any>) => Promise<unknown> | unknown;
+};
+
+export { type APIHandlerOptions, apiHandler };

package/dist/api/create_api_handler.js

@@ -0,0 +1,148 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/api/create_api_handler.ts
+var create_api_handler_exports = {};
+__export(create_api_handler_exports, {
+  apiHandler: () => apiHandler
+});
+module.exports = __toCommonJS(create_api_handler_exports);
+var import_http = require("dn-react-toolkit/http");
+var import_drizzle_orm = require("drizzle-orm");
+var import_react_router = require("react-router");
+var import_uuid = require("uuid");
+function apiHandler({
+  withAuthAction,
+  repository,
+  validators,
+  existingConditions,
+  injectUserId
+}) {
+  const loader = async ({ request }) => {
+    return {};
+  };
+  const action = withAuthAction((auth) => async ({ request }) => {
+    if (!auth || auth.role !== "admin") {
+      return (0, import_react_router.redirect)("/login");
+    }
+    switch (request.method) {
+      case "POST":
+      case "PUT": {
+        const serilaizedParams = await request.json();
+        const params = Object.entries(serilaizedParams).reduce(
+          function reducer(acc, [key, value]) {
+            const converter = (value2) => {
+              if (value2.type === "null") {
+                return null;
+              }
+              if (value2.type === "string") {
+                return value2.value;
+              }
+              if (value2.type === "number") {
+                return value2.value;
+              }
+              if (value2.type === "boolean") {
+                return value2.value;
+              }
+              if (value2.type === "date") {
+                return new Date(value2.value);
+              }
+              if (Array.isArray(value2)) {
+                return value2.map((v) => converter(v));
+              }
+              if (typeof value2 === "object") {
+                return Object.entries(value2).reduce(
+                  reducer,
+                  {}
+                );
+              }
+            };
+            const result = converter(value);
+            if (result === void 0) {
+              return acc;
+            }
+            return {
+              ...acc,
+              [key]: result
+            };
+          },
+          {}
+        );
+        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_http.BAD_REQUEST)(
+                validator.message ? validator.message(value) : void 0
+              );
+            }
+          }
+        }
+        const itemId = params.id || (0, import_uuid.v4)();
+        if (!params.id && existingConditions) {
+          const paramsForExistenceCheck = Object.keys(
+            existingConditions
+          ).filter(
+            (key) => Object.prototype.hasOwnProperty.call(params, key)
+          );
+          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_http.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_http.CREATED)(item);
+      }
+      default:
+        throw (0, import_http.METHOD_NOT_ALLOWED)();
+    }
+  });
+  return {
+    loader,
+    action
+  };
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  apiHandler
+});

package/dist/api/create_api_handler.mjs

@@ -0,0 +1,132 @@
+// src/api/create_api_handler.ts
+import {
+  BAD_REQUEST,
+  CONFLICT,
+  CREATED,
+  METHOD_NOT_ALLOWED
+} from "dn-react-toolkit/http";
+import {
+  and
+} from "drizzle-orm";
+import {
+  redirect
+} from "react-router";
+import { v4 } from "uuid";
+function apiHandler({
+  withAuthAction,
+  repository,
+  validators,
+  existingConditions,
+  injectUserId
+}) {
+  const loader = async ({ request }) => {
+    return {};
+  };
+  const action = withAuthAction((auth) => async ({ request }) => {
+    if (!auth || auth.role !== "admin") {
+      return redirect("/login");
+    }
+    switch (request.method) {
+      case "POST":
+      case "PUT": {
+        const serilaizedParams = await request.json();
+        const params = Object.entries(serilaizedParams).reduce(
+          function reducer(acc, [key, value]) {
+            const converter = (value2) => {
+              if (value2.type === "null") {
+                return null;
+              }
+              if (value2.type === "string") {
+                return value2.value;
+              }
+              if (value2.type === "number") {
+                return value2.value;
+              }
+              if (value2.type === "boolean") {
+                return value2.value;
+              }
+              if (value2.type === "date") {
+                return new Date(value2.value);
+              }
+              if (Array.isArray(value2)) {
+                return value2.map((v) => converter(v));
+              }
+              if (typeof value2 === "object") {
+                return Object.entries(value2).reduce(
+                  reducer,
+                  {}
+                );
+              }
+            };
+            const result = converter(value);
+            if (result === void 0) {
+              return acc;
+            }
+            return {
+              ...acc,
+              [key]: result
+            };
+          },
+          {}
+        );
+        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 || v4();
+        if (!params.id && existingConditions) {
+          const paramsForExistenceCheck = Object.keys(
+            existingConditions
+          ).filter(
+            (key) => Object.prototype.hasOwnProperty.call(params, key)
+          );
+          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);
+      }
+      default:
+        throw METHOD_NOT_ALLOWED();
+    }
+  });
+  return {
+    loader,
+    action
+  };
+}
+export {
+  apiHandler
+};

package/dist/api/create_handler.d.mts

@@ -8,6 +8,6 @@ declare const createAPIHandler: <TFile>({ authService, fileService, passwordReco
     passwordRecoveryService: PasswordRecoveryService;
     getThirdPartyAuth: (provider: string) => ThirdpartyAuth;
     signupTokenManager: JWTManager<ThirdpartySignupTokenPayload>;
-}) => (args: LoaderFunctionArgs | ActionFunctionArgs) => Promise<(({ request }: LoaderFunctionArgs<any> | ActionFunctionArgs<any>) => Promise<Response>) | Response>;
+}) => (args: LoaderFunctionArgs | ActionFunctionArgs) => Promise<Response | (({ request }: ActionFunctionArgs<any> | LoaderFunctionArgs<any>) => Promise<Response>)>;
 
 export { createAPIHandler };

package/dist/api/create_handler.d.ts

@@ -8,6 +8,6 @@ declare const createAPIHandler: <TFile>({ authService, fileService, passwordReco
     passwordRecoveryService: PasswordRecoveryService;
     getThirdPartyAuth: (provider: string) => ThirdpartyAuth;
     signupTokenManager: JWTManager<ThirdpartySignupTokenPayload>;
-}) => (args: LoaderFunctionArgs | ActionFunctionArgs) => Promise<(({ request }: LoaderFunctionArgs<any> | ActionFunctionArgs<any>) => Promise<Response>) | Response>;
+}) => (args: LoaderFunctionArgs | ActionFunctionArgs) => Promise<Response | (({ request }: ActionFunctionArgs<any> | LoaderFunctionArgs<any>) => Promise<Response>)>;
 
 export { createAPIHandler };

package/dist/api/create_handler.js

@@ -27,13 +27,14 @@ var import_http = require("dn-react-toolkit/http");
 var import_server = require("dn-react-toolkit/auth/server");
 
 // src/auth/with_auth.ts
+var import_uuid = require("uuid");
 var toResponse = (result) => {
   if (result instanceof Response) {
     return result;
   }
   return Response.json(result);
 };
-function createWithAuthHandler({ authService }) {
+function createWithStrictAuthHandler({ authService }) {
   return function(fn) {
     const handler = async function(arg) {
       const respond = async (auth, headers = new Headers()) => {
@@ -42,7 +43,7 @@ function createWithAuthHandler({ authService }) {
       };
       const setHeader = (res, headers) => {
         headers.forEach((value, key) => {
-          res.headers.set(key, value);
+          res.headers.append(key, value);
         });
         return res;
       };
@@ -50,9 +51,7 @@ function createWithAuthHandler({ authService }) {
         arg.request
       );
       if (accessToken) {
-        const payload = await authService.accessTokenManager.verify(
-          accessToken
-        );
+        const payload = await authService.accessTokenManager.verify(accessToken);
         if (payload) {
           return respond(payload);
         }
@@ -62,23 +61,17 @@ function createWithAuthHandler({ authService }) {
       );
       if (refreshToken) {
         try {
-          const newAccessToken = await authService.refreshAccessToken(
-            refreshToken
-          );
+          const newAccessToken = await authService.refreshAccessToken(refreshToken);
           const setCookieHeader = await authService.getAccessTokenSetCookie(
             newAccessToken
           );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
-          const payload = authService.accessTokenManager.decode(
-            newAccessToken
-          );
+          const payload = authService.accessTokenManager.decode(newAccessToken);
           return respond(payload, headers);
         } catch (e) {
           console.log(e);
-          const setCookieHeader = await authService.getRefreshTokenSetCookie(
-            null
-          );
+          const setCookieHeader = await authService.getRefreshTokenSetCookie(null);
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
           return respond(void 0, headers);
@@ -106,7 +99,7 @@ var createAPIHandler = ({
     const { request, params } = args;
     const method = request.method.toUpperCase();
     const slug = params["*"] ? params["*"].split("/") : [];
-    const withAuth = createWithAuthHandler({ authService });
+    const withAuth = createWithStrictAuthHandler({ authService });
     switch (slug[0]) {
       case "auth": {
         switch (slug[1]) {
@@ -134,10 +127,13 @@ var createAPIHandler = ({
                 const provider = slug[2];
                 switch (method) {
                   case "POST": {
-                    return (0, import_server.loginWithThirdPartyHandler)(request, {
-                      provider,
-                      getThirdPartyAuth
-                    });
+                    return (0, import_server.loginWithThirdPartyHandler)(
+                      request,
+                      {
+                        provider,
+                        getThirdPartyAuth
+                      }
+                    );
                   }
                 }
               }
@@ -176,11 +172,14 @@ var createAPIHandler = ({
               default: {
                 switch (method) {
                   case "POST": {
-                    return (0, import_server.signUpWithThirdpartyHandler)(request, {
-                      authService,
-                      fileService,
-                      signupTokenManager
-                    });
+                    return (0, import_server.signUpWithThirdpartyHandler)(
+                      request,
+                      {
+                        authService,
+                        fileService,
+                        signupTokenManager
+                      }
+                    );
                   }
                 }
               }
@@ -204,7 +203,9 @@ var createAPIHandler = ({
             });
           }
           case "reset-password": {
-            return (0, import_server.resetPasswordHandler)(request, { passwordRecoveryService });
+            return (0, import_server.resetPasswordHandler)(request, {
+              passwordRecoveryService
+            });
           }
         }
       }
@@ -214,7 +215,9 @@ var createAPIHandler = ({
             switch (method) {
               case "POST": {
                 return withAuth(
-                  (auth) => ({ request: request2 }) => (0, import_server2.uploadFileHandler)({ fileService })(auth)(request2)
+                  (auth) => ({ request: request2 }) => (0, import_server2.uploadFileHandler)({ fileService })(
+                    auth
+                  )(request2)
                 )(args);
               }
             }

package/dist/api/create_handler.mjs

@@ -14,13 +14,14 @@ import {
 } from "dn-react-toolkit/auth/server";
 
 // src/auth/with_auth.ts
+import { v4 } from "uuid";
 var toResponse = (result) => {
   if (result instanceof Response) {
     return result;
   }
   return Response.json(result);
 };
-function createWithAuthHandler({ authService }) {
+function createWithStrictAuthHandler({ authService }) {
   return function(fn) {
     const handler = async function(arg) {
       const respond = async (auth, headers = new Headers()) => {
@@ -29,7 +30,7 @@ function createWithAuthHandler({ authService }) {
       };
       const setHeader = (res, headers) => {
         headers.forEach((value, key) => {
-          res.headers.set(key, value);
+          res.headers.append(key, value);
         });
         return res;
       };
@@ -37,9 +38,7 @@ function createWithAuthHandler({ authService }) {
         arg.request
       );
       if (accessToken) {
-        const payload = await authService.accessTokenManager.verify(
-          accessToken
-        );
+        const payload = await authService.accessTokenManager.verify(accessToken);
         if (payload) {
           return respond(payload);
         }
@@ -49,23 +48,17 @@ function createWithAuthHandler({ authService }) {
       );
       if (refreshToken) {
         try {
-          const newAccessToken = await authService.refreshAccessToken(
-            refreshToken
-          );
+          const newAccessToken = await authService.refreshAccessToken(refreshToken);
           const setCookieHeader = await authService.getAccessTokenSetCookie(
             newAccessToken
           );
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
-          const payload = authService.accessTokenManager.decode(
-            newAccessToken
-          );
+          const payload = authService.accessTokenManager.decode(newAccessToken);
           return respond(payload, headers);
         } catch (e) {
           console.log(e);
-          const setCookieHeader = await authService.getRefreshTokenSetCookie(
-            null
-          );
+          const setCookieHeader = await authService.getRefreshTokenSetCookie(null);
           const headers = new Headers();
           headers.append("Set-Cookie", setCookieHeader);
           return respond(void 0, headers);
@@ -96,7 +89,7 @@ var createAPIHandler = ({
     const { request, params } = args;
     const method = request.method.toUpperCase();
     const slug = params["*"] ? params["*"].split("/") : [];
-    const withAuth = createWithAuthHandler({ authService });
+    const withAuth = createWithStrictAuthHandler({ authService });
     switch (slug[0]) {
       case "auth": {
         switch (slug[1]) {
@@ -124,10 +117,13 @@ var createAPIHandler = ({
                 const provider = slug[2];
                 switch (method) {
                   case "POST": {
-                    return loginWithThirdPartyHandler(request, {
-                      provider,
-                      getThirdPartyAuth
-                    });
+                    return loginWithThirdPartyHandler(
+                      request,
+                      {
+                        provider,
+                        getThirdPartyAuth
+                      }
+                    );
                   }
                 }
               }
@@ -166,11 +162,14 @@ var createAPIHandler = ({
               default: {
                 switch (method) {
                   case "POST": {
-                    return signUpWithThirdpartyHandler(request, {
-                      authService,
-                      fileService,
-                      signupTokenManager
-                    });
+                    return signUpWithThirdpartyHandler(
+                      request,
+                      {
+                        authService,
+                        fileService,
+                        signupTokenManager
+                      }
+                    );
                   }
                 }
               }
@@ -194,7 +193,9 @@ var createAPIHandler = ({
             });
           }
           case "reset-password": {
-            return resetPasswordHandler(request, { passwordRecoveryService });
+            return resetPasswordHandler(request, {
+              passwordRecoveryService
+            });
           }
         }
       }
@@ -204,7 +205,9 @@ var createAPIHandler = ({
             switch (method) {
               case "POST": {
                 return withAuth(
-                  (auth) => ({ request: request2 }) => uploadFileHandler({ fileService })(auth)(request2)
+                  (auth) => ({ request: request2 }) => uploadFileHandler({ fileService })(
+                    auth
+                  )(request2)
                 )(args);
               }
             }