uritemplate - npm Package Compare versions

Comparing version 0.2.3 to 0.2.4

bin/uritemplate-min.js

@@ -1,1 +0,1 @@
-(function(e){"use strict";function n(e){var t,o;if(null===e||void 0===e)return!1;if(r.isArray(e)){for(t=0;e.length>t;t+=1)if(n(e[t]))return!0;return!1}if("string"==typeof e||"number"==typeof e||"boolean"==typeof e)return!0;for(o in e)if(e.hasOwnProperty(o)&&n(e[o]))return!0;return!1}var r=function(){function e(e){return"[object Array]"===Object.prototype.toString.apply(e)}function n(e,n,r){var t,o=r;for(t in e)e.hasOwnProperty(t)&&(o=n(o,e[t],t,e));return o}function r(e,n,r){var t,o=r;for(t=0;e.length>t;t+=1)o=n(o,e[t],t,e);return o}function t(t,o,i){return e(t)?r(t,o,i):n(t,o,i)}return{isArray:e,reduce:t}}(),t=function(){function e(e){return e>="a"&&"z">=e||e>="A"&&"Z">=e}function n(e){return e>="0"&&"9">=e}function r(e){return n(e)||e>="a"&&"f">=e||e>="A"&&"F">=e}return{isAlpha:e,isDigit:n,isHexDigit:r}}(),o=function(){function e(e){var n,r,t="",o=u.encode(e);for(r=0;o.length>r;r+=1)n=o.charCodeAt(r),t+="%"+n.toString(16).toUpperCase();return t}function n(e,n){return"%"===e[n]&&t.isHexDigit(e[n+1])&&t.isHexDigit(e[n+2])}function r(e,n){return parseInt(e.substr(n,2),16)}function o(e){if(!n(e,0))return!1;var t=r(e,1),o=u.numBytes(t);if(0===o)return!1;for(var i=1;o>i;i+=1)if(!n(e,3*i)||!u.isValidFollowingCharCode(r(e,3*i+1)))return!1;return!0}function i(e,t){var o=e[t];if(!n(e,t))return o;var i=r(e,t+1),a=u.numBytes(i);if(0===a)return o;for(var s=1;a>s;s+=1)if(!n(e,t+3*s)||!u.isValidFollowingCharCode(r(e,t+3*s+1)))return o;return e.substr(t,3*a)}var u={encode:function(e){return unescape(encodeURIComponent(e))},numBytes:function(e){return 127>=e?1:e>=194&&223>=e?2:e>=224&&239>=e?3:e>=240&&244>=e?4:0},isValidFollowingCharCode:function(e){return e>=128&&191>=e}};return{encodeCharacter:e,isPctEncoded:o,pctCharAt:i}}(),i=function(){function e(e){return t.isAlpha(e)||t.isDigit(e)||"_"===e||o.isPctEncoded(e)}function n(e){return t.isAlpha(e)||t.isDigit(e)||"-"===e||"."===e||"_"===e||"~"===e}function r(e){return":"===e||"/"===e||"?"===e||"#"===e||"["===e||"]"===e||"@"===e||"!"===e||"$"===e||"&"===e||"("===e||")"===e||"*"===e||"+"===e||","===e||";"===e||"="===e||"'"===e}return{isVarchar:e,isUnreserved:n,isReserved:r}}(),u=function(){function e(e,n){var r,t="",u="";for(("number"==typeof e||"boolean"==typeof e)&&(e=""+e),r=0;e.length>r;r+=u.length)u=o.pctCharAt(e,r),t+=u.length>1?u:i.isUnreserved(u)||n&&i.isReserved(u)?u:o.encodeCharacter(u);return t}function n(n){return e(n,!0)}return{encode:e,encodePassReserved:n}}(),a=function(){function e(e){n[e]={symbol:e,separator:"?"===e?"&":""===e||"+"===e||"#"===e?",":e,named:";"===e||"&"===e||"?"===e,ifEmpty:"&"===e||"?"===e?"=":"",first:"+"===e?"":e,encode:"+"===e||"#"===e?u.encodePassReserved:u.encode,toString:function(){return this.symbol}}}var n={};return e(""),e("+"),e("#"),e("."),e("/"),e(";"),e("?"),e("&"),{valueOf:function(e){if(n[e])return n[e];if("=,!@|".indexOf(e)>=0)throw Error('Illegal use of reserved operator "'+e+'"');return n[""]}}}(),s=function(){function e(e){var n,r="",t="";for(n=0;e.length>n;n+=t.length)t=o.pctCharAt(e,n),r+=t.length>0?t:i.isReserved(t)||i.isUnreserved(t)?t:o.encodeCharacter(t);return r}function n(e){this.literal=n.encodeLiteral(e)}return n.encodeLiteral=e,n.prototype.expand=function(){return this.literal},n.prototype.toString=n.prototype.expand,n}(),f=function(){function e(e){function n(){p={varname:u.substring(d,f),exploded:!1,maxLength:null},d=null}function r(){if(h===f)throw Error("after a ':' you have to specify the length. position = "+f);p.maxLength=parseInt(u.substring(h,f),10),h=null}var u,s,f,c=[],p=null,d=null,h=null,g="";for(u=e.substr(1,e.length-2),s=a.valueOf(u.charAt(0)),f=""===s.symbol?0:1,d=f;u.length>f;f+=g.length){if(g=o.pctCharAt(u,f),null!==d){if("."===g){if(d===f)throw Error("a varname MUST NOT start with a dot -- see position "+f);continue}if(i.isVarchar(g))continue;n()}if(null!==h){if(t.isDigit(g))continue;r()}if(":"!==g)if("*"!==g){if(","!==g)throw Error("illegal character '"+g+"' at position "+f+' of "'+u+'"');c.push(p),p=null,d=f+1}else{if(null===p)throw Error("explode exploded at position "+f);if(p.exploded)throw Error("explode exploded twice at position "+f);if(p.maxLength)throw Error("an explode (*) MUST NOT follow to a prefix, see position "+f);p.exploded=!0}else{if(null!==p.maxLength)throw Error("only one :maxLength is allowed per varspec at position "+f);h=f+1}}return null!==d&&n(),null!==h&&r(),c.push(p),new l(e,s,c)}function n(n){var r,t,o=[],i=null,u=0;for(r=0;n.length>r;r+=1)if(t=n.charAt(r),null===u){if(null===i)throw Error("reached unreachable code");if("{"===t)throw Error("brace was opened in position "+i+" and cannot be reopened in position "+r);if("}"===t){if(i+1===r)throw Error("empty braces on position "+i);o.push(e(n.substring(i,r+1))),i=null,u=r+1}}else{if("}"===t)throw Error("brace was closed in position "+r+" but never opened");"{"===t&&(r>u&&o.push(new s(n.substring(u,r))),u=null,i=r)}if(null!==i)throw Error("brace was opened on position "+i+", but never closed");return n.length>u&&o.push(new s(n.substr(u))),new c(n,o)}return n}(),l=function(){function e(e){return JSON?JSON.stringify(e):e}function t(e,n,r){this.templateText=e,this.operator=n,this.varspecs=r}return t.prototype.toString=function(){return this.templateText},t.prototype.expand=function(t){function o(e,r,t){return n(r)&&(e.length>0&&(e+=","),c||(e+=h.encode(t)+","),e+=h.encode(r)),e}function i(e,r,t){return n(r)&&(e.length>0&&(e+=h.separator),e+=c?s.encodeLiteral(f.varname):h.encode(t),e+="="+h.encode(r)),e}function u(e,r,t){return n(r)&&(e.length>0&&(e+=h.separator),c||(e+=h.encode(t)+"="),e+=h.encode(r)),e}var a,f,l,c,p="",d=!0,h=this.operator;for(a=0;this.varspecs.length>a;a+=1)if(f=this.varspecs[a],l=t[f.varname],n(l))if(d?(p+=h.first,d=!1):p+=h.separator,c=r.isArray(l),"string"==typeof l||"number"==typeof l||"boolean"==typeof l){if(l=""+l,h.named){if(p+=s.encodeLiteral(f.varname),""===l){p+=h.ifEmpty;continue}p+="="}f.maxLength&&l.length>f.maxLength&&(l=l.substr(0,f.maxLength)),p+=h.encode(l)}else{if(f.maxLength)throw Error("Prefix modifiers are not applicable to variables that have composite values. You tried to expand "+this+" with "+e(l));if(f.exploded)p+=r.reduce(l,h.named?i:u,"");else{if(h.named){if(p+=s.encodeLiteral(f.varname),!n(l)){p+=h.ifEmpty;continue}p+="="}p+=r.reduce(l,o,"")}}if(d){var g=!1;for(a=0;this.varspecs.length>a;a+=1)if(this.varspecs[a].exploded){g=!0;break}h.named&&!g&&(p+=h.symbol,p+=f.varname+h.ifEmpty)}return p},t}(),c=function(){function e(e,n){this.templateText=e,this.expressions=n}return e.prototype.toString=function(){return this.templateText},e.prototype.expand=function(e){var n,r="";for(n=0;this.expressions.length>n;n+=1)r+=this.expressions[n].expand(e);return r},e.parse=f,e}();e(c)})(function(e){"use strict";"undefined"!=typeof module?module.exports=e:"undefined"!=typeof define?define([],function(){return e}):"undefined"!=typeof window?window.UriTemplate=e:global.UriTemplate=e});
+(function(e){"use strict";function r(e){var t,o;if(null===e||void 0===e)return!1;if(n.isArray(e)){for(t=0;e.length>t;t+=1)if(r(e[t]))return!0;return!1}if("string"==typeof e||"number"==typeof e||"boolean"==typeof e)return!0;for(o in e)if(e.hasOwnProperty(o)&&r(e[o]))return!0;return!1}var n=function(){function e(e){return"[object Array]"===Object.prototype.toString.apply(e)}function r(e,r,n){var t,o=n;for(t in e)e.hasOwnProperty(t)&&(o=r(o,e[t],t,e));return o}function n(e,r,n){var t,o=n;for(t=0;e.length>t;t+=1)o=r(o,e[t],t,e);return o}function t(t,o,i){return e(t)?n(t,o,i):r(t,o,i)}function o(e){if("object"!=typeof e||null===e)return e;Object.freeze(e);var r,n;for(n in e)e.hasOwnProperty(n)&&(r=e[n],"object"==typeof r&&i(r));return e}function i(e){return"function"==typeof Object.freeze?o(e):e}return{isArray:e,reduce:t,deepFreeze:i}}(),t=function(){function e(e){return e>="a"&&"z">=e||e>="A"&&"Z">=e}function r(e){return e>="0"&&"9">=e}function n(e){return r(e)||e>="a"&&"f">=e||e>="A"&&"F">=e}return{isAlpha:e,isDigit:r,isHexDigit:n}}(),o=function(){function e(e){var r,n,t="",o=u.encode(e);for(n=0;o.length>n;n+=1)r=o.charCodeAt(n),t+="%"+r.toString(16).toUpperCase();return t}function r(e,r){return"%"===e[r]&&t.isHexDigit(e[r+1])&&t.isHexDigit(e[r+2])}function n(e,r){return parseInt(e.substr(r,2),16)}function o(e){if(!r(e,0))return!1;var t=n(e,1),o=u.numBytes(t);if(0===o)return!1;for(var i=1;o>i;i+=1)if(!r(e,3*i)||!u.isValidFollowingCharCode(n(e,3*i+1)))return!1;return!0}function i(e,t){var o=e[t];if(!r(e,t))return o;var i=n(e,t+1),a=u.numBytes(i);if(0===a)return o;for(var s=1;a>s;s+=1)if(!r(e,t+3*s)||!u.isValidFollowingCharCode(n(e,t+3*s+1)))return o;return e.substr(t,3*a)}var u={encode:function(e){return unescape(encodeURIComponent(e))},numBytes:function(e){return 127>=e?1:e>=194&&223>=e?2:e>=224&&239>=e?3:e>=240&&244>=e?4:0},isValidFollowingCharCode:function(e){return e>=128&&191>=e}};return{encodeCharacter:e,isPctEncoded:o,pctCharAt:i}}(),i=function(){function e(e){return t.isAlpha(e)||t.isDigit(e)||"_"===e||o.isPctEncoded(e)}function r(e){return t.isAlpha(e)||t.isDigit(e)||"-"===e||"."===e||"_"===e||"~"===e}function n(e){return":"===e||"/"===e||"?"===e||"#"===e||"["===e||"]"===e||"@"===e||"!"===e||"$"===e||"&"===e||"("===e||")"===e||"*"===e||"+"===e||","===e||";"===e||"="===e||"'"===e}return{isVarchar:e,isUnreserved:r,isReserved:n}}(),u=function(){function e(e,r){var n,t="",u="";for(("number"==typeof e||"boolean"==typeof e)&&(e=""+e),n=0;e.length>n;n+=u.length)u=e.charAt(n),t+=i.isUnreserved(u)||r&&i.isReserved(u)?u:o.encodeCharacter(u);return t}function r(r){return e(r,!0)}return{encode:e,encodePassReserved:r}}(),a=function(){function e(e){r[e]={symbol:e,separator:"?"===e?"&":""===e||"+"===e||"#"===e?",":e,named:";"===e||"&"===e||"?"===e,ifEmpty:"&"===e||"?"===e?"=":"",first:"+"===e?"":e,encode:"+"===e||"#"===e?u.encodePassReserved:u.encode,toString:function(){return this.symbol}}}var r={};return e(""),e("+"),e("#"),e("."),e("/"),e(";"),e("?"),e("&"),{valueOf:function(e){if(r[e])return r[e];if("=,!@|".indexOf(e)>=0)throw Error('Illegal use of reserved operator "'+e+'"');return r[""]}}}(),s=function(){function e(r){this.literal=e.encodeLiteral(r)}return e.encodeLiteral=function(e){var r,n="",t="";for(r=0;e.length>r;r+=t.length)t=o.pctCharAt(e,r),n+=t.length>1?t:i.isReserved(t)||i.isUnreserved(t)?t:o.encodeCharacter(t);return n},e.prototype.expand=function(){return this.literal},e.prototype.toString=e.prototype.expand,e}(),f=function(){function e(e){function r(){p={varname:u.substring(d,f),exploded:!1,maxLength:null},d=null}function n(){if(h===f)throw Error("after a ':' you have to specify the length. position = "+f);p.maxLength=parseInt(u.substring(h,f),10),h=null}var u,s,f,c=[],p=null,d=null,h=null,g="";for(u=e.substr(1,e.length-2),s=a.valueOf(u.charAt(0)),f=""===s.symbol?0:1,d=f;u.length>f;f+=g.length){if(g=o.pctCharAt(u,f),null!==d){if("."===g){if(d===f)throw Error("a varname MUST NOT start with a dot -- see position "+f);continue}if(i.isVarchar(g))continue;r()}if(null!==h){if(f===h&&"0"===g)throw Error("A :prefix must not start with digit 0 -- see position "+f);if(t.isDigit(g)){if(f-h>=4)throw Error("A :prefix must max 4 digits -- see position "+f);continue}n()}if(":"!==g)if("*"!==g){if(","!==g)throw Error("illegal character '"+g+"' at position "+f+' of "'+u+'"');c.push(p),p=null,d=f+1}else{if(null===p)throw Error("explode exploded at position "+f);if(p.exploded)throw Error("explode exploded twice at position "+f);if(p.maxLength)throw Error("an explode (*) MUST NOT follow to a prefix, see position "+f);p.exploded=!0}else{if(null!==p.maxLength)throw Error("only one :maxLength is allowed per varspec at position "+f);h=f+1}}return null!==d&&r(),null!==h&&n(),c.push(p),new l(e,s,c)}function r(r){var n,t,o=[],i=null,u=0;for(n=0;r.length>n;n+=1)if(t=r.charAt(n),null===u){if(null===i)throw Error("reached unreachable code");if("{"===t)throw Error("brace was opened in position "+i+" and cannot be reopened in position "+n);if("}"===t){if(i+1===n)throw Error("empty braces on position "+i);o.push(e(r.substring(i,n+1))),i=null,u=n+1}}else{if("}"===t)throw Error("brace was closed in position "+n+" but never opened");"{"===t&&(n>u&&o.push(new s(r.substring(u,n))),u=null,i=n)}if(null!==i)throw Error("brace was opened on position "+i+", but never closed");return r.length>u&&o.push(new s(r.substr(u))),new c(r,o)}return r}(),l=function(){function e(e){return JSON?JSON.stringify(e):e}function t(e,r,n){this.templateText=e,this.operator=r,this.varspecs=n}return t.prototype.toString=function(){return this.templateText},t.prototype.expand=function(t){function o(e,n,t){return r(n)&&(e.length>0&&(e+=","),c||(e+=h.encode(t)+","),e+=h.encode(n)),e}function i(e,n,t){return r(n)&&(e.length>0&&(e+=h.separator),e+=c?s.encodeLiteral(f.varname):h.encode(t),e+="="+h.encode(n)),e}function u(e,n,t){return r(n)&&(e.length>0&&(e+=h.separator),c||(e+=h.encode(t)+"="),e+=h.encode(n)),e}var a,f,l,c,p="",d=!0,h=this.operator;for(a=0;this.varspecs.length>a;a+=1)if(f=this.varspecs[a],l=t[f.varname],r(l))if(d?(p+=h.first,d=!1):p+=h.separator,c=n.isArray(l),"string"==typeof l||"number"==typeof l||"boolean"==typeof l){if(l=""+l,h.named){if(p+=s.encodeLiteral(f.varname),""===l){p+=h.ifEmpty;continue}p+="="}null!==f.maxLength&&(l=l.substr(0,f.maxLength)),p+=h.encode(l)}else{if(f.maxLength)throw Error("Prefix modifiers are not applicable to variables that have composite values. You tried to expand "+this+" with "+e(l));if(f.exploded)p+=n.reduce(l,h.named?i:u,"");else{if(h.named){if(p+=s.encodeLiteral(f.varname),!r(l)){p+=h.ifEmpty;continue}p+="="}p+=n.reduce(l,o,"")}}if(d){var g=!1;for(a=0;this.varspecs.length>a;a+=1)if(this.varspecs[a].exploded){g=!0;break}h.named&&!g&&(p+=h.symbol,p+=f.varname+h.ifEmpty)}return p},t}(),c=function(){function e(e,r){this.templateText=e,this.expressions=r,n.deepFreeze(this)}return e.prototype.toString=function(){return this.templateText},e.prototype.expand=function(e){var r,n="";for(r=0;this.expressions.length>r;r+=1)n+=this.expressions[r].expand(e);return n},e.parse=f,e}();e(c)})(function(e){"use strict";"undefined"!=typeof module?module.exports=e:"function"==typeof define?define([],function(){return e}):"undefined"!=typeof window?window.UriTemplate=e:global.UriTemplate=e});

bin/uritemplate.js

@@ -12,4 +12,3 @@ /*jshint */
 var objectHelper = (function () {
-
-    function isArray(value) {
+    function isArray (value) {
         return Object.prototype.toString.apply(value) === '[object Array]';
@@ -20,3 +19,3 @@ }
     // TODO handling if initialValue is undefined
-    function objectReduce(object, callback, initialValue) {
+    function objectReduce (object, callback, initialValue) {
         var
@@ -35,3 +34,3 @@ propertyName,
     // TODO handling if initialValue is undefined
-    function arrayReduce(array, callback, initialValue) {
+    function arrayReduce (array, callback, initialValue) {
         var
@@ -46,9 +45,36 @@ index,
 
-    function reduce(arrayOrObject, callback, initialValue) {
+    function reduce (arrayOrObject, callback, initialValue) {
         return isArray(arrayOrObject) ? arrayReduce(arrayOrObject, callback, initialValue) : objectReduce(arrayOrObject, callback, initialValue);
     }
 
+    function deepFreezeUsingObjectFreeze (object) {
+        if (typeof object !== "object" || object === null) {
+            return object;
+        }
+        Object.freeze(object);
+        var property, propertyName;
+        for (propertyName in object) {
+            if (object.hasOwnProperty(propertyName)) {
+                property = object[propertyName];
+                // be aware, arrays are 'object', too
+                if (typeof property === "object") {
+                    deepFreeze(property);
+                }
+            }
+        }
+        return object;
+    }
+
+    function deepFreeze (object) {
+        if (typeof Object.freeze === 'function') {
+            return deepFreezeUsingObjectFreeze(object);
+        }
+        return object;
+    }
+
+
     return {
         isArray: isArray,
-        reduce: reduce
+        reduce: reduce,
+        deepFreeze: deepFreeze
     };
@@ -79,3 +105,2 @@ }());
 var pctEncoder = (function () {
-
     var utf8 = {
@@ -125,2 +150,8 @@ encode: function (chr) {
 
+    /**
+     * Returns, whether the given text at start is in the form 'percent hex-digit hex-digit', like '%3F'
+     * @param text
+     * @param start
+     * @return {boolean|*|*}
+     */
     function isPercentDigitDigit (text, start) {
@@ -130,3 +161,9 @@ return text[start] === '%' && charHelper.isHexDigit(text[start + 1]) && charHelper.isHexDigit(text[start + 2]);
 
-    function parseHex2(text, start) {
+    /**
+     * Parses a hex number from start with length 2.
+     * @param text a string
+     * @param start the start index of the 2-digit hex number
+     * @return {Number}
+     */
+    function parseHex2 (text, start) {
         return parseInt(text.substr(start, 2), 16);
@@ -136,3 +173,3 @@ }
     /**
-     * Returns wether or not the given char sequence is a correctly pct-encoded sequence.
+     * Returns whether or not the given char sequence is a correctly pct-encoded sequence.
      * @param chr
@@ -196,3 +233,3 @@ * @return {boolean}
      */
-    function isVarchar(chr) {
+    function isVarchar (chr) {
         return charHelper.isAlpha(chr) || charHelper.isDigit(chr) || chr === '_' || pctEncoder.isPctEncoded(chr);
@@ -206,3 +243,3 @@ }
      */
-    function isUnreserved(chr) {
+    function isUnreserved (chr) {
         return charHelper.isAlpha(chr) || charHelper.isDigit(chr) || chr === '-' || chr === '.' || chr === '_' || chr === '~';
@@ -213,6 +250,7 @@ }
      * Returns if chr is an reserved character according 1.5 of rfc 6570
+     * or the percent character mentioned in 3.2.1.
      * @param chr
      * @return {Boolean}
      */
-    function isReserved(chr) {
+    function isReserved (chr) {
         return chr === ':' || chr === '/' || chr === '?' || chr === '#' || chr === '[' || chr === ']' || chr === '@' || chr === '!' || chr === '$' || chr === '&' || chr === '(' ||
@@ -244,9 +282,4 @@ chr === ')' || chr === '*' || chr === '+' || chr === ',' || chr === ';' || chr === '=' || chr === "'";
         for (index = 0; index < text.length; index += chr.length) {
-            chr = pctEncoder.pctCharAt(text, index);
-            if (chr.length > 1) {
-                result += chr;
-            }
-            else {
-                result += rfcCharHelper.isUnreserved(chr) || (passReserved && rfcCharHelper.isReserved(chr)) ? chr : pctEncoder.encodeCharacter(chr);
-            }
+            chr = text.charAt(index);
+            result += rfcCharHelper.isUnreserved(chr) || (passReserved && rfcCharHelper.isReserved(chr)) ? chr : pctEncoder.encodeCharacter(chr);
         }
@@ -318,3 +351,3 @@ return result;
  */
-function isDefined(object) {
+function isDefined (object) {
     var
@@ -348,4 +381,7 @@ index,
 var LiteralExpression = (function () {
+    function LiteralExpression (literal) {
+        this.literal = LiteralExpression.encodeLiteral(literal);
+    }
 
-    function encodeLiteral(literal) {
+    LiteralExpression.encodeLiteral = function (literal) {
         var
@@ -357,3 +393,3 @@ result = '',
             chr = pctEncoder.pctCharAt(literal, index);
-            if (chr.length > 0) {
+            if (chr.length > 1) {
                 result += chr;
@@ -364,13 +400,8 @@ }
             }
+            // chr = literal.charAt(index);
+            // result += rfcCharHelper.isReserved(chr) || rfcCharHelper.isUnreserved(chr) ? chr : pctEncoder.encodeCharacter(chr);
         }
         return result;
-    }
+    };
 
-    function LiteralExpression(literal) {
-        this.literal = LiteralExpression.encodeLiteral(literal);
-    }
-
-    LiteralExpression.encodeLiteral = encodeLiteral;
-
-
     LiteralExpression.prototype.expand = function () {
@@ -386,4 +417,3 @@ return this.literal;
 var parse = (function () {
-
-    function parseExpression(outerText) {
+    function parseExpression (outerText) {
         var
@@ -399,3 +429,3 @@ text,
 
-        function closeVarname() {
+        function closeVarname () {
             varspec = {varname: text.substring(varnameStart, index), exploded: false, maxLength: null};
@@ -405,3 +435,3 @@ varnameStart = null;
 
-        function closeMaxLength() {
+        function closeMaxLength () {
             if (maxLengthStart === index) {
@@ -414,3 +444,3 @@ throw new Error("after a ':' you have to specify the length. position = " + index);
 
-        // remove outer {}
+        // remove outer braces
         text = outerText.substr(1, outerText.length - 2);
@@ -440,3 +470,9 @@
             if (maxLengthStart !== null) {
+                if (index === maxLengthStart && chr === '0') {
+                    throw new Error('A :prefix must not start with digit 0 -- see position ' + index);
+                }
                 if (charHelper.isDigit(chr)) {
+                    if (index - maxLengthStart >= 4) {
+                        throw new Error('A :prefix must max 4 digits -- see position ' + index);
+                    }
                     continue;
@@ -485,3 +521,3 @@ }
 
-    function parseTemplate(uriTemplateText) {
+    function parseTemplate (uriTemplateText) {
         // assert filled string
@@ -540,9 +576,8 @@ var
 var VariableExpression = (function () {
-
     // helper function if JSON is not available
-    function prettyPrint(value) {
+    function prettyPrint (value) {
         return JSON ? JSON.stringify(value) : value;
     }
 
-    function VariableExpression(templateText, operator, varspecs) {
+    function VariableExpression (templateText, operator, varspecs) {
         this.templateText = templateText;
@@ -557,3 +592,3 @@ this.operator = operator;
 
-    VariableExpression.prototype.expand = function expandExpression(variables) {
+    VariableExpression.prototype.expand = function (variables) {
         var
@@ -569,3 +604,3 @@ result = '',
         // callback to be used within array.reduce
-        function reduceUnexploded(result, currentValue, currentKey) {
+        function reduceUnexploded (result, currentValue, currentKey) {
             if (isDefined(currentValue)) {
@@ -583,3 +618,3 @@ if (result.length > 0) {
 
-        function reduceNamedExploded(result, currentValue, currentKey) {
+        function reduceNamedExploded (result, currentValue, currentKey) {
             if (isDefined(currentValue)) {
@@ -595,3 +630,3 @@ if (result.length > 0) {
 
-        function reduceUnnamedExploded(result, currentValue, currentKey) {
+        function reduceUnnamedExploded (result, currentValue, currentKey) {
             if (isDefined(currentValue)) {
@@ -634,3 +669,3 @@ if (result.length > 0) {
                 }
-                if (varspec.maxLength && value.length > varspec.maxLength) {
+                if (varspec.maxLength !== null) {
                     value = value.substr(0, varspec.maxLength);
@@ -679,3 +714,2 @@ }
 
-
     return VariableExpression;
@@ -685,5 +719,6 @@ }());
 var UriTemplate = (function () {
-    function UriTemplate(templateText, expressions) {
+    function UriTemplate (templateText, expressions) {
         this.templateText = templateText;
         this.expressions = expressions;
+        objectHelper.deepFreeze(this);
     }
@@ -696,2 +731,3 @@
     UriTemplate.prototype.expand = function (variables) {
+        // this.expressions.map(function (expression) {return expression.expand(variables);}).join('');
         var
@@ -707,3 +743,2 @@ index,
     UriTemplate.parse = parse;
-
     return UriTemplate;
@@ -720,3 +755,3 @@ }());
         }
-        else if (typeof define !== "undefined") {
+        else if (typeof define === "function") {
             define([],function() {
@@ -723,0 +758,0 @@ return UriTemplate;

Jakefile.js

@@ -50,2 +50,3 @@ /*jshint */
             path.join('test', 'integration', 'simpleTest.js'),
+            path.join('test', 'integration', 'testExport.js'),
             path.join('test', 'integration', 'testRfcSamples.js')
@@ -63,19 +64,23 @@ ],
 
-    var all = new jake.FileList();
-    all.include('./Jakefile.js', 'own-testcases.json');
-    all.include('src/**');
-    all.include('test/**');
-    all.exclude(TARGET_COMPRESSED);
-    var TARGET_UNCOMPRESSED_DEPENDENCIES = all.toArray();
+    var TARGET_UNCOMPRESSED_DEPENDENCIES = (function () {
+        var all = new jake.FileList();
+        all.include('./Jakefile.js', 'own-testcases.json');
+        all.include('src/**');
+        all.include('test/**');
+        all.exclude(TARGET_COMPRESSED);
+        return all.toArray();
+    }());
 
-    function closeTask(err) {
+    function closeTask (err) {
         if (err) {
-            fail(err);
+            fail(JSON.stringify(err, null, 4));
         }
-        complete();
+        else {
+            complete();
+        }
     }
 
-    desc('clean');
+    desc('removes all artifacts');
     task('clean', [], function () {
-        function unlinkWhenExists(filename, callback) {
+        function unlinkWhenExists (filename, callback) {
             fs.unlink(filename, function (err) {
@@ -85,3 +90,2 @@ callback(err && err.code !== 'ENOENT' ? err : undefined);
         }
-
         async.forEach([TMP_UNTESTED_UNCOMPRESSED, TMP_UNTESTED_COMPRESSED, TARGET_UNCOMPRESSED, TARGET_COMPRESSED], unlinkWhenExists, closeTask);
@@ -91,2 +95,3 @@ }, ASYNC);
     file(TARGET_UNCOMPRESSED, TARGET_UNCOMPRESSED_DEPENDENCIES, function () {
+        // there is no other way to pass parameters to a testcase -- sorry
         global.URI_TEMPLATE_FILE = TMP_UNTESTED_UNCOMPRESSED;
@@ -100,3 +105,3 @@ async.series([
                 jake.logger.log('unit testing ...');
-                nodeunit.reporters[NODEUNIT_REPORTER].run(UNIT_TESTS, NODEUNIT_OPTIONS, callback);
+                nodeunit.reporters['minimal'].run(UNIT_TESTS, NODEUNIT_OPTIONS, callback);
             },
@@ -146,5 +151,4 @@ function (callback) {
     // for short test only
-    desc('unit tests');
+    desc('unit tests (without jshint)');
     task('unit', [], function () {
-        // here we want the default reporter and not the configured one
         nodeunit.reporters['default'].run(UNIT_TESTS, NODEUNIT_OPTIONS, complete);
@@ -157,5 +161,4 @@ }, ASYNC);
     });
-    task('default', ['clean', 'release']);
+    task('default', ['clean', 'build']);
 
-
 }());

own-testcases.json

@@ -11,3 +11,38 @@ {
         ]
+    },
+    "Allowed characters": {
+        "level": 3,
+        "variables": {
+            "dot": "dot"
+        },
+        "testcases": [
+            ["{?.dot}", false],
+            ["{a,.b}", false]
+        ]
+    },
+    "Prefix modifiers": {
+        "level": 4,
+        "variables": {
+            "text": "I like octal numbers",
+            "emptyObject": {},
+            "filledObject": {"composite": "true"},
+            "emptyArr": [],
+            "filledArr": [1]
+        },
+        "testcases": [
+            ["{text:0}", false],
+            ["{text:08}", false],
+            ["{text:8}", "I%20like%20o"],
+            ["{text:9999}", "I%20like%20octal%20numbers"],
+            ["{text:10000}", false],
+            ["{text:1.0}", false],
+            ["{text:1e+2}", false],
+            ["{text:9876543210987654321098765432109876543210}", false],
+            ["{emptyObject:1}", ""],
+            ["{filledObject:1}", false],
+            ["{emptyArr:1}", ""],
+            ["{filledArr:1}", false]
+
+        ]
     }
 }

package.json

@@ -15,8 +15,6 @@ {
   "main": "bin/uritemplate.js",
-  "licenses": [
-    {
+  "licenses": [{
       "type": "MIT",
       "url": "http://www.opensource.org/licenses/mit-license.php"
-    }
-  ],
+  }],
   "files": [
@@ -31,3 +29,3 @@ "src",
     "README.md",
-    "reqire.js",
+    "require.js",
     ".gitmodules",
@@ -40,3 +38,3 @@ "uritemplate-test/extended-tests.json",
   ],
-  "version": "0.2.3",
+  "version": "0.2.4",
   "readmeFilename": "README.md",
@@ -54,4 +52,3 @@ "gitHead": "901b85201a821427dfb4591b56aea3a70d45c67c",
     "url": "https://github.com/fxa/uritemplate-js.git"
-  },
-  "license": "MIT"
+  }
 }

README.md

@@ -12,2 +12,4 @@ URI Template JS
 
+Be aware, that a parsed UriTemplate is frozen, so it is stateless. You can reuse instances of UriTemplates.
+
 Requirements
@@ -64,2 +66,3 @@ ------------
 -------------
+* 0.2.4 fixed double encoding according [RubenVerborgh] and some Prefix modifiers bugs
 * 0.2.3 fixed bug with empty objects ('{?empty}' with '{empty:{}}' shall expand to '?empty=')
@@ -72,4 +75,4 @@ * 0.2.2 fixed pct encoding bug with multibyte utf8 chars
 ----------
-* Implementing meaningful unit tests (now only dummy test implemented)
+* Implementing more unit tests (now only a view tests are implemented)
 * A new method extract(uri), which tries to extract the variables from a given uri.
   This is harder, than you might think

src/encodingHelper.js

@@ -18,9 +18,4 @@ /*jshint unused: false */
         for (index = 0; index < text.length; index += chr.length) {
-            chr = pctEncoder.pctCharAt(text, index);
-            if (chr.length > 1) {
-                result += chr;
-            }
-            else {
-                result += rfcCharHelper.isUnreserved(chr) || (passReserved && rfcCharHelper.isReserved(chr)) ? chr : pctEncoder.encodeCharacter(chr);
-            }
+            chr = text.charAt(index);
+            result += rfcCharHelper.isUnreserved(chr) || (passReserved && rfcCharHelper.isReserved(chr)) ? chr : pctEncoder.encodeCharacter(chr);
         }
@@ -27,0 +22,0 @@ return result;

src/isDefined.js

@@ -14,3 +14,3 @@ /*jshint unused:false */
  */
-function isDefined(object) {
+function isDefined (object) {
     "use strict";
@@ -17,0 +17,0 @@ var

src/LiteralExpression.js

@@ -5,4 +5,7 @@ /*jshint unused:false */
     "use strict";
+    function LiteralExpression (literal) {
+        this.literal = LiteralExpression.encodeLiteral(literal);
+    }
 
-    function encodeLiteral(literal) {
+    LiteralExpression.encodeLiteral = function (literal) {
         var
@@ -14,3 +17,3 @@ result = '',
             chr = pctEncoder.pctCharAt(literal, index);
-            if (chr.length > 0) {
+            if (chr.length > 1) {
                 result += chr;
@@ -21,13 +24,8 @@ }
             }
+            // chr = literal.charAt(index);
+            // result += rfcCharHelper.isReserved(chr) || rfcCharHelper.isUnreserved(chr) ? chr : pctEncoder.encodeCharacter(chr);
         }
         return result;
-    }
+    };
 
-    function LiteralExpression(literal) {
-        this.literal = LiteralExpression.encodeLiteral(literal);
-    }
-
-    LiteralExpression.encodeLiteral = encodeLiteral;
-
-
     LiteralExpression.prototype.expand = function () {
@@ -34,0 +32,0 @@ return this.literal;

src/objectHelper.js

 /*jshint unused: false */
 var objectHelper = (function () {
     "use strict";
-
-    function isArray(value) {
+    function isArray (value) {
         return Object.prototype.toString.apply(value) === '[object Array]';
@@ -11,3 +10,3 @@ }
     // TODO handling if initialValue is undefined
-    function objectReduce(object, callback, initialValue) {
+    function objectReduce (object, callback, initialValue) {
         var
@@ -26,3 +25,3 @@ propertyName,
     // TODO handling if initialValue is undefined
-    function arrayReduce(array, callback, initialValue) {
+    function arrayReduce (array, callback, initialValue) {
         var
@@ -37,10 +36,37 @@ index,
 
-    function reduce(arrayOrObject, callback, initialValue) {
+    function reduce (arrayOrObject, callback, initialValue) {
         return isArray(arrayOrObject) ? arrayReduce(arrayOrObject, callback, initialValue) : objectReduce(arrayOrObject, callback, initialValue);
     }
 
+    function deepFreezeUsingObjectFreeze (object) {
+        if (typeof object !== "object" || object === null) {
+            return object;
+        }
+        Object.freeze(object);
+        var property, propertyName;
+        for (propertyName in object) {
+            if (object.hasOwnProperty(propertyName)) {
+                property = object[propertyName];
+                // be aware, arrays are 'object', too
+                if (typeof property === "object") {
+                    deepFreeze(property);
+                }
+            }
+        }
+        return object;
+    }
+
+    function deepFreeze (object) {
+        if (typeof Object.freeze === 'function') {
+            return deepFreezeUsingObjectFreeze(object);
+        }
+        return object;
+    }
+
+
     return {
         isArray: isArray,
-        reduce: reduce
+        reduce: reduce,
+        deepFreeze: deepFreeze
     };
 }());

src/parse.js

 /*jshint unused:false */
-/*global pctEncoder, operators, charHelper, rfcCharHelper, LiteralExpression, UriTemplate, VariableExpression */
+/*global pctEncoder, operators, charHelper, rfcCharHelper, LiteralExpression, UriTemplate, VariableExpression*/
 var parse = (function () {
     "use strict";
-
-    function parseExpression(outerText) {
+    function parseExpression (outerText) {
         var
@@ -17,3 +16,3 @@ text,
 
-        function closeVarname() {
+        function closeVarname () {
             varspec = {varname: text.substring(varnameStart, index), exploded: false, maxLength: null};
@@ -23,3 +22,3 @@ varnameStart = null;
 
-        function closeMaxLength() {
+        function closeMaxLength () {
             if (maxLengthStart === index) {
@@ -32,3 +31,3 @@ throw new Error("after a ':' you have to specify the length. position = " + index);
 
-        // remove outer {}
+        // remove outer braces
         text = outerText.substr(1, outerText.length - 2);
@@ -58,3 +57,9 @@
             if (maxLengthStart !== null) {
+                if (index === maxLengthStart && chr === '0') {
+                    throw new Error('A :prefix must not start with digit 0 -- see position ' + index);
+                }
                 if (charHelper.isDigit(chr)) {
+                    if (index - maxLengthStart >= 4) {
+                        throw new Error('A :prefix must max 4 digits -- see position ' + index);
+                    }
                     continue;
@@ -103,3 +108,3 @@ }
 
-    function parseTemplate(uriTemplateText) {
+    function parseTemplate (uriTemplateText) {
         // assert filled string
@@ -106,0 +111,0 @@ var

src/pctEncoder.js

@@ -5,3 +5,2 @@ /*jshint unused:false */
     "use strict";
-
     var utf8 = {
@@ -51,2 +50,8 @@ encode: function (chr) {
 
+    /**
+     * Returns, whether the given text at start is in the form 'percent hex-digit hex-digit', like '%3F'
+     * @param text
+     * @param start
+     * @return {boolean|*|*}
+     */
     function isPercentDigitDigit (text, start) {
@@ -56,3 +61,9 @@ return text[start] === '%' && charHelper.isHexDigit(text[start + 1]) && charHelper.isHexDigit(text[start + 2]);
 
-    function parseHex2(text, start) {
+    /**
+     * Parses a hex number from start with length 2.
+     * @param text a string
+     * @param start the start index of the 2-digit hex number
+     * @return {Number}
+     */
+    function parseHex2 (text, start) {
         return parseInt(text.substr(start, 2), 16);
@@ -62,3 +73,3 @@ }
     /**
-     * Returns wether or not the given char sequence is a correctly pct-encoded sequence.
+     * Returns whether or not the given char sequence is a correctly pct-encoded sequence.
      * @param chr
@@ -65,0 +76,0 @@ * @return {boolean}

src/post.txt

@@ -10,3 +10,3 @@
         }
-        else if (typeof define !== "undefined") {
+        else if (typeof define === "function") {
             define([],function() {
@@ -13,0 +13,0 @@ return UriTemplate;

src/rfcCharHelper.js

@@ -11,3 +11,3 @@ /*jshint unused: false */
      */
-    function isVarchar(chr) {
+    function isVarchar (chr) {
         return charHelper.isAlpha(chr) || charHelper.isDigit(chr) || chr === '_' || pctEncoder.isPctEncoded(chr);
@@ -21,3 +21,3 @@ }
      */
-    function isUnreserved(chr) {
+    function isUnreserved (chr) {
         return charHelper.isAlpha(chr) || charHelper.isDigit(chr) || chr === '-' || chr === '.' || chr === '_' || chr === '~';
@@ -28,6 +28,7 @@ }
      * Returns if chr is an reserved character according 1.5 of rfc 6570
+     * or the percent character mentioned in 3.2.1.
      * @param chr
      * @return {Boolean}
      */
-    function isReserved(chr) {
+    function isReserved (chr) {
         return chr === ':' || chr === '/' || chr === '?' || chr === '#' || chr === '[' || chr === ']' || chr === '@' || chr === '!' || chr === '$' || chr === '&' || chr === '(' ||
@@ -34,0 +35,0 @@ chr === ')' || chr === '*' || chr === '+' || chr === ',' || chr === ';' || chr === '=' || chr === "'";

src/UriTemplate_.js

 /*jshint unused:false */
-/*global parse*/
+/*global parse, objectHelper*/
 var UriTemplate = (function () {
     "use strict";
-    function UriTemplate(templateText, expressions) {
+    function UriTemplate (templateText, expressions) {
         this.templateText = templateText;
         this.expressions = expressions;
+        objectHelper.deepFreeze(this);
     }
@@ -15,2 +16,3 @@
     UriTemplate.prototype.expand = function (variables) {
+        // this.expressions.map(function (expression) {return expression.expand(variables);}).join('');
         var
@@ -26,4 +28,3 @@ index,
     UriTemplate.parse = parse;
-
     return UriTemplate;
 }());

src/VariableExpression.js

@@ -5,9 +5,8 @@ /*jshint unused:false */
     "use strict";
-
     // helper function if JSON is not available
-    function prettyPrint(value) {
+    function prettyPrint (value) {
         return JSON ? JSON.stringify(value) : value;
     }
 
-    function VariableExpression(templateText, operator, varspecs) {
+    function VariableExpression (templateText, operator, varspecs) {
         this.templateText = templateText;
@@ -22,3 +21,3 @@ this.operator = operator;
 
-    VariableExpression.prototype.expand = function expandExpression(variables) {
+    VariableExpression.prototype.expand = function (variables) {
         var
@@ -34,3 +33,3 @@ result = '',
         // callback to be used within array.reduce
-        function reduceUnexploded(result, currentValue, currentKey) {
+        function reduceUnexploded (result, currentValue, currentKey) {
             if (isDefined(currentValue)) {
@@ -48,3 +47,3 @@ if (result.length > 0) {
 
-        function reduceNamedExploded(result, currentValue, currentKey) {
+        function reduceNamedExploded (result, currentValue, currentKey) {
             if (isDefined(currentValue)) {
@@ -60,3 +59,3 @@ if (result.length > 0) {
 
-        function reduceUnnamedExploded(result, currentValue, currentKey) {
+        function reduceUnnamedExploded (result, currentValue, currentKey) {
             if (isDefined(currentValue)) {
@@ -99,3 +98,3 @@ if (result.length > 0) {
                 }
-                if (varspec.maxLength && value.length > varspec.maxLength) {
+                if (varspec.maxLength !== null) {
                     value = value.substr(0, varspec.maxLength);
@@ -144,4 +143,3 @@ }
 
-
     return VariableExpression;
 }());

test/integration/simpleTest.js

@@ -8,7 +8,17 @@ module.exports = (function () {
     return {
-        'UriTemplate has a parse function': function (test) {
+        'UriTemplate has a static parse function': function (test) {
             test.equal(typeof UriTemplate.parse, 'function');
             test.done();
+        },
+        'UriTemplate has a expand function': function (test) {
+            test.equal(typeof UriTemplate.prototype.expand, 'function');
+            test.done();
+        },
+        'UriTemplate instances are frozen': function (test) {
+            var ut = new UriTemplate('text', []);
+            test.ok(Object.isFrozen(ut));
+            test.ok(Object.isFrozen(ut.expressions));
+            test.done();
         }
     };
 }());

test/integration/testRfcSamples.js

@@ -8,6 +8,5 @@ module.exports = (function () {
         sandbox = require('nodeunit').utils.sandbox;
-    // var testCase = require('nodeunit').testCase;
 
     var NOISY = false;
-    function log(text) {
+    function log (text) {
         if (NOISY) {
@@ -18,4 +17,3 @@ console.log(text);
 
-
-    function loadUriTemplate() {
+    function loadUriTemplate () {
         var context = {module: {}};
@@ -26,7 +24,7 @@ sandbox(global.URI_TEMPLATE_FILE, context);
 
-    function loadTestFile(testFileName) {
+    function loadTestFile (testFileName) {
         return JSON.parse(fs.readFileSync(testFileName));
     }
 
-    function assertMatches(test, template, variables, expected, chapterName, UriTemplate) {
+    function assertMatches (test, template, variables, expected, chapterName, UriTemplate) {
         var
@@ -40,3 +38,2 @@ uriTemplate,
         catch (error) {
-            // if expected === false, the error was expected!
             if (expected === false) {
@@ -46,4 +43,4 @@ log('ok. expected error found');
             }
-            log('error', error);
-            test.fail('chapter ' + chapterName + ', template ' + template + ' threw error: ' + error);
+            console.log('error', error);
+            test.fail('chapter ' + chapterName + ', template ' + template + ' threw error, when parsing: ' + error);
             return;
@@ -59,7 +56,8 @@ }
         }
-        catch (exception) {
+        catch (error) {
             if (expected === false) {
                 return;
             }
-            test.fail('chapter ' + chapterName + ', template ' + template + ' threw error: ' + JSON.stringify(exception, null, 4));
+            console.log('error', error);
+            test.fail('chapter ' + chapterName + ', template ' + template + ' threw error, when expanding: ' + JSON.stringify(error, null, 4));
             return;
@@ -83,7 +81,7 @@ }
         else {
-            test.equal(actual, expected, 'actual: ' + actual + ', expected: ' + expected + ', template: ' + template);
+            test.equal(actual, expected, 'actual: "' + actual + '", expected: "' + expected + '", template: "' + template + '"');
         }
     }
 
-    function runTestFile(test, filename) {
+    function runTestFile (test, filename) {
         var
@@ -117,3 +115,3 @@ tests,
 
-    var SPEC_HOME = 'uritemplate-test';
+    var SPEC_HOME = '../uritemplate-test';
 
@@ -124,2 +122,5 @@ return {
         },
+        'spec examples by section': function (test) {
+            runTestFile(test, path.join(SPEC_HOME, 'spec-examples-by-section.json'));
+        },
         'extended tests': function (test) {
@@ -133,4 +134,8 @@ runTestFile(test, path.join(SPEC_HOME, 'extended-tests.json'));
             runTestFile(test, 'own-testcases.json');
+        },
+        'testfile': function (test) {
+            test.ok(global.URI_TEMPLATE_FILE.substr(0, 3), 'tmp');
+            test.done();
         }
     };
 }());

test/unit/testObjectHelper.js

 module.exports = (function () {
     "use strict";
 
-    var context = {console: console};
+    var context = {};
     require('nodeunit').utils.sandbox('src/objectHelper.js', context);
@@ -32,4 +32,31 @@ var objectHelper = context.objectHelper;
             test.done();
+        },
+        'deepFreeze': {
+            'deepFreeze freezes an object': function (test) {
+                var object = {};
+                objectHelper.deepFreeze(object);
+                test.ok(Object.isFrozen(object));
+                test.done();
+            },
+            'deepFreeze freezes children': function (test) {
+                var object = {child: {}};
+                objectHelper.deepFreeze(object);
+                test.ok(Object.isFrozen(object));
+                test.ok(Object.isFrozen(object.child));
+                test.done();
+            },
+            'deepFreeze works with arrays': function (test) {
+                var object = {child: []};
+                objectHelper.deepFreeze(object);
+                test.ok(Object.isFrozen(object));
+                test.ok(Object.isFrozen(object.child));
+                test.done();
+            },
+            'deepFreeze works with null': function (test) {
+                objectHelper.deepFreeze(null);
+                test.done();
+            }
         }
+
     };
 }());

test/unit/testPctEncoder.js

@@ -6,3 +6,3 @@ module.exports = (function () {
         sandbox = require('nodeunit').utils.sandbox,
-        context = {console: console};
+        context = {};
     sandbox('src/charHelper.js', context);
@@ -66,22 +66,5 @@ sandbox('src/pctEncoder.js', context);
             }
-        },
-
-
-        'this and that': {
-            "ouml is correct encoded": function (test) {
-                test.equal(pctEncoder.encodeCharacter('ö'), '%C3%B6');
-                test.done();
-            },
-            'ouml is pctEncoded': function (test) {
-                test.ok(pctEncoder.isPctEncoded('%C3%B6'));
-                test.done();
-            },
-            'ouml is extracted from text': function (test) {
-                test.equal(pctEncoder.pctCharAt('zw%C3%B6lf', 2), '%C3%B6');
-                test.done();
-            }
         }
-
     };
 }());
 

test/unit/testVariableExpression.js

@@ -6,3 +6,3 @@ module.exports = (function () {
         sandbox = require('nodeunit').utils.sandbox,
-        context = {console: console};
+        context = {};
     sandbox('src/objectHelper.js', context);
@@ -15,2 +15,3 @@ sandbox('src/charHelper.js', context);
     sandbox('src/isDefined.js', context);
+    sandbox('src/LiteralExpression.js', context);
     sandbox('src/VariableExpression.js', context);
@@ -44,4 +45,25 @@
             test.done();
+        },
+        "double encode if ?": function (test) {
+            var ve = new VariableExpression("{?uri", operators.valueOf('?'), [
+                {varname: 'uri', exploded: false, maxLength: null}
+            ]);
+            test.equal(ve.expand({uri: 'http://example.org/?ref=http%3A%2F%2Fother.org%2F'}), '?uri=http%3A%2F%2Fexample.org%2F%3Fref%3Dhttp%253A%252F%252Fother.org%252F');
+            test.done();
+        },
+        "not double encode if +": function (test) {
+            var ve = new VariableExpression("{+uri", operators.valueOf('+'), [
+                {varname: 'uri', exploded: false, maxLength: null}
+            ]);
+            test.equal(ve.expand({uri: 'http://example.org/?ref=http%3A%2F%2Fother.org%2F'}), 'http://example.org/?ref=http%253A%252F%252Fother.org%252F');
+            test.done();
+        },
+        'maxLength is used': function (test) {
+            var ve = new VariableExpression("{one:1}", operators.valueOf(''), [
+                {varname: 'one', exploded: false, maxLength: 1}
+            ]);
+            test.equal(ve.expand({one: 'two'}), 't');
+            test.done();
         }
     };
 }());

uritemplate-test/extended-tests.json

@@ -21,2 +21,3 @@ {
             "query"        : "PREFIX dc: <http://purl.org/dc/elements/1.1/> SELECT ?book ?who WHERE { ?book dc:creator ?who }",
+            "uri"          : "http://example.org/?uri=http%3A%2F%2Fexample.org%2F",
             "word"         : "drücken",
@@ -48,2 +49,3 @@ "Stra%C3%9Fe"  : "Grüner Weg",
             ["/sparql{?query}", "/sparql?query=PREFIX%20dc%3A%20%3Chttp%3A%2F%2Fpurl.org%2Fdc%2Felements%2F1.1%2F%3E%20SELECT%20%3Fbook%20%3Fwho%20WHERE%20%7B%20%3Fbook%20dc%3Acreator%20%3Fwho%20%7D"],
+            ["/go{?uri}", "/go?uri=http%3A%2F%2Fexample.org%2F%3Furi%3Dhttp%253A%252F%252Fexample.org%252F"],
             ["/service{?word}", "/service?word=dr%C3%BCcken"],
@@ -50,0 +52,0 @@ ["/lookup{?Stra%C3%9Fe}", "/lookup?Stra%C3%9Fe=Gr%C3%BCner%20Weg"],

New alerts

Uses eval

Supply chain risk

Package uses dynamic code execution (e.g., eval()), which is a dangerous practice. This can prevent the code from running in certain environments and increases the risk that the code may contain exploits or malicious behavior.

Found 1 instance in 1 package

Dynamic require

Supply chain risk

Dynamic require can indicate the package is performing dangerous or unsafe dynamic code execution.

Found 1 instance in 1 package

Minified code

Quality

This package contains minified code. This may be harmless in some cases where minified code is included in packaged libraries, however packages on npm should not minify code.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

120643

increased by26.17%

Number of package files

35

increased by12.9%

Lines of code

2398

increased by16.58%

Number of lines in readme file

76

increased by4.11%

Worsened metrics

Number of low quality alerts

2

increased by100%

Number of low supply chain risk alerts

7

increased by133.33%

Number of medium supply chain risk alerts

1

increased byInfinity%

No dependency changes