11use crate :: collector:: { new_ident_from_id, GlobalCollect , Id , ImportKind } ;
2- use crate :: parse:: {
3- emit_source_code, might_need_handle_watch, HookAnalysis , PathData , TransformModule ,
4- TransformOutput ,
5- } ;
2+ use crate :: parse:: PathData ;
63use crate :: transform:: { add_handle_watch, create_synthetic_named_import} ;
74use crate :: words:: * ;
85
9- use std:: collections:: BTreeMap ;
10- use std:: path:: Path ;
11-
12- use anyhow:: { Context , Error } ;
13- use path_slash:: PathExt ;
6+ use anyhow:: Error ;
147use swc_atoms:: JsWord ;
158use swc_common:: comments:: { SingleThreadedComments , SingleThreadedCommentsMap } ;
16- use swc_common:: { sync :: Lrc , SourceMap , DUMMY_SP } ;
9+ use swc_common:: DUMMY_SP ;
1710use swc_ecmascript:: ast;
1811use swc_ecmascript:: utils:: private_ident;
1912
@@ -158,32 +151,6 @@ pub fn new_module(ctx: NewModuleCtx) -> Result<(ast::Module, SingleThreadedComme
158151 Ok ( ( module, comments) )
159152}
160153
161- pub fn fix_path < S : AsRef < Path > , D : AsRef < Path > > (
162- src : S ,
163- dest : D ,
164- ident : & str ,
165- ) -> Result < JsWord , Error > {
166- let src = src. as_ref ( ) ;
167- let dest = dest. as_ref ( ) ;
168- if ident. starts_with ( '.' ) {
169- let diff = pathdiff:: diff_paths ( src, dest) ;
170-
171- if let Some ( diff) = diff {
172- let normalize = diff. to_slash_lossy ( ) ;
173- let relative = relative_path:: RelativePath :: new ( & normalize) ;
174- let final_path = relative. join ( ident) . normalize ( ) ;
175- let final_str = final_path. as_str ( ) ;
176- return Ok ( if final_str. starts_with ( '.' ) {
177- JsWord :: from ( final_str)
178- } else {
179- JsWord :: from ( format ! ( "./{}" , final_str) )
180- } ) ;
181- }
182- }
183-
184- Ok ( JsWord :: from ( ident) )
185- }
186-
187154fn create_named_export ( expr : Box < ast:: Expr > , name : & str ) -> ast:: ModuleItem {
188155 ast:: ModuleItem :: ModuleDecl ( ast:: ModuleDecl :: ExportDecl ( ast:: ExportDecl {
189156 span : DUMMY_SP ,
@@ -206,123 +173,6 @@ fn create_named_export(expr: Box<ast::Expr>, name: &str) -> ast::ModuleItem {
206173 } ) )
207174}
208175
209- #[ test]
210- fn test_fix_path ( ) {
211- assert_eq ! (
212- fix_path( "src" , "" , "./state.qwik.mjs" ) . unwrap( ) ,
213- JsWord :: from( "./src/state.qwik.mjs" )
214- ) ;
215-
216- assert_eq ! (
217- fix_path( "src/path" , "" , "./state" ) . unwrap( ) ,
218- JsWord :: from( "./src/path/state" )
219- ) ;
220-
221- assert_eq ! (
222- fix_path( "src" , "" , "../state" ) . unwrap( ) ,
223- JsWord :: from( "./state" )
224- ) ;
225- assert_eq ! (
226- fix_path( "a" , "a" , "./state" ) . unwrap( ) ,
227- JsWord :: from( "./state" )
228- ) ;
229- }
230-
231- pub fn generate_entries (
232- mut output : TransformOutput ,
233- core_module : & JsWord ,
234- explicit_extensions : bool ,
235- root_dir : Option < & Path > ,
236- ) -> Result < TransformOutput , anyhow:: Error > {
237- let source_map = Lrc :: new ( SourceMap :: default ( ) ) ;
238- let mut entries_map: BTreeMap < & str , Vec < & HookAnalysis > > = BTreeMap :: new ( ) ;
239- let mut new_modules = Vec :: with_capacity ( output. modules . len ( ) ) ;
240- {
241- let hooks: Vec < & HookAnalysis > = output. modules . iter ( ) . flat_map ( |m| & m. hook ) . collect ( ) ;
242- for hook in hooks {
243- if let Some ( ref e) = hook. entry {
244- entries_map. entry ( e. as_ref ( ) ) . or_default ( ) . push ( hook) ;
245- }
246- }
247-
248- for ( entry, hooks) in & entries_map {
249- let module = new_entry_module ( entry, hooks, core_module, explicit_extensions) ;
250- let ( code, map) =
251- emit_source_code ( Lrc :: clone ( & source_map) , None , & module, root_dir, false )
252- . context ( "Emitting source code" ) ?;
253- new_modules. push ( TransformModule {
254- path : [ entry, ".js" ] . concat ( ) ,
255- code,
256- map,
257- is_entry : true ,
258- hook : None ,
259- order : 0 ,
260- } ) ;
261- }
262- }
263- output. modules . append ( & mut new_modules) ;
264-
265- Ok ( output)
266- }
267-
268- fn new_entry_module (
269- path : & str ,
270- hooks : & [ & HookAnalysis ] ,
271- core_module : & JsWord ,
272- explicit_extensions : bool ,
273- ) -> ast:: Module {
274- let mut module = ast:: Module {
275- span : DUMMY_SP ,
276- body : Vec :: with_capacity ( hooks. len ( ) ) ,
277- shebang : None ,
278- } ;
279- let mut need_handle_watch = false ;
280- for hook in hooks {
281- // TODO fix the path from the entry to the hook in case of mismatched location
282- let mut src = fix_path (
283- hook. path . to_string ( ) ,
284- Path :: new ( path) . parent ( ) . unwrap ( ) . to_str ( ) . unwrap ( ) ,
285- & [ "./" , & hook. canonical_filename ] . concat ( ) ,
286- )
287- . unwrap ( )
288- . to_string ( ) ;
289- if explicit_extensions {
290- src = src + "." + hook. extension . as_ref ( ) ;
291- }
292- if might_need_handle_watch ( & hook. ctx_kind , & hook. ctx_name ) {
293- need_handle_watch = true ;
294- }
295- module
296- . body
297- . push ( ast:: ModuleItem :: ModuleDecl ( ast:: ModuleDecl :: ExportNamed (
298- ast:: NamedExport {
299- span : DUMMY_SP ,
300- type_only : false ,
301- with : None ,
302- src : Some ( Box :: new ( ast:: Str {
303- span : DUMMY_SP ,
304- value : JsWord :: from ( src) ,
305- raw : None ,
306- } ) ) ,
307- specifiers : vec ! [ ast:: ExportSpecifier :: Named ( ast:: ExportNamedSpecifier {
308- is_type_only: false ,
309- span: DUMMY_SP ,
310- orig: ast:: ModuleExportName :: Ident ( ast:: Ident :: new(
311- hook. name. clone( ) ,
312- DUMMY_SP ,
313- Default :: default ( ) ,
314- ) ) ,
315- exported: None ,
316- } ) ] ,
317- } ,
318- ) ) ) ;
319- }
320- if need_handle_watch {
321- add_handle_watch ( & mut module. body , core_module) ;
322- }
323- module
324- }
325-
326176pub fn transform_function_expr (
327177 expr : ast:: Expr ,
328178 use_lexical_scope : & Id ,
0 commit comments