fixes for jsr publish

masylum · masylum · commit 955c0ec87e7e · 2024-06-28T13:32:26.000+02:00
diff --git a/LICENSE.md b/LICENSE.md
@@ -4,7 +4,7 @@ Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
 You may obtain a copy of the License at
 
-   http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
 Unless required by applicable law or agreed to in writing, software
 distributed under the License is distributed on an "AS IS" BASIS,
diff --git a/package.json b/package.json
@@ -8,6 +8,7 @@
     "scripts": {
         "lint": "eslint .",
         "prettier": "prettier --check .",
+        "prettier-fix": "prettier --write .",
         "test": "vitest",
         "generate-testcase": "node test/generate-testcase.js",
         "build": "tsup src/index.ts --format cjs,esm --dts",
diff --git a/src/dom.ts b/src/dom.ts
@@ -1,5 +1,9 @@
-import { type Cheerio, type Element, type AnyNode } from 'cheerio'
-import { removeElement } from 'domutils'
+import {
+    type Cheerio,
+    type Element,
+    type AnyNode,
+    type CheerioAPI,
+} from 'cheerio'
 
 import { whitespace } from './regexes.js'
 
@@ -15,17 +19,17 @@ export function removeNodes(
     }
 }
 
-export function removeComments(node: AnyNode) {
+export function removeComments($: CheerioAPI, node: AnyNode) {
     if ((node.type === 'tag' || node.type === 'root') && node.children) {
         for (let i = node.children.length - 1; i >= 0; i--) {
-            removeComments(node.children[i]!)
+            removeComments($, node.children[i]!)
         }
     } else if (
         node.type === 'comment' ||
         node.type === 'directive' ||
         node.type === 'cdata'
     ) {
-        return removeElement(node)
+        return $(node).remove()
     }
 }
 
diff --git a/src/index.ts b/src/index.ts
@@ -1745,7 +1745,7 @@ export class Readability {
 
         if (this.options.extraction) {
             // Remove all comments
-            removeComments(this.$.root()[0])
+            removeComments(this.$, this.$.root()[0])
 
             // Remove all scripts once we've got the metadata
             removeNodes(this.$('script, noscript'))
diff --git a/src/utils/simplifyDivs.test.ts b/src/utils/simplifyDivs.test.ts
@@ -8,21 +8,21 @@ describe('simplifyDivs', () => {
         const node = $('#content')[0]!
         simplifyDivs($, node)
         return expect($.html()).toBe(
-            `<html><head></head><body><div id="content">${expectation}</div></body></html>`
+            `<html><head></head><body><div id="content">${expectation}</div></body></html>`,
         )
     }
 
     it('should wrap sequences of phrasing content in <p> tags', () => {
         subject(
             'Some text<span>Inline text</span>More text<div>Block content</div>Even more text',
-            '<p>Some text<span>Inline text</span>More text</p><div>Block content</div><p>Even more text</p>'
+            '<p>Some text<span>Inline text</span>More text</p><div>Block content</div><p>Even more text</p>',
         )
     })
 
     it('should not create <p> tags for whitespace-only nodes', () => {
         subject(
             '<span>Inline text</span><span>  </span><span>More text</span>',
-            '<p><span>Inline text</span><span>  </span><span>More text</span></p>'
+            '<p><span>Inline text</span><span>  </span><span>More text</span></p>',
         )
     })
 

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,9 @@`
`1`		`-import { type Cheerio, type Element, type AnyNode } from 'cheerio'`
`2`		`-import { removeElement } from 'domutils'`
	`1`	`+import {`
	`2`	`+ type Cheerio,`
	`3`	`+ type Element,`
	`4`	`+ type AnyNode,`
	`5`	`+ type CheerioAPI,`
	`6`	`+} from 'cheerio'`
`3`	`7`
`4`	`8`	`import { whitespace } from './regexes.js'`
`5`	`9`
`@@ -15,17 +19,17 @@ export function removeNodes(`
`15`	`19`	`}`
`16`	`20`	`}`
`17`	`21`
`18`		`-export function removeComments(node: AnyNode) {`
	`22`	`+export function removeComments($: CheerioAPI, node: AnyNode) {`
`19`	`23`	`if ((node.type === 'tag' \|\| node.type === 'root') && node.children) {`
`20`	`24`	`for (let i = node.children.length - 1; i >= 0; i--) {`
`21`		`- removeComments(node.children[i]!)`
	`25`	`+ removeComments($, node.children[i]!)`
`22`	`26`	`}`
`23`	`27`	`} else if (`
`24`	`28`	`node.type === 'comment' \|\|`
`25`	`29`	`node.type === 'directive' \|\|`
`26`	`30`	`node.type === 'cdata'`
`27`	`31`	`) {`
`28`		`- return removeElement(node)`
	`32`	`+ return $(node).remove()`
`29`	`33`	`}`
`30`	`34`	`}`
`31`	`35`
Original file line number	Diff line number	Diff line change
`@@ -8,21 +8,21 @@ describe('simplifyDivs', () => {`
`8`	`8`	`const node = $('#content')[0]!`
`9`	`9`	`simplifyDivs($, node)`
`10`	`10`	`return expect($.html()).toBe(`
`11`		- `<html><head></head><body><div id="content">${expectation}</div></body></html>`
	`11`	+ `<html><head></head><body><div id="content">${expectation}</div></body></html>`,
`12`	`12`	`)`
`13`	`13`	`}`
`14`	`14`
`15`	`15`	`it('should wrap sequences of phrasing content in <p> tags', () => {`
`16`	`16`	`subject(`
`17`	`17`	`'Some text<span>Inline text</span>More text<div>Block content</div>Even more text',`
`18`		`- '<p>Some text<span>Inline text</span>More text</p><div>Block content</div><p>Even more text</p>'`
	`18`	`+ '<p>Some text<span>Inline text</span>More text</p><div>Block content</div><p>Even more text</p>',`
`19`	`19`	`)`
`20`	`20`	`})`
`21`	`21`
`22`	`22`	`it('should not create <p> tags for whitespace-only nodes', () => {`
`23`	`23`	`subject(`
`24`	`24`	`'<span>Inline text</span><span> </span><span>More text</span>',`
`25`		`- '<p><span>Inline text</span><span> </span><span>More text</span></p>'`
	`25`	`+ '<p><span>Inline text</span><span> </span><span>More text</span></p>',`
`26`	`26`	`)`
`27`	`27`	`})`
`28`	`28`