Lots of cleanup, commenting

js/markdown.js

@@ -1,12 +1,3 @@
-// FIXME: Nested blockquotes require blank line
-// TODO: HTML tags probably need better handling. Consider whether interior of matched tags should be interpreted as markdown.
-// TODO: Test broken/incomplete syntax thoroughly
-// TODO: Sanity checks on loops/recursion
-// TODO: Spreadsheet functions in tables
-// TODO: Support document differentiators for CSS identifiers (using markdown to render 2+ documents in the same page, need ids to be unique within the page)
-// TODO: Support language marker in ``` to at least add a CSS class to the <pre>
-// TODO: Better way to detect start of new block inside of list item without line break
-
 class MDTokenType {
 	static Text = new MDTokenType('Text');
 	static Whitespace = new MDTokenType('Whitespace');

testjs.html

@@ -11,9 +11,14 @@
 				--color-failed: #a00;
 				--color-errored: #a80;
 				--color-untested: #888;
+				--color-background: #fff;
+				--color-text: #000;
+				--color-secondary: #888;
+				background-color: var(--color-background);
+				color: var(--color-text);
 			}
 			.testclass {
-				border: 1px solid black;
+				border: 1px solid var(--color-secondary);
 				padding: 0.5em 1em;
 				margin-bottom: 1em;
 				max-width: 50em;
@@ -23,9 +28,6 @@
 				font-size: 1.25rem;
 				padding-bottom: 0.25em;
 			}
-			.testclassstatus {
-
-			}
 			.testclassstatus.passed { color: var(--color-passed); }
 			.testclassstatus.failed { color: var(--color-failed); }
 			.testclassstatus.errored { color: var(--color-errored); }
@@ -36,7 +38,7 @@
 				margin-left: 2em;
 			}
 			.testcase {
-				border-top: 1px solid #888;
+				border-top: 1px solid var(--color-secondary);
 			}
 			.testcasename {
 				font-family: monospace;
@@ -48,7 +50,7 @@
 			}
 			.testcasetiming {
 				float: right;
-				color: #888;
+				color: var(--color-secondary);
 				font-size: 80%;
 			}
 			.testcaseresult {
@@ -58,19 +60,30 @@
 				clear: both;
 			}
 			.result-untested {
-				color: #888;
+				color: var(--color-untested);
 			}
 			.result-testing {
-				color: black;
+				color: var(--color-text);
 			}
 			.result-passed {
-				color: #090;
+				color: var(--color-passed);
 			}
 			.result-failed {
-				color: #a00;
+				color: var(--color-failed);
 			}
 			.result-errored {
-				color: #a80;
+				color: var(--color-errored);
+			}
+			@media (prefers-color-scheme: dark) {
+				:root {
+					--color-passed: #090;
+					--color-failed: #a00;
+					--color-errored: #a80;
+					--color-untested: #888;
+					--color-background: #000;
+					--color-text: #fff;
+					--color-secondary: #888;
+				}
 			}
 		</style>
 		<script src="js/markdown.js"></script>
@@ -424,14 +437,14 @@
 		<script>
 			function onLoad() {
 				let testClasses = [
-					// FIXME: Reenable these! Disabled temporarily to test spreadsheets faster.
-					// TokenTests,
-					// UtilsTests,
-					// InlineTests,
-					// BlockTests,
+					TokenTests,
+					UtilsTests,
+					InlineTests,
+					BlockTests,
 					CellValueTests,
 					CellAddressRangeTests,
 					ExpressionSetTests,
+					SpreadsheetMarkdownIntegrationTests,
 				];
 				TestClassRunner.runAll(testClasses);
 			}
@@ -1555,6 +1568,8 @@
 					this._test_simple_formula('=AND(FALSE, TRUE)', false);
 					this._test_simple_formula('=AND(TRUE, FALSE)', false);
 					this._test_simple_formula('=AND(TRUE, TRUE)', true);
+					this._test_simple_formula('=AND(TRUE, TRUE, TRUE, TRUE)', true);
+					this._test_simple_formula('=AND(TRUE, TRUE, TRUE, FALSE)', false);
 				}
 
 				test_func_average() {
@@ -1638,6 +1653,9 @@
 					this._test_simple_formula('=ROUND(-3.1)', -3);
 					this._test_simple_formula('=ROUND(-3.5)', -3);
 					this._test_simple_formula('=ROUND(-3.9)', -4);
+					this._test_simple_formula('=ROUND(3.1415926535, 1)', 3.1);
+					this._test_simple_formula('=ROUND(3.1415926535, 2)', 3.14);
+					this._test_simple_formula('=ROUND(31.415926535, -1)', 30);
 				}
 
 				test_func_sqrt() {
@@ -1671,6 +1689,45 @@
 					this._test_simple_formula('=2.718281828459045 ; currency 2', new CellValue('$2.72', 2.718281828459045, 'currency', 2));
 				}
 			}
+
+			class SpreadsheetMarkdownIntegrationTests extends BaseTest {
+				parser;
+
+				setUp() {
+					this.parser = new Markdown([ ...Markdown.allBlockReaders, new SpreadsheetBlockReader() ], Markdown.allInlineReaders);
+				}
+
+				md(markdown) {
+					return normalizeWhitespace(this.parser.toHTML(markdown));
+				}
+
+				test_integration() {
+					const markdown = '| A | B | C |\n| --- | --- | --- |\n| 3 | 4 | =A*B |';
+					const expected = '<table> <thead> ' +
+						'<tr> <th>A</th> <th>B</th> <th>C</th> </tr> ' +
+						'</thead> <tbody> <tr> ' +
+						'<td class="spreadsheet-type-number" data-numeric-value="3" data-string-value="3">3</td> ' +
+						'<td class="spreadsheet-type-number" data-numeric-value="4" data-string-value="4">4</td> ' +
+						'<td class="calculated spreadsheet-type-number" data-numeric-value="12" data-string-value="12">12</td> ' +
+						'</tr> </tbody> </table>';
+					const result = this.md(markdown);
+					this.assertEqual(result, expected);
+				}
+
+				test_bailOut() {
+					// If no formulas found table isn't modified
+					const markdown = '| A | B | C |\n| --- | --- | --- |\n| 3 | 4 | A*B |';
+					const expected = '<table> <thead> ' +
+						'<tr> <th>A</th> <th>B</th> <th>C</th> </tr> ' +
+						'</thead> <tbody> <tr> ' +
+						'<td>3</td> ' +
+						'<td>4</td> ' +
+						'<td>A*B</td> ' +
+						'</tr> </tbody> </table>';
+					const result = this.md(markdown);
+					this.assertEqual(result, expected);
+				}
+			}
 		</script>
 	</head>
 	<body>