fix: replace Deno.statSync with Deno.stat to allow views to be us…

…ed on Deno Deploy

.github/API/application.md

@@ -8,7 +8,7 @@ The `app` object conventionally denotes the Opine application. Create it by
 calling the top-level `opine()` function exported by the Opine module:
 
 ```ts
-import opine from "https://deno.land/x/[email protected].1/mod.ts";
+import opine from "https://deno.land/x/[email protected].2/mod.ts";
 
 const app = opine();
 
@@ -69,7 +69,7 @@ sub-app was mounted.
 > to a route.
 
 ```ts
-import opine from "https://deno.land/x/[email protected].1/mod.ts";
+import opine from "https://deno.land/x/[email protected].2/mod.ts";
 
 const app = opine(); // the main app
 const admin = opine(); // the sub app
@@ -487,7 +487,7 @@ starts listening for requests - this is provided for legacy reasons to aid in
 transitions from Express on Node.
 
 ```ts
-import opine from "https://deno.land/x/[email protected].1/mod.ts";
+import opine from "https://deno.land/x/[email protected].2/mod.ts";
 
 const app = opine();
 
@@ -523,7 +523,7 @@ This method is supported for legacy reasons to aid in transitions from Express
 on Node.
 
 ```ts
-import opine from "https://deno.land/x/[email protected].1/mod.ts";
+import opine from "https://deno.land/x/[email protected].2/mod.ts";
 
 const app = opine();
 const PORT = 3000;
@@ -542,7 +542,7 @@ starts listening for requests - this is provided for legacy reasons to aid in
 transitions from Express on Node.
 
 ```ts
-import opine from "https://deno.land/x/[email protected].1/mod.ts";
+import opine from "https://deno.land/x/[email protected].2/mod.ts";
 
 const app = opine();
 
@@ -560,7 +560,7 @@ starts listening for requests - this is provided for legacy reasons to aid in
 transitions from Express on Node.
 
 ```ts
-import opine from "https://deno.land/x/[email protected].1/mod.ts";
+import opine from "https://deno.land/x/[email protected].2/mod.ts";
 
 const app = opine();
 

.github/API/middlewares.md

@@ -28,7 +28,7 @@ reasons.
 > `toString` may not be a function and instead a string or other user-input.
 
 ```ts
-import { json, opine } from "https://deno.land/x/[email protected].1/mod.ts";
+import { json, opine } from "https://deno.land/x/[email protected].2/mod.ts";
 
 const app = opine();
 
@@ -77,7 +77,7 @@ reasons.
 > recommended.
 
 ```ts
-import { opine, raw } from "https://deno.land/x/[email protected].1/mod.ts";
+import { opine, raw } from "https://deno.land/x/[email protected].2/mod.ts";
 
 const app = opine();
 
@@ -230,7 +230,7 @@ reasons.
 > recommended.
 
 ```ts
-import { opine, text } from "https://deno.land/x/[email protected].1/mod.ts";
+import { opine, text } from "https://deno.land/x/[email protected].2/mod.ts";
 
 const app = opine();
 
@@ -277,7 +277,7 @@ reasons.
 > `toString` may not be a function and instead a string or other user-input.
 
 ```ts
-import { opine, urlencoded } from "https://deno.land/x/[email protected].1/mod.ts";
+import { opine, urlencoded } from "https://deno.land/x/[email protected].2/mod.ts";
 
 const app = opine();
 

.github/API/opine.md

@@ -8,15 +8,15 @@ Creates an Opine application. The `opine()` function is a top-level function
 exported by the Opine module:
 
 ```ts
-import opine from "https://deno.land/x/[email protected].1/mod.ts";
+import opine from "https://deno.land/x/[email protected].2/mod.ts";
 
 const app = opine();
 ```
 
 The `opine()` function is also exported as a named export:
 
 ```ts
-import { opine } from "https://deno.land/x/[email protected].1/mod.ts";
+import { opine } from "https://deno.land/x/[email protected].2/mod.ts";
 
 const app = opine();
 ```

.github/API/request.md

@@ -101,7 +101,7 @@ import {
   json,
   opine,
   urlencoded,
-} from "https://deno.land/x/[email protected].1/mod.ts";
+} from "https://deno.land/x/[email protected].2/mod.ts";
 
 const app = opine();
 
@@ -118,7 +118,7 @@ The following example shows how to implement your own simple body-parsing
 middleware to transform `req.body` into a raw string:
 
 ```ts
-import opine from "https://deno.land/x/[email protected].1/mod.ts";
+import opine from "https://deno.land/x/[email protected].2/mod.ts";
 
 import { readAll } from "https://deno.land/[email protected]/streams/conversion.ts";
 

.github/API/router.md

@@ -16,7 +16,7 @@ Opine has a top-level named function export `Router()` that creates a new
 `router` object.
 
 ```ts
-import { Router } from "https://deno.land/x/[email protected].1/mod.ts";
+import { Router } from "https://deno.land/x/[email protected].2/mod.ts";
 
 const router = Router(options);
 ```
@@ -260,7 +260,7 @@ function defined and work their way "down" the middleware stack processing for
 each path they match.
 
 ```ts
-import opine, { Router } from "https://deno.land/x/[email protected].1/mod.ts";
+import opine, { Router } from "https://deno.land/x/[email protected].2/mod.ts";
 
 const app = opine();
 const router = Router();

.github/CHANGELOG.md

@@ -1,5 +1,9 @@
 # ChangeLog
 
+## [2.3.2] - 27-08-2022
+
+- fix: replace `Deno.statSync` with `Deno.stat` to allow views to be used on Deno Deploy
+
 ## [2.3.1] - 27-08-2022
 
 - fix: improve error messages thrown from `read` module

README.md

@@ -50,7 +50,7 @@ import express from "npm:express";
 ## Getting Started
 
 ```ts
-import { opine } from "https://deno.land/x/[email protected].1/mod.ts";
+import { opine } from "https://deno.land/x/[email protected].2/mod.ts";
 
 const app = opine();
 
@@ -73,14 +73,14 @@ Before importing, [download and install Deno](https://deno.land/#installation).
 You can then import Opine straight into your project:
 
 ```ts
-import { opine } from "https://deno.land/x/[email protected].1/mod.ts";
+import { opine } from "https://deno.land/x/[email protected].2/mod.ts";
 ```
 
 Opine is also available on [nest.land](https://nest.land/package/opine), a
 package registry for Deno on the Blockchain.
 
 ```ts
-import { opine } from "https://x.nest.land/[email protected].1/mod.ts";
+import { opine } from "https://x.nest.land/[email protected].2/mod.ts";
 ```
 
 ## Features

docs/index.html

@@ -110,7 +110,7 @@ <h2>Table of Contents</h2>
 				<a href="#getting-started" id="getting-started" style="color: inherit; text-decoration: none;">
 					<h2>Getting Started</h2>
 				</a>
-				<pre><code class="language-ts"><span class="hljs-keyword">import</span> { opine } <span class="hljs-keyword">from</span> <span class="hljs-string">&quot;https://deno.land/x/[email protected].1/mod.ts&quot;</span>;
+				<pre><code class="language-ts"><span class="hljs-keyword">import</span> { opine } <span class="hljs-keyword">from</span> <span class="hljs-string">&quot;https://deno.land/x/[email protected].2/mod.ts&quot;</span>;
 
 <span class="hljs-keyword">const</span> app = opine();
 
@@ -129,11 +129,11 @@ <h2>Installation</h2>
 				repo and via the <a href="https://deno.land/x">Deno Registry</a>.</p>
 				<p>Before importing, <a href="https://deno.land/#installation">download and install Deno</a>.</p>
 				<p>You can then import Opine straight into your project:</p>
-				<pre><code class="language-ts"><span class="hljs-keyword">import</span> { opine } <span class="hljs-keyword">from</span> <span class="hljs-string">&quot;https://deno.land/x/[email protected].1/mod.ts&quot;</span>;
+				<pre><code class="language-ts"><span class="hljs-keyword">import</span> { opine } <span class="hljs-keyword">from</span> <span class="hljs-string">&quot;https://deno.land/x/[email protected].2/mod.ts&quot;</span>;
 </code></pre>
 				<p>Opine is also available on <a href="https://nest.land/package/opine">nest.land</a>, a
 				package registry for Deno on the Blockchain.</p>
-				<pre><code class="language-ts"><span class="hljs-keyword">import</span> { opine } <span class="hljs-keyword">from</span> <span class="hljs-string">&quot;https://x.nest.land/[email protected].1/mod.ts&quot;</span>;
+				<pre><code class="language-ts"><span class="hljs-keyword">import</span> { opine } <span class="hljs-keyword">from</span> <span class="hljs-string">&quot;https://x.nest.land/[email protected].2/mod.ts&quot;</span>;
 </code></pre>
 				<a href="#features" id="features" style="color: inherit; text-decoration: none;">
 					<h2>Features</h2>

egg.json

@@ -1,7 +1,7 @@
 {
   "name": "opine",
   "description": "Minimalist web framework for Deno ported from ExpressJS.",
-  "version": "2.3.1",
+  "version": "2.3.2",
   "repository": "https://github.com/cmorten/opine",
   "stable": true,
   "checkFormat": false,

src/application.ts

@@ -457,7 +457,7 @@ async function tryRender(view: any, options: any, callback: Function) {
  * @param {Function} callback
  * @public
  */
-app.render = function render(
+app.render = async function render(
   name: string,
   options: any,
   callback: Function = () => {},
@@ -501,13 +501,17 @@ app.render = function render(
   if (!view) {
     const View = this.get("view");
 
-    view = new View(name, {
-      defaultEngine: this.get("view engine"),
-      engines,
-      root: this.get("views"),
-    });
+    try {
+      view = new View(name, {
+        defaultEngine: this.get("view engine"),
+        engines,
+        root: this.get("views"),
+      });
+    } catch (e) {
+      return done(e);
+    }
 
-    if (!view.path) {
+    if (!await view.pathPromise) {
       const dirs = Array.isArray(view.root) && view.root.length > 1
         ? `directories "${view.root.slice(0, -1).join('", "')}" or "${
           view.root[view.root.length - 1]
@@ -530,7 +534,7 @@ app.render = function render(
   }
 
   // render
-  tryRender(view, renderOptions, done);
+  await tryRender(view, renderOptions, done);
 };
 
 const isTlsOptions = (

src/view.ts

@@ -11,13 +11,13 @@ import {
  * Return a stat, maybe.
  *
  * @param {string} path
- * @return {Deno.FileInfo}
+ * @return {Promise<Deno.FileInfo>}
  * @private
  */
-function tryStat(path: string) {
+async function tryStat(path: string) {
   try {
-    return Deno.statSync(path);
-  } catch (e) {
+    return await Deno.stat(path);
+  } catch {
     return undefined;
   }
 }
@@ -32,7 +32,7 @@ export class View {
   name!: any;
   root!: any;
   engine!: any;
-  path!: any;
+  pathPromise!: any;
 
   /**
    * Initialize a new `View` with the given `name`.
@@ -82,7 +82,7 @@ export class View {
     this.engine = options.engines[this.ext];
 
     // lookup path
-    this.path = this.lookup(fileName);
+    this.pathPromise = this.lookup(fileName);
   }
 
   /**
@@ -92,9 +92,9 @@ export class View {
    * @param {string} file
    * @private
    */
-  resolve(dir: string, file: string) {
+  async resolve(dir: string, file: string) {
     let path = join(dir, file);
-    let stat = tryStat(path);
+    let stat = await tryStat(path);
 
     if (stat && stat.isFile) {
       return path;
@@ -103,7 +103,7 @@ export class View {
     // <path>/index.<ext>
     const ext = this.ext;
     path = join(dir, basename(file, ext), `index${ext}`);
-    stat = tryStat(path);
+    stat = await tryStat(path);
 
     if (stat && stat.isFile) {
       return path;
@@ -116,7 +116,7 @@ export class View {
    * @param {string} name
    * @private
    */
-  lookup(name: string) {
+  async lookup(name: string) {
     const roots = [].concat(this.root);
     let path;
 
@@ -125,7 +125,7 @@ export class View {
       const loc = resolve(root, name);
       const dir = dirname(loc);
       const file = basename(loc);
-      path = this.resolve(dir, file);
+      path = await this.resolve(dir, file);
     }
 
     return path;
@@ -139,7 +139,8 @@ export class View {
    * @private
    */
   async render(options: object, callback: Function) {
-    const out = await this.engine(this.path, options);
+    const path = await this.pathPromise;
+    const out = await this.engine(path, options);
     callback(undefined, out);
   }
 }

test/units/app.render.test.ts

@@ -78,7 +78,7 @@ describe("app", function () {
 
       function View(this: any, name: string, options: any) {
         this.name = name;
-        this.path = "fake";
+        this.pathPromise = Promise.resolve("fake");
       }
 
       View.prototype.render = function (options: any, fn: any) {
@@ -230,7 +230,7 @@ describe("app", function () {
 
         function View(this: any, name: string, options: any) {
           this.name = name;
-          this.path =
+          this.pathPromise =
             "path is required by application.js as a signal of success even though it is not used there.";
         }
 
@@ -255,7 +255,7 @@ describe("app", function () {
 
         function View(this: any, name: string, options: any) {
           this.name = name;
-          this.path = "fake";
+          this.pathPromise = "fake";
           count++;
         }
 
@@ -285,7 +285,7 @@ describe("app", function () {
 
         function View(this: any, name: string, options: any) {
           this.name = name;
-          this.path = "fake";
+          this.pathPromise = "fake";
           count++;
         }
 
@@ -364,7 +364,7 @@ describe("app", function () {
 
         function View(this: any, name: string, options: any) {
           this.name = name;
-          this.path = "fake";
+          this.pathPromise = "fake";
           count++;
         }
 

version.ts

@@ -1,7 +1,7 @@
 /**
  * Version of Opine.
  */
-export const VERSION = "2.3.1";
+export const VERSION = "2.3.2";
 
 /**
  * Supported version of Deno.