fix: svelte component slot types (#972)

* fix: svelte component slot types * fix: script fixed by someone smarter <3
AmadeusITGroup · Oct 25, 2024 · c30b945 · c30b945
1 parent 1247f00
commit c30b945
Show file tree

Hide file tree

Showing 9 changed files with 32 additions and 19 deletions.
diff --git a/core-bootstrap/src/components/accordion/accordion.ts b/core-bootstrap/src/components/accordion/accordion.ts
@@ -20,7 +20,7 @@ import type {TransitionFn} from '@agnos-ui/core/services/transitions/baseTransit
 
 export * from '@agnos-ui/core/components/accordion';
 
-export type AccordionItemContext = WidgetSlotContext<AccordionItemWidget>;
+export interface AccordionItemContext extends WidgetSlotContext<AccordionItemWidget> {}
 
 interface AccordionExtraProps {
 	/**

diff --git a/core-bootstrap/src/components/alert/alert.ts b/core-bootstrap/src/components/alert/alert.ts
@@ -9,7 +9,7 @@ import type {TransitionFn} from '@agnos-ui/core/services/transitions/baseTransit
 
 export * from '@agnos-ui/core/components/alert';
 
-export type AlertContext = WidgetSlotContext<AlertWidget>;
+export interface AlertContext extends WidgetSlotContext<AlertWidget> {}
 
 interface AlertExtraProps {
 	/**

diff --git a/core-bootstrap/src/components/modal/modal.ts b/core-bootstrap/src/components/modal/modal.ts
@@ -8,7 +8,7 @@ import type {TransitionFn} from '@agnos-ui/core/services/transitions/baseTransit
 
 export * from '@agnos-ui/core/components/modal';
 
-export type ModalContext<Data> = WidgetSlotContext<ModalWidget<Data>>;
+export interface ModalContext<Data> extends WidgetSlotContext<ModalWidget<Data>> {}
 
 interface ModalExtraProps<Data> {
 	/**

diff --git a/core-bootstrap/src/components/pagination/pagination.ts b/core-bootstrap/src/components/pagination/pagination.ts
@@ -13,17 +13,17 @@ export * from '@agnos-ui/core/components/pagination';
 /**
  * A type for the slot context of the pagination widget
  */
-export type PaginationContext = WidgetSlotContext<PaginationWidget>;
+export interface PaginationContext extends WidgetSlotContext<PaginationWidget> {}
 
 /**
  * A type for the slot context of the pagination widget when the slot is the number label
  */
-export type PaginationNumberContext = PaginationContext & {
+export interface PaginationNumberContext extends PaginationContext {
 	/**
 	 * Displayed page
 	 */
 	displayedPage: number;
-};
+}
 
 interface PaginationExtraProps {
 	/**

diff --git a/core-bootstrap/src/components/progressbar/progressbar.ts b/core-bootstrap/src/components/progressbar/progressbar.ts
@@ -7,7 +7,7 @@ import type {BSContextualClass} from '../../types';
 
 export * from '@agnos-ui/core/components/progressbar';
 
-export type ProgressbarContext = WidgetSlotContext<ProgressbarWidget>;
+export interface ProgressbarContext extends WidgetSlotContext<ProgressbarWidget> {}
 
 interface ProgressbarExtraProps {
 	/**

diff --git a/core-bootstrap/src/components/select/select.ts b/core-bootstrap/src/components/select/select.ts
@@ -8,14 +8,14 @@ export * from '@agnos-ui/core/components/select';
 /**
  * A type for the slot context of the pagination widget
  */
-export type SelectContext<Item> = WidgetSlotContext<SelectWidget<Item>>;
+export interface SelectContext<Item> extends WidgetSlotContext<SelectWidget<Item>> {}
 
-export type SelectItemContext<Item> = SelectContext<Item> & {
+export interface SelectItemContext<Item> extends SelectContext<Item> {
 	/**
 	 * Contextual data related to an item
 	 */
 	itemContext: ItemContext<Item>;
-};
+}
 
 interface SelectExtraProps<Item> {
 	/**

diff --git a/core-bootstrap/src/components/slider/slider.ts b/core-bootstrap/src/components/slider/slider.ts
@@ -5,9 +5,19 @@ import type {SlotContent, Widget, WidgetFactory, WidgetSlotContext} from '@agnos
 
 export * from '@agnos-ui/core/components/slider';
 
-export type SliderContext = WidgetSlotContext<SliderWidget>;
-export type SliderSlotLabelContext = SliderContext & {value: number};
-export type SliderSlotHandleContext = SliderContext & {item: SliderHandle};
+export interface SliderContext extends WidgetSlotContext<SliderWidget> {}
+export interface SliderSlotLabelContext extends SliderContext {
+	/**
+	 * the value of the handle the label is attached to
+	 */
+	value: number;
+}
+export interface SliderSlotHandleContext extends SliderContext {
+	/**
+	 * the handle context
+	 */
+	item: SliderHandle;
+}
 
 interface SliderExtraProps {
 	/**

diff --git a/core-bootstrap/src/components/toast/toast.ts b/core-bootstrap/src/components/toast/toast.ts
@@ -7,7 +7,7 @@ import type {TransitionFn} from '@agnos-ui/core/services/transitions/baseTransit
 
 export * from '@agnos-ui/core/components/toast';
 
-export type ToastContext = WidgetSlotContext<ToastWidget>;
+export interface ToastContext extends WidgetSlotContext<ToastWidget> {}
 
 export interface ToastExtraProps {
 	/**

diff --git a/scripts/bootstrapTypes/genTypeExports.ts b/scripts/bootstrapTypes/genTypeExports.ts
@@ -41,11 +41,12 @@ const hardCodedImports: Record<string, string> = {
 function getTypesImportsMap(nodes: Node[], excludedNames: Set<string>) {
 	const importsByModule = new Map<string, string[]>();
 	const processedNames = new Set<string>(excludedNames);
+
 	function visit(node: Node) {
-		if (ts.isTypeReferenceNode(node)) {
-			const name = ts.isIdentifier(node.typeName) ? node.typeName.text : node.typeName.getText();
+		if (ts.isIdentifier(node)) {
+			const name = node.text;
 			if (!processedNames.has(name)) {
-				let symbol = typeChecker.getSymbolAtLocation(node.typeName);
+				let symbol = typeChecker.getSymbolAtLocation(node);
 				let moduleSpecifier: string | undefined;
 				while (symbol && symbol.flags & ts.SymbolFlags.Alias && !(symbol.declarations?.[0] && ts.isImportSpecifier(symbol.declarations?.[0]))) {
 					symbol = typeChecker.getImmediateAliasedSymbol(symbol);
@@ -111,8 +112,10 @@ for (const component of components) {
 	)) {
 		exportNames.add(bootstrapExport.name);
 		const node = bootstrapExport.getDeclarations()![0];
-		if (ts.isTypeAliasDeclaration(node)) {
-			// type aliases are copied as defined
+		if (ts.isTypeAliasDeclaration(node) || (ts.isInterfaceDeclaration(node) && bootstrapExport.name.endsWith('Context'))) {
+			// type aliases
+			// and interfaces whose name ends with "Context"
+			// are copied as defined
 			exports += node.getFullText() + '\n\n';
 			exportedNodes.push(node);
 		} else if (ts.isInterfaceDeclaration(node)) {