feature/cpp branch alignment based on next branch merging for both op…

…enrpc and apis (#171)

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

@@ -1,10 +1,10 @@
-            ${if.optional}if (proxyResponse->${Property}.IsSet()) {
-                ${base.title}.${property} = std::make_optional<${type}>();
-                auto index(proxyResponse->${Property}.Elements());
+            ${if.optional}if ((*proxyResponse)${Property.dependency}.${Property}.IsSet()) {
+                ${base.title}${property.dependency}${if.impl.optional}.value()${end.if.impl.optional}.${property} = std::make_optional<${type}>();
+                auto index((*proxyResponse)${Property.dependency}.${Property}.Elements());
                 while (index.Next() == true) {
-    ${if.object}${items.with.indent}${end.if.object}${if.non.object}                ${base.title}.${property}.value().push_back(index.Current().Value());${end.if.non.object}
+    ${if.object}${items.with.indent}${end.if.object}${if.non.object}                ${base.title}${property.dependency}${if.impl.optional}.value()${end.if.impl.optional}.${property}.value().push_back(index.Current().Value());${end.if.non.object}
                 }
-            }${end.if.optional}${if.non.optional}auto index(proxyResponse->${Property}.Elements());
+            }${end.if.optional}${if.non.optional}auto index((*proxyResponse)${Property.dependency}.${Property}.Elements());
             while (index.Next() == true) {
-${if.object}${items.with.indent}${end.if.object}${if.non.object}                ${base.title}.${property}.value().push_back(index.Current().Value());${end.if.non.object}
+${if.object}${items.with.indent}${end.if.object}${if.non.object}                ${base.title}${property.dependency}${if.impl.optional}.value()${end.if.impl.optional}.${property}.value().push_back(index.Current().Value());${end.if.non.object}
             }${end.if.non.optional}

languages/cpp/templates/methods/property.cpp

@@ -2,6 +2,7 @@
     ${method.signature.result} ${info.Title}Impl::${method.name}( ${method.signature.params}${if.params}, ${end.if.params}Firebolt::Error *err ) const
     {
         const string method = _T("${info.title.lowercase}.${method.name}");
+        ${if.params}JsonObject jsonParameters;${end.if.params}
         ${if.params}${method.params.serialization}${end.if.params}
         ${method.result.json} jsonResult;
 ${method.result.initialization}

languages/javascript/templates/declarations/default.js

@@ -3,4 +3,4 @@
    * 
 ${method.params.annotations}${if.deprecated}   * @deprecated ${method.deprecation}
 ${end.if.deprecated}  */
-function ${method.name}(${method.signature.params}): Promise<${method.result.type}>
+  function ${method.name}(${method.signature.params}): Promise<${method.result.type}>

languages/javascript/templates/schemas/default.js

@@ -1,5 +1,4 @@
     /**
      * ${schema.description}
      */
-
 ${schema.shape}

languages/javascript/templates/types/default.mjs

@@ -1,4 +1 @@
-/*
- * ${title} - ${description}
- */
-type ${title} = ${shape}
+type ${title} = ${shape}

languages/javascript/templates/types/enum.mjs

@@ -1,6 +1,3 @@
-/*
- * ${title} - ${description}
- */
 ${title}: {
     ${key}: '${value}',
 },

languages/javascript/templates/types/enum.ts

@@ -1,6 +1,3 @@
-/*
- * ${title} - ${description}
- */
 enum ${title} {
     ${key} = '${value}',
 }

languages/javascript/templates/types/property.mjs

@@ -1 +1 @@
-    ${property}${if.optional}?${end.if.optional}: ${title} // ${summary}
+    ${property}${if.optional}?${end.if.optional}: ${title} // ${summary}

src/macrofier/engine.mjs

@@ -818,7 +818,7 @@ const enumFinder = compose(
   filter(([_key, val]) => isObject(val))
 )
 
-const generateEventEnums = (json, templates, options = { destination: '' }) => {
+const generateEnums = (json, templates, options = { destination: '' }) => {
   const suffix = options.destination.split('.').pop()
   return compose(
     option(''),
@@ -855,7 +855,7 @@ const generateEvents = (json, templates) => {
     return acc
   }, null)
 
-  return generateEventEnums(obj, templates)
+  return generateEnums(obj, templates)
 }
 
 function generateDefaults(json = {}, templates) {
@@ -1732,7 +1732,11 @@ function generateProviderSubscribe(json, templates) {
 function generateProviderInterfaces(json, templates) {
   const interfaces = getProvidedCapabilities(json)
   const suffix = state.destination ? state.destination.split('.').pop() : ''
-  let template = getTemplate(suffix ? `/sections/provider-interfaces.${suffix}` : '/sections/provider-interfaces', templates)
+
+  let template
+  if (suffix) {
+    template = getTemplate(`/sections/provider-interfaces.${suffix}`, templates)
+  }
   if (!template) {
     template = getTemplate('/sections/provider-interfaces', templates)
   }
@@ -1814,8 +1818,14 @@ function insertProviderInterfaceMacros(template, capability, moduleJson = {}, te
     .replace(/\$\{capability\}/g, capability)
     .replace(/[ \t]*\$\{methods\}[ \t]*\n/g, iface.map(method => {
       const focusable = method.tags.find(t => t['x-allow-focus'])
+      let interfaceDeclaration;
       const interfaceTemplate = '/interfaces/' + (focusable ? 'focusable' : 'default')
-      const interfaceDeclaration = getTemplate(suffix ? `${interfaceTemplate}.${suffix}` : interfaceTemplate, templates)
+      if (suffix) {
+        interfaceDeclaration = getTemplate(`${interfaceTemplate}.${suffix}`, templates)
+      }
+      if (!interfaceDeclaration) {
+        interfaceDeclaration = getTemplate(interfaceTemplate, templates)
+      }
       xValues = getProviderXValues(method)
       method.tags.unshift({
         name: 'provider'

src/macrofier/types.mjs

@@ -17,7 +17,7 @@
  */
 
 import deepmerge from 'deepmerge'
-import { getPath, localizeDependencies } from '../shared/json-schema.mjs'
+import { getPath, localizeDependencies, getSafeEnumKeyName } from '../shared/json-schema.mjs'
 import path from "path"
 
 let convertTuplesToArraysOrObjects = false
@@ -69,8 +69,6 @@ const indent = (str, padding) => {
   }
 }
 
-const safeName = value => value.split(':').pop().replace(/[\.\-]/g, '_').replace(/\+/g, '_plus').replace(/([a-z])([A-Z0-9])/g, '$1_$2').toUpperCase()
-
 // TODO: This is what's left of getMethodSignatureParams. We need to figure out / handle C's `FireboltTypes_StringHandle`
 function getMethodSignatureParams(method, module, { destination, callback }) {
   const paramOptional = getTemplate('/parameters/optional')
@@ -215,7 +213,7 @@ const insertEnumMacros = (content, schema, module, name, suffix, templateDir = "
         if (!value) {
           value = getTemplate(path.join(templateDir, 'unset' + suffix))
 	}
-        value ? values.push(template[i].replace(/\$\{key\}/g, safeName(value))
+        value ? values.push(template[i].replace(/\$\{key\}/g, getSafeEnumKeyName(value))
                                        .replace(/\$\{value\}/g, value)) : ''
       })
       template[i] = values.map((value, id) => {
@@ -401,8 +399,8 @@ const insertObjectMacros = (content, schema, module, title, property, options) =
             options2.property = prop
             const schemaShape = getSchemaShape(type, module, options2)
             properties.push(template
-              .replace(/\$\{property\}/g, safeName(prop))
-              .replace(/\$\{Property\}/g, capitalize(safeName(prop)))
+              .replace(/\$\{property\}/g, getSafeEnumKeyName(prop))
+              .replace(/\$\{Property\}/g, capitalize(getSafeEnumKeyName(prop)))
               .replace(/\$\{parent\.title\}/g, title)
               .replace(/\$\{title\}/g, getSchemaType(type, module, options2))
               .replace(/\$\{shape\}/g, schemaShape)