- fix bug: pug malformat crashes the whole server

zbryikt · Feb 5, 2021 · f44742a · f44742a
1 parent 2b594f0
commit f44742a
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 15 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,10 @@
 # Change Log
 
+## 2.2.2
+
+ - fix bug: pug malformat crashes the whole server
+
+
 ## 2.2.1
 
  - fix bug: update of dependencies doesn't trigger pug file's rebuilding.

diff --git a/bin/lib/tree/PugTree.js b/bin/lib/tree/PugTree.js
diff --git a/lib/tree/PugTree.ls b/lib/tree/PugTree.ls
@@ -5,10 +5,21 @@ pugtree = new DocTree do
   parser: (c, f) ->
     /* use pug dependencies tracking */
     cwd = path.resolve process.cwd!
-    ret2 = pug.compileClientWithDependenciesTracked(
-      c,
-      {basedir: path.join(cwd,path.dirname f), filename: f} <<< pugbuild.extapi
-    )
-    return ret2.dependencies.map(-> it.replace cwd, '../..')
+    try
+      ret2 = pug.compileClientWithDependenciesTracked(
+        c,
+        {basedir: path.join(cwd,path.dirname f), filename: f} <<< pugbuild.extapi
+      )
+      return ret2.dependencies.map(-> it.replace cwd, '../..')
+    catch e
+      try
+        ret = c
+          .split \\n
+          .map -> /\s*(extend|include)\s+(.+)$/.exec(it)
+          .filter -> it
+          .map -> it.2
+      catch e
+        return []
+
 
 module.exports = pugtree
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -4,7 +4,7 @@
   "license": "MIT",
   "main": "bin/lib/index.js",
   "description": "simple, quick template for bootstrap a page",
-  "version": "2.2.1",
+  "version": "2.2.2",
   "homepage": "https://github.com/zbryikt/template",
   "repository": {
     "type": "git",