perf(vapor): use nthChild instead of nextn (#12847)

This commit is contained in:
edison 2025-02-12 16:43:26 +08:00 committed by GitHub
parent 10993af9e1
commit 1b50febfe9
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
6 changed files with 47 additions and 14 deletions

View File

@ -1,13 +1,13 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
exports[`compiler: children transform > children & sibling references 1`] = ` exports[`compiler: children transform > children & sibling references 1`] = `
"import { child as _child, nextn as _nextn, next as _next, createTextNode as _createTextNode, insert as _insert, toDisplayString as _toDisplayString, setText as _setText, renderEffect as _renderEffect, template as _template } from 'vue'; "import { child as _child, nthChild as _nthChild, next as _next, createTextNode as _createTextNode, insert as _insert, toDisplayString as _toDisplayString, setText as _setText, renderEffect as _renderEffect, template as _template } from 'vue';
const t0 = _template("<div><p> </p> <!><p> </p></div>", true) const t0 = _template("<div><p> </p> <!><p> </p></div>", true)
export function render(_ctx) { export function render(_ctx) {
const n4 = t0() const n4 = t0()
const n0 = _child(n4) const n0 = _child(n4)
const n3 = _nextn(n0, 2) const n3 = _nthChild(n4, 2)
const n2 = _next(n3) const n2 = _next(n3)
const x0 = _child(n0) const x0 = _child(n0)
const n1 = _createTextNode() const n1 = _createTextNode()
@ -22,6 +22,19 @@ export function render(_ctx) {
}" }"
`; `;
exports[`compiler: children transform > efficient find 1`] = `
"import { child as _child, nthChild as _nthChild, toDisplayString as _toDisplayString, setText as _setText, renderEffect as _renderEffect, template as _template } from 'vue';
const t0 = _template("<div><div>x</div><div>x</div><div> </div></div>", true)
export function render(_ctx) {
const n1 = t0()
const n0 = _nthChild(n1, 2)
const x0 = _child(n0)
_renderEffect(() => _setText(x0, _toDisplayString(_ctx.msg)))
return n1
}"
`;
exports[`compiler: children transform > efficient traversal 1`] = ` exports[`compiler: children transform > efficient traversal 1`] = `
"import { child as _child, next as _next, toDisplayString as _toDisplayString, setText as _setText, renderEffect as _renderEffect, template as _template } from 'vue'; "import { child as _child, next as _next, toDisplayString as _toDisplayString, setText as _setText, renderEffect as _renderEffect, template as _template } from 'vue';
const t0 = _template("<div><div>x</div><div><span> </span></div><div><span> </span></div><div><span> </span></div></div>", true) const t0 = _template("<div><div>x</div><div><span> </span></div><div><span> </span></div><div><span> </span></div></div>", true)

View File

@ -46,4 +46,16 @@ describe('compiler: children transform', () => {
) )
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
}) })
test('efficient find', () => {
const { code } = compileWithElementTransform(
`<div>
<div>x</div>
<div>x</div>
<div>{{ msg }}</div>
</div>`,
)
expect(code).contains(`const n0 = _nthChild(n1, 2)`)
expect(code).toMatchSnapshot()
})
}) })

View File

@ -70,7 +70,7 @@ export function genChildren(
if (offset === 1) { if (offset === 1) {
push(...genCall(helper('next'), prev[0])) push(...genCall(helper('next'), prev[0]))
} else { } else {
push(...genCall(helper('nextn'), prev[0], String(offset))) push(...genCall(helper('nthChild'), from, String(offset)))
} }
} else { } else {
if (newPath.length === 1 && newPath[0] === 0) { if (newPath.length === 1 && newPath[0] === 0) {
@ -113,7 +113,7 @@ export function genChildren(
if (i === 1) { if (i === 1) {
init = genCall(helper('next'), init) init = genCall(helper('next'), init)
} else if (i > 1) { } else if (i > 1) {
init = genCall(helper('nextn'), init, String(i)) init = genCall(helper('nthChild'), resolvedFrom, String(i))
} }
} }
push(...init!) push(...init!)

View File

@ -1,5 +1,5 @@
import { template } from '../../src/dom/template' import { template } from '../../src/dom/template'
import { child, next, nextn } from '../../src/dom/node' import { child, next, nthChild } from '../../src/dom/node'
describe('api: template', () => { describe('api: template', () => {
test('create element', () => { test('create element', () => {
@ -18,6 +18,17 @@ describe('api: template', () => {
expect(root.$root).toBe(true) expect(root.$root).toBe(true)
}) })
test('nthChild', () => {
const t = template('<div><span><b>nested</b></span><p></p></div>')
const root = t()
const span = nthChild(root, 0)
const b = nthChild(span, 0)
const p = nthChild(root, 1)
expect(span).toBe(root.firstChild)
expect(b).toBe(root.firstChild!.firstChild)
expect(p).toBe(root.firstChild!.nextSibling)
})
test('next', () => { test('next', () => {
const t = template('<div><span></span><b></b><p></p></div>') const t = template('<div><span></span><b></b><p></p></div>')
const root = t() const root = t()
@ -26,7 +37,7 @@ describe('api: template', () => {
expect(span).toBe(root.childNodes[0]) expect(span).toBe(root.childNodes[0])
expect(b).toBe(root.childNodes[1]) expect(b).toBe(root.childNodes[1])
expect(nextn(span, 2)).toBe(root.childNodes[2]) expect(nthChild(root, 2)).toBe(root.childNodes[2])
expect(next(b)).toBe(root.childNodes[2]) expect(next(b)).toBe(root.childNodes[2])
}) })
}) })

View File

@ -19,14 +19,11 @@ export function child(node: ParentNode): Node {
} }
/*! #__NO_SIDE_EFFECTS__ */ /*! #__NO_SIDE_EFFECTS__ */
export function next(node: Node): Node { export function nthChild(node: Node, i: number): Node {
return node.nextSibling! return node.childNodes[i]
} }
/*! #__NO_SIDE_EFFECTS__ */ /*! #__NO_SIDE_EFFECTS__ */
export function nextn(node: Node, offset: number = 1): Node { export function next(node: Node): Node {
for (let i = 0; i < offset; i++) { return node.nextSibling!
node = node.nextSibling!
}
return node
} }

View File

@ -10,7 +10,7 @@ export { createComponent, createComponentWithFallback } from './component'
export { renderEffect } from './renderEffect' export { renderEffect } from './renderEffect'
export { createSlot } from './componentSlots' export { createSlot } from './componentSlots'
export { template } from './dom/template' export { template } from './dom/template'
export { createTextNode, child, next, nextn } from './dom/node' export { createTextNode, child, nthChild, next } from './dom/node'
export { export {
setText, setText,
setHtml, setHtml,