Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions rust-plugins/auto-import/options.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -46,4 +46,5 @@ export interface IPluginOptions {
presets?: Preset[];
include?: string[];
exclude?: string[];
injectAtEnd?: boolean;
}
4 changes: 3 additions & 1 deletion rust-plugins/auto-import/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -84,6 +84,7 @@ impl Default for Dts {
}

#[derive(serde::Deserialize, serde::Serialize, Clone, Debug)]
#[serde(rename_all = "camelCase")]
pub struct Options {
pub dirs: Option<Vec<ConfigRegex>>,
pub dts: Option<Dts>,
Expand All @@ -92,6 +93,7 @@ pub struct Options {
pub import_mode: Option<ImportMode>,
pub include: Option<Vec<ConfigRegex>>,
pub exclude: Option<Vec<ConfigRegex>>,
pub inject_at_end: Option<bool>,
}

#[farm_plugin]
Expand Down Expand Up @@ -157,7 +159,7 @@ impl Plugin for FarmfePluginAutoImport {
vue_template_addon(&mut content, &imports);
}
let content =
parser::inject_imports::inject_imports(&content, imports.clone().to_vec(), None);
parser::inject_imports::inject_imports(&content, imports.clone().to_vec(), None, options.inject_at_end.unwrap_or(false));
// let (cm, src) = create_swc_source_map(Source {
// path: PathBuf::from(param.resolved_path),
// content: Arc::new(content.clone()),
Expand Down
13 changes: 10 additions & 3 deletions rust-plugins/auto-import/src/parser/inject_imports.rs
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ fn get_exclude_imports(content: &str, imports: Vec<Import>) -> Vec<Import> {
.collect()
}

pub fn inject_imports(content: &str, imports: Vec<Import>, priority: Option<usize>) -> String {
pub fn inject_imports(content: &str, imports: Vec<Import>, priority: Option<usize>, inject_at_end: bool) -> String {
let esm_imports = parse_esm_imports(None, Some(content));
let imports = get_exclude_imports(&content, imports)
.into_iter()
Expand Down Expand Up @@ -132,7 +132,14 @@ pub fn inject_imports(content: &str, imports: Vec<Import>, priority: Option<usiz
})
})
.collect::<Vec<Import>>();
let inject_idx = if inject_at_end {
esm_imports.last().map_or(0, |i| i.span.hi.0 as usize)
} else {
0
};
let mut content_str = stringify_imports(imports);
content_str.push_str(content);
content_str
let mut content = content.to_string();
content.insert_str(inject_idx, &content_str);
// content_str.push_str(content);
content
}
8 changes: 6 additions & 2 deletions rust-plugins/auto-import/src/parser/parse.rs
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
use std::{collections::HashMap, fs};

use farmfe_core::{
swc_ecma_ast::*,
swc_ecma_parser::{Syntax, TsSyntax},
swc_common::Span, swc_ecma_ast::*, swc_ecma_parser::{Syntax, TsSyntax}
};
use farmfe_toolkit::{
script::{parse_module, ParseScriptModuleResult},
Expand Down Expand Up @@ -69,6 +68,7 @@ pub struct ESMImport {
pub namespaced_import: Option<String>,
pub named_imports: Option<HashMap<String, String>>,
pub type_named_imports: Option<HashMap<String, String>>,
pub span: Span,
}

pub struct ImportsVisitor {
Expand Down Expand Up @@ -124,6 +124,7 @@ impl Visit for ImportsVisitor {
namespaced_import: None,
named_imports: None,
type_named_imports: None,
span: import.span
});
}
ImportSpecifier::Namespace(namespace) => {
Expand All @@ -135,6 +136,7 @@ impl Visit for ImportsVisitor {
default_import: None,
named_imports: None,
type_named_imports: None,
span: import.span
});
}
}
Expand All @@ -147,6 +149,7 @@ impl Visit for ImportsVisitor {
namespaced_import: None,
type_named_imports: None,
named_imports: Some(named_imports),
span: import.span
});
}
if !type_named_imports.is_empty() {
Expand All @@ -157,6 +160,7 @@ impl Visit for ImportsVisitor {
namespaced_import: None,
type_named_imports: Some(type_named_imports),
named_imports: None,
span: import.span
});
}
}
Expand Down
Loading