Update application bootstrap logic. Resolves NativeScript#53.

atanasovg · atanasovg · commit 580f98204a4e · 2015-04-02T19:59:16.000+03:00
diff --git a/src/src/com/tns/NativeScriptApplication.java b/src/src/com/tns/NativeScriptApplication.java
@@ -733,7 +733,7 @@ public void onCreate() {
 			}
 			
 			Platform.init(this);
-			Platform.run(Platform.DefaultApplicationModuleName);
+			Platform.run();
 	
 			onCreateInternal();
 		}
diff --git a/src/src/com/tns/Platform.java b/src/src/com/tns/Platform.java
@@ -78,8 +78,6 @@ public class Platform
 	
 	private static ArrayList<Constructor<?>> ctorCache = new ArrayList<Constructor<?>>();
 
-	public final static String DefaultApplicationModuleName = "./bootstrap";
-	
 	private static JsDebugger jsDebugger;
 	
 	public static boolean IsLogEnabled = BuildConfig.DEBUG;
@@ -187,10 +185,10 @@ static void setExtractPolicy(ExtractPolicy policy)
 		extractPolicy = policy;
 	}
 
-	public static void run(String appFileName)
+	public static void run()
 	{
-		String appContent = Require.getAppContent(appFileName);
-		runNativeScript(appFileName, appContent);
+		String[] bootstrapInfo = Require.bootstrapApp();
+		runNativeScript(bootstrapInfo[0], bootstrapInfo[1]);
 	}
 
 	private static int cacheConstructor(String name, String className, Object[] args, String[] methodOverrides) throws ClassNotFoundException, IOException
diff --git a/src/src/com/tns/Require.java b/src/src/com/tns/Require.java
@@ -55,10 +55,29 @@ public static String getApplicationFilesPath()
 		return ApplicationFilesPath;
 	}
 
-	public static String getAppContent(String appFileName)
+	public static String[] bootstrapApp()
 	{
-		File bootstrapFile = findModuleFile(appFileName, "");
-		return getModuleContent(bootstrapFile.getPath());
+		// Bootstrap logic flows like:
+		// 	1. Check for package.json -> `main` field
+		// 	2. Check for index.js
+		// 	3. Check for bootstrap.js
+		
+		File bootstrapFile = findModuleFile("./", "");
+		if(!bootstrapFile.exists())
+		{
+			bootstrapFile = findModuleFile("./bootstrap", "");
+		}
+		
+		if(!bootstrapFile.exists())
+		{
+			Platform.APP_FAIL("Application entry point file not found. Please specify either package.json with main field, index.js or bootstrap.js!");
+		}
+		
+		String[] bootstrapInfo = new String[2];
+		bootstrapInfo[0] = bootstrapFile.getName();
+		bootstrapInfo[1] = getModuleContent(bootstrapFile.getPath());
+		
+		return bootstrapInfo;
 	}
 
 	public static String getModuleContent(String modulePath)

Original file line number	Diff line number	Diff line change
`@@ -733,7 +733,7 @@ public void onCreate() {`
`733`	`733`	`}`
`734`	`734`
`735`	`735`	`Platform.init(this);`
`736`		`- Platform.run(Platform.DefaultApplicationModuleName);`
	`736`	`+ Platform.run();`
`737`	`737`
`738`	`738`	`onCreateInternal();`
`739`	`739`	`}`
Original file line number	Diff line number	Diff line change
`@@ -78,8 +78,6 @@ public class Platform`
`78`	`78`
`79`	`79`	`private static ArrayList<Constructor<?>> ctorCache = new ArrayList<Constructor<?>>();`
`80`	`80`
`81`		`- public final static String DefaultApplicationModuleName = "./bootstrap";`
`82`		`-`
`83`	`81`	`private static JsDebugger jsDebugger;`
`84`	`82`
`85`	`83`	`public static boolean IsLogEnabled = BuildConfig.DEBUG;`
`@@ -187,10 +185,10 @@ static void setExtractPolicy(ExtractPolicy policy)`
`187`	`185`	`extractPolicy = policy;`
`188`	`186`	`}`
`189`	`187`
`190`		`- public static void run(String appFileName)`
	`188`	`+ public static void run()`
`191`	`189`	`{`
`192`		`- String appContent = Require.getAppContent(appFileName);`
`193`		`- runNativeScript(appFileName, appContent);`
	`190`	`+ String[] bootstrapInfo = Require.bootstrapApp();`
	`191`	`+ runNativeScript(bootstrapInfo[0], bootstrapInfo[1]);`
`194`	`192`	`}`
`195`	`193`
`196`	`194`	`private static int cacheConstructor(String name, String className, Object[] args, String[] methodOverrides) throws ClassNotFoundException, IOException`