dn-react-router-toolkit 0.6.1 → 0.6.2

package/dist/crud/crud_form_provider.js

@@ -39,12 +39,72 @@ var import_react_router = require("react-router");
 var import_react_store_input = require("react-store-input");
 var import_react = require("react");
 var import_react2 = __toESM(require("react"));
+
+// src/crud/serialize.ts
+function serialize(value) {
+  if (value === void 0) {
+    return void 0;
+  }
+  if (value === null) {
+    return {
+      type: "null",
+      value: null
+    };
+  }
+  if (typeof value === "string") {
+    return {
+      type: "string",
+      value
+    };
+  }
+  if (typeof value === "number") {
+    return {
+      type: "number",
+      value
+    };
+  }
+  if (typeof value === "boolean") {
+    return {
+      type: "boolean",
+      value
+    };
+  }
+  if (value instanceof Date) {
+    return {
+      type: "date",
+      value: value.toISOString()
+    };
+  }
+  if (Array.isArray(value)) {
+    return {
+      type: "array",
+      value: value.map((item) => serialize(item))
+    };
+  }
+  if (typeof value === "object") {
+    return {
+      type: "object",
+      value: Object.entries(value).reduce(
+        (acc, [key, value2]) => {
+          return {
+            ...acc,
+            [key]: serialize(value2)
+          };
+        },
+        {}
+      )
+    };
+  }
+  return void 0;
+}
+
+// src/crud/crud_form_provider.tsx
 var FormContext = (0, import_react.createContext)({});
 function useFormContext() {
   return (0, import_react.useContext)(FormContext);
 }
 function CrudFormProvider({
-  primaryKey = "id",
+  primaryKey,
   name,
   prefix,
   item,
@@ -53,7 +113,13 @@ function CrudFormProvider({
 }) {
   const apiPrefix = `/api${prefix}`;
   const store = (0, import_react_store_input.useStore)({
-    ...item || {}
+    ...item || {},
+    ...Object.fromEntries(
+      Object.entries(columns).map(([key, value]) => [
+        key,
+        value.defaultValue !== void 0 ? value.defaultValue : void 0
+      ])
+    )
   });
   const navigate = (0, import_react_router.useNavigate)();
   const submit = async () => {
@@ -62,57 +128,7 @@ function CrudFormProvider({
       headers: {
         "Content-Type": "application/json"
       },
-      body: JSON.stringify(
-        Object.entries(store.state).reduce(function reducer(acc, [key, value]) {
-          const converter = (value2) => {
-            if (value2 === void 0) {
-              return void 0;
-            }
-            if (value2 === null) {
-              return {
-                type: "null",
-                value: null
-              };
-            }
-            if (typeof value2 === "string") {
-              return {
-                type: "string",
-                value: value2
-              };
-            }
-            if (typeof value2 === "number") {
-              return {
-                type: "number",
-                value: value2
-              };
-            }
-            if (typeof value2 === "boolean") {
-              return {
-                type: "boolean",
-                value: value2
-              };
-            }
-            if (value2 instanceof Date) {
-              return {
-                type: "date",
-                value: value2.toISOString()
-              };
-            }
-            if (Array.isArray(value2)) {
-              return value2.map((v) => converter(v));
-            }
-            if (typeof value2 === "object") {
-              return Object.entries(
-                value2
-              ).reduce(reducer, {});
-            }
-          };
-          return {
-            ...acc,
-            [key]: converter(value)
-          };
-        }, {})
-      )
+      body: JSON.stringify(serialize(store.state))
     });
     if (!res.ok) {
       const { message } = await res.json();

package/dist/crud/crud_form_provider.mjs

@@ -3,12 +3,72 @@ import { useNavigate } from "react-router";
 import { useStore } from "react-store-input";
 import { createContext, useContext } from "react";
 import React from "react";
+
+// src/crud/serialize.ts
+function serialize(value) {
+  if (value === void 0) {
+    return void 0;
+  }
+  if (value === null) {
+    return {
+      type: "null",
+      value: null
+    };
+  }
+  if (typeof value === "string") {
+    return {
+      type: "string",
+      value
+    };
+  }
+  if (typeof value === "number") {
+    return {
+      type: "number",
+      value
+    };
+  }
+  if (typeof value === "boolean") {
+    return {
+      type: "boolean",
+      value
+    };
+  }
+  if (value instanceof Date) {
+    return {
+      type: "date",
+      value: value.toISOString()
+    };
+  }
+  if (Array.isArray(value)) {
+    return {
+      type: "array",
+      value: value.map((item) => serialize(item))
+    };
+  }
+  if (typeof value === "object") {
+    return {
+      type: "object",
+      value: Object.entries(value).reduce(
+        (acc, [key, value2]) => {
+          return {
+            ...acc,
+            [key]: serialize(value2)
+          };
+        },
+        {}
+      )
+    };
+  }
+  return void 0;
+}
+
+// src/crud/crud_form_provider.tsx
 var FormContext = createContext({});
 function useFormContext() {
   return useContext(FormContext);
 }
 function CrudFormProvider({
-  primaryKey = "id",
+  primaryKey,
   name,
   prefix,
   item,
@@ -17,7 +77,13 @@ function CrudFormProvider({
 }) {
   const apiPrefix = `/api${prefix}`;
   const store = useStore({
-    ...item || {}
+    ...item || {},
+    ...Object.fromEntries(
+      Object.entries(columns).map(([key, value]) => [
+        key,
+        value.defaultValue !== void 0 ? value.defaultValue : void 0
+      ])
+    )
   });
   const navigate = useNavigate();
   const submit = async () => {
@@ -26,57 +92,7 @@ function CrudFormProvider({
       headers: {
         "Content-Type": "application/json"
       },
-      body: JSON.stringify(
-        Object.entries(store.state).reduce(function reducer(acc, [key, value]) {
-          const converter = (value2) => {
-            if (value2 === void 0) {
-              return void 0;
-            }
-            if (value2 === null) {
-              return {
-                type: "null",
-                value: null
-              };
-            }
-            if (typeof value2 === "string") {
-              return {
-                type: "string",
-                value: value2
-              };
-            }
-            if (typeof value2 === "number") {
-              return {
-                type: "number",
-                value: value2
-              };
-            }
-            if (typeof value2 === "boolean") {
-              return {
-                type: "boolean",
-                value: value2
-              };
-            }
-            if (value2 instanceof Date) {
-              return {
-                type: "date",
-                value: value2.toISOString()
-              };
-            }
-            if (Array.isArray(value2)) {
-              return value2.map((v) => converter(v));
-            }
-            if (typeof value2 === "object") {
-              return Object.entries(
-                value2
-              ).reduce(reducer, {});
-            }
-          };
-          return {
-            ...acc,
-            [key]: converter(value)
-          };
-        }, {})
-      )
+      body: JSON.stringify(serialize(store.state))
     });
     if (!res.ok) {
       const { message } = await res.json();

package/dist/crud/crud_loader.js

@@ -88,6 +88,45 @@ var import_http = require("dn-react-toolkit/http");
 var import_drizzle_orm2 = require("drizzle-orm");
 var import_react_router = require("react-router");
 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,
@@ -106,51 +145,10 @@ function apiHandler({
       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
-            };
-          },
-          {}
-        );
+        const params = deserialize(serilaizedParams);
         if (validators) {
           const paramsForValidation = Object.keys(validators).filter(
-            (key) => Object.prototype.hasOwnProperty.call(
-              validators,
-              key
-            )
+            (key) => Object.prototype.hasOwnProperty.call(validators, key)
           );
           for (const paramKey of paramsForValidation) {
             const value = params[paramKey];

package/dist/crud/crud_loader.mjs

@@ -74,6 +74,45 @@ import {
   redirect
 } from "react-router";
 import { v4 } 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,
@@ -92,51 +131,10 @@ function apiHandler({
       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
-            };
-          },
-          {}
-        );
+        const params = deserialize(serilaizedParams);
         if (validators) {
           const paramsForValidation = Object.keys(validators).filter(
-            (key) => Object.prototype.hasOwnProperty.call(
-              validators,
-              key
-            )
+            (key) => Object.prototype.hasOwnProperty.call(validators, key)
           );
           for (const paramKey of paramsForValidation) {
             const value = params[paramKey];

package/dist/crud/crud_page.d.mts

@@ -4,14 +4,15 @@ import React__default from 'react';
 import 'react-store-input';
 import '../table/table.mjs';
 
-type CrudPageOptions<TModel, TPrimaryKey extends keyof TModel> = {
+type CrudPageOptions<TModel> = {
     name: string;
+    primaryKey: keyof TModel;
     tablePageOptions: Omit<TablePageOptions<TModel>, "name">;
     formOptions: {
         form?: React__default.FC;
-        columns: CrudFormProps<TModel, TPrimaryKey>["columns"];
+        columns: CrudFormProps<TModel>["columns"];
     };
-    AdminHeader: React__default.FC<{
+    header: React__default.FC<{
         title: string;
         actions?: React__default.ReactNode;
         className?: string;
@@ -19,6 +20,6 @@ type CrudPageOptions<TModel, TPrimaryKey extends keyof TModel> = {
     }>;
 };
 type CrudPage = (prefix: string) => React__default.FC;
-declare function crudPage<TModel, TPrimaryKey extends keyof TModel = "id" extends keyof TModel ? "id" : never>({ name, tablePageOptions, formOptions, AdminHeader, }: CrudPageOptions<TModel, TPrimaryKey>): CrudPage;
+declare function crudPage<TModel>({ name, primaryKey, tablePageOptions, formOptions, header: header, }: CrudPageOptions<TModel>): CrudPage;
 
 export { type CrudPage, type CrudPageOptions, crudPage };

package/dist/crud/crud_page.d.ts

@@ -4,14 +4,15 @@ import React__default from 'react';
 import 'react-store-input';
 import '../table/table.js';
 
-type CrudPageOptions<TModel, TPrimaryKey extends keyof TModel> = {
+type CrudPageOptions<TModel> = {
     name: string;
+    primaryKey: keyof TModel;
     tablePageOptions: Omit<TablePageOptions<TModel>, "name">;
     formOptions: {
         form?: React__default.FC;
-        columns: CrudFormProps<TModel, TPrimaryKey>["columns"];
+        columns: CrudFormProps<TModel>["columns"];
     };
-    AdminHeader: React__default.FC<{
+    header: React__default.FC<{
         title: string;
         actions?: React__default.ReactNode;
         className?: string;
@@ -19,6 +20,6 @@ type CrudPageOptions<TModel, TPrimaryKey extends keyof TModel> = {
     }>;
 };
 type CrudPage = (prefix: string) => React__default.FC;
-declare function crudPage<TModel, TPrimaryKey extends keyof TModel = "id" extends keyof TModel ? "id" : never>({ name, tablePageOptions, formOptions, AdminHeader, }: CrudPageOptions<TModel, TPrimaryKey>): CrudPage;
+declare function crudPage<TModel>({ name, primaryKey, tablePageOptions, formOptions, header: header, }: CrudPageOptions<TModel>): CrudPage;
 
 export { type CrudPage, type CrudPageOptions, crudPage };