fix(reactive): fix batch api can not throw error (#2268)

* fix(reactive): fix batch api can not throw error * fix(json-schema): fix ci
alibaba · Oct 5, 2021 · 07227ad · 07227ad
1 parent 4c1cfed
commit 07227ad
Show file tree

Hide file tree

Showing 7 changed files with 36 additions and 16 deletions.
diff --git a/packages/json-schema/src/transformer.ts b/packages/json-schema/src/transformer.ts
@@ -207,13 +207,15 @@ const getUserReactions =
         reaction.effects = effects?.length ? effects : DefaultFieldEffects
       }
       if (reaction.effects) {
-        untracked(() => {
-          each(reaction.effects, (type) => {
-            if (FieldEffects[type]) {
-              FieldEffects[type](field.address, run)
-            }
+        autorun.memo(() => {
+          untracked(() => {
+            each(reaction.effects, (type) => {
+              if (FieldEffects[type]) {
+                FieldEffects[type](field.address, run)
+              }
+            })
           })
-        })
+        }, [])
       } else {
         run()
       }

diff --git a/packages/path/src/index.ts b/packages/path/src/index.ts
@@ -16,6 +16,9 @@ const isMatcher = Symbol('PATH_MATCHER')
 
 const isValid = (val: any) => val !== undefined && val !== null
 
+const isAssignable = (val: any) =>
+  typeof val === 'object' || typeof val === 'function'
+
 const isNumberIndex = (val: any) =>
   isStr(val) ? /^\d+$/.test(val) : isNum(val)
 
@@ -44,7 +47,7 @@ const setIn = (segments: Segments, source: any, value: any) => {
     const index = segments[i]
     const rules = getDestructor(index as string)
     if (!rules) {
-      if (!isValid(source)) return
+      if (!isValid(source) || !isAssignable(source)) return
       if (isArr(source) && !isNumberIndex(index)) {
         return
       }
@@ -77,7 +80,7 @@ const deleteIn = (segments: Segments, source: any) => {
         return
       }
 
-      if (!isValid(source)) return
+      if (!isValid(source) || !isAssignable(source)) return
       source = source[index]
       if (!isObj(source)) {
         return
@@ -107,7 +110,7 @@ const existIn = (segments: Segments, source: any, start: number | Path) => {
         return hasOwnProperty.call(source, index)
       }
 
-      if (!isValid(source)) return false
+      if (!isValid(source) || !isAssignable(source)) return false
       source = source[index]
 
       if (!isObj(source)) {

diff --git a/packages/react/src/components/SchemaField.tsx b/packages/react/src/components/SchemaField.tsx
@@ -78,9 +78,7 @@ export function createSchemaField<Components extends SchemaReactComponents>(
   function MarkupField<
     Decorator extends ReactComponentPath<Components>,
     Component extends ReactComponentPath<Components>
-  >(
-    props: ISchemaMarkupFieldProps<Components, Component, Decorator>
-  ): React.ReactElement {
+  >(props: ISchemaMarkupFieldProps<Components, Component, Decorator>) {
     const parent = useContext(SchemaMarkupContext)
     if (!parent) return <Fragment />
     const renderChildren = () => {

diff --git a/packages/reactive/src/__tests__/batch.spec.ts b/packages/reactive/src/__tests__/batch.spec.ts
@@ -204,6 +204,18 @@ describe('normal batch', () => {
     expect(handler).toBeCalledTimes(2)
     expect(obs.cc).toEqual(41)
   })
+
+  test('batch error', () => {
+    let error = null
+    try {
+      batch(() => {
+        throw '123'
+      })
+    } catch (e) {
+      error = e
+    }
+    expect(error).toEqual('123')
+  })
 })
 
 describe('annotation batch', () => {

diff --git a/packages/reactive/src/internals.ts b/packages/reactive/src/internals.ts
@@ -95,15 +95,15 @@ export const createBoundaryFunction = (
 ) => {
   function boundary<F extends (...args: any) => any>(fn?: F): ReturnType<F> {
     let results: ReturnType<F>
-    start()
     try {
+      start()
       if (isFn(fn)) {
         results = fn()
       }
     } finally {
       end()
-      return results
     }
+    return results
   }
 
   boundary.bound = createBindFunction(boundary)

diff --git a/scripts/jest.base.js b/scripts/jest.base.js
@@ -12,8 +12,8 @@ module.exports = {
   // moduleNameMapper: process.env.TEST_ENV === 'production' ? undefined : alias,
   globals: {
     'ts-jest': {
-      babelConfig: true,
-      tsconfig: 'tsconfig.jest.json',
+      babelConfig: false,
+      tsconfig: path.resolve(__dirname, '../tsconfig.jest.json'),
       diagnostics: false,
     },
   },

diff --git a/tsconfig.jest.json b/tsconfig.jest.json
@@ -2,6 +2,11 @@
   "extends": "./tsconfig.json",
   "compilerOptions": {
     "jsx": "react",
+    "esModuleInterop": true,
+    "moduleResolution": "node",
+    "allowJs": true,
+    "module": "commonjs",
+    "target": "es5",
     "paths": {
       "@formily/*": [
         "./packages/*/src",