Skip to content

Commit

Permalink
Fallback from Record<string, any> to 'any' for function parameters (#839
Browse files Browse the repository at this point in the history
)
  • Loading branch information
const314 committed Jun 2, 2023
1 parent 66f9afc commit 65f8034
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
2 changes: 1 addition & 1 deletion packages/devextreme-react-generator/package.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"author": "Developer Express Inc.",
"name": "devextreme-react-generator",
"version": "4.1.1",
"version": "4.1.2",
"description": "DevExtreme React UI and Visualization Components",
"repository": {
"type": "git",
Expand Down
5 changes: 4 additions & 1 deletion packages/devextreme-react-generator/src/generator.ts
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,10 @@ export function getComplexOptionType(
}

function formatFunctionDescriptor(functionDescriptor: IFunctionDescr): string {
const parameters = functionDescriptor.params?.map((p) => `${p.name}: ${getComplexOptionType(p.types, resolveCustomType) || BaseTypes.Any}`)
const parameters = functionDescriptor.params?.map((p) => {
const parameterType = getComplexOptionType(p.types, resolveCustomType) || BaseTypes.Any;
return `${p.name}: ${parameterType === BaseTypes.Object ? BaseTypes.Any : parameterType}`;
})
.join(', ') || '';
const returnType = (
functionDescriptor.returnValueType && (formatTypeDescriptor(functionDescriptor.returnValueType) || (functionDescriptor.returnValueType.type === 'void' && 'void'))
Expand Down
2 changes: 1 addition & 1 deletion packages/devextreme-react/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"@types/react-dom": "^16.9.16",
"del": "^3.0.0",
"devextreme": "23.1-next",
"devextreme-react-generator": "^4.1.1",
"devextreme-react-generator": "^4.1.2",
"gulp": "^4.0.2",
"jest": "^25.0.0",
"react": "~18.0.0",
Expand Down

0 comments on commit 65f8034

Please sign in to comment.