Merge pull request #11 from retejs/new-linter

fix: update cli and fix linting errors
retejs · Aug 30, 2024 · 7337e65 · 7337e65
2 parents d847605 + 5d3d1e2
commit 7337e65
Show file tree

Hide file tree

Showing 13 changed files with 2,255 additions and 1,844 deletions.
diff --git a/.eslintrc b/.eslintrc
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,7 @@ node_modules
 npm-debug.log
 dist
 docs
+/coverage
+.rete-cli
+.sonar
+.svelte-kit
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -0,0 +1,17 @@
+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
+      }
+    },
+    rules: {
+      '@typescript-eslint/unbound-method': 'off'
+    }
+  }
+)
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -33,9 +33,10 @@
   "devDependencies": {
     "@rollup/plugin-node-resolve": "^15.1.0",
     "@sveltejs/package": "^2.1.0",
+    "globals": "^15.9.0",
     "rete": "^2.0.1",
     "rete-area-plugin": "^2.0.0",
-    "rete-cli": "^1.0.2",
+    "rete-cli": "~2.0.1",
     "rete-render-utils": "^2.0.0",
     "rollup-plugin-scss": "^4.0.0",
     "rollup-plugin-svelte": "^7.1.6",

diff --git a/src/index.ts b/src/index.ts
@@ -102,7 +102,7 @@ export class SveltePlugin<Schemes extends BaseSchemes, T = Requires<Schemes>> ex
         element,
         result.component,
         result.props,
-        () => parent?.emit({ type: 'rendered', data: (context as Requires<Schemes>).data } as T)
+        () => void parent.emit({ type: 'rendered', data: (context as Requires<Schemes>).data } as T)
       )
 
       this.owners.set(element, preset)

diff --git a/src/presets/classic/index.ts b/src/presets/classic/index.ts
@@ -1,4 +1,4 @@
-/* eslint-disable no-console */
+
 import { ClassicPreset, Scope } from 'rete'
 import { classicConnectionPath, getDOMSocketPosition, loopConnectionPath, SocketPositionWatcher } from 'rete-render-utils'
 import type { ComponentType, SvelteComponent } from 'svelte'
@@ -24,22 +24,20 @@ type CustomizationProps<Schemes extends ClassicScheme> = {
   connection?: (data: ExtractPayload<Schemes, 'connection'>) => Component<any> | null
   socket?: (data: ExtractPayload<Schemes, 'socket'>) => Component<any> | null
   control?: <N extends ClassicPreset.Control>(data: ExtractPayload<Schemes, 'control'>)
-    => Component<{ data: N }> | null
+  => Component<{ data: N }> | null
 }
 type ClassicProps<Schemes extends ClassicScheme, K> = {
-  socketPositionWatcher?: SocketPositionWatcher<Scope<never, [K]>>,
+  socketPositionWatcher?: SocketPositionWatcher<Scope<never, [K]>>
   customize?: CustomizationProps<Schemes>
 }
 
 /**
  * Classic preset for rendering nodes, connections, controls and sockets.
  */
-export function setup<Schemes extends ClassicScheme, K extends SvelteArea2D<Schemes>>(
-  props?: ClassicProps<Schemes, K>
-): RenderPreset<Schemes, K> {
+export function setup<Schemes extends ClassicScheme, K extends SvelteArea2D<Schemes>>(props?: ClassicProps<Schemes, K>): RenderPreset<Schemes, K> {
   const positionWatcher = typeof props?.socketPositionWatcher === 'undefined'
     ? getDOMSocketPosition<Schemes, K>()
-    : props?.socketPositionWatcher
+    : props.socketPositionWatcher
   const { node, connection, socket, control } = props?.customize || {}
 
   return {
@@ -60,8 +58,12 @@ export function setup<Schemes extends ClassicScheme, K extends SvelteArea2D<Sche
 
         return {
           data: payload,
-          ...(start ? { start } : {}),
-          ...(end ? { end } : {})
+          ...start
+            ? { start }
+            : {},
+          ...end
+            ? { end }
+            : {}
         }
       }
       return { data: payload }
@@ -72,21 +74,27 @@ export function setup<Schemes extends ClassicScheme, K extends SvelteArea2D<Sche
       const emit = parent.emit.bind(parent)
 
       if (context.data.type === 'node') {
-        const component = node ? node(context.data) : Node
+        const component = node
+          ? node(context.data)
+          : Node
 
         return component && {
-          component, props: {
+          component,
+          props: {
             data: context.data.payload,
             emit
           }
         }
       } else if (context.data.type === 'connection') {
-        const component = connection ? connection(context.data) : Connection
+        const component = connection
+          ? connection(context.data)
+          : Connection
         const { payload } = context.data
         const { source, target, sourceOutput, targetInput } = payload
 
         return component && {
-          component: ConnectionWrapper, props: {
+          component: ConnectionWrapper,
+          props: {
             data: context.data.payload,
             component,
             start: context.data.start || ((change: any) => positionWatcher.listen(source, 'output', sourceOutput, change)),
@@ -110,10 +118,13 @@ export function setup<Schemes extends ClassicScheme, K extends SvelteArea2D<Sche
         }
       } else if (context.data.type === 'socket') {
         const { payload } = context.data
-        const component = socket ? socket(context.data) : Socket
+        const component = socket
+          ? socket(context.data)
+          : Socket
 
         return component && {
-          component, props: {
+          component,
+          props: {
             data: payload
           }
         }
@@ -124,15 +135,17 @@ export function setup<Schemes extends ClassicScheme, K extends SvelteArea2D<Sche
           const component = control(context.data)
 
           return component && {
-            component, props: {
+            component,
+            props: {
               data: payload
             }
           }
         }
 
         return context.data.payload instanceof ClassicPreset.InputControl
           ? {
-            component: Control, props: {
+            component: Control,
+            props: {
               data: payload
             }
           }

diff --git a/src/presets/context-menu/index.ts b/src/presets/context-menu/index.ts
@@ -8,7 +8,9 @@ import type { ContextMenuRender } from './types'
  * Preset for rendering context menu.
  */
 export function setup<Schemes extends BaseSchemes, K extends ContextMenuRender>(props?: { delay?: number }): RenderPreset<Schemes, K> {
-  const delay = typeof props?.delay === 'undefined' ? 1000 : props.delay
+  const delay = typeof props?.delay === 'undefined'
+    ? 1000
+    : props.delay
 
   return {
     update(context) {

diff --git a/src/presets/minimap/types.ts b/src/presets/minimap/types.ts
@@ -3,7 +3,7 @@ import type { RenderSignal } from '../../types'
 export type Rect = {
   width: number
   height: number
-  left: number,
+  left: number
   top: number
 }
 export type Transform = {

diff --git a/src/presets/reroute/index.ts b/src/presets/reroute/index.ts
@@ -16,9 +16,9 @@ type Props = {
  */
 export function setup<Schemes extends BaseSchemes, K extends PinsRender>(props?: Props): RenderPreset<Schemes, K> {
   const getProps = () => ({
-    menu: props?.contextMenu || (() => null),
-    translate: props?.translate || (() => null),
-    down: props?.pointerdown || (() => null)
+    menu: props?.contextMenu ?? (() => null),
+    translate: props?.translate ?? (() => null),
+    down: props?.pointerdown ?? (() => null)
   })
 
   return {

diff --git a/src/presets/types.ts b/src/presets/types.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-invalid-void-type */
 import type { BaseSchemes } from 'rete'
 import type { ComponentType } from 'svelte'
 

diff --git a/src/renderer.ts b/src/renderer.ts
@@ -1,3 +1,4 @@
+/* eslint-disable @typescript-eslint/no-invalid-void-type */
 import type { ComponentType, SvelteComponent } from 'svelte'
 
 import Root from './Root.svelte'

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