react-hook-core 0.4.10 → 0.4.12

package/lib/core.js

@@ -4,7 +4,7 @@ exports.pageSizes = [12, 24, 60, 100, 120, 180, 300, 600]
 exports.sizes = exports.pageSizes
 var resources = (function () {
   function resources() {}
-  resources.phone = / |-|\.|\(|\)/g
+  resources.phone = / |\-|\.|\(|\)/g
   resources._cache = {}
   resources.cache = true
   resources.fields = "fields"

package/lib/index.js

@@ -10,7 +10,6 @@ __export(require("./core"))
 __export(require("./diff"))
 __export(require("./edit"))
 __export(require("./formutil"))
-__export(require("./merge"))
 __export(require("./reflect"))
 __export(require("./route"))
 __export(require("./search"))

package/lib/useEdit.js

@@ -332,7 +332,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
         var diffObj_1 = reflect_1.makeDiff(flag.originalModel, obj_1, keys, version_1)
         var objKeys = Object.keys(diffObj_1)
         if (objKeys.length === 0) {
-          p1.showMessage(p1.resource.value("msg_no_change"))
+          p1.showMessage(resource.msg_no_change)
         } else {
           validate(obj_1, function () {
             p1.confirm(
@@ -384,13 +384,14 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   }
   var succeed = p && p.succeed ? p.succeed : _succeed
   var _fail = function (result) {
+    var resource = p1.resource.resource()
     var f = refForm.current
     var u = p1.ui
     if (u && f) {
       var unmappedErrors = u.showFormError(f, result)
       formutil_1.focusFirstError(f)
       if (unmappedErrors && unmappedErrors.length > 0) {
-        var t = p1.resource.value("error")
+        var t = resource.error
         if (p1.ui && p1.ui.buildErrorMessage) {
           var msg = p1.ui.buildErrorMessage(unmappedErrors)
           p1.showError(msg, undefined, t)
@@ -399,7 +400,7 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
         }
       }
     } else {
-      var t = p1.resource.value("error")
+      var t = resource.error
       if (result.length > 0) {
         p1.showError(result[0].field + " " + result[0].code + " " + result[0].message, undefined, t)
       } else {
@@ -410,13 +411,14 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   var fail = p && p.fail ? p.fail : _fail
   var _handleError = function (err) {
     if (err) {
+      var resource = p1.resource.resource()
       setRunning(false)
       input_1.hideLoading(p1.loading)
-      var errHeader = p1.resource.value("error")
-      var errMsg = p1.resource.value("error_internal")
+      var errHeader = resource.error
+      var errMsg = resource.error_internal
       var data = err && err.response ? err.response : err
       if (data.status === 400) {
-        var errMsg_1 = p1.resource.value("error_400")
+        var errMsg_1 = resource.error_400
         p1.showError(errMsg_1, undefined, errHeader)
       } else {
         p1.showError(errMsg, undefined, errHeader)
@@ -426,9 +428,10 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
   var handleError = p && p.handleError ? p.handleError : _handleError
   var _postSave = function (r, origin, version, isPatch, backOnSave) {
     setRunning(false)
+    var resource = p1.resource.resource()
     input_1.hideLoading(p1.loading)
     var x = r
-    var successMsg = p1.resource.value("msg_save_success")
+    var successMsg = resource.msg_save_success
     var newMod = flag.newMode
     if (Array.isArray(x)) {
       fail(x)
@@ -441,8 +444,8 @@ exports.useCoreEdit = function (refForm, initialState, service, p1, p, props) {
         } else if (!newMod && x === 0) {
           handleNotFound()
         } else {
-          var title = p1.resource.value("error")
-          var err = p1.resource.value("error_version")
+          var title = resource.error
+          var err = resource.error_version
           p1.showError(err, undefined, title)
         }
       }

package/lib/useSearch.js

@@ -25,7 +25,6 @@ var react_1 = require("react")
 var common_1 = require("./common")
 var core_1 = require("./core")
 var input_1 = require("./input")
-var merge_1 = require("./merge")
 var reflect_1 = require("./reflect")
 var route_1 = require("./route")
 var search_1 = require("./search")
@@ -338,7 +337,7 @@ exports.useCoreSearch = function (refForm, initialState, service, p1, p2) {
     return refForm && refForm.current ? refForm.current.getAttribute("currency-code") : "USD"
   }
   var getCurrencyCode = p && p.getCurrencyCode ? p.getCurrencyCode : _getCurrencyCode
-  var _c = merge_1.useMergeState(p),
+  var _c = update_1.useMergeState(p),
     component = _c[0],
     setComponent = _c[1]
   var toggleFilter = function (event) {

package/package.json

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

package/src/core.ts

@@ -6,7 +6,7 @@ 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
+  static phone = / |\-|\.|\(|\)/g
   static _cache: any = {}
   static cache = true
   static fields = "fields"
@@ -22,7 +22,6 @@ export interface StringMap {
 }
 export interface ResourceService {
   resource(): StringMap
-  value(key: string, param?: any): string
 }
 
 export interface Locale {

package/src/index.ts

@@ -5,7 +5,6 @@ export * from "./core"
 export * from "./diff"
 export * from "./edit"
 export * from "./formutil"
-export * from "./merge"
 export * from "./reflect"
 export * from "./route"
 export * from "./search"

package/src/useEdit.ts

@@ -441,7 +441,7 @@ export const useCoreEdit = <T, ID, S, P>(
         const diffObj = makeDiff(flag.originalModel, obj, keys, version)
         const objKeys = Object.keys(diffObj)
         if (objKeys.length === 0) {
-          p1.showMessage(p1.resource.value("msg_no_change"))
+          p1.showMessage(resource.msg_no_change)
         } else {
           validate(obj, () => {
             p1.confirm(
@@ -497,13 +497,14 @@ export const useCoreEdit = <T, ID, S, P>(
   const succeed = p && p.succeed ? p.succeed : _succeed
 
   const _fail = (result: ErrorMessage[]) => {
+    const resource = p1.resource.resource()
     const f = refForm.current
     const u = p1.ui
     if (u && f) {
       const unmappedErrors = u.showFormError(f, result)
       focusFirstError(f)
       if (unmappedErrors && unmappedErrors.length > 0) {
-        const t = p1.resource.value("error")
+        const t = resource.error
         if (p1.ui && p1.ui.buildErrorMessage) {
           const msg = p1.ui.buildErrorMessage(unmappedErrors)
           p1.showError(msg, undefined, t)
@@ -512,7 +513,7 @@ export const useCoreEdit = <T, ID, S, P>(
         }
       }
     } else {
-      const t = p1.resource.value("error")
+      const t = resource.error
       if (result.length > 0) {
         p1.showError(result[0].field + " " + result[0].code + " " + result[0].message, undefined, t)
       } else {
@@ -524,13 +525,14 @@ export const useCoreEdit = <T, ID, S, P>(
 
   const _handleError = function (err: any) {
     if (err) {
+      const resource = p1.resource.resource()
       setRunning(false)
       hideLoading(p1.loading)
-      const errHeader = p1.resource.value("error")
-      const errMsg = p1.resource.value("error_internal")
+      const errHeader = resource.error
+      const errMsg = resource.error_internal
       const data = err && err.response ? err.response : err
       if (data.status === 400) {
-        const errMsg = p1.resource.value("error_400")
+        const errMsg = resource.error_400
         p1.showError(errMsg, undefined, errHeader)
       } else {
         p1.showError(errMsg, undefined, errHeader)
@@ -541,9 +543,10 @@ export const useCoreEdit = <T, ID, S, P>(
 
   const _postSave = (r: number | T | ErrorMessage[], origin: T, version?: string, isPatch?: boolean, backOnSave?: boolean) => {
     setRunning(false)
+    const resource = p1.resource.resource()
     hideLoading(p1.loading)
     const x: any = r
-    const successMsg = p1.resource.value("msg_save_success")
+    const successMsg = resource.msg_save_success
     const newMod = flag.newMode
     // const st = createEditStatus(p ? p.status : undefined);
     if (Array.isArray(x)) {
@@ -557,8 +560,8 @@ export const useCoreEdit = <T, ID, S, P>(
         } else if (!newMod && x === 0) {
           handleNotFound()
         } else {
-          const title = p1.resource.value("error")
-          const err = p1.resource.value("error_version")
+          const title = resource.error
+          const err = resource.error_version
           p1.showError(err, undefined, title)
         }
       }

package/src/useSearch.ts

@@ -2,7 +2,6 @@ import { useEffect, useState } from "react"
 import { error } from "./common"
 import { LoadingService, Locale, pageSizes, resources, ResourceService, UIService } from "./core"
 import { hideLoading, initForm, showLoading } from "./input"
-import { DispatchWithCallback, useMergeState } from "./merge"
 import { clone } from "./reflect"
 import { buildFromUrl } from "./route"
 import {
@@ -23,7 +22,7 @@ import {
   Sortable,
 } from "./search"
 import { enLocale } from "./state"
-import { useUpdate } from "./update"
+import { DispatchWithCallback, useMergeState, useUpdate } from "./update"
 
 export function showPaging<T>(com: Pagination, list: T[], pageSize?: number, total?: number): void {
   com.total = total