Merge pull request #1708 from simlu/dev

Revert "chore: refactor"
blackflux · Jun 15, 2022 · f41e2b2 · f41e2b2
2 parents be6e205 + 316ee59
commit f41e2b2
Show file tree

Hide file tree

Showing 10 changed files with 12 additions and 12 deletions.
diff --git a/src/core/compiler/iterator.js → src/core/compiler-iterator.js b/src/core/compiler/iterator.js → src/core/compiler-iterator.js
@@ -1,4 +1,4 @@
-import iterator from '../../generic/iterator.js';
+import iterator from '../generic/iterator.js';
 
 export default (tower, needle, tree, { onAdd, onFin }) => {
   const stack = [[[tower, null]]];

diff --git a/src/core/compiler.js b/src/core/compiler.js
@@ -1,9 +1,9 @@
 /* compile needles to hierarchical map object */
 import parser from './parser.js';
-import iterator from './compiler/iterator.js';
+import iterator from './compiler-iterator.js';
 import { defineProperty } from '../generic/helper.js';
-import { Wildcard } from './parser/wildcard.js';
-import { Ref } from './parser/ref.js';
+import { Wildcard } from './wildcard.js';
+import { Ref } from './ref.js';
 
 const LEAF = Symbol('leaf');
 const markLeaf = (input, match, readonly) => defineProperty(input, LEAF, match, readonly);

diff --git a/src/core/find/result.js → src/core/find-result.js b/src/core/find/result.js → src/core/find-result.js
diff --git a/src/core/find.js b/src/core/find.js
@@ -3,7 +3,7 @@ import {
   hasMatches, matchedBy, isLastLeafMatch,
   getValues, getOrder, getRoots
 } from './compiler.js';
-import Result from './find/result.js';
+import Result from './find-result.js';
 import { toPath } from '../generic/helper.js';
 
 const formatPath = (input, ctx) => (ctx.joined ? toPath(input) : [...input]);

diff --git a/src/core/parser/result.js → src/core/parser-result.js b/src/core/parser/result.js → src/core/parser-result.js
@@ -1,5 +1,5 @@
-import assert from '../../generic/assert.js';
-import { defineProperty } from '../../generic/helper.js';
+import assert from '../generic/assert.js';
+import { defineProperty } from '../generic/helper.js';
 import { Wildcard } from './wildcard.js';
 import { Ref } from './ref.js';
 

diff --git a/src/core/parser.js b/src/core/parser.js
@@ -1,5 +1,5 @@
-import { Wildcard } from './parser/wildcard.js';
-import Result from './parser/result.js';
+import { Wildcard } from './wildcard.js';
+import Result from './parser-result.js';
 
 const throwError = (msg, input, context = {}) => {
   throw new Error(Object.entries(context)

diff --git a/src/core/parser/ref.js → src/core/ref.js b/src/core/parser/ref.js → src/core/ref.js
diff --git a/src/core/parser/wildcard.js → src/core/wildcard.js b/src/core/parser/wildcard.js → src/core/wildcard.js
@@ -1,4 +1,4 @@
-import { escapeRegex, asRegex } from '../../generic/helper.js';
+import { escapeRegex, asRegex } from '../generic/helper.js';
 
 export const parseWildcard = (str) => {
   let regex = '';

diff --git a/test/core/parser.spec.js b/test/core/parser.spec.js
@@ -1,6 +1,6 @@
 import { describe } from 'node-tdd';
 import { expect } from 'chai';
-import { Ref } from '../../src/core/parser/ref.js';
+import { Ref } from '../../src/core/ref.js';
 import parser from '../../src/core/parser.js';
 import Context from '../../src/core/context.js';
 import generateParsedNeedle from '../helper/generate-parsed-needle.js';

diff --git a/test/core/parser/wildcard.spec.js → test/core/wildcard.spec.js b/test/core/parser/wildcard.spec.js → test/core/wildcard.spec.js
@@ -1,6 +1,6 @@
 import { expect } from 'chai';
 import { describe } from 'node-tdd';
-import { parseWildcard } from '../../../src/core/parser/wildcard.js';
+import { parseWildcard } from '../../src/core/wildcard.js';
 
 describe('Testing Helper', () => {
   describe('Testing parseWildcard', () => {