react-hook-core 0.4.6 → 0.4.7

package/src/diff.ts

@@ -1,52 +1,82 @@
-import {DiffModel} from './core';
-import {clone} from './reflect';
+import { LoadingService, ResourceService } from "./core"
+import { clone } from "./reflect"
+
+export interface DiffParameter {
+  resource: ResourceService
+  showMessage: (msg: string, option?: string) => void
+  showError: (m: string, header?: string, detail?: string, callback?: () => void) => void
+  loading?: LoadingService
+  // status?: DiffStatusConfig;
+}
+export interface BaseDiffState {
+  disabled: boolean
+}
+export interface DiffModel<T, ID> {
+  id?: ID
+  origin?: T
+  value: T
+}
+export interface ApprService<ID> {
+  approve(id: ID, ctx?: any): Promise<number | string>
+  reject(id: ID, ctx?: any): Promise<number | string>
+}
+export interface DiffService<T, ID> {
+  keys(): string[]
+  diff(id: ID, ctx?: any): Promise<DiffModel<T, ID>>
+}
+export interface DiffApprService<T, ID> extends DiffService<T, ID>, ApprService<ID> {}
+export interface DiffState<T> {
+  origin: T
+  value: T
+  disabled: boolean
+}
 
 export function formatDiffModel<T, ID>(obj: DiffModel<T, ID>, formatFields?: (obj3: T) => T): DiffModel<T, ID> {
   if (!obj) {
-    return obj;
+    return obj
   }
-  const obj2 = clone(obj);
+  const obj2 = clone(obj)
   if (!obj2.origin) {
-    obj2.origin = {};
+    obj2.origin = {}
   } else {
-    if (typeof obj2.origin === 'string') {
-      obj2.origin = JSON.parse(obj2.origin);
+    if (typeof obj2.origin === "string") {
+      obj2.origin = JSON.parse(obj2.origin)
     }
-    if (formatFields && typeof obj2.origin === 'object' && !Array.isArray(obj2.origin)) {
-      obj2.origin = formatFields(obj2.origin);
+    if (formatFields && typeof obj2.origin === "object" && !Array.isArray(obj2.origin)) {
+      obj2.origin = formatFields(obj2.origin)
     }
   }
   if (!obj2.value) {
-    obj2.value = {};
+    obj2.value = {}
   } else {
-    if (typeof obj2.value === 'string') {
-      obj2.value = JSON.parse(obj2.value);
+    if (typeof obj2.value === "string") {
+      obj2.value = JSON.parse(obj2.value)
     }
-    if (formatFields && typeof obj2.value === 'object' && !Array.isArray(obj2.value)) {
-      obj2.value = formatFields(obj2.value);
+    if (formatFields && typeof obj2.value === "object" && !Array.isArray(obj2.value)) {
+      obj2.value = formatFields(obj2.value)
     }
   }
-  return obj2;
+  return obj2
 }
 
-export function getDataFields(form?: HTMLElement|null): HTMLElement[] {
-  let results: HTMLElement[] = [];
+export function getDataFields(form?: HTMLElement | null): HTMLElement[] {
+  let results: HTMLElement[] = []
   if (!form) {
-    return results;
+    return results
   }
-  const attributeValue = form.getAttribute('data-field');
+  const attributeValue = form.getAttribute("data-field")
   if (attributeValue && attributeValue.length > 0) {
-    results.push(form);
+    results.push(form)
   }
-  const childNodes = form.childNodes;
+  const childNodes = form.childNodes
   if (childNodes.length > 0) {
     // tslint:disable-next-line:prefer-for-of
     for (let i = 0; i < childNodes.length; i++) {
-      const childNode = childNodes[i] as HTMLElement;
+      const childNode = childNodes[i] as HTMLElement
       if (childNode.nodeType === Node.ELEMENT_NODE) {
-        results = results.concat(getDataFields(childNode));
+        results = results.concat(getDataFields(childNode))
       }
     }
   }
-  return results;
+  return results
 }

package/src/edit.ts

@@ -1,121 +1,52 @@
-import { NavigateFunction } from 'react-router-dom';
-import {Attribute, Attributes, ErrorMessage, LoadingService, Locale, resources, ResourceService, StringMap, UIService, ViewService} from './core';
-
-export interface ResultInfo<T> {
-  status: number|string;
-  errors?: ErrorMessage[];
-  value?: T;
-  message?: string;
-}
-export interface EditParameter {
-  resource: ResourceService;
-  showMessage: (msg: string, option?: string) => void;
-  showError: (m: string, callback?: () => void, header?: string) => void;
-  confirm: (m2: string, yesCallback?: () => void, header?: string, btnLeftText?: string, btnRightText?: string, noCallback?: () => void) => void;
-  ui?: UIService;
-  getLocale?: (profile?: string) => Locale;
-  loading?: LoadingService;
-  // status?: EditStatusConfig;
-}
-export interface GenericService<T, ID, R> extends ViewService<T, ID> {
-  patch?(obj: Partial<T>, ctx?: any): Promise<R>;
-  create(obj: T, ctx?: any): Promise<R>;
-  update(obj: T, ctx?: any): Promise<R>;
-  delete?(id: ID, ctx?: any): Promise<number>;
-}
-export interface MetaModel {
-  keys?: string[];
-  version?: string;
-}
-export function build(attributes: Attributes, name?: string): MetaModel|undefined {
-  if (!attributes) {
-    return undefined;
-  }
-  if (resources.cache && name && name.length > 0) {
-    let meta: MetaModel = resources._cache[name];
-    if (!meta) {
-      meta = buildMetaModel(attributes);
-      resources._cache[name] = meta;
-    }
-    return meta;
-  } else {
-    return buildMetaModel(attributes);
-  }
-}
-
-function buildMetaModel(attributes: Attributes): MetaModel {
-  if (!attributes) {
-    return {};
-  }
-  /*
-  if (model && !model.source) {
-    model.source = model.name;
-  }
-  */
-  const md: MetaModel = {};
-  const pks: string[] = new Array<string>();
-  const keys: string[] = Object.keys(attributes);
-  for (const key of keys) {
-    const attr: Attribute = attributes[key];
-    if (attr) {
-      if (attr.version) {
-        md.version = key;
-      }
-      if (attr.key === true) {
-        pks.push(key);
-      }
-    }
-  }
-  md.keys = pks;
-  return md;
-}
+import { NavigateFunction } from "react-router-dom"
+import { Attributes, ErrorMessage, StringMap } from "./core"
 
 export function createModel<T>(attributes?: Attributes): T {
-  const obj: any = {};
+  const obj: any = {}
   if (!attributes) {
-    return obj;
+    return obj
   }
-  const attrs = Object.keys(attributes);
+  const attrs = Object.keys(attributes)
   for (const k of attrs) {
-    const attr = attributes[k];
+    const attr = attributes[k]
     if (attr.name) {
       switch (attr.type) {
-        case 'string':
-        case 'text':
-          obj[attr.name] = '';
-          break;
-        case 'integer':
-        case 'number':
-          obj[attr.name] = 0;
-          break;
-        case 'array':
-          obj[attr.name] = [];
-          break;
-        case 'boolean':
-          obj[attr.name] = false;
-          break;
-        case 'date':
-          obj[attr.name] = new Date();
-          break;
-        case 'object':
+        case "string":
+        case "text":
+          obj[attr.name] = ""
+          break
+        case "integer":
+        case "number":
+          obj[attr.name] = 0
+          break
+        case "array":
+          obj[attr.name] = []
+          break
+        case "boolean":
+          obj[attr.name] = false
+          break
+        case "date":
+          obj[attr.name] = new Date()
+          break
+        case "object":
           if (attr.typeof) {
-            const object = createModel(attr.typeof);
-            obj[attr.name] = object;
-            break;
+            const object = createModel(attr.typeof)
+            obj[attr.name] = object
+            break
           } else {
-            obj[attr.name] = {};
-            break;
+            obj[attr.name] = {}
+            break
           }
-        case 'ObjectId':
-          obj[attr.name] = null;
-          break;
+        case "ObjectId":
+          obj[attr.name] = null
+          break
         default:
-          obj[attr.name] = '';
-          break;
+          obj[attr.name] = ""
+          break
       }
     }
   }
-  return obj;
+  return obj
 }
 /*
 export function initPropertyNullInModel<T>(obj: T, m?: Attributes): T {
@@ -142,25 +73,15 @@ export function handleStatus(x: number|string, st: EditStatusConfig, gv: (k: str
   }
 }
 */
-export function handleVersion<T>(obj: T, version?: string): void {
-  if (obj && version && version.length > 0) {
-    const v = (obj as any)[version];
-    if (v && typeof v === 'number') {
-      (obj as any)[version] = v + 1;
-    } else {
-      (obj as any)[version] = 1;
-    }
-  }
-}
-export function isSuccessful<T>(x: number|T|ErrorMessage[]): boolean {
+export function isSuccessful<T>(x: number | T | ErrorMessage[]): boolean {
   if (Array.isArray(x)) {
-    return false;
-  } else if (typeof x === 'object') {
-    return true;
-  } else if (typeof x === 'number' && x > 0) {
-    return true;
+    return false
+  } else if (typeof x === "object") {
+    return true
+  } else if (typeof x === "number" && x > 0) {
+    return true
   }
-  return false;
+  return false
 }
 type Result<T> = number | T | ErrorMessage[]
 export function afterSaved<T>(

package/src/error.ts

@@ -0,0 +1,55 @@
+import { StringMap } from "./core"
+
+export interface Message {
+  message: string
+  title: string
+  yes?: string
+  no?: 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 {
+  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
+}
+export function messageByHttpStatus(status: number, gv: StringMap | ((key: string) => string)): string {
+  const k = "error_" + status
+  let msg = getString(k, gv)
+  if (!msg || msg.length === 0) {
+    msg = getString("error_500", gv)
+  }
+  return msg
+}
+export function error(err: any, gv: StringMap | ((key: string) => string), ae: (msg: string, callback?: () => void, header?: string) => void) {
+  const title = getString("error", gv)
+  let msg = getString("error_internal", gv)
+  if (!err) {
+    ae(msg, undefined, title)
+    return
+  }
+  const data = err && err.response ? err.response : err
+  if (data) {
+    const status = data.status
+    if (status && !isNaN(status)) {
+      msg = messageByHttpStatus(status, gv)
+    }
+    ae(msg, undefined, title)
+  } else {
+    ae(msg, undefined, title)
+  }
+}

package/src/formutil.ts

@@ -1,106 +1,95 @@
-export function setReadOnly(form?: HTMLFormElement|null, ...args: string[]): void {
+export function setReadOnly(form?: HTMLFormElement | null, ...args: string[]): void {
   if (!form) {
-    return;
+    return
   }
-  const len = form.length;
+  const len = form.length
   for (let i = 0; i < len; i++) {
-    const ctrl = form[i] as HTMLInputElement;
-    const name = ctrl.getAttribute('name');
-    let skip = false;
-    if (name != null && name.length > 0 && name !== 'btnBack') {
+    const ctrl = form[i] as HTMLInputElement
+    const name = ctrl.getAttribute("name")
+    let skip = false
+    if (name != null && name.length > 0 && name !== "btnBack") {
       if (arguments.length > 1) {
         for (let j = 1; j < arguments.length; j++) {
           if (arguments[j] === name) {
-            skip = true;
+            skip = true
             // continue; has bugs => why?
           }
         }
       }
       if (skip === false) {
-        let nodeName = ctrl.nodeName;
-        const type = ctrl.getAttribute('type');
-        if (nodeName === 'INPUT' && type !== null) {
-          nodeName = type.toUpperCase();
+        let nodeName = ctrl.nodeName
+        const type = ctrl.getAttribute("type")
+        if (nodeName === "INPUT" && type !== null) {
+          nodeName = type.toUpperCase()
         }
-        if (nodeName !== 'BUTTON'
-          && nodeName !== 'RESET'
-          && nodeName !== 'SUBMIT'
-          && nodeName !== 'SELECT') {
+        if (nodeName !== "BUTTON" && nodeName !== "RESET" && nodeName !== "SUBMIT" && nodeName !== "SELECT") {
           switch (type) {
-            case 'checkbox':
-              ctrl.disabled = true;
-              break;
-            case 'radio':
-              ctrl.disabled = true;
-              break;
+            case "checkbox":
+              ctrl.disabled = true
+              break
+            case "radio":
+              ctrl.disabled = true
+              break
             default:
-              ctrl.readOnly = true;
+              ctrl.readOnly = true
           }
         } else {
-          ctrl.disabled = true;
+          ctrl.disabled = true
         }
       }
     }
   }
 }
 export function focusFirstElement(form: HTMLFormElement): void {
-  let i = 0;
-  const len = form.length;
+  let i = 0
+  const len = form.length
   for (i = 0; i < len; i++) {
-    const ctrl = form[i] as HTMLInputElement;
+    const ctrl = form[i] as HTMLInputElement
     if (!(ctrl.readOnly || ctrl.disabled)) {
-      let nodeName = ctrl.nodeName;
-      const type = ctrl.getAttribute('type');
+      let nodeName = ctrl.nodeName
+      const type = ctrl.getAttribute("type")
       if (type) {
-        const t = type.toUpperCase();
-        if (t === 'BUTTON' || t === 'SUBMIT') {
-          ctrl.focus();
+        const t = type.toUpperCase()
+        if (t === "BUTTON" || t === "SUBMIT") {
+          ctrl.focus()
         }
-        if (nodeName === 'INPUT') {
-          nodeName = t;
+        if (nodeName === "INPUT") {
+          nodeName = t
         }
       }
-      if (nodeName !== 'BUTTON'
-        && nodeName !== 'RESET'
-        && nodeName !== 'SUBMIT'
-        && nodeName !== 'CHECKBOX'
-        && nodeName !== 'RADIO') {
-        ctrl.focus();
+      if (nodeName !== "BUTTON" && nodeName !== "RESET" && nodeName !== "SUBMIT" && nodeName !== "CHECKBOX" && nodeName !== "RADIO") {
+        ctrl.focus()
         try {
-          ctrl.setSelectionRange(0, ctrl.value.length);
-        } catch (err) {
-        }
-        return;
+          ctrl.setSelectionRange(0, ctrl.value.length)
+        } catch (err) {}
+        return
       }
     }
   }
 }
-export function focusFirstError(form?: HTMLFormElement|null, className?: string): void {
+export function focusFirstError(form?: HTMLFormElement | null, className?: string): void {
   if (!form) {
-    return;
+    return
   }
-  const len = form.length;
+  const len = form.length
   if (className && className.length > 0) {
     for (let i = 0; i < len; i++) {
-      const ctrl = form[i] as HTMLInputElement;
-      const parent = ctrl.parentElement;
-      if (ctrl.classList.contains(className)
-        || (parent && parent.classList.contains(className))) {
-        ctrl.focus();
-        ctrl.scrollIntoView();
-        return;
+      const ctrl = form[i] as HTMLInputElement
+      const parent = ctrl.parentElement
+      if (ctrl.classList.contains(className) || (parent && parent.classList.contains(className))) {
+        ctrl.focus()
+        ctrl.scrollIntoView()
+        return
       }
     }
   } else {
     for (let i = 0; i < len; i++) {
-      const ctrl = form[i] as HTMLInputElement;
-      const parent = ctrl.parentElement;
-      if (ctrl.classList.contains('invalid')
-        || ctrl.classList.contains('.ng-invalid')
-        || (parent && parent.classList.contains('invalid'))) {
-        ctrl.focus();
-        ctrl.scrollIntoView();
-        return;
+      const ctrl = form[i] as HTMLInputElement
+      const parent = ctrl.parentElement
+      if (ctrl.classList.contains("invalid") || ctrl.classList.contains(".ng-invalid") || (parent && parent.classList.contains("invalid"))) {
+        ctrl.focus()
+        ctrl.scrollIntoView()
+        return
       }
     }
   }