Merge commit from fork

* fix: handle empty quoted strings in CSS selector splitting

* add unit tests and special case for empty selectors

* remove unterminated quotes special case

---------

Co-authored-by: Lukas Holländer <lukas.hollaender@yworks.com>

Author: joshuavanderpoll

src/context/stylesheets.ts

@@ -88,10 +88,14 @@ export class StyleSheets {
     }
   }
 
-  private static splitSelectorAtCommas(selectorText: string): string[] {
+  public static splitSelectorAtCommas(selectorText: string): string[] {
+    if (selectorText.trim().length === 0) {
+      return []
+    }
+
     const initialRegex = /,|["']/g
-    const closingDoubleQuotesRegex = /[^\\]["]/g
-    const closingSingleQuotesRegex = /[^\\][']/g
+    const closingDoubleQuotesRegex = /\\[\s\S]|"/g
+    const closingSingleQuotesRegex = /\\[\s\S]|'/g
     const parts = []
 
     let state: 'initial' | 'withinQuotes' = 'initial'
@@ -124,11 +128,14 @@ export class StyleSheets {
         case 'withinQuotes':
           closingQuotesRegex.lastIndex = i
           match = closingQuotesRegex.exec(selectorText)
-          if (match) {
+          if (!match) {
+            i = selectorText.length
+          } else {
             i = closingQuotesRegex.lastIndex
-            state = 'initial'
+            if (match[0].length === 1) {
+              state = 'initial'
+            }
           }
-          // else this is a syntax error - omit the last part...
           break
       }
     }

test/style-sheets/style-sheets.spec.ts

@@ -1,9 +1,48 @@
 import { describe, it, expect } from 'vitest'
 import { svg2pdf } from '../../src/svg2pdf'
+import { StyleSheets } from '../../src/context/stylesheets'
 import jsPDF from 'jspdf'
 import { loadSvg } from '../utils/loadSvg'
 
 describe('style-sheets', () => {
+  it('splits selectors at commas outside quoted attribute values', () => {
+    expect(
+      StyleSheets.splitSelectorAtCommas(
+        'rect, [data-value="one,two"], [data-value=\'three,four\'], circle'
+      )
+    ).toEqual(['rect', '[data-value="one,two"]', "[data-value='three,four']", 'circle'])
+  })
+
+  it('trims selectors and preserves commas in escaped quoted values', () => {
+    expect(StyleSheets.splitSelectorAtCommas('  .first  , [title="a\\",b"], .last  ')).toEqual([
+      '.first',
+      '[title="a\\",b"]',
+      '.last'
+    ])
+  })
+
+  it('returns an empty selector for an empty string', () => {
+    expect(StyleSheets.splitSelectorAtCommas('')).toEqual([])
+    expect(StyleSheets.splitSelectorAtCommas('   ')).toEqual([])
+  })
+
+  it('preserves empty strings inside selectors', () => {
+    expect(StyleSheets.splitSelectorAtCommas('[href=""], [target="_blank"]')).toEqual([
+      '[href=""]',
+      '[target="_blank"]'
+    ])
+  })
+
+  it('keeps invalid selector fragments when splitting', () => {
+    expect(StyleSheets.splitSelectorAtCommas('rect,,[invalid, .circle')).toEqual([
+      'rect',
+      '',
+      '[invalid',
+      '.circle'
+    ])
+    expect(StyleSheets.splitSelectorAtCommas('[title="unterminated, .last')).toEqual([])
+  })
+
   it('style-sheets', async () => {
     const { svgElement, width, height } = await loadSvg('/test/style-sheets/style-sheets.svg')
     const pdf = new jsPDF(width > height ? 'l' : 'p', 'pt', [width, height])