Merge pull request #237 from zazuko/hydra-shapes-graph

Author: tpluscode

.changeset/yummy-wombats-switch.md

@@ -0,0 +1,5 @@
+---
+"@kopflos-cms/hydra": patch
+---
+
+Improve shapes graph for hydra Collections

labs/handlebars/test/index.test.ts

@@ -3,7 +3,7 @@ import { expect } from 'chai'
 import { createEnv } from '@kopflos-cms/core/env.js' // eslint-disable-line import/no-unresolved
 import process from '../index.js'
 
-describe('@kopflos-labs/handlebars', () => {
+describe('@kopflos-labs/handlebars', function () {
   beforeEach(createStore(import.meta.url, {
     format: 'ttl',
   }))
@@ -23,7 +23,7 @@ describe('@kopflos-labs/handlebars', () => {
     expect(result).to.equal('http://example.org/article')
   })
 
-  describe('valueof helper', () => {
+  describe('valueof helper', function () {
     it('follows the path and prints value', function () {
       const result = process('{{ valueof "schema:image/schema:thumbnail/schema:contentUrl" }}', {
         pointer: this.rdf.graph.namedNode('http://example.org/article'),

labs/html-template/test/index.test.ts

@@ -7,10 +7,10 @@ import type { AnyPointer } from 'clownface'
 import snapshots from 'mocha-chai-rdf/snapshots.js'
 import bindTemplate from '../index.js'
 
-describe('@kopflos-labs/html-template', () => {
+describe('@kopflos-labs/html-template', function () {
   use(snapshots)
 
-  it('uses core representation a default template data', async () => {
+  it('uses core representation a default template data', async function () {
     // given
     const templateFunc = sinon.stub()
     const context = {
@@ -41,7 +41,7 @@ describe('@kopflos-labs/html-template', () => {
     expect(templateData.dataset).canonical.toMatchSnapshot()
   })
 
-  it('fetches data with given arguments', async () => {
+  it('fetches data with given arguments', async function () {
     // given
     const templateFunc = sinon.stub()
     const fetchData = sinon.stub().returns(({ env }: HandlerArgs) => {
@@ -77,7 +77,7 @@ describe('@kopflos-labs/html-template', () => {
     expect(templateData.dataset).canonical.toMatchSnapshot()
   })
 
-  it('fetches data as stream', async () => {
+  it('fetches data as stream', async function () {
     // given
     const templateFunc = sinon.stub()
     const fetchData = sinon.stub().returns(({ env }: HandlerArgs) => {
@@ -112,7 +112,7 @@ describe('@kopflos-labs/html-template', () => {
     expect(templateData.dataset).canonical.toMatchSnapshot()
   })
 
-  it('returns error if previous response is not a string', async () => {
+  it('returns error if previous response is not a string', async function () {
     // given
     const context = {
       env: createEnv({
@@ -135,7 +135,7 @@ describe('@kopflos-labs/html-template', () => {
     expect(result).to.be.an('error')
   })
 
-  it('returns error if there is no previous response', async () => {
+  it('returns error if there is no previous response', async function () {
     // given
     const context = {
       env: createEnv({

labs/html-template/test/lib/replaceTemplates.test.ts

@@ -8,7 +8,7 @@ import { expect } from 'chai'
 import { replaceTemplates } from '../../lib/replaceTemplates.js'
 import type { TemplateFunc } from '../../index.js'
 
-describe('@kopflos-labs/html-template/lib/replaceTemplates.js', () => {
+describe('@kopflos-labs/html-template/lib/replaceTemplates.js', function () {
   before(createStore(import.meta.url, {
     format: 'ttl',
   }))
@@ -20,7 +20,7 @@ describe('@kopflos-labs/html-template/lib/replaceTemplates.js', () => {
     },
   })
 
-  context('<template target-class>', () => {
+  context('<template target-class>', function () {
     it('finds target by absolute url', function () {
       // given
       const graph = this.rdf.graph
@@ -43,7 +43,7 @@ http://example.org/Foo
     })
   })
 
-  context('<template property>', () => {
+  context('<template property>', function () {
     it('descends into the graph', function () {
       // given
       const graph = this.rdf.graph

labs/html-template/test/lib/url.test.ts

@@ -2,18 +2,18 @@ import { expect } from 'chai'
 import rdf from '@zazuko/env-node'
 import { toNamedNode } from '../../lib/url.js'
 
-describe('@kopflos-labs/html-template/lib/url.js', () => {
+describe('@kopflos-labs/html-template/lib/url.js', function () {
   const ns = rdf.namespace('http://example.org/')
 
-  it('expands relative urls against base', () => {
+  it('expands relative urls against base', function () {
     expect(toNamedNode(rdf, ns, 'Class')).eq(ns.Class)
   })
 
-  it('keeps absolute URL', () => {
+  it('keeps absolute URL', function () {
     expect(toNamedNode(rdf, ns, 'http://foo.bar/Baz')).eq(rdf.namedNode('http://foo.bar/Baz'))
   })
 
-  it('expands known prefixed named', () => {
+  it('expands known prefixed named', function () {
     expect(toNamedNode(rdf, ns, 'schema:Thing')).eq(rdf.ns.schema.Thing)
   })
 })

package-lock.json

@@ -18,7 +18,7 @@
   },
   "devDependencies": {
     "@changesets/cli": "^2.27.10",
-    "@tpluscode/eslint-config": "^0.5",
+    "@tpluscode/eslint-config": "^0.6",
     "@types/chai": "^5",
     "@types/debug": "^4.1.12",
     "@types/mocha": "^10.0.7",

package.json

@@ -13,6 +13,7 @@ describe('kopflos/lib/command/serve', function () {
   let process: ReturnType<typeof fork>
 
   beforeEach(createEmpty)
+
   beforeEach(function () {
     process = fork(serve)
     fs.mkdirSync(fixturesDir)

packages/cli/test/lib/command/serve.test.ts

@@ -5,8 +5,8 @@ import { loadConfig, prepareConfig } from '../../lib/config.js'
 describe('kopflos/lib/config.js', function () {
   this.timeout(10000)
 
-  describe('loadConfig', () => {
-    it('should discover the config file', async () => {
+  describe('loadConfig', function () {
+    it('should discover the config file', async function () {
       const { config } = await loadConfig({
         path: undefined,
         root: url.fileURLToPath(new URL('..', import.meta.url)),
@@ -17,7 +17,7 @@ describe('kopflos/lib/config.js', function () {
       })
     })
 
-    it('should load config from path', async () => {
+    it('should load config from path', async function () {
       // given
       const configPath = url.fileURLToPath(new URL('../fixtures/config.json', import.meta.url))
 
@@ -33,8 +33,8 @@ describe('kopflos/lib/config.js', function () {
     })
   })
 
-  describe('prepareConfig', () => {
-    it('sets config itself as watched paths', async () => {
+  describe('prepareConfig', function () {
+    it('sets config itself as watched paths', async function () {
       // given
       const configPath = url.fileURLToPath(new URL('../fixtures/config.json', import.meta.url))
 
@@ -50,7 +50,7 @@ describe('kopflos/lib/config.js', function () {
       expect(config.watch).to.deep.eq([configPath])
     })
 
-    it('adds config itself to watched paths', async () => {
+    it('adds config itself to watched paths', async function () {
       // given
       const configPath = url.fileURLToPath(new URL('../fixtures/config.with-watch.json', import.meta.url))
 
@@ -66,7 +66,7 @@ describe('kopflos/lib/config.js', function () {
       expect(config.watch).to.contain.all.members([configPath, 'lib'])
     })
 
-    it('rebase relative plugin paths to config path', async () => {
+    it('rebase relative plugin paths to config path', async function () {
       // given
       const configPath = url.fileURLToPath(new URL('../fixtures/config.with-relative.json', import.meta.url))
 

packages/cli/test/lib/config.test.ts

@@ -9,7 +9,7 @@ import { ex } from '../../testing-helpers/ns.js'
 import Kopflos from '../lib/Kopflos.js'
 import handlerLookupStub from './support/handlerLookupStub.js'
 
-describe('@kopflos-cms/handlers.js', () => {
+describe('@kopflos-cms/handlers.js', function () {
   use(snapshots)
 
   before(createStore(import.meta.url, { format: 'trig', includeDefaultGraph: true }))
@@ -20,7 +20,8 @@ describe('@kopflos-cms/handlers.js', () => {
       default: 'http://localhost:8080/sparql',
     },
   }
-  describe('getCoreRepresentation', () => {
+
+  describe('getCoreRepresentation', function () {
     it('forwards core representation', async function () {
       // given
       const kopflos = new Kopflos(config, {