Merge pull request #233 from NativeScript/master

merge master into release

src/src/com/tns/FileSystem.java

@@ -16,6 +16,8 @@
 
 public class FileSystem
 {
+	private static final String appRootPrefix = "~/";
+
 	public static String readAll(InputStream inputStream) throws IOException
 	{
 		StringBuilder text;
@@ -96,7 +98,17 @@ public static JSONObject readJSONFile(File file) throws IOException, JSONExcepti
 
 	public static String resolveRelativePath(String path, String currentDirectory)
 	{
-		File temp = new File(currentDirectory, path);
+		String baseDir;
+		if (path.startsWith(appRootPrefix))
+		{
+			baseDir = new File(NativeScriptApplication.getInstance().getApplicationContext().getFilesDir(), "app").getAbsolutePath();
+			path = path.substring(appRootPrefix.length());
+		}
+		else
+		{
+			baseDir = currentDirectory;
+		}
+		File temp = new File(baseDir, path);
 		try
 		{
 			return temp.getCanonicalPath();
@@ -105,7 +117,7 @@ public static String resolveRelativePath(String path, String currentDirectory)
 		{
 			try
 			{
-				URI uri = new URI(currentDirectory);
+				URI uri = new URI(baseDir);
 				return uri.resolve(path).getPath();
 			}
 			catch(URISyntaxException e1){

src/src/com/tns/Require.java

@@ -143,7 +143,7 @@ private static File findModuleFile(String moduleName, String currentDirectory)
 			directory = new File(moduleName);
 			jsFile = isJSFile ? new File(moduleName) : new File(moduleName + ".js");
 		}
-		else if (moduleName.startsWith("./") || moduleName.startsWith("../"))
+		else if (moduleName.startsWith("./") || moduleName.startsWith("../") || moduleName.startsWith("~/"))
 		{
 			// same or up directory
 			String resolvedPath = FileSystem.resolveRelativePath(moduleName, currentDirectory);

test-app/assets/app/modules/mymodule.js

@@ -0,0 +1,3 @@
+exports.echo = function(value) {
+	return value;
+}

test-app/assets/app/tests/tests.js

@@ -1813,6 +1813,17 @@ describe("Tests ", function () {
 		expect(moduleName).toEqual("testModule");
 	});
 
+	it("When_require_a_module_via_app_root_syntax_it_should_be_loaded", function () {
+
+		__log("TEST: When_require_a_module_via_app_root_syntax_it_should_be_loaded");
+
+		var mymodule = require("~/modules/mymodule");
+		var value = mymodule.echo(12345)
+
+		expect(value).toBe(12345);
+	});
+
+
 	it("When_require_a_bcl_module_in_a_dir_it_should_be_loaded", function () {
 
 		__log("TEST: When_require_a_bcl_module_in_a_dir_it_should_be_loaded");