Merge pull request #2057 from aml-org/publish-5.6.3

W-16890709: Publish 5.6.3
aml-org · Oct 16, 2024 · d58adb3 · d58adb3
2 parents a9a34f0 + b82950d
commit d58adb3
Show file tree

Hide file tree

Showing 1,147 changed files with 2,810 additions and 1,877 deletions.
diff --git a/...t/shared/src/main/scala/amf/apicontract/internal/spec/common/emitter/ServerEmitters.scala b/...t/shared/src/main/scala/amf/apicontract/internal/spec/common/emitter/ServerEmitters.scala
@@ -2,14 +2,13 @@ package amf.apicontract.internal.spec.common.emitter
 
 import amf.apicontract.client.scala.model.domain.api.Api
 import amf.apicontract.client.scala.model.domain.{EndPoint, Operation, Parameter, Server}
-import amf.apicontract.internal.metamodel.domain.ServerModel
 import amf.apicontract.internal.metamodel.domain.api.BaseApiModel
+import amf.apicontract.internal.metamodel.domain.{ParameterModel, ServerModel}
 import amf.apicontract.internal.spec.oas.emitter.context.{Oas3SpecEmitterFactory, OasSpecEmitterContext}
 import amf.apicontract.internal.spec.oas.emitter.domain.OasTagToReferenceEmitter
 import amf.apicontract.internal.spec.oas.parser.domain.BaseUriSplitter
 import amf.apicontract.internal.spec.raml.emitter.context.RamlSpecEmitterContext
 import amf.apicontract.internal.spec.spec.toRaml
-import org.mulesoft.common.client.lexical.Position
 import amf.core.client.scala.model.document.BaseUnit
 import amf.core.client.scala.model.domain.{AmfArray, AmfScalar, DomainElement}
 import amf.core.internal.annotations.{BasePathLexicalInformation, HostLexicalInformation, VirtualElement}
@@ -25,6 +24,7 @@ import amf.shapes.internal.domain.metamodel.ScalarShapeModel
 import amf.shapes.internal.spec.common.emitter.annotations.AnnotationsEmitter
 import amf.shapes.internal.spec.common.emitter.{EnumValuesEmitter, ShapeEmitterContext}
 import amf.shapes.internal.spec.contexts.emitter.raml.RamlScalarEmitter
+import org.mulesoft.common.client.lexical.Position
 import org.yaml.model.YDocument
 import org.yaml.model.YDocument.{EntryBuilder, PartBuilder}
 
@@ -280,7 +280,7 @@ case class OasServerVariableEmitter(variable: Parameter, ordering: SpecOrdering)
     val shape  = variable.schema
     val fs     = shape.fields
 
-    fs.entry(ShapeModel.Description).map(f => result += ValueEmitter("description", f))
+    variable.fields.entry(ParameterModel.Description).map(f => result += ValueEmitter("description", f))
 
     fs.entry(ShapeModel.Values).map(f => result += EnumValuesEmitter("enum", f.value, ordering))
 

diff --git a/.../src/main/scala/amf/apicontract/internal/spec/oas/parser/domain/OasLikeServerParser.scala b/.../src/main/scala/amf/apicontract/internal/spec/oas/parser/domain/OasLikeServerParser.scala
@@ -63,6 +63,7 @@ class OasLikeServerVariableParser(entry: YMapEntryLike, parent: String)(implicit
     variable.setWithoutId(ParameterModel.Required, AmfScalar(true), Annotations.synthesized())
 
     val map = entry.value.as[YMap]
+    map.key("description", ParameterModel.Description in variable)
     parseMap(variable, map)
 
     variable
@@ -83,8 +84,6 @@ class OasLikeServerVariableParser(entry: YMapEntryLike, parent: String)(implicit
         schema.withDefault(DataNodeParser(entry.value).parse(), Annotations(entry))
       }
     )
-    map.key("description", ShapeModel.Description in schema)
-
     AnnotationParser(schema, map).parse()
   }
 }
diff --git a/amf-apicontract.versions b/amf-apicontract.versions
@@ -1,6 +1,6 @@
-amf.apicontract=5.6.2
-amf.aml=6.6.0
-amf.model=3.9.0
+amf.apicontract=5.6.3
+amf.aml=6.6.1
+amf.model=3.10.0
 antlr4Version=0.7.25
 amf.validation.profile.dialect=1.6.0
 amf.validation.report.dialect=1.2.0
diff --git a/amf-cli/js/package.json b/amf-cli/js/package.json
@@ -1,6 +1,6 @@
 {
   "name": "amf-client-js",
-  "version": "5.4.0-SNAPSHOT",
+  "version": "5.7.0-SNAPSHOT",
   "description": "AMF Library",
   "main": "amf.js",
   "author": "amf team",

diff --git a/amf-cli/js/typings/amf-client-js.d.ts b/amf-cli/js/typings/amf-client-js.d.ts
@@ -6503,6 +6503,7 @@ declare module "amf-client-js" {
     getMaxYamlReferences: undefined | number;
     isAmfJsonLdSerialization: boolean;
     isTokens: boolean;
+    isExtensionsEverywhere: boolean;
 
     constructor();
 
@@ -6523,6 +6524,10 @@ declare module "amf-client-js" {
     withoutBaseUnitUrl(): ParsingOptions;
 
     withoutTokens(): ParsingOptions;
+
+    withExtensionsEverywhere(): ParsingOptions;
+
+    withoutExtensionsEverywhere(): ParsingOptions;
   }
   export class Path {
     static delimiter: string;

diff --git a/amf-cli/shared/src/test/resources/avro/doc/cycled/async-basic-avsc.yaml.jsonld b/amf-cli/shared/src/test/resources/avro/doc/cycled/async-basic-avsc.yaml.jsonld
@@ -5,7 +5,7 @@
       "@type": [
         "doc:APIContractProcessingData"
       ],
-      "apiContract:modelVersion": "3.9.0",
+      "apiContract:modelVersion": "3.10.0",
       "doc:sourceSpec": "ASYNC 2.0"
     },
     {

diff --git a/amf-cli/shared/src/test/resources/avro/doc/cycled/async-basic-json.yaml.jsonld b/amf-cli/shared/src/test/resources/avro/doc/cycled/async-basic-json.yaml.jsonld
@@ -5,7 +5,7 @@
       "@type": [
         "doc:APIContractProcessingData"
       ],
-      "apiContract:modelVersion": "3.9.0",
+      "apiContract:modelVersion": "3.10.0",
       "doc:sourceSpec": "ASYNC 2.0"
     },
     {

diff --git a/amf-cli/shared/src/test/resources/avro/tck/apis/invalid/avro-invalid-ref.jsonld b/amf-cli/shared/src/test/resources/avro/tck/apis/invalid/avro-invalid-ref.jsonld
@@ -107,7 +107,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.9.0"
+            "@value": "3.10.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/avro/tck/apis/invalid/avro-invalid.jsonld b/amf-cli/shared/src/test/resources/avro/tck/apis/invalid/avro-invalid.jsonld
@@ -91,7 +91,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.9.0"
+            "@value": "3.10.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/avro/tck/apis/invalid/avro-ref-broken-schema.jsonld b/amf-cli/shared/src/test/resources/avro/tck/apis/invalid/avro-ref-broken-schema.jsonld
@@ -107,7 +107,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.9.0"
+            "@value": "3.10.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/avro/tck/apis/valid/async-2.4-avro-valid.jsonld b/amf-cli/shared/src/test/resources/avro/tck/apis/valid/async-2.4-avro-valid.jsonld
@@ -91,7 +91,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.9.0"
+            "@value": "3.10.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/avro/tck/apis/valid/async-avro-component-ref.jsonld b/amf-cli/shared/src/test/resources/avro/tck/apis/valid/async-avro-component-ref.jsonld
@@ -107,7 +107,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.9.0"
+            "@value": "3.10.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/avro/tck/apis/valid/async-avro-external-ref.jsonld b/amf-cli/shared/src/test/resources/avro/tck/apis/valid/async-avro-external-ref.jsonld
@@ -743,7 +743,7 @@
         ],
         "http://a.ml/vocabularies/apiContract#modelVersion": [
           {
-            "@value": "3.9.0"
+            "@value": "3.10.0"
           }
         ],
         "http://a.ml/vocabularies/document#sourceSpec": [

diff --git a/amf-cli/shared/src/test/resources/avro/tck/apis/valid/avro-components-external.dumped.yaml b/amf-cli/shared/src/test/resources/avro/tck/apis/valid/avro-components-external.dumped.yaml
@@ -0,0 +1,43 @@
+asyncapi: 2.6.0
+info:
+  title: Market Data API
+  version: 1.0.0
+  description: This API provides real-time market data updates.
+components:
+  messages:
+    m1:
+      payload:
+        type: record
+        name: Person
+        fields:
+          -
+            name: name
+            type: string
+          -
+            name: age
+            type:
+              - "null"
+              - int
+            default: null
+          -
+            name: favoriteProgrammingLanguage
+            type:
+              type: enum
+              name: ProgrammingLanguage
+              symbols:
+                - JS
+                - Java
+                - Go
+                - Rust
+                - C
+          -
+            name: address
+            type:
+              type: record
+              name: Address
+              fields:
+                -
+                  name: zipcode
+                  type: int
+      schemaFormat: application/vnd.apache.avro;version=1.9.0
+channels: {}