jlto 1.2.1 → 1.4.0

package/.nvmrc

@@ -0,0 +1 @@
+v16

package/README.md

@@ -1,6 +1,7 @@
 # JLTO
 
-[![Codeship](https://app.codeship.com/projects/c496b690-12e2-0137-3a15-526d29fa1101/status?branch=master)](https://app.codeship.com/projects/327499) [![Coverage](https://coveralls.io/repos/github/dmytro-krekota/jlto/badge.svg?branch=master)](https://coveralls.io/github/dmytro-krekota/jlto?branch=master) [![Dependencies](https://david-dm.org/dmytro-krekota/jlto.svg)](https://david-dm.org/dmytro-krekota/jlto) [![DevDependencies](https://david-dm.org/dmytro-krekota/jlto/dev-status.svg)](https://david-dm.org/dmytro-krekota/jlto?type=dev) [![Join the chat at https://gitter.im/dmytro-krekota_jlto/Lobby](https://badges.gitter.im/dmytro-krekota_jlto/Lobby.svg)](https://gitter.im/dmytro-krekota_jlto/community?source=orgpage)
+[![CircleCI](https://circleci.com/gh/dmytro-krekota/jlto.svg?style=svg)](https://app.circleci.com/pipelines/github/dmytro-krekota/jlto)
+[![Coverage](https://coveralls.io/repos/github/dmytro-krekota/jlto/badge.svg?branch=master)](https://coveralls.io/github/dmytro-krekota/jlto?branch=master) [![Join the chat at https://gitter.im/dmytro-krekota_jlto/Lobby](https://badges.gitter.im/dmytro-krekota_jlto/Lobby.svg)](https://gitter.im/dmytro-krekota_jlto/community?source=orgpage)
 
 [![NPM](https://nodei.co/npm/jlto.png?downloads=true)](https://nodei.co/npm/jlto/)
 
@@ -12,29 +13,29 @@
 
 **Supported template engines:**
 
-* [Nunjucks](https://mozilla.github.io/nunjucks/) (Tested with unit tests)
-* [Twig.js](https://github.com/twigjs/twig.js) (Tested with unit tests)
-* [LiquidNode](https://github.com/sirlantis/liquid-node) (Tested with unit tests)
-* [Twig](https://twig.sensiolabs.org/)
-* [Jinja](http://jinja.pocoo.org/)
-* [Django](https://docs.djangoproject.com/en/1.11/ref/templates/language/)
-* [Liquid](https://shopify.github.io/liquid/)
-* [Jinjava](https://github.com/HubSpot/jinjava)
+- [Nunjucks](https://mozilla.github.io/nunjucks/) (Tested with unit tests)
+- [Twig.js](https://github.com/twigjs/twig.js) (Tested with unit tests)
+- [LiquidNode](https://github.com/sirlantis/liquid-node) (Tested with unit tests)
+- [Twig](https://twig.sensiolabs.org/)
+- [Jinja](http://jinja.pocoo.org/)
+- [Django](https://docs.djangoproject.com/en/1.11/ref/templates/language/)
+- [Liquid](https://shopify.github.io/liquid/)
+- [Jinjava](https://github.com/HubSpot/jinjava)
 
 **Available options:**
 
-* expressionStart - symbols at the beginning of expressions
-* expressionEnd - symbols at the end of expressions
-* blockStart - symbols at the beginning of blocks
-* blockEnd - symbols at the end of blocks
-* commentStart - symbols at the beginning of comments
-* commentEnd - symbols at the beginning of comments
-* specialChars - special chars in blocks and expressions
-* cleanupBlocks - flag for optimize blocks
-* cleanupExpressions - flag for optimize expressions
-* removeComments - flag for removing comments
-* minifyHtml - flag for minifying html code with [html-minifier](https://www.npmjs.com/package/html-minifier)
-* minifyHtmlOptions - options for html-minifier
+- expressionStart - symbols at the beginning of expressions
+- expressionEnd - symbols at the end of expressions
+- blockStart - symbols at the beginning of blocks
+- blockEnd - symbols at the end of blocks
+- commentStart - symbols at the beginning of comments
+- commentEnd - symbols at the beginning of comments
+- specialChars - special chars in blocks and expressions
+- cleanupBlocks - flag for optimize blocks
+- cleanupExpressions - flag for optimize expressions
+- removeComments - flag for removing comments
+- minifyHtml - flag for minifying html code with [html-minifier](https://www.npmjs.com/package/html-minifier)
+- minifyHtmlOptions - options for html-minifier
 
 See default values for above options [here](https://github.com/dmytro-krekota/jlto/blob/master/lib/core/default.js).
 
@@ -43,13 +44,13 @@ See default values for above options [here](https://github.com/dmytro-krekota/jl
 **Simple example:**
 
 ```js
-let jlto = require("jlto");
+let jlto = require('jlto')
 let template = `
 {{ hello }}
 {{   "<John   &   Paul> ?"     | escape   }}
 {{ '2.7'   | round }}{%  if  product  %}Product exists.{%  endif  %}
-`;
-let optimizedTemplate = jlto.optimizeString(template);
+`
+let optimizedTemplate = jlto.optimizeString(template)
 // optimizedTemplate:
 // `
 //{{hello}}
@@ -61,7 +62,7 @@ let optimizedTemplate = jlto.optimizeString(template);
 **Example of using minifyHtml option:**
 
 ```js
-let jlto = require("jlto");
+let jlto = require('jlto')
 let template = `
 <div {% if id %}id="{{ id | escape('html_attr') }}"{% endif %} class="section-container {{ classes | join(' ') | html_attribute }}">
   <div class="section-writables">
@@ -69,8 +70,8 @@ let template = `
       {{ writable | write | raw }}
     {% endfor %}
   </div>
-</div>`;
-let optimizedTemplate = jlto.optimizeString(template, {minifyHtml: true});
+</div>`
+let optimizedTemplate = jlto.optimizeString(template, {minifyHtml: true})
 // optimizedTemplate:
 // `<div {%if id%} id="{{id|escape('html_attr')}}" {%endif%} class="section-container {{classes|join(' ')|html_attribute}}"><div class="section-writables"> {%for writable in writables%} {{writable|write|raw}} {%endfor%} </div></div>`
 ```
@@ -80,24 +81,23 @@ let optimizedTemplate = jlto.optimizeString(template, {minifyHtml: true});
 ```js
 module.exports = (grunt) => {
   grunt.registerTask('min-nunjucks', 'Min nunjucks templates', () => {
-    let jlto = require('jlto');
-    let fs = require('fs');
-    let glob = require('glob');
-    let done = this.async();
+    let jlto = require('jlto')
+    let fs = require('fs')
+    let glob = require('glob')
+    let done = this.async()
     glob('./**/*.nunjucks.html', (error, files) => {
       files.forEach((filePath) => {
-        let fileContent;
-        fileContent = fs.readFileSync(filePath).toString();
+        let fileContent
+        fileContent = fs.readFileSync(filePath).toString()
         try {
-          fileContent = jlto.optimizeString(fileContent, {minifyHtml: true});
-          fs.writeFileSync(filePath, fileContent);
-        } catch (ignored) {
-        }
-      });
-      return done();
-    });
-  });
-};
+          fileContent = jlto.optimizeString(fileContent, {minifyHtml: true})
+          fs.writeFileSync(filePath, fileContent)
+        } catch (ignored) {}
+      })
+      return done()
+    })
+  })
+}
 ```
 
 ## Tests

package/index.js

@@ -1,3 +1,3 @@
-let jlto = require('./lib/jlto')
+let jlto = require('./lib/jlto');
 
-module.exports = new jlto()
+module.exports = new jlto();

package/lib/core/default.js

@@ -20,10 +20,10 @@ class Default {
         collapseWhitespace: true,
         minifyJS: true,
         minifyCSS: true,
-        ignoreCustomFragments: [/\{([{%])[^}]+[%}]\}/]
-      }
-    }
+        ignoreCustomFragments: [/\{([{%])[^}]+[%}]\}/],
+      },
+    };
   }
 }
 
-module.exports = Default
+module.exports = Default;

package/lib/core/utils.js

@@ -3,12 +3,12 @@
  */
 class Utils {
   static isNull(value) {
-    return value === null
+    return value === null;
   }
 
   static isUndefined(value) {
-    return value === undefined
+    return value === undefined;
   }
 }
 
-module.exports = Utils
+module.exports = Utils;

package/lib/helpers/blocksHelper.js

@@ -3,72 +3,72 @@
  */
 class BlocksHelper {
   constructor(options) {
-    this.options = options
-    this.utils = require('./../core/utils')
+    this.options = options;
+    this.utils = require('./../core/utils');
   }
 
   getBlockWithoutExtraSpaces(expression) {
-    let body = expression.slice(this.options.blockStart.length).slice(0, -this.options.blockEnd.length)
-    let resultBody = ''
-    let i
-    let waitForChar
+    let body = expression.slice(this.options.blockStart.length).slice(0, -this.options.blockEnd.length);
+    let resultBody = '';
+    let i;
+    let waitForChar;
 
-    body = body.trim()
+    body = body.trim();
     for (i = 0; i < body.length; i++) {
       if (waitForChar && body[i] !== waitForChar) {
-        resultBody += body[i]
-        continue
+        resultBody += body[i];
+        continue;
       }
-      if (body[i] === '"' || body[i] === '\'') {
+      if (body[i] === '"' || body[i] === "'") {
         if (!waitForChar) {
-          waitForChar = body[i]
+          waitForChar = body[i];
         } else {
-          waitForChar = null
+          waitForChar = null;
         }
       }
       if (this.options.specialChars.indexOf(body[i]) >= 0) {
-        resultBody = resultBody.trim()
+        resultBody = resultBody.trim();
       }
       if (this.options.specialChars.indexOf(resultBody[resultBody.length - 1]) >= 0 && body[i] === ' ') {
-        continue
+        continue;
       }
       if (resultBody[resultBody.length - 1] === ' ' && body[i] === ' ') {
-        continue
+        continue;
       }
       if (body[i] !== '\n') {
-        resultBody += body[i]
+        resultBody += body[i];
       }
     }
 
-    return this.options.blockStart + resultBody + this.options.blockEnd
+    return this.options.blockStart + resultBody + this.options.blockEnd;
   }
 
   clearExtraSpaces(template) {
-    let i
-    let startIndex = null
-    let tempSubstring
-    let resultString = ''
+    let i;
+    let startIndex = null;
+    let tempSubstring;
+    let resultString = '';
 
     for (i = 0; i < template.length + 1; i++) {
       if (!this.utils.isNull(startIndex)) {
-        tempSubstring = template.substring(i - this.options.blockEnd.length, i)
+        tempSubstring = template.substring(i - this.options.blockEnd.length, i);
         if (tempSubstring === this.options.blockEnd) {
-          resultString += this.getBlockWithoutExtraSpaces(template.substring(startIndex, i))
-          startIndex = null
+          resultString += this.getBlockWithoutExtraSpaces(template.substring(startIndex, i));
+          startIndex = null;
         }
       }
       if (this.utils.isNull(startIndex)) {
-        tempSubstring = template.substring(i, i + this.options.blockStart.length)
+        tempSubstring = template.substring(i, i + this.options.blockStart.length);
         if (tempSubstring === this.options.blockStart) {
-          startIndex = i
+          startIndex = i;
         } else if (!this.utils.isUndefined(template[i])) {
-          resultString += template[i]
+          resultString += template[i];
         }
       }
     }
 
-    return resultString
+    return resultString;
   }
 }
 
-module.exports = BlocksHelper
+module.exports = BlocksHelper;

package/lib/helpers/commentsHelper.js

@@ -3,35 +3,35 @@
  */
 class CommentsHelper {
   constructor(options) {
-    this.options = options
-    this.utils = require('./../core/utils')
+    this.options = options;
+    this.utils = require('./../core/utils');
   }
 
   removeComments(template) {
-    let i
-    let startIndex = null
-    let tempString
-    let resultString = ''
+    let i;
+    let startIndex = null;
+    let tempString;
+    let resultString = '';
 
     for (i = 0; i < template.length + 1; i++) {
       if (!this.utils.isNull(startIndex)) {
-        tempString = template.substring(i - this.options.commentEnd.length, i)
+        tempString = template.substring(i - this.options.commentEnd.length, i);
         if (tempString === this.options.commentEnd) {
-          startIndex = null
+          startIndex = null;
         }
       }
       if (this.utils.isNull(startIndex)) {
-        tempString = template.substring(i, i + this.options.commentStart.length)
+        tempString = template.substring(i, i + this.options.commentStart.length);
         if (tempString === this.options.commentStart) {
-          startIndex = i
+          startIndex = i;
         } else if (!this.utils.isUndefined(template[i])) {
-          resultString += template[i]
+          resultString += template[i];
         }
       }
     }
 
-    return resultString
+    return resultString;
   }
 }
 
-module.exports = CommentsHelper
+module.exports = CommentsHelper;

package/lib/helpers/expressionsHelper.js

@@ -3,72 +3,72 @@
  */
 class ExpressionsHelper {
   constructor(options) {
-    this.options = options
-    this.utils = require('./../core/utils')
+    this.options = options;
+    this.utils = require('./../core/utils');
   }
 
   getExpressionWithoutExtraSpaces(expression) {
-    let body = expression.slice(this.options.expressionStart.length).slice(0, -this.options.expressionEnd.length)
-    let resultBody = ''
-    let i
-    let waitForChar
+    let body = expression.slice(this.options.expressionStart.length).slice(0, -this.options.expressionEnd.length);
+    let resultBody = '';
+    let i;
+    let waitForChar;
 
-    body = body.trim()
+    body = body.trim();
     for (i = 0; i < body.length; i++) {
       if (waitForChar && body[i] !== waitForChar) {
-        resultBody += body[i]
-        continue
+        resultBody += body[i];
+        continue;
       }
-      if (body[i] === '"' || body[i] === '\'') {
+      if (body[i] === '"' || body[i] === "'") {
         if (!waitForChar) {
-          waitForChar = body[i]
+          waitForChar = body[i];
         } else {
-          waitForChar = null
+          waitForChar = null;
         }
       }
       if (this.options.specialChars.indexOf(body[i]) >= 0) {
-        resultBody = resultBody.trim()
+        resultBody = resultBody.trim();
       }
       if (this.options.specialChars.indexOf(resultBody[resultBody.length - 1]) >= 0 && body[i] === ' ') {
-        continue
+        continue;
       }
       if (resultBody[resultBody.length - 1] === ' ' && body[i] === ' ') {
-        continue
+        continue;
       }
       if (body[i] !== '\n') {
-        resultBody += body[i]
+        resultBody += body[i];
       }
     }
 
-    return this.options.expressionStart + resultBody + this.options.expressionEnd
+    return this.options.expressionStart + resultBody + this.options.expressionEnd;
   }
 
   clearExtraSpaces(template) {
-    let i
-    let startIndex = null
-    let tempSubstring
-    let resultString = ''
+    let i;
+    let startIndex = null;
+    let tempSubstring;
+    let resultString = '';
 
     for (i = 0; i < template.length + 1; i++) {
       if (!this.utils.isNull(startIndex)) {
-        tempSubstring = template.substring(i - this.options.expressionEnd.length, i)
+        tempSubstring = template.substring(i - this.options.expressionEnd.length, i);
         if (tempSubstring === this.options.expressionEnd) {
-          resultString += this.getExpressionWithoutExtraSpaces(template.substring(startIndex, i))
-          startIndex = null
+          resultString += this.getExpressionWithoutExtraSpaces(template.substring(startIndex, i));
+          startIndex = null;
         }
       }
       if (this.utils.isNull(startIndex)) {
-        tempSubstring = template.substring(i, i + this.options.expressionStart.length)
+        tempSubstring = template.substring(i, i + this.options.expressionStart.length);
         if (tempSubstring === this.options.expressionStart) {
-          startIndex = i
+          startIndex = i;
         } else if (!this.utils.isUndefined(template[i])) {
-          resultString += template[i]
+          resultString += template[i];
         }
       }
     }
 
-    return resultString
+    return resultString;
   }
 }
 
-module.exports = ExpressionsHelper
+module.exports = ExpressionsHelper;

package/lib/jlto.js

@@ -4,38 +4,38 @@
  */
 class JLTO {
   constructor() {
-    this.defaultOptions = new (require('./core/default'))().options
+    this.defaultOptions = new (require('./core/default'))().options;
   }
 
   optimizeString(string, options = {}) {
-    let expressionsHelper
-    let blocksHelper
-    let commentsHelper
-    this.options = {...this.defaultOptions, ...options}
-    expressionsHelper = new (require('./helpers/expressionsHelper'))(this.options)
-    blocksHelper = new (require('./helpers/blocksHelper'))(this.options)
-    commentsHelper = new (require('./helpers/commentsHelper'))(this.options)
+    let expressionsHelper;
+    let blocksHelper;
+    let commentsHelper;
+    this.options = {...this.defaultOptions, ...options};
+    expressionsHelper = new (require('./helpers/expressionsHelper'))(this.options);
+    blocksHelper = new (require('./helpers/blocksHelper'))(this.options);
+    commentsHelper = new (require('./helpers/commentsHelper'))(this.options);
 
     if (this.options.removeComments) {
-      string = commentsHelper.removeComments(string)
+      string = commentsHelper.removeComments(string);
     }
     if (this.options.cleanupExpressions) {
-      string = expressionsHelper.clearExtraSpaces(string)
+      string = expressionsHelper.clearExtraSpaces(string);
     }
     if (this.options.cleanupBlocks) {
-      string = blocksHelper.clearExtraSpaces(string)
+      string = blocksHelper.clearExtraSpaces(string);
     }
     if (this.options.minifyHtml) {
-      let minify = require('html-minifier').minify
+      let minify = require('html-minifier').minify;
       this.options.minifyHtmlOptions = {
         ...this.defaultOptions.minifyHtmlOptions,
-        ...(options.minifyHtmlOptions || {})
-      }
-      string = minify(string, this.options.minifyHtmlOptions)
+        ...(options.minifyHtmlOptions || {}),
+      };
+      string = minify(string, this.options.minifyHtmlOptions);
     }
 
-    return string
+    return string;
   }
 }
 
-module.exports = JLTO
+module.exports = JLTO;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "jlto",
-  "version": "1.2.1",
+  "version": "1.4.0",
   "description": "Nodejs-based tool for optimizing Jinja like templates",
   "keywords": [
     "jinja",
@@ -34,11 +34,11 @@
   "scripts": {
     "lint": "eslint test lib --max-warnings=0 --fix",
     "test": "npm run lint && jest --coverage",
-    "codeship-testing": "jest --coverage && cat ./coverage/lcov.info | coveralls",
+    "ci-testing": "jest --coverage && cat ./coverage/lcov.info | coveralls",
     "prettier": "prettier \"{test,lib}/**/*.js\" --write"
   },
   "engines": {
-    "node": ">=10"
+    "node": ">=16"
   },
   "pre-commit": [
     "prettier",
@@ -54,15 +54,17 @@
     ]
   },
   "devDependencies": {
-    "chai": "4.2.0",
-    "coveralls": "3.0.4",
-    "eslint": "6.0.1",
-    "jest": "24.8.0",
-    "liquid-node": "3.0.1",
-    "nunjucks": "3.2.0",
+    "chai": "4.3.4",
+    "coveralls": "3.1.1",
+    "eslint": "8.6.0",
+    "eslint-config-prettier": "^8.3.0",
+    "eslint-plugin-prettier": "^4.0.0",
+    "jest": "27.4.7",
+    "liquid": "5.1.1",
+    "nunjucks": "3.2.3",
     "pre-commit": "1.2.2",
-    "prettier": "1.18.2",
-    "twig": "1.13.3"
+    "prettier": "2.5.1",
+    "twig": "1.15.4"
   },
   "dependencies": {
     "html-minifier": "4.0.0"

package/test.dockerfile

@@ -1,9 +0,0 @@
-FROM node:12.6.0
-
-# Move project to /jlto directory
-RUN mkdir -p /jlto
-COPY . /jlto
-WORKDIR /jlto
-
-# Install dependencies
-RUN npm ci