als-layout 1.0.0 → 1.2.0

package/lib/build-root.js

@@ -1,8 +1,8 @@
-const { buildFromCache, Root, parseHTML } = require('als-document')
+const { buildFromCache, Root, parseHTML, cacheDoc } = require('als-document')
 
 function buildRoot(item) {
    const root = 
-   (item instanceof Root) ? item 
+   (item instanceof Root) ? buildFromCache(cacheDoc(item))
    : (typeof item === 'string') ? parseHTML(item) 
    : (typeof item === 'object') ? buildFromCache(item) 
    : new Root()

package/lib/elements/image.js

@@ -1,5 +1,7 @@
 const addMeta = require('./add-meta')
-function addImage(image,layout) {
+function addImage(image,version, layout) {
+   if (image && version) image += src.includes('?') ? '&' : '?' + `v=${version}`
+
    addMeta({property:'og:image',content:image},layout)
    addMeta({name:'twitter:image',content:image},layout)
    addMeta({name:'twitter:card',content:'summary_large_image'},layout)

package/lib/elements/link.js

@@ -1,7 +1,8 @@
 const { SingleNode } = require('als-document')
-function addLink(href, layout) {
+function addLink(href, version, layout) {
    let linkElement = layout.root.$(`link[rel=stylesheet][href="${href}"]`)
    if (linkElement) return
+   if (href && version) href += href.includes('?') ? '&' : '?' + `v=${version}`
    linkElement = new SingleNode('link', { rel: 'stylesheet', href })
    layout.head.insert(2, linkElement)
    return layout

package/lib/elements/script.js

@@ -1,9 +1,11 @@
 const { Node } = require('als-document')
-function addScript(attributes={}, innerHTML, head = true, layout) {
-   if (attributes.src && layout.root.$(`script[src="${attributes.src}"]`)) return
-   const script = new Node('script', attributes)
+function addScript(attrs = {}, innerHTML = '', head = true, version, layout) {
+   const { src } = attrs
+   if (src && layout.root.$(`script[src="${attrs.src}"]`)) return
+   if (src && version) attrs.src += src.includes('?') ? '&' : '?' + `v=${version}`
+   const script = new Node('script', attrs)
    script.innerHTML = innerHTML
-   if(head) layout.root.head.insert(2, script)
+   if (head) layout.root.head.insert(2, script)
    else layout.body.insert(3, script)
    return layout
 }

package/lib/elements/url.js

@@ -1,12 +1,16 @@
 const addMeta = require('./add-meta')
-const {SingleNode} = require('als-document')
+const { SingleNode } = require('als-document')
 
-function getUrl(url,host,layout) {
-   url = new URL(url,host).href.replace(/\/$/,'')
-   addMeta({property:'og:url',content:url},layout)
-   const canonicalElement = layout.root.$('link[rel="canonical"]')
-   if(canonicalElement) canonicalElement.setAttribute('href',url)
-   else layout.head.insert(2,new SingleNode('link',{rel:'canonical',href:url}))
+function getUrl(url, host, layout) {
+   try {
+      url = new URL(url, host).href.replace(/\/$/, '')
+      addMeta({ property: 'og:url', content: url }, layout)
+      const canonicalElement = layout.root.$('link[rel="canonical"]')
+      if (canonicalElement) canonicalElement.setAttribute('href', url)
+      else layout.head.insert(2, new SingleNode('link', { rel: 'canonical', href: url }))
+   } catch (error) {
+      console.log(`url ${url} with host ${host} is not valid url`)
+   }
    return layout
 }
 

package/lib/layout.js

@@ -34,15 +34,16 @@ class Layout {
    get cached() { return cacheDoc(this.root) }
    get clone() { return new Layout(this.root, this.options) }
 
+   version(v) {this.v = v; return this;}
    keywords(keywords = []) { return addKeywords(keywords, this) }
    description(description) { return addDescription(description, this) }
    title(title) { return addTitle(title, this) }
    style(styles, minified) { return addStyle(styles, minified, this) }
-   image(image) { return addImage(image, this) }
+   image(image,v=this.v) { return addImage(image, v, this) }
    url(url, host = this.options.host) { return addUrl(url, host, this) }
    favicon(href) { return addFavicon(href, this) }
-   script(attributes, innerHTML, head = true) { return addScript(attributes, innerHTML, head, this) }
-   link(href) { return addLink(href, this) }
+   script(attributes, innerHTML, head = true, v=this.v) { return addScript(attributes, innerHTML, head, v, this) }
+   link(href, v=this.v) { return addLink(href, v, this) }
    charset(newCharset = 'UTF-8') { return charset(newCharset, this) }
    viewport(newViewport = 'width=device-width, initial-scale=1.0') { return viewport(newViewport, this) }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "als-layout",
-  "version": "1.0.0",
+  "version": "1.2.0",
   "description": "Html layout constructor",
   "main": "index.js",
   "directories": {
@@ -14,7 +14,7 @@
   "license": "ISC",
   "dependencies": {
     "als-css-parser": "^0.5.0",
-    "als-document": "^1.0.1-beta",
+    "als-document": "^1.0.1",
     "als-simple-css": "^8.0.0"
   }
 }

package/readme.md

@@ -2,6 +2,11 @@
 
 Html layout constructor.
 
+## Change log
+  * version method
+  * script,link,image - version parameter
+  * updated als-document version
+
 ## install
 
 ```bash
@@ -18,13 +23,14 @@ const layout = new Layout()
    .title('Test title') // adding/updating title and meta[og:title]
    .favicon('/favicon.png') // adding/updating link[rel=icon][type=image/x-icon] with new href
    .keywords(['some','keyword']) // adding/updating meta[name=keywords]. not adding existing keywords
-   .image('/main-image.png') // adding/updating meta - og:image,twitter:image,twitter:card
+   .image('/main-image.png','1.5') // adding/updating meta - og:image,twitter:image,twitter:card
    .description('Cool site') // adding/updating meta og:description,twitter:description and description tag
+   .version('1.0.0') // adds version parameter to link, script.src and image
    .url('/some', 'http://site.com') // adding/updating meta[og:url] and link[rel="canonical"]
    .style([{body:{m:0,bgc:'whitesmoke'}}]) // adding as simple-css styles to existing/new style tag
    .style('body {margin:0; backgroung-color:whitesmoke;}',true) // adding css styles to existing/new style tag. Second parameter is minified (default=false).
-   .link('/styles.css') // adding link[rel=stylesheet] if such href not exists
-   .script({src:'/app.js'},'', true) // set script with src to head if such src not exists
+   .link('/styles.css','2.0') // adding link[rel=stylesheet] if such href not exists
+   .script({src:'/app.js'},'', true,'3.0') // set script with src to head if such src not exists
    .script({}, 'console.log("hello world")', false) // set script with script code to footer
 
 
@@ -37,6 +43,7 @@ layout.cached // cached DOM
 layout.clone // new layout object clone for curent object
 ```
 
+In image, script.src and link, last parameter is version which using 'layout.v' (defined by layout.version(v)) if not defined. 
 
 ## Advanced usage
 

package/tests/build-root.test.js

@@ -15,7 +15,7 @@ describe('Basic tests', function () {
 
    it('should create an instance of Root from ready root', () => {
       const root = new Root()
-      assert(buildRoot(root)  === root)
+      assert(buildRoot(root) !== root)
    });
 
    it('should add !DOCTYPE', () => {