@zhin.js/dependency 1.0.1 → 1.0.3

package/dist/hook-registry.js

@@ -1,3 +1,5 @@
+import { Dependency } from './dependency.js';
+import path from 'path';
 const dependencyStack = [];
 export function setCurrentDependency(dep) {
     if (dep) {
@@ -7,7 +9,7 @@ export function setCurrentDependency(dep) {
         dependencyStack.pop();
     }
 }
-function getCurrentDependency() {
+export function getCurrentDependency() {
     return dependencyStack.length > 0 ? dependencyStack[dependencyStack.length - 1] : null;
 }
 class HookRegistry {
@@ -43,10 +45,15 @@ class HookRegistry {
             if (!config) {
                 throw new Error(`Hook "${name}" is not registered. Please registerHook it first using registerHook().`);
             }
-            const currentDep = this.getCurrentDependency();
+            let currentDep = this.getCurrentDependency();
             if (!currentDep) {
-                console.warn(`No current dependency context for hook "${name}".`);
-                return;
+                if (name !== 'importModule') {
+                    console.warn(`No current dependency context for hook "${name}".`);
+                    return;
+                }
+                currentDep = new Dependency(args[1] || path.join(process.cwd(), './src/index'));
+                Dependency['globalDepMap'].set(currentDep.filePath, currentDep);
+                setCurrentDependency(currentDep);
             }
             return config.handler(currentDep, ...args);
         };

package/dist/hook-registry.js.map

@@ -1 +1 @@
-{"version":3,"file":"hook-registry.js","sourceRoot":"","sources":["../src/hook-registry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"hook-registry.js","sourceRoot":"","sources":["../src/hook-registry.ts"],"names":[],"mappings":"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"}

package/dist/hooks.d.ts

@@ -1,6 +1,8 @@
+import { Dependency } from './dependency.js';
 export declare function addListener(event: string, listener: () => void): () => void;
+export declare function useDependency(): Dependency;
 export declare function onMount(hook: () => void | Promise<void>): void;
-export declare function onDispose(hook: () => void | Promise<void>): void;
-export declare function importModule(importPath: string): Promise<void>;
+export declare function onDispose(hook: () => void | Promise<void>, inner?: boolean): void;
+export declare function importModule(importPath: string, importModulePath?: string): Promise<void>;
 export { registerHook, unregisterHook, useHook, hasHook, getAllHooks } from './hook-registry.js';
 //# sourceMappingURL=hooks.d.ts.map

package/dist/hooks.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":"AA8DA,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAE3E;AAMD,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAE9D;AAMD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAEhE;AAMD,wBAAsB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAEpE;AAID,OAAO,EACL,YAAY,EACZ,cAAc,EACd,OAAO,EACP,OAAO,EACP,WAAW,EACZ,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"hooks.d.ts","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAqE7C,wBAAgB,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,IAAI,GAAG,MAAM,IAAI,CAE3E;AACD,wBAAgB,aAAa,IAAI,UAAU,CAE1C;AAKD,wBAAgB,OAAO,CAAC,IAAI,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAE9D;AAQD,wBAAgB,SAAS,CAAC,IAAI,EAAE,MAAM,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,KAAK,GAAE,OAAe,GAAG,IAAI,CAExF;AAMD,wBAAsB,YAAY,CAAC,UAAU,EAAE,MAAM,EAAC,gBAAgB,CAAC,EAAC,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAE7F;AAID,OAAO,EACL,YAAY,EACZ,cAAc,EACd,OAAO,EACP,OAAO,EACP,WAAW,EACZ,MAAM,oBAAoB,CAAC"}

package/dist/hooks.js

@@ -14,31 +14,41 @@ registerHook({
     },
     description: 'registerHook a mount hook for the current dependency'
 });
+registerHook({
+    name: 'useDependency',
+    handler: (dep) => {
+        return dep;
+    },
+    description: 'use the current dependency'
+});
 registerHook({
     name: 'onDispose',
-    handler: (dep, hook) => {
-        dep.addDisposeHook(hook);
+    handler: (dep, hook, inner = false) => {
+        dep.addDisposeHook(hook, inner);
     },
     description: 'registerHook a dispose hook for the current dependency'
 });
 registerHook({
     name: 'importModule',
-    handler: async (dep, importPath) => {
-        await dep.importChild(importPath);
+    handler: async (dep, importPath, importModulePath) => {
+        await dep.importChild(importPath, importModulePath);
     },
     description: 'Import a module and create a child dependency'
 });
 export function addListener(event, listener) {
     return useHook('addListener')(event, listener);
 }
+export function useDependency() {
+    return useHook('useDependency')();
+}
 export function onMount(hook) {
     return useHook('onMount')(hook);
 }
-export function onDispose(hook) {
-    return useHook('onDispose')(hook);
+export function onDispose(hook, inner = false) {
+    return useHook('onDispose')(hook, inner);
 }
-export async function importModule(importPath) {
-    return useHook('importModule')(importPath);
+export async function importModule(importPath, importModulePath) {
+    return useHook('importModule')(importPath, importModulePath);
 }
 export { registerHook, unregisterHook, useHook, hasHook, getAllHooks } from './hook-registry.js';
 //# sourceMappingURL=hooks.js.map

package/dist/hooks.js.map

@@ -1 +1 @@
-{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAS3D,YAAY,CAAC;IACX,IAAI,EAAE,aAAa;IACnB,OAAO,EAAE,CAAC,GAAe,EAAE,KAAa,EAAE,QAAoB,EAAE,EAAE;QAChE,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACxB,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACxC,CAAC;IACD,WAAW,EAAE,iDAAiD;CAC/D,CAAC,CAAC;AAMH,YAAY,CAAC;IACX,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,CAAC,GAAe,EAAE,IAAgC,EAAE,EAAE;QAC7D,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IACD,WAAW,EAAE,sDAAsD;CACpE,CAAC,CAAC;AAMH,YAAY,CAAC;IACX,IAAI,EAAE,WAAW;IACjB,OAAO,EAAE,CAAC,GAAe,EAAE,IAAgC,EAAE,EAAE;QAC7D,GAAG,CAAC,cAAc,CAAC,IAAI,CAAC,CAAC;IAC3B,CAAC;IACD,WAAW,EAAE,wDAAwD;CACtE,CAAC,CAAC;AAMH,YAAY,CAAC;IACX,IAAI,EAAE,cAAc;IACpB,OAAO,EAAE,KAAK,EAAE,GAAe,EAAE,UAAkB,EAAE,EAAE;QACrD,MAAM,GAAG,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;IACpC,CAAC;IACD,WAAW,EAAE,+CAA+C;CAC7D,CAAC,CAAC;AASH,MAAM,UAAU,WAAW,CAAC,KAAa,EAAE,QAAoB;IAC7D,OAAO,OAAO,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;AACjD,CAAC;AAMD,MAAM,UAAU,OAAO,CAAC,IAAgC;IACtD,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC;AAMD,MAAM,UAAU,SAAS,CAAC,IAAgC;IACxD,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,CAAC,CAAC;AACpC,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,UAAkB;IACnD,OAAO,OAAO,CAAC,cAAc,CAAC,CAAC,UAAU,CAAC,CAAC;AAC7C,CAAC;AAID,OAAO,EACL,YAAY,EACZ,cAAc,EACd,OAAO,EACP,OAAO,EACP,WAAW,EACZ,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"hooks.js","sourceRoot":"","sources":["../src/hooks.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAC;AAS3D,YAAY,CAAC;IACX,IAAI,EAAE,aAAa;IACnB,OAAO,EAAE,CAAC,GAAe,EAAE,KAAa,EAAE,QAAoB,EAAE,EAAE;QAChE,GAAG,CAAC,EAAE,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;QACxB,OAAO,GAAG,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;IACxC,CAAC;IACD,WAAW,EAAE,iDAAiD;CAC/D,CAAC,CAAC;AAMH,YAAY,CAAC;IACX,IAAI,EAAE,SAAS;IACf,OAAO,EAAE,CAAC,GAAe,EAAE,IAAgC,EAAE,EAAE;QAC7D,GAAG,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC;IACzB,CAAC;IACD,WAAW,EAAE,sDAAsD;CACpE,CAAC,CAAC;AACH,YAAY,CAAC;IACX,IAAI,EAAE,eAAe;IACrB,OAAO,EAAE,CAAC,GAAe,EAAE,EAAE;QAC3B,OAAO,GAAG,CAAC;IACb,CAAC;IACD,WAAW,EAAE,4BAA4B;CAC1C,CAAC,CAAA;AAMF,YAAY,CAAC;IACX,IAAI,EAAE,WAAW;IACjB,OAAO,EAAE,CAAC,GAAe,EAAE,IAAgC,EAAE,QAAiB,KAAK,EAAE,EAAE;QACrF,GAAG,CAAC,cAAc,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;IAClC,CAAC;IACD,WAAW,EAAE,wDAAwD;CACtE,CAAC,CAAC;AAMH,YAAY,CAAC;IACX,IAAI,EAAE,cAAc;IACpB,OAAO,EAAE,KAAK,EAAE,GAAe,EAAE,UAAkB,EAAC,gBAAwB,EAAE,EAAE;QAC9E,MAAM,GAAG,CAAC,WAAW,CAAC,UAAU,EAAC,gBAAgB,CAAC,CAAC;IACrD,CAAC;IACD,WAAW,EAAE,+CAA+C;CAC7D,CAAC,CAAC;AASH,MAAM,UAAU,WAAW,CAAC,KAAa,EAAE,QAAoB;IAC7D,OAAO,OAAO,CAAC,aAAa,CAAC,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;AACjD,CAAC;AACD,MAAM,UAAU,aAAa;IAC3B,OAAO,OAAO,CAAC,eAAe,CAAC,EAAE,CAAC;AACpC,CAAC;AAKD,MAAM,UAAU,OAAO,CAAC,IAAgC;IACtD,OAAO,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,CAAC;AAClC,CAAC;AAQD,MAAM,UAAU,SAAS,CAAC,IAAgC,EAAE,QAAiB,KAAK;IAChF,OAAO,OAAO,CAAC,WAAW,CAAC,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;AAC3C,CAAC;AAMD,MAAM,CAAC,KAAK,UAAU,YAAY,CAAC,UAAkB,EAAC,gBAAwB;IAC5E,OAAO,OAAO,CAAC,cAAc,CAAC,CAAC,UAAU,EAAC,gBAAgB,CAAC,CAAC;AAC9D,CAAC;AAID,OAAO,EACL,YAAY,EACZ,cAAc,EACd,OAAO,EACP,OAAO,EACP,WAAW,EACZ,MAAM,oBAAoB,CAAC"}

package/dist/index.d.ts

@@ -1,4 +1,6 @@
 export * from './dependency.js';
 export * from './hooks.js';
+export { getCurrentDependency } from './hook-registry.js';
 export type { HookFunction, HookConfig, Hooks } from './hook-registry.js';
+export type { Constructor, EffectCleanup, TimerId, ImmediateId, WrappedEffects } from './types.js';
 //# sourceMappingURL=index.d.ts.map

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC;AAC1D,YAAY,EAAE,YAAY,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAC1E,YAAY,EAAE,WAAW,EAAE,aAAa,EAAE,OAAO,EAAE,WAAW,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC"}

package/dist/index.js

@@ -1,3 +1,4 @@
 export * from './dependency.js';
 export * from './hooks.js';
+export { getCurrentDependency } from './hook-registry.js';
 //# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,iBAAiB,CAAC;AAChC,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,oBAAoB,EAAE,MAAM,oBAAoB,CAAC"}

package/dist/types.d.ts

@@ -1,4 +1,12 @@
 export type Constructor<T> = {
     new (...args: any[]): T;
 };
+export type EffectCleanup = () => void;
+export type TimerId = ReturnType<typeof setInterval> | ReturnType<typeof setTimeout>;
+export type ImmediateId = ReturnType<typeof setImmediate>;
+export interface WrappedEffects {
+    setInterval: typeof globalThis.setInterval;
+    setTimeout: typeof globalThis.setTimeout;
+    setImmediate: typeof globalThis.setImmediate;
+}
 //# sourceMappingURL=types.d.ts.map

package/dist/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,CAAC,CAAC,IAAG;IACxB,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;CAC3B,CAAC"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,WAAW,CAAC,CAAC,IAAG;IACxB,KAAK,GAAG,IAAI,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC;CAC3B,CAAC;AAKF,MAAM,MAAM,aAAa,GAAG,MAAM,IAAI,CAAC;AAKvC,MAAM,MAAM,OAAO,GAAG,UAAU,CAAC,OAAO,WAAW,CAAC,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;AAKrF,MAAM,MAAM,WAAW,GAAG,UAAU,CAAC,OAAO,YAAY,CAAC,CAAC;AAK1D,MAAM,WAAW,cAAc;IAC7B,WAAW,EAAE,OAAO,UAAU,CAAC,WAAW,CAAC;IAC3C,UAAU,EAAE,OAAO,UAAU,CAAC,UAAU,CAAC;IACzC,YAAY,EAAE,OAAO,UAAU,CAAC,YAAY,CAAC;CAC9C"}

package/loaders/bun-plugin.ts

@@ -37,10 +37,10 @@ export function createDependencyTreePlugin(): BunPlugin {
         
         // 二次检查：使用统一的判断逻辑（支持 EXCLUDE）
         if (!shouldTransformPath(args.path, ['.ts', '.js'])) {
-          // 不需要处理此文件，返回原始内容
+          // 不需要处理此文件，返回原内容
           return {
             contents: source,
-            loader: 'ts',
+            loader: args.path.endsWith('.ts') ? 'ts' : 'js',
           };
         }
         
@@ -53,19 +53,22 @@ export function createDependencyTreePlugin(): BunPlugin {
         
         // 如果不是热重载，且已经转换过或没有相对导入，跳过转换
         if (!isHotReload && (alreadyTransformed || !hasRelativeImports(source))) {
-          // 返回原始内容，不进行转换
+          // 返回原内容
           return {
             contents: source,
-            loader: 'ts',
+            loader: args.path.endsWith('.ts') ? 'ts' : 'js',
           };
         }
         
         // 转换相对路径的 import 语句
         const transformed = transformImports(source, args.path, isHotReload, '__BUN_PLUGIN_TRANSFORMED__');
         
+        // 根据文件扩展名确定 loader
+        const loader = args.path.endsWith('.ts') ? 'ts' : 'js';
+        
         return {
           contents: transformed,
-          loader: 'ts',
+          loader: loader as 'ts' | 'js',
         };
       });
     },

package/loaders/transform-utils.mjs

@@ -11,6 +11,58 @@ export function hasRelativeImports(source) {
   return /^import\s+['"](\.[^'"]+)['"]/m.test(source);
 }
 
+/**
+ * 生成副作用包装代码
+ * 包装全局副作用函数，自动添加清理逻辑到 onDispose
+ */
+function generateEffectWrappers() {
+  return [`
+const __EFFECTS__=[];
+const __globalSetInterval = globalThis.setInterval;
+const __globalSetTimeout = globalThis.setTimeout;
+const __globalSetImmediate = typeof setImmediate !== 'undefined' ? globalThis.setImmediate : null;
+
+
+const setInterval = function(...args) {
+  const timerId = __globalSetInterval.apply(this, args);
+  __EFFECTS__.push(() => clearInterval(timerId));
+  return timerId;
+};
+
+const setTimeout = function(...args) {
+  const timerId = __globalSetTimeout.apply(this, args);
+  __EFFECTS__.push(() => clearTimeout(timerId));
+  return timerId;
+};
+
+if (__globalSetImmediate) {
+  const setImmediate = function(...args) {
+    const immediateId = __globalSetImmediate.apply(this, args);
+    __EFFECTS__.push(() => clearImmediate(immediateId));
+    return immediateId;
+  };
+}`,
+`onDispose(async () => {
+  while(__EFFECTS__.length>0){
+    await __EFFECTS__.shift()();
+  }
+}, true);`,
+];
+}
+
+/**
+ * 检查是否启用副作用包装
+ * 通过环境变量 DEPENDENCY_WRAP_EFFECTS 控制
+ * 值为 'false' 或 '0' 时禁用，其他情况默认启用
+ */
+function shouldWrapEffects() {
+  const envValue = process.env.DEPENDENCY_WRAP_EFFECTS;
+  if (envValue === 'false' || envValue === '0') {
+    return false;
+  }
+  return true; // 默认启用
+}
+
 /**
  * 转换 import 语句
  * @param {string} source - 源代码
@@ -19,36 +71,65 @@ export function hasRelativeImports(source) {
  * @param {string} marker - 转换标记（如 '__LOADER_TRANSFORMED__' 或 '__BUN_PLUGIN_TRANSFORMED__'）
  */
 export function transformImports(source, currentPath, isHotReload = false, marker = '__LOADER_TRANSFORMED__') {
-  // 检查是否有相对路径的 import
-  if (!hasRelativeImports(source) && !isHotReload) {
+  // 检查是否需要转换
+  const needsImportTransform = hasRelativeImports(source);
+  const wrapEffects = shouldWrapEffects();
+  const hooksPath = pkgJson.name;
+
+  if (wrapEffects) {
+    const hasOnDispose = source.includes('onDispose');
+    if (!hasOnDispose) {
+      source = `import { onDispose } from '${hooksPath}';\n` + source;
+    }
+    // 收集所有import 行（改为可选换行符，支持不同操作系统）
+    const importLines = source.match(/import\s+[^;]+from\s+(['"])([^'"]+)\1;[\r\n]*/gm) || [];
+    const lastImportLine = importLines[importLines.length - 1];
+    const [before,after] = generateEffectWrappers();
+    if (lastImportLine) {
+      source = source.replace(lastImportLine, lastImportLine + before);
+    } else {
+      // 没有 import 语句，在文件开头添加
+      source = before + source;
+    }
+    source = source + after;
+  }
+  // 如果不需要任何转换，直接返回原始代码
+  // 注意：如果启用了副作用包装，即使没有相对引用也需要继续处理
+  if (!needsImportTransform && !isHotReload && !wrapEffects) {
     return source;
   }
-  
+
+  // 如果只启用了副作用包装，没有其他转换，直接返回已注入副作用包装的代码
+  if (!needsImportTransform && !isHotReload) {
+    return source;
+  }
+
   // 添加标记（热重载时添加时间戳）
-  let result = isHotReload 
+  let result = isHotReload
     ? `/* ${marker} (Hot Reload: ${Date.now()}) */\n`
     : `/* ${marker} */\n`;
-  
-  // 检查是否已有 importModule 导入
-  const hasImportModule = /import.*importModule.*from.*hooks/.test(source);
-  
-  // 如果没有，添加 importModule 导入
-  if (!hasImportModule) {
-    const hooksPath = pkgJson.name;
+
+  // 2. 检查是否已有 importModule 导入
+  const hasImportModule = /import.*importModule.*from.*${hooksPath}/.test(source);
+
+  // 如果没有且需要转换 import，添加 importModule 导入
+  if (needsImportTransform && !hasImportModule) {
     result += `import { importModule } from '${hooksPath}';\n`;
   }
-  
-  // 转换相对路径的 import
-  // 注意：先转换 source，然后再拼接
-  const transformedSource = source.replace(
-    /^import\s+(['"])(\.[^'"]+)\1;?\s*$/gm,
-    (match, quote, importPath) => {
-      return `await importModule(${quote}${importPath}${quote});`;
-    }
-  );
-  
+
+  // 3. 转换相对路径的 import
+  let transformedSource = source;
+  if (needsImportTransform) {
+    transformedSource = source.replace(
+      /^import\s+(['"])(\.[^'"]+)\1;?\s*$/gm,
+      (match, quote, importPath) => {
+        return `await importModule(${quote}${importPath}${quote},${quote}${currentPath}${quote});`;
+      }
+    );
+  }
+
   result += transformedSource;
-  
+
   return result;
 }
 
@@ -73,13 +154,13 @@ export function transformImports(source, currentPath, isHotReload = false, marke
 export function shouldTransformPath(path, extensions = ['.ts', '.js']) {
   // 去除查询参数（如 ?t=timestamp）
   const [actualPath] = path.split('?');
-  
+
   // 检查扩展名
   const hasValidExtension = extensions.some(ext => actualPath.endsWith(ext));
   if (!hasValidExtension) {
     return false;
   }
-  
+
   // 1. 检查 INCLUDE 路径（优先级最高，即使在 node_modules 中也处理）
   const includePaths = process.env.DEPENDENCY_TREE_INCLUDE;
   if (includePaths) {
@@ -88,7 +169,7 @@ export function shouldTransformPath(path, extensions = ['.ts', '.js']) {
       return true; // 明确包含，直接返回 true
     }
   }
-  
+
   // 2. 检查 EXCLUDE 路径（优先级第二）
   const excludePaths = process.env.DEPENDENCY_TREE_EXCLUDE;
   if (excludePaths) {
@@ -97,12 +178,12 @@ export function shouldTransformPath(path, extensions = ['.ts', '.js']) {
       return false; // 明确排除
     }
   }
-  
+
   // 3. 默认规则：排除所有 node_modules，除非明确 INCLUDE
   if (actualPath.includes('/node_modules/')) {
     return false;
   }
-  
+
   return true;
 }
 

package/loaders/tsx-loader.mjs

@@ -52,11 +52,12 @@ export async function load(url, context, nextLoad) {
       // 转换相对路径的 import 语句
       const transformed = transformImports(source, actualUrl, isHotReload, '__LOADER_TRANSFORMED__');
       
-      return {
+      // 不使用 shortCircuit，让 tsx 继续处理 TypeScript 转译
+      return nextLoad(url, {
+        ...context,
         format: 'module',
         source: transformed,
-        shortCircuit: true,
-      };
+      });
     } catch (error) {
       console.error('Loader error:', error);
       return nextLoad(url, context);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhin.js/dependency",
-  "version": "1.0.1",
+  "version": "1.0.3",
   "description": "A TypeScript dependency tree analyzer with ESM support",
   "type": "module",
   "main": "./dist/index.js",
@@ -36,6 +36,11 @@
     "@types/bun": "^1.2.0",
     "typescript": "^5.3.0"
   },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/zhinjs/zhin.git",
+    "directory": "basic/dependency"
+  },
   "scripts": {
     "build": "tsc",
     "dev": "tsc --watch",