X-Git-Url: http://nitlanguage.org

diff --git a/src/web/api_model.nit b/src/web/api_model.nit
index 7d3ea69..31077c4 100644
--- a/src/web/api_model.nit
+++ b/src/web/api_model.nit
@@ -69,6 +69,16 @@ class APIList
 		return mentities
 	end
 
+	# Sort mentities by lexicographic order
+	#
+	# TODO choose order from request
+	fun sort_mentities(req: HttpRequest, mentities: Array[MEntity]) : Array[MEntity] do
+		var sorted = mentities.to_a
+		var sorter = new MEntityNameSorter
+		sorter.sort(sorted)
+		return sorted
+	end
+
 	# Limit mentities depending on the `n` parameter.
 	fun limit_mentities(req: HttpRequest, mentities: Array[MEntity]): Array[MEntity] do
 		var n = req.int_arg("n")
@@ -80,6 +90,7 @@ class APIList
 
 	redef fun get(req, res) do
 		var mentities = list_mentities(req)
+		mentities = sort_mentities(req, mentities)
 		mentities = limit_mentities(req, mentities)
 		res.json new JsonArray.from(mentities)
 	end
@@ -132,7 +143,7 @@ class APIEntity
 	redef fun get(req, res) do
 		var mentity = mentity_from_uri(req, res)
 		if mentity == null then return
-		res.json mentity.api_json(self)
+		res.raw_json mentity.to_full_json
 	end
 end
 
@@ -164,7 +175,7 @@ class APIEntityLinearization
 			return
 		end
 		var mentities = new JsonArray
-		for e in lin do mentities.add e.full_json
+		for e in lin do mentities.add e
 		res.json mentities
 	end
 end
@@ -173,25 +184,27 @@ end
 #
 # Example: `GET /defs/core::Array`
 class APIEntityDefs
-	super APIHandler
+	super APIList
 
 	redef fun get(req, res) do
 		var mentity = mentity_from_uri(req, res)
 		if mentity == null then return
-		var arr = new JsonArray
+		var mentities: Array[MEntity]
 		if mentity isa MModule then
-			for mclassdef in mentity.mclassdefs do arr.add mclassdef
+			mentities = mentity.mclassdefs
 		else if mentity isa MClass then
-			for mclassdef in mentity.mclassdefs do arr.add mclassdef
+			mentities = mentity.mclassdefs
 		else if mentity isa MClassDef then
-			for mpropdef in mentity.mpropdefs do arr.add mpropdef
+			mentities = mentity.mpropdefs
 		else if mentity isa MProperty then
-			for mpropdef in mentity.mpropdefs do arr.add mpropdef
+			mentities = mentity.mpropdefs
 		else
 			res.api_error(404, "No definition list for mentity `{mentity.full_name}`")
 			return
 		end
-		res.json arr
+		mentities = sort_mentities(req, mentities)
+		mentities = limit_mentities(req, mentities)
+		res.json new JsonArray.from(mentities)
 	end
 end