From 98302e417eca5f51bc2657be1587b2def1840e59 Mon Sep 17 00:00:00 2001
From: Mert Sincan <sincan.mert@gmail.com>
Date: Thu, 16 May 2024 11:50:43 +0100
Subject: [PATCH] Fixed #5405 - TypeScript emits are in an incompatible format
 with defineEmits

---
 components/lib/accordion/Accordion.d.ts       | 10 +++--
 .../accordioncontent/AccordionContent.d.ts    | 10 +++--
 .../lib/accordionheader/AccordionHeader.d.ts  | 10 +++--
 .../lib/accordionpanel/AccordionPanel.d.ts    | 10 +++--
 components/lib/accordiontab/AccordionTab.d.ts | 11 +++--
 components/lib/autocomplete/AutoComplete.d.ts | 10 +++--
 components/lib/avatar/Avatar.d.ts             | 11 +++--
 components/lib/avatargroup/AvatarGroup.d.ts   | 11 +++--
 components/lib/badge/Badge.d.ts               | 11 +++--
 components/lib/blockui/BlockUI.d.ts           | 11 +++--
 components/lib/breadcrumb/Breadcrumb.d.ts     | 10 +++--
 components/lib/button/Button.d.ts             | 11 +++--
 components/lib/buttongroup/ButtonGroup.d.ts   | 11 +++--
 components/lib/calendar/Calendar.d.ts         | 11 +++--
 components/lib/card/Card.d.ts                 | 11 +++--
 components/lib/carousel/Carousel.d.ts         | 10 +++--
 .../lib/cascadeselect/CascadeSelect.d.ts      | 11 +++--
 components/lib/chart/Chart.d.ts               | 36 ++++++++-------
 components/lib/checkbox/Checkbox.d.ts         | 10 +++--
 components/lib/chip/Chip.d.ts                 | 11 +++--
 components/lib/chips/Chips.d.ts               | 10 +++--
 components/lib/colorpicker/ColorPicker.d.ts   | 10 +++--
 components/lib/column/Column.d.ts             | 13 +++---
 components/lib/columngroup/ColumnGroup.d.ts   | 11 +++--
 .../lib/confirmdialog/ConfirmDialog.d.ts      | 11 +++--
 components/lib/confirmpopup/ConfirmPopup.d.ts | 11 +++--
 components/lib/contextmenu/ContextMenu.d.ts   | 38 +++++++++-------
 components/lib/datatable/DataTable.d.ts       | 27 ++++++-----
 components/lib/dataview/DataView.d.ts         | 10 +++--
 components/lib/datepicker/DatePicker.d.ts     | 11 +++--
 .../lib/deferredcontent/DeferredContent.d.ts  | 11 +++--
 components/lib/dialog/Dialog.d.ts             | 11 +++--
 components/lib/divider/Divider.d.ts           | 10 +++--
 components/lib/dock/Dock.d.ts                 | 10 +++--
 components/lib/drawer/Drawer.d.ts             | 11 +++--
 components/lib/dropdown/Dropdown.d.ts         | 39 +++++++++-------
 .../lib/dynamicdialog/DynamicDialog.d.ts      | 19 ++++----
 components/lib/editor/Editor.d.ts             | 10 +++--
 components/lib/fieldset/Fieldset.d.ts         | 10 +++--
 components/lib/fileupload/FileUpload.d.ts     | 26 ++++++-----
 components/lib/floatlabel/FloatLabel.d.ts     | 10 +++--
 components/lib/galleria/Galleria.d.ts         | 10 +++--
 components/lib/iconfield/IconField.d.ts       | 10 +++--
 components/lib/icons/index.d.ts               |  8 ++--
 components/lib/image/Image.d.ts               | 36 ++++++++-------
 .../lib/inlinemessage/InlineMessage.d.ts      | 10 +++--
 components/lib/inplace/Inplace.d.ts           | 11 +++--
 components/lib/inputchips/InputChips.d.ts     | 10 +++--
 components/lib/inputgroup/InputGroup.d.ts     | 11 +++--
 .../lib/inputgroupaddon/InputGroupAddon.d.ts  | 11 +++--
 components/lib/inputicon/InputIcon.d.ts       | 11 +++--
 components/lib/inputmask/InputMask.d.ts       | 10 +++--
 components/lib/inputnumber/InputNumber.d.ts   | 27 ++++++-----
 components/lib/inputotp/InputOtp.d.ts         | 10 +++--
 components/lib/inputswitch/InputSwitch.d.ts   | 10 +++--
 components/lib/inputtext/InputText.d.ts       | 11 +++--
 components/lib/knob/Knob.d.ts                 | 12 +++--
 components/lib/listbox/Listbox.d.ts           | 10 +++--
 components/lib/megamenu/MegaMenu.d.ts         | 10 +++--
 components/lib/menu/Menu.d.ts                 | 36 ++++++++-------
 components/lib/menubar/Menubar.d.ts           | 10 +++--
 components/lib/message/Message.d.ts           | 10 +++--
 components/lib/metergroup/MeterGroup.d.ts     | 11 +++--
 components/lib/multiselect/MultiSelect.d.ts   | 36 ++++++++-------
 components/lib/orderlist/OrderList.d.ts       | 11 +++--
 .../organizationchart/OrganizationChart.d.ts  | 11 +++--
 components/lib/overlaypanel/OverlayPanel.d.ts | 39 +++++++++-------
 components/lib/paginator/Paginator.d.ts       | 11 +++--
 components/lib/panel/Panel.d.ts               | 10 +++--
 components/lib/panelmenu/PanelMenu.d.ts       | 10 +++--
 components/lib/password/Password.d.ts         | 11 +++--
 components/lib/picklist/PickList.d.ts         | 11 +++--
 components/lib/popover/Popover.d.ts           | 35 ++++++++-------
 components/lib/portal/Portal.d.ts             | 10 +++--
 components/lib/progressbar/ProgressBar.d.ts   | 11 +++--
 .../lib/progressspinner/ProgressSpinner.d.ts  | 11 +++--
 components/lib/radiobutton/RadioButton.d.ts   | 10 +++--
 components/lib/rating/Rating.d.ts             | 11 +++--
 components/lib/row/Row.d.ts                   | 11 +++--
 components/lib/scrollpanel/ScrollPanel.d.ts   | 10 +++--
 components/lib/scrolltop/ScrollTop.d.ts       | 11 +++--
 components/lib/select/Select.d.ts             | 45 +++++++++++--------
 components/lib/selectbutton/SelectButton.d.ts | 11 +++--
 components/lib/sidebar/Sidebar.d.ts           | 11 +++--
 components/lib/skeleton/Skeleton.d.ts         | 11 +++--
 components/lib/slider/Slider.d.ts             | 10 +++--
 components/lib/speeddial/SpeedDial.d.ts       | 10 +++--
 components/lib/splitbutton/SplitButton.d.ts   | 10 +++--
 components/lib/splitter/Splitter.d.ts         | 10 +++--
 .../lib/splitterpanel/SplitterPanel.d.ts      | 10 +++--
 components/lib/stepper/Stepper.d.ts           | 10 +++--
 components/lib/stepperpanel/StepperPanel.d.ts | 10 +++--
 components/lib/steps/Steps.d.ts               | 10 +++--
 components/lib/tab/Tab.d.ts                   | 10 +++--
 components/lib/tablist/TabList.d.ts           | 10 +++--
 components/lib/tabmenu/TabMenu.d.ts           | 10 +++--
 components/lib/tabpanel/TabPanel.d.ts         | 10 +++--
 components/lib/tabpanels/TabPanels.d.ts       | 10 +++--
 components/lib/tabs/Tabs.d.ts                 | 11 ++---
 components/lib/tabview/TabView.d.ts           | 10 +++--
 components/lib/tag/Tag.d.ts                   | 11 +++--
 components/lib/terminal/Terminal.d.ts         | 11 +++--
 components/lib/textarea/Textarea.d.ts         | 10 +++--
 components/lib/tieredmenu/TieredMenu.d.ts     | 36 ++++++++-------
 components/lib/timeline/Timeline.d.ts         | 11 +++--
 components/lib/toast/Toast.d.ts               | 10 +++--
 components/lib/togglebutton/ToggleButton.d.ts | 10 +++--
 components/lib/toggleswitch/ToggleSwitch.d.ts | 10 +++--
 components/lib/toolbar/Toolbar.d.ts           | 10 +++--
 components/lib/tree/Tree.d.ts                 | 11 +++--
 components/lib/treeselect/TreeSelect.d.ts     | 35 ++++++++-------
 components/lib/treetable/TreeTable.d.ts       | 11 +++--
 components/lib/ts-helpers.d.ts                | 24 +++++-----
 .../lib/virtualscroller/VirtualScroller.d.ts  | 35 ++++++++-------
 114 files changed, 948 insertions(+), 637 deletions(-)

diff --git a/components/lib/accordion/Accordion.d.ts b/components/lib/accordion/Accordion.d.ts
index 0191ad9cf..11b93511f 100755
--- a/components/lib/accordion/Accordion.d.ts
+++ b/components/lib/accordion/Accordion.d.ts
@@ -11,7 +11,7 @@ import { VNode } from 'vue';
 import { AccordionTabPassThroughOptionType } from '../accordiontab';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type AccordionPassThroughOptionType = AccordionPassThroughAttributes | ((options: AccordionPassThroughMethodOptions) => AccordionPassThroughAttributes | string) | string | null | undefined;
 
@@ -206,7 +206,7 @@ export interface AccordionSlots {
 /**
  * Defines valid emits in Accordion component.
  */
-export interface AccordionEmits {
+interface AccordionEmitsOptions {
     /**
      * Emitted when the active panel changes.
      * @param {string | string[] | null | undefined} value - Value of new active panel.
@@ -238,6 +238,8 @@ export interface AccordionEmits {
     'tab-click'(event: AccordionClickEvent): void;
 }
 
+export declare type AccordionEmits = EmitFn<AccordionEmitsOptions>;
+
 /**
  * **PrimeVue - Accordion**
  *
@@ -250,11 +252,11 @@ export interface AccordionEmits {
  * @group Component
  *
  */
-declare class Accordion extends ClassComponent<AccordionProps, AccordionSlots, AccordionEmits> {}
+declare const Accordion: DefineComponent<AccordionProps, AccordionSlots, AccordionEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Accordion: GlobalComponentConstructor<Accordion>;
+        Accordion: GlobalComponentConstructor<AccordionProps, AccordionSlots, AccordionEmits>;
     }
 }
 
diff --git a/components/lib/accordioncontent/AccordionContent.d.ts b/components/lib/accordioncontent/AccordionContent.d.ts
index b45e7d6b6..0256693b6 100755
--- a/components/lib/accordioncontent/AccordionContent.d.ts
+++ b/components/lib/accordioncontent/AccordionContent.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type AccordionContentPassThroughOptionType = AccordionContentPassThroughAttributes | ((options: AccordionContentPassThroughMethodOptions) => AccordionContentPassThroughAttributes | string) | string | null | undefined;
 
@@ -122,7 +122,9 @@ export interface AccordionContentSlots {
     default(): VNode[];
 }
 
-export interface AccordionContentEmits {}
+interface AccordionContentEmitsOptions {}
+
+export declare type AccordionContentEmits = EmitFn<AccordionContentEmitsOptions>;
 
 /**
  * **PrimeVue - AccordionContent**
@@ -136,11 +138,11 @@ export interface AccordionContentEmits {}
  * @group Component
  *
  */
-declare class AccordionContent extends ClassComponent<AccordionContentProps, AccordionContentSlots, AccordionContentEmits> {}
+declare const AccordionContent: DefineComponent<AccordionContentProps, AccordionContentSlots, AccordionContentEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        AccordionContent: GlobalComponentConstructor<AccordionContent>;
+        AccordionContent: GlobalComponentConstructor<AccordionContentProps, AccordionContentSlots, AccordionContentEmits>;
     }
 }
 
diff --git a/components/lib/accordionheader/AccordionHeader.d.ts b/components/lib/accordionheader/AccordionHeader.d.ts
index c8dafd282..fabb01794 100755
--- a/components/lib/accordionheader/AccordionHeader.d.ts
+++ b/components/lib/accordionheader/AccordionHeader.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type AccordionHeaderPassThroughOptionType = AccordionHeaderPassThroughAttributes | ((options: AccordionHeaderPassThroughMethodOptions) => AccordionHeaderPassThroughAttributes | string) | string | null | undefined;
 
@@ -122,7 +122,9 @@ export interface AccordionHeaderSlots {
     toggleicon(): VNode[];
 }
 
-export interface AccordionHeaderEmits {}
+interface AccordionHeaderEmitsOptions {}
+
+export declare type AccordionHeaderEmits = EmitFn<AccordionHeaderEmitsOptions>;
 
 /**
  * **PrimeVue - AccordionHeader**
@@ -136,11 +138,11 @@ export interface AccordionHeaderEmits {}
  * @group Component
  *
  */
-declare class AccordionHeader extends ClassComponent<AccordionHeaderProps, AccordionHeaderSlots, AccordionHeaderEmits> {}
+declare const AccordionHeader: DefineComponent<AccordionHeaderProps, AccordionHeaderSlots, AccordionHeaderEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        AccordionHeader: GlobalComponentConstructor<AccordionHeader>;
+        AccordionHeader: GlobalComponentConstructor<AccordionHeaderProps, AccordionHeaderSlots, AccordionHeaderEmits>;
     }
 }
 
diff --git a/components/lib/accordionpanel/AccordionPanel.d.ts b/components/lib/accordionpanel/AccordionPanel.d.ts
index a2b73844e..c74c4e310 100755
--- a/components/lib/accordionpanel/AccordionPanel.d.ts
+++ b/components/lib/accordionpanel/AccordionPanel.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type AccordionPanelPassThroughOptionType = AccordionPanelPassThroughAttributes | ((options: AccordionPanelPassThroughMethodOptions) => AccordionPanelPassThroughAttributes | string) | string | null | undefined;
 
@@ -120,7 +120,9 @@ export interface AccordionPanelSlots {
     default(): VNode[];
 }
 
-export interface AccordionPanelEmits {}
+interface AccordionPanelEmitsOptions {}
+
+export declare type AccordionPanelEmits = EmitFn<AccordionPanelEmitsOptions>;
 
 /**
  * **PrimeVue - AccordionPanel**
@@ -134,11 +136,11 @@ export interface AccordionPanelEmits {}
  * @group Component
  *
  */
-declare class AccordionPanel extends ClassComponent<AccordionPanelProps, AccordionPanelSlots, AccordionPanelEmits> {}
+declare const AccordionPanel: DefineComponent<AccordionPanelProps, AccordionPanelSlots, AccordionPanelEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        AccordionPanel: GlobalComponentConstructor<AccordionPanel>;
+        AccordionPanel: GlobalComponentConstructor<AccordionPanelProps, AccordionPanelSlots, AccordionPanelEmits>;
     }
 }
 
diff --git a/components/lib/accordiontab/AccordionTab.d.ts b/components/lib/accordiontab/AccordionTab.d.ts
index 2099f021e..18a4e1e2c 100755
--- a/components/lib/accordiontab/AccordionTab.d.ts
+++ b/components/lib/accordiontab/AccordionTab.d.ts
@@ -10,7 +10,7 @@
  */
 import { AnchorHTMLAttributes, HTMLAttributes, TransitionProps, VNode } from 'vue';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type AccordionTabPassThroughOptionType = AccordionTabPassThroughAttributes | ((options: AccordionTabPassThroughMethodOptions) => AccordionTabPassThroughAttributes | string) | string | null | undefined;
 
@@ -216,7 +216,9 @@ export interface AccordionTabSlots {
 /**
  * Defines valid emits in AcordionTab component.
  */
-export interface AccordionTabEmits {}
+interface AccordionTabEmitsOptions {}
+
+export declare type AccordionTabEmits = EmitFn<AccordionTabEmitsOptions>;
 
 /**
  * @deprecated since v4. Use the new structure of Accordion instead.
@@ -230,12 +232,13 @@ export interface AccordionTabEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class AccordionTab extends ClassComponent<AccordionTabProps, AccordionTabSlots, AccordionTabEmits> {}
+declare const AccordionTab: DefineComponent<AccordionTabProps, AccordionTabSlots, AccordionTabEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        AccordionTab: GlobalComponentConstructor<AccordionTab>;
+        AccordionTab: GlobalComponentConstructor<AccordionTabProps, AccordionTabSlots, AccordionTabEmits>;
     }
 }
 
diff --git a/components/lib/autocomplete/AutoComplete.d.ts b/components/lib/autocomplete/AutoComplete.d.ts
index 812dc1def..a0167a5c4 100755
--- a/components/lib/autocomplete/AutoComplete.d.ts
+++ b/components/lib/autocomplete/AutoComplete.d.ts
@@ -12,7 +12,7 @@ import { ComponentHooks } from '../basecomponent';
 import { ChipPassThroughOptions } from '../chip';
 import { InputTextPassThroughOptions } from '../inputtext';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, Nullable, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, Nullable, PassThrough } from '../ts-helpers';
 import { VirtualScrollerItemOptions, VirtualScrollerPassThroughOptionType, VirtualScrollerProps } from '../virtualscroller';
 
 export declare type AutoCompletePassThroughOptionType = AutoCompletePassThroughAttributes | ((options: AutoCompletePassThroughMethodOptions) => AutoCompletePassThroughAttributes | string) | string | null | undefined;
@@ -778,7 +778,7 @@ export interface AutoCompleteSlots {
 /**
  * Defines valid emits in AutoComplete component.
  */
-export interface AutoCompleteEmits {
+interface AutoCompleteEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {*} value - New value.
@@ -853,6 +853,8 @@ export interface AutoCompleteEmits {
     hide(): void;
 }
 
+export declare type AutoCompleteEmits = EmitFn<AutoCompleteEmitsOptions>;
+
 /**
  * **PrimeVue - AutoComplete**
  *
@@ -865,11 +867,11 @@ export interface AutoCompleteEmits {
  * @group Component
  *
  */
-declare class AutoComplete extends ClassComponent<AutoCompleteProps, AutoCompleteSlots, AutoCompleteEmits> {}
+declare const AutoComplete: DefineComponent<AutoCompleteProps, AutoCompleteSlots, AutoCompleteEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        AutoComplete: GlobalComponentConstructor<AutoComplete>;
+        AutoComplete: GlobalComponentConstructor<AutoCompleteProps, AutoCompleteSlots, AutoCompleteEmits>;
     }
 }
 
diff --git a/components/lib/avatar/Avatar.d.ts b/components/lib/avatar/Avatar.d.ts
index a7ed13053..4c190814c 100644
--- a/components/lib/avatar/Avatar.d.ts
+++ b/components/lib/avatar/Avatar.d.ts
@@ -9,7 +9,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type AvatarPassThroughOptionType = AvatarPassThroughAttributes | ((options: AvatarPassThroughMethodOptions) => AvatarPassThroughAttributes | string) | string | null | undefined;
 
@@ -147,13 +147,15 @@ export interface AvatarSlots {
 /**
  * Defines valid emits in Avatar component.
  */
-export interface AvatarEmits {
+interface AvatarEmitsOptions {
     /**
      * Triggered when an error occurs while loading an image file.
      */
     error(event: Event): void;
 }
 
+export declare type AvatarEmits = EmitFn<AvatarEmitsOptions>;
+
 /**
  * **PrimeVue - Avatar**
  *
@@ -164,12 +166,13 @@ export interface AvatarEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Avatar extends ClassComponent<AvatarProps, AvatarSlots, AvatarEmits> {}
+declare const Avatar: DefineComponent<AvatarProps, AvatarSlots, AvatarEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Avatar: GlobalComponentConstructor<Avatar>;
+        Avatar: GlobalComponentConstructor<AvatarProps, AvatarSlots, AvatarEmits>;
     }
 }
 
diff --git a/components/lib/avatargroup/AvatarGroup.d.ts b/components/lib/avatargroup/AvatarGroup.d.ts
index a3a1cec9c..b55a3ae18 100644
--- a/components/lib/avatargroup/AvatarGroup.d.ts
+++ b/components/lib/avatargroup/AvatarGroup.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type AvatarGroupPassThroughOptionType = AvatarGroupPassThroughAttributes | ((options: AvatarGroupPassThroughMethodOptions) => AvatarGroupPassThroughAttributes | string) | string | null | undefined;
 
@@ -101,7 +101,9 @@ export interface AvatarGroupSlots {
 /**
  * Defines valid emits in AvatarGroup component.
  */
-export interface AvatarGroupEmits {}
+interface AvatarGroupEmitsOptions {}
+
+export declare type AvatarGroupEmits = EmitFn<AvatarGroupEmitsOptions>;
 
 /**
  * **PrimeVue - AvatarGroup**
@@ -113,12 +115,13 @@ export interface AvatarGroupEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class AvatarGroup extends ClassComponent<AvatarGroupProps, AvatarGroupSlots, AvatarGroupEmits> {}
+declare const AvatarGroup: DefineComponent<AvatarGroupProps, AvatarGroupSlots, AvatarGroupEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        AvatarGroup: GlobalComponentConstructor<AvatarGroup>;
+        AvatarGroup: GlobalComponentConstructor<AvatarGroupProps, AvatarGroupSlots, AvatarGroupEmits>;
     }
 }
 
diff --git a/components/lib/badge/Badge.d.ts b/components/lib/badge/Badge.d.ts
index b6257c714..da36a08fa 100644
--- a/components/lib/badge/Badge.d.ts
+++ b/components/lib/badge/Badge.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 
 export declare type BadgePassThroughOptionType<T = any> = BadgePassThroughAttributes | ((options: BadgePassThroughMethodOptions<T>) => BadgePassThroughAttributes | string) | string | null | undefined;
 
@@ -109,7 +109,9 @@ export interface BadgeSlots {
 /**
  * Defines valid emits in Badge component.
  */
-export interface BadgeEmits {}
+interface BadgeEmitsOptions {}
+
+export declare type BadgeEmits = EmitFn<BadgeEmitsOptions>;
 
 /**
  * **PrimeVue - Badge**
@@ -121,12 +123,13 @@ export interface BadgeEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Badge extends ClassComponent<BadgeProps, BadgeSlots, BadgeEmits> {}
+declare const Badge: DefineComponent<BadgeProps, BadgeSlots, BadgeEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Badge: GlobalComponentConstructor<Badge>;
+        Badge: GlobalComponentConstructor<BadgeProps, BadgeSlots, BadgeEmits>;
     }
 }
 
diff --git a/components/lib/blockui/BlockUI.d.ts b/components/lib/blockui/BlockUI.d.ts
index dd685d651..d2ac111cc 100755
--- a/components/lib/blockui/BlockUI.d.ts
+++ b/components/lib/blockui/BlockUI.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type BlockUIPassThroughOptionType = BlockUIPassThroughAttributes | ((options: BlockUIPassThroughMethodOptions) => BlockUIPassThroughAttributes | string) | string | null | undefined;
 
@@ -140,7 +140,7 @@ export interface BlockUISlots {
 /**
  * Defines valid emits in BlockUI component
  */
-export interface BlockUIEmits {
+interface BlockUIEmitsOptions {
     /**
      * Fired when the element gets blocked.
      */
@@ -151,6 +151,8 @@ export interface BlockUIEmits {
     unblock(): void;
 }
 
+export declare type BlockUIEmits = EmitFn<BlockUIEmitsOptions>;
+
 /**
  * **PrimeVue - BlockUI**
  *
@@ -161,12 +163,13 @@ export interface BlockUIEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class BlockUI extends ClassComponent<BlockUIProps, BlockUISlots, BlockUIEmits> {}
+declare const BlockUI: DefineComponent<BlockUIProps, BlockUISlots, BlockUIEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        BlockUI: GlobalComponentConstructor<BlockUI>;
+        BlockUI: GlobalComponentConstructor<BlockUIProps, BlockUISlots, BlockUIEmits>;
     }
 }
 
diff --git a/components/lib/breadcrumb/Breadcrumb.d.ts b/components/lib/breadcrumb/Breadcrumb.d.ts
index 9577a491c..c2e5889de 100755
--- a/components/lib/breadcrumb/Breadcrumb.d.ts
+++ b/components/lib/breadcrumb/Breadcrumb.d.ts
@@ -11,7 +11,7 @@ import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { MenuItem } from '../menuitem';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type BreadcrumbPassThroughOptionType = BreadcrumbPassThroughAttributes | ((options: BreadcrumbPassThroughMethodOptions) => BreadcrumbPassThroughAttributes | string) | string | null | undefined;
 
@@ -220,7 +220,9 @@ export interface BreadcrumbSlots {
 /**
  * Defines valid emits in Breadcrumb component.
  */
-export interface BreadcrumbEmits {}
+interface BreadcrumbEmitsOptions {}
+
+export declare type BreadcrumbEmits = EmitFn<BreadcrumbEmitsOptions>;
 
 /**
  * **PrimeVue - Breadcrumb**
@@ -234,11 +236,11 @@ export interface BreadcrumbEmits {}
  * @group Component
  *
  */
-declare class Breadcrumb extends ClassComponent<BreadcrumbProps, BreadcrumbSlots, BreadcrumbEmits> {}
+declare const Breadcrumb: DefineComponent<BreadcrumbProps, BreadcrumbSlots, BreadcrumbEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Breadcrumb: GlobalComponentConstructor<Breadcrumb>;
+        Breadcrumb: GlobalComponentConstructor<BreadcrumbProps, BreadcrumbSlots, BreadcrumbEmits>;
     }
 }
 
diff --git a/components/lib/button/Button.d.ts b/components/lib/button/Button.d.ts
index 437610ead..c14665067 100755
--- a/components/lib/button/Button.d.ts
+++ b/components/lib/button/Button.d.ts
@@ -10,7 +10,7 @@
 import { ButtonHTMLAttributes, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 
 export declare type ButtonPassThroughOptionType<T = any> = ButtonPassThroughAttributes | ((options: ButtonPassThroughMethodOptions<T>) => ButtonPassThroughAttributes | string) | string | null | undefined;
 
@@ -232,7 +232,9 @@ export interface ButtonSlots {
 /**
  * Defines valid emits in Button component.
  */
-export interface ButtonEmits {}
+interface ButtonEmitsOptions {}
+
+export declare type ButtonEmits = EmitFn<ButtonEmitsOptions>;
 
 /**
  * **PrimeVue - Button**
@@ -244,12 +246,13 @@ export interface ButtonEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Button extends ClassComponent<ButtonProps, ButtonSlots, ButtonEmits> {}
+declare const Button: DefineComponent<ButtonProps, ButtonSlots, ButtonEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Button: GlobalComponentConstructor<Button>;
+        Button: GlobalComponentConstructor<ButtonProps, ButtonSlots, ButtonEmits>;
     }
 }
 
diff --git a/components/lib/buttongroup/ButtonGroup.d.ts b/components/lib/buttongroup/ButtonGroup.d.ts
index 7106445c9..05786b9e7 100644
--- a/components/lib/buttongroup/ButtonGroup.d.ts
+++ b/components/lib/buttongroup/ButtonGroup.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type ButtonGroupPassThroughOptionType = ButtonGroupPassThroughAttributes | ((options: ButtonGroupPassThroughMethodOptions) => ButtonGroupPassThroughAttributes | string) | string | null | undefined;
 
@@ -93,7 +93,9 @@ export interface ButtonGroupSlots {
 /**
  * Defines valid emits in ButtonGroup component.
  */
-export interface ButtonGroupEmits {}
+interface ButtonGroupEmitsOptions {}
+
+export declare type ButtonGroupEmits = EmitFn<ButtonGroupEmitsOptions>;
 
 /**
  * **PrimeVue - ButtonGroup**
@@ -105,12 +107,13 @@ export interface ButtonGroupEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class ButtonGroup extends ClassComponent<ButtonGroupProps, ButtonGroupSlots, ButtonGroupEmits> {}
+declare const ButtonGroup: DefineComponent<ButtonGroupProps, ButtonGroupSlots, ButtonGroupEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        ButtonGroup: GlobalComponentConstructor<ButtonGroup>;
+        ButtonGroup: GlobalComponentConstructor<ButtonGroupProps, ButtonGroupSlots, ButtonGroupEmits>;
     }
 }
 
diff --git a/components/lib/calendar/Calendar.d.ts b/components/lib/calendar/Calendar.d.ts
index 0ce427fdc..5250d11e9 100755
--- a/components/lib/calendar/Calendar.d.ts
+++ b/components/lib/calendar/Calendar.d.ts
@@ -9,7 +9,7 @@
  */
 import 'vue';
 import * as DatePicker from '../datepicker';
-import { ClassComponent, GlobalComponentConstructor } from '../ts-helpers';
+import { DefineComponent, EmitFn, GlobalComponentConstructor } from '../ts-helpers';
 
 /**
  * Custom passthrough(pt) option method.
@@ -98,7 +98,9 @@ export interface CalendarSlots extends DatePicker.DatePickerSlots {}
 /**
  * Defines valid emits in Calendar component.
  */
-export interface CalendarEmits extends DatePicker.DatePickerEmits {}
+interface CalendarEmitsOptions {}
+
+export declare type CalendarEmits = EmitFn<CalendarEmitsOptions> & DatePicker.DatePickerEmits;
 
 /**
  * @deprecated Deprecated since v4. Use DatePicker component instead.
@@ -112,12 +114,13 @@ export interface CalendarEmits extends DatePicker.DatePickerEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Calendar extends ClassComponent<CalendarProps, CalendarSlots, CalendarEmits> {}
+declare const Calendar: DefineComponent<CalendarProps, CalendarSlots, CalendarEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Calendar: GlobalComponentConstructor<Calendar>;
+        Calendar: GlobalComponentConstructor<CalendarProps, CalendarSlots, CalendarEmits>;
     }
 }
 
diff --git a/components/lib/card/Card.d.ts b/components/lib/card/Card.d.ts
index b46de6f6f..52bb0217f 100755
--- a/components/lib/card/Card.d.ts
+++ b/components/lib/card/Card.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type CardPassThroughOptionType = CardPassThroughAttributes | ((options: CardPassThroughMethodOptions) => CardPassThroughAttributes | string) | string | null | undefined;
 
@@ -141,7 +141,9 @@ export interface CardSlots {
 /**
  * Defines valid emits in Card component.
  */
-export interface CardEmits {}
+interface CardEmitsOptions {}
+
+export declare type CardEmits = EmitFn<CardEmitsOptions>;
 
 /**
  * **PrimeVue - Card**
@@ -153,12 +155,13 @@ export interface CardEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Card extends ClassComponent<CardProps, CardSlots, CardEmits> {}
+declare const Card: DefineComponent<CardProps, CardSlots, CardEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Card: GlobalComponentConstructor<Card>;
+        Card: GlobalComponentConstructor<CardProps, CardSlots, CardEmits>;
     }
 }
 
diff --git a/components/lib/carousel/Carousel.d.ts b/components/lib/carousel/Carousel.d.ts
index 663eb2da4..2c05f33c9 100755
--- a/components/lib/carousel/Carousel.d.ts
+++ b/components/lib/carousel/Carousel.d.ts
@@ -11,7 +11,7 @@ import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { ButtonPassThroughOptions } from '../button';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type CarouselPassThroughOptionType = CarouselPassThroughAttributes | ((options: CarouselPassThroughMethodOptions) => CarouselPassThroughAttributes | string) | string | null | undefined;
 
@@ -370,7 +370,7 @@ export interface CarouselSlots {
 /**
  * Defines valid emits in Carousel component.
  */
-export interface CarouselEmits {
+interface CarouselEmitsOptions {
     /**
      * Emitted when the page changes.
      * @param {number} value - New page value.
@@ -378,6 +378,8 @@ export interface CarouselEmits {
     'update:page'(value: number): void;
 }
 
+export declare type CarouselEmits = EmitFn<CarouselEmitsOptions>;
+
 /**
  * **PrimeVue - Carousel**
  *
@@ -390,11 +392,11 @@ export interface CarouselEmits {
  * @group Component
  *
  */
-declare class Carousel extends ClassComponent<CarouselProps, CarouselSlots, CarouselEmits> {}
+declare const Carousel: DefineComponent<CarouselProps, CarouselSlots, CarouselEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Carousel: GlobalComponentConstructor<Carousel>;
+        Carousel: GlobalComponentConstructor<CarouselProps, CarouselSlots, CarouselEmits>;
     }
 }
 
diff --git a/components/lib/cascadeselect/CascadeSelect.d.ts b/components/lib/cascadeselect/CascadeSelect.d.ts
index 577f7865c..c8d0dfc28 100644
--- a/components/lib/cascadeselect/CascadeSelect.d.ts
+++ b/components/lib/cascadeselect/CascadeSelect.d.ts
@@ -10,7 +10,7 @@
 import { HTMLAttributes, InputHTMLAttributes, TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 
 export declare type CascadeSelectPassThroughOptionType = CascadeSelectPassThroughAttributes | ((options: CascadeSelectPassThroughMethodOptions) => CascadeSelectPassThroughAttributes | string) | string | null | undefined;
 
@@ -497,7 +497,7 @@ export interface CascadeSelectSlots {
 /**
  * Defines valid emits in CascadeSelect component.
  */
-export interface CascadeSelectEmits {
+interface CascadeSelectEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {*} value - New value.
@@ -546,6 +546,8 @@ export interface CascadeSelectEmits {
     hide(): void;
 }
 
+export declare type CascadeSelectEmits = EmitFn<CascadeSelectEmitsOptions>;
+
 /**
  * **PrimeVue - CascadeSelect**
  *
@@ -556,12 +558,13 @@ export interface CascadeSelectEmits {
  * ![PrimeVue(https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class CascadeSelect extends ClassComponent<CascadeSelectProps, CascadeSelectSlots, CascadeSelectEmits> {}
+declare const CascadeSelect: DefineComponent<CascadeSelectProps, CascadeSelectSlots, CascadeSelectEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        CascadeSelect: GlobalComponentConstructor<CascadeSelect>;
+        CascadeSelect: GlobalComponentConstructor<CascadeSelectProps, CascadeSelectSlots, CascadeSelectEmits>;
     }
 }
 
diff --git a/components/lib/chart/Chart.d.ts b/components/lib/chart/Chart.d.ts
index f85ecca94..52f7fff98 100755
--- a/components/lib/chart/Chart.d.ts
+++ b/components/lib/chart/Chart.d.ts
@@ -10,7 +10,7 @@
 import { CanvasHTMLAttributes } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type ChartPassThroughOptionType = ChartPassThroughAttributes | ((options: ChartPassThroughMethodOptions) => ChartPassThroughAttributes | string) | string | null | undefined;
 
@@ -146,7 +146,7 @@ export interface ChartSlots {}
 /**
  * Defines valid emits in Chart component.
  */
-export interface ChartEmits {
+interface ChartEmitsOptions {
     /**
      * Callback to invoke when a tab gets expanded.
      * @param {ChartSelectEvent} event - Custom select event.
@@ -159,19 +159,9 @@ export interface ChartEmits {
     loaded(chart: any): void;
 }
 
-/**
- * **PrimeVue - Chart**
- *
- * _Chart groups a collection of contents in tabs._
- *
- * [Live Demo](https://www.primevue.org/chart/)
- * --- ---
- * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
- *
- * @group Component
- *
- */
-declare class Chart extends ClassComponent<ChartProps, ChartSlots, ChartEmits> {
+export declare type ChartEmits = EmitFn<ChartEmitsOptions>;
+
+export interface ChartMethods {
     /**
      * Redraws the graph.
      *
@@ -198,9 +188,23 @@ declare class Chart extends ClassComponent<ChartProps, ChartSlots, ChartEmits> {
     getChart(): any;
 }
 
+/**
+ * **PrimeVue - Chart**
+ *
+ * _Chart groups a collection of contents in tabs._
+ *
+ * [Live Demo](https://www.primevue.org/chart/)
+ * --- ---
+ * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
+ *
+ * @group Component
+ *
+ */
+declare const Chart: DefineComponent<ChartProps, ChartSlots, ChartEmits, ChartMethods>;
+
 declare module 'vue' {
     export interface GlobalComponents {
-        Chart: GlobalComponentConstructor<Chart>;
+        Chart: GlobalComponentConstructor<ChartProps, ChartSlots, ChartEmits, ChartMethods>;
     }
 }
 
diff --git a/components/lib/checkbox/Checkbox.d.ts b/components/lib/checkbox/Checkbox.d.ts
index a96a72b15..31c908126 100755
--- a/components/lib/checkbox/Checkbox.d.ts
+++ b/components/lib/checkbox/Checkbox.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type CheckboxPassThroughOptionType = CheckboxPassThroughAttributes | ((options: CheckboxPassThroughMethodOptions) => CheckboxPassThroughAttributes | string) | string | null | undefined;
 
@@ -235,7 +235,7 @@ export interface CheckboxSlots {
 /**
  * Defines valid emits in Checkbox component.
  */
-export interface CheckboxEmits {
+interface CheckboxEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {*} value - New value.
@@ -258,6 +258,8 @@ export interface CheckboxEmits {
     blur(event: Event): void;
 }
 
+export declare type CheckboxEmits = EmitFn<CheckboxEmitsOptions>;
+
 /**
  * **PrimeVue - Checkbox**
  *
@@ -270,11 +272,11 @@ export interface CheckboxEmits {
  * @group Component
  *
  */
-declare class Checkbox extends ClassComponent<CheckboxProps, CheckboxSlots, CheckboxEmits> {}
+declare const Checkbox: DefineComponent<CheckboxProps, CheckboxSlots, CheckboxEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Checkbox: GlobalComponentConstructor<Checkbox>;
+        Checkbox: GlobalComponentConstructor<CheckboxProps, CheckboxSlots, CheckboxEmits>;
     }
 }
 
diff --git a/components/lib/chip/Chip.d.ts b/components/lib/chip/Chip.d.ts
index a2bd4f633..7c6d02a84 100644
--- a/components/lib/chip/Chip.d.ts
+++ b/components/lib/chip/Chip.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type ChipPassThroughOptionType<T = any> = ChipPassThroughAttributes | ((options: ChipPassThroughMethodOptions<T>) => ChipPassThroughAttributes | string) | string | null | undefined;
 
@@ -187,7 +187,7 @@ export interface ChipSlots {
 /**
  * Defines valid properties in Chip component.
  */
-export interface ChipEmits {
+interface ChipEmitsOptions {
     /**
      * Callback to invoke when a chip is removed.
      * @param {Event} event - Browser event.
@@ -195,6 +195,8 @@ export interface ChipEmits {
     remove(event: Event): void;
 }
 
+export declare type ChipEmits = EmitFn<ChipEmitsOptions>;
+
 /**
  * **PrimeVue - Chip**
  *
@@ -205,12 +207,13 @@ export interface ChipEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Chip extends ClassComponent<ChipProps, ChipSlots, ChipEmits> {}
+declare const Chip: DefineComponent<ChipProps, ChipSlots, ChipEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Chip: GlobalComponentConstructor<Chip>;
+        Chip: GlobalComponentConstructor<ChipProps, ChipSlots, ChipEmits>;
     }
 }
 
diff --git a/components/lib/chips/Chips.d.ts b/components/lib/chips/Chips.d.ts
index 3cbd73358..25a236abb 100755
--- a/components/lib/chips/Chips.d.ts
+++ b/components/lib/chips/Chips.d.ts
@@ -9,7 +9,7 @@
  */
 import 'vue';
 import * as InputChips from '../inputchips';
-import { ClassComponent, GlobalComponentConstructor } from '../ts-helpers';
+import { DefineComponent, EmitFn, GlobalComponentConstructor } from '../ts-helpers';
 
 /**
  * Custom passthrough(pt) option method.
@@ -61,7 +61,9 @@ export interface ChipsSlots extends InputChips.InputChipsSlots {}
 /**
  * Defines valid emits in Chips component.
  */
-export interface ChipsEmits extends InputChips.InputChipsEmits {}
+interface ChipsEmitsOptions {}
+
+export declare type ChipsEmits = EmitFn<ChipsEmitsOptions> & InputChips.InputChipsEmits;
 
 /**
  * @deprecated Deprecated since v4. Use InputChips component instead.
@@ -77,11 +79,11 @@ export interface ChipsEmits extends InputChips.InputChipsEmits {}
  * @group Component
  *
  */
-declare class Chips extends ClassComponent<ChipsProps, ChipsSlots, ChipsEmits> {}
+declare const Chips: DefineComponent<ChipsProps, ChipsSlots, ChipsEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Chips: GlobalComponentConstructor<Chips>;
+        Chips: GlobalComponentConstructor<ChipsProps, ChipsSlots, ChipsEmits>;
     }
 }
 
diff --git a/components/lib/colorpicker/ColorPicker.d.ts b/components/lib/colorpicker/ColorPicker.d.ts
index 1b1391326..77a864bc3 100755
--- a/components/lib/colorpicker/ColorPicker.d.ts
+++ b/components/lib/colorpicker/ColorPicker.d.ts
@@ -10,7 +10,7 @@
 import { TransitionProps } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 
 export declare type ColorPickerPassThroughOptionType = ColorPickerPassThroughAttributes | ((options: ColorPickerPassThroughMethodOptions) => ColorPickerPassThroughAttributes | string) | string | null | undefined;
 
@@ -208,7 +208,7 @@ export interface ColorPickerSlots {}
 /**
  * Defines valid emits in ColorPicker component.
  */
-export interface ColorPickerEmits {
+interface ColorPickerEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {*} value - New value.
@@ -229,6 +229,8 @@ export interface ColorPickerEmits {
     hide(): void;
 }
 
+export declare type ColorPickerEmits = EmitFn<ColorPickerEmitsOptions>;
+
 /**
  * **PrimeVue - ColorPicker**
  *
@@ -241,11 +243,11 @@ export interface ColorPickerEmits {
  * @group Component
  *
  */
-declare class ColorPicker extends ClassComponent<ColorPickerProps, ColorPickerSlots, ColorPickerEmits> {}
+declare const ColorPicker: DefineComponent<ColorPickerProps, ColorPickerSlots, ColorPickerEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        ColorPicker: GlobalComponentConstructor<ColorPicker>;
+        ColorPicker: GlobalComponentConstructor<ColorPickerProps, ColorPickerSlots, ColorPickerEmits>;
     }
 }
 
diff --git a/components/lib/column/Column.d.ts b/components/lib/column/Column.d.ts
index 95fafbc5a..125dbca00 100755
--- a/components/lib/column/Column.d.ts
+++ b/components/lib/column/Column.d.ts
@@ -17,7 +17,7 @@ import { DataTablePassThroughOptions } from '../datatable';
 import { PassThroughOptions } from '../passthrough';
 import { RadioButtonPassThroughOptionType } from '../radiobutton';
 import { SelectPassThroughOptionType } from '../select';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 import { VirtualScrollerLoaderOptions } from '../virtualscroller';
 
 export declare type ColumnPassThroughOptionType = ColumnPassThroughAttributes | ((options: ColumnPassThroughMethodOptions) => ColumnPassThroughAttributes | string) | string | null | undefined;
@@ -974,7 +974,9 @@ export interface ColumnSlots {
     nodetoggleicon(): VNode[];
 }
 
-export interface ColumnEmits {}
+interface ColumnEmitsOptions {}
+
+export declare type ColumnEmits = EmitFn<ColumnEmitsOptions>;
 
 /**
  * **PrimeVue - Column**
@@ -986,14 +988,15 @@ export interface ColumnEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Column extends ClassComponent<ColumnProps, ColumnSlots, ColumnEmits> {}
+declare const Column: DefineComponent<ColumnProps, ColumnSlots, ColumnEmits>;
 
-export type ColumnNode = Column & { props: Column['$props'] };
+export type ColumnNode = { props: ColumnProps };
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Column: GlobalComponentConstructor<Column>;
+        Column: GlobalComponentConstructor<ColumnProps, ColumnSlots, ColumnEmits>;
     }
 }
 
diff --git a/components/lib/columngroup/ColumnGroup.d.ts b/components/lib/columngroup/ColumnGroup.d.ts
index fb0ba1a9b..0e99ef2bc 100755
--- a/components/lib/columngroup/ColumnGroup.d.ts
+++ b/components/lib/columngroup/ColumnGroup.d.ts
@@ -9,7 +9,7 @@
  */
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type ColumnGroupPassThroughOptionType = ColumnGroupPassThroughAttributes | ((options: ColumnGroupPassThroughMethodOptions) => ColumnGroupPassThroughAttributes | string) | string | null | undefined;
 
@@ -118,7 +118,9 @@ export interface ColumnGroupSlots {}
 /**
  * Defines valid emits in ColumnGroup component.
  */
-export interface ColumnGroupEmits {}
+interface ColumnGroupEmitsOptions {}
+
+export declare type ColumnGroupEmits = EmitFn<ColumnGroupEmitsOptions>;
 
 /**
  * **PrimeVue - ColumnGroup**
@@ -130,12 +132,13 @@ export interface ColumnGroupEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class ColumnGroup extends ClassComponent<ColumnGroupProps, ColumnGroupSlots, ColumnGroupEmits> {}
+declare const ColumnGroup: DefineComponent<ColumnGroupProps, ColumnGroupSlots, ColumnGroupEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        ColumnGroup: GlobalComponentConstructor<ColumnGroup>;
+        ColumnGroup: GlobalComponentConstructor<ColumnGroupProps, ColumnGroupSlots, ColumnGroupEmits>;
     }
 }
 
diff --git a/components/lib/confirmdialog/ConfirmDialog.d.ts b/components/lib/confirmdialog/ConfirmDialog.d.ts
index e472bd382..64f9422b6 100644
--- a/components/lib/confirmdialog/ConfirmDialog.d.ts
+++ b/components/lib/confirmdialog/ConfirmDialog.d.ts
@@ -12,7 +12,7 @@ import { ComponentHooks } from '../basecomponent';
 import { ButtonPassThroughOptions } from '../button';
 import { ConfirmationOptions } from '../confirmationoptions';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type ConfirmDialogPassThroughOptionType = ConfirmDialogPassThroughAttributes | ((options: ConfirmDialogPassThroughMethodOptions) => ConfirmDialogPassThroughAttributes | string) | string | null | undefined;
 
@@ -279,7 +279,9 @@ export interface ConfirmDialogSlots {
 /**
  * Defines valid emits in ConfirmDialog component.
  */
-export interface ConfirmDialogEmits {}
+export interface ConfirmDialogEmitsOptions {}
+
+export declare type ConfirmDialogEmits = EmitFn<ConfirmDialogEmitsOptions>;
 
 /**
  * **PrimeVue - ConfirmDialog**
@@ -291,12 +293,13 @@ export interface ConfirmDialogEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class ConfirmDialog extends ClassComponent<ConfirmDialogProps, ConfirmDialogSlots, ConfirmDialogEmits> {}
+declare const ConfirmDialog: DefineComponent<ConfirmDialogProps, ConfirmDialogSlots, ConfirmDialogEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        ConfirmDialog: GlobalComponentConstructor<ConfirmDialog>;
+        ConfirmDialog: GlobalComponentConstructor<ConfirmDialogProps, ConfirmDialogSlots, ConfirmDialogEmits>;
     }
 }
 
diff --git a/components/lib/confirmpopup/ConfirmPopup.d.ts b/components/lib/confirmpopup/ConfirmPopup.d.ts
index 81bfebb44..111c78dd2 100644
--- a/components/lib/confirmpopup/ConfirmPopup.d.ts
+++ b/components/lib/confirmpopup/ConfirmPopup.d.ts
@@ -12,7 +12,7 @@ import { ComponentHooks } from '../basecomponent';
 import { ButtonPassThroughOptions } from '../button';
 import { ConfirmationOptions } from '../confirmationoptions';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type ConfirmPopupPassThroughOptionType = ConfirmPopupPassThroughAttributes | ((options: ConfirmPopupPassThroughMethodOptions) => ConfirmPopupPassThroughAttributes | string) | string | null | undefined;
 
@@ -224,7 +224,9 @@ export interface ConfirmPopupSlots {
 /**
  * Defines valid emits in ConfirmPopup component.
  */
-export interface ConfirmPopupEmits {}
+interface ConfirmPopupEmitsOptions {}
+
+export declare type ConfirmPopupEmits = EmitFn<ConfirmPopupEmitsOptions>;
 
 /**
  * **PrimeVue - ConfirmPopup**
@@ -236,12 +238,13 @@ export interface ConfirmPopupEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class ConfirmPopup extends ClassComponent<ConfirmPopupProps, ConfirmPopupSlots, ConfirmPopupEmits> {}
+declare const ConfirmPopup: DefineComponent<ConfirmPopupProps, ConfirmPopupSlots, ConfirmPopupEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        ConfirmPopup: GlobalComponentConstructor<ConfirmPopup>;
+        ConfirmPopup: GlobalComponentConstructor<ConfirmPopupProps, ConfirmPopupSlots, ConfirmPopupEmits>;
     }
 }
 
diff --git a/components/lib/contextmenu/ContextMenu.d.ts b/components/lib/contextmenu/ContextMenu.d.ts
index 0453d483a..30d0fe3c5 100755
--- a/components/lib/contextmenu/ContextMenu.d.ts
+++ b/components/lib/contextmenu/ContextMenu.d.ts
@@ -12,7 +12,7 @@ import { TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { MenuItem } from '../menuitem';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 
 export declare type ContextMenuPassThroughOptionType = ContextMenuPassThroughAttributes | ((options: ContextMenuPassThroughMethodOptions) => ContextMenuPassThroughAttributes | string) | string | null | undefined;
 
@@ -341,7 +341,7 @@ export interface ContextMenuSlots {
 /**
  * Defines valid emits in ContextMenu component.
  */
-export interface ContextMenuEmits {
+interface ContextMenuEmitsOptions {
     /**
      * Callback to invoke when the component receives focus.
      * @param {Event} event - Browser event.
@@ -370,20 +370,9 @@ export interface ContextMenuEmits {
     hide(): void;
 }
 
-/**
- * **PrimeVue - ContextMenu**
- *
- * _ContextMenu displays an overlay menu on right click of its target. Note that components like DataTable has special integration with ContextMenu.
- * Refer to documentation of the individual documentation of the with context menu support._
- *
- * [Live Demo](https://www.primevue.org/contextmenu/)
- * --- ---
- * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
- *
- * @group Component
- *
- */
-declare class ContextMenu extends ClassComponent<ContextMenuProps, ContextMenuSlots, ContextMenuEmits> {
+export declare type ContextMenuEmits = EmitFn<ContextMenuEmitsOptions>;
+
+export interface ContextMenuMethods {
     /**
      * Toggles the visibility of the menu.
      * @param {Event} event - Browser event.
@@ -406,9 +395,24 @@ declare class ContextMenu extends ClassComponent<ContextMenuProps, ContextMenuSl
     hide(): void;
 }
 
+/**
+ * **PrimeVue - ContextMenu**
+ *
+ * _ContextMenu displays an overlay menu on right click of its target. Note that components like DataTable has special integration with ContextMenu.
+ * Refer to documentation of the individual documentation of the with context menu support._
+ *
+ * [Live Demo](https://www.primevue.org/contextmenu/)
+ * --- ---
+ * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
+ *
+ * @group Component
+ *
+ */
+declare const ContextMenu: DefineComponent<ContextMenuProps, ContextMenuSlots, ContextMenuEmits, ContextMenuMethods>;
+
 declare module 'vue' {
     export interface GlobalComponents {
-        ContextMenu: GlobalComponentConstructor<ContextMenu>;
+        ContextMenu: GlobalComponentConstructor<ContextMenuProps, ContextMenuSlots, ContextMenuEmits, ContextMenuMethods>;
     }
 }
 
diff --git a/components/lib/datatable/DataTable.d.ts b/components/lib/datatable/DataTable.d.ts
index a579a5650..75997b1d3 100755
--- a/components/lib/datatable/DataTable.d.ts
+++ b/components/lib/datatable/DataTable.d.ts
@@ -15,7 +15,7 @@ import { ColumnGroupPassThroughOptionType } from '../columngroup';
 import { PaginatorPassThroughOptionType } from '../paginator';
 import { PassThroughOptions } from '../passthrough';
 import { RowPassThroughOptionType } from '../row';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, Nullable, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, Nullable, PassThrough } from '../ts-helpers';
 import { VirtualScrollerPassThroughOptionType, VirtualScrollerProps } from '../virtualscroller';
 
 export declare type DataTablePassThroughOptionType = DataTablePassThroughAttributes | ((options: DataTablePassThroughMethodOptions) => DataTablePassThroughAttributes | string) | string | null | undefined;
@@ -1415,7 +1415,7 @@ export interface DataTableSlots {
 /**
  * Defines valid emits in Datatable component.
  */
-export interface DataTableEmits {
+interface DataTableEmitsOptions {
     /**
      * Emitted when the first changes.
      * @param {number} value - New value.
@@ -1608,6 +1608,17 @@ export interface DataTableEmits {
     'state-save'(event: DataTableStateEvent): void;
 }
 
+export declare type DataTableEmits = EmitFn<DataTableEmitsOptions>;
+
+export interface DataTableMethods {
+    /**
+     * Exports the data to CSV format.
+     * @param {DataTableExportCSVOptions} [options] - Export options.
+     * @param {Object[]} [data] - Custom exportable data. This param can be used on lazy dataTable.
+     */
+    exportCSV(options?: DataTableExportCSVOptions, data?: any[]): void;
+}
+
 /**
  * **PrimeVue - DataTable**
  *
@@ -1618,19 +1629,13 @@ export interface DataTableEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class DataTable extends ClassComponent<DataTableProps, DataTableSlots, DataTableEmits> {
-    /**
-     * Exports the data to CSV format.
-     * @param {DataTableExportCSVOptions} [options] - Export options.
-     * @param {Object[]} [data] - Custom exportable data. This param can be used on lazy dataTable.
-     */
-    exportCSV(options?: DataTableExportCSVOptions, data?: any[]): void;
-}
+declare const DataTable: DefineComponent<DataTableProps, DataTableSlots, DataTableEmits, DataTableMethods>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        DataTable: GlobalComponentConstructor<DataTable>;
+        DataTable: GlobalComponentConstructor<DataTableProps, DataTableSlots, DataTableEmits>;
     }
 }
 
diff --git a/components/lib/dataview/DataView.d.ts b/components/lib/dataview/DataView.d.ts
index 956d72ad0..00fc886df 100755
--- a/components/lib/dataview/DataView.d.ts
+++ b/components/lib/dataview/DataView.d.ts
@@ -11,7 +11,7 @@ import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PaginatorPassThroughOptionType } from '../paginator';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type DataViewPassThroughOptionType = DataViewPassThroughAttributes | ((options: DataViewPassThroughMethodOptions) => DataViewPassThroughAttributes | string) | string | null | undefined;
 
@@ -313,7 +313,7 @@ export interface DataViewSlots {
 /**
  * Defines valid slots in DataView component.
  */
-export interface DataViewEmits {
+interface DataViewEmitsOptions {
     /**
      * Emitted when the first changes.
      * @param {number} value - New value.
@@ -331,6 +331,8 @@ export interface DataViewEmits {
     page(event: DataViewPageEvent): void;
 }
 
+export declare type DataViewEmits = EmitFn<DataViewEmitsOptions>;
+
 /**
  * **PrimeVue - DataView**
  *
@@ -343,11 +345,11 @@ export interface DataViewEmits {
  * @group Component
  *
  */
-declare class DataView extends ClassComponent<DataViewProps, DataViewSlots, DataViewEmits> {}
+declare const DataView: DefineComponent<DataViewProps, DataViewSlots, DataViewEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        DataView: GlobalComponentConstructor<DataView>;
+        DataView: GlobalComponentConstructor<DataViewProps, DataViewSlots, DataViewEmits>;
     }
 }
 
diff --git a/components/lib/datepicker/DatePicker.d.ts b/components/lib/datepicker/DatePicker.d.ts
index 8333c73d8..be653f924 100755
--- a/components/lib/datepicker/DatePicker.d.ts
+++ b/components/lib/datepicker/DatePicker.d.ts
@@ -12,7 +12,7 @@ import { ComponentHooks } from '../basecomponent';
 import { ButtonPassThroughOptions, ButtonProps } from '../button';
 import { InputTextPassThroughOptions } from '../inputtext';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 
 export declare type DatePickerPassThroughOptionType = DatePickerPassThroughAttributes | ((options: DatePickerPassThroughMethodOptions) => DatePickerPassThroughAttributes | string) | string | null | undefined;
 
@@ -988,7 +988,7 @@ export interface DatePickerSlots {
 /**
  * Defines valid emits in DatePicker component.
  */
-export interface DatePickerEmits {
+interface DatePickerEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {string | Date | string[] | Date[] | undefined} value - New value.
@@ -1048,6 +1048,8 @@ export interface DatePickerEmits {
     keydown(event: Event): void;
 }
 
+export declare type DatePickerEmits = EmitFn<DatePickerEmitsOptions>;
+
 /**
  * **PrimeVue - DatePicker**
  *
@@ -1058,12 +1060,13 @@ export interface DatePickerEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class DatePicker extends ClassComponent<DatePickerProps, DatePickerSlots, DatePickerEmits> {}
+declare const DatePicker: DefineComponent<DatePickerProps, DatePickerSlots, DatePickerEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        DatePicker: GlobalComponentConstructor<DatePicker>;
+        DatePicker: GlobalComponentConstructor<DatePickerProps, DatePickerSlots, DatePickerEmits>;
     }
 }
 
diff --git a/components/lib/deferredcontent/DeferredContent.d.ts b/components/lib/deferredcontent/DeferredContent.d.ts
index 893151a6f..1cfa95993 100755
--- a/components/lib/deferredcontent/DeferredContent.d.ts
+++ b/components/lib/deferredcontent/DeferredContent.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type DeferredContentPassThroughOptionType = DeferredContentPassThroughAttributes | ((options: DeferredContentPassThroughMethodOptions) => DeferredContentPassThroughAttributes | string) | string | null | undefined;
 
@@ -116,13 +116,15 @@ export interface DeferredContentSlots {
 /**
  * Defines valid emits in DeferredContent component.
  */
-export interface DeferredContentEmits {
+interface DeferredContentEmitsOptions {
     /**
      * Callback to invoke when deferred content is loaded.
      */
     load(): void;
 }
 
+export declare type DeferredContentEmits = EmitFn<DeferredContentEmitsOptions>;
+
 /**
  * **PrimeVue - DeferredContent**
  *
@@ -133,12 +135,13 @@ export interface DeferredContentEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class DeferredContent extends ClassComponent<DeferredContentProps, DeferredContentSlots, DeferredContentEmits> {}
+declare const DeferredContent: DefineComponent<DeferredContentProps, DeferredContentSlots, DeferredContentEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        DeferredContent: GlobalComponentConstructor<DeferredContent>;
+        DeferredContent: GlobalComponentConstructor<DeferredContentProps, DeferredContentSlots, DeferredContentEmits>;
     }
 }
 
diff --git a/components/lib/dialog/Dialog.d.ts b/components/lib/dialog/Dialog.d.ts
index e7dc2b876..2af1f5c1a 100755
--- a/components/lib/dialog/Dialog.d.ts
+++ b/components/lib/dialog/Dialog.d.ts
@@ -11,7 +11,7 @@ import { HTMLAttributes, TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { ButtonPassThroughOptions, ButtonProps } from '../button';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 
 export declare type DialogPassThroughOptionType<T = any> = DialogPassThroughAttributes | ((options: DialogPassThroughMethodOptions<T>) => DialogPassThroughAttributes | string) | string | null | undefined;
 
@@ -392,7 +392,7 @@ export interface DialogSlots {
 /**
  * Defines valid emits in Dialog component.
  */
-export interface DialogEmits {
+interface DialogEmitsOptions {
     /**
      * Emitted when the visible changes.
      * @param {boolean} value - New value.
@@ -427,6 +427,8 @@ export interface DialogEmits {
     dragend(event: Event): void;
 }
 
+export declare type DialogEmits = EmitFn<DialogEmitsOptions>;
+
 /**
  * **PrimeVue - Dialog**
  *
@@ -437,12 +439,13 @@ export interface DialogEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Dialog extends ClassComponent<DialogProps, DialogSlots, DialogEmits> {}
+declare const Dialog: DefineComponent<DialogProps, DialogSlots, DialogEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Dialog: GlobalComponentConstructor<Dialog>;
+        Dialog: GlobalComponentConstructor<DialogProps, DialogSlots, DialogEmits>;
     }
 }
 
diff --git a/components/lib/divider/Divider.d.ts b/components/lib/divider/Divider.d.ts
index 804727c3e..1c51bdbb8 100644
--- a/components/lib/divider/Divider.d.ts
+++ b/components/lib/divider/Divider.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type DividerPassThroughOptionType = DividerPassThroughAttributes | ((options: DividerPassThroughMethodOptions) => DividerPassThroughAttributes | string) | string | null | undefined;
 
@@ -116,7 +116,9 @@ export interface DividerSlots {
     default(): VNode[];
 }
 
-export interface DividerEmits {}
+interface DividerEmitsOptions {}
+
+export declare type DividerEmits = EmitFn<DividerEmitsOptions>;
 
 /**
  * **PrimeVue - Divider**
@@ -130,11 +132,11 @@ export interface DividerEmits {}
  * @group Component
  *
  */
-declare class Divider extends ClassComponent<DividerProps, DividerSlots, DividerEmits> {}
+declare const Divider: DefineComponent<DividerProps, DividerSlots, DividerEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Divider: GlobalComponentConstructor<Divider>;
+        Divider: GlobalComponentConstructor<DividerProps, DividerSlots, DividerEmits>;
     }
 }
 
diff --git a/components/lib/dock/Dock.d.ts b/components/lib/dock/Dock.d.ts
index 876392579..474dcb55d 100644
--- a/components/lib/dock/Dock.d.ts
+++ b/components/lib/dock/Dock.d.ts
@@ -11,7 +11,7 @@ import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { MenuItem } from '../menuitem';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type DockPassThroughOptionType = DockPassThroughAttributes | ((options: DockPassThroughMethodOptions) => DockPassThroughAttributes | string) | string | null | undefined;
 
@@ -299,7 +299,7 @@ export interface DockSlots {
 /**
  * Defines valid emits in Dock component.
  */
-export interface DockEmits {
+interface DockEmitsOptions {
     /**
      * Callback to invoke when the component receives focus.
      * @param {Event} event - Browser event.
@@ -312,6 +312,8 @@ export interface DockEmits {
     blur(event: Event): void;
 }
 
+export declare type DockEmits = EmitFn<DockEmitsOptions>;
+
 /**
  * **PrimeVue - Dock**
  *
@@ -324,11 +326,11 @@ export interface DockEmits {
  * @group Component
  *
  */
-declare class Dock extends ClassComponent<DockProps, DockSlots, DockEmits> {}
+declare const Dock: DefineComponent<DockProps, DockSlots, DockEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Dock: GlobalComponentConstructor<Dock>;
+        Dock: GlobalComponentConstructor<DockProps, DockSlots, DockEmits>;
     }
 }
 
diff --git a/components/lib/drawer/Drawer.d.ts b/components/lib/drawer/Drawer.d.ts
index a0bc7b56d..33874bbbb 100755
--- a/components/lib/drawer/Drawer.d.ts
+++ b/components/lib/drawer/Drawer.d.ts
@@ -11,7 +11,7 @@ import { TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { ButtonPassThroughOptions } from '../button';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type DrawerPassThroughOptionType = DrawerPassThroughAttributes | ((options: DrawerPassThroughMethodOptions) => DrawerPassThroughAttributes | string) | string | null | undefined;
 
@@ -251,7 +251,7 @@ export interface DrawerSlots {
 /**
  * Defines valid emits in Drawer component.
  */
-export interface DrawerEmits {
+interface DrawerEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {boolean} value - New value.
@@ -267,6 +267,8 @@ export interface DrawerEmits {
     hide(): void;
 }
 
+export declare type DrawerEmits = EmitFn<DrawerEmitsOptions>;
+
 /**
  * **PrimeVue - Drawer**
  *
@@ -277,12 +279,13 @@ export interface DrawerEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Drawer extends ClassComponent<DrawerProps, DrawerSlots, DrawerEmits> {}
+declare const Drawer: DefineComponent<DrawerProps, DrawerSlots, DrawerEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Drawer: GlobalComponentConstructor<Drawer>;
+        Drawer: GlobalComponentConstructor<DrawerProps, DrawerSlots, DrawerEmits>;
     }
 }
 
diff --git a/components/lib/dropdown/Dropdown.d.ts b/components/lib/dropdown/Dropdown.d.ts
index adc9d7891..d5538026b 100755
--- a/components/lib/dropdown/Dropdown.d.ts
+++ b/components/lib/dropdown/Dropdown.d.ts
@@ -9,7 +9,7 @@
  */
 import 'vue';
 import * as Select from '../select';
-import { ClassComponent, GlobalComponentConstructor } from '../ts-helpers';
+import { DefineComponent, EmitFn, GlobalComponentConstructor } from '../ts-helpers';
 
 /**
  * Custom passthrough(pt) option method.
@@ -62,22 +62,11 @@ export interface DropdownSlots extends Select.SelectSlots {}
 /**
  * Defines valid emits in Dropdown component.
  */
-export interface DropdownEmits extends Select.SelectEmits {}
+interface DropdownEmitsOptions {}
 
-/**
- * @deprecated Deprecated since v4. Use Select component instead.
- *
- * **PrimeVue - Dropdown**
- *
- * _Dropdown also known as Select, is used to choose an item from a collection of options._
- *
- * [Live Demo](https://www.primevue.org/select/)
- * --- ---
- * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
- *
- * @group Component
- */
-declare class Dropdown extends ClassComponent<DropdownProps, DropdownSlots, DropdownEmits> {
+export declare type DropdownEmits = EmitFn<DropdownEmitsOptions> & Select.SelectEmits;
+
+export interface DropdownMethods {
     /**
      * Shows the overlay.
      * @param {boolean} [isFocus] - Decides whether to focus on the component. @defaultValue false.
@@ -94,9 +83,25 @@ declare class Dropdown extends ClassComponent<DropdownProps, DropdownSlots, Drop
     hide: (isFocus?: boolean) => void;
 }
 
+/**
+ * @deprecated Deprecated since v4. Use Select component instead.
+ *
+ * **PrimeVue - Dropdown**
+ *
+ * _Dropdown also known as Select, is used to choose an item from a collection of options._
+ *
+ * [Live Demo](https://www.primevue.org/select/)
+ * --- ---
+ * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
+ *
+ * @group Component
+ *
+ */
+declare const Dropdown: DefineComponent<DropdownProps, DropdownSlots, DropdownEmits, DropdownMethods>;
+
 declare module 'vue' {
     export interface GlobalComponents {
-        Dropdown: GlobalComponentConstructor<Dropdown>;
+        Dropdown: GlobalComponentConstructor<DropdownProps, DropdownSlots, DropdownEmits, DropdownMethods>;
     }
 }
 
diff --git a/components/lib/dynamicdialog/DynamicDialog.d.ts b/components/lib/dynamicdialog/DynamicDialog.d.ts
index 3db5a2e11..374b2e4b5 100644
--- a/components/lib/dynamicdialog/DynamicDialog.d.ts
+++ b/components/lib/dynamicdialog/DynamicDialog.d.ts
@@ -7,7 +7,7 @@
  * @module dynamicdialog
  *
  */
-import { ClassComponent, GlobalComponentConstructor } from '../ts-helpers';
+import { DefineComponent, EmitFn, GlobalComponentConstructor } from '../ts-helpers';
 
 /**
  * Defines valid properties in DynamicDialog component.
@@ -20,16 +20,18 @@ export interface DynamicDialogProps {
     unstyled?: boolean;
 }
 
-/**
- * Defines valid emits in DynamicDialog component.
- */
-export interface DynamicDialogEmits {}
-
 /**
  * Defines valid slots in DynamicDialog component.
  */
 export interface DynamicDialogSlots {}
 
+/**
+ * Defines valid emits in DynamicDialog component.
+ */
+interface DynamicDialogEmitsOptions {}
+
+export declare type DynamicDialogEmits = EmitFn<DynamicDialogEmitsOptions>;
+
 /**
  * **PrimeVue - DynamicDialog**
  *
@@ -40,12 +42,13 @@ export interface DynamicDialogSlots {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class DynamicDialog extends ClassComponent<DynamicDialogProps, DynamicDialogSlots, DynamicDialogEmits> {}
+declare const DynamicDialog: DefineComponent<DynamicDialogProps, DynamicDialogSlots, DynamicDialogEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        DynamicDialog: GlobalComponentConstructor<DynamicDialog>;
+        DynamicDialog: GlobalComponentConstructor<DynamicDialogProps, DynamicDialogSlots, DynamicDialogEmits>;
     }
 }
 
diff --git a/components/lib/editor/Editor.d.ts b/components/lib/editor/Editor.d.ts
index 44e4896ab..08863bbbb 100755
--- a/components/lib/editor/Editor.d.ts
+++ b/components/lib/editor/Editor.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type EditorPassThroughOptionType = EditorPassThroughAttributes | ((options: EditorPassThroughMethodOptions) => EditorPassThroughAttributes | string) | string | null | undefined;
 
@@ -272,7 +272,7 @@ export interface EditorSlots {
 /**
  * Defines valid emits in Editor component.
  */
-export interface EditorEmits {
+interface EditorEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {string} value - New value.
@@ -295,6 +295,8 @@ export interface EditorEmits {
     load(event: EditorLoadEvent): void;
 }
 
+export declare type EditorEmits = EmitFn<EditorEmitsOptions>;
+
 /**
  * **PrimeVue - Editor**
  *
@@ -307,11 +309,11 @@ export interface EditorEmits {
  * @group Component
  *
  */
-declare class Editor extends ClassComponent<EditorProps, EditorSlots, EditorEmits> {}
+declare const Editor: DefineComponent<EditorProps, EditorSlots, EditorEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Editor: GlobalComponentConstructor<Editor>;
+        Editor: GlobalComponentConstructor<EditorProps, EditorSlots, EditorEmits>;
     }
 }
 
diff --git a/components/lib/fieldset/Fieldset.d.ts b/components/lib/fieldset/Fieldset.d.ts
index aec0bc517..177d8581c 100755
--- a/components/lib/fieldset/Fieldset.d.ts
+++ b/components/lib/fieldset/Fieldset.d.ts
@@ -10,7 +10,7 @@
 import { AnchorHTMLAttributes, TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type FieldsetPassThroughOptionType = FieldsetPassThroughAttributes | ((options: FieldsetPassThroughMethodOptions) => FieldsetPassThroughAttributes | string) | string | null | undefined;
 
@@ -216,7 +216,7 @@ export interface FieldsetSlots {
 /**
  * Defines valid emits in Fildset component.
  */
-export interface FieldsetEmits {
+interface FieldsetEmitsOptions {
     /**
      * Emitted when the collapsed changes.
      * @param {boolean} value - New value.
@@ -229,6 +229,8 @@ export interface FieldsetEmits {
     toggle(event: FieldsetToggleEvent): void;
 }
 
+export declare type FieldsetEmits = EmitFn<FieldsetEmitsOptions>;
+
 /**
  * **PrimeVue - Fieldset**
  *
@@ -241,11 +243,11 @@ export interface FieldsetEmits {
  * @group Component
  *
  */
-declare class Fieldset extends ClassComponent<FieldsetProps, FieldsetSlots, FieldsetEmits> {}
+declare const Fieldset: DefineComponent<FieldsetProps, FieldsetSlots, FieldsetEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Fieldset: GlobalComponentConstructor<Fieldset>;
+        Fieldset: GlobalComponentConstructor<FieldsetProps, FieldsetSlots, FieldsetEmits>;
     }
 }
 
diff --git a/components/lib/fileupload/FileUpload.d.ts b/components/lib/fileupload/FileUpload.d.ts
index cf7ca6468..dbb04bc2f 100755
--- a/components/lib/fileupload/FileUpload.d.ts
+++ b/components/lib/fileupload/FileUpload.d.ts
@@ -14,7 +14,7 @@ import { ButtonPassThroughOptions } from '../button';
 import { MessagePassThroughOptions } from '../message';
 import { PassThroughOptions } from '../passthrough';
 import { ProgressBarPassThroughOptions } from '../progressbar';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type FileUploadPassThroughOptionType = FileUploadPassThroughAttributes | ((options: FileUploadPassThroughMethodOptions) => FileUploadPassThroughAttributes | string) | string | null | undefined;
 
@@ -587,7 +587,7 @@ export interface FileUploadSlots {
     }): VNode[];
 }
 
-export interface FileUploadEmits {
+interface FileUploadEmitsOptions {
     /**
      * Callback to invoke when files are selected.
      * @param {FileUploadSelectEvent} event - Custom select event.
@@ -639,6 +639,17 @@ export interface FileUploadEmits {
     removeUploadedFile(event: FileUploadRemoveUploadedFile): void;
 }
 
+export declare type FileUploadEmits = EmitFn<FileUploadEmitsOptions>;
+
+export interface FileUploadMethods {
+    /**
+     * Upload file.
+     *
+     * @memberof FileUpload
+     */
+    upload(): void;
+}
+
 /**
  * **PrimeVue - FileUpload**
  *
@@ -651,18 +662,11 @@ export interface FileUploadEmits {
  * @group Component
  *
  */
-declare class FileUpload extends ClassComponent<FileUploadProps, FileUploadSlots, FileUploadEmits> {
-    /**
-     * Upload file.
-     *
-     * @memberof FileUpload
-     */
-    upload(): void;
-}
+declare const FileUpload: DefineComponent<FileUploadProps, FileUploadSlots, FileUploadEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        FileUpload: GlobalComponentConstructor<FileUpload>;
+        FileUpload: GlobalComponentConstructor<FileUploadProps, FileUploadSlots, FileUploadEmits>;
     }
 }
 
diff --git a/components/lib/floatlabel/FloatLabel.d.ts b/components/lib/floatlabel/FloatLabel.d.ts
index 3e862d69b..928f73921 100644
--- a/components/lib/floatlabel/FloatLabel.d.ts
+++ b/components/lib/floatlabel/FloatLabel.d.ts
@@ -10,7 +10,7 @@
 import { TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type FloatLabelPassThroughOptionType = FloatLabelPassThroughAttributes | ((options: FloatLabelPassThroughMethodOptions) => FloatLabelPassThroughAttributes | string) | string | null | undefined;
 
@@ -103,7 +103,9 @@ export interface FloatLabelSlots {
 /**
  * Defines valid emits in FloatLabel component.
  */
-export interface FloatLabelEmits {}
+interface FloatLabelEmitsOptions {}
+
+export declare type FloatLabelEmits = EmitFn<FloatLabelEmitsOptions>;
 
 /**
  * **PrimeVue - FloatLabel**
@@ -117,11 +119,11 @@ export interface FloatLabelEmits {}
  * @group Component
  *
  */
-declare class FloatLabel extends ClassComponent<FloatLabelProps, FloatLabelSlots, FloatLabelEmits> {}
+declare const FloatLabel: DefineComponent<FloatLabelProps, FloatLabelSlots, FloatLabelEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        FloatLabel: GlobalComponentConstructor<FloatLabel>;
+        FloatLabel: GlobalComponentConstructor<FloatLabelProps, FloatLabelSlots, FloatLabelEmits>;
     }
 }
 
diff --git a/components/lib/galleria/Galleria.d.ts b/components/lib/galleria/Galleria.d.ts
index ce17535bd..b2f38b293 100755
--- a/components/lib/galleria/Galleria.d.ts
+++ b/components/lib/galleria/Galleria.d.ts
@@ -10,7 +10,7 @@
 import { ButtonHTMLAttributes, HTMLAttributes, TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type GalleriaPassThroughOptionType = GalleriaPassThroughAttributes | ((options: GalleriaPassThroughMethodOptions) => GalleriaPassThroughAttributes | string) | string | null | undefined;
 
@@ -503,7 +503,7 @@ export interface GalleriaSlots {
 /**
  * Defines valid emits in Galleria component.
  */
-export interface GalleriaEmits {
+interface GalleriaEmitsOptions {
     /**
      * Emitted when the active index changes.
      * @param {number} value - Index of new active item.
@@ -516,6 +516,8 @@ export interface GalleriaEmits {
     'update:visible'(value: boolean): void;
 }
 
+export declare type GalleriaEmits = EmitFn<GalleriaEmitsOptions>;
+
 /**
  * **PrimeVue - Galleria**
  *
@@ -528,11 +530,11 @@ export interface GalleriaEmits {
  * @group Component
  *
  */
-declare class Galleria extends ClassComponent<GalleriaProps, GalleriaSlots, GalleriaEmits> {}
+declare const Galleria: DefineComponent<GalleriaProps, GalleriaSlots, GalleriaEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Galleria: GlobalComponentConstructor<Galleria>;
+        Galleria: GlobalComponentConstructor<GalleriaProps, GalleriaSlots, GalleriaEmits>;
     }
 }
 
diff --git a/components/lib/iconfield/IconField.d.ts b/components/lib/iconfield/IconField.d.ts
index cfdbab0a8..9c90c180c 100644
--- a/components/lib/iconfield/IconField.d.ts
+++ b/components/lib/iconfield/IconField.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type IconFieldPassThroughOptionType<T = any> = IconFieldPassThroughAttributes | ((options: IconFieldPassThroughMethodOptions<T>) => IconFieldPassThroughAttributes | string) | string | null | undefined;
 
@@ -101,7 +101,9 @@ export interface IconFieldSlots {
 /**
  * Defines valid emits in IconField component.
  */
-export interface IconFieldEmits {}
+interface IconFieldEmitsOptions {}
+
+export declare type IconFieldEmits = EmitFn<IconFieldEmitsOptions>;
 
 /**
  * **PrimeVue - IconField**
@@ -115,11 +117,11 @@ export interface IconFieldEmits {}
  * @group Component
  *
  */
-declare class IconField extends ClassComponent<IconFieldProps, IconFieldSlots, IconFieldEmits> {}
+declare const IconField: DefineComponent<IconFieldProps, IconFieldSlots, IconFieldEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        IconField: GlobalComponentConstructor<IconField>;
+        IconField: GlobalComponentConstructor<IconFieldProps, IconFieldSlots, IconFieldEmits>;
     }
 }
 
diff --git a/components/lib/icons/index.d.ts b/components/lib/icons/index.d.ts
index 2a8725f22..2c0f4a8c4 100644
--- a/components/lib/icons/index.d.ts
+++ b/components/lib/icons/index.d.ts
@@ -1,4 +1,4 @@
-import { ClassComponent } from '../ts-helpers';
+import { DefineComponent, EmitFn } from '../ts-helpers';
 
 export interface IconProps {
     label?: string | undefined;
@@ -7,6 +7,8 @@ export interface IconProps {
 
 export interface IconSlots {}
 
-export interface IconEmits {}
+interface IconEmitsOptions {}
 
-export declare class Icon extends ClassComponent<IconProps, IconSlots, IconEmits> {}
+export declare type IconEmits = EmitFn<IconEmitsOptions>;
+
+declare const Icon: DefineComponent<IconProps, IconSlots, IconEmits>;
diff --git a/components/lib/image/Image.d.ts b/components/lib/image/Image.d.ts
index eb561fe33..5154d19a1 100644
--- a/components/lib/image/Image.d.ts
+++ b/components/lib/image/Image.d.ts
@@ -10,7 +10,7 @@
 import { TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type ImagePassThroughOptionType = ImagePassThroughAttributes | ((options: ImagePassThroughMethodOptions) => ImagePassThroughAttributes | string) | string | null | undefined;
 
@@ -329,21 +329,11 @@ export interface ImageSlots {
     }): VNode[];
 }
 
-export interface ImageEmits {}
+interface ImageEmitsOptions {}
 
-/**
- * **PrimeVue - Image**
- *
- * _Displays an image with preview and tranformation options. For multiple image, see Galleria._
- *
- * [Live Demo](https://www.primevue.org/image/)
- * --- ---
- * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
- *
- * @group Component
- *
- */
-declare class Image extends ClassComponent<ImageProps, ImageSlots, ImageEmits> {
+export declare type ImageEmits = EmitFn<ImageEmitsOptions>;
+
+export interface ImageMethods {
     /**
      * Triggered when the preview overlay is shown.
      *
@@ -364,9 +354,23 @@ declare class Image extends ClassComponent<ImageProps, ImageSlots, ImageEmits> {
     error(): void;
 }
 
+/**
+ * **PrimeVue - Image**
+ *
+ * _Displays an image with preview and tranformation options. For multiple image, see Galleria._
+ *
+ * [Live Demo](https://www.primevue.org/image/)
+ * --- ---
+ * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
+ *
+ * @group Component
+ *
+ */
+declare const Image: DefineComponent<ImageProps, ImageSlots, ImageEmits, ImageMethods>;
+
 declare module 'vue' {
     export interface GlobalComponents {
-        Image: GlobalComponentConstructor<Image>;
+        Image: GlobalComponentConstructor<ImageProps, ImageSlots, ImageEmits, ImageMethods>;
     }
 }
 
diff --git a/components/lib/inlinemessage/InlineMessage.d.ts b/components/lib/inlinemessage/InlineMessage.d.ts
index 9f957d1f1..f8025b04d 100755
--- a/components/lib/inlinemessage/InlineMessage.d.ts
+++ b/components/lib/inlinemessage/InlineMessage.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 
 export declare type InlineMessagePassThroughOptionType = InlineMessagePassThroughAttributes | ((options: InlineMessagePassThroughMethodOptions) => InlineMessagePassThroughAttributes | string) | string | null | undefined;
 
@@ -134,7 +134,9 @@ export interface InlineMessageSlots {
     icon(): VNode[];
 }
 
-export interface InlineMessageEmits {}
+interface InlineMessageEmitsOptions {}
+
+export declare type InlineMessageEmits = EmitFn<InlineMessageEmitsOptions>;
 
 /**
  * **PrimeVue - InlineMessage**
@@ -148,11 +150,11 @@ export interface InlineMessageEmits {}
  * @group Component
  *
  */
-declare class InlineMessage extends ClassComponent<InlineMessageProps, InlineMessageSlots, InlineMessageEmits> {}
+declare const InlineMessage: DefineComponent<InlineMessageProps, InlineMessageSlots, InlineMessageEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        InlineMessage: GlobalComponentConstructor<InlineMessage>;
+        InlineMessage: GlobalComponentConstructor<InlineMessageProps, InlineMessageSlots, InlineMessageEmits>;
     }
 }
 
diff --git a/components/lib/inplace/Inplace.d.ts b/components/lib/inplace/Inplace.d.ts
index 87cc79225..0b12a25a7 100755
--- a/components/lib/inplace/Inplace.d.ts
+++ b/components/lib/inplace/Inplace.d.ts
@@ -10,7 +10,7 @@
 import { HTMLAttributes, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type InplacePassThroughOptionType = InplacePassThroughAttributes | ((options: InplacePassThroughMethodOptions) => InplacePassThroughAttributes | string) | string | null | undefined;
 
@@ -167,7 +167,7 @@ export interface InplaceSlots {
 /**
  * Defines valid emits in Inplace component.
  */
-export interface InplaceEmits {
+interface InplaceEmitsOptions {
     /**
      * Emitted when the active changes.
      * @param {boolean} value - New value.
@@ -185,6 +185,8 @@ export interface InplaceEmits {
     close(event: Event): void;
 }
 
+export declare type InplaceEmits = EmitFn<InplaceEmitsOptions>;
+
 /**
  * **PrimeVue - Inplace**
  *
@@ -195,12 +197,13 @@ export interface InplaceEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Inplace extends ClassComponent<InplaceProps, InplaceSlots, InplaceEmits> {}
+declare const Inplace: DefineComponent<InplaceProps, InplaceSlots, InplaceEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Inplace: GlobalComponentConstructor<Inplace>;
+        Inplace: GlobalComponentConstructor<InplaceProps, InplaceSlots, InplaceEmits>;
     }
 }
 
diff --git a/components/lib/inputchips/InputChips.d.ts b/components/lib/inputchips/InputChips.d.ts
index 494564bbe..45ee24280 100755
--- a/components/lib/inputchips/InputChips.d.ts
+++ b/components/lib/inputchips/InputChips.d.ts
@@ -11,7 +11,7 @@ import { InputHTMLAttributes, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { ChipPassThroughOptions } from '../chip';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type InputChipsPassThroughOptionType = InputChipsPassThroughAttributes | ((options: InputChipsPassThroughMethodOptions) => InputChipsPassThroughAttributes | string) | string | null | undefined;
 
@@ -320,7 +320,7 @@ export interface InputChipsSlots {
 /**
  * Defines valid emits in InputChips component.
  */
-export interface InputChipsEmits {
+interface InputChipsEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {*} value - New value.
@@ -338,6 +338,8 @@ export interface InputChipsEmits {
     remove(event: InputChipsRemoveEvent): void;
 }
 
+export declare type InputChipsEmits = EmitFn<InputChipsEmitsOptions>;
+
 /**
  * **PrimeVue - InputChips**
  *
@@ -350,11 +352,11 @@ export interface InputChipsEmits {
  * @group Component
  *
  */
-declare class InputChips extends ClassComponent<InputChipsProps, InputChipsSlots, InputChipsEmits> {}
+declare const InputChips: DefineComponent<InputChipsProps, InputChipsSlots, InputChipsEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        InputChips: GlobalComponentConstructor<InputChips>;
+        InputChips: GlobalComponentConstructor<InputChipsProps, InputChipsSlots, InputChipsEmits>;
     }
 }
 
diff --git a/components/lib/inputgroup/InputGroup.d.ts b/components/lib/inputgroup/InputGroup.d.ts
index e24460a4c..d9a42e094 100644
--- a/components/lib/inputgroup/InputGroup.d.ts
+++ b/components/lib/inputgroup/InputGroup.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type InputGroupPassThroughOptionType = InputGroupPassThroughAttributes | ((options: InputGroupPassThroughMethodOptions) => InputGroupPassThroughAttributes | string) | string | null | undefined;
 
@@ -102,7 +102,9 @@ export interface InputGroupSlots {
 /**
  * Defines valid emits in InputGroup component.
  */
-export interface InputGroupEmits {}
+interface InputGroupEmitsOptions {}
+
+export declare type InputGroupEmits = EmitFn<InputGroupEmitsOptions>;
 
 /**
  * **PrimeVue - InputGroup**
@@ -114,12 +116,13 @@ export interface InputGroupEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class InputGroup extends ClassComponent<InputGroupProps, InputGroupSlots, InputGroupEmits> {}
+declare const InputGroup: DefineComponent<InputGroupProps, InputGroupSlots, InputGroupEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        InputGroup: GlobalComponentConstructor<InputGroup>;
+        InputGroup: GlobalComponentConstructor<InputGroupProps, InputGroupSlots, InputGroupEmits>;
     }
 }
 
diff --git a/components/lib/inputgroupaddon/InputGroupAddon.d.ts b/components/lib/inputgroupaddon/InputGroupAddon.d.ts
index 372b70706..ec1028538 100644
--- a/components/lib/inputgroupaddon/InputGroupAddon.d.ts
+++ b/components/lib/inputgroupaddon/InputGroupAddon.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type InputGroupAddonPassThroughOptionType = InputGroupAddonPassThroughAttributes | ((options: InputGroupAddonPassThroughMethodOptions) => InputGroupAddonPassThroughAttributes | string) | string | null | undefined;
 
@@ -102,7 +102,9 @@ export interface InputGroupAddonSlots {
 /**
  * Defines valid emits in InputGroupAddon component.
  */
-export interface InputGroupAddonEmits {}
+interface InputGroupAddonEmitsOptions {}
+
+export declare type InputGroupAddonEmits = EmitFn<InputGroupAddonEmitsOptions>;
 
 /**
  * **PrimeVue - InputGroupAddon**
@@ -114,12 +116,13 @@ export interface InputGroupAddonEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class InputGroupAddon extends ClassComponent<InputGroupAddonProps, InputGroupAddonSlots, InputGroupAddonEmits> {}
+declare const InputGroupAddon: DefineComponent<InputGroupAddonProps, InputGroupAddonSlots, InputGroupAddonEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        InputGroupAddon: GlobalComponentConstructor<InputGroupAddon>;
+        InputGroupAddon: GlobalComponentConstructor<InputGroupAddonProps, InputGroupAddonSlots, InputGroupAddonEmits>;
     }
 }
 
diff --git a/components/lib/inputicon/InputIcon.d.ts b/components/lib/inputicon/InputIcon.d.ts
index 4a164048d..43d0b1962 100644
--- a/components/lib/inputicon/InputIcon.d.ts
+++ b/components/lib/inputicon/InputIcon.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type InputIconPassThroughOptionType<T = any> = InputIconPassThroughAttributes | ((options: InputIconPassThroughMethodOptions<T>) => InputIconPassThroughAttributes | string) | string | null | undefined;
 
@@ -97,7 +97,9 @@ export interface InputIconSlots {
 /**
  * Defines valid emits in InputIcon component.
  */
-export interface InputIconEmits {}
+interface InputIconEmitsOptions {}
+
+export declare type InputIconEmits = EmitFn<InputIconEmitsOptions>;
 
 /**
  * **PrimeVue - InputIcon**
@@ -109,12 +111,13 @@ export interface InputIconEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class InputIcon extends ClassComponent<InputIconProps, InputIconSlots, InputIconEmits> {}
+declare const InputIcon: DefineComponent<InputIconProps, InputIconSlots, InputIconEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        InputIcon: GlobalComponentConstructor<InputIcon>;
+        InputIcon: GlobalComponentConstructor<InputIconProps, InputIconSlots, InputIconEmits>;
     }
 }
 
diff --git a/components/lib/inputmask/InputMask.d.ts b/components/lib/inputmask/InputMask.d.ts
index 5cd23b4a4..012c4d03c 100755
--- a/components/lib/inputmask/InputMask.d.ts
+++ b/components/lib/inputmask/InputMask.d.ts
@@ -10,7 +10,7 @@
 import { ComponentHooks } from '../basecomponent';
 import { InputTextPassThroughOptions } from '../inputtext';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type InputMaskPassThroughOptionType = InputMaskPassThroughAttributes | ((options: InputMaskPassThroughMethodOptions) => InputMaskPassThroughAttributes | string) | string | null | undefined;
 
@@ -174,7 +174,7 @@ export interface InputMaskSlots {}
 /**
  * Defines valid emits in InputMask component.
  */
-export interface InputMaskEmits {
+interface InputMaskEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {string} value - New value.
@@ -206,6 +206,8 @@ export interface InputMaskEmits {
     complete: (event: Event) => void;
 }
 
+export declare type InputMaskEmits = EmitFn<InputMaskEmitsOptions>;
+
 /**
  * **PrimeVue - InputMask**
  *
@@ -218,11 +220,11 @@ export interface InputMaskEmits {
  * @group Component
  *
  */
-declare class InputMask extends ClassComponent<InputMaskProps, InputMaskSlots, InputMaskEmits> {}
+declare const InputMask: DefineComponent<InputMaskProps, InputMaskSlots, InputMaskEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        InputMask: GlobalComponentConstructor<InputMask>;
+        InputMask: GlobalComponentConstructor<InputMaskProps, InputMaskSlots, InputMaskEmits>;
     }
 }
 
diff --git a/components/lib/inputnumber/InputNumber.d.ts b/components/lib/inputnumber/InputNumber.d.ts
index b7b2078dc..e4113a60d 100755
--- a/components/lib/inputnumber/InputNumber.d.ts
+++ b/components/lib/inputnumber/InputNumber.d.ts
@@ -11,7 +11,7 @@ import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { InputTextPassThroughOptions } from '../inputtext';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, Nullable, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, Nullable, PassThrough } from '../ts-helpers';
 
 export declare type RoundingMode = 'ceil' | 'floor' | 'expand' | 'trunc' | 'halfCeil' | 'halfFloor' | 'halfExpand' | 'halfTrunc' | 'halfEven';
 
@@ -420,7 +420,7 @@ export interface InputNumberSlots {
 /**
  * Defines valid emits in InputNumber component.
  */
-export interface InputNumberEmits {
+interface InputNumberEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {number} value - New value.
@@ -443,6 +443,17 @@ export interface InputNumberEmits {
     blur(event: InputNumberBlurEvent): void;
 }
 
+export declare type InputNumberEmits = EmitFn<InputNumberEmitsOptions>;
+
+export interface InputNumberMethods {
+    /**
+     * Returns Intl.NumberFormat object.
+     *
+     * @memberof InputNumber
+     */
+    getFormatter: () => Intl.NumberFormat | undefined;
+}
+
 /**
  * **PrimeVue - InputNumber**
  *
@@ -453,19 +464,13 @@ export interface InputNumberEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class InputNumber extends ClassComponent<InputNumberProps, InputNumberSlots, InputNumberEmits> {
-    /**
-     * Returns Intl.NumberFormat object.
-     *
-     * @memberof InputNumber
-     */
-    getFormatter: () => Intl.NumberFormat | undefined;
-}
+declare const InputNumber: DefineComponent<InputNumberProps, InputNumberSlots, InputNumberEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        InputNumber: GlobalComponentConstructor<InputNumber>;
+        InputNumber: GlobalComponentConstructor<InputNumberProps, InputNumberSlots, InputNumberEmits>;
     }
 }
 
diff --git a/components/lib/inputotp/InputOtp.d.ts b/components/lib/inputotp/InputOtp.d.ts
index dd78821d1..70eecfc0e 100755
--- a/components/lib/inputotp/InputOtp.d.ts
+++ b/components/lib/inputotp/InputOtp.d.ts
@@ -11,7 +11,7 @@ import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { InputTextPassThroughOptions } from '../inputtext';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type InputOtpPassThroughOptionType = InputOtpPassThroughAttributes | ((options: InputOtpPassThroughMethodOptions) => InputOtpPassThroughAttributes | string) | string | null | undefined;
 
@@ -233,7 +233,7 @@ export interface InputOtpSlots {
 /**
  * Defines valid emits in InputOtp component.
  */
-export interface InputOtpEmits {
+interface InputOtpEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {boolean} value - New value.
@@ -256,6 +256,8 @@ export interface InputOtpEmits {
     blur(event: Event): void;
 }
 
+export declare type InputOtpEmits = EmitFn<InputOtpEmitsOptions>;
+
 /**
  * **PrimeVue - InputOtp**
  *
@@ -268,11 +270,11 @@ export interface InputOtpEmits {
  * @group Component
  *
  */
-declare class InputOtp extends ClassComponent<InputOtpProps, InputOtpSlots, InputOtpEmits> {}
+declare const InputOtp: DefineComponent<InputOtpProps, InputOtpSlots, InputOtpEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        InputOtp: GlobalComponentConstructor<InputOtp>;
+        InputOtp: GlobalComponentConstructor<InputOtpProps, InputOtpSlots, InputOtpEmits>;
     }
 }
 
diff --git a/components/lib/inputswitch/InputSwitch.d.ts b/components/lib/inputswitch/InputSwitch.d.ts
index 42c158eb7..12699e7ff 100755
--- a/components/lib/inputswitch/InputSwitch.d.ts
+++ b/components/lib/inputswitch/InputSwitch.d.ts
@@ -8,7 +8,7 @@
  *
  */
 import * as ToggleSwitch from '../toggleswitch';
-import { ClassComponent, GlobalComponentConstructor } from '../ts-helpers';
+import { DefineComponent, EmitFn, GlobalComponentConstructor } from '../ts-helpers';
 /**
  * Custom passthrough(pt) option method.
  */
@@ -40,7 +40,9 @@ export interface InputSwitchSlots extends ToggleSwitch.ToggleSwitchSlots {}
 /**
  * Defines valid emits in InputSwitch component.
  */
-export interface InputSwitchEmits extends ToggleSwitch.ToggleSwitchEmits {}
+interface InputSwitchEmitsOptions {}
+
+export declare type InputSwitchEmits = EmitFn<InputSwitchEmitsOptions> & ToggleSwitch.ToggleSwitchEmits;
 
 /**
  * @deprecated Deprecated since v4. Use ToggleSwitch component instead.
@@ -56,11 +58,11 @@ export interface InputSwitchEmits extends ToggleSwitch.ToggleSwitchEmits {}
  * @group Component
  *
  */
-declare class InputSwitch extends ClassComponent<InputSwitchProps, InputSwitchSlots, InputSwitchEmits> {}
+declare const InputSwitch: DefineComponent<InputSwitchProps, InputSwitchSlots, InputSwitchEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        InputSwitch: GlobalComponentConstructor<InputSwitch>;
+        InputSwitch: GlobalComponentConstructor<InputSwitchProps, InputSwitchSlots, InputSwitchEmits>;
     }
 }
 
diff --git a/components/lib/inputtext/InputText.d.ts b/components/lib/inputtext/InputText.d.ts
index 792983ccc..31c0c5c89 100755
--- a/components/lib/inputtext/InputText.d.ts
+++ b/components/lib/inputtext/InputText.d.ts
@@ -10,7 +10,7 @@
 import { InputHTMLAttributes } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, Nullable, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, Nullable, PassThrough } from '../ts-helpers';
 
 export declare type InputTextPassThroughOptionType<T = any> = InputTextPassThroughAttributes | ((options: InputTextPassThroughMethodOptions<T>) => InputTextPassThroughAttributes | string) | string | null | undefined;
 
@@ -130,7 +130,7 @@ export interface InputTextSlots {}
 /**
  * Defines valid emits in InputText component.
  */
-export interface InputTextEmits {
+interface InputTextEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {string} value - New value.
@@ -138,6 +138,8 @@ export interface InputTextEmits {
     'update:modelValue'(value: string | undefined): void;
 }
 
+export declare type InputTextEmits = EmitFn<InputTextEmitsOptions>;
+
 /**
  * **PrimeVue - InputText**
  *
@@ -148,12 +150,13 @@ export interface InputTextEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class InputText extends ClassComponent<InputTextProps, InputTextSlots, InputTextEmits> {}
+declare const InputText: DefineComponent<InputTextProps, InputTextSlots, InputTextEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        InputText: GlobalComponentConstructor<InputText>;
+        InputText: GlobalComponentConstructor<InputTextProps, InputTextSlots, InputTextEmits>;
     }
 }
 
diff --git a/components/lib/knob/Knob.d.ts b/components/lib/knob/Knob.d.ts
index b30d66a79..b151d447c 100644
--- a/components/lib/knob/Knob.d.ts
+++ b/components/lib/knob/Knob.d.ts
@@ -9,7 +9,7 @@
  */
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type KnobPassThroughOptionType = KnobPassThroughAttributes | ((options: KnobPassThroughMethodOptions) => KnobPassThroughAttributes | string) | string | null | undefined;
 
@@ -221,7 +221,7 @@ export interface KnobSlots {}
 /**
  * Defines valid emits in Knob component.
  */
-export interface KnobEmits {
+export interface KnobEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {number} event - New value.
@@ -234,6 +234,8 @@ export interface KnobEmits {
     change(value: number): void;
 }
 
+export declare type KnobEmits = EmitFn<KnobEmitsOptions>;
+
 /**
  * **PrimeVue - Knob**
  *
@@ -243,12 +245,14 @@ export interface KnobEmits {
  * --- ---
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
+ * @group Component
+ *
  */
-declare class Knob extends ClassComponent<KnobProps, KnobSlots, KnobEmits> {}
+declare const Knob: DefineComponent<KnobProps, KnobSlots, KnobEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Knob: GlobalComponentConstructor<Knob>;
+        Knob: GlobalComponentConstructor<KnobProps, KnobSlots, KnobEmits>;
     }
 }
 
diff --git a/components/lib/listbox/Listbox.d.ts b/components/lib/listbox/Listbox.d.ts
index b5b473c73..cf79f6ee4 100755
--- a/components/lib/listbox/Listbox.d.ts
+++ b/components/lib/listbox/Listbox.d.ts
@@ -13,7 +13,7 @@ import { IconFieldPassThroughOptions } from '../iconfield';
 import { InputIconPassThroughOptions } from '../inputicon';
 import { InputTextPassThroughOptions } from '../inputtext';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 import { VirtualScrollerItemOptions, VirtualScrollerPassThroughOptionType, VirtualScrollerProps } from '../virtualscroller';
 
 export declare type ListboxPassThroughOptionType<T = any> = ListboxPassThroughAttributes | ((options: ListboxPassThroughMethodOptions<T>) => ListboxPassThroughAttributes | string) | string | null | undefined;
@@ -555,7 +555,7 @@ export interface ListboxSlots {
 /**
  * Defines valid emits in Listbox component.
  */
-export interface ListboxEmits {
+interface ListboxEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {*} value - New value.
@@ -593,6 +593,8 @@ export interface ListboxEmits {
     'option-dblclick'(event: ListboxOptionDblClickEvent): void;
 }
 
+export declare type ListboxEmits = EmitFn<ListboxEmitsOptions>;
+
 /**
  * **PrimeVue - Listbox**
  *
@@ -605,11 +607,11 @@ export interface ListboxEmits {
  * @group Component
  *
  */
-declare class Listbox extends ClassComponent<ListboxProps, ListboxSlots, ListboxEmits> {}
+declare const Listbox: DefineComponent<ListboxProps, ListboxSlots, ListboxEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Listbox: GlobalComponentConstructor<Listbox>;
+        Listbox: GlobalComponentConstructor<ListboxProps, ListboxSlots, ListboxEmits>;
     }
 }
 
diff --git a/components/lib/megamenu/MegaMenu.d.ts b/components/lib/megamenu/MegaMenu.d.ts
index 2fb28fcd6..1da571a0f 100755
--- a/components/lib/megamenu/MegaMenu.d.ts
+++ b/components/lib/megamenu/MegaMenu.d.ts
@@ -11,7 +11,7 @@ import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { MenuItem } from '../menuitem';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type MegaMenuPassThroughOptionType = MegaMenuPassThroughAttributes | ((options: MegaMenuPassThroughMethodOptions) => MegaMenuPassThroughAttributes | string) | string | null | undefined;
 
@@ -378,7 +378,7 @@ export interface MegaMenuSlots {
 /**
  * Defines valid emits in MegaMenu component.
  */
-export interface MegaMenuEmits {
+interface MegaMenuEmitsOptions {
     /**
      * Callback to invoke when the component receives focus.
      * @param {Event} event - Browser event.
@@ -391,6 +391,8 @@ export interface MegaMenuEmits {
     blur(event: Event): void;
 }
 
+export declare type MegaMenuEmits = EmitFn<MegaMenuEmitsOptions>;
+
 /**
  * **PrimeVue - MegaMenu**
  *
@@ -403,11 +405,11 @@ export interface MegaMenuEmits {
  * @group Component
  *
  */
-declare class MegaMenu extends ClassComponent<MegaMenuProps, MegaMenuSlots, MegaMenuEmits> {}
+declare const MegaMenu: DefineComponent<MegaMenuProps, MegaMenuSlots, MegaMenuEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        MegaMenu: GlobalComponentConstructor<MegaMenu>;
+        MegaMenu: GlobalComponentConstructor<MegaMenuProps, MegaMenuSlots, MegaMenuEmits>;
     }
 }
 
diff --git a/components/lib/menu/Menu.d.ts b/components/lib/menu/Menu.d.ts
index 3e7ff72e3..7dcd9e15f 100755
--- a/components/lib/menu/Menu.d.ts
+++ b/components/lib/menu/Menu.d.ts
@@ -11,7 +11,7 @@ import { TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { MenuItem } from '../menuitem';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 
 export declare type MenuPassThroughOptionType = MenuPassThroughAttributes | ((options: MenuPassThroughMethodOptions) => MenuPassThroughAttributes | string) | string | null | undefined;
 
@@ -325,7 +325,7 @@ export interface MenuSlots {
 /**
  * Defines valid emits in Menu component.
  */
-export interface MenuEmits {
+interface MenuEmitsOptions {
     /**
      * Callback to invoke when the component receives focus.
      * @param {Event} event - Browser event.
@@ -338,19 +338,9 @@ export interface MenuEmits {
     blur(event: Event): void;
 }
 
-/**
- * **PrimeVue - Menu**
- *
- * _Menu is a navigation / command component that supports dynamic and static positioning._
- *
- * [Live Demo](https://www.primevue.org/menu/)
- * --- ---
- * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
- *
- * @group Component
- *
- */
-declare class Menu extends ClassComponent<MenuProps, MenuSlots, MenuEmits> {
+export declare type MenuEmits = EmitFn<MenuEmitsOptions>;
+
+export interface MenuMethods {
     /**
      * Toggles the visibility of the overlay.
      * @param {Event} event - Browser event.
@@ -374,9 +364,23 @@ declare class Menu extends ClassComponent<MenuProps, MenuSlots, MenuEmits> {
     hide(): void;
 }
 
+/**
+ * **PrimeVue - Menu**
+ *
+ * _Menu is a navigation / command component that supports dynamic and static positioning._
+ *
+ * [Live Demo](https://www.primevue.org/menu/)
+ * --- ---
+ * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
+ *
+ * @group Component
+ *
+ */
+declare const Menu: DefineComponent<MenuProps, MenuSlots, MenuEmits, MenuMethods>;
+
 declare module 'vue' {
     export interface GlobalComponents {
-        Menu: GlobalComponentConstructor<Menu>;
+        Menu: GlobalComponentConstructor<MenuProps, MenuSlots, MenuEmits, MenuMethods>;
     }
 }
 
diff --git a/components/lib/menubar/Menubar.d.ts b/components/lib/menubar/Menubar.d.ts
index 2b5c71a49..293aff746 100755
--- a/components/lib/menubar/Menubar.d.ts
+++ b/components/lib/menubar/Menubar.d.ts
@@ -11,7 +11,7 @@ import { ButtonHTMLAttributes, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { MenuItem } from '../menuitem';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type MenubarPassThroughOptionType = MenubarPassThroughAttributes | ((options: MenubarPassThroughMethodOptions) => MenubarPassThroughAttributes | string) | string | null | undefined;
 
@@ -402,7 +402,9 @@ export interface MenubarSlots {
 /**
  * Defines valid emits in Menubar component.
  */
-export interface MenubarEmits {}
+interface MenubarEmitsOptions {}
+
+export declare type MenubarEmits = EmitFn<MenubarEmitsOptions>;
 
 /**
  * **PrimeVue - Menubar**
@@ -416,11 +418,11 @@ export interface MenubarEmits {}
  * @group Component
  *
  */
-declare class Menubar extends ClassComponent<MenubarProps, MenubarSlots, MenubarEmits> {}
+declare const Menubar: DefineComponent<MenubarProps, MenubarSlots, MenubarEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Menubar: GlobalComponentConstructor<Menubar>;
+        Menubar: GlobalComponentConstructor<MenubarProps, MenubarSlots, MenubarEmits>;
     }
 }
 
diff --git a/components/lib/message/Message.d.ts b/components/lib/message/Message.d.ts
index 2b7394e81..9481d1bad 100755
--- a/components/lib/message/Message.d.ts
+++ b/components/lib/message/Message.d.ts
@@ -10,7 +10,7 @@
 import { ButtonHTMLAttributes, TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 
 export declare type MessagePassThroughOptionType<T = any> = MessagePassThroughAttributes | ((options: MessagePassThroughMethodOptions<T>) => MessagePassThroughAttributes | string) | string | null | undefined;
 
@@ -216,7 +216,7 @@ export interface MessageSlots {
 /**
  * Defines valid emits in Message component.
  */
-export interface MessageEmits {
+interface MessageEmitsOptions {
     /**
      * Callback to invoke when a message is closed.
      * @param {Event} event - Browser event.
@@ -228,6 +228,8 @@ export interface MessageEmits {
     'life-end'(): void;
 }
 
+export declare type MessageEmits = EmitFn<MessageEmitsOptions>;
+
 /**
  * **PrimeVue - Message**
  *
@@ -240,11 +242,11 @@ export interface MessageEmits {
  * @group Component
  *
  */
-declare class Message extends ClassComponent<MessageProps, MessageSlots, MessageEmits> {}
+declare const Message: DefineComponent<MessageProps, MessageSlots, MessageEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Message: GlobalComponentConstructor<Message>;
+        Message: GlobalComponentConstructor<MessageProps, MessageSlots, MessageEmits>;
     }
 }
 
diff --git a/components/lib/metergroup/MeterGroup.d.ts b/components/lib/metergroup/MeterGroup.d.ts
index cc20eeee9..ab59cf17c 100644
--- a/components/lib/metergroup/MeterGroup.d.ts
+++ b/components/lib/metergroup/MeterGroup.d.ts
@@ -9,7 +9,7 @@
  */
 import { VNode } from 'vue';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type MeterGroupPassThroughOptionType = MeterGroupPassThroughAttributes | ((options: MeterGroupPassThroughMethodOptions) => MeterGroupPassThroughAttributes | string) | string | null | undefined;
 
@@ -285,7 +285,9 @@ export interface MeterGroupSlots {
 /**
  * Defines valid emits in MeterGroup component.
  */
-export interface MeterGroupEmits {}
+interface MeterGroupEmitsOptions {}
+
+export declare type MeterGroupEmits = EmitFn<MeterGroupEmitsOptions>;
 
 /**
  * **PrimeVue - MeterGroup**
@@ -297,12 +299,13 @@ export interface MeterGroupEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class MeterGroup extends ClassComponent<MeterGroupProps, MeterGroupSlots, MeterGroupEmits> {}
+declare const MeterGroup: DefineComponent<MeterGroupProps, MeterGroupSlots, MeterGroupEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        MeterGroup: GlobalComponentConstructor<MeterGroup>;
+        MeterGroup: GlobalComponentConstructor<MeterGroupProps, MeterGroupSlots, MeterGroupEmits>;
     }
 }
 
diff --git a/components/lib/multiselect/MultiSelect.d.ts b/components/lib/multiselect/MultiSelect.d.ts
index 407f23302..6eb6d89f1 100755
--- a/components/lib/multiselect/MultiSelect.d.ts
+++ b/components/lib/multiselect/MultiSelect.d.ts
@@ -14,7 +14,7 @@ import { IconFieldPassThroughOptions } from '../iconfield';
 import { InputIconPassThroughOptions } from '../inputicon';
 import { InputTextPassThroughOptions } from '../inputtext';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 import { VirtualScrollerItemOptions, VirtualScrollerPassThroughOptionType, VirtualScrollerProps } from '../virtualscroller';
 
 export declare type MultiSelectPassThroughOptionType = MultiSelectPassThroughAttributes | ((options: MultiSelectPassThroughMethodOptions) => MultiSelectPassThroughAttributes | string) | string | null | undefined;
@@ -828,7 +828,7 @@ export interface MultiSelectSlots {
 /**
  * Defines valid emits in MultiSelect component.
  */
-export interface MultiSelectEmits {
+interface MultiSelectEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {*} value - New value.
@@ -877,19 +877,9 @@ export interface MultiSelectEmits {
     'selectall-change'(event: MultiSelectAllChangeEvent): void;
 }
 
-/**
- * **PrimeVue - MultiSelect**
- *
- * _MultiSelect is used to select multiple items from a collection._
- *
- * [Live Demo](https://www.primevue.org/multiselect/)
- * --- ---
- * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
- *
- * @group Component
- *
- */
-declare class MultiSelect extends ClassComponent<MultiSelectProps, MultiSelectSlots, MultiSelectEmits> {
+export declare type MultiSelectEmits = EmitFn<MultiSelectEmitsOptions>;
+
+export interface MultiSelectMethods {
     /**
      * Shows the overlay.
      * @param {boolean} [isFocus] - Decides whether to focus on the component. Default value is false.
@@ -906,9 +896,23 @@ declare class MultiSelect extends ClassComponent<MultiSelectProps, MultiSelectSl
     hide(isFocus?: boolean): void;
 }
 
+/**
+ * **PrimeVue - MultiSelect**
+ *
+ * _MultiSelect is used to select multiple items from a collection._
+ *
+ * [Live Demo](https://www.primevue.org/multiselect/)
+ * --- ---
+ * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
+ *
+ * @group Component
+ *
+ */
+declare const MultiSelect: DefineComponent<MultiSelectProps, MultiSelectSlots, MultiSelectEmits>;
+
 declare module 'vue' {
     export interface GlobalComponents {
-        MultiSelect: GlobalComponentConstructor<MultiSelect>;
+        MultiSelect: GlobalComponentConstructor<MultiSelectProps, MultiSelectSlots, MultiSelectEmits>;
     }
 }
 
diff --git a/components/lib/orderlist/OrderList.d.ts b/components/lib/orderlist/OrderList.d.ts
index cd65d2f25..8970d1774 100755
--- a/components/lib/orderlist/OrderList.d.ts
+++ b/components/lib/orderlist/OrderList.d.ts
@@ -12,7 +12,7 @@ import { ComponentHooks } from '../basecomponent';
 import { ButtonPassThroughOptions, ButtonProps } from '../button';
 import { ListboxPassThroughOptions } from '../listbox';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type OrderListPassThroughOptionType = OrderListPassThroughAttributes | ((options: OrderListPassThroughMethodOptions) => OrderListPassThroughAttributes | string) | string | null | undefined;
 
@@ -333,7 +333,7 @@ export interface OrderListSlots {
 /**
  * Defines valid slots in OrderList component.
  */
-export interface OrderListEmits {
+interface OrderListEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {*} value - New value.
@@ -356,6 +356,8 @@ export interface OrderListEmits {
     'selection-change'(event: OrderListSelectionChangeEvent): void;
 }
 
+export declare type OrderListEmits = EmitFn<OrderListEmitsOptions>;
+
 /**
  * **PrimeVue - OrderList**
  *
@@ -366,12 +368,13 @@ export interface OrderListEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class OrderList extends ClassComponent<OrderListProps, OrderListSlots, OrderListEmits> {}
+declare const OrderList: DefineComponent<OrderListProps, OrderListSlots, OrderListEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        OrderList: GlobalComponentConstructor<OrderList>;
+        OrderList: GlobalComponentConstructor<OrderListProps, OrderListSlots, OrderListEmits>;
     }
 }
 
diff --git a/components/lib/organizationchart/OrganizationChart.d.ts b/components/lib/organizationchart/OrganizationChart.d.ts
index 4d88dd5e6..a3b3dcc0e 100755
--- a/components/lib/organizationchart/OrganizationChart.d.ts
+++ b/components/lib/organizationchart/OrganizationChart.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type OrganizationChartPassThroughOptionType = OrganizationChartPassThroughAttributes | ((options: OrganizationChartPassThroughMethodOptions) => OrganizationChartPassThroughAttributes | string) | string | null | undefined;
 
@@ -307,7 +307,7 @@ export interface OrganizationChartSlots {
 /**
  * Defines valid emits in OrganizationChart component.
  */
-export interface OrganizationChartEmits {
+interface OrganizationChartEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {*} value - New value.
@@ -340,6 +340,8 @@ export interface OrganizationChartEmits {
     'node-collapsed'(node: OrganizationChartNode): void;
 }
 
+export declare type OrganizationChartEmits = EmitFn<OrganizationChartEmitsOptions>;
+
 /**
  * **PrimeVue - OrganizationChart**
  *
@@ -350,12 +352,13 @@ export interface OrganizationChartEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class OrganizationChart extends ClassComponent<OrganizationChartProps, OrganizationChartSlots, OrganizationChartEmits> {}
+declare const OrganizationChart: DefineComponent<OrganizationChartProps, OrganizationChartSlots, OrganizationChartEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        OrganizationChart: GlobalComponentConstructor<OrganizationChart>;
+        OrganizationChart: GlobalComponentConstructor<OrganizationChartProps, OrganizationChartSlots, OrganizationChartEmits>;
     }
 }
 
diff --git a/components/lib/overlaypanel/OverlayPanel.d.ts b/components/lib/overlaypanel/OverlayPanel.d.ts
index fe0bd8354..58fab9fca 100644
--- a/components/lib/overlaypanel/OverlayPanel.d.ts
+++ b/components/lib/overlaypanel/OverlayPanel.d.ts
@@ -9,7 +9,7 @@
  */
 import 'vue';
 import * as Popover from '../popover';
-import { ClassComponent, GlobalComponentConstructor } from '../ts-helpers';
+import { DefineComponent, EmitFn, GlobalComponentConstructor } from '../ts-helpers';
 
 /**
  * Custom passthrough(pt) option method.
@@ -52,22 +52,11 @@ export interface OverlayPanelSlots extends Popover.PopoverSlots {}
 /**
  * Defines valid emits in OverlayPanel component.
  */
-export interface OverlayPanelEmits extends Popover.PopoverEmits {}
+interface OverlayPanelEmitsOptions {}
 
-/**
- * @deprecated Deprecated since v4. Use Popover component instead.
- *
- * **PrimeVue - OverlayPanel**
- *
- * _OverlayPanel, also known as Popover, is a container component that can overlay other components on page._
- *
- * [Live Demo](https://www.primevue.org/popover/)
- * --- ---
- * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
- *
- * @group Component
- */
-declare class OverlayPanel extends ClassComponent<OverlayPanelProps, OverlayPanelSlots, OverlayPanelEmits> {
+export declare type OverlayPanelEmits = EmitFn<OverlayPanelEmitsOptions> & Popover.PopoverEmits;
+
+export interface OverlayPanelMethods {
     /**
      * Aligns overlay panel based on the current position of the container.
      */
@@ -96,9 +85,25 @@ declare class OverlayPanel extends ClassComponent<OverlayPanelProps, OverlayPane
     hide(): void;
 }
 
+/**
+ * @deprecated Deprecated since v4. Use Popover component instead.
+ *
+ * **PrimeVue - OverlayPanel**
+ *
+ * _OverlayPanel, also known as Popover, is a container component that can overlay other components on page._
+ *
+ * [Live Demo](https://www.primevue.org/popover/)
+ * --- ---
+ * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
+ *
+ * @group Component
+ *
+ */
+declare const OverlayPanel: DefineComponent<OverlayPanelProps, OverlayPanelSlots, OverlayPanelEmits, OverlayPanelMethods>;
+
 declare module 'vue' {
     export interface GlobalComponents {
-        OverlayPanel: GlobalComponentConstructor<OverlayPanel>;
+        OverlayPanel: GlobalComponentConstructor<OverlayPanelProps, OverlayPanelSlots, OverlayPanelEmits, OverlayPanelMethods>;
     }
 }
 
diff --git a/components/lib/paginator/Paginator.d.ts b/components/lib/paginator/Paginator.d.ts
index f495da8de..4eb36c8c1 100755
--- a/components/lib/paginator/Paginator.d.ts
+++ b/components/lib/paginator/Paginator.d.ts
@@ -12,7 +12,7 @@ import { ComponentHooks } from '../basecomponent';
 import { DropdownPassThroughOptions } from '../dropdown';
 import { InputNumberPassThroughOptions } from '../inputnumber';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type PaginatorPassThroughOptionType<T = any> = PaginatorPassThroughAttributes | ((options: PaginatorPassThroughMethodOptions<T>) => PaginatorPassThroughAttributes | string) | string | null | undefined;
 
@@ -417,7 +417,7 @@ export interface PaginatorSlots {
 /**
  * Defines valid emits in Paginator component.
  */
-export interface PaginatorEmits {
+interface PaginatorEmitsOptions {
     /**
      * Emitted when the first changes.
      * @param {number} value - New value.
@@ -435,6 +435,8 @@ export interface PaginatorEmits {
     page(event: PageState): void;
 }
 
+export declare type PaginatorEmits = EmitFn<PaginatorEmitsOptions>;
+
 /**
  * **PrimeVue - Paginator**
  *
@@ -445,12 +447,13 @@ export interface PaginatorEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Paginator extends ClassComponent<PaginatorProps, PaginatorSlots, PaginatorEmits> {}
+declare const Paginator: DefineComponent<PaginatorProps, PaginatorSlots, PaginatorEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Paginator: GlobalComponentConstructor<Paginator>;
+        Paginator: GlobalComponentConstructor<PaginatorProps, PaginatorSlots, PaginatorEmits>;
     }
 }
 
diff --git a/components/lib/panel/Panel.d.ts b/components/lib/panel/Panel.d.ts
index bb9d7de5f..263f8f484 100755
--- a/components/lib/panel/Panel.d.ts
+++ b/components/lib/panel/Panel.d.ts
@@ -11,7 +11,7 @@ import { TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { ButtonPassThroughOptions } from '../button';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type PanelPassThroughOptionType = PanelPassThroughAttributes | ((options: PanelPassThroughMethodOptions) => PanelPassThroughAttributes | string) | string | null | undefined;
 
@@ -243,7 +243,7 @@ export interface PanelSlots {
 /**
  * Defines valid emits in Panel component.
  */
-export interface PanelEmits {
+interface PanelEmitsOptions {
     /**
      * Emitted when the collapsed changes.
      * @param {boolean} value - New value.
@@ -256,6 +256,8 @@ export interface PanelEmits {
     toggle(event: PanelToggleEvent): void;
 }
 
+export declare type PanelEmits = EmitFn<PanelEmitsOptions>;
+
 /**
  * **PrimeVue - Panel**
  *
@@ -268,11 +270,11 @@ export interface PanelEmits {
  * @group Component
  *
  */
-declare class Panel extends ClassComponent<PanelProps, PanelSlots, PanelEmits> {}
+declare const Panel: DefineComponent<PanelProps, PanelSlots, PanelEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Panel: GlobalComponentConstructor<Panel>;
+        Panel: GlobalComponentConstructor<PanelProps, PanelSlots, PanelEmits>;
     }
 }
 
diff --git a/components/lib/panelmenu/PanelMenu.d.ts b/components/lib/panelmenu/PanelMenu.d.ts
index ec3e2732b..52a89fb6e 100755
--- a/components/lib/panelmenu/PanelMenu.d.ts
+++ b/components/lib/panelmenu/PanelMenu.d.ts
@@ -11,7 +11,7 @@ import { TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { MenuItem } from '../menuitem';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type PanelMenuPassThroughOptionType = PanelMenuPassThroughAttributes | ((options: PanelMenuPassThroughMethodOptions) => PanelMenuPassThroughAttributes | string) | string | null | undefined;
 
@@ -377,7 +377,7 @@ export interface PanelMenuSlots {
 /**
  * Defines valid emits in PanelMenu component.
  */
-export interface PanelMenuEmits {
+interface PanelMenuEmitsOptions {
     /**
      * Emitted when the expandedKeys changes.
      * @param {*} value - New value.
@@ -395,6 +395,8 @@ export interface PanelMenuEmits {
     'panel-close'(event: PanelMenuPanelCloseEvent): void;
 }
 
+export declare type PanelMenuEmits = EmitFn<PanelMenuEmitsOptions>;
+
 /**
  * **PrimeVue - PanelMenu**
  *
@@ -407,11 +409,11 @@ export interface PanelMenuEmits {
  * @group Component
  *
  */
-declare class PanelMenu extends ClassComponent<PanelMenuProps, PanelMenuSlots, PanelMenuEmits> {}
+declare const PanelMenu: DefineComponent<PanelMenuProps, PanelMenuSlots, PanelMenuEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        PanelMenu: GlobalComponentConstructor<PanelMenu>;
+        PanelMenu: GlobalComponentConstructor<PanelMenuProps, PanelMenuSlots, PanelMenuEmits>;
     }
 }
 
diff --git a/components/lib/password/Password.d.ts b/components/lib/password/Password.d.ts
index 76460aecc..7a350699c 100755
--- a/components/lib/password/Password.d.ts
+++ b/components/lib/password/Password.d.ts
@@ -11,7 +11,7 @@ import { HTMLAttributes, InputHTMLAttributes, TransitionProps, VNode } from 'vue
 import { ComponentHooks } from '../basecomponent';
 import { InputTextPassThroughOptions } from '../inputtext';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, Nullable, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, Nullable, PassThrough } from '../ts-helpers';
 
 export declare type PasswordPassThroughOptionType = PasswordPassThroughAttributes | ((options: PasswordPassThroughMethodOptions) => PasswordPassThroughAttributes | string) | string | null | undefined;
 
@@ -413,7 +413,7 @@ export interface PasswordSlots {
 /**
  * Defines valid emits in Password component.
  */
-export interface PasswordEmits {
+interface PasswordEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {string} value - New value.
@@ -426,6 +426,8 @@ export interface PasswordEmits {
     change(event: Event): void;
 }
 
+export declare type PasswordEmits = EmitFn<PasswordEmitsOptions>;
+
 /**
  * **PrimeVue - Password**
  *
@@ -436,12 +438,13 @@ export interface PasswordEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Password extends ClassComponent<PasswordProps, PasswordSlots, PasswordEmits> {}
+declare const Password: DefineComponent<PasswordProps, PasswordSlots, PasswordEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Password: GlobalComponentConstructor<Password>;
+        Password: GlobalComponentConstructor<PasswordProps, PasswordSlots, PasswordEmits>;
     }
 }
 
diff --git a/components/lib/picklist/PickList.d.ts b/components/lib/picklist/PickList.d.ts
index 067cbf1c0..8624fdca6 100755
--- a/components/lib/picklist/PickList.d.ts
+++ b/components/lib/picklist/PickList.d.ts
@@ -12,7 +12,7 @@ import { ComponentHooks } from '../basecomponent';
 import { ButtonPassThroughOptions } from '../button';
 import { ListboxPassThroughOptions } from '../listbox';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type PickListPassThroughOptionType = PickListPassThroughAttributes | ((options: PickListPassThroughMethodOptions) => PickListPassThroughAttributes | string) | string | null | undefined;
 
@@ -544,7 +544,7 @@ export interface PickListSlots {
 /**
  * Defines valid emits in PickList component.
  */
-export interface PickListEmits {
+interface PickListEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {*} value - New value.
@@ -587,6 +587,8 @@ export interface PickListEmits {
     'move-all-to-source'(event: PickListMoveAllToSourceEvent): void;
 }
 
+export declare type PickListEmits = EmitFn<PickListEmitsOptions>;
+
 /**
  * **PrimeVue - PickList**
  *
@@ -597,12 +599,13 @@ export interface PickListEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class PickList extends ClassComponent<PickListProps, PickListSlots, PickListEmits> {}
+declare const PickList: DefineComponent<PickListProps, PickListSlots, PickListEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        PickList: GlobalComponentConstructor<PickList>;
+        PickList: GlobalComponentConstructor<PickListProps, PickListSlots, PickListEmits>;
     }
 }
 
diff --git a/components/lib/popover/Popover.d.ts b/components/lib/popover/Popover.d.ts
index 038fc9094..afeb97920 100755
--- a/components/lib/popover/Popover.d.ts
+++ b/components/lib/popover/Popover.d.ts
@@ -10,7 +10,7 @@
 import { TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 
 export declare type PopoverPassThroughOptionType = PopoverPassThroughAttributes | ((options: PopoverPassThroughMethodOptions) => PopoverPassThroughAttributes | string) | string | null | undefined;
 
@@ -203,7 +203,7 @@ export interface PopoverSlots {
 /**
  * Defines valid emits in Popover component.
  */
-export interface PopoverEmits {
+interface PopoverEmitsOptions {
     /**
      * Callback to invoke when the overlay is shown.
      */
@@ -214,18 +214,9 @@ export interface PopoverEmits {
     hide(): void;
 }
 
-/**
- * **PrimeVue - Popover**
- *
- * _Popover, also known as Popover, is a container component that can overlay other components on page._
- *
- * [Live Demo](https://www.primevue.org/popover/)
- * --- ---
- * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
- *
- * @group Component
- */
-declare class Popover extends ClassComponent<PopoverProps, PopoverSlots, PopoverEmits> {
+export declare type PopoverEmits = EmitFn<PopoverEmitsOptions>;
+
+export interface PopoverMethods {
     /**
      * Aligns overlay panel based on the current position of the container.
      */
@@ -254,9 +245,23 @@ declare class Popover extends ClassComponent<PopoverProps, PopoverSlots, Popover
     hide(): void;
 }
 
+/**
+ * **PrimeVue - Popover**
+ *
+ * _Popover, also known as Popover, is a container component that can overlay other components on page._
+ *
+ * [Live Demo](https://www.primevue.org/popover/)
+ * --- ---
+ * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
+ *
+ * @group Component
+ *
+ */
+declare const Popover: DefineComponent<PopoverProps, PopoverSlots, PopoverEmits, PopoverMethods>;
+
 declare module 'vue' {
     export interface GlobalComponents {
-        Popover: GlobalComponentConstructor<Popover>;
+        Popover: GlobalComponentConstructor<PopoverProps, PopoverSlots, PopoverEmits, PopoverMethods>;
     }
 }
 
diff --git a/components/lib/portal/Portal.d.ts b/components/lib/portal/Portal.d.ts
index 3c3d47d5d..ab0c356bd 100644
--- a/components/lib/portal/Portal.d.ts
+++ b/components/lib/portal/Portal.d.ts
@@ -1,5 +1,5 @@
 import { VNode } from 'vue';
-import { ClassComponent, GlobalComponentConstructor, HintedString } from '../ts-helpers';
+import { DefineComponent, EmitFn, GlobalComponentConstructor, HintedString } from '../ts-helpers';
 
 type PortalAppendToType = HintedString<'body' | 'self'> | undefined | HTMLElement;
 
@@ -24,13 +24,15 @@ export interface PortalSlots {
     default: () => VNode[];
 }
 
-export declare type PortalEmits = {};
+declare type PortalEmitsOptions = {};
 
-declare class Portal extends ClassComponent<PortalProps, PortalSlots, PortalEmits> {}
+export declare type PortalEmits = EmitFn<PortalEmitsOptions>;
+
+declare const Portal: DefineComponent<PortalProps, PortalSlots, PortalEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Portal: GlobalComponentConstructor<Portal>;
+        Portal: GlobalComponentConstructor<PortalProps, PortalSlots, PortalEmits>;
     }
 }
 
diff --git a/components/lib/progressbar/ProgressBar.d.ts b/components/lib/progressbar/ProgressBar.d.ts
index 0483e0430..486c5583f 100755
--- a/components/lib/progressbar/ProgressBar.d.ts
+++ b/components/lib/progressbar/ProgressBar.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type ProgressBarPassThroughOptionType<T = any> = ProgressBarPassThroughAttributes | ((options: ProgressBarPassThroughMethodOptions<T>) => ProgressBarPassThroughAttributes | string) | string | null | undefined;
 
@@ -123,7 +123,9 @@ export interface ProgressBarSlots {
 /**
  * Defines valid emits in ProgressBar component.
  */
-export interface ProgressBarEmits {}
+interface ProgressBarEmitsOptions {}
+
+export declare type ProgressBarEmits = EmitFn<ProgressBarEmitsOptions>;
 
 /**
  * **PrimeVue - ProgressBar**
@@ -135,12 +137,13 @@ export interface ProgressBarEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class ProgressBar extends ClassComponent<ProgressBarProps, ProgressBarSlots, ProgressBarEmits> {}
+declare const ProgressBar: DefineComponent<ProgressBarProps, ProgressBarSlots, ProgressBarEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        ProgressBar: GlobalComponentConstructor<ProgressBar>;
+        ProgressBar: GlobalComponentConstructor<ProgressBarProps, ProgressBarSlots, ProgressBarEmits>;
     }
 }
 
diff --git a/components/lib/progressspinner/ProgressSpinner.d.ts b/components/lib/progressspinner/ProgressSpinner.d.ts
index eabf8b534..8c5713543 100755
--- a/components/lib/progressspinner/ProgressSpinner.d.ts
+++ b/components/lib/progressspinner/ProgressSpinner.d.ts
@@ -9,7 +9,7 @@
  */
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type ProgressSpinnerPassThroughOptionType = ProgressSpinnerPassThroughAttributes | ((options: ProgressSpinnerPassThroughMethodOptions) => ProgressSpinnerPassThroughAttributes | string) | string | null | undefined;
 
@@ -117,7 +117,9 @@ export interface ProgressSpinnerSlots {}
 /**
  * Defines valid emits in ProgressSpinner component.
  */
-export interface ProgressSpinnerEmits {}
+interface ProgressSpinnerEmitsOptions {}
+
+export declare type ProgressSpinnerEmits = EmitFn<ProgressSpinnerEmitsOptions>;
 
 /**
  * **PrimeVue - ProgressSpinner**
@@ -129,12 +131,13 @@ export interface ProgressSpinnerEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class ProgressSpinner extends ClassComponent<ProgressSpinnerProps, ProgressSpinnerSlots, ProgressSpinnerEmits> {}
+declare const ProgressSpinner: DefineComponent<ProgressSpinnerProps, ProgressSpinnerSlots, ProgressSpinnerEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        ProgressSpinner: GlobalComponentConstructor<ProgressSpinner>;
+        ProgressSpinner: GlobalComponentConstructor<ProgressSpinnerProps, ProgressSpinnerSlots, ProgressSpinnerEmits>;
     }
 }
 
diff --git a/components/lib/radiobutton/RadioButton.d.ts b/components/lib/radiobutton/RadioButton.d.ts
index fb3c0af33..d9d3364f4 100755
--- a/components/lib/radiobutton/RadioButton.d.ts
+++ b/components/lib/radiobutton/RadioButton.d.ts
@@ -9,7 +9,7 @@
  */
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type RadioButtonPassThroughOptionType = RadioButtonPassThroughAttributes | ((options: RadioButtonPassThroughMethodOptions) => RadioButtonPassThroughAttributes | string) | string | null | undefined;
 
@@ -196,7 +196,7 @@ export interface RadioButtonSlots {}
 /**
  * Defines valid emits in RadioButton component.
  */
-export interface RadioButtonEmits {
+interface RadioButtonEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {*} value - New value.
@@ -219,6 +219,8 @@ export interface RadioButtonEmits {
     blur(event: Event): void;
 }
 
+export declare type RadioButtonEmits = EmitFn<RadioButtonEmitsOptions>;
+
 /**
  * **PrimeVue - RadioButton**
  *
@@ -231,11 +233,11 @@ export interface RadioButtonEmits {
  * @group Component
  *
  */
-declare class RadioButton extends ClassComponent<RadioButtonProps, RadioButtonSlots, RadioButtonEmits> {}
+declare const RadioButton: DefineComponent<RadioButtonProps, RadioButtonSlots, RadioButtonEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        RadioButton: GlobalComponentConstructor<RadioButton>;
+        RadioButton: GlobalComponentConstructor<RadioButtonProps, RadioButtonSlots, RadioButtonEmits>;
     }
 }
 
diff --git a/components/lib/rating/Rating.d.ts b/components/lib/rating/Rating.d.ts
index 42d8c9d56..84c66c8f1 100755
--- a/components/lib/rating/Rating.d.ts
+++ b/components/lib/rating/Rating.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type RatingPassThroughOptionType = RatingPassThroughAttributes | ((options: RatingPassThroughMethodOptions) => RatingPassThroughAttributes | string) | string | null | undefined;
 
@@ -231,7 +231,7 @@ export interface RatingSlots {
 /**
  * Defines valid emits in Rating component.
  */
-export interface RatingEmits {
+interface RatingEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {number} value - New value.
@@ -254,6 +254,8 @@ export interface RatingEmits {
     blur(event: Event): void;
 }
 
+export declare type RatingEmits = EmitFn<RatingEmitsOptions>;
+
 /**
  * **PrimeVue - Rating**
  *
@@ -264,12 +266,13 @@ export interface RatingEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Rating extends ClassComponent<RatingProps, RatingSlots, RatingEmits> {}
+declare const Rating: DefineComponent<RatingProps, RatingSlots, RatingEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Rating: GlobalComponentConstructor<Rating>;
+        Rating: GlobalComponentConstructor<RatingProps, RatingSlots, RatingEmits>;
     }
 }
 
diff --git a/components/lib/row/Row.d.ts b/components/lib/row/Row.d.ts
index 576068ea6..dc280155a 100755
--- a/components/lib/row/Row.d.ts
+++ b/components/lib/row/Row.d.ts
@@ -8,7 +8,7 @@
  *
  */
 import { ComponentHooks } from '../basecomponent';
-import { ClassComponent, GlobalComponentConstructor } from '../ts-helpers';
+import { DefineComponent, EmitFn, GlobalComponentConstructor } from '../ts-helpers';
 
 export declare type RowPassThroughOptionType = RowPassThroughAttributes | ((options: RowPassThroughMethodOptions) => RowPassThroughAttributes | string) | string | null | undefined;
 
@@ -94,7 +94,9 @@ export interface RowSlots {}
 /**
  * Defines valid emits in Row component.
  */
-export interface RowEmits {}
+interface RowEmitsOptions {}
+
+export declare type RowEmits = EmitFn<RowEmitsOptions>;
 
 /**
  * **PrimeVue - Row**
@@ -106,12 +108,13 @@ export interface RowEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Row extends ClassComponent<RowProps, RowSlots, RowEmits> {}
+declare const Row: DefineComponent<RowProps, RowSlots, RowEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Row: GlobalComponentConstructor<Row>;
+        Row: GlobalComponentConstructor<RowProps, RowSlots, RowEmits>;
     }
 }
 
diff --git a/components/lib/scrollpanel/ScrollPanel.d.ts b/components/lib/scrollpanel/ScrollPanel.d.ts
index a7e3443a0..5f487c0b4 100644
--- a/components/lib/scrollpanel/ScrollPanel.d.ts
+++ b/components/lib/scrollpanel/ScrollPanel.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type ScrollPanelPassThroughOptionType = ScrollPanelPassThroughAttributes | ((options: ScrollPanelPassThroughMethodOptions) => ScrollPanelPassThroughAttributes | string) | string | null | undefined;
 
@@ -148,7 +148,9 @@ export interface ScrollPanelSlots {
     default: () => VNode[];
 }
 
-export interface ScrollPanelEmits {}
+interface ScrollPanelEmitsOptions {}
+
+export declare type ScrollPanelEmits = EmitFn<ScrollPanelEmitsOptions>;
 
 /**
  * **PrimeVue - ScrollPanel**
@@ -162,11 +164,11 @@ export interface ScrollPanelEmits {}
  * @group Component
  *
  */
-declare class ScrollPanel extends ClassComponent<ScrollPanelProps, ScrollPanelSlots, ScrollPanelEmits> {}
+declare const ScrollPanel: DefineComponent<ScrollPanelProps, ScrollPanelSlots, ScrollPanelEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        ScrollPanel: GlobalComponentConstructor<ScrollPanel>;
+        ScrollPanel: GlobalComponentConstructor<ScrollPanelProps, ScrollPanelSlots, ScrollPanelEmits>;
     }
 }
 
diff --git a/components/lib/scrolltop/ScrollTop.d.ts b/components/lib/scrolltop/ScrollTop.d.ts
index ad5f59624..96c6e1523 100644
--- a/components/lib/scrolltop/ScrollTop.d.ts
+++ b/components/lib/scrolltop/ScrollTop.d.ts
@@ -11,7 +11,7 @@ import { TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { ButtonPassThroughOptions, ButtonProps } from '../button';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type ScrollTopPassThroughOptionType = ScrollTopPassThroughAttributes | ((options: ScrollTopPassThroughMethodOptions) => ScrollTopPassThroughAttributes | string) | string | null | undefined;
 
@@ -169,7 +169,9 @@ export interface ScrollTopSlots {
 /**
  * Defines valid emits in ScrollTop component.
  */
-export interface ScrollTopEmits {}
+interface ScrollTopEmitsOptions {}
+
+export declare type ScrollTopEmits = EmitFn<ScrollTopEmitsOptions>;
 
 /**
  * **PrimeVue - ScrollTop**
@@ -181,12 +183,13 @@ export interface ScrollTopEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class ScrollTop extends ClassComponent<ScrollTopProps, ScrollTopSlots, ScrollTopEmits> {}
+declare const ScrollTop: DefineComponent<ScrollTopProps, ScrollTopSlots, ScrollTopEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        ScrollTop: GlobalComponentConstructor<ScrollTop>;
+        ScrollTop: GlobalComponentConstructor<ScrollTopProps, ScrollTopSlots, ScrollTopEmits>;
     }
 }
 
diff --git a/components/lib/select/Select.d.ts b/components/lib/select/Select.d.ts
index 5af0e89ad..c9fe46e18 100755
--- a/components/lib/select/Select.d.ts
+++ b/components/lib/select/Select.d.ts
@@ -13,7 +13,7 @@ import { IconFieldPassThroughOptions } from '../iconfield';
 import { InputIconPassThroughOptions } from '../inputicon';
 import { InputTextPassThroughOptions } from '../inputtext';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 import { VirtualScrollerItemOptions, VirtualScrollerPassThroughOptionType, VirtualScrollerProps } from '../virtualscroller';
 
 export declare type SelectPassThroughOptionType<T = any> = SelectPassThroughAttributes | ((options: SelectPassThroughMethodOptions<T>) => SelectPassThroughAttributes | string) | string | null | undefined;
@@ -730,7 +730,7 @@ export interface SelectSlots {
 /**
  * Defines valid emits in Select component.
  */
-export interface SelectEmits {
+interface SelectEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {*} value - New value.
@@ -774,6 +774,27 @@ export interface SelectEmits {
     filter(event: SelectFilterEvent): void;
 }
 
+export declare type SelectEmits = EmitFn<SelectEmitsOptions>;
+
+export interface SelectMethods {
+    /**
+     * Shows the overlay.
+     * @param {boolean} [isFocus] - Decides whether to focus on the component.
+     * @defaultValue false.
+     *
+     * @memberof Select
+     */
+    show: (isFocus?: boolean) => void;
+    /**
+     * Hides the overlay.
+     * @param {boolean} [isFocus] - Decides whether to focus on the component.
+     * @defaultValue false.
+     *
+     * @memberof Select
+     */
+    hide: (isFocus?: boolean) => void;
+}
+
 /**
  * **PrimeVue - Select**
  *
@@ -784,27 +805,13 @@ export interface SelectEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Select extends ClassComponent<SelectProps, SelectSlots, SelectEmits> {
-    /**
-     * Shows the overlay.
-     * @param {boolean} [isFocus] - Decides whether to focus on the component. @defaultValue false.
-     *
-     * @memberof Select
-     */
-    show: (isFocus?: boolean) => void;
-    /**
-     * Hides the overlay.
-     * @param {boolean} [isFocus] - Decides whether to focus on the component. @defaultValue false.
-     *
-     * @memberof Select
-     */
-    hide: (isFocus?: boolean) => void;
-}
+declare const Select: DefineComponent<SelectProps, SelectSlots, SelectEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Select: GlobalComponentConstructor<Select>;
+        Select: GlobalComponentConstructor<SelectProps, SelectSlots, SelectEmits>;
     }
 }
 
diff --git a/components/lib/selectbutton/SelectButton.d.ts b/components/lib/selectbutton/SelectButton.d.ts
index 7dbd2e0e5..427666567 100755
--- a/components/lib/selectbutton/SelectButton.d.ts
+++ b/components/lib/selectbutton/SelectButton.d.ts
@@ -11,7 +11,7 @@ import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
 // import { ToggleButtonPassThroughOptions } from '../togglebutton';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type SelectButtonPassThroughOptionType = SelectButtonPassThroughAttributes | ((options: SelectButtonPassThroughMethodOptions) => SelectButtonPassThroughAttributes | string) | string | null | undefined;
 
@@ -223,7 +223,7 @@ export interface SelectButtonSlots {
 /**
  * Defines valid emits in SelectButton component.
  */
-export interface SelectButtonEmits {
+interface SelectButtonEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {*} value - New value.
@@ -245,6 +245,8 @@ export interface SelectButtonEmits {
     blur(event: Event): void;
 }
 
+export declare type SelectButtonEmits = EmitFn<SelectButtonEmitsOptions>;
+
 /**
  * **PrimeVue - SelectButton**
  *
@@ -255,12 +257,13 @@ export interface SelectButtonEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class SelectButton extends ClassComponent<SelectButtonProps, SelectButtonSlots, SelectButtonEmits> {}
+declare const SelectButton: DefineComponent<SelectButtonProps, SelectButtonSlots, SelectButtonEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        SelectButton: GlobalComponentConstructor<SelectButton>;
+        SelectButton: GlobalComponentConstructor<SelectButtonProps, SelectButtonSlots, SelectButtonEmits>;
     }
 }
 
diff --git a/components/lib/sidebar/Sidebar.d.ts b/components/lib/sidebar/Sidebar.d.ts
index 627ed3f01..8fa626c46 100755
--- a/components/lib/sidebar/Sidebar.d.ts
+++ b/components/lib/sidebar/Sidebar.d.ts
@@ -9,7 +9,7 @@
  */
 import 'vue';
 import * as Drawer from '../drawer';
-import { ClassComponent, GlobalComponentConstructor } from '../ts-helpers';
+import { DefineComponent, EmitFn, GlobalComponentConstructor } from '../ts-helpers';
 
 /**
  * Custom passthrough(pt) option method.
@@ -50,7 +50,9 @@ export interface SidebarSlots extends Drawer.DrawerSlots {}
 /**
  * Defines valid emits in Sidebar component.
  */
-export interface SidebarEmits extends Drawer.DrawerEmits {}
+interface SidebarEmitsOptions {}
+
+export declare type SidebarEmits = EmitFn<SidebarEmitsOptions> & Drawer.DrawerEmits;
 
 /**
  * @deprecated Deprecated since v4. Use Drawer component instead.
@@ -64,12 +66,13 @@ export interface SidebarEmits extends Drawer.DrawerEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Sidebar extends ClassComponent<SidebarProps, SidebarSlots, SidebarEmits> {}
+declare const Sidebar: DefineComponent<SidebarProps, SidebarSlots, SidebarEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Sidebar: GlobalComponentConstructor<Sidebar>;
+        Sidebar: GlobalComponentConstructor<SidebarProps, SidebarSlots, SidebarEmits>;
     }
 }
 
diff --git a/components/lib/skeleton/Skeleton.d.ts b/components/lib/skeleton/Skeleton.d.ts
index 8c2943cd8..379715643 100644
--- a/components/lib/skeleton/Skeleton.d.ts
+++ b/components/lib/skeleton/Skeleton.d.ts
@@ -9,7 +9,7 @@
  */
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type SkeletonPassThroughOptionType = SkeletonPassThroughAttributes | ((options: SkeletonPassThroughMethodOptions) => SkeletonPassThroughAttributes | string) | string | null | undefined;
 
@@ -123,7 +123,9 @@ export interface SkeletonSlots {}
 /**
  * Defines valid emits in Skeleton component.
  */
-export interface SkeletonEmits {}
+interface SkeletonEmitsOptions {}
+
+export declare type SkeletonEmits = EmitFn<SkeletonEmitsOptions>;
 
 /**
  * **PrimeVue - Skeleton**
@@ -135,12 +137,13 @@ export interface SkeletonEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Skeleton extends ClassComponent<SkeletonProps, SkeletonSlots, SkeletonEmits> {}
+declare const Skeleton: DefineComponent<SkeletonProps, SkeletonSlots, SkeletonEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Skeleton: GlobalComponentConstructor<Skeleton>;
+        Skeleton: GlobalComponentConstructor<SkeletonProps, SkeletonSlots, SkeletonEmits>;
     }
 }
 
diff --git a/components/lib/slider/Slider.d.ts b/components/lib/slider/Slider.d.ts
index 2376e6ea3..aa7c16b75 100755
--- a/components/lib/slider/Slider.d.ts
+++ b/components/lib/slider/Slider.d.ts
@@ -9,7 +9,7 @@
  */
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type SliderPassThroughOptionType = SliderPassThroughAttributes | ((options: SliderPassThroughMethodOptions) => SliderPassThroughAttributes | string) | string | null | undefined;
 
@@ -172,7 +172,7 @@ export interface SliderSlots {}
 /**
  * Defines valid emits in Slider component.
  */
-export interface SliderEmits {
+interface SliderEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {number | number[]} value - New value.
@@ -190,6 +190,8 @@ export interface SliderEmits {
     slideend(event: SliderSlideEndEvent): void;
 }
 
+export declare type SliderEmits = EmitFn<SliderEmitsOptions>;
+
 /**
  * **PrimeVue - Slider**
  *
@@ -202,11 +204,11 @@ export interface SliderEmits {
  * @group Component
  *
  */
-declare class Slider extends ClassComponent<SliderProps, SliderSlots, SliderEmits> {}
+declare const Slider: DefineComponent<SliderProps, SliderSlots, SliderEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Slider: GlobalComponentConstructor<Slider>;
+        Slider: GlobalComponentConstructor<SliderProps, SliderSlots, SliderEmits>;
     }
 }
 
diff --git a/components/lib/speeddial/SpeedDial.d.ts b/components/lib/speeddial/SpeedDial.d.ts
index 358e5a06b..7384c7674 100644
--- a/components/lib/speeddial/SpeedDial.d.ts
+++ b/components/lib/speeddial/SpeedDial.d.ts
@@ -12,7 +12,7 @@ import { ComponentHooks } from '../basecomponent';
 import { ButtonPassThroughOptions, ButtonProps } from '../button';
 import { MenuItem } from '../menuitem';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type SpeedDialPassThroughOptionType = SpeedDialPassThroughAttributes | ((options: SpeedDialPassThroughMethodOptions) => SpeedDialPassThroughAttributes | string) | string | null | undefined;
 
@@ -369,7 +369,7 @@ export interface SpeedDialSlots {
 /**
  * Defines valid emits in SpeedDial component.
  */
-export interface SpeedDialEmits {
+interface SpeedDialEmitsOptions {
     /**
      * Fired when the button element clicked.
      * @param {Event} event - Browser event.
@@ -395,6 +395,8 @@ export interface SpeedDialEmits {
     blur(event: Event): void;
 }
 
+export declare type SpeedDialEmits = EmitFn<SpeedDialEmitsOptions>;
+
 /**
  * **PrimeVue - SpeedDial**
  *
@@ -407,11 +409,11 @@ export interface SpeedDialEmits {
  * @group Component
  *
  */
-declare class SpeedDial extends ClassComponent<SpeedDialProps, SpeedDialSlots, SpeedDialEmits> {}
+declare const SpeedDial: DefineComponent<SpeedDialProps, SpeedDialSlots, SpeedDialEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        SpeedDial: GlobalComponentConstructor<SpeedDial>;
+        SpeedDial: GlobalComponentConstructor<SpeedDialProps, SpeedDialSlots, SpeedDialEmits>;
     }
 }
 
diff --git a/components/lib/splitbutton/SplitButton.d.ts b/components/lib/splitbutton/SplitButton.d.ts
index 0581f7025..003dfe0a5 100755
--- a/components/lib/splitbutton/SplitButton.d.ts
+++ b/components/lib/splitbutton/SplitButton.d.ts
@@ -13,7 +13,7 @@ import { ButtonPassThroughOptions } from '../button';
 import { MenuItem } from '../menuitem';
 import { PassThroughOptions } from '../passthrough';
 import { TieredMenuPassThroughOptions, TieredMenuRouterBindProps } from '../tieredmenu';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 
 export declare type SplitButtonPassThroughOptionType = SplitButtonPassThroughAttributes | ((options: SplitButtonPassThroughMethodOptions) => SplitButtonPassThroughAttributes | string) | string | null | undefined;
 
@@ -311,7 +311,7 @@ export interface SplitButtonSlots {
 /**
  * Defines valid emits in SplitButton component.
  */
-export interface SplitButtonEmits {
+interface SplitButtonEmitsOptions {
     /**
      * Callback to invoke when main button is clicked.
      * @param {Event} event - Browser event.
@@ -319,6 +319,8 @@ export interface SplitButtonEmits {
     click(event: Event): void;
 }
 
+export declare type SplitButtonEmits = EmitFn<SplitButtonEmitsOptions>;
+
 /**
  * **PrimeVue - SplitButton**
  *
@@ -331,11 +333,11 @@ export interface SplitButtonEmits {
  * @group Component
  *
  */
-declare class SplitButton extends ClassComponent<SplitButtonProps, SplitButtonSlots, SplitButtonEmits> {}
+declare const SplitButton: DefineComponent<SplitButtonProps, SplitButtonSlots, SplitButtonEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        SplitButton: GlobalComponentConstructor<SplitButton>;
+        SplitButton: GlobalComponentConstructor<SplitButtonProps, SplitButtonSlots, SplitButtonEmits>;
     }
 }
 
diff --git a/components/lib/splitter/Splitter.d.ts b/components/lib/splitter/Splitter.d.ts
index a0c122560..ad33e27fe 100644
--- a/components/lib/splitter/Splitter.d.ts
+++ b/components/lib/splitter/Splitter.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type SplitterPassThroughOptionType = SplitterPassThroughAttributes | ((options: SplitterPassThroughMethodOptions) => SplitterPassThroughAttributes | string) | string | null | undefined;
 
@@ -206,7 +206,7 @@ export interface SplitterSlots {
 /**
  * Defines valid emits in Splitter component.
  */
-export interface SplitterEmits {
+interface SplitterEmitsOptions {
     /**
      * Callback to invoke when resize starts.
      * @param {SplitterResizeStartEvent} event - Custom resize start event.
@@ -224,6 +224,8 @@ export interface SplitterEmits {
     resizeend(event: SplitterResizeEndEvent): void;
 }
 
+export declare type SplitterEmits = EmitFn<SplitterEmitsOptions>;
+
 /**
  * **PrimeVue - Splitter**
  *
@@ -236,11 +238,11 @@ export interface SplitterEmits {
  * @group Component
  *
  */
-declare class Splitter extends ClassComponent<SplitterProps, SplitterSlots, SplitterEmits> {}
+declare const Splitter: DefineComponent<SplitterProps, SplitterSlots, SplitterEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Splitter: GlobalComponentConstructor<Splitter>;
+        Splitter: GlobalComponentConstructor<SplitterProps, SplitterSlots, SplitterEmits>;
     }
 }
 
diff --git a/components/lib/splitterpanel/SplitterPanel.d.ts b/components/lib/splitterpanel/SplitterPanel.d.ts
index fa803c26d..bb65233c3 100644
--- a/components/lib/splitterpanel/SplitterPanel.d.ts
+++ b/components/lib/splitterpanel/SplitterPanel.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type SplitterPanelPassThroughOptionType = SplitterPanelPassThroughAttributes | ((options: SplitterPanelPassThroughMethodOptions) => SplitterPanelPassThroughAttributes | string) | string | null | undefined;
 
@@ -120,7 +120,9 @@ export interface SplitterPanelSlots {
     default: () => VNode[];
 }
 
-export interface SplitterPanelEmits {}
+interface SplitterPanelEmitsOptions {}
+
+export declare type SplitterPanelEmits = EmitFn<SplitterPanelEmitsOptions>;
 
 /**
  * **PrimeVue - SplitterPanel**
@@ -134,11 +136,11 @@ export interface SplitterPanelEmits {}
  * @group Component
  *
  */
-declare class SplitterPanel extends ClassComponent<SplitterPanelProps, SplitterPanelSlots, SplitterPanelEmits> {}
+declare const SplitterPanel: DefineComponent<SplitterPanelProps, SplitterPanelSlots, SplitterPanelEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        SplitterPanel: GlobalComponentConstructor<SplitterPanel>;
+        SplitterPanel: GlobalComponentConstructor<SplitterPanelProps, SplitterPanelSlots, SplitterPanelEmits>;
     }
 }
 
diff --git a/components/lib/stepper/Stepper.d.ts b/components/lib/stepper/Stepper.d.ts
index a178cdfd9..bc5a200bd 100644
--- a/components/lib/stepper/Stepper.d.ts
+++ b/components/lib/stepper/Stepper.d.ts
@@ -11,7 +11,7 @@ import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
 import { StepperPanelPassThroughOptionType } from '../stepperpanel';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type StepperPassThroughOptionType = StepperPassThroughAttributes | ((options: StepperPassThroughMethodOptions) => StepperPassThroughAttributes | string) | string | null | undefined;
 
@@ -166,7 +166,7 @@ export interface StepperSlots {
 /**
  * Defines valid emits in Stepper component.
  */
-export interface StepperEmits {
+interface StepperEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {number | number[]} value - New value.
@@ -178,6 +178,8 @@ export interface StepperEmits {
     'step-change'(event: StepperChangeEvent): void;
 }
 
+export declare type StepperEmits = EmitFn<StepperEmitsOptions>;
+
 /**
  * **PrimeVue - Stepper**
  *
@@ -190,11 +192,11 @@ export interface StepperEmits {
  * @group Component
  *
  */
-declare class Stepper extends ClassComponent<StepperProps, StepperSlots, StepperEmits> {}
+declare const Stepper: DefineComponent<StepperProps, StepperSlots, StepperEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Stepper: GlobalComponentConstructor<Stepper>;
+        Stepper: GlobalComponentConstructor<StepperProps, StepperSlots, StepperEmits>;
     }
 }
 
diff --git a/components/lib/stepperpanel/StepperPanel.d.ts b/components/lib/stepperpanel/StepperPanel.d.ts
index 6ac2fe050..c9108711e 100644
--- a/components/lib/stepperpanel/StepperPanel.d.ts
+++ b/components/lib/stepperpanel/StepperPanel.d.ts
@@ -10,7 +10,7 @@
 import { TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type StepperPanelPassThroughOptionType = StepperPanelPassThroughAttributes | ((options: StepperPanelPassThroughMethodOptions) => StepperPanelPassThroughAttributes | string) | string | null | undefined;
 
@@ -261,7 +261,9 @@ export interface StepperPanelSlots {
     }): VNode[];
 }
 
-export interface StepperPanelEmits {}
+interface StepperPanelEmitsOptions {}
+
+export declare type StepperPanelEmits = EmitFn<StepperPanelEmitsOptions>;
 
 /**
  * **PrimeVue - StepperPanel**
@@ -275,11 +277,11 @@ export interface StepperPanelEmits {}
  * @group Component
  *
  */
-declare class StepperPanel extends ClassComponent<StepperPanelProps, StepperPanelSlots, StepperPanelEmits> {}
+declare const StepperPanel: DefineComponent<StepperPanelProps, StepperPanelSlots, StepperPanelEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        StepperPanel: GlobalComponentConstructor<StepperPanel>;
+        StepperPanel: GlobalComponentConstructor<StepperPanelProps, StepperPanelSlots, StepperPanelEmits>;
     }
 }
 
diff --git a/components/lib/steps/Steps.d.ts b/components/lib/steps/Steps.d.ts
index 1c0024ead..99bafedf7 100755
--- a/components/lib/steps/Steps.d.ts
+++ b/components/lib/steps/Steps.d.ts
@@ -11,7 +11,7 @@ import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { MenuItem } from '../menuitem';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type StepsPassThroughOptionType = StepsPassThroughAttributes | ((options: StepsPassThroughMethodOptions) => StepsPassThroughAttributes | string) | string | null | undefined;
 
@@ -214,7 +214,9 @@ export interface StepsSlots {
 /**
  * Defines valid emits in Steps component.
  */
-export interface StepsEmits {}
+interface StepsEmitsOptions {}
+
+export declare type StepsEmits = EmitFn<StepsEmitsOptions>;
 
 /**
  * **PrimeVue - Steps**
@@ -228,11 +230,11 @@ export interface StepsEmits {}
  * @group Component
  *
  */
-declare class Steps extends ClassComponent<StepsProps, StepsSlots, StepsEmits> {}
+declare const Steps: DefineComponent<StepsProps, StepsSlots, StepsEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Steps: GlobalComponentConstructor<Steps>;
+        Steps: GlobalComponentConstructor<StepsProps, StepsSlots, StepsEmits>;
     }
 }
 
diff --git a/components/lib/tab/Tab.d.ts b/components/lib/tab/Tab.d.ts
index 04a75c567..0e8bb3b05 100755
--- a/components/lib/tab/Tab.d.ts
+++ b/components/lib/tab/Tab.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type TabPassThroughOptionType = TabPassThroughAttributes | ((options: TabPassThroughMethodOptions) => TabPassThroughAttributes | string) | string | null | undefined;
 
@@ -123,7 +123,9 @@ export interface TabSlots {
     default(): VNode[];
 }
 
-export interface TabEmits {}
+interface TabEmitsOptions {}
+
+export declare type TabEmits = EmitFn<TabEmitsOptions>;
 
 /**
  * **PrimeVue - Tab**
@@ -137,11 +139,11 @@ export interface TabEmits {}
  * @group Component
  *
  */
-declare class Tab extends ClassComponent<TabProps, TabSlots, TabEmits> {}
+declare const Tab: DefineComponent<TabProps, TabSlots, TabEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Tab: GlobalComponentConstructor<Tab>;
+        Tab: GlobalComponentConstructor<TabProps, TabSlots, TabEmits>;
     }
 }
 
diff --git a/components/lib/tablist/TabList.d.ts b/components/lib/tablist/TabList.d.ts
index 8249b7e4f..3a70ae19e 100755
--- a/components/lib/tablist/TabList.d.ts
+++ b/components/lib/tablist/TabList.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type TabListPassThroughOptionType = TabListPassThroughAttributes | ((options: TabListPassThroughMethodOptions) => TabListPassThroughAttributes | string) | string | null | undefined;
 
@@ -117,7 +117,9 @@ export interface TabListSlots {
     default(): VNode[];
 }
 
-export interface TabListEmits {}
+interface TabListEmitsOptions {}
+
+export declare type TabListEmits = EmitFn<TabListEmitsOptions>;
 
 /**
  * **PrimeVue - TabList**
@@ -131,11 +133,11 @@ export interface TabListEmits {}
  * @group Component
  *
  */
-declare class TabList extends ClassComponent<TabListProps, TabListSlots, TabListEmits> {}
+declare const TabList: DefineComponent<TabListProps, TabListSlots, TabListEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        TabList: GlobalComponentConstructor<TabList>;
+        TabList: GlobalComponentConstructor<TabListProps, TabListSlots, TabListEmits>;
     }
 }
 
diff --git a/components/lib/tabmenu/TabMenu.d.ts b/components/lib/tabmenu/TabMenu.d.ts
index bf3a44c55..9d32b88b1 100755
--- a/components/lib/tabmenu/TabMenu.d.ts
+++ b/components/lib/tabmenu/TabMenu.d.ts
@@ -11,7 +11,7 @@ import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { MenuItem } from '../menuitem';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type TabMenuPassThroughOptionType = TabMenuPassThroughAttributes | ((options: TabMenuPassThroughMethodOptions) => TabMenuPassThroughAttributes | string) | string | null | undefined;
 
@@ -251,7 +251,7 @@ export interface TabMenuSlots {
 /**
  * Defines valid emits in TabMenu component.
  */
-export interface TabMenuEmits {
+interface TabMenuEmitsOptions {
     /**
      * Callback to invoke when an active tab is changed.
      * @param {TabMenuChangeEvent} event - Custom tab change event.
@@ -259,6 +259,8 @@ export interface TabMenuEmits {
     'tab-change'(event: TabMenuChangeEvent): void;
 }
 
+export declare type TabMenuEmits = EmitFn<TabMenuEmitsOptions>;
+
 /**
  * **PrimeVue - TabMenu**
  *
@@ -271,11 +273,11 @@ export interface TabMenuEmits {
  * @group Component
  *
  */
-declare class TabMenu extends ClassComponent<TabMenuProps, TabMenuSlots, TabMenuEmits> {}
+declare const TabMenu: DefineComponent<TabMenuProps, TabMenuSlots, TabMenuEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        TabMenu: GlobalComponentConstructor<TabMenu>;
+        TabMenu: GlobalComponentConstructor<TabMenuProps, TabMenuSlots, TabMenuEmits>;
     }
 }
 
diff --git a/components/lib/tabpanel/TabPanel.d.ts b/components/lib/tabpanel/TabPanel.d.ts
index 0c0875fb8..cc5e039a7 100755
--- a/components/lib/tabpanel/TabPanel.d.ts
+++ b/components/lib/tabpanel/TabPanel.d.ts
@@ -10,7 +10,7 @@
 import { AnchorHTMLAttributes, HTMLAttributes, LiHTMLAttributes, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type TabPanelPassThroughOptionType = TabPanelPassThroughAttributes | ((options: TabPanelPassThroughMethodOptions) => TabPanelPassThroughAttributes | string) | string | null | undefined;
 
@@ -209,7 +209,9 @@ export interface TabPanelSlots {
     header(): VNode[];
 }
 
-export interface TabPanelEmits {}
+interface TabPanelEmitsOptions {}
+
+export declare type TabPanelEmits = EmitFn<TabPanelEmitsOptions>;
 
 /**
  * **PrimeVue - TabPanel**
@@ -223,11 +225,11 @@ export interface TabPanelEmits {}
  * @group Component
  *
  */
-declare class TabPanel extends ClassComponent<TabPanelProps, TabPanelSlots, TabPanelEmits> {}
+declare const TabPanel: DefineComponent<TabPanelProps, TabPanelSlots, TabPanelEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        TabPanel: GlobalComponentConstructor<TabPanel>;
+        TabPanel: GlobalComponentConstructor<TabPanelProps, TabPanelSlots, TabPanelEmits>;
     }
 }
 
diff --git a/components/lib/tabpanels/TabPanels.d.ts b/components/lib/tabpanels/TabPanels.d.ts
index 3288e1df2..4f2c589cc 100755
--- a/components/lib/tabpanels/TabPanels.d.ts
+++ b/components/lib/tabpanels/TabPanels.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type TabPanelsPassThroughOptionType = TabPanelsPassThroughAttributes | ((options: TabPanelsPassThroughMethodOptions) => TabPanelsPassThroughAttributes | string) | string | null | undefined;
 
@@ -101,7 +101,9 @@ export interface TabPanelsSlots {
     default(): VNode[];
 }
 
-export interface TabPanelsEmits {}
+interface TabPanelsEmitsOptions {}
+
+export declare type TabPanelsEmits = EmitFn<TabPanelsEmitsOptions>;
 
 /**
  * **PrimeVue - TabPanels**
@@ -115,11 +117,11 @@ export interface TabPanelsEmits {}
  * @group Component
  *
  */
-declare class TabPanels extends ClassComponent<TabPanelsProps, TabPanelsSlots, TabPanelsEmits> {}
+declare const TabPanels: DefineComponent<TabPanelsProps, TabPanelsSlots, TabPanelsEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        TabPanels: GlobalComponentConstructor<TabPanels>;
+        TabPanels: GlobalComponentConstructor<TabPanelsProps, TabPanelsSlots, TabPanelsEmits>;
     }
 }
 
diff --git a/components/lib/tabs/Tabs.d.ts b/components/lib/tabs/Tabs.d.ts
index 279c05a82..d4ccedf3a 100644
--- a/components/lib/tabs/Tabs.d.ts
+++ b/components/lib/tabs/Tabs.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type TabsPassThroughOptionType = TabsPassThroughAttributes | ((options: TabsPassThroughMethodOptions) => TabsPassThroughAttributes | string) | string | null | undefined;
 
@@ -156,7 +156,7 @@ export interface TabsSlots {
 /**
  * Defines valid emits in Tabs component.
  */
-export interface TabsEmits {
+interface TabsEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {string} value - Current value.
@@ -164,8 +164,9 @@ export interface TabsEmits {
     'update:value'(value: number): void;
 }
 
+export declare type TabsEmits = EmitFn<TabsEmitsOptions>;
+
 /**
- *
  * **PrimeVue - Tabs**
  *
  * _Tabs facilitates seamless switching between different views._
@@ -177,11 +178,11 @@ export interface TabsEmits {
  * @group Component
  *
  */
-declare class Tabs extends ClassComponent<TabsProps, TabsSlots, TabsEmits> {}
+declare const Tabs: DefineComponent<TabsProps, TabsSlots, TabsEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Tabs: GlobalComponentConstructor<Tabs>;
+        Tabs: GlobalComponentConstructor<TabsProps, TabsSlots, TabsEmits>;
     }
 }
 
diff --git a/components/lib/tabview/TabView.d.ts b/components/lib/tabview/TabView.d.ts
index 5b3a75c84..e298b2a3a 100755
--- a/components/lib/tabview/TabView.d.ts
+++ b/components/lib/tabview/TabView.d.ts
@@ -12,7 +12,7 @@ import { ButtonHTMLAttributes, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
 import { TabPanelPassThroughOptionType } from '../tabpanel';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type TabViewPassThroughOptionType = TabViewPassThroughAttributes | ((options: TabViewPassThroughMethodOptions) => TabViewPassThroughAttributes | string) | string | null | undefined;
 
@@ -251,7 +251,7 @@ export interface TabViewSlots {
 /**
  * Defines valid emits in TabView component.
  */
-export interface TabViewEmits {
+interface TabViewEmitsOptions {
     /**
      * Emitted when the activeIndex changes.
      * @param {number} index - Current activeIndex.
@@ -269,6 +269,8 @@ export interface TabViewEmits {
     'tab-click'(event: TabViewClickEvent): void;
 }
 
+export declare type TabViewEmits = EmitFn<TabViewEmitsOptions>;
+
 /**
  * @deprecated since v4. Use Tabs component instead.
  *
@@ -283,11 +285,11 @@ export interface TabViewEmits {
  * @group Component
  *
  */
-declare class TabView extends ClassComponent<TabViewProps, TabViewSlots, TabViewEmits> {}
+declare const TabView: DefineComponent<TabViewProps, TabViewSlots, TabViewEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        TabView: GlobalComponentConstructor<TabView>;
+        TabView: GlobalComponentConstructor<TabViewProps, TabViewSlots, TabViewEmits>;
     }
 }
 
diff --git a/components/lib/tag/Tag.d.ts b/components/lib/tag/Tag.d.ts
index 73ec18b06..89bd183bf 100644
--- a/components/lib/tag/Tag.d.ts
+++ b/components/lib/tag/Tag.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 
 export declare type TagPassThroughOptionType = TagPassThroughAttributes | ((options: TagPassThroughMethodOptions) => TagPassThroughAttributes | string) | string | null | undefined;
 
@@ -131,7 +131,9 @@ export interface TagSlots {
 /**
  * Defines valid emits in Tag component.
  */
-export interface TagEmits {}
+interface TagEmitsOptions {}
+
+export declare type TagEmits = EmitFn<TagEmitsOptions>;
 
 /**
  * **PrimeVue - Tag**
@@ -143,12 +145,13 @@ export interface TagEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Tag extends ClassComponent<TagProps, TagSlots, TagEmits> {}
+declare const Tag: DefineComponent<TagProps, TagSlots, TagEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Tag: GlobalComponentConstructor<Tag>;
+        Tag: GlobalComponentConstructor<TagProps, TagSlots, TagEmits>;
     }
 }
 
diff --git a/components/lib/terminal/Terminal.d.ts b/components/lib/terminal/Terminal.d.ts
index 4a433212e..fc59397bf 100755
--- a/components/lib/terminal/Terminal.d.ts
+++ b/components/lib/terminal/Terminal.d.ts
@@ -9,7 +9,7 @@
  */
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type TerminalPassThroughOptionType = TerminalPassThroughAttributes | ((options: TerminalPassThroughMethodOptions) => TerminalPassThroughAttributes | string) | string | null | undefined;
 
@@ -153,7 +153,9 @@ export interface TerminalSlots {}
 /**
  * Defines valid emits in Terminal component.
  */
-export interface TerminalEmits {}
+interface TerminalEmitsOptions {}
+
+export declare type TerminalEmits = EmitFn<TerminalEmitsOptions>;
 
 /**
  * **PrimeVue - Terminal**
@@ -165,12 +167,13 @@ export interface TerminalEmits {}
  * ![Primevue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Terminal extends ClassComponent<TerminalProps, TerminalSlots, TerminalEmits> {}
+declare const Terminal: DefineComponent<TerminalProps, TerminalSlots, TerminalEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Terminal: GlobalComponentConstructor<Terminal>;
+        Terminal: GlobalComponentConstructor<TerminalProps, TerminalSlots, TerminalEmits>;
     }
 }
 
diff --git a/components/lib/textarea/Textarea.d.ts b/components/lib/textarea/Textarea.d.ts
index d8ee51c11..ad7abbe6c 100755
--- a/components/lib/textarea/Textarea.d.ts
+++ b/components/lib/textarea/Textarea.d.ts
@@ -10,7 +10,7 @@
 import { TextareaHTMLAttributes } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, Nullable, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, Nullable, PassThrough } from '../ts-helpers';
 
 export declare type TextareaPassThroughOptionType = TextareaPassThroughAttributes | ((options: TextareaPassThroughMethodOptions) => TextareaPassThroughAttributes | string) | string | null | undefined;
 
@@ -136,7 +136,7 @@ export interface TextareaSlots {}
 /**
  * Defines valid emits in Textarea component.
  */
-export interface TextareaEmits {
+interface TextareaEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {string} value - New value.
@@ -144,6 +144,8 @@ export interface TextareaEmits {
     'update:modelValue': (value: string) => void;
 }
 
+export declare type TextareaEmits = EmitFn<TextareaEmitsOptions>;
+
 /**
  * **PrimeVue - Textarea**
  *
@@ -156,11 +158,11 @@ export interface TextareaEmits {
  * @group Component
  *
  */
-declare class Textarea extends ClassComponent<TextareaProps, TextareaSlots, TextareaEmits> {}
+declare const Textarea: DefineComponent<TextareaProps, TextareaSlots, TextareaEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Textarea: GlobalComponentConstructor<Textarea>;
+        Textarea: GlobalComponentConstructor<TextareaProps, TextareaSlots, TextareaEmits>;
     }
 }
 
diff --git a/components/lib/tieredmenu/TieredMenu.d.ts b/components/lib/tieredmenu/TieredMenu.d.ts
index 5288499eb..7dba63ef0 100755
--- a/components/lib/tieredmenu/TieredMenu.d.ts
+++ b/components/lib/tieredmenu/TieredMenu.d.ts
@@ -11,7 +11,7 @@ import { TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { MenuItem } from '../menuitem';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 
 export declare type TieredMenuPassThroughOptionType<T = any> = TieredMenuPassThroughAttributes | ((options: TieredMenuPassThroughMethodOptions<T>) => TieredMenuPassThroughAttributes | string) | string | null | undefined;
 
@@ -348,7 +348,7 @@ export interface TieredMenuSlots {
 /**
  * Defines valid emits in TieredMenuMenu component.
  */
-export interface TieredMenuEmits {
+interface TieredMenuEmitsOptions {
     /**
      * Callback to invoke when the component receives focus.
      * @param {Event} event - Browser event.
@@ -377,19 +377,9 @@ export interface TieredMenuEmits {
     hide(): void;
 }
 
-/**
- * **PrimeVue - TieredMenu**
- *
- * _TieredMenu displays submenus in nested overlays._
- *
- * [Live Demo](https://www.primevue.org/tieredmenu/)
- * --- ---
- * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
- *
- * @group Component
- *
- */
-declare class TieredMenu extends ClassComponent<TieredMenuProps, TieredMenuSlots, TieredMenuEmits> {
+export declare type TieredMenuEmits = EmitFn<TieredMenuEmitsOptions>;
+
+export interface TieredMenuMethods {
     /**
      * Toggles the visibility of the overlay.
      * @param {Event} event - Browser event
@@ -412,9 +402,23 @@ declare class TieredMenu extends ClassComponent<TieredMenuProps, TieredMenuSlots
     hide(): void;
 }
 
+/**
+ * **PrimeVue - TieredMenu**
+ *
+ * _TieredMenu displays submenus in nested overlays._
+ *
+ * [Live Demo](https://www.primevue.org/tieredmenu/)
+ * --- ---
+ * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
+ *
+ * @group Component
+ *
+ */
+declare const TieredMenu: DefineComponent<TieredMenuProps, TieredMenuSlots, TieredMenuEmits, TieredMenuMethods>;
+
 declare module 'vue' {
     export interface GlobalComponents {
-        TieredMenu: GlobalComponentConstructor<TieredMenu>;
+        TieredMenu: GlobalComponentConstructor<TieredMenuProps, TieredMenuSlots, TieredMenuEmits, TieredMenuMethods>;
     }
 }
 
diff --git a/components/lib/timeline/Timeline.d.ts b/components/lib/timeline/Timeline.d.ts
index 4840bba08..6ab26ea5c 100644
--- a/components/lib/timeline/Timeline.d.ts
+++ b/components/lib/timeline/Timeline.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type TimelinePassThroughOptionType = TimelinePassThroughAttributes | ((options: TimelinePassThroughMethodOptions) => TimelinePassThroughAttributes | string) | string | null | undefined;
 
@@ -208,7 +208,9 @@ export interface TimelineSlots {
 /**
  * Defines valid emits in Timeline component.
  */
-export interface TimelineEmits {}
+interface TimelineEmitsOptions {}
+
+export declare type TimelineEmits = EmitFn<TimelineEmitsOptions>;
 
 /**
  * **PrimeVue - Timeline**
@@ -220,12 +222,13 @@ export interface TimelineEmits {}
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Timeline extends ClassComponent<TimelineProps, TimelineSlots, TimelineEmits> {}
+declare const Timeline: DefineComponent<TimelineProps, TimelineSlots, TimelineEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Timeline: GlobalComponentConstructor<Timeline>;
+        Timeline: GlobalComponentConstructor<TimelineProps, TimelineSlots, TimelineEmits>;
     }
 }
 
diff --git a/components/lib/toast/Toast.d.ts b/components/lib/toast/Toast.d.ts
index 7daa46038..dfd7e80c9 100755
--- a/components/lib/toast/Toast.d.ts
+++ b/components/lib/toast/Toast.d.ts
@@ -10,7 +10,7 @@
 import { ButtonHTMLAttributes, TransitionProps, VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type ToastPassThroughOptionType = ToastPassThroughAttributes | ((options: ToastPassThroughMethodOptions) => ToastPassThroughAttributes | string) | string | null | undefined;
 
@@ -332,7 +332,7 @@ export interface ToastSlots {
 /**
  * Defines valid emits in Toast component.
  */
-export interface ToastEmits {
+interface ToastEmitsOptions {
     /**
      * Callback to invoke when the toast is closed.
      * @param {ToastMessageOptions} message - Toast message.
@@ -345,6 +345,8 @@ export interface ToastEmits {
     'life-end'(message: ToastMessageOptions): void;
 }
 
+export declare type ToastEmits = EmitFn<ToastEmitsOptions>;
+
 /**
  * **PrimeVue - Toast**
  *
@@ -357,11 +359,11 @@ export interface ToastEmits {
  * @group Component
  *
  */
-declare class Toast extends ClassComponent<ToastProps, ToastSlots, ToastEmits> {}
+declare const Toast: DefineComponent<ToastProps, ToastSlots, ToastEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Toast: GlobalComponentConstructor<Toast>;
+        Toast: GlobalComponentConstructor<ToastProps, ToastSlots, ToastEmits>;
     }
 }
 
diff --git a/components/lib/togglebutton/ToggleButton.d.ts b/components/lib/togglebutton/ToggleButton.d.ts
index 4a5a68604..28241e133 100755
--- a/components/lib/togglebutton/ToggleButton.d.ts
+++ b/components/lib/togglebutton/ToggleButton.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type ToggleButtonPassThroughOptionType<T = any> = ToggleButtonPassThroughAttributes | ((options: ToggleButtonPassThroughMethodOptions<T>) => ToggleButtonPassThroughAttributes | string) | string | null | undefined;
 
@@ -204,7 +204,7 @@ export interface ToggleButtonSlots {
 /**
  * Defines valid emits in ToggleButton component.
  */
-export interface ToggleButtonEmits {
+interface ToggleButtonEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {boolean} value - New value.
@@ -227,6 +227,8 @@ export interface ToggleButtonEmits {
     blur(event: Event): void;
 }
 
+export declare type ToggleButtonEmits = EmitFn<ToggleButtonEmitsOptions>;
+
 /**
  * **PrimeVue - ToggleButton**
  *
@@ -239,11 +241,11 @@ export interface ToggleButtonEmits {
  * @group Component
  *
  */
-declare class ToggleButton extends ClassComponent<ToggleButtonProps, ToggleButtonSlots, ToggleButtonEmits> {}
+declare const ToggleButton: DefineComponent<ToggleButtonProps, ToggleButtonSlots, ToggleButtonEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        ToggleButton: GlobalComponentConstructor<ToggleButton>;
+        ToggleButton: GlobalComponentConstructor<ToggleButtonProps, ToggleButtonSlots, ToggleButtonEmits>;
     }
 }
 
diff --git a/components/lib/toggleswitch/ToggleSwitch.d.ts b/components/lib/toggleswitch/ToggleSwitch.d.ts
index c582977d5..9b0bf529c 100755
--- a/components/lib/toggleswitch/ToggleSwitch.d.ts
+++ b/components/lib/toggleswitch/ToggleSwitch.d.ts
@@ -9,7 +9,7 @@
  */
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type ToggleSwitchPassThroughOptionType = ToggleSwitchPassThroughAttributes | ((options: ToggleSwitchPassThroughMethodOptions) => ToggleSwitchPassThroughAttributes | string) | string | null | undefined;
 
@@ -174,7 +174,7 @@ export interface ToggleSwitchSlots {}
 /**
  * Defines valid emits in ToggleSwitch component.
  */
-export interface ToggleSwitchEmits {
+interface ToggleSwitchEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {boolean} value - New value.
@@ -197,6 +197,8 @@ export interface ToggleSwitchEmits {
     blur(event: Event): void;
 }
 
+export declare type ToggleSwitchEmits = EmitFn<ToggleSwitchEmitsOptions>;
+
 /**
  * **PrimeVue - ToggleSwitch**
  *
@@ -209,11 +211,11 @@ export interface ToggleSwitchEmits {
  * @group Component
  *
  */
-declare class ToggleSwitch extends ClassComponent<ToggleSwitchProps, ToggleSwitchSlots, ToggleSwitchEmits> {}
+declare const ToggleSwitch: DefineComponent<ToggleSwitchProps, ToggleSwitchSlots, ToggleSwitchEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        ToggleSwitch: GlobalComponentConstructor<ToggleSwitch>;
+        ToggleSwitch: GlobalComponentConstructor<ToggleSwitchProps, ToggleSwitchSlots, ToggleSwitchEmits>;
     }
 }
 
diff --git a/components/lib/toolbar/Toolbar.d.ts b/components/lib/toolbar/Toolbar.d.ts
index cc56d2979..8d3148f29 100755
--- a/components/lib/toolbar/Toolbar.d.ts
+++ b/components/lib/toolbar/Toolbar.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type ToolbarPassThroughOptionType = ToolbarPassThroughAttributes | ((options: ToolbarPassThroughMethodOptions) => ToolbarPassThroughAttributes | string) | string | null | undefined;
 
@@ -126,7 +126,9 @@ export interface ToolbarSlots {
 /**
  * Defines valid emits in Toolbar component.
  */
-export interface ToolbarEmits {}
+interface ToolbarEmitsOptions {}
+
+export declare type ToolbarEmits = EmitFn<ToolbarEmitsOptions>;
 
 /**
  * **PrimeVue - Toolbar**
@@ -140,11 +142,11 @@ export interface ToolbarEmits {}
  * @group Component
  *
  */
-declare class Toolbar extends ClassComponent<ToolbarProps, ToolbarSlots, ToolbarEmits> {}
+declare const Toolbar: DefineComponent<ToolbarProps, ToolbarSlots, ToolbarEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Toolbar: GlobalComponentConstructor<Toolbar>;
+        Toolbar: GlobalComponentConstructor<ToolbarProps, ToolbarSlots, ToolbarEmits>;
     }
 }
 
diff --git a/components/lib/tree/Tree.d.ts b/components/lib/tree/Tree.d.ts
index 543443e20..16917314c 100755
--- a/components/lib/tree/Tree.d.ts
+++ b/components/lib/tree/Tree.d.ts
@@ -14,7 +14,7 @@ import { InputIconPassThroughOptions } from '../inputicon';
 import { InputTextPassThroughOptions } from '../inputtext';
 import { PassThroughOptions } from '../passthrough';
 import { TreeNode } from '../treenode';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 
 export declare type TreePassThroughOptionType<T = any> = TreePassThroughAttributes | ((options: TreePassThroughMethodOptions<T>) => TreePassThroughAttributes | string) | string | null | undefined;
 
@@ -429,7 +429,7 @@ export interface TreeSlots {
 /**
  * Defines valid emits in Tree component.
  */
-export interface TreeEmits {
+interface TreeEmitsOptions {
     /**
      * Emitted when the expanded keys change.
      * @param {TreeNode} value - New expanded keys.
@@ -467,6 +467,8 @@ export interface TreeEmits {
     'filter'(event: TreeFilterEvent): void;
 }
 
+export declare type TreeEmits = EmitFn<TreeEmitsOptions>;
+
 /**
  * **PrimeVue - Tree**
  *
@@ -477,12 +479,13 @@ export interface TreeEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class Tree extends ClassComponent<TreeProps, TreeSlots, TreeEmits> {}
+declare const Tree: DefineComponent<TreeProps, TreeSlots, TreeEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        Tree: GlobalComponentConstructor<Tree>;
+        Tree: GlobalComponentConstructor<TreeProps, TreeSlots, TreeEmits>;
     }
 }
 
diff --git a/components/lib/treeselect/TreeSelect.d.ts b/components/lib/treeselect/TreeSelect.d.ts
index 3e797b907..57a9991bf 100644
--- a/components/lib/treeselect/TreeSelect.d.ts
+++ b/components/lib/treeselect/TreeSelect.d.ts
@@ -13,7 +13,7 @@ import { ChipPassThroughOptions } from '../chip';
 import { PassThroughOptions } from '../passthrough';
 import { TreeExpandedKeys, TreePassThroughOptions } from '../tree';
 import { TreeNode } from '../treenode';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 
 export declare type TreeSelectPassThroughOptionType = TreeSelectPassThroughAttributes | ((options: TreeSelectPassThroughMethodOptions) => TreeSelectPassThroughAttributes | string) | string | null | undefined;
 
@@ -378,7 +378,7 @@ export interface TreeSelectSlots {
 /**
  * Defines valid emits in TreeSelect component.
  */
-export interface TreeSelectEmits {
+interface TreeSelectEmitsOptions {
     /**
      * Emitted when the value changes.
      * @param {*} value - New value.
@@ -427,18 +427,9 @@ export interface TreeSelectEmits {
     'node-collapse'(node: TreeNode): void;
 }
 
-/**
- * **PrimeVue - TreeSelect**
- *
- * _TreeSelect is a form component to choose from hierarchical data._
- *
- * [Live Demo](https://www.primevue.org/treeselect/)
- * --- ---
- * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
- *
- * @group Component
- */
-declare class TreeSelect extends ClassComponent<TreeSelectProps, TreeSelectSlots, TreeSelectEmits> {
+export declare type TreeSelectEmits = EmitFn<TreeSelectEmitsOptions>;
+
+export interface TreeSelectMethods {
     /**
      * Shows the overlay.
      *
@@ -453,9 +444,23 @@ declare class TreeSelect extends ClassComponent<TreeSelectProps, TreeSelectSlots
     hide: () => void;
 }
 
+/**
+ * **PrimeVue - TreeSelect**
+ *
+ * _TreeSelect is a form component to choose from hierarchical data._
+ *
+ * [Live Demo](https://www.primevue.org/treeselect/)
+ * --- ---
+ * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
+ *
+ * @group Component
+ *
+ */
+declare const TreeSelect: DefineComponent<TreeSelectProps, TreeSelectSlots, TreeSelectEmits, TreeSelectMethods>;
+
 declare module 'vue' {
     export interface GlobalComponents {
-        TreeSelect: GlobalComponentConstructor<TreeSelect>;
+        TreeSelect: GlobalComponentConstructor<TreeSelectProps, TreeSelectSlots, TreeSelectEmits, TreeSelectMethods>;
     }
 }
 
diff --git a/components/lib/treetable/TreeTable.d.ts b/components/lib/treetable/TreeTable.d.ts
index ae44a2ab7..e158906cc 100755
--- a/components/lib/treetable/TreeTable.d.ts
+++ b/components/lib/treetable/TreeTable.d.ts
@@ -13,7 +13,7 @@ import { ColumnPassThroughOptionType } from '../column';
 import { PaginatorPassThroughOptionType } from '../paginator';
 import { PassThroughOptions } from '../passthrough';
 import { TreeNode } from '../treenode';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, HintedString, PassThrough } from '../ts-helpers';
 
 export declare type TreeTablePassThroughOptionType = TreeTablePassThroughAttributes | ((options: TreeTablePassThroughMethodOptions) => TreeTablePassThroughAttributes | string) | string | null | undefined;
 
@@ -720,7 +720,7 @@ export interface TreeTableSlots {
 /**
  * Defines valid emits in TreeTable component.
  */
-export interface TreeTableEmits {
+interface TreeTableEmitsOptions {
     /**
      * Emitted when the expanded keys change.
      * @param {TreeNode} value - New expanded keys.
@@ -798,6 +798,8 @@ export interface TreeTableEmits {
     'column-resize-end'(event: Event): void;
 }
 
+export declare type TreeTableEmits = EmitFn<TreeTableEmitsOptions>;
+
 /**
  * **PrimeVue - TreeTable**
  *
@@ -808,12 +810,13 @@ export interface TreeTableEmits {
  * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
  *
  * @group Component
+ *
  */
-declare class TreeTable extends ClassComponent<TreeTableProps, TreeTableSlots, TreeTableEmits> {}
+declare const TreeTable: DefineComponent<TreeTableProps, TreeTableSlots, TreeTableEmits>;
 
 declare module 'vue' {
     export interface GlobalComponents {
-        TreeTable: GlobalComponentConstructor<TreeTable>;
+        TreeTable: GlobalComponentConstructor<TreeTableProps, TreeTableSlots, TreeTableEmits>;
     }
 }
 
diff --git a/components/lib/ts-helpers.d.ts b/components/lib/ts-helpers.d.ts
index d5ab18adf..ac3e12500 100644
--- a/components/lib/ts-helpers.d.ts
+++ b/components/lib/ts-helpers.d.ts
@@ -1,27 +1,27 @@
-import { AllowedComponentProps, ComponentCustomProps, ObjectEmitsOptions, VNode, VNodeProps } from 'vue';
+import { AllowedComponentProps, ComponentCustomProps, MethodOptions, ObjectEmitsOptions, SlotsType, VNode, VNodeProps, DefineComponent as _DefineComponent } from 'vue';
 
 declare type PublicProps = VNodeProps & AllowedComponentProps & ComponentCustomProps;
 
 declare type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends (k: infer I) => void ? I : never;
 
-declare type EmitFn<Options = ObjectEmitsOptions, Event extends keyof Options = keyof Options> = Options extends Array<infer V>
-    ? (event: V, ...args: any[]) => void
+export declare type EmitFn<Options = ObjectEmitsOptions, Event extends keyof Options = keyof Options> = Options extends Array<infer V>
+    ? (e: V, ...args: any[]) => void
     : {} extends Options
-    ? (event: string, ...args: any[]) => void
+    ? (e: string, ...args: any[]) => void
     : UnionToIntersection<
           {
-              [key in Event]: Options[key] extends (...args: infer Args) => any ? (event: key, ...args: Args) => void : (event: key, ...args: any[]) => void;
+              [key in Event]: Options[key] extends (...args: infer Args) => any ? (e: key, ...args: Args) => void : (e: key, ...args: any[]) => void;
           }[Event]
       >;
 
-export class ClassComponent<Props, Slots, Emits> {
-    $props: Props & PublicProps;
-    $slots: Slots;
-    $emit: EmitFn<Emits>;
-}
+export type DefineComponent<P = {}, S = {}, E = {}, M = {}> = _DefineComponent<P, {}, {}, {}, M & MethodOptions, {}, {}, E & ObjectEmitsOptions, string, {}, {}, {}, S & SlotsType>;
 
-export type GlobalComponentConstructor<T> = {
-    new (): T;
+export type GlobalComponentConstructor<P = {}, S = {}, E = {}, M = {}> = {
+    new (): {
+        $props: P & PublicProps;
+        $slots: S;
+        $emit: E;
+    } & M;
 };
 
 /**
diff --git a/components/lib/virtualscroller/VirtualScroller.d.ts b/components/lib/virtualscroller/VirtualScroller.d.ts
index 5d276ed9e..4f68fefc2 100644
--- a/components/lib/virtualscroller/VirtualScroller.d.ts
+++ b/components/lib/virtualscroller/VirtualScroller.d.ts
@@ -10,7 +10,7 @@
 import { VNode } from 'vue';
 import { ComponentHooks } from '../basecomponent';
 import { PassThroughOptions } from '../passthrough';
-import { ClassComponent, DesignToken, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
+import { DefineComponent, DesignToken, EmitFn, GlobalComponentConstructor, PassThrough } from '../ts-helpers';
 
 export declare type VirtualScrollerPassThroughOptionType = VirtualScrollerPassThroughAttributes | ((options: VirtualScrollerPassThroughMethodOptions) => VirtualScrollerPassThroughAttributes | string) | string | null | undefined;
 
@@ -464,7 +464,7 @@ export interface VirtualScrollerSlots {
 /**
  * Defines valid emits in VirtualScroller component.
  */
-export interface VirtualScrollerEmits {
+interface VirtualScrollerEmitsOptions {
     /**
      * Emitted when the numToleratedItems changes.
      * @param {number} value - New number tolerated items
@@ -487,18 +487,9 @@ export interface VirtualScrollerEmits {
     'lazy-load'(event: VirtualScrollerLazyEvent): void;
 }
 
-/**
- * **PrimeVue - VirtualScroller**
- *
- * _VirtualScroller is a performant approach to handle huge data efficiently._
- *
- * [Live Demo](https://www.primevue.org/virtualscroller/)
- * --- ---
- * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
- *
- * @group Component
- */
-declare class VirtualScroller extends ClassComponent<VirtualScrollerProps, VirtualScrollerSlots, VirtualScrollerEmits> {
+export declare type VirtualScrollerEmits = EmitFn<VirtualScrollerEmitsOptions>;
+
+export interface VirtualScrollerMethods {
     /**
      * Scroll to move to a specific position.
      * @param {ScrollToOptions} [options] - scoll options.
@@ -523,9 +514,23 @@ declare class VirtualScroller extends ClassComponent<VirtualScrollerProps, Virtu
     getRenderedRange(): VirtualScrollerRangeMethod;
 }
 
+/**
+ * **PrimeVue - VirtualScroller**
+ *
+ * _VirtualScroller is a performant approach to handle huge data efficiently._
+ *
+ * [Live Demo](https://www.primevue.org/virtualscroller/)
+ * --- ---
+ * ![PrimeVue](https://primefaces.org/cdn/primevue/images/logo-100.png)
+ *
+ * @group Component
+ *
+ */
+declare const VirtualScroller: DefineComponent<VirtualScrollerProps, VirtualScrollerSlots, VirtualScrollerEmits, VirtualScrollerMethods>;
+
 declare module 'vue' {
     export interface GlobalComponents {
-        VirtualScroller: GlobalComponentConstructor<VirtualScroller>;
+        VirtualScroller: GlobalComponentConstructor<VirtualScrollerProps, VirtualScrollerSlots, VirtualScrollerEmits, VirtualScrollerMethods>;
     }
 }