chore: keep fixing

Author: hardfist

crates/rspack_core/src/concatenated_module.rs

@@ -20,7 +20,7 @@ use rspack_collections::{
 use rspack_error::{Diagnosable, Diagnostic, Error, Result, ToStringResultToRspackResultExt};
 use rspack_hash::{HashDigest, HashFunction, RspackHash, RspackHashDigest};
 use rspack_hook::define_hook;
-use rspack_javascript_compiler::ast::Ast;
+use rspack_javascript_compiler::{ast::Ast, transform::parse_file_as_module};
 use rspack_sources::{
   BoxSource, CachedSource, ConcatSource, RawStringSource, ReplaceSource, Source, SourceExt,
 };
@@ -33,7 +33,7 @@ use swc_core::{
   ecma::{
     ast::{EsVersion, Program},
     atoms::Atom,
-    parser::{Syntax, parse_file_as_module},
+    parser::Syntax,
     transforms::base::resolver,
   },
 };

crates/rspack_javascript_compiler/src/compiler/transform.rs

@@ -34,16 +34,15 @@ use swc_core::{
     FileName, GLOBALS, Mark, SourceFile, SourceMap,
     comments::{Comments, SingleThreadedComments},
     errors::Handler,
+    input::SourceFileInput,
   },
   ecma::{
-    ast::{EsVersion, Pass, Program},
-    parser::{
-      Syntax, parse_file_as_commonjs, parse_file_as_module, parse_file_as_program,
-      parse_file_as_script,
-    },
+    ast::{EsVersion, Module, Pass, Program, Script},
+    parser::{Lexer, PResult, Parser, Syntax, unstable::Capturing},
     transforms::base::helpers::{self, Helpers},
   },
 };
+use swc_ecma_lexer::error::Error;
 use swc_error_reporters::handler::try_with_handler;
 use url::Url;
 
@@ -650,3 +649,68 @@ impl<'a> JavaScriptTransformer<'a> {
     }
   }
 }
+
+pub fn parse_file_as_module(
+  fm: &SourceFile,
+  syntax: Syntax,
+  target: EsVersion,
+  comments: Option<&dyn Comments>,
+  recovered_errors: &mut Vec<Error>,
+) -> PResult<Module> {
+  with_file_parser(fm, syntax, target, comments, recovered_errors, |p| {
+    p.parse_module()
+  })
+}
+
+pub fn with_file_parser<T>(
+  fm: &SourceFile,
+  syntax: Syntax,
+  target: EsVersion,
+  comments: Option<&dyn Comments>,
+  recovered_errors: &mut Vec<Error>,
+  op: impl for<'aa> FnOnce(&mut Parser<Capturing<Lexer>>) -> PResult<T>,
+) -> PResult<T> {
+  let lexer = self::Lexer::new(syntax, target, SourceFileInput::from(fm), comments);
+  let mut p = Parser::new_from(Capturing::new(lexer));
+  let ret = op(&mut p);
+
+  recovered_errors.append(&mut p.take_errors());
+
+  ret
+}
+
+pub fn parse_file_as_script(
+  fm: &SourceFile,
+  syntax: Syntax,
+  target: EsVersion,
+  comments: Option<&dyn Comments>,
+  recovered_errors: &mut Vec<Error>,
+) -> PResult<Script> {
+  with_file_parser(fm, syntax, target, comments, recovered_errors, |p| {
+    p.parse_script()
+  })
+}
+
+pub fn parse_file_as_commonjs(
+  fm: &SourceFile,
+  syntax: Syntax,
+  target: EsVersion,
+  comments: Option<&dyn Comments>,
+  recovered_errors: &mut Vec<Error>,
+) -> PResult<Script> {
+  with_file_parser(fm, syntax, target, comments, recovered_errors, |p| {
+    p.parse_commonjs()
+  })
+}
+
+pub fn parse_file_as_program(
+  fm: &SourceFile,
+  syntax: Syntax,
+  target: EsVersion,
+  comments: Option<&dyn Comments>,
+  recovered_errors: &mut Vec<Error>,
+) -> PResult<Program> {
+  with_file_parser(fm, syntax, target, comments, recovered_errors, |p| {
+    p.parse_program()
+  })
+}