[js] use $hxEnums for Type.resolveEnum and don't add enums to $hxClasses (see #7165)

also, inline Type.resolve(Enum|Class)

src/generators/genjs.ml

@@ -1150,8 +1150,10 @@ let generate_enum ctx e =
 		generate_package_create ctx e.e_path;
 	print ctx "%s = " p;
 	let as_objects = not (Common.defined ctx.com Define.JsEnumsAsArrays) in
-	if has_feature ctx "Type.resolveEnum" then print ctx "$hxClasses[\"%s\"] = " (dot_path e.e_path);
-	if as_objects then print ctx "$hxEnums[\"%s\"] = " dotp;
+	(if as_objects then
+		print ctx "$hxEnums[\"%s\"] = " dotp
+	else if has_feature ctx "Type.resolveEnum" then
+		print ctx "$hxClasses[\"%s\"] = " (dot_path e.e_path));
 	print ctx "{";
 	if has_feature ctx "js.Boot.isEnum" then print ctx " __ename__ : %s," (if has_feature ctx "Type.getEnumName" then "[" ^ String.concat "," ename ^ "]" else "true");
 	print ctx " __constructs__ : [%s] }" (String.concat "," (List.map (fun s -> Printf.sprintf "\"%s\"" s) e.e_names));
@@ -1456,13 +1458,15 @@ let generate com =
 	if (not ctx.js_modern) && (ctx.es_version < 5) then
 		spr ctx "var console = $global.console || {log:function(){}};\n";
 
+	let enums_as_objects = not (Common.defined com Define.JsEnumsAsArrays) in
+
 	(* TODO: fix $estr *)
 	let vars = [] in
-	let vars = (if has_feature ctx "Type.resolveClass" || has_feature ctx "Type.resolveEnum" then ("$hxClasses = " ^ (if ctx.js_modern then "{}" else "$hxClasses || {}")) :: vars else vars) in
+	let vars = (if has_feature ctx "Type.resolveClass" || (not enums_as_objects && has_feature ctx "Type.resolveEnum") then ("$hxClasses = " ^ (if ctx.js_modern then "{}" else "$hxClasses || {}")) :: vars else vars) in
 	let vars = if has_feature ctx "has_enum"
 		then ("$estr = function() { return " ^ (ctx.type_accessor (TClassDecl { null_class with cl_path = ["js"],"Boot" })) ^ ".__string_rec(this,''); }") :: vars
 		else vars in
-	let vars = if not (Common.defined com Define.JsEnumsAsArrays) then "$hxEnums = {}" :: vars else vars in
+	let vars = if enums_as_objects then "$hxEnums = {}" :: vars else vars in
 	(match List.rev vars with
 	| [] -> ()
 	| vl ->

std/js/_std/Type.hx

@@ -65,6 +65,7 @@ enum ValueType {
 		return a.join(".");
 	}
 
+	#if js_enums_as_arrays
 	public static function resolveClass( name : String ) : Class<Dynamic> untyped {
 		var cl : Class<Dynamic> = $hxClasses[name];
 		// ensure that this is a class
@@ -80,6 +81,15 @@ enum ValueType {
 			return null;
 		return e;
 	}
+	#else
+	public static inline function resolveClass( name : String ) : Class<Dynamic> {
+		return untyped __define_feature__("Type.resolveClass", $hxClasses[name]);
+	}
+
+	public static inline function resolveEnum( name : String ) : Enum<Dynamic> {
+		return untyped $hxEnums[name];
+	}
+	#end
 
 	#if (js_es < 5)
 	public static function createInstance<T>( cl : Class<T>, args : Array<Dynamic> ) : T {