Move query and queryAll to queries namespace

.eslintrc

@@ -20,6 +20,7 @@
       "optionalDependencies": false,
       "peerDependencies": false,
     }],
+    "import/prefer-default-export": "off",
     "no-param-reassign": "off",
     "prefer-spread": "off",
     "prefer-rest-params": "off"

spec/queryAll.spec.js → spec/queries/query-all.spec.js

@@ -1,20 +1,18 @@
-import { queryAll } from "../src";
+import { queryAll } from "../../src";
 
 describe("queryAll", () => {
   afterEach(clearFixtures);
 
   it("returns array of childs which matched by selector", () => {
-    useFixture(
-      `
+    useFixture(`
       <div class="root" >
         <div class="matched"></div>
         <div class="matched"></div>
         <div class="notMatched"></div>
       </div>
       <div class="matched"></div>
       <div class="matched"></div>
-    `
-    );
+    `);
 
     const subject = document.querySelector(".root");
 
@@ -24,15 +22,13 @@ describe("queryAll", () => {
   });
 
   it("returns empty array when children which matched by selector not existed", () => {
-    useFixture(
-      `
+    useFixture(`
       <div class="root" >
         <div class="notMatched"></div>
       </div>
       <div class="matched"></div>
       <div class="matched"></div>
-    `
-    );
+    `);
 
     const subject = document.querySelector(".root");
 

spec/query.spec.js → spec/queries/query.spec.js

@@ -1,33 +1,29 @@
-import { query } from "../src";
+import { query } from "../../src";
 
 describe("query", () => {
   afterEach(clearFixtures);
 
   it("returns first child which matched by selector", () => {
-    useFixture(
-      `
+    useFixture(`
       <div class="root" >
         <div class="matched"></div>
         <div class="other"></div>
       </div>
       <div class="matched"></div>
-    `
-    );
+    `);
 
     const subject = document.querySelector(".root");
 
     expect(query(subject, ".matched")).toBe(subject.querySelector(".matched"));
   });
 
   it("returns null when child which matched by selector not exists", () => {
-    useFixture(
-      `
+    useFixture(`
       <div class="root" >
         <div class="notMatched"></div>
       </div>
       <div class="matched"></div>
-    `
-    );
+    `);
 
     const subject = document.querySelector(".root");
 

src/index.js

@@ -1,10 +1,14 @@
 /* @flow */
 
+import type { Elements, Selector } from "./types";
+
 import { html, body } from "./aliases";
+import query from "./queries/query";
+import queryAll from "./queries/query-all";
 
-type CSSClass = string;
+/* Types */
 
-type Elements = Array<Element>;
+type CSSClass = string;
 
 type EventDetails = { [key: string]: mixed };
 
@@ -14,26 +18,8 @@ type EventType = string;
 
 type PredicateFn = (element: Element) => boolean;
 
-type Selector = string;
-
-/* Utilities */
-
-function toArray(arrayLike: any): Array<any> {
-  return Array.prototype.slice.call(arrayLike);
-}
-
 /* Queries */
 
-function query(element: Element, selector: Selector): ?Element {
-  return element.querySelector(selector);
-}
-
-function queryAll(element: Element, selector: Selector): Elements {
-  const elements = element.querySelectorAll(selector);
-
-  return (toArray(elements): Elements);
-}
-
 type MatchesFn = (selector: Selector) => boolean;
 
 function getMatchesFn(): MatchesFn {

src/queries/query-all.js

@@ -0,0 +1,13 @@
+/* @flow */
+
+import type { Elements, Selector } from "../types";
+
+import { toArray } from "../utils";
+
+function queryAll(element: Element, selector: Selector): Elements {
+  const elements = element.querySelectorAll(selector);
+
+  return (toArray(elements): Elements);
+}
+
+export default queryAll;

src/queries/query.js

@@ -0,0 +1,9 @@
+/* @flow */
+
+import type { Selector } from "../types";
+
+function query(element: Element, selector: Selector): ?Element {
+  return element.querySelector(selector);
+}
+
+export default query;

src/types.js

@@ -0,0 +1,5 @@
+/* @flow */
+
+export type Elements = Array<Element>;
+
+export type Selector = string;

src/utils.js

@@ -0,0 +1,7 @@
+/* @flow */
+
+function toArray(arrayLike: any): Array<any> {
+  return Array.prototype.slice.call(arrayLike);
+}
+
+export { toArray };