From 56775c890de0fe316fc2d4398281d79443b2f290 Mon Sep 17 00:00:00 2001
From: Emre Guneyler <eguneys@hotmail.com>
Date: Mon, 14 Sep 2020 22:31:42 +0000
Subject: [PATCH] patreon link

---
 README.md |  2 ++
 index.js  | 24 +++++++++++++-----------
 page.js   |  7 ++++---
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/README.md b/README.md
index faa29ff..d65036d 100644
--- a/README.md
+++ b/README.md
@@ -120,4 +120,6 @@ Questions about parsing:
 - https://stackoverflow.com/questions/63876748/how-to-parse-a-string-of-commands-that-appear-multiple-times-into-an-array
 - https://stackoverflow.com/questions/63880636/how-to-get-matched-index-of-a-regex-for-all-occurences
 
+[Become patreon](https://www.patreon.com/eguneys)
+
 Happy blogging 💙
diff --git a/index.js b/index.js
index 49ad11c..9670efc 100644
--- a/index.js
+++ b/index.js
@@ -6,6 +6,7 @@ function readFiles(indir, cb) {
   fs.readdir(indir, (err, files) => {
     if (err) {
       cb(err);
+      return;
     }
 
     let res = [];
@@ -26,43 +27,44 @@ function readFiles(indir, cb) {
 }
 
 function writeFiles(pages, outdir, cb) {
-  let c = 0;
+  let c = 0,
+      w = 0;
 
   for (let i = 0; i < pages.length; i += 2) {
     let filename = pages[i],
         content = pages[i + 1];
     fs.writeFile(`${outdir}/${filename}`, content, err => {
       if (err) {
-        console.log(`Error writing output file ${filename} skipping, ${err.message}`);
+        console.log(`skipping ${filename}, ${err.code}`);
       } else {
         console.log('✓ ' + filename);
+        w++;
       }
 
       c++;
 
       if (c * 2 === pages.length) {
-        cb(null, c);
+        cb(!w, w);
       }
     });
   }
 }
 
-function app() {
-  let indir = process.argv[2];
-  let outdir = process.argv[3];
+function app(indir, outdir) {
   readFiles(indir, (err, defs) => {
     if (err) {
-      throw err;
+      console.error(`${err.code}`);
+      return;
     }
 
     writeFiles(jener(defs), outdir, (err, c) => {
       if (err) {
-        throw err;
+        console.error(`Couldn't write any files`);
+      } else {
+        console.log(`Generated ${c} files.`);
       }
-
-      console.log(`Generated ${c} files.`);
     });
   });
 }
 
-app();
\ No newline at end of file
+module.exports = app;
\ No newline at end of file
diff --git a/page.js b/page.js
index 6159a62..13f0a84 100644
--- a/page.js
+++ b/page.js
@@ -3,9 +3,10 @@ const regMixin = /<!-- #mixin \b(\w+)\b -->\n([\s\S]*)/;
 const regPage0 = /<!-- #page -->\n([\s\S]*)/;
 const regPage = /<!-- #page \b(\w+)\b -->\n([\s\S]*)/;
 const regPage2 = /<!-- #page \b(\w+)\b \b(\w+)\b -->\n([\s\S]*)/;
-const regPageContent = /<!-- #content \b(\w+)\b -->\n([\s\S]*)/;
-const regPageContentNonGreedy = /<!-- #content \b\w+\b -->\n[\s\S]*?(?=<!-- #content|$)/g;
+const regPageContent = /<!-- #content \b(\w+)\b -->\n?([\s\S]*)/;
+const regPageContentNonGreedy = /<!-- #content \b\w+\b -->\n?[\s\S]*?(?=<!-- #content|$)/g;
 const regPageContentRest = /([\s\S]*?)(?=<!-- #content|$)/;
+const regPageContentRestOptionalNl = /([\s\S]*?)(?=\n?<!-- #content|$)/;
 
 function jener(defs) {
   let layouts = {},
@@ -82,7 +83,7 @@ function page(page, layout, replace) {
   let res = [];
 
   if (replace) {
-    let match = page.match(regPageContentRest);
+    let match = page.match(regPageContentRestOptionalNl);
     res.push(freplace(replace, match[1]));
   }