feat: JavaScript namespaces, JSON-Schema Bundles, Bi-directional JSON-RPC changes

.github/workflows/merge-to-main.yml

@@ -0,0 +1,94 @@
+name: Attempt to merge next to main
+on:
+  workflow_dispatch:
+
+jobs:
+  # Check if next can merge into main
+  check_merge:
+    name: Check if "next" can merge into "main"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          repo-token: ${{ secrets.SEMANTIC_RELEASE_BOT_PAT }}
+          persist-credentials: true
+
+      # Set user identity
+      - name: Set-Identity
+        run: |
+          git config --global user.email "${{ secrets.GLOBAL_GITHUB_EMAIL }}"
+          git config --global user.name "${{ secrets.GLOBAL_GITHUB_USER }}"
+
+      # Checkout "main"
+      - name: Checkout main
+        run: git checkout "main"
+
+      # Attempt a dry-run merge
+      - name: Attempt a dry-run merge
+        run: |
+          git merge --no-commit --no-ff origin/${{github.ref_name}}
+          exit $?
+
+  # Attempt to merge to main if our dry-run succeeded
+  process_merge_on_success:
+    name: Perform merge from "next" to "main"
+    needs: check_merge
+    runs-on: ubuntu-latest
+    if: ${{ success() }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          repo-token: ${{ secrets.SEMANTIC_RELEASE_BOT_PAT }}
+          persist-credentials: true
+
+      # Set user identity
+      - name: Set-Identity
+        run: |
+          git config --global user.email "${{ secrets.GLOBAL_GITHUB_EMAIL }}"
+          git config --global user.name "${{ secrets.GLOBAL_GITHUB_USER }}"
+
+      # Checkout "main"
+      - name: Checkout main
+        run: git checkout "main"
+
+      - name: Perform the merge from next to main
+        run: |
+          git merge origin/next
+          merge_status=$?
+
+          git push origin "main"
+          push_status=$?
+
+          if [ "$merge_status" -eq 0 ] && [ "$push_status" -eq 0 ]; then
+            echo "Push to main succeeded"
+            exit 0
+          else
+            exit 1
+          fi
+
+  # If the merge cannot be performed, let stakeholders  know
+  process_merge_on_failure:
+    name: Merge dry-run failure
+    needs: check_merge
+    runs-on: ubuntu-latest
+    if: ${{ failure() }}
+
+    steps:
+      - name: Post error message (To-Do)
+        run: echo "Next cannot be merged into main cleanly"
+
+  # If we attempted to merge/push to next-main but there was a failure
+  process_push_failure:
+    name: Merge failure
+    needs: process_merge_on_success
+    runs-on: ubuntu-latest
+    if: ${{ failure() && needs.process_merge_on_success.result != 'skipped' }}
+
+    steps:
+      - name: Post error message (To-Do)
+        run: echo "There was a failure when merging next into main"

.github/workflows/merge-to-next-major.yml

@@ -0,0 +1,149 @@
+name: Attempt to merge next to next-major
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - "next"
+
+jobs:
+  # Check if next can merge into next-major
+  check_merge:
+    name: Check if "next" can merge into "next-major"
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          repo-token: ${{ secrets.SEMANTIC_RELEASE_BOT_PAT }}
+          persist-credentials: true
+
+      # Set user identity
+      - name: Set-Identity
+        run: |
+          git config --global user.email "${{ secrets.GLOBAL_GITHUB_EMAIL }}"
+          git config --global user.name "${{ secrets.GLOBAL_GITHUB_USER }}"
+
+      # Checkout "next-major"
+      - name: Checkout next-major
+        run: git checkout "next-major"
+
+      # Get the "next-major" version number
+      - name: Extract next-major version
+        id: extract_version
+        run: echo "::set-output name=version::$(node -e 'console.log(require("./package.json").version)')"
+
+      # Checkout "next"
+      - name: Checkout next
+        run: git checkout "next"
+
+      # Update "next" version to match "next-major"
+      - name: Update "next" version to match "next-major"
+        run: |
+          jq '.version = "${{ steps.extract_version.outputs.version }}"' package.json > temp.json
+
+          if diff -q "package.json" "temp.json" >/dev/null; then
+            echo "Versions are identical. No change required."
+            rm temp.json
+          else
+            mv temp.json package.json
+            git add package.json && git commit -m "Sync version to ${{ steps.extract_version.outputs.version }}"
+          fi
+
+      # Checkout "next-major"
+      - name: Checkout next-major
+        run: git checkout "next-major"
+
+      # Attempt a dry-run merge
+      - name: Attempt a dry-run merge
+        run: |
+          git merge --no-commit --no-ff ${{github.ref_name}}
+          exit $?
+
+  # Attempt to merge to next-major if our dry-run succeeded
+  process_merge_on_success:
+    name: Perform merge from "next" to "next-major"
+    needs: check_merge
+    runs-on: ubuntu-latest
+    if: ${{ success() }}
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+          repo-token: ${{ secrets.SEMANTIC_RELEASE_BOT_PAT }}
+          persist-credentials: true
+
+      # Set user identity
+      - name: Set-Identity
+        run: |
+          git config --global user.email "${{ secrets.GLOBAL_GITHUB_EMAIL }}"
+          git config --global user.name "${{ secrets.GLOBAL_GITHUB_USER }}"
+
+      # Checkout "next-major"
+      - name: Checkout next-major
+        run: git checkout "next-major"
+
+      # Get the "next-major" version number
+      - name: Extract next-major version
+        id: extract_version
+        run: echo "::set-output name=version::$(node -e 'console.log(require("./package.json").version)')"
+
+      # Checkout "next"
+      - name: Checkout next
+        run: git checkout "next"
+
+      # Update "next" version to match "next-major"
+      - name: Update "next" version to match "next-major"
+        run: |
+          jq '.version = "${{ steps.extract_version.outputs.version }}"' package.json > temp.json
+
+          if diff -q "package.json" "temp.json" >/dev/null; then
+            echo "Versions are identical. No change required."
+            rm temp.json
+          else
+            mv temp.json package.json
+            git add package.json && git commit -m "Sync version to ${{ steps.extract_version.outputs.version }}"
+          fi
+
+      # Checkout "next-major"
+      - name: Checkout next-major
+        run: git checkout "next-major"
+
+      - name: Perform the merge from next to next-major
+        run: |
+          git merge next
+          merge_status=$?
+
+          git push origin "next-major"
+          push_status=$?
+
+          if [ "$merge_status" -eq 0 ] && [ "$push_status" -eq 0 ]; then
+            echo "Push to next-major succeeded"
+            exit 0
+          else
+            exit 1
+          fi
+
+  # If the merge cannot be performed, let stakeholders know
+  process_merge_on_failure:
+    name: Merge dry-run failure
+    needs: check_merge
+    runs-on: ubuntu-latest
+    if: ${{ failure() }}
+
+    steps:
+      - name: Post error message (To-Do)
+        run: echo "Next cannot be merged into next-major cleanly"
+
+  # If we attempted to merge/push to next-main but there was a failure
+  process_push_failure:
+    name: Merge failure
+    needs: process_merge_on_success
+    runs-on: ubuntu-latest
+    if: ${{ failure() && needs.process_merge_on_success.result != 'skipped' }}
+
+    steps:
+      - name: Post error message (To-Do)
+        run: echo "There was a failure when merging next into next-major"

languages/cpp/templates/modules/include/module.h

@@ -19,7 +19,10 @@
 #pragma once
 
 #include "error.h"
-/* ${IMPORTS} */
+/* ${IMPORTS:h} */
+${if.callsmetrics}#include "metrics.h"
+${end.if.callsmetrics}
+
 
 ${if.declarations}namespace Firebolt {
 namespace ${info.Title} {
@@ -30,7 +33,19 @@ namespace ${info.Title} {
 ${if.types}
 // Types
 /* ${TYPES} */${end.if.types}
-${if.providers}/* ${PROVIDERS} */${end.if.providers}${if.xuses}/* ${XUSES} */${end.if.xuses}
+${if.providers}// Provider Interfaces
+struct IProviderSession {
+    virtual ~IProviderSession() = default;
+
+    virtual std::string correlationId() const = 0;
+};
+
+struct IFocussableProviderSession : virtual public IProviderSession {
+    virtual ~IFocussableProviderSession() override = default;
+
+    virtual void focus( Firebolt::Error *err = nullptr ) = 0;
+};
+/* ${PROVIDER_INTERFACES} */${end.if.providers}${if.xuses}/* ${XUSES} */${end.if.xuses}
 ${if.methods}struct I${info.Title} {
 
     virtual ~I${info.Title}() = default;

languages/cpp/templates/modules/src/module_impl.cpp

@@ -22,7 +22,7 @@
 namespace Firebolt {
 namespace ${info.Title} {
 ${if.providers}
-/* ${PROVIDERS} */${end.if.providers}
+/* ${PROVIDER_CLASES} */${end.if.providers}
     // Methods
     /* ${METHODS} */
 
@@ -35,5 +35,5 @@ namespace ${info.Title} {
 
 namespace WPEFramework {
 
-/* ${ENUMS} */
+/* ${ENUM_IMPLEMENTATIONS} */
 }${end.if.enums}

languages/cpp/templates/modules/src/module_impl.h

@@ -20,7 +20,9 @@
 
 #include "FireboltSDK.h"
 #include "IModule.h"
-/* ${IMPORTS} */
+/* ${IMPORTS:impl} */
+${if.callsmetrics}#include "metrics_impl.h"
+${end.if.callsmetrics}
 #include "${info.title.lowercase}.h"
 
 ${if.implementations}

languages/cpp/templates/schemas/include/common/module.h

@@ -19,7 +19,7 @@
 #pragma once
 
 #include "error.h"
-/* ${IMPORTS} */
+/* ${IMPORTS:h} */
 
 ${if.declarations}namespace Firebolt {
 namespace ${info.Title} {

languages/cpp/templates/schemas/src/jsondata_module.h

@@ -18,7 +18,7 @@
 
 #pragma once
 
-/* ${IMPORTS} */
+/* ${IMPORTS:jsondata} */
 #include "common/${info.title.lowercase}.h"
 
 ${if.schemas}namespace Firebolt {

languages/cpp/templates/schemas/src/module_common.cpp

@@ -17,11 +17,11 @@
  */
 
 #include "FireboltSDK.h"
-/* ${IMPORTS} */
+/* ${IMPORTS:cpp} */
 #include "jsondata_${info.title.lowercase}.h"
 ${if.enums}
 
 namespace WPEFramework {
 
-/* ${ENUMS} */
+/* ${ENUM_IMPLEMENTATIONS} */
 }${end.if.enums}

languages/cpp/templates/sdk/include/firebolt.h

@@ -127,7 +127,7 @@ struct IFireboltAccessor {
     // Module Instance methods goes here.
     // Instances are owned by the FireboltAcccessor and linked with its lifecycle.
 
-${module.init}
+${module.init:h}
 };
 
 }

languages/cpp/templates/sdk/src/firebolt.cpp

@@ -94,7 +94,7 @@ namespace Firebolt {
         {
         }
 
-${module.init}
+${module.init:cpp}
     private:
         FireboltSDK::Accessor* _accessor;
         static FireboltAccessorImpl* _singleton;

languages/javascript/language.config.json

@@ -5,8 +5,12 @@
         "/index.mjs",
         "/defaults.mjs"
     ],
+    "templatesPerSchema": [
+        "/index.mjs"
+    ],
     "createModuleDirectories": true,
-    "copySchemasIntoModules": true,
+    "copySchemasIntoModules": false,
+    "mergeOnTitle": true,
     "aggregateFiles": [
         "/index.d.ts"
     ],