Merge pull request #115 from lzear/lodash-es

Update `lodash` to `lodash-es`
lzear · Feb 27, 2024 · 6e9c4ca · 6e9c4ca
2 parents 4e1b432 + 63568c3
commit 6e9c4ca
Show file tree

Hide file tree

Showing 27 changed files with 1,248 additions and 2,716 deletions.
diff --git a/.changeset/strange-mirrors-wash.md b/.changeset/strange-mirrors-wash.md
@@ -0,0 +1,5 @@
+---
+"votes": major
+---
+
+Update `lodash` to `lodash-es`. Change the package to be ESM by default.
diff --git a/votes/package.json b/votes/package.json
@@ -1,11 +1,12 @@
 {
   "name": "votes",
+  "type": "module",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
   "exports": {
     ".": {
-      "require": "./dist/index.js",
-      "import": "./dist/index.mjs"
+      "require": "./dist/index.cjs",
+      "import": "./dist/index.js"
     }
   },
   "version": "2.2.2",
@@ -63,7 +64,7 @@
   },
   "dependencies": {
     "javascript-lp-solver": "0.4.15",
-    "lodash": "^4.17.21"
+    "lodash-es": "^4.17.21"
   },
   "peerDependencies": {
     "javascript-lp-solver": ">=0.4.0"

diff --git a/votes/src/classes/method.ts b/votes/src/classes/method.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import _ from 'lodash-es'
 
 import { scoresToRanking } from '../utils/scores'
 

diff --git a/votes/src/classes/random-matrix-method.ts b/votes/src/classes/random-matrix-method.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import _ from 'lodash-es'
 
 import type { Matrix, ScoreObject } from '../types'
 import { shuffleArray } from '../utils/shuffle-array'

diff --git a/votes/src/methods/baldwin/index.ts b/votes/src/methods/baldwin/index.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import _ from 'lodash-es'
 
 import { RoundBallotMethod } from '../../classes/round-ballot-method'
 import type { Ballot, ScoreObject } from '../../types'

diff --git a/votes/src/methods/biggest-support/index.ts b/votes/src/methods/biggest-support/index.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import _ from 'lodash-es'
 
 import { BallotMethod } from '../../classes/ballot-method'
 import type { Ballot } from '../../types'

diff --git a/votes/src/methods/bottom-two-runoff/index.ts b/votes/src/methods/bottom-two-runoff/index.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import _ from 'lodash-es'
 
 import { RoundBallotMethod } from '../../classes/round-ballot-method'
 import type { Ballot, ScoreObject } from '../../types'

diff --git a/votes/src/methods/coombs/index.ts b/votes/src/methods/coombs/index.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import _ from 'lodash-es'
 
 import { RoundBallotMethod } from '../../classes/round-ballot-method'
 import type { Ballot, ScoreObject } from '../../types'

diff --git a/votes/src/methods/copeland/index.ts b/votes/src/methods/copeland/index.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import _ from 'lodash-es'
 
 import { MatrixScoreMethod } from '../../classes/matrix-score-method'
 import type { Matrix, ScoreObject } from '../../types'

diff --git a/votes/src/methods/kemeny/index.ts b/votes/src/methods/kemeny/index.ts
@@ -1,5 +1,4 @@
-import range from 'lodash/range'
-import zipObject from 'lodash/zipObject'
+import { range, zipObject } from 'lodash-es'
 
 import { MatrixScoreMethod } from '../../classes/matrix-score-method'
 import type { Matrix, ScoreObject } from '../../types'

diff --git a/votes/src/methods/majority-judgment/index.ts b/votes/src/methods/majority-judgment/index.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import _ from 'lodash-es'
 
 import { BallotMethod } from '../../classes/ballot-method'
 import type { Ballot, ScoreObject } from '../../types'

diff --git a/votes/src/methods/maximal-lotteries/index.ts b/votes/src/methods/maximal-lotteries/index.ts
@@ -1,4 +1,4 @@
-import zipObject from 'lodash/zipObject'
+import { zipObject } from 'lodash-es'
 
 import { RandomMatrixMethod } from '../../classes/random-matrix-method'
 import { findNashEquilibrium } from '../../simplex/find-nash-equilibrium'

diff --git a/votes/src/methods/minimax-td/index.ts b/votes/src/methods/minimax-td/index.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import _ from 'lodash-es'
 
 import type { Matrix, ScoreObject } from '../../types'
 import { findSmithSet } from '../../utils/condorcet'

diff --git a/votes/src/methods/nanson/index.ts b/votes/src/methods/nanson/index.ts
@@ -1,5 +1,4 @@
-import _ from 'lodash'
-import sum from 'lodash/sum'
+import _ from 'lodash-es'
 
 import { RoundBallotMethod } from '../../classes/round-ballot-method'
 import type { Ballot, ScoreObject } from '../../types'
@@ -16,7 +15,7 @@ const round = (
   const borda = new Borda({ candidates, ballots })
   const bordaScores = borda.scores()
   const scores = Object.values(bordaScores)
-  const avg = sum(scores) / scores.length
+  const avg = _.sum(scores) / scores.length
   const eliminated = candidates.filter((c) => bordaScores[c] <= avg)
   const qualified = _.difference(candidates, eliminated)
   return { eliminated, qualified, scores: bordaScores }

diff --git a/votes/src/methods/random-candidates/index.ts b/votes/src/methods/random-candidates/index.ts
@@ -1,4 +1,4 @@
-import zipObject from 'lodash/zipObject'
+import { zipObject } from 'lodash-es'
 
 import { RandomMethod } from '../../classes/random-method'
 import type { ScoreObject } from '../../types'

diff --git a/votes/src/methods/ranked-pairs/generate-acyclic-graph.ts b/votes/src/methods/ranked-pairs/generate-acyclic-graph.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import _ from 'lodash-es'
 
 import { Tarjan } from './tarjan'
 import { Vertex } from './vertex'

diff --git a/votes/src/methods/ranked-pairs/index.ts b/votes/src/methods/ranked-pairs/index.ts
@@ -1,6 +1,4 @@
-import groupBy from 'lodash/groupBy'
-import range from 'lodash/range'
-import zipObject from 'lodash/zipObject'
+import { groupBy, range, zipObject } from 'lodash-es'
 
 import { MatrixScoreMethod } from '../../classes/matrix-score-method'
 import type { Matrix, ScoreObject } from '../../types'

diff --git a/votes/src/methods/schulze/index.ts b/votes/src/methods/schulze/index.ts
@@ -1,4 +1,4 @@
-import range from 'lodash/range'
+import { range } from 'lodash-es'
 
 import { MatrixScoreMethod } from '../../classes/matrix-score-method'
 import type { Matrix, ScoreObject } from '../../types'

diff --git a/votes/src/methods/two-round-runoff/index.ts b/votes/src/methods/two-round-runoff/index.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import _ from 'lodash-es'
 
 import { RoundBallotMethod } from '../../classes/round-ballot-method'
 import type { ScoreObject } from '../../types'

diff --git a/votes/src/test/matrix.ts b/votes/src/test/matrix.ts
@@ -1,4 +1,4 @@
-import range from 'lodash/range'
+import { range } from 'lodash-es'
 
 export const product = (a: number[][], b: number[][]): number[][] => {
   const dimA = [a.length, a[0].length]

diff --git a/votes/src/test/test-utils.ts b/votes/src/test/test-utils.ts
@@ -1,4 +1,4 @@
-import fill from 'lodash/fill'
+import { fill } from 'lodash-es'
 
 import type { Ballot } from '../types'
 import { toWeightedBallots } from '../utils'

diff --git a/votes/src/utils/condorcet.ts b/votes/src/utils/condorcet.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import _ from 'lodash-es'
 
 import type { Matrix } from '../types'
 

diff --git a/votes/src/utils/make-matrix.ts b/votes/src/utils/make-matrix.ts
@@ -1,6 +1,4 @@
-import difference from 'lodash/difference'
-import range from 'lodash/range'
-import times from 'lodash/times'
+import { difference, range, times } from 'lodash-es'
 
 import type { Ballot, Matrix } from '../types'
 

diff --git a/votes/src/utils/normalize.ts b/votes/src/utils/normalize.ts
@@ -1,4 +1,4 @@
-import _ from 'lodash'
+import _ from 'lodash-es'
 
 import type { Ballot } from '../types'
 

diff --git a/votes/src/utils/scores-zero.ts b/votes/src/utils/scores-zero.ts
@@ -1,4 +1,4 @@
-import zipObject from 'lodash/zipObject'
+import { zipObject } from 'lodash-es'
 
 import type { ScoreObject } from '../types'
 

diff --git a/votes/src/utils/scores.ts b/votes/src/utils/scores.ts
@@ -1,6 +1,4 @@
-import groupBy from 'lodash/groupBy'
-import sortBy from 'lodash/sortBy'
-import toPairs from 'lodash/toPairs'
+import { groupBy, sortBy, toPairs } from 'lodash-es'
 
 export const scoresToRanking = (scores: {
   [candidate: string]: number