Optimization of generation time: generate macros only based on the sc…

…hemhema template requirement if it is set (#165)
rdkcentral · Jan 31, 2024 · 30e8133 · 30e8133
1 parent 66c6feb
commit 30e8133
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 40 deletions.
diff --git a/languages/cpp/language.config.json b/languages/cpp/language.config.json
@@ -25,5 +25,10 @@
     "primitives": {},
     "langVersion" : "c++17",
     "additionalSchemaTemplates": [ "json-types" ],
-    "additionalMethodTemplates": [ "declarations", "declarations-override" ]
+    "additionalMethodTemplates": [ "declarations", "declarations-override" ],
+    "templateExtensionMap": {
+        "methods": [ "impl.cpp", "cpp" ],
+        "declarations": [ "h" ],
+        "declarations-override": [ "impl.h" ]
+    }
 }
diff --git a/languages/cpp/templates/codeblocks/module-include-private.cpp b/languages/cpp/templates/codeblocks/module-include-private.cpp
@@ -1,2 +1,2 @@
 ${if.modules}#include "${info.title.lowercase}_impl.h"
-${end.if.modules}${module.includes.private}
+${end.if.modules}${module.includes.private}
diff --git a/languages/javascript/language.config.json b/languages/javascript/language.config.json
@@ -7,7 +7,6 @@
     ],
     "createModuleDirectories": true,
     "copySchemasIntoModules": true,
-    "aggregateFile": "/index.d.ts",
     "aggregateFiles": [
         "/index.d.ts"
     ],
@@ -25,4 +24,4 @@
         "object": "object"
     },
     "additionalMethodTemplates": [ "declarations" ]
-}
+}
diff --git a/src/macrofier/engine.mjs b/src/macrofier/engine.mjs
diff --git a/src/macrofier/index.mjs b/src/macrofier/index.mjs
@@ -53,6 +53,7 @@ const macrofy = async (
         convertTuplesToArraysOrObjects,
         additionalSchemaTemplates,
         additionalMethodTemplates,
+        templateExtensionMap,
         excludeDeclarations,
         extractProviderSchema,
         aggregateFiles,
@@ -97,6 +98,7 @@ const macrofy = async (
             allocatedPrimitiveProxies,
             additionalSchemaTemplates,
             additionalMethodTemplates,
+            templateExtensionMap,
             excludeDeclarations,
             extractProviderSchema,
             operators
@@ -181,7 +183,7 @@ const macrofy = async (
 
             // Pick the index and defaults templates for each module.
             templatesPerModule.forEach(t => {
-                const macros = engine.generateMacros(module, templates, exampleTemplates, {hideExcluded: hideExcluded, copySchemasIntoModules: copySchemasIntoModules, createPolymorphicMethods: createPolymorphicMethods, destination: t})
+                const macros = engine.generateMacros(module, templates, exampleTemplates, {hideExcluded: hideExcluded, copySchemasIntoModules: copySchemasIntoModules, createPolymorphicMethods: createPolymorphicMethods, destination: t, type: 'methods'})
                 let content = getTemplateForModule(module.info.title, t, templates)
 
                 // NOTE: whichever insert is called first also needs to be called again last, so each phase can insert recursive macros from the other

diff --git a/src/sdk/index.mjs b/src/sdk/index.mjs
@@ -69,6 +69,7 @@ const run = async ({
     allocatedPrimitiveProxies: config.allocatedPrimitiveProxies,
     additionalSchemaTemplates: config.additionalSchemaTemplates,
     additionalMethodTemplates: config.additionalMethodTemplates,
+    templateExtensionMap: config.templateExtensionMap,
     excludeDeclarations: config.excludeDeclarations,
     extractProviderSchema: config.extractProviderSchema,
     staticModuleNames: staticModuleNames,