Fix bug in # replace

JAForbes · Apr 12, 2024 · 6af74a7 · 6af74a7
1 parent 72d3330
commit 6af74a7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 4 deletions.
diff --git a/lib/parser.ts b/lib/parser.ts
@@ -133,7 +133,8 @@ export function parser(_strings: TemplateStringsArray, ..._values: any[]): Parse
 				}
 			}
 
-			if (x === '#' && !string[i + 1]?.match(/[A-z]/)) {
+			// have to account for ids and hex colours
+			if (x === '#' && string[i + 1]?.match(/[A-z][0-9]|\s/)) {
 				if (openGlobal) {
 					globalOuts.push(outs, placeHolderHash)
 				} else {

diff --git a/test/server.ts b/test/server.ts
@@ -6,6 +6,13 @@ import render from 'mithril-node-render'
 import CSS, { sheets, pretty } from '../lib'
 import { JSDOM } from 'jsdom'
 
+const assertStringEq = (a:string,b: string) => {
+	if (a !== b ) {
+		throw new Error('strings not equal: \n' + a + '\n' + b)
+	}
+}
+
+
 test('server', async () => {
 	const { css, m } = CSS(hyperscript, { server: true})
 	const desktop = css('@media(min-width: 1000px)')
@@ -38,7 +45,7 @@ test('server', async () => {
 		</html>
 	`)
 
-	assert.equal(
+	assertStringEq(
 		pretty([...sheets.values()].join('')),
 		pretty(`
 			css-node {
@@ -59,6 +66,6 @@ test('server', async () => {
 	await new Promise((Y) => setTimeout(Y, 200))
 	const h1 = jsdom.window.document.body.querySelector('h1')
 
-	assert.equal(h1?.className, className)
-	assert.equal(h1?.getAttribute('style'), `--${className}-1:red;--${className}-2:blue`)
+	assertStringEq(h1?.className!, className)
+	assertStringEq(h1?.getAttribute('style')!, `--${className}-1:red;--${className}-2:blue`)
 })