Merge pull request #554 from dnum-mi/fix/fix-types-and-build-2

fix/fix types and build 2

Author: laruiss

package.json

@@ -61,7 +61,7 @@
     "semantic-release": "semantic-release",
     "typecheck": "vue-tsc --noEmit -p tsconfig.vitest.json --composite false",
     "vite:build": "vite build && npm run typegen",
-    "typegen": "vue-tsc --declaration --emitDeclarationOnly || exit 0"
+    "typegen": "vue-tsc --declaration --emitDeclarationOnly"
   },
   "dependencies": {
     "@gouvfr/dsfr": "~1.9.3",

src/components/DsfrNavigation/DsfrNavigation.vue

@@ -80,7 +80,6 @@ onUnmounted(() => {
         v-for="(navItem, idx) of navItems"
         :key="idx"
       >
-        <!-- @vue-ignore -->
         <DsfrNavigationMenuLink
           v-if="navItem.to && navItem.text"
           v-bind="navItem"

src/components/DsfrNavigation/DsfrNavigationMenuLink.vue

@@ -6,8 +6,8 @@ import { RouteLocationNormalized } from 'vue-router'
 
 export type DsfrNavigationMenuLinkProps = {
   id?: string,
-  to: string | RouteLocationNormalized,
-  text: string,
+  to?: string | RouteLocationNormalized,
+  text?: string,
   icon?: string,
   onClick?: ($event: MouseEvent) => void
 }
@@ -16,6 +16,8 @@ const props = withDefaults(defineProps<DsfrNavigationMenuLinkProps>(), {
   id: () => getRandomId('menu-link'),
   icon: undefined,
   onClick: () => undefined,
+  text: '',
+  to: '#',
 })
 
 defineEmits<{(event: 'toggle-id', id: string): void}>()

src/components/DsfrRadioButton/DsfrRadioButton.vue

@@ -4,7 +4,7 @@ import { getRandomId } from '../../utils/random-utils'
 
 export type DsfrRadioButtonProps = {
   id?: string
-  name: string
+  name?: string
   modelValue?: string | number
   small?: boolean
   value: string | number

src/components/DsfrRadioButton/DsfrRadioButtonSet.vue

@@ -71,7 +71,6 @@ const onChange = ($event: string) => {
         class="fr-fieldset__content"
         role="radiogroup"
       >
-        <!-- @vue-ignore -->
         <DsfrRadioButton
           v-for="(option, i) of options"
           :key="option.value || i"

src/components/DsfrTable/DsfrTable.vue

@@ -6,12 +6,18 @@ import { type DsfrTableHeaderProps } from './DsfrTableHeader.vue'
 withDefaults(defineProps<{
   title?: string
   headers?:(DsfrTableHeaderProps | string)[]
-  rows?: DsfrTableRowProps[]
+  rows?: (DsfrTableRowProps | string)[]
   noCaption?: boolean
 }>(), {
   title: undefined,
   headers: () => [],
+  rows: () => [],
 })
+
+const getRowData = (row: (DsfrTableRowProps | string | ({component: string} & Record<string, any>))) => {
+  // @ts-ignore TODO: find a way to improve types here
+  return row.rowData || row
+}
 </script>
 
 <template>
@@ -38,12 +44,11 @@ withDefaults(defineProps<{
         <!-- @slot Slot par défaut pour le corps du tableau. Sera dans `<tbody>` -->
         <slot />
         <template v-if="rows && rows.length">
-          <!-- @vue-ignore -->
           <DsfrTableRow
             v-for="(row, i) of rows"
             :key="i"
-            :row-data="row.rowData || row"
-            :row-attrs="row.rowAttrs || {}"
+            :row-data="getRowData(row)"
+            :row-attrs="typeof row === 'string' ? {} : row.rowAttrs"
           />
         </template>
       </tbody>

src/components/DsfrTable/DsfrTableHeaders.spec.ts

@@ -40,7 +40,8 @@ describe('DsfrTableHeaders', () => {
     expect(thEls).toHaveLength(headers.length)
     let i = 0
     for (const header of thEls) {
-      expect(header).toContainHTML(headers[i].text || headers[i])
+      // @ts-ignore text will be present
+      expect(header).toContainHTML((headers[i]).text || headers[i])
       i++
     }
     expect(onClick).toHaveBeenCalledTimes(1)

src/components/DsfrTable/DsfrTableRow.vue

@@ -3,7 +3,7 @@ import { type HTMLAttributes } from 'vue'
 import DsfrTableCell from './DsfrTableCell.vue'
 
 export type DsfrTableRowProps = {
-  rowData?: Record<string, any>[]
+  rowData?: (string | Record<string, any>)[]
   rowAttrs?: HTMLAttributes
 }
 

tsconfig.app.json

@@ -28,7 +28,7 @@
     "checkJs": true,
     "target": "ESNext",
     "paths": {
-      "@/*": ["./src/*"]
+      "@/*": ["./*"]
     },
     "lib": ["ES2020", "DOM"],
     "types": ["cypress", "node"]