Merge branch 'main' into activate-element-intent

Author: jugglinmike

.github/workflows/auto-publish.yml

@@ -6,20 +6,20 @@ on:
 jobs:
   main:
     name: Build, Validate and Deploy
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: w3c/spec-prod@v2
         with:
           GH_PAGES_BRANCH: gh-pages
           # equivalent to the Bikeshed CLI argument, `--die-on=link-error`
           BUILD_FAIL_ON: link-error
   check-cddl-consistency:
     name: Verify that the generated CDDL files are in sync with the inline CDDL
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v1
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 18.x
       - name: Extract CDDL
@@ -28,9 +28,9 @@ jobs:
         run: git diff --exit-code
   check-cddl-validity:
     name: Verify that the generated CDDL files are valid
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Get cddl version
         run: curl -s https://crates.io/api/v1/crates/cddl | python3 -c "import sys, json; print(json.load(sys.stdin)['crate']['max_stable_version'])" | tee cddl.txt
       - name: "Cache rust binaries"
@@ -53,10 +53,10 @@ jobs:
         run: ./scripts/test-cddl.sh
   check-json-schema-validity:
     name: Verify that the JSON schema files are valid
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v3
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
         with:
           node-version: 18
       - run: npm ci

index.bs

@@ -127,10 +127,6 @@ This section gives the initial contents of the remote end definition and local e
 [=Remote end definition=]
 
 <xmp class="cddl remote-cddl">
-Extensible = {
-  *text => any
-}
-
 Command = {
   id: uint,
   CommandData,
@@ -149,10 +145,6 @@ EmptyParams = { Extensible }
 [=Local end definition=]:
 
 <xmp class="cddl local-cddl">
-Extensible = {
-  *text => any
-}
-
 Message = (
   CommandResponse //
   ErrorResponse //
@@ -191,6 +183,14 @@ EventData = (
 )
 </xmp>
 
+[=Remote end definition=] and [=local end definition=]:
+
+<xmp class="cddl remote-cddl local-cddl">
+Extensible = {
+  *text => any
+}
+</xmp>
+
 Capabilities {#protocol-capabilities}
 -------------------------------------
 

schemas/at-driver-local.cddl

@@ -1,7 +1,3 @@
-Extensible = {
-  *text => any
-}
-
 Message = (
   CommandResponse //
   ErrorResponse //
@@ -39,6 +35,10 @@ EventData = (
   InteractionEvent
 )
 
+Extensible = {
+  *text => any
+}
+
 SessionResult = (SessionNewResult)
 
 CapabilitiesRequest = {

schemas/at-driver-remote.cddl

@@ -1,7 +1,3 @@
-Extensible = {
-  *text => any
-}
-
 Command = {
   id: uint,
   CommandData,
@@ -16,6 +12,10 @@ CommandData = (
 
 EmptyParams = { Extensible }
 
+Extensible = {
+  *text => any
+}
+
 SessionCommand = (SessionNewCommand)
 
 CapabilitiesRequest = {