refact: remove ttlcache package, make src/bin.js clean

package.json

@@ -40,15 +40,13 @@
   },
   "homepage": "https://github.com/i5ting/ts-junit#readme",
   "dependencies": {
-    "@isaacs/ttlcache": "^1.2.0",
     "debug": "^4.3.1",
     "recast": "^0.21.5",
     "typescript": "^4.8.3",
     "uvu": "^0.5.1",
     "yargs": "^17.5.1"
   },
   "devDependencies": {
-    "@types/lru-cache": "^7.10.10",
     "@types/node": "^18.7.18",
     "@types/yargs": "^17.0.13",
     "concurrently": "^5.3.0",

src/Context.ts

@@ -1,12 +1,7 @@
 import * as fs from 'node:fs'
 import { load } from './loadObject/scan';
-
 import { Debug } from './Utils'
 
-// import { Watch } from './Watch'
-
-import { Parse } from './parse'
-
 const debug = Debug("ts-junit")
 
 import IStrategy from './IStrategy'
@@ -50,7 +45,6 @@ export default class Context {
 
         assert(fs.existsSync(jsFile))
 
-
         debug(" --- runTest --- ")
         let nodeList = [load(jsFile)]
 
@@ -83,5 +77,4 @@ export default class Context {
             this.strategy.test.run()
         }
     }
-
 }

src/Parse.ts

@@ -10,7 +10,6 @@ const debug = Debug('parse')
 export function getEableRunDataMapping(commonjsFile: string) {
   const allTest = getDataMapping(commonjsFile)
   const clazz = allTest.find(item => item['Class']?.length > 0)
-  // console.dir(clazz)
 
   if (clazz['Disabled']?.length > 0) {
     console.log(clazz['Disabled'] + 'has  @Disabled decorator， no need to run any test!')

src/Utils.ts

@@ -1,5 +1,4 @@
 import * as fs from 'node:fs'
-// import * as Debugger from 'debug'
 import debugModule from 'debug';
 const debug = new debugModule('foo');
 

src/ast.ts

@@ -9,21 +9,18 @@ export const processedFiles = new Set()
 export const needCompileFiles = new Array()
 
 function getImportsForFile(file: string, options?: any) {
-    // console.dir(file)
     const fileInfo = ts.preProcessFile(readFileSync(file).toString())
+
     if (options && options.verbose)
         console.log('getImportsForFile ' + file + ': ' + fileInfo.importedFiles.map((el) => el.fileName).join(', '))
     return fileInfo.importedFiles
         .map((importedFile: FileReference) => importedFile.fileName)
         .flatMap((fileName: string) => {
-            // console.dir(fileName)
             if (!fileName.startsWith('.')) {
                 libFiles.add(fileName)
             }
 
             return fileName
-            // flat map is not ideal here, because we could hit multiple valid imports, and not the first aka best one
-            //return applyPathMapping(fileName, path_mapping) 
         })
         .filter((x: string) => x.startsWith('.')) // only relative paths allowed
         .flatMap((fileName: string) => {
@@ -60,8 +57,8 @@ export function getAllImportsForFile(file: string, options?: Object) {
     getImportsForFile(file, options)
     let count: number = 0
     localFiles.forEach((i) => {
-        count++;
-        // 
+        count++
+
         if (!processedFiles.has(i) && count > 0) {
             // processedFiles.add(i)
             getAllImportsForFile(i, options)
@@ -79,8 +76,8 @@ export function getDependencyImports(files: any) {
     const alibFiles = new Set()
     const alocalFiles = new Set()
 
-    files.map((a: string) => {
-        getImportsForFile(a)
+    files.map((file: string) => {
+        getImportsForFile(file)
 
         libFiles.forEach(alibFiles.add, alibFiles)
         localFiles.forEach(alibFiles.add, alocalFiles)

src/bin.ts

@@ -1,48 +1,8 @@
 #!/usr/bin/env node
 
-import fs from 'node:fs'
-import path from 'node:path'
-
 import yargs from 'yargs/yargs';
-
 import { hideBin } from 'yargs/helpers'
 
-import { executeWithDefaultStrategy, executeFileWithDefaultStrategy } from '.'
-
-const argv = yargs(hideBin(process.argv)).argv
-
-// console.dir(argv)
-
-run(argv['_'])
-
-
-function run(rest: any) {
-    rest.map(function (i: string) {
-        let item = path.resolve(process.cwd(), i)
-
-        try {
-            const stat = fs.lstatSync(item)
-
-            let fileOrDirType = stat.isDirectory() ? 'dir' : stat.isFile() ? 'file' : 'other'
-
-            switch (fileOrDirType) {
-                case 'dir':
-                    console.warn('find dir ' + item)
-                    executeWithDefaultStrategy([item])
-                    break;
-                case 'file':
-                    console.warn('find file 2' + item.replace('.ts', ''))
-
-                    executeFileWithDefaultStrategy([item.replace('.ts', '')])
-                    break;
-                default:
-                    console.warn('unknow type')
-                    break;
-            }
-        } catch (error) {
-            throw error
-        }
-
-    })
-}
+import { execute } from '.'
 
+execute(yargs(hideBin(process.argv)).argv['_'])

src/index.ts

@@ -1,5 +1,7 @@
+
+import fs from 'node:fs'
+import path from 'node:path'
 import Context from './Context'
-import IStrategy from './IStrategy'
 import UvuStrategy from './UvuStrategy'
 import { WatchDir, WatchFile } from './Watch'
 import { Debug } from './Utils'
@@ -16,7 +18,6 @@ export * from './loadObject/scan'
 export * from './loadObject/require'
 export * from './loadObject/flatten'
 
-
 export function executeWithDefaultStrategy(dirs: string[]) {
     debug('executeWithDefaultStrategy')
 
@@ -39,8 +40,34 @@ export function executeFileWithDefaultStrategy(testFiles: string[]) {
     })
 }
 
-export function execute(dir: string[], strategy: IStrategy) {
+export function execute(rest: any) {
     debug('execute With Strategy')
-    const context = new Context(strategy)
-    // context.runTests(dir)
+    console.time('build ts')
+    rest.map(function (i: string) {
+        let item = path.resolve(process.cwd(), i)
+
+        try {
+            const stat = fs.lstatSync(item)
+
+            let fileOrDirType = stat.isDirectory() ? 'dir' : stat.isFile() ? 'file' : 'other'
+
+            switch (fileOrDirType) {
+                case 'dir':
+                    console.warn('find dir ' + item)
+                    executeWithDefaultStrategy([item])
+                    break;
+                case 'file':
+                    console.warn('find file 2' + item.replace('.ts', ''))
+
+                    executeFileWithDefaultStrategy([item.replace('.ts', '')])
+                    break;
+                default:
+                    console.warn('unknow type')
+                    break;
+            }
+        } catch (error) {
+            throw error
+        }
+    })
+    console.timeEnd('build ts')
 }

src/watch.ts

@@ -1,15 +1,13 @@
-// import * as os from "os";
 import * as fs from "fs";
 import * as path from "path";
 import * as ts from "typescript";
 
 import { EventEmitter } from 'node:events';
 
-import { getDependencyImports, getAllImportsForFile, getNeedCompileFiles, libFiles } from "./ast";
+import { getAllImportsForFile, getNeedCompileFiles } from "./ast";
 
 import { Debug } from './Utils'
 import Context from './Context'
-import { cache } from './cache'
 import { getTsFiles } from './index'
 
 const debug = Debug('watch')

test/parse.ts

@@ -1,6 +1,5 @@
 import { test } from 'uvu';
 import * as path from 'node:path'
-import * as fs from 'node:fs'
 import * as assert from 'uvu/assert';
 
 import { Parse, getDataMapping, getEableRunDataMapping } from '../src'

test/uvu.ts

@@ -2,7 +2,7 @@ import { test } from 'uvu';
 import * as path from 'node:path'
 import * as assert from 'uvu/assert';
 
-import { getDependencyImports, getAllImportsForFile, getNeedCompileFiles, libFiles } from "../src/ast";
+import { getAllImportsForFile, getNeedCompileFiles } from "../src/ast";
 
 test('Math.sqrt()', () => {
   assert.is(Math.sqrt(4), 2);
@@ -31,9 +31,7 @@ test.only('getAllImportsForFile()', () => {
 
   var needCompileFiles = getNeedCompileFiles()
 
-  // console.dir(needCompileFiles)
-
-  assert.is(needCompileFiles.length, 15);
+  assert.is(needCompileFiles.length, 14);
 });