Merge pull request #1081 from aml-org/r/v6.3.3

W-17062253 R/v6.3.3

als-actions/js/package.json

@@ -6,7 +6,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@aml-org/amf-antlr-parsers": "0.7.25",
+    "@aml-org/amf-antlr-parsers": "0.7.27",
     "ajv": "6.12.6",
     "avro-js": "1.12.0"
   },

als-actions/shared/src/test/resources/actions/hover/async-api20-full-result.yaml

@@ -100,9 +100,9 @@ hovers:
   (26,17):
     - Piece of data required or returned by an Operation
   (27,13):
-    - Piece of data required or returned by an Operation
+    - Human readable description of an element
   (27,27):
-    - Piece of data required or returned by an Operation
+    - Human readable description of an element
   (28,12):
     - Examples for a particular element declaration
   (28,17):

als-actions/shared/src/test/resources/actions/hover/async-api26-full-result.yaml

@@ -84,9 +84,9 @@ hovers:
   (24,18):
     - Piece of data required or returned by an Operation
   (25,13):
-    - Piece of data required or returned by an Operation
+    - Human readable description of an element
   (25,28):
-    - Piece of data required or returned by an Operation
+    - Human readable description of an element
   (26,9):
     - Human readable name for the object
   (26,14):
@@ -96,9 +96,9 @@ hovers:
   (27,18):
     - Piece of data required or returned by an Operation
   (28,13):
-    - Piece of data required or returned by an Operation
+    - Human readable description of an element
   (28,26):
-    - Piece of data required or returned by an Operation
+    - Human readable description of an element
   (29,7):
     - Information about the network accessible locations where the API is available
   (29,14):
@@ -739,9 +739,9 @@ hovers:
   (209,18):
     - Piece of data required or returned by an Operation
   (210,11):
-    - Piece of data required or returned by an Operation
+    - Human readable description of an element
   (210,32):
-    - Piece of data required or returned by an Operation
+    - Human readable description of an element
   (211,7):
     - Piece of data required or returned by an Operation
   (211,12):
@@ -751,9 +751,9 @@ hovers:
   (212,16):
     - Piece of data required or returned by an Operation
   (213,11):
-    - Piece of data required or returned by an Operation
+    - Human readable description of an element
   (213,30):
-    - Piece of data required or returned by an Operation
+    - Human readable description of an element
   (214,9):
     - Top level element describing a asynchronous API
   (214,18):

als-actions/shared/src/test/resources/actions/hover/oas30-full-result.yaml

@@ -84,9 +84,9 @@ hovers:
   (23,20):
     - Piece of data required or returned by an Operation
   (24,13):
-    - Piece of data required or returned by an Operation
+    - Human readable description of an element
   (24,63):
-    - Piece of data required or returned by an Operation
+    - Human readable description of an element
   (26,2):
     - Path to each declared endpoint. Relative to basePath
   (26,6):

als-common/js/package.json

@@ -6,7 +6,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@aml-org/amf-antlr-parsers": "0.7.25",
+    "@aml-org/amf-antlr-parsers": "0.7.27",
     "ajv": "6.12.6",
     "avro-js": "1.12.0"
   },

als-common/shared/src/main/scala/org/mulesoft/amfintegration/dialect/dialects/avro/AvroDialect.scala

@@ -196,7 +196,7 @@ object AvroMapNode extends AvroTypedNode {
       .withEnum(
         AvroDialect.avroTypes
       )
-      .withObjectRange(Seq(AvroRootNode.id))
+      .withLiteralRange(xsdString.iri())
 }
 
 object AvroArrayNode extends AvroTypedNode {

als-node-client/node-package/package.json

@@ -15,7 +15,7 @@
     "als": "./dist/als-node-client.min.js"
   },
   "dependencies": {
-    "@aml-org/amf-antlr-parsers": "0.7.25",
+    "@aml-org/amf-antlr-parsers": "0.7.27",
     "@aml-org/amf-custom-validator": "1.7.2",
     "@aml-org/amf-custom-validator-web": "1.7.2",
     "ajv": "6.12.6",

als-server/js/node-package/package.json

@@ -15,7 +15,7 @@
     "build:dist": "webpack --config ./webpack.config.js"
   },
   "dependencies": {
-    "@aml-org/amf-antlr-parsers": "0.7.25",
+    "@aml-org/amf-antlr-parsers": "0.7.27",
     "@aml-org/amf-custom-validator": "1.7.2",
     "@aml-org/amf-custom-validator-web": "1.7.2",
     "ajv": "6.12.6",

als-server/shared/src/test/resources/diagnostics/avro/async26-imports-invalid-avro.yaml

@@ -0,0 +1,23 @@
+asyncapi: 2.6.0
+info:
+  title: Market Data API
+  version: 1.0.0
+  description: This API provides real-time market data updates.
+
+channels:
+  m1:
+    description: Pancho
+
+components:
+  messages:
+    m1:
+      schemaFormat: application/vnd.apache.avro;version=1.9.0
+      payload:
+        $ref: schemas/union-type-invalid-payload.avsc
+      examples:
+        - payload:
+                name: John Doe
+                address: 
+                  zipcode: 1355
+                age: 20
+                favoriteProgrammingLanguage: Java

als-server/shared/src/test/resources/diagnostics/avro/async26-imports-valid-avro.yaml

@@ -0,0 +1,15 @@
+asyncapi: 2.6.0
+info:
+  title: Market Data API
+  version: 1.0.0
+  description: This API provides real-time market data updates.
+channels:
+  m1:
+    description: Pancho
+
+components:
+  messages:
+    m1:
+      schemaFormat: application/vnd.apache.avro;version=1.9.0
+      payload:
+        $ref: schemas/union-type-payload.avsc

als-server/shared/src/test/resources/diagnostics/avro/schemas/avro-user/avrotoavro.avsc

@@ -0,0 +1,20 @@
+{
+	"type" : "record",
+	"name" : "avrotoavro",
+	"fields" : [
+		{"name": "user_user", "type":  {
+			"name": "user",
+			"type": "record",
+			"fields": [
+				{
+					"name": "username",
+					"type": "string"
+				},
+				{
+					"name": "age",
+					"type": "int"
+				}
+			]
+		}}
+	]
+}

als-server/shared/src/test/resources/diagnostics/avro/schemas/union-type-invalid-payload.avsc

@@ -0,0 +1,20 @@
+{
+  "type": "record",
+  "name": "Person",
+  "fields": [
+    {"name": "name", "type": "string", "example": "Donkey"},
+    {"name": "age", "type": ["null", "int"], "default": null},
+    {
+      "name": "favoriteProgrammingLanguage",
+      "type": {"name": "ProgrammingLanguage", "type": "enum", "symbols": ["JS", "Java", "Go", "Rust", "C"]}
+    },
+    {
+      "name": "address",
+      "type": {
+        "name": "Address",
+        "type": "record",
+        "fields": [{"name": "zipcode", "type": "int"}, {"name": "zipcode", "type": "boolean"}]
+      }
+    }
+  ]
+}

als-server/shared/src/test/resources/diagnostics/avro/schemas/union-type-payload.avsc

@@ -0,0 +1,20 @@
+{
+  "type": "record",
+  "name": "Person",
+  "fields": [
+    {"name": "name", "type": "string", "example": "Donkey"},
+    {"name": "age", "type": ["null", "int"], "default": null},
+    {
+      "name": "favoriteProgrammingLanguage",
+      "type": {"name": "ProgrammingLanguage", "type": "enum", "symbols": ["JS", "Java", "Go", "Rust", "C"]}
+    },
+    {
+      "name": "address",
+      "type": {
+        "name": "Address",
+        "type": "record",
+        "fields": [{"name": "zipcode", "type": "int"}]
+      }
+    }
+  ]
+}

als-server/shared/src/test/resources/diagnostics/project/api.raml.jsonld

@@ -5,7 +5,7 @@
 "@type": [
 "doc:APIContractProcessingData"
 ],
-"apiContract:modelVersion": "3.9.0",
+"apiContract:modelVersion": "3.10.0",
 "doc:transformed": true,
 "doc:sourceSpec": "RAML 1.0"
 },