parse duplicate values in/out of arrays

quiltdata · Jan 27, 2024 · a1fe762 · a1fe762
1 parent 656e6f5
commit a1fe762
Show file tree

Hide file tree

Showing 2 changed files with 53 additions and 7 deletions.
diff --git a/plugins/nf-quilt/src/main/nextflow/quilt/jep/QuiltParser.groovy b/plugins/nf-quilt/src/main/nextflow/quilt/jep/QuiltParser.groovy
@@ -1,3 +1,4 @@
+/* groovylint-disable Instanceof */
 /*
  * Copyright 2022, Quilt Data Inc
  *
@@ -75,18 +76,50 @@ class QuiltParser {
         return new QuiltParser(uri.authority, pkg, path, options, metadata)
     }
 
-    static Map<String,Object> parseQuery(String query) {
+    static String decode(String str) {
+        return URLDecoder.decode(str, StandardCharsets.UTF_8)
+    }
+
+    static String encode(String str) {
+        return URLEncoder.encode(str, StandardCharsets.UTF_8)
+    }
+
+    static Map<String, Object> parseQuery(String query) {
         if (!query) { return [:] } // skip for urls without query params
-        final queryParams = query.split('&')
-        return queryParams.collectEntries { params -> params.split('=').collect { param -> URLDecoder.decode(param) } }
+        def params = query.split('&')
+        def result = [:]
+        params.each { param ->
+            def keyValue = param.split('=')
+            if (keyValue.size() == 2) {
+                String key = decode(keyValue[0])
+                String value = decode(keyValue[1])
+                if (result.containsKey(key)) {
+                    if (result[key] instanceof List) {
+                        result[key].add(value)
+                    } else {
+                        result[key] = [result[key], value]
+                    }
+                } else {
+                    result[key] = value
+                }
+            }
+
+        }
+        return result
+    }
+
+    static String encodePair(String key, String value) {
+        return "${QuiltParser.encode(key)}=${QuiltParser.encode(value)}"
     }
 
     static String unparseQuery(Map<String,Object> query) {
         if (!query) { return '' } // skip for urls without query params
-        List<String> params = query.collect {  key, val ->
-            String k = URLEncoder.encode(key, StandardCharsets.UTF_8)
-            String v = URLEncoder.encode(val.toString(), StandardCharsets.UTF_8)
-            "${k}=${v}".toString()
+        List<String> params = query.collect {  key, value ->
+            if (value instanceof List) {
+                value.collect { QuiltParser.encodePair(key, it.toString()) }.join('&')
+            } else {
+                QuiltParser.encodePair(key, value.toString())
+            }
         }
         return params.join('&')
     }

diff --git a/plugins/nf-quilt/src/test/nextflow/quilt/jep/QuiltParserTest.groovy b/plugins/nf-quilt/src/test/nextflow/quilt/jep/QuiltParserTest.groovy
@@ -123,4 +123,17 @@ class QuiltParserTest extends QuiltSpecification {
         unparsed.replace('%2f', '/') == fullURL
     }
 
+    void 'should collect array parameters from query string'() {
+        when:
+        String query = 'key=val1,val2&quay=vale1&quay=vale2'
+        Map<String,Object> result = QuiltParser.parseQuery(query)
+        println "QuiltParserTest[$query] -> ${result}"
+        String unparsed = QuiltParser.unparseQuery(result)
+
+        then:
+        result['key'] == 'val1,val2'
+        result['quay'] == ['vale1', 'vale2']
+        unparsed == query.replace(',', '%2C')
+    }
+
 }