feat: support patternParameters and typed additionalParameters

ogen-go · Feb 1, 2025 · 07790a7 · 07790a7
1 parent 09030eb
commit 07790a7
Show file tree

Hide file tree

Showing 26 changed files with 1,364 additions and 1 deletion.
diff --git a/_testdata/negative/field_naming/conflict_additional_props.yaml b/_testdata/negative/field_naming/conflict_additional_props.yaml
@@ -21,6 +21,7 @@ components:
     User:
       type: object
       properties:
+        # AdditionalProps is a reserved keyword when utilizing additionalProperties
         AdditionalProps:
           type: integer
       additionalProperties:

diff --git a/_testdata/negative/field_naming/conflict_pattern_props.yaml b/_testdata/negative/field_naming/conflict_pattern_props.yaml
@@ -21,6 +21,7 @@ components:
     User:
       type: object
       properties:
+        # Pattern0Props is a reserved keyword when utilizing patternProperties
         Pattern0Props:
           type: integer
       patternProperties:

diff --git a/_testdata/negative/field_naming/extension_additional_props.yaml b/_testdata/negative/field_naming/extension_additional_props.yaml
@@ -25,6 +25,7 @@ components:
           type: integer
       x-ogen-properties:
         id:
+          # AdditionalProps is a reserved keyword when utilizing additionalProperties
           name: "AdditionalProps"
       additionalProperties:
         type: string
diff --git a/_testdata/negative/field_naming/extension_pattern_props.yaml b/_testdata/negative/field_naming/extension_pattern_props.yaml
@@ -25,6 +25,7 @@ components:
           type: integer
       x-ogen-properties:
         id:
+          # Pattern0Props is a reserved keyword when utilizing patternProperties
           name: "Pattern0Props"
       patternProperties:
         "^x-.*":

diff --git a/_testdata/positive/additionalPropertiesPatternProperties.yml b/_testdata/positive/additionalPropertiesPatternProperties.yml
@@ -0,0 +1,31 @@
+openapi: 3.1.0
+info:
+  title: "REST API"
+  version: 0.0.1
+
+servers:
+  - url: "http://localhost:8888"
+
+paths:
+  /api/alive:
+    get:
+      operationId: alive
+      tags:
+        - system
+      parameters:
+        - name: flexData
+          in: query
+          style: deepObject
+          schema:
+              type: object
+              properties:
+                hello_world:
+                  type: string
+              patternProperties:
+                "^pat-.*":
+                  type: string
+              additionalProperties:
+                type: string
+      responses:
+        "200":
+          description: ok
diff --git a/gen/gen_parameters.go b/gen/gen_parameters.go
@@ -228,7 +228,7 @@ func isParamAllowed(t *ir.Type, root bool, visited map[*ir.Type]struct{}) error
 		// return nil
 		return &ErrNotImplemented{"sum type parameter"}
 	case ir.KindMap:
-		return &ErrNotImplemented{"object with additionalProperties"}
+		return nil
 	case ir.KindAny:
 		return &ErrNotImplemented{"any type parameter"}
 	default:

diff --git a/internal/integration/_config/additionalPropertiesPatternProperties.yml b/internal/integration/_config/additionalPropertiesPatternProperties.yml
@@ -0,0 +1,6 @@
+generator:
+  features:
+    enable:
+      - "debug/example_tests"
+      - "paths/server"
+      - "paths/client"
diff --git a/internal/integration/generate.go b/internal/integration/generate.go
@@ -29,6 +29,7 @@ package integration
 //
 //go:generate go run ../../cmd/ogen -v --clean --config _config/allOf.yml --target test_allof ../../_testdata/positive/allOf.yml
 //go:generate go run ../../cmd/ogen -v --clean --config _config/anyOf.yml --target test_anyof ../../_testdata/positive/anyOf.json
+//go:generate go run ../../cmd/ogen -v --clean --config _config/additionalPropertiesPatternProperties.yml --target test_additionalpropertiespatternproperties ../../_testdata/positive/additionalPropertiesPatternProperties.yml
 //
 //go:generate go run ../../cmd/ogen -v --clean -target test_enum_naming       ../../_testdata/positive/enum_naming.yml
 //go:generate go run ../../cmd/ogen -v --clean -target test_naming_extensions ../../_testdata/positive/naming_extensions.json

diff --git a/internal/integration/test_additionalpropertiespatternproperties/oas_cfg_gen.go b/internal/integration/test_additionalpropertiespatternproperties/oas_cfg_gen.go