Merge pull request #86 from retejs/new-linter

Ni55aN · web-flow · commit 532869145930 · 2024-08-30T19:50:18.000+03:00
fix: update cli and fix linting errors
diff --git a/.eslintrc b/.eslintrc
diff --git a/.gitignore b/.gitignore
@@ -4,3 +4,6 @@ node_modules
 npm-debug.log
 dist
 docs
+/coverage
+.rete-cli
+.sonar
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
@@ -34,9 +34,10 @@
     "@vitejs/plugin-vue": "^4.1.0",
     "@vitejs/plugin-vue2": "^2.2.0",
     "@vue/compiler-sfc": "^3.2.22",
+    "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-commonjs": "^9.2.2",
     "rollup-plugin-pug": "1.1.1",
diff --git a/src/index.ts b/src/index.ts
@@ -31,7 +31,7 @@ export type Props = {
    *  @param [context] to be used for createApp({ ...context }) or new Vue({ ...context })
    *  @returns app / vue instance.
    */
-  setup?: (context: Context) => Instance;
+  setup?: (context: Context) => Instance
 }
 
 /**
@@ -112,7 +112,7 @@ export class VuePlugin<Schemes extends BaseSchemes, T = Requires<Schemes>> exten
         element,
         result.component,
         result.props,
-        () => parent?.emit({ type: 'rendered', data: (context as Requires<Schemes>).data } as T)
+        () => 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
@@ -27,20 +27,18 @@ type CustomizationProps<Schemes extends ClassicScheme> = {
   control?: (data: ExtractPayload<Schemes, 'control'>) => Component<any> | 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 VueArea2D<Schemes>>(
-  props?: ClassicProps<Schemes, K>
-): RenderPreset<Schemes, K> {
+export function setup<Schemes extends ClassicScheme, K extends VueArea2D<Schemes>>(props?: ClassicProps<Schemes, K>): RenderPreset<Schemes, K> {
   const positionWatcher = typeof props?.socketPositionWatcher === 'undefined'
     ? getDOMSocketPosition<Schemes, K>()
-    : props?.socketPositionWatcher
-  const { node, connection, socket, control } = props?.customize || {}
+    : props.socketPositionWatcher
+  const { node, connection, socket, control } = props?.customize ?? {}
 
   return {
     attach(plugin) {
@@ -60,8 +58,12 @@ export function setup<Schemes extends ClassicScheme, K extends VueArea2D<Schemes
 
         return {
           data: payload,
-          ...(start ? { start } : {}),
-          ...(end ? { end } : {})
+          ...start
+            ? { start }
+            : {},
+          ...end
+            ? { end }
+            : {}
         }
       }
       return { data: payload }
@@ -72,25 +74,31 @@ export function setup<Schemes extends ClassicScheme, K extends VueArea2D<Schemes
       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)),
-            end: context.data.end || ((change: any) => positionWatcher.listen(target, 'input', targetInput, change)),
+            start: context.data.start ?? ((change: any) => positionWatcher.listen(source, 'output', sourceOutput, change)),
+            end: context.data.end ?? ((change: any) => positionWatcher.listen(target, 'input', targetInput, change)),
             path: async (start: Position, end: Position) => {
               const response = await plugin.emit({ type: 'connectionpath', data: { payload, points: [start, end] } })
 
@@ -110,10 +118,13 @@ export function setup<Schemes extends ClassicScheme, K extends VueArea2D<Schemes
         }
       } 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, props: {
+          component,
+          props: {
             data: payload
           }
         }
@@ -124,15 +135,17 @@ export function setup<Schemes extends ClassicScheme, K extends VueArea2D<Schemes
           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/classic/types.ts b/src/presets/classic/types.ts
@@ -2,7 +2,7 @@ import { ClassicPreset as Classic, GetSchemes, NodeId } from 'rete'
 
 import { Position, RenderSignal } from '../../types'
 
-type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I)=> void)
+type UnionToIntersection<U> = (U extends any ? (k: U) => void : never) extends ((k: infer I) => void)
   ? I
   : never
 type GetControls<
@@ -33,4 +33,4 @@ export type VueArea2D<T extends ClassicScheme> =
   }>
   | { type: 'unmount', data: { element: HTMLElement } }
 
-export type ExtractPayload<T extends ClassicScheme, K extends string> = Extract<VueArea2D<T>, { type: 'render', data: { type: K }}>['data']
+export type ExtractPayload<T extends ClassicScheme, K extends string> = Extract<VueArea2D<T>, { type: 'render', data: { type: K } }>['data']
diff --git a/src/presets/context-menu/index.ts b/src/presets/context-menu/index.ts
@@ -8,7 +8,9 @@ import { 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/index.ts b/src/presets/minimap/index.ts
@@ -13,7 +13,7 @@ export function setup<Schemes extends BaseSchemes, K extends MinimapRender>(prop
       if (context.data.type === 'minimap') {
         return {
           nodes: context.data.nodes,
-          size: props?.size || 200,
+          size: props?.size ?? 200,
           ratio: context.data.ratio,
           viewport: context.data.viewport,
           translate: context.data.translate,
@@ -27,7 +27,7 @@ export function setup<Schemes extends BaseSchemes, K extends MinimapRender>(prop
           component: Minimap,
           props: {
             nodes: context.data.nodes,
-            size: props?.size || 200,
+            size: props?.size ?? 200,
             ratio: context.data.ratio,
             viewport: context.data.viewport,
             translate: context.data.translate,
diff --git a/src/presets/minimap/types.ts b/src/presets/minimap/types.ts
@@ -3,7 +3,7 @@ import { 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 { BaseSchemes } from 'rete'
 
 import { VuePlugin } from '..'
diff --git a/src/vuecompat/types.ts b/src/vuecompat/types.ts
@@ -4,8 +4,8 @@ type Vue = typeof VueNamespace
 
 export type Context = Vue extends { createApp: (arg: infer U) => any }
   ? U
-  : (Vue extends { new(options: infer U): any } ? U : any)
+  : (Vue extends new(options: infer U) => any ? U : any)
 
 export type Instance = Vue extends { createApp: (arg: any) => infer U }
   ? U
-  : (Vue extends { new(options: any): infer U } ? U : any)
+  : (Vue extends new(options: any) => infer U ? U : any)
diff --git a/src/vuecompat/vue2.ts b/src/vuecompat/vue2.ts
@@ -16,7 +16,9 @@ export function create(element: any, component: any, payload: any, onRendered: a
     }
   }
 
-  const app: Vue & { payload?: Record<string, unknown> } = props?.setup ? props.setup(context) as Vue : new Vue(context)
+  const app: Vue & { payload?: Record<string, unknown> } = props?.setup
+    ? props.setup(context) as Vue
+    : new Vue(context)
 
   app.payload = payload
 
diff --git a/src/vuecompat/vue3.ts b/src/vuecompat/vue3.ts
@@ -22,7 +22,9 @@ export function create<P extends object>(element: HTMLElement, component: any, p
     }
   }
 
-  const app = props?.setup ? props.setup(context) : createApp(context)
+  const app = props?.setup
+    ? props.setup(context)
+    : createApp(context)
 
   app.mount(element)
 
diff --git a/tsconfig.json b/tsconfig.json
@@ -1,6 +1,6 @@
 {
+    "extends": "rete-cli/configs/tsconfig.json",
     "compilerOptions": {
-        "strict": true,
         "lib": ["DOM"]
     },
     "include": ["src"]
