react-hook-core 0.5.2 → 0.5.3

package/lib/index.js

@@ -18,7 +18,7 @@ __export(require("./util"))
 function checked(s, v) {
   if (s) {
     if (Array.isArray(s)) {
-      return s.includes(v)
+      return includes(s, v)
     } else {
       return s === v
     }
@@ -26,6 +26,16 @@ function checked(s, v) {
   return false
 }
 exports.checked = checked
+function includes(s, v) {
+  var l = s.length
+  for (var i = 0; i < l; i++) {
+    if (s[i] === v) {
+      return true
+    }
+  }
+  return false
+}
+exports.includes = includes
 function value(obj) {
   return obj ? obj : {}
 }
@@ -128,8 +138,8 @@ exports.formatDate = formatDate
 function dateToString(date) {
   var d2 = typeof date !== "string" ? date : new Date(date)
   var year = d2.getFullYear()
-  var month = String(d2.getMonth() + 1).padStart(2, "0")
-  var day = String(d2.getDate()).padStart(2, "0")
+  var month = pad(d2.getMonth() + 1)
+  var day = pad(d2.getDate())
   return year + "-" + month + "-" + day
 }
 exports.dateToString = dateToString
@@ -139,14 +149,17 @@ function datetimeToString(date) {
   }
   var d2 = typeof date !== "string" ? date : new Date(date)
   var year = d2.getFullYear()
-  var month = String(d2.getMonth() + 1).padStart(2, "0")
-  var day = String(d2.getDate()).padStart(2, "0")
-  var hours = String(d2.getHours()).padStart(2, "0")
-  var minutes = String(d2.getMinutes()).padStart(2, "0")
-  var seconds = String(d2.getSeconds()).padStart(2, "0")
+  var month = pad(d2.getMonth() + 1)
+  var day = pad(d2.getDate())
+  var hours = pad(d2.getHours())
+  var minutes = pad(d2.getMinutes())
+  var seconds = pad(d2.getSeconds())
   return year + "-" + month + "-" + day + "T" + hours + ":" + minutes + ":" + seconds
 }
 exports.datetimeToString = datetimeToString
+function pad(n) {
+  return n < 10 ? "0" + n : n.toString()
+}
 exports.scrollToFocus = function (e, isUseTimeOut) {
   try {
     var element = e.target

package/lib/reflect.js

@@ -85,6 +85,9 @@ function notIn(s1, s2) {
 }
 exports.notIn = notIn
 function makeDiff(o1, o2, keys, version) {
+  if (o1 && !o2) {
+    return o1
+  }
   var obj1 = o1
   var obj2 = o2
   var obj3 = {}
@@ -111,19 +114,22 @@ function makeDiff(o1, o2, keys, version) {
 }
 exports.makeDiff = makeDiff
 function hasDiff(o1, o2, keys, version) {
+  if (o1 && !o2) {
+    return true
+  }
   var diff = makeDiff(o1, o2, keys, version)
-  return !isEmptyObject(diff)
+  return !isEmpty(diff)
 }
 exports.hasDiff = hasDiff
-function isEmptyObject(obj) {
-  for (var key in obj) {
-    if (obj.hasOwnProperty(key)) {
+function isEmpty(obj) {
+  for (var _ in obj) {
+    if (Object.prototype.hasOwnProperty.call(obj, _)) {
       return false
     }
   }
   return true
 }
-exports.isEmptyObject = isEmptyObject
+exports.isEmpty = isEmpty
 function equal(obj1, obj2) {
   if (obj1 == null && obj2 == null) {
     return true

package/lib/route.js

@@ -8,7 +8,9 @@ function onBack(e, navigate, confirm, resource, o1, o2, keys, version) {
 }
 exports.onBack = onBack
 function goBack(navigate, confirm, resource, o1, o2, keys, version) {
-  if (!reflect_1.hasDiff(o1, o2, keys, version)) {
+  if (!o2) {
+    navigate(-1)
+  } else if (!reflect_1.hasDiff(o1, o2, keys, version)) {
     navigate(-1)
   } else {
     confirm(resource.msg_confirm_back, function () {
@@ -17,85 +19,97 @@ function goBack(navigate, confirm, resource, o1, o2, keys, version) {
   }
 }
 exports.goBack = goBack
-function buildFromUrl(modelT) {
-  return buildParameters(window.location.search, modelT)
+function buildFromUrl(model) {
+  return buildParameters(window.location.search, model)
 }
 exports.buildFromUrl = buildFromUrl
 function buildParameters(url, model) {
-  var urlSearch = url
-  var i = urlSearch.indexOf("?")
-  if (i >= 0) {
-    urlSearch = url.substring(i + 1)
-  }
-  try {
-    var parsed = convertToObject(query_string_1.default.parse(urlSearch), model)
-    return parsed
-  } catch (error) {
-    console.log(error)
-    throw error
+  var query = url
+  var index = url.indexOf("?")
+  if (index >= 0) {
+    query = url.substring(index + 1)
   }
+  var parsed = query_string_1.default.parse(query, {
+    parseNumbers: true,
+    parseBooleans: true,
+  })
+  return convertToObject(parsed, model)
 }
 exports.buildParameters = buildParameters
 function convertToObject(input, model) {
   if (model) {
-    return parseToModel(input, model)
+    return mapToModel(input, model)
   }
   var output = {}
   for (var key in input) {
+    if (!Object.prototype.hasOwnProperty.call(input, key)) {
+      continue
+    }
     var value = input[key]
     var keys = key.split(".")
-    var currentObj = output
+    var current = output
     for (var i = 0; i < keys.length; i++) {
-      var currentKey = keys[i]
-      if (!currentObj[currentKey]) {
-        if (i === keys.length - 1) {
-          currentObj[currentKey] = parseValue(value)
-        } else {
-          currentObj[currentKey] = {}
+      var k = keys[i]
+      if (i === keys.length - 1) {
+        current[k] = parseValue(value)
+      } else {
+        if (!current[k]) {
+          current[k] = {}
         }
+        current = current[k]
       }
-      currentObj = currentObj[currentKey]
     }
   }
   return output
 }
 exports.convertToObject = convertToObject
-function parseToModel(dest, src) {
-  if (typeof dest !== "object" || typeof src !== "object") {
-    return dest
-  }
-  for (var key in src) {
-    if (!Object.hasOwn(dest, key)) continue
-    if (src.hasOwnProperty(key)) {
-      if (src[key] && src[key].constructor === Object) {
-        if (!dest[key] || dest[key].constructor !== Object) {
-          dest[key] = {}
-        }
-        parseToModel(dest[key], src[key])
-      } else if (src[key] instanceof Date) {
-        dest[key] = new Date(dest[key])
-      } else if (typeof src[key] === "boolean") {
-        if (dest[key].length > 0) {
-          dest[key] = new Boolean(dest[key])
-        }
-      } else if (typeof src[key] === "number") {
-        if (typeof dest[key] === "string" && dest[key].indexOf(".") !== -1) {
-          dest[key] = parseFloat(dest[key])
-        } else {
-          dest[key] = parseInt(dest[key], 10)
-        }
-      } else if (typeof src[key] === "string") {
-        if (dest[key]) {
-          dest[key] = dest[key].toString()
-        }
+function mapToModel(input, model) {
+  var result = {}
+  var key
+  for (key in model) {
+    if (!Object.prototype.hasOwnProperty.call(model, key)) {
+      continue
+    }
+    var modelValue = model[key]
+    var inputValue = input[key]
+    if (inputValue === undefined) {
+      result[key] = modelValue
+      continue
+    }
+    if (modelValue instanceof Date) {
+      result[key] = new Date(inputValue)
+    } else if (typeof modelValue === "number") {
+      result[key] = Number(inputValue)
+    } else if (typeof modelValue === "boolean") {
+      result[key] = Boolean(inputValue)
+    } else if (typeof modelValue === "string") {
+      result[key] = String(inputValue)
+    } else if (Object.prototype.toString.call(modelValue) === "[object Array]") {
+      if (Object.prototype.toString.call(inputValue) === "[object Array]") {
+        result[key] = inputValue
+      } else {
+        result[key] = [inputValue]
       }
+    } else if (typeof modelValue === "object" && modelValue !== null) {
+      result[key] = mapToModel(inputValue || {}, modelValue)
+    } else {
+      result[key] = inputValue
     }
   }
-  return dest
+  return result
 }
 function parseValue(value) {
-  if (!isNaN(value) && !isNaN(parseFloat(value))) {
-    return parseFloat(value)
+  if (typeof value !== "string") {
+    return value
+  }
+  if (!isNaN(Number(value))) {
+    return Number(value)
+  }
+  if (value === "true") {
+    return true
+  }
+  if (value === "false") {
+    return false
   }
   return value
 }

package/lib/search.js

@@ -340,6 +340,11 @@ function buildSortFilter(obj, sortable) {
   return filter
 }
 exports.buildSortFilter = buildSortFilter
+function addParametersIntoUrlWithSort(filter, state, isFirstLoad) {
+  var urlFilter = buildSortFilter(filter, state)
+  addParametersIntoUrl(urlFilter, isFirstLoad)
+}
+exports.addParametersIntoUrlWithSort = addParametersIntoUrlWithSort
 function handleToggle(target, off) {
   var on = !off
   if (target) {
@@ -358,7 +363,7 @@ function getNumber(e) {
   return parseInt(e.currentTarget.value, 10)
 }
 exports.getNumber = getNumber
-function setSortFilter(state, filter, setState, setFilter, search) {
+function setSortFilter(filter, state, setFilter, setState, search) {
   setSort(state, filter.sort)
   if (setFilter) {
     setFilter(filter)

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-hook-core",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "react",
   "main": "./lib/index.js",
   "types": "./src/index.ts",

package/src/core.ts

@@ -75,23 +75,9 @@ export type Type =
   | "datetimes"
   | "times"
 
-export type Format = "currency" | "percentage" | "email" | "url" | "phone" | "fax" | "ipv4" | "ipv6"
-
-export interface Attribute {
-  name?: string
-  type?: Type
-  format?: Format
-  key?: boolean
-  version?: boolean
-  typeof?: Attributes
-  scale?: number
-  noformat?: boolean
-}
 export interface Attribute {
   name?: string
   type?: Type
-  key?: boolean
-  version?: boolean
   typeof?: Attributes
 }
 export interface Attributes {

package/src/index.ts

@@ -40,13 +40,22 @@ export const useCallbackState: RetType = <T>(initialValue: T | (() => T)) => {
 export function checked(s: string[] | string | undefined, v: string): boolean | undefined {
   if (s) {
     if (Array.isArray(s)) {
-      return s.includes(v)
+      return includes(s, v)
     } else {
       return s === v
     }
   }
   return false
 }
+export function includes(s: string[], v: string): boolean {
+  const l = s.length
+  for (let i = 0; i < l; i++) {
+    if (s[i] === v) {
+      return true
+    }
+  }
+  return false
+}
 export function value<T>(obj?: T): T {
   return obj ? obj : ({} as any)
 }
@@ -182,8 +191,8 @@ export function formatDate(date: Date | null | undefined, format: string): strin
 export function dateToString(date: Date | string): string {
   const d2 = typeof date !== "string" ? date : new Date(date)
   const year = d2.getFullYear()
-  const month = String(d2.getMonth() + 1).padStart(2, "0")
-  const day = String(d2.getDate()).padStart(2, "0")
+  const month = pad(d2.getMonth() + 1)
+  const day = pad(d2.getDate())
   return `${year}-${month}-${day}`
 }
 export function datetimeToString(date?: Date | string): string | undefined {
@@ -192,13 +201,16 @@ export function datetimeToString(date?: Date | string): string | undefined {
   }
   const d2 = typeof date !== "string" ? date : new Date(date)
   const year = d2.getFullYear()
-  const month = String(d2.getMonth() + 1).padStart(2, "0")
-  const day = String(d2.getDate()).padStart(2, "0")
-  const hours = String(d2.getHours()).padStart(2, "0")
-  const minutes = String(d2.getMinutes()).padStart(2, "0")
-  const seconds = String(d2.getSeconds()).padStart(2, "0")
+  const month = pad(d2.getMonth() + 1)
+  const day = pad(d2.getDate())
+  const hours = pad(d2.getHours())
+  const minutes = pad(d2.getMinutes())
+  const seconds = pad(d2.getSeconds())
   return `${year}-${month}-${day}T${hours}:${minutes}:${seconds}`
 }
+function pad(n: number): string {
+  return n < 10 ? "0" + n : n.toString()
+}
 
 export const scrollToFocus = (e: any, isUseTimeOut?: boolean) => {
   try {

package/src/reflect.ts

@@ -76,7 +76,10 @@ export function notIn(s1: string[], s2: string[]): string[] {
   return r
 }
 
-export function makeDiff<T>(o1: T, o2: T, keys?: string[], version?: string): Partial<T> {
+export function makeDiff<T>(o1: T, o2?: T, keys?: string[], version?: string): Partial<T> {
+  if (o1 && !o2) {
+    return o1
+  }
   const obj1: any = o1
   const obj2: any = o2
   const obj3: any = {}
@@ -99,13 +102,16 @@ export function makeDiff<T>(o1: T, o2: T, keys?: string[], version?: string): Pa
   }
   return obj3
 }
-export function hasDiff<T>(o1: T, o2: T, keys?: string[], version?: string): boolean {
+export function hasDiff<T>(o1: T, o2?: T, keys?: string[], version?: string): boolean {
+  if (o1 && !o2) {
+    return true
+  }
   const diff = makeDiff(o1, o2, keys, version)
-  return !isEmptyObject(diff)
+  return !isEmpty(diff)
 }
-export function isEmptyObject(obj: any): boolean {
-  for (let key in obj) {
-    if (obj.hasOwnProperty(key)) {
+export function isEmpty(obj: object): boolean {
+  for (const _ in obj) {
+    if (Object.prototype.hasOwnProperty.call(obj, _)) {
       return false
     }
   }

package/src/route.ts

@@ -11,7 +11,7 @@ export function onBack<T>(
   confirm: (msg: string, yesCallback?: () => void) => void,
   resource: StringMap,
   o1: T,
-  o2: T,
+  o2?: T,
   keys?: string[],
   version?: string,
 ) {
@@ -24,102 +24,129 @@ export function goBack<T>(
   confirm: (msg: string, yesCallback?: () => void) => void,
   resource: StringMap,
   o1: T,
-  o2: T,
+  o2?: T,
   keys?: string[],
   version?: string,
 ) {
-  if (!hasDiff(o1, o2, keys, version)) {
+  if (!o2) {
+    navigate(-1)
+  } else if (!hasDiff(o1, o2, keys, version)) {
     navigate(-1)
   } else {
     confirm(resource.msg_confirm_back, () => navigate(-1))
   }
 }
 
-export function buildFromUrl<S extends Filter>(modelT?: S): S {
-  return buildParameters<S>(window.location.search, modelT)
+export function buildFromUrl<T extends Filter>(model?: T): T {
+  return buildParameters<T>(window.location.search, model)
 }
+
 export function buildParameters<T>(url: string, model?: T): T {
-  let urlSearch = url
-  const i = urlSearch.indexOf("?")
-  if (i >= 0) {
-    urlSearch = url.substring(i + 1)
-  }
-  try {
-    const parsed: any = convertToObject<T>(queryString.parse(urlSearch), model)
-    return parsed
-  } catch (error) {
-    console.log(error)
-    throw error
+  var query = url
+  var index = url.indexOf("?")
+
+  if (index >= 0) {
+    query = url.substring(index + 1)
   }
+
+  var parsed = queryString.parse(query, {
+    parseNumbers: true,
+    parseBooleans: true,
+  })
+
+  return convertToObject(parsed as any, model)
 }
 
-export function convertToObject<T>(input: any, model?: T): T {
+export function convertToObject<T>(input: { [key: string]: any }, model?: T): T {
   if (model) {
-    return parseToModel(input, model)
+    return mapToModel(input, model)
   }
-  const output: any = {}
 
-  for (let key in input) {
-    const value = input[key]
-    const keys = key.split(".")
+  var output: any = {}
+
+  for (var key in input) {
+    if (!Object.prototype.hasOwnProperty.call(input, key)) {
+      continue
+    }
 
-    let currentObj: any = output
-    for (let i = 0; i < keys.length; i++) {
-      const currentKey = keys[i]
+    var value = input[key]
+    var keys = key.split(".")
+    var current = output
 
-      if (!currentObj[currentKey]) {
-        if (i === keys.length - 1) {
-          currentObj[currentKey] = parseValue(value)
-        } else {
-          currentObj[currentKey] = {}
+    for (var i = 0; i < keys.length; i++) {
+      var k = keys[i]
+
+      if (i === keys.length - 1) {
+        current[k] = parseValue(value)
+      } else {
+        if (!current[k]) {
+          current[k] = {}
         }
+        current = current[k]
       }
-
-      currentObj = currentObj[currentKey]
     }
   }
 
   return output as T
 }
 
-function parseToModel(dest: any, src: any) {
-  if (typeof dest !== "object" || typeof src !== "object") {
-    return dest
-  }
-  for (let key in src) {
-    if (!Object.hasOwn(dest, key)) continue
-    if (src.hasOwnProperty(key)) {
-      if (src[key] && src[key].constructor === Object) {
-        if (!dest[key] || dest[key].constructor !== Object) {
-          dest[key] = {}
-        }
-        parseToModel(dest[key], src[key])
-      } else if (src[key] instanceof Date) {
-        dest[key] = new Date(dest[key])
-      } else if (typeof src[key] === "boolean") {
-        if (dest[key].length > 0) {
-          dest[key] = new Boolean(dest[key])
-        }
-      } else if (typeof src[key] === "number") {
-        if (typeof dest[key] === "string" && dest[key].indexOf(".") !== -1) {
-          dest[key] = parseFloat(dest[key])
-        } else {
-          dest[key] = parseInt(dest[key], 10)
-        }
-      } else if (typeof src[key] === "string") {
-        if (dest[key]) {
-          dest[key] = dest[key].toString()
-        }
+function mapToModel<T>(input: { [key: string]: any }, model: T): T {
+  var result: any = {}
+  var key: string
+
+  for (key in model as any) {
+    if (!Object.prototype.hasOwnProperty.call(model, key)) {
+      continue
+    }
+
+    var modelValue = (model as any)[key]
+    var inputValue = input[key]
+
+    if (inputValue === undefined) {
+      result[key] = modelValue
+      continue
+    }
+
+    if (modelValue instanceof Date) {
+      result[key] = new Date(inputValue)
+    } else if (typeof modelValue === "number") {
+      result[key] = Number(inputValue)
+    } else if (typeof modelValue === "boolean") {
+      result[key] = Boolean(inputValue)
+    } else if (typeof modelValue === "string") {
+      result[key] = String(inputValue)
+    } else if (Object.prototype.toString.call(modelValue) === "[object Array]") {
+      if (Object.prototype.toString.call(inputValue) === "[object Array]") {
+        result[key] = inputValue
+      } else {
+        result[key] = [inputValue]
       }
+    } else if (typeof modelValue === "object" && modelValue !== null) {
+      result[key] = mapToModel(inputValue || {}, modelValue)
+    } else {
+      result[key] = inputValue
     }
   }
-  return dest
+
+  return result
 }
 
 function parseValue(value: any): any {
-  // Check if the value is a string representing a number and parse it to a number
-  if (!isNaN(value) && !isNaN(parseFloat(value))) {
-    return parseFloat(value)
+  if (typeof value !== "string") {
+    return value
   }
+
+  if (!isNaN(Number(value))) {
+    return Number(value)
+  }
+
+  if (value === "true") {
+    return true
+  }
+
+  if (value === "false") {
+    return false
+  }
+
   return value
 }

package/src/search.ts

@@ -361,6 +361,10 @@ export function buildSortFilter<S extends Filter>(obj: S, sortable: Sortable): S
   delete filter.fields
   return filter
 }
+export function addParametersIntoUrlWithSort<F extends Filter>(filter: F, state: Sortable, isFirstLoad?: boolean) {
+  const urlFilter = buildSortFilter(filter, state)
+  addParametersIntoUrl(urlFilter, isFirstLoad)
+}
 export function handleToggle(target?: HTMLElement, off?: boolean): boolean {
   const on = !off
   if (target) {
@@ -379,10 +383,10 @@ export function getNumber(e: ChangeEvent<HTMLSelectElement | HTMLInputElement>):
 }
 
 export function setSortFilter<F extends Filter, T extends Sortable>(
-  state: T,
   filter: F,
-  setState?: (v: React.SetStateAction<T>) => void,
+  state: T,
   setFilter?: (v: React.SetStateAction<F>) => void,
+  setState?: (v: React.SetStateAction<T>) => void,
   search?: (first?: boolean) => void,
 ) {
   setSort(state, filter.sort)

package/src/state.ts

@@ -39,7 +39,11 @@ export function updateNumber<T>(
   }
 }
 export function formatAndUpdateState<T>(
-  e: ChangeEvent<HTMLInputElement> | ChangeEvent<HTMLSelectElement> | ChangeEvent<HTMLTextAreaElement>,
+  e:
+    | ChangeEvent<HTMLInputElement>
+    | ChangeEvent<HTMLSelectElement>
+    | ChangeEvent<HTMLTextAreaElement>
+    | ChangeEvent<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement>,
   o: T,
   setObj: (v: React.SetStateAction<T>) => void,
   formatStr?: (s?: string) => string,
@@ -48,7 +52,11 @@ export function formatAndUpdateState<T>(
   updateState(e, o, setObj, callback, formatStr)
 }
 export function updateState<T>(
-  e: ChangeEvent<HTMLInputElement> | ChangeEvent<HTMLSelectElement> | ChangeEvent<HTMLTextAreaElement>,
+  e:
+    | ChangeEvent<HTMLInputElement>
+    | ChangeEvent<HTMLSelectElement>
+    | ChangeEvent<HTMLTextAreaElement>
+    | ChangeEvent<HTMLInputElement | HTMLSelectElement | HTMLTextAreaElement>,
   o: T,
   setObj: (v: React.SetStateAction<T>) => void,
   callback?: () => void,