Skip to content

Commit 66b2da2

Browse files
committed
fix: use property name not getter name for objc class props
1 parent a7e8b25 commit 66b2da2

File tree

2 files changed

+11
-2
lines changed

2 files changed

+11
-2
lines changed

NativeScript/runtime/modules/module/ModuleInternal.cpp

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -328,8 +328,14 @@ std::string ModuleInternal::ResolvePathFromPackageJson(
328328
std::string ModuleInternal::ResolvePath(napi_env env,
329329
const std::string& baseDir,
330330
const std::string& moduleName) {
331+
std::string moduleNameCopy = moduleName;
332+
333+
if (moduleName.starts_with("~")) {
334+
moduleNameCopy = RuntimeConfig.ApplicationPath + moduleNameCopy.substr(1);
335+
}
336+
331337
std::filesystem::path baseDirPath(baseDir);
332-
std::filesystem::path moduleNamePath(moduleName);
338+
std::filesystem::path moduleNamePath(moduleNameCopy);
333339
std::filesystem::path fullPath = baseDirPath / moduleNamePath;
334340

335341
bool isDirectory = false;

metadata-generator/src/IR/Member.cpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,11 @@ MemberDecl::MemberDecl(CXCursor cursor,
8989

9090
CXString cxname = clang_Cursor_getObjCPropertyGetterName(cursor);
9191
getterSelector = clang_getCString(cxname);
92-
name = jsifySelector(getterSelector);
92+
CXString cxPropertyName = clang_getCursorSpelling(cursor);
93+
std::string propertyName = clang_getCString(cxPropertyName);
94+
name = jsifyName(propertyName);
9395
clang_disposeString(cxname);
96+
clang_disposeString(cxPropertyName);
9497

9598
cxname = clang_Cursor_getObjCPropertySetterName(cursor);
9699
setterSelector = clang_getCString(cxname);

0 commit comments

Comments
 (0)