Skip to content
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.

Sign up for GitHub

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

Jump to bottom

refactor: make code shorter #81

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

refactor: make code shorter #81

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
47 changes: 17 additions & 30 deletions finder.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,17 +160,13 @@ function findUniquePath(
}

function selector(path: Path): string {
let node = path[0]
let query = node.name
for (let i = 1; i < path.length; i++) {
const level = path[i].level || 0
if (node.level === level - 1) {
query = `${path[i].name} > ${query}`
} else {
query = `${path[i].name} ${query}`
}
node = path[i]
}
let query = path[0].name
path.reduce((prev, cur) => {
query = prev.level === (cur.level || 0) - 1
? `${cur.name} > ${query}`
: `${cur.name} ${query}`
return cur
})
return query
}

Expand Down Expand Up @@ -248,19 +244,10 @@ function index(input: Element): number | null {
if (!parent) {
return null
}
let child = parent.firstChild
if (!child) {
return null
}
let i = 0
while (child) {
if (child.nodeType === Node.ELEMENT_NODE) {
i++
}
if (child === input) {
break
}
child = child.nextSibling
let current: Element | null = input
let i = 1
while (current = current.previousElementSibling) {
i++
}
return i
}
Expand All @@ -285,13 +272,13 @@ function maybe(...level: (Knot | null)[]): Knot[] | null {
}

function notEmpty<T>(value: T | null | undefined): value is T {
return value !== null && value !== undefined
return !!value
}

function* combinations(stack: Knot[][], path: Knot[] = []): Generator<Knot[]> {
if (stack.length > 0) {
for (let node of stack[0]) {
yield* combinations(stack.slice(1, stack.length), path.concat(node))
yield* combinations(stack.slice(1), path.concat(node))
}
} else {
yield path
Expand All @@ -315,7 +302,7 @@ function* optimize(
visited: new Map<string, boolean>(),
}
): Generator<Knot[]> {
if (path.length > 2 && path.length > config.optimizedMinLength) {
if (path.length > Math.max(2, config.optimizedMinLength)) {
for (let i = 1; i < path.length - 1; i++) {
if (scope.counter > config.maxNumberOfTries) {
return // Okay At least I tried!
Expand All @@ -327,7 +314,7 @@ function* optimize(
if (scope.visited.has(newPathKey)) {
return
}
if (unique(newPath) && same(newPath, input)) {
if (unique(newPath) && same(newPathKey, input)) {
yield newPath
scope.visited.set(newPathKey, true)
yield* optimize(newPath, input, scope)
Expand All @@ -336,6 +323,6 @@ function* optimize(
}
}

function same(path: Path, input: Element) {
return rootDocument.querySelector(selector(path)) === input
function same(pathKey: string, input: Element) {
return rootDocument.querySelector(pathKey) === input
}
Loading