Correct schema for object with number index (YousefED#248)

* Properly transform object with numeric index (YousefED#245)

* Added tests and fixed failing tests (YousefED#245)

* remove the compiled files changes

Author: CaselIT

test/programs/array-types/main.ts

@@ -1,3 +1 @@
-interface MyArray {
-    [index: number]: string | number;
-}
+type MyArray = Array<string | number>;

test/programs/object-numeric-index-as-property/main.ts

@@ -0,0 +1,9 @@
+interface Target {
+  objAnonymous: {
+    [index: number]: number;
+  };
+  objInterface: IndexInterface;
+}
+interface IndexInterface {
+  [index: number]: number;
+}

test/programs/object-numeric-index-as-property/schema.json

@@ -0,0 +1,24 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "properties": {
+      "objAnonymous": {
+          "additionalProperties": false,
+          "patternProperties": {
+              "^[0-9]+$": {
+                  "type": "number"
+              }
+          },
+          "type": "object"
+      },
+      "objInterface": {
+          "additionalProperties": false,
+          "patternProperties": {
+              "^[0-9]+$": {
+                  "type": "number"
+              }
+          },
+          "type": "object"
+      }
+  },
+  "type": "object"
+}

test/programs/object-numeric-index/main.ts

@@ -0,0 +1,3 @@
+interface IndexInterface {
+  [index: number]: number;
+}

test/programs/object-numeric-index/schema.json

@@ -0,0 +1,10 @@
+{
+  "$schema": "http://json-schema.org/draft-07/schema#",
+  "additionalProperties": false,
+  "patternProperties": {
+      "^[0-9]+$": {
+          "type": "number"
+      }
+  },
+  "type": "object"
+}

test/schema.test.ts

@@ -307,6 +307,11 @@ describe("schema", () => {
             id: "someSchemaId"
         });
     });
+
+    describe("object index", () => {
+        assertSchema("object-numeric-index", "IndexInterface");
+        assertSchema("object-numeric-index-as-property", "Target", { required: false });
+    });
 });
 
 describe("tsconfig.json", () => {

typescript-json-schema.ts

@@ -11,6 +11,7 @@ const vm = require("vm");
 const REGEX_FILE_NAME_OR_SPACE = /(\bimport\(".*?"\)|".*?")\.| /g;
 const REGEX_TSCONFIG_NAME = /^.*\.json$/;
 const REGEX_TJS_JSDOC = /^-([\w]+)\s+(\S|\S[\s\S]*\S)\s*$/g;
+const NUMERIC_INDEX_PATTERN = "^[0-9]+$";
 
 export function getDefaultArgs(): Args {
     return {
@@ -88,7 +89,7 @@ export type Definition = {
     propertyOrder?: string[],
     properties?: {[key: string]: any},
     defaultProperties?: string[],
-
+    patternProperties?: {[pattern: string]: Definition},
     typeof?: "function"
 };
 
@@ -419,8 +420,17 @@ export class JsonSchemaGenerator {
                     definition.type = typeof value;
                     definition.enum = [ value ];
                 } else if (arrayType !== undefined) {
-                    definition.type = "array";
-                    definition.items = this.getTypeDefinition(arrayType);
+                    if ((propertyType.flags & ts.TypeFlags.Object) &&
+                        ((propertyType as ts.ObjectType).objectFlags & (ts.ObjectFlags.Anonymous | ts.ObjectFlags.Interface))) {
+                        definition.type = "object";
+                        definition.additionalProperties = false;
+                        definition.patternProperties = {
+                            [NUMERIC_INDEX_PATTERN]: this.getTypeDefinition(arrayType)
+                        };
+                    } else {
+                        definition.type = "array";
+                        definition.items = this.getTypeDefinition(arrayType);
+                    }
                 } else {
                     // Report that type could not be processed
                     const error = new TypeError("Unsupported type: " + propertyTypeString);