snakeskin - npm Package Compare versions

Comparing version 2.3.18 to 2.3.19

index.js

@@ -7,3 +7,3 @@ #!/usr/bin/env node
 Program
-	.version('2.3.18')
+	.version(Snakeskin.VERSION)
 	.option('-s, --source [src]', 'source file')
@@ -10,0 +10,0 @@ .option('-o, --output [src]', 'output file')

lib/core.js

@@ -6,3 +6,3 @@ /*!
 var Snakeskin = {
-	VERSION: '2.3.18',
+	VERSION: '2.3.19',
 
@@ -9,0 +9,0 @@ Directions: {},

lib/directions/template.js

@@ -216,3 +216,3 @@ /*!
 
-	dirObj.save(') { ' + defParams + 'var __SNAKESKIN_RESULT__ = \'\';');
+	dirObj.save(') { ' + defParams + 'var __SNAKESKIN_RESULT__ = \'\', $_;');
 	dirObj.save('var TPL_NAME = \'' + dirObj.defEscape(dirObj.pasteDangerBlocks(tmpTplName)) + '\';' +
@@ -219,0 +219,0 @@ 'var PARENT_TPL_NAME;'

lib/output.js

@@ -526,4 +526,4 @@ /**!
 
-				return 'Snakeskin.Filters[\'' + params.shift() + '\']' + (deepFilter || !pCount ? '(' : '') + res +
-					(input ? ',' + input : '') + (deepFilter || !pCount ? ')' : '');
+				return '($_ = Snakeskin.Filters[\'' + params.shift() + '\']' + (deepFilter || !pCount ? '(' : '') + res +
+					(input ? ',' + input : '') + (deepFilter || !pCount ? ')' : '') + ')';
 
@@ -530,0 +530,0 @@ }, fbody);

package.json

 {
   "name": "snakeskin",
-  "version": "2.3.18",
+  "version": "2.3.19",
   "description": "Snakeskin — компилятор блочных шаблонов c поддержкой наследования.\r Независим от среды исполнения, для работы нужен лишь интерпретатор JavaScript.",
@@ -5,0 +5,0 @@ "main": "snakeskin.js",

snakeskin.live.js

@@ -6,3 +6,3 @@ /*!
 var Snakeskin = {
-	VERSION: '2.3.18',
+	VERSION: '2.3.19',
 
@@ -9,0 +9,0 @@ Directions: {},

snakeskin.live.min.js

@@ -1,2 +0,2 @@
-var Snakeskin={VERSION:"2.3.18",Directions:{},Filters:{},BEM:{},Vars:{},write:{},cache:{}};
+var Snakeskin={VERSION:"2.3.19",Directions:{},Filters:{},BEM:{},Vars:{},write:{},cache:{}};
 (function(g){function h(a){return k[a]}function l(a){return m[a]}Snakeskin.forEach=function(a,c,e){var b=-1,d;if(Array.isArray(a))for(d=a.length;++b<d;)if(e){if(!1===c.call(e,a[b],b,0===b,b===d-1,d))break}else{if(!1===c(a[b],b,0===b,b===d-1,d))break}else{var b=0,f;for(f in a)a.hasOwnProperty(f)&&b++;d=b;b=-1;for(f in a)if(a.hasOwnProperty(f))if(b++,e){if(!1===c.call(e,a[f],f,b,0===b,b===d-1,d))break}else if(!1===c(a[f],f,b,0===b,b===d-1,d))break}};var k={"&":"&amp;","<":"&lt;",">":"&gt;",'"':"&quot;",
@@ -3,0 +3,0 @@ "'":"&#39;","/":"&#x2F;"},n=/[&<>"'\/]/g;Snakeskin.Filters.html=function(a){return(a+"").replace(n,h)};Snakeskin.Filters.undef=function(a){return"undefined"!==typeof a?a:""};var m={"&amp;":"&","&lt;":"<","&gt;":">","&quot;":'"',"&#39;":"'","&#x2F;":"/"},p=/&amp;|&lt;|&gt;|&quot;|&#39;|&#x2F;/g;Snakeskin.Filters.uhtml=function(a){return(a+"").replace(p,l)};var q=/<\/?[^>]+>/g;Snakeskin.Filters.stripTags=function(a){return(a+"").replace(q,"")};var r=/%5B/g,s=/%5D/g;Snakeskin.Filters.uri=function(a){return encodeURI(a+

snakeskin.min.js

@@ -1,2 +0,2 @@
-var Snakeskin={VERSION:"2.3.18",Directions:{},Filters:{},BEM:{},Vars:{},write:{},cache:{}};
+var Snakeskin={VERSION:"2.3.19",Directions:{},Filters:{},BEM:{},Vars:{},write:{},cache:{}};
 (function(G){function M(b){return N[b]}function O(b){return P[b]}function n(b,c,a){var e=this.prototype,d;for(d in e)e.hasOwnProperty(d)&&e[d].init&&(this[d]=e[d].init());this.canWrite=!0;this.i=-1;this.openBlockI=0;this.posCache={};this.sysPosCache={};this.quotContent=[];var f=this.cDataContent=[];this.source=String(b).replace(/{cdata}([\s\S]*?){(?:\/cdata|end cdata)}/gm,function(a,b){f.push(b);return"__SNAKESKIN_CDATA__"+(f.length-1)}).trim();this.res=(a?"":"/* This code is generated automatically, don't alter it. */")+
@@ -25,3 +25,3 @@ (c?"var Snakeskin = global.Snakeskin;exports.liveInit = function (path) { Snakeskin = require(path);exec();return this;};function exec() {":"")}Array.isArray||(Array.isArray=function(b){return"[object Array]"===Object.prototype.toString.call(b)});String.prototype.trim||(String.prototype.trim=function(){for(var b=this.replace(/^\s\s*/,""),c=b.length;/\s/.test(b.charAt(--c)););return b.substring(0,c+1)});Snakeskin.forEach=function(b,c,a){var e=-1,d;if(Array.isArray(b))for(d=b.length;++e<d;)if(a){if(!1===
 r)if("|"===B&&/[!$a-z_]/i.test(v))y=!0;else{d&&d--;h.shift();continue}}else if(")"!==r||f)")"===r&&f&&f--,g[g.length-1]+=r,k[g.length-1]+=r}x&&x--;"|"===B&&/[!$a-z_]/i.test(v)?(q=!1,l||(d?h[0].push(t+1):h.push([0,t+1])),g.push(v),k.push(v),f=0,l=!0,t+=2):l&&(")"===r&&!f||t===b.length-1)&&(l=h[0],r=n-u+s,B=d?m.substring(l[0]+s,l[1]+r):m.substring(0,l[1]+r),g=g.reduce(function(a,b){"!html"!==b?a.push(b):d||(A=!0);return a},[]),g=g.reduce(function(a,b){var c=b.split(" "),e=c.slice(1).join("").trim();
-return"Snakeskin.Filters['"+c.shift()+"']"+(y||!d?"(":"")+a+(e?","+e:"")+(y||!d?")":"")},B),k=k.join().length+1,m=d?m.substring(0,l[0]+s)+g+m.substring(l[1]+r+k):g,s+=g.length-B.length-k+n-u,u=n=0,h.pop(),g=[],k=[],l=!1,d&&(d--,y=!1))}return(A||c?"":"Snakeskin.Filters.html(")+m+(A||c?"":")")};Snakeskin.Directions.end=function(b,c,a,e){a.openBlockI--;var d=arguments,f=a.openBlockI+1,h;0===a.openBlockI?Snakeskin.Directions.templateEnd.apply(Snakeskin,arguments):a.isNotSysPos(f)&&(Snakeskin.forEach(a.posCache,
+return"($_ = Snakeskin.Filters['"+c.shift()+"']"+(y||!d?"(":"")+a+(e?","+e:"")+(y||!d?")":"")+")"},B),k=k.join().length+1,m=d?m.substring(0,l[0]+s)+g+m.substring(l[1]+r+k):g,s+=g.length-B.length-k+n-u,u=n=0,h.pop(),g=[],k=[],l=!1,d&&(d--,y=!1))}return(A||c?"":"Snakeskin.Filters.html(")+m+(A||c?"":")")};Snakeskin.Directions.end=function(b,c,a,e){a.openBlockI--;var d=arguments,f=a.openBlockI+1,h;0===a.openBlockI?Snakeskin.Directions.templateEnd.apply(Snakeskin,arguments):a.isNotSysPos(f)&&(Snakeskin.forEach(a.posCache,
 function(b,c){return(b=a.getLastPos(c))&&("undefined"!==typeof b.i&&b.i===f||b===f)?(h=!0,Snakeskin.Directions[c+"End"].apply(Snakeskin,d),!1):!0}),h||(a.parentTplName||a.protoStart)||a.save("};"));Snakeskin.forEach(a.sysPosCache,function(b,c){return(b=a.getLastPos(c))&&("undefined"!==typeof b.i&&b.i===f||b===f)?(Snakeskin.Directions[c+"End"].apply(Snakeskin,d),!1):!0})};n.prototype.startI=0;n.prototype.openBlockI=0;n.prototype.tplName=null;n.prototype.parentTplName=null;Snakeskin.Directions.template=
@@ -31,5 +31,5 @@ function(b,c,a,e){a.startI=a.i+1;c=/([\s\S]*?)\(/m.exec(b)[1];var d=a.pasteDangerBlocks(c);a.tplName=d;if(0!==a.openBlockI)throw a.error("Missing closing or opening tag in the template (command: {"+b+'}, template: "'+d+", "+a.genErrorAdvInfo(e.info)+'")!');a.openBlockI++;if(!e.dryRun){var f;/\s+extends\s+/m.test(b)&&(f=a.pasteDangerBlocks(/\s+extends\s+([\s\S]*)/m.exec(b)[1]),a.parentTplName=f);A[d]={};u[d]={};H[d]=0;y[d]={};I[d]=0;C[d]={};J[d]=f;var h=/\(([\s\S]*?)\)/m.exec(b)[1];a.save("/* Snakeskin template: "+
 "function "+c+"(");h=h.split(",");v[d]=v[f]?v[f].concat(h):h;v[f]&&Snakeskin.forEach(v[f],function(a){var b=a.split("=");b[0]=b[0].trim();b[1]=b[1]&&b[1].trim();Snakeskin.forEach(h,function(c,d){var e=c.split("=");e[0]=e[0].trim();e[1]=e[1]&&e[1].trim();b[0]===e[0]&&"undefined"===typeof e[1]&&(h[d]=a)})});var g="";Snakeskin.forEach(h,function(b,c){var e=b.split("=");e[0]=e[0].trim();a.save(e[0]);1<e.length&&(v[f]&&!g&&Snakeskin.forEach(v[f],function(a){var b=a.split("="),c;b[0]=b[0].trim();b[1]=b[1]&&
-b[1].trim();Snakeskin.forEach(h,function(a){a=a.split("=");a[0]=a[0].trim();a[1]=a[1]&&a[1].trim();return a[0]===b[0]?(c=!0,!1):!0});c||"undefined"===typeof b[1]||(g+="var "+b[0]+" = "+b[1]+";",C[d][b[0]]=a)}),e[1]=e[1].trim(),g+=e[0]+" = typeof "+e[0]+" !== 'undefined' && "+e[0]+" !== null ? "+e[0]+" : "+e[1]+";");C[d][e[0]]=b;c!==h.length-1&&a.save(",")});a.save(") { "+g+"var __SNAKESKIN_RESULT__ = '';");a.save("var TPL_NAME = '"+a.defEscape(a.pasteDangerBlocks(c))+"';var PARENT_TPL_NAME;");f&&
-a.save("PARENT_TPL_NAME = '"+a.defEscape(a.pasteDangerBlocks(f))+"';")}};Snakeskin.Directions.templateEnd=function(b,c,a,e){var d=a.tplName;if(a.backHashI)throw a.error('Proto "'+a.lastBack+'" is not defined (command: {'+b+'}, template: "'+d+", "+a.genErrorAdvInfo(e.info)+'")!');if(!e.dryRun){b=a.source;var f=a.i,h=a.startI;F[d]=b.substring(h,f-c-1);var l=a.parentTplName;if(l)return a.source=b.substring(0,h)+a.getExtStr(d,e.info)+b.substring(f-c-1),A[d]={},u[d]={},H[d]=0,y[d]={},I[d]=0,C[d]={},a.i=
-h-1,a.openBlockI++,!1===Snakeskin.write[l]&&(a.res=a.res.replace(RegExp("/\\* Snakeskin template: "+l.replace(/([.\[\]^$])/gm,"\\$1")+";[\\s\\S]*?/\\* Snakeskin template\\. \\*/","m"),"")),a.parentTplName=null,!1;a.save("return __SNAKESKIN_RESULT__; };if (typeof Snakeskin !== 'undefined') {Snakeskin.cache['"+a.defEscape(a.pasteDangerBlocks(d))+"'] = "+(e.commonJS?"exports.":"")+d+";}/* Snakeskin template. */");a.canWrite=!0;a.tplName=null}};Snakeskin.Directions.call=function(b,c,a){a.parentTplName||
+b[1].trim();Snakeskin.forEach(h,function(a){a=a.split("=");a[0]=a[0].trim();a[1]=a[1]&&a[1].trim();return a[0]===b[0]?(c=!0,!1):!0});c||"undefined"===typeof b[1]||(g+="var "+b[0]+" = "+b[1]+";",C[d][b[0]]=a)}),e[1]=e[1].trim(),g+=e[0]+" = typeof "+e[0]+" !== 'undefined' && "+e[0]+" !== null ? "+e[0]+" : "+e[1]+";");C[d][e[0]]=b;c!==h.length-1&&a.save(",")});a.save(") { "+g+"var __SNAKESKIN_RESULT__ = '', $_;");a.save("var TPL_NAME = '"+a.defEscape(a.pasteDangerBlocks(c))+"';var PARENT_TPL_NAME;");
+f&&a.save("PARENT_TPL_NAME = '"+a.defEscape(a.pasteDangerBlocks(f))+"';")}};Snakeskin.Directions.templateEnd=function(b,c,a,e){var d=a.tplName;if(a.backHashI)throw a.error('Proto "'+a.lastBack+'" is not defined (command: {'+b+'}, template: "'+d+", "+a.genErrorAdvInfo(e.info)+'")!');if(!e.dryRun){b=a.source;var f=a.i,h=a.startI;F[d]=b.substring(h,f-c-1);var l=a.parentTplName;if(l)return a.source=b.substring(0,h)+a.getExtStr(d,e.info)+b.substring(f-c-1),A[d]={},u[d]={},H[d]=0,y[d]={},I[d]=0,C[d]={},
+a.i=h-1,a.openBlockI++,!1===Snakeskin.write[l]&&(a.res=a.res.replace(RegExp("/\\* Snakeskin template: "+l.replace(/([.\[\]^$])/gm,"\\$1")+";[\\s\\S]*?/\\* Snakeskin template\\. \\*/","m"),"")),a.parentTplName=null,!1;a.save("return __SNAKESKIN_RESULT__; };if (typeof Snakeskin !== 'undefined') {Snakeskin.cache['"+a.defEscape(a.pasteDangerBlocks(d))+"'] = "+(e.commonJS?"exports.":"")+d+";}/* Snakeskin template. */");a.canWrite=!0;a.tplName=null}};Snakeskin.Directions.call=function(b,c,a){a.parentTplName||
 a.protoStart||a.save("__SNAKESKIN_RESULT__ += "+b+";")};Snakeskin.Directions["void"]=function(b,c,a){a.parentTplName||a.protoStart||a.save(a.prepareOutput(b)+";")};n.prototype.varCache={init:function(){return{}}};Snakeskin.Directions["var"]=function(b,c,a,e){c=a.tplName;var d=b.split("=")[0].trim();if(y[c][d]||C[c][d])throw a.error('Variable "'+d+'" is already defined as constant (command: {var '+b+'}, template: "'+c+", "+a.genErrorAdvInfo(e.info)+'")!');a.varCache[d]=!0;a.parentTplName||a.protoStart||
@@ -36,0 +36,0 @@ a.save(a.prepareOutput("var "+b+";",!0))};Snakeskin.Directions.block=function(b,c,a,e){c=a.tplName;var d=a.parentTplName;if(!e.dryRun&&(d&&!a.hasPos("block")&&!a.hasPos("proto")||!d)){if(A[c][b])throw a.error('Block "'+b+'" is already defined (command: {block '+b+'}, template: "'+c+", "+a.genErrorAdvInfo(e.info)+'")!');A[c][b]={from:a.i-a.startI+1}}a.pushPos("block",{name:b,i:++a.openBlockI},!0)};Snakeskin.Directions.blockEnd=function(b,c,a,e){b=a.popPos("block");e.dryRun||(!a.parentTplName||a.hasPos("block")||

No alert changes

Improved metrics

Total package byte prevSize

6548922

Lines of code

5016

increased by0.02%

No dependency changes