Skip to content

Commit

Permalink
Merge pull request #39 from floodfx/express_route_next
Browse files Browse the repository at this point in the history
do not return 404 if liveview route not found, instead call next() to…
  • Loading branch information
floodfx authored Feb 18, 2022
2 parents 1d8a20d + 609f5ff commit 9e07d22
Show file tree
Hide file tree
Showing 38 changed files with 123 additions and 77 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -168,6 +168,8 @@ lvServer.start();

### Additional Feature Documentation
* [Updating HTML Document `<title />`](docs/updating-html-title.md)
* [LiveViewJS Changesets](docs/changesets.md).
* [Routing Details](docs/routing.md).

#### Other features to be implemented:
* [LiveView Helpers](https://hexdocs.pm/phoenix_live_view/Phoenix.LiveView.Helpers.html) - Vote for [Issue 17](https://github.com/floodfx/liveviewjs/issues/17)
Expand Down
18 changes: 9 additions & 9 deletions coverage/clover.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<coverage generated="1644989803167" clover="3.2.0">
<project timestamp="1644989803167" name="All files">
<coverage generated="1645213637664" clover="3.2.0">
<project timestamp="1645213637664" name="All files">
<metrics statements="469" coveredstatements="469" conditionals="272" coveredconditionals="258" methods="90" coveredmethods="89" elements="831" coveredelements="816" complexity="0" loc="469" ncloc="469" packages="8" files="21" classes="21"/>
<package name="examples.autocomplete">
<metrics statements="5" coveredstatements="5" conditionals="1" coveredconditionals="1" methods="2" coveredmethods="2"/>
Expand Down Expand Up @@ -129,15 +129,15 @@
<line num="151" count="2" type="stmt"/>
<line num="161" count="2" type="stmt"/>
<line num="162" count="2" type="cond" truecount="1" falsecount="0"/>
<line num="165" count="1" type="stmt"/>
<line num="166" count="1" type="stmt"/>
<line num="167" count="1" type="stmt"/>
<line num="171" count="1" type="cond" truecount="1" falsecount="0"/>
<line num="172" count="1" type="stmt"/>
<line num="175" count="1" type="stmt"/>
<line num="170" count="1" type="cond" truecount="1" falsecount="0"/>
<line num="171" count="1" type="stmt"/>
<line num="174" count="1" type="stmt"/>
<line num="179" count="1" type="stmt"/>
<line num="180" count="1" type="stmt"/>
<line num="181" count="1" type="stmt"/>
<line num="184" count="1" type="stmt"/>
<line num="196" count="8" type="stmt"/>
<line num="183" count="1" type="stmt"/>
<line num="195" count="8" type="stmt"/>
</file>
</package>
<package name="server.component">
Expand Down
2 changes: 1 addition & 1 deletion coverage/coverage-final.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion coverage/lcov-report/examples/autocomplete/data.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../prettify.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/examples/autocomplete/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../prettify.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/examples/live-search/data.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../prettify.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/examples/live-search/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../prettify.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/examples/volunteers/data.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../prettify.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/examples/volunteers/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../prettify.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="prettify.js"></script>
<script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../prettify.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/server/component/changeset.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../prettify.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/server/component/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../prettify.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/server/component/index.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../prettify.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/server/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../prettify.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/server/index.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../prettify.js"></script>
<script>
Expand Down
15 changes: 6 additions & 9 deletions coverage/lcov-report/server/live_view_server.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -259,8 +259,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">server</a> live
<a name='L194'></a><a href='#L194'>194</a>
<a name='L195'></a><a href='#L195'>195</a>
<a name='L196'></a><a href='#L196'>196</a>
<a name='L197'></a><a href='#L197'>197</a>
<a name='L198'></a><a href='#L198'>198</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
<a name='L197'></a><a href='#L197'>197</a></td><td class="line-coverage quiet"><span class="cline-any cline-neutral">&nbsp;</span>
<span class="cline-any cline-yes">4x</span>
<span class="cline-any cline-yes">4x</span>
<span class="cline-any cline-yes">4x</span>
Expand Down Expand Up @@ -424,7 +423,6 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">server</a> live
<span class="cline-any cline-yes">2x</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>
<span class="cline-any cline-yes">1x</span>
<span class="cline-any cline-yes">1x</span>
<span class="cline-any cline-neutral">&nbsp;</span>
Expand Down Expand Up @@ -600,7 +598,7 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">server</a> live
// register live_title_tag helper
app.locals.live_title_tag = live_title_tag;
&nbsp;
app.get('/:liveview', async (req, res) =&gt; {
app.get('/:liveview', async (req, res, next) =&gt; {
const liveview = req.params.liveview;
&nbsp;
const emptyVoid = <span class="fstat-no" title="function not covered" >() =</span>&gt; { };
Expand All @@ -619,10 +617,9 @@ <h1><a href="../index.html">All files</a> / <a href="index.html">server</a> live
// look up component for route
const component = this._router[`/${liveview}`];
if (!component) {
// TODO which is better 404 or just call next()?
// next();
// return;
res.status(404).send("Not found");
// no component found for route so call next() to
// let a possible downstream route handle the request
next();
return;
}
&nbsp;
Expand Down Expand Up @@ -661,7 +658,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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../prettify.js"></script>
<script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../prettify.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/server/socket/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../prettify.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/server/socket/message_router.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -415,7 +415,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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../prettify.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/server/socket/types.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -373,7 +373,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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../prettify.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/server/socket/util.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../prettify.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/server/templates/diff.ts.html
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ <h1><a href="../../index.html">All files</a> / <a href="index.html">server/templ
<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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../prettify.js"></script>
<script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../../prettify.js"></script>
<script>
Expand Down
2 changes: 1 addition & 1 deletion coverage/lcov-report/server/templates/helpers/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../../prettify.js"></script>
<script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../../prettify.js"></script>
<script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -187,7 +187,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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../../prettify.js"></script>
<script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../../prettify.js"></script>
<script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../../prettify.js"></script>
<script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../../prettify.js"></script>
<script>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 Tue Feb 15 2022 22:36:43 GMT-0700 (Mountain Standard Time)
at Fri Feb 18 2022 12:47:17 GMT-0700 (Mountain Standard Time)
</div>
<script src="../../../prettify.js"></script>
<script>
Expand Down
Loading

0 comments on commit 9e07d22

Please sign in to comment.