refactors HandlebarsEngine context.model() and assign helper.

ZenWave360 · Dec 13, 2024 · a62bc55 · a62bc55
1 parent 7413cf8
commit a62bc55
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/CustomHandlebarsHelpers.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/CustomHandlebarsHelpers.java
@@ -186,15 +186,16 @@ public static Object uncapFirst(String text, Options options) throws IOException
     }
 
     public static Object assign(final String variableName, final Options options) throws IOException {
+        var model = (Map) options.context.model();
         if (options.params.length == 1) {
             if (options.param(0) != null) {
-                options.context.combine(Map.of(variableName, options.param(0)));
+                model.put(variableName, options.param(0));
             } else {
 
             }
         } else {
             CharSequence finalValue = options.apply(options.fn);
-            options.context.combine(Map.of(variableName, finalValue.toString().trim()));
+            model.put(variableName, finalValue.toString().trim());
         }
         return null;
     }

diff --git a/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/HandlebarsEngine.java b/zenwave-sdk-cli/src/main/java/io/zenwave360/sdk/templating/HandlebarsEngine.java
@@ -47,12 +47,14 @@ public List<TemplateOutput> processTemplates(Map<String, Object> model, List<Tem
 
     @Override
     public List<TemplateOutput> processTemplates(String modelPrefix, Map<String, Object> apiModel, List<TemplateInput> templateInputs) {
-        Context context = Context.newBuilder(this.context).build();
-        if (modelPrefix != null) {
-            context.combine(modelPrefix, apiModel);
-        } else {
-            context.combine(apiModel);
-        }
+        var currentModel = new HashMap((Map)context.model());
+        ((Map) context.model()).putAll(apiModel);
+//        Context context = Context.newBuilder(this.context).build();
+//        if (modelPrefix != null) {
+//            context.combine(modelPrefix, apiModel);
+//        } else {
+//            context.combine(apiModel);
+//        }
         List<TemplateOutput> templateOutputList = new ArrayList<>();
         templateInputs.forEach(templateInput -> {
             if (templateInput.getSkip() == null || !Boolean.TRUE.equals(templateInput.getSkip().apply(apiModel))) {
@@ -66,6 +68,8 @@ public List<TemplateOutput> processTemplates(String modelPrefix, Map<String, Obj
                 }
             }
         });
+        ((Map<?, ?>) context.model()).clear();
+        ((Map) context.model()).putAll(currentModel);
         return templateOutputList;
     }
 }