Merge branch 'master' into feature/upgrade_to_es6

Author: montogeek

LICENSE

@@ -0,0 +1,20 @@
+Copyright JS Foundation and other contributors
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+'Software'), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

lib/normalize.js

@@ -1,38 +1,86 @@
-const doubleSlashWinRegExp = /\\+/g;
-const doubleSlashNixRegExp = /\/+/g;
-const currentDirectoryWinMiddleRegExp = /\\(\.\\)+/;
-const currentDirectoryWinEndRegExp = /\\\.$/;
-const parentDirectoryWinMiddleRegExp = /\\+[^\\]+\\+\.\.\\/;
-const parentDirectoryWinEndRegExp1 = /([A-Z]:\\)\\*[^\\]+\\+\.\.$/i;
-const parentDirectoryWinEndRegExp2 = /\\+[^\\]+\\+\.\.$/;
-const currentDirectoryNixMiddleRegExp = /\/+(\.\/)+/;
-const currentDirectoryNixEndRegExp1 = /^\/+\.$/;
-const currentDirectoryNixEndRegExp2 = /\/+\.$/;
-const parentDirectoryNixMiddleRegExp = /(^|\/[^\/]+)\/+\.\.\/+/;
-const parentDirectoryNixEndRegExp1 = /^\/[^\/]+\/+\.\.$/;
-const parentDirectoryNixEndRegExp2 = /\/+[^\/]+\/+\.\.$/;
-const parentDirectoryNixEndRegExp3 = /^\/+\.\.$/;
-
-// RegExp magic :)
-
 module.exports = function normalize(path) {
-	while(currentDirectoryWinMiddleRegExp.test(path))
-		path = path.replace(currentDirectoryWinMiddleRegExp, "\\");
-	path = path.replace(currentDirectoryWinEndRegExp, "");
-	while(parentDirectoryWinMiddleRegExp.test(path))
-		path = path.replace(parentDirectoryWinMiddleRegExp, "\\");
-	path = path.replace(parentDirectoryWinEndRegExp1, "$1");
-	path = path.replace(parentDirectoryWinEndRegExp2, "");
-
-	while(currentDirectoryNixMiddleRegExp.test(path))
-		path = path.replace(currentDirectoryNixMiddleRegExp, "/");
-	path = path.replace(currentDirectoryNixEndRegExp1, "/");
-	path = path.replace(currentDirectoryNixEndRegExp2, "");
-	while(parentDirectoryNixMiddleRegExp.test(path))
-		path = path.replace(parentDirectoryNixMiddleRegExp, "/");
-	path = path.replace(parentDirectoryNixEndRegExp1, "/");
-	path = path.replace(parentDirectoryNixEndRegExp2, "");
-	path = path.replace(parentDirectoryNixEndRegExp3, "/");
-
-	return path.replace(doubleSlashWinRegExp, "\\").replace(doubleSlashNixRegExp, "/");
-};
+	var parts = path.split(/(\\+|\/+)/);
+	if(parts.length === 1)
+		return path;
+	var result = [];
+	var absolutePathStart = 0;
+	for(var i = 0, sep = false; i < parts.length; i++, sep = !sep) {
+		var part = parts[i];
+		if(i === 0 && /^([A-Z]:)?$/i.test(part)) {
+			result.push(part);
+			absolutePathStart = 2;
+		} else if(sep) {
+			result.push(part[0]);
+		} else if(part === "..") {
+			switch(result.length) {
+				case 0:
+					// i. e. ".." => ".."
+					// i. e. "../a/b/c" => "../a/b/c"
+					result.push(part);
+					break;
+				case 2:
+					// i. e. "a/.." => ""
+					// i. e. "/.." => "/"
+					// i. e. "C:\.." => "C:\"
+					// i. e. "a/../b/c" => "b/c"
+					// i. e. "/../b/c" => "/b/c"
+					// i. e. "C:\..\a\b\c" => "C:\a\b\c"
+					i++;
+					sep = !sep;
+					result.length = absolutePathStart;
+					break;
+				case 4:
+					// i. e. "a/b/.." => "a"
+					// i. e. "/a/.." => "/"
+					// i. e. "C:\a\.." => "C:\"
+					// i. e. "/a/../b/c" => "/b/c"
+					if(absolutePathStart === 0) {
+						result.length -= 3;
+					} else {
+						i++;
+						sep = !sep;
+						result.length = 2;
+					}
+					break;
+				default:
+					// i. e. "/a/b/.." => "/a"
+					// i. e. "/a/b/../c" => "/a/c"
+					result.length -= 3;
+					break;
+			}
+		} else if(part === ".") {
+			switch(result.length) {
+				case 0:
+					// i. e. "." => "."
+					// i. e. "./a/b/c" => "./a/b/c"
+					result.push(part);
+					break;
+				case 2:
+					// i. e. "a/." => "a"
+					// i. e. "/." => "/"
+					// i. e. "C:\." => "C:\"
+					// i. e. "C:\.\a\b\c" => "C:\a\b\c"
+					if(absolutePathStart === 0) {
+						result.length--;
+					} else {
+						i++;
+						sep = !sep;
+					}
+					break;
+				default:
+					// i. e. "a/b/." => "a/b"
+					// i. e. "/a/." => "/"
+					// i. e. "C:\a\." => "C:\"
+					// i. e. "a/./b/c" => "a/b/c"
+					// i. e. "/a/./b/c" => "/a/b/c"
+					result.length--;
+					break;
+			}
+		} else if(part) {
+			result.push(part);
+		}
+	}
+	if(result.length === 1 && /^[A-Za-z]:$/.test(result))
+		return result[0] + "\\";
+	return result.join("");
+};

package.json

@@ -1,6 +1,6 @@
 {
   "name": "memory-fs",
-  "version": "0.3.0",
+  "version": "0.4.1",
   "description": "A simple in-memory filesystem. Holds data in a javascript object.",
   "main": "lib/MemoryFileSystem.js",
   "directories": {