chore: fix zog schema regex

Author: Oudwins

docs/static/zss/0.0.1/schema.json

@@ -31,7 +31,7 @@
             "properties": {
               "content": {},
               "uri": {
-                "pattern": "^(?P\u003cid\u003ehttps?://[A-Za-z0-9.-]+(?::[0-9]+)?(?:/[A-Za-z0-9._~!$\u0026'()*+,;=:@%-]+)+)/(?P\u003cversion\u003e(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*)(?:-beta(?:\\.(?:0|[1-9][0-9]*))?)?)/schema\\.json$",
+                "pattern": "^(?:https?://[A-Za-z0-9.-]+(?::[0-9]+)?(?:/[A-Za-z0-9._~!$\u0026'()*+,;=:@%-]+)+)/(?:(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*)(?:-beta(?:\\.(?:0|[1-9][0-9]*))?)?)/schema\\.json$",
                 "type": "string"
               }
             },
@@ -225,7 +225,7 @@
       "type": "object"
     },
     "$schema": {
-      "pattern": "^(?P\u003cid\u003ehttps?://[A-Za-z0-9.-]+(?::[0-9]+)?(?:/[A-Za-z0-9._~!$\u0026'()*+,;=:@%-]+)+)/(?P\u003cversion\u003e(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*)(?:-beta(?:\\.(?:0|[1-9][0-9]*))?)?)/schema\\.json$",
+      "pattern": "^(?:https?://[A-Za-z0-9.-]+(?::[0-9]+)?(?:/[A-Za-z0-9._~!$\u0026'()*+,;=:@%-]+)+)/(?:(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*)(?:-beta(?:\\.(?:0|[1-9][0-9]*))?)?)/schema\\.json$",
       "type": "string"
     },
     "root": {
@@ -252,7 +252,7 @@
           "properties": {
             "content": {},
             "uri": {
-              "pattern": "^(?P\u003cid\u003ehttps?://[A-Za-z0-9.-]+(?::[0-9]+)?(?:/[A-Za-z0-9._~!$\u0026'()*+,;=:@%-]+)+)/(?P\u003cversion\u003e(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*)(?:-beta(?:\\.(?:0|[1-9][0-9]*))?)?)/schema\\.json$",
+              "pattern": "^(?:https?://[A-Za-z0-9.-]+(?::[0-9]+)?(?:/[A-Za-z0-9._~!$\u0026'()*+,;=:@%-]+)+)/(?:(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*)(?:-beta(?:\\.(?:0|[1-9][0-9]*))?)?)/schema\\.json$",
               "type": "string"
             }
           },
@@ -470,7 +470,7 @@
           "properties": {
             "content": {},
             "uri": {
-              "pattern": "^(?P\u003cid\u003ehttps?://[A-Za-z0-9.-]+(?::[0-9]+)?(?:/[A-Za-z0-9._~!$\u0026'()*+,;=:@%-]+)+)/(?P\u003cversion\u003e(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*)(?:-beta(?:\\.(?:0|[1-9][0-9]*))?)?)/schema\\.json$",
+              "pattern": "^(?:https?://[A-Za-z0-9.-]+(?::[0-9]+)?(?:/[A-Za-z0-9._~!$\u0026'()*+,;=:@%-]+)+)/(?:(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*)\\.(?:0|[1-9][0-9]*)(?:-beta(?:\\.(?:0|[1-9][0-9]*))?)?)/schema\\.json$",
               "type": "string"
             }
           },

pkgs/zss/jsonschema/draft2020_12/jsonschema.go

@@ -8,6 +8,7 @@ import (
 
 	zsscore "github.com/Oudwins/zog/pkgs/zss/core"
 	"github.com/Oudwins/zog/pkgs/zss/jsonschema/shared"
+	"github.com/Oudwins/zog/pkgs/zss/regexconv"
 	"github.com/Oudwins/zog/zconst"
 )
 
@@ -254,7 +255,11 @@ func ConvertTest(out Schema, kind zconst.ZogType, test *zsscore.ZSSTest) error {
 	case zconst.IssueCodeIP:
 		out["format"] = "ip"
 	case zconst.IssueCodeMatch:
-		out["pattern"] = test.Params[zconst.IssueCodeMatch]
+		pattern, ok := test.Params[zconst.IssueCodeMatch].(string)
+		if !ok {
+			return fmt.Errorf("match test param must be a string")
+		}
+		out["pattern"] = regexconv.GoRE2ToECMA262(pattern)
 	case zconst.IssueCodeTrue:
 		out["const"] = true
 	case zconst.IssueCodeFalse:

pkgs/zss/jsonschema/jsonschema_test.go

@@ -3,6 +3,7 @@ package zjsonschema_test
 import (
 	"encoding/json"
 	"errors"
+	"regexp"
 	"testing"
 
 	zsscore "github.com/Oudwins/zog/pkgs/zss/core"
@@ -197,6 +198,30 @@ func TestFromZSSConvertsCustomTestsWithOption(t *testing.T) {
 	assert.Equal(t, "^z", schema["pattern"])
 }
 
+func TestFromZSSConvertsNamedGroupsInMatchPatterns(t *testing.T) {
+	doc := zsscore.ZSSDocument{Root: &zsscore.ZSSSchema{Kind: zconst.TypeString, Processors: []zsscore.ZSSProcessor{
+		testProcessor(zconst.IssueCodeMatch, map[string]any{zconst.IssueCodeMatch: regexp.MustCompile(`^(?P<id>[a-z]+)/(?P<version>[0-9]+)$`).String()}),
+	}}}
+
+	schema, err := zjsonschema.FromZSS(doc, zjsonschema.Options{})
+	require.NoError(t, err)
+	requireValidJSONSchema(t, schema)
+
+	assert.Equal(t, `^(?:[a-z]+)/(?:[0-9]+)$`, schema["pattern"])
+}
+
+func TestFromZSSReturnsErrorForNonStringMatchPattern(t *testing.T) {
+	doc := zsscore.ZSSDocument{Root: &zsscore.ZSSSchema{Kind: zconst.TypeString, Processors: []zsscore.ZSSProcessor{
+		testProcessor(zconst.IssueCodeMatch, map[string]any{zconst.IssueCodeMatch: 1}),
+	}}}
+
+	_, err := zjsonschema.FromZSS(doc, zjsonschema.Options{})
+
+	require.Error(t, err)
+	assert.ErrorContains(t, err, `convert test "match"`)
+	assert.ErrorContains(t, err, "match test param must be a string")
+}
+
 func TestFromZSSReturnsTestConverterErrors(t *testing.T) {
 	wantErr := errors.New("custom test failed")
 	doc := zsscore.ZSSDocument{Root: &zsscore.ZSSSchema{Kind: zconst.TypeString, Processors: []zsscore.ZSSProcessor{

pkgs/zss/regexconv/regexconv.go

@@ -0,0 +1,11 @@
+package regexconv
+
+import "regexp"
+
+var pythonNamedGroupPattern = regexp.MustCompile(`\(\?P<[^>]+>`)
+
+// GoRE2ToECMA262 converts Go/RE2 regex syntax to ECMA-262 syntax.
+// For now, it only removes Go-supported Python-style named capture groups.
+func GoRE2ToECMA262(pattern string) string {
+	return pythonNamedGroupPattern.ReplaceAllString(pattern, "(?:")
+}

pkgs/zss/regexconv/regexconv_test.go

@@ -0,0 +1,20 @@
+package regexconv
+
+import (
+	"regexp"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+)
+
+func TestGoRE2ToECMA262ConvertsPythonStyleNamedGroups(t *testing.T) {
+	pattern := regexp.MustCompile(`^(?P<id>[a-z]+)/(?P<version>[0-9]+)$`).String()
+
+	assert.Equal(t, `^(?:[a-z]+)/(?:[0-9]+)$`, GoRE2ToECMA262(pattern))
+}
+
+func TestGoRE2ToECMA262LeavesOtherSyntaxUnchanged(t *testing.T) {
+	pattern := `^(?<id>[a-z]+)/(?:[0-9]+)$`
+
+	assert.Equal(t, pattern, GoRE2ToECMA262(pattern))
+}