Remove nested function in topological sort

steelbreeze · Jul 12, 2018 · 5231311 · 5231311
1 parent 6cfee75
commit 5231311
Show file tree

Hide file tree

Showing 9 changed files with 45 additions and 35 deletions.
diff --git a/lib/node/index.d.ts b/lib/node/index.d.ts
@@ -5,7 +5,7 @@
  *
  * @copyright (c) 2017-8 David Mesquita-Morris
  *
- * Licensed under the MIT and GPL v3 licences
+ * Licensed under the MIT licence
  */
 export { Tree } from "./tree";
 export { Sort } from "./sort";
diff --git a/lib/node/index.js b/lib/node/index.js
@@ -6,7 +6,7 @@
  *
  * @copyright (c) 2017-8 David Mesquita-Morris
  *
- * Licensed under the MIT and GPL v3 licences
+ * Licensed under the MIT licence
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 // pull in the tree algorithms

diff --git a/lib/node/sort.d.ts b/lib/node/sort.d.ts
@@ -5,7 +5,7 @@
  *
  * @copyright (c) 2018 David Mesquita-Morris
  *
- * Licensed under the MIT and GPL v3 licences
+ * Licensed under the MIT licence
  */
 export declare namespace Sort {
     /**

diff --git a/lib/node/sort.js b/lib/node/sort.js
@@ -6,9 +6,24 @@
  *
  * @copyright (c) 2018 David Mesquita-Morris
  *
- * Licensed under the MIT and GPL v3 licences
+ * Licensed under the MIT licence
  */
 Object.defineProperty(exports, "__esModule", { value: true });
+function visit(item, visited, sorted, dependencies, throwOnCircularDependency) {
+    if (visited.indexOf(item) === -1) {
+        visited.push(item);
+        for (var _i = 0, _a = dependencies(item); _i < _a.length; _i++) {
+            var dependency = _a[_i];
+            visit(dependency, visited, sorted, dependencies, throwOnCircularDependency);
+        }
+        sorted.push(item);
+    }
+    else {
+        if (throwOnCircularDependency && sorted.indexOf(item) === -1) {
+            throw new Error('Topologicalt sort: circular dependency detected');
+        }
+    }
+}
 var Sort;
 (function (Sort) {
     /**
@@ -22,19 +37,10 @@ var Sort;
         if (throwOnCircularDependency === void 0) { throwOnCircularDependency = false; }
         var sorted = new Array();
         var visited = new Array();
-        function visit(item) {
-            if (visited.indexOf(item) === -1) {
-                visited.push(item);
-                dependencies(item).forEach(visit);
-                sorted.push(item);
-            }
-            else {
-                if (throwOnCircularDependency && sorted.indexOf(item) === -1) {
-                    throw new Error('Topologicalt sort: circular dependency detected');
-                }
-            }
+        for (var _i = 0, source_1 = source; _i < source_1.length; _i++) {
+            var item = source_1[_i];
+            visit(item, visited, sorted, dependencies, throwOnCircularDependency);
         }
-        source.forEach(visit);
         return sorted;
     }
     Sort.topological = topological;

diff --git a/lib/node/tree.d.ts b/lib/node/tree.d.ts
@@ -5,7 +5,7 @@
  *
  * @copyright (c) 2017 David Mesquita-Morris
  *
- * Licensed under the MIT and GPL v3 licences
+ * Licensed under the MIT licence
  */
 export declare namespace Tree {
     /**

diff --git a/lib/node/tree.js b/lib/node/tree.js
@@ -6,7 +6,7 @@
  *
  * @copyright (c) 2017 David Mesquita-Morris
  *
- * Licensed under the MIT and GPL v3 licences
+ * Licensed under the MIT licence
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 var Tree;

diff --git a/src/index.ts b/src/index.ts
@@ -5,7 +5,7 @@
  * 
  * @copyright (c) 2017-8 David Mesquita-Morris
  * 
- * Licensed under the MIT and GPL v3 licences
+ * Licensed under the MIT licence
  */
 
 // pull in the tree algorithms

diff --git a/src/sort.ts b/src/sort.ts
@@ -5,9 +5,25 @@
  * 
  * @copyright (c) 2018 David Mesquita-Morris
  * 
- * Licensed under the MIT and GPL v3 licences
+ * Licensed under the MIT licence
  */
 
+function visit<T>(item: T, visited: Array<T>, sorted: Array<T>, dependencies: (item: T) => Array<T>, throwOnCircularDependency: boolean): void {
+	if (visited.indexOf(item) === -1) {
+		visited.push(item);
+
+		for (const dependency of dependencies(item)) {
+			visit(dependency, visited, sorted, dependencies, throwOnCircularDependency);
+		}
+
+		sorted.push(item);
+	} else {
+		if (throwOnCircularDependency && sorted.indexOf(item) === -1) {
+			throw new Error('Topologicalt sort: circular dependency detected');
+		}
+	}
+}
+
 export namespace Sort {
 	/**
 	 * Sorts an array of items based on a function that derives dependencies such that each item in the sorted array precedes its dependencies.
@@ -20,22 +36,10 @@ export namespace Sort {
 		var sorted = new Array<T>();
 		var visited = new Array<T>();
 
-		function visit(item: T): void {
-			if (visited.indexOf(item) === -1) {
-				visited.push(item);
-
-				dependencies(item).forEach(visit);
-
-				sorted.push(item);
-			} else {
-				if(throwOnCircularDependency && sorted.indexOf(item) === -1) {
-					throw new Error('Topologicalt sort: circular dependency detected');
-				}
-			}
+		for (const item of source) {
+			visit(item, visited, sorted, dependencies, throwOnCircularDependency);
 		}
 
-		source.forEach(visit);
-
 		return sorted;
 	}
 }
diff --git a/src/tree.ts b/src/tree.ts
@@ -5,7 +5,7 @@
  * 
  * @copyright (c) 2017 David Mesquita-Morris
  * 
- * Licensed under the MIT and GPL v3 licences
+ * Licensed under the MIT licence
  */
 
 export namespace Tree {