Merge pull request #290 from keanu-delgado/patch-3

Disallow prefix modifier on variables with composite values
medialize · Mar 30, 2016 · ffd9b33 · ffd9b33
2 parents d37c326 + aae197e
commit ffd9b33
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/src/URITemplate.js b/src/URITemplate.js
@@ -164,6 +164,11 @@
         continue;
       }
 
+      if (d.type > 1 && variable.maxlength) {
+        // composite variable cannot specify maxlength
+        throw new Error('Invalid expression: Prefix modifier not applicable to variable "' + variable.name + '"');
+      }
+
       // expand the given variable
       buffer.push(URITemplate['expand' + type](
         d,

diff --git a/test/test_template.js b/test/test_template.js
@@ -376,6 +376,13 @@
     }, Error, 'Failing invalid modifier');
   });
 
+  test('Expansion errors', function() {
+    raises(function() {
+      var data = {'composite_var': ['multiple', 'values']};
+      URITemplate('{composite_var:3}').expand(data);
+    }, Error, 'Failing prefix modifier after composite variable');
+  });
+
   test('noConflict mode', function() {
     var actual_lib = URITemplate; // actual library; after loading, before noConflict()
     var unconflicted = URITemplate.noConflict();