@mojojs/core 0.15.0 → 0.15.1

package/lib/cli/create-full-app.js

@@ -53,18 +53,18 @@ const jsController = `export default class Controller {
 const mtLayout = `<!DOCTYPE html>
 <html>
   <head>
-    <%%- ctx.mojoFaviconTag() %%>
+    <%%= ctx.mojoFaviconTag() %>
     <title>Welcome</title>
   </head>
-  <body><%%- view.content %></body>
+  <body><%%== view.content %></body>
 </html>
 `;
-const mtView = `<%% view.layout = 'default'; %%>
+const mtView = `<%% view.layout = 'default'; %>
 <h2><%%= msg %></h2>
 <p>
   This page was generated from the template "views/example/welcome.html.mt" and the layout
-  "views/layouts/default.html.mt", <a href="<%%= ctx.urlFor() %%>">click here</a> to reload the page or
-  <a href="<%%= ctx.urlFor('/public/index.html') %%>">here</a> to move forward to a static page.
+  "views/layouts/default.html.mt", <a href="<%%= ctx.urlFor() %>">click here</a> to reload the page or
+  <a href="<%%= ctx.urlFor('/public/index.html') %>">here</a> to move forward to a static page.
 </p>
 `;
 const staticFile = `<!DOCTYPE html>

package/lib/cli/create-lite-app.js

@@ -38,7 +38,7 @@ app.start();
 const indexTemplate = \`
 <h1>Waiting...</h1>
 <script>
-  const ws = new WebSocket('<%%= ctx.urlFor('heading') %%>');
+  const ws = new WebSocket('<%%= ctx.urlFor('heading') %>');
   ws.onmessage = event => { document.querySelector('h1').innerHTML = event.data };
 </script>
 \`;
@@ -47,10 +47,10 @@ const defaultLayout = \`
 <!DOCTYPE html>
 <html>
   <head>
-    <%%- ctx.mojoFaviconTag() %%>
-    <title><%%= title %%></title>
+    <%%= ctx.mojoFaviconTag() %>
+    <title><%%= title %></title>
   </head>
-  <body><%%- view.content %%></body>
+  <body><%%== view.content %></body>
 </html>
 \`;
 `;

package/lib/core.d.ts

@@ -1,6 +1,6 @@
 /*!
  * mojo.js
- * Copyright (C) 2021 Sebastian Riedel
+ * Copyright (C) 2021-2022 Sebastian Riedel
  * MIT Licensed
  */
 import type { AppOptions } from './types.js';

package/lib/plugins/view-helpers.js

@@ -1,6 +1,7 @@
 import { inspect } from 'util';
 import DOM, { SafeString } from '@mojojs/dom';
 export default function viewHelpersPlugin(app) {
+    app.addHelper('currentRoute', currentRoute);
     app.decorateContext('inspect', (object, options) => inspect(object, options));
     app.addHelper('include', include);
     app.addHelper('mojoFaviconTag', mojoFaviconTag);
@@ -8,6 +9,15 @@ export default function viewHelpersPlugin(app) {
     app.addHelper('styleTag', styleTag);
     app.addHelper('tag', tag);
 }
+function currentRoute(ctx) {
+    const plan = ctx.plan;
+    if (plan === null)
+        return null;
+    const endpoint = plan.endpoint;
+    if (endpoint === undefined)
+        return null;
+    return endpoint.customName ?? endpoint.defaultName ?? null;
+}
 async function include(ctx, options, stash) {
     return await ctx.renderToString(options, stash);
 }

package/lib/plugins/view-helpers.js.map

@@ -1 +1 @@
-{"version":3,"file":"view-helpers.js","sourceRoot":"","sources":["../../src/plugins/view-helpers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAC7B,OAAO,GAAG,EAAE,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AAE5C,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,GAAY;IACpD,GAAG,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,MAA2B,EAAE,OAAuB,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAEnH,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAElC,GAAG,CAAC,SAAS,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;IAChD,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACtC,GAAG,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACpC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAC5B,CAAC;AAED,KAAK,UAAU,OAAO,CAAC,GAAgB,EAAE,OAAsB,EAAE,KAA0B;IACzF,OAAO,MAAM,GAAG,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,cAAc,CAAC,GAAgB;IACtC,OAAO,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,EAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAC,CAAC,CAAC;AACnF,CAAC;AAED,SAAS,SAAS,CAAC,GAAgB,EAAE,MAAc;IACjD,OAAO,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAC,GAAG,EAAE,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,QAAQ,CAAC,GAAgB,EAAE,MAAc;IAChD,OAAO,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,EAAC,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC;AAC5E,CAAC;AAED,SAAS,GAAG,CACV,GAAgB,EAChB,IAAY,EACZ,QAAgC,EAAE,EAClC,UAA+B,EAAE;IAEjC,OAAO,IAAI,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;AACrE,CAAC"}
+{"version":3,"file":"view-helpers.js","sourceRoot":"","sources":["../../src/plugins/view-helpers.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;AAC7B,OAAO,GAAG,EAAE,EAAC,UAAU,EAAC,MAAM,aAAa,CAAC;AAE5C,MAAM,CAAC,OAAO,UAAU,iBAAiB,CAAC,GAAY;IACpD,GAAG,CAAC,SAAS,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;IAE5C,GAAG,CAAC,eAAe,CAAC,SAAS,EAAE,CAAC,MAA2B,EAAE,OAAuB,EAAE,EAAE,CAAC,OAAO,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAEnH,GAAG,CAAC,SAAS,CAAC,SAAS,EAAE,OAAO,CAAC,CAAC;IAElC,GAAG,CAAC,SAAS,CAAC,gBAAgB,EAAE,cAAc,CAAC,CAAC;IAChD,GAAG,CAAC,SAAS,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;IACtC,GAAG,CAAC,SAAS,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IACpC,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC;AAC5B,CAAC;AAED,SAAS,YAAY,CAAC,GAAgB;IACpC,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC;IACtB,IAAI,IAAI,KAAK,IAAI;QAAE,OAAO,IAAI,CAAC;IAC/B,MAAM,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC;IAC/B,IAAI,QAAQ,KAAK,SAAS;QAAE,OAAO,IAAI,CAAC;IACxC,OAAO,QAAQ,CAAC,UAAU,IAAI,QAAQ,CAAC,WAAW,IAAI,IAAI,CAAC;AAC7D,CAAC;AAED,KAAK,UAAU,OAAO,CAAC,GAAgB,EAAE,OAAsB,EAAE,KAA0B;IACzF,OAAO,MAAM,GAAG,CAAC,cAAc,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC;AAClD,CAAC;AAED,SAAS,cAAc,CAAC,GAAgB;IACtC,OAAO,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,EAAC,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,mBAAmB,CAAC,EAAC,CAAC,CAAC;AACnF,CAAC;AAED,SAAS,SAAS,CAAC,GAAgB,EAAE,MAAc;IACjD,OAAO,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,EAAC,GAAG,EAAE,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC;AAC1D,CAAC;AAED,SAAS,QAAQ,CAAC,GAAgB,EAAE,MAAc;IAChD,OAAO,GAAG,CAAC,GAAG,CAAC,MAAM,EAAE,EAAC,GAAG,EAAE,YAAY,EAAE,IAAI,EAAE,GAAG,CAAC,UAAU,CAAC,MAAM,CAAC,EAAC,CAAC,CAAC;AAC5E,CAAC;AAED,SAAS,GAAG,CACV,GAAgB,EAChB,IAAY,EACZ,QAAgC,EAAE,EAClC,UAA+B,EAAE;IAEjC,OAAO,IAAI,UAAU,CAAC,GAAG,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,OAAO,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;AACrE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojojs/core",
-  "version": "0.15.0",
+  "version": "0.15.1",
   "description": "Real-time web framework",
   "keywords": [
     "web",

package/vendor/README.md

@@ -4,7 +4,7 @@ This distribution includes a few files with different licenses that have been bu
 
 * Mojolicious Artwork
 
-  Copyright (C) 2010-2021, Sebastian Riedel.
+  Copyright (C) 2010-2022, Sebastian Riedel.
 
   Licensed under the [CC-SA License, Version 4.0](http://creativecommons.org/licenses/by-sa/4.0).
 

package/vendor/views/mojo/debug.html.mt

@@ -3,13 +3,13 @@
 <html>
   <head>
     <title>Debug</title>
-    <%= ctx.mojoFaviconTag() %>
-    <%= ctx.scriptTag('/mojo/bootstrap/bootstrap.bundle.min.js') %>
-    <%= ctx.scriptTag('/mojo/highlight.js/highlight.pack.js') %>
-    <%= ctx.styleTag('/mojo/bootstrap/bootstrap.min.css') %>
-    <%= ctx.styleTag('/mojo/highlight.js/highlight-mojo-dark.css') %>
-    <%= ctx.styleTag('https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css') %>
-    <%= ctx.styleTag('/mojo/mojo.css') %>
+    %= ctx.mojoFaviconTag()
+    %= ctx.scriptTag('/mojo/bootstrap/bootstrap.bundle.min.js')
+    %= ctx.scriptTag('/mojo/highlight.js/highlight.pack.js')
+    %= ctx.styleTag('/mojo/bootstrap/bootstrap.min.css')
+    %= ctx.styleTag('/mojo/highlight.js/highlight-mojo-dark.css')
+    %= ctx.styleTag('https://cdnjs.cloudflare.com/ajax/libs/font-awesome/5.15.3/css/all.min.css')
+    %= ctx.styleTag('/mojo/mojo.css')
     <script>
       hljs.initHighlightingOnLoad();
       window.onload = function() {
@@ -61,7 +61,7 @@
       <div class="row flex-wrap">
         <main class="col-sm-12 col-md-8 col-lg-10 py-md-3 pl-md-5">
           <div class="row mojo-divider">
-            <% if (ctx.stash.exception !== undefined) { %>
+            % if (ctx.stash.exception !== undefined) {
               <div class="alert alert-danger mojo-wide" role="alert">
                 <h2>Server Error</h2>
                 This application is in <b>development</b> mode and will show internal information to help you with
@@ -69,33 +69,33 @@
               </div>
               <div id="showcase" class="mojo-box mojo-code mojo-no-bottom-border mojo-no-top-border mojo-border-radius-top">
                 <pre id="error" class="mojo-error"><%= exception %></pre>
-                <% const context = await view.exceptionContext(exception); %>
-                <% if (context !== null) { %>
+                % const context = await view.exceptionContext(exception);
+                % if (context !== null) {
                   <div>
                     <table class="mojo-wide">
-                      <% for (const line of context.source) { %>
-                        <% const extra = context.line === line.num ? ' mojo-important' : ''; %>
+                      % for (const line of context.source) {
+                        % const extra = context.line === line.num ? ' mojo-important' : '';
                         <tr>
                           <td class="text-right<%= extra %>"><%= line.num %></td>
                           <td class="mojo-context mojo-wide<%= extra %>"><pre><code><%= line.code %></code></pre></td>
                         </tr>
-                      <% } %>
+                      % }
                     </table>
                   </div>
-                <% } %>
+                % }
               </div>
               <div id="trace" class="mojo-box mojo-no-padding more mojo-no-top-border mojo-border-radius-bottom">
                 <div id="frames" class="more">
                   <table class="mojo-striped-grey mojo-wide">
-                    <% const lines = exception.stack.split('\n').filter(line => line.match(/^\s*at\ /)); %>
-                    <% const trace = lines.map(val => val.replace(/^\s+/, '')); %>
-                    <% for (const frame of trace) { %>
+                    % const lines = exception.stack.split('\n').filter(line => line.match(/^\s*at\ /));
+                    % const trace = lines.map(val => val.replace(/^\s+/, ''));
+                    % for (const frame of trace) {
                       <tr><td class="mojo-value"><pre><%= frame %></pre></td></tr>
-                    <% } %>
+                    % }
                   </table>
                 </div>
               </div>
-            <% } else { %>
+            % } else {
               <div class="alert alert-warning mojo-wide" role="alert">
                 <h2>Page Not Found</h2>
                 This application is in <b>development</b> mode and will show internal information to help you with
@@ -108,12 +108,12 @@
                     for <code><%= ctx.req.path %></code>, maybe you need to add a new one?
                   </p>
                 </div>
-                <% function walk (route, depth) { %>
-                  <% const pattern = route.pattern; %>
-                  <% let unparsed = pattern.unparsed || '/'; %>
-                  <% if (depth > 0) unparsed = `+${unparsed}`; %>
-                  <% pattern.match('/', {isEndpoint: route.isEndpoint}); %>
-                  <% const regex = pattern.regex.toString(); %>
+                % function walk (route, depth) {
+                  % const pattern = route.pattern;
+                  % let unparsed = pattern.unparsed || '/';
+                  % if (depth > 0) unparsed = `+${unparsed}`;
+                  % pattern.match('/', {isEndpoint: route.isEndpoint});
+                  % const regex = pattern.regex.toString();
                   <tr data-bs-toggle="tooltip" data-bs-placement="left" data-bs-html="true"
                     title="<b>Regex:</b> <code><%= regex %></code>">
                     <td class="mojo-value">
@@ -123,17 +123,17 @@
                       <pre><%= route.methods.join(', ').toUpperCase() || '*' %></pre>
                     </td>
                     <td class="mojo-value">
-                      <% if (route.customName !== undefined) { %>
+                      % if (route.customName !== undefined) {
                         <span class="badge bg-success"><%= route.customName %></span>
-                      <% } else if (route.defaultName !== undefined) { %>
+                      % } else if (route.defaultName !== undefined) {
                         <span class="badge bg-secondary"><%= route.defaultName %></span>
-                      <% } %>
+                      % }
                     </td>
                   </tr>
-                  <% depth++; %>
-                  <%= route.children.map(child => walk(child, depth)).join('') %>
-                  <% depth--; %>
-                <% } %>
+                  % depth++;
+                  %= route.children.map(child => walk(child, depth)).join('')
+                  % depth--;
+                % }
                 <table class="mojo-striped-light mojo-wide">
                   <thead>
                     <tr>
@@ -142,43 +142,43 @@
                       <th>Name</th>
                     </tr>
                   </thead>
-                  <%= ctx.app.router.children.map(child => walk(child, 0)).join('') %>
+                  %= ctx.app.router.children.map(child => walk(child, 0)).join('')
                 </table>
               </div>
-            <% } %>
+            % }
           </div>
           <div class="row mojo-divider">
             <div id="request" class="mojo-box mojo-no-padding mojo-border-radius-both">
-              <% function keyValue (key, value) { %>
+              % function keyValue (key, value) {
               <tr>
                 <td class="mojo-key text-right"><%= key %>:</td>
                 <td class="mojo-value"><pre><%= value %></pre></td>
               </tr>
-              <% } %>
+              % }
               <table class="mojo-striped mojo-fixed-table mojo-wide">
-                <%= keyValue('Request ID', ctx.req.requestId) %>
-                <%= keyValue('Method', ctx.req.method) %>
-                <%= keyValue('Path', ctx.req.path) %>
-                <%= keyValue('Base URL', ctx.req.baseUrl) %>
-                <%= keyValue('Parameters', ctx.inspect((await ctx.params()).toObject())) %>
-                <%= keyValue('Stash', ctx.inspect(ctx.stash) ) %>
-                <% const rawHeaders = ctx.req.raw.rawHeaders; %>
-                <% for (let i = 0; i < rawHeaders.length; i += 2) { %>
-                  <%= keyValue(rawHeaders[i], rawHeaders[i + 1]) %>
-                <% } %>
+                %= keyValue('Request ID', ctx.req.requestId)
+                %= keyValue('Method', ctx.req.method)
+                %= keyValue('Path', ctx.req.path)
+                %= keyValue('Base URL', ctx.req.baseUrl)
+                %= keyValue('Parameters', ctx.inspect((await ctx.params()).toObject()))
+                %= keyValue('Stash', ctx.inspect(ctx.stash) )
+                % const rawHeaders = ctx.req.raw.rawHeaders;
+                % for (let i = 0; i < rawHeaders.length; i += 2) {
+                  %= keyValue(rawHeaders[i], rawHeaders[i + 1])
+                % }
               </table>
             </div>
           </div>
           <div class="row">
-            <% if (ctx.app.log.history.length > 0) { %>
-              <% const log = ctx.app.log.history.map(view.stringFormatter).join(''); %>
+            % if (ctx.app.log.history.length > 0) {
+              % const log = ctx.app.log.history.map(view.stringFormatter).join('');
               <pre class="mojo-terminal"><code class="nohighlight"><%= log %></code></pre>
-            <% } else { %>
+            % } else {
               <div class="alert alert-warning mojo-wide" role="alert">
                 The application log appears to be empty, perhaps the log level <b><%= ctx.app.log.level %></b> is too
                 high? Try lowering it to <b>trace</b> for framework specific information.
               </div>
-            <% } %>
+            % }
           </div>
         </main>
       </div>
@@ -190,7 +190,7 @@
             <b>Free</b> and <b>Open Source</b>.
           </div>
           <div class="col-sm align-self-center text-center mojo-copy">
-              <i class="far fa-copyright"></i> 2021 Sebastian Riedel and the
+              <i class="far fa-copyright"></i> 2021-2022 Sebastian Riedel and the
               <a href="https://github.com/mojolicious/mojo.js/AUTHORS">mojo.js contributors</a>.
           </div>
           <div class="col-sm align-self-center text-center mojo-social">