@papaemmelab/isabl-web 0.3.0 → 0.3.2

package/node_modules_old/topo/lib/index.js

@@ -0,0 +1,229 @@
+'use strict';
+
+// Load modules
+
+const Hoek = require('hoek');
+
+
+// Declare internals
+
+const internals = {};
+
+
+exports = module.exports = internals.Topo = function () {
+
+    this._items = [];
+    this.nodes = [];
+};
+
+
+internals.Topo.prototype.add = function (nodes, options) {
+
+    options = options || {};
+
+    // Validate rules
+
+    const before = [].concat(options.before || []);
+    const after = [].concat(options.after || []);
+    const group = options.group || '?';
+    const sort = options.sort || 0;                   // Used for merging only
+
+    Hoek.assert(before.indexOf(group) === -1, 'Item cannot come before itself:', group);
+    Hoek.assert(before.indexOf('?') === -1, 'Item cannot come before unassociated items');
+    Hoek.assert(after.indexOf(group) === -1, 'Item cannot come after itself:', group);
+    Hoek.assert(after.indexOf('?') === -1, 'Item cannot come after unassociated items');
+
+    ([].concat(nodes)).forEach((node, i) => {
+
+        const item = {
+            seq: this._items.length,
+            sort: sort,
+            before: before,
+            after: after,
+            group: group,
+            node: node
+        };
+
+        this._items.push(item);
+    });
+
+    // Insert event
+
+    const error = this._sort();
+    Hoek.assert(!error, 'item', (group !== '?' ? 'added into group ' + group : ''), 'created a dependencies error');
+
+    return this.nodes;
+};
+
+
+internals.Topo.prototype.merge = function (others) {
+
+    others = [].concat(others);
+    for (let i = 0; i < others.length; ++i) {
+        const other = others[i];
+        if (other) {
+            for (let j = 0; j < other._items.length; ++j) {
+                const item = Hoek.shallow(other._items[j]);
+                this._items.push(item);
+            }
+        }
+    }
+
+    // Sort items
+
+    this._items.sort(internals.mergeSort);
+    for (let i = 0; i < this._items.length; ++i) {
+        this._items[i].seq = i;
+    }
+
+    const error = this._sort();
+    Hoek.assert(!error, 'merge created a dependencies error');
+
+    return this.nodes;
+};
+
+
+internals.mergeSort = function (a, b) {
+
+    return a.sort === b.sort ? 0 : (a.sort < b.sort ? -1 : 1);
+};
+
+
+internals.Topo.prototype._sort = function () {
+
+    // Construct graph
+
+    const graph = {};
+    const graphAfters = Object.create(null); // A prototype can bungle lookups w/ false positives
+    const groups = Object.create(null);
+
+    for (let i = 0; i < this._items.length; ++i) {
+        const item = this._items[i];
+        const seq = item.seq;                         // Unique across all items
+        const group = item.group;
+
+        // Determine Groups
+
+        groups[group] = groups[group] || [];
+        groups[group].push(seq);
+
+        // Build intermediary graph using 'before'
+
+        graph[seq] = item.before;
+
+        // Build second intermediary graph with 'after'
+
+        const after = item.after;
+        for (let j = 0; j < after.length; ++j) {
+            graphAfters[after[j]] = (graphAfters[after[j]] || []).concat(seq);
+        }
+    }
+
+    // Expand intermediary graph
+
+    let graphNodes = Object.keys(graph);
+    for (let i = 0; i < graphNodes.length; ++i) {
+        const node = graphNodes[i];
+        const expandedGroups = [];
+
+        const graphNodeItems = Object.keys(graph[node]);
+        for (let j = 0; j < graphNodeItems.length; ++j) {
+            const group = graph[node][graphNodeItems[j]];
+            groups[group] = groups[group] || [];
+
+            for (let k = 0; k < groups[group].length; ++k) {
+                expandedGroups.push(groups[group][k]);
+            }
+        }
+        graph[node] = expandedGroups;
+    }
+
+    // Merge intermediary graph using graphAfters into final graph
+
+    const afterNodes = Object.keys(graphAfters);
+    for (let i = 0; i < afterNodes.length; ++i) {
+        const group = afterNodes[i];
+
+        if (groups[group]) {
+            for (let j = 0; j < groups[group].length; ++j) {
+                const node = groups[group][j];
+                graph[node] = graph[node].concat(graphAfters[group]);
+            }
+        }
+    }
+
+    // Compile ancestors
+
+    let children;
+    const ancestors = {};
+    graphNodes = Object.keys(graph);
+    for (let i = 0; i < graphNodes.length; ++i) {
+        const node = graphNodes[i];
+        children = graph[node];
+
+        for (let j = 0; j < children.length; ++j) {
+            ancestors[children[j]] = (ancestors[children[j]] || []).concat(node);
+        }
+    }
+
+    // Topo sort
+
+    const visited = {};
+    const sorted = [];
+
+    for (let i = 0; i < this._items.length; ++i) {
+        let next = i;
+
+        if (ancestors[i]) {
+            next = null;
+            for (let j = 0; j < this._items.length; ++j) {
+                if (visited[j] === true) {
+                    continue;
+                }
+
+                if (!ancestors[j]) {
+                    ancestors[j] = [];
+                }
+
+                const shouldSeeCount = ancestors[j].length;
+                let seenCount = 0;
+                for (let k = 0; k < shouldSeeCount; ++k) {
+                    if (sorted.indexOf(ancestors[j][k]) >= 0) {
+                        ++seenCount;
+                    }
+                }
+
+                if (seenCount === shouldSeeCount) {
+                    next = j;
+                    break;
+                }
+            }
+        }
+
+        if (next !== null) {
+            next = next.toString();         // Normalize to string TODO: replace with seq
+            visited[next] = true;
+            sorted.push(next);
+        }
+    }
+
+    if (sorted.length !== this._items.length) {
+        return new Error('Invalid dependencies');
+    }
+
+    const seqIndex = {};
+    for (let i = 0; i < this._items.length; ++i) {
+        const item = this._items[i];
+        seqIndex[item.seq] = item;
+    }
+
+    const sortedNodes = [];
+    this._items = sorted.map((value) => {
+
+        const sortedItem = seqIndex[value];
+        sortedNodes.push(sortedItem.node);
+        return sortedItem;
+    });
+
+    this.nodes = sortedNodes;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@papaemmelab/isabl-web",
-  "version": "0.3.0",
+  "version": "0.3.2",
   "scripts": {
     "serve": "vue-cli-service serve",
     "lint": "vue-cli-service lint",
@@ -9,20 +9,16 @@
     "build-wc-async": "vue-cli-service build --target wc-async --name isabl-web ./src/components/*.vue",
     "publish-app": "yarn build-lib && yarn version --patch && yarn build-lib && yarn publish --access public",
     "dev": "yarn build-lib --watch",
-    "postuninstall": "electron-builder install-app-deps",
     "test:unit": "vue-cli-service test:unit",
     "test:e2e": "vue-cli-service test:e2e",
     "test:travis": "yarn test:e2e --headless",
     "test:submissions": "node tests/utils/create_test_submission.js",
     "test:report-coverage": "nyc report --reporter=text-lcov > coverage.lcov && codecov -t $CODECOV_TOKEN",
-    "electron:build": "vue-cli-service electron:build",
-    "electron:serve": "vue-cli-service electron:serve",
-    "electron:generate-icons": "electron-icon-builder --input=./public/icon.png --output=build --flatten",
-    "postinstall": "electron-builder install-app-deps",
     "demo": "nodemon demo/demo-app.js"
   },
   "dependencies": {
-    "ansi_up": "4.0.4",
+    "@mdi/font": "^7.0.96",
+    "ansi_up": "^5",
     "axios": "^0.21.1",
     "crossfilter": "^1.3.12",
     "crossfilter2": "^1.4.7",
@@ -40,7 +36,7 @@
     "vue-observe-visibility": "^0.4.6",
     "vue-router": "^3.0.1",
     "vue-upload-component": "^2.8.11",
-    "vuetify": "1.1.9",
+    "vuetify": "2.6.10",
     "vuex": "^3.0.1",
     "vuex-router-sync": "^5.0.0"
   },
@@ -59,16 +55,14 @@
     "babel-jest": "^23.0.1",
     "babel-plugin-istanbul": "^5.2.0",
     "codecov": "^3.6.1",
-    "electron": "^4.0.0",
-    "electron-icon-builder": "^1.0.0",
+    "eslint-plugin-vuetify": "^1.1.0",
     "express": "^4.16.3",
     "html-webpack-plugin": "^3.2.0",
     "istanbul-lib-coverage": "^2.0.5",
     "mini-css-extract-plugin": "^0.4.2",
-    "node-sass": "^4.9.0",
     "nyc": "^14.1.1",
+    "sass": "^1.55.0",
     "sass-loader": "^7.0.1",
-    "vue-cli-plugin-electron-builder": "^1.2.0",
     "vue-template-compiler": "^2.5.16",
     "xlsx-populate": "^1.19.1"
   },