@mojojs/core 0.12.4 → 0.15.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mojojs/core",
-  "version": "0.12.4",
+  "version": "0.15.0",
   "description": "Real-time web framework",
   "keywords": [
     "web",
@@ -51,7 +51,6 @@
   "devDependencies": {
     "@istanbuljs/esm-loader-hook": "^0.1.2",
     "@types/busboy": "^0.3.1",
-    "@types/ejs": "^3.0.6",
     "@types/js-yaml": "^4.0.3",
     "@types/lru-cache": "^5.1.0",
     "@types/mime-types": "^2.1.0",
@@ -77,12 +76,12 @@
     "node": ">= 16"
   },
   "dependencies": {
-    "@mojojs/dom": "^1.0.1",
+    "@mojojs/dom": "^1.1.2",
     "@mojojs/path": "^1.1.2",
+    "@mojojs/template": "^1.0.0",
     "ajv": "^8.5.0",
     "busboy": "^1.0.0",
     "chalk": "^5.0.0",
-    "ejs": "^3.1.6",
     "form-data": "^4.0.0",
     "js-yaml": "^4.1.0",
     "lru-cache": "^6.0.0",

package/vendor/views/mojo/{debug.html.ejs → 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() {
@@ -69,7 +69,7 @@
               </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) %>
+                <% const context = await view.exceptionContext(exception); %>
                 <% if (context !== null) { %>
                   <div>
                     <table class="mojo-wide">
@@ -130,9 +130,9 @@
                       <% } %>
                     </td>
                   </tr>
-                  <% depth++ %>
+                  <% depth++; %>
                   <%= route.children.map(child => walk(child, depth)).join('') %>
-                  <% depth-- %>
+                  <% depth--; %>
                 <% } %>
                 <table class="mojo-striped-light mojo-wide">
                   <thead>
@@ -162,7 +162,7 @@
                 <%= 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 %>
+                <% const rawHeaders = ctx.req.raw.rawHeaders; %>
                 <% for (let i = 0; i < rawHeaders.length; i += 2) { %>
                   <%= keyValue(rawHeaders[i], rawHeaders[i + 1]) %>
                 <% } %>
@@ -171,7 +171,7 @@
           </div>
           <div class="row">
             <% if (ctx.app.log.history.length > 0) { %>
-              <% const log = ctx.app.log.history.map(view.stringFormatter).join('') %>
+              <% const log = ctx.app.log.history.map(view.stringFormatter).join(''); %>
               <pre class="mojo-terminal"><code class="nohighlight"><%= log %></code></pre>
             <% } else { %>
               <div class="alert alert-warning mojo-wide" role="alert">

package/vendor/views/mojo/{exception.html.ejs → exception.html.mt}

@@ -3,7 +3,7 @@
 <html>
   <head>
     <title>Server Error</title>
-    <%- ctx.mojoFaviconTag() %>
+    <%= ctx.mojoFaviconTag() %>
     <style>
       body {
         background-color: #caecf6;

package/vendor/views/mojo/{not-found.html.ejs → not-found.html.mt}

@@ -3,7 +3,7 @@
 <html>
   <head>
     <title>Page Not Found</title>
-    <%- ctx.mojoFaviconTag() %>
+    <%= ctx.mojoFaviconTag() %>
     <style>
       a img {
         border: 0;

package/lib/plugins/ejs-engine.d.ts

@@ -1,2 +0,0 @@
-import type { App } from '../app.js';
-export default function ejsEnginePlugin(app: App): void;

package/lib/plugins/ejs-engine.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"ejs-engine.js","sourceRoot":"","sources":["../../src/plugins/ejs-engine.ts"],"names":[],"mappings":"AAGA,OAAO,EAAC,UAAU,EAAC,MAAM,QAAQ,CAAC;AAClC,OAAO,IAAI,MAAM,cAAc,CAAC;AAChC,OAAO,EAAC,OAAO,EAAC,MAAM,KAAK,CAAC;AAC5B,OAAO,GAAG,MAAM,WAAW,CAAC;AAE5B,MAAM,CAAC,OAAO,UAAU,eAAe,CAAC,GAAQ;IAC9C,GAAG,CAAC,QAAQ,CAAC,SAAS,CAAC,KAAK,EAAE,IAAI,SAAS,EAAE,CAAC,CAAC;AACjD,CAAC;AAED,MAAM,SAAS;IAAf;QACE,UAAK,GAAuC,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IA0B3D,CAAC;IAxBC,KAAK,CAAC,MAAM,CAAC,GAAgB,EAAE,OAAsB;QACnD,IAAI,QAAQ,CAAC;QAEb,IAAI,OAAO,CAAC,MAAM,KAAK,SAAS,EAAE;YAChC,MAAM,QAAQ,GAAG,UAAU,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YACxE,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAEpC,IAAI,QAAQ,KAAK,SAAS,EAAE;gBAC1B,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC,MAAM,EAAE,EAAC,KAAK,EAAE,IAAI,EAAC,CAAC,CAAC;gBAClD,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;aACpC;SACF;aAAM;YACL,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YAE5C,IAAI,QAAQ,KAAK,SAAS,EAAE;gBAC1B,IAAI,OAAO,CAAC,QAAQ,KAAK,SAAS;oBAAE,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;gBAC7F,MAAM,MAAM,GAAG,MAAM,IAAI,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;gBACjE,QAAQ,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,EAAC,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAAC,CAAC,CAAC;gBACjF,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;aAC5C;SACF;QAED,OAAO,MAAM,CAAC,IAAI,CAAC,MAAM,QAAQ,CAAC,EAAC,GAAG,GAAG,CAAC,KAAK,EAAE,KAAK,EAAE,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,OAAO,EAAC,CAAC,CAAC,CAAC;IAC3F,CAAC;CACF"}

package/lib/validator/schema.d.ts

@@ -1,8 +0,0 @@
-import type { JSONValue } from '../types.js';
-import type { ValidateFunction } from 'ajv';
-import { ValidatorResult } from './result.js';
-export declare class ValidatorSchema {
-    _validate: ValidateFunction;
-    constructor(validate: ValidateFunction);
-    validate(data: JSONValue): ValidatorResult;
-}

package/lib/validator/schema.js

@@ -1,19 +0,0 @@
-import { ValidatorResult } from './result.js';
-export class ValidatorSchema {
-    constructor(validate) {
-        this._validate = validate;
-    }
-    validate(data) {
-        const validate = this._validate;
-        const isValid = validate(data);
-        const errors = [];
-        const results = validate.errors;
-        if (results != null) {
-            for (const error of results) {
-                errors.push({ instancePath: error.instancePath, schemaPath: error.schemaPath, message: error.message });
-            }
-        }
-        return new ValidatorResult(isValid, errors);
-    }
-}
-//# sourceMappingURL=schema.js.map

package/lib/validator/schema.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"schema.js","sourceRoot":"","sources":["../../src/validator/schema.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,eAAe,EAAC,MAAM,aAAa,CAAC;AAE5C,MAAM,OAAO,eAAe;IAG1B,YAAY,QAA0B;QACpC,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;IAC5B,CAAC;IAED,QAAQ,CAAC,IAAe;QACtB,MAAM,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC;QAChC,MAAM,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC;QAE/B,MAAM,MAAM,GAAG,EAAE,CAAC;QAClB,MAAM,OAAO,GAAG,QAAQ,CAAC,MAAM,CAAC;QAChC,IAAI,OAAO,IAAI,IAAI,EAAE;YACnB,KAAK,MAAM,KAAK,IAAI,OAAO,EAAE;gBAC3B,MAAM,CAAC,IAAI,CAAC,EAAC,YAAY,EAAE,KAAK,CAAC,YAAY,EAAE,UAAU,EAAE,KAAK,CAAC,UAAU,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,EAAC,CAAC,CAAC;aACvG;SACF;QAED,OAAO,IAAI,eAAe,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC;IAC9C,CAAC;CACF"}