react-hook-core 0.1.4 → 0.1.5

package/src/core.ts

@@ -1,5 +1,5 @@
-import {RouteComponentProps} from 'react-router';
-import {focusFirstElement} from './formutil';
+import { Params } from 'react-router';
+import { focusFirstElement } from './formutil';
 
 export const pageSizes = [12, 24, 60, 100, 120, 180, 300, 600];
 export interface ModelMap {
@@ -35,12 +35,12 @@ export interface SearchParameter {
   auto?: boolean;
 }
 export interface EditStatusConfig {
-  duplicate_key: number|string;
-  not_found: number|string;
-  success: number|string;
-  version_error: number|string;
-  error?: number|string;
-  data_corrupt?: number|string;
+  duplicate_key: number | string;
+  not_found: number | string;
+  success: number | string;
+  version_error: number | string;
+  error?: number | string;
+  data_corrupt?: number | string;
 }
 export function createEditStatus(status?: EditStatusConfig): EditStatusConfig {
   if (status) {
@@ -57,10 +57,10 @@ export function createEditStatus(status?: EditStatusConfig): EditStatusConfig {
   return s;
 }
 export interface DiffStatusConfig {
-  not_found: number|string;
-  success: number|string;
-  version_error: number|string;
-  error?: number|string;
+  not_found: number | string;
+  success: number | string;
+  version_error: number | string;
+  error?: number | string;
 }
 export function createDiffStatus(status?: DiffStatusConfig): DiffStatusConfig {
   if (status) {
@@ -96,7 +96,7 @@ export interface SearchState<T, S extends Filter> {
 }
 export interface SearchService<T, S extends Filter> {
   keys?(): string[];
-  search(s: S, limit?: number, offset?: number|string, fields?: string[]): Promise<SearchResult<T>>;
+  search(s: S, limit?: number, offset?: number | string, fields?: string[]): Promise<SearchResult<T>>;
 }
 export interface ViewParameter {
   resource: ResourceService;
@@ -105,9 +105,9 @@ export interface ViewParameter {
   loading?: LoadingService;
 }
 export interface ViewService<T, ID> {
-  metadata?(): Attributes|undefined;
+  metadata?(): Attributes | undefined;
   keys?(): string[];
-  load(id: ID, ctx?: any): Promise<T|null>;
+  load(id: ID, ctx?: any): Promise<T | null>;
 }
 
 export interface DiffParameter {
@@ -131,8 +131,8 @@ export interface DiffModel<T, ID> {
   value: T;
 }
 export interface ApprService<ID> {
-  approve(id: ID, ctx?: any): Promise<number|string>;
-  reject(id: ID, ctx?: any): Promise<number|string>;
+  approve(id: ID, ctx?: any): Promise<number | string>;
+  reject(id: ID, ctx?: any): Promise<number | string>;
 }
 export interface DiffService<T, ID> {
   keys(): string[];
@@ -148,11 +148,11 @@ export interface DiffState<T> {
 
 // tslint:disable-next-line:class-name
 export class resource {
-  static phone = / |\-|\.|\(|\)/g;
+  static phone = / |-|\.|\(|\)/g;
   static _cache: any = {};
   static cache = true;
 }
-export function getCurrencyCode(form?: HTMLFormElement|null): string|undefined {
+export function getCurrencyCode(form?: HTMLFormElement | null): string | undefined {
   if (form) {
     const x = form.getAttribute('currency-code');
     if (x) {
@@ -182,34 +182,34 @@ export interface Message {
   yes?: string;
   no?: string;
 }
-export function getString(key: string, gv: StringMap|((key: string) => string)): string {
+export function getString(key: string, gv: StringMap | ((key: string) => string)): string {
   if (typeof gv === 'function') {
     return gv(key);
   } else {
     return gv[key];
   }
 }
-export function message(gv: StringMap|((key: string) => string), msg: string, title?: string, yes?: string, no?: string): Message {
+export function message(gv: StringMap | ((key: string) => string), msg: string, title?: string, yes?: string, no?: string): Message {
   const m2 = (msg && msg.length > 0 ? getString(msg, gv) : '');
-    const m: Message = { message: m2, title: '' };
-    if (title && title.length > 0) {
-      m.title = getString(title, gv);
-    }
-    if (yes && yes.length > 0) {
-      m.yes = getString(yes, gv);
-    }
-    if (no && no.length > 0) {
-      m.no = getString(no, gv);
-    }
-    return m;
+  const m: Message = { message: m2, title: '' };
+  if (title && title.length > 0) {
+    m.title = getString(title, gv);
+  }
+  if (yes && yes.length > 0) {
+    m.yes = getString(yes, gv);
+  }
+  if (no && no.length > 0) {
+    m.no = getString(no, gv);
+  }
+  return m;
 }
-export function messageByHttpStatus(status: number, gv: StringMap|((key: string) => string)): string {
+export function messageByHttpStatus(status: number, gv: StringMap | ((key: string) => string)): string {
   const k = 'status_' + status;
   let msg = getString(k, gv);
-    if (!msg || msg.length === 0) {
-      msg = getString('error_internal', gv);
-    }
-    return msg;
+  if (!msg || msg.length === 0) {
+    msg = getString('error_internal', gv);
+  }
+  return msg;
 }
 
 export interface Locale {
@@ -232,12 +232,12 @@ export interface LoadingService {
 export interface ErrorMessage {
   field: string;
   code: string;
-  param?: string|number|Date;
+  param?: string | number | Date;
   message?: string;
 }
 export interface UIService {
-  getValue(el: HTMLInputElement, locale?: Locale, currencyCode?: string): string|number|boolean|null|undefined;
-  decodeFromForm(form: HTMLFormElement, locale?: Locale, currencyCode?: string|null): any;
+  getValue(el: HTMLInputElement, locale?: Locale, currencyCode?: string): string | number | boolean | null | undefined;
+  decodeFromForm(form: HTMLFormElement, locale?: Locale, currencyCode?: string | null): any;
 
   validateForm(form?: HTMLFormElement, locale?: Locale, focusFirst?: boolean, scroll?: boolean): boolean;
   removeFormError(form: HTMLFormElement): void;
@@ -284,26 +284,23 @@ export function buildKeys(attributes: Attributes): string[] {
   }
   return ps;
 }
-
-export function buildId<ID>(props: RouteComponentProps, keys?: string[]): ID|null {
-  if (!props) {
-    return null;
-  }
-  const sp: any = ((props as any).match ? props : (props as any)['props']);
+type Readonly<T> = {
+  readonly [P in keyof T]: T[P];
+};
+export function buildId<ID>(p: Readonly<Params<string>>, keys?: string[]): ID | null {
   if (!keys || keys.length === 0 || keys.length === 1) {
     if (keys && keys.length === 1) {
-      const x = sp.match.params[keys[0]];
-      if (x && x !== '') {
-        return x;
+      if (p[keys[0]]) {
+        return p[keys[0]] as any;
       }
     }
-    return sp.match.params['id'];
+    return p['id'] as any;
   }
   const id: any = {};
   for (const key of keys) {
-    let v = sp.match.params[key];
+    let v = p[key];
     if (!v) {
-      v = sp[key];
+      v = p[key];
       if (!v) {
         return null;
       }
@@ -312,8 +309,6 @@ export function buildId<ID>(props: RouteComponentProps, keys?: string[]): ID|nul
   }
   return id;
 }
-
-
 export function dateToDefaultString(date: Date): string {
   return '' + date.getFullYear() + '-' + addZero(date.getMonth() + 1, 2) + '-' + addZero(date.getDate(), 2); // DateUtil.formatDate(date, 'YYYY-MM-DD');
 }
@@ -380,7 +375,7 @@ export function formatCurrency(currency: string|number, locale?: Locale, currenc
 }
 */
 
-export function initForm(form?: HTMLFormElement, initMat?: (f: HTMLFormElement) => void): HTMLFormElement|undefined {
+export function initForm(form?: HTMLFormElement, initMat?: (f: HTMLFormElement) => void): HTMLFormElement | undefined {
   if (form) {
     setTimeout(() => {
       if (initMat) {
@@ -412,7 +407,7 @@ export function error(err: any, gv: (key: string) => string, ae: (msg: string, h
 export function getName(d: string, n?: string): string {
   return (n && n.length > 0 ? n : d);
 }
-export function getModelName(form?: HTMLFormElement|null, name?: string): string {
+export function getModelName(form?: HTMLFormElement | null, name?: string): string {
   if (form) {
     const a = form.getAttribute('model-name');
     if (a && a.length > 0) {
@@ -473,7 +468,7 @@ export function hideLoading(s?: LoadingService): void {
 export interface UIParameter {
   ui?: UIService;
 }
-export function getRemoveError(u?: UIParameter, rmErr?: (el: HTMLInputElement) => void): ((el: HTMLInputElement) => void)|undefined {
+export function getRemoveError(u?: UIParameter, rmErr?: (el: HTMLInputElement) => void): ((el: HTMLInputElement) => void) | undefined {
   if (rmErr) {
     return rmErr;
   }
@@ -484,13 +479,13 @@ export function removeFormError(u?: UIParameter, f?: HTMLFormElement): void {
     u.ui.removeFormError(f);
   }
 }
-export function getValidateForm(u?: UIParameter, vf?: (form: HTMLFormElement, locale?: Locale, focusFirst?: boolean, scroll?: boolean) => boolean): ((form: HTMLFormElement, locale?: Locale, focusFirst?: boolean, scroll?: boolean) => boolean)|undefined {
+export function getValidateForm(u?: UIParameter, vf?: (form: HTMLFormElement, locale?: Locale, focusFirst?: boolean, scroll?: boolean) => boolean): ((form: HTMLFormElement, locale?: Locale, focusFirst?: boolean, scroll?: boolean) => boolean) | undefined {
   if (vf) {
     return vf;
   }
   return (u && u.ui ? u.ui.validateForm : undefined);
 }
-export function getDecodeFromForm(u?: UIParameter, d?: (form: HTMLFormElement, locale?: Locale, currencyCode?: string) => any): ((form: HTMLFormElement, locale?: Locale, currencyCode?: string) => any)|undefined {
+export function getDecodeFromForm(u?: UIParameter, d?: (form: HTMLFormElement, locale?: Locale, currencyCode?: string) => any): ((form: HTMLFormElement, locale?: Locale, currencyCode?: string) => any) | undefined {
   if (d) {
     return d;
   }

package/src/diff.ts

@@ -1,5 +1,5 @@
-import {clone} from 'reflectx';
 import {DiffModel} from './core';
+import {clone} from './reflect';
 
 export function formatDiffModel<T, ID>(obj: DiffModel<T, ID>, formatFields?: (obj3: T) => T): DiffModel<T, ID> {
   if (!obj) {

package/src/formutil.ts

@@ -74,7 +74,7 @@ export function focusFirstError(form?: HTMLFormElement|null, className?: string)
       const ctrl = form[i] as HTMLInputElement;
       const parent = ctrl.parentElement;
       if (ctrl.classList.contains(className)
-        || parent && parent.classList.contains(className)) {
+        || (parent && parent.classList.contains(className))) {
         ctrl.focus();
         ctrl.scrollIntoView();
         return;
@@ -86,7 +86,7 @@ export function focusFirstError(form?: HTMLFormElement|null, className?: string)
       const parent = ctrl.parentElement;
       if (ctrl.classList.contains('invalid')
         || ctrl.classList.contains('.ng-invalid')
-        || parent && parent.classList.contains('invalid')) {
+        || (parent && parent.classList.contains('invalid'))) {
         ctrl.focus();
         ctrl.scrollIntoView();
         return;

package/src/index.ts

@@ -1,20 +1,21 @@
 import * as React from 'react';
-import { RouteComponentProps } from 'react-router';
 export * from './formutil';
 export * from './util';
 export * from './core';
 export * from './state';
 export * from './edit';
 export * from './route';
-export * from './components';
 export * from './diff';
-export * from './router';
 export * from './merge';
 export * from './update';
-export * from './useView';
-export * from './useEdit';
 export * from './useSearch';
 export * from './useMessage';
+export * from './useEdit';
+export * from './components';
+export * from './search';
+export * from './reflect';
+
+import {pageSizes} from './core';
 
 export function checked(s: string[]|string|undefined, v: string): boolean|undefined {
   if (s) {
@@ -29,10 +30,6 @@ export function checked(s: string[]|string|undefined, v: string): boolean|undefi
 export function value<T>(obj?: T): T {
   return (obj ? obj : {} as any);
 }
-export const withDefaultProps = (Component: any) => (props: RouteComponentProps) => {
-  // return <Component props={props} history={props.history} />;
-  return React.createElement(Component, { props, history: props.history });
-};
 export interface LoadingProps {
   error?: any;
 }
@@ -58,3 +55,17 @@ export const Loading = (props: LoadingProps) => {
     );*/
   }
 };
+export interface Props {
+  id?: string;
+  name?: string;
+  size?: number;
+  sizes?: number[];
+  onChange?: React.ChangeEventHandler<HTMLSelectElement>;
+}
+export function PageSizeSelect(p: Props) {
+  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 default PageSizeSelect;

package/src/reflect.ts

@@ -0,0 +1,244 @@
+export function clone(obj: any): any {
+  if (!obj) {
+    return obj;
+  }
+  if (obj instanceof Date) {
+    return new Date(obj.getTime());
+  }
+  if (typeof obj !== 'object') {
+    return obj;
+  }
+  if (Array.isArray(obj)) {
+    const arr = [];
+    for (const sub of obj) {
+      const c = clone(sub);
+      arr.push(c);
+    }
+    return arr;
+  }
+  const x: any = {};
+  const keys = Object.keys(obj);
+  for (const k of keys) {
+    const v = obj[k];
+    if (v instanceof Date) {
+      x[k] = new Date(v.getTime());
+    } else {
+      switch (typeof v) {
+        case 'object':
+          x[k] = clone(v);
+          break;
+        default:
+          x[k] = v;
+          break;
+      }
+    }
+  }
+  return x;
+}
+
+export function getDirectValue(obj: any, key: string): any {
+  if (obj && obj.hasOwnProperty(key)) {
+    return obj[key];
+  }
+  return null;
+}
+
+export function setValue(obj: any, key: string, value: any): any {
+  let replaceKey = key.replace(/\[/g, '.[').replace(/\.\./g, '.');
+  if (replaceKey.indexOf('.') === 0) {
+    replaceKey = replaceKey.slice(1, replaceKey.length);
+  }
+  const keys = replaceKey.split('.');
+  const firstKey = keys.shift();
+  if (!firstKey) {
+    return;
+  }
+  const isArrayKey = /\[([0-9]+)\]/.test(firstKey);
+  if (keys.length > 0) {
+    const firstKeyValue = obj[firstKey] || {};
+    const returnValue = setValue(firstKeyValue, keys.join('.'), value);
+    return setKey(obj, isArrayKey, firstKey, returnValue);
+  }
+  return setKey(obj, isArrayKey, firstKey, value);
+}
+const setKey = (_object: any, _isArrayKey: boolean, _key: string, _nextValue: any) => {
+  if (_isArrayKey) {
+    if (_object.length > _key) {
+      _object[_key] = _nextValue;
+    } else {
+      _object.push(_nextValue);
+    }
+  } else {
+    _object[_key] = _nextValue;
+  }
+  return _object;
+};
+
+export function diff(obj1: any, obj2: any): string[] {
+  const fields = [];
+  const key1s = Object.keys(obj1);
+  for (const k of key1s) {
+    const v1 = obj1[k];
+    const v2 = obj2[k];
+    if (v1 == null) {
+      if (v2 != null) {
+        fields.push(k);
+      }
+    } else {
+      if (typeof v1 !== 'object') {
+        if (v1 !== v2) {
+          fields.push(k);
+        }
+      } else {
+        const e = equal(v1, v2);
+        if (!e) {
+          fields.push(k);
+        }
+      }
+    }
+  }
+  const key2s = Object.keys(obj2);
+  const ni = notIn(key1s, key2s);
+  for (const n of ni) {
+    fields.push(n);
+  }
+  return fields;
+}
+
+export function makeDiff(obj1: any, obj2: any, keys?: string[], version?: string): any {
+  const obj3: any = {};
+  const s = diff(obj1, obj2);
+  if (s.length === 0) {
+    return obj3;
+  }
+  for (const d of s) {
+    obj3[d] = obj2[d];
+  }
+  if (keys && keys.length > 0) {
+    for (const x of keys) {
+      if (x.length > 0) {
+        obj3[x] = obj1[x];
+      }
+    }
+  }
+  if (version && version.length > 0) {
+    obj3[version] = obj1[version];
+  }
+  return obj3;
+}
+
+export function notIn(s1: string[], s2: string[]): string[] {
+  const r = [];
+  for (const s of s2) {
+    if (s1.indexOf(s) < 0) {
+      r.push(s);
+    }
+  }
+  return r;
+}
+
+export function equal(obj1: any, obj2: any): boolean {
+  if (obj1 == null && obj2 == null) {
+    return true;
+  }
+  if (obj1 == null || obj2 == null) {
+    return false;
+  }
+  if ((typeof obj1) !== (typeof obj2)) {
+    return false;
+  }
+  if (typeof obj1 !== 'object') {
+    return obj1 === obj2;
+  }
+  if (obj1 instanceof Date) {
+    if (!(obj2 instanceof Date)) {
+      return false;
+    }
+    return (obj1.getTime() === obj2.getTime());
+  }
+  if ((Array.isArray(obj1) && !Array.isArray(obj2))
+      || (!Array.isArray(obj1) && Array.isArray(obj2))) {
+    return false;
+  }
+  if (!Array.isArray(obj1) && !Array.isArray(obj2)) {
+    const key1s = Object.keys(obj1);
+    const key2s = Object.keys(obj2);
+    if (key1s.length !== key2s.length) {
+      return false;
+    }
+    for (const k of key1s) {
+      const v = obj1[k];
+      if (typeof v !== 'object') {
+        if (v !== obj2[k]) {
+          return false;
+        }
+      } else {
+        const e = equal(v, obj2[k]);
+        if (e === false) {
+          return false;
+        }
+      }
+    }
+    return true;
+  }
+  return equalArrays(obj1, obj2);
+}
+
+export function equalArrays<T>(ar1: T[], ar2: T[]): boolean {
+  if (ar1 == null && ar2 == null) {
+    return true;
+  }
+  if (ar1 == null || ar2 == null) {
+    return false;
+  }
+  if (ar1.length !== ar2.length) {
+    return false;
+  }
+  for (let i = 0; i < ar1.length; i++) {
+    const e = equal(ar1[i], ar2[i]);
+    if (e === false) {
+      return false;
+    }
+  }
+  return true;
+}
+
+export function getArray<T>(list: T[]|undefined|null, name: string, v: boolean|string|number): T[] {
+  const arrs = [];
+  if (list) {
+    for (const obj of list) {
+      if ((obj as any)[name] === v) {
+        arrs.push(obj);
+      }
+    }
+  }
+  return arrs;
+}
+export function getDiffArray<T>(list: T[]|undefined|null, name: string, v: boolean|string|number): T[] {
+  const arrs = [];
+  if (list) {
+    for (const obj of list) {
+      if ((obj as any)[name] !== true) {
+        arrs.push(obj);
+      }
+    }
+  }
+  return arrs;
+}
+export function setAll<T>(list: T[]|undefined|null, name: string, v: boolean|string|number): void {
+  if (list) {
+    for (const obj of list) {
+      (obj as any)[name] = v;
+    }
+  }
+}
+export function equalAll<T>(list: T[]|undefined|null, name: string, v: boolean|string|number): boolean {
+  if (list) {
+    for (const obj of list) {
+      if ((obj as any)[name] !== v) {
+        return false;
+      }
+    }
+  }
+  return true;
+}