Merge pull request #1248 from basics/feature/improve-typescript

Typescript improvements

Author: ThornWalli

package-lock.json

@@ -109,6 +109,7 @@
     "stylelint-config-recess-order": "6.0.0",
     "stylelint-config-standard": "37.0.0",
     "typescript-eslint": "8.26.0",
+    "vite-plugin-checker": "^0.9.0",
     "vite-svg-loader": "5.1.0",
     "vitepress": "1.6.3",
     "vitest": "3.0.8",

package.json

@@ -4,15 +4,13 @@ import {
   getStyleDescription
 } from '../utils/description';
 import type Font from './Font';
-import type {
-  Link,
-  Noscript,
-  Style,
-  TagUserProperties,
-  UserTagConfigWithoutInnerContent
-} from '@unhead/schema';
+// import type { RawInput } from 'unhead/types';
+// import type { Link, Noscript, Style } from '@unhead/vue';
 import type { ModulePublicRuntimeConfig } from '../../module';
 
+// TagUserProperties,
+//   UserTagConfigWithoutInnerContent
+
 export default class FontCollection {
   list: Font[];
   constructor() {
@@ -38,10 +36,7 @@ export default class FontCollection {
     return rootSelector;
   }
 
-  getPreloadDescriptions(
-    critical: boolean,
-    crossorigin = 'anonymous'
-  ): Link<UserTagConfigWithoutInnerContent>[] {
+  getPreloadDescriptions(critical: boolean, crossorigin = 'anonymous') {
     return Array.from(
       this.list
         .reduce((result, font) => {
@@ -60,19 +55,17 @@ export default class FontCollection {
     );
   }
 
-  getStyleDescriptions(
-    options: ModulePublicRuntimeConfig
-  ): Link<TagUserProperties>[] {
+  getStyleDescriptions(options: ModulePublicRuntimeConfig) {
     return getRelevantDescriptions([
       getStyleDescription(
         this.list.map(font => font.getCSSText(options)).join(' '),
         false,
         this.getKey()
       )
-    ]) as Link<TagUserProperties>[];
+    ]);
   }
 
-  getNoScriptStyleDescriptions(): TagUserProperties[] {
+  getNoScriptStyleDescriptions() {
     return getRelevantDescriptions([
       getStyleDescription(
         this.list.map(font => font.getNoScriptCSSText()).join(' '),
@@ -97,6 +90,6 @@ function toFontHex(value: string) {
   return toHashHex(value).padStart(9, '-');
 }
 
-function getRelevantDescriptions(descriptions: (Style | Noscript)[]) {
+function getRelevantDescriptions(descriptions: Partial<{ key: string }>[]) {
   return descriptions.filter(item => item.key !== '0');
 }

src/runtime/classes/FontCollection.ts

@@ -1,4 +1,4 @@
-enum State {
+export enum State {
   READY,
   FAIL,
   PENDING

src/runtime/classes/lighthouse/Stats.ts

@@ -7,7 +7,7 @@ import type {
   HTMLCrossOriginAttribute,
   ISource
 } from '../../../../module';
-import type { Link, TagUserProperties } from '@unhead/schema';
+import type { Link } from '@unhead/vue';
 
 export default class Source implements ISource {
   src: string;
@@ -90,12 +90,8 @@ export default class Source implements ISource {
     );
   }
 
-  getPreload(
-    srcset: string,
-    sizes?: string,
-    crossorigin?: CrossOrigin
-  ): Link<TagUserProperties> {
-    const preload: Link<TagUserProperties> = {
+  getPreload(srcset: string, sizes?: string, crossorigin?: CrossOrigin): Link {
+    const preload: Link = {
       rel: 'preload',
       as: 'image',
       imagesrcset: srcset,

src/runtime/components/BoosterImage/classes/Source.ts

@@ -38,7 +38,7 @@ import {
   onMounted,
   onUnmounted
 } from 'vue';
-import type { Script } from '@unhead/schema';
+import type { Script } from '@unhead/vue';
 
 import DefaultButton from '../Button.vue';
 import {