Create namespaces only if there is value to put

rdkcentral · Jul 19, 2023 · bc3e3d4 · bc3e3d4
1 parent 549e4a0
commit bc3e3d4
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 21 deletions.
diff --git a/languages/c/templates/modules/include/module.h b/languages/c/templates/modules/include/module.h
@@ -22,20 +22,21 @@
 #include <firebolt.h>
 /* ${IMPORTS} */
 
-#ifdef __cplusplus
+${if.declarations}#ifdef __cplusplus
 extern "C" {
 #endif
 
 // Enums
-
 /* ${ENUMS} */
 
+// Accessors
 /* ${ACCESSORS} */
 
+// Methods & Events
 /* ${DECLARATIONS} */
 
 #ifdef __cplusplus
 }
-#endif
+#endif${end.if.declarations}
 
 #endif // Header Include Guard
diff --git a/languages/c/templates/modules/src/module.cpp b/languages/c/templates/modules/src/module.cpp
@@ -20,23 +20,28 @@
 /* ${IMPORTS} */
 #include "${info.title.lowercase}.h"
 
-namespace FireboltSDK {
+${if.types}namespace FireboltSDK {
     namespace ${info.Title} {
     // Types
        /* ${TYPES} */
     }
-}
+}${end.if.types}
 
 /* ${ENUMS} */
 
-#ifdef __cplusplus
+${if.definitions}#ifdef __cplusplus
 extern "C" {
 #endif
 
+// Accessors
 /* ${ACCESSORS} */
+
+// Methods
 /* ${METHODS} */
+
+// Events
 /* ${EVENTS} */
 
 #ifdef __cplusplus
 }
-#endif
+#endif${end.if.definitions}
diff --git a/languages/c/templates/schemas/include/common/module.h b/languages/c/templates/schemas/include/common/module.h
@@ -22,18 +22,18 @@
 #include <firebolt.h>
 /* ${IMPORTS} */
 
-#ifdef __cplusplus
+${if.declarations}#ifdef __cplusplus
 extern "C" {
 #endif
 
 // Enums
-
 /* ${ENUMS} */
 
+// Types
 /* ${TYPES} */
 
 #ifdef __cplusplus
 }
-#endif
+#endif${end.if.declarations}
 
 #endif // Header Include Guard
diff --git a/languages/c/templates/schemas/src/jsondata_module.h b/languages/c/templates/schemas/src/jsondata_module.h
@@ -21,10 +21,10 @@
 /* ${IMPORTS} */
 #include "common/${info.title.lowercase}.h"
 
-namespace FireboltSDK {
+${if.schemas}namespace FireboltSDK {
     namespace ${info.Title} {
     // Types
 
        /* ${SCHEMAS} */
     }
-}
+}${end.if.schemas}
diff --git a/languages/c/templates/schemas/src/module_common.cpp b/languages/c/templates/schemas/src/module_common.cpp
@@ -22,14 +22,19 @@
 
 /* ${ENUMS} */
 
-#ifdef __cplusplus
+${if.definitions}#ifdef __cplusplus
 extern "C" {
 #endif
 
+    // Accessors
     /* ${ACCESSORS} */
+
+    // Methods
     /* ${METHODS} */
+
+    // Events
     /* ${EVENTS} */
 
 #ifdef __cplusplus
 }
-#endif
+#endif${end.if.definitions}
diff --git a/languages/c/templates/sections/accessors.c b/languages/c/templates/sections/accessors.c
@@ -1,2 +1 @@
-// Accessors
 ${schema.list}
diff --git a/languages/c/templates/sections/methods.c b/languages/c/templates/sections/methods.c
@@ -1,4 +1 @@
-
-// Methods
-
 ${method.list}
diff --git a/src/macrofier/engine.mjs b/src/macrofier/engine.mjs
@@ -29,7 +29,7 @@ import isString from 'crocks/core/isString.js'
 import predicates from 'crocks/predicates/index.js'
 const { isObject, isArray, propEq, pathSatisfies, propSatisfies } = predicates
 
-import { isRPCOnlyMethod, isProviderInterfaceMethod, getProviderInterface, getPayloadFromEvent, providerHasNoParameters, isTemporalSetMethod, hasMethodAttributes, getMethodAttributes, isEventMethodWithContext, getSemanticVersion, getSetterFor, getProvidedCapabilities, isPolymorphicPullMethod, hasPublicAPIs, createPolymorphicMethods } from '../shared/modules.mjs'
+import { isRPCOnlyMethod, isProviderInterfaceMethod, getProviderInterface, getPayloadFromEvent, providerHasNoParameters, isTemporalSetMethod, isCallsMetricsMethod, isExcludedMethod, hasMethodAttributes, getMethodAttributes, isEventMethodWithContext, getSemanticVersion, getSetterFor, getProvidedCapabilities, isPolymorphicPullMethod, hasPublicAPIs, createPolymorphicMethods } from '../shared/modules.mjs'
 import isEmpty from 'crocks/core/isEmpty.js'
 import { getLinkedSchemaPaths, getSchemaConstraints, isSchema, localizeDependencies, isDefinitionReferencedBySchema } from '../shared/json-schema.mjs'
 
@@ -507,6 +507,11 @@ const insertMacros = (fContents = '', macros = {}) => {
   const quote = config.operators ? config.operators.stringQuotation : '"'
   const or = config.operators ? config.operators.or : ' | '
 
+  fContents = fContents.replace(/\$\{if\.types\}(.*?)\$\{end\.if\.types\}/gms, macros.types.trim() ? '$1' : '')
+  fContents = fContents.replace(/\$\{if\.schemas\}(.*?)\$\{end\.if\.schemas\}/gms, macros.schemas.trim() ? '$1' : '')
+  fContents = fContents.replace(/\$\{if\.declarations\}(.*?)\$\{end\.if\.declarations\}/gms, (macros.accessors.trim() || macros.declarations.trim() || macros.enums.trim()) ? '$1' : '')
+  fContents = fContents.replace(/\$\{if\.definitions\}(.*?)\$\{end\.if\.definitions\}/gms, (macros.accessors.trim() || macros.methods.trim() || macros.events.trim()) ? '$1' : '')
+
   fContents = fContents.replace(/\$\{module.list\}/g, macros.module)
   fContents = fContents.replace(/[ \t]*\/\* \$\{METHODS\} \*\/[ \t]*\n/, macros.methods)
   fContents = fContents.replace(/[ \t]*\/\* \$\{ACCESSORS\} \*\/[ \t]*\n/, macros.accessors)
@@ -638,7 +643,7 @@ const generateEnums = (json, templates, options = { destination: '' }) => {
   return compose(
     option(''),
     map(val => {
-      let template = getTemplate(`/sections/enum.${suffix}`, templates)
+      let template = val ? getTemplate(`/sections/enum.${suffix}`, templates) : val
       return template ? template.replace(/\$\{schema.list\}/g, val.trimEnd()) : val
     }),
     map(reduce((acc, val) => acc.concat(val).concat('\n'), '')),
@@ -1037,7 +1042,7 @@ function generateMethods(json = {}, examples = {}, templates = {}) {
 }
 
 // TODO: this is called too many places... let's reduce that to just generateMethods
-function insertMethodMacros(template, methodObj, json, templates, examples={}) {
+function insertMethodMacros(template, methodObj, json, templates, examples = {}) {
   const moduleName = getModuleName(json)
 
   const info = {