react-hook-core 0.4.7 → 0.4.8

package/lib/core.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true })
 var formutil_1 = require("./formutil")
 exports.pageSizes = [12, 24, 60, 100, 120, 180, 300, 600]
+exports.sizes = exports.pageSizes
 var resources = (function () {
   function resources() {}
   resources.phone = / |-|\.|\(|\)/g
@@ -16,17 +17,6 @@ var resources = (function () {
   return resources
 })()
 exports.resources = resources
-exports.size = exports.pageSizes
-function getCurrencyCode(form) {
-  if (form) {
-    var x = form.getAttribute("currency-code")
-    if (x) {
-      return x
-    }
-  }
-  return undefined
-}
-exports.getCurrencyCode = getCurrencyCode
 function removePhoneFormat(phone) {
   if (phone) {
     return phone.replace(resources.phone, "")
@@ -35,46 +25,6 @@ function removePhoneFormat(phone) {
   }
 }
 exports.removePhoneFormat = removePhoneFormat
-function buildKeys(attributes) {
-  if (!attributes) {
-    return []
-  }
-  var ks = Object.keys(attributes)
-  var ps = []
-  for (var _i = 0, ks_1 = ks; _i < ks_1.length; _i++) {
-    var k = ks_1[_i]
-    var attr = attributes[k]
-    if (attr.key === true) {
-      ps.push(k)
-    }
-  }
-  return ps
-}
-exports.buildKeys = buildKeys
-function buildId(p, keys) {
-  if (!keys || keys.length === 0 || keys.length === 1) {
-    if (keys && keys.length === 1) {
-      if (p[keys[0]]) {
-        return p[keys[0]]
-      }
-    }
-    return p["id"]
-  }
-  var id = {}
-  for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-    var key = keys_1[_i]
-    var v = p[key]
-    if (!v) {
-      v = p[key]
-      if (!v) {
-        return null
-      }
-    }
-    id[key] = v
-  }
-  return id
-}
-exports.buildId = buildId
 exports.datetimeToString = function (inputDate) {
   var date = new Date(inputDate)
   var year = date.getFullYear()
@@ -116,7 +66,7 @@ function getModelName(form, name) {
     var b = form.name
     if (b) {
       if (b.endsWith("Form")) {
-        return b.substr(0, b.length - 4)
+        return b.substring(0, b.length - 4)
       }
       return b
     }

package/lib/useEdit.js

@@ -24,6 +24,46 @@ var merge_1 = require("./merge")
 var reflect_1 = require("./reflect")
 var state_1 = require("./state")
 var update_1 = require("./update")
+function buildKeys(attributes) {
+  if (!attributes) {
+    return []
+  }
+  var ks = Object.keys(attributes)
+  var ps = []
+  for (var _i = 0, ks_1 = ks; _i < ks_1.length; _i++) {
+    var k = ks_1[_i]
+    var attr = attributes[k]
+    if (attr.key === true) {
+      ps.push(k)
+    }
+  }
+  return ps
+}
+exports.buildKeys = buildKeys
+function buildId(p, keys) {
+  if (!keys || keys.length === 0 || keys.length === 1) {
+    if (keys && keys.length === 1) {
+      if (p[keys[0]]) {
+        return p[keys[0]]
+      }
+    }
+    return p["id"]
+  }
+  var id = {}
+  for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
+    var key = keys_1[_i]
+    var v = p[key]
+    if (!v) {
+      v = p[key]
+      if (!v) {
+        return null
+      }
+    }
+    id[key] = v
+  }
+  return id
+}
+exports.buildId = buildId
 function build(attributes, name) {
   if (!attributes) {
     return undefined
@@ -47,8 +87,8 @@ function buildMetaModel(attributes) {
   var md = {}
   var pks = new Array()
   var keys = Object.keys(attributes)
-  for (var _i = 0, keys_1 = keys; _i < keys_1.length; _i++) {
-    var key = keys_1[_i]
+  for (var _i = 0, keys_2 = keys; _i < keys_2.length; _i++) {
+    var key = keys_2[_i]
     var attr = attributes[key]
     if (attr) {
       if (attr.version) {
@@ -96,7 +136,7 @@ exports.useEdit = function (refForm, initialState, service, p2, p) {
         p.version = version
       }
     }
-    var id = core_1.buildId(params, keys)
+    var id = buildId(params, keys)
     if (p && p.initialize) {
       p.initialize(id, baseProps.load, baseProps.setState, p.callback)
     } else {
@@ -133,7 +173,7 @@ exports.useEditProps = function (props, refForm, initialState, service, p2, p) {
         p.version = version
       }
     }
-    var id = core_1.buildId(params, keys)
+    var id = buildId(params, keys)
     if (p && p.initialize) {
       p.initialize(id, baseProps.load, baseProps.setState, p.callback)
     } else {
@@ -414,8 +454,8 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
       if (isPatch) {
         var keys = Object.keys(result)
         var a = origin
-        for (var _i = 0, keys_2 = keys; _i < keys_2.length; _i++) {
-          var k = keys_2[_i]
+        for (var _i = 0, keys_3 = keys; _i < keys_3.length; _i++) {
+          var k = keys_3[_i]
           a[k] = result[k]
         }
         succeed(successMsg, a, undefined, backOnSave, a)

package/package.json

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

package/src/core.ts

@@ -1,4 +1,3 @@
-import { Params } from "react-router"
 import { focusFirstElement } from "./formutil"
 
 export interface LoadingService {
@@ -6,6 +5,7 @@ export interface LoadingService {
   hideLoading(): void
 }
 export const pageSizes = [12, 24, 60, 100, 120, 180, 300, 600]
+export const sizes = pageSizes
 // tslint:disable-next-line:class-name
 export class resources {
   static phone = / |-|\.|\(|\)/g
@@ -18,17 +18,7 @@ export class resources {
   static limits = pageSizes
   static pageMaxSize = 7
 }
-export const size = pageSizes
 
-export function getCurrencyCode(form?: HTMLFormElement | null): string | undefined {
-  if (form) {
-    const x = form.getAttribute("currency-code")
-    if (x) {
-      return x
-    }
-  }
-  return undefined
-}
 export function removePhoneFormat(phone: string): string {
   if (phone) {
     return phone.replace(resources.phone, "")
@@ -42,7 +32,6 @@ export interface StringMap {
 export interface ResourceService {
   resource(): StringMap
   value(key: string, param?: any): string
-  format(f: string, ...args: any[]): string
 }
 
 export interface Locale {
@@ -98,13 +87,7 @@ export type DataType =
   | "dates"
   | "datetimes"
   | "times"
-/*
-export interface Metadata {
-  name?: string;
-  attributes: Attributes;
-  source?: string;
-}
-*/
+
 export interface Attribute {
   name?: string
   type?: DataType
@@ -116,45 +99,6 @@ export interface Attributes {
   [key: string]: Attribute
 }
 
-export function buildKeys(attributes: Attributes): string[] {
-  if (!attributes) {
-    return []
-  }
-  const ks = Object.keys(attributes)
-  const ps = []
-  for (const k of ks) {
-    const attr: Attribute = attributes[k]
-    if (attr.key === true) {
-      ps.push(k)
-    }
-  }
-  return ps
-}
-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) {
-      if (p[keys[0]]) {
-        return p[keys[0]] as any
-      }
-    }
-    return p["id"] as any
-  }
-  const id: any = {}
-  for (const key of keys) {
-    let v = p[key]
-    if (!v) {
-      v = p[key]
-      if (!v) {
-        return null
-      }
-    }
-    id[key] = v
-  }
-  return id
-}
 export const datetimeToString = (inputDate: Date) => {
   const date = new Date(inputDate)
   const year = date.getFullYear()
@@ -172,61 +116,6 @@ export const dateToString = (inputDate: Date) => {
   const day = String(inputDate.getDate()).padStart(2, "0")
   return `${year}-${month}-${day}`
 }
-/*
-export function formatFax(value: string) {
-  return formatter.formatFax(value);
-}
-
-export function formatPhone(value: string) {
-  return formatter.formatPhone(value);
-}
-export function formatNumber(num: string|number, scale?: number, locale?: Locale): string {
-  if (!scale) {
-    scale = 2;
-  }
-  if (!locale) {
-    locale = storage.getLocale();
-  }
-  let c: number;
-  if (!num) {
-    return '';
-  } else if (typeof num === 'number') {
-    c = num;
-  } else {
-    const x: any = num;
-    if (isNaN(x)) {
-      return '';
-    } else {
-      c = parseFloat(x);
-    }
-  }
-  return storage.locale().formatNumber(c, scale, locale);
-}
-
-export function formatCurrency(currency: string|number, locale?: Locale, currencyCode?: string) {
-  if (!currencyCode) {
-    currencyCode = 'USD';
-  }
-  if (!locale) {
-    locale = storage.getLocale();
-  }
-  let c: number;
-  if (!currency) {
-    return '';
-  } else if (typeof currency === 'number') {
-    c = currency;
-  } else {
-    let x: any = currency;
-    x = x.replace(locale.decimalSeparator, '.');
-    if (isNaN(x)) {
-      return '';
-    } else {
-      c = parseFloat(x);
-    }
-  }
-  return storage.locale().formatCurrency(c, currencyCode, locale);
-}
-*/
 
 export function initForm(form?: HTMLFormElement, initMat?: (f: HTMLFormElement) => void): HTMLFormElement | undefined {
   if (form) {
@@ -251,7 +140,7 @@ export function getModelName(form?: HTMLFormElement | null, name?: string): stri
     const b = form.name
     if (b) {
       if (b.endsWith("Form")) {
-        return b.substr(0, b.length - 4)
+        return b.substring(0, b.length - 4)
       }
       return b
     }

package/src/edit.ts

@@ -48,31 +48,7 @@ export function createModel<T>(attributes?: Attributes): T {
   }
   return obj
 }
-/*
-export function initPropertyNullInModel<T>(obj: T, m?: Attributes): T {
-  if (!m) {
-    const x: any = {};
-    return x;
-  }
-  const model = createModel(m);
-  for (const key of Object.keys(model as any)) {
-    if (obj && !(obj as any).hasOwnProperty(key)) {
-      (obj as any)[key] = (model as any)[key];
-    }
-  }
-  return obj;
-}
-export function handleStatus(x: number|string, st: EditStatusConfig, gv: (k: string, p?: any) => string, se: (m: string, title?: string, detail?: string, callback?: () => void) => void): void {
-  const title = gv('error');
-  if (x === st.version_error) {
-    se(gv('error_version'), title);
-  } else if (x === st.data_corrupt) {
-    se(gv('error_data_corrupt'), title);
-  } else {
-    se(gv('error_internal'), title);
-  }
-}
-*/
+
 export function isSuccessful<T>(x: number | T | ErrorMessage[]): boolean {
   if (Array.isArray(x)) {
     return false
@@ -83,6 +59,7 @@ export function isSuccessful<T>(x: number | T | ErrorMessage[]): boolean {
   }
   return false
 }
+
 type Result<T> = number | T | ErrorMessage[]
 export function afterSaved<T>(
   res: Result<T>,

package/src/search.ts

@@ -33,7 +33,6 @@ export interface Sortable {
 export interface Pagination {
   initLimit?: number
   limit: number
-  // limit: number;
   page?: number
   total?: number
   pages?: number
@@ -43,7 +42,7 @@ export interface Pagination {
   appendable?: boolean
 }
 
-interface Searchable extends Pagination, Sortable {}
+export interface Searchable extends Pagination, Sortable {}
 
 export function getOffset(limit: number, page?: number, firstLimit?: number): number {
   const p = page && page > 0 ? page : 1

package/src/useEdit.ts

@@ -1,9 +1,8 @@
 import { useEffect, useState } from "react"
-import { useNavigate, useParams } from "react-router"
+import { Params, useNavigate, useParams } from "react-router"
 import {
   Attribute,
   Attributes,
-  buildId,
   ErrorMessage,
   getModelName as getModelName2,
   hideLoading,
@@ -23,6 +22,46 @@ import { clone, makeDiff } from "./reflect"
 import { localeOf } from "./state"
 import { useUpdate } from "./update"
 
+export function buildKeys(attributes: Attributes): string[] {
+  if (!attributes) {
+    return []
+  }
+  const ks = Object.keys(attributes)
+  const ps = []
+  for (const k of ks) {
+    const attr: Attribute = attributes[k]
+    if (attr.key === true) {
+      ps.push(k)
+    }
+  }
+  return ps
+}
+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) {
+      if (p[keys[0]]) {
+        return p[keys[0]] as any
+      }
+    }
+    return p["id"] as any
+  }
+  const id: any = {}
+  for (const key of keys) {
+    let v = p[key]
+    if (!v) {
+      v = p[key]
+      if (!v) {
+        return null
+      }
+    }
+    id[key] = v
+  }
+  return id
+}
+
 export interface EditParameter {
   resource: ResourceService
   showMessage: (msg: string, option?: string) => void

package/lib/useView.js

@@ -1,133 +0,0 @@
-"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 react_1 = require("react")
-var react_router_1 = require("react-router")
-var core_1 = require("./core")
-var error_1 = require("./error")
-var formutil_1 = require("./formutil")
-var merge_1 = require("./merge")
-exports.useViewOne = function (p) {
-  return exports.useCoreView(p.refForm, p.initialState, p.service, p, p)
-}
-exports.useView = function (refForm, initialState, service, p1, p) {
-  var baseProps = exports.useCoreView(refForm, initialState, service, p1, p)
-  var _a = merge_1.useMergeState(initialState),
-    setState = _a[1]
-  var params = react_router_1.useParams()
-  react_1.useEffect(function () {
-    if (baseProps.refForm) {
-      core_1.initForm(baseProps.refForm.current)
-    }
-    var id = core_1.buildId(params, p ? p.keys : undefined)
-    if (id) {
-      if (p && p.initialize) {
-        p.initialize(id, baseProps.load, setState, p.callback)
-      } else {
-        baseProps.load(id, p ? p.callback : undefined)
-      }
-    }
-  }, [])
-  return __assign({}, baseProps)
-}
-exports.useCoreView = function (refForm, initialState, service, p1, p) {
-  var _a = merge_1.useMergeState(initialState),
-    state = _a[0],
-    setState = _a[1]
-  var _b = react_1.useState(),
-    running = _b[0],
-    setRunning = _b[1]
-  var navigate = react_router_1.useNavigate()
-  var back = function (event) {
-    if (event) {
-      event.preventDefault()
-    }
-    navigate(-1)
-  }
-  var getModelName = function (f) {
-    if (p && p.name) {
-      return p.name
-    }
-    return core_1.getModelName(f, "model")
-  }
-  var showModel = function (model) {
-    var n = getModelName(refForm.current)
-    var objSet = {}
-    objSet[n] = model
-    setState(objSet)
-  }
-  var _handleNotFound = function (form) {
-    var msg = error_1.message(p1.resource.value, "error_not_found", "error")
-    if (form) {
-      formutil_1.setReadOnly(form)
-    }
-    p1.showError(msg.message, msg.title)
-  }
-  var handleNotFound = p && p.handleNotFound ? p.handleNotFound : _handleNotFound
-  var _load = function (_id, callback) {
-    var id = _id
-    if (id != null && id !== "") {
-      setRunning(true)
-      core_1.showLoading(p1.loading)
-      var fn = typeof service === "function" ? service : service.load
-      fn(id)
-        .then(function (obj) {
-          if (!obj) {
-            handleNotFound(refForm.current)
-          } else {
-            if (callback) {
-              callback(obj, showModel)
-            } else {
-              showModel(obj)
-            }
-          }
-          setRunning(false)
-          core_1.hideLoading(p1.loading)
-        })
-        .catch(function (err) {
-          var data = err && err.response ? err.response : err
-          var r = p1.resource
-          var title = r.value("error")
-          var msg = r.value("error_internal")
-          if (data && data.status === 404) {
-            handleNotFound(refForm.current)
-          } else {
-            if (data && data.status) {
-              msg = error_1.messageByHttpStatus(data.status, r.value)
-            }
-            formutil_1.setReadOnly(refForm.current)
-            p1.showError(msg, title)
-          }
-          setRunning(false)
-          core_1.hideLoading(p1.loading)
-        })
-    }
-  }
-  var load = p && p.load ? p.load : _load
-  return {
-    state: state,
-    setState: setState,
-    refForm: refForm,
-    resource: p1.resource.resource(),
-    running: running,
-    setRunning: setRunning,
-    showModel: showModel,
-    getModelName: getModelName,
-    handleNotFound: handleNotFound,
-    load: load,
-    back: back,
-  }
-}

package/src/useView.ts

@@ -1,183 +0,0 @@
-import { useEffect, useState } from "react"
-import { useNavigate, useParams } from "react-router"
-import { Attributes, buildId, getModelName as getModelName2, hideLoading, initForm, LoadingService, Locale, ResourceService, showLoading } from "./core"
-import { message, messageByHttpStatus } from "./error"
-import { setReadOnly } from "./formutil"
-import { DispatchWithCallback, useMergeState } from "./merge"
-
-export interface ViewParameter {
-  resource: ResourceService
-  showError: (m: string, header?: string, detail?: string, callback?: () => void) => void
-  getLocale?: (profile?: string) => Locale
-  loading?: LoadingService
-}
-export interface ViewService<T, ID> {
-  metadata?(): Attributes | undefined
-  keys?(): string[]
-  load(id: ID, ctx?: any): Promise<T | null>
-}
-
-export interface BaseViewComponentParam<T, ID> {
-  name?: string
-  handleNotFound?: (form?: HTMLFormElement) => void
-  getModelName?: (f?: HTMLFormElement) => string
-  showModel?: (m: T) => void
-  load?: (i: ID, callback?: (m: T, showM: (m2: T) => void) => void) => void
-}
-export interface HookBaseViewParameter<T, ID, S> extends BaseViewComponentParam<T, ID> {
-  refForm: any
-  initialState: S
-  service: ((id: ID, ctx?: any) => Promise<T>) | ViewService<T, ID>
-  resource: ResourceService
-  showError: (m: string, header?: string, detail?: string, callback?: () => void) => void
-  getLocale?: () => Locale
-  loading?: LoadingService
-}
-export interface ViewComponentParam<T, ID, S> extends BaseViewComponentParam<T, ID> {
-  keys?: string[]
-  initialize?: (
-    id: ID,
-    ld: (i: ID, cb?: (m: T, showF: (model: T) => void) => void) => void,
-    setState2: DispatchWithCallback<Partial<S>>,
-    callback?: (m: T, showF: (model: T) => void) => void,
-  ) => void
-  callback?: (m: T, showF: (model: T) => void) => void
-}
-export interface HookPropsViewParameter<T, ID, S, P> extends HookPropsBaseViewParameter<T, ID, S, P> {
-  keys?: string[]
-  initialize?: (
-    id: ID,
-    ld: (i: ID, cb?: (m: T, showF: (model: T) => void) => void) => void,
-    setState2: DispatchWithCallback<Partial<S>>,
-    callback?: (m: T, showF: (model: T) => void) => void,
-  ) => void
-  callback?: (m: T, showF: (model: T) => void) => void
-}
-export interface HookPropsBaseViewParameter<T, ID, S, P> extends HookBaseViewParameter<T, ID, S> {
-  props: P
-}
-export const useViewOne = <T, ID, S>(p: HookBaseViewParameter<T, ID, S>) => {
-  return useCoreView(p.refForm, p.initialState, p.service, p, p)
-}
-export const useView = <T, ID, S>(
-  refForm: any,
-  initialState: S,
-  service: ((id: ID, ctx?: any) => Promise<T>) | ViewService<T, ID>,
-  p1: ViewParameter,
-  p?: ViewComponentParam<T, ID, S>,
-) => {
-  const baseProps = useCoreView(refForm, initialState, service, p1, p)
-  const [, setState] = useMergeState<S>(initialState)
-  const params = useParams()
-  useEffect(() => {
-    if (baseProps.refForm) {
-      initForm(baseProps.refForm.current)
-    }
-    const id = buildId<ID>(params, p ? p.keys : undefined)
-    if (id) {
-      if (p && p.initialize) {
-        p.initialize(id, baseProps.load, setState, p.callback)
-      } else {
-        baseProps.load(id, p ? p.callback : undefined)
-      }
-    }
-  }, [])
-  return { ...baseProps }
-}
-
-export const useCoreView = <T, ID, S>(
-  refForm: any,
-  initialState: S,
-  service: ((id: ID, ctx?: any) => Promise<T>) | ViewService<T, ID>,
-  p1: ViewParameter,
-  p?: ViewComponentParam<T, ID, S>,
-) => {
-  const [state, setState] = useMergeState<S>(initialState)
-  const [running, setRunning] = useState<boolean>()
-  const navigate = useNavigate()
-
-  const back = (event: any) => {
-    if (event) {
-      event.preventDefault()
-    }
-    navigate(-1)
-  }
-
-  const getModelName = (f?: HTMLFormElement) => {
-    if (p && p.name) {
-      return p.name
-    }
-    return getModelName2(f, "model")
-  }
-
-  const showModel = (model: T) => {
-    const n: string = getModelName(refForm.current)
-    const objSet: any = {}
-    objSet[n] = model
-    setState(objSet)
-  }
-
-  const _handleNotFound = (form?: any): void => {
-    const msg = message(p1.resource.value, "error_not_found", "error")
-    if (form) {
-      setReadOnly(form)
-    }
-    p1.showError(msg.message, msg.title)
-  }
-  const handleNotFound = p && p.handleNotFound ? p.handleNotFound : _handleNotFound
-
-  const _load = (_id: ID, callback?: (m: T, showM: (m2: T) => void) => void) => {
-    const id: any = _id
-    if (id != null && id !== "") {
-      setRunning(true)
-      showLoading(p1.loading)
-      const fn = typeof service === "function" ? service : service.load
-      fn(id)
-        .then((obj) => {
-          if (!obj) {
-            handleNotFound(refForm.current)
-          } else {
-            if (callback) {
-              callback(obj, showModel)
-            } else {
-              showModel(obj)
-            }
-          }
-          setRunning(false)
-          hideLoading(p1.loading)
-        })
-        .catch((err) => {
-          const data = err && err.response ? err.response : err
-          const r = p1.resource
-          const title = r.value("error")
-          let msg = r.value("error_internal")
-          if (data && data.status === 404) {
-            handleNotFound(refForm.current)
-          } else {
-            if (data && data.status) {
-              msg = messageByHttpStatus(data.status, r.value)
-            }
-            setReadOnly(refForm.current)
-            p1.showError(msg, title)
-          }
-          setRunning(false)
-          hideLoading(p1.loading)
-        })
-    }
-  }
-  const load = p && p.load ? p.load : _load
-
-  return {
-    state,
-    setState,
-    refForm,
-    resource: p1.resource.resource(),
-    running,
-    setRunning,
-    showModel,
-    getModelName,
-    handleNotFound,
-    load,
-    back,
-  }
-}