header dependency sequence changed to remove JsonData dependency adde…

…d in the inculde files (to avoid cpp header dependency from c headers)

languages/c/templates/imports/default.h

@@ -0,0 +1 @@
+#include "Common/${info.title}.h"

languages/c/templates/imports/default.jsondata

@@ -0,0 +1 @@
+#include "JsonData_${info.title}.h"

languages/c/templates/schemas/src/JsonData_Module.h

@@ -18,6 +18,7 @@
 
 #pragma once
 
+/* ${IMPORTS} */
 #include "Common/${info.title}.h"
 
 namespace FireboltSDK {

languages/c/templates/schemas/src/Module_Common.cpp

@@ -17,6 +17,7 @@
  */
 
 #include "FireboltSDK.h"
+/* ${IMPORTS} */
 #include "JsonData_${info.title}.h"
 
 /* ${ENUMS} */

src/macrofier/engine.mjs

@@ -338,7 +338,7 @@ const generateMacros = (obj, templates, languages, options = {}) => {
   // grab the options so we don't have to pass them from method to method
   Object.assign(state, options)
 
-  const imports = generateImports(obj, templates)
+  const imports = generateImports(obj, templates, { destination : (options.destination ? options.destination : '') })
   const initialization = generateInitialization(obj, templates)
   const enums = generateEnums(obj, templates, { destination : (options.destination ? options.destination : '') })
   const eventsEnum = generateEvents(obj, templates)
@@ -759,7 +759,7 @@ function getRelatedSchemaLinks(schema = {}, json = {}, templates = {}, options =
   return links
 }
 
-const generateImports = (json, templates) => {
+const generateImports = (json, templates, options = { destination: '' }) => {
   let imports = ''
 
   if (rpcMethodsOrEmptyArray(json).length) {
@@ -789,14 +789,21 @@ const generateImports = (json, templates) => {
   if (methodsWithXMethodsInResult(json).length) {
     imports += getTemplate('/imports/x-method', templates)
   }
+  const suffix = options.destination.split('.').pop()
+  const prefix = options.destination.split('/').pop().split('_')[0].toLowerCase()
+
+  let template = prefix ? getTemplate(`/imports/default.${prefix}`, templates) : ''
+  if (!template) {
+    template = getTemplate(suffix ? `/imports/default.${suffix}` : '/imports/default', templates)
+  }
 
   if (json['x-schemas'] && Object.keys(json['x-schemas']).length > 0 && !json.info['x-uri-titles']) {
-    imports += Object.keys(json['x-schemas']).map(shared => getTemplate('/imports/default', templates).replace(/\$\{info.title\}/g, shared)).join('')
+    imports += Object.keys(json['x-schemas']).map(shared => template.replace(/\$\{info.title\}/g, shared)).join('')
   }
 
   let componentExternalSchema = getComponentExternalSchema(json)
   if (componentExternalSchema.length && json.info['x-uri-titles']) {
-    imports += componentExternalSchema.map(shared => getTemplate('/imports/default', templates).replace(/\$\{info.title\}/g, shared)).join('')
+    imports += componentExternalSchema.map(shared => template.replace(/\$\{info.title\}/g, shared)).join('')
   }
   return imports
 }