fix: file format + errors reported by svelte-check after minor upgrade

AmadeusITGroup · Jan 15, 2024 · ac1508c · ac1508c
1 parent 64a010f
commit ac1508c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 14 deletions.
diff --git a/angular/headless/src/types.ts b/angular/headless/src/types.ts
@@ -25,9 +25,10 @@ export type SlotContent<Props extends object = object> =
 	| Type<unknown>
 	| ComponentTemplate<Props, any, any>;
 
-export type AdaptSlotContentProps<Props extends Record<string, any>> = Props extends WidgetSlotContext<infer U>
-	? WidgetSlotContext<AdaptWidgetSlots<U>> & AdaptPropsSlots<Omit<Props, keyof WidgetSlotContext<any>>>
-	: AdaptPropsSlots<Props>;
+export type AdaptSlotContentProps<Props extends Record<string, any>> =
+	Props extends WidgetSlotContext<infer U>
+		? WidgetSlotContext<AdaptWidgetSlots<U>> & AdaptPropsSlots<Omit<Props, keyof WidgetSlotContext<any>>>
+		: AdaptPropsSlots<Props>;
 
 export type AdaptPropsSlots<Props> = Omit<Props, `slot${string}`> & {
 	[K in keyof Props & `slot${string}`]: Props[K] extends CoreSlotContent<infer U> ? SlotContent<AdaptSlotContentProps<U>> : Props[K];

diff --git a/core/src/services/extendWidget.ts b/core/src/services/extendWidget.ts
@@ -16,9 +16,8 @@ export type ExtendWidgetProps<W extends Widget, ExtraProps extends object> = Wid
 /**
  * Type replacing the original Props with WidgetSlotContext contaning ExtraProps
  */
-export type ExtendWidgetAdaptSlotContentProps<Props extends Record<string, any>, ExtraProps extends object> = Props extends WidgetSlotContext<infer U>
-	? WidgetSlotContext<ExtendWidgetProps<U, ExtraProps>> & Omit<Props, keyof WidgetSlotContext<any>>
-	: Props;
+export type ExtendWidgetAdaptSlotContentProps<Props extends Record<string, any>, ExtraProps extends object> =
+	Props extends WidgetSlotContext<infer U> ? WidgetSlotContext<ExtendWidgetProps<U, ExtraProps>> & Omit<Props, keyof WidgetSlotContext<any>> : Props;
 
 /**
  * Type enriching the original widget slot Props with ExtraProps slots

diff --git a/demo/src/app.ts b/demo/src/app.ts
@@ -1,6 +1,8 @@
 import {intersectionApi} from '$lib/stores';
 import {afterUpdate} from 'svelte';
 
+const textToLinesRegex = /\r/g;
+
 export function getTitle(title: string, frameworkName = '') {
 	return `AgnosUI - ${title}` + (frameworkName ? ` for ${frameworkName}` : '');
 }
@@ -14,7 +16,7 @@ export function getWidgetDescription(name: string, frameworkName = '') {
  * @param text text to split
  */
 export function textToLines(text: string) {
-	return text.replaceAll('\r', '').split('\n\n');
+	return text.replace(textToLinesRegex, '').split('\n\n');
 }
 
 const arrowFunctionRegExp = /^\([^(]*\)[^=]*=>/;

diff --git a/demo/src/lib/layout/MainSection.svelte b/demo/src/lib/layout/MainSection.svelte
@@ -1,6 +1,6 @@
 <script lang="ts">
 	import {createTOC} from '../../app';
-	const tocDirective = createTOC((node) => [...node.querySelectorAll('section')] as HTMLElement[]);
+	const tocDirective = createTOC((node) => Array.from(node.querySelectorAll('section')));
 </script>
 
 <div use:tocDirective><slot /></div>
diff --git a/react/headless/src/types.ts b/react/headless/src/types.ts
@@ -8,9 +8,10 @@ export type SlotContent<Props extends object = object> =
 	| React.ComponentType<Props>
 	| React.ReactNode;
 
-export type AdaptSlotContentProps<Props extends Record<string, any>> = Props extends WidgetSlotContext<infer U>
-	? WidgetSlotContext<AdaptWidgetSlots<U>> & AdaptPropsSlots<Omit<Props, keyof WidgetSlotContext<any>>>
-	: AdaptPropsSlots<Props>;
+export type AdaptSlotContentProps<Props extends Record<string, any>> =
+	Props extends WidgetSlotContext<infer U>
+		? WidgetSlotContext<AdaptWidgetSlots<U>> & AdaptPropsSlots<Omit<Props, keyof WidgetSlotContext<any>>>
+		: AdaptPropsSlots<Props>;
 
 export type AdaptPropsSlots<Props> = Omit<Props, `slot${string}`> & {
 	[K in keyof Props & `slot${string}`]: Props[K] extends CoreSlotContent<infer U> ? SlotContent<AdaptSlotContentProps<U>> : Props[K];

diff --git a/svelte/headless/src/types.ts b/svelte/headless/src/types.ts
@@ -19,9 +19,10 @@ export type SlotSvelteComponent<Props extends object = object> = ComponentType<
 
 export type SlotContent<Props extends object = object> = CoreSlotContent<Props> | SlotSvelteComponent<Props> | typeof useSvelteSlot;
 
-export type AdaptSlotContentProps<Props extends Record<string, any>> = Props extends WidgetSlotContext<infer U>
-	? WidgetSlotContext<AdaptWidgetSlots<U>> & AdaptPropsSlots<Omit<Props, keyof WidgetSlotContext<any>>>
-	: AdaptPropsSlots<Props>;
+export type AdaptSlotContentProps<Props extends Record<string, any>> =
+	Props extends WidgetSlotContext<infer U>
+		? WidgetSlotContext<AdaptWidgetSlots<U>> & AdaptPropsSlots<Omit<Props, keyof WidgetSlotContext<any>>>
+		: AdaptPropsSlots<Props>;
 
 export type AdaptPropsSlots<Props> = Omit<Props, `slot${string}`> & {
 	[K in keyof Props & `slot${string}`]: Props[K] extends CoreSlotContent<infer U> ? SlotContent<AdaptSlotContentProps<U>> : Props[K];