CPPSDK: remove reduntant code (#178)

* chore: Copy JS templates to C and create language.config.json

* feat(languages): Add support for a distinct JSON-type for each schema

Also started tweaking C templates and adding a few useful macros.

* chore: Dropped debug logs

* fix: Stop passing non-schemas in to getSchemaType

* feat(accessors): New macro section for schema property accessors

* fix: Sort the macrofied schemas based on schema refs (#90)

* fix: Sort the macrofied schemas based on schema refs

* fix: Sort the schemas before macrofying

* fix: Handle the schemas part

* Enum fixes (#93)

Enum fixes :
1. missing description added
2. alignment fixes
3. implementation added for enum inside properties
4. Enum to String value Conversion logic added for C

* Types and Accessor related fixes (#94)

Types and Accessor related fixes:
1. Accessor creation
2. JsonContainer creation
3. Types order placed based on depenedencies
4. filtered redundant new lines
5. UnamedSchema issue fixes
6. Types and Accessors:  generation added for objects inside methods result/params
7. AnyOf support added

* Static code implementation updates (#96)

Static code implementation updates
Co-authored-by: Jeremy LaCivita <[email protected]>

* Add support to generate file inclusion for common schema also (#97)

Add support to generate file inclusion for common schema also

* C-Language: Templates based property methods (#100)

* feat: Add method templates for properties

* feat: Property setters using templates

* fix: Macro name correction

* Add support to keep original file permissions of template/sdk files (#99)

* Event template implementation added (#101)

* Template for Polymorphic pull method (#102)

* feat: Add method templates for properties

* feat: Property setters using templates

* fix: Macro name correction

* feat: Add template for polymorphic-pull

* fix: In progress commit

* fix: Promote and name sub-schemas in one place

* fix: Add extractSubSchemas flag to C language

* fix: Uncomment writeFilePermissions

* polymorphic-pull: method and event implementation added (#107)

* SchemaSorting: logic updated to consider all schemas (#106)

* fix: Fix the reentrancy of methods from callback (#105)

* Default template implementation added (#103)

Default template implementation added

* feat(macrofier): Add dynamic schema template output

* Naming + void* to struct* changes based on sky review, removed redundant code, array handling fix (#109)

Naming + void* to struct* changes based on sky review, removed redundant code, array handling fix

* language-c: re-arrange files locations (#112)

language-c: re-arrange files locations

* fixes to generate array inside subschemas (#111)

* include test always (#113)

* use String type if there is any issue with anyOf merge (#114)

* calls-metrics: support added (#115)

* Generate polymorphci methods for anyOf param/result case (#110)

* fix: Split c-structs from c (w/ Accessors)

* fix: Latest work

* chore: Copy JS templates to C and create language.config.json

* feat(languages): Add support for a distinct JSON-type for each schema

Also started tweaking C templates and adding a few useful macros.

* chore: Dropped debug logs

* fix: Stop passing non-schemas in to getSchemaType

* feat(accessors): New macro section for schema property accessors

* fix: Sort the macrofied schemas based on schema refs (#90)

* fix: Sort the macrofied schemas based on schema refs

* fix: Sort the schemas before macrofying

* fix: Handle the schemas part

* Enum fixes (#93)

Enum fixes :
1. missing description added
2. alignment fixes
3. implementation added for enum inside properties
4. Enum to String value Conversion logic added for C

* Types and Accessor related fixes (#94)

Types and Accessor related fixes:
1. Accessor creation
2. JsonContainer creation
3. Types order placed based on depenedencies
4. filtered redundant new lines
5. UnamedSchema issue fixes
6. Types and Accessors:  generation added for objects inside methods result/params
7. AnyOf support added

* Static code implementation updates (#96)

Static code implementation updates
Co-authored-by: Jeremy LaCivita <[email protected]>

* Add support to generate file inclusion for common schema also (#97)

Add support to generate file inclusion for common schema also

* C-Language: Templates based property methods (#100)

* feat: Add method templates for properties

* feat: Property setters using templates

* fix: Macro name correction

* Add support to keep original file permissions of template/sdk files (#99)

* Event template implementation added (#101)

* Template for Polymorphic pull method (#102)

* feat: Add method templates for properties

* feat: Property setters using templates

* fix: Macro name correction

* feat: Add template for polymorphic-pull

* fix: Promote and name sub-schemas in one place

* fix: Add extractSubSchemas flag to C language

* fix: Uncomment writeFilePermissions

* polymorphic-pull: method and event implementation added (#107)

* SchemaSorting: logic updated to consider all schemas (#106)

* fix: Fix the reentrancy of methods from callback (#105)

* Default template implementation added (#103)

Default template implementation added

* Naming + void* to struct* changes based on sky review, removed redundant code, array handling fix (#109)

Naming + void* to struct* changes based on sky review, removed redundant code, array handling fix

* language-c: re-arrange files locations (#112)

language-c: re-arrange files locations

* fixes to generate array inside subschemas (#111)

* include test always (#113)

* use String type if there is any issue with anyOf merge (#114)

* calls-metrics: support added (#115)

* Generate polymorphci methods for anyOf param/result case (#110)

* Create namespaces only if there is value to put (#117)

* Changes to avoid duplication of sub-array schema with same reference (#116)

* detach setter declaration from property template and add setter templ… (#118)

Detach setter declaration from property template and add setter template, remove unredundant warnings
Cleanup changes, add separator between prefix and subSchema name generation
Introduce excludeDeclarations flag to handle declaration exclusion specific to language
Alignement changes + cleanup + OUT params support added to differentiate method signature parameters
Update in static code

* SubArray generation issue fix (#121)

* cmake changes to install proper files (#119)

* chore: Copy JS templates to C and create language.config.json

* feat(languages): Add support for a distinct JSON-type for each schema

Also started tweaking C templates and adding a few useful macros.

* chore: Dropped debug logs

* fix: Stop passing non-schemas in to getSchemaType

* feat(accessors): New macro section for schema property accessors

* fix: Sort the macrofied schemas based on schema refs (#90)

* fix: Sort the macrofied schemas based on schema refs

* fix: Sort the schemas before macrofying

* fix: Handle the schemas part

* Enum fixes (#93)

Enum fixes :
1. missing description added
2. alignment fixes
3. implementation added for enum inside properties
4. Enum to String value Conversion logic added for C

* Types and Accessor related fixes (#94)

Types and Accessor related fixes:
1. Accessor creation
2. JsonContainer creation
3. Types order placed based on depenedencies
4. filtered redundant new lines
5. UnamedSchema issue fixes
6. Types and Accessors:  generation added for objects inside methods result/params
7. AnyOf support added

* Static code implementation updates (#96)

Static code implementation updates
Co-authored-by: Jeremy LaCivita <[email protected]>

* Add support to generate file inclusion for common schema also (#97)

Add support to generate file inclusion for common schema also

* C-Language: Templates based property methods (#100)

* feat: Add method templates for properties

* feat: Property setters using templates

* fix: Macro name correction

* Add support to keep original file permissions of template/sdk files (#99)

* Event template implementation added (#101)

* Template for Polymorphic pull method (#102)

* feat: Add method templates for properties

* feat: Property setters using templates

* fix: Macro name correction

* feat: Add template for polymorphic-pull

* fix: Promote and name sub-schemas in one place

* fix: Add extractSubSchemas flag to C language

* fix: Uncomment writeFilePermissions

* polymorphic-pull: method and event implementation added (#107)

* SchemaSorting: logic updated to consider all schemas (#106)

* fix: Fix the reentrancy of methods from callback (#105)

* Default template implementation added (#103)

Default template implementation added

* Naming + void* to struct* changes based on sky review, removed redundant code, array handling fix (#109)

Naming + void* to struct* changes based on sky review, removed redundant code, array handling fix

* language-c: re-arrange files locations (#112)

language-c: re-arrange files locations

* fixes to generate array inside subschemas (#111)

* include test always (#113)

* use String type if there is any issue with anyOf merge (#114)

* calls-metrics: support added (#115)

* Generate polymorphci methods for anyOf param/result case (#110)

* Create namespaces only if there is value to put (#117)

* Changes to avoid duplication of sub-array schema with same reference (#116)

* detach setter declaration from property template and add setter templ… (#118)

Detach setter declaration from property template and add setter template, remove unredundant warnings
Cleanup changes, add separator between prefix and subSchema name generation
Introduce excludeDeclarations flag to handle declaration exclusion specific to language
Alignement changes + cleanup + OUT params support added to differentiate method signature parameters
Update in static code

* SubArray generation issue fix (#121)

* cmake changes to install proper files (#119)

* native code: changed return type from uint32_t to int32_t (#127)

* fix: Provider Interfaces and Tuples in JS

* feat: Initial commit of cpp sdk

* feat: Fix issues in generated headers

* CPPSDK: static code + template changes (#137)

* CPPSDK: static code + template changes

* CPPSDK: static code updates

* CPPSDK: updates in error handling

* CPPSDK: namespace settings changes (#135)

* CPP SDK : changes to handle additional Properties (#134)

CPP SDK : changes to handle additional Properties

* CPPSDK: parameter and result handling changes (#136)

CPPSDK:
1. parameter and result handling changes
2. anyOf type handling
3. reference schema handling

* CPPSDK: aggregate files based on suffix type handling added, module and override module generation also handled (#139)

CPPSDK: aggregate files based on suffix type handling added, module and override module generation also handled

* CPPSDK: changes to handle enum and x-schema enum without title (#138)

* CPPSDK: parameter/result handling for method and events + inner object handling (#140)

* CPPSDK: template added for capabilties-method (#142)

* CPPSDK: method name changed to camel case (#144)

* CPPSDK: event name changed to camelcase (#145)

* CPPSDK: add overrideRule to handle template generation + remove enum level checking (#141)

1. Add properties to the template only if object has properties or additionalProperties
2. use primitive types from templates, instead defined variable

* CPPSDK: remove const from return type (#149)

* CPPSDK: typo fix (#150)

* CPPSDK: handle empty properties and propertyNames with templates (#152)

* CPPSDK: code generation template and engine changes (#151)

1. Callback generation + types: with generation changes + template updates
2.Set title for properties inside x-schemas

* CPPSDK: template updates based on more complex schema generation (#153)

* CPPSDK: polymorphic-pull method/event generation support added (#154)

* CPPSDK: provider support added (#156)

* CPPSDK: check jsonrpc response values are set or not before assigning based on optional types (#157)

* fix: Copy allow-focus tag to use methods

* CPPSDK: calls metrics support added (#158)

* CPPSDK: calls metrics support added

* CPPSDK: handle patternProperties (#160)

* CPPSDK: polymorphic method schema creation changes (#159)

* CPPSDK: changes to handle context params (#161)

* CPPSDK: warning fix during promoteAndNameSubSchemas (#163)

* Check template for codeblocks exists or not before trying to generate (#164)

* Optimization of generation time: generate macros only based on the schemhema template requirement if it is set (#165)

* Updates based on MAC testing (#167)

* CPPSDK: proceed to install only the build is successfully done and some cleanup (#169)

* merge conflict fixes

* feature/cpp branch alignment based on next branch merging for both openrpc and apis (#171)

* CPPSDK: update install script to handle version parsing for file based and prebuild install cases (#173)

* Update to align generated firebolt.d.ts sync with same is next branch (#172)

* CPPSDK : Add Async communication support and CPP code generation for x-uses + x-allow-focus=true (#170)

* CPPSDK: remove reduntant code

---------

Co-authored-by: Jeremy LaCivita <[email protected]>
Co-authored-by: sramani-metro <[email protected]>
Co-authored-by: Santhosh Ramani <[email protected]>
Co-authored-by: kschrief <[email protected]>

src/macrofier/engine.mjs

@@ -484,42 +484,6 @@ const promoteAndNameSubSchemas = (obj) => {
   return obj
 }
 
-const skip = ['NavigationIntent']
-const findAll = (tag, obj, transform) => {
-  if (Array.isArray(obj)) {
-    obj.forEach(item => findAll(tag, item, transform))
-  }
-  else if (obj && (typeof obj === "object")) {
-    Object.keys(obj).forEach(key => {
-      if (!skip.includes(key)) {
-        if (key === tag) {
-          if (obj[key].find(schema => schema.$ref.endsWith('/ListenResponse'))) {
-
-          }
-          else {
-            Object.assign(obj, transform(obj))
-            delete obj[key]
-            console.dir(obj)
-            findAll(tag, obj, transform)  
-          }
-        }
-        else {
-          findAll(tag, obj[key], transform)
-        }
-      }
-    })
-  }
-}
-
-const mergeAnyOfs = (obj) => {
-  // make a copy so we don't polute our inputs
-  obj = JSON.parse(JSON.stringify(obj))
-
-  findAll('anyOf', obj, anyOf => mergeAnyOf(anyOf))
-
-return obj
-}
-
 const generateMacros = (obj, templates, languages, options = {}) => {
   if (options.createPolymorphicMethods) {
     let methods = []
@@ -541,11 +505,6 @@ const generateMacros = (obj, templates, languages, options = {}) => {
     obj = promoteAndNameSubSchemas(obj)
   }
 
-  // config.mergeAnyOfs = true
-  // if (config.mergeAnyOfs) {
-  //   obj = mergeAnyOfs(obj)
-  // }
-
   // grab the options so we don't have to pass them from method to method
   Object.assign(state, options)
 

src/shared/modules.mjs

@@ -1112,9 +1112,6 @@ const addComponentSubSchemasName = (obj, schemas) => {
         key = key.charAt(0).toUpperCase() + key.substring(1)
         componentSchema = addComponentSubSchemasNameForProperties(key, componentSchema)
       })
-      if (!schema.title && !key) {
-         schema.title = capitalize(key)
-      }
     })
 
   return schemas