fix(json-schema): fix typings and x-reactions.when (#2360)

* fix(json-schemaa): fix reactions otherwise is not work * chore: update tsconfig.json
alibaba · Oct 28, 2021 · 19e8a4b · 19e8a4b
1 parent a218946
commit 19e8a4b
Show file tree

Hide file tree

Showing 28 changed files with 77 additions and 107 deletions.
diff --git a/devtools/chrome-extension/tsconfig.build.json b/devtools/chrome-extension/tsconfig.build.json
@@ -3,11 +3,7 @@
   "compilerOptions": {
     "outDir": "./lib",
     "paths": {
-      "@formily/*": [
-        "../../packages/*",
-        "../../designable/*",
-        "../../devtools/*"
-      ]
+      "@formily/*": ["packages/*", "devtools/*"]
     },
     "declaration": true
   }

diff --git a/package.json b/package.json
@@ -154,7 +154,7 @@
     "ts-jest": "^26.0.0",
     "ts-loader": "^7.0.4",
     "ts-node": "^9.1.1",
-    "typescript": "^4.3.0",
+    "typescript": "^4.1.5",
     "vue-eslint-parser": "^7.1.1",
     "webpack": "^4.41.5",
     "webpack-cli": "^3.3.10",

diff --git a/packages/antd/tsconfig.build.json b/packages/antd/tsconfig.build.json
@@ -3,11 +3,7 @@
   "compilerOptions": {
     "outDir": "./lib",
     "paths": {
-      "@formily/*": [
-        "../../packages/*",
-        "../../designable/*",
-        "../../devtools/*"
-      ]
+      "@formily/*": ["packages/*", "devtools/*"]
     },
     "declaration": true
   }

diff --git a/packages/benchmark/tsconfig.build.json b/packages/benchmark/tsconfig.build.json
@@ -3,11 +3,7 @@
   "compilerOptions": {
     "outDir": "./lib",
     "paths": {
-      "@formily/*": [
-        "../../packages/*",
-        "../../designable/*",
-        "../../devtools/*"
-      ]
+      "@formily/*": ["packages/*", "devtools/*"]
     },
     "declaration": true
   }

diff --git a/packages/core/tsconfig.build.json b/packages/core/tsconfig.build.json
@@ -3,11 +3,7 @@
   "compilerOptions": {
     "outDir": "./lib",
     "paths": {
-      "@formily/*": [
-        "../../packages/*",
-        "../../designable/*",
-        "../../devtools/*"
-      ]
+      "@formily/*": ["packages/*", "devtools/*"]
     },
     "declaration": true
   }

diff --git a/packages/element/tsconfig.build.json b/packages/element/tsconfig.build.json
@@ -3,11 +3,7 @@
   "compilerOptions": {
     "outDir": "./lib",
     "paths": {
-      "@formily/*": [
-        "../../packages/*",
-        "../../designable/*",
-        "../../devtools/*"
-      ]
+      "@formily/*": ["packages/*", "devtools/*"]
     },
     "declaration": true
   }

diff --git a/packages/grid/package.json b/packages/grid/package.json
@@ -28,7 +28,7 @@
     "build:global": "ts-node ../../scripts/build-global"
   },
   "peerDependencies": {
-    "typescript": "^4.4.0"
+    "typescript": "^4.1.0"
   },
   "dependencies": {
     "@formily/reactive": "2.0.0-rc.17"

diff --git a/packages/grid/tsconfig.build.json b/packages/grid/tsconfig.build.json
@@ -3,11 +3,7 @@
   "compilerOptions": {
     "outDir": "./lib",
     "paths": {
-      "@formily/*": [
-        "../../packages/*",
-        "../../designable/*",
-        "../../devtools/*"
-      ]
+      "@formily/*": ["packages/*", "devtools/*"]
     },
     "declaration": true
   }

diff --git a/packages/json-schema/package.json b/packages/json-schema/package.json
@@ -28,7 +28,7 @@
     "build:global": "ts-node ../../scripts/build-global"
   },
   "peerDependencies": {
-    "typescript": "^4.4.0"
+    "typescript": "^4.1.5"
   },
   "dependencies": {
     "@formily/core": "2.0.0-rc.17",

diff --git a/packages/json-schema/src/transformer.ts b/packages/json-schema/src/transformer.ts
@@ -3,7 +3,6 @@ import { untracked, autorun, observable } from '@formily/reactive'
 import {
   isArr,
   isStr,
-  isValid,
   toArr,
   each,
   isFn,
@@ -189,7 +188,7 @@ const getUserReactions =
           $dependencies,
         }
         const compiledWhen = shallowCompile(when, scope)
-        const condition = isValid(compiledWhen) ? compiledWhen : true
+        const condition = when ? compiledWhen : true
         const request = condition ? fulfill : otherwise
         const runner = condition ? fulfill?.run : otherwise?.run
         setSchemaFieldState({

diff --git a/packages/json-schema/src/types.ts b/packages/json-schema/src/types.ts
@@ -141,7 +141,7 @@ export type Stringify<P extends { [key: string]: any }> = {
   /**
    * Use `string & {}` instead of string to keep Literal Type for ISchema#component and ISchema#decorator
    */
-  [key in keyof P]?: P[key] | `{{${string}}}`
+  [key in keyof P]?: P[key] | string
 }
 
 export type ISchema<

diff --git a/packages/json-schema/tsconfig.build.json b/packages/json-schema/tsconfig.build.json
@@ -3,11 +3,7 @@
   "compilerOptions": {
     "outDir": "./lib",
     "paths": {
-      "@formily/*": [
-        "../../packages/*",
-        "../../designable/*",
-        "../../devtools/*"
-      ]
+      "@formily/*": ["packages/*", "devtools/*"]
     },
     "declaration": true
   }

diff --git a/packages/next/tsconfig.build.json b/packages/next/tsconfig.build.json
@@ -3,11 +3,7 @@
   "compilerOptions": {
     "outDir": "./lib",
     "paths": {
-      "@formily/*": [
-        "../../packages/*",
-        "../../designable/*",
-        "../../devtools/*"
-      ]
+      "@formily/*": ["packages/*", "devtools/*"]
     },
     "declaration": true
   }

diff --git a/packages/path/tsconfig.build.json b/packages/path/tsconfig.build.json
@@ -3,11 +3,7 @@
   "compilerOptions": {
     "outDir": "./lib",
     "paths": {
-      "@formily/*": [
-        "../../packages/*",
-        "../../designable/*",
-        "../../devtools/*"
-      ]
+      "@formily/*": ["packages/*", "devtools/*"]
     },
     "declaration": true
   }

diff --git a/packages/react/src/__tests__/schema.markup.spec.tsx b/packages/react/src/__tests__/schema.markup.spec.tsx
@@ -802,3 +802,47 @@ test('schema x-validator/required', async () => {
     ])
   })
 })
+
+test('schema x-reactions when undefined', async () => {
+  const form = createForm({
+    values: {
+      aaa: 'xxx',
+    },
+  })
+  const SchemaField = createSchemaField({
+    components: {
+      Input: () => <div data-testid="input"></div>,
+      Select: () => <div data-testid="select"></div>,
+    },
+  })
+
+  const { queryByTestId } = render(
+    <FormProvider form={form}>
+      <SchemaField>
+        <SchemaField.String name="input" required x-component="Input" />
+        <SchemaField.String
+          name="select"
+          required
+          x-component="Select"
+          x-reactions={{
+            when: '{{$values.input}}',
+            fulfill: {
+              state: {
+                visible: true,
+              },
+            },
+            otherwise: {
+              state: {
+                visible: false,
+              },
+            },
+          }}
+        />
+      </SchemaField>
+    </FormProvider>
+  )
+  await waitFor(() => {
+    expect(queryByTestId('input')).not.toBeNull()
+    expect(queryByTestId('select')).toBeNull()
+  })
+})
diff --git a/packages/react/src/components/SchemaField.tsx b/packages/react/src/components/SchemaField.tsx
@@ -75,6 +75,7 @@ export function createSchemaField<Components extends SchemaReactComponents>(
   }
 
   SchemaField.displayName = 'SchemaField'
+
   function MarkupField<
     Decorator extends ReactComponentPath<Components>,
     Component extends ReactComponentPath<Components>
@@ -195,5 +196,6 @@ export function createSchemaField<Components extends SchemaReactComponents>(
   SchemaField.DateTime = DateTimeField
   SchemaField.Void = VoidField
   SchemaField.Number = NumberField
+
   return SchemaField
 }
diff --git a/packages/react/src/types.ts b/packages/react/src/types.ts
@@ -1,3 +1,4 @@
+import React from 'react'
 import {
   Form,
   Field as FieldType,
@@ -171,4 +172,4 @@ export type ISchemaTypeFieldProps<
   Components extends SchemaReactComponents,
   Decorator extends ReactComponentPath<Components>,
   Component extends ReactComponentPath<Components>
-> = Omit<ISchemaMarkupFieldProps<Components, Decorator, Component>, 'type'>
+> = ISchemaMarkupFieldProps<Components, Decorator, Component>
diff --git a/packages/react/tsconfig.build.json b/packages/react/tsconfig.build.json
@@ -3,11 +3,7 @@
   "compilerOptions": {
     "outDir": "./lib",
     "paths": {
-      "@formily/*": [
-        "../../packages/*",
-        "../../designable/*",
-        "../../devtools/*"
-      ]
+      "@formily/*": ["packages/*", "devtools/*"]
     },
     "declaration": true
   }

diff --git a/packages/reactive-react/tsconfig.build.json b/packages/reactive-react/tsconfig.build.json
@@ -3,11 +3,7 @@
   "compilerOptions": {
     "outDir": "./lib",
     "paths": {
-      "@formily/*": [
-        "../../packages/*",
-        "../../designable/*",
-        "../../devtools/*"
-      ]
+      "@formily/*": ["packages/*", "devtools/*"]
     },
     "declaration": true
   }

diff --git a/packages/reactive-test-cases-for-react18/tsconfig.build.json b/packages/reactive-test-cases-for-react18/tsconfig.build.json
@@ -3,11 +3,7 @@
   "compilerOptions": {
     "outDir": "./lib",
     "paths": {
-      "@formily/*": [
-        "../../packages/*",
-        "../../designable/*",
-        "../../devtools/*"
-      ]
+      "@formily/*": ["packages/*", "devtools/*"]
     },
     "declaration": true
   }

diff --git a/packages/reactive-vue/tsconfig.build.json b/packages/reactive-vue/tsconfig.build.json
@@ -3,11 +3,7 @@
   "compilerOptions": {
     "outDir": "./lib",
     "paths": {
-      "@formily/*": [
-        "../../packages/*",
-        "../../designable/*",
-        "../../devtools/*"
-      ]
+      "@formily/*": ["packages/*", "devtools/*"]
     },
     "declaration": true
   }

diff --git a/packages/reactive/tsconfig.build.json b/packages/reactive/tsconfig.build.json
@@ -3,11 +3,7 @@
   "compilerOptions": {
     "outDir": "./lib",
     "paths": {
-      "@formily/*": [
-        "../../packages/*",
-        "../../designable/*",
-        "../../devtools/*"
-      ]
+      "@formily/*": ["packages/*", "devtools/*"]
     },
     "declaration": true
   }

diff --git a/packages/shared/tsconfig.build.json b/packages/shared/tsconfig.build.json
@@ -3,11 +3,7 @@
   "compilerOptions": {
     "outDir": "./lib",
     "paths": {
-      "@formily/*": [
-        "../../packages/*",
-        "../../designable/*",
-        "../../devtools/*"
-      ]
+      "@formily/*": ["packages/*", "devtools/*"]
     },
     "declaration": true
   }

diff --git a/packages/validator/tsconfig.build.json b/packages/validator/tsconfig.build.json
@@ -3,11 +3,7 @@
   "compilerOptions": {
     "outDir": "./lib",
     "paths": {
-      "@formily/*": [
-        "../../packages/*",
-        "../../designable/*",
-        "../../devtools/*"
-      ]
+      "@formily/*": ["packages/*", "devtools/*"]
     },
     "declaration": true
   }

diff --git a/packages/vue/tsconfig.build.json b/packages/vue/tsconfig.build.json
@@ -3,11 +3,7 @@
   "compilerOptions": {
     "outDir": "./lib",
     "paths": {
-      "@formily/*": [
-        "../../packages/*",
-        "../../designable/*",
-        "../../devtools/*"
-      ]
+      "@formily/*": ["packages/*", "devtools/*"]
     },
     "declaration": true
   }

diff --git a/tsconfig.jest.json b/tsconfig.jest.json
@@ -8,11 +8,7 @@
     "module": "commonjs",
     "target": "es5",
     "paths": {
-      "@formily/*": [
-        "./packages/*/src",
-        "./designable/*/src",
-        "./devtools/*/src"
-      ]
+      "@formily/*": ["./packages/*/src"]
     }
   },
   "exclude": ["./packages/*/esm", "./packages/*/lib"]

diff --git a/tsconfig.json b/tsconfig.json
@@ -8,18 +8,14 @@
     "allowJs": false,
     "noUnusedLocals": false,
     "preserveConstEnums": true,
-    "sourceMap": true,
     "skipLibCheck": true,
+    "sourceMap": true,
     "declaration": true,
     "experimentalDecorators": true,
     "downlevelIteration": true,
     "baseUrl": ".",
     "paths": {
-      "@formily/*": [
-        "./packages/*/src",
-        "./designable/*/src",
-        "./devtools/*/src"
-      ]
+      "@formily/*": ["packages/*/src", "devtools/*/src"]
     }
   }
 }
diff --git a/yarn.lock b/yarn.lock
@@ -19512,10 +19512,10 @@ typedarray@^0.0.6:
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@^4.3.0:
-  version "4.4.3"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.3.tgz#bdc5407caa2b109efd4f82fe130656f977a29324"
-  integrity sha512-4xfscpisVgqqDfPaJo5vkd+Qd/ItkoagnHpufr+i2QCHBsNYp+G7UAoyFl8aPtx879u38wPV65rZ8qbGZijalA==
+typescript@^4.1.5:
+  version "4.4.4"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.4.4.tgz#2cd01a1a1f160704d3101fd5a58ff0f9fcb8030c"
+  integrity sha512-DqGhF5IKoBl8WNf8C1gu8q0xZSInh9j1kJJMqT3a94w1JzVaBU4EXOSMrz9yDqMT0xt3selp83fuFMQ0uzv6qA==
 
 ua-parser-js@^0.7.18:
   version "0.7.28"