react-hook-core 0.1.16 → 0.1.17

package/lib/com.js

@@ -6,7 +6,7 @@ function PageSizeSelect(p) {
   var g = p.sizes;
   var s = (!g || g.length === 0 ? core_1.pageSizes : g);
   var opts = s.map(function (pgSize) { return React.createElement('option', { key: pgSize, value: pgSize }, pgSize); });
-  return React.createElement('select', { id: p.id, name: p.name, defaultValue: p.size, onChange: p.onChange }, opts);
+  return React.createElement('select', { id: p.id, name: p.name, value: p.size, defaultValue: p.size, onChange: p.onChange }, opts);
 }
 exports.PageSizeSelect = PageSizeSelect;
 function Search(p) {

package/lib/merge.js

@@ -4,16 +4,11 @@ var react_1 = require("react");
 function useMergeState(initialState) {
   var _a = react_1.useState(initialState ? initialState : {}), state = _a[0], _setState = _a[1];
   var callbackRef = react_1.useRef();
-  var isFirstCallbackCall = react_1.useRef(true);
   var setState = react_1.useCallback(function (newState, callback) {
     callbackRef.current = callback;
     _setState(function (prevState) { return Object.assign({}, prevState, newState); });
-  }, []);
+  }, [state]);
   react_1.useEffect(function () {
-    if (isFirstCallbackCall.current) {
-      isFirstCallbackCall.current = false;
-      return;
-    }
     if (callbackRef.current) {
       callbackRef.current(state);
     }

package/lib/route.js

@@ -1,18 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 var qs = require("query-string");
-function buildFromUrl() {
-  return buildParameters(window.location.search);
+function buildFromUrl(modelT) {
+  return buildParameters(window.location.search, modelT);
 }
 exports.buildFromUrl = buildFromUrl;
-function buildParameters(url) {
+function buildParameters(url, model) {
   var urlSearch = url;
-  var i = urlSearch.indexOf('?');
+  var i = urlSearch.indexOf("?");
   if (i >= 0) {
     urlSearch = url.substring(i + 1);
   }
   try {
-    var parsed = convertToObject(qs.parse(urlSearch));
+    var parsed = convertToObject(qs.parse(urlSearch), model);
     return parsed;
   }
   catch (error) {
@@ -21,17 +21,20 @@ function buildParameters(url) {
   }
 }
 exports.buildParameters = buildParameters;
-function convertToObject(input) {
+function convertToObject(input, model) {
+  if (model) {
+    return parseToModel(input, model);
+  }
   var output = {};
   for (var key in input) {
     var value = input[key];
-    var keys = key.split('.');
+    var keys = key.split(".");
     var currentObj = output;
     for (var i = 0; i < keys.length; i++) {
       var currentKey = keys[i];
       if (!currentObj[currentKey]) {
         if (i === keys.length - 1) {
-          currentObj[currentKey] = value;
+          currentObj[currentKey] = parseValue(value);
         }
         else {
           currentObj[currentKey] = {};
@@ -43,3 +46,43 @@ function convertToObject(input) {
   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);
+        }
+      }
+    }
+  }
+  return dest;
+}
+function parseValue(value) {
+  if (!isNaN(value) && !isNaN(parseFloat(value))) {
+    return parseFloat(value);
+  }
+  return value;
+}

package/lib/search.js

@@ -143,6 +143,7 @@ function changePage(com, pageIndex, pageSize) {
 }
 exports.changePage = changePage;
 function optimizeFilter(obj, searchable, fields) {
+  var sLimit = searchable.limit;
   obj.fields = fields;
   if (searchable.pageIndex && searchable.pageIndex > 1) {
     obj.page = searchable.pageIndex;
@@ -150,7 +151,12 @@ function optimizeFilter(obj, searchable, fields) {
   else {
     delete obj.page;
   }
-  obj.limit = searchable.pageSize;
+  if (sLimit) {
+    obj.limit = searchable.limit;
+  }
+  else {
+    obj.limit = searchable.pageSize;
+  }
   if (searchable.appendMode && searchable.initPageSize !== searchable.pageSize) {
     obj.firstLimit = searchable.initPageSize;
   }
@@ -169,24 +175,22 @@ function optimizeFilter(obj, searchable, fields) {
   return obj;
 }
 exports.optimizeFilter = optimizeFilter;
-function mapObjects(objA, objB) {
+function mapObjects(dest, src) {
   var _a;
-  for (var key in objA) {
-    if (objB.hasOwnProperty(key) && objB[key] !== null && objB[key] !== undefined) {
-      if (Array.isArray(objA[key])) {
-        objA[key] = [];
-        if (!(Array.isArray(objB[key]) && objB[key].length === 0) && typeof objB[key] === 'string') {
-          var arrayObjKeyB = objB[key].length > 0 ? (_a = (objB[key])) === null || _a === void 0 ? void 0 : _a.split(',') : [];
-          if (arrayObjKeyB && arrayObjKeyB.length > 1) {
-            objA[key] = __spreadArrays(arrayObjKeyB);
-          }
-          else {
-            objA[key].push(objB[key]);
-          }
+  for (var key in dest) {
+    if (src.hasOwnProperty(key) && src[key] !== null && src[key] !== undefined) {
+      if (Array.isArray(dest[key]) && typeof src[key] === 'string' && src[key].length > 0) {
+        var arrayObjKeySrc = src[key].length > 0 ? (_a = (src[key])) === null || _a === void 0 ? void 0 : _a.split(',') : [];
+        if (arrayObjKeySrc && arrayObjKeySrc.length > 1) {
+          dest[key] = __spreadArrays(arrayObjKeySrc);
+        }
+        else {
+          dest[key] = [];
+          dest[key].push(src[key]);
         }
       }
       else {
-        objA[key] = objB[key];
+        dest[key] = src[key];
       }
     }
   }
@@ -562,6 +566,7 @@ exports.toggleSortStyle = toggleSortStyle;
 function getModel(state, modelName, searchable, fields, excluding) {
   var obj2 = getModelFromState(state, modelName);
   var obj = obj2 ? obj2 : {};
+  console.log("getModel optimizeFilter", searchable);
   var obj3 = optimizeFilter(obj, searchable, fields);
   obj3.excluding = excluding;
   return obj3;

package/lib/state.js

@@ -91,6 +91,7 @@ function buildState(e, state, ctrl, modelName, tloc) {
       var dataField = ctrl.getAttribute('data-field');
       var field = (dataField ? dataField : ctrl.name);
       var model = Object.assign({}, ex);
+      var dType = 'array';
       if (type && type.toLowerCase() === 'checkbox') {
         var value = model[field];
         if (ctrl.id && ctrl.name !== ctrl.id) {
@@ -123,7 +124,7 @@ function buildState(e, state, ctrl, modelName, tloc) {
         var objSet = {};
         try {
           var selectedDate = new Date(ctrl.value);
-          reflect_1.setValue(model, field, ctrl.value && ctrl.value !== '' ? selectedDate.toISOString() : '');
+          reflect_1.setValue(model, field, ctrl.value && ctrl.value !== '' ? selectedDate.toISOString() : null);
           objSet[modelName] = model;
           return objSet;
         }

package/lib/update.js

@@ -1,14 +1,30 @@
 "use strict";
+var __assign = (this && this.__assign) || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+      for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+        t[p] = s[p];
+    }
+    return t;
+  };
+  return __assign.apply(this, arguments);
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 var core_1 = require("./core");
 var merge_1 = require("./merge");
 var state_1 = require("./state");
-var m = 'model';
+var react_1 = require("react");
+var m = "model";
 var _getModelName = function (f2) {
   return core_1.getModelName(f2, m);
 };
 exports.useUpdate = function (initialState, getName, getLocale, removeErr) {
   var _a = merge_1.useMergeState(initialState), state = _a[0], setState = _a[1];
+  var _b = react_1.useState(false), rerender = _b[0], setRerender = _b[1];
+  react_1.useEffect(function () {
+    setRerender(!rerender);
+  }, [state]);
   var updatePhoneState = function (event) {
     var re = /^[0-9\b]+$/;
     var target = event.currentTarget;
@@ -17,8 +33,8 @@ exports.useUpdate = function (initialState, getName, getLocale, removeErr) {
       updateState(event);
     }
     else {
-      var splitArr = value.split('');
-      var responseStr_1 = '';
+      var splitArr = value.split("");
+      var responseStr_1 = "";
       splitArr.forEach(function (element) {
         if (re.test(element)) {
           responseStr_1 += element;
@@ -28,12 +44,12 @@ exports.useUpdate = function (initialState, getName, getLocale, removeErr) {
       updateState(event);
     }
   };
-  var getModelName = (typeof getName === 'function' ? getName : _getModelName);
+  var getModelName = typeof getName === "function" ? getName : _getModelName;
   var updateState = function (e, callback, lc) {
     var ctrl = e.currentTarget;
     var mn = m;
     if (getName) {
-      if (typeof getName === 'string') {
+      if (typeof getName === "string") {
         mn = getName;
       }
       else {
@@ -48,7 +64,7 @@ exports.useUpdate = function (initialState, getName, getLocale, removeErr) {
     var objSet = state_1.buildState(e, state, ctrl, mn, l);
     if (objSet) {
       if (callback) {
-        setState(objSet, callback);
+        setState(__assign({}, objSet), callback);
       }
       else {
         setState(objSet);
@@ -73,6 +89,6 @@ exports.useUpdate = function (initialState, getName, getLocale, removeErr) {
     updateFlatState: updateFlatState,
     getLocale: getLocale,
     setState: setState,
-    state: state
+    state: state,
   };
 };

package/lib/useEdit.js

@@ -138,7 +138,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
     showModel(model);
   };
   var _handleNotFound = function (form) {
-    var msg = core_1.message(p1.resource.value, 'error_not_found', 'error');
+    var msg = core_1.message(p1.resource.value, 'error_404', 'error');
     if (form) {
       formutil_1.readOnly(form);
     }

package/lib/useSearch.js

@@ -113,7 +113,7 @@ exports.useSearch = function (refForm, initialState, service, p2, p) {
     else {
       var se = (p && p.createFilter ? p.createFilter() : undefined);
       try {
-        var s = search_1.mergeFilter(route_1.buildFromUrl(), se, component.pageSizes);
+        var s = search_1.mergeFilter(route_1.buildFromUrl(se), se, component.pageSizes);
         load(s, p2.auto);
       }
       catch (error) {
@@ -138,11 +138,15 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
   var getModelName = (p && p.getModelName ? p.getModelName : _getModelName);
   var baseProps = update_1.useUpdate(initialState, getModelName, p1.getLocale, core_1.getRemoveError(p1));
   var state = baseProps.state, setState = baseProps.setState;
+  var _b = react_1.useState(false), rerender = _b[0], setRerender = _b[1];
+  react_1.useEffect(function () {
+    setRerender(!rerender);
+  }, [state]);
   var _getCurrencyCode = function () {
     return refForm && refForm.current ? refForm.current.getAttribute('currency-code') : null;
   };
   var getCurrencyCode = p && p.getCurrencyCode ? p.getCurrencyCode : _getCurrencyCode;
-  var _b = merge_1.useMergeState(p), component = _b[0], setComponent = _b[1];
+  var _c = merge_1.useMergeState(p), component = _c[0], setComponent = _c[1];
   var toggleFilter = function (event) {
     var x = !component.hideFilter;
     core_1.handleToggle(event.target, !x);
@@ -195,6 +199,9 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
   var doSearch = function (se, isFirstLoad) {
     core_1.removeFormError(p1, refForm.current);
     var s = getFilter(se);
+    if (isFirstLoad) {
+      setState(state);
+    }
     var isStillRunning = running;
     validateSearch(s, function () {
       if (isStillRunning === true) {

package/package.json

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

package/src/com.ts

@@ -1,53 +1,53 @@
-import * as React from 'react';
-import { Locale, pageSizes } from './core';
-
-export interface PageSizeProps {
-  id?: string;
-  name?: string;
-  size?: number;
-  sizes?: number[];
-  onChange?: React.ChangeEventHandler<HTMLSelectElement>;
-}
-export function PageSizeSelect(p: PageSizeProps) {
-  const g = p.sizes;
-  const s = (!g || g.length === 0 ? pageSizes : g);
-  const opts = s.map(pgSize => React.createElement('option', { key: pgSize, value: pgSize }, pgSize));
-  return React.createElement('select', { id: p.id, name: p.name, defaultValue: p.size, onChange: p.onChange }, opts);
-}
-export interface Props {
-  id?: string;
-  name?: string;
-  size?: number;
-  sizes?: number[];
-  className?: string;
-  maxLength?: number;
-  value?: string;
-  placeholder?: string;
-  pageSizeChanged?: (event: any) => void;
-  search?: React.MouseEventHandler<HTMLElement>;
-  toggle?: React.MouseEventHandler<HTMLElement>;
-  clear?: React.MouseEventHandler<HTMLButtonElement>;
-  onChange?: (e: any, callback?: (() => void) | undefined, lc?: Locale | undefined) => void;
-}
-export function Search(p: Props) {
-  return (React.createElement(React.Fragment, null,
-    React.createElement("label", { className: p.className },
-      p.pageSizeChanged && React.createElement(PageSizeSelect, { size: p.size, sizes: p.sizes, onChange: p.pageSizeChanged, name: p.name, id: p.id }),
-      React.createElement("input", { type: 'text', id: 'q', name: 'q', value: p.value || '', onChange: p.onChange, maxLength: p.maxLength, placeholder: p.placeholder }),
-      p.clear && React.createElement("button", { type: 'button', hidden: !p.value, className: 'btn-remove-text', onClick: p.clear }),
-      p.toggle && React.createElement("button", { type: 'button', className: 'btn-filter', onClick: p.toggle }),
-      p.search && React.createElement("button", { type: 'submit', className: 'btn-search', onClick: p.search }))));
-  /*
-  return (
-    <>
-      <label className={p.className}>
-        {p.pageSizeChanged && <PageSizeSelect size={p.size} sizes={p.sizes} onChange={p.pageSizeChanged} name={p.name} id={p.id} />}
-        <input type='text' id='q' name='q' value={p.value || ''} onChange={p.onChange} maxLength={p.maxLength} placeholder={p.placeholder} />
-        {p.clear && <button type='button' hidden={!p.value} className='btn-remove-text' onClick={p.clear}/>}
-        {p.toggle && <button type='button' className='btn-filter' onClick={p.toggle} />}
-        {p.search && <button type='submit' className='btn-search' onClick={p.search} />}
-      </label>
-    </>
-  );
-  */
-}
+import * as React from 'react';
+import { Locale, pageSizes } from './core';
+
+export interface PageSizeProps {
+  id?: string;
+  name?: string;
+  size?: number;
+  sizes?: number[];
+  onChange?: React.ChangeEventHandler<HTMLSelectElement>;
+}
+export function PageSizeSelect(p: PageSizeProps) {
+  const g = p.sizes;
+  const s = (!g || g.length === 0 ? pageSizes : g);
+  const opts = s.map(pgSize => React.createElement('option', { key: pgSize, value: pgSize }, pgSize));
+  return React.createElement('select', { id: p.id, name: p.name, value: p.size, defaultValue: p.size, onChange: p.onChange }, opts);
+}
+export interface Props {
+  id?: string;
+  name?: string;
+  size?: number;
+  sizes?: number[];
+  className?: string;
+  maxLength?: number;
+  value?: string;
+  placeholder?: string;
+  pageSizeChanged?: (event: any) => void;
+  search?: React.MouseEventHandler<HTMLElement>;
+  toggle?: React.MouseEventHandler<HTMLElement>;
+  clear?: React.MouseEventHandler<HTMLButtonElement>;
+  onChange?: (e: any, callback?: (() => void) | undefined, lc?: Locale | undefined) => void;
+}
+export function Search(p: Props) {
+  return (React.createElement(React.Fragment, null,
+    React.createElement("label", { className: p.className },
+      p.pageSizeChanged && React.createElement(PageSizeSelect, { size: p.size, sizes: p.sizes, onChange: p.pageSizeChanged, name: p.name, id: p.id }),
+      React.createElement("input", { type: 'text', id: 'q', name: 'q', value: p.value || '', onChange: p.onChange, maxLength: p.maxLength, placeholder: p.placeholder }),
+      p.clear && React.createElement("button", { type: 'button', hidden: !p.value, className: 'btn-remove-text', onClick: p.clear }),
+      p.toggle && React.createElement("button", { type: 'button', className: 'btn-filter', onClick: p.toggle }),
+      p.search && React.createElement("button", { type: 'submit', className: 'btn-search', onClick: p.search }))));
+  /*
+  return (
+    <>
+      <label className={p.className}>
+        {p.pageSizeChanged && <PageSizeSelect size={p.size} sizes={p.sizes} onChange={p.pageSizeChanged} name={p.name} id={p.id} />}
+        <input type='text' id='q' name='q' value={p.value || ''} onChange={p.onChange} maxLength={p.maxLength} placeholder={p.placeholder} />
+        {p.clear && <button type='button' hidden={!p.value} className='btn-remove-text' onClick={p.clear}/>}
+        {p.toggle && <button type='button' className='btn-filter' onClick={p.toggle} />}
+        {p.search && <button type='submit' className='btn-search' onClick={p.search} />}
+      </label>
+    </>
+  );
+  */
+}

package/src/merge.ts

@@ -1,28 +1,23 @@
-import {useCallback, useEffect, useRef, useState} from 'react';
-
-export type Callback<T> = (value?: T) => void;
-export type DispatchWithCallback<T> = (value: T, callback?: Callback<T>) => void;
-
-export function useMergeState<T>(initialState?: T | (() => T)): [T, DispatchWithCallback<Partial<T>>] {
-  const [state, _setState] = useState(initialState ? initialState : {} as any);
-
-  const callbackRef = useRef<Callback<T>>();
-  const isFirstCallbackCall = useRef<boolean>(true);
-
-  const setState = useCallback((newState: Partial<T>, callback?: Callback<T>): void => {
-    callbackRef.current = callback;
-    _setState((prevState: any) => Object.assign({}, prevState, newState));
-  }, []);
-
-  useEffect(() => {
-    if (isFirstCallbackCall.current) {
-      isFirstCallbackCall.current = false;
-      return;
-    }
-    if (callbackRef.current) {
-      callbackRef.current(state);
-    }
-  }, [state]);
-
-  return [state, setState];
-}
+import {useCallback, useEffect, useRef, useState} from 'react';
+
+export type Callback<T> = (value?: T) => void;
+export type DispatchWithCallback<T> = (value: T, callback?: Callback<T>) => void;
+
+export function useMergeState<T>(initialState?: T | (() => T)): [T, DispatchWithCallback<Partial<T>>] {
+  const [state, _setState] = useState(initialState ? initialState : {} as any);
+
+  const callbackRef = useRef<Callback<T>>();
+
+  const setState = useCallback((newState: Partial<T>, callback?: Callback<T>): void => {
+    callbackRef.current = callback;
+    _setState((prevState: any) => Object.assign({}, prevState, newState));
+  }, [state]);
+
+  useEffect( () => {
+    if (callbackRef.current) {
+      callbackRef.current(state);
+    }
+  }, [state]);
+
+  return [state, setState];
+}

package/src/route.ts

@@ -1,47 +1,86 @@
-import * as qs from 'query-string';
-
-export function buildFromUrl<S>(): S {
-  return buildParameters(window.location.search);
-}
-export function buildParameters<T>(url: string): T {
-
-  let urlSearch = url;
-  const i = urlSearch.indexOf('?');
-  if (i >= 0) {
-    urlSearch = url.substring(i + 1);
-  }
-  try {
-    const parsed: any = convertToObject(qs.parse(urlSearch));
-    return parsed;
-    
-  } catch (error) {
-    console.log(error);
-    throw error;
-  }
-}
-
-export function convertToObject(input: any) {
-  const output = {};
-
-  for (let key in input) {
-    const value = input[key];
-    const keys = key.split('.');
-
-    let currentObj = output as any;
-    for (let i = 0; i < keys.length; i++) {
-      const currentKey = keys[i];
-
-      if (!currentObj[currentKey]) {
-        if (i === keys.length - 1) {
-          currentObj[currentKey] = value;
-        } else {
-          currentObj[currentKey] = {};
-        }
-      }
-
-      currentObj = currentObj[currentKey];
-    }
-  }
-
-  return output;
-}
+import * as qs from "query-string";
+
+export function buildFromUrl<S>(modelT?: S): S {
+  return buildParameters<S>(window.location.search, modelT);
+}
+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>(qs.parse(urlSearch), model);
+    return parsed;
+  } catch (error) {
+    console.log(error);
+    throw error;
+  }
+}
+
+export function convertToObject<T>(input: any, model?: T): T {
+  if (model){
+   return parseToModel(input, model);
+  }
+  const output: any = {};
+
+  for (let key in input) {
+    const value = input[key];
+    const keys = key.split(".");
+
+    let currentObj: any = output;
+    for (let i = 0; i < keys.length; i++) {
+      const currentKey = keys[i];
+
+      if (!currentObj[currentKey]) {
+        if (i === keys.length - 1) {
+          currentObj[currentKey] = parseValue(value);
+        } else {
+          currentObj[currentKey] = {};
+        }
+      }
+
+      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);
+        }
+      }
+    }
+  }
+  return dest;
+}
+
+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);
+  }
+  return value;
+}