do not export html as default from template module; fix imports every…

…where; actually use root template in liveview server
floodfx · Feb 10, 2022 · 869264c · 869264c
1 parent 3ab968f
commit 869264c
Show file tree

Hide file tree

Showing 54 changed files with 90 additions and 87 deletions.
diff --git a/coverage/clover.xml b/coverage/clover.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<coverage generated="1644477692883" clover="3.2.0">
-  <project timestamp="1644477692883" name="All files">
+<coverage generated="1644517936335" clover="3.2.0">
+  <project timestamp="1644517936335" name="All files">
     <metrics statements="386" coveredstatements="386" conditionals="184" coveredconditionals="176" methods="86" coveredmethods="83" elements="656" coveredelements="645" complexity="0" loc="386" ncloc="386" packages="8" files="20" classes="20"/>
     <package name="examples.autocomplete">
       <metrics statements="5" coveredstatements="5" conditionals="1" coveredconditionals="1" methods="2" coveredmethods="2"/>

diff --git a/coverage/coverage-final.json b/coverage/coverage-final.json
diff --git a/coverage/lcov-report/examples/autocomplete/data.ts.html b/coverage/lcov-report/examples/autocomplete/data.ts.html
@@ -3106,7 +3106,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">examples/aut
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/examples/autocomplete/index.html b/coverage/lcov-report/examples/autocomplete/index.html
@@ -101,7 +101,7 @@ <h1><a href="../../index.html">All files</a> examples/autocomplete</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/examples/live-search/data.ts.html b/coverage/lcov-report/examples/live-search/data.ts.html
@@ -331,7 +331,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">examples/liv
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/examples/live-search/index.html b/coverage/lcov-report/examples/live-search/index.html
@@ -101,7 +101,7 @@ <h1><a href="../../index.html">All files</a> examples/live-search</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/examples/volunteers/data.ts.html b/coverage/lcov-report/examples/volunteers/data.ts.html
@@ -220,7 +220,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">examples/vol
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/examples/volunteers/index.html b/coverage/lcov-report/examples/volunteers/index.html
@@ -101,7 +101,7 @@ <h1><a href="../../index.html">All files</a> examples/volunteers</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/index.html b/coverage/lcov-report/index.html
@@ -206,7 +206,7 @@ <h1>All files</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/component/base_component.ts.html b/coverage/lcov-report/server/component/base_component.ts.html
@@ -169,7 +169,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">server/compo
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/component/changeset.ts.html b/coverage/lcov-report/server/component/changeset.ts.html
@@ -148,7 +148,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">server/compo
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/component/index.html b/coverage/lcov-report/server/component/index.html
@@ -131,7 +131,7 @@ <h1><a href="../../index.html">All files</a> server/component</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/component/index.ts.html b/coverage/lcov-report/server/component/index.ts.html
@@ -76,7 +76,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">server/compo
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/index.html b/coverage/lcov-report/server/index.html
@@ -116,7 +116,7 @@ <h1><a href="../index.html">All files</a> server</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/index.ts.html b/coverage/lcov-report/server/index.ts.html
@@ -82,7 +82,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">server</a> inde
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/live_view_server.ts.html b/coverage/lcov-report/server/live_view_server.ts.html
@@ -451,7 +451,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">server</a> live
 &nbsp;
 export class LiveViewServer {
   private port: number = 4444;
-  private rootView: string = "index.html.ejs";
+  private rootView: string = "root.html.ejs";
   private viewsPath: string[];
   private signingSecret: string;
   private sessionStore: session.Store = new MemoryStore();
@@ -588,7 +588,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">server</a> live
       const view = component.render(ctx);
 &nbsp;
       // render the view with all the data
-      res.render("root.html.ejs", {
+      res.render(this.rootView, {
         page_title: "Live View",
         csrf_meta_tag: req.session.csrfToken,
         liveViewId,
@@ -607,7 +607,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">server</a> live
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/socket/component_manager.ts.html b/coverage/lcov-report/server/socket/component_manager.ts.html
@@ -817,7 +817,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">server/socke
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/socket/index.html b/coverage/lcov-report/server/socket/index.html
@@ -146,7 +146,7 @@ <h1><a href="../../index.html">All files</a> server/socket</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/socket/message_router.ts.html b/coverage/lcov-report/server/socket/message_router.ts.html
@@ -403,7 +403,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">server/socke
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/socket/types.ts.html b/coverage/lcov-report/server/socket/types.ts.html
@@ -358,7 +358,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">server/socke
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/socket/util.ts.html b/coverage/lcov-report/server/socket/util.ts.html
@@ -139,7 +139,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">server/socke
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/templates/helpers/form_for.ts.html b/coverage/lcov-report/server/templates/helpers/form_for.ts.html
@@ -91,7 +91,7 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">server/te
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">4x</span>
 <span class="cline-any cline-yes">4x</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import html from ".."
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { html } from ".."
 &nbsp;
 interface FormForOptions {
   phx_submit?: string
@@ -112,7 +112,7 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">server/te
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/templates/helpers/index.html b/coverage/lcov-report/server/templates/helpers/index.html
@@ -191,7 +191,7 @@ <h1><a href="../../../index.html">All files</a> server/templates/helpers</h1>
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/templates/helpers/index.ts.html b/coverage/lcov-report/server/templates/helpers/index.ts.html
@@ -85,7 +85,7 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">server/te
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/templates/helpers/inputs.ts.html b/coverage/lcov-report/server/templates/helpers/inputs.ts.html
@@ -138,7 +138,7 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">server/te
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">1x</span>
 <span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { LiveViewChangeset } from "../../component/types";
-import html, { safe } from "../index"
+import { html, safe } from "../index"
 &nbsp;
 interface InputOptions {
   placeholder?: string
@@ -154,7 +154,7 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">server/te
   const type = options?.type ?? "text";
   const id = `input_${key}`;
   const value = changeset.data[key]<span class="branch-0 cbranch-no" title="branch not covered" > ?? "</span>";
-  return html`&lt;input type="${type}" id="${id}" name="${key}" value="${value}"${autocomplete}${placeholder}${phx_debounce}/&gt;`
+  return html`&lt;input type="${type}" id="${id}" name="${String(key)}" value="${value}"${autocomplete}${placeholder}${phx_debounce}/&gt;`
 }
 &nbsp;
 interface TelephoneInputOptions extends Omit&lt;InputOptions, "type"&gt; { }
@@ -181,7 +181,7 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">server/te
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/templates/helpers/live_patch.ts.html b/coverage/lcov-report/server/templates/helpers/live_patch.ts.html
@@ -109,7 +109,7 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">server/te
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-yes">3x</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import html, { HtmlSafeString, safe } from "..";
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { html, HtmlSafeString, safe } from "..";
 &nbsp;
 interface LiveViewPatchHelperOptions {
   to: {
@@ -139,7 +139,7 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">server/te
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/templates/helpers/live_title_tag.ts.html b/coverage/lcov-report/server/templates/helpers/live_title_tag.ts.html
@@ -97,7 +97,7 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">server/te
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/templates/helpers/options_for_select.ts.html b/coverage/lcov-report/server/templates/helpers/options_for_select.ts.html
@@ -187,7 +187,7 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">server/te
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
 <span class="cline-any cline-neutral">&nbsp;</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import html, { HtmlSafeString, join } from "..";
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { html, HtmlSafeString, join } from "..";
 &nbsp;
 type Options =
   string[] | Record&lt;string, string&gt;
@@ -256,7 +256,7 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">server/te
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>

diff --git a/coverage/lcov-report/server/templates/helpers/submit.ts.html b/coverage/lcov-report/server/templates/helpers/submit.ts.html
@@ -81,7 +81,7 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">server/te
 <span class="cline-any cline-yes">6x</span>
 <span class="cline-any cline-yes">2x</span>
 <span class="cline-any cline-yes">2x</span>
-<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import html, { safe } from ".."
+<span class="cline-any cline-neutral">&nbsp;</span></td><td class="text"><pre class="prettyprint lang-js">import { html, safe } from ".."
 &nbsp;
 interface SubmitOptions {
   phx_disable_with: string
@@ -97,7 +97,7 @@ <h1><a href="../../../index.html">All files</a> / <a href="index.html">server/te
             <div class='footer quiet pad2 space-top1 center small'>
                 Code coverage generated by
                 <a href="https://istanbul.js.org/" target="_blank" rel="noopener noreferrer">istanbul</a>
-                at Thu Feb 10 2022 00:21:32 GMT-0700 (Mountain Standard Time)
+                at Thu Feb 10 2022 11:32:16 GMT-0700 (Mountain Standard Time)
             </div>
         <script src="../../../prettify.js"></script>
         <script>