feat: support import func

Author: Soontao

.vscode/settings.json

@@ -48,5 +48,8 @@
     "testfile",
     "testproject",
     "Theo"
-  ]
+  ],
+  "[typescript]": {
+    "editor.defaultFormatter": "vscode.typescript-language-features"
+  }
 }

LICENSE

@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018 Theo Sun
+Copyright (c) 2018 - NOW Theo Sun
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

README.md

@@ -7,7 +7,7 @@
 
 ES6 circular import check tool, support `js`, `ts`, `jsx`, `tsx` and `mjs` files, and will ignore all `node_modules` files.
 
-Support `import`, `export` keywords and `require()` function now
+Support `import`, `export` keywords and `require()`, `import()` function now
 
 ## Why do we need this tool ?
 
@@ -109,3 +109,7 @@ or
 Congratulation! Not found circular dependency in tests/testproject2
 
 ```
+
+## [CHANGELOG](./CHANGELOG.md)
+
+## [LICENSE (MIT)](./LICENSE)

src/file.ts

@@ -3,7 +3,7 @@ import { sync } from "glob";
 import { join as pathJoin, dirname, join, normalize, relative } from "path";
 import { join as arrayJoin, map, isArray, isString, concat, filter, keys } from "@newdash/newdash";
 import { includes } from "@newdash/newdash/includes"
-import { readFileSync, writeFileSync } from "fs";
+import { readFileSync, writeFileSync, existsSync } from "fs";
 import { cwd } from "process";
 import { tmpdir, platform } from "os";
 import { exec } from "child_process";
@@ -13,6 +13,10 @@ require.extensions[".jsx"] = require.extensions[".js"]
 require.extensions[".tsx"] = require.extensions[".js"]
 require.extensions[".mjs"] = require.extensions[".js"]
 
+const extensions = [
+  "js", "jsx", "ts", "tsx", "mjs"
+]
+
 const { resolve } = require
 
 export const allDependencies = (absPath: string) => {
@@ -82,6 +86,7 @@ export const readFile = (absolutePath: string) => {
 export const resolveFilePath = (fromFileAbsolutePath: string, importFileRelativePath: string) => {
   const dir = dirname(fromFileAbsolutePath);
   const targetPath = join(dir, importFileRelativePath);
+  // to do replace nodejs resolve function
   try {
     return normalize(resolve(targetPath));
   } catch (error) {

src/processor.ts

@@ -61,9 +61,13 @@ export const findFileDependencies = (fileAbsolutePath: string, fileCodeString: s
       },
       CallExpression: (p) => {
         const { node } = p;
-        if (node.callee.type === "Identifier" && (node.callee.name === "require" || node.callee.name === "import")) {
-          if (node.arguments.length >= 1 && node.arguments[0].type === "StringLiteral") {
-            const sourceFile = resolveFilePath(fileAbsolutePath, node.arguments[0].value)
+        if ((
+          node.callee?.type === "Identifier" && node.callee.name === "require" ||
+          node.callee?.type === "Import"
+        )) {
+          if (node.arguments?.length >= 1 && node?.arguments[0].type === "StringLiteral") {
+            const importRelPath = node.arguments[0].value;
+            const sourceFile = resolveFilePath(fileAbsolutePath, importRelPath)
             if (sourceFile) {
               result.push({
                 fromFile: fileAbsolutePath,

tests/processor.spec.ts

@@ -39,14 +39,20 @@ describe('processor tests', () => {
   test('should parse minified code correctly', () => {
     // this gave false positives in the old regex / non-babel processor implementation, because it contains a string that looks like export from but isn't
     const Proj6MinifiedAbsPath = join(__dirname, "./testproject6/util/base64.js")
-    const deps = findFileDependencies(Proj6MinifiedAbsPath, readFileSync(Proj6MinifiedAbsPath, {encoding: "utf8"}))
+    const deps = findFileDependencies(Proj6MinifiedAbsPath, readFileSync(Proj6MinifiedAbsPath, { encoding: "utf8" }))
     expect(deps).toHaveLength(0);
   });
 
+  test('should support import() function', () => {
+    const path = join(__dirname, "./testproject/d5/testfile7.mjs")
+    const deps = findFileDependencies(path, readFileSync(path, { encoding: "utf8" }))
+    expect(deps).toHaveLength(1)
+  });
+
   test('should be able to parse a variety of different kinds of imports', () => {
     const Proj7File1AbsPath = join(__dirname, "./testproject7/file1.js")
     const Proj7File2AbsPath = join(__dirname, "./testproject7/file2.js")
-    const deps = findFileDependencies(Proj7File1AbsPath, readFileSync(Proj7File1AbsPath, {encoding: "utf8"}))
+    const deps = findFileDependencies(Proj7File1AbsPath, readFileSync(Proj7File1AbsPath, { encoding: "utf8" }))
     expect(deps).toEqual([
       {
         fromFile: Proj7File1AbsPath,

tests/testproject/d5/d6/testfile8.mjs

@@ -0,0 +1,3 @@
+
+const { a } = require("../testfile7.mjs")
+a += 2

tests/testproject/d5/testfile7.mjs

@@ -0,0 +1,6 @@
+
+async () => {
+  await import("./d6/testfile8.mjs")
+}
+
+export const a = 11