clean up and skip cli for now

Author: bartveneman

src/cli/cli.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
 
-import { validate_arguments, parse_arguments, InvalidArgumentsError } from './arguments.js'
-import { program, MissingDataError } from './program.js'
+import { validate_arguments, parse_arguments } from './arguments.js'
+import { program } from './program.js'
 import { read } from './file-reader.js'
 import { print as pretty } from './reporters/pretty.js'
 import { print as tap } from './reporters/tap.js'

src/cli/reporters/pretty.ts

@@ -64,30 +64,26 @@ export function print({ report, context }: Report, params: CliArguments) {
 				console.log(styleText('dim', '─'.repeat(terminal_width)))
 
 				let lines = sheet.text.split('\n')
-				let line_coverage = sheet.line_coverage
 
-				for (let i = 0; i < lines.length; i++) {
-					if (line_coverage[i] === 1) continue
-
-					// Rewind cursor N lines to render N previous lines
-					for (let j = i - NUM_LEADING_LINES; j < i; j++) {
-						// Make sure that we don't try to start before line 0
-						if (j >= 0) {
-							console.log(styleText('dim', line_number(j)), styleText('dim', indent(lines[j])))
-						}
-					}
-
-					// Render uncovered lines while increasing cursor until reaching next covered block
-					while (line_coverage[i] === 0) {
-						console.log(styleText('red', line_number(i, false)), indent(lines[i]))
-						i++
-					}
-
-					// Forward cursor N lines to render N trailing lines
-					for (let end = i + NUM_TRAILING_LINES; i < end && i < lines.length; i++) {
-						console.log(styleText('dim', line_number(i)), styleText('dim', indent(lines[i])))
+				for (let chunk of sheet.chunks) {
+					let ls = chunk.css.split('\n')
+					// TODO FIX ME
+					for (let l = 0; l < ls.length; l++) {
+						console.log(styleText('red', line_number(l + chunk.start_line, false)), indent(ls[l]))
 					}
 
+					// Render N leading lines
+					// for (let x = Math.max(chunk.start_line - NUM_LEADING_LINES, 0); x < chunk.start_line; x++) {
+					// 	console.log(styleText('dim', line_number(x)), styleText('dim', indent(lines[x])))
+					// }
+					// Render the uncovered chunk
+					// for (let i = chunk.start_line; i <= chunk.end_line; i++) {
+					// 	console.log(styleText('red', line_number(i, false)), indent(lines[i]))
+					// }
+					// Render N trailing lines
+					// for (let y = chunk.end_line; Math.min(chunk.end_line + NUM_TRAILING_LINES, lines.length); y++) {
+					// 	console.log(styleText('dim', line_number(y)), styleText('dim', indent(lines[y])))
+					// }
 					// Show empty line between blocks
 					console.log()
 				}

src/lib/index.ts

@@ -1,6 +1,6 @@
-import { type Coverage, type Range } from './parse-coverage.js'
+import { type Coverage } from './parse-coverage.js'
 import { prettify, type PrettifiedChunk, type PrettifiedCoverage } from './prettify.js'
-import { deduplicate_entries, concatenate } from './decuplicate.js'
+import { deduplicate_entries } from './decuplicate.js'
 import { filter_coverage } from './filter-entries.js'
 import { extend_ranges } from './extend-ranges.js'
 import { chunkify, type ChunkedCoverage } from './chunkify.js'
@@ -88,41 +88,9 @@ 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('deduped')
-	// console.log(deduplicated.at(0))
-	// console.log()
 	let extended: Coverage[] = extend_ranges(deduplicated)
-	// console.log('extended')
-	// console.log(extended.at(0))
-	// console.log()
-	// let concatenated: Coverage[] = extended.map((cov) => ({
-	// 	...cov,
-	// 	ranges: concatenate(cov.ranges),
-	// }))
-	// console.log('concatenated')
-	// console.log(concatenated.at(0))
-	// console.log()
-	// if (concatenated.at(0)!.ranges[0].start !== 0) {
-	// 	console.log(0, concatenated.at(0)!.ranges[0].start)
-	// 	console.log(concatenated.at(0)!.text.substring(0, concatenated.at(0)!.ranges[0].start))
-	// 	console.log()
-	// }
-	// for (let i = 0; i < concatenated.at(0)!.ranges.length; i++) {
-	// 	let str = concatenated.at(0)!.text.slice(concatenated.at(0)!.ranges[i].end, concatenated.at(0)!.ranges[i + 1]?.start)
-	// 	if (str.trim().length > 0) {
-	// 		console.log(concatenated.at(0)!.ranges[i].end, concatenated.at(0)!.ranges[i + 1]?.start)
-	// 		console.log(str)
-	// 		console.log()
-	// 	}
-	// }
 	let chunkified: ChunkedCoverage[] = extended.map((sheet) => chunkify(sheet))
-	// console.log('chunkified')
-	// console.log(chunkified.at(0))
-	// console.log()
 	let prettified: PrettifiedCoverage[] = chunkified.map((sheet) => prettify(sheet))
-	// console.log('prettified')
-	// console.log(prettified.at(0))
-	// console.log()
 	let coverage_per_stylesheet = prettified.map((stylesheet) => calculate_stylesheet_coverage(stylesheet))
 
 	// Calculate total coverage for all stylesheets combined

src/lib/test/kitchen-sink.test.ts

@@ -232,52 +232,59 @@ test.describe('Wallace mega soverage suite', () => {
 	})
 
 	test('CopyButton has full coverage', async () => {
-		let data = coverage.find(({ url }) => url.includes('CopyButton')) as Coverage
-		let result = await calculate_coverage([data])
-		expect.soft(result.line_coverage_ratio).toBe(1)
-		expect.soft(result.total_lines).toBe(17)
+		let result = await calculate_coverage(coverage)
+		let sheet = result.coverage_per_stylesheet.find((s) => s.url.includes('CopyButton'))!
+		expect.soft(sheet.line_coverage_ratio).toBe(1)
+		expect.soft(sheet.total_lines).toBe(17)
 	})
 
 	test('Heading has full coverage', async () => {
-		let data = coverage.find(({ url }) => url.includes('Heading')) as Coverage
-		let result = await calculate_coverage([data])
-		expect.soft(result.line_coverage_ratio).toBe(1)
-		expect.soft(result.total_lines).toBe(37)
+		let result = await calculate_coverage(coverage)
+		let sheet = result.coverage_per_stylesheet.find((s) => s.url.includes('Heading'))!
+		expect.soft(sheet.line_coverage_ratio).toBe(1)
+		expect.soft(sheet.total_lines).toBe(37)
 	})
 
 	test('Meter has partial coverage', async () => {
-		let data = coverage.find(({ url }) => url.includes('Meter')) as Coverage
-		let result = await calculate_coverage([data])
-		expect.soft(result.line_coverage_ratio).not.toBe(1)
-		expect.soft(result.total_lines).toBe(35)
-
-		let sheet = result.coverage_per_stylesheet.at(0)!
+		let result = await calculate_coverage(coverage)
+		let sheet = result.coverage_per_stylesheet.find((s) => s.url.includes('Meter'))!
+		expect.soft(sheet.line_coverage_ratio).not.toBe(1)
+		expect.soft(sheet.total_lines).toBe(35)
 		expect.soft(sheet.chunks.map(({ is_covered, start_line, end_line }) => ({ is_covered, start_line, end_line }))).toEqual([
 			{ is_covered: true, start_line: 1, end_line: 22 },
 			{ is_covered: false, start_line: 23, end_line: 35 },
 		])
 	})
 
 	test('Container has partial coverage', async () => {
-		let data = coverage.find(({ url }) => url.includes('Container')) as Coverage
-		let result = await calculate_coverage([data])
-		expect.soft(result.line_coverage_ratio).not.toBe(1)
-		expect.soft(result.total_lines).toBe(44)
-
-		let sheet = result.coverage_per_stylesheet.at(0)!
+		let result = await calculate_coverage(coverage)
+		let sheet = result.coverage_per_stylesheet.find((s) => s.url.includes('Container'))!
+		expect.soft(sheet.line_coverage_ratio).not.toBe(1)
+		expect.soft(sheet.total_lines).toBe(44)
 		expect.soft(sheet.chunks.map(({ is_covered, start_line, end_line }) => ({ is_covered, start_line, end_line }))).toEqual([
 			{ is_covered: true, start_line: 1, end_line: 21 },
 			{ is_covered: false, start_line: 22, end_line: 24 },
 			{ is_covered: true, start_line: 25, end_line: 44 },
 		])
 	})
 
+	test('Markdown has partial coverage', async () => {
+		let result = await calculate_coverage(coverage)
+		let sheet = result.coverage_per_stylesheet.find((s) => s.url.includes('Markdown'))!
+		expect.soft(sheet.line_coverage_ratio).not.toBe(1)
+		expect.soft(sheet.total_lines).toBe(202)
+		expect.soft(sheet.chunks.filter((c) => !c.is_covered).map(({ start_line, end_line }) => ({ start_line, end_line }))).toEqual([
+			{ start_line: 26, end_line: 38 }, // .markdown h4
+			{ start_line: 154, end_line: 157 }, // .markdown img
+			{ start_line: 179, end_line: 197 }, // .markdown aside
+		])
+	})
+
 	// This was a notoriously difficult one to fix
 	test('main sheet has partial coverage', async () => {
-		let data = coverage.find(({ url }) => url.endsWith('0.RC2DzJv0.css')) as Coverage
-		let result = await calculate_coverage([data])
-		let sheet = result.coverage_per_stylesheet.at(0)!
-		expect.soft(sheet.chunks.filter((c) => !c.is_covered).map(({ start_line, end_line, css }) => ({ start_line, end_line }))).toEqual([
+		let result = await calculate_coverage(coverage)
+		let sheet = result.coverage_per_stylesheet.find((s) => s.url.endsWith('0.RC2DzJv0.css'))!
+		expect.soft(sheet.chunks.filter((c) => !c.is_covered).map(({ start_line, end_line }) => ({ start_line, end_line }))).toEqual([
 			{ start_line: 77, end_line: 81 }, // @media print { .nav-list.svelte-1h32yp1
 			{ start_line: 127, end_line: 130 }, // .nav-popover-trigger.svelte-1h32yp1.invisible
 			{ start_line: 146, end_line: 152 }, // @supports not (right: anchor(end)) { .nav-popover