+ Util-test += ShExUtil.getPredicateUsage()

shexjs · Sep 27, 2020 · c5e8342 · c5e8342
1 parent abd6159
commit c5e8342
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 1 deletion.
diff --git a/packages/shex-util/shex-util.js b/packages/shex-util/shex-util.js
@@ -536,7 +536,7 @@ const ShExUtil = {
 
     let predicates = { } // IRI->{ uses: [shapeLabel], commonType: shapeExpr }
     Object.keys(schema.shapes).forEach(shapeLabel => {
-      let shapeExpr = _ShExUtil.skipDecl(schema.shapes[shapeLabel])
+      let shapeExpr = schema.shapes[shapeLabel]
       if (shapeExpr.type === 'Shape') {
         let tcs = _ShExUtil.simpleTripleConstraints(shapeExpr) || []
         tcs.forEach(tc => {

diff --git a/test/Util-test.js b/test/Util-test.js
@@ -427,6 +427,19 @@ describe('shex-util:', function () {
     })
   })
 
+  describe('utility function getPredicateUsage', function () {
+    const parser = ShExParser.construct(Base, {}, {index: false})
+    Tests.forEach(test => {
+      it (`should nest ${test.name}`, function () {
+        const orig = parser.parse(test.schema)
+        const unaltered = JSON.parse(JSON.stringify(orig))
+        const untyped = {}
+        const predicateUsage = ShExUtil.getPredicateUsage(unaltered, untyped)
+        expect(predicateUsage).to.deep.equal(test.predicateUsage)
+      })
+    })
+  })
+
   describe('utility function getProofGraph', function () {
     it (`should parse validation results`, function () {
       const store = new N3.Store()