Allow @:js.import(define)

Author: RblSb

src/generators/genjs.ml

@@ -1668,37 +1668,61 @@ let generate js_gen com =
 	Gctx.map_source_header com.defines (fun s -> print ctx "// %s\n" s);
 
 	let import_statements = ref [] in
-	let () =
-		List.iter (fun mt -> match mt with
-			| TClassDecl c when (has_class_flag c CExtern) && Meta.has Meta.JsImport c.cl_meta && is_directly_used ctx.com c.cl_meta ->
-				let _, args, mp = Meta.get Meta.JsImport c.cl_meta in
-				let id = snd c.cl_path in
-				let flat_path = Path.flat_path (get_generated_class_path c) in
-				let alias = try
-					fst (Native.get_native_name c.cl_meta)
-				with Not_found ->
-					c.cl_meta <- (Meta.Native,[EConst (String(flat_path,SDoubleQuotes)),null_pos],null_pos) :: c.cl_meta;
-					Native.apply_native_paths mt;
-					flat_path in
-				(match args with
+	List.iter (fun mt -> match mt with
+		| TClassDecl c when (has_class_flag c CExtern) && Meta.has Meta.JsImport c.cl_meta && is_directly_used ctx.com c.cl_meta ->
+			let _, args, mp = Meta.get Meta.JsImport c.cl_meta in
+			let id = snd c.cl_path in
+			let flat_path = Path.flat_path (get_generated_class_path c) in
+			let alias = try
+				fst (Native.get_native_name c.cl_meta)
+			with Not_found ->
+				c.cl_meta <- (Meta.Native,[EConst (String(flat_path,SDoubleQuotes)),null_pos],null_pos) :: c.cl_meta;
+				Native.apply_native_paths mt;
+				flat_path
+			in
+			let err () =
+				abort ("Unsupported @:js.import format. Use:\n" ^
+				"	@:js.import('mylib.js')\n" ^
+				"	@:js.import('mylib.js', 'name')\n" ^
+				"	@:js.import(@default 'mylib.js')\n" ^
+				"	@:js.import(@star 'mylib.js')\n" ^
+				"'mylib.js' can also be replaced with mylibjs_path custom define,\nif you set it as -D mylibjs_path=\"mylib.js\"")
+				mp
+			in
+			let get_module_name expr =
+				match expr with
+					| EConst(String(module_name,_)),_ -> module_name
+					| EConst(Ident(define)),_ ->
+						begin try
+							let s = Define.raw_defined_value com.defines define in
+							Helper.unquote s
+						with Not_found ->
+							abort ("Define " ^ define ^ " with js library path is not specified") mp;
+						end
+					| _ -> err()
+			in
+			(match args with
 				(* @:js.import(@star "module") - namespace import *)
-				| [EMeta ((Meta.Custom "star",[],_),(EConst(String(module_name,_)),_)),_] ->
+				| [EMeta ((Meta.Custom "star",[],_),ename),_] ->
+					let module_name = get_module_name ename in
 					import_statements := (Printf.sprintf "import * as %s from \"%s\";" alias module_name) :: !import_statements
 				(* @:js.import(@default "module") - default import *)
-				| [EMeta ((Meta.Custom "default",[],_),(EConst(String(module_name,_)),_)),_] ->
+				| [EMeta ((Meta.Custom "default",[],_),ename),_] ->
+					let module_name = get_module_name ename in
 					import_statements := (Printf.sprintf "import %s from \"%s\";" alias module_name) :: !import_statements
 				(* @:js.import("module") - named import using class name *)
-				| [(EConst(String(module_name,_)),_)] ->
+				| [ename] ->
+					let module_name = get_module_name ename in
 					import_statements := (Printf.sprintf "import { %s as %s } from \"%s\";" id alias module_name) :: !import_statements
 				(* @:js.import("module", "exportName") - named import with alias *)
-				| [(EConst(String(module_name,_)),_); (EConst(String(export_name,_)),_)] ->
+				| [ename; (EConst(String(export_name,_)),_)] ->
+					let module_name = get_module_name ename in
 					import_statements := (Printf.sprintf "import { %s as %s } from \"%s\";" export_name alias module_name) :: !import_statements
 				| exprs ->
-					abort "Unsupported @:js.import format. Use: @:js.import('module'), @:js.import('module', 'name'), @:js.import(@default 'module'), or @:js.import(@star 'module')" mp
-				)
-			| _ -> ()
-		) com.types;
-	in
+					err ()
+			)
+		| _ -> ()
+	) com.types;
 	(match !import_statements with
 		| [] -> ()
 		| lines ->

tests/misc/projects/Issue10615/compile.hxml

@@ -4,3 +4,4 @@
 --class-path src
 --js bin/main.js
 --cmd node bin/main
+-D pixijs_path="../pixi.js"

tests/misc/projects/Issue10615/compile2.hxml

@@ -5,3 +5,4 @@
 --js bin/main.js
 --cmd node bin/main
 -D js-es=6
+-D pixijs_path="../pixi.js"

tests/misc/projects/Issue10615/src/Main.hx

@@ -1,7 +1,8 @@
-import pixi.Pixi.PixiApp;
 import pixi.Pixi.PixiDef;
 import pixi.Pixi.Assets;
 import pixi.Pixi.Application;
+import pixi.Pixi.Application2;
+import pixi.Pixi.Application3;
 
 @:js.import(@star '../lib.js')
 extern class Lib {
@@ -62,11 +63,15 @@ class Main {
 		eq(app.test(), "test");
 		eq(Application.name(), "Application");
 
+		var app = new Application2();
+		eq(app.test(), "test");
+		eq(Application2.name(), "Application");
+
 		eq(PixiDef.name(), "default name");
 
-		var app = new PixiApp();
+		var app = new Application3();
 		eq(app.test(), "test");
-		eq(PixiApp.name(), "Application");
+		eq(Application3.name(), "Application");
 		new Main();
 	}
 

tests/misc/projects/Issue10615/src/pixi/Pixi.hx

@@ -7,18 +7,25 @@ extern class Application {
 	static function name():String;
 }
 
-@:js.import(@default "../pixi.js")
-extern class PixiDef {
+@:js.import(pixijs_path, "Application")
+extern class Application2 {
+	function new();
+	function test():String;
 	static function name():String;
 }
 
 @:js.import("../pixi.js", "Application")
-extern class PixiApp {
+extern class Application3 {
 	function new();
 	function test():String;
 	static function name():String;
 }
 
+@:js.import(@default "../pixi.js")
+extern class PixiDef {
+	static function name():String;
+}
+
 @:js.import("../pixi.js", "Assets")
 extern class Assets {
 	static function load<T>(url:String):String;