Merge pull request #4 from retejs/new-linter

fix: update cli and fix linting errors

.gitignore

@@ -2,6 +2,8 @@ node_modules
 .idea/
 .vscode/
 .nyc_output
-coverage
+/coverage
 npm-debug.log
 dist
+.rete-cli
+.sonar

eslint.config.mjs

@@ -0,0 +1,12 @@
+import tseslint from 'typescript-eslint';
+import configs from 'rete-cli/configs/eslint.mjs';
+
+export default tseslint.config(
+  ...configs,
+  {
+    files: ['test/**/*.ts'],
+    rules: {
+      '@typescript-eslint/no-require-imports': 'off'
+    }
+  }
+)

package.json

@@ -28,7 +28,7 @@
   },
   "devDependencies": {
     "rete": "^2.0.1",
-    "rete-cli": "^1.0.2",
+    "rete-cli": "~2.0.1",
     "typescript": "4.8.4"
   }
 }

src/types.ts

@@ -13,13 +13,13 @@ export type Context<N extends BaseN, C extends BaseC> =
   | { getNodes(): N[], getConnections(): C[] }
 
 export type Structures<N extends BaseN, C extends BaseC> =
-& Subgraph<N, C>
-& Sets<N, C>
-& Mapping<N, C>
-& Traverse<N, C>
-& {
-  subgraph: Subgraph<N, C>
-  sets: Sets<N, C>
-  mapping: Mapping<N, C>
-  traverse: Traverse<N, C>
-}
+  & Subgraph<N, C>
+  & Sets<N, C>
+  & Mapping<N, C>
+  & Traverse<N, C>
+  & {
+    subgraph: Subgraph<N, C>
+    sets: Sets<N, C>
+    mapping: Mapping<N, C>
+    traverse: Traverse<N, C>
+  }

test/setupTests.ts

@@ -1,6 +1,5 @@
 const nodeCrypto = require('crypto')
 
-// eslint-disable-next-line no-undef
 Object.defineProperty(globalThis, 'crypto', {
   value: {
     getRandomValues: function (buffer: any) {

test/subgraph.test.ts

@@ -11,42 +11,53 @@ describe('Subgraph', () => {
     const graph = structures(editor)
 
     expect(graph.children().nodes()).toHaveLength(2)
-    expect(graph.children().nodes().map(n => n.id).sort()).toEqual([a.id, b.id].sort())
+    expect(graph.children().nodes()
+      .map(n => n.id)
+      .sort()).toEqual([a.id, b.id].sort())
   })
 
   it('parents', async () => {
     const { a, b, editor } = await createCompound()
     const graph = structures(editor)
 
     expect(graph.parents(n => n.id === a.id).nodes()).toHaveLength(1)
-    expect(graph.parents(n => n.id === a.id).nodes().map(n => n.id).sort()).toEqual([b.id].sort())
+    expect(graph.parents(n => n.id === a.id).nodes()
+      .map(n => n.id)
+      .sort()).toEqual([b.id].sort())
   })
 
   it('ancestors', async () => {
     const { a, b, c, editor } = await createCompound()
     const graph = structures(editor)
 
     expect(graph.ancestors().nodes()).toHaveLength(2)
-    expect(graph.ancestors(n => n.id === a.id).nodes().map(n => n.id)).toEqual([b.id, c.id])
-    expect(graph.ancestors(n => n.id === b.id).nodes().map(n => n.id)).toEqual([c.id])
+    expect(graph.ancestors(n => n.id === a.id).nodes()
+      .map(n => n.id)).toEqual([b.id, c.id])
+    expect(graph.ancestors(n => n.id === b.id).nodes()
+      .map(n => n.id)).toEqual([c.id])
   })
 
   it('orphans', async () => {
     const { c, d, editor } = await createCompound()
     const graph = structures(editor)
 
     expect(graph.orphans().nodes()).toHaveLength(2)
-    expect(graph.orphans().nodes().map(n => n.id).sort()).toEqual([c.id, d.id].sort())
+    expect(graph.orphans().nodes()
+      .map(n => n.id)
+      .sort()).toEqual([c.id, d.id].sort())
   })
 
   it('descendants', async () => {
     const { a, b, c, d, editor } = await createCompound()
     const graph = structures(editor)
 
     expect(graph.descendants(n => n.id === c.id).nodes()).toHaveLength(2)
-    expect(graph.descendants(n => n.id === c.id).nodes().map(n => n.id).sort()).toEqual([a.id, b.id].sort())
+    expect(graph.descendants(n => n.id === c.id).nodes()
+      .map(n => n.id)
+      .sort()).toEqual([a.id, b.id].sort())
     expect(graph.descendants(n => n.id === b.id).nodes()).toHaveLength(1)
-    expect(graph.descendants(n => n.id === b.id).nodes().map(n => n.id)).toEqual([a.id])
+    expect(graph.descendants(n => n.id === b.id).nodes()
+      .map(n => n.id)).toEqual([a.id])
     expect(graph.descendants(n => n.id === d.id).nodes()).toHaveLength(0)
   })
 
@@ -55,7 +66,9 @@ describe('Subgraph', () => {
     const graph = structures(editor)
 
     expect(graph.siblings(n => n.id === c.id).nodes()).toHaveLength(2)
-    expect(graph.siblings(n => n.id === c.id).nodes().map(n => n.id).sort()).toEqual([c.id, d.id].sort())
+    expect(graph.siblings(n => n.id === c.id).nodes()
+      .map(n => n.id)
+      .sort()).toEqual([c.id, d.id].sort())
 
     const e = new Node('a')
 
@@ -64,6 +77,8 @@ describe('Subgraph', () => {
     await editor.addNode(e)
 
     expect(graph.siblings(n => n.id === e.id).nodes()).toHaveLength(2)
-    expect(graph.siblings(n => n.id === e.id).nodes().map(n => n.id).sort()).toEqual([b.id, e.id].sort())
+    expect(graph.siblings(n => n.id === e.id).nodes()
+      .map(n => n.id)
+      .sort()).toEqual([b.id, e.id].sort())
   })
 })

test/traverse.test.ts

@@ -27,25 +27,30 @@ describe('Traverse', () => {
     const graph = structures(editor)
 
     expect(graph.roots().nodes()).toHaveLength(1)
-    expect(graph.roots().nodes().map(n => n.id)).toEqual([a.id])
+    expect(graph.roots().nodes()
+      .map(n => n.id)).toEqual([a.id])
   })
 
   it('leaves', async () => {
     const { c, editor } = await createSequentABC()
     const graph = structures(editor)
 
     expect(graph.leaves().nodes()).toHaveLength(1)
-    expect(graph.leaves().nodes().map(n => n.id)).toEqual([c.id])
+    expect(graph.leaves().nodes()
+      .map(n => n.id)).toEqual([c.id])
   })
 
   it('successors', async () => {
     const { a, b, c, editor } = await createSequentABC()
     const graph = structures(editor)
 
     expect(graph.successors(a.id).nodes()).toHaveLength(2)
-    expect(graph.successors(a.id).nodes().map(n => n.id).sort()).toEqual([b.id, c.id].sort())
+    expect(graph.successors(a.id).nodes()
+      .map(n => n.id)
+      .sort()).toEqual([b.id, c.id].sort())
     expect(graph.successors(b.id).nodes()).toHaveLength(1)
-    expect(graph.successors(b.id).nodes().map(n => n.id)).toEqual([c.id])
+    expect(graph.successors(b.id).nodes()
+      .map(n => n.id)).toEqual([c.id])
     expect(graph.successors(c.id).nodes()).toHaveLength(0)
   })
 
@@ -54,9 +59,12 @@ describe('Traverse', () => {
     const graph = structures(editor)
 
     expect(graph.predecessors(c.id).nodes()).toHaveLength(2)
-    expect(graph.predecessors(c.id).nodes().map(n => n.id).sort()).toEqual([a.id, b.id].sort())
+    expect(graph.predecessors(c.id).nodes()
+      .map(n => n.id)
+      .sort()).toEqual([a.id, b.id].sort())
     expect(graph.predecessors(b.id).nodes()).toHaveLength(1)
-    expect(graph.predecessors(b.id).nodes().map(n => n.id)).toEqual([a.id])
+    expect(graph.predecessors(b.id).nodes()
+      .map(n => n.id)).toEqual([a.id])
     expect(graph.predecessors(a.id).nodes()).toHaveLength(0)
   })
 })

tsconfig.json

@@ -1,9 +1,10 @@
 {
+    "extends": "rete-cli/configs/tsconfig.json",
     "compilerOptions": {
-        "strict": true,
         "esModuleInterop": true
     },
     "include": [
-        "src"
+        "src",
+        "test"
     ]
 }