Remove null values from document types

BREAKING: The serialization of document types stored in the htmlparser2 adapter now no longer has an empty trailing string. Ie. `<!DOCTYPE html "">` is now `<!DOCTYPE html>`.
inikulin · Mar 7, 2022 · 38639f3 · 38639f3
1 parent 55d414b
commit 38639f3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 8 deletions.
diff --git a/packages/parse5-htmlparser2-tree-adapter/lib/index.ts b/packages/parse5-htmlparser2-tree-adapter/lib/index.ts
@@ -104,12 +104,7 @@ export function getTemplateContent(templateElement: Element): Document {
     return templateElement.children[0] as Document;
 }
 
-export function setDocumentType(
-    document: Document,
-    name: string | null,
-    publicId: string | null,
-    systemId: string | null
-): void {
+export function setDocumentType(document: Document, name: string, publicId: string, systemId: string): void {
     const data = doctype.serializeContent(name, publicId, systemId);
     let doctypeNode = document.children.find(
         (node): node is ProcessingInstruction => isDirective(node) && node.name === '!doctype'

diff --git a/packages/parse5/lib/common/doctype.ts b/packages/parse5/lib/common/doctype.ts
@@ -140,7 +140,7 @@ export function getDocumentMode(token: DoctypeToken): DOCUMENT_MODE {
     return DOCUMENT_MODE.NO_QUIRKS;
 }
 
-export function serializeContent(name: string | null, publicId: string | null, systemId: string | null): string {
+export function serializeContent(name: string, publicId: string, systemId: string): string {
     let str = '!DOCTYPE ';
 
     if (name) {
@@ -153,7 +153,7 @@ export function serializeContent(name: string | null, publicId: string | null, s
         str += ' SYSTEM';
     }
 
-    if (systemId !== null) {
+    if (systemId) {
         str += ` ${enquoteDoctypeId(systemId)}`;
     }