Fix head opening tag omission w/o title

wooorm · wooorm · commit 1c938b92d411 · 2024-09-16T12:04:57.000+02:00
While typically a `title` is needed, there are cases where `<head>` can be empty, in which case, the start tag can be omitted. Closes GH-43.
diff --git a/lib/omission/opening.js b/lib/omission/opening.js
@@ -37,23 +37,25 @@ function html(node) {
  *   Whether the opening tag can be omitted.
  */
 function head(node) {
-  const children = node.children
-  /** @type {Array<string>} */
-  const seen = []
-  let index = -1
+  /** @type {Set<string>} */
+  const seen = new Set()
 
-  while (++index < children.length) {
-    const child = children[index]
+  // Whether `srcdoc` or not,
+  // make sure the content model at least doesn’t have too many `base`s/`title`s.
+  for (const child of node.children) {
     if (
       child.type === 'element' &&
-      (child.tagName === 'title' || child.tagName === 'base')
+      (child.tagName === 'base' || child.tagName === 'title')
     ) {
-      if (seen.includes(child.tagName)) return false
-      seen.push(child.tagName)
+      if (seen.has(child.tagName)) return false
+      seen.add(child.tagName)
     }
   }
 
-  return children.length > 0
+  // “May be omitted if the element is empty,
+  // or if the first thing inside the head element is an element.”
+  const child = node.children[0]
+  return !child || child.type === 'element'
 }
 
 /**
diff --git a/test/omission-closing-head.js b/test/omission-closing-head.js
@@ -6,7 +6,7 @@ import {u} from 'unist-builder'
 
 test('`head` (closing)', async function (t) {
   await t.test('should omit tag without following', async function () {
-    assert.deepEqual(toHtml(h('head'), {omitOptionalTags: true}), '<head>')
+    assert.deepEqual(toHtml(h('head'), {omitOptionalTags: true}), '')
   })
 
   await t.test(
@@ -16,7 +16,7 @@ test('`head` (closing)', async function (t) {
         toHtml(h('html', [h('head'), u('comment', 'alpha')]), {
           omitOptionalTags: true
         }),
-        '<head></head><!--alpha-->'
+        '</head><!--alpha-->'
       )
     }
   )
@@ -26,7 +26,7 @@ test('`head` (closing)', async function (t) {
     async function () {
       assert.deepEqual(
         toHtml(h('html', [h('head'), ' alpha']), {omitOptionalTags: true}),
-        '<head></head> alpha'
+        '</head> alpha'
       )
     }
   )
@@ -38,7 +38,7 @@ test('`head` (closing)', async function (t) {
         toHtml(h('html', [h('head'), u('text', 'alpha')]), {
           omitOptionalTags: true
         }),
-        '<head>alpha'
+        'alpha'
       )
     }
   )
diff --git a/test/omission-opening-head.js b/test/omission-opening-head.js
@@ -11,9 +11,12 @@ test('`head` (opening)', async function (t) {
     )
   })
 
-  await t.test('should not omit tag without children', async function () {
-    assert.deepEqual(toHtml(h('head'), {omitOptionalTags: true}), '<head>')
-  })
+  await t.test(
+    'should omit tag without children (could be fine in `srcdoc`)',
+    async function () {
+      assert.deepEqual(toHtml(h('head'), {omitOptionalTags: true}), '')
+    }
+  )
 
   await t.test('should omit tag with `title`', async function () {
     assert.deepEqual(

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ import {u} from 'unist-builder'`
`6`	`6`
`7`	`7`	test('`head` (closing)', async function (t) {
`8`	`8`	`await t.test('should omit tag without following', async function () {`
`9`		`- assert.deepEqual(toHtml(h('head'), {omitOptionalTags: true}), '<head>')`
	`9`	`+ assert.deepEqual(toHtml(h('head'), {omitOptionalTags: true}), '')`
`10`	`10`	`})`
`11`	`11`
`12`	`12`	`await t.test(`
@@ -16,7 +16,7 @@ test('`head` (closing)', async function (t) {
`16`	`16`	`toHtml(h('html', [h('head'), u('comment', 'alpha')]), {`
`17`	`17`	`omitOptionalTags: true`
`18`	`18`	`}),`
`19`		`- '<head></head><!--alpha-->'`
	`19`	`+ '</head><!--alpha-->'`
`20`	`20`	`)`
`21`	`21`	`}`
`22`	`22`	`)`
@@ -26,7 +26,7 @@ test('`head` (closing)', async function (t) {
`26`	`26`	`async function () {`
`27`	`27`	`assert.deepEqual(`
`28`	`28`	`toHtml(h('html', [h('head'), ' alpha']), {omitOptionalTags: true}),`
`29`		`- '<head></head> alpha'`
	`29`	`+ '</head> alpha'`
`30`	`30`	`)`
`31`	`31`	`}`
`32`	`32`	`)`
@@ -38,7 +38,7 @@ test('`head` (closing)', async function (t) {
`38`	`38`	`toHtml(h('html', [h('head'), u('text', 'alpha')]), {`
`39`	`39`	`omitOptionalTags: true`
`40`	`40`	`}),`
`41`		`- '<head>alpha'`
	`41`	`+ 'alpha'`
`42`	`42`	`)`
`43`	`43`	`}`
`44`	`44`	`)`