Fix streaming response

Author: akclace

internal/app/dev/styling.go

@@ -211,6 +211,9 @@ func (s *AppStyle) setupTailwindConfig(templateLocations []string, sourceFS *app
 		buf.WriteString(fmt.Sprintf("'%s'", path.Join(sourceFS.Root, loc)))
 	}
 
+	buf.WriteString(", ")
+	buf.WriteString(fmt.Sprintf("'%s'", path.Join(sourceFS.Root, "static", "*.js")))
+
 	configContents := fmt.Sprintf(TAILWIND_CONFIG_CONTENTS, buf.String(), daisyPlugin, daisyThemes)
 	if err := workFS.Write(configPath, []byte(configContents)); err != nil {
 		return fmt.Errorf("error writing tailwind config file : %s", err)

internal/app/handler.go

@@ -532,7 +532,6 @@ func (a *App) handleStreamResponse(w http.ResponseWriter, r *http.Request, rtype
 	} else {
 		w.Header().Set("Content-Type", "text/html; charset=utf-8")
 	}
-	w.WriteHeader(http.StatusOK)
 
 	retValue := streamResponse["value"]
 	if retValue == nil {
@@ -552,27 +551,44 @@ func (a *App) handleStreamResponse(w http.ResponseWriter, r *http.Request, rtype
 		return
 	}
 
+	w.WriteHeader(http.StatusOK)
 	for v := range retSeq {
-		if rtype == apptype.HTML_TYPE {
-			err := a.executeTemplate(w, "", fragment, v)
+		if rtype == apptype.TEXT || (rtype == apptype.HTML_TYPE && (fragment == "" || fragment == "-")) {
+			vStr, ok := v.(string)
+			if !ok {
+				vStr = fmt.Sprintf("%v", v)
+			}
+			vStr = types.StripQuotes(vStr)
+			_, err := fmt.Fprint(w, vStr)
 			if err != nil {
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return
 			}
-		} else if rtype == apptype.JSON {
-			err := json.NewEncoder(w).Encode(retValue)
+		} else if rtype == apptype.HTML_TYPE {
+			err := a.executeTemplate(w, "", fragment, v)
 			if err != nil {
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return
 			}
-		} else if rtype == apptype.TEXT {
-			_, err := fmt.Fprint(w, retValue)
+		} else if rtype == apptype.JSON {
+			err := json.NewEncoder(w).Encode(v)
 			if err != nil {
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return
 			}
 		}
 
+		_, err := fmt.Fprint(w, "\n")
+		if err != nil {
+			http.Error(w, err.Error(), http.StatusInternalServerError)
+			return
+		}
+
+		flusher.Flush()
+	}
+
+	if rtype == apptype.HTML_TYPE {
+		w.Write([]byte("<!--cl_stream_end-->\n\n"))
 		flusher.Flush()
 	}
 

internal/app/tests/styling_test.go

@@ -81,7 +81,7 @@ app = ace.app("testApp", custom_layout=True, routes = [ace.html("/")],
 
 	data, err = workFS.ReadFile("style/tailwind.config.js")
 	testutil.AssertNoError(t, err)
-	testutil.AssertStringMatch(t, "tailwind.config.js", `module.exports = { content: ['action/*.go.html', '*.go.html', 'base_templates/*.go.html'], theme: { extend: {}, }, plugins: [ ], }`, string(data))
+	testutil.AssertStringMatch(t, "tailwind.config.js", `module.exports = { content: ['action/*.go.html', '*.go.html', 'base_templates/*.go.html', 'static/*.js'], theme: { extend: {}, }, plugins: [ ], }`, string(data))
 }
 
 func TestStyleDaisyUI(t *testing.T) {
@@ -103,7 +103,7 @@ app = ace.app("testApp", custom_layout=True, routes = [ace.html("/")],
 
 	data, err = workFS.ReadFile("style/tailwind.config.js")
 	testutil.AssertNoError(t, err)
-	testutil.AssertStringMatch(t, "tailwind.config.js", `module.exports = { content: ['action/*.go.html', '*.go.html', 'base_templates/*.go.html'], theme: { extend: {}, }, plugins: [ require("daisyui") ], daisyui: { themes: ["emerald", "night"], }, }`, string(data))
+	testutil.AssertStringMatch(t, "tailwind.config.js", `module.exports = { content: ['action/*.go.html', '*.go.html', 'base_templates/*.go.html', 'static/*.js'], theme: { extend: {}, }, plugins: [ require("daisyui") ], daisyui: { themes: ["emerald", "night"], }, }`, string(data))
 }
 
 func TestStyleDaisyUIThemes(t *testing.T) {
@@ -125,7 +125,7 @@ app = ace.app("testApp", custom_layout=True, routes = [ace.html("/")],
 
 	data, err = workFS.ReadFile("style/tailwind.config.js")
 	testutil.AssertNoError(t, err)
-	testutil.AssertStringMatch(t, "tailwind.config.js", `module.exports = { content: ['action/*.go.html', '*.go.html', 'base_templates/*.go.html'], theme: { extend: {}, }, plugins: [ require("daisyui") ], daisyui: { themes: ["cupcake", "dark", "emerald", "night"], }, }`, string(data))
+	testutil.AssertStringMatch(t, "tailwind.config.js", `module.exports = { content: ['action/*.go.html', '*.go.html', 'base_templates/*.go.html', 'static/*.js'], theme: { extend: {}, }, plugins: [ require("daisyui") ], daisyui: { themes: ["cupcake", "dark", "emerald", "night"], }, }`, string(data))
 }
 
 func TestStyleDaisyUILight(t *testing.T) {
@@ -147,7 +147,7 @@ app = ace.app("testApp", custom_layout=True, routes = [ace.html("/")],
 
 	data, err = workFS.ReadFile("style/tailwind.config.js")
 	testutil.AssertNoError(t, err)
-	testutil.AssertStringMatch(t, "tailwind.config.js", `module.exports = { content: ['action/*.go.html', '*.go.html', 'base_templates/*.go.html'], theme: { extend: {}, }, plugins: [ require("daisyui") ], daisyui: { themes: ["abc", "cupcake", "xyz"], }, }`, string(data))
+	testutil.AssertStringMatch(t, "tailwind.config.js", `module.exports = { content: ['action/*.go.html', '*.go.html', 'base_templates/*.go.html', 'static/*.js'], theme: { extend: {}, }, plugins: [ require("daisyui") ], daisyui: { themes: ["abc", "cupcake", "xyz"], }, }`, string(data))
 }
 
 func TestStyleCustom(t *testing.T) {