fix:

gajus · Sep 2, 2017 · 9006e5b · 9006e5b
1 parent 6fe7aec
commit 9006e5b
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 15 deletions.
diff --git 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
@@ -1,13 +1,13 @@
 import {
-  nextUntil,
+  nextUntilSubroutine,
   readSubroutine,
   selectSubroutine,
   testSubroutine
 } from './subroutines';
 
 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
@@ -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
@@ -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<Object>,
 
   // eslint-disable-next-line flowtype/no-weak-types

diff --git 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 => {