Merge pull request #10 from curran/modernize-distribution

Modernize Distribution

.gitignore

@@ -1,4 +1,5 @@
 node_modules
+dist
 *~
 #*
-
+*.swp

package.json

@@ -12,9 +12,11 @@
       "type": "git",
       "url": "http://github.com/jdfekete/reorder.js.git"
    },
-   "main": "./reorder.v1.js",
-   "unpkg": "reorder.v1.min.js",
-   "jsdelivr": "reorder.v1.min.js",
+   "unpkg": "dist/reorder.umd.js",
+   "jsdelivr": "dist/reorder.umd.js",
+   "main": "dist/reorder.cjs.js",
+   "module": "dist/reorder.esm.js",
+   "browser": "dist/reorder.umd.js",
    "types": "./reorder.d.ts",
    "author": [
       {
@@ -23,18 +25,23 @@
       }
    ],
    "scripts": {
-      "build": "make all",
-      "clean": "make clean",
+      "build": "rollup -c",
       "test": "vows --nocolor; echo"
    },
+   "files": [
+      "dist"
+   ],
    "dependencies": {
       "science": "1.9.2",
       "tiny-queue": "0.2.1"
    },
    "devDependencies": {
+      "@rollup/plugin-commonjs": "^17.0.0",
+      "@rollup/plugin-node-resolve": "^11.0.1",
       "jshint": "^2.9.7",
       "jsonfile": "2.0.0",
       "numeric": "1.2.6",
+      "rollup": "^2.35.1",
       "seedrandom": "2.3.11",
       "uglify-js": "3.4.9",
       "vows": "^0.8.2"

reorder.v1.js

@@ -1024,7 +1024,7 @@ function count_out_crossings(graph, v, w, inv) {
  * @param {list} layer2 - the ordered list of nodes in layer 2
  * @returns {list} a tuple containing the new layer1, layer2, and crossings count
  */
-function adjacent_exchange(graph, layer1, layer2) {
+export function adjacent_exchange(graph, layer1, layer2) {
     layer1 = layer1.slice();
     layer2 = layer2.slice();
     var i, v, w, c0, c1,
@@ -1069,8 +1069,6 @@ function adjacent_exchange(graph, layer1, layer2) {
 
     return [layer1, layer2, improved];
 }
-
-reorder.adjacent_exchange = adjacent_exchange;
 reorder.barycenter_order = function(graph, comps, max_iter) {
     var orders = [[], [], 0];
     // Compute the barycenter heuristic on each connected component
@@ -2285,9 +2283,6 @@ reorder.order = function() {
             if (list[i-1] >= list[i])
                 throw "Invalid list, indices not sorted";
         except = list.slice(0);
-        // except = list.sort(function(a,b) {
-        //     return a-b;
-        // });
         return order;
     };
 

rollup.config.js

@@ -0,0 +1,27 @@
+import resolve from "@rollup/plugin-node-resolve";
+import commonjs from "@rollup/plugin-commonjs";
+import pkg from "./package.json";
+
+export default [
+  {
+    input: "src/index.js",
+    output: {
+      name: "reorder",
+      file: pkg.browser,
+      format: "umd",
+    },
+    plugins: [
+      resolve(),
+      commonjs(),
+    ],
+  },
+  {
+    input: "src/index.js",
+    external: ["science"],
+    output: [
+      { file: pkg.main, format: "cjs" },
+      { file: pkg.module, format: "es" },
+    ],
+  },
+];
+

src/adjacent_exchange.js

@@ -1,3 +1,5 @@
+import { inverse_permutation } from './permutation';
+
 // Accorging to
 // E. R. Gansner, E. Koutsofios, S. C. North, and K.-P. Vo. 1993. A
 // Technique for Drawing Directed Graphs. IEEE Trans. Softw. Eng. 19, 3
@@ -46,7 +48,7 @@ function count_out_crossings(graph, v, w, inv) {
  * @param {list} layer2 - the ordered list of nodes in layer 2
  * @returns {list} a tuple containing the new layer1, layer2, and crossings count
  */
-function adjacent_exchange(graph, layer1, layer2) {
+export function adjacent_exchange(graph, layer1, layer2) {
     layer1 = layer1.slice();
     layer2 = layer2.slice();
     var i, v, w, c0, c1,
@@ -91,5 +93,3 @@ function adjacent_exchange(graph, layer1, layer2) {
 
     return [layer1, layer2, improved];
 }
-
-reorder.adjacent_exchange = adjacent_exchange;