Skip to content

Commit 4ed29be

Browse files
alexslavralexslavr
authored
Regenerate angular after migration to IMD metadata (#28379)
1 parent 7e2c016 commit 4ed29be

File tree

743 files changed

+29304
-37200
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

743 files changed

+29304
-37200
lines changed

‎package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"devextreme:inject-descriptions-to-bundle": "dx-tools inject-descriptions --target-path ./packages/devextreme/ts/dx.all.d.ts --artifacts ./artifacts/internal-tools",
88
"devextreme:inject-descriptions-to-modules": "dx-tools inject-descriptions --collapse-tags --sources ./packages/devextreme/js --artifacts ./artifacts/internal-tools",
99
"devextreme:inject-descriptions": "npm run devextreme:inject-descriptions-to-bundle && npm run devextreme:inject-descriptions-to-modules",
10-
"angular:copy-metadata": "shx mkdir -p ./packages/devextreme-angular/metadata/ && shx cp ./artifacts/internal-tools/NGMetaData.json ./packages/devextreme-angular/metadata/",
10+
"angular:copy-metadata": "shx mkdir -p ./packages/devextreme-angular/metadata/ && shx cp ./artifacts/internal-tools/NGMetaData.json ./packages/devextreme-angular/metadata/ && shx cp ./artifacts/internal-tools/integration-data.json ./packages/devextreme-angular/metadata/",
1111
"angular:regenerate": "nx regenerate devextreme-angular",
1212
"angular:inject-descriptions": "dx-tools inject-descriptions --sources ./packages/devextreme-angular/npm/dist --artifacts ./artifacts/internal-tools",
1313
"react:copy-metadata": "shx mkdir -p ./packages/devextreme-react/metadata/ && shx cp ./artifacts/internal-tools/integration-data.json ./packages/devextreme-react/metadata/",
@@ -44,7 +44,7 @@
4444
"axe-core": "4.10.0",
4545
"cheerio": "1.0.0-rc.10",
4646
"codelyzer": "6.0.2",
47-
"devextreme-internal-tools": "16.0.0-beta.12",
47+
"devextreme-internal-tools": "16.0.0-beta.13",
4848
"http-server": "14.1.1",
4949
"husky": "8.0.3",
5050
"jest": "29.7.0",

‎packages/devextreme-angular/build.config.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ module.exports = {
22
tools: {
33
metadataGenerator: {
44
sourceMetadataFilePath: './metadata/NGMetaData.json',
5+
imdMetadataFilePath: './metadata/integration-data.json',
56
deprecatedMetadataFilePath: './metadata/DeprecatedComponentsMetadata.json',
67
outputFolderPath: './metadata/generated',
78
nestedPathPart: 'nested',

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

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@ import {
2323

2424
export { ExplicitTypes } from 'devextreme/ui/accordion';
2525

26-
import { Store } from 'devextreme/data';
27-
import DataSource, { Options as DataSourceOptions } from 'devextreme/data/data_source';
28-
import { ContentReadyEvent, DisposingEvent, dxAccordionItem, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, ItemTitleClickEvent, OptionChangedEvent, SelectionChangedEvent } from 'devextreme/ui/accordion';
26+
import DataSource from 'devextreme/data/data_source';
27+
import { dxAccordionItem, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, ItemTitleClickEvent, OptionChangedEvent, SelectionChangedEvent } from 'devextreme/ui/accordion';
28+
import { DataSourceOptions } from 'devextreme/data/data_source';
29+
import { Store } from 'devextreme/data/store';
2930

3031
import DxAccordion from 'devextreme/ui/accordion';
3132

@@ -123,10 +124,10 @@ export class DxAccordionComponent<TItem = any, TKey = any> extends DxComponent i
123124
124125
*/
125126
@Input()
126-
get dataSource(): Store | DataSource | DataSourceOptions | null | string | Array<dxAccordionItem | string | any> {
127+
get dataSource(): Array<any | dxAccordionItem | string> | DataSource | DataSourceOptions | null | Store | string {
127128
return this._getOption('dataSource');
128129
}
129-
set dataSource(value: Store | DataSource | DataSourceOptions | null | string | Array<dxAccordionItem | string | any>) {
130+
set dataSource(value: Array<any | dxAccordionItem | string> | DataSource | DataSourceOptions | null | Store | string) {
130131
this._setOption('dataSource', value);
131132
}
132133

@@ -162,10 +163,10 @@ export class DxAccordionComponent<TItem = any, TKey = any> extends DxComponent i
162163
163164
*/
164165
@Input()
165-
get elementAttr(): any {
166+
get elementAttr(): Record<string, any> {
166167
return this._getOption('elementAttr');
167168
}
168-
set elementAttr(value: any) {
169+
set elementAttr(value: Record<string, any>) {
169170
this._setOption('elementAttr', value);
170171
}
171172

@@ -188,10 +189,10 @@ export class DxAccordionComponent<TItem = any, TKey = any> extends DxComponent i
188189
189190
*/
190191
@Input()
191-
get height(): number | Function | string | undefined {
192+
get height(): (() => number | string) | number | string | undefined {
192193
return this._getOption('height');
193194
}
194-
set height(value: number | Function | string | undefined) {
195+
set height(value: (() => number | string) | number | string | undefined) {
195196
this._setOption('height', value);
196197
}
197198

@@ -240,10 +241,10 @@ export class DxAccordionComponent<TItem = any, TKey = any> extends DxComponent i
240241
241242
*/
242243
@Input()
243-
get items(): Array<string | any | { disabled?: boolean, html?: string, icon?: string, template?: any, text?: string, title?: string, titleTemplate?: any, visible?: boolean }> {
244+
get items(): Array<any | dxAccordionItem | string> {
244245
return this._getOption('items');
245246
}
246-
set items(value: Array<string | any | { disabled?: boolean, html?: string, icon?: string, template?: any, text?: string, title?: string, titleTemplate?: any, visible?: boolean }>) {
247+
set items(value: Array<any | dxAccordionItem | string>) {
247248
this._setOption('items', value);
248249
}
249250

@@ -422,10 +423,10 @@ export class DxAccordionComponent<TItem = any, TKey = any> extends DxComponent i
422423
423424
*/
424425
@Input()
425-
get width(): number | Function | string | undefined {
426+
get width(): (() => number | string) | number | string | undefined {
426427
return this._getOption('width');
427428
}
428-
set width(value: number | Function | string | undefined) {
429+
set width(value: (() => number | string) | number | string | undefined) {
429430
this._setOption('width', value);
430431
}
431432

@@ -542,7 +543,7 @@ export class DxAccordionComponent<TItem = any, TKey = any> extends DxComponent i
542543
* This member supports the internal infrastructure and is not intended to be used directly from your code.
543544
544545
*/
545-
@Output() dataSourceChange: EventEmitter<Store | DataSource | DataSourceOptions | null | string | Array<dxAccordionItem | string | any>>;
546+
@Output() dataSourceChange: EventEmitter<Array<any | dxAccordionItem | string> | DataSource | DataSourceOptions | null | Store | string>;
546547

547548
/**
548549
@@ -563,7 +564,7 @@ export class DxAccordionComponent<TItem = any, TKey = any> extends DxComponent i
563564
* This member supports the internal infrastructure and is not intended to be used directly from your code.
564565
565566
*/
566-
@Output() elementAttrChange: EventEmitter<any>;
567+
@Output() elementAttrChange: EventEmitter<Record<string, any>>;
567568

568569
/**
569570
@@ -577,7 +578,7 @@ export class DxAccordionComponent<TItem = any, TKey = any> extends DxComponent i
577578
* This member supports the internal infrastructure and is not intended to be used directly from your code.
578579
579580
*/
580-
@Output() heightChange: EventEmitter<number | Function | string | undefined>;
581+
@Output() heightChange: EventEmitter<(() => number | string) | number | string | undefined>;
581582

582583
/**
583584
@@ -605,7 +606,7 @@ export class DxAccordionComponent<TItem = any, TKey = any> extends DxComponent i
605606
* This member supports the internal infrastructure and is not intended to be used directly from your code.
606607
607608
*/
608-
@Output() itemsChange: EventEmitter<Array<string | any | { disabled?: boolean, html?: string, icon?: string, template?: any, text?: string, title?: string, titleTemplate?: any, visible?: boolean }>>;
609+
@Output() itemsChange: EventEmitter<Array<any | dxAccordionItem | string>>;
609610

610611
/**
611612
@@ -703,7 +704,7 @@ export class DxAccordionComponent<TItem = any, TKey = any> extends DxComponent i
703704
* This member supports the internal infrastructure and is not intended to be used directly from your code.
704705
705706
*/
706-
@Output() widthChange: EventEmitter<number | Function | string | undefined>;
707+
@Output() widthChange: EventEmitter<(() => number | string) | number | string | undefined>;
707708

708709

709710

‎packages/devextreme-angular/src/ui/action-sheet/index.ts‎

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,10 @@ import {
2323

2424
export { ExplicitTypes } from 'devextreme/ui/action_sheet';
2525

26-
import { ButtonStyle, ButtonType } from 'devextreme/common';
27-
import { UserDefinedElement } from 'devextreme/core/element';
28-
import { Store } from 'devextreme/data';
29-
import DataSource, { Options as DataSourceOptions } from 'devextreme/data/data_source';
30-
import { CancelClickEvent, ContentReadyEvent, DisposingEvent, dxActionSheetItem, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, OptionChangedEvent } from 'devextreme/ui/action_sheet';
26+
import DataSource from 'devextreme/data/data_source';
27+
import { dxActionSheetItem, CancelClickEvent, ContentReadyEvent, DisposingEvent, InitializedEvent, ItemClickEvent, ItemContextMenuEvent, ItemHoldEvent, ItemRenderedEvent, OptionChangedEvent } from 'devextreme/ui/action_sheet';
28+
import { DataSourceOptions } from 'devextreme/data/data_source';
29+
import { Store } from 'devextreme/data/store';
3130

3231
import DxActionSheet from 'devextreme/ui/action_sheet';
3332

@@ -86,10 +85,10 @@ export class DxActionSheetComponent<TItem = any, TKey = any> extends DxComponent
8685
8786
*/
8887
@Input()
89-
get dataSource(): Store | DataSource | DataSourceOptions | null | string | Array<dxActionSheetItem | string | any> {
88+
get dataSource(): Array<any | dxActionSheetItem | string> | DataSource | DataSourceOptions | null | Store | string {
9089
return this._getOption('dataSource');
9190
}
92-
set dataSource(value: Store | DataSource | DataSourceOptions | null | string | Array<dxActionSheetItem | string | any>) {
91+
set dataSource(value: Array<any | dxActionSheetItem | string> | DataSource | DataSourceOptions | null | Store | string) {
9392
this._setOption('dataSource', value);
9493
}
9594

@@ -112,10 +111,10 @@ export class DxActionSheetComponent<TItem = any, TKey = any> extends DxComponent
112111
113112
*/
114113
@Input()
115-
get elementAttr(): any {
114+
get elementAttr(): Record<string, any> {
116115
return this._getOption('elementAttr');
117116
}
118-
set elementAttr(value: any) {
117+
set elementAttr(value: Record<string, any>) {
119118
this._setOption('elementAttr', value);
120119
}
121120

@@ -125,10 +124,10 @@ export class DxActionSheetComponent<TItem = any, TKey = any> extends DxComponent
125124
126125
*/
127126
@Input()
128-
get height(): number | Function | string | undefined {
127+
get height(): (() => number | string) | number | string | undefined {
129128
return this._getOption('height');
130129
}
131-
set height(value: number | Function | string | undefined) {
130+
set height(value: (() => number | string) | number | string | undefined) {
132131
this._setOption('height', value);
133132
}
134133

@@ -177,10 +176,10 @@ export class DxActionSheetComponent<TItem = any, TKey = any> extends DxComponent
177176
178177
*/
179178
@Input()
180-
get items(): Array<string | any | { disabled?: boolean, icon?: string, onClick?: Function, stylingMode?: ButtonStyle, template?: any, text?: string, type?: ButtonType }> {
179+
get items(): Array<any | dxActionSheetItem | string> {
181180
return this._getOption('items');
182181
}
183-
set items(value: Array<string | any | { disabled?: boolean, icon?: string, onClick?: Function, stylingMode?: ButtonStyle, template?: any, text?: string, type?: ButtonType }>) {
182+
set items(value: Array<any | dxActionSheetItem | string>) {
184183
this._setOption('items', value);
185184
}
186185

@@ -242,10 +241,10 @@ export class DxActionSheetComponent<TItem = any, TKey = any> extends DxComponent
242241
243242
*/
244243
@Input()
245-
get target(): UserDefinedElement | string {
244+
get target(): any | string {
246245
return this._getOption('target');
247246
}
248-
set target(value: UserDefinedElement | string) {
247+
set target(value: any | string) {
249248
this._setOption('target', value);
250249
}
251250

@@ -294,10 +293,10 @@ export class DxActionSheetComponent<TItem = any, TKey = any> extends DxComponent
294293
295294
*/
296295
@Input()
297-
get width(): number | Function | string | undefined {
296+
get width(): (() => number | string) | number | string | undefined {
298297
return this._getOption('width');
299298
}
300-
set width(value: number | Function | string | undefined) {
299+
set width(value: (() => number | string) | number | string | undefined) {
301300
this._setOption('width', value);
302301
}
303302

@@ -385,7 +384,7 @@ export class DxActionSheetComponent<TItem = any, TKey = any> extends DxComponent
385384
* This member supports the internal infrastructure and is not intended to be used directly from your code.
386385
387386
*/
388-
@Output() dataSourceChange: EventEmitter<Store | DataSource | DataSourceOptions | null | string | Array<dxActionSheetItem | string | any>>;
387+
@Output() dataSourceChange: EventEmitter<Array<any | dxActionSheetItem | string> | DataSource | DataSourceOptions | null | Store | string>;
389388

390389
/**
391390
@@ -399,14 +398,14 @@ export class DxActionSheetComponent<TItem = any, TKey = any> extends DxComponent
399398
* This member supports the internal infrastructure and is not intended to be used directly from your code.
400399
401400
*/
402-
@Output() elementAttrChange: EventEmitter<any>;
401+
@Output() elementAttrChange: EventEmitter<Record<string, any>>;
403402

404403
/**
405404
406405
* This member supports the internal infrastructure and is not intended to be used directly from your code.
407406
408407
*/
409-
@Output() heightChange: EventEmitter<number | Function | string | undefined>;
408+
@Output() heightChange: EventEmitter<(() => number | string) | number | string | undefined>;
410409

411410
/**
412411
@@ -434,7 +433,7 @@ export class DxActionSheetComponent<TItem = any, TKey = any> extends DxComponent
434433
* This member supports the internal infrastructure and is not intended to be used directly from your code.
435434
436435
*/
437-
@Output() itemsChange: EventEmitter<Array<string | any | { disabled?: boolean, icon?: string, onClick?: Function, stylingMode?: ButtonStyle, template?: any, text?: string, type?: ButtonType }>>;
436+
@Output() itemsChange: EventEmitter<Array<any | dxActionSheetItem | string>>;
438437

439438
/**
440439
@@ -469,7 +468,7 @@ export class DxActionSheetComponent<TItem = any, TKey = any> extends DxComponent
469468
* This member supports the internal infrastructure and is not intended to be used directly from your code.
470469
471470
*/
472-
@Output() targetChange: EventEmitter<UserDefinedElement | string>;
471+
@Output() targetChange: EventEmitter<any | string>;
473472

474473
/**
475474
@@ -497,7 +496,7 @@ export class DxActionSheetComponent<TItem = any, TKey = any> extends DxComponent
497496
* This member supports the internal infrastructure and is not intended to be used directly from your code.
498497
499498
*/
500-
@Output() widthChange: EventEmitter<number | Function | string | undefined>;
499+
@Output() widthChange: EventEmitter<(() => number | string) | number | string | undefined>;
501500

502501

503502

‎packages/devextreme-angular/src/ui/action-sheet/nested/item-dxi.ts‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import {
1616
import { DOCUMENT } from '@angular/common';
1717

1818

19+
import { NativeEventInfo } from 'devextreme/events/index';
1920
import { ButtonStyle, ButtonType } from 'devextreme/common';
2021

2122
import {
@@ -53,10 +54,10 @@ export class DxiActionSheetItemComponent extends CollectionNestedOption implemen
5354
}
5455

5556
@Input()
56-
get onClick(): Function {
57+
get onClick(): ((e: NativeEventInfo<any>) => void) {
5758
return this._getOption('onClick');
5859
}
59-
set onClick(value: Function) {
60+
set onClick(value: ((e: NativeEventInfo<any>) => void)) {
6061
this._setOption('onClick', value);
6162
}
6263

0 commit comments

Comments
 (0)