mangony - npm Package Compare versions

Comparing version 1.0.11 to 1.0.12

lib/plugins/templater.js

@@ -117,3 +117,10 @@ /**
 		data = Helpers.extend(data, {
-			assets: assets
+			assets: assets,
+			currentPage: {
+				filename: obj.page.filename,
+				destFile: destFile,
+				serverFile: obj.page.serverFile,
+				dirname: obj.page.dirname,
+				id: obj.page.id
+			}
 		});
@@ -120,0 +127,0 @@

package.json

 {
 	"name": "mangony",
-	"version": "1.0.11",
+	"version": "1.0.12",
 	"description": "Yet another static site generator in NodeJS focussed on being fast and simple. Mangony fulfills just one task: It takes handlebars templates and compiles them to an output directory.",
@@ -5,0 +5,0 @@ "main": "index.js",

server.js

@@ -45,3 +45,4 @@ var Mangony = require('./index');
 	devServer: {
-		start: true
+		start: true,
+		port: 3002
 	}
@@ -48,0 +49,0 @@ });

test/fixtures/exported/exported-data.json

@@ -5,15 +5,15 @@ {
         "layouts": [
-            "lyt-default"
+            "lyt-default",
+            "lyt-docu"
         ],
         "pages": [
             "a",
-            "index",
+            "sub/sub-sub/sub-sub-a",
+            "md",
             "sub/sub-a",
-            "md",
-            "sub/sub-sub/sub-sub-a"
+            "index"
         ],
         "partials": [
             "test-partial",
-            "test-yield",
-            "testtete"
+            "test-yield"
         ],
@@ -24,3 +24,2 @@ "panels": [],
             "b",
-            "new",
             "c",
@@ -49,2 +48,26 @@ "d"
             }
+        },
+        "lyt-docu": {
+            "id": "lyt-docu",
+            "assets": "./",
+            "ext": ".html",
+            "srcExt": ".hbs",
+            "basename": "lyt-docu.hbs",
+            "filename": "lyt-docu",
+            "dirname": "test/fixtures/layouts",
+            "destDir": "test/expected/",
+            "destSubDir": "",
+            "destFile": "lyt-docu.html",
+            "serverFile": "lyt-docu",
+            "raw": "---\r\ntitle: Wrap With\r\nmenuLink: Wrap With\r\nsortOrder: 03\r\nsitemap: General\r\n---\r\n{{#extend \"lyt-default\"}}\r\n\t{{#content \"main\"}}\r\n\t\t{{{yield}}}\r\n\t{{/content}}\r\n{{/extend}}",
+            "parsed": {
+                "orig": "---\r\ntitle: Wrap With\r\nmenuLink: Wrap With\r\nsortOrder: 03\r\nsitemap: General\r\n---\r\n{{#extend \"lyt-default\"}}\r\n\t{{#content \"main\"}}\r\n\t\t{{{yield}}}\r\n\t{{/content}}\r\n{{/extend}}",
+                "data": {
+                    "title": "Wrap With",
+                    "menuLink": "Wrap With",
+                    "sortOrder": 3,
+                    "sitemap": "General"
+                },
+                "content": "\r\n{{#extend \"lyt-default\"}}\r\n\t{{#content \"main\"}}\r\n\t\t{{{yield}}}\r\n\t{{/content}}\r\n{{/extend}}"
+            }
         }
@@ -65,9 +88,11 @@ },
             "serverFile": "test-partial",
-            "raw": "---\r\ntestPartial: test partial\r\n---\r\n{{! ---\r\ngeneral: s-tester\r\n============================================\r\n\r\nRequirements:\r\n- (only hbs)\r\n\r\nOptions:\r\n- testerClasses {String} - Modifier classes\r\n\r\nImportant Notes:\r\n\r\n--- }}\r\n<div class=\"s-tester{{#if testerClasses}} {{testerClasses}}{{/if}}\"\r\n     data-js-module=\"tester\"\r\n     data-js-options=\"{ &quot;test&quot;:  &quot;testing&quot;}\">\r\n     <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>\r\n</div>\r\n",
+            "raw": "---\r\ntestPartial: test partial\r\ncontextData: a\r\nlayout: \"lyt-docu\"\r\n---\r\n{{! ---\r\ngeneral: s-tester\r\n============================================\r\n\r\nRequirements:\r\n- (only hbs)\r\n\r\nOptions:\r\n- testerClasses {String} - Modifier classes\r\n\r\nImportant Notes:\r\n\r\n--- }}\r\n<div class=\"s-tester{{#if testerClasses}} {{testerClasses}}{{/if}}\"\r\n     data-js-module=\"tester\"\r\n     data-js-options=\"{ &quot;test&quot;:  &quot;testing&quot;}\">\r\n\t<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>\r\n\t<strong>\r\n\t\t{{a}}\r\n\t</strong>\r\n</div>\r\n",
             "parsed": {
-                "orig": "---\r\ntestPartial: test partial\r\n---\r\n{{! ---\r\ngeneral: s-tester\r\n============================================\r\n\r\nRequirements:\r\n- (only hbs)\r\n\r\nOptions:\r\n- testerClasses {String} - Modifier classes\r\n\r\nImportant Notes:\r\n\r\n--- }}\r\n<div class=\"s-tester{{#if testerClasses}} {{testerClasses}}{{/if}}\"\r\n     data-js-module=\"tester\"\r\n     data-js-options=\"{ &quot;test&quot;:  &quot;testing&quot;}\">\r\n     <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>\r\n</div>\r\n",
+                "orig": "---\r\ntestPartial: test partial\r\ncontextData: a\r\nlayout: \"lyt-docu\"\r\n---\r\n{{! ---\r\ngeneral: s-tester\r\n============================================\r\n\r\nRequirements:\r\n- (only hbs)\r\n\r\nOptions:\r\n- testerClasses {String} - Modifier classes\r\n\r\nImportant Notes:\r\n\r\n--- }}\r\n<div class=\"s-tester{{#if testerClasses}} {{testerClasses}}{{/if}}\"\r\n     data-js-module=\"tester\"\r\n     data-js-options=\"{ &quot;test&quot;:  &quot;testing&quot;}\">\r\n\t<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>\r\n\t<strong>\r\n\t\t{{a}}\r\n\t</strong>\r\n</div>\r\n",
                 "data": {
-                    "testPartial": "test partial"
+                    "testPartial": "test partial",
+                    "contextData": "a",
+                    "layout": "lyt-docu"
                 },
-                "content": "\r\n{{! ---\r\ngeneral: s-tester\r\n============================================\r\n\r\nRequirements:\r\n- (only hbs)\r\n\r\nOptions:\r\n- testerClasses {String} - Modifier classes\r\n\r\nImportant Notes:\r\n\r\n--- }}\r\n<div class=\"s-tester{{#if testerClasses}} {{testerClasses}}{{/if}}\"\r\n     data-js-module=\"tester\"\r\n     data-js-options=\"{ &quot;test&quot;:  &quot;testing&quot;}\">\r\n     <p>Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>\r\n</div>\r\n"
+                "content": "\r\n{{! ---\r\ngeneral: s-tester\r\n============================================\r\n\r\nRequirements:\r\n- (only hbs)\r\n\r\nOptions:\r\n- testerClasses {String} - Modifier classes\r\n\r\nImportant Notes:\r\n\r\n--- }}\r\n<div class=\"s-tester{{#if testerClasses}} {{testerClasses}}{{/if}}\"\r\n     data-js-module=\"tester\"\r\n     data-js-options=\"{ &quot;test&quot;:  &quot;testing&quot;}\">\r\n\t<p>Lorem ipsum dolor sit amet, consectetur adipisicing elit.</p>\r\n\t<strong>\r\n\t\t{{a}}\r\n\t</strong>\r\n</div>\r\n"
             }
@@ -93,21 +118,2 @@ },
             }
-        },
-        "testtete": {
-            "id": "testtete",
-            "assets": "../",
-            "ext": ".html",
-            "srcExt": ".hbs",
-            "basename": "testtete.hbs",
-            "filename": "testtete",
-            "dirname": "test\\fixtures\\partials\\utilities",
-            "destDir": "test/expected/",
-            "destSubDir": "utilities",
-            "destFile": "testtete.html",
-            "serverFile": "testtete",
-            "raw": "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Cumque ea magnam voluptas. Accusamus architecto aspernatur cumque dolore earum facilis illo in magni minima modi, nemo odio omnis ut vel velit.",
-            "parsed": {
-                "orig": "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Cumque ea magnam voluptas. Accusamus architecto aspernatur cumque dolore earum facilis illo in magni minima modi, nemo odio omnis ut vel velit.",
-                "data": {},
-                "content": "Lorem ipsum dolor sit amet, consectetur adipisicing elit. Cumque ea magnam voluptas. Accusamus architecto aspernatur cumque dolore earum facilis illo in magni minima modi, nemo odio omnis ut vel velit."
-            }
         }
@@ -140,24 +146,42 @@ },
         },
-        "index": {
-            "id": "index",
+        "sub/sub-sub/sub-sub-a": {
+            "id": "sub/sub-sub/sub-sub-a",
+            "assets": "../../",
+            "ext": ".html",
+            "srcExt": ".hbs",
+            "basename": "sub-sub-a.hbs",
+            "filename": "sub-sub-a",
+            "dirname": "test/fixtures/pages/sub/sub-sub",
+            "destDir": "test/expected/",
+            "destSubDir": "sub/sub-sub",
+            "destFile": "sub-sub-a.html",
+            "serverFile": "sub-sub-a",
+            "raw": "---\r\ncomponents: General\r\n---\r\nsub-sub-a content",
+            "parsed": {
+                "orig": "---\r\ncomponents: General\r\n---\r\nsub-sub-a content",
+                "data": {
+                    "components": "General"
+                },
+                "content": "\r\nsub-sub-a content"
+            }
+        },
+        "md": {
+            "id": "md",
             "assets": "./",
             "ext": ".html",
-            "srcExt": ".hbs",
-            "basename": "index.hbs",
-            "filename": "index",
+            "srcExt": ".md",
+            "basename": "md.md",
+            "filename": "md",
             "dirname": "test/fixtures/pages",
             "destDir": "test/expected/",
             "destSubDir": "",
-            "destFile": "index.html",
-            "serverFile": "index",
-            "raw": "---\r\ntitle: Index Title\r\nmenuLink: Home\r\nsortOrder: 01\r\nsitemap: General\r\n---\r\n\r\n{{#extend \"lyt-default\"}}\r\n\t{{#content \"main\"}}\r\n\t\t{{#with this.deep-data_d}}\r\n\t\t\t{{d}}\r\n\t\t{{/with}}\r\n\t\t{{#with a}}\r\n\t\t\t{{a}}\r\n\t\t{{/with}}\r\n\t\t{{> test-partial }}\r\n\t{{/content}}\r\n{{/extend}}\r\n",
+            "destFile": "md.html",
+            "serverFile": "md",
+            "raw": "---\r\ntitle: test\r\n---\r\n\r\n{{#extend \"lyt-default\"}}{{#content \"main\"}}\r\n\r\n## {{title}}\r\n\r\n{{> test-partial }}\r\n\r\nFar far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts. Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean. A small river named Duden flows by their place and supplies it with the necessary regelialia.\r\n\r\n- list item 1\r\n- list item 2\r\n- list item 3\r\n\r\n{{/content}}{{/extend}}",
             "parsed": {
-                "orig": "---\r\ntitle: Index Title\r\nmenuLink: Home\r\nsortOrder: 01\r\nsitemap: General\r\n---\r\n\r\n{{#extend \"lyt-default\"}}\r\n\t{{#content \"main\"}}\r\n\t\t{{#with this.deep-data_d}}\r\n\t\t\t{{d}}\r\n\t\t{{/with}}\r\n\t\t{{#with a}}\r\n\t\t\t{{a}}\r\n\t\t{{/with}}\r\n\t\t{{> test-partial }}\r\n\t{{/content}}\r\n{{/extend}}\r\n",
+                "orig": "---\r\ntitle: test\r\n---\r\n\r\n{{#extend \"lyt-default\"}}{{#content \"main\"}}\r\n\r\n## {{title}}\r\n\r\n{{> test-partial }}\r\n\r\nFar far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts. Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean. A small river named Duden flows by their place and supplies it with the necessary regelialia.\r\n\r\n- list item 1\r\n- list item 2\r\n- list item 3\r\n\r\n{{/content}}{{/extend}}",
                 "data": {
-                    "title": "Index Title",
-                    "menuLink": "Home",
-                    "sortOrder": 1,
-                    "sitemap": "General"
+                    "title": "test"
                 },
-                "content": "\r\n\r\n{{#extend \"lyt-default\"}}\r\n\t{{#content \"main\"}}\r\n\t\t{{#with this.deep-data_d}}\r\n\t\t\t{{d}}\r\n\t\t{{/with}}\r\n\t\t{{#with a}}\r\n\t\t\t{{a}}\r\n\t\t{{/with}}\r\n\t\t{{> test-partial }}\r\n\t{{/content}}\r\n{{/extend}}\r\n"
+                "content": "\r\n\r\n{{#extend \"lyt-default\"}}{{#content \"main\"}}\r\n\r\n## {{title}}\r\n\r\n{{> test-partial }}\r\n\r\nFar far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts. Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean. A small river named Duden flows by their place and supplies it with the necessary regelialia.\r\n\r\n- list item 1\r\n- list item 2\r\n- list item 3\r\n\r\n{{/content}}{{/extend}}"
             }
@@ -188,43 +212,25 @@ },
         },
-        "md": {
-            "id": "md",
+        "index": {
+            "id": "index",
             "assets": "./",
             "ext": ".html",
-            "srcExt": ".md",
-            "basename": "md.md",
-            "filename": "md",
-            "dirname": "test/fixtures/pages",
+            "srcExt": ".hbs",
+            "basename": "index.hbs",
+            "filename": "index",
+            "dirname": "test\\fixtures\\pages",
             "destDir": "test/expected/",
             "destSubDir": "",
-            "destFile": "md.html",
-            "serverFile": "md",
-            "raw": "---\r\ntitle: test\r\n---\r\n\r\n{{#extend \"lyt-default\"}}{{#content \"main\"}}\r\n\r\n## {{title}}\r\n\r\n{{> test-partial }}\r\n\r\nFar far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts. Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean. A small river named Duden flows by their place and supplies it with the necessary regelialia.\r\n\r\n- list item 1\r\n- list item 2\r\n- list item 3\r\n\r\n{{/content}}{{/extend}}",
+            "destFile": "index.html",
+            "serverFile": "index",
+            "raw": "---\r\ntitle: Index Title\r\nmenuLink: Home\r\nsortOrder: 01\r\nsitemap: General\r\n---\r\n\r\n{{#extend \"lyt-default\"}}\r\n\t{{#content \"main\"}}\r\n\t\t{{#with this.deep-data_d}}\r\n\t\t\t{{d}}\r\n\t\t{{/with}}\r\n\t\t{{#with a}}\r\n\t\t\t{{a}}\r\n\t\t{{/with}}\r\n\t\t{{> test-partial }}\r\n\t{{/content}}\r\n{{/extend}}\r\n",
             "parsed": {
-                "orig": "---\r\ntitle: test\r\n---\r\n\r\n{{#extend \"lyt-default\"}}{{#content \"main\"}}\r\n\r\n## {{title}}\r\n\r\n{{> test-partial }}\r\n\r\nFar far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts. Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean. A small river named Duden flows by their place and supplies it with the necessary regelialia.\r\n\r\n- list item 1\r\n- list item 2\r\n- list item 3\r\n\r\n{{/content}}{{/extend}}",
+                "orig": "---\r\ntitle: Index Title\r\nmenuLink: Home\r\nsortOrder: 01\r\nsitemap: General\r\n---\r\n\r\n{{#extend \"lyt-default\"}}\r\n\t{{#content \"main\"}}\r\n\t\t{{#with this.deep-data_d}}\r\n\t\t\t{{d}}\r\n\t\t{{/with}}\r\n\t\t{{#with a}}\r\n\t\t\t{{a}}\r\n\t\t{{/with}}\r\n\t\t{{> test-partial }}\r\n\t{{/content}}\r\n{{/extend}}\r\n",
                 "data": {
-                    "title": "test"
+                    "title": "Index Title",
+                    "menuLink": "Home",
+                    "sortOrder": 1,
+                    "sitemap": "General"
                 },
-                "content": "\r\n\r\n{{#extend \"lyt-default\"}}{{#content \"main\"}}\r\n\r\n## {{title}}\r\n\r\n{{> test-partial }}\r\n\r\nFar far away, behind the word mountains, far from the countries Vokalia and Consonantia, there live the blind texts. Separated they live in Bookmarksgrove right at the coast of the Semantics, a large language ocean. A small river named Duden flows by their place and supplies it with the necessary regelialia.\r\n\r\n- list item 1\r\n- list item 2\r\n- list item 3\r\n\r\n{{/content}}{{/extend}}"
+                "content": "\r\n\r\n{{#extend \"lyt-default\"}}\r\n\t{{#content \"main\"}}\r\n\t\t{{#with this.deep-data_d}}\r\n\t\t\t{{d}}\r\n\t\t{{/with}}\r\n\t\t{{#with a}}\r\n\t\t\t{{a}}\r\n\t\t{{/with}}\r\n\t\t{{> test-partial }}\r\n\t{{/content}}\r\n{{/extend}}\r\n"
             }
-        },
-        "sub/sub-sub/sub-sub-a": {
-            "id": "sub/sub-sub/sub-sub-a",
-            "assets": "../../",
-            "ext": ".html",
-            "srcExt": ".hbs",
-            "basename": "sub-sub-a.hbs",
-            "filename": "sub-sub-a",
-            "dirname": "test/fixtures/pages/sub/sub-sub",
-            "destDir": "test/expected/",
-            "destSubDir": "sub/sub-sub",
-            "destFile": "sub-sub-a.html",
-            "serverFile": "sub-sub-a",
-            "raw": "---\r\ncomponents: General\r\n---\r\nsub-sub-a content",
-            "parsed": {
-                "orig": "---\r\ncomponents: General\r\n---\r\nsub-sub-a content",
-                "data": {
-                    "components": "General"
-                },
-                "content": "\r\nsub-sub-a content"
-            }
         }
@@ -238,2 +244,3 @@ },
                     "a",
+                    "lyt-docu",
                     "index"
@@ -250,2 +257,8 @@ ]
         "components": {
+            "General": {
+                "name": "General",
+                "files": [
+                    "sub/sub-sub/sub-sub-a"
+                ]
+            },
             "Custom": {
@@ -256,8 +269,2 @@ "name": "Custom",
                 ]
-            },
-            "General": {
-                "name": "General",
-                "files": [
-                    "sub/sub-sub/sub-sub-a"
-                ]
             }
@@ -273,5 +280,2 @@ }
     },
-    "new": {
-        "test": "test"
-    },
     "c": {
@@ -278,0 +282,0 @@ "c": "c"

test/fixtures/exported/watcher-data.json

@@ -9,4 +9,3 @@ {
         "c.hjson",
-        "deep-data",
-        "new.json"
+        "deep-data"
     ],
@@ -13,0 +12,0 @@ "C:\\xampp\\htdocs\\Mangony\\mangony\\test\\fixtures\\data\\**\\*.json": [],

test/fixtures/exported/watcher-layouts.json

@@ -6,5 +6,6 @@ {
     "C:\\xampp\\htdocs\\Mangony\\mangony\\test\\fixtures\\layouts": [
-        "lyt-default.hbs"
+        "lyt-default.hbs",
+        "lyt-docu.hbs"
     ],
     "C:\\xampp\\htdocs\\Mangony\\mangony\\test\\fixtures\\layouts\\**\\*.hbs": []
 }

No alert changes

Improved metrics

Total package byte prevSize

103765

increased by0.5%

Lines of code

2733

increased by0.51%

No dependency changes