fix: fix bug of needless undefined in oneOfType and flatten oneOfType…

… with only one level
alibaba · Sep 6, 2022 · ff9c208 · ff9c208
1 parent 1f355c6
commit ff9c208
Show file tree

Hide file tree

Showing 3 changed files with 746 additions and 2,043 deletions.
diff --git a/modules/material-parser/src/parse/transform.ts b/modules/material-parser/src/parse/transform.ts
@@ -1,4 +1,4 @@
-import { omit, pick, isNil, uniq } from 'lodash';
+import { omit, pick, isNil, uniq, pull } from 'lodash';
 import { safeEval, isEvaluable } from '../utils';
 import { debug } from '../core';
 
@@ -38,6 +38,7 @@ export function transformType(itemType: any) {
     case 'element':
     case 'node':
     case 'void':
+    case 'undefined':
       break;
     case 'func':
       if (params) {
@@ -205,6 +206,7 @@ function combineOneOfValues(propType) {
   const newValue = [];
   let oneOfItem = null;
   let firstBooleanIndex = -1;
+
   propType.value.forEach((item) => {
     if (item?.type === 'oneOf') {
       if (!oneOfItem) {
@@ -228,7 +230,14 @@ function combineOneOfValues(propType) {
       newValue.push(item);
     }
   });
+
   let result = propType;
+
+  if (!result.isRequired && result.value.includes('undefined')) {
+    pull(result.value, 'undefined');
+    pull(newValue, 'undefined');
+  }
+
   const oneOfItemLength = oneOfItem?.value?.length;
   if (oneOfItemLength) {
     newValue.push(oneOfItem);
@@ -247,6 +256,11 @@ function combineOneOfValues(propType) {
     };
   }
   result.value = uniq(result.value);
+
+  if (result.type === 'oneOfType' && result.value.length === 1) {
+    result = result.value[0];
+  }
+
   return result;
 }
 

diff --git a/modules/material-parser/src/parse/ts/index.ts b/modules/material-parser/src/parse/ts/index.ts
@@ -294,6 +294,10 @@ function getDocgenTypeHelper(
     return makeResult({
       name: 'any',
     });
+  } else if (type.flags & TypeFlags.Undefined) {
+    return makeResult({
+      name: 'undefined',
+    });
   } else if (type.flags & TypeFlags.Union && !isComplexType(type)) {
     return makeResult({
       name: 'union',