From a5fb25629cd93d85233fea6d2e9f4f358b2dd0f6 Mon Sep 17 00:00:00 2001
From: Stefano Balocco <stefano.balocco@gmail.com>
Date: Sat, 29 Jan 2022 23:33:57 +0100
Subject: [PATCH] null is an object, but is a primitive type. So, every time I
 typeof == 'object', I should also check != null

---
 README.md    |  4 +++-
 jTDAL.js     | 32 ++++++++++++++------------------
 jTDAL.min.js |  2 +-
 jTDAL.ts     | 27 ++++++++++++---------------
 package.json |  2 +-
 5 files changed, 31 insertions(+), 36 deletions(-)

diff --git a/README.md b/README.md
index a6275b5..2a95fd3 100644
--- a/README.md
+++ b/README.md
@@ -44,7 +44,9 @@ The first that exists and is not false, is the used as result of the path expres
 
 If the path expression supports booleans, you can prepend [!] to a path.
 
-If the path expression supports strings, you can append, as last path, STRING:this is a string {and/you/can/have/paths/too}! {?this/path/is/true} showed only if the condition is true{?this/path/is/true}{?!this/is/false} visible only unless is true{?!this/is/false}
+If the path expression supports strings, you can append, as last path
+
+    STRING:this is a string {and/you/can/have/paths/too}! {?this/path/is/true} showed only if the condition is true{?this/path/is/true}{?!this/is/false} visible only unless is true{?!this/is/false}
 
 In a boolean check, empty lists or empty string will be considered "false".
 
diff --git a/jTDAL.js b/jTDAL.js
index ddcef78..5ad2c3b 100644
--- a/jTDAL.js
+++ b/jTDAL.js
@@ -97,36 +97,36 @@ var jTDAL;
                                 case 'GLOBAL': {
                                     if (1 < path.length) {
                                         const countSecondLevel = path.length;
-                                        returnValue += (boolPath ? (not ? '!(' : '(') : '') + '"object"===typeof (t[i]=d)';
+                                        returnValue += (boolPath ? (not ? '!(' : '(') : '') + '"object"===typeof(t[i]=d)&&null!==t[i]';
                                         for (let indexSecondLevel = 1; indexSecondLevel < countSecondLevel; ++indexSecondLevel) {
                                             returnValue += '&&';
                                             let lastPath = 't[i]["' + path[indexSecondLevel] + '"]';
-                                            returnValue += '"undefined"!==typeof ';
+                                            returnValue += '"undefined"!==typeof';
                                             returnValue += '(t[i]=("function"===typeof ' + lastPath + '?' + lastPath + '(r,d)):' + lastPath + ')';
                                         }
-                                        returnValue += (boolPath ? '?"object"===typeof t[i]?0<Object.keys(t[i]).length:(Array.isArray(t[i])?0<t[i].length:false!==t[i]&&null!==t[i]):false)?true' : '?t[i]') + ':';
+                                        returnValue += (boolPath ? '?"object"===typeof t[i]?null!==t[i]&&0<Object.keys(t[i]).length:(Array.isArray(t[i])?0<t[i].length:false!==t[i]):false)?true' : '?t[i]') + ':';
                                     }
                                     break;
                                 }
                                 default: {
                                     const countSecondLevel = path.length;
                                     openedBracket++;
-                                    returnValue += '(' + (boolPath ? (not ? '!' : '') + '(' : '') + '"object"===typeof (t[i]=r)';
+                                    returnValue += '(' + (boolPath ? (not ? '!' : '') + '(' : '') + '"object"===typeof(t[i]=r)&&null!==t[i]';
                                     for (let indexSecondLevel = 0; indexSecondLevel < countSecondLevel; ++indexSecondLevel) {
                                         returnValue += '&&';
                                         let lastPath = 't[i]["' + path[indexSecondLevel] + '"]';
-                                        returnValue += '"undefined"!==typeof ';
+                                        returnValue += '"undefined"!==typeof';
                                         returnValue += '(t[i]=("function"===typeof ' + lastPath + '?' + lastPath + '(d,r):' + lastPath + '))';
                                     }
-                                    returnValue += (boolPath ? '?"object"===typeof t[i]?0<Object.keys(t[i]).length:(Array.isArray(t[i])?0<t[i].length:false!==t[i]&&null!==t[i]):false)' + (not ? '&&' : '||') : '?t[i]:');
-                                    returnValue += (boolPath ? (not ? '!' : '') + '(' : '') + '"object"===typeof (t[i]=d)';
+                                    returnValue += (boolPath ? '?"object"===typeof t[i]?null!==t[i]&&0<Object.keys(t[i]).length:(Array.isArray(t[i])?0<t[i].length:false!==t[i]):false)' + (not ? '&&' : '||') : '?t[i]:');
+                                    returnValue += (boolPath ? (not ? '!' : '') + '(' : '') + '"object"===typeof(t[i]=d)&&null!==t[i]';
                                     for (let indexSecondLevel = 0; indexSecondLevel < countSecondLevel; ++indexSecondLevel) {
                                         returnValue += '&&';
                                         let lastPath = 't[i]["' + path[indexSecondLevel] + '"]';
-                                        returnValue += '"undefined"!==typeof ';
+                                        returnValue += '"undefined"!==typeof';
                                         returnValue += '(t[i]=("function"===typeof ' + lastPath + '?' + lastPath + '(d,r):' + lastPath + '))';
                                     }
-                                    returnValue += (boolPath ? '?"object"===typeof t[i]?0<Object.keys(t[i]).length:(Array.isArray(t[i])?0<t[i].length:false!==t[i]&&null!==t[i]):false)?true' : '?t[i]') + ':';
+                                    returnValue += (boolPath ? '?"object"===typeof t[i]?null!==t[i]&&0<Object.keys(t[i]).length:(Array.isArray(t[i])?0<t[i].length:false!==t[i]):false)?true' : '?t[i]') + ':';
                                 }
                             }
                         }
@@ -203,7 +203,7 @@ var jTDAL;
                         current[0] += '+(';
                         current[0] += 'false!==(t[i++]=' + tmpValue + ')&&';
                         current[0] += '(!Array.isArray(t[--i])||(t[i]=Object.assign({},t[i])))&&';
-                        current[0] += '("object"===typeof t[i]&&0<Object.keys(t[i++]).length)&&(t[i++]=1)';
+                        current[0] += '("object"===typeof t[i]&&null!==t[i]&&0<Object.keys(t[i++]).length)&&(t[i++]=1)';
                         current[0] += '?';
                         current[0] += 'Object.keys(t[i-2]).reduce(function(o,e){';
                         current[0] += 'r["' + tmpTDALrules[1] + '"]=t[i-2][e];';
@@ -264,16 +264,12 @@ var jTDAL;
                         }
                         else if ('true' !== tmpValue) {
                             current[2] += '+(false!==(t[i++]=' + tmpValue + ')&&("string"===typeof t[--i]||("number"===typeof t[i]&&!isNaN(t[i])))?" ' + tmpTDALrules[1] +
-                                '=\\""+t[i]+"\\"":(true!==t[i]?"":"';
+                                '=\\""+t[i]+"\\"":(true!==t[i]?"":"' + tmpTDALrules[1] + '"';
                             if ('undefined' !== (typeof attributes[tmpTDALrules[1]])) {
                                 current[1] = current[1].replace(new RegExp('\\s*' + tmpTDALrules[1] + '(?:=([\'"]).*?\\1)?'), '');
-                                current[2] += tmpTDALrules[1] + '"' +
-                                    ((('undefined' !== (typeof attributes[tmpTDALrules[1]][3])) && ('' != attributes[tmpTDALrules[1]][3])) ? '+"="+' +
-                                        JSON.stringify(String(attributes[tmpTDALrules[1]][2] + attributes[tmpTDALrules[1]][3] +
-                                            attributes[tmpTDALrules[1]][2])) : "");
-                            }
-                            else {
-                                current[2] += '"';
+                                current[2] += ((('undefined' !== (typeof attributes[tmpTDALrules[1]][3])) && ('' != attributes[tmpTDALrules[1]][3])) ? '+"="+' +
+                                    JSON.stringify(String(attributes[tmpTDALrules[1]][2] + attributes[tmpTDALrules[1]][3] +
+                                        attributes[tmpTDALrules[1]][2])) : "");
                             }
                             current[2] += '))';
                         }
diff --git a/jTDAL.min.js b/jTDAL.min.js
index 61cb3cf..4c6552b 100644
--- a/jTDAL.min.js
+++ b/jTDAL.min.js
@@ -1 +1 @@
-"use strict";var jTDAL;!function(t){const e="(?:[\\w-\\/]*[\\w](?:[\\s]*\\|[\\s]*[\\w-\\/]*[\\w])*)",i="(?:(?:!)?[\\w-\\/]*[\\w](?:[\\s]*\\|[\\s]*[\\w-\\/]*[\\w])*)",r="(STRING:[^;]+|"+i+")",n={tagWithTDAL:new RegExp("<((?:\\w+:)?\\w+)(\\s+[^<>]+?)??\\s+data-tdal-(?:"+["condition","repeat","content","replace","attributes","omittag"].join("|")+")=(['\"])(.*?)\\3(\\s+[^<>]+?)??\\s*(/)?>","i"),tagWithAttribute:new RegExp("<((?:w+:)?w+)(s+[^<>]+?)??s+%s=(['\"])(.*?)\\3(s+[^<>]+?)??s*(/)?>","i"),tagAttributes:new RegExp("(?<=\\s)((?:[\\w-]+:)?[\\w-]+)=(?:(['\"])(.*?)\\2|([^>\\s'\"]+))","gi"),pathString:new RegExp("(?:{("+e+")}|{\\?("+i+")}(.*?){\\?\\2})"),pathInString:new RegExp("{("+e+")}","g"),conditionInString:new RegExp("{\\?("+i+")}(.*?){\\?\\1}","g"),condition:new RegExp("^[\\s]*("+r+")[\\s]*$"),repeat:new RegExp("^[\\s]*([\\w-]+?)[\\s]+("+e+")[\\s]*$"),content:new RegExp("^[\\s]*(?:(text|structure)[\\s]+)?("+r+")[\\s]*$"),attributes:new RegExp("[\\s]*(?:(?:([\\w-]+?)[\\s]+("+r+")[\\s]*)(?:;[\\s]*|$))","g"),attributesTDAL:new RegExp("\\s*(data-tdal-[\\w-]+)=(?:(['\"])(.*?)\\2|([^>\\s'\"]+))","gi")},s=["area","base","br","col","embed","hr","img","input","link","meta","param","source","track","wbr"];function l(t){let e='""',i=null;for(;null!=(i=n.pathString.exec(t));)if(0<i.index&&(e+="+"+JSON.stringify(String(t.substr(0,i.index)))),t=t.substr(i.index+i[0].length),i[1])e+="+"+f(i[1]);else if(i[2]){const t=f(i[2],!0);"true"===t?e+="+"+l(i[3]):"false"!==t&&(e+="+(true==="+t+'?""+'+l(i[3])+':"")')}return 0<t.length&&(e+="+"+JSON.stringify(String(t))),e}function f(t,e=!1){let i="";if(t){let r=0;t:{const n=t.split("|"),s=n.length;for(let t=0;t<s;++t){const s=n[t].replace(/^\s+/,"");if(s.startsWith("STRING:")){i+="("+l(s.substr(7))+")";break t}{const t="!"===s[0],n=e||t,l=(t?s.substring(1):s).split("/");if(0<l.length&&0<l[0].length)switch(l[0]){case"FALSE":i+=t?"true":"false";break t;case"TRUE":i+=t?"false":"true";break t;case"REPEAT":if(3==l.length){r++,i+=(n?"("+(t?"!":""):"")+'("undefined"!==typeof r["REPEAT"]&&',i+='"undefined"!==typeof r["REPEAT"]["'+l[1]+'"]&&';let e='r["REPEAT"]["'+l[1]+'"]["'+l[2]+'"]';i+='"undefined"!==typeof '+e,i+=(n?")?false!==(t[i]="+e+")&&null!==t[i]":"?"+e)+":"}break;case"GLOBAL":if(1<l.length){const e=l.length;i+=(n?t?"!(":"(":"")+'"object"===typeof (t[i]=d)';for(let t=1;t<e;++t){i+="&&";let e='t[i]["'+l[t]+'"]';i+='"undefined"!==typeof ',i+='(t[i]=("function"===typeof '+e+"?"+e+"(r,d)):"+e+")"}i+=(n?'?"object"===typeof t[i]?0<Object.keys(t[i]).length:(Array.isArray(t[i])?0<t[i].length:false!==t[i]&&null!==t[i]):false)?true':"?t[i]")+":"}break;default:{const e=l.length;r++,i+="("+(n?(t?"!":"")+"(":"")+'"object"===typeof (t[i]=r)';for(let t=0;t<e;++t){i+="&&";let e='t[i]["'+l[t]+'"]';i+='"undefined"!==typeof ',i+='(t[i]=("function"===typeof '+e+"?"+e+"(d,r):"+e+"))"}i+=n?'?"object"===typeof t[i]?0<Object.keys(t[i]).length:(Array.isArray(t[i])?0<t[i].length:false!==t[i]&&null!==t[i]):false)'+(t?"&&":"||"):"?t[i]:",i+=(n?(t?"!":"")+"(":"")+'"object"===typeof (t[i]=d)';for(let t=0;t<e;++t){i+="&&";let e='t[i]["'+l[t]+'"]';i+='"undefined"!==typeof ',i+='(t[i]=("function"===typeof '+e+"?"+e+"(d,r):"+e+"))"}i+=(n?'?"object"===typeof t[i]?0<Object.keys(t[i]).length:(Array.isArray(t[i])?0<t[i].length:false!==t[i]&&null!==t[i]):false)?true':"?t[i]")+":"}}}}i+="false"}for(let t=0;t<r;t++)i+=")"}else i="false";return i}function o(t){let e="",i=null;for(;null!==(i=n.tagWithTDAL.exec(t));){0<i.index&&(e+="+"+JSON.stringify(String(t.substr(0,i.index)))),t=t.substr(i.index+i[0].length);let r,l={};for(;null!==(r=n.tagAttributes.exec(i[0]));)l[r[1]]=r;let a=["",i[0],"","","","","",""],u=!!i[6]||s.includes(i[1].toLowerCase());if(!u){let e=[];const n=new RegExp("<(\\/)?"+i[1]+"[^<>]*(?<!\\/)>","gi");let s=1;for(;void 0===e[0]&&null!==(r=n.exec(t));)r[1]?s--:s++,0==s&&(e=[r.index,r[0].length]);void 0===e[0]?u=!0:(a[4]+=o(t.substr(0,e[0])),a[6]+=t.substr(e[0],e[1]),t=t.substr(e[0]+e[1]))}t:{if(l["data-tdal-condition"]&&n.condition.exec(l["data-tdal-condition"][3])){let t=f(l["data-tdal-condition"][3],!0);if("false"===t)break t;"true"!==t&&(a[0]+="+(true==="+t+'?""',a[7]=':"")'+a[7])}let t;if(l["data-tdal-repeat"]&&(t=n.repeat.exec(l["data-tdal-repeat"][3]))){let e=f(t[2]);if("false"==e||'""'==e||"true"==e)break t;a[0]+="+(",a[0]+="false!==(t[i++]="+e+")&&",a[0]+="(!Array.isArray(t[--i])||(t[i]=Object.assign({},t[i])))&&",a[0]+='("object"===typeof t[i]&&0<Object.keys(t[i++]).length)&&(t[i++]=1)',a[0]+="?",a[0]+="Object.keys(t[i-2]).reduce(function(o,e){",a[0]+='r["'+t[1]+'"]=t[i-2][e];',a[0]+='r["REPEAT"]["'+t[1]+'"]={};',a[0]+='r["REPEAT"]["'+t[1]+'"]["index"]=e;',a[0]+='r["REPEAT"]["'+t[1]+'"]["number"]=t[i-1]++;',a[0]+='r["REPEAT"]["'+t[1]+'"]["even"]=0==(r["REPEAT"]["'+t[1]+'"]["number"]%2);',a[0]+='r["REPEAT"]["'+t[1]+'"]["odd"]=1==(r["REPEAT"]["'+t[1]+'"]["number"]%2);',a[0]+='r["REPEAT"]["'+t[1]+'"]["first"]=1==r["REPEAT"]["'+t[1]+'"]["number"];',a[0]+='r["REPEAT"]["'+t[1]+'"]["length"]=Object.keys(t[i-2]);',a[0]+='r["REPEAT"]["'+t[1]+'"]["last"]=r["REPEAT"]["'+t[1]+'"]["length"]==r["REPEAT"]["'+t[1]+'"]["number"];',a[0]+="return o",a[7]=';},""):"")+((i-=2)?"":"")'+a[7]}if(l["data-tdal-content"]&&(t=n.content.exec(l["data-tdal-content"][3]))){let e=f(t[2]);if("false"==e)a[4]="";else if("true"!=e){let i=["",""];"structure"!=t[1]&&(i[0]="(new String(",i[1]=')).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;")'),a[3]+="+(false!==(t[i++]="+e+')&&("string"===typeof t[--i]||("number"===typeof t[i]&&!isNaN(t[i])))?'+i[0]+"t[i]"+i[1]+':(true!==t[i]?"":""',a[5]+="))"}}else if(l["data-tdal-replace"]&&(t=n.content.exec(l["data-tdal-replace"][3]))){let e=f(t[2]);if("false"==e)a[1]="",a[4]="",a[6]="";else if("true"!=e){let i=["",""];"structure"!=t[1]&&(i[0]="(new String(",i[1]=')).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;")'),a[0]+="+(false!==(t[i++]="+e+')&&("string"===typeof t[--i]||("number"===typeof t[i]&&!isNaN(t[i])))?'+i[0]+"t[i]"+i[1]+':(true!==t[i]?"":""',a[7]="))"+a[7]}}if(l["data-tdal-attributes"]&&(t=n.attributes.exec(l["data-tdal-attributes"][3])))for(;null!==t;){let e=f(t[2]);"false"===e?void 0!==l[t[1]]&&(a[1]=a[1].replace(new RegExp("\\s*"+t[1]+"(?:=(['\"]).*?\\1)?"),"")):"true"!==e&&(a[2]+="+(false!==(t[i++]="+e+')&&("string"===typeof t[--i]||("number"===typeof t[i]&&!isNaN(t[i])))?" '+t[1]+'=\\""+t[i]+"\\"":(true!==t[i]?"":"',void 0!==l[t[1]]?(a[1]=a[1].replace(new RegExp("\\s*"+t[1]+"(?:=(['\"]).*?\\1)?"),""),a[2]+=t[1]+'"'+(void 0!==l[t[1]][3]&&""!=l[t[1]][3]?'+"="+'+JSON.stringify(String(l[t[1]][2]+l[t[1]][3]+l[t[1]][2])):"")):a[2]+='"',a[2]+="))"),t=n.attributes.exec(l["data-tdal-attributes"][3])}if(l["data-tdal-omittag"]&&n.condition.exec(l["data-tdal-omittag"][3])){let t=f(l["data-tdal-omittag"][3],!0);"true"==t?(a[1]="",a[6]=""):"false"!=t&&(a[0]+="+("+t+'?"":""',a[3]=")"+a[3],a[5]+="+("+t+'?"":""',a[7]=")"+a[7])}for(;null!==(r=n.attributesTDAL.exec(a[1]));)a[1]=a[1].replace(n.attributesTDAL,"")}a[1]=a[1].replace(/\s*\/?>$/,""),!u||""==a[4]&&""==a[3]&&""==a[5]||(a[6]="</"+i[1]+">",u=!1),e+=a[0]+"+"+JSON.stringify(String(a[1]))+a[2]+(""!=a[1]?'+"'+(u?"/":"")+'>"':"")+a[3]+a[4]+a[5]+"+"+JSON.stringify(String(a[6]))+a[7]}return e+="+"+JSON.stringify(String(t)),e}function a(t,e=!0,i=!0){return('let r={"REPEAT":{}},i=0,t=[];return '+(e?"(":"")+'""'+o(i?t.replace(/<!--.*?-->/gs,""):t)).replace(/(?<!\\)""\+/,"").replace(/(?<!\\)"\+"/g,"").replace(/\+""$/,"")+(e?").trim()":"")}t.CompileToFunction=function(t,e=!0,i=!0){return new Function("d",a(t,e,i))},t.CompileToString=function(t,e=!0,i=!0){return"function(d){"+a(t,e,i)+"}"}}(jTDAL||(jTDAL={})),"undefined"!=typeof exports&&(exports.CompileToFunction=jTDAL.CompileToFunction,exports.CompileToString=jTDAL.CompileToString);
\ No newline at end of file
+"use strict";var jTDAL;!function(t){const e="(?:[\\w-\\/]*[\\w](?:[\\s]*\\|[\\s]*[\\w-\\/]*[\\w])*)",i="(?:(?:!)?[\\w-\\/]*[\\w](?:[\\s]*\\|[\\s]*[\\w-\\/]*[\\w])*)",r="(STRING:[^;]+|"+i+")",n={tagWithTDAL:new RegExp("<((?:\\w+:)?\\w+)(\\s+[^<>]+?)??\\s+data-tdal-(?:"+["condition","repeat","content","replace","attributes","omittag"].join("|")+")=(['\"])(.*?)\\3(\\s+[^<>]+?)??\\s*(/)?>","i"),tagWithAttribute:new RegExp("<((?:w+:)?w+)(s+[^<>]+?)??s+%s=(['\"])(.*?)\\3(s+[^<>]+?)??s*(/)?>","i"),tagAttributes:new RegExp("(?<=\\s)((?:[\\w-]+:)?[\\w-]+)=(?:(['\"])(.*?)\\2|([^>\\s'\"]+))","gi"),pathString:new RegExp("(?:{("+e+")}|{\\?("+i+")}(.*?){\\?\\2})"),pathInString:new RegExp("{("+e+")}","g"),conditionInString:new RegExp("{\\?("+i+")}(.*?){\\?\\1}","g"),condition:new RegExp("^[\\s]*("+r+")[\\s]*$"),repeat:new RegExp("^[\\s]*([\\w-]+?)[\\s]+("+e+")[\\s]*$"),content:new RegExp("^[\\s]*(?:(text|structure)[\\s]+)?("+r+")[\\s]*$"),attributes:new RegExp("[\\s]*(?:(?:([\\w-]+?)[\\s]+("+r+")[\\s]*)(?:;[\\s]*|$))","g"),attributesTDAL:new RegExp("\\s*(data-tdal-[\\w-]+)=(?:(['\"])(.*?)\\2|([^>\\s'\"]+))","gi")},l=["area","base","br","col","embed","hr","img","input","link","meta","param","source","track","wbr"];function s(t){let e='""',i=null;for(;null!=(i=n.pathString.exec(t));)if(0<i.index&&(e+="+"+JSON.stringify(String(t.substr(0,i.index)))),t=t.substr(i.index+i[0].length),i[1])e+="+"+f(i[1]);else if(i[2]){const t=f(i[2],!0);"true"===t?e+="+"+s(i[3]):"false"!==t&&(e+="+(true==="+t+'?""+'+s(i[3])+':"")')}return 0<t.length&&(e+="+"+JSON.stringify(String(t))),e}function f(t,e=!1){let i="";if(t){let r=0;t:{const n=t.split("|"),l=n.length;for(let t=0;t<l;++t){const l=n[t].replace(/^\s+/,"");if(l.startsWith("STRING:")){i+="("+s(l.substr(7))+")";break t}{const t="!"===l[0],n=e||t,s=(t?l.substring(1):l).split("/");if(0<s.length&&0<s[0].length)switch(s[0]){case"FALSE":i+=t?"true":"false";break t;case"TRUE":i+=t?"false":"true";break t;case"REPEAT":if(3==s.length){r++,i+=(n?"("+(t?"!":""):"")+'("undefined"!==typeof r["REPEAT"]&&',i+='"undefined"!==typeof r["REPEAT"]["'+s[1]+'"]&&';let e='r["REPEAT"]["'+s[1]+'"]["'+s[2]+'"]';i+='"undefined"!==typeof '+e,i+=(n?")?false!==(t[i]="+e+")&&null!==t[i]":"?"+e)+":"}break;case"GLOBAL":if(1<s.length){const e=s.length;i+=(n?t?"!(":"(":"")+'"object"===typeof(t[i]=d)&&null!==t[i]';for(let t=1;t<e;++t){i+="&&";let e='t[i]["'+s[t]+'"]';i+='"undefined"!==typeof',i+='(t[i]=("function"===typeof '+e+"?"+e+"(r,d)):"+e+")"}i+=(n?'?"object"===typeof t[i]?null!==t[i]&&0<Object.keys(t[i]).length:(Array.isArray(t[i])?0<t[i].length:false!==t[i]):false)?true':"?t[i]")+":"}break;default:{const e=s.length;r++,i+="("+(n?(t?"!":"")+"(":"")+'"object"===typeof(t[i]=r)&&null!==t[i]';for(let t=0;t<e;++t){i+="&&";let e='t[i]["'+s[t]+'"]';i+='"undefined"!==typeof',i+='(t[i]=("function"===typeof '+e+"?"+e+"(d,r):"+e+"))"}i+=n?'?"object"===typeof t[i]?null!==t[i]&&0<Object.keys(t[i]).length:(Array.isArray(t[i])?0<t[i].length:false!==t[i]):false)'+(t?"&&":"||"):"?t[i]:",i+=(n?(t?"!":"")+"(":"")+'"object"===typeof(t[i]=d)&&null!==t[i]';for(let t=0;t<e;++t){i+="&&";let e='t[i]["'+s[t]+'"]';i+='"undefined"!==typeof',i+='(t[i]=("function"===typeof '+e+"?"+e+"(d,r):"+e+"))"}i+=(n?'?"object"===typeof t[i]?null!==t[i]&&0<Object.keys(t[i]).length:(Array.isArray(t[i])?0<t[i].length:false!==t[i]):false)?true':"?t[i]")+":"}}}}i+="false"}for(let t=0;t<r;t++)i+=")"}else i="false";return i}function o(t){let e="",i=null;for(;null!==(i=n.tagWithTDAL.exec(t));){0<i.index&&(e+="+"+JSON.stringify(String(t.substr(0,i.index)))),t=t.substr(i.index+i[0].length);let r,s={};for(;null!==(r=n.tagAttributes.exec(i[0]));)s[r[1]]=r;let u=["",i[0],"","","","","",""],a=!!i[6]||l.includes(i[1].toLowerCase());if(!a){let e=[];const n=new RegExp("<(\\/)?"+i[1]+"[^<>]*(?<!\\/)>","gi");let l=1;for(;void 0===e[0]&&null!==(r=n.exec(t));)r[1]?l--:l++,0==l&&(e=[r.index,r[0].length]);void 0===e[0]?a=!0:(u[4]+=o(t.substr(0,e[0])),u[6]+=t.substr(e[0],e[1]),t=t.substr(e[0]+e[1]))}t:{if(s["data-tdal-condition"]&&n.condition.exec(s["data-tdal-condition"][3])){let t=f(s["data-tdal-condition"][3],!0);if("false"===t)break t;"true"!==t&&(u[0]+="+(true==="+t+'?""',u[7]=':"")'+u[7])}let t;if(s["data-tdal-repeat"]&&(t=n.repeat.exec(s["data-tdal-repeat"][3]))){let e=f(t[2]);if("false"==e||'""'==e||"true"==e)break t;u[0]+="+(",u[0]+="false!==(t[i++]="+e+")&&",u[0]+="(!Array.isArray(t[--i])||(t[i]=Object.assign({},t[i])))&&",u[0]+='("object"===typeof t[i]&&null!==t[i]&&0<Object.keys(t[i++]).length)&&(t[i++]=1)',u[0]+="?",u[0]+="Object.keys(t[i-2]).reduce(function(o,e){",u[0]+='r["'+t[1]+'"]=t[i-2][e];',u[0]+='r["REPEAT"]["'+t[1]+'"]={};',u[0]+='r["REPEAT"]["'+t[1]+'"]["index"]=e;',u[0]+='r["REPEAT"]["'+t[1]+'"]["number"]=t[i-1]++;',u[0]+='r["REPEAT"]["'+t[1]+'"]["even"]=0==(r["REPEAT"]["'+t[1]+'"]["number"]%2);',u[0]+='r["REPEAT"]["'+t[1]+'"]["odd"]=1==(r["REPEAT"]["'+t[1]+'"]["number"]%2);',u[0]+='r["REPEAT"]["'+t[1]+'"]["first"]=1==r["REPEAT"]["'+t[1]+'"]["number"];',u[0]+='r["REPEAT"]["'+t[1]+'"]["length"]=Object.keys(t[i-2]);',u[0]+='r["REPEAT"]["'+t[1]+'"]["last"]=r["REPEAT"]["'+t[1]+'"]["length"]==r["REPEAT"]["'+t[1]+'"]["number"];',u[0]+="return o",u[7]=';},""):"")+((i-=2)?"":"")'+u[7]}if(s["data-tdal-content"]&&(t=n.content.exec(s["data-tdal-content"][3]))){let e=f(t[2]);if("false"==e)u[4]="";else if("true"!=e){let i=["",""];"structure"!=t[1]&&(i[0]="(new String(",i[1]=')).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;")'),u[3]+="+(false!==(t[i++]="+e+')&&("string"===typeof t[--i]||("number"===typeof t[i]&&!isNaN(t[i])))?'+i[0]+"t[i]"+i[1]+':(true!==t[i]?"":""',u[5]+="))"}}else if(s["data-tdal-replace"]&&(t=n.content.exec(s["data-tdal-replace"][3]))){let e=f(t[2]);if("false"==e)u[1]="",u[4]="",u[6]="";else if("true"!=e){let i=["",""];"structure"!=t[1]&&(i[0]="(new String(",i[1]=')).replace(/&/g, "&amp;").replace(/</g, "&lt;").replace(/>/g, "&gt;").replace(/"/g, "&quot;")'),u[0]+="+(false!==(t[i++]="+e+')&&("string"===typeof t[--i]||("number"===typeof t[i]&&!isNaN(t[i])))?'+i[0]+"t[i]"+i[1]+':(true!==t[i]?"":""',u[7]="))"+u[7]}}if(s["data-tdal-attributes"]&&(t=n.attributes.exec(s["data-tdal-attributes"][3])))for(;null!==t;){let e=f(t[2]);"false"===e?void 0!==s[t[1]]&&(u[1]=u[1].replace(new RegExp("\\s*"+t[1]+"(?:=(['\"]).*?\\1)?"),"")):"true"!==e&&(u[2]+="+(false!==(t[i++]="+e+')&&("string"===typeof t[--i]||("number"===typeof t[i]&&!isNaN(t[i])))?" '+t[1]+'=\\""+t[i]+"\\"":(true!==t[i]?"":"'+t[1]+'"',void 0!==s[t[1]]&&(u[1]=u[1].replace(new RegExp("\\s*"+t[1]+"(?:=(['\"]).*?\\1)?"),""),u[2]+=void 0!==s[t[1]][3]&&""!=s[t[1]][3]?'+"="+'+JSON.stringify(String(s[t[1]][2]+s[t[1]][3]+s[t[1]][2])):""),u[2]+="))"),t=n.attributes.exec(s["data-tdal-attributes"][3])}if(s["data-tdal-omittag"]&&n.condition.exec(s["data-tdal-omittag"][3])){let t=f(s["data-tdal-omittag"][3],!0);"true"==t?(u[1]="",u[6]=""):"false"!=t&&(u[0]+="+("+t+'?"":""',u[3]=")"+u[3],u[5]+="+("+t+'?"":""',u[7]=")"+u[7])}for(;null!==(r=n.attributesTDAL.exec(u[1]));)u[1]=u[1].replace(n.attributesTDAL,"")}u[1]=u[1].replace(/\s*\/?>$/,""),!a||""==u[4]&&""==u[3]&&""==u[5]||(u[6]="</"+i[1]+">",a=!1),e+=u[0]+"+"+JSON.stringify(String(u[1]))+u[2]+(""!=u[1]?'+"'+(a?"/":"")+'>"':"")+u[3]+u[4]+u[5]+"+"+JSON.stringify(String(u[6]))+u[7]}return e+="+"+JSON.stringify(String(t)),e}function u(t,e=!0,i=!0){return('let r={"REPEAT":{}},i=0,t=[];return '+(e?"(":"")+'""'+o(i?t.replace(/<!--.*?-->/gs,""):t)).replace(/(?<!\\)""\+/,"").replace(/(?<!\\)"\+"/g,"").replace(/\+""$/,"")+(e?").trim()":"")}t.CompileToFunction=function(t,e=!0,i=!0){return new Function("d",u(t,e,i))},t.CompileToString=function(t,e=!0,i=!0){return"function(d){"+u(t,e,i)+"}"}}(jTDAL||(jTDAL={})),"undefined"!=typeof exports&&(exports.CompileToFunction=jTDAL.CompileToFunction,exports.CompileToString=jTDAL.CompileToString);
\ No newline at end of file
diff --git a/jTDAL.ts b/jTDAL.ts
index eddfe9e..15464d2 100644
--- a/jTDAL.ts
+++ b/jTDAL.ts
@@ -102,37 +102,37 @@ namespace jTDAL {
 									if( 1 < path.length ) {
 										const countSecondLevel = path.length;
 										// d must be a object
-										returnValue += ( boolPath ? ( not ? '!(' : '(' ) : '' ) + '"object"===typeof (t[i]=d)';
+										returnValue += ( boolPath ? ( not ? '!(' : '(' ) : '' ) + '"object"===typeof(t[i]=d)&&null!==t[i]';
 										// Skip GLOBAL
 										for( let indexSecondLevel = 1; indexSecondLevel < countSecondLevel; ++indexSecondLevel ) {
 											returnValue += '&&';
 											let lastPath = 't[i]["' + path[ indexSecondLevel ] + '"]';
-											returnValue += '"undefined"!==typeof ';
+											returnValue += '"undefined"!==typeof';
 											returnValue += '(t[i]=("function"===typeof ' + lastPath + '?' + lastPath + '(r,d)):' + lastPath + ')';
 										}
-										returnValue += ( boolPath ? '?"object"===typeof t[i]?0<Object.keys(t[i]).length:(Array.isArray(t[i])?0<t[i].length:false!==t[i]&&null!==t[i]):false)?true' : '?t[i]' ) + ':';
+										returnValue += ( boolPath ? '?"object"===typeof t[i]?null!==t[i]&&0<Object.keys(t[i]).length:(Array.isArray(t[i])?0<t[i].length:false!==t[i]):false)?true' : '?t[i]' ) + ':';
 									}
 									break;
 								}
 								default: {
 									const countSecondLevel = path.length;
 									openedBracket++;
-									returnValue += '(' + ( boolPath ? ( not ? '!' : '' ) + '(' : '' ) + '"object"===typeof (t[i]=r)';
+									returnValue += '(' + ( boolPath ? ( not ? '!' : '' ) + '(' : '' ) + '"object"===typeof(t[i]=r)&&null!==t[i]';
 									for( let indexSecondLevel = 0; indexSecondLevel < countSecondLevel; ++indexSecondLevel ) {
 										returnValue += '&&';
 										let lastPath = 't[i]["' + path[ indexSecondLevel ] + '"]';
-										returnValue += '"undefined"!==typeof ';
+										returnValue += '"undefined"!==typeof';
 										returnValue += '(t[i]=("function"===typeof ' + lastPath + '?' + lastPath + '(d,r):' + lastPath + '))';
 									}
-									returnValue += ( boolPath ? '?"object"===typeof t[i]?0<Object.keys(t[i]).length:(Array.isArray(t[i])?0<t[i].length:false!==t[i]&&null!==t[i]):false)' + ( not ? '&&' : '||' ) : '?t[i]:' );
-									returnValue += ( boolPath ? ( not ? '!' : '' ) + '(' : '' ) + '"object"===typeof (t[i]=d)';
+									returnValue += ( boolPath ? '?"object"===typeof t[i]?null!==t[i]&&0<Object.keys(t[i]).length:(Array.isArray(t[i])?0<t[i].length:false!==t[i]):false)' + ( not ? '&&' : '||' ) : '?t[i]:' );
+									returnValue += ( boolPath ? ( not ? '!' : '' ) + '(' : '' ) + '"object"===typeof(t[i]=d)&&null!==t[i]';
 									for( let indexSecondLevel = 0; indexSecondLevel < countSecondLevel; ++indexSecondLevel ) {
 										returnValue += '&&';
 										let lastPath = 't[i]["' + path[ indexSecondLevel ] + '"]';
-										returnValue += '"undefined"!==typeof ';
+										returnValue += '"undefined"!==typeof';
 										returnValue += '(t[i]=("function"===typeof ' + lastPath + '?' + lastPath + '(d,r):' + lastPath + '))';
 									}
-									returnValue += ( boolPath ? '?"object"===typeof t[i]?0<Object.keys(t[i]).length:(Array.isArray(t[i])?0<t[i].length:false!==t[i]&&null!==t[i]):false)?true' : '?t[i]' ) + ':';
+									returnValue += ( boolPath ? '?"object"===typeof t[i]?null!==t[i]&&0<Object.keys(t[i]).length:(Array.isArray(t[i])?0<t[i].length:false!==t[i]):false)?true' : '?t[i]' ) + ':';
 								}
 							}
 						}
@@ -219,7 +219,7 @@ namespace jTDAL {
 						current[ 0 ] += 'false!==(t[i++]=' + tmpValue + ')&&';
 						current[ 0 ] += '(!Array.isArray(t[--i])||(t[i]=Object.assign({},t[i])))&&';
 						// current i = index for object loop ( i+=1 )
-						current[ 0 ] += '("object"===typeof t[i]&&0<Object.keys(t[i++]).length)&&(t[i++]=1)';
+						current[ 0 ] += '("object"===typeof t[i]&&null!==t[i]&&0<Object.keys(t[i++]).length)&&(t[i++]=1)';
 						current[ 0 ] += '?';
 						current[ 0 ] += 'Object.keys(t[i-2]).reduce(function(o,e){';
 						current[ 0 ] += 'r["' + tmpTDALrules[ 1 ] + '"]=t[i-2][e];';
@@ -278,15 +278,12 @@ namespace jTDAL {
 							}
 						} else if( 'true' !== tmpValue ) {
 							current[ 2 ] += '+(false!==(t[i++]=' + tmpValue + ')&&("string"===typeof t[--i]||("number"===typeof t[i]&&!isNaN(t[i])))?" ' + tmpTDALrules[ 1 ] +
-															'=\\""+t[i]+"\\"":(true!==t[i]?"":"';
+															'=\\""+t[i]+"\\"":(true!==t[i]?"":"' + tmpTDALrules[ 1 ] + '"';
 							if( 'undefined' !== ( typeof attributes[ tmpTDALrules[ 1 ] ] ) ) {
 								current[ 1 ] = current[ 1 ].replace( new RegExp( '\\s*' + tmpTDALrules[ 1 ] + '(?:=([\'"]).*?\\1)?' ), '' );
-								current[ 2 ] += tmpTDALrules[ 1 ] + '"' +
-																( ( ( 'undefined' !== ( typeof attributes[ tmpTDALrules[ 1 ] ][ 3 ] ) ) && ( '' != attributes[ tmpTDALrules[ 1 ] ][ 3 ] ) ) ? '+"="+' +
+								current[ 2 ] += ( ( ( 'undefined' !== ( typeof attributes[ tmpTDALrules[ 1 ] ][ 3 ] ) ) && ( '' != attributes[ tmpTDALrules[ 1 ] ][ 3 ] ) ) ? '+"="+' +
 																JSON.stringify( String( attributes[ tmpTDALrules[ 1 ] ][ 2 ] + attributes[ tmpTDALrules[ 1 ] ][ 3 ] +
 																attributes[ tmpTDALrules[ 1 ] ][ 2 ] ) ) : "" );
-							} else {
-								current[ 2 ] += '"';
 							}
 							current[ 2 ] += '))';
 						}
diff --git a/package.json b/package.json
index 9ef3d85..a77a14d 100644
--- a/package.json
+++ b/package.json
@@ -7,7 +7,7 @@
     "type": "git",
     "url": "https://github.com/StefanoBalocco/jTDAL.git"
   },
-  "version": "2.1.2",
+  "version": "2.1.3",
   "keywords": [
     "template engine",
     "tal"