fix(compiler): enhance npm module resolution with new script module handling and dependency ID resolution (#148)

Author: dos1in

fe/packages/compiler/__tests__/npm-resolver.spec.js

@@ -113,6 +113,44 @@ describe('NpmResolver', () => {
 		})
 	})
 
+	describe('resolveScriptModule', () => {
+		it('应该优先解析最近目录下的 npm 脚本模块', () => {
+			const localPackagePath = path.join(tempDir, 'pages/feature/miniprogram_npm/westore')
+			const rootPackagePath = path.join(tempDir, 'miniprogram_npm/westore')
+			const pageFilePath = path.join(tempDir, 'pages/feature/index.js')
+
+			fs.mkdirSync(localPackagePath, { recursive: true })
+			fs.mkdirSync(rootPackagePath, { recursive: true })
+			fs.writeFileSync(path.join(localPackagePath, 'package.json'), JSON.stringify({ main: 'local.js' }))
+			fs.writeFileSync(path.join(localPackagePath, 'local.js'), 'module.exports = "local"')
+			fs.writeFileSync(path.join(rootPackagePath, 'package.json'), JSON.stringify({ main: 'root.js' }))
+			fs.writeFileSync(path.join(rootPackagePath, 'root.js'), 'module.exports = "root"')
+
+			const result = npmResolver.resolveScriptModule('westore', pageFilePath, moduleId => {
+				for (const ext of ['.js', '.ts']) {
+					if (fs.existsSync(path.join(tempDir, `${moduleId}${ext}`))) {
+						return moduleId
+					}
+				}
+
+				const packageJsonPath = path.join(tempDir, moduleId, 'package.json')
+				if (fs.existsSync(packageJsonPath)) {
+					const packageInfo = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'))
+					const entryModuleId = npmResolver.normalizeModuleId(path.resolve(moduleId, packageInfo.main))
+					for (const ext of ['.js', '.ts']) {
+						if (fs.existsSync(path.join(tempDir, `${entryModuleId}${ext}`))) {
+							return entryModuleId
+						}
+					}
+				}
+
+				return null
+			})
+
+			expect(result).toBe('/pages/feature/miniprogram_npm/westore/local')
+		})
+	})
+
 	describe('isValidComponent', () => {
 		it('应该验证有效的组件', () => {
 			const componentPath = path.join(tempDir, 'test-component')
@@ -180,4 +218,4 @@ describe('NpmResolver', () => {
 			expect(npmResolver.packageCache.size).toBe(0)
 		})
 	})
-}) 
+}) 

fe/packages/compiler/__tests__/require-path-resolution.spec.js

@@ -181,6 +181,134 @@ describe('Require Path Resolution', () => {
 		expect(compiledCode).not.toMatch(/require\(['"]@vant/)
 	})
 
+	it('should resolve bare npm package requires via package entry', async () => {
+		fs.mkdirSync('pages/npm-entry', { recursive: true })
+		fs.mkdirSync('miniprogram_npm/westore', { recursive: true })
+
+		fs.writeFileSync('app.json', JSON.stringify({
+			pages: ['pages/npm-entry/index']
+		}))
+
+		fs.writeFileSync('miniprogram_npm/westore/package.json', JSON.stringify({
+			main: 'index.js'
+		}))
+
+		fs.writeFileSync('miniprogram_npm/westore/index.js', `
+			module.exports = {
+				create: function() {
+					return 'westore'
+				}
+			}
+		`)
+
+		fs.writeFileSync('pages/npm-entry/index.js', `
+			const westore = require('westore')
+
+			Page({
+				onLoad() {
+					console.log(westore.create())
+				}
+			})
+		`)
+
+		fs.writeFileSync('pages/npm-entry/index.json', JSON.stringify({
+			navigationBarTitleText: 'NPM Entry'
+		}))
+
+		storeInfo(tempDir)
+
+		const progress = { completedTasks: 0 }
+		const result = await compileJS([{ path: 'pages/npm-entry/index' }], null, null, progress)
+
+		const modulePaths = result.map(module => module.path)
+		expect(modulePaths).toContain('/miniprogram_npm/westore/index')
+
+		const pageModule = result.find(module => module.path === 'pages/npm-entry/index')
+		expect(pageModule.code).toContain('require("/miniprogram_npm/westore/index")')
+	})
+
+	it('should resolve npm directory requires to index modules', async () => {
+		fs.mkdirSync('pages/npm-dir', { recursive: true })
+		fs.mkdirSync('miniprogram_npm/@vant/weapp/util', { recursive: true })
+
+		fs.writeFileSync('app.json', JSON.stringify({
+			pages: ['pages/npm-dir/index']
+		}))
+
+		fs.writeFileSync('miniprogram_npm/@vant/weapp/util/index.js', `
+			exports.getName = function() {
+				return 'vant-util'
+			}
+		`)
+
+		fs.writeFileSync('pages/npm-dir/index.js', `
+			const { getName } = require('@vant/weapp/util')
+
+			Page({
+				onLoad() {
+					console.log(getName())
+				}
+			})
+		`)
+
+		fs.writeFileSync('pages/npm-dir/index.json', JSON.stringify({
+			navigationBarTitleText: 'NPM Dir'
+		}))
+
+		storeInfo(tempDir)
+
+		const progress = { completedTasks: 0 }
+		const result = await compileJS([{ path: 'pages/npm-dir/index' }], null, null, progress)
+
+		const modulePaths = result.map(module => module.path)
+		expect(modulePaths).toContain('/miniprogram_npm/@vant/weapp/util/index')
+
+		const pageModule = result.find(module => module.path === 'pages/npm-dir/index')
+		expect(pageModule.code).toContain('require("/miniprogram_npm/@vant/weapp/util/index")')
+	})
+
+	it('should prefer the nearest miniprogram_npm directory for bare package requires', async () => {
+		fs.mkdirSync('pages/near/index/miniprogram_npm/westore', { recursive: true })
+		fs.mkdirSync('miniprogram_npm/westore', { recursive: true })
+
+		fs.writeFileSync('app.json', JSON.stringify({
+			pages: ['pages/near/index/index']
+		}))
+
+		fs.writeFileSync('pages/near/index/miniprogram_npm/westore/package.json', JSON.stringify({
+			main: 'local.js'
+		}))
+		fs.writeFileSync('pages/near/index/miniprogram_npm/westore/local.js', 'module.exports = "local"')
+
+		fs.writeFileSync('miniprogram_npm/westore/package.json', JSON.stringify({
+			main: 'root.js'
+		}))
+		fs.writeFileSync('miniprogram_npm/westore/root.js', 'module.exports = "root"')
+
+		fs.writeFileSync('pages/near/index/index.js', `
+			const westore = require('westore')
+
+			Page({
+				onLoad() {
+					console.log(westore)
+				}
+			})
+		`)
+
+		fs.writeFileSync('pages/near/index/index.json', JSON.stringify({
+			navigationBarTitleText: 'Nearest NPM'
+		}))
+
+		storeInfo(tempDir)
+
+		const progress = { completedTasks: 0 }
+		const result = await compileJS([{ path: 'pages/near/index/index' }], null, null, progress)
+
+		const pageModule = result.find(module => module.path === 'pages/near/index/index')
+		expect(pageModule.code).toContain('require("/pages/near/index/miniprogram_npm/westore/local")')
+		expect(pageModule.code).not.toContain('require("/miniprogram_npm/westore/root")')
+	})
+
 	it('should handle mixed import and require statements', async () => {
 		// 创建测试文件结构
 		fs.mkdirSync('pages/mixed', { recursive: true })

fe/packages/compiler/src/common/npm-resolver.js

@@ -67,6 +67,29 @@ class NpmResolver {
 		return null
 	}
 
+	/**
+	 * 解析脚本模块路径，支持微信小程序 npm 逐级寻址和 package.json 入口
+	 * @param {string} specifier 模块导入路径
+	 * @param {string} modulePath 当前模块绝对文件路径
+	 * @param {(moduleId: string) => string | null} resolveExistingModuleId 解析真实存在模块的回调
+	 * @returns {string|null} 解析后的模块 id
+	 */
+	resolveScriptModule(specifier, modulePath, resolveExistingModuleId) {
+		if (!specifier || !resolveExistingModuleId) {
+			return null
+		}
+
+		for (const searchPath of this.generateSearchPaths(modulePath)) {
+			const moduleId = this.normalizeModuleId(`/${searchPath}/${specifier}`)
+			const resolvedModuleId = resolveExistingModuleId(moduleId)
+			if (resolvedModuleId) {
+				return resolvedModuleId
+			}
+		}
+
+		return null
+	}
+
 	/**
 	 * 生成 miniprogram_npm 搜索路径
 	 * 按照微信小程序的寻址顺序生成搜索路径
@@ -132,6 +155,14 @@ class NpmResolver {
 		return null
 	}
 
+	normalizeModuleId(moduleId) {
+		let normalized = moduleId.replace(/\.(js|ts)$/, '').replace(/\\/g, '/')
+		if (!normalized.startsWith('/')) {
+			normalized = `/${normalized}`
+		}
+		return normalized
+	}
+
 	/**
 	 * 检查是否为有效的组件
 	 * @param {string} componentPath 组件路径
@@ -219,4 +250,4 @@ class NpmResolver {
 	}
 }
 
-export { NpmResolver } 
+export { NpmResolver }