💥 refactor!: Only use named exports and test build.

make-github-pseudonymous-again · make-github-pseudonymous-again · commit 80a484bc9587 · 2024-02-25T17:42:33.000+01:00
BREAKING CHANGE: Default exports are not available anymore.
diff --git a/README.md b/README.md
@@ -6,12 +6,12 @@ Parent is [js-algorithms](https://github.com/make-github-pseudonymous-again/js-a
 See [docs](https://graph-algorithm.github.io/maximum-matching/index.html).
 
 ```js
-import maximumMatching, {iter} from '@graph-algorithm/maximum-matching';
+import {iter, weight as maximumMatching} from '@graph-algorithm/maximum-matching';
 const edges = [[1, 2, 10], [2, 3, 11]] ;
 const matching = maximumMatching(edges) ; // [-1, -1, 3, 2]
 [...iter(matching)]; // [ [2, 3] ]
 
-import maximumCardinalityMatching from '@graph-algorithm/maximum-matching/cardinality';
+import {opt as maximumCardinalityMatching} from '@graph-algorithm/maximum-matching/cardinality/index.js';
 for (const edge of iter(maximumCardinalityMatching([[1, 2], [2, 3], [3, 4]]))) {
 	console.log(edge);
 }
diff --git a/package.json b/package.json
@@ -88,7 +88,7 @@
     "@node-loader/core": "2.0.0",
     "@node-loader/import-maps": "1.1.0",
     "ava": "6.1.1",
-    "babel-plugin-replace-import-extension": "^1.1.4",
+    "babel-plugin-replace-import-extension": "1.1.4",
     "babel-plugin-transform-remove-console": "6.9.4",
     "babel-plugin-unassert": "3.2.0",
     "babel-preset-minify": "0.5.2",
diff --git a/src/addDefaultWeight.js b/src/addDefaultWeight.js
@@ -1,2 +1,2 @@
-const addDefaultWeight = (edges) => edges.map(([u, v, w]) => [u, v, w || 1]);
-export default addDefaultWeight;
+export const addDefaultWeight = (edges) =>
+	edges.map(([u, v, w]) => [u, v, w || 1]);
diff --git a/src/cardinality/approx/bipartite.js b/src/cardinality/approx/bipartite.js
@@ -1 +1 @@
-export {default} from './general.js';
+export {general as bipartite} from './general.js';
diff --git a/src/cardinality/approx/general.js b/src/cardinality/approx/general.js
@@ -1,4 +1,3 @@
-import general from '../opt/general.js';
+import {general as generalOpt} from '../opt/general.js';
 
-const generalApprox = (edges, _eps) => general(edges);
-export default generalApprox;
+export const general = (edges, _eps) => generalOpt(edges);
diff --git a/src/cardinality/approx/index.js b/src/cardinality/approx/index.js
@@ -1,2 +1,2 @@
-export {default as bipartite} from './bipartite.js';
-export {default, default as general} from './general.js';
+export {bipartite} from './bipartite.js';
+export {general} from './general.js';
diff --git a/src/cardinality/index.js b/src/cardinality/index.js
@@ -1,2 +1,2 @@
-export {default as approx} from './approx/index.js';
-export {default, default as opt} from './opt/index.js';
+export {general as approx} from './approx/index.js';
+export {general as opt} from './opt/index.js';
diff --git a/src/cardinality/opt/bipartite.js b/src/cardinality/opt/bipartite.js
@@ -1 +1 @@
-export {default} from './general.js';
+export {general as bipartite} from './general.js';
diff --git a/src/cardinality/opt/general.js b/src/cardinality/opt/general.js
@@ -1,6 +1,5 @@
-import addDefaultWeight from '../../addDefaultWeight.js';
-import blossomNoChecks from '../../core/blossomNoChecks.js';
+import {addDefaultWeight} from '../../addDefaultWeight.js';
+import {blossomNoChecks} from '../../core/blossomNoChecks.js';
 
-const general = (edges) => blossomNoChecks(addDefaultWeight(edges), true);
-
-export default general;
+export const general = (edges) =>
+	blossomNoChecks(addDefaultWeight(edges), true);
diff --git a/src/cardinality/opt/index.js b/src/cardinality/opt/index.js
@@ -1,2 +1,2 @@
-export {default as bipartite} from './bipartite.js';
-export {default, default as general} from './general.js';
+export {bipartite} from './bipartite.js';
+export {general} from './general.js';
diff --git a/src/core/blossom/blossom.js b/src/core/blossom/blossom.js
@@ -1,15 +1,15 @@
 import assert from 'assert';
 
-import blossomEdges from './blossomEdges.js';
-import blossomLeaves from './blossomLeaves.js';
-import checkDelta2 from './checkDelta2.js';
-import checkDelta3 from './checkDelta3.js';
-import endpoints from './endpoints.js';
-import min from './min.js';
-import neighbours from './neighbours.js';
-import rotate from './rotate.js';
-import statistics from './statistics.js';
-import verifyOptimum from './verifyOptimum.js';
+import {blossomEdges} from './blossomEdges.js';
+import {blossomLeaves} from './blossomLeaves.js';
+import {checkDelta2} from './checkDelta2.js';
+import {checkDelta3} from './checkDelta3.js';
+import {endpoints} from './endpoints.js';
+import {min} from './min.js';
+import {neighbours} from './neighbours.js';
+import {rotate} from './rotate.js';
+import {statistics} from './statistics.js';
+import {verifyOptimum} from './verifyOptimum.js';
 
 // Adapted from http://jorisvr.nl/maximummatching.html
 // All credit for the implementation goes to Joris van Rantwijk [http://jorisvr.nl].
@@ -29,7 +29,7 @@ import verifyOptimum from './verifyOptimum.js';
 // A C program for maximum weight matching by Ed Rothberg was used extensively
 // to validate this new code.
 
-export default function blossom(CHECK_OPTIMUM, CHECK_DELTA) {
+export function blossom(CHECK_OPTIMUM, CHECK_DELTA) {
 	// Check delta2/delta3 computation after every substage;
 	// only works on integer weights, slows down the algorithm to O(n^4).
 	if (CHECK_DELTA === undefined) CHECK_DELTA = false;
diff --git a/src/core/blossom/blossomEdges.js b/src/core/blossom/blossomEdges.js
@@ -1,6 +1,6 @@
-import blossomLeaves from './blossomLeaves.js';
+import {blossomLeaves} from './blossomLeaves.js';
 
-export default function* blossomEdges(nvertex, blossomchilds, neighbend, bv) {
+export function* blossomEdges(nvertex, blossomchilds, neighbend, bv) {
 	for (const v of blossomLeaves(nvertex, blossomchilds, bv)) {
 		for (const p of neighbend[v]) yield Math.floor(p / 2);
 	}
diff --git a/src/core/blossom/blossomLeaves.js b/src/core/blossom/blossomLeaves.js
@@ -1,7 +1,7 @@
 /**
  * Generate the leaf vertices of a blossom via depth-first search.
  */
-export default function* blossomLeaves(nvertex, nodes, b) {
+export function* blossomLeaves(nvertex, nodes, b) {
 	if (b < nvertex) yield b;
 	else yield* _blossomLeavesDFS(nvertex, nodes, nodes[b].slice());
 }
diff --git a/src/core/blossom/checkDelta2.js b/src/core/blossom/checkDelta2.js
@@ -1,7 +1,7 @@
 import assert from 'assert';
 
 // Check optimized delta2 against a trivial computation.
-const checkDelta2 = ({
+export const checkDelta2 = ({
 	nvertex,
 	neighbend,
 	label,
@@ -52,5 +52,3 @@ const checkDelta2 = ({
 		}
 	}
 };
-
-export default checkDelta2;
diff --git a/src/core/blossom/checkDelta3.js b/src/core/blossom/checkDelta3.js
@@ -1,9 +1,9 @@
 import assert from 'assert';
 
-import blossomLeaves from './blossomLeaves.js';
+import {blossomLeaves} from './blossomLeaves.js';
 
 // Check optimized delta3 against a trivial computation.
-const checkDelta3 = ({
+export const checkDelta3 = ({
 	nvertex,
 	edges,
 	blossomparent,
@@ -54,5 +54,3 @@ const checkDelta3 = ({
 		console.debug('bk=' + bk + ' tbk=' + tbk + ' bd=' + bd + ' tbd=' + tbd);
 	assert(bd === tbd);
 };
-
-export default checkDelta3;
diff --git a/src/core/blossom/endpoints.js b/src/core/blossom/endpoints.js
@@ -1,10 +1,8 @@
-const endpoints = (nedge, edges) => {
+export const endpoints = (nedge, edges) => {
 	const endpoint = [];
 	for (let p = 0; p < nedge; ++p) {
 		endpoint.push(edges[p][0], edges[p][1]);
 	}
 
 	return endpoint;
 };
-
-export default endpoints;
diff --git a/src/core/blossom/index.js b/src/core/blossom/index.js
@@ -1,6 +1,6 @@
-export {default as checkDelta2} from './checkDelta2.js';
-export {default as checkDelta3} from './checkDelta3.js';
-export {default as rotate} from './rotate.js';
-export {default as min} from './min.js';
-export {default, default as blossom} from './blossom.js';
-export {default as verifyOptimum} from './verifyOptimum.js';
+export {checkDelta2} from './checkDelta2.js';
+export {checkDelta3} from './checkDelta3.js';
+export {rotate} from './rotate.js';
+export {min} from './min.js';
+export {blossom} from './blossom.js';
+export {verifyOptimum} from './verifyOptimum.js';
diff --git a/src/core/blossom/min.js b/src/core/blossom/min.js
@@ -1,7 +1,5 @@
-const min = (a, i, j) => {
+export const min = (a, i, j) => {
 	let o = a[i];
 	for (++i; i < j; ++i) if (a[i] < o) o = a[i];
 	return o;
 };
-
-export default min;
diff --git a/src/core/blossom/neighbours.js b/src/core/blossom/neighbours.js
@@ -1,4 +1,4 @@
-const neighbours = (nvertex, nedge, edges) => {
+export const neighbours = (nvertex, nedge, edges) => {
 	const neighbend = [];
 
 	for (let i = 0; i < nvertex; ++i) neighbend.push([]);
@@ -12,5 +12,3 @@ const neighbours = (nvertex, nedge, edges) => {
 
 	return neighbend;
 };
-
-export default neighbours;
diff --git a/src/core/blossom/rotate.js b/src/core/blossom/rotate.js
@@ -1,8 +1,6 @@
-const rotate = (a, n) => {
+export const rotate = (a, n) => {
 	const head = a.splice(0, n);
 	for (let i = 0; i < n; ++i) {
 		a.push(head[i]);
 	}
 };
-
-export default rotate;
diff --git a/src/core/blossom/statistics.js b/src/core/blossom/statistics.js
@@ -1,6 +1,6 @@
 import assert from 'assert';
 
-const statistics = (edges) => {
+export const statistics = (edges) => {
 	const nedge = edges.length;
 	let nvertex = 0;
 	let maxweight = 0;
@@ -20,5 +20,3 @@ const statistics = (edges) => {
 
 	return [nvertex, nedge, maxweight];
 };
-
-export default statistics;
diff --git a/src/core/blossom/verifyOptimum.js b/src/core/blossom/verifyOptimum.js
@@ -1,9 +1,9 @@
 import assert from 'assert';
 
-import min from './min.js';
+import {min} from './min.js';
 
 // Verify that the optimum solution has been reached.
-const verifyOptimum = ({
+export const verifyOptimum = ({
 	nvertex,
 	edges,
 	maxCardinality,
@@ -80,5 +80,3 @@ const verifyOptimum = ({
 	}
 	// Ok.
 };
-
-export default verifyOptimum;
diff --git a/src/core/blossomNoChecks.js b/src/core/blossomNoChecks.js
@@ -1,5 +1,3 @@
-import blossom from './blossom/index.js';
+import {blossom} from './blossom/index.js';
 
-const blossomNoChecks = blossom(false, false);
-
-export default blossomNoChecks;
+export const blossomNoChecks = blossom(false, false);
diff --git a/src/core/index.js b/src/core/index.js
@@ -1,11 +1,2 @@
-import blossom from './blossom/index.js';
-import blossomNoChecks from './blossomNoChecks.js';
-
-/* eslint import/no-anonymous-default-export: [2, {"allowObject": true}] */
-export default {
-	blossom,
-	blossomNoChecks,
-};
-
-export {default as blossom} from './blossom/index.js';
-export {default as blossomNoChecks} from './blossomNoChecks.js';
+export {blossom} from './blossom/index.js';
+export {blossomNoChecks} from './blossomNoChecks.js';
diff --git a/src/index.js b/src/index.js
@@ -1,5 +1,4 @@
-export {default as cardinality} from './cardinality/index.js';
-export {default as iter} from './iter.js';
-export {default as core} from './core/index.js';
-export {default as addDefaultWeight} from './addDefaultWeight.js';
-export {default as weight, default} from './weight/index.js';
+export {addDefaultWeight} from './addDefaultWeight.js';
+export {iter} from './iter.js';
+export {opt as cardinality} from './cardinality/index.js';
+export {opt as weight} from './weight/index.js';
diff --git a/src/iter.js b/src/iter.js
@@ -1,4 +1,4 @@
-export default function* iter(matching) {
+export function* iter(matching) {
 	let i = 0;
 	for (const j of matching) {
 		// This takes care of j === -1
diff --git a/src/weight/approx/bipartite.js b/src/weight/approx/bipartite.js
@@ -1 +1 @@
-export {default} from './general.js';
+export {general as bipartite} from './general.js';
diff --git a/src/weight/approx/general.js b/src/weight/approx/general.js
@@ -1,4 +1,3 @@
-import general from '../opt/general.js';
+import {general as generalOpt} from '../opt/general.js';
 
-const generalApprox = (edges, _eps) => general(edges);
-export default generalApprox;
+export const general = (edges, _eps) => generalOpt(edges);
diff --git a/src/weight/approx/index.js b/src/weight/approx/index.js
@@ -1,2 +1,2 @@
-export {default as bipartite} from './bipartite.js';
-export {default, default as general} from './general.js';
+export {bipartite} from './bipartite.js';
+export {general} from './general.js';
diff --git a/src/weight/index.js b/src/weight/index.js
@@ -1,2 +1,2 @@
-export {default as approx} from './approx/index.js';
-export {default, default as opt} from './opt/index.js';
+export {general as approx} from './approx/index.js';
+export {general as opt} from './opt/index.js';
diff --git a/src/weight/opt/bipartite.js b/src/weight/opt/bipartite.js
@@ -1 +1 @@
-export {default} from './general.js';
+export {general as bipartite} from './general.js';
diff --git a/src/weight/opt/general.js b/src/weight/opt/general.js
@@ -1,5 +1,3 @@
-import blossomNoChecks from '../../core/blossomNoChecks.js';
+import {blossomNoChecks} from '../../core/blossomNoChecks.js';
 
-const general = (edges) => blossomNoChecks(edges);
-
-export default general;
+export const general = (edges) => blossomNoChecks(edges);
diff --git a/src/weight/opt/index.js b/src/weight/opt/index.js
@@ -1,2 +1,2 @@
-export {default as bipartite} from './bipartite.js';
-export {default, default as general} from './general.js';
+export {bipartite} from './bipartite.js';
+export {general} from './general.js';
diff --git a/test/src/cardinality.js b/test/src/cardinality.js
@@ -2,11 +2,11 @@ import test from 'ava';
 
 import {enumerate} from '@iterable-iterator/zip';
 
-import maximumCardinalityMatching from '../../src/cardinality/index.js';
-import blossom from '../../src/core/blossom/index.js';
-
 import {addDefaultWeight} from '#module';
 
+import {opt as maximumCardinalityMatching} from '#module/cardinality/index.js';
+import {blossom} from '#module/core/blossom/index.js';
+
 const macro = (t, algorithm, edges, expected) => {
 	const input = edges.map((edge) => edge.slice()); // Deepcopy
 	const result = algorithm(edges);
diff --git a/test/src/readme.js b/test/src/readme.js
@@ -1,8 +1,8 @@
 import test from 'ava';
 
-import maximumCardinalityMatching from '../../src/cardinality/index.js';
+import {iter, weight as maximumMatching} from '#module';
 
-import maximumMatching, {iter} from '#module';
+import {opt as maximumCardinalityMatching} from '#module/cardinality/index.js';
 
 test('weight', (t) => {
 	const edges = [
diff --git a/test/src/weight.js b/test/src/weight.js
@@ -2,9 +2,9 @@ import test from 'ava';
 
 import {enumerate} from '@iterable-iterator/zip';
 
-import blossom from '../../src/core/blossom/index.js';
+import {weight as maximumMatching} from '#module';
 
-import maximumMatching from '#module';
+import {blossom} from '#module/core/blossom/index.js';
 
 const macro = (t, algorithm, edges, expected) => {
 	const input = edges.map((edge) => edge.slice()); // Deepcopy
diff --git a/yarn.lock b/yarn.lock
@@ -2602,7 +2602,7 @@ babel-plugin-polyfill-regenerator@^0.5.5:
   dependencies:
     "@babel/helper-define-polyfill-provider" "^0.5.0"
 
-babel-plugin-replace-import-extension@^1.1.4:
+babel-plugin-replace-import-extension@1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/babel-plugin-replace-import-extension/-/babel-plugin-replace-import-extension-1.1.4.tgz#bfe96afd8363e47b9512086bfc0953e0493f4427"
   integrity sha512-UJi5YV31JxoaHHxhytRhQqOQN3+ZsaoXVia7e58yc35pe4tNjNr7BdznnDvIPbEG/4u5kf+lLDk9peaxsOPxGw==

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-export {default} from './general.js';`
	`1`	`+export {general as bipartite} from './general.js';`