@api-components/api-type-document 4.2.33 → 4.2.34

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@api-components/api-type-document",
   "description": "A documentation table for type (resource) properties. Works with AMF data model",
-  "version": "4.2.33",
+  "version": "4.2.34",
   "license": "Apache-2.0",
   "main": "index.js",
   "module": "index.js",

package/src/PropertyShapeDocument.js

@@ -753,6 +753,24 @@ export class PropertyShapeDocument extends PropertyDocumentMixin(LitElement) {
     ></api-type-document>`;
   }
 
+  _extractElementsDataType(namespaceKey){
+    const key = this._getAmfKey(namespaceKey)
+    const dataTypes = this.range[key]
+    if(!dataTypes){
+      return 'Any'
+    }
+    let dataType = ''
+    for(const dataTypeValue of dataTypes){
+      const computeDataType = this._computeRangeDataType(dataTypeValue)
+
+      if(dataType!=='' && dataType!==computeDataType){
+        return 'Any'
+      }
+      dataType = String(computeDataType)
+    }
+    return dataType
+  }
+
   _getTypeLabelData(){
     const { propertyDataType, avroValue } = this;
     if(avroValue==='map'){
@@ -761,6 +779,15 @@ export class PropertyShapeDocument extends PropertyDocumentMixin(LitElement) {
     if(propertyDataType==='Unknown type' && avroValue){
       return {dataType:avroValue,customValue:true}
     }
+    
+    if(this.isAllOf){
+      const dataType = this._extractElementsDataType(this.ns.w3.shacl.and)
+      return {dataType,customValue:false}
+    }
+    if(this.isAnyOf){
+      const dataType = this._extractElementsDataType(this.ns.w3.shacl.or)
+      return {dataType,customValue:false}
+    }
     return {dataType:propertyDataType,customValue:false}
   }