cleaning up

Author: bartveneman

src/lib/chunkify.ts

@@ -22,21 +22,18 @@ function merge(stylesheet: ChunkedCoverage): ChunkedCoverage {
 			continue
 		}
 
-		// let previous_chunk = stylesheet.chunks.at(i - 1)
 		let latest_chunk = new_chunks.at(-1)
 
 		// merge current and previous if they are both covered or uncovered
 		if (i > 0 && previous_chunk && latest_chunk) {
 			if (previous_chunk.is_covered === chunk.is_covered) {
 				latest_chunk.end_offset = chunk.end_offset
-				// latest_chunk.css = stylesheet.text.slice(latest_chunk.start_offset, chunk.end_offset)
 				previous_chunk = chunk
 				continue
 			}
 			// If the current chunk is only whitespace or empty, add it to the previous
 			else if (/^\s+$/.test(stylesheet.text.slice(chunk.start_offset, chunk.end_offset)) || chunk.end_offset === chunk.start_offset) {
 				latest_chunk.end_offset = chunk.end_offset
-				// latest_chunk.css = stylesheet.text.slice(latest_chunk.start_offset, chunk.end_offset)
 				// do not update previous_chunk
 				continue
 			}
@@ -52,7 +49,6 @@ function merge(stylesheet: ChunkedCoverage): ChunkedCoverage {
 	}
 }
 
-// TODO: get rid of empty chunks, merge first/last with adjecent covered block + merge chunks
 export function chunkify(stylesheet: Coverage): ChunkedCoverage {
 	let chunks = []
 	let offset = 0
@@ -64,7 +60,6 @@ export function chunkify(stylesheet: Coverage): ChunkedCoverage {
 				start_offset: offset,
 				end_offset: range.start,
 				is_covered: false,
-				// css: stylesheet.text.substring(offset, range.start),
 			})
 			offset = range.start
 		}
@@ -73,7 +68,6 @@ export function chunkify(stylesheet: Coverage): ChunkedCoverage {
 			start_offset: range.start,
 			end_offset: range.end,
 			is_covered: true,
-			// css: stylesheet.text.substring(range.start, range.end),
 		})
 		offset = range.end
 	}
@@ -84,21 +78,14 @@ export function chunkify(stylesheet: Coverage): ChunkedCoverage {
 			start_offset: offset,
 			end_offset: stylesheet.text.length,
 			is_covered: false,
-			// css: stylesheet.text.substring(offset, stylesheet.text.length),
 		})
 	}
 
-	// console.log('before merge')
-	// console.log(chunks)
-
 	let merged = merge({
 		url: stylesheet.url,
 		text: stylesheet.text,
 		chunks,
 	})
 
-	// console.log('after merge')
-	// console.log(merged.chunks)
-
 	return merged
 }

src/lib/css-tree.d.ts

@@ -38,6 +38,7 @@ export function extend_ranges(coverage: Coverage[]): Coverage[] {
 				}
 			}
 
+			// If the next non-whitespace character is }, add it to the current range
 			let offset = range.end
 			let next_char = text.charAt(offset)
 			while (/\s/.test(next_char)) {
@@ -51,21 +52,6 @@ export function extend_ranges(coverage: Coverage[]): Coverage[] {
 			return range
 		})
 
-		// console.log('Before extending')
-		// console.log({
-		// 	ranges: ranges.map((r) => ({
-		// 		...r,
-		// 		text: text.slice(r.start, r.end),
-		// 	})),
-		// })
-		// console.log()
-		// console.log('after extending')
-		// console.log({
-		// 	ranges: new_ranges.map((r) => ({
-		// 		...r,
-		// 		text: text.slice(r.start, r.end),
-		// 	})),
-		// })
 		return { text, ranges: new_ranges, url }
 	})
 }

src/lib/extend-ranges.ts

@@ -30,6 +30,7 @@ export async function filter_coverage(coverage: Coverage[]): Promise<Coverage[]>
 		}
 
 		// At this point it can only be CSS
+		// TODO: that's not true, check if it's css-like of js-like
 		result.push({
 			url: entry.url,
 			text: entry.text,

src/lib/filter-entries.ts

@@ -88,9 +88,7 @@ export async function calculate_coverage(coverage: Coverage[]): Promise<Coverage
 
 	let filtered_coverage: Coverage[] = await filter_coverage(coverage)
 	let deduplicated: Coverage[] = deduplicate_entries(filtered_coverage)
-	// console.log(deduplicated.find((s) => s.url.includes('Container')))
 	let extended: Coverage[] = extend_ranges(deduplicated)
-	// console.log(extended.find((s) => s.url.includes('Container')))
 	let chunkified: ChunkedCoverage[] = extended.map((sheet) => chunkify(sheet))
 	let prettified: PrettifiedCoverage[] = chunkified.map((sheet) => prettify(sheet))
 	let coverage_per_stylesheet = prettified.map((stylesheet) => calculate_stylesheet_coverage(stylesheet))

src/lib/index.ts

@@ -1,10 +1,10 @@
 import { test, expect } from '@playwright/test'
 import { prettify } from './prettify'
 
-test('simple range at start', () => {})
-test('simple range at middle', () => {})
-test('simple range at end', () => {})
+test.skip('simple range at start', () => {})
+test.skip('simple range at middle', () => {})
+test.skip('simple range at end', () => {})
 
-test('atrule at start', () => {})
-test('atrule at middle', () => {})
-test('atrule at end', () => {})
+test.skip('atrule at start', () => {})
+test.skip('atrule at middle', () => {})
+test.skip('atrule at end', () => {})

src/lib/prettify.test.ts

@@ -3,7 +3,6 @@ import type { DOMParser as LinkedomParser } from 'linkedom'
 
 async function get_dom_parser(): Promise<DOMParser | LinkedomParser> {
 	if (typeof window !== 'undefined' && 'DOMParser' in window) {
-		/* v8 ignore */
 		return new window.DOMParser()
 	}