dn-react-router-toolkit 0.8.1 → 0.9.0

package/dist/table/table_form.js

@@ -49,10 +49,7 @@ function Table({
   return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
     "table",
     {
-      className: (0, import_utils.cn)(
-        className,
-        "text-[15px] border-separate border-spacing-0"
-      ),
+      className: (0, import_utils.cn)(className, "text-[15px] border-separate border-spacing-0"),
       children: [
         /* @__PURE__ */ (0, import_jsx_runtime.jsx)("thead", { children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)("tr", { children: keys.map((key) => {
           const value = columns[key];
@@ -91,13 +88,11 @@ function Table({
             }
             return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, { children: reactNode });
           }
-          const filter = filters[key];
+          const filter = filters?.[key];
           return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
             "th",
             {
-              className: (0, import_utils.cn)(
-                "py-4 border-y font-normal align-top"
-              ),
+              className: (0, import_utils.cn)("py-4 border-y font-normal align-top"),
               children: [
                 /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Head, {}),
                 filter && /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "px-3 mt-4", children: /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(
@@ -108,12 +103,7 @@ function Table({
                       const value2 = e.target.value;
                       setSearchParams((prev) => {
                         if (value2) {
-                          prev.set(
-                            key,
-                            encodeURIComponent(
-                              value2
-                            )
-                          );
+                          prev.set(key, encodeURIComponent(value2));
                         } else {
                           prev.delete(key);
                         }
@@ -122,14 +112,7 @@ function Table({
                     },
                     children: [
                       /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: "", children: "\uC804\uCCB4" }),
-                      filter.map((option) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)(
-                        "option",
-                        {
-                          value: option,
-                          children: option
-                        },
-                        option
-                      ))
+                      filter.map((option) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("option", { value: option, children: option }, option))
                     ]
                   }
                 ) })
@@ -168,7 +151,7 @@ function Table({
                 className: "block content-center px-4 w-full h-full",
                 children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Content, {})
               }
-            ) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Content, {});
+            ) : /* @__PURE__ */ (0, import_jsx_runtime.jsx)("div", { className: "px-4 w-full h-full content-center", children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Content, {}) });
             const cell = Mapper ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(Mapper, { item, index: i2, children: linkedContent }) : linkedContent;
             return /* @__PURE__ */ (0, import_jsx_runtime.jsx)("td", { className: "px-0 h-14 border-b", children: cell }, key);
           }) }, i))

package/dist/table/table_form.mjs

@@ -25,10 +25,7 @@ function Table({
   return /* @__PURE__ */ jsxs(
     "table",
     {
-      className: cn(
-        className,
-        "text-[15px] border-separate border-spacing-0"
-      ),
+      className: cn(className, "text-[15px] border-separate border-spacing-0"),
       children: [
         /* @__PURE__ */ jsx("thead", { children: /* @__PURE__ */ jsx("tr", { children: keys.map((key) => {
           const value = columns[key];
@@ -67,13 +64,11 @@ function Table({
             }
             return /* @__PURE__ */ jsx(Fragment, { children: reactNode });
           }
-          const filter = filters[key];
+          const filter = filters?.[key];
           return /* @__PURE__ */ jsxs(
             "th",
             {
-              className: cn(
-                "py-4 border-y font-normal align-top"
-              ),
+              className: cn("py-4 border-y font-normal align-top"),
               children: [
                 /* @__PURE__ */ jsx(Head, {}),
                 filter && /* @__PURE__ */ jsx("div", { className: "px-3 mt-4", children: /* @__PURE__ */ jsxs(
@@ -84,12 +79,7 @@ function Table({
                       const value2 = e.target.value;
                       setSearchParams((prev) => {
                         if (value2) {
-                          prev.set(
-                            key,
-                            encodeURIComponent(
-                              value2
-                            )
-                          );
+                          prev.set(key, encodeURIComponent(value2));
                         } else {
                           prev.delete(key);
                         }
@@ -98,14 +88,7 @@ function Table({
                     },
                     children: [
                       /* @__PURE__ */ jsx("option", { value: "", children: "\uC804\uCCB4" }),
-                      filter.map((option) => /* @__PURE__ */ jsx(
-                        "option",
-                        {
-                          value: option,
-                          children: option
-                        },
-                        option
-                      ))
+                      filter.map((option) => /* @__PURE__ */ jsx("option", { value: option, children: option }, option))
                     ]
                   }
                 ) })
@@ -144,7 +127,7 @@ function Table({
                 className: "block content-center px-4 w-full h-full",
                 children: /* @__PURE__ */ jsx(Content, {})
               }
-            ) : /* @__PURE__ */ jsx(Content, {});
+            ) : /* @__PURE__ */ jsx("div", { className: "px-4 w-full h-full content-center", children: /* @__PURE__ */ jsx(Content, {}) });
             const cell = Mapper ? /* @__PURE__ */ jsx(Mapper, { item, index: i2, children: linkedContent }) : linkedContent;
             return /* @__PURE__ */ jsx("td", { className: "px-0 h-14 border-b", children: cell }, key);
           }) }, i))

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dn-react-router-toolkit",
-  "version": "0.8.1",
+  "version": "0.9.0",
   "types": "./dist/index.d.ts",
   "main": "./dist/index.mjs",
   "module": "./dist/index.js",
@@ -100,4 +100,4 @@
     "react-dom": "^19",
     "react-router": "^7.13.1"
   }
-}
+}

package/dist/crud/crud_loader.d.mts

@@ -1,26 +0,0 @@
-import { LoaderFunctionArgs, LoaderFunction } from 'react-router';
-import { TableItemLoaderOptions } from '../table/item_loader.mjs';
-import { TableRepository } from '../table/repository.mjs';
-import { TableLoaderOptions } from '../table/load_table.mjs';
-import { PgTableWithColumns } from 'drizzle-orm/pg-core';
-import { APIHandlerOptions } from '../api/create_api_handler.mjs';
-import 'drizzle-orm';
-import 'drizzle-orm/node-postgres';
-import '../auth/with_auth.mjs';
-import 'dn-react-toolkit/auth';
-import 'dn-react-toolkit/auth/server';
-
-type CrudHandlerOptions<T extends PgTableWithColumns<any>, TSelect> = {
-    repository: TableRepository<T, TSelect>;
-    apiHandlerOptions: Omit<APIHandlerOptions<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 PgTableWithColumns<any>, 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,26 +0,0 @@
-import { LoaderFunctionArgs, LoaderFunction } from 'react-router';
-import { TableItemLoaderOptions } from '../table/item_loader.js';
-import { TableRepository } from '../table/repository.js';
-import { TableLoaderOptions } from '../table/load_table.js';
-import { PgTableWithColumns } from 'drizzle-orm/pg-core';
-import { APIHandlerOptions } from '../api/create_api_handler.js';
-import 'drizzle-orm';
-import 'drizzle-orm/node-postgres';
-import '../auth/with_auth.js';
-import 'dn-react-toolkit/auth';
-import 'dn-react-toolkit/auth/server';
-
-type CrudHandlerOptions<T extends PgTableWithColumns<any>, TSelect> = {
-    repository: TableRepository<T, TSelect>;
-    apiHandlerOptions: Omit<APIHandlerOptions<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 PgTableWithColumns<any>, 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

@@ -1,351 +0,0 @@
-"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/crud/crud_loader.tsx
-var crud_loader_exports = {};
-__export(crud_loader_exports, {
-  crudHandler: () => crudHandler
-});
-module.exports = __toCommonJS(crud_loader_exports);
-
-// src/table/load_table.tsx
-var import_drizzle_orm = require("drizzle-orm");
-async function loadTable({
-  request,
-  repository,
-  options
-}) {
-  const searchParams = new URL(request.url).searchParams;
-  const { where, searchKey, defaultOrderBy, defaultDirection } = options;
-  const query = searchParams.get("query") ?? void 0;
-  const limit = Number(searchParams.get("limit") ?? "20");
-  const offset = Number(searchParams.get("offset") ?? "0");
-  const orderBy = searchParams.get("orderBy") ?? defaultOrderBy;
-  const direction = searchParams.get("direction") ?? defaultDirection;
-  const filterWhere = Object.entries(options.filters ?? {}).map(([key, value]) => {
-    const param = searchParams.get(key);
-    if (param) {
-      return (0, import_drizzle_orm.eq)(
-        repository.schema[key],
-        decodeURIComponent(param)
-      );
-    }
-    return void 0;
-  }).filter(Boolean);
-  const whereClauses = (0, import_drizzle_orm.and)(
-    searchKey && query ? (0, import_drizzle_orm.ilike)(
-      repository.schema[searchKey],
-      `%${query}%`
-    ) : void 0,
-    ...filterWhere,
-    ...where ?? []
-  );
-  const total = await repository.countTotal({ where: whereClauses });
-  const items = await repository.findAll({
-    orderBy,
-    direction,
-    limit,
-    offset,
-    where: whereClauses
-  });
-  const filters = Object.fromEntries(
-    await Promise.all(
-      Object.keys(options.filters ?? {}).map(async (key) => {
-        const values = await repository.select(key);
-        return [key, values.filter(Boolean)];
-      })
-    )
-  );
-  return {
-    items,
-    total,
-    limit,
-    offset,
-    orderBy,
-    direction,
-    searchKey,
-    filters
-  };
-}
-
-// src/table/loader.tsx
-function tableLoader({
-  repository,
-  options
-}) {
-  return async ({ request }) => {
-    const table = await loadTable({
-      request,
-      repository,
-      options
-    });
-    return {
-      table
-    };
-  };
-}
-
-// src/table/item_loader.tsx
-var tableItemloader = ({
-  repository
-}) => {
-  return async (args) => {
-    const { params } = args;
-    if (params["itemId"] === "new") {
-      return { item: void 0 };
-    }
-    const item = params["itemId"] ? await repository.find(params["itemId"]) : void 0;
-    return {
-      item
-    };
-  };
-};
-
-// src/api/create_api_handler.ts
-var import_http = require("dn-react-toolkit/http");
-var import_drizzle_orm2 = require("drizzle-orm");
-var import_uuid = 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_http.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_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)
-            );
-            if (paramsForExistenceCheck.length > 0) {
-              const where = (0, import_drizzle_orm2.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);
-        } catch (error) {
-          if (error instanceof Error) {
-            throw (0, import_http.INTERNAL_SERVER_ERROR)(error.message);
-          }
-          throw error;
-        }
-      }
-      default:
-        throw (0, import_http.METHOD_NOT_ALLOWED)();
-    }
-  });
-  return {
-    loader,
-    action
-  };
-}
-
-// src/api/item_api_handler.ts
-var import_http2 = require("dn-react-toolkit/http");
-function itemApiHandler({
-  withAuthAction,
-  repository,
-  isOwnedBy,
-  roles
-}) {
-  const loader = async ({ request }) => {
-    return {};
-  };
-  const action = withAuthAction((auth) => async ({ params, request }) => {
-    if (roles && roles.length > 0 && (!auth || !roles.includes(auth.role))) {
-      throw (0, import_http2.UNAUTHORIZED)();
-    }
-    const itemId = params.itemId;
-    const existing = await repository.find(itemId);
-    if (!existing) {
-      throw (0, import_http2.NOT_FOUND)();
-    }
-    if (isOwnedBy && !isOwnedBy(existing, auth)) {
-      throw (0, import_http2.FORBIDDEN)();
-    }
-    switch (request.method) {
-      case "DELETE": {
-        await repository.delete(itemId);
-        return {};
-      }
-    }
-  });
-  return {
-    loader,
-    action
-  };
-}
-
-// src/crud/crud_loader.tsx
-function crudHandler({
-  repository,
-  apiHandlerOptions,
-  loaderOptions,
-  itemLoaderOptions
-}) {
-  return (prefix) => async (args) => {
-    const pattern = args.unstable_pattern;
-    if (pattern === `/api${prefix}`) {
-      const { loader, action } = apiHandler({
-        repository,
-        ...apiHandlerOptions
-      });
-      if (args.request.method === "GET") {
-        return loader(args);
-      } else {
-        return action(args);
-      }
-    }
-    if (pattern.startsWith(`/api${prefix}`)) {
-      const { loader, action } = itemApiHandler({
-        repository,
-        ...apiHandlerOptions
-      });
-      if (args.request.method === "GET") {
-        return loader(args);
-      } else {
-        return action(args);
-      }
-    }
-    if (pattern === prefix) {
-      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)) {
-      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;
-    }
-  };
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  crudHandler
-});