Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 3 commits into from
Jan 31, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e4e33ec
Optimization of generation time: generate macros only based on the sc…
HaseenaSainul Jan 23, 2024
6a648fa
insertMethodMacros: call getSchemaShape based on type (method or decl…
HaseenaSainul Jan 24, 2024
d3168de
Ensure: method schemaShape generation is doing only for Modules
HaseenaSainul Jan 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion languages/cpp/language.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" ]
}
}
2 changes: 1 addition & 1 deletion languages/cpp/templates/codeblocks/module-include-private.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
${if.modules}#include "${info.title.lowercase}_impl.h"
${end.if.modules}${module.includes.private}
${end.if.modules}${module.includes.private}
3 changes: 1 addition & 2 deletions languages/javascript/language.config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
],
"createModuleDirectories": true,
"copySchemasIntoModules": true,
"aggregateFile": "/index.d.ts",
"aggregateFiles": [
"/index.d.ts"
],
Expand All @@ -25,4 +24,4 @@
"object": "object"
},
"additionalMethodTemplates": [ "declarations" ]
}
}
82 changes: 47 additions & 35 deletions src/macrofier/engine.mjs
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 3 additions & 1 deletion src/macrofier/index.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ const macrofy = async (
convertTuplesToArraysOrObjects,
additionalSchemaTemplates,
additionalMethodTemplates,
templateExtensionMap,
excludeDeclarations,
extractProviderSchema,
aggregateFiles,
Expand Down Expand Up @@ -97,6 +98,7 @@ const macrofy = async (
allocatedPrimitiveProxies,
additionalSchemaTemplates,
additionalMethodTemplates,
templateExtensionMap,
excludeDeclarations,
extractProviderSchema,
operators
Expand Down Expand Up @@ -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
Expand Down
1 change: 1 addition & 0 deletions src/sdk/index.mjs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
Loading