openharmony/arkcompiler_ets_runtime
1
0
Fork 0
mirror of https://gitee.com/openharmony/arkcompiler_ets_runtime synced 2024-11-30 13:40:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!8411 Support local packageName use two level

Browse Source 
Merge pull request !8411 from yaochaonan/router
This commit is contained in:
openharmony_ci 2024-07-30 15:30:06 +00:00 committed by Gitee
commit 82ab349e1c
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ecmascript/module/module_path_helper.cpp
View File

@ -722,6 +722,7 @@ void ModulePathHelper::TranstaleExpressionInput(const JSPandaFile *jsPandaFile,
// all we need to do is to find the corresponding mapping result.
// EXCEPTION: @ohos. @hms. is translated all by runtime.
if (jsPandaFile->FindOhmUrlInPF(requestPath, outEntryPoint)) {
// this path for moduleName(xxx or xxx/xxx) -> moduleName/Index;
requestPath = outEntryPoint;
} else {
ParseCrossModuleFile(jsPandaFile, requestPath);
@ -782,6 +783,7 @@ CString ModulePathHelper::TranslateExpressionInputWithEts(JSThread *thread, cons
/*
* input requestPath: moduleName/src/main/xxx/xxx/xxx
* moduleName/xxx/xxx
* moduleName : singleLevelName or twoLevelName
* output requestPath: @bundle.bundleName/moduleName/xxx/xxx/xxx
* @bundle.bundleName/moduleName/xxx/xxx
*/
@ -790,10 +792,20 @@ void ModulePathHelper::ParseCrossModuleFile(const JSPandaFile *jsPandaFile, CStr
size_t pos = requestPath.find(PathHelper::SLASH_TAG);
CString moduleName = requestPath.substr(0, pos);
CString outEntryPoint;
if (jsPandaFile->FindOhmUrlInPF(moduleName, outEntryPoint)) {
// try get mapped module path by single level moduleName.
bool isModuleName = jsPandaFile->FindOhmUrlInPF(moduleName, outEntryPoint);
if (!isModuleName) {
// retry get mapped module path by two level moduleName
pos = requestPath.find(PathHelper::SLASH_TAG, pos + 1);
moduleName = requestPath.substr(0, pos);
isModuleName = jsPandaFile->FindOhmUrlInPF(moduleName, outEntryPoint);
}
if (isModuleName) {
// outEntryPoint: @bundle.bundleName/moduleName/Index
CString relativePath = requestPath.substr(pos);
// get rid of Index, get pure perfix(@bundle.bundleName/moduleName).
size_t index = outEntryPoint.rfind(PathHelper::SLASH_TAG);
// get rid of src/main. Concat perfix and input relative path.
if (relativePath.find(PHYCICAL_FILE_PATH, 0) == 0) {
requestPath = outEntryPoint.substr(0, index) + PathHelper::SLASH_TAG +
requestPath.substr(pos + PHYCICAL_FILE_PATH_LEN);