@f3liz/rescript-autogen-openapi 0.3.1 → 0.4.0

package/lib/es6/src/core/CodegenUtils.mjs

@@ -31,6 +31,18 @@ function escapeString(str) {
   return str.replaceAll("\\", "\\\\").replaceAll("\"", "\\\"").replaceAll("\n", "\\n").replaceAll("\r", "\\r").replaceAll("\t", "\\t");
 }
 
+function escapeRegexPattern(str) {
+  return escapeString((function(s) {
+      return s.replace(/(\\*)(\/)/g, function(match, backslashes, slash) {
+        if (backslashes.length % 2 === 0) {
+          return backslashes + '\\\\' + slash;
+        } else {
+          return match;
+        }
+      });
+    })(str));
+}
+
 function generateFileHeader(description) {
   return `// ` + description + `
 // Generated by @f3liz/rescript-autogen-openapi
@@ -247,6 +259,7 @@ export {
   generateTypeName,
   generateOperationName,
   escapeString,
+  escapeRegexPattern,
   generateFileHeader,
   indent,
   trimMargin,

package/lib/es6/src/generators/IRToSuryGenerator.mjs

@@ -50,7 +50,7 @@ function generateSchemaWithContext(ctx, depthOpt, extractedTypeMap, irType) {
         let s = applyConstraints("S.string", c.minLength, c.maxLength, v => v.toString());
         let p = c.pattern;
         if (p !== undefined) {
-          return s + `->S.pattern(%re("/` + CodegenUtils.escapeString(p) + `/"))`;
+          return s + `->S.pattern(%re("/` + CodegenUtils.escapeRegexPattern(p) + `/"))`;
         } else {
           return s;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@f3liz/rescript-autogen-openapi",
-  "version": "0.3.1",
+  "version": "0.4.0",
   "description": "Generate ReScript code with Sury schemas from OpenAPI 3.1 specs. Supports multiple forks with diff/merge capabilities.",
   "keywords": [
     "rescript",

package/src/core/CodegenUtils.res

@@ -48,6 +48,23 @@ let escapeString = (str: string): string =>
   ->String.replaceAll("\n", "\\n")->String.replaceAll("\r", "\\r")
   ->String.replaceAll("\t", "\\t")
 
+// Escape Regex Pattern (escape unescaped slashes, then escape string)
+let escapeRegexPattern = (str: string): string => {
+  let withEscapedSlashes = %raw(`
+    function(s) {
+      return s.replace(/(\\*)(\/)/g, function(match, backslashes, slash) {
+        if (backslashes.length % 2 === 0) {
+          return backslashes + '\\\\' + slash;
+        } else {
+          return match;
+        }
+      });
+    }
+  `)(str)
+  
+  escapeString(withEscapedSlashes)
+}
+
 // Generate file header
 let generateFileHeader = (~description: string): string =>
   `// ${description}

package/src/generators/IRToSuryGenerator.res

@@ -42,7 +42,7 @@ let rec generateSchemaWithContext = (~ctx: GenerationContext.t, ~depth=0, ~extra
     | String({constraints: c}) =>
       let s = applyConstraints("S.string", c.minLength, c.maxLength, v => Int.toString(v))
       switch c.pattern {
-      | Some(p) => `${s}->S.pattern(%re("/${CodegenUtils.escapeString(p)}/"))`
+      | Some(p) => `${s}->S.pattern(%re("/${CodegenUtils.escapeRegexPattern(p)}/"))`
       | None => s
       }
     | Number({constraints: c}) =>