feat: use better regex for route parameters (#1393)

orval-labs · May 21, 2024 · ba24407 · ba24407
1 parent c1adaf7
commit ba24407
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/packages/core/src/constants.ts b/packages/core/src/constants.ts
@@ -28,3 +28,5 @@ export const VERBS_WITH_BODY = [
 
 export const URL_REGEX =
   /^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+$/;
+
+export const TEMPLATE_TAG_REGEX = /\${(.+?)}/g; // For replace of 'thing' ${thing}
diff --git a/packages/core/src/getters/route.ts b/packages/core/src/getters/route.ts
@@ -1,6 +1,6 @@
 import { camel, sanitize } from '../utils';
+import { TEMPLATE_TAG_REGEX } from '../constants';
 
-const TEMPLATE_TAG_REGEX = /\${(\w+)}/g; // For replace of 'thing' ${thing}
 const TEMPLATE_TAG_IN_PATH_REGEX = /\/([\w]+)(?:\$\{)/g; // all dynamic parts of path
 
 const hasParam = (path: string): boolean => /[^{]*{[\w*_-]*}.*/.test(path);

diff --git a/packages/query/src/utils.ts b/packages/query/src/utils.ts
@@ -11,6 +11,7 @@ import {
   upath,
   GetterProps,
   GetterPropType,
+  TEMPLATE_TAG_REGEX,
 } from '@orval/core';
 import chalk from 'chalk';
 
@@ -122,7 +123,7 @@ export const wrapRouteParameters = (
   route: string,
   prepend: string,
   append: string,
-): string => route.replaceAll(/\${(.+?)}/g, `\${${prepend}$1${append}}`);
+): string => route.replaceAll(TEMPLATE_TAG_REGEX, `\${${prepend}$1${append}}`);
 
 export const makeRouteSafe = (route: string): string =>
   wrapRouteParameters(route, 'encodeURIComponent(String(', '))');
Original file line number	Diff line number	Diff line change
Expand Up		@@ -28,3 +28,5 @@ export const VERBS_WITH_BODY = [

		export const URL_REGEX =
		/^(?:http(s)?:\/\/)?[\w.-]+(?:\.[\w\.-]+)+[\w\-\._~:/?#[\]@!\$&'\(\)\*\+,;=.]+$/;

		export const TEMPLATE_TAG_REGEX = /\${(.+?)}/g; // For replace of 'thing' ${thing}