feat(json-schema): add error when x-component can not found

alibaba · Apr 23, 2021 · 8bc884b · 8bc884b
1 parent ffb52a7
commit 8bc884b
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 147 deletions.
diff --git a/packages/json-schema/src/transformer.ts b/packages/json-schema/src/transformer.ts
@@ -199,6 +199,26 @@ const omitInvalid = (target: any) => {
   )
 }
 
+const findComponent = (
+  type: 'component' | 'decorator',
+  path: Formily.Core.Types.FormPathPattern,
+  options: ISchemaFieldFactoryOptions,
+  state: IFieldState
+) => {
+  if (path) {
+    const component =
+      FormPath.getIn(options?.components, path) || state?.[type]?.[0]
+    if (component) {
+      return component
+    }
+    //Todo: need to use __DEV__ keyword
+    console.error(
+      `[Formily JSON Schema]: Cannot find the '${path}' component mapped by Schema.x-${type}`
+    )
+  }
+  return state?.[type]?.[0]
+}
+
 const getStateFromSchema = (
   schema: Schema,
   options: ISchemaFieldFactoryOptions,
@@ -224,15 +244,11 @@ const getStateFromSchema = (
     display: schema['x-display'],
     pattern: schema['x-pattern'],
     decorator: [
-      (schema['x-decorator'] &&
-        FormPath.getIn(options?.components, schema['x-decorator'])) ||
-        state?.decorator?.[0],
+      findComponent('decorator', schema['x-decorator'], options, state),
       schema['x-decorator-props'] || state?.decorator?.[1],
     ],
     component: [
-      (schema['x-component'] &&
-        FormPath.getIn(options?.components, schema['x-component'])) ||
-        state?.component?.[0],
+      findComponent('component', schema['x-component'], options, state),
       schema['x-component-props'] || state?.component?.[1],
     ],
   })

diff --git a/packages/shared/src/__tests__/index.spec.ts b/packages/shared/src/__tests__/index.spec.ts
@@ -21,7 +21,6 @@ import { Subscribable } from '../subscribable'
 import { merge } from '../merge'
 import { instOf } from '../instanceof'
 import { isFn, isHTMLElement, isNumberLike, isReactElement } from '../checkers'
-import { log } from '../log'
 import { defaults } from '../defaults'
 
 describe('array', () => {
@@ -525,76 +524,6 @@ describe('types', () => {
   })
 })
 
-describe('log', () => {
-  const SomeString = Date.now().toString(32)
-  const SomeObject = { v: SomeString }
-  const Keyword = 'Formily'
-  const Tips = 'you should do something'
-  const FormilyLog = log
-  test('log api', () => {
-    expect(FormilyLog.log(SomeString)).toEqual({
-      content: SomeString,
-      keyword: Keyword,
-    })
-    expect(FormilyLog.log(SomeObject)).toEqual({
-      content: SomeObject,
-      keyword: Keyword,
-    })
-  })
-  test('info api', () => {
-    expect(FormilyLog.info(SomeString)).toEqual({
-      content: SomeString,
-      keyword: Keyword,
-    })
-    expect(FormilyLog.info(SomeObject)).toEqual({
-      content: SomeObject,
-      keyword: Keyword,
-    })
-  })
-  test('warn api', () => {
-    expect(FormilyLog.warn(SomeString)).toEqual({
-      content: SomeString,
-      keyword: Keyword,
-    })
-    expect(FormilyLog.warn(SomeObject)).toEqual({
-      content: SomeObject,
-      keyword: Keyword,
-    })
-
-    expect(FormilyLog.warn(SomeString, Tips)).toEqual({
-      content: SomeString,
-      keyword: Keyword,
-      tips: Tips,
-    })
-    expect(FormilyLog.warn(SomeObject, Tips)).toEqual({
-      content: SomeObject,
-      keyword: Keyword,
-      tips: Tips,
-    })
-  })
-  test('error api', () => {
-    expect(FormilyLog.error(SomeString)).toEqual({
-      content: SomeString,
-      keyword: Keyword,
-    })
-    expect(FormilyLog.error(SomeObject)).toEqual({
-      content: SomeObject,
-      keyword: Keyword,
-    })
-
-    expect(FormilyLog.error(SomeString, Tips)).toEqual({
-      content: SomeString,
-      keyword: Keyword,
-      tips: Tips,
-    })
-    expect(FormilyLog.error(SomeObject, Tips)).toEqual({
-      content: SomeObject,
-      keyword: Keyword,
-      tips: Tips,
-    })
-  })
-})
-
 describe('merge', () => {
   test('assign', () => {
     const target = {

diff --git a/packages/shared/src/index.ts b/packages/shared/src/index.ts
@@ -12,5 +12,4 @@ export * from './subscribable'
 export * from './merge'
 export * from './instanceof'
 export * from './defaults'
-export * from './log'
 export * from './uid'
diff --git a/packages/shared/src/log.ts b/packages/shared/src/log.ts