From 9006e5bf68527227246a4202bd4f6240ecfc1c2f Mon Sep 17 00:00:00 2001 From: Gajus Kuizinas Date: Sat, 2 Sep 2017 12:44:48 +0300 Subject: [PATCH] fix: --- src/evaluators/browserEvaluator.js | 1 + src/subroutineAliasPreset.js | 4 ++-- src/subroutines/nextUntilSubroutine.js | 12 ++---------- src/types.js | 2 ++ test/surgeon/subroutines/nextUntilSubroutine.js | 3 --- 5 files changed, 7 insertions(+), 15 deletions(-) diff --git a/src/evaluators/browserEvaluator.js b/src/evaluators/browserEvaluator.js index 1b6dd6b..8f49f2e 100644 --- a/src/evaluators/browserEvaluator.js +++ b/src/evaluators/browserEvaluator.js @@ -42,6 +42,7 @@ export default (): EvaluatorType => { return [].slice.apply(node.querySelectorAll(selector)); }; + // eslint-disable-next-line no-unused-vars const nextUntil = (node: HTMLElement, selector: string, filter?: string) => { throw new Error('Not implemented.'); }; diff --git a/src/subroutineAliasPreset.js b/src/subroutineAliasPreset.js index 06628fd..334d6cf 100644 --- a/src/subroutineAliasPreset.js +++ b/src/subroutineAliasPreset.js @@ -1,5 +1,5 @@ import { - nextUntil, + nextUntilSubroutine, readSubroutine, selectSubroutine, testSubroutine @@ -7,7 +7,7 @@ import { export default { nu: (subject, values, bindle) => { - return nextUntil(subject, values, bindle); + return nextUntilSubroutine(subject, values, bindle); }, ra: (subject, values, bindle) => { return readSubroutine(subject, ['attribute'].concat(values), bindle); diff --git a/src/subroutines/nextUntilSubroutine.js b/src/subroutines/nextUntilSubroutine.js index dd41c56..f666bda 100644 --- a/src/subroutines/nextUntilSubroutine.js +++ b/src/subroutines/nextUntilSubroutine.js @@ -1,26 +1,18 @@ // @flow -import { - FinalResultSentinel -} from 'pianola'; import { createDebug } from '../utilities'; import { - parseQuantifierExpression -} from '../parsers'; -import { - SelectSubroutineUnexpectedResultCountError, SurgeonError } from '../errors'; import type { - SelectSubroutineQuantifierType, SubroutineType } from '../types'; const debug = createDebug('subroutine:nextUntil'); -const selectSubroutine: SubroutineType = (subject, [selectorExpression, filterExpression], {evaluator}) => { +const nextUntilSubroutine: SubroutineType = (subject, [selectorExpression, filterExpression], {evaluator}) => { debug('selecting following siblings matching "%s" until "%s"', filterExpression, selectorExpression); if (!evaluator.isElement(subject)) { @@ -34,4 +26,4 @@ const selectSubroutine: SubroutineType = (subject, [selectorExpression, filterEx return matches; }; -export default selectSubroutine; +export default nextUntilSubroutine; diff --git a/src/types.js b/src/types.js index 64ea379..62d196d 100644 --- a/src/types.js +++ b/src/types.js @@ -9,6 +9,8 @@ export type EvaluatorType = {| +getPropertyValue: (element: Object, name: string) => mixed, +isElement: (maybeElement: mixed) => boolean, + + // eslint-disable-next-line flowtype/no-weak-types +nextUntil: (element: Object, selector: string, filter?: string) => Array, // eslint-disable-next-line flowtype/no-weak-types diff --git a/test/surgeon/subroutines/nextUntilSubroutine.js b/test/surgeon/subroutines/nextUntilSubroutine.js index e64fae5..ae00639 100644 --- a/test/surgeon/subroutines/nextUntilSubroutine.js +++ b/test/surgeon/subroutines/nextUntilSubroutine.js @@ -2,9 +2,6 @@ import test from 'ava'; import sinon from 'sinon'; -import { - FinalResultSentinel -} from 'pianola'; import nextUntilSubroutine from '../../../src/subroutines/nextUntilSubroutine'; test('returns array when expecting multiple results', (t): void => {