Skip to content

fix(runtime): Non-standard Concatenation Algorithm in BOM URL polyfill #17472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
48 changes: 48 additions & 0 deletions packages/taro-runtime/src/__tests__/bom.spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
describe('BOM', () => {
process.env.FRAMEWORK = 'nerv'
const runtime = require('../../dist/runtime.esm')
global.window = runtime.window

afterAll(() => {
process.env.FRAMEWORK = ''
})

describe('URL', () => {
it('URL 构造函数的 path 和 base 参数拼接算法', () => {
const doubleSlashURL = new URL('//double/slash/path', 'https://example.com/') + ''
expect(doubleSlashURL).toBe('https://double/slash/path')

const absoluteURL1 = new URL('/absolute/path', 'https://example.com/') + ''
expect(absoluteURL1).toBe('https://example.com/absolute/path')

const absoluteURL2 = new URL('/absolute/path', 'https://example.com/exist/path') + ''
expect(absoluteURL2).toBe('https://example.com/absolute/path')

const relativeURL1 = new URL('relative/path', 'https://example.com/exist/path') + ''
expect(relativeURL1).toBe('https://example.com/exist/relative/path')

const relativeURL2 = new URL('relative/path', 'https://example.com/exist/path/') + ''
expect(relativeURL2).toBe('https://example.com/exist/path/relative/path')
})

it('URL path 折叠算法', () => {
const currentPath1 = new URL('./current/path', 'https://example.com/exist/path/') + ''
expect(currentPath1).toBe('https://example.com/exist/path/current/path')

const currentPath2 = new URL('./current/path', 'https://example.com/exist/path') + ''
expect(currentPath2).toBe('https://example.com/exist/current/path')

const parentPath1 = new URL('../parent/path', 'https://example.com/exist/path/') + ''
expect(parentPath1).toBe('https://example.com/exist/parent/path')

const parentPath2 = new URL('../parent/path', 'https://example.com/exist/path') + ''
expect(parentPath2).toBe('https://example.com/parent/path')

const parentPath3 = new URL('../../parent/path', 'https://example.com/exist/path/') + ''
expect(parentPath3).toBe('https://example.com/parent/path')

const parentPath4 = new URL('../../parent/path', 'https://example.com/exist/path') + ''
expect(parentPath4).toBe('https://example.com/parent/path')
})
})
})
35 changes: 25 additions & 10 deletions packages/taro-runtime/src/bom/URL.ts
Original file line number Diff line number Diff line change
Expand Up @@ -229,18 +229,33 @@ function parseUrlBase (url: string, base?: string) {
if (VALID_URL.test(url)) {
fullUrl = url
} else if (parsedBase) {
if (url) {
if (url.startsWith('//')) {
fullUrl = parsedBase.protocol + url
} else {
fullUrl = parsedBase.origin + (url.startsWith('/') ? url : `/${url}`)
}
} else {
fullUrl = parsedBase.href
}
const { protocol, origin, pathname, href } = parsedBase

fullUrl = url
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

个人觉得这个不如之前的写法清晰易读

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

个人觉得这个不如之前的写法清晰易读

在同一份数据涉及的操作不多时,展开写可能更清晰;但分支情况多了,代码行数多反而不利于阅读,格式化规范的三目运算符则能清晰展示不同条件和分支的相互关系。

? url.startsWith('//')
? protocol + url
: url.startsWith('/')
? `${origin}${url}`
: pathname.endsWith('/')
? `${origin}${pathname}${url}`
: `${origin}${pathname.replace(/[^/]+$/, url)}`
: href
} else {
throw new TypeError(`Failed to construct 'URL': Invalid URL`)
}

return parseUrl(fullUrl)
return parseUrl(collapseUrl(fullUrl))
}

function collapseUrl (url: string) {
url = url.replace(/\/\.\/|\/\.$/g, '/')
let { origin, pathname, search, hash } = parseUrl(url)

for (let simplified = ''; ; pathname = simplified) {
simplified = pathname.replace(/\/.+?\/\.\./g, '')
if (simplified === pathname) break
}
pathname = pathname.replace(/^\/\.\./, '')

return `${origin}${pathname}${search}${hash}`
}