AG-14921 group src selector files into one folder, fix namings

Squashed commit of the following: commit 5763c5bc1044454d142c117989de3a6189a8e056 Author: Slava Leleka <[email protected]> Date: Wed Jun 22 00:38:15 2022 +0300 group src selector files into one folder, fix namings commit fa3d19eb9591175f9479537cb0fd47575e7d81c8 Author: Slava Leleka <[email protected]> Date: Wed Jun 22 00:28:45 2022 +0300 fix always-true condition for utils.logError()
AdguardTeam · Jun 22, 2022 · c59d012 · c59d012
1 parent 6ee775e
commit c59d012
Show file tree

Hide file tree

Showing 18 changed files with 16 additions and 20 deletions.
diff --git a/rollup.config.ts b/rollup.config.ts
@@ -13,7 +13,7 @@ const OUTPUT_PATH = 'dist-v2';
 const SOURCE_PATH = './src/index.ts';
 const LIBRARY_NAME = 'ExtendedCSS';
 
-const SELECTOR_SOURCE_PATH = './src/selector.ts';
+const SELECTOR_SOURCE_PATH = './src/selector/index.ts';
 const TEST_TEMP_DIR = 'test/build';
 
 const banner = `/*! ${pkg.name} - v${pkg.version} - ${new Date().toDateString()}

diff --git a/src/index.ts b/src/index.ts
@@ -1,4 +1 @@
-export * from './converter';
-export * from './tokenizer';
-export * from './parser';
 export * from './selector';
diff --git a/src/converter.ts → src/selector/converter.ts b/src/converter.ts → src/selector/converter.ts
diff --git a/src/finder-utils.ts → src/selector/finder-utils.ts b/src/finder-utils.ts → src/selector/finder-utils.ts
diff --git a/src/selector.ts → src/selector/index.ts b/src/selector.ts → src/selector/index.ts
@@ -10,7 +10,7 @@ import {
     AnySelectorNodeInterface,
 } from './nodes';
 
-import utils from './utils';
+import utils from '../utils';
 
 import {
     CONTAINS_PSEUDO_CLASS_MARKERS,
@@ -32,7 +32,7 @@ import {
     COLON,
     ABSOLUTE_PSEUDO_CLASSES,
     RELATIVE_PSEUDO_CLASSES,
-} from './constants';
+} from '../constants';
 
 /**
  * Selects dom elements by value of RegularSelector

diff --git a/src/matcher-utils.ts → src/selector/matcher-utils.ts b/src/matcher-utils.ts → src/selector/matcher-utils.ts
@@ -7,9 +7,9 @@ import {
     REGEXP_ANY_SYMBOL,
     REGEXP_WITH_FLAGS_REGEXP,
     SLASH,
-} from './constants';
+} from '../constants';
 
-import utils from './utils';
+import utils from '../utils';
 
 /**
  * Removes quotes for specified content value.

diff --git a/src/nodes.ts → src/selector/nodes.ts b/src/nodes.ts → src/selector/nodes.ts
diff --git a/src/parser.ts → src/selector/parser.ts b/src/parser.ts → src/selector/parser.ts
@@ -45,7 +45,7 @@ import {
     REGULAR_PSEUDO_CLASSES,
     REGULAR_PSEUDO_ELEMENTS,
     IS_OR_NOT_PSEUDO_SELECTING_ROOT,
-} from './constants';
+} from '../constants';
 
 /**
  * Checks whether the passed token is supported extended pseudo-class

diff --git a/src/pseudo-processor.ts → src/selector/pseudo-processor.ts b/src/pseudo-processor.ts → src/selector/pseudo-processor.ts
@@ -1,4 +1,4 @@
-import utils from './utils';
+import utils from '../utils';
 
 import {
     matchingText,
@@ -19,7 +19,7 @@ import {
     MATCHES_CSS_BEFORE_PSEUDO,
     MATCHES_CSS_AFTER_PSEUDO,
     REGULAR_PSEUDO_ELEMENTS,
-} from './constants';
+} from '../constants';
 
 export const matchPseudo = {
     /**

diff --git a/src/tokenizer.ts → src/selector/tokenizer.ts b/src/tokenizer.ts → src/selector/tokenizer.ts
@@ -1,6 +1,6 @@
 import { convert } from './converter';
 
-import { ACCEPTABLE_MARKS } from './constants';
+import { ACCEPTABLE_MARKS } from '../constants';
 
 export enum TokenType {
     Mark = 'mark',

diff --git a/src/utils.ts b/src/utils.ts
@@ -24,7 +24,6 @@ const utils = {
      */
     logError: (typeof console !== 'undefined'
         && console.error
-        && Function.prototype.bind
         && console.error.bind)
         ? console.error.bind(window.console)
         : console.error,

diff --git a/test/v2/helpers/parser.ts b/test/v2/helpers/parser.ts
@@ -1,6 +1,6 @@
-import { parse } from '../../../src/parser';
+import { parse } from '../../../src/selector/parser';
 
-import { NodeType } from '../../../src/nodes';
+import { NodeType } from '../../../src/selector/nodes';
 
 interface TestAnySelectorNodeInterface {
     type: string,

diff --git a/test/v2/converter.test.ts → test/v2/selector-converter.test.ts b/test/v2/converter.test.ts → test/v2/selector-converter.test.ts
@@ -1,4 +1,4 @@
-import { convert } from '../../src/converter';
+import { convert } from '../../src/selector/converter';
 
 describe('converter', () => {
     describe('trim selectors', () => {

diff --git a/test/v2/matcher-utils.test.ts → test/v2/selector-matcher-utils.test.ts b/test/v2/matcher-utils.test.ts → test/v2/selector-matcher-utils.test.ts
@@ -5,7 +5,7 @@
 import {
     getValidMatcherArg,
     parseRawPropChain,
-} from '../../src/matcher-utils';
+} from '../../src/selector/matcher-utils';
 
 describe('matcher-utils tests', () => {
     describe('test getValidMatcherArg', () => {

diff --git a/test/v2/parser.test.ts → test/v2/selector-parser.test.ts b/test/v2/parser.test.ts → test/v2/selector-parser.test.ts
@@ -1,6 +1,6 @@
-import { parse } from '../../src/parser';
+import { parse } from '../../src/selector/parser';
 
-import { NodeType } from '../../src/nodes';
+import { NodeType } from '../../src/selector/nodes';
 
 import {
     getRegularSelector,

diff --git a/test/v2/selector-jsdom.test.ts → test/v2/selector-query-jsdom.test.ts b/test/v2/selector-jsdom.test.ts → test/v2/selector-query-jsdom.test.ts
diff --git a/test/v2/selector-playwright.test.ts → test/v2/selector-query-playwright.test.ts b/test/v2/selector-playwright.test.ts → test/v2/selector-query-playwright.test.ts
diff --git a/test/v2/tokenizer.test.ts → test/v2/selector-tokenizer.test.ts b/test/v2/tokenizer.test.ts → test/v2/selector-tokenizer.test.ts
@@ -1,4 +1,4 @@
-import { tokenize } from '../../src/tokenizer';
+import { tokenize } from '../../src/selector/tokenizer';
 
 describe('tokenizer', () => {
     it('simple', () => {