fix: escape special characters in string template literals (#603)

* fix: escape special characters in string template literals * fix: wrong quoting --------- Co-authored-by: Andreas Hochsteger <[email protected]>
YousefED · May 14, 2024 · 54a651c · 54a651c
1 parent 3426762
commit 54a651c
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 2 deletions.
diff --git a/api.md b/api.md
@@ -1445,6 +1445,24 @@ class MyObject {
 ```
 
 
+## [string-template-literal](./test/programs/string-template-literal)
+
+```ts
+interface MyObject {
+  a: `@${string}`,
+  b: `@${number}`,
+  c: `@${bigint}`,
+  d: `@${boolean}`,
+  e: `@${undefined}`,
+  f: `@${null}`,
+  g: `${string}@`,
+  h: `${number}@`,
+  i: `${string}@${number}`,
+  j: `${string}.${string}`,
+}
+```
+
+
 ## [symbol](./test/programs/symbol)
 
 ```ts

diff --git a/test/programs/string-template-literal/main.ts b/test/programs/string-template-literal/main.ts
@@ -8,4 +8,5 @@ interface MyObject {
   g: `${string}@`,
   h: `${number}@`,
   i: `${string}@${number}`,
+  j: `${string}.${string}`,
 }
diff --git a/test/programs/string-template-literal/schema.json b/test/programs/string-template-literal/schema.json
@@ -39,6 +39,10 @@
       "i": {
         "type": "string",
         "pattern": "^.*@[0-9]*$"
+      },
+      "j": {
+        "type": "string",
+        "pattern": "^.*\\..*$"
       }
     },
     "additionalProperties": false,
@@ -51,7 +55,8 @@
       "f",
       "g",
       "h",
-      "i"
+      "i",
+      "j"
     ],
     "$schema": "http://json-schema.org/draft-07/schema#"
 }
diff --git a/typescript-json-schema.ts b/typescript-json-schema.ts
@@ -753,7 +753,7 @@ export class JsonSchemaGenerator {
                         const {texts, types} = propertyType;
                         const pattern = [];
                         for (let i = 0; i < texts.length; i++) {
-                            const text = texts[i];
+                            const text = texts[i].replace(/[\\^$.*+?()[\]{}|]/g, "\\$&");
                             const type = types[i];
 
                             if (i === 0) {