Merge pull request #66 from advanced-rest-client/fix/W-12065773/missing-type-documentation

carowright · web-flow · commit 66ebc0716e7e · 2022-12-16T16:35:34.000-03:00
[W-12065773] Missing type documentation
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/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.19",
+  "version": "4.2.20",
   "license": "Apache-2.0",
   "main": "index.js",
   "module": "index.js",
diff --git a/src/ApiTypeDocument.js b/src/ApiTypeDocument.js
@@ -414,6 +414,12 @@ export class ApiTypeDocument extends PropertyDocumentMixin(LitElement) {
       }
     } else if (this._hasType(type, this.ns.w3.shacl.NodeShape)) {
       isObject = true;
+      const andKey = this._getAmfKey(this.ns.w3.shacl.and);
+      if (andKey in type) {
+        isObject = false;
+        isAnd = true;
+        this.andTypes = this._computeAndTypes(type[andKey]);
+      }
     } else if (this._hasType(type, this.ns.aml.vocabularies.shapes.AnyShape)) {
       const andKey = this._getAmfKey(this.ns.w3.shacl.and);
       if (andKey in type) {

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "@api-components/api-type-document",`
`3`	`3`	`"description": "A documentation table for type (resource) properties. Works with AMF data model",`
`4`		`- "version": "4.2.19",`
	`4`	`+ "version": "4.2.20",`
`5`	`5`	`"license": "Apache-2.0",`
`6`	`6`	`"main": "index.js",`
`7`	`7`	`"module": "index.js",`