compress js runtime bundle

Server/src/main/java/prompto/server/ResourceServlet.java

@@ -67,20 +67,27 @@ protected void service(HttpServletRequest request, HttpServletResponse response)
                 super.service(request, response);
                 return;
 		}
+
+		boolean tryGzip = writeBody && acceptsGzip(request);
 
-		Resource resource = getResource(request);
+		Resource resource = getResource(request, tryGzip);
 
         if (resource==null || !resource.exists()) {
             response.setStatus(HttpServletResponse.SC_NOT_FOUND);
             return;
-       }
+        }
         response.setStatus(HttpServletResponse.SC_OK);
         writeHeaders(response, resource);
         if(writeBody)
         	writeBody(request, response, resource);
 	}
 
-	protected Resource getResource(HttpServletRequest request) {
+	private boolean acceptsGzip(HttpServletRequest request) {
+		String accept = request.getHeader(HttpHeader.ACCEPT_ENCODING.asString());
+ 		return accept!=null && accept.contains("gzip");
+	}
+
+	protected Resource getResource(HttpServletRequest request, boolean tryGzip) {
         String servletPath;
         String pathInfo;
         Boolean included = request.getAttribute(RequestDispatcher.INCLUDE_REQUEST_URI) != null;
@@ -103,7 +110,12 @@ protected Resource getResource(HttpServletRequest request) {
         String pathInContext = URIUtil.addPaths(servletPath, pathInfo);
         if(pathInContext=="/" && welcomePage!=null)
         	pathInContext = welcomePage;
-        Resource resource = getClassPathResource(pathInContext);
+        Resource resource = null;
+        if(tryGzip)
+        	resource = getClassPathResource(pathInContext + ".gz");
+        if(resource!=null)
+        	return resource;
+    	resource = getClassPathResource(pathInContext);
         if(resource!=null)
         	return resource;
         else
@@ -190,10 +202,19 @@ private void writeBodySync(HttpServletRequest request, HttpOutput out, Resource
 	protected void writeHeaders(HttpServletResponse response, Resource resource) {
 		writeContentType(response, resource);
 		writeContentLength(response, resource);
+		writeContentEncoding(response, resource);
 		writeCacheControl(response, resource);
 		writeEtags(response, resource);
      }
 
+	private void writeContentEncoding(HttpServletResponse response, Resource resource) {
+		if(resource.getName().endsWith(".gz")) {
+			response.setHeader(HttpHeader.CONTENT_ENCODING.asString(), "gzip");
+			if(resource.getName().endsWith(".js.gz"))
+				response.setContentType("application/javascript");
+		}
+	}
+
 	private void writeContentType(HttpServletResponse response, Resource resource) {
 		if(resource instanceof MimeTypeProvider) {
 			String mimeType = ((MimeTypeProvider)resource).getMimeType();

Server/src/main/resources/js/lib/prompto.core.bundle.js

@@ -11894,6 +11894,10 @@ CodeWriter.prototype.newInstanceWriter = function(type) {
     return new CodeWriter(this.dialect, this.context.newInstanceContext(null, type), this.indenter);
 };
 
+CodeWriter.prototype.newDocumentWriter = function() {
+    return new CodeWriter(this.dialect, this.context.newDocumentContext(null, false), this.indenter);
+};
+
 CodeWriter.prototype.newMemberWriter = function() {
     return new CodeWriter (this.dialect, this.context.newChildContext(), this.indenter);
 };
@@ -186709,6 +186713,7 @@ SortedExpression.prototype.toEDialect = function(writer) {
         writer.append("descending ");
     this.source.toDialect(writer);
     if(this.key!=null) {
+        writer = this.contextualizeWriter(writer);
         writer.append(" with ");
         var keyExp = this.key;
         if(keyExp instanceof UnresolvedIdentifier) try {
@@ -186731,6 +186736,7 @@ SortedExpression.prototype.toODialect = function(writer) {
     writer.append("(");
     this.source.toDialect(writer);
     if(this.key!=null) {
+        writer = this.contextualizeWriter(writer);
         writer.append(", key = ");
         this.key.toDialect(writer);
     }
@@ -186741,6 +186747,18 @@ SortedExpression.prototype.toMDialect = function(writer) {
     this.toODialect(writer);
 }
 
+SortedExpression.prototype.contextualizeWriter = function(writer) {
+    var type = this.source.check(writer.context);
+    var itemType = type.itemType;
+    if (itemType instanceof CategoryType)
+        return writer.newInstanceWriter(itemType);
+    else if (itemType instanceof DocumentType)
+        return writer.newDocumentWriter();
+    else
+        return writer;
+};
+
+
 SortedExpression.prototype.check = function(context) {
 	var type = this.source.check(context);
 	if(!(type instanceof ListType || type instanceof TupleType || type instanceof SetType)) {