review update

rdkcentral · Jul 13, 2023 · 600899a · 600899a
1 parent b7e8758
commit 600899a
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 19 deletions.
diff --git a/languages/c/src/types/NativeHelpers.mjs b/languages/c/src/types/NativeHelpers.mjs
@@ -30,18 +30,7 @@ const { isObject, isArray, propEq, pathSatisfies, hasProp, propSatisfies } = pre
 const getModuleName = json => getPathOr(null, ['info', 'title'], json) || json.title || 'missing'
 
 const getFireboltStringType = () => 'FireboltTypes_String_t'
-const getHeaderText = () => {
 
-    return `/*
-*  Copyright 2022 Comcast
-*
-*  Auto Generated using firebolt-openrpc tools. DO NOT EDIT.
-*
-*/
-
-`
-}
-
 const capitalize = str => str[0].toUpperCase() + str.substr(1)
 const description = (title, str='') => '/* ' + title + (str.length > 0 ? ' - ' + str : '') + ' */'
 const isOptional = (prop, json) => (!json.required || !json.required.includes(prop))
@@ -204,7 +193,6 @@ function getPropertyEventUnregisterSignature(property, module) {
 
 
 export {
-    getHeaderText,
     getNativeType,
     getModuleName,
     getPropertyGetterSignature,

diff --git a/src/macrofier/engine.mjs b/src/macrofier/engine.mjs
@@ -158,7 +158,7 @@ const getComponentExternalSchema = (json) => {
         let title = ''
         if (ref.includes('x-schemas')) {
           if (ref.split('/')[2] !== json.info.title) {
-            title = ref.split('/')[2].toLowerCase()
+            title = ref.split('/')[2]
           }
         }
         title && !refSchemas.includes(title) ? refSchemas.push(title) : null
@@ -361,7 +361,7 @@ const addContentDescriptorSubSchema = (descriptor, prefix, obj) => {
 }
 
 // only consider sub-objects and sub enums to be sub-schemas
-const isSubSchema = (schema) => schema.type === 'object' || (schema.type === 'string' && schema.enum)
+const isSubSchema = (schema) => schema.type === 'object' || (schema.type === 'string' && schema.enum) || (schema.type === 'array' && schema.items)
 
 const promoteAndNameSubSchemas = (obj) => {
   // make a copy so we don't polute our inputs
@@ -584,11 +584,11 @@ function insertTableofContents(content) {
 }
 
 const convertEnumTemplate = (schema, templateName, templates) => {
-  let enm = getEnum(schema)
+  let enumSchema = isArraySchema(schema) ? schema.items : schema
   const template = getTemplate(templateName, templates).split('\n')
   for (var i = 0; i < template.length; i++) {
     if (template[i].indexOf('${key}') >= 0) {
-      template[i] = enm.enum.map(value => {
+      template[i] = enumSchema.enum.map(value => {
         const safeName = value.split(':').pop().replace(/[\.\-]/g, '_').replace(/\+/g, '_plus').replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase()
         return template[i].replace(/\$\{key\}/g, safeName)
           .replace(/\$\{value\}/g, value)
@@ -694,11 +694,11 @@ function sortSchemasByReference(schemas = []) {
   return schemas
 }
 
-const getEnum = x => x.type && x.type === 'array' ? x.items : x
+const isArraySchema = x => x.type && x.type === 'array' && x.items
 
 const isEnum = x => {
-   let enm = getEnum(x)
-   return enm.type && enm.type === 'string' && Array.isArray(enm.enum) && x.title
+   let schema = isArraySchema(x) ? x.items : x
+   return schema.type && schema.type === 'string' && Array.isArray(schema.enum) && x.title
 }
 
 function generateSchemas(json, templates, options) {