CPPSDK: parameter/result handling for method and events + inner objec…

…t handlings

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

@@ -0,0 +1 @@
+        WPEFramework::Core::ProxyType<${method.result.json}>* proxyResponse = reinterpret_cast<WPEFramework::Core::ProxyType<${method.result.json}>*>(jsonResponse);

languages/cpp/templates/callback-parameter-serialization/primitive.cpp

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

languages/cpp/templates/callback-response-instantiation/generic.cpp

@@ -0,0 +1 @@
+response

languages/cpp/templates/callback-response-instantiation/primitive.cpp

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

languages/cpp/templates/callback-response-instantiation/ref.h

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

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

@@ -0,0 +1,5 @@
+            ${if.namespace.notsame}Firebolt::${info.Title}::${end.if.namespace.notsame}JsonData_${title} elements = (*proxyResponse)->Variants();
+            ${if.namespace.notsame}${info.Title}::${end.if.namespace.notsame}${title} response;
+            while (elements.Next()) {
+                response.insert(elements.Label(), elements.Current().${additional.type}.Value());
+            }

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

@@ -0,0 +1,5 @@
+            auto index((*proxyResponse)->Elements());
+            ${type} response;
+            while (index.Next() == true) {
+                response.push_back(index.Current().Value());
+            }

languages/cpp/templates/callback-result-instantiation/enum.cpp

@@ -0,0 +1 @@
+            ${if.namespace.notsame}${info.Title}::${end.if.namespace.notsame}${title} response = (*proxyResponse)->Value();

languages/cpp/templates/callback-result-instantiation/generic.cpp

@@ -0,0 +1 @@
+            ${type} response = (*proxyResponse)->Value();

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

@@ -0,0 +1,2 @@
+            ${title} response;
+${properties}

languages/cpp/templates/callback-result-instantiation/primitive.cpp

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

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

@@ -0,0 +1 @@
+${shape}            ${if.non.object}response.${property} = (*proxyResponse)->${Property};${end.if.non.object}

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

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

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

@@ -0,0 +1 @@
+.

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

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

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

@@ -0,0 +1 @@
+${shape}            ${if.non.object}response.${property.dependency}${property} = (*proxyResponse)->${Property.dependency}${Property};${end.if.non.object}

languages/cpp/templates/callback-result-instantiation/sub-property/ref.h

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

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

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

languages/cpp/templates/callback-result-instantiation/title.cpp

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

languages/cpp/templates/callback-result-instantiation/tuple.cpp

@@ -0,0 +1,4 @@
+                auto index((*proxyResponse)->Elements());
+                ${if.namespace.notsame}${info.Title}::${end.if.namespace.notsame}${title} response;
+                response.first = index.Get(0);
+                response.second = index.Get(1);

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

@@ -0,0 +1 @@
+    using ${title} = WPEFramework::Core::JSON::VariantContainer;

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

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

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

@@ -0,0 +1 @@
+    /* anyOf schema shape is supported right now */

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

@@ -0,0 +1 @@
+WPEFramework::Core::JSON::ArrayType<${json.type}>

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

@@ -1,4 +1 @@
-    /* ${title} ${description} */
-    ENUM_CONVERSION_BEGIN(${name})
-        { ${NAME}_${key}, _T("${value}") },
-    ENUM_CONVERSION_END(${name})
+    using JsonData_${type} = WPEFramework::Core::JSON::EnumType<${type}>;

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

@@ -0,0 +1 @@
+Firebolt::${info.Title}::

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

@@ -6,20 +6,20 @@
         ${title}()
             : WPEFramework::Core::JSON::Container()
         {
-            ${properties.register}
+${properties.register}
         }
 
         ${title}(const ${title}& other)
         {
-            ${properties.assign}
+${properties.assign}
         }
 
         ${title}& operator=(const ${title}& other)
         {
-            ${properties.assign}
+${properties.assign}
             return (*this);
         }
 
     public:
-        ${properties}
+${properties}
     };

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

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

languages/cpp/templates/json-types/property-assign.cpp

@@ -1,2 +1,2 @@
-        Add(_T("${property}"), &${Property});
-        ${Property} = other.${Property}
+            Add(_T("${property}"), &${Property});
+            ${Property} = other.${Property};

languages/cpp/templates/json-types/property-register.cpp

@@ -1,2 +1 @@
-        Add(_T("${property}"), &${Property});
-
+            Add(_T("${property}"), &${Property});

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

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

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

@@ -0,0 +1 @@
+        using ${title} = WPEFramework::Core::JSON::ArrayType<${json.type}>;

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

@@ -0,0 +1,7 @@
+        WPEFramework::Core::JSON::ArrayType<WPEFramework::Core::JSON::Variant> ${Property};
+        for (auto& element: ${property}) {
+            ${Property}.Add() = element;
+        }
+        WPEFramework::Core::JSON::Variant ${Property}Variant;
+        ${Property}Variant.Array(${Property});
+        jsonParameters.Set(_T("${property}"), ${Property}Variant);

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

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

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

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

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

@@ -1,2 +1,7 @@
-        WPEFramework::Core::JSON::Variant ${Property} = ${property};
+        ${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} = ${Property}VariantContainer;
         jsonParameters.Set(_T("${property}"), ${Property});

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

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

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

@@ -0,0 +1 @@
+${shape}            ${if.non.object}${title}.${Property} = ${base.title}.${property};${end.if.non.object}

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

@@ -0,0 +1 @@
+.

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

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

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

@@ -0,0 +1 @@
+${shape}            ${if.non.object}${title}.${Property.dependency}${Property} = ${base.title}.${property.dependency}${property};${end.if.non.object}

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

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

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

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

languages/cpp/templates/parameters/optional.h

@@ -1 +1 @@
-std::optional<${method.param.type}> ${method.param.name}
+const std::optional<${method.param.type}>& ${method.param.name}

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

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

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

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

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

@@ -0,0 +1 @@
+${if.namespace.notsame}${parent.Title}::${end.if.namespace.notsame}

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,3 @@
+            while (jsonResult.Variants().Next()) {
+                ${property}.insert(elements.Label(), elements.Current().${additional.type}.Value()); 
+            }

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

@@ -0,0 +1,4 @@
+            auto index(jsonResult.Elements());
+            while (index.Next() == true) {
+                ${property}.push_back(index.Current().Value());
+            }

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

@@ -0,0 +1 @@
+            ${property} = jsonResult.Value();

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

@@ -1,4 +1 @@
-                WPEFramework::Core::ProxyType<FireboltSDK::${info.Title}::${title}>* resultPtr = new WPEFramework::Core::ProxyType<FireboltSDK::${info.Title}::${title}>();
-                *resultPtr = WPEFramework::Core::ProxyType<FireboltSDK::${info.Title}::${title}>::Create();
-                *(*resultPtr) = jsonResult;
-                *${property} = static_cast<${info.Title}_${title}>(resultPtr);
+${properties}

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

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

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

@@ -1,2 +1 @@
-                FireboltSDK::JSON::String* strResult = new FireboltSDK::JSON::String(jsonResult);
-                *value = static_cast<FireboltTypes_StringHandle>(strResult);
+            ${property} = jsonResult.Value().c_str();

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

@@ -0,0 +1 @@
+.

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

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

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

@@ -0,0 +1 @@
+${shape}            ${if.non.object}${base.title}.${property.dependency}${property} = jsonResult.${Property.dependency}${Property};${end.if.non.object}

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

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

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

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

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

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

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

@@ -0,0 +1,3 @@
+                auto index(jsonResult.Elements());
+                ${property}.first = index.Get(0);
+                ${property}.second = index.Get(1);

languages/cpp/templates/types/additionalProperties.h

@@ -1 +1 @@
-${title} value;
+using ${title} = std::unordered_map<${key}, ${type}>;

languages/cpp/templates/types/additionalPropertiesKey.h

@@ -0,0 +1 @@
+std::string

languages/cpp/templates/types/anyOf.h

@@ -0,0 +1 @@
+std::string

languages/cpp/templates/types/anyOfSchemaShape.h

@@ -0,0 +1 @@
+    /* anyOf schema shape is supported right now */

languages/cpp/templates/types/const.h

@@ -0,0 +1 @@
+std::string

languages/cpp/templates/types/default.h

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

languages/cpp/templates/types/items.h

@@ -0,0 +1 @@
+${title}${delimiter}, ${end.delimiter}

languages/cpp/templates/types/null.h

@@ -0,0 +1 @@
+void

languages/cpp/templates/types/object.h

@@ -1,5 +1,3 @@
 struct ${title} {
-
     ${properties}
-
 };

languages/cpp/templates/types/tuple.h

@@ -1,2 +1,2 @@
 /* ${title} */
-std::pair<${type},${type}> ${title};
+std::pair<${items}> ${title};

src/macrofier/engine.mjs

@@ -1193,13 +1193,14 @@ function insertMethodMacros(template, methodObj, json, templates, examples = {})
   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 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') : ''
   // this was wrong... check when we merge if it was fixed
-  const callbackSerializedParams = event ? types.getSchemaShape(event.result.schema, json, { templateDir: 'parameter-serialization', property: result.name, destination: state.destination, section: state.section, level: 1, skipTitleOnce: true }) : ''
-  const callbackResultInst = event ? types.getSchemaShape(event, json, { name: event.name, templateDir: 'result-instantiation' }) : ''
-//  const callbackResponseInst = event ? types.getSchemaInstantiation(event, json, event.name, { instantiationType: 'callback.response' }) : ''
+  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 }) : ''
+
+  const callbackResultInst = event ? types.getSchemaShape(event.result.schema, json, { templateDir: 'callback-result-instantiation', property: result.name, destination: state.destination, section: state.section, level: 1, skipTitleOnce: true }) : ''
   // hmm... how is this different from callbackSerializedParams? i guess they get merged?
-  const callbackResponseInst = event ? types.getSchemaShape(event.result.schema, json, { templateDir: 'parameter-serialization', property: result.name, destination: state.destination, section: state.section, level: 1, skipTitleOnce: true }) : ''
+  const callbackResponseInst = event ? types.getSchemaShape(event.result.schema, json, { templateDir: 'callback-response-instantiation', property: result.name, destination: state.destination, section: state.section, level: 1, skipTitleOnce: true }) : ''
   const resultType = result.schema ? types.getSchemaType(result.schema, json, { name: result.name, templateDir: state.typeTemplateDir }) : ''
   const resultJsonType = result.schema ? types.getSchemaType(result.schema, json, { name: result.name, templateDir: 'json-types' }) : ''
   const resultParams = generateResultParams(result.schema, json, templates, { name: result.name})
@@ -1306,7 +1307,7 @@ function insertMethodMacros(template, methodObj, json, templates, examples = {})
     .replace(/\$\{method\.pulls\.params.type\}/g, pullsParams ? pullsParams.title : '')
     .replace(/\$\{method\.pulls\.params\}/g, pullsParamsType)
     .replace(/\$\{method\.pulls\.param\.type\}/g, pullsForParamType)
-    .replace(/\$\{method\.pulls\.param\.json.type\}/g, pullsForParamJsonType)
+    .replace(/\$\{method\.pulls\.param\.json\.type\}/g, pullsForParamJsonType)
     .replace(/\$\{method\.setter\.for\}/g, setterFor)
     .replace(/\$\{method\.puller\}/g, pullerTemplate) // must be last!!
     .replace(/\$\{method\.setter\}/g, setterTemplate) // must be last!!