Commit 0d774c7

committed

refactor(no-multiple-template-root): optimize code

1 parent b33de28 commit 0d774c7Copy full SHA for 0d774c7

File tree

2 files changed

+35

-54

lines changed

lib/rules
- no-multiple-template-root.js
tests/lib/rules
- no-multiple-template-root.js

2 files changed

+35

-54

lines changed

`‎lib/rules/no-multiple-template-root.js`

Lines changed: 15 additions & 54 deletions

Original file line number	Diff line number	Diff line change
`@@ -9,53 +9,16 @@ const utils = require('../utils')`
`9`	`9`	`/**`
`10`	`10`	`* Get all comments that need to be reported`
`11`	`11`	`* @param {(HTMLComment \| HTMLBogusComment \| Comment)[]} comments`
`12`		`- * @param {VRootElement} element`
	`12`	`+ * @param {Range[]} elementRanges`
`13`	`13`	`* @returns {(HTMLComment \| HTMLBogusComment \| Comment)[]}`
`14`	`14`	`*/`
`15`		`-function getReportComments(comments, element) {`
`16`		`- const commentRanges = comments.map((comment) => comment.range)`
`17`		`- const elementRanges = element.children`
`18`		`- .filter((child) => child.type === 'VElement')`
`19`		`- .map((child) => child.range)`
`20`		`-`
`21`		`- // should return comment directly when no any elements`
`22`		`- if (elementRanges.length === 0) {`
`23`		`- return comments`
`24`		`- }`
`25`		`-`
`26`		`- let commentIndex = 0`
`27`		`- let elementIndex = 0`
`28`		`-`
`29`		`- const needReportComments = []`
`30`		`- while (commentIndex < commentRanges.length) {`
`31`		`- const [commentStart, commentEnd] = commentRanges[commentIndex]`
`32`		`- const [elementStart, elementEnd] = elementRanges[elementIndex]`
`33`		`- // if the comment is in the range of element, should skip`
`34`		`- if (commentStart > elementStart && commentEnd < elementEnd) {`
`35`		`- commentIndex += 1`
`36`		`- continue`
`37`		`- }`
`38`		`-`
`39`		`- if (commentEnd < elementStart) {`
`40`		`- needReportComments.push(comments[commentIndex])`
`41`		`- commentIndex += 1`
`42`		`- }`
`43`		`-`
`44`		`- // the element array has no any element, but comment still has some elements`
`45`		`- if (`
`46`		`- elementIndex === elementRanges.length - 1 &&`
`47`		`- commentStart > elementEnd`
`48`		`- ) {`
`49`		`- needReportComments.push(comments[commentIndex])`
`50`		`- commentIndex += 1`
`51`		`- }`
`52`		`-`
`53`		`- if (elementIndex < elementRanges.length - 1 && commentStart > elementEnd) {`
`54`		`- elementIndex += 1`
`55`		`- }`
`56`		`- }`
`57`		`-`
`58`		`- return needReportComments`
	`15`	`+function getReportComments(comments, elementRanges) {`
	`16`	`+ return comments.filter(`
	`17`	`+ (comment) =>`
	`18`	`+ !elementRanges.some(`
	`19`	`+ (range) => range[0] <= comment.range[0] && comment.range[1] <= range[1]`
	`20`	`+ )`
	`21`	`+ )`
`59`	`22`	`}`
`60`	`23`
`61`	`24`	`module.exports = {`
`@@ -103,16 +66,14 @@ module.exports = {`
`103`	`66`	`}`
`104`	`67`
`105`	`68`	`const comments = element.comments`
	`69`	`+ const elementRanges = element.children.map((child) => child.range)`
`106`	`70`	`if (disallowComments && comments.length > 0) {`
`107`		`- const needReportComments = getReportComments(comments, element)`
`108`		`- if (needReportComments.length > 0) {`
`109`		`- for (const comment of needReportComments) {`
`110`		`- context.report({`
`111`		`- node: comment,`
`112`		`- loc: comment.loc,`
`113`		`- messageId: 'commentRoot'`
`114`		`- })`
`115`		`- }`
	`71`	`+ for (const comment of getReportComments(comments, elementRanges)) {`
	`72`	`+ context.report({`
	`73`	`+ node: comment,`
	`74`	`+ loc: comment.loc,`
	`75`	`+ messageId: 'commentRoot'`
	`76`	`+ })`
`116`	`77`	`}`
`117`	`78`	`}`
`118`	`79`

`‎tests/lib/rules/no-multiple-template-root.js`

Lines changed: 20 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -257,6 +257,26 @@ ruleTester.run('no-multiple-template-root', rule, {`
`257`	`257`	`}`
`258`	`258`	`]`
`259`	`259`	`},`
	`260`	`+ {`
	`261`	+ code: `
	`262`	`+ <template>`
	`263`	`+ <div />`
	`264`	`+ <!-- comments -->`
	`265`	`+ <div />`
	`266`	`+ </template>`
	`267`	+ `,
	`268`	`+ options: [{ disallowComments: true }],`
	`269`	`+ errors: [`
	`270`	`+ {`
	`271`	`+ message: 'The template root disallows comments.',`
	`272`	`+ line: 4`
	`273`	`+ },`
	`274`	`+ {`
	`275`	`+ message: 'The template root requires exactly one element.',`
	`276`	`+ line: 5`
	`277`	`+ }`
	`278`	`+ ]`
	`279`	`+ },`
`260`	`280`	`{`
`261`	`281`	code: `
`262`	`282`	`<template>`

0 commit comments

Comments

(0)

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Uh oh!

Commit 0d774c7

File tree

2 files changed

2 files changed

`‎lib/rules/no-multiple-template-root.js`

`‎tests/lib/rules/no-multiple-template-root.js`

0 commit comments