Merge pull request #69 from ericmorand/issue_66

Fix issue #66

Author: Eric MORAND

package.json

@@ -47,7 +47,6 @@
     "dateformat-converter": "^2.0.1",
     "eval": "^0.1.2",
     "fs-extra": "^5.0.0",
-    "hash.js": "^1.1.3",
     "htmlspecialchars": "^1.0.5",
     "iconv-lite": "^0.4.19",
     "is-integer": "^1.0.7",
@@ -63,7 +62,7 @@
     "regex-parser": "^2.2.8",
     "require-uncached": "^1.0.3",
     "secure-filters": "^1.1.0",
-    "sha.js": "^2.4.9",
+    "sha.js": "^2.4.10",
     "snake-case": "^2.1.0",
     "stack-trace": "0.0.10",
     "tmp": "0.0.33",

src/twing/cache/filesystem.ts

@@ -2,7 +2,7 @@ import {TwingCacheInterface} from "../cache-interface";
 
 let fs = require('fs-extra');
 let path = require('path');
-let hashJs = require('hash.js');
+let hashJs = require('sha.js');
 let tmp = require('tmp');
 
 /**
@@ -26,7 +26,7 @@ export class TwingCacheFilesystem implements TwingCacheInterface {
     }
 
     generateKey(name: string, className: string) {
-        let hash: string = hashJs.sha256().update(className).digest('hex');
+        let hash: string = hashJs('sha256').update(className).digest('hex');
 
         return path.join(
             this.directory,

src/twing/environment.ts

@@ -33,7 +33,7 @@ import {TwingRuntimeLoaderInterface} from "./runtime-loader-interface";
 import {TwingReflectionObject} from "./reflection-object";
 
 const merge = require('merge');
-const hash = require('hash.js');
+const hash = require('sha.js');
 const path = require('path');
 
 /**
@@ -290,7 +290,7 @@ export class TwingEnvironment {
     getTemplateClass(name: string, index: number = null) {
         let key = this.getLoader().getCacheKey(name) + this.optionsHash;
 
-        return this.templateClassPrefix + hash.sha256().update(key).digest('hex') + (index === null ? '' : '_' + index);
+        return this.templateClassPrefix + hash('sha256').update(key).digest('hex') + (index === null ? '' : '_' + index);
     }
 
     /**
@@ -450,7 +450,7 @@ export class TwingEnvironment {
      */
     createTemplate(template: string) {
         let result: TwingTemplate;
-        let name = `__string_template__${hash.sha256().update(template).digest('hex')}`;
+        let name = `__string_template__${hash('sha256').update(template).digest('hex')}`;
         let current = this.getLoader();
 
         let loader = new TwingLoaderChain([