From ead38f751dae1c386140b520df1d5eec8e954933 Mon Sep 17 00:00:00 2001 From: draarivpatel-ui <287273626+draarivpatel-ui@users.noreply.github.com> Date: Mon, 9 Nov 2026 18:34:22 -0600 Subject: [PATCH 1/3] fix(parser): recognize attributes without whitespace between quoted values When a quoted attribute value is immediately followed by another attribute (for example id="abc"class="def"), the tag regex required a whitespace separator before every attribute and therefore failed to match the whole start tag. The tag was emitted as text and tag-pair reported a false no start tag error for the matching end tag. Relax the separator to allow a new attribute directly after a closing quote while keeping whitespace as the normal separator. --- dist/core/htmlparser.js | 4 ++-- src/core/htmlparser.ts | 2 +- test/htmlparser.spec.js | 40 +++++++++++++++++++++++++++++++++++++ test/rules/tag-pair.spec.js | 6 ++++++ 4 files changed, 49 insertions(+), 3 deletions(-) diff --git a/dist/core/htmlparser.js b/dist/core/htmlparser.js index 63bb73796..d300d2ec2 100644 --- a/dist/core/htmlparser.js +++ b/dist/core/htmlparser.js @@ -17,7 +17,7 @@ class HTMLParser { } parse(html) { const mapCdataTags = this._mapCdataTags; - const regTag = /<(?:\/([^\s>]+)\s*|!--([\s\S]*?)--|!([^>]*?)|([\w\-:]+)((?:\s+[^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s"'>]*))?)*?)\s*(\/?))>/g; + const regTag = /<(?:\/([^\s>]+)\s*|!--([\s\S]*?)--|!([^>]*?)|([\w\-:]+)((?:(?:\s+|(?<=["']))[^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s"'>]*))?)*?)\s*(\/?))>/g; const regAttr = /\s*([^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+)(?:\s*=\s*(?:(")([^"]*)"|(')([^']*)'|([^\s"'>]*)))?/g; const regLine = /\r?\n/g; let match; @@ -234,4 +234,4 @@ class HTMLParser { } } exports.default = HTMLParser; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"htmlparser.js","sourceRoot":"","sources":["../../src/core/htmlparser.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"htmlparser.js","sourceRoot":"","sources":["../../src/core/htmlparser.ts"],"names":[],"mappings":";;AAwBA,MAAqB,UAAU;IAO7B;QACE,IAAI,CAAC,UAAU,GAAG,EAAE,CAAA;QACpB,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,CAAA;QACjD,IAAI,CAAC,UAAU,GAAG,EAAE,CAAA;QACpB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;IACvB,CAAC;IAEM,OAAO,CAAC,GAAW;QAGxB,MAAM,GAAG,GAA+B,EAAE,CAAA;QAC1C,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAE5B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACtC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAA;QACtB,CAAC;QAED,OAAO,GAAG,CAAA;IACZ,CAAC;IAEM,KAAK,CAAC,IAAY;QACvB,MAAM,YAAY,GAAG,IAAI,CAAC,aAAa,CAAA;QAEvC,MAAM,MAAM,GAEV,wKAAwK,CAAA;QAC1K,MAAM,OAAO,GAEX,6FAA6F,CAAA;QAC/F,MAAM,OAAO,GAAG,QAAQ,CAAA;QAExB,IAAI,KAA6B,CAAA;QACjC,IAAI,UAAkB,CAAA;QACtB,IAAI,SAAS,GAAG,CAAC,CAAA;QACjB,IAAI,OAAe,CAAA;QACnB,IAAI,QAAgB,CAAA;QACpB,IAAI,QAAQ,GAAkB,IAAI,CAAA;QAClC,IAAI,UAA8B,CAAA;QAClC,IAAI,QAAQ,GAAa,EAAE,CAAA;QAC3B,IAAI,cAAc,GAAG,CAAC,CAAA;QACtB,IAAI,IAAY,CAAA;QAChB,IAAI,aAAa,GAAG,CAAC,CAAA;QACrB,IAAI,IAAI,GAAG,CAAC,CAAA;QACZ,MAAM,SAAS,GAAG,IAAI,CAAC,UAAU,CAAA;QAEjC,IAAI,CAAC,IAAI,CAAC,OAAO,EAAE;YACjB,GAAG,EAAE,CAAC;YACN,IAAI,EAAE,CAAC;YACP,GAAG,EAAE,CAAC;SACP,CAAC,CAAA;QAGF,MAAM,sBAAsB,GAAG,GAAG,EAAE;YAClC,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI;gBAChE,KAAK,EAAE,EAAE;aACV,CAAA;YAED,OAAO,CACL,YAAY,CAAC,OAAO,CAAC;gBACrB,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,KAAK,CAAC,CAAC,CAClD,CAAA;QACH,CAAC,CAAA;QAGD,MAAM,SAAS,GAAG,CAChB,IAAY,EACZ,GAAW,EACX,GAAW,EACX,IAAqB,EACrB,EAAE;YACF,MAAM,GAAG,GAAG,GAAG,GAAG,aAAa,GAAG,CAAC,CAAA;YACnC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBACvB,IAAI,GAAG,EAAE,CAAA;YACX,CAAC;YACD,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;YACd,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;YACd,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;YAChB,IAAI,CAAC,GAAG,GAAG,GAAG,CAAA;YACd,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;YACpB,IAAI,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;YAErB,OAAO,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;gBACzB,IAAI,EAAE,CAAA;gBACN,aAAa,GAAG,GAAG,GAAG,OAAO,CAAC,SAAS,CAAA;YACzC,CAAC;QACH,CAAC,CAAA;QAED,OAAO,CAAC,KAAK,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC;YACnC,UAAU,GAAG,KAAK,CAAC,KAAK,CAAA;YACxB,IAAI,UAAU,GAAG,SAAS,EAAE,CAAC;gBAE3B,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,UAAU,CAAC,CAAA;gBAC5C,IAAI,QAAQ,EAAE,CAAC;oBACb,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;gBACrB,CAAC;qBAAM,CAAC;oBAEN,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAA;gBACpC,CAAC;YACH,CAAC;YACD,SAAS,GAAG,MAAM,CAAC,SAAS,CAAA;YAE5B,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;gBACzB,IAAI,QAAQ,IAAI,OAAO,KAAK,QAAQ,EAAE,CAAC;oBAErC,IAAI,GAAG,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;oBACxB,SAAS,CAAC,OAAO,EAAE,IAAI,EAAE,cAAc,EAAE;wBACvC,OAAO,EAAE,QAAQ;wBACjB,KAAK,EAAE,UAAU;qBAClB,CAAC,CAAA;oBACF,QAAQ,GAAG,IAAI,CAAA;oBACf,UAAU,GAAG,SAAS,CAAA;oBACtB,QAAQ,GAAG,EAAE,CAAA;gBACf,CAAC;gBAED,IAAI,CAAC,QAAQ,EAAE,CAAC;oBAEd,SAAS,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE;wBACxC,OAAO,EAAE,OAAO;qBACjB,CAAC,CAAA;oBACF,SAAQ;gBACV,CAAC;YACH,CAAC;YAED,IAAI,QAAQ,EAAE,CAAC;gBACb,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAA;YACzB,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;oBAEzB,QAAQ,GAAG,EAAE,CAAA;oBACb,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,CAAC,CAAA;oBACtB,IAAI,SAAS,CAAA;oBACb,IAAI,cAAc,GAAG,CAAC,CAAA;oBAEtB,OAAO,CAAC,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC;wBACzC,MAAM,IAAI,GAAG,SAAS,CAAC,CAAC,CAAC,CAAA;wBACzB,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC;4BACxB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;4BACd,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gCACZ,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gCACd,CAAC,CAAC,EAAE,CAAA;wBACR,MAAM,KAAK,GAAG,SAAS,CAAC,CAAC,CAAC;4BACxB,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;4BACd,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gCACZ,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;gCACd,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;oCACZ,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;oCACd,CAAC,CAAC,EAAE,CAAA;wBAEV,QAAQ,CAAC,IAAI,CAAC;4BACZ,IAAI,EAAE,IAAI;4BACV,KAAK,EAAE,KAAK;4BACZ,KAAK,EAAE,KAAK;4BACZ,KAAK,EAAE,SAAS,CAAC,KAAK;4BACtB,GAAG,EAAE,SAAS,CAAC,CAAC,CAAC;yBAClB,CAAC,CAAA;wBACF,cAAc,IAAI,SAAS,CAAC,CAAC,CAAC,CAAC,MAAM,CAAA;oBACvC,CAAC;oBAED,IAAI,cAAc,KAAK,KAAK,CAAC,MAAM,EAAE,CAAC;wBACpC,SAAS,CAAC,UAAU,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE;4BAC1C,OAAO,EAAE,OAAO;4BAChB,KAAK,EAAE,QAAQ;4BACf,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC;yBAChB,CAAC,CAAA;wBAEF,IAAI,sBAAsB,EAAE,EAAE,CAAC;4BAC7B,QAAQ,GAAG,OAAO,CAAA;4BAClB,UAAU,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAA;4BAC9B,QAAQ,GAAG,EAAE,CAAA;4BACb,cAAc,GAAG,SAAS,CAAA;wBAC5B,CAAC;oBACH,CAAC;yBAAM,CAAC;wBAEN,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,UAAU,CAAC,CAAA;oBACzC,CAAC;gBACH,CAAC;qBAAM,IAAI,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC;oBAEhC,SAAS,CAAC,SAAS,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE;wBACzC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC;wBAC7B,IAAI,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK;qBAC9B,CAAC,CAAA;gBACJ,CAAC;YACH,CAAC;QACH,CAAC;QAED,IAAI,IAAI,CAAC,MAAM,GAAG,SAAS,EAAE,CAAC;YAE5B,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE,IAAI,CAAC,MAAM,CAAC,CAAA;YAC7C,SAAS,CAAC,MAAM,EAAE,IAAI,EAAE,SAAS,CAAC,CAAA;QACpC,CAAC;QAED,IAAI,CAAC,IAAI,CAAC,KAAK,EAAE;YACf,GAAG,EAAE,SAAS;YACd,IAAI,EAAE,IAAI;YACV,GAAG,EAAE,IAAI,CAAC,MAAM,GAAG,aAAa,GAAG,CAAC;SACrC,CAAC,CAAA;IACJ,CAAC;IAEM,WAAW,CAAC,KAAa,EAAE,QAAkB;QAClD,MAAM,UAAU,GAAG,IAAI,CAAC,UAAU,CAAA;QAClC,MAAM,QAAQ,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QACrC,IAAI,IAAI,CAAA;QAER,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAChD,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;YAClB,IAAI,UAAU,CAAC,IAAI,CAAC,KAAK,SAAS,EAAE,CAAC;gBACnC,UAAU,CAAC,IAAI,CAAC,GAAG,EAAE,CAAA;YACvB,CAAC;YACD,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QACjC,CAAC;IACH,CAAC;IAEM,IAAI,CAAC,IAAY,EAAE,IAAqB;QAC7C,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;YACvB,IAAI,GAAG,EAAE,CAAA;QACX,CAAC;QACD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAA;QAEhB,IAAI,SAAS,GAAe,EAAE,CAAA;QAC9B,MAAM,aAAa,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QAC3C,MAAM,YAAY,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,CAAA;QAE3C,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAChC,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,CAAA;QAC7C,CAAC;QACD,IAAI,YAAY,KAAK,SAAS,EAAE,CAAC;YAC/B,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,YAAY,CAAC,CAAA;QAC5C,CAAC;QAED,MAAM,SAAS,GAAG,IAAI,CAAC,SAAS,CAAA;QAChC,IAAI,SAAS,KAAK,IAAI,EAAE,CAAC;YACvB,OAAO,SAAS,CAAC,WAAW,CAAC,CAAA;YAC7B,IAAI,CAAC,SAAS,GAAG,SAAS,CAAA;QAC5B,CAAC;QAED,IAAI,CAAC,SAAS,GAAG,IAAI,CAAA;QAErB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAGjD,SAAS,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC;IAEM,cAAc,CAAC,IAAY,EAAE,QAAkB;QACpD,MAAM,aAAa,GAA2B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAA;QACnE,IAAI,aAAa,KAAK,SAAS,EAAE,CAAC;YAChC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBACrD,IAAI,aAAa,CAAC,CAAC,CAAC,KAAK,QAAQ,EAAE,CAAC;oBAClC,aAAa,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;oBAC1B,MAAK;gBACP,CAAC;YACH,CAAC;QACH,CAAC;IACH,CAAC;IAEM,MAAM,CACX,KAAY,EACZ,KAAa;QAKb,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,EAAE,KAAK,CAAC,CAAA;QACvC,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,CAAA;QACpC,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,GAAG,CAAC,CAAA;QACrC,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,CAAA;QACrB,IAAI,GAAW,CAAA;QAEf,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;YAClB,IAAI,IAAI,SAAS,CAAA;YACjB,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC,MAAM,GAAG,CAAC,CAAA;QACtC,CAAC;aAAM,CAAC;YACN,GAAG,GAAG,KAAK,CAAC,GAAG,GAAG,KAAK,CAAA;QACzB,CAAC;QAED,OAAO;YACL,IAAI,EAAE,IAAI;YACV,GAAG,EAAE,GAAG;SACT,CAAA;IACH,CAAC;IAEM,WAAW,CAAC,QAAgB;QAGjC,MAAM,QAAQ,GAA+B,EAAE,CAAA;QAC/C,IAAI,IAAU,CAAA;QAEd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAChD,IAAI,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAA;YAClB,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,KAAK,CAAA;QAClC,CAAC;QAED,OAAO,QAAQ,CAAA;IACjB,CAAC;CACF;AA9SD,6BA8SC"} \ No newline at end of file diff --git a/src/core/htmlparser.ts b/src/core/htmlparser.ts index 5dcf18a56..0b11bbb0d 100644 --- a/src/core/htmlparser.ts +++ b/src/core/htmlparser.ts @@ -54,7 +54,7 @@ export default class HTMLParser { const regTag = // eslint-disable-next-line no-control-regex - /<(?:\/([^\s>]+)\s*|!--([\s\S]*?)--|!([^>]*?)|([\w\-:]+)((?:\s+[^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s"'>]*))?)*?)\s*(\/?))>/g + /<(?:\/([^\s>]+)\s*|!--([\s\S]*?)--|!([^>]*?)|([\w\-:]+)((?:(?:\s+|(?<=["']))[^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s"'>]*))?)*?)\s*(\/?))>/g const regAttr = // eslint-disable-next-line no-control-regex /\s*([^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+)(?:\s*=\s*(?:(")([^"]*)"|(')([^']*)'|([^\s"'>]*)))?/g diff --git a/test/htmlparser.spec.js b/test/htmlparser.spec.js index 77d9755d8..03e53990c 100644 --- a/test/htmlparser.spec.js +++ b/test/htmlparser.spec.js @@ -654,4 +654,44 @@ describe('HTMLParser: Case parse', () => { }) parser.parse('/') }) + + it('should parse attributes without whitespace between quoted values', (done) => { + const parser = new HTMLParser() + const arrEvents = [] + getAllEvents(parser, arrEvents, () => { + expect(arrEvents[1]).toEvent('tagstart', { + tagName: 'div', + close: '', + }) + const attrs = arrEvents[1].attrs + expect(attrs.length).toBe(2) + expect(attrs[0].name).toBe('id') + expect(attrs[0].value).toBe('abc') + expect(attrs[1].name).toBe('class') + expect(attrs[1].value).toBe('def') + expect(arrEvents[3]).toEvent('tagend', { + tagName: 'div', + }) + done() + }) + parser.parse('
test
') + }) + + it('should parse single quoted attributes without whitespace between values', (done) => { + const parser = new HTMLParser() + const arrEvents = [] + getAllEvents(parser, arrEvents, () => { + expect(arrEvents[1]).toEvent('tagstart', { + tagName: 'div', + }) + const attrs = arrEvents[1].attrs + expect(attrs.length).toBe(2) + expect(attrs[0].name).toBe('id') + expect(attrs[0].value).toBe('abc') + expect(attrs[1].name).toBe('class') + expect(attrs[1].value).toBe('def') + done() + }) + parser.parse("
test
") + }) }) diff --git a/test/rules/tag-pair.spec.js b/test/rules/tag-pair.spec.js index a86bdc327..de75818a9 100644 --- a/test/rules/tag-pair.spec.js +++ b/test/rules/tag-pair.spec.js @@ -35,6 +35,12 @@ describe(`Rules: ${ruleId}`, () => { expect(messages[0].col).toBe(3) }) + it('Attributes without whitespace between quoted values should still pair', () => { + const code = '
test
' + const messages = HTMLHint.verify(code, ruleOptions) + expect(messages.length).toBe(0) + }) + it('No start tag should result in an error', () => { const code = '' const messages = HTMLHint.verify(code, ruleOptions) From 6f24811465fb0fcace10a3e52148e2e72470513d Mon Sep 17 00:00:00 2001 From: draarivpatel-ui <287273626+draarivpatel-ui@users.noreply.github.com> Date: Wed, 11 Nov 2026 00:59:45 -0600 Subject: [PATCH 2/3] fix(parser): eliminate regTag backtracking and align --!> comment parsing --- dist/core/htmlparser.js | 12 ++-- src/core/htmlparser.ts | 9 +-- test/htmlparser.spec.js | 96 ++++++++++++++++++++++++++++++++ test/rules/doctype-html5.spec.js | 6 ++ 4 files changed, 114 insertions(+), 9 deletions(-) diff --git a/dist/core/htmlparser.js b/dist/core/htmlparser.js index d300d2ec2..f37a8b18f 100644 --- a/dist/core/htmlparser.js +++ b/dist/core/htmlparser.js @@ -16,8 +16,9 @@ class HTMLParser { return obj; } parse(html) { + var _a; const mapCdataTags = this._mapCdataTags; - const regTag = /<(?:\/([^\s>]+)\s*|!--([\s\S]*?)--|!([^>]*?)|([\w\-:]+)((?:(?:\s+|(?<=["']))[^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s"'>]*))?)*?)\s*(\/?))>/g; + const regTag = /<(?:\/([^\s>]+)\s*|!--(?:-?|([\s\S]*?)--!?)|!([^>]*?)|([\w\-:]+)((?:(?:\s+|(?<=["']))[^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s"'>]+))?)*(?:(?:\s+|(?<=["']))[^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+\s*=\s*)?)\s*(\/?))>/g; const regAttr = /\s*([^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+)(?:\s*=\s*(?:(")([^"]*)"|(')([^']*)'|([^\s"'>]*)))?/g; const regLine = /\r?\n/g; let match; @@ -140,10 +141,11 @@ class HTMLParser { saveBlock('text', match[0], matchIndex); } } - else if (match[2] || match[3]) { + else if (match[3] === undefined || match[3]) { + const isLongComment = match[3] === undefined; saveBlock('comment', match[0], matchIndex, { - content: match[2] || match[3], - long: match[2] ? true : false, + content: isLongComment ? ((_a = match[2]) !== null && _a !== void 0 ? _a : '') : match[3], + long: isLongComment, }); } } @@ -234,4 +236,4 @@ class HTMLParser { } } exports.default = HTMLParser; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"htmlparser.js","sourceRoot":"","sources":["../../src/core/htmlparser.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"htmlparser.js","sourceRoot":"","sources":["../../src/core/htmlparser.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/core/htmlparser.ts b/src/core/htmlparser.ts index 0b11bbb0d..b11c806e5 100644 --- a/src/core/htmlparser.ts +++ b/src/core/htmlparser.ts @@ -54,7 +54,7 @@ export default class HTMLParser { const regTag = // eslint-disable-next-line no-control-regex - /<(?:\/([^\s>]+)\s*|!--([\s\S]*?)--|!([^>]*?)|([\w\-:]+)((?:(?:\s+|(?<=["']))[^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s"'>]*))?)*?)\s*(\/?))>/g + /<(?:\/([^\s>]+)\s*|!--(?:-?|([\s\S]*?)--!?)|!([^>]*?)|([\w\-:]+)((?:(?:\s+|(?<=["']))[^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s"'>]+))?)*(?:(?:\s+|(?<=["']))[^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+\s*=\s*)?)\s*(\/?))>/g const regAttr = // eslint-disable-next-line no-control-regex /\s*([^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+)(?:\s*=\s*(?:(")([^"]*)"|(')([^']*)'|([^\s"'>]*)))?/g @@ -204,11 +204,12 @@ export default class HTMLParser { // If a miss match occurs, the current content is matched to text saveBlock('text', match[0], matchIndex) } - } else if (match[2] || match[3]) { + } else if (match[3] === undefined || match[3]) { // Comment tag + const isLongComment = match[3] === undefined saveBlock('comment', match[0], matchIndex, { - content: match[2] || match[3], - long: match[2] ? true : false, + content: isLongComment ? (match[2] ?? '') : match[3], + long: isLongComment, }) } } diff --git a/test/htmlparser.spec.js b/test/htmlparser.spec.js index 03e53990c..7c69fc4b6 100644 --- a/test/htmlparser.spec.js +++ b/test/htmlparser.spec.js @@ -694,4 +694,100 @@ describe('HTMLParser: Case parse', () => { }) parser.parse("
test
") }) + + it('should parse comment ending with --!> as long comment', (done) => { + const parser = new HTMLParser() + const arrEvents = [] + getAllEvents(parser, arrEvents, () => { + expect(arrEvents[1]).toEvent('comment', { + content: 'comment\r\ntest', + long: true, + }) + done() + }) + parser.parse('') + }) + + it('should parse empty comment ending with --!> as long comment', (done) => { + const parser = new HTMLParser() + const arrEvents = [] + getAllEvents(parser, arrEvents, () => { + expect(arrEvents[1]).toEvent('comment', { + content: '', + long: true, + raw: '', + }) + done() + }) + parser.parse('') + }) + + it('should not swallow elements after abruptly closed comments', (done) => { + const parser = new HTMLParser() + const arrEvents = [] + getAllEvents(parser, arrEvents, () => { + expect(arrEvents[1]).toEvent('comment', { + content: '', + long: true, + raw: '', + }) + expect(arrEvents[2]).toEvent('tagstart', { + tagName: 'div', + }) + expect(arrEvents[3]).toEvent('comment', { + content: '', + long: true, + raw: '', + }) + expect(arrEvents[4]).toEvent('tagstart', { + tagName: 'span', + }) + expect(arrEvents[5]).toEvent('comment', { + content: 'x', + long: true, + raw: '', + }) + expect(arrEvents[6]).toEvent('comment', { + content: '--unfinished', + long: false, + raw: '
before html5 doctype should not result in an error', () => { + const code = '' + const messages = HTMLHint.verify(code, ruleOptions) + expect(messages.length).toBe(0) + }) }) From 73ed35ada9f45510632b9b1a12f5d796c28ec4aa Mon Sep 17 00:00:00 2001 From: draarivpatel-ui <287273626+draarivpatel-ui@users.noreply.github.com> Date: Wed, 11 Nov 2026 09:25:09 -0600 Subject: [PATCH 3/3] fix(parser): replace polynomial regex in start-tag and attr scanning --- dist/core/htmlparser.js | 480 ++++++++++++++++++++++++++----- src/core/htmlparser.ts | 542 +++++++++++++++++++++++++++++++----- test/htmlparser.spec.js | 31 +++ test/rules/tag-pair.spec.js | 6 + 4 files changed, 916 insertions(+), 143 deletions(-) diff --git a/dist/core/htmlparser.js b/dist/core/htmlparser.js index f37a8b18f..d5c392593 100644 --- a/dist/core/htmlparser.js +++ b/dist/core/htmlparser.js @@ -1,5 +1,32 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); +const isSpace = (code) => code === 0x20 || + (code >= 0x09 && code <= 0x0d) || + code === 0x00a0 || + code === 0x1680 || + (code >= 0x2000 && code <= 0x200a) || + code === 0x2028 || + code === 0x2029 || + code === 0x202f || + code === 0x205f || + code === 0x3000 || + code === 0xfeff; +const isTagNameChar = (code) => (code >= 0x61 && code <= 0x7a) || + (code >= 0x41 && code <= 0x5a) || + (code >= 0x30 && code <= 0x39) || + code === 0x5f || + code === 0x2d || + code === 0x3a; +const isAttrNameChar = (code) => !isSpace(code) && + code !== 0x22 && + code !== 0x27 && + code !== 0x3e && + code !== 0x2f && + code !== 0x3d && + code > 0x0f && + code !== 0x7f && + (code < 0x80 || code > 0x9f); +const isUnquotedAttrValueChar = (code) => !isSpace(code) && code !== 0x22 && code !== 0x27 && code !== 0x3e; class HTMLParser { constructor() { this._listeners = {}; @@ -16,16 +43,11 @@ class HTMLParser { return obj; } parse(html) { - var _a; const mapCdataTags = this._mapCdataTags; - const regTag = /<(?:\/([^\s>]+)\s*|!--(?:-?|([\s\S]*?)--!?)|!([^>]*?)|([\w\-:]+)((?:(?:\s+|(?<=["']))[^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s"'>]+))?)*(?:(?:\s+|(?<=["']))[^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+\s*=\s*)?)\s*(\/?))>/g; - const regAttr = /\s*([^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+)(?:\s*=\s*(?:(")([^"]*)"|(')([^']*)'|([^\s"'>]*)))?/g; - const regLine = /\r?\n/g; - let match; - let matchIndex; + const htmlLen = html.length; let lastIndex = 0; - let tagName; - let arrAttrs; + let tagName = ''; + let arrAttrs = []; let tagCDATA = null; let attrsCDATA; let arrCDATA = []; @@ -57,13 +79,364 @@ class HTMLParser { data.col = col; arrBlocks.push(data); this.fire(type, data); - while (regLine.exec(raw)) { + let nlIndex = raw.indexOf('\n'); + while (nlIndex !== -1) { line++; - lastLineIndex = pos + regLine.lastIndex; + lastLineIndex = pos + nlIndex + 1; + nlIndex = raw.indexOf('\n', nlIndex + 1); } }; - while ((match = regTag.exec(html))) { - matchIndex = match.index; + let gtPos = -1; + const nextGt = (from) => { + if (gtPos < from) { + const found = html.indexOf('>', from); + gtPos = found === -1 ? htmlLen : found; + } + return gtPos; + }; + let endTagP = -1; + let endTagQ = -1; + const scanEndTag = (from) => { + if (endTagP < from) { + let p = from; + while (p < htmlLen) { + const c = html.charCodeAt(p); + if (c === 0x3e || isSpace(c)) { + break; + } + p++; + } + let q = p; + while (q < htmlLen && isSpace(html.charCodeAt(q))) { + q++; + } + endTagP = p; + endTagQ = q; + } + if (endTagP > from && + endTagQ < htmlLen && + html.charCodeAt(endTagQ) === 0x3e) { + return endTagQ + 1; + } + return -1; + }; + let commentCloseK = -1; + let commentCloseEnd = htmlLen; + const findCommentClose = (from) => { + if (commentCloseK < from) { + let k = from; + while (true) { + const dash = html.indexOf('--', k); + if (dash === -1 || dash + 2 >= htmlLen) { + commentCloseK = htmlLen; + commentCloseEnd = htmlLen; + break; + } + const c2 = html.charCodeAt(dash + 2); + if (c2 === 0x3e) { + commentCloseK = dash; + commentCloseEnd = dash + 3; + break; + } + if (c2 === 0x21 && + dash + 3 < htmlLen && + html.charCodeAt(dash + 3) === 0x3e) { + commentCloseK = dash; + commentCloseEnd = dash + 4; + break; + } + k = dash + 1; + } + } + return commentCloseK; + }; + let failedStates = null; + let noDoubleQuoteFrom = htmlLen + 1; + let noSingleQuoteFrom = htmlLen + 1; + const dfsStack = []; + let spanAttrsEnd = 0; + let spanClose = ''; + const markFailedState = (state) => { + if (failedStates === null) { + failedStates = new Uint8Array(Math.ceil((htmlLen * 3 + 3) / 8)); + } + failedStates[state >>> 3] |= 1 << (state & 7); + }; + const findStartTagSpan = (tagNameEnd) => { + dfsStack.length = 0; + dfsStack.push(tagNameEnd * 3); + while (dfsStack.length > 0) { + const item = dfsStack.pop(); + if (item < 0) { + markFailedState(~item); + continue; + } + if (failedStates !== null && + (failedStates[item >>> 3] & (1 << (item & 7))) !== 0) { + continue; + } + const role = item % 3; + const cursor = (item - role) / 3; + let wsEnd = cursor; + if (role !== 2) { + while (wsEnd < htmlLen && isSpace(html.charCodeAt(wsEnd))) { + wsEnd++; + } + if (wsEnd >= htmlLen) { + markFailedState(item); + continue; + } + const ch = html.charCodeAt(wsEnd); + if (ch === 0x3e) { + spanAttrsEnd = cursor; + spanClose = ''; + return wsEnd + 1; + } + if (ch === 0x2f && + wsEnd + 1 < htmlLen && + html.charCodeAt(wsEnd + 1) === 0x3e) { + spanAttrsEnd = cursor; + spanClose = '/'; + return wsEnd + 2; + } + const hasSep = wsEnd > cursor || role === 1; + if (!hasSep || !isAttrNameChar(ch)) { + markFailedState(item); + continue; + } + } + let nameEnd = wsEnd + 1; + while (nameEnd < htmlLen && isAttrNameChar(html.charCodeAt(nameEnd))) { + nameEnd++; + } + let eqPos = nameEnd; + while (eqPos < htmlLen && isSpace(html.charCodeAt(eqPos))) { + eqPos++; + } + if (eqPos >= htmlLen || html.charCodeAt(eqPos) !== 0x3d) { + dfsStack.push(~item); + dfsStack.push(nameEnd * 3); + continue; + } + let valStart = eqPos + 1; + while (valStart < htmlLen && isSpace(html.charCodeAt(valStart))) { + valStart++; + } + if (valStart >= htmlLen) { + markFailedState(item); + continue; + } + const vch = html.charCodeAt(valStart); + if (vch === 0x3e) { + spanAttrsEnd = valStart; + spanClose = ''; + return valStart + 1; + } + if (vch === 0x22) { + if (valStart + 1 >= noDoubleQuoteFrom) { + markFailedState(item); + continue; + } + const closeQuote = html.indexOf('"', valStart + 1); + if (closeQuote === -1) { + noDoubleQuoteFrom = valStart + 1; + markFailedState(item); + continue; + } + dfsStack.push(~item); + dfsStack.push((closeQuote + 1) * 3 + 1); + continue; + } + if (vch === 0x27) { + if (valStart + 1 >= noSingleQuoteFrom) { + markFailedState(item); + continue; + } + const closeQuote = html.indexOf("'", valStart + 1); + if (closeQuote === -1) { + noSingleQuoteFrom = valStart + 1; + markFailedState(item); + continue; + } + dfsStack.push(~item); + dfsStack.push((closeQuote + 1) * 3 + 1); + continue; + } + let valEnd = valStart + 1; + while (valEnd < htmlLen && + isUnquotedAttrValueChar(html.charCodeAt(valEnd))) { + valEnd++; + } + dfsStack.push(~item); + if (valStart > eqPos + 1 && isAttrNameChar(vch)) { + dfsStack.push(valStart * 3 + 2); + } + dfsStack.push(valEnd * 3); + } + return -1; + }; + const parseAttrs = (tagNameEnd, attrsEnd) => { + arrAttrs = []; + let cursor = tagNameEnd; + while (cursor < attrsEnd) { + let wsEnd = cursor; + while (wsEnd < attrsEnd && isSpace(html.charCodeAt(wsEnd))) { + wsEnd++; + } + if (wsEnd >= attrsEnd || !isAttrNameChar(html.charCodeAt(wsEnd))) { + return false; + } + let nameEnd = wsEnd + 1; + while (nameEnd < attrsEnd && isAttrNameChar(html.charCodeAt(nameEnd))) { + nameEnd++; + } + const attrName = html.slice(wsEnd, nameEnd); + let eqPos = nameEnd; + while (eqPos < attrsEnd && isSpace(html.charCodeAt(eqPos))) { + eqPos++; + } + if (eqPos >= attrsEnd || html.charCodeAt(eqPos) !== 0x3d) { + arrAttrs.push({ + name: attrName, + value: '', + quote: '', + index: cursor - tagNameEnd, + raw: html.slice(cursor, nameEnd), + }); + cursor = nameEnd; + continue; + } + let valStart = eqPos + 1; + while (valStart < attrsEnd && isSpace(html.charCodeAt(valStart))) { + valStart++; + } + if (valStart < attrsEnd && html.charCodeAt(valStart) === 0x22) { + const closeQuote = html.indexOf('"', valStart + 1); + if (closeQuote === -1 || closeQuote >= attrsEnd) { + return false; + } + arrAttrs.push({ + name: attrName, + value: html.slice(valStart + 1, closeQuote), + quote: '"', + index: cursor - tagNameEnd, + raw: html.slice(cursor, closeQuote + 1), + }); + cursor = closeQuote + 1; + continue; + } + if (valStart < attrsEnd && html.charCodeAt(valStart) === 0x27) { + const closeQuote = html.indexOf("'", valStart + 1); + if (closeQuote === -1 || closeQuote >= attrsEnd) { + return false; + } + arrAttrs.push({ + name: attrName, + value: html.slice(valStart + 1, closeQuote), + quote: "'", + index: cursor - tagNameEnd, + raw: html.slice(cursor, closeQuote + 1), + }); + cursor = closeQuote + 1; + continue; + } + let valEnd = valStart; + while (valEnd < attrsEnd && + isUnquotedAttrValueChar(html.charCodeAt(valEnd))) { + valEnd++; + } + arrAttrs.push({ + name: attrName, + value: html.slice(valStart, valEnd), + quote: '', + index: cursor - tagNameEnd, + raw: html.slice(cursor, valEnd), + }); + cursor = valEnd; + } + return true; + }; + let searchIndex = 0; + while (searchIndex < htmlLen) { + const matchIndex = html.indexOf('<', searchIndex); + if (matchIndex === -1 || matchIndex + 1 >= htmlLen) { + break; + } + if (nextGt(matchIndex + 1) === htmlLen) { + break; + } + const nextCode = html.charCodeAt(matchIndex + 1); + let matchEnd = -1; + let matchedKind = null; + let commentContent = ''; + let isLongComment = false; + let startTagNameEnd = 0; + if (nextCode === 0x2f) { + const endPos = scanEndTag(matchIndex + 2); + if (endPos !== -1) { + tagName = html.slice(matchIndex + 2, endTagP); + matchEnd = endPos; + matchedKind = 'end'; + } + } + else if (nextCode === 0x21) { + if (matchIndex + 3 < htmlLen && + html.charCodeAt(matchIndex + 2) === 0x2d && + html.charCodeAt(matchIndex + 3) === 0x2d) { + const afterOpen = matchIndex + 4; + if (afterOpen < htmlLen && html.charCodeAt(afterOpen) === 0x3e) { + matchEnd = afterOpen + 1; + commentContent = ''; + isLongComment = true; + matchedKind = 'comment'; + } + else if (afterOpen + 1 < htmlLen && + html.charCodeAt(afterOpen) === 0x2d && + html.charCodeAt(afterOpen + 1) === 0x3e) { + matchEnd = afterOpen + 2; + commentContent = ''; + isLongComment = true; + matchedKind = 'comment'; + } + else { + const closeK = findCommentClose(afterOpen); + if (closeK < htmlLen) { + matchEnd = commentCloseEnd; + commentContent = html.slice(afterOpen, closeK); + isLongComment = true; + matchedKind = 'comment'; + } + } + } + if (matchedKind === null) { + const closeGt = nextGt(matchIndex + 2); + if (closeGt < htmlLen) { + matchEnd = closeGt + 1; + commentContent = html.slice(matchIndex + 2, closeGt); + isLongComment = false; + matchedKind = 'comment'; + } + } + } + else if (isTagNameChar(nextCode)) { + let tagNameEnd = matchIndex + 2; + while (tagNameEnd < htmlLen && + isTagNameChar(html.charCodeAt(tagNameEnd))) { + tagNameEnd++; + } + const endPos = findStartTagSpan(tagNameEnd); + if (endPos !== -1) { + tagName = html.slice(matchIndex + 1, tagNameEnd); + startTagNameEnd = tagNameEnd; + matchEnd = endPos; + matchedKind = 'start'; + } + } + if (matchedKind === null) { + searchIndex = matchIndex + 1; + continue; + } + const rawMatch = html.slice(matchIndex, matchEnd); if (matchIndex > lastIndex) { text = html.substring(lastIndex, matchIndex); if (tagCDATA) { @@ -73,8 +446,9 @@ class HTMLParser { saveBlock('text', text, lastIndex); } } - lastIndex = regTag.lastIndex; - if ((tagName = match[1])) { + lastIndex = matchEnd; + searchIndex = matchEnd; + if (matchedKind === 'end') { if (tagCDATA && tagName === tagCDATA) { text = arrCDATA.join(''); saveBlock('cdata', text, lastCDATAIndex, { @@ -86,69 +460,39 @@ class HTMLParser { arrCDATA = []; } if (!tagCDATA) { - saveBlock('tagend', match[0], matchIndex, { + saveBlock('tagend', rawMatch, matchIndex, { tagName: tagName, }); continue; } } if (tagCDATA) { - arrCDATA.push(match[0]); - } - else { - if ((tagName = match[4])) { - arrAttrs = []; - const attrs = match[5]; - let attrMatch; - let attrMatchCount = 0; - while ((attrMatch = regAttr.exec(attrs))) { - const name = attrMatch[1]; - const quote = attrMatch[2] - ? attrMatch[2] - : attrMatch[4] - ? attrMatch[4] - : ''; - const value = attrMatch[3] - ? attrMatch[3] - : attrMatch[5] - ? attrMatch[5] - : attrMatch[6] - ? attrMatch[6] - : ''; - arrAttrs.push({ - name: name, - value: value, - quote: quote, - index: attrMatch.index, - raw: attrMatch[0], - }); - attrMatchCount += attrMatch[0].length; - } - if (attrMatchCount === attrs.length) { - saveBlock('tagstart', match[0], matchIndex, { - tagName: tagName, - attrs: arrAttrs, - close: match[6], - }); - if (isMapCdataTagsRequired()) { - tagCDATA = tagName; - attrsCDATA = arrAttrs.concat(); - arrCDATA = []; - lastCDATAIndex = lastIndex; - } - } - else { - saveBlock('text', match[0], matchIndex); + arrCDATA.push(rawMatch); + } + else if (matchedKind === 'start') { + if (parseAttrs(startTagNameEnd, spanAttrsEnd)) { + saveBlock('tagstart', rawMatch, matchIndex, { + tagName: tagName, + attrs: arrAttrs, + close: spanClose, + }); + if (isMapCdataTagsRequired()) { + tagCDATA = tagName; + attrsCDATA = arrAttrs.concat(); + arrCDATA = []; + lastCDATAIndex = lastIndex; } } - else if (match[3] === undefined || match[3]) { - const isLongComment = match[3] === undefined; - saveBlock('comment', match[0], matchIndex, { - content: isLongComment ? ((_a = match[2]) !== null && _a !== void 0 ? _a : '') : match[3], - long: isLongComment, - }); + else { + saveBlock('text', rawMatch, matchIndex); } } + else if (isLongComment || commentContent) { + saveBlock('comment', rawMatch, matchIndex, { + content: commentContent, + long: isLongComment, + }); + } } if (html.length > lastIndex) { text = html.substring(lastIndex, html.length); @@ -236,4 +580,4 @@ class HTMLParser { } } exports.default = HTMLParser; -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"htmlparser.js","sourceRoot":"","sources":["../../src/core/htmlparser.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"htmlparser.js","sourceRoot":"","sources":["../../src/core/htmlparser.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/core/htmlparser.ts b/src/core/htmlparser.ts index b11c806e5..5ac534553 100644 --- a/src/core/htmlparser.ts +++ b/src/core/htmlparser.ts @@ -22,6 +22,41 @@ export interface Block { export type Listener = (event: Block) => void +const isSpace = (code: number): boolean => + code === 0x20 || + (code >= 0x09 && code <= 0x0d) || + code === 0x00a0 || + code === 0x1680 || + (code >= 0x2000 && code <= 0x200a) || + code === 0x2028 || + code === 0x2029 || + code === 0x202f || + code === 0x205f || + code === 0x3000 || + code === 0xfeff + +const isTagNameChar = (code: number): boolean => + (code >= 0x61 && code <= 0x7a) || + (code >= 0x41 && code <= 0x5a) || + (code >= 0x30 && code <= 0x39) || + code === 0x5f || + code === 0x2d || + code === 0x3a + +const isAttrNameChar = (code: number): boolean => + !isSpace(code) && + code !== 0x22 && + code !== 0x27 && + code !== 0x3e && + code !== 0x2f && + code !== 0x3d && + code > 0x0f && + code !== 0x7f && + (code < 0x80 || code > 0x9f) + +const isUnquotedAttrValueChar = (code: number): boolean => + !isSpace(code) && code !== 0x22 && code !== 0x27 && code !== 0x3e + export default class HTMLParser { public lastEvent: Partial | null @@ -51,20 +86,11 @@ export default class HTMLParser { public parse(html: string): void { const mapCdataTags = this._mapCdataTags + const htmlLen = html.length - const regTag = - // eslint-disable-next-line no-control-regex - /<(?:\/([^\s>]+)\s*|!--(?:-?|([\s\S]*?)--!?)|!([^>]*?)|([\w\-:]+)((?:(?:\s+|(?<=["']))[^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+(?:\s*=\s*(?:"[^"]*"|'[^']*'|[^\s"'>]+))?)*(?:(?:\s+|(?<=["']))[^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+\s*=\s*)?)\s*(\/?))>/g - const regAttr = - // eslint-disable-next-line no-control-regex - /\s*([^\s"'>\/=\x00-\x0F\x7F\x80-\x9F]+)(?:\s*=\s*(?:(")([^"]*)"|(')([^']*)'|([^\s"'>]*)))?/g - const regLine = /\r?\n/g - - let match: RegExpExecArray | null - let matchIndex: number let lastIndex = 0 - let tagName: string - let arrAttrs: Attr[] + let tagName = '' + let arrAttrs: Attr[] = [] let tagCDATA: string | null = null let attrsCDATA: Attr[] | undefined let arrCDATA: string[] = [] @@ -110,14 +136,414 @@ export default class HTMLParser { arrBlocks.push(data) this.fire(type, data) - while (regLine.exec(raw)) { + let nlIndex = raw.indexOf('\n') + while (nlIndex !== -1) { line++ - lastLineIndex = pos + regLine.lastIndex + lastLineIndex = pos + nlIndex + 1 + nlIndex = raw.indexOf('\n', nlIndex + 1) + } + } + + let gtPos = -1 + const nextGt = (from: number): number => { + if (gtPos < from) { + const found = html.indexOf('>', from) + gtPos = found === -1 ? htmlLen : found + } + return gtPos + } + + let endTagP = -1 + let endTagQ = -1 + const scanEndTag = (from: number): number => { + if (endTagP < from) { + let p = from + while (p < htmlLen) { + const c = html.charCodeAt(p) + if (c === 0x3e || isSpace(c)) { + break + } + p++ + } + let q = p + while (q < htmlLen && isSpace(html.charCodeAt(q))) { + q++ + } + endTagP = p + endTagQ = q + } + if ( + endTagP > from && + endTagQ < htmlLen && + html.charCodeAt(endTagQ) === 0x3e + ) { + return endTagQ + 1 } + return -1 } - while ((match = regTag.exec(html))) { - matchIndex = match.index + let commentCloseK = -1 + let commentCloseEnd = htmlLen + const findCommentClose = (from: number): number => { + if (commentCloseK < from) { + let k = from + while (true) { + const dash = html.indexOf('--', k) + if (dash === -1 || dash + 2 >= htmlLen) { + commentCloseK = htmlLen + commentCloseEnd = htmlLen + break + } + const c2 = html.charCodeAt(dash + 2) + if (c2 === 0x3e) { + commentCloseK = dash + commentCloseEnd = dash + 3 + break + } + if ( + c2 === 0x21 && + dash + 3 < htmlLen && + html.charCodeAt(dash + 3) === 0x3e + ) { + commentCloseK = dash + commentCloseEnd = dash + 4 + break + } + k = dash + 1 + } + } + return commentCloseK + } + + let failedStates: Uint8Array | null = null + let noDoubleQuoteFrom = htmlLen + 1 + let noSingleQuoteFrom = htmlLen + 1 + const dfsStack: number[] = [] + let spanAttrsEnd = 0 + let spanClose = '' + + const markFailedState = (state: number) => { + if (failedStates === null) { + failedStates = new Uint8Array(Math.ceil((htmlLen * 3 + 3) / 8)) + } + failedStates[state >>> 3] |= 1 << (state & 7) + } + + const findStartTagSpan = (tagNameEnd: number): number => { + dfsStack.length = 0 + dfsStack.push(tagNameEnd * 3) + + while (dfsStack.length > 0) { + const item = dfsStack.pop()! + if (item < 0) { + markFailedState(~item) + continue + } + + if ( + failedStates !== null && + (failedStates[item >>> 3] & (1 << (item & 7))) !== 0 + ) { + continue + } + + const role = item % 3 + const cursor = (item - role) / 3 + let wsEnd = cursor + + if (role !== 2) { + while (wsEnd < htmlLen && isSpace(html.charCodeAt(wsEnd))) { + wsEnd++ + } + if (wsEnd >= htmlLen) { + markFailedState(item) + continue + } + + const ch = html.charCodeAt(wsEnd) + if (ch === 0x3e) { + spanAttrsEnd = cursor + spanClose = '' + return wsEnd + 1 + } + if ( + ch === 0x2f && + wsEnd + 1 < htmlLen && + html.charCodeAt(wsEnd + 1) === 0x3e + ) { + spanAttrsEnd = cursor + spanClose = '/' + return wsEnd + 2 + } + + const hasSep = wsEnd > cursor || role === 1 + if (!hasSep || !isAttrNameChar(ch)) { + markFailedState(item) + continue + } + } + + let nameEnd = wsEnd + 1 + while (nameEnd < htmlLen && isAttrNameChar(html.charCodeAt(nameEnd))) { + nameEnd++ + } + + let eqPos = nameEnd + while (eqPos < htmlLen && isSpace(html.charCodeAt(eqPos))) { + eqPos++ + } + if (eqPos >= htmlLen || html.charCodeAt(eqPos) !== 0x3d) { + dfsStack.push(~item) + dfsStack.push(nameEnd * 3) + continue + } + + let valStart = eqPos + 1 + while (valStart < htmlLen && isSpace(html.charCodeAt(valStart))) { + valStart++ + } + if (valStart >= htmlLen) { + markFailedState(item) + continue + } + + const vch = html.charCodeAt(valStart) + if (vch === 0x3e) { + spanAttrsEnd = valStart + spanClose = '' + return valStart + 1 + } + + if (vch === 0x22) { + if (valStart + 1 >= noDoubleQuoteFrom) { + markFailedState(item) + continue + } + const closeQuote = html.indexOf('"', valStart + 1) + if (closeQuote === -1) { + noDoubleQuoteFrom = valStart + 1 + markFailedState(item) + continue + } + dfsStack.push(~item) + dfsStack.push((closeQuote + 1) * 3 + 1) + continue + } + + if (vch === 0x27) { + if (valStart + 1 >= noSingleQuoteFrom) { + markFailedState(item) + continue + } + const closeQuote = html.indexOf("'", valStart + 1) + if (closeQuote === -1) { + noSingleQuoteFrom = valStart + 1 + markFailedState(item) + continue + } + dfsStack.push(~item) + dfsStack.push((closeQuote + 1) * 3 + 1) + continue + } + + let valEnd = valStart + 1 + while ( + valEnd < htmlLen && + isUnquotedAttrValueChar(html.charCodeAt(valEnd)) + ) { + valEnd++ + } + + dfsStack.push(~item) + if (valStart > eqPos + 1 && isAttrNameChar(vch)) { + dfsStack.push(valStart * 3 + 2) + } + dfsStack.push(valEnd * 3) + } + + return -1 + } + + const parseAttrs = (tagNameEnd: number, attrsEnd: number): boolean => { + arrAttrs = [] + let cursor = tagNameEnd + + while (cursor < attrsEnd) { + let wsEnd = cursor + while (wsEnd < attrsEnd && isSpace(html.charCodeAt(wsEnd))) { + wsEnd++ + } + if (wsEnd >= attrsEnd || !isAttrNameChar(html.charCodeAt(wsEnd))) { + return false + } + + let nameEnd = wsEnd + 1 + while (nameEnd < attrsEnd && isAttrNameChar(html.charCodeAt(nameEnd))) { + nameEnd++ + } + const attrName = html.slice(wsEnd, nameEnd) + + let eqPos = nameEnd + while (eqPos < attrsEnd && isSpace(html.charCodeAt(eqPos))) { + eqPos++ + } + if (eqPos >= attrsEnd || html.charCodeAt(eqPos) !== 0x3d) { + arrAttrs.push({ + name: attrName, + value: '', + quote: '', + index: cursor - tagNameEnd, + raw: html.slice(cursor, nameEnd), + }) + cursor = nameEnd + continue + } + + let valStart = eqPos + 1 + while (valStart < attrsEnd && isSpace(html.charCodeAt(valStart))) { + valStart++ + } + + if (valStart < attrsEnd && html.charCodeAt(valStart) === 0x22) { + const closeQuote = html.indexOf('"', valStart + 1) + if (closeQuote === -1 || closeQuote >= attrsEnd) { + return false + } + arrAttrs.push({ + name: attrName, + value: html.slice(valStart + 1, closeQuote), + quote: '"', + index: cursor - tagNameEnd, + raw: html.slice(cursor, closeQuote + 1), + }) + cursor = closeQuote + 1 + continue + } + + if (valStart < attrsEnd && html.charCodeAt(valStart) === 0x27) { + const closeQuote = html.indexOf("'", valStart + 1) + if (closeQuote === -1 || closeQuote >= attrsEnd) { + return false + } + arrAttrs.push({ + name: attrName, + value: html.slice(valStart + 1, closeQuote), + quote: "'", + index: cursor - tagNameEnd, + raw: html.slice(cursor, closeQuote + 1), + }) + cursor = closeQuote + 1 + continue + } + + let valEnd = valStart + while ( + valEnd < attrsEnd && + isUnquotedAttrValueChar(html.charCodeAt(valEnd)) + ) { + valEnd++ + } + arrAttrs.push({ + name: attrName, + value: html.slice(valStart, valEnd), + quote: '', + index: cursor - tagNameEnd, + raw: html.slice(cursor, valEnd), + }) + cursor = valEnd + } + + return true + } + + let searchIndex = 0 + while (searchIndex < htmlLen) { + const matchIndex = html.indexOf('<', searchIndex) + if (matchIndex === -1 || matchIndex + 1 >= htmlLen) { + break + } + if (nextGt(matchIndex + 1) === htmlLen) { + break + } + + const nextCode = html.charCodeAt(matchIndex + 1) + let matchEnd = -1 + let matchedKind: 'end' | 'start' | 'comment' | null = null + let commentContent = '' + let isLongComment = false + let startTagNameEnd = 0 + + if (nextCode === 0x2f) { + const endPos = scanEndTag(matchIndex + 2) + if (endPos !== -1) { + tagName = html.slice(matchIndex + 2, endTagP) + matchEnd = endPos + matchedKind = 'end' + } + } else if (nextCode === 0x21) { + if ( + matchIndex + 3 < htmlLen && + html.charCodeAt(matchIndex + 2) === 0x2d && + html.charCodeAt(matchIndex + 3) === 0x2d + ) { + const afterOpen = matchIndex + 4 + if (afterOpen < htmlLen && html.charCodeAt(afterOpen) === 0x3e) { + matchEnd = afterOpen + 1 + commentContent = '' + isLongComment = true + matchedKind = 'comment' + } else if ( + afterOpen + 1 < htmlLen && + html.charCodeAt(afterOpen) === 0x2d && + html.charCodeAt(afterOpen + 1) === 0x3e + ) { + matchEnd = afterOpen + 2 + commentContent = '' + isLongComment = true + matchedKind = 'comment' + } else { + const closeK = findCommentClose(afterOpen) + if (closeK < htmlLen) { + matchEnd = commentCloseEnd + commentContent = html.slice(afterOpen, closeK) + isLongComment = true + matchedKind = 'comment' + } + } + } + + if (matchedKind === null) { + const closeGt = nextGt(matchIndex + 2) + if (closeGt < htmlLen) { + matchEnd = closeGt + 1 + commentContent = html.slice(matchIndex + 2, closeGt) + isLongComment = false + matchedKind = 'comment' + } + } + } else if (isTagNameChar(nextCode)) { + let tagNameEnd = matchIndex + 2 + while ( + tagNameEnd < htmlLen && + isTagNameChar(html.charCodeAt(tagNameEnd)) + ) { + tagNameEnd++ + } + const endPos = findStartTagSpan(tagNameEnd) + if (endPos !== -1) { + tagName = html.slice(matchIndex + 1, tagNameEnd) + startTagNameEnd = tagNameEnd + matchEnd = endPos + matchedKind = 'start' + } + } + + if (matchedKind === null) { + searchIndex = matchIndex + 1 + continue + } + + const rawMatch = html.slice(matchIndex, matchEnd) if (matchIndex > lastIndex) { // Save the previous text or CDATA text = html.substring(lastIndex, matchIndex) @@ -128,9 +554,10 @@ export default class HTMLParser { saveBlock('text', text, lastIndex) } } - lastIndex = regTag.lastIndex + lastIndex = matchEnd + searchIndex = matchEnd - if ((tagName = match[1])) { + if (matchedKind === 'end') { if (tagCDATA && tagName === tagCDATA) { // Output CDATA before closing the label text = arrCDATA.join('') @@ -145,7 +572,7 @@ export default class HTMLParser { if (!tagCDATA) { // End of label - saveBlock('tagend', match[0], matchIndex, { + saveBlock('tagend', rawMatch, matchIndex, { tagName: tagName, }) continue @@ -153,65 +580,30 @@ export default class HTMLParser { } if (tagCDATA) { - arrCDATA.push(match[0]) - } else { - if ((tagName = match[4])) { - // Label start - arrAttrs = [] - const attrs = match[5] - let attrMatch - let attrMatchCount = 0 - - while ((attrMatch = regAttr.exec(attrs))) { - const name = attrMatch[1] - const quote = attrMatch[2] - ? attrMatch[2] - : attrMatch[4] - ? attrMatch[4] - : '' - const value = attrMatch[3] - ? attrMatch[3] - : attrMatch[5] - ? attrMatch[5] - : attrMatch[6] - ? attrMatch[6] - : '' - - arrAttrs.push({ - name: name, - value: value, - quote: quote, - index: attrMatch.index, - raw: attrMatch[0], - }) - attrMatchCount += attrMatch[0].length - } + arrCDATA.push(rawMatch) + } else if (matchedKind === 'start') { + if (parseAttrs(startTagNameEnd, spanAttrsEnd)) { + saveBlock('tagstart', rawMatch, matchIndex, { + tagName: tagName, + attrs: arrAttrs, + close: spanClose, + }) - if (attrMatchCount === attrs.length) { - saveBlock('tagstart', match[0], matchIndex, { - tagName: tagName, - attrs: arrAttrs, - close: match[6], - }) - - if (isMapCdataTagsRequired()) { - tagCDATA = tagName - attrsCDATA = arrAttrs.concat() - arrCDATA = [] - lastCDATAIndex = lastIndex - } - } else { - // If a miss match occurs, the current content is matched to text - saveBlock('text', match[0], matchIndex) + if (isMapCdataTagsRequired()) { + tagCDATA = tagName + attrsCDATA = arrAttrs.concat() + arrCDATA = [] + lastCDATAIndex = lastIndex } - } else if (match[3] === undefined || match[3]) { - // Comment tag - const isLongComment = match[3] === undefined - saveBlock('comment', match[0], matchIndex, { - content: isLongComment ? (match[2] ?? '') : match[3], - long: isLongComment, - }) + } else { + // If a miss match occurs, the current content is matched to text + saveBlock('text', rawMatch, matchIndex) } + } else if (isLongComment || commentContent) { + saveBlock('comment', rawMatch, matchIndex, { + content: commentContent, + long: isLongComment, + }) } } diff --git a/test/htmlparser.spec.js b/test/htmlparser.spec.js index 7c69fc4b6..d293c51b5 100644 --- a/test/htmlparser.spec.js +++ b/test/htmlparser.spec.js @@ -790,4 +790,35 @@ describe('HTMLParser: Case parse', () => { }) parser.parse(input) }) + + it('should emit malformed empty-assignment start tag as single text block without parsing quoted markup', (done) => { + const parser = new HTMLParser() + const arrEvents = [] + getAllEvents(parser, arrEvents, () => { + expect(arrEvents.length).toBe(3) + expect(arrEvents[1]).toEvent('text', { + raw: '
">', + pos: 0, + line: 1, + col: 1, + }) + done() + }) + parser.parse('
">') + }) + + it('should handle repeated unclosed comment prefixes and end-tag prefixes in linear time', (done) => { + const parser = new HTMLParser() + const arrEvents = [] + const input = `${'