dn-react-router-toolkit 0.8.0 → 0.8.1

package/dist/post/post_form_page.mjs

@@ -6510,10 +6510,10 @@ var require_listCacheClear = __commonJS({
 var require_eq = __commonJS({
   "node_modules/lodash/eq.js"(exports, module) {
     "use strict";
-    function eq(value, other) {
+    function eq2(value, other) {
       return value === other || value !== value && other !== other;
     }
-    module.exports = eq;
+    module.exports = eq2;
   }
 });
 
@@ -6521,11 +6521,11 @@ var require_eq = __commonJS({
 var require_assocIndexOf = __commonJS({
   "node_modules/lodash/_assocIndexOf.js"(exports, module) {
     "use strict";
-    var eq = require_eq();
+    var eq2 = require_eq();
     function assocIndexOf(array, key) {
       var length = array.length;
       while (length--) {
-        if (eq(array[length][0], key)) {
+        if (eq2(array[length][0], key)) {
           return length;
         }
       }
@@ -6983,12 +6983,12 @@ var require_assignValue = __commonJS({
   "node_modules/lodash/_assignValue.js"(exports, module) {
     "use strict";
     var baseAssignValue = require_baseAssignValue();
-    var eq = require_eq();
+    var eq2 = require_eq();
     var objectProto = Object.prototype;
     var hasOwnProperty = objectProto.hasOwnProperty;
     function assignValue(object, key, value) {
       var objValue = object[key];
-      if (!(hasOwnProperty.call(object, key) && eq(objValue, value)) || value === void 0 && !(key in object)) {
+      if (!(hasOwnProperty.call(object, key) && eq2(objValue, value)) || value === void 0 && !(key in object)) {
         baseAssignValue(object, key, value);
       }
     }
@@ -7940,6 +7940,7 @@ import { Fragment as Fragment2, jsx as jsx8, jsxs as jsxs3 } from "react/jsx-run
 // src/table/load_table.tsx
 import {
   and,
+  eq,
   ilike
 } from "drizzle-orm";
 
@@ -7958,7 +7959,7 @@ import {
 import { v4 } from "uuid";
 
 // src/api/item_api_handler.ts
-import { UNAUTHORIZED as UNAUTHORIZED2 } from "dn-react-toolkit/http";
+import { FORBIDDEN, NOT_FOUND, UNAUTHORIZED as UNAUTHORIZED2 } from "dn-react-toolkit/http";
 
 // src/crud/crud_page.tsx
 import { useLoaderData as useLoaderData2, useLocation as useLocation4 } from "react-router";

package/dist/table/index.d.mts

@@ -6,7 +6,7 @@ export { createTablePage } from './page.mjs';
 export { OrderedTableProps, Table, TableColumnOptions, TableColumnProps } from './table.mjs';
 export { TableLoaderOptions, loadTable } from './load_table.mjs';
 export { LoadedModel, TableForm, TablePageOptions } from './table_form.mjs';
-export { LoadedTable, useTable } from './use_table.mjs';
+export { TableLoaderData, useTable } from './use_table.mjs';
 import 'drizzle-orm';
 import 'drizzle-orm/node-postgres';
 import 'drizzle-orm/pg-core';

package/dist/table/index.d.ts

@@ -6,7 +6,7 @@ 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 { LoadedTable, useTable } from './use_table.js';
+export { TableLoaderData, useTable } from './use_table.js';
 import 'drizzle-orm';
 import 'drizzle-orm/node-postgres';
 import 'drizzle-orm/pg-core';

package/dist/table/index.js

@@ -79,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
@@ -184,11 +188,22 @@ async function loadTable({
   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 });
@@ -199,6 +214,14 @@ async function loadTable({
     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,
@@ -206,7 +229,8 @@ async function loadTable({
     offset,
     orderBy,
     direction,
-    searchKey
+    searchKey,
+    filters
   };
 }
 
@@ -248,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];
@@ -256,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];
@@ -273,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";
@@ -295,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."
             }
           ) }),
@@ -341,16 +414,7 @@ function Table({
 var import_react_router3 = require("react-router");
 function useTable() {
   const { table } = (0, import_react_router3.useLoaderData)();
-  const { items, total, limit, offset, orderBy, direction, searchKey } = table;
-  return {
-    items,
-    total,
-    limit,
-    offset,
-    orderBy,
-    direction,
-    searchKey
-  };
+  return table;
 }
 
 // src/table/table_form.tsx
@@ -360,7 +424,16 @@ function TableForm({
   primaryKey = "id"
 }) {
   const { pathname } = (0, import_react_router4.useLocation)();
-  const { items, total, limit, offset, orderBy, direction, searchKey } = useTable();
+  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);
@@ -373,7 +446,7 @@ function TableForm({
     searchKey && /* @__PURE__ */ (0, import_jsx_runtime3.jsxs)(
       "form",
       {
-        className: "h-18 px-4 flex items-center border-t",
+        className: "h-20 px-4 flex items-center border-t",
         onSubmit: (e) => {
           e.preventDefault();
           const formData = new FormData(e.currentTarget);
@@ -410,7 +483,8 @@ function TableForm({
         limit,
         offset,
         orderBy,
-        direction
+        direction,
+        filters
       }
     ),
     /* @__PURE__ */ (0, import_jsx_runtime3.jsx)(

package/dist/table/index.mjs

@@ -50,6 +50,10 @@ var BaseTableRepository = class {
   async delete(pk) {
     await this.db.delete(this.schema).where(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
@@ -144,6 +148,7 @@ var tableItemloader = ({
 // src/table/load_table.tsx
 import {
   and,
+  eq as eq2,
   ilike
 } from "drizzle-orm";
 async function loadTable({
@@ -158,11 +163,22 @@ async function loadTable({
   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 eq2(
+        repository.schema[key],
+        decodeURIComponent(param)
+      );
+    }
+    return void 0;
+  }).filter(Boolean);
   const whereClauses = and(
     searchKey && query ? ilike(
       repository.schema[searchKey],
       `%${query}%`
     ) : void 0,
+    ...filterWhere,
     ...where ?? []
   );
   const total = await repository.countTotal({ where: whereClauses });
@@ -173,6 +189,14 @@ async function loadTable({
     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,
@@ -180,7 +204,8 @@ async function loadTable({
     offset,
     orderBy,
     direction,
-    searchKey
+    searchKey,
+    filters
   };
 }
 
@@ -222,7 +247,8 @@ function Table({
   limit,
   offset,
   orderBy,
-  direction
+  direction,
+  filters
 }) {
   const keys = Object.entries(columns).filter((entry) => entry[1]).map(([key]) => key);
   const sortedArray = [...data];
@@ -230,7 +256,10 @@ function Table({
   return /* @__PURE__ */ jsxs2(
     "table",
     {
-      className: cn2(className, "text-[15px] border-separate border-spacing-0"),
+      className: cn2(
+        className,
+        "text-[15px] border-separate border-spacing-0"
+      ),
       children: [
         /* @__PURE__ */ jsx2("thead", { children: /* @__PURE__ */ jsx2("tr", { children: keys.map((key) => {
           const value = columns[key];
@@ -247,8 +276,8 @@ function Table({
                 "button",
                 {
                   className: cn2(
-                    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";
@@ -269,14 +298,59 @@ function Table({
             }
             return /* @__PURE__ */ jsx2(Fragment2, { children: reactNode });
           }
-          return /* @__PURE__ */ jsx2("th", { className: cn2("border-y font-normal"), children: /* @__PURE__ */ jsx2(Head, {}) }, key);
+          const filter = filters[key];
+          return /* @__PURE__ */ jsxs2(
+            "th",
+            {
+              className: cn2(
+                "py-4 border-y font-normal align-top"
+              ),
+              children: [
+                /* @__PURE__ */ jsx2(Head, {}),
+                filter && /* @__PURE__ */ jsx2("div", { className: "px-3 mt-4", children: /* @__PURE__ */ jsxs2(
+                  "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__ */ jsx2("option", { value: "", children: "\uC804\uCCB4" }),
+                      filter.map((option) => /* @__PURE__ */ jsx2(
+                        "option",
+                        {
+                          value: option,
+                          children: option
+                        },
+                        option
+                      ))
+                    ]
+                  }
+                ) })
+              ]
+            },
+            key
+          );
         }) }) }),
         /* @__PURE__ */ jsxs2("tbody", { children: [
           sortedArray.length === 0 && /* @__PURE__ */ jsx2("tr", { children: /* @__PURE__ */ jsx2(
             "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."
             }
           ) }),
@@ -315,16 +389,7 @@ function Table({
 import { useLoaderData } from "react-router";
 function useTable() {
   const { table } = useLoaderData();
-  const { items, total, limit, offset, orderBy, direction, searchKey } = table;
-  return {
-    items,
-    total,
-    limit,
-    offset,
-    orderBy,
-    direction,
-    searchKey
-  };
+  return table;
 }
 
 // src/table/table_form.tsx
@@ -334,7 +399,16 @@ function TableForm({
   primaryKey = "id"
 }) {
   const { pathname } = useLocation2();
-  const { items, total, limit, offset, orderBy, direction, searchKey } = useTable();
+  const {
+    items,
+    total,
+    limit,
+    offset,
+    orderBy,
+    direction,
+    searchKey,
+    filters
+  } = useTable();
   const navigate = useNavigate();
   const search = (query) => {
     const searchParams2 = new URLSearchParams(window.location.search);
@@ -347,7 +421,7 @@ function TableForm({
     searchKey && /* @__PURE__ */ jsxs3(
       "form",
       {
-        className: "h-18 px-4 flex items-center border-t",
+        className: "h-20 px-4 flex items-center border-t",
         onSubmit: (e) => {
           e.preventDefault();
           const formData = new FormData(e.currentTarget);
@@ -384,7 +458,8 @@ function TableForm({
         limit,
         offset,
         orderBy,
-        direction
+        direction,
+        filters
       }
     ),
     /* @__PURE__ */ jsx3(

package/dist/table/load_table.d.mts

@@ -1,6 +1,6 @@
 import { SQLWrapper, InferSelectModel } from 'drizzle-orm';
-import { TableRepository, ColumnOf } from './repository.mjs';
 import { PgTableWithColumns } from 'drizzle-orm/pg-core';
+import { TableRepository, ColumnOf } from './repository.mjs';
 import 'drizzle-orm/node-postgres';
 
 type TableOptions<T extends PgTableWithColumns<any>> = {
@@ -8,6 +8,9 @@ type TableOptions<T extends PgTableWithColumns<any>> = {
     searchKey?: ColumnOf<T>;
     defaultOrderBy: keyof InferSelectModel<T>;
     defaultDirection: "asc" | "desc";
+    filters?: {
+        [key in keyof InferSelectModel<T>]?: "auto";
+    };
 };
 type TableLoaderOptions<T extends PgTableWithColumns<any>, TSelect> = {
     repository: TableRepository<T, TSelect>;
@@ -25,6 +28,9 @@ declare function loadTable<T extends PgTableWithColumns<any>, TSelect>({ request
     orderBy: keyof T["_"]["columns"] & string;
     direction: "asc" | "desc";
     searchKey: ColumnOf<T> | undefined;
+    filters: {
+        [k: string]: unknown[];
+    };
 }>;
 
 export { type TableLoaderOptions, loadTable };

package/dist/table/load_table.d.ts

@@ -1,6 +1,6 @@
 import { SQLWrapper, InferSelectModel } from 'drizzle-orm';
-import { TableRepository, ColumnOf } from './repository.js';
 import { PgTableWithColumns } from 'drizzle-orm/pg-core';
+import { TableRepository, ColumnOf } from './repository.js';
 import 'drizzle-orm/node-postgres';
 
 type TableOptions<T extends PgTableWithColumns<any>> = {
@@ -8,6 +8,9 @@ type TableOptions<T extends PgTableWithColumns<any>> = {
     searchKey?: ColumnOf<T>;
     defaultOrderBy: keyof InferSelectModel<T>;
     defaultDirection: "asc" | "desc";
+    filters?: {
+        [key in keyof InferSelectModel<T>]?: "auto";
+    };
 };
 type TableLoaderOptions<T extends PgTableWithColumns<any>, TSelect> = {
     repository: TableRepository<T, TSelect>;
@@ -25,6 +28,9 @@ declare function loadTable<T extends PgTableWithColumns<any>, TSelect>({ request
     orderBy: keyof T["_"]["columns"] & string;
     direction: "asc" | "desc";
     searchKey: ColumnOf<T> | undefined;
+    filters: {
+        [k: string]: unknown[];
+    };
 }>;
 
 export { type TableLoaderOptions, loadTable };

package/dist/table/load_table.js

@@ -36,11 +36,22 @@ async function loadTable({
   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 });
@@ -51,6 +62,14 @@ async function loadTable({
     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,
@@ -58,7 +77,8 @@ async function loadTable({
     offset,
     orderBy,
     direction,
-    searchKey
+    searchKey,
+    filters
   };
 }
 // Annotate the CommonJS export names for ESM import in node:

package/dist/table/load_table.mjs

@@ -1,6 +1,7 @@
 // src/table/load_table.tsx
 import {
   and,
+  eq,
   ilike
 } from "drizzle-orm";
 async function loadTable({
@@ -15,11 +16,22 @@ async function loadTable({
   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 eq(
+        repository.schema[key],
+        decodeURIComponent(param)
+      );
+    }
+    return void 0;
+  }).filter(Boolean);
   const whereClauses = and(
     searchKey && query ? ilike(
       repository.schema[searchKey],
       `%${query}%`
     ) : void 0,
+    ...filterWhere,
     ...where ?? []
   );
   const total = await repository.countTotal({ where: whereClauses });
@@ -30,6 +42,14 @@ async function loadTable({
     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,
@@ -37,7 +57,8 @@ async function loadTable({
     offset,
     orderBy,
     direction,
-    searchKey
+    searchKey,
+    filters
   };
 }
 export {

package/dist/table/loader.d.mts

@@ -14,6 +14,9 @@ declare function tableLoader<T extends PgTableWithColumns<any>, TSelect>({ repos
         orderBy: keyof T["_"]["columns"] & string;
         direction: "asc" | "desc";
         searchKey: ColumnOf<T> | undefined;
+        filters: {
+            [k: string]: unknown[];
+        };
     };
 }>;
 

package/dist/table/loader.d.ts

@@ -14,6 +14,9 @@ declare function tableLoader<T extends PgTableWithColumns<any>, TSelect>({ repos
         orderBy: keyof T["_"]["columns"] & string;
         direction: "asc" | "desc";
         searchKey: ColumnOf<T> | undefined;
+        filters: {
+            [k: string]: unknown[];
+        };
     };
 }>;