snakeskin - npm Package Compare versions

Comparing version 2.3.14 to 2.3.15

index.js

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

lib/compiler.js

@@ -101,2 +101,5 @@ /**
 
+					// Хак для {void ...} как {?...}
+					.replace(/^\?/, 'void ')
+
 					// Хак для поддержки {data ...} как {{ ... }}
@@ -103,0 +106,0 @@ .replace(/^{([\s\S]*)}$/m, function (sstr, $1) {

lib/core.js

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

package.json

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

readme.md

@@ -117,3 +117,3 @@ # Snakeskin
 
-Директивы поддерживающие локальные фильтры: *var*, *forEach*, *for*, *while*, *until*, *if*, *elseIf*, *data*,
+Директивы поддерживающие локальные фильтры: *var*, *forEach*, *for*, *while*, *until*, *if*, *elseIf*, *data*, *void*,
 декларация констант и вывод значений.
@@ -227,3 +227,3 @@
 
-Директивы поддерживающие работы с with: *with*, *var*, *forEach*, *for*, *while*, *until*, *if*, *elseIf*, *data*,
+Директивы поддерживающие работы с with: *with*, *var*, *forEach*, *for*, *while*, *until*, *if*, *elseIf*, *data*, *void*,
 декларация констант и вывод значений.
@@ -270,2 +270,6 @@
 
+Также для директивы доступна более короткая форма записи:
+
+    {?changeDocTitle('Foobar')}
+
 ## Директива end
@@ -272,0 +276,0 @@

snakeskin.live.js

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

snakeskin.live.min.js

@@ -1,2 +0,2 @@
-var Snakeskin={VERSION:"2.3.14",Directions:{},Filters:{},BEM:{},Vars:{},write:{},cache:{}};
+var Snakeskin={VERSION:"2.3.15",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.14",Directions:{},Filters:{},BEM:{},Vars:{},write:{},cache:{}};
+var Snakeskin={VERSION:"2.3.15",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. */")+
@@ -15,4 +15,4 @@ (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===
 (c=b[a].innerHTML?c+(a+": (class: "+(b[a].className||"undefined")+", id: "+(b[a].id||"undefined")+"), "):c+(a+": "+b[a]+", "));return c.replace(/, $/,"")};n.prototype.error=function(b){b=Error(b);b.name="Snakeskin Error";return b};Snakeskin.compile=function(b,c,a,e,d){a=a||{};b.innerHTML&&(a.node=b);var f=new n(b.innerHTML||b,c,e);f.sysPosCache["with"]=d;var h;b=0;var l;d="";for(var g=!1,k,m,s=!0,q=!1;++f.i<f.source.length;){var z=f.source,p=z.charAt(f.i),L=z.charAt(f.i+1);if(h||f.tplName||!/\s/.test(p)){if(!m){if(h){if("\\"===
-p||g)g=!g}else g=!1;if(!g)if("/"===p)if("/"===L&&"/"===z.charAt(f.i+2))k="///";else if("*"===L)k="/*",f.i++;else{if("*"===z.charAt(f.i-1)){k=!1;continue}}else/[\n\v\r]/.test(p)&&"///"===k&&(k=!1);if(k)continue;if("{"===p)if(h)b++;else{h=!0;continue}else if(!("}"!==p||b&&b--)){h=!1;z=d.length;d=f.replaceDangerBlocks(d).trim();p=d.replace(/^\//,"end ").replace(/^{([\s\S]*)}$/m,function(a,b){return"data "+b}).split(" ")[0];p=Snakeskin.Directions[p]?p:"const";!1===Snakeskin.Directions[p]("const"!==p?
-d.replace(RegExp("^"+p+"\\s+","m"),""):d,z,f,{commonJS:c,dryRun:e,info:a})&&(l=h=!1);d="";continue}}h?(l&&!f.protoStart&&(f.save("';"),l=!1),"/"!==d&&(m||(K[p]?s=!0:/[^\s\/]/.test(p)&&(s=!1)),D[p]&&("/"===p?s:1)&&!m?m=p:m&&("\\"===p||q)?q=!q:D[p]&&(m===p&&!q)&&(m=!1)),d+=p):f.protoStart||(l||(f.save("__SNAKESKIN_RESULT__ += '"),l=!0),f.parentTplName||f.save(f.defEscape(p)))}}if(0!==f.openBlockI)throw f.error("Missing closing or opening tag in the template, "+f.genErrorAdvInfo(a)+'")!');f.res=f.pasteDangerBlocks(f.res).replace(/[\t\v\r\n]/gm,
+p||g)g=!g}else g=!1;if(!g)if("/"===p)if("/"===L&&"/"===z.charAt(f.i+2))k="///";else if("*"===L)k="/*",f.i++;else{if("*"===z.charAt(f.i-1)){k=!1;continue}}else/[\n\v\r]/.test(p)&&"///"===k&&(k=!1);if(k)continue;if("{"===p)if(h)b++;else{h=!0;continue}else if(!("}"!==p||b&&b--)){h=!1;z=d.length;d=f.replaceDangerBlocks(d).trim();p=d.replace(/^\//,"end ").replace(/^\?/,"void ").replace(/^{([\s\S]*)}$/m,function(a,b){return"data "+b}).split(" ")[0];p=Snakeskin.Directions[p]?p:"const";!1===Snakeskin.Directions[p]("const"!==
+p?d.replace(RegExp("^"+p+"\\s+","m"),""):d,z,f,{commonJS:c,dryRun:e,info:a})&&(l=h=!1);d="";continue}}h?(l&&!f.protoStart&&(f.save("';"),l=!1),"/"!==d&&(m||(K[p]?s=!0:/[^\s\/]/.test(p)&&(s=!1)),D[p]&&("/"===p?s:1)&&!m?m=p:m&&("\\"===p||q)?q=!q:D[p]&&(m===p&&!q)&&(m=!1)),d+=p):f.protoStart||(l||(f.save("__SNAKESKIN_RESULT__ += '"),l=!0),f.parentTplName||f.save(f.defEscape(p)))}}if(0!==f.openBlockI)throw f.error("Missing closing or opening tag in the template, "+f.genErrorAdvInfo(a)+'")!');f.res=f.pasteDangerBlocks(f.res).replace(/[\t\v\r\n]/gm,
 "").replace(/__SNAKESKIN_CDATA__(\d+)/g,function(a,b){return f.cDataContent[b].replace(/\n/gm,"\\n").replace(/\r/gm,"\\r").replace(/\v/gm,"\\v").replace(/'/gm,"&#39;")}).replace(/__SNAKESKIN_RESULT__ \+= '';/g,"");f.res+=e?"":"/* Snakeskin templating system. Generated at: "+(new Date).toString()+". */";f.res+=c?"}":"";if(e)return f.res;G?c?eval(f.res):global.eval(f.res):window.eval(f.res);return f.res};var X={"break":!0,"case":!0,"catch":!0,"continue":!0,"delete":!0,"do":!0,"else":!0,"false":!0,finnaly:!0,
@@ -19,0 +19,0 @@ "for":!0,"function":!0,"if":!0,"in":!0,"instanceof":!0,"new":!0,"null":!0,"return":!0,"switch":!0,"this":!0,"throw":!0,"true":!0,"try":!0,"typeof":!0,"var":!0,"void":!0,"while":!0,"with":!0,"class":!0,let:!0,"const":!0,"debugger":!0,"interface":!0},Y={"var":!0,let:!0,"const":!0};n.prototype.replaceTplVars=function(b){b=this.pasteDangerBlocks(b);for(var c=0,a,e=!1,d,f,h=!0,l=!1,g="",k=0;k<b.length;k++){var m=b.charAt(k),s=b.charAt(k+1);if(c||"$"!==m||"{"!==s){if(c||(g+=m.replace(/\\/gm,"\\\\").replace(/('|")/gm,

No alert changes

Improved metrics

Total package byte prevSize

6548792

increased by0.01%

Lines of code

5013

increased by0.1%

Number of lines in readme file

429

increased by0.94%

No dependency changes