Merge pull request #8 from upsetjs/release/v2.3.2

sgratzl · web-flow · commit 0ef0267a2207 · 2024-01-21T16:22:37.000-05:00
Release v2.3.2
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1,6 +1,8 @@
 name: ci
 
-on: [push]
+on:
+  - push
+  - pull_request
 
 jobs:
   build:
@@ -9,7 +11,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 20
       - run: npm i -g yarn
       - run: yarn config set checksumBehavior ignore
       - name: Cache Node.js modules
diff --git a/.github/workflows/release_helper.yml b/.github/workflows/release_helper.yml
@@ -20,7 +20,7 @@ jobs:
         uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: '14'
+          node-version: 20
       - name: Extract version
         id: extract_version
         run: node -pe "'::set-output name=version::' + require('./package.json').version"
@@ -45,7 +45,7 @@ jobs:
         uses: actions/checkout@v2
       - uses: actions/setup-node@v2
         with:
-          node-version: 14
+          node-version: 20
       - run: npm i -g yarn
       - run: yarn config set checksumBehavior ignore
       - name: Cache Node.js modules
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -14,7 +14,7 @@
     "editor.defaultFormatter": "esbenp.prettier-vscode"
   },
   "eslint.nodePath": ".yarn/sdks",
-  "prettier.prettierPath": ".yarn/sdks/prettier/index.js",
+  "prettier.prettierPath": ".yarn/sdks/prettier/index.cjs",
   "files.eol": "\n",
   "editor.detectIndentation": false,
   "editor.tabSize": 2,
diff --git a/.yarn/releases/yarn-3.2.4.cjs b/.yarn/releases/yarn-3.2.4.cjs
diff --git a/.yarn/releases/yarn-4.0.2.cjs b/.yarn/releases/yarn-4.0.2.cjs
diff --git a/.yarnrc.yml b/.yarnrc.yml
@@ -6,4 +6,4 @@ packageExtensions:
     dependencies:
       eslint-import-resolver-node: "*"
 
-yarnPath: .yarn/releases/yarn-3.2.4.cjs
+yarnPath: .yarn/releases/yarn-4.0.2.cjs
diff --git a/package.json b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "bubblesets-js",
   "description": "JavaScript implementation of bubble sets by Christopher Collins",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "author": {
     "name": "Samuel Gratzl",
     "email": "sam@sgratzl.com",
@@ -38,37 +38,41 @@
     "src/**/*.ts"
   ],
   "devDependencies": {
-    "@babel/core": "^7.20.2",
-    "@babel/preset-env": "^7.20.2",
-    "@rollup/plugin-babel": "^6.0.2",
-    "@rollup/plugin-commonjs": "^23.0.2",
-    "@rollup/plugin-node-resolve": "^15.0.1",
-    "@rollup/plugin-replace": "^5.0.1",
-    "@rollup/plugin-typescript": "^9.0.2",
-    "@types/jest": "^29.2.2",
-    "@typescript-eslint/eslint-plugin": "^5.42.1",
-    "@typescript-eslint/parser": "^5.42.1",
-    "@yarnpkg/sdks": "^2.6.3",
-    "eslint": "^8.27.0",
-    "eslint-config-airbnb-typescript": "^17.0.0",
-    "eslint-config-prettier": "^8.5.0",
+    "@babel/core": "^7.23.7",
+    "@babel/preset-env": "^7.23.8",
+    "@rollup/plugin-babel": "^6.0.4",
+    "@rollup/plugin-commonjs": "^25.0.7",
+    "@rollup/plugin-node-resolve": "^15.2.3",
+    "@rollup/plugin-replace": "^5.0.5",
+    "@rollup/plugin-typescript": "^11.1.6",
+    "@types/jest": "^29.5.11",
+    "@typescript-eslint/eslint-plugin": "^6.19.0",
+    "@typescript-eslint/parser": "^6.19.0",
+    "@yarnpkg/sdks": "^3.1.0",
+    "eslint": "^8.56.0",
+    "eslint-config-airbnb-typescript": "^17.1.0",
+    "eslint-config-prettier": "^9.1.0",
     "eslint-config-react-app": "^7.0.1",
     "eslint-plugin-flowtype": "^8.0.3",
-    "eslint-plugin-import": "^2.26.0",
-    "eslint-plugin-jsx-a11y": "^6.6.1",
-    "eslint-plugin-prettier": "^4.2.1",
-    "eslint-plugin-react": "^7.31.10",
+    "eslint-plugin-import": "^2.29.1",
+    "eslint-plugin-jsx-a11y": "^6.8.0",
+    "eslint-plugin-prettier": "^5.1.3",
+    "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
-    "jest": "^29.3.1",
-    "prettier": "^2.7.1",
-    "rimraf": "^3.0.2",
-    "rollup": "^3.2.5",
-    "rollup-plugin-dts": "^5.0.0",
+    "jest": "^29.7.0",
+    "prettier": "^3.2.4",
+    "rimraf": "^5.0.5",
+    "rollup": "^4.9.6",
+    "rollup-plugin-dts": "^6.1.0",
     "rollup-plugin-terser": "^7.0.2",
-    "ts-jest": "^29.0.3",
-    "tslib": "^2.4.1",
-    "typedoc": "^0.23.20",
-    "typescript": "^4.8.4"
+    "ts-jest": "^29.1.1",
+    "tslib": "^2.6.2",
+    "typedoc": "^0.25.7",
+    "typescript": "^5.3.3"
+  },
+  "resolutions": {
+    "@typescript-eslint/eslint-plugin": "^6.19.0",
+    "@typescript-eslint/parser": "^6.19.0"
   },
   "scripts": {
     "clean": "rimraf build docs node_modules \"*.tgz\" \"*.tsbuildinfo\" \"samples/*.js\" \"samples/*.map\"",
@@ -88,5 +92,5 @@
     "docs": "typedoc src/index.ts",
     "prepare": "yarn run build"
   },
-  "packageManager": "yarn@3.2.4"
+  "packageManager": "yarn@4.0.2"
 }
diff --git a/samples/bench.html b/samples/bench.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en" style="height: 100%; margin: 0">
   <head>
     <title>Bubblesets - Benchmark</title>
diff --git a/samples/circles.html b/samples/circles.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <title>BubbleSets - Playground</title>
diff --git a/samples/cliques.html b/samples/cliques.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en" style="height: 100%; margin: 0">
   <head>
     <title>Bubblesets - Cliques</title>
diff --git a/samples/default.html b/samples/default.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <title>BubbleSets - Playground</title>
diff --git a/samples/default_esm.html b/samples/default_esm.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
   <head>
     <title>ESM Sample</title>
diff --git a/samples/sample.html b/samples/sample.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 <html lang="en">
   <head>
     <title>BubbleSets - Sample</title>
diff --git a/src/Intersection.ts b/src/Intersection.ts
@@ -9,7 +9,11 @@ export enum EState {
 }
 
 export class Intersection {
-  constructor(public readonly state: EState, public readonly x = 0, public readonly y = 0) {}
+  constructor(
+    public readonly state: EState,
+    public readonly x = 0,
+    public readonly y = 0
+  ) {}
 }
 
 export function intersectLineLine(la: ILine, lb: ILine) {
diff --git a/src/model/Circle.ts b/src/model/Circle.ts
@@ -2,7 +2,11 @@ import type { ICircle, IRectangle2 } from '../interfaces';
 import { ptsDistanceSq } from '../utils';
 
 export class Circle implements IRectangle2, ICircle {
-  constructor(public cx: number, public cy: number, public radius: number) {}
+  constructor(
+    public cx: number,
+    public cy: number,
+    public radius: number
+  ) {}
 
   get x() {
     return this.cx - this.radius;
diff --git a/src/model/Line.ts b/src/model/Line.ts
@@ -18,7 +18,12 @@ export function lineBoundingBox(line: ILine): IRectangle2 {
 }
 
 export class Line {
-  constructor(public x1: number, public y1: number, public x2: number, public y2: number) {}
+  constructor(
+    public x1: number,
+    public y1: number,
+    public x2: number,
+    public y2: number
+  ) {}
 
   equals(that: ILine) {
     return this.x1 === that.x1 && this.y1 === that.y1 && this.x2 === that.x2 && this.y2 === that.y2;
diff --git a/src/model/Rectangle.ts b/src/model/Rectangle.ts
@@ -3,7 +3,12 @@ import { ptsDistanceSq } from '../utils';
 import { outcode, OutCode } from '../Intersection';
 
 export class Rectangle implements IRectangle2, ICircle {
-  constructor(public x: number, public y: number, public width: number, public height: number) {}
+  constructor(
+    public x: number,
+    public y: number,
+    public width: number,
+    public height: number
+  ) {}
 
   get x2() {
     return this.x + this.width;
diff --git a/src/routing.ts b/src/routing.ts
@@ -8,7 +8,7 @@ import {
 } from './Intersection';
 import { Line } from './model/Line';
 import { doublePointsEqual, ptsDistanceSq } from './utils';
-import { IPoint, point, ICircle, IRectangle2 } from './interfaces';
+import { type IPoint, point, type ICircle, type IRectangle2 } from './interfaces';
 
 export function calculateVirtualEdges(
   items: ReadonlyArray<ICircle>,
@@ -176,24 +176,27 @@ function calculateClosestNeighbor(
   nonMembers: ReadonlyArray<IRectangle2>
 ) {
   let minLengthSq = Number.POSITIVE_INFINITY;
-  return visited.reduce((closestNeighbor, neighborItem) => {
-    const distanceSq = ptsDistanceSq(itemCenter.x, itemCenter.y, neighborItem.cx, neighborItem.cy);
-    if (distanceSq > minLengthSq) {
-      // the interference can only increase the distance so if already bigger, return
-      return closestNeighbor;
-    }
+  return visited.reduce(
+    (closestNeighbor, neighborItem) => {
+      const distanceSq = ptsDistanceSq(itemCenter.x, itemCenter.y, neighborItem.cx, neighborItem.cy);
+      if (distanceSq > minLengthSq) {
+        // the interference can only increase the distance so if already bigger, return
+        return closestNeighbor;
+      }
 
-    const directLine = new Line(itemCenter.x, itemCenter.y, neighborItem.cx, neighborItem.cy);
-    // augment distance by number of interfering items
-    const numberInterferenceItems = itemsCuttingLine(nonMembers, directLine);
+      const directLine = new Line(itemCenter.x, itemCenter.y, neighborItem.cx, neighborItem.cy);
+      // augment distance by number of interfering items
+      const numberInterferenceItems = itemsCuttingLine(nonMembers, directLine);
 
-    // TODO is there a better function to consider interference in nearest-neighbor checking? This is hacky
-    if (distanceSq * (numberInterferenceItems + 1) * (numberInterferenceItems + 1) < minLengthSq) {
-      closestNeighbor = neighborItem;
-      minLengthSq = distanceSq * (numberInterferenceItems + 1) * (numberInterferenceItems + 1);
-    }
-    return closestNeighbor;
-  }, null as ICircle | null);
+      // TODO is there a better function to consider interference in nearest-neighbor checking? This is hacky
+      if (distanceSq * (numberInterferenceItems + 1) * (numberInterferenceItems + 1) < minLengthSq) {
+        closestNeighbor = neighborItem;
+        minLengthSq = distanceSq * (numberInterferenceItems + 1) * (numberInterferenceItems + 1);
+      }
+      return closestNeighbor;
+    },
+    null as ICircle | null
+  );
 }
 
 function sortByDistanceToCentroid<T extends ICircle>(items: ReadonlyArray<T>) {
diff --git a/tsconfig.json b/tsconfig.json
@@ -8,7 +8,7 @@
     "sourceMap": true,
     "strict": true,
     "removeComments": true,
-    "importsNotUsedAsValues": "error",
+    "verbatimModuleSyntax": true,
     "experimentalDecorators": true,
     "forceConsistentCasingInFileNames": true,
     "strictBindCallApply": true,
@@ -26,8 +26,8 @@
     "noEmit": true,
     "paths": {
       "@": ["./src"],
-      "*": ["*", "node_modules/*"]
-    }
+      "*": ["*", "node_modules/*"],
+    },
   },
   "include": ["src/**/*.ts", "src/**/*.tsx"],
 
@@ -38,6 +38,6 @@
     "excludeExternals": true,
     "excludePrivate": true,
     "includeVersion": true,
-    "hideGenerator": true
-  }
+    "hideGenerator": true,
+  },
 }
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<!DOCTYPE html>`
	`1`	`+<!doctype html>`
`2`	`2`	`<html lang="en" style="height: 100%; margin: 0">`
`3`	`3`	`<head>`
`4`	`4`	`<title>Bubblesets - Benchmark</title>`