CPPSDK: changes to handle nested array/objects

languages/cpp/templates/additional-types/boolean.cpp

@@ -0,0 +1 @@
+Boolean()

languages/cpp/templates/additional-types/integer.cpp

@@ -0,0 +1 @@
+Number()

languages/cpp/templates/additional-types/number.cpp

@@ -0,0 +1 @@
+Float()

languages/cpp/templates/additional-types/string.cpp

@@ -0,0 +1 @@
+String()

languages/cpp/templates/json-types/null.h

@@ -0,0 +1 @@
+WPEFramework::Core::JSON::VariantContainer

languages/cpp/templates/json-types/void.cpp

@@ -0,0 +1 @@
+WPEFramework::Core::JSON::VariantContainer

languages/cpp/templates/parameter-serialization/array.cpp

@@ -1,6 +1,6 @@
         WPEFramework::Core::JSON::ArrayType<WPEFramework::Core::JSON::Variant> ${Property};
-        for (auto& element: ${property}) {
-            ${Property}.Add() = element;
+        for (auto& element : ${property}) {
+${if.object}${items.with.indent}${end.if.object}${if.non.object}${Property}.Add() = element;${end.if.non.object}
         }
         WPEFramework::Core::JSON::Variant ${Property}Variant;
         ${Property}Variant.Array(${Property});

languages/cpp/templates/parameter-serialization/enum.cpp

@@ -1,3 +1,3 @@
-        ${if.namespace.notsame}Firebolt::${info.Title}::${end.if.namespace.notsame}JsonData_${title} jsonValue = ${property};
+        ${if.namespace.notsame}Firebolt::${info.Title}::${end.if.namespace.notsame}JsonData_${title} jsonValue = ${property}${if.optional}.value()${end.if.optional};
         WPEFramework::Core::JSON::Variant ${Property}(jsonValue.Data());
         jsonParameters.Set(_T("${property}"), ${Property});

languages/cpp/templates/parameter-serialization/generic.cpp

@@ -1,2 +1,2 @@
-        WPEFramework::Core::JSON::Variant ${Property}(${property});
-        jsonParameters.Set(_T("${property}"), ${Property});
+        WPEFramework::Core::JSON::Variant ${Property}(${property}${if.optional}.value()${end.if.optional});
+        jsonParameters.Set(_T("${property}"), ${Property});

languages/cpp/templates/parameter-serialization/object-array.cpp

@@ -0,0 +1,7 @@
+            ${if.namespace.notsame}Firebolt::${info.Title}::${end.if.namespace.notsame}JsonData_${title} ${Property}Container;
+${properties}
+        string ${Property}Str;
+        ${Property}Container.ToString(${Property}Str);
+        WPEFramework::Core::JSON::VariantContainer ${Property}VariantContainer(${Property}Str);
+        WPEFramework::Core::JSON::Variant ${Property}Variant = ${Property}VariantContainer;
+        ${Property}.Add() = ${Property}Variant;

languages/cpp/templates/parameter-serialization/object.cpp

@@ -1,3 +1,4 @@
+        auto element = ${property};
         ${if.namespace.notsame}Firebolt::${info.Title}::${end.if.namespace.notsame}JsonData_${title} ${Property}Container;
 ${properties}
         string ${Property}Str;

languages/cpp/templates/parameter-serialization/property.cpp

@@ -1 +1 @@
-${shape}            ${if.non.object}${title}.${Property} = ${base.title}.${property};${end.if.non.object}
+${shape}        ${if.non.object}${base.Title}Container.${Property} = element${if.base.optional}.value()${end.if.base.optional}.${property}${if.optional}.value()${end.if.optional};${end.if.non.object}

languages/cpp/templates/parameter-serialization/sub-property/property.cpp

@@ -1 +1 @@
-${shape}            ${if.non.object}${title}.${Property.dependency}${Property} = ${base.title}.${property.dependency}${property};${end.if.non.object}
+${shape}            ${if.non.object}${title}.${Property.dependency}${Property} = element${if.base.optional}.value()${end.if.base.optional}.${property.dependency}${property}${if.optional}.value()${end.if.optional};${end.if.non.object}

languages/cpp/templates/result-initialization/additionalProperties.cpp

@@ -0,0 +1 @@
+        ${Title} ${property};

languages/cpp/templates/result-initialization/array.cpp

@@ -0,0 +1 @@
+        ${type} ${property};

languages/cpp/templates/result-instantiation/additionalProperties.cpp

@@ -1,3 +1,6 @@
             while (jsonResult.Variants().Next()) {
-                ${property}.insert(elements.Label(), elements.Current().${additional.type}.Value()); 
+                std::string label = jsonResult.Variants().Label();
+                ${property}.emplace(std::piecewise_construct,
+                    std::forward_as_tuple(label),
+                    std::forward_as_tuple(jsonResult.Variants().Current().${additional.type}));
             }

languages/cpp/templates/result-instantiation/array.cpp

@@ -1,4 +1,4 @@
             auto index(jsonResult.Elements());
             while (index.Next() == true) {
-                ${property}.push_back(index.Current().Value());
-            }
+${if.object}${items.with.indent}${end.if.object}${if.non.object}                ${property}.push_back(index.Current().Value());${end.if.non.object}
+            }

languages/cpp/templates/result-instantiation/object-array.cpp

@@ -0,0 +1,4 @@
+                ${type} ${property}Result${level};
+            ${if.namespace.notsame}Firebolt::${info.Title}::${end.if.namespace.notsame}JsonData_${title} jsonResult = index.Current();
+${properties}
+            ${property}.push_back(${property}Result${level});

languages/cpp/templates/result-instantiation/object.cpp

@@ -1 +1,3 @@
-${properties}
+            ${type} ${property}Result${level};
+${properties}
+            ${property} = ${property}Result${level};

languages/cpp/templates/result-instantiation/property.cpp

@@ -1 +1 @@
-${shape}            ${if.non.object}${base.title}.${property} = jsonResult.${Property}.Value();${end.if.non.object}
+${shape}            ${if.non.array}${if.non.object}${base.title}Result${level}.${property} = jsonResult.${Property}.Value();${end.if.non.object}${end.if.non.array}

languages/cpp/templates/result-instantiation/ref.h

@@ -0,0 +1 @@
+${shape}

languages/cpp/templates/result-instantiation/sub-property/array.cpp

@@ -0,0 +1,4 @@
+            auto index(jsonResult.${Property}.Elements());
+            while (index.Next() == true) {
+${if.object}${items.with.indent}${end.if.object}${if.non.object}                ${property}.push_back(index.Current().Value());${end.if.non.object}
+            }

languages/cpp/templates/result-instantiation/sub-property/object-array.cpp

@@ -0,0 +1,4 @@
+                ${type} ${property}Result${level};
+            ${if.namespace.notsame}Firebolt::${info.Title}::${end.if.namespace.notsame}JsonData_${title} jsonResult = index.Current();
+${properties}
+            ${property}Result.${property}${if.impl.optional}.value()${end.if.impl.optional}.push_back(${property}Result${level});

languages/cpp/templates/result-instantiation/sub-property/object.cpp

@@ -1 +1 @@
-${properties}
+${properties}

languages/cpp/templates/result-instantiation/sub-property/property.cpp

@@ -1 +1 @@
-${shape}            ${if.non.object}${base.title}.${property.dependency}${property} = jsonResult.${Property.dependency}${Property};${end.if.non.object}
+${shape}            ${if.non.object}${base.title}Result${level}.${property.dependency}${if.impl.optional}value().${end.if.impl.optional}${property} = jsonResult.${Property.dependency}${Property};${end.if.non.object}

languages/cpp/templates/result-instantiation/sub-property/title.cpp

@@ -1 +1 @@
-${Title}
+${Title}

src/macrofier/engine.mjs

@@ -1191,10 +1191,10 @@ function insertMethodMacros(template, methodObj, json, templates, examples = {})
   const pullsResultType = pullsResult && types.getSchemaShape(pullsResult, json, { destination: state.destination, templateDir: state.typeTemplateDir, section: state.section })
   const pullsForType = pullsResult && types.getSchemaType(pullsResult, json, { destination: state.destination, templateDir: state.typeTemplateDir, section: state.section })
   const pullsParamsType = pullsParams ? types.getSchemaShape(pullsParams, json, { destination: state.destination, templateDir: state.typeTemplateDir, section: state.section }) : ''
-  const serializedParams = flattenedMethod.params.map(param => types.getSchemaShape(param.schema, json, { templateDir: 'parameter-serialization', property: param.name, destination: state.destination, section: state.section, level: 1, skipTitleOnce: true })).join('\n')
+  const serializedParams = flattenedMethod.params.map(param => types.getSchemaShape(param.schema, json, { templateDir: 'parameter-serialization', property: param.name, required: param.required || false, destination: state.destination, section: state.section, level: 1, skipTitleOnce: true })).join('\n')
   const resultInst = types.getSchemaShape(flattenedMethod.result.schema, json, { templateDir: 'result-instantiation', property: flattenedMethod.result.name, destination: state.destination, section: state.section, level: 1, skipTitleOnce: true }) // w/out level: 1, getSchemaShape skips anonymous types, like primitives
   const resultInit = types.getSchemaShape(flattenedMethod.result.schema, json, { templateDir: 'result-initialization', property: flattenedMethod.result.name, destination: state.destination, section: state.section, level: 1, skipTitleOnce: true }) // w/out level: 1, getSchemaShape skips anonymous types, like primitives
-  const serializedEventParams = event ? flattenedMethod.params.filter(p => p.name !== 'listen').map(param => types.getSchemaShape(param.schema, json, {templateDir: 'parameter-serialization', property: param.name, destination: state.destination, section: state.section, level: 1, skipTitleOnce: true })).join('\n') : ''
+  const serializedEventParams = event ? flattenedMethod.params.filter(p => p.name !== 'listen').map(param => types.getSchemaShape(param.schema, json, {templateDir: 'parameter-serialization', property: param.name, required: param.required || false, destination: state.destination, section: state.section, level: 1, skipTitleOnce: true })).join('\n') : ''
   // this was wrong... check when we merge if it was fixed
   const callbackSerializedParams = event ? types.getSchemaShape(event.result.schema, json, { templateDir: 'callback-parameter-serialization', property: result.name, destination: state.destination, section: state.section, level: 1, skipTitleOnce: true }) : ''