dn-react-router-toolkit 0.7.15 → 0.8.1

package/dist/table/index.d.ts

@@ -1,10 +1,14 @@
-export { BaseTableRepository, ColumnOf, FindAllOptions, InsertModelOf, SelectModelOf, TableRepository } from './repository.js';
+export { BaseTableRepository, ColumnOf, FindAllOptions, InsertModelOf, SchemaOf, SelectModelOf, TableRepository } from './repository.js';
 export { TablePageButtons } from './buttons.js';
 export { TableItemLoaderOptions, tableItemloader } from './item_loader.js';
-export { TableLoaderOptions, tableLoader } from './loader.js';
-export { TablePageOptions, TableProps, createTablePage } from './page.js';
+export { tableLoader } from './loader.js';
+export { createTablePage } from './page.js';
 export { OrderedTableProps, Table, TableColumnOptions, TableColumnProps } from './table.js';
+export { TableLoaderOptions, loadTable } from './load_table.js';
+export { LoadedModel, TableForm, TablePageOptions } from './table_form.js';
+export { TableLoaderData, useTable } from './use_table.js';
 import 'drizzle-orm';
+import 'drizzle-orm/node-postgres';
 import 'drizzle-orm/pg-core';
 import 'react/jsx-runtime';
 import 'react-router';

package/dist/table/index.js

@@ -22,10 +22,13 @@ var table_exports = {};
 __export(table_exports, {
   BaseTableRepository: () => BaseTableRepository,
   Table: () => Table,
+  TableForm: () => TableForm,
   TablePageButtons: () => TablePageButtons,
   createTablePage: () => createTablePage,
+  loadTable: () => loadTable,
   tableItemloader: () => tableItemloader,
-  tableLoader: () => tableLoader
+  tableLoader: () => tableLoader,
+  useTable: () => useTable
 });
 module.exports = __toCommonJS(table_exports);
 
@@ -37,7 +40,7 @@ var BaseTableRepository = class {
   pk;
   constructor(db, schema, pk = "id") {
     this.db = db;
-    this.schema = schema;
+    this.schema = db._.fullSchema[schema];
     this.pk = pk;
   }
   async find(id) {
@@ -76,6 +79,10 @@ var BaseTableRepository = class {
   async delete(pk) {
     await this.db.delete(this.schema).where((0, import_drizzle_orm.eq)(this.schema[this.pk], pk));
   }
+  async select(key) {
+    const rows = await this.db.select({ value: this.schema[key] }).from(this.schema).groupBy(this.schema[key]);
+    return rows.map((row) => row.value);
+  }
 };
 
 // src/table/buttons.tsx
@@ -167,51 +174,88 @@ var tableItemloader = ({
   };
 };
 
-// src/table/loader.tsx
+// src/table/load_table.tsx
 var import_drizzle_orm2 = 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_orm2.eq)(
+        repository.schema[key],
+        decodeURIComponent(param)
+      );
+    }
+    return void 0;
+  }).filter(Boolean);
+  const whereClauses = (0, import_drizzle_orm2.and)(
+    searchKey && query ? (0, import_drizzle_orm2.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,
-  tableOptions
+  options
 }) {
   return async ({ request }) => {
-    const searchParams = new URL(request.url).searchParams;
-    const { where, searchKey, defaultOrderBy, defaultDirection } = tableOptions;
-    const query = searchParams.get("query") ?? void 0;
-    const limit = Number(searchParams.get("limit") ?? "10");
-    const offset = Number(searchParams.get("offset") ?? "0");
-    const orderBy = searchParams.get("orderBy") ?? defaultOrderBy;
-    const direction = searchParams.get("direction") ?? defaultDirection;
-    const whereClauses = (0, import_drizzle_orm2.and)(
-      searchKey && query ? (0, import_drizzle_orm2.ilike)(
-        repository.schema[searchKey],
-        `%${query}%`
-      ) : void 0,
-      ...where ?? []
-    );
-    const total = await repository.countTotal({ where: whereClauses });
-    const items = await repository.findAll({
-      orderBy,
-      direction,
-      limit,
-      offset,
-      where: whereClauses
+    const table = await loadTable({
+      request,
+      repository,
+      options
     });
     return {
-      table: {
-        items,
-        total,
-        limit,
-        offset,
-        orderBy,
-        direction,
-        searchKey
-      }
+      table
     };
   };
 }
 
 // src/table/page.tsx
-var import_react_router3 = require("react-router");
+var import_react_router5 = require("react-router");
+
+// src/table/table_form.tsx
+var import_react_router4 = require("react-router");
 var import_go2 = require("react-icons/go");
 
 // src/table/table.tsx
@@ -228,7 +272,8 @@ function Table({
   limit,
   offset,
   orderBy,
-  direction
+  direction,
+  filters
 }) {
   const keys = Object.entries(columns).filter((entry) => entry[1]).map(([key]) => key);
   const sortedArray = [...data];
@@ -236,7 +281,10 @@ function Table({
   return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(
     "table",
     {
-      className: (0, import_utils2.cn)(className, "text-[15px] border-separate border-spacing-0"),
+      className: (0, import_utils2.cn)(
+        className,
+        "text-[15px] border-separate border-spacing-0"
+      ),
       children: [
         /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("thead", { children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("tr", { children: keys.map((key) => {
           const value = columns[key];
@@ -253,8 +301,8 @@ function Table({
                 "button",
                 {
                   className: (0, import_utils2.cn)(
-                    orderBy === key ? "text-neutral-900 font-medium" : "text-neutral-500",
-                    "px-4 h-14 flex items-center w-full"
+                    orderBy === key ? "text-gray-900 font-medium" : "text-gray-500 font-medium",
+                    "px-4 flex items-center w-full"
                   ),
                   onClick: () => {
                     let newDirection = "asc";
@@ -275,14 +323,59 @@ function Table({
             }
             return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(import_jsx_runtime2.Fragment, { children: reactNode });
           }
-          return /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("th", { className: (0, import_utils2.cn)("border-y font-normal"), children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Head, {}) }, key);
+          const filter = filters[key];
+          return /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(
+            "th",
+            {
+              className: (0, import_utils2.cn)(
+                "py-4 border-y font-normal align-top"
+              ),
+              children: [
+                /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(Head, {}),
+                filter && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("div", { className: "px-3 mt-4", children: /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)(
+                  "select",
+                  {
+                    className: "w-full h-10 px-1.5 border rounded-full outline-none",
+                    onChange: (e) => {
+                      const value2 = e.target.value;
+                      setSearchParams((prev) => {
+                        if (value2) {
+                          prev.set(
+                            key,
+                            encodeURIComponent(
+                              value2
+                            )
+                          );
+                        } else {
+                          prev.delete(key);
+                        }
+                        return prev;
+                      });
+                    },
+                    children: [
+                      /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("option", { value: "", children: "\uC804\uCCB4" }),
+                      filter.map((option) => /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
+                        "option",
+                        {
+                          value: option,
+                          children: option
+                        },
+                        option
+                      ))
+                    ]
+                  }
+                ) })
+              ]
+            },
+            key
+          );
         }) }) }),
         /* @__PURE__ */ (0, import_jsx_runtime2.jsxs)("tbody", { children: [
           sortedArray.length === 0 && /* @__PURE__ */ (0, import_jsx_runtime2.jsx)("tr", { children: /* @__PURE__ */ (0, import_jsx_runtime2.jsx)(
             "td",
             {
               colSpan: keys.length,
-              className: "px-4 h-14 text-neutral-400 text-center",
+              className: "px-4 h-20 text-gray-400 text-center",
               children: "\uB370\uC774\uD130\uAC00 \uC5C6\uC2B5\uB2C8\uB2E4."
             }
           ) }),
@@ -317,8 +410,97 @@ function Table({
   );
 }
 
-// src/table/page.tsx
+// src/table/use_table.tsx
+var import_react_router3 = require("react-router");
+function useTable() {
+  const { table } = (0, import_react_router3.useLoaderData)();
+  return table;
+}
+
+// src/table/table_form.tsx
 var import_jsx_runtime3 = require("react/jsx-runtime");
+function TableForm({
+  columns,
+  primaryKey = "id"
+}) {
+  const { pathname } = (0, import_react_router4.useLocation)();
+  const {
+    items,
+    total,
+    limit,
+    offset,
+    orderBy,
+    direction,
+    searchKey,
+    filters
+  } = useTable();
+  const navigate = (0, import_react_router4.useNavigate)();
+  const search = (query) => {
+    const searchParams2 = new URLSearchParams(window.location.search);
+    searchParams2.set("query", query);
+    searchParams2.set("offset", "0");
+    navigate(`${pathname}?${searchParams2.toString()}`);
+  };
+  const [searchParams] = (0, import_react_router4.useSearchParams)();
+  return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_jsx_runtime3.Fragment, { children: [
+    searchKey && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(
+      "form",
+      {
+        className: "h-20 px-4 flex items-center border-t",
+        onSubmit: (e) => {
+          e.preventDefault();
+          const formData = new FormData(e.currentTarget);
+          const query = formData.get("query");
+          search(query);
+        },
+        children: [
+          /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
+            "button",
+            {
+              type: "submit",
+              className: "w-10 h-10 flex justify-center items-center",
+              children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_go2.GoSearch, { className: "text-xl mr-4" })
+            }
+          ),
+          /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
+            "input",
+            {
+              className: "outline-none h-full flex-1",
+              placeholder: "\uC5EC\uAE30\uC5D0 \uAC80\uC0C9\uD558\uC138\uC694...",
+              name: "query",
+              defaultValue: searchParams.get("query") ?? ""
+            }
+          )
+        ]
+      }
+    ),
+    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
+      Table,
+      {
+        data: items,
+        columns,
+        getLink: primaryKey ? (item) => `${pathname}/${item[primaryKey]}` : void 0,
+        limit,
+        offset,
+        orderBy,
+        direction,
+        filters
+      }
+    ),
+    /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
+      TablePageButtons,
+      {
+        total,
+        limit,
+        offset,
+        MAX_PAGES_TO_SHOW: 10
+      }
+    )
+  ] });
+}
+
+// src/table/page.tsx
+var import_jsx_runtime4 = require("react/jsx-runtime");
 function createTablePage({
   name,
   columns,
@@ -327,82 +509,19 @@ function createTablePage({
   return function TablePage({
     header: Header
   }) {
-    const { pathname } = (0, import_react_router3.useLocation)();
-    const { table } = (0, import_react_router3.useLoaderData)();
-    const { items, total, limit, offset, orderBy, direction, searchKey } = table;
-    const navigate = (0, import_react_router3.useNavigate)();
-    const search = (query) => {
-      const searchParams2 = new URLSearchParams(window.location.search);
-      searchParams2.set("query", query);
-      searchParams2.set("offset", "0");
-      navigate(`${pathname}?${searchParams2.toString()}`);
-    };
-    const [searchParams] = (0, import_react_router3.useSearchParams)();
-    return /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_jsx_runtime3.Fragment, { children: [
-      /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
+    const { pathname } = (0, import_react_router5.useLocation)();
+    return /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_jsx_runtime4.Fragment, { children: [
+      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(
         Header,
         {
           title: name,
-          actions: /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(import_react_router3.Link, { to: `${pathname}/new`, className: "button-primary", children: [
+          actions: /* @__PURE__ */ (0, import_jsx_runtime4.jsxs)(import_react_router5.Link, { to: `${pathname}/new`, className: "button-primary", children: [
             name,
             " \uCD94\uAC00"
           ] })
         }
       ),
-      /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)("div", { className: "max-w-7xl mx-auto w-full overflow-auto", children: [
-        searchKey && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(
-          "form",
-          {
-            className: "h-18 px-4 flex items-center border-t",
-            onSubmit: (e) => {
-              e.preventDefault();
-              const formData = new FormData(e.currentTarget);
-              const query = formData.get("query");
-              search(query);
-            },
-            children: [
-              /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
-                "button",
-                {
-                  type: "submit",
-                  className: "w-10 h-10 flex justify-center items-center",
-                  children: /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(import_go2.GoSearch, { className: "text-xl mr-4" })
-                }
-              ),
-              /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
-                "input",
-                {
-                  className: "outline-none h-full flex-1",
-                  placeholder: "\uC5EC\uAE30\uC5D0 \uAC80\uC0C9\uD558\uC138\uC694...",
-                  name: "query",
-                  defaultValue: searchParams.get("query") ?? ""
-                }
-              )
-            ]
-          }
-        ),
-        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
-          Table,
-          {
-            data: items,
-            columns,
-            getLink: primaryKey ? (item) => `${pathname}/${item[primaryKey]}` : void 0,
-            limit,
-            offset,
-            orderBy,
-            direction
-          }
-        ),
-        /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(
-          TablePageButtons,
-          {
-            total,
-            limit,
-            offset,
-            MAX_PAGES_TO_SHOW: 10
-          }
-        )
-      ] })
+      /* @__PURE__ */ (0, import_jsx_runtime4.jsx)("div", { className: "max-w-7xl mx-auto w-full overflow-auto", children: /* @__PURE__ */ (0, import_jsx_runtime4.jsx)(TableForm, { columns, primaryKey }) })
     ] });
   };
 }
@@ -410,8 +529,11 @@ function createTablePage({
 0 && (module.exports = {
   BaseTableRepository,
   Table,
+  TableForm,
   TablePageButtons,
   createTablePage,
+  loadTable,
   tableItemloader,
-  tableLoader
+  tableLoader,
+  useTable
 });