@eturnity/eturnity_maths 7.30.0 → 7.32.0

package/.eslintrc.js

@@ -1,28 +1,187 @@
 module.exports = {
+  root: true,
   env: {
     browser: true,
-    es2021: true
+    node: true,
+    es6: true,
   },
-  extends: 'eslint:recommended',
-  overrides: [
-    {
-      env: {
-        node: true
-      },
-      files: ['.eslintrc.{js,cjs}'],
-      parserOptions: {
-        sourceType: 'script'
-      }
-    }
+  extends: [
+    'eslint:recommended',
+    'eslint:recommended',
+    'plugin:vue/vue3-recommended',
+    'plugin:prettier/recommended',
   ],
+  plugins: ['vue', 'prettier'],
   parserOptions: {
-    ecmaVersion: 'latest',
-    sourceType: 'module'
+    ecmaVersion: 2020,
+    sourceType: 'module',
   },
   rules: {
-    indent: ['error', 'tab'],
-    'linebreak-style': ['error', 'unix'],
-    quotes: ['error', 'single'],
-    semi: ['error', 'never']
-  }
+    'vue/component-name-in-template-casing': [
+      'warn',
+      'PascalCase',
+      {
+        registeredComponentsOnly: false,
+        ignores: [],
+      },
+    ],
+    'vue/multi-word-component-names': [
+      'warn',
+      {
+        ignores: [],
+      },
+    ],
+    'vue/html-closing-bracket-newline': [
+      'warn',
+      {
+        singleline: 'never',
+        multiline: 'always',
+      },
+    ],
+    'vue/html-closing-bracket-spacing': [
+      'warn',
+      {
+        startTag: 'never',
+        endTag: 'never',
+        selfClosingTag: 'always',
+      },
+    ],
+    'vue/no-multi-spaces': [
+      'warn',
+      {
+        ignoreProperties: false,
+      },
+    ],
+    'vue/html-end-tags': 'warn',
+    'keyword-spacing': [
+      'warn',
+      {
+        before: true, // Require a space before keywords
+        after: true, // Require a space after keywords
+      },
+    ],
+    // Enforce one space after comma
+    'comma-spacing': [
+      'warn',
+      {
+        before: false, // No space before comma
+        after: true, // Require a space after comma
+      },
+    ],
+    'func-call-spacing': ['warn', 'never'],
+    // Enforce one space around binary operators (+, -, *, /, etc.)
+    'space-infix-ops': 'warn',
+    // Enforce no space inside parentheses
+    'space-in-parens': ['warn', 'never'],
+    // Enforce one space before block statements (if, else, for, etc.)
+    'space-before-blocks': 'warn',
+    // Enforce no spaces inside square brackets
+    'array-bracket-spacing': ['warn', 'never'],
+    // Enforce one space before function parentheses
+    'space-before-function-paren': ['warn', 'never'],
+    // Enforce one space inside braces of object literals
+    'object-curly-spacing': ['warn', 'always'],
+    // Enforce one space before and after arrow functions (optional)
+    'arrow-spacing': ['warn', { before: true, after: true }],
+    // Enforce one space after colon in object literals
+    'key-spacing': [
+      'warn',
+      {
+        beforeColon: false, // No space before colon
+        afterColon: true, // Require one space after colon
+        mode: 'strict', // Enforce spacing between key and value
+      },
+    ],
+    'vue/html-indent': 'off',
+    'vue/html-quotes': ['warn', 'double'],
+    'vue/html-self-closing': [
+      'warn',
+      {
+        html: {
+          void: 'always',
+          normal: 'never',
+          component: 'always',
+        },
+        svg: 'always',
+        math: 'always',
+      },
+    ],
+    'vue/require-default-prop': 'warn',
+    'vue/require-prop-types': 'warn',
+    'vue/v-on-event-hyphenation': [
+      'warn',
+      'always',
+      {
+        autofix: true,
+        ignore: [],
+      },
+    ],
+    'vue/prop-name-casing': ['warn', 'camelCase'],
+    'vue/order-in-components': 'warn',
+    'vue/this-in-template': ['warn', 'never'],
+    'vue/attributes-order': [
+      'warn',
+      {
+        order: [
+          'DEFINITION',
+          'LIST_RENDERING',
+          'CONDITIONALS',
+          'RENDER_MODIFIERS',
+          'GLOBAL',
+          ['UNIQUE', 'SLOT'],
+          'TWO_WAY_BINDING',
+          'OTHER_DIRECTIVES',
+          'OTHER_ATTR',
+          'EVENTS',
+          'CONTENT',
+        ],
+        alphabetical: true,
+      },
+    ],
+    'vue/no-unused-vars': 'warn',
+    'vue/no-use-v-if-with-v-for': [
+      'warn',
+      {
+        allowUsingIterationVar: false,
+      },
+    ],
+    'no-unused-vars': 'warn',
+    'no-undef': 'warn',
+    'no-console': 'warn',
+    'no-debugger': 'warn',
+    'no-multi-spaces': 'warn',
+    'no-mixed-spaces-and-tabs': 'warn',
+    'no-redeclare': 'warn',
+    'no-prototype-builtins': 'warn',
+    'no-unsafe-finally': 'warn',
+    'max-len': [
+      'warn',
+      {
+        code: 120,
+        tabWidth: 2,
+        ignoreUrls: true,
+        ignoreComments: true,
+        ignoreTrailingComments: true,
+        ignorePattern: '^import\\s.+\\sfrom\\s.+;$',
+      },
+    ],
+    'prettier/prettier': [
+      'warn',
+      2,
+      2,
+      {
+        semi: false,
+        singleQuote: true,
+        trailingComma: 'es5',
+        printWidth: 80,
+        tabWidth: 2,
+        useTabs: false,
+        endOfLine: 'auto',
+      },
+    ],
+    'vue/script-indent': ['warn', 2, { baseIndent: 1 }],
+  },
+  globals: {
+    _: true,
+  },
 }

package/.prettierrc

@@ -1,7 +1,9 @@
 {
-    "semi": false,
-    "singleQuote": true,
-    "useTabs": false,
-    "trailingComma": "none",
-    "printWidth": 80
-  }
+  "semi": false,
+  "singleQuote": true,
+  "printWidth": 80,
+  "tabWidth": 2,
+  "trailingComma": "es5",
+  "bracketSpacing": true,
+  "vueIndentScriptAndStyle": true
+}

package/package.json

@@ -1,12 +1,12 @@
 {
   "name": "@eturnity/eturnity_maths",
-  "version": "7.30.0",
+  "version": "7.32.0",
   "author": "Eturnity Team",
   "main": "src/index.js",
   "private": false,
   "scripts": {
-    "test": "jest",
-    "prettier": "prettier --write \"**/*.js\""
+    "lint": "eslint --fix --debug --ext .js,.vue .",
+    "test": "jest"
   },
   "repository": {
     "type": "git",
@@ -28,8 +28,16 @@
     "@babel/core": "7.21.4",
     "@babel/preset-env": "7.21.4",
     "babel-jest": "29.5.0",
+    "@vue/eslint-config-standard": "8.0.1",
+    "babel-eslint": "10.1.0",
+    "easygettext": "2.17.0",
+    "eslint": "8.0.1",
+    "eslint-config-prettier": "8.8.0",
+    "eslint-plugin-prettier": "4.2.1",
+    "eslint-plugin-vue": "9.14.1",
     "jest": "29.5.0",
-    "prettier": "2.8.8"
+    "prettier": "^2.8.4",
+    "prettier-plugin-vue": "^1.1.6"
   },
   "description": ""
 }

package/src/geometry.js

@@ -1061,7 +1061,6 @@ export function getIndexesOfBiggestTriangleWithTwoFixedIndexes(
 	preferedAndFixedIndexes = [...new Set(preferedAndFixedIndexes)]
 	if (points.length < 3 || fixedIndexes.length < 3) {
 		throw new Error('not enough points to make a triangle')
-		return
 	}
 	let minArea = calculateArea(points) / areaMinFactor
 	let maxArea = minArea

package/src/intersectionPolygon.js

@@ -609,7 +609,7 @@ function findPointInsidePolygon(point, polygon) {
   var classify
   var org, dest
   for (var i = 0; i < edges.length; i++) {
-    ;[org, dest] = edges[i]
+    [org, dest] = edges[i]
     classify = classifyPoint(point, [org, dest])
     if (
       (classify.loc === 'RIGHT' && org.y < point.y && dest.y >= point.y) ||

package/src/lib/concaveman.js

@@ -20,7 +20,7 @@ export default function concaveman(points, concavity, lengthThreshold) {
 
   // index the points with an R-tree
   var tree = new RBush(16)
-  tree.toBBox = function (a) {
+  tree.toBBox = function(a) {
     return {
       minX: a[0],
       minY: a[1],
@@ -28,10 +28,10 @@ export default function concaveman(points, concavity, lengthThreshold) {
       maxY: a[1]
     }
   }
-  tree.compareMinX = function (a, b) {
+  tree.compareMinX = function(a, b) {
     return a[0] - b[0]
   }
-  tree.compareMinY = function (a, b) {
+  tree.compareMinY = function(a, b) {
     return a[1] - b[1]
   }
 

package/src/objects/Line.js

@@ -205,7 +205,7 @@ export class Line {
 		}
 		const polygon0 = polygons.find((p) => p.id == this.belongsTo[0].polygonId)
 		const polygon1 = polygons.find((p) => p.id == this.belongsTo[1].polygonId)
-		if(!polygon0 || !polygon1){
+		if (!polygon0 || !polygon1) {
 			return false
 		}
 		let A, B, C, D
@@ -213,14 +213,14 @@ export class Line {
 			A = polygon0.outline[this.belongsTo[0].index]
 			B =
         polygon0.outline[
-        	(this.belongsTo[0].index + 1) % polygon0.outline.length
+          (this.belongsTo[0].index + 1) % polygon0.outline.length
         ]
 		}
 		if (this.belongsTo[1].index !== null) {
-			C = polygon1.outline[this.belongsTo[1].index]
+			C = polygon1.outline[this.belongsTo[1].index] 
 			D =
         polygon1.outline[
-        	(this.belongsTo[1].index + 1) % polygon1.outline.length
+          (this.belongsTo[1].index + 1) % polygon1.outline.length
         ]
 		}
 		if (!A || !B) {

package/src/objects/Polygon.js

@@ -150,8 +150,8 @@ export class Polygon {
 	}
 	translate(vectorInMm) {
 		this.version++
-		if(this.roofs){
-			this.roofs.forEach(r=>r.version++)
+		if (this.roofs) {
+			this.roofs.forEach(r => r.version++)
 		}
 		this.positionOffset.x += vectorInMm.x
 		this.positionOffset.y += vectorInMm.y

package/src/objects/graph/graphCreation.js

@@ -1,7 +1,7 @@
 import { Graph } from './DFS'
 import { isSameSegment2D } from '../../geometry'
 
-export function generateGraph(polygons, {includingRoofOnRoofs = true} = {}) {
+export function generateGraph(polygons, { includingRoofOnRoofs = true } = {}) {
 	const edges2D = []
 	const g = new Graph()
 	polygons

package/src/splitMergePolygons.js

@@ -60,7 +60,7 @@ export function mergePolygons(polygonIdsToMerge, edges, layer, polygons) {
 		if (!polygon) {
 			let newPolygon = new Polygon(outlineList[k], layer)
 			polygonList.push(newPolygon)
-		}else{
+		} else {
 			polygonList.push(polygon)
 		}
 	}
@@ -438,7 +438,7 @@ export function getEdgeList(
 }
 function forestRecursion(cycleTree) {
 	if (cycleTree.children.length > 0) {
-		let cycles = cycleTree.children.reduce(function (done, curr) {
+		let cycles = cycleTree.children.reduce(function(done, curr) {
 			done.push(...forestRecursion(curr))
 			return done
 		}, [])