revert: unwanted state modification

codecov.yml

@@ -1,6 +1,6 @@
 ignore:
   - demos
-  - test-setup.js
+  - packages/core-tests/test-setup.js
   - karma.conf.js
   - types
   - packages/*/test

package.json

@@ -7,7 +7,7 @@
     "lint": "eslint . --ext .ts --quiet --ignore-path .gitignore --ignore-path .eslintignore",
     "build": "wsrun -m build",
     "test": "run-p test:*",
-    "test:core": "c8 --all -o coverage/core --reporter=lcov mocha --recursive 'packages/core-tests/**/*.test.ts'",
+    "test:core": "c8 --all -o coverage/core --reporter=lcov npm run -w @hydrofoil/shaperone-core-tests test",
     "test:web": "web-test-runner",
     "release": "changeset publish",
     "docs": "docsify serve ./dist",
@@ -28,7 +28,6 @@
     "@web/dev-server-rollup": "^0.6.4",
     "@web/test-runner": "^0.19",
     "c8": "^7.1.2",
-    "chai-snapshot-matcher": "^1.0.6",
     "docsify-cli": "^4.4.1",
     "es-dev-commonjs-transformer": "^0.2.0",
     "eslint-import-resolver-typescript": "^3.6.1",
@@ -52,15 +51,6 @@
   "resolutions": {
     "@polymer/polymer": "3.4.1"
   },
-  "mocha": {
-    "watch-files": [
-      "./**/*.ts"
-    ],
-    "require": [
-      "test-setup.js"
-    ],
-    "loader": "ts-node/esm/transpile-only"
-  },
   "lint-staged": {
     "*.{js,ts}": [
       "eslint --fix --quiet"

packages/core-tests/package.json

@@ -3,6 +3,9 @@
   "private": true,
   "version": "0.1.1",
   "type": "module",
+  "scripts": {
+    "test": "mocha \"**/*.ts\""
+  },
   "devDependencies": {
     "@hydrofoil/shaperone-core": "*",
     "@rdfine/shacl": "^0.10.5",
@@ -17,10 +20,17 @@
     "@types/mocha": "^9.1.1",
     "@types/sinon-chai": "^3.2.4",
     "autoesm": "^1.0.5",
+    "chai-snapshot-matcher": "^1.0.6",
     "chai-subset": "^1.6.0",
     "chai-quantifiers": "^1.0.10",
     "deepmerge": "^4.2.2",
     "promise-the-world": "^1.0.1",
     "rdf-dataset-ext": "^1.1.0"
+  },
+  "mocha": {
+    "require": [
+      "./test-setup.js"
+    ],
+    "loader": "ts-node/esm/transpile-only"
   }
 }

packages/core-tests/test-setup.js

@@ -0,0 +1,17 @@
+import 'chai-snapshot-matcher'
+import chaiQuantifiers from 'chai-quantifiers'
+import chai from 'chai'
+import sinonChai from 'sinon-chai'
+import chaiSubset from 'chai-subset'
+import { setEnv } from '@hydrofoil/shaperone-core/env.js'
+import rdf from '@zazuko/env'
+
+chai.use(sinonChai)
+chai.use(chaiQuantifiers)
+chai.use(chaiSubset)
+
+export const mochaHooks = {
+  beforeAll() {
+    setEnv(rdf)
+  },
+}

packages/core/models/shapes/reducers.ts

@@ -44,16 +44,17 @@ export const setGraph = formStateReducer((state: ShapeState, { shapesGraph }: Se
   const newAnyPointer = shapesGraph !== state.shapesGraph && (!shapesGraph.term || !state.shapesGraph?.term)
 
   const shapes = findShapes(shapesGraph)
-  draft.shapes = shapes
   if (newDataset || newAnyPointer) {
     // pointer to a different dataset
     draft.shapesGraph = shapesGraph
+    draft.shapes = shapes
     draft.preferredRootShape = getPreferredShape(shapesGraph, shapes)
     return
   }
 
   if (shapesGraph.term && !shapesGraph.term.equals(state.shapesGraph?.term)) {
     // same dataset, changed pointer
+    draft.shapes = shapes
     draft.preferredRootShape = getPreferredShape(shapesGraph, shapes)
   }
 }), emptyState)