feat(generator): handle custom request escaping

algolia · Mar 31, 2022 · a1396b9 · a1396b9
1 parent 59ce8b4
commit a1396b9
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 24 deletions.
diff --git a/clients/algoliasearch-client-javascript/bundlesize.config.json b/clients/algoliasearch-client-javascript/bundlesize.config.json
@@ -35,18 +35,6 @@
     {
       "path": "packages/recommend/dist/recommend.umd.browser.js",
       "maxSize": "3.80KB"
-    },
-    {
-      "path": "packages/client-common/dist/client-common.esm.node.js",
-      "maxSize": "5.25KB"
-    },
-    {
-      "path": "packages/requester-browser-xhr/dist/requester-browser-xhr.esm.node.js",
-      "maxSize": "900B"
-    },
-    {
-      "path": "packages/requester-node-http/dist/requester-node-http.esm.node.js",
-      "maxSize": "1.15KB"
     }
   ]
 }
diff --git a/templates/java/libraries/okhttp-gson/api.mustache b/templates/java/libraries/okhttp-gson/api.mustache
@@ -111,8 +111,10 @@ public class {{classname}} extends ApiClient {
         Object bodyObj = {{#bodyParam}}{{paramName}}{{/bodyParam}}{{^bodyParam}}null{{/bodyParam}};
 
         // create path and map variables
-        String requestPath = "{{{path}}}"{{#pathParams}}
-            .replaceAll("\\{" + "{{baseName}}" + "\\}", this.escapeString({{{paramName}}}.toString())){{/pathParams}};
+        String requestPath = "{{{path}}}"{{#vendorExtensions}}{{#pathParams}}.replaceAll(
+            {{=<% %>=}}"\\{<%baseName%>\\}"<%={{ }}=%>,
+            {{#x-is-custom-request}}{{{paramName}}}.toString(){{/x-is-custom-request}}{{^x-is-custom-request}}this.escapeString({{{paramName}}}.toString()){{/x-is-custom-request}}
+        ){{/pathParams}}{{/vendorExtensions}};
 
         {{javaUtilPrefix}}List<Pair> queryParams = new {{javaUtilPrefix}}ArrayList<Pair>();
         {{javaUtilPrefix}}Map<String, String> headers = new {{javaUtilPrefix}}HashMap<String, String>();

diff --git a/templates/javascript/api-single.mustache b/templates/javascript/api-single.mustache
@@ -202,12 +202,9 @@ export function create{{capitalizedApiName}}Api(options: CreateClientOptions{{#h
       {{/allParams.0}}
       requestOptions?: RequestOptions
         ) : Promise<{{{returnType}}}> {
-      const requestPath = '{{{path}}}'{{#pathParams}}.replace(
-      {{=<% %>=}}
-        '{<%baseName%>}',
-      <%={{ }}=%>
-        encodeURIComponent(String({{paramName}}))
-      ){{/pathParams}};
+      const requestPath = '{{{path}}}'{{#vendorExtensions}}{{#pathParams}}.replace(
+      {{=<% %>=}}'{<%baseName%>}'<%={{ }}=%>,{{#x-is-custom-request}}String({{paramName}}){{/x-is-custom-request}}{{^x-is-custom-request}}encodeURIComponent(String({{paramName}})){{/x-is-custom-request}}
+      ){{/pathParams}}{{/vendorExtensions}};
       const headers: Headers = {};
       const queryParameters: QueryParameters = {};
 

diff --git a/templates/php/api.mustache b/templates/php/api.mustache
@@ -231,7 +231,7 @@ use {{invokerPackage}}\RetryStrategy\ClusterHosts;
         }
         {{/isExplode}}
         {{/queryParams}}
-        {{#pathParams}}
+        {{#vendorExtensions}}{{#pathParams}}
         // path params
         {{#collectionFormat}}
         if (is_array(${{paramName}})) {
@@ -240,12 +240,12 @@ use {{invokerPackage}}\RetryStrategy\ClusterHosts;
         {{/collectionFormat}}
         if (${{paramName}} !== null) {
             $resourcePath = str_replace(
-                '{' . '{{baseName}}' . '}',
-                ObjectSerializer::toPathValue(${{paramName}}),
+                {{=<% %>=}}'{<%baseName%>}'<%={{ }}=%>,
+                {{#x-is-custom-request}}{{paramName}}{{/x-is-custom-request}}{{^x-is-custom-request}}ObjectSerializer::toPathValue(${{paramName}}){{/x-is-custom-request}},
                 $resourcePath
             );
         }
-        {{/pathParams}}
+        {{/pathParams}}{{/vendorExtensions}}
 
         {{#bodyParams}}
         if (isset(${{paramName}})) {