fix: Quote unsafe property names in languages that support it

rdkcentral · Aug 21, 2024 · 647043d · 647043d
1 parent 756e88a
commit 647043d
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/languages/javascript/language.config.json b/languages/javascript/language.config.json
@@ -5,6 +5,7 @@
         "/index.mjs",
         "/defaults.mjs"
     ],
+    "enableStringPropertyKeys": true,
     "createModuleDirectories": true,
     "copySchemasIntoModules": true,
     "aggregateFiles": [

diff --git a/src/macrofier/types.mjs b/src/macrofier/types.mjs
@@ -317,6 +317,8 @@ const insertObjectPatternPropertiesMacros = (content, schema, module, title, opt
 }
 
 const getIndents = level => level ? '    ' : ''
+const wrapProp = name => name.match(/[/\.\+]/) ? `"${name}"` : name
+const safePropName = name => config.enableStringPropertyKeys ? wrapProp(name) : getSafeEnumKeyName(name)
 const insertObjectMacros = (content, schema, module, title, property, options) => {
   const options2 = options ? JSON.parse(JSON.stringify(options)) : {}
   options2.parent = title
@@ -348,8 +350,8 @@ const insertObjectMacros = (content, schema, module, title, property, options) =
           const description = getSchemaDescription(prop, module)
           let replacedTemplate  = template
           .replace(/(^\s+)/g, '$1'.repeat(options2.level))
-          .replace(/\$\{property\}/g, name)
-          .replace(/\$\{Property\}/g, capitalize(name))
+          .replace(/\$\{property\}/g, safePropName(name))
+          .replace(/\$\{Property\}/g, capitalize(safePropName(name)))
           .replace(/\$\{parent\.title\}/g, title)
           .replace(/\$\{title\}/g, type)
           .replace(/\$\{shape\}/g, schemaShape)