Add separator between prefix and subSchema name generation

rdkcentral · Jul 24, 2023 · b1cfaf3 · b1cfaf3
1 parent 0dce986
commit b1cfaf3
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/languages/c/src/types/JSONHelpers.mjs b/languages/c/src/types/JSONHelpers.mjs
@@ -4,7 +4,7 @@ const getJsonDataPrefix = () => 'JsonData_'
 const wpeJsonNameSpace = () => 'WPEFramework::Core::JSON'
 
 const getJsonDataStructName = (modName, name, prefix = '') => {
-  let result =((prefix && prefix.length > 0) && (prefix !== name))  ? `${capitalize(modName)}::${getJsonDataPrefix()}${capitalize(prefix)}${capitalize(name)}` : `${capitalize(modName)}::${getJsonDataPrefix()}${capitalize(name)}`
+  let result =((prefix && prefix.length > 0) && (prefix !== name))  ? `${capitalize(modName)}::${getJsonDataPrefix()}${capitalize(prefix)}_${capitalize(name)}` : `${capitalize(modName)}::${getJsonDataPrefix()}${capitalize(name)}`
 
   return ((result.includes(wpeJsonNameSpace()) === true) ? result : `${getSdkNameSpace()}::${result}`)
 }

diff --git a/languages/c/src/types/NativeHelpers.mjs b/languages/c/src/types/NativeHelpers.mjs
@@ -111,7 +111,7 @@ const getTypeName = (moduleName, varName, prefix = '', upperCase = false, capita
     prefix = (prefix !== varName) ? (upperCase ? prefix.toUpperCase() : capitalize(prefix)) : ''
   }
   prefix = (prefix && prefix.length > 0) ?(upperCase ? prefix.toUpperCase() : capitalize(prefix)) : prefix
-  let name = (prefix && prefix.length > 0) ? `${mName}_${prefix}${vName}` : `${mName}_${vName}`
+  let name = (prefix && prefix.length > 0) ? `${mName}_${prefix}_${vName}` : `${mName}_${vName}`
   return name
 }
 

diff --git a/src/macrofier/engine.mjs b/src/macrofier/engine.mjs
@@ -370,7 +370,7 @@ const addContentDescriptorSubSchema = (descriptor, prefix, obj) => {
   else {
     let descriptorName = capitalize(descriptor.name)
     let prefixName = capitalize(prefix)
-    title = (prefixName !== descriptorName) ? prefixName + descriptorName : descriptorName
+    title = (prefixName !== descriptorName) ? prefixName + '_' +descriptorName : descriptorName
     if (obj.components.schemas[title]) {
       throw 'Generated name `' + title + '` already exists...'
     }