chore: webpack build system, cli ready!

jayu · jayu · commit 31a3def6f393 · 2021-12-20T01:26:05.000+01:00
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 node_modules
-dist
 __fixtures__
 editor-log.txt
-cliQuery
+cliQuery
+dist
+babel-dist
diff --git a/README.md b/README.md
@@ -8,6 +8,8 @@ Names:
 
 ❌ Fix bug with `<$>$</$>;` matching too much - JSX text wildcard acts like $$ o.O
 
+❌ restrict more than 2 wildcards on query parse level
+
 ⌛ Make CLI a product
    - ✅ codeframe from babel
    - ✅  investigate results formatting query :`<Text $="ellipsis" ></Text>`
@@ -31,7 +33,7 @@ Names:
 
 ✅ Support json
 
-❌ Bundle/minify/obfuscate
+✅ Bundle/minify/obfuscate
 
 ❌ Invent / Implement license mechanism
    - try webassembly
diff --git a/__tests__/search/codePatterns.test.ts b/__tests__/search/codePatterns.test.ts
@@ -73,7 +73,7 @@ describe('code patterns', () => {
     `]
 
     const results = search({
-      mode: 'include',
+      mode: 'include', // TODO this should be 'exact', no?
       filePaths: filesList,
       queryCodes: queries,
     })
diff --git a/__tests__/searchMultiThread.test.ts b/__tests__/searchMultiThread.test.ts
@@ -8,7 +8,7 @@ import { getFilesList } from '/getFilesList'
 jest.mock('worker_threads', () => {
   const actual = jest.requireActual('worker_threads')
   function Worker(_: string, params: any) {
-    const mockedPath = path.resolve(process.cwd(), 'dist/src/searchWorker.js')
+    const mockedPath = path.resolve(process.cwd(), 'dist/worker.js')
     return new actual.Worker(mockedPath, params)
   }
   return {
diff --git a/babel.config.js b/babel.config.js
@@ -11,7 +11,8 @@ module.exports = {
         "rootPathSuffix": "./",
         "rootPathPrefix": "/"
       }
-    ]
+    ],
+    "./babel.plugins.js"
   ],
   "ignore": ["dist", "node_modules", "__tests__"]
 }
diff --git a/babel.plugins.js b/babel.plugins.js
@@ -0,0 +1,18 @@
+
+module.exports = function plugin() {
+  return {
+    visitor: {
+      CallExpression(path, state) {
+        if (['log', 'logStepStart', 'logStepEnd'].includes(path.node.callee?.name) || /^measure/.test(path.node.callee?.name)) {
+          path.remove()
+        }
+      },
+      VariableDeclaration(path, state) {
+        if (/^measure/.test(path.node.declarations[0]?.id?.name)) {
+          path.remove()
+
+        }
+      },
+    },
+  };
+}
diff --git a/bin.js b/bin.js
@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+require('./dist/cli.js')
diff --git a/package.json b/package.json
@@ -2,7 +2,7 @@
   "name": "magic-search",
   "version": "1.0.0",
   "description": "AST based search",
-  "bin": "dist/cli.js",
+  "bin": "bin.js",
   "author": "Jakub Mazurek (@jayu) <jakub.mazurek.dev@gmail.com>",
   "license": "MIT",
   "devDependencies": {
@@ -31,19 +31,23 @@
     "@babel/generator": "7.16.0",
     "@babel/parser": "7.16.4",
     "@babel/plugin-syntax-typescript": "7.16.0",
+    "babel-loader": "^8.2.3",
     "colorette": "^2.0.16",
     "commander": "^8.3.0",
     "ignore": "^5.1.9",
     "ora": "^6.0.1",
-    "prettier": "^2.5.1"
+    "prettier": "^2.5.1",
+    "webpack": "^5.65.0",
+    "webpack-cli": "^4.9.1"
   },
   "scripts": {
-    "build": "rm -rf dist && babel ./ --extensions \".ts,.tsx\" -d dist",
-    "build:watch": "babel ./ --extensions \".ts,.tsx\" -d dist --watch",
+    "build:watch": "webpack --mode development",
+    "build": "webpack --mode production",
+    "babel": "rm -rf babel-dist && babel ./ --extensions \".ts,.tsx\" -d babel-dist",
     "typecheck": "tsc --noEmit --project tsconfig.json",
     "dev": "node ./dist/dev.js",
     "cli": "node ./dist/cli.js",
     "test": "yarn build && jest --passWithNoTests",
     "test:setup": "node ./dist/getFixtures.js"
   }
-}
+}
diff --git a/src/cli.ts b/src/cli.ts
@@ -5,9 +5,9 @@ import { getFilesList } from '/getFilesList'
 import { green, magenta, cyan, bold, red, yellow } from "colorette"
 import { Mode, getMode, getCodeFrame, print } from '/utils'
 import { parseQueries } from '/parseQuery'
-import { openAsyncEditor } from './terminalEditor'
+import { openAsyncEditor } from '/terminalEditor'
 import { Command } from 'commander';
-import ora from 'ora';
+import ora from 'ora'
 const program = new Command();
 
 program
@@ -28,7 +28,8 @@ program
       catch (e) { }
 
       const separator = '\n'.padStart(process.stdout.columns, '━')
-      const modeAndCaseText = `${separator}${cyan(bold('Mode:'))} ${green(mode)}   ${cyan(bold('Case:'))} ${green(caseInsensitive ? 'insensitive' : 'sensitive')}\n`
+      const rootText = `${cyan(bold('Root:'))} ${green(resolvedRoot)}\n`
+      const modeAndCaseText = `${separator}${rootText}${cyan(bold('Mode:'))} ${green(mode)}   ${cyan(bold('Case:'))} ${green(caseInsensitive ? 'insensitive' : 'sensitive')}\n`
       let query = ''
 
       if (queryPath === undefined) {
@@ -63,7 +64,7 @@ program
 
         process.exit(1)
       }
-      const spinner = ora(`Searching ${root}`).start();
+      const spinner = ora(`Searching`).start();
 
       const results = await search({
         mode,
@@ -76,15 +77,16 @@ program
 
       const endTime = Date.now()
       if (results.length > 0) {
-        const first20 = results.slice(0, resultsLimitCount)
+        const limitedResults = results.slice(0, resultsLimitCount)
         const resultsText = results.length <= resultsLimitCount ? `Results:\n` : `First ${resultsLimitCount} results:\n`
 
         print(cyan(bold(resultsText)))
 
-        first20.forEach((result) => {
+        limitedResults.forEach((result) => {
           const startLine = result.loc.start.line
           const codeFrame = getCodeFrame(result.code, startLine)
-          print(`${green(result.filePath)}:${magenta(startLine)}:${yellow(result.loc.start.column + 1)}`)
+          const relativePath = root === process.cwd() ? path.relative(resolvedRoot, result.filePath) : result.filePath
+          print(`${green(relativePath)}:${magenta(startLine)}:${yellow(result.loc.start.column + 1)}`)
           print('\n' + codeFrame + '\n')
         })
 
diff --git a/src/getFilesList.ts b/src/getFilesList.ts
@@ -4,7 +4,7 @@ import ignore from 'ignore';
 import { measureStart } from './utils';
 
 export const getFilesList = (root: string) => {
-  const stop = measureStart('getFiles')
+  const measureStop = measureStart('getFiles')
   const ignoreInstance = ignore()
   const scan = (dir: string): string[] => {
     let gitignore = ''
@@ -35,7 +35,7 @@ export const getFilesList = (root: string) => {
 
   const filesList = scan(root)
 
-  stop()
+  measureStop()
 
   return filesList
 }
diff --git a/src/js-tokens-fork.ts b/src/js-tokens-fork.ts
diff --git a/src/search.ts b/src/search.ts
@@ -23,15 +23,15 @@ import {
   prepareCodeResult,
 } from './astUtils'
 
-type SearchArgs = {
+export type SearchArgs = {
   filePaths: string[],
   queryCodes: string[],
   mode: Mode,
   caseInsensitive?: boolean,
   debug?: boolean
 }
 
-type Matches = Array<Match & { filePath: string }>
+export type Matches = Array<Match & { filePath: string }>
 
 const dedupMatches = (matches: Matches, log: (...args: any[]) => void, debug = false) => {
   const deduped: Matches = []
diff --git a/src/searchMultiThread.ts b/src/searchMultiThread.ts
@@ -3,11 +3,11 @@ import {
 } from 'worker_threads'
 import { cpus } from 'os';
 import path from 'path';
-import { search as searchBase } from './search';
+import type { SearchArgs, Matches } from './search';
 
 const coresCount = Math.round(cpus().length / 2)
 
-export const search = async ({ filePaths, ...params }: Parameters<typeof searchBase>[0]) => {
+export const search = async ({ filePaths, ...params }: SearchArgs) => {
   const tasks = []
   const chunkSize = Math.round(filePaths.length / coresCount)
 
@@ -16,7 +16,7 @@ export const search = async ({ filePaths, ...params }: Parameters<typeof searchB
     const endIndex = i < coresCount - 1 ? startIndex + chunkSize : undefined
     const filePathsSlice = filePaths.slice(startIndex, endIndex)
     const task = new Promise((resolve, reject) => {
-      const worker = new Worker(path.resolve('dist', __dirname, './searchWorker.js'), {
+      const worker = new Worker(__dirname + '/worker.js', {
         workerData: {
           ...params,
           filePaths: filePathsSlice
@@ -35,5 +35,5 @@ export const search = async ({ filePaths, ...params }: Parameters<typeof searchB
 
   const result = await Promise.all(tasks)
 
-  return result.flat(1) as ReturnType<typeof searchBase>
+  return result.flat(1) as Matches
 };
diff --git a/src/terminalEditor.ts b/src/terminalEditor.ts
@@ -200,10 +200,13 @@ export const openAsyncEditor = ({ header = '', code = '', footer = footerDefault
             }
 
             if (key.name === 'f' && key.ctrl) {
-                content = format(content, {
-                    parser: 'babel-ts'
-                })
-                fixCursorOverflow(content)
+                try {
+
+                    content = format(content, {
+                        parser: 'babel-ts'
+                    })
+                    fixCursorOverflow(content)
+                } catch (e) { }
             }
 
             if (key.name === 'up') {
diff --git a/webpack.config.js b/webpack.config.js
@@ -0,0 +1,40 @@
+const path = require('path');
+const pgk = require('./package.json')
+
+module.exports = (_, { mode }) => {
+  return {
+    watch: mode === 'development',
+    entry: {
+      cli: path.resolve(__dirname, './src/cli.ts'),
+      worker: path.resolve(__dirname, './src/searchWorker.ts'),
+    },
+    module: {
+      rules: [
+        {
+          test: /\.(js|ts)$/,
+          exclude: /node_modules|__tests__/,
+          use: ['babel-loader']
+        }
+      ]
+    },
+    //Don't transpile & include modules except some ESM modules that does not work otherwise
+    externals: Object.keys(pgk.dependencies).filter((dep) => {
+      const depPkg = require(`./node_modules/${dep}/package.json`)
+      return depPkg.type !== 'module'
+    }).reduce((map, dep) => ({
+      ...map,
+      [dep]: `commonjs2 ${dep}`
+    })),
+    externalsPresets: {
+      node: true,
+    },
+    resolve: {
+      extensions: ['*', '.js', '.ts']
+    },
+    target: 'node',
+    output: {
+      path: path.resolve(__dirname, './dist'),
+      filename: '[name].js',
+    },
+  };
+}
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ import { getFilesList } from '/getFilesList'`
`8`	`8`	`jest.mock('worker_threads', () => {`
`9`	`9`	`const actual = jest.requireActual('worker_threads')`
`10`	`10`	`function Worker(_: string, params: any) {`
`11`		`- const mockedPath = path.resolve(process.cwd(), 'dist/src/searchWorker.js')`
	`11`	`+ const mockedPath = path.resolve(process.cwd(), 'dist/worker.js')`
`12`	`12`	`return new actual.Worker(mockedPath, params)`
`13`	`13`	`}`
`14`	`14`	`return {`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,8 @@ module.exports = {`
`11`	`11`	`"rootPathSuffix": "./",`
`12`	`12`	`"rootPathPrefix": "/"`
`13`	`13`	`}`
`14`		`- ]`
	`14`	`+ ],`
	`15`	`+ "./babel.plugins.js"`
`15`	`16`	`],`
`16`	`17`	`"ignore": ["dist", "node_modules", "__tests__"]`
`17`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#!/usr/bin/env node`
	`2`	`+require('./dist/cli.js')`