allow-extra-props-where-pattern-properties-not-empty

YousefED · Aug 21, 2023 · 8fb2651 · 8fb2651
1 parent 3662786
commit 8fb2651
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git a/test/programs/numeric-keys/main.ts b/test/programs/numeric-keys/main.ts
@@ -0,0 +1,3 @@
+interface NumericKeys {
+    [key: number]: number;
+}
diff --git a/test/programs/numeric-keys/schema.json b/test/programs/numeric-keys/schema.json
@@ -0,0 +1,9 @@
+{
+    "$schema": "http://json-schema.org/draft-07/schema#",
+    "patternProperties": {
+        "^[0-9]+$": {
+            "type": "number"
+        }
+    },
+    "type": "object"
+}
diff --git a/test/schema.test.ts b/test/schema.test.ts
@@ -379,6 +379,7 @@ describe("schema", () => {
         assertSchema("array-empty", "MyEmptyArray");
         assertSchema("map-types", "MyObject");
         assertSchema("extra-properties", "MyObject");
+        assertSchema("numeric-keys", "NumericKeys", { noExtraProps: true });
     });
 
     describe("string literals", () => {

diff --git a/typescript-json-schema.ts b/typescript-json-schema.ts
@@ -1137,7 +1137,7 @@ export class JsonSchemaGenerator {
             if (this.args.defaultProps) {
                 definition.defaultProperties = [];
             }
-            if (this.args.noExtraProps && definition.additionalProperties === undefined) {
+            if (this.args.noExtraProps && definition.additionalProperties === undefined && !Object.keys(definition.patternProperties || {}).length) {
                 definition.additionalProperties = false;
             }
             if (this.args.propOrder) {
@@ -1378,9 +1378,6 @@ export class JsonSchemaGenerator {
                 } else if (typ.flags & ts.TypeFlags.Intersection) {
                     if (this.args.noExtraProps) {
                         // extend object instead of using allOf because allOf does not work well with additional properties. See #107
-                        if (this.args.noExtraProps) {
-                            definition.additionalProperties = false;
-                        }
 
                         const types = (<ts.IntersectionType>typ).types;
                         for (const member of types) {
@@ -1398,6 +1395,10 @@ export class JsonSchemaGenerator {
                                 definition.required = unique((definition.required || []).concat(other.required)).sort();
                             }
                         }
+
+                        if ( definition.additionalProperties === undefined && !Object.keys(definition.patternProperties || {}).length) {
+                            definition.additionalProperties = false;
+                        }
                     } else {
                         this.getIntersectionDefinition(typ as ts.IntersectionType, definition);
                     }