test: fix core tests

Author: tpluscode

packages/core-tests/components.test.ts

@@ -5,13 +5,8 @@ import { expect } from 'chai'
 import { ex } from '@shaperone/testing'
 import { rdfs, schema, skos } from '@tpluscode/rdf-ns-builders'
 import rdf from '@shaperone/testing/env.js'
-import { setEnv } from '@hydrofoil/shaperone-core/env.js'
 
 describe('core/lib/components', () => {
-  before(async () => {
-    await setEnv(rdf)
-  })
-
   describe('sort', () => {
     it('sorts by rdf:label by default', () => {
       // given

packages/core-tests/lib/components.test.ts

@@ -17,7 +17,7 @@ describe('core/lib/property', () => {
       }
 
       // when
-      const term = createTerm($rdf, property, 'http://foo/bar')
+      const term = createTerm(property, 'http://foo/bar')
 
       // then
       expect(term.value).to.equal('http://foo/bar')
@@ -32,7 +32,7 @@ describe('core/lib/property', () => {
       }
 
       // when
-      const term = createTerm($rdf, property, '41')
+      const term = createTerm(property, '41')
 
       // then
       expect(term).to.deep.equal($rdf.literal('41', xsd.int))

packages/core-tests/lib/property.test.ts

@@ -2,7 +2,7 @@ import { describe, it } from 'mocha'
 import { expect } from 'chai'
 import { dash } from '@tpluscode/rdf-ns-builders/loose'
 import reducers from '@hydrofoil/shaperone-core/models/components/reducers.js'
-import type { Component, ComponentDecorator, ComponentsState } from '@hydrofoil/shaperone-core/models/components'
+import type { Component, ComponentDecorator, ComponentsState } from '@hydrofoil/shaperone-core/models/components/index.js'
 import env from '@shaperone/testing/env.js'
 import { setEnv } from '@hydrofoil/shaperone-core/env.js'
 

packages/core-tests/models/components/reducers.test.ts

@@ -1,7 +1,7 @@
 import { describe, it } from 'mocha'
 import { expect } from 'chai'
 import { testStore } from '@shaperone/testing/models/form.js'
-import type { Store } from '@hydrofoil/shaperone-core/state'
+import type { Store } from '@hydrofoil/shaperone-core/state/index.js'
 import { loadDash } from '@hydrofoil/shaperone-core/models/editors/effects/index.js'
 
 describe('models/editors/effects/loadDash', () => {

packages/core-tests/models/editors/effects/loadDash.test.ts

@@ -5,7 +5,7 @@ import { dash } from '@tpluscode/rdf-ns-builders/loose'
 import type { NamedNode } from '@rdfjs/types'
 import { expect } from 'chai'
 import { testStore } from '@shaperone/testing/models/form.js'
-import type { Editor, EditorsState, MultiEditor } from '@hydrofoil/shaperone-core/models/editors'
+import type { Editor, EditorsState, MultiEditor } from '@hydrofoil/shaperone-core/models/editors/index.js'
 import { matchSingleEditors, matchMultiEditors } from '@hydrofoil/shaperone-core/models/editors/lib/match.js'
 import { propertyShape } from '@shaperone/testing/util.js'
 

packages/core-tests/models/editors/lib/match.test.ts

@@ -4,7 +4,7 @@ import { dash } from '@tpluscode/rdf-ns-builders/loose'
 import { testEditor } from '@shaperone/testing/models/form.js'
 import { testEditorsState as testState } from '@shaperone/testing/models/editors.js'
 import { decorate } from '@hydrofoil/shaperone-core/models/editors/reducers/decorate.js'
-import type { MatcherDecorator, SingleEditor } from '@hydrofoil/shaperone-core/models/editors'
+import type { MatcherDecorator, SingleEditor } from '@hydrofoil/shaperone-core/models/editors/index.js'
 
 describe('core/models/editors/reducers/decorate', () => {
   it('creates decorator array for editor', () => {

packages/core-tests/models/editors/reducers/decorate.test.ts

@@ -5,8 +5,8 @@ import { sinon } from '@shaperone/testing'
 import { dash } from '@tpluscode/rdf-ns-builders/loose'
 import { testStore } from '@shaperone/testing/models/form.js'
 import { addObject } from '@hydrofoil/shaperone-core/models/forms/effects/addObject.js'
-import type { Store } from '@hydrofoil/shaperone-core/state'
-import type { SingleEditorMatch } from '@hydrofoil/shaperone-core/models/editors'
+import type { Store } from '@hydrofoil/shaperone-core/state/index.js'
+import type { SingleEditorMatch } from '@hydrofoil/shaperone-core/models/editors/index.js'
 import { propertyShape } from '@shaperone/testing/util.js'
 import { sh } from '@tpluscode/rdf-ns-builders'
 import { blankNode } from '@shaperone/testing/nodeFactory.js'

packages/core-tests/models/forms/effects/addObject.test.ts

@@ -4,10 +4,10 @@ import { expect } from 'chai'
 import type { sinon } from '@shaperone/testing'
 import { dash, foaf, schema, sh } from '@tpluscode/rdf-ns-builders'
 import { testFocusNodeState, testPropertyState, testStore } from '@shaperone/testing/models/form.js'
-import type { Dispatch, Store } from '@hydrofoil/shaperone-core/state'
+import type { Dispatch, Store } from '@hydrofoil/shaperone-core/state/index.js'
 import { syncProperties } from '@hydrofoil/shaperone-core/models/forms/effects/lib/syncProperties.js'
-import type { EditorsState } from '@hydrofoil/shaperone-core/models/editors'
-import type { State } from '@hydrofoil/shaperone-core/models/forms'
+import type { EditorsState } from '@hydrofoil/shaperone-core/models/editors/index.js'
+import type { State } from '@hydrofoil/shaperone-core/models/forms/index.js'
 import { nodeShape, propertyShape } from '@shaperone/testing/util.js'
 
 describe('models/forms/effects/lib/syncProperties', () => {

packages/core-tests/models/forms/effects/lib/syncProperties.test.ts

@@ -4,7 +4,7 @@ import { expect } from 'chai'
 import { sinon } from '@shaperone/testing'
 import { testStore } from '@shaperone/testing/models/form.js'
 import { pushFocusNode } from '@hydrofoil/shaperone-core/models/forms/effects/pushFocusNode.js'
-import type { Store } from '@hydrofoil/shaperone-core/state'
+import type { Store } from '@hydrofoil/shaperone-core/state/index.js'
 import { propertyShape } from '@shaperone/testing/util.js'
 
 describe('models/forms/effects/pushFocusNode', () => {