From 48fb14fd7a414a49ab7a6713b80e0c370e2a6b7b Mon Sep 17 00:00:00 2001 From: newcat Date: Sat, 5 Jun 2021 00:38:44 +0200 Subject: [PATCH] Fixed linter errors for renderer --- .eslintrc.js | 16 ----- .eslintrc.json | 22 ++++++ .prettierrc | 3 +- .../package.json | 3 +- .../src/components/ContextMenu.vue | 57 ++++++++++----- .../src/components/Minimap.vue | 16 ++--- .../src/components/Sidebar.vue | 25 +++++-- .../src/connection/ConnectionView.vue | 5 +- .../src/connection/ConnectionWrapper.vue | 20 ++++-- .../src/connection/TemporaryConnection.vue | 15 ++-- .../src/editor/Editor.vue | 72 +++++++++++-------- .../src/editor/panZoom.ts | 2 +- .../src/history/connectionStep.ts | 2 +- .../src/history/index.ts | 4 +- .../src/node/Node.vue | 63 ++++++++++------ .../src/node/NodeInterface.vue | 26 +++++-- .../src/node/viewNode.ts | 2 +- .../nodeinterfaces/button/ButtonInterface.vue | 8 ++- .../checkbox/CheckboxInterface.vue | 17 ++++- .../src/nodeinterfaces/icons/Arrow.vue | 7 +- .../integer/IntegerInterface.vue | 46 ++++++++---- .../nodeinterfaces/number/NumberInterface.vue | 46 ++++++++---- .../nodeinterfaces/select/SelectInterface.vue | 25 ++++--- .../nodeinterfaces/slider/SliderInterface.vue | 31 +++++--- .../textinput/TextInputInterface.vue | 9 ++- .../src/nodepalette/NodePalette.vue | 17 +++-- .../src/nodepalette/PaletteEntry.vue | 7 +- .../src/utility/usePlugin.ts | 2 +- tsconfig.json | 2 +- 29 files changed, 383 insertions(+), 187 deletions(-) delete mode 100644 .eslintrc.js create mode 100644 .eslintrc.json diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index b4854d1e..00000000 --- a/.eslintrc.js +++ /dev/null @@ -1,16 +0,0 @@ -/*eslint-env node*/ - -module.exports = { - root: true, - parser: "vue-eslint-parser", - parserOptions: { - parser: "@typescript-eslint/parser", - }, - plugins: ["@typescript-eslint"], - extends: ["eslint:recommended", "plugin:@typescript-eslint/recommended", "prettier", "plugin:vue/vue3-recommended"], - rules: { - "@typescript-eslint/no-non-null-assertion": 0, - "@typescript-eslint/no-explicit-any": 0, - "@typescript-eslint/explicit-module-boundary-types": 0, - }, -}; diff --git a/.eslintrc.json b/.eslintrc.json new file mode 100644 index 00000000..ea284b8f --- /dev/null +++ b/.eslintrc.json @@ -0,0 +1,22 @@ +{ + "root": true, + "parser": "vue-eslint-parser", + "parserOptions": { + "parser": "@typescript-eslint/parser" + }, + "plugins": ["@typescript-eslint"], + "extends": [ + "eslint:recommended", + "plugin:@typescript-eslint/recommended", + "prettier", + "plugin:vue/vue3-recommended" + ], + "rules": { + "indent": ["warn", 4], + "@typescript-eslint/no-non-null-assertion": 0, + "@typescript-eslint/no-explicit-any": 0, + "@typescript-eslint/explicit-module-boundary-types": 0, + "vue/html-indent": ["warn", 4], + "vue/no-mutating-props": "off" + } +} diff --git a/.prettierrc b/.prettierrc index fc5018ff..49e684bd 100644 --- a/.prettierrc +++ b/.prettierrc @@ -2,5 +2,6 @@ "tabWidth": 4, "arrowParens": "always", "printWidth": 120, - "quoteProps": "consistent" + "quoteProps": "consistent", + "trailingComma": "all" } diff --git a/packages/baklavajs-plugin-renderer-vue/package.json b/packages/baklavajs-plugin-renderer-vue/package.json index 7df881f2..2aa67164 100644 --- a/packages/baklavajs-plugin-renderer-vue/package.json +++ b/packages/baklavajs-plugin-renderer-vue/package.json @@ -20,7 +20,8 @@ "scripts": { "dev": "vite", "build": "rimraf dist && vue-tsc --noEmit && vite build && tsc --emitDeclarationOnly", - "docs": "typedoc --json ../../docs/api/plugin-renderer-vue.json --options ../../typedoc.json" + "docs": "typedoc --json ../../docs/api/plugin-renderer-vue.json --options ../../typedoc.json", + "lint": "eslint --ext .ts,.vue src" }, "repository": { "type": "git", diff --git a/packages/baklavajs-plugin-renderer-vue/src/components/ContextMenu.vue b/packages/baklavajs-plugin-renderer-vue/src/components/ContextMenu.vue index 102ca573..d40a959b 100644 --- a/packages/baklavajs-plugin-renderer-vue/src/components/ContextMenu.vue +++ b/packages/baklavajs-plugin-renderer-vue/src/components/ContextMenu.vue @@ -1,20 +1,39 @@ diff --git a/packages/baklavajs-plugin-renderer-vue/src/components/Minimap.vue b/packages/baklavajs-plugin-renderer-vue/src/components/Minimap.vue index 20da7049..bed9875c 100644 --- a/packages/baklavajs-plugin-renderer-vue/src/components/Minimap.vue +++ b/packages/baklavajs-plugin-renderer-vue/src/components/Minimap.vue @@ -7,11 +7,11 @@ @mousedown.self="mousedown" @mousemove.self="mousemove" @mouseup="mouseup" - > + /> diff --git a/packages/baklavajs-plugin-renderer-vue/src/components/Sidebar.vue b/packages/baklavajs-plugin-renderer-vue/src/components/Sidebar.vue index fd866fa1..dca24549 100644 --- a/packages/baklavajs-plugin-renderer-vue/src/components/Sidebar.vue +++ b/packages/baklavajs-plugin-renderer-vue/src/components/Sidebar.vue @@ -1,16 +1,29 @@ @@ -32,7 +45,7 @@ export default defineComponent({ }); const styles = computed(() => ({ - width: `${width}px`, + width: `${width.value}px` })); const close = () => { @@ -61,6 +74,6 @@ export default defineComponent({ }; return { el, graph, nodeName, styles, startResize, close }; - }, + } }); diff --git a/packages/baklavajs-plugin-renderer-vue/src/connection/ConnectionView.vue b/packages/baklavajs-plugin-renderer-vue/src/connection/ConnectionView.vue index 69a0618b..33b21ec1 100644 --- a/packages/baklavajs-plugin-renderer-vue/src/connection/ConnectionView.vue +++ b/packages/baklavajs-plugin-renderer-vue/src/connection/ConnectionView.vue @@ -1,5 +1,8 @@ diff --git a/packages/baklavajs-plugin-renderer-vue/src/connection/TemporaryConnection.vue b/packages/baklavajs-plugin-renderer-vue/src/connection/TemporaryConnection.vue index 86b04fda..050378a8 100644 --- a/packages/baklavajs-plugin-renderer-vue/src/connection/TemporaryConnection.vue +++ b/packages/baklavajs-plugin-renderer-vue/src/connection/TemporaryConnection.vue @@ -6,7 +6,7 @@ :y2="d.output[1]" :state="status" is-temporary - > + /> diff --git a/packages/baklavajs-plugin-renderer-vue/src/editor/Editor.vue b/packages/baklavajs-plugin-renderer-vue/src/editor/Editor.vue index da4f73da..c17469d0 100644 --- a/packages/baklavajs-plugin-renderer-vue/src/editor/Editor.vue +++ b/packages/baklavajs-plugin-renderer-vue/src/editor/Editor.vue @@ -1,11 +1,11 @@ @@ -86,8 +105,8 @@ export default defineComponent({ props: { plugin: { type: Object as () => IBaklavaView, - required: true, - }, + required: true + } }, setup(props) { const token = Symbol("EditorToken"); @@ -97,18 +116,16 @@ export default defineComponent({ const el = ref(null); - const currentGraph = props.plugin.displayedGraph; - const nodes = computed(() => currentGraph.value.nodes); - const connections = computed(() => currentGraph.value.connections); - const selectedNodes = computed(() => currentGraph.value.selectedNodes); + const nodes = computed(() => props.plugin.displayedGraph.value.nodes); + const connections = computed(() => props.plugin.displayedGraph.value.connections); + const selectedNodes = computed(() => props.plugin.displayedGraph.value.selectedNodes); const panZoom = usePanZoom(); const temporaryConnection = useTemporaryConnection(); const { transform } = useTransform(); - const backgroundStyle = props.plugin.backgroundStyles; const nodeContainerStyle = computed(() => ({ - ...panZoom.styles.value, + ...panZoom.styles.value })); // Reason: https://github.com/newcat/baklavajs/issues/54 @@ -171,7 +188,7 @@ export default defineComponent({ } const instance = reactive(new nodeTypeInfo.type()) as AbstractNode; - currentGraph.value.addNode(instance); + props.plugin.displayedGraph.value.addNode(instance); const [x, y] = transform(ev.clientX, ev.clientY); instance.position.x = x; instance.position.y = y; @@ -182,11 +199,11 @@ export default defineComponent({ if (!props.plugin.commandHandler.pressedKeys.value.includes("Control")) { unselectAllNodes(); } - currentGraph.value.selectedNodes.push(node); + props.plugin.displayedGraph.value.selectedNodes.push(node); }; const unselectAllNodes = () => { - currentGraph.value.selectedNodes = []; + props.plugin.displayedGraph.value.selectedNodes = []; }; return { @@ -195,7 +212,6 @@ export default defineComponent({ nodes, connections, selectedNodes, - backgroundStyle, nodeContainerStyle, mouseMoveHandler, mouseDown, @@ -206,9 +222,9 @@ export default defineComponent({ drop, selectNode, temporaryConnection: temporaryConnection.temporaryConnection, - mouseWheel: panZoom.onMouseWheel, + mouseWheel: panZoom.onMouseWheel }; - }, + } }); diff --git a/packages/baklavajs-plugin-renderer-vue/src/editor/panZoom.ts b/packages/baklavajs-plugin-renderer-vue/src/editor/panZoom.ts index cf671d02..729bfe1a 100644 --- a/packages/baklavajs-plugin-renderer-vue/src/editor/panZoom.ts +++ b/packages/baklavajs-plugin-renderer-vue/src/editor/panZoom.ts @@ -1,4 +1,4 @@ -import { computed, toRef } from "vue"; +import { computed } from "vue"; import { useDragMove, useGraph } from "../utility"; export function usePanZoom() { diff --git a/packages/baklavajs-plugin-renderer-vue/src/history/connectionStep.ts b/packages/baklavajs-plugin-renderer-vue/src/history/connectionStep.ts index cf59c4da..bed9e299 100644 --- a/packages/baklavajs-plugin-renderer-vue/src/history/connectionStep.ts +++ b/packages/baklavajs-plugin-renderer-vue/src/history/connectionStep.ts @@ -1,4 +1,4 @@ -import { Editor, IConnectionState, IConnection, Graph } from "@baklavajs/core"; +import { IConnectionState, IConnection, Graph } from "@baklavajs/core"; import { IStep } from "./step"; export default class ConnectionStep implements IStep { diff --git a/packages/baklavajs-plugin-renderer-vue/src/history/index.ts b/packages/baklavajs-plugin-renderer-vue/src/history/index.ts index dad02330..d5f81892 100644 --- a/packages/baklavajs-plugin-renderer-vue/src/history/index.ts +++ b/packages/baklavajs-plugin-renderer-vue/src/history/index.ts @@ -1,4 +1,4 @@ -import { computed, Ref, ref, watch } from "vue"; +import { Ref, ref, watch } from "vue"; import { Graph } from "@baklavajs/core"; import type { ICommandHandler, ICommand } from "../commands"; @@ -111,7 +111,7 @@ export function useHistory(graph: Ref, commandHandler: ICommandHandler): // TODO: Also add moving nodes to the history } }, - { immediate: true } + { immediate: true }, ); commandHandler.registerCommand(UNDO_COMMAND, { diff --git a/packages/baklavajs-plugin-renderer-vue/src/node/Node.vue b/packages/baklavajs-plugin-renderer-vue/src/node/Node.vue index c8416266..6227e7cf 100644 --- a/packages/baklavajs-plugin-renderer-vue/src/node/Node.vue +++ b/packages/baklavajs-plugin-renderer-vue/src/node/Node.vue @@ -1,29 +1,43 @@