d.ts - Replace [Smth]Options members of 'Function' type (smthExpr) to more specific to keep exact signature in generated wrappers (#33285)

Author: dmlvr

packages/devextreme-angular/src/ui/accordion/index.ts

@@ -287,10 +287,10 @@ export class DxAccordionComponent<TItem = any, TKey = any> extends DxComponent i
     
      */
     @Input()
-    get keyExpr(): Function | string {
+    get keyExpr(): ((item: any) => any) | string {
         return this._getOption('keyExpr');
     }
-    set keyExpr(value: Function | string) {
+    set keyExpr(value: ((item: any) => any) | string) {
         this._setOption('keyExpr', value);
     }
 
@@ -634,7 +634,7 @@ export class DxAccordionComponent<TItem = any, TKey = any> extends DxComponent i
      * This member supports the internal infrastructure and is not intended to be used directly from your code.
     
      */
-    @Output() keyExprChange: EventEmitter<Function | string>;
+    @Output() keyExprChange: EventEmitter<((item: any) => any) | string>;
 
     /**
     

packages/devextreme-angular/src/ui/button-group/index.ts

@@ -207,10 +207,10 @@ export class DxButtonGroupComponent extends DxComponent implements OnDestroy, On
     
      */
     @Input()
-    get keyExpr(): Function | string {
+    get keyExpr(): ((item: any) => any) | string {
         return this._getOption('keyExpr');
     }
-    set keyExpr(value: Function | string) {
+    set keyExpr(value: ((item: any) => any) | string) {
         this._setOption('keyExpr', value);
     }
 
@@ -441,7 +441,7 @@ export class DxButtonGroupComponent extends DxComponent implements OnDestroy, On
      * This member supports the internal infrastructure and is not intended to be used directly from your code.
     
      */
-    @Output() keyExprChange: EventEmitter<Function | string>;
+    @Output() keyExprChange: EventEmitter<((item: any) => any) | string>;
 
     /**
     

packages/devextreme-angular/src/ui/card-view/nested/tab-panel-options.ts

@@ -176,10 +176,10 @@ export class DxoCardViewTabPanelOptionsComponent extends NestedOption implements
     }
 
     @Input()
-    get keyExpr(): Function | string {
+    get keyExpr(): ((item: any) => any) | string {
         return this._getOption('keyExpr');
     }
-    set keyExpr(value: Function | string) {
+    set keyExpr(value: ((item: any) => any) | string) {
         this._setOption('keyExpr', value);
     }
 

packages/devextreme-angular/src/ui/chat/nested/suggestions.ts

@@ -126,10 +126,10 @@ export class DxoChatSuggestionsComponent extends NestedOption implements OnDestr
     }
 
     @Input()
-    get keyExpr(): Function | string {
+    get keyExpr(): ((item: any) => any) | string {
         return this._getOption('keyExpr');
     }
-    set keyExpr(value: Function | string) {
+    set keyExpr(value: ((item: any) => any) | string) {
         this._setOption('keyExpr', value);
     }
 

packages/devextreme-angular/src/ui/context-menu/index.ts

@@ -188,10 +188,10 @@ export class DxContextMenuComponent<TItem = any, TKey = any> extends DxComponent
     
      */
     @Input()
-    get disabledExpr(): Function | string {
+    get disabledExpr(): ((item: any) => boolean | undefined) | string {
         return this._getOption('disabledExpr');
     }
-    set disabledExpr(value: Function | string) {
+    set disabledExpr(value: ((item: any) => boolean | undefined) | string) {
         this._setOption('disabledExpr', value);
     }
 
@@ -305,10 +305,10 @@ export class DxContextMenuComponent<TItem = any, TKey = any> extends DxComponent
     
      */
     @Input()
-    get itemsExpr(): Function | string {
+    get itemsExpr(): ((item: any) => Array<any> | undefined) | string {
         return this._getOption('itemsExpr');
     }
-    set itemsExpr(value: Function | string) {
+    set itemsExpr(value: ((item: any) => Array<any> | undefined) | string) {
         this._setOption('itemsExpr', value);
     }
 
@@ -370,10 +370,10 @@ export class DxContextMenuComponent<TItem = any, TKey = any> extends DxComponent
     
      */
     @Input()
-    get selectedExpr(): Function | string {
+    get selectedExpr(): ((item: any, value: boolean | undefined) => boolean | undefined) | string {
         return this._getOption('selectedExpr');
     }
-    set selectedExpr(value: Function | string) {
+    set selectedExpr(value: ((item: any, value: boolean | undefined) => boolean | undefined) | string) {
         this._setOption('selectedExpr', value);
     }
 
@@ -645,7 +645,7 @@ export class DxContextMenuComponent<TItem = any, TKey = any> extends DxComponent
      * This member supports the internal infrastructure and is not intended to be used directly from your code.
     
      */
-    @Output() disabledExprChange: EventEmitter<Function | string>;
+    @Output() disabledExprChange: EventEmitter<((item: any) => boolean | undefined) | string>;
 
     /**
     
@@ -708,7 +708,7 @@ export class DxContextMenuComponent<TItem = any, TKey = any> extends DxComponent
      * This member supports the internal infrastructure and is not intended to be used directly from your code.
     
      */
-    @Output() itemsExprChange: EventEmitter<Function | string>;
+    @Output() itemsExprChange: EventEmitter<((item: any) => Array<any> | undefined) | string>;
 
     /**
     
@@ -743,7 +743,7 @@ export class DxContextMenuComponent<TItem = any, TKey = any> extends DxComponent
      * This member supports the internal infrastructure and is not intended to be used directly from your code.
     
      */
-    @Output() selectedExprChange: EventEmitter<Function | string>;
+    @Output() selectedExprChange: EventEmitter<((item: any, value: boolean | undefined) => boolean | undefined) | string>;
 
     /**
     

packages/devextreme-angular/src/ui/data-grid/nested/tab-panel-options.ts

@@ -176,10 +176,10 @@ export class DxoDataGridTabPanelOptionsComponent extends NestedOption implements
     }
 
     @Input()
-    get keyExpr(): Function | string {
+    get keyExpr(): ((item: any) => any) | string {
         return this._getOption('keyExpr');
     }
-    set keyExpr(value: Function | string) {
+    set keyExpr(value: ((item: any) => any) | string) {
         this._setOption('keyExpr', value);
     }
 

packages/devextreme-angular/src/ui/form/nested/tab-panel-options.ts

@@ -176,10 +176,10 @@ export class DxoFormTabPanelOptionsComponent extends NestedOption implements OnD
     }
 
     @Input()
-    get keyExpr(): Function | string {
+    get keyExpr(): ((item: any) => any) | string {
         return this._getOption('keyExpr');
     }
-    set keyExpr(value: Function | string) {
+    set keyExpr(value: ((item: any) => any) | string) {
         this._setOption('keyExpr', value);
     }
 

packages/devextreme-angular/src/ui/gantt/index.ts

@@ -199,10 +199,10 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange
     
      */
     @Input()
-    get dependencies(): { dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: Function | string, predecessorIdExpr?: Function | string, successorIdExpr?: Function | string, typeExpr?: Function | string } {
+    get dependencies(): { dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: ((dependency: any) => any) | string, predecessorIdExpr?: ((dependency: any, value: any) => any) | string, successorIdExpr?: ((dependency: any, value: any) => any) | string, typeExpr?: ((dependency: any, value: any) => any) | string } {
         return this._getOption('dependencies');
     }
-    set dependencies(value: { dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: Function | string, predecessorIdExpr?: Function | string, successorIdExpr?: Function | string, typeExpr?: Function | string }) {
+    set dependencies(value: { dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: ((dependency: any) => any) | string, predecessorIdExpr?: ((dependency: any, value: any) => any) | string, successorIdExpr?: ((dependency: any, value: any) => any) | string, typeExpr?: ((dependency: any, value: any) => any) | string }) {
         this._setOption('dependencies', value);
     }
 
@@ -355,10 +355,10 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange
     
      */
     @Input()
-    get resourceAssignments(): { dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: Function | string, resourceIdExpr?: Function | string, taskIdExpr?: Function | string } {
+    get resourceAssignments(): { dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: ((resourceAssignment: any) => any) | string, resourceIdExpr?: ((resourceAssignment: any, value: any) => any) | string, taskIdExpr?: ((resourceAssignment: any, value: any) => any) | string } {
         return this._getOption('resourceAssignments');
     }
-    set resourceAssignments(value: { dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: Function | string, resourceIdExpr?: Function | string, taskIdExpr?: Function | string }) {
+    set resourceAssignments(value: { dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: ((resourceAssignment: any) => any) | string, resourceIdExpr?: ((resourceAssignment: any, value: any) => any) | string, taskIdExpr?: ((resourceAssignment: any, value: any) => any) | string }) {
         this._setOption('resourceAssignments', value);
     }
 
@@ -368,10 +368,10 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange
     
      */
     @Input()
-    get resources(): { colorExpr?: Function | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: Function | string, textExpr?: Function | string } {
+    get resources(): { colorExpr?: ((resource: any, value: any) => any) | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: ((resource: any) => any) | string, textExpr?: ((resource: any, value: any) => string) | string } {
         return this._getOption('resources');
     }
-    set resources(value: { colorExpr?: Function | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: Function | string, textExpr?: Function | string }) {
+    set resources(value: { colorExpr?: ((resource: any, value: any) => any) | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: ((resource: any) => any) | string, textExpr?: ((resource: any, value: any) => string) | string }) {
         this._setOption('resources', value);
     }
 
@@ -563,10 +563,10 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange
     
      */
     @Input()
-    get tasks(): { colorExpr?: Function | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, endExpr?: Function | string, keyExpr?: Function | string, parentIdExpr?: Function | string, progressExpr?: Function | string, startExpr?: Function | string, titleExpr?: Function | string } {
+    get tasks(): { colorExpr?: ((task: any, value: any) => any) | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, endExpr?: ((task: any, value: any) => any) | string, keyExpr?: ((task: any) => any) | string, parentIdExpr?: ((task: any, value: any) => any) | string, progressExpr?: ((task: any, value: any) => any) | string, startExpr?: ((task: any, value: any) => any) | string, titleExpr?: ((task: any, value: any) => any) | string } {
         return this._getOption('tasks');
     }
-    set tasks(value: { colorExpr?: Function | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, endExpr?: Function | string, keyExpr?: Function | string, parentIdExpr?: Function | string, progressExpr?: Function | string, startExpr?: Function | string, titleExpr?: Function | string }) {
+    set tasks(value: { colorExpr?: ((task: any, value: any) => any) | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, endExpr?: ((task: any, value: any) => any) | string, keyExpr?: ((task: any) => any) | string, parentIdExpr?: ((task: any, value: any) => any) | string, progressExpr?: ((task: any, value: any) => any) | string, startExpr?: ((task: any, value: any) => any) | string, titleExpr?: ((task: any, value: any) => any) | string }) {
         this._setOption('tasks', value);
     }
 
@@ -949,7 +949,7 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange
      * This member supports the internal infrastructure and is not intended to be used directly from your code.
     
      */
-    @Output() dependenciesChange: EventEmitter<{ dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: Function | string, predecessorIdExpr?: Function | string, successorIdExpr?: Function | string, typeExpr?: Function | string }>;
+    @Output() dependenciesChange: EventEmitter<{ dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: ((dependency: any) => any) | string, predecessorIdExpr?: ((dependency: any, value: any) => any) | string, successorIdExpr?: ((dependency: any, value: any) => any) | string, typeExpr?: ((dependency: any, value: any) => any) | string }>;
 
     /**
     
@@ -1033,14 +1033,14 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange
      * This member supports the internal infrastructure and is not intended to be used directly from your code.
     
      */
-    @Output() resourceAssignmentsChange: EventEmitter<{ dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: Function | string, resourceIdExpr?: Function | string, taskIdExpr?: Function | string }>;
+    @Output() resourceAssignmentsChange: EventEmitter<{ dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: ((resourceAssignment: any) => any) | string, resourceIdExpr?: ((resourceAssignment: any, value: any) => any) | string, taskIdExpr?: ((resourceAssignment: any, value: any) => any) | string }>;
 
     /**
     
      * This member supports the internal infrastructure and is not intended to be used directly from your code.
     
      */
-    @Output() resourcesChange: EventEmitter<{ colorExpr?: Function | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: Function | string, textExpr?: Function | string }>;
+    @Output() resourcesChange: EventEmitter<{ colorExpr?: ((resource: any, value: any) => any) | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, keyExpr?: ((resource: any) => any) | string, textExpr?: ((resource: any, value: any) => string) | string }>;
 
     /**
     
@@ -1145,7 +1145,7 @@ export class DxGanttComponent extends DxComponent implements OnDestroy, OnChange
      * This member supports the internal infrastructure and is not intended to be used directly from your code.
     
      */
-    @Output() tasksChange: EventEmitter<{ colorExpr?: Function | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, endExpr?: Function | string, keyExpr?: Function | string, parentIdExpr?: Function | string, progressExpr?: Function | string, startExpr?: Function | string, titleExpr?: Function | string }>;
+    @Output() tasksChange: EventEmitter<{ colorExpr?: ((task: any, value: any) => any) | string, dataSource?: Array<any> | DataSource | DataSourceOptions | null | Store | string, endExpr?: ((task: any, value: any) => any) | string, keyExpr?: ((task: any) => any) | string, parentIdExpr?: ((task: any, value: any) => any) | string, progressExpr?: ((task: any, value: any) => any) | string, startExpr?: ((task: any, value: any) => any) | string, titleExpr?: ((task: any, value: any) => any) | string }>;
 
     /**
     

packages/devextreme-angular/src/ui/gantt/nested/dependencies.ts

@@ -41,34 +41,34 @@ export class DxoGanttDependenciesComponent extends NestedOption implements OnDes
     }
 
     @Input()
-    get keyExpr(): Function | string {
+    get keyExpr(): ((dependency: any) => any) | string {
         return this._getOption('keyExpr');
     }
-    set keyExpr(value: Function | string) {
+    set keyExpr(value: ((dependency: any) => any) | string) {
         this._setOption('keyExpr', value);
     }
 
     @Input()
-    get predecessorIdExpr(): Function | string {
+    get predecessorIdExpr(): ((dependency: any, value: any) => any) | string {
         return this._getOption('predecessorIdExpr');
     }
-    set predecessorIdExpr(value: Function | string) {
+    set predecessorIdExpr(value: ((dependency: any, value: any) => any) | string) {
         this._setOption('predecessorIdExpr', value);
     }
 
     @Input()
-    get successorIdExpr(): Function | string {
+    get successorIdExpr(): ((dependency: any, value: any) => any) | string {
         return this._getOption('successorIdExpr');
     }
-    set successorIdExpr(value: Function | string) {
+    set successorIdExpr(value: ((dependency: any, value: any) => any) | string) {
         this._setOption('successorIdExpr', value);
     }
 
     @Input()
-    get typeExpr(): Function | string {
+    get typeExpr(): ((dependency: any, value: any) => any) | string {
         return this._getOption('typeExpr');
     }
-    set typeExpr(value: Function | string) {
+    set typeExpr(value: ((dependency: any, value: any) => any) | string) {
         this._setOption('typeExpr', value);
     }
 

packages/devextreme-angular/src/ui/gantt/nested/resource-assignments.ts

@@ -41,26 +41,26 @@ export class DxoGanttResourceAssignmentsComponent extends NestedOption implement
     }
 
     @Input()
-    get keyExpr(): Function | string {
+    get keyExpr(): ((resourceAssignment: any) => any) | string {
         return this._getOption('keyExpr');
     }
-    set keyExpr(value: Function | string) {
+    set keyExpr(value: ((resourceAssignment: any) => any) | string) {
         this._setOption('keyExpr', value);
     }
 
     @Input()
-    get resourceIdExpr(): Function | string {
+    get resourceIdExpr(): ((resourceAssignment: any, value: any) => any) | string {
         return this._getOption('resourceIdExpr');
     }
-    set resourceIdExpr(value: Function | string) {
+    set resourceIdExpr(value: ((resourceAssignment: any, value: any) => any) | string) {
         this._setOption('resourceIdExpr', value);
     }
 
     @Input()
-    get taskIdExpr(): Function | string {
+    get taskIdExpr(): ((resourceAssignment: any, value: any) => any) | string {
         return this._getOption('taskIdExpr');
     }
-    set taskIdExpr(value: Function | string) {
+    set taskIdExpr(value: ((resourceAssignment: any, value: any) => any) | string) {
         this._setOption('taskIdExpr', value);
     }