feat(core): switch to using a parser for imports

nrwl · Jul 17, 2023 · b1676df · b1676df
1 parent 2159e4b
commit b1676df
Show file tree

Hide file tree

Showing 14 changed files with 1,187 additions and 201 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/packages/nx/Cargo.toml b/packages/nx/Cargo.toml
@@ -27,10 +27,11 @@ watchexec-filterer-ignore = "1.2.1"
 watchexec-signals = "1.0.0"
 xxhash-rust = { version = '0.8.5', features = ['xxh3', 'xxh64'] }
 
-swc_common = "0.31.12"
-swc_ecma_parser = { version = "0.136.0", features = ["typescript"] }
-swc_ecma_visit = "0.92.0"
-swc_ecma_ast = "0.106.0"
+swc_common = "0.31.16"
+swc_ecma_parser = { version = "0.137.1", features = ["typescript"] }
+swc_ecma_visit = "0.93.0"
+swc_ecma_ast = "0.107.0"
+swc_ecma_dep_graph = "0.109.1"
 
 [lib]
 crate-type = ['cdylib']

diff --git a/packages/nx/src/native/index.d.ts b/packages/nx/src/native/index.d.ts
@@ -14,6 +14,7 @@ export function hashArray(input: Array<string>): string
 export function hashFile(file: string): FileData | null
 export function hashFiles(workspaceRoot: string): Record<string, string>
 export function hashFilesMatchingGlobs(directory: string, globPatterns: Array<string>): string | null
+export function findImports(projectFileMap: Record<string, Array<string>>): Array<ImportResult>
 export interface FileData {
   file: string
   hash: string
@@ -44,7 +45,12 @@ export interface NxWorkspaceFiles {
   projectConfigurations: Record<string, object>
 }
 export function getWorkspaceFilesNative(workspaceRoot: string, globs: Array<string>, parseConfigurations: (arg0: Array<string>) => Record<string, object>): NxWorkspaceFiles
-export function findImports(filePaths: Array<string>, callback: (obj: null, result: {file: string, importExpr: string}) => void): void
+export class ImportResult {
+  file: string
+  sourceProject: string
+  dynamicImportExpressions: Array<string>
+  staticImportExpressions: Array<string>
+}
 export class Watcher {
   origin: string
   /**
@@ -55,7 +61,3 @@ export class Watcher {
   watch(callback: (err: string | null, events: WatchEvent[]) => void): void
   stop(): Promise<void>
 }
-export class ImportResult {
-  file: string
-  importExpr: string
-}
diff --git a/packages/nx/src/native/index.js b/packages/nx/src/native/index.js
@@ -246,7 +246,7 @@ if (!nativeBinding) {
   throw new Error(`Failed to load native binding`)
 }
 
-const { expandOutputs, remove, copy, hashArray, hashFile, hashFiles, hashFilesMatchingGlobs, EventType, Watcher, WorkspaceErrors, getProjectConfigurations, getWorkspaceFilesNative, ImportResult, findImports } = nativeBinding
+const { expandOutputs, remove, copy, hashArray, hashFile, hashFiles, hashFilesMatchingGlobs, ImportResult, findImports, EventType, Watcher, WorkspaceErrors, getProjectConfigurations, getWorkspaceFilesNative } = nativeBinding
 
 module.exports.expandOutputs = expandOutputs
 module.exports.remove = remove
@@ -255,10 +255,10 @@ module.exports.hashArray = hashArray
 module.exports.hashFile = hashFile
 module.exports.hashFiles = hashFiles
 module.exports.hashFilesMatchingGlobs = hashFilesMatchingGlobs
+module.exports.ImportResult = ImportResult
+module.exports.findImports = findImports
 module.exports.EventType = EventType
 module.exports.Watcher = Watcher
 module.exports.WorkspaceErrors = WorkspaceErrors
 module.exports.getProjectConfigurations = getProjectConfigurations
 module.exports.getWorkspaceFilesNative = getWorkspaceFilesNative
-module.exports.ImportResult = ImportResult
-module.exports.findImports = findImports
diff --git a/packages/nx/src/native/logger/mod.rs b/packages/nx/src/native/logger/mod.rs
@@ -63,7 +63,7 @@ where
 
 pub(crate) fn enable_logger() {
     let env_filter =
-        EnvFilter::try_from_env("NX_NATIVE_LOGGING").unwrap_or_else(|_| EnvFilter::new("INFO"));
+        EnvFilter::try_from_env("NX_NATIVE_LOGGING").unwrap_or_else(|_| EnvFilter::new("ERROR"));
     _ = tracing_subscriber::fmt()
         .with_env_filter(env_filter)
         .event_format(NxLogFormatter)

diff --git a/packages/nx/src/native/mod.rs b/packages/nx/src/native/mod.rs
@@ -1,9 +1,9 @@
 pub mod cache;
 pub mod hasher;
 mod logger;
+pub mod plugins;
 mod types;
 mod utils;
 mod walker;
 pub mod watch;
 pub mod workspace;
-pub mod ts_import_locators;
diff --git a/packages/nx/src/native/plugins/js.rs b/packages/nx/src/native/plugins/js.rs
@@ -0,0 +1 @@
+mod ts_import_locators;