@f3liz/rescript-autogen-openapi 0.3.1 → 0.5.0

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

@@ -31,6 +31,65 @@ function escapeString(str) {
   return str.replaceAll("\\", "\\\\").replaceAll("\"", "\\\"").replaceAll("\n", "\\n").replaceAll("\r", "\\r").replaceAll("\t", "\\t");
 }
 
+function escapeRegexPattern(str) {
+  return (function(s) {
+      return s.replace(/\[([^\]]+)\]/g, function(match) {
+        let content = match.slice(1, -1);
+        let chars = [];
+        let hyphenCount = 0;
+        let i = 0;
+        
+        while (i < content.length) {
+          if (content[i] === '\\\\' && i + 1 < content.length) {
+            if (content[i + 1] === '-') {
+              // Escaped hyphen - count it and skip
+              hyphenCount++;
+              i += 2;
+            } else {
+              // Other escaped char - keep as is
+              chars.push(content[i]);
+              chars.push(content[i + 1]);
+              i += 2;
+            }
+          } else if (content[i] === '-' && i > 0 && i < content.length - 1) {
+            // Check if this hyphen is part of a valid range
+            let prevChar = chars[chars.length - 1];
+            let nextChar = content[i + 1];
+            // If previous char is a backslash, this can't be a range
+            if (chars.length >= 2 && chars[chars.length - 2] === '\\\\') {
+              // Previous was escaped, so this hyphen is literal
+              hyphenCount++;
+              i++;
+            } else if (nextChar === '\\\\') {
+              // Next is escape sequence, hyphen is literal
+              hyphenCount++;
+              i++;
+            } else if (prevChar && nextChar && prevChar.charCodeAt(0) < nextChar.charCodeAt(0)) {
+              // Valid range (e.g., a-z), keep the hyphen
+              chars.push('-');
+              i++;
+            } else {
+              // Invalid or ambiguous, move to end
+              hyphenCount++;
+              i++;
+            }
+          } else {
+            // Regular character or hyphen at start/end
+            chars.push(content[i]);
+            i++;
+          }
+        }
+        
+        // Add collected hyphens at the end
+        let result = chars.join('');
+        if (hyphenCount > 0) {
+          result += '-'.repeat(hyphenCount);
+        }
+        return '[' + result + ']';
+      });
+    })(str);
+}
+
 function generateFileHeader(description) {
   return `// ` + description + `
 // Generated by @f3liz/rescript-autogen-openapi
@@ -247,6 +306,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(/` + CodegenUtils.escapeRegexPattern(p) + `/)`;
         } else {
           return s;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@f3liz/rescript-autogen-openapi",
-  "version": "0.3.1",
+  "version": "0.5.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,71 @@ let escapeString = (str: string): string =>
   ->String.replaceAll("\n", "\\n")->String.replaceAll("\r", "\\r")
   ->String.replaceAll("\t", "\\t")
 
+// Escape Regex Pattern for ReScript 12 regex literals
+// With /.../ syntax, forward slashes don't need escaping inside character classes
+// Only fix hyphen placement in character classes for clarity
+let escapeRegexPattern = (str: string): string => {
+  // Move escaped hyphens (\-) to the end of character classes for clarity
+  %raw(`
+    function(s) {
+      return s.replace(/\[([^\]]+)\]/g, function(match) {
+        let content = match.slice(1, -1);
+        let chars = [];
+        let hyphenCount = 0;
+        let i = 0;
+        
+        while (i < content.length) {
+          if (content[i] === '\\\\' && i + 1 < content.length) {
+            if (content[i + 1] === '-') {
+              // Escaped hyphen - count it and skip
+              hyphenCount++;
+              i += 2;
+            } else {
+              // Other escaped char - keep as is
+              chars.push(content[i]);
+              chars.push(content[i + 1]);
+              i += 2;
+            }
+          } else if (content[i] === '-' && i > 0 && i < content.length - 1) {
+            // Check if this hyphen is part of a valid range
+            let prevChar = chars[chars.length - 1];
+            let nextChar = content[i + 1];
+            // If previous char is a backslash, this can't be a range
+            if (chars.length >= 2 && chars[chars.length - 2] === '\\\\') {
+              // Previous was escaped, so this hyphen is literal
+              hyphenCount++;
+              i++;
+            } else if (nextChar === '\\\\') {
+              // Next is escape sequence, hyphen is literal
+              hyphenCount++;
+              i++;
+            } else if (prevChar && nextChar && prevChar.charCodeAt(0) < nextChar.charCodeAt(0)) {
+              // Valid range (e.g., a-z), keep the hyphen
+              chars.push('-');
+              i++;
+            } else {
+              // Invalid or ambiguous, move to end
+              hyphenCount++;
+              i++;
+            }
+          } else {
+            // Regular character or hyphen at start/end
+            chars.push(content[i]);
+            i++;
+          }
+        }
+        
+        // Add collected hyphens at the end
+        let result = chars.join('');
+        if (hyphenCount > 0) {
+          result += '-'.repeat(hyphenCount);
+        }
+        return '[' + result + ']';
+      });
+    }
+  `)(str)
+}
+
 // 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(/${CodegenUtils.escapeRegexPattern(p)}/)`
       | None => s
       }
     | Number({constraints: c}) =>