fix: handle hyphens when generating example paths

stoplightio · XVincentX · May 26, 2020 · May 19, 2020 · May 19, 2020 · May 19, 2020
commit 879bae256b6c0583cfd1aa4345539ade201b7f38
@@ -31,9 +31,18 @@ export function createExamplePath(
 ): E.Either<Error, string> {
   return DoEither.bind('pathData', generateTemplateAndValuesForPathParams(operation))
     .bindL('queryData', ({ pathData }) => generateTemplateAndValuesForQueryParams(pathData.template, operation))
-    .return(({ pathData, queryData }) =>
-      URI.expand(queryData.template, transformValues({ ...pathData.values, ...queryData.values }))
-    );
+    .return(({ pathData, queryData }) => {
+      // replace "-" in template path and query params
+      const cleanedTemplate = queryData.template.replace(/(?<=\{.*)(?=.*\})(-)/g, '');
+      const realValues = transformValues({ ...pathData.values, ...queryData.values });
+      const cleanedValues = {};
+      for (const realValue in realValues) {
+        const cleanedValue = realValue.replace(/-/g, '');
+        cleanedValues[cleanedValue] = realValues[realValue];
+      }
+
+      return URI.expand(cleanedTemplate, cleanedValues);
+    });
 }
 
 function generateParamValue(spec: IHttpParam): E.Either<Error, unknown> {

@@ -145,11 +145,8 @@ const validateOutput: ValidatorFn<IHttpOperation, IHttpResponse> = ({ resource,
 };
 
 function getPathParams(path: string, template: string, realParams: IHttpPathParam[]) {
-  // replace "-" in template path params
-  const cleanedTemplate = template
-    .split('/')
-    .map(part => (part.startsWith('{') ? part.replace(/-/g, '') : part))
-    .join('/');
+  // replace "-" in template path and query params
+  const cleanedTemplate = template.replace(/(?<=\{.*)(?=.*\})(-)/g, '');
 
   const pathParams = new URI.Template(cleanedTemplate).match(path);