fix(template): allow for colon to terminate a template

ahmadnassri · Dec 3, 2021 · 28aa6d8 · 28aa6d8
1 parent 68715e1
commit 28aa6d8
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 9 deletions.
diff --git a/lib/parse-path-template.js b/lib/parse-path-template.js
@@ -1,7 +1,7 @@
 // helper
 module.exports = function (src, variables = {}, defaults = {}) {
   // find all parameters
-  const results = src.matchAll(/\{(?<param>[^/]+)\}/g)
+  const results = src.matchAll(/\{(?<param>[^/:]+)\}/g)
 
   for (const { groups: { param } } of results) {
     const regex = new RegExp(`{${param}}`, 'g')

diff --git a/package-lock.json b/package-lock.json
diff --git a/test/index.js b/test/index.js
@@ -45,7 +45,7 @@ test('methods are callable', assert => {
 
   fetch.callsFake((url, options) => {
     assert.match(url, new URL('http://pets.com/pets/%7BpetId%7D'))
-    assert.deepEqual(options, {
+    assert.same(options, {
       method: 'get',
       headers: {}
     })
@@ -62,7 +62,7 @@ test('methods options', assert => {
 
   fetch.callsFake((url, options) => {
     assert.match(url, new URL('https://pets.com/pets/1'))
-    assert.deepEqual(options, {
+    assert.same(options, {
       method: 'get',
       headers: {}
     })
@@ -83,7 +83,7 @@ test('global defaults', assert => {
 
   fetch.callsFake((url, options) => {
     assert.match(url, new URL('https://pets.com/pets/1?name=ruby&is_good=yes'))
-    assert.deepEqual(options, {
+    assert.same(options, {
       method: 'get',
       headers: { 'x-pet-type': 'dog' }
     })

diff --git a/test/parse-server.js b/test/parse-server.js
@@ -102,3 +102,25 @@ test('populates the server.url with server.variables', assert => {
 
   assert.equal(parseServer({ url: 'localhost/{foo}', variables: { foo: 'bar' } }, spec), 'localhost/bar')
 })
+
+test('populates the server.url with server.variables with colons', assert => {
+  assert.plan(1)
+
+  const spec = {
+    servers: [{
+      url: 'localhost',
+      variables: { foo: {} }
+    }]
+  }
+
+  assert.equal(parseServer({
+    url: '{protocol}://{host}:{port}/{path1}/{path2}',
+    variables: {
+      protocol: 'ftp',
+      host: 'localhost',
+      port: '8080',
+      path1: 'path1',
+      path2: 'path2'
+    }
+  }, spec), 'ftp://localhost:8080/path1/path2')
+})