tweaks

Author: bartveneman

src/cli/reporters/pretty.ts

@@ -61,7 +61,7 @@ export function print({ report, context }: Report, params: CliArguments) {
 					if (line_coverage[i] === 0) {
 						// Rewind cursor N lines to render N previous lines
 						for (let j = i - NUM_LEADING_LINES; j < i; j++) {
-							console.log(styleText('dim', line_number(j)), styleText('dim', lines[j]!))
+							console.log(styleText('dim', line_number(j)), styleText('dim', lines[j] || ''))
 						}
 						// Render uncovered lines while increasing cursor until reaching next covered block
 						while (line_coverage[i] === 0) {

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<Coverage['text'], Pick<Coverage, 'ranges' | 'url'>> {
+export function deduplicate_entries(entries: Coverage[]): Coverage[] {
 	let checked_stylesheets = new Map<string, { url: string; ranges: Range[] }>()
 
 	for (let entry of entries) {
@@ -36,5 +36,5 @@ export function deduplicate_entries(entries: Coverage[]): Map<Coverage['text'],
 		}
 	}
 
-	return checked_stylesheets
+	return Array.from(checked_stylesheets, ([text, { url, ranges }]) => ({ text, url, ranges }))
 }

src/deduplicate.test.ts

@@ -7,16 +7,16 @@ test('handles a single entry', () => {
 		ranges: [{ start: 0, end: 4 }],
 		url: 'example.com',
 	}
-	expect(deduplicate_entries([entry])).toEqual(new Map([[entry.text, { url: entry.url, ranges: entry.ranges }]]))
+	expect(deduplicate_entries([entry])).toEqual([entry])
 })
 
-test('deduplicats a simple duplicate entry', () => {
+test('deduplicates a simple duplicate entry', () => {
 	let entry = {
 		text: 'a {}',
 		ranges: [{ start: 0, end: 4 }],
 		url: 'example.com',
 	}
-	expect(deduplicate_entries([entry, entry])).toEqual(new Map([[entry.text, { url: entry.url, ranges: entry.ranges }]]))
+	expect(deduplicate_entries([entry, entry])).toEqual([entry])
 })
 
 test('merges two identical texts with different URLs and identical ranges', () => {
@@ -33,7 +33,7 @@ test('merges two identical texts with different URLs and identical ranges', () =
 		},
 	]
 	let first = entries.at(0)!
-	expect(deduplicate_entries(entries)).toEqual(new Map([[first.text, { url: first.url, ranges: first.ranges }]]))
+	expect(deduplicate_entries(entries)).toEqual([{ text: first.text, url: first.url, ranges: first.ranges }])
 })
 
 test('merges different ranges on identical CSS, different URLs', () => {
@@ -50,9 +50,7 @@ test('merges different ranges on identical CSS, different URLs', () => {
 		},
 	]
 	let first = entries.at(0)!
-	expect(deduplicate_entries(entries)).toEqual(
-		new Map([[first.text, { url: first.url, ranges: [first.ranges[0], entries[1]!.ranges[0]] }]]),
-	)
+	expect(deduplicate_entries(entries)).toEqual([{ text: first.text, url: first.url, ranges: [first.ranges[0], entries[1]!.ranges[0]] }])
 })
 
 test('merges different ranges on identical CSS, identical URLs', () => {
@@ -68,9 +66,9 @@ test('merges different ranges on identical CSS, identical URLs', () => {
 			url: 'example.com',
 		},
 	]
-	expect(deduplicate_entries(entries)).toEqual(
-		new Map([[entries[0]!.text, { url: entries[0]!.url, ranges: [entries[0]!.ranges[0], entries[1]!.ranges[0]] }]]),
-	)
+	expect(deduplicate_entries(entries)).toEqual([
+		{ text: entries[0]!.text, url: entries[0]!.url, ranges: [entries[0]!.ranges[0], entries[1]!.ranges[0]] },
+	])
 })
 
 test('does not merge different CSS with different URLs and identical ranges', () => {
@@ -86,12 +84,10 @@ test('does not merge different CSS with different URLs and identical ranges', ()
 			url: 'example.com/b',
 		},
 	]
-	expect(deduplicate_entries(entries)).toEqual(
-		new Map([
-			[entries[0]!.text, { url: entries[0]!.url, ranges: entries[0]!.ranges }],
-			[entries[1]!.text, { url: entries[1]!.url, ranges: entries[1]!.ranges }],
-		]),
-	)
+	expect(deduplicate_entries(entries)).toEqual([
+		{ text: entries[0]!.text, url: entries[0]!.url, ranges: entries[0]!.ranges },
+		{ text: entries[1]!.text, url: entries[1]!.url, ranges: entries[1]!.ranges },
+	])
 })
 
 test('does not merge different CSS with same URLs and identical ranges', () => {
@@ -107,10 +103,8 @@ test('does not merge different CSS with same URLs and identical ranges', () => {
 			url: 'example.com',
 		},
 	]
-	expect(deduplicate_entries(entries)).toEqual(
-		new Map([
-			[entries[0]!.text, { url: entries[0]!.url, ranges: entries[0]!.ranges }],
-			[entries[1]!.text, { url: entries[1]!.url, ranges: entries[1]!.ranges }],
-		]),
-	)
+	expect(deduplicate_entries(entries)).toEqual([
+		{ text: entries[0]!.text, url: entries[0]!.url, ranges: entries[0]!.ranges },
+		{ text: entries[1]!.text, url: entries[1]!.url, ranges: entries[1]!.ranges },
+	])
 })

src/index.ts

@@ -57,12 +57,12 @@ export function calculate_coverage(coverage: Coverage[], parse_html?: Parser): C
 		throw new TypeError('No valid coverage data found')
 	}
 
-	let filtered_coverage = filter_coverage(coverage, parse_html)
-	let prettified_coverage = prettify(filtered_coverage)
-	let deduplicated = deduplicate_entries(prettified_coverage)
+	let filtered_coverage: Coverage[] = filter_coverage(coverage, parse_html)
+	let prettified_coverage: Coverage[] = prettify(filtered_coverage)
+	let deduplicated: Coverage[] = deduplicate_entries(prettified_coverage)
 
 	// Calculate coverage for each individual stylesheet we found
-	let coverage_per_stylesheet = Array.from(deduplicated).map(([text, { url, ranges }]) => {
+	let coverage_per_stylesheet = deduplicated.map(({ text, url, ranges }) => {
 		function is_line_covered(line: string, start_offset: number) {
 			let end = start_offset + line.length
 			let next_offset = end + 1 // account for newline character

src/prettify.ts

@@ -3,18 +3,19 @@ import type { Range, Coverage } from './parse-coverage.ts'
 // css-tree tokens: https://github.com/csstree/csstree/blob/be5ea1257009960c04cccdb58bb327263e27e3b3/lib/tokenizer/types.js
 import { tokenize, tokenTypes } from 'css-tree/tokenizer'
 
+let irrelevant_tokens: Set<number> = new Set([
+	tokenTypes.EOF,
+	tokenTypes.BadString,
+	tokenTypes.BadUrl,
+	tokenTypes.WhiteSpace,
+	tokenTypes.Semicolon,
+	tokenTypes.Comment,
+	tokenTypes.Colon,
+])
+
 export function prettify(coverage: Coverage[]): Coverage[] {
 	return coverage.map(({ url, text, ranges }) => {
 		let formatted = format(text)
-		let irrelevant_tokens: Set<number> = new Set([
-			tokenTypes.EOF,
-			tokenTypes.BadString,
-			tokenTypes.BadUrl,
-			tokenTypes.WhiteSpace,
-			tokenTypes.Semicolon,
-			tokenTypes.Comment,
-			tokenTypes.Colon,
-		])
 
 		// Initialize the ranges with an empty array of token indexes
 		let ext_ranges: (Range & { tokens: number[] })[] = ranges.map(({ start, end }) => ({ start, end, tokens: [] }))