Support multiple ReturnValueTypes for func props (#867)

Author: mpreyskurantov

package-lock.json

@@ -15,7 +15,7 @@
     "cpy-cli": "^3.1.1",
     "del-cli": "^3.0.1",
     "devextreme": "23.1-next",
-    "devextreme-internal-tools": "10.0.0-beta.17",
+    "devextreme-internal-tools": "10.0.0-beta.19",
     "eslint": "^7.32.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-airbnb-typescript": "^12.3.1",

package.json

@@ -1,7 +1,7 @@
 {
   "author": "Developer Express Inc.",
   "name": "devextreme-react-generator",
-  "version": "4.1.3",
+  "version": "4.1.7",
   "description": "DevExtreme React UI and Visualization Components",
   "repository": {
     "type": "git",

packages/devextreme-react-generator/package.json

@@ -1258,4 +1258,70 @@ describe('mapWidget', () => {
       expect(getComplexOptionType(types, typeResolver)).toEqual(expected);
     });
   });
+
+  describe('getComplexOptionType for func with multiple return types', () => {
+    const types = [
+      {
+        type: 'Function',
+        acceptableValues: [],
+        isCustomType: false,
+        importPath: '',
+        isImportedType: false,
+        params: [],
+        returnValueTypes: [{
+          type: 'String',
+        }, {
+          type: 'Number',
+        },
+        ],
+      },
+    ];
+
+    const expected = '(() => string | number)';
+
+    it('should return multiple types', () => {
+      expect(getComplexOptionType(types)).toEqual(expected);
+    });
+  });
+
+  describe('getComplexOptionType for func with single return type', () => {
+    const types = [
+      {
+        type: 'Function',
+        acceptableValues: [],
+        isCustomType: false,
+        importPath: '',
+        isImportedType: false,
+        params: [],
+        returnValueTypes: [{
+          type: 'String',
+        }],
+      },
+    ];
+
+    const expected = '(() => string)';
+
+    it('should return single type', () => {
+      expect(getComplexOptionType(types)).toEqual(expected);
+    });
+  });
+
+  describe('getComplexOptionType for func with empty returnValueTypes IMD', () => {
+    const types = [
+      {
+        type: 'Function',
+        acceptableValues: [],
+        isCustomType: false,
+        importPath: '',
+        isImportedType: false,
+        params: [],
+      },
+    ];
+
+    const expected = '(() => any)';
+
+    it('should return any fallback type', () => {
+      expect(getComplexOptionType(types)).toEqual(expected);
+    });
+  });
 });

packages/devextreme-react-generator/src/generator.test.ts

@@ -54,6 +54,7 @@ enum BaseTypes {
   Null = 'null',
   True = 'true',
   False = 'false',
+  void = 'void',
 }
 
 const UNKNOWN_MODULE = 'UNKNOWN_MODULE';
@@ -139,9 +140,9 @@ export function getComplexOptionType(
         return `${p.name}: ${parameterType === BaseTypes.Object ? BaseTypes.Any : parameterType}`;
       })
         .join(', ') || '';
-      const returnType = (
-        functionDescriptor.returnValueType && (formatTypeDescriptor(functionDescriptor.returnValueType) || (functionDescriptor.returnValueType.type === 'void' && 'void'))
-      ) || BaseTypes.Any;
+      const returnType = functionDescriptor.returnValueTypes
+        ? functionDescriptor.returnValueTypes.map((t) => formatTypeDescriptor(t)).join(' | ')
+        : BaseTypes.Any;
       return `(${parameters}) => ${returnType}`;
     }
 

packages/devextreme-react-generator/src/generator.ts

@@ -36,7 +36,7 @@
     "@types/react": "^16.14.28",
     "@types/react-dom": "^16.9.16",
     "del": "^3.0.0",
-    "devextreme-react-generator": "^4.1.3",
+    "devextreme-react-generator": "^4.1.7",
     "gulp": "^4.0.2",
     "gulp-header": "^2.0.9",
     "gulp-shell": "^0.8.0",