Merge pull request #403 from NativeScript/JavaScriptImplementation-Require

Change the JavaScriptImplementation attribute to utilize the require path

Author: Mihail Slavchev

build/project-template-gradle/src/main/java/com/tns/FragmentClass.java

@@ -6,7 +6,7 @@
 import android.view.View;
 import android.view.ViewGroup;
 
-@JavaScriptImplementation(javaScriptFile = "app/tns_modules/ui/frame/frame.js")
+@JavaScriptImplementation(javaScriptFile = "ui/frame")
 public class FragmentClass extends android.app.Fragment implements com.tns.NativeScriptHashCodeProvider {
 
     public FragmentClass()

build/project-template-gradle/src/main/java/com/tns/NativeScriptActivity.java

@@ -1,6 +1,6 @@
 package com.tns;
 
-@JavaScriptImplementation(javaScriptFile = "app/tns_modules/ui/frame/frame.js")
+@JavaScriptImplementation(javaScriptFile = "ui/frame")
 public class NativeScriptActivity extends android.app.Activity implements com.tns.NativeScriptHashCodeProvider {
 
     public NativeScriptActivity()

build/project-template-gradle/src/main/java/com/tns/NativeScriptApplication.java

@@ -2,7 +2,7 @@
 
 import android.app.Application;
 
-@JavaScriptImplementation(javaScriptFile = "app/tns_modules/application/application.js")
+@JavaScriptImplementation(javaScriptFile = "application")
 public class NativeScriptApplication extends android.app.Application implements com.tns.NativeScriptHashCodeProvider {
 
     private static NativeScriptApplication thiz;

src/jni/Module.cpp

@@ -145,7 +145,7 @@ void Module::RequireCallback(const v8::FunctionCallbackInfo<v8::Value>& args)
 
 		auto isData = false;
 
-		auto moduleObj = Load(modulePath, isData);
+		auto moduleObj = LoadImpl(modulePath, isData);
 
 		if (isData)
 		{
@@ -185,7 +185,17 @@ void Module::RequireNativeCallback(const v8::FunctionCallbackInfo<v8::Value>& ar
 	funcPtr(args);
 }
 
-Local<Object> Module::Load(const string& path, bool& isData)
+void Module::Load(const string& path)
+{
+	auto isolate = Isolate::GetCurrent();
+	auto context = isolate->GetCurrentContext();
+	auto globalObject = context->Global();
+	auto require = globalObject->Get(context, ConvertToV8String("require")).ToLocalChecked().As<Function>();
+	Local<Value> args[] = { ConvertToV8String(path) };
+	require->Call(context, globalObject, 1, args);
+}
+
+Local<Object> Module::LoadImpl(const string& path, bool& isData)
 {
 	Local<Object> result;
 

src/jni/Module.h

@@ -21,7 +21,7 @@ namespace tns
 		public:
 			static void Init(v8::Isolate *isolate);
 
-			static v8::Local<v8::Object> Load(const std::string& path, bool& isData);
+			static void Load(const std::string& path);
 
 			static void RequireCallback(const v8::FunctionCallbackInfo<v8::Value>& args);
 
@@ -30,6 +30,8 @@ namespace tns
 
 			static v8::Local<v8::String> WrapModuleContent(const std::string& path);
 
+			static v8::Local<v8::Object> LoadImpl(const std::string& path, bool& isData);
+
 			static v8::Local<v8::Object> LoadModule(v8::Isolate *isolate, const std::string& path);
 
 			static v8::Local<v8::Object> LoadData(v8::Isolate *isolate, const std::string& path);

src/jni/NativePlatform.cpp

@@ -88,12 +88,7 @@ void NativePlatform::RunModule(JNIEnv *_env, jobject obj, jstring scriptFile)
 	JEnv env(_env);
 
 	string filePath = ArgConverter::jstringToString(scriptFile);
-
-	bool isData = false;
-
-	auto moduleObj = Module::Load(filePath, isData);
-
-	assert(!isData);
+	Module::Load(filePath);
 }
 
 jobject NativePlatform::RunScript(JNIEnv *_env, jobject obj, jstring scriptFile)

src/src/com/tns/Platform.java

@@ -174,11 +174,8 @@ public static void run() throws NativeScriptException
 
 	public static void runModule(File jsFile) throws NativeScriptException
 	{
-		if (jsFile.exists() && jsFile.isFile())
-		{
-			String filePath = jsFile.getAbsolutePath();
-			runModule(filePath);
-		}
+		String filePath = jsFile.getPath();
+		runModule(filePath);
 	}
 
 	public static Object runScript(File jsFile) throws NativeScriptException
@@ -357,7 +354,7 @@ private static void createJSInstance(Object instance)
 			JavaScriptImplementation jsImpl = clazz.getAnnotation(JavaScriptImplementation.class);
 			if (jsImpl != null)
 			{
-				File jsFile = new File(Module.getApplicationFilesPath(), jsImpl.javaScriptFile());
+				File jsFile = new File(jsImpl.javaScriptFile());
 				runModule(jsFile);
 			}
 			loadedJavaScriptExtends.put(clazz, jsImpl);

test-app/src/com/tns/NativeScriptActivity.java

@@ -3,7 +3,7 @@
  */
 package com.tns;
 
-@JavaScriptImplementation(javaScriptFile = "app/MyActivity.js")
+@JavaScriptImplementation(javaScriptFile = "./MyActivity.js")
 public class NativeScriptActivity extends android.app.Activity
 {
 	public NativeScriptActivity()

test-app/src/com/tns/NativeScriptApplication.java

@@ -2,7 +2,7 @@
 
 import android.app.Application;
 
-@JavaScriptImplementation(javaScriptFile = "app/MyApp.js")
+@JavaScriptImplementation(javaScriptFile = "./MyApp.js")
 public class NativeScriptApplication extends android.app.Application implements com.tns.NativeScriptHashCodeProvider {
 
     private static NativeScriptApplication thiz;