tweaks

Author: bartveneman

src/decuplicate.ts

@@ -6,7 +6,7 @@ import type { Coverage, Range } from './parse-coverage.ts'
  * - if a duplicate stylesheet enters the room, we add it's ranges to the existing stylesheet's ranges
  * - only bytes of deduplicated stylesheets are counted
  */
-export function deduplicate_entries(entries: Coverage[]): Map<NonNullable<Coverage['text']>, Pick<Coverage, 'ranges' | 'url'>> {
+export function deduplicate_entries(entries: Coverage[]): Map<Coverage['text'], Pick<Coverage, 'ranges' | 'url'>> {
 	let checked_stylesheets = new Map<string, { url: string; ranges: Range[] }>()
 
 	for (let entry of entries) {

src/index.test.ts

@@ -29,7 +29,7 @@ test.describe('from <style> tag', () => {
 					</body>
 				</html>
 			`
-		coverage = await generate_coverage(html)
+		coverage = (await generate_coverage(html)) as Coverage[]
 	})
 
 	test('counts totals', () => {
@@ -86,7 +86,7 @@ test.describe('from <link rel="stylesheet">', () => {
 					</body>
 				</html>
 			`
-		coverage = await generate_coverage(html, { link_css: css })
+		coverage = (await generate_coverage(html, { link_css: css })) as Coverage[]
 	})
 
 	test('counts totals', () => {

src/parse-coverage.ts

@@ -1,31 +1,22 @@
 import * as v from 'valibot'
 
-export type Range = {
-	start: number
-	end: number
-}
+let RangeSchema = v.object({
+	start: v.number(),
+	end: v.number(),
+})
 
-export type Coverage = {
-	url: string
-	text: string
-	ranges: Range[]
-}
+export type Range = v.InferInput<typeof RangeSchema>
+
+let CoverageSchema = v.object({
+	text: v.string(),
+	url: v.string(),
+	ranges: v.array(RangeSchema),
+})
 
-let CoverageSchema = v.array(
-	v.object({
-		text: v.string(),
-		url: v.string(),
-		ranges: v.array(
-			v.object({
-				start: v.number(),
-				end: v.number(),
-			}),
-		),
-	}),
-)
+export type Coverage = v.InferInput<typeof CoverageSchema>
 
 export function is_valid_coverage(input: unknown): boolean {
-	let result = v.safeParse(CoverageSchema, input)
+	let result = v.safeParse(v.array(CoverageSchema), input)
 	return result.success
 }