fix(auto-import): alias import preset

packages/auto-import/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @farmfe/plugin-auto-import
 
+## 0.0.3
+
+### Patch Changes
+
+- fix(auto-import): alias import preset
+
 ## 0.0.2
 
 ### Patch Changes

packages/auto-import/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@farmfe/plugin-auto-import",
-  "version": "0.0.2",
+  "version": "0.0.3",
   "main": "scripts/index.js",
   "types": "scripts/index.d.ts",
   "type": "module",

packages/auto-import/playground-vue/farm.config.ts

@@ -7,7 +7,15 @@ export default defineConfig({
   plugins: [
     visualizer(),
     farmAutoImport({
-    dirs: ["src/apis"],
-    dts: "./src/auto_import.d.ts",
-  })],
+      dts: "./src/auto_import.d.ts",
+      presets:[
+        "vue",
+        {
+          '@vueuse/core': [
+            'useMouse',
+            ['useFetch', 'useMyFetch']
+          ],
+        }
+      ]
+    })],
 });

packages/auto-import/playground-vue/package.json

@@ -9,13 +9,14 @@
     "clean": "farm clean"
   },
   "dependencies": {
+    "@vueuse/core": "^11.0.3",
     "vue": "^3.4.0"
   },
   "devDependencies": {
     "@farmfe/cli": "^1.0.2",
     "@farmfe/core": "^1.3.0",
-    "@vitejs/plugin-vue": "^5.0.4",
     "@farmfe/plugin-auto-import": "workspace:*",
+    "@vitejs/plugin-vue": "^5.0.4",
     "core-js": "^3.30.1"
   }
 }

packages/auto-import/playground-vue/src/App.vue

@@ -1,5 +1,12 @@
 <script setup lang="ts">
 import HelloWorld from './components/HelloWorld.vue'
+const s = useMyFetch("http:://baidu.com")
+const { x, y } = useMouse()
+watch(y, () => {
+  console.log(y)
+}, {
+  deep: true
+})
 </script>
 
 <template>

packages/auto-import/playground-vue/src/apis/name.ts

@@ -0,0 +1 @@
+export default function name() {}

packages/auto-import/playground-vue/src/auto_import.d.ts

@@ -1,5 +1,56 @@
 /* generated by farmfe_plugin_auto_import */
 export {} 
 declare global {
+	const name: typeof import('./apis/name.ts')['default']
 	const getName: typeof import('./apis/index.ts')['getName']
+	const onActivated: typeof import('vue')['onActivated']
+	const onBeforeMount: typeof import('vue')['onBeforeMount']
+	const onBeforeUnmount: typeof import('vue')['onBeforeUnmount']
+	const onBeforeUpdate: typeof import('vue')['onBeforeUpdate']
+	const onErrorCaptured: typeof import('vue')['onErrorCaptured']
+	const onDeactivated: typeof import('vue')['onDeactivated']
+	const onMounted: typeof import('vue')['onMounted']
+	const onServerPrefetch: typeof import('vue')['onServerPrefetch']
+	const onUnmounted: typeof import('vue')['onUnmounted']
+	const onUpdated: typeof import('vue')['onUpdated']
+	const useAttrs: typeof import('vue')['useAttrs']
+	const useSlots: typeof import('vue')['useSlots']
+	const computed: typeof import('vue')['computed']
+	const customRef: typeof import('vue')['customRef']
+	const isReadonly: typeof import('vue')['isReadonly']
+	const isRef: typeof import('vue')['isRef']
+	const isProxy: typeof import('vue')['isProxy']
+	const isReactive: typeof import('vue')['isReactive']
+	const markRaw: typeof import('vue')['markRaw']
+	const reactive: typeof import('vue')['reactive']
+	const readonly: typeof import('vue')['readonly']
+	const ref: typeof import('vue')['ref']
+	const shallowReactive: typeof import('vue')['shallowReactive']
+	const shallowReadonly: typeof import('vue')['shallowReadonly']
+	const shallowRef: typeof import('vue')['shallowRef']
+	const triggerRef: typeof import('vue')['triggerRef']
+	const toRaw: typeof import('vue')['toRaw']
+	const toRef: typeof import('vue')['toRef']
+	const toRefs: typeof import('vue')['toRefs']
+	const toValue: typeof import('vue')['toValue']
+	const unref: typeof import('vue')['unref']
+	const watch: typeof import('vue')['watch']
+	const watchEffect: typeof import('vue')['watchEffect']
+	const watchPostEffect: typeof import('vue')['watchPostEffect']
+	const watchSyncEffect: typeof import('vue')['watchSyncEffect']
+	const defineComponent: typeof import('vue')['defineComponent']
+	const defineAsyncComponent: typeof import('vue')['defineAsyncComponent']
+	const getCurrentInstance: typeof import('vue')['getCurrentInstance']
+	const h: typeof import('vue')['h']
+	const inject: typeof import('vue')['inject']
+	const nextTick: typeof import('vue')['nextTick']
+	const provide: typeof import('vue')['provide']
+	const useCssModule: typeof import('vue')['useCssModule']
+	const createApp: typeof import('vue')['createApp']
+	const effectScope: typeof import('vue')['effectScope']
+	const EffectScope: typeof import('vue')['EffectScope']
+	const getCurrentScope: typeof import('vue')['getCurrentScope']
+	const onScopeDispose: typeof import('vue')['onScopeDispose']
+	const useMouse: typeof import('@vueuse/core')['useMouse']
+	const useMyFetch: typeof import('@vueuse/core')['useFetch']
 }

packages/auto-import/src/parser/generate_dts.rs

@@ -21,27 +21,29 @@ pub fn remove_tsx_jsx_suffix(s: &str) -> String {
   re.replace(s, "").into_owned()
 }
 
-pub fn stringify_resolver(item: &Import) -> String {
+pub fn stringify_presets(item: &Import) -> String {
   format!(
     "\tconst {}: typeof import('{}')['{}']\n",
-    item.name, item.form, item.name
+    item.as_name.clone().unwrap_or(item.name.clone()), item.form, item.name
   )
 }
 
 pub fn stringify_imports_dts(dts_file_path: &str, item: &Import) -> String {
   let related = format!("./{}", relative(dts_file_path, &item.form));
   let import_path = remove_tsx_jsx_suffix(&related);
-  let is_export_component = match item.export_type {
-    ExportType::Default => false,
+  let is_export_decl = match item.export_type {
+    ExportType::DefaultDecl => false,
     _ => true,
   };
   let mut target = "default";
-  if is_export_component {
+  if is_export_decl {
     target = &item.name;
   }
   format!(
     "\tconst {}: typeof import('{}')['{}']\n",
-    item.name, import_path, target
+    item.as_name.clone().unwrap_or(item.name.clone()),
+    import_path,
+    target
   )
 }
 
@@ -61,7 +63,7 @@ pub fn generate_dts(option: GenerateDtsOption) {
     &option
       .presets_imports
       .iter()
-      .map(|&item| stringify_resolver(item))
+      .map(|&item| stringify_presets(item))
       .collect::<Vec<_>>()
       .join(""),
   );
@@ -98,9 +100,7 @@ mod tests {
     let imports = scan_dir_exports(root_path);
     println!("imports: {:#?}", imports);
 
-    let presets_imports = resolve_presets(&vec![PresetItem::String(
-      "react-router".to_string(),
-    )]);
+    let presets_imports = resolve_presets(&vec![PresetItem::String("react-router".to_string())]);
     let generate_dts_option = GenerateDtsOption {
       imports: &imports.iter().collect::<Vec<_>>(),
       presets_imports: &presets_imports.iter().collect::<Vec<_>>(),

packages/auto-import/src/parser/inject_imports.rs

@@ -47,7 +47,8 @@ fn get_exclude_imports(content: &str, imports: Vec<Import>) -> Vec<Import> {
   imports
     .into_iter()
     .filter(|item| {
-      let name = &item.name.as_str();
+      let name = item.as_name.clone().unwrap_or(item.name.clone());
+      let name = &name.as_str();
       !exclude_vars.contains(name) && include_vars.contains(name)
     })
     .collect()