Merge pull request #6 from retejs/new-linter

fix: update cli and fix linting errors

.gitignore

@@ -1,3 +1,6 @@
 node_modules
 dist
 docs
+/coverage
+.rete-cli
+.sonar

eslint.config.mjs

@@ -0,0 +1,14 @@
+import tseslint from 'typescript-eslint'
+import configs from 'rete-cli/configs/eslint.mjs'
+import gloals from 'globals'
+
+export default tseslint.config(
+  ...configs,
+  {
+    languageOptions: {
+      globals: {
+        ...gloals.browser
+      }
+    }
+  }
+)

package.json

@@ -30,10 +30,10 @@
     "rete-area-plugin": "^2.0.0"
   },
   "devDependencies": {
+    "globals": "^15.9.0",
     "rete": "^2.0.1",
     "rete-area-plugin": "^2.0.0",
-    "rete-cli": "^1.0.2",
-    "typescript": "4.8.4"
+    "rete-cli": "~2.0.1"
   },
   "dependencies": {
     "@babel/runtime": "^7.21.0"

src/agents/classic/index.ts

@@ -25,10 +25,12 @@ export const useScopeAgent: ScopeAgent = (params: DefaultScopesAgentParams, { ar
   function pick(id: NodeId) {
     const timeoutId = window.setTimeout(() => {
       const selected = editor.getNodes().filter(n => n.selected)
-      const targets = selected.length ? selected.map(n => n.id) : [id]
+      const targets = selected.length
+        ? selected.map(n => n.id)
+        : [id]
 
       candidates.push(...targets)
-      scopes.emit({ type: 'scopepicked', data: { ids: targets } })
+      void scopes.emit({ type: 'scopepicked', data: { ids: targets } })
     }, timeout)
 
     picked = { timeout: timeoutId }
@@ -39,13 +41,13 @@ export const useScopeAgent: ScopeAgent = (params: DefaultScopesAgentParams, { ar
     cancel()
     candidates = []
 
-    scopes.emit({ type: 'scopereleased', data: { ids: list } })
+    void scopes.emit({ type: 'scopereleased', data: { ids: list } })
 
     return list
   }
 
   area.addPipe(async context => {
-    if (!('type' in context)) return context
+    if (!context || typeof context !== 'object' || !('type' in context)) return context
     if (context.type === 'nodepicked') {
       pick(context.data.id)
     }
@@ -103,26 +105,28 @@ export function useVisualEffects<T>({ area, editor, scopes }: AgentContext<T>):
       }
     }
   }
-  // eslint-disable-next-line max-statements
+
   scopes.addPipe(context => {
     if (context.type === 'scopepicked') {
       const { ids } = context.data
 
-      editor.getNodes().filter(n => !ids.includes(n.id)).forEach(node => {
-        const view = area.nodeViews.get(node.id)
+      editor.getNodes().filter(n => !ids.includes(n.id))
+        .forEach(node => {
+          const view = area.nodeViews.get(node.id)
 
-        if (view) view.element.style.opacity = '0.4'
-      })
+          if (view) view.element.style.opacity = '0.4'
+        })
       if (clientPointerPostion) updateHighlightedScopes(clientPointerPostion, pickedNodes)
     }
     if (context.type === 'scopereleased') {
       const { ids } = context.data
 
-      editor.getNodes().filter(n => !ids.includes(n.id)).forEach(node => {
-        const view = area.nodeViews.get(node.id)
+      editor.getNodes().filter(n => !ids.includes(n.id))
+        .forEach(node => {
+          const view = area.nodeViews.get(node.id)
 
-        if (view) view.element.style.opacity = ''
-      })
+          if (view) view.element.style.opacity = ''
+        })
       if (clientPointerPostion) updateHighlightedScopes(clientPointerPostion, pickedNodes)
     }
     if (context.type === 'pointermove') {

src/index.ts

@@ -63,7 +63,6 @@ export class ScopesPlugin<Schemes extends ExpectedScheme, T = never> extends Sco
     this.size = props?.size || ((id, size) => size)
   }
 
-  // eslint-disable-next-line max-statements
   setParent(scope: Scope<BaseArea<Schemes>, [Root<Schemes>]>): void {
     super.setParent(scope)
 
@@ -90,13 +89,17 @@ export class ScopesPlugin<Schemes extends ExpectedScheme, T = never> extends Sco
         const current = props.editor.getNode(id)
 
         if (!current) throw new Error('cannot find node')
-        // prevent translating children if the node translation
-        // is triggered by its resizing (when its children moved)
+        /*
+         * prevent translating children if the node translation
+         * is triggered by its resizing (when its children moved)
+         */
         if (!isTranslating(id)) {
           await translateChildren(id, context.data, props)
         }
 
-        const parent = current.parent ? props.editor.getNode(current.parent) : null
+        const parent = current.parent
+          ? props.editor.getNode(current.parent)
+          : null
 
         if (parent && !agentParams.exclude(id)) {
           const hasAnySelectedParent = hasSelectedParent(id, props)
@@ -149,7 +152,7 @@ export class ScopesPlugin<Schemes extends ExpectedScheme, T = never> extends Sco
 export function getPickedNodes<S extends ExpectedScheme>(scopes: Scope<Scopes, [Requires<S>, Root<S>]>) {
   const nodes: NodeId[] = []
 
-  scopes.addPipe(async context => {
+  scopes.addPipe(context => {
     if (!('type' in context)) return context
     if (context.type === 'scopepicked') {
       nodes.push(...context.data.ids)

src/ordering.ts

@@ -31,19 +31,22 @@ function bringForward<T>(nodeId: NodeId, props: Props<T>) {
     return n.parent === nodeId
   })
 
-  connections.forEach(connection => bringConnectionForward(connection.id, props))
+  connections.forEach(connection => {
+    bringConnectionForward(connection.id, props)
+  })
 
   if (view) {
     props.area.area.content.reorder(view.element, null)
   }
 
-  children.forEach(child => bringForward(child.id, props))
+  children.forEach(child => {
+    bringForward(child.id, props)
+  })
 }
 
 export function useOrdering<T>(props: Props<T>) {
-  // eslint-disable-next-line max-statements
-  props.area.addPipe(async context => {
-    if (!('type' in context)) return context
+  props.area.addPipe(context => {
+    if (!context || typeof context !== 'object' || !('type' in context)) return context
     if (context.type === 'nodepicked') {
       bringForward(context.data.id, props)
     }

src/scope.ts

@@ -21,7 +21,8 @@ export async function reassignParent<T>(ids: NodeId[], pointer: { x: number, y:
       if (!view) throw new Error('node view')
 
       return { node, view }
-    }).filter(({ node, view }) => {
+    })
+    .filter(({ node, view }) => {
       return !ids.includes(node.id)
         && pointer.x > view.position.x
         && pointer.y > view.position.y

src/sizing.ts

@@ -44,7 +44,7 @@ export function updateNodeSizes<T>(node: ExpectedScheme['Node'], size: Size, { a
   node.width = width
   node.height = height
 
-  area.resize(node.id, width, height)
+  void area.resize(node.id, width, height)
 }
 
 // eslint-disable-next-line max-statements

src/types.ts

@@ -1,9 +1,9 @@
 import { ConnectionBase, GetSchemes, NodeBase, NodeId } from 'rete'
 
 export type Padding = {
-  top: number,
-  left: number,
-  right: number,
+  top: number
+  left: number
+  right: number
   bottom: number
 }
 

src/utils.ts

@@ -37,12 +37,12 @@ export type Translate = (nodeId: string, x: number, y: number) => Promise<void>
  * keep track of currently moving nodes (to prevent infinite loop)
  */
 export function trackedTranslate<T>(props: Props<T>): {
-  translate: Translate,
+  translate: Translate
   isTranslating: (id: NodeId) => boolean
 } {
   const active = new Map<NodeId, number>()
-  const increment = (id: NodeId) => active.set(id, (active.get(id) || 0) + 1)
-  const decrement = (id: NodeId) => active.set(id, (active.get(id) || 0) - 1)
+  const increment = (id: NodeId) => active.set(id, (active.get(id) ?? 0) + 1)
+  const decrement = (id: NodeId) => active.set(id, (active.get(id) ?? 0) - 1)
 
   return {
     async translate(id, x, y) {
@@ -59,7 +59,7 @@ export function trackedTranslate<T>(props: Props<T>): {
       }
     },
     isTranslating(id) {
-      return (active.get(id) || 0) > 0
+      return (active.get(id) ?? 0) > 0
     }
   }
 }

src/validation.ts

@@ -9,7 +9,6 @@ type Props<T> = { editor: NodeEditor<ExpectedScheme>, area: BaseAreaPlugin<Expec
 export function useValidator<T>(props: Props<T>) {
   const isClearing = watchClearing(props.editor)
 
-  // eslint-disable-next-line max-statements
   props.area.addPipe(context => {
     if (!context || !(typeof context === 'object' && 'type' in context)) return context
     if (context.type === 'nodecreate') {

tsconfig.json

@@ -1,6 +1,6 @@
 {
+    "extends": "rete-cli/configs/tsconfig.json",
     "compilerOptions": {
-        "strict": true,
         "lib": [
             "DOM"
         ]