CJS interop + TS types (#15)

* CJS interop + TS types

* Improve linter

Author: chrmod

.editorconfig

@@ -7,3 +7,10 @@ root = true
 [*]
 end_of_line = lf
 insert_final_newline = true
+indent_style = space
+indent_size = 2
+charset = utf-8
+trim_trailing_whitespace = true
+block_comment_start = /**
+block_comment = *
+block_comment_end = */

.eslintrc

@@ -0,0 +1,22 @@
+/* eslint-env node */
+module.exports = {
+  root: true,
+  extends: [
+    'eslint:recommended',
+    'plugin:@typescript-eslint/recommended',
+    'prettier',
+  ],
+  parser: '@typescript-eslint/parser',
+  plugins: ['@typescript-eslint', 'prettier'],
+  rules: {
+    'prettier/prettier': 2, // Means error
+  },
+  overrides: [
+    {
+      files: ['lint.js', 'cli.js', 'scripts/**/*'],
+      env: {
+        node: true,
+      },
+    },
+  ],
+};

.eslintrc.cjs

@@ -38,14 +38,8 @@ jobs:
         env:
           AWS_DEFAULT_REGION: us-east-1
 
-      - name: Export SQL
-        run: npm run export-sql
-
-      - name: Export JSON
-        run: npm run export-json
-
-      - name: Export Adblocker Engine
-        run: npm run export-engine
+      - name: Build
+        run: npm run build
 
       - name: NPM package version bump
         run: npm version patch --no-git-tag-version

.github/workflows/release.yml

@@ -39,11 +39,5 @@ jobs:
       - name: Test
         run: npm test
 
-      - name: Export SQL
-        run: npm run export-sql
-
-      - name: Export JSON
-        run: npm run export-json
-
-      - name: Export Adblocker Engine
-        run: npm run export-engine
+      - name: Build
+        run: npm run build

.github/workflows/tests.yml

@@ -1,9 +1,13 @@
 #!/usr/bin/env node
 
 import { readFileSync } from 'node:fs';
+import path from 'node:path';
+import * as url from 'url';
 import { FiltersEngine, Request } from '@cliqz/adblocker';
-import { generateEngine } from './src/prepare.js';
 
+const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
+
+// eslint-disable-next-line @typescript-eslint/no-empty-function
 const debug = process.env.DEBUG === 'true' ? console.log : () => {};
 
 (async () => {
@@ -15,10 +19,10 @@ const debug = process.env.DEBUG === 'true' ? console.log : () => {};
     process.exit(1);
   }
 
-  const trackerEnginePath = await generateEngine();
-
   const loadingStart = Date.now();
-  const engine = FiltersEngine.deserialize(readFileSync(trackerEnginePath));
+  const engine = FiltersEngine.deserialize(
+    readFileSync(path.join(__dirname, 'dist', 'trackerdb.engine')),
+  );
   const loadingEnd = Date.now();
 
   const matches = url.startsWith('http')

cli.js

@@ -0,0 +1,5 @@
+cat >dist/cjs/package.json <<!EOF
+{
+    "type": "commonjs"
+}
+!EOF

fixup

@@ -126,22 +126,6 @@ function extractSection(source, tag) {
   }
 }
 
-function removeSection(source, section) {
-  return (
-    source.slice(0, source.lastIndexOf('\n\n---', section[0])) +
-    source.slice(source.indexOf('\n', section[1] + 1))
-  );
-}
-
-function replaceSection(source, section, replacement) {
-  replacement.sort();
-  return (
-    source.slice(0, section[0]) +
-    replacement.join('\n') +
-    source.slice(section[1])
-  );
-}
-
 function* iterPatternFiles() {
   const baseDir = path.join(
     path.dirname(fileURLToPath(import.meta.url)),