als-layout 0.2.0 → 0.3.0

package/layout.js

@@ -1,5 +1,5 @@
 module.exports = class Layout {
-   constructor({title,body,description,image,lang='en',url,twiterName,scripts={},links={},favicon,footer='',header='',charset='UTF-8'}) {
+   constructor({title,body,description,image,lang='en',url,twiterName,scripts=[],links=[],favicon,footer='',header='',charset='UTF-8'}) {
       this.title = title
       this.body = body
       this.description = description
@@ -15,16 +15,16 @@ module.exports = class Layout {
       this.twiterName = twiterName
    }
 
-   get({title,body,description,image,lang,url,favicon,footer='',header='',scripts={},links={},charset=this.charset}) {
-      this.scripts = scripts
-      this.links = links
+   get({title,body,description,image,lang,url,favicon,footer='',header='',scripts=[],links=[],charset=this.charset}) {
+      this.scripts = [...this.scripts,...scripts]
+      this.links = [...this.links,...links]
       if(title) this.title = title
       if(body) this.body = body
-      if(description) this.description = description
-      if(image) this.image = image
-      if(lang) this.lang = lang
-      if(url) this.url = url
-      if(favicon) this.favicon = favicon
+      if(description && description !== '') this.description = description
+      if(image && image !== '') this.image = image
+      if(lang && lang !== '') this.lang = lang
+      if(url && url !== '') this.url = url
+      if(favicon && favicon !== '') this.favicon = favicon
       this.footer = footer
       this.header = header
       let {footerScripts,headerScripts} = this._scripts()
@@ -71,7 +71,7 @@ module.exports = class Layout {
    }
 
    _footer(scripts) {
-      return /*html*/`${scripts} ${this.footer}`
+      return /*html*/`${this.footer} ${scripts}`
    }
 
    _header(scripts) {
@@ -81,8 +81,7 @@ module.exports = class Layout {
    _scripts() {
       let footerScripts = ''
       let headerScripts = ''
-      Object.keys(this.scripts).forEach(name => {
-         let script = this.scripts[name]
+      this.scripts.forEach(script => {
          let {inner='',src='',async,crossorigin,defer,integrity,referrerpolicy,type,footer=false,v} = script
          v = v ? '?'+v : ''
          async = async ? ' async ' : ''
@@ -100,8 +99,7 @@ module.exports = class Layout {
    }
 
    _styles() {
-      return Object.keys(this.links).map(name => {
-         let link = this.links[name]
+      return this.links.map(link => {
          let {href,rel='stylesheet',crossorigin,hreflang,media,referrerpolicy,sizes,type,v} = link
          v = v ? '?'+v : ''
          crossorigin = crossorigin ? ` crossorigin="${crossorigin}" ` : ''

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "als-layout",
-  "version": "0.2.0",
+  "version": "0.3.0",
   "description": "Being tested. create html layout with node",
   "main": "layout.js",
   "keywords": [],

package/readme.md

@@ -1,6 +1,6 @@
 # Als-layout
 
-**being tested**
+* new in 0.3: scripts and links now array
 
 ## Syntax
 ```javascript
@@ -9,7 +9,7 @@ let Layout = require('als-layout')
 let layout = new Layout({
    title,body,description,image,
    lang='en',url,twiterName,
-   scripts={},links={},
+   scripts=[],links=[],
    favicon,footer='',header='',
    charset='UTF-8'
 })
@@ -18,7 +18,7 @@ let pageLayout = layout.get({
    title,body,description,image,
    lang,url,favicon,
    footer='',header='',
-   scripts={},links={},
+   scripts=[],links=[],
    charset=this.charset
 })
 ```
@@ -27,10 +27,10 @@ let pageLayout = layout.get({
 ## scripts and links
 
 ```javascript
-let scripts = {
-   scriptName:{inner='',src='',async,crossorigin,defer,integrity,referrerpolicy,type,footer=false,v}
-}
-let links = {
-   linkName:{href,rel='stylesheet',crossorigin,hreflang,media,referrerpolicy,sizes,type,v}
-}
+let scripts = [
+   {inner='',src='',async,crossorigin,defer,integrity,referrerpolicy,type,footer=false,v}
+]
+let links = [
+   {href,rel='stylesheet',crossorigin,hreflang,media,referrerpolicy,sizes,type,v}
+]
 ```