Merge pull request #20 from mAAdhaTTah/fix-peer-dep-order

Fix ordering when rearranging

.travis.yml

@@ -3,4 +3,3 @@ node_js:
   - 6
   - 8
   - 10
-  - stable

src/getComponents.js

@@ -33,6 +33,28 @@ const getName = (type, name) => {
 const getRequire = (type, name) => config[type][name].require;
 const getPeers = (type, name) => config[type][name].peerDependencies;
 const getNoCSS = (type, name) => config[type][name].noCSS;
+const makeArray = element =>
+    // eslint-disable-next-line eqeqeq
+    element != null && !Array.isArray(element)
+        ? [element]
+        : element;
+const getAllDeps = (type, name) => {
+    const requires = makeArray(getRequire(type, name));
+    const peers = makeArray(getPeers(type, name));
+    if (requires && peers) {
+        return [...requires, ...peers];
+    }
+
+    if (requires) {
+        return requires;
+    }
+
+    if (peers) {
+        return peers;
+    }
+
+    return [];
+};
 
 const getTheme = theme => {
     if (theme === 'default') {
@@ -49,11 +71,7 @@ const getDependencies = (type) => function getDependencies(deps, newDeps) {
         return deps;
     }
 
-    if (!Array.isArray(newDeps)) {
-        newDeps = [newDeps];
-    }
-
-    deps = newDeps.reduce((deps, dep) => {
+    deps = makeArray(newDeps).reduce((deps, dep) => {
         dep = getName(type, dep);
         deps = getDependencies(deps, getRequire(type, dep));
 
@@ -65,17 +83,18 @@ const getDependencies = (type) => function getDependencies(deps, newDeps) {
     }, deps);
 
     if (type === 'languages') {
-        deps.sort((a, b) => {
-            const aPeers = getPeers(type, a);
-            const bPeers = getPeers(type, b);
+        deps.sort((b, a) => {
+            const aPeers = getAllDeps(type, a);
+            const bPeers = getAllDeps(type, b);
 
             if (aPeers && aPeers.includes(b)) {
-                return 1;
+                return -1;
             }
 
             if (bPeers && bPeers.includes(a)) {
-                return -1;
+                return 1;
             }
+
             return 0;
         });
     }

test/fixtures/issue-19/expected.js

@@ -0,0 +1,12 @@
+import Prism from "prismjs/components/prism-core";
+import "prismjs/components/prism-clike";
+import "prismjs/components/prism-swift";
+import "prismjs/components/prism-c";
+import "prismjs/components/prism-cpp";
+import "prismjs/components/prism-go";
+import "prismjs/components/prism-bash";
+import "prismjs/components/prism-javascript";
+import "prismjs/components/prism-json";
+import "prismjs/components/prism-kotlin";
+import "prismjs/components/prism-objectivec";
+import "prismjs/components/prism-java";

test/fixtures/issue-19/options.json

@@ -0,0 +1,15 @@
+{
+  "languages": [
+    "clike",
+    "bash",
+    "cpp",
+    "go",
+    "java",
+    "javascript",
+    "json",
+    "kotlin",
+    "shell",
+    "objectivec",
+    "swift"
+  ]
+}