chore: apply ESLint fixes

Author: gajus

.eslintignore

@@ -1,8 +1,8 @@
 jobs:
   test:
-    runs-on: ubuntu-latest
     environment: release
     name: Test
+    runs-on: ubuntu-latest
     steps:
       - name: setup repository
         uses: actions/checkout@v3
@@ -11,7 +11,7 @@ jobs:
       - name: setup node.js
         uses: actions/setup-node@v3
         with:
-          node-version: "18"
+          node-version: '18'
       - run: npm ci
       - run: npm run lint
       - run: npm run test

.eslintrc

@@ -1,8 +1,8 @@
 jobs:
   test:
-    runs-on: ubuntu-latest
     environment: release
     name: Test
+    runs-on: ubuntu-latest
     steps:
       - name: setup repository
         uses: actions/checkout@v3
@@ -11,15 +11,15 @@ jobs:
       - name: setup node.js
         uses: actions/setup-node@v3
         with:
-          node-version: "18"
+          node-version: '18'
       - run: npm ci
       - run: npm run lint
       - run: npm run test
       - run: npm run build
-      - run: npx semantic-release
-        env:
+      - env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        run: npx semantic-release
 name: Test, build and release
 on:
   push:

.github/workflows/feature.yaml

@@ -0,0 +1,37 @@
+const auto = require('eslint-config-canonical/configurations/auto');
+const ava = require('eslint-config-canonical/configurations/ava');
+const node = require('eslint-config-canonical/configurations/node');
+
+module.exports = [
+  ...auto,
+  ava.recommended,
+  {
+    files: ['**/*.cjs'],
+    ...node.recommended,
+  },
+  {
+    rules: {
+      '@typescript-eslint/no-explicit-any': 0,
+      'func-style': 0,
+      'id-length': 0,
+      'no-template-curly-in-string': 0,
+      'regexp/no-unused-capturing-group': 0,
+      'regexp/optimal-quantifier-concatenation': 0,
+      'require-unicode-regexp': 0,
+    },
+  },
+  {
+    ignores: [
+      'package-lock.json',
+      'dist',
+      'node_modules',
+      'src/pg-formatter',
+      '*.log',
+      '.*',
+      '!.github',
+      '!.gitignore',
+      '!.husky',
+      '!.releaserc',
+    ],
+  },
+];

.github/workflows/main.yaml

@@ -32,8 +32,8 @@
     "benny": "^3.7.1",
     "coveralls": "^3.1.1",
     "del-cli": "^4.0.1",
-    "eslint": "^7.32.0",
-    "eslint-config-canonical": "^28.0.0",
+    "eslint": "^9.17.0",
+    "eslint-config-canonical": "^44.3.36",
     "faker": "^5.5.3",
     "husky": "^7.0.4",
     "npm-watch": "^0.11.0",
@@ -55,18 +55,18 @@
     "type": "git",
     "url": "[email protected]:gajus/liqe.git"
   },
-  "watch": {
-    "compile-parser": "src/grammar.ne"
-  },
   "scripts": {
-    "watch": "npm-watch",
     "benchmark": "ts-node --transpile-only test/benchmark.ts",
     "build": "del-cli ./dist && tsc",
     "compile-parser": "nearleyc src/grammar.ne --out ./src/grammar.ts && sed -i '' 's/loc?: number/loc: number/g' src/grammar.ts",
     "dev": "tsc --watch",
     "lint": "eslint ./src ./test && tsc --noEmit",
-    "test": "NODE_ENV=test ava --serial --verbose"
+    "test": "NODE_ENV=test ava --serial --verbose",
+    "watch": "npm-watch"
   },
   "typings": "./dist/src/Liqe.d.ts",
-  "version": "1.0.0"
+  "version": "1.0.0",
+  "watch": {
+    "compile-parser": "src/grammar.ne"
+  }
 }

eslint.config.cjs

@@ -1,15 +1,10 @@
-export {
-  filter,
-} from './filter';
-export {
-  highlight,
-} from './highlight';
-export {
-  parse,
-} from './parse';
-export {
-  test,
-} from './test';
+export { LiqeError, SyntaxError } from './errors';
+export { filter } from './filter';
+export { highlight } from './highlight';
+export { isSafeUnquotedExpression } from './isSafeUnquotedExpression';
+export { parse } from './parse';
+export { serialize } from './serialize';
+export { test } from './test';
 export {
   BooleanOperatorToken,
   ComparisonOperatorToken,
@@ -29,13 +24,3 @@ export {
   TagToken,
   UnaryOperatorToken,
 } from './types';
-export {
-  LiqeError,
-  SyntaxError,
-} from './errors';
-export {
-  serialize,
-} from './serialize';
-export {
-  isSafeUnquotedExpression,
-} from './isSafeUnquotedExpression';

package.json

@@ -2,9 +2,8 @@ const WILDCARD_RULE = /(\*+)|(\?)/g;
 
 export const convertWildcardToRegex = (pattern: string): RegExp => {
   return new RegExp(
-    pattern
-      .replace(WILDCARD_RULE, (_match, p1) => {
-        return p1 ? '(.+?)' : '(.)';
-      }),
+    pattern.replaceAll(WILDCARD_RULE, (_match, p1) => {
+      return p1 ? '(.+?)' : '(.)';
+    }),
   );
 };

src/Liqe.ts

@@ -1,6 +1,4 @@
-import {
-  isSafePath,
-} from './isSafePath';
+import { isSafePath } from './isSafePath';
 
 export const createGetValueFunctionBody = (path: string): string => {
   if (!isSafePath(path)) {
@@ -9,7 +7,5 @@ export const createGetValueFunctionBody = (path: string): string => {
 
   const body = 'return subject' + path;
 
-  return body
-    .replace(/(\.(\d+))/g, '.[$2]')
-    .replace(/\./g, '?.');
+  return body.replaceAll(/(\.(\d+))/g, '.[$2]').replaceAll('.', '?.');
 };

src/convertWildcardToRegex.ts

@@ -1,15 +1,7 @@
-import {
-  convertWildcardToRegex,
-} from './convertWildcardToRegex';
-import {
-  escapeRegexString,
-} from './escapeRegexString';
-import {
-  parseRegex,
-} from './parseRegex';
-import type {
-  LiqeQuery,
-} from './types';
+import { convertWildcardToRegex } from './convertWildcardToRegex';
+import { escapeRegexString } from './escapeRegexString';
+import { parseRegex } from './parseRegex';
+import { type LiqeQuery } from './types';
 
 type RegExpCache = Record<string, RegExp>;
 
@@ -19,10 +11,11 @@ const createRegexTest = (regexCache: RegExpCache, regex: string) => {
   if (regexCache[regex]) {
     rule = regexCache[regex];
   } else {
-    rule = regexCache[regex] = parseRegex(regex);
+    rule = parseRegex(regex);
+    regexCache[regex] = rule;
   }
 
-  return (subject: string): string | false => {
+  return (subject: string): false | string => {
     return subject.match(rule)?.[0] ?? false;
   };
 };
@@ -32,9 +25,7 @@ export const createStringTest = (regexCache: RegExpCache, ast: LiqeQuery) => {
     throw new Error('Expected a tag expression.');
   }
 
-  const {
-    expression,
-  } = ast;
+  const { expression } = ast;
 
   if (expression.type === 'RangeExpression') {
     throw new Error('Unexpected range expression.');
@@ -50,9 +41,18 @@ export const createStringTest = (regexCache: RegExpCache, ast: LiqeQuery) => {
 
   const value = String(expression.value);
 
-  if ((value.includes('*') || value.includes('?')) && expression.quoted === false) {
-    return createRegexTest(regexCache, String(convertWildcardToRegex(value)) + 'ui');
+  if (
+    (value.includes('*') || value.includes('?')) &&
+    expression.quoted === false
+  ) {
+    return createRegexTest(
+      regexCache,
+      String(convertWildcardToRegex(value)) + 'ui',
+    );
   } else {
-    return createRegexTest(regexCache, '/(' + escapeRegexString(value) + ')/' + (expression.quoted ? 'u' : 'ui'));
+    return createRegexTest(
+      regexCache,
+      '/(' + escapeRegexString(value) + ')/' + (expression.quoted ? 'u' : 'ui'),
+    );
   }
 };

src/createGetValueFunctionBody.ts

@@ -1,13 +1,9 @@
-/* eslint-disable fp/no-class */
-
-import {
-  ExtendableError,
-} from 'ts-error';
+import { ExtendableError } from 'ts-error';
 
 export class LiqeError extends ExtendableError {}
 
 export class SyntaxError extends LiqeError {
-  public constructor (
+  public constructor(
     public message: string,
     public offset: number,
     public line: number,

src/createStringTest.ts

@@ -2,7 +2,5 @@ const ESCAPE_RULE = /[$()*+.?[\\\]^{|}]/g;
 const DASH_RULE = /-/g;
 
 export const escapeRegexString = (subject: string): string => {
-  return subject
-    .replace(ESCAPE_RULE, '\\$&')
-    .replace(DASH_RULE, '\\x2d');
+  return subject.replaceAll(ESCAPE_RULE, '\\$&').replaceAll(DASH_RULE, '\\x2d');
 };

src/errors.ts

@@ -1,16 +1,9 @@
-import {
-  internalFilter,
-} from './internalFilter';
-import type {
-  LiqeQuery,
-} from './types';
+import { internalFilter } from './internalFilter';
+import { type LiqeQuery } from './types';
 
 export const filter = <T extends Object>(
   ast: LiqeQuery,
   data: readonly T[],
 ): readonly T[] => {
-  return internalFilter(
-    ast,
-    data,
-  );
+  return internalFilter(ast, data);
 };