Expand tslint schema for member-ordering, no-consecutive-blank-lines,…

… and no-inferrable-types. Fixes SchemaStore#249
rikoe · Dec 1, 2016 · 84b4baa · 84b4baa
1 parent d1c4941
commit 84b4baa
Showing 1 changed file with 78 additions and 21 deletions.
diff --git a/src/schemas/json/tslint.json b/src/schemas/json/tslint.json
@@ -192,9 +192,51 @@
 				"member-ordering": {
 					"description": "Enforces chosen member ordering",
 					"type": "array",
-					"items": {
-						"type": [ "object", "boolean", "string" ]
-					}
+					"items": [
+						{ 
+							"type": "boolean" 
+						},
+						{ 
+							"type": "object",
+							"properties": {
+								"order": {
+									"oneOf": [
+										{
+											"type": "string",
+											"enum": [
+												"fields-first",
+												"statics-first",
+												"instance-sandwich"
+											]
+										},
+										{
+											"type": "array",
+											"items": {
+												"type": "string",
+												"enum": [
+													"public-static-field",
+													"public-static-method",
+													"protected-static-field",
+													"protected-static-method",
+													"private-static-field",
+													"private-static-method",
+													"public-instance-field",
+													"protected-instance-field",
+													"private-instance-field",
+													"constructor",
+													"public-instance-method",
+													"protected-instance-method",
+													"private-instance-method"
+												]
+											},
+											"maxLength": 13
+										}
+									]
+								}
+							},
+							"additionalProperties": false
+						}
+					]
 				},
 				"new-parens": {
 					"description": "Requires parentheses when invoking a constructor via the `new` keyword",
@@ -222,10 +264,18 @@
 				},
 				"no-consecutive-blank-lines": {
 					"description": "Disallows one or more blank lines in a row",
-					"type": "array",
-					"items": {
-						"type": [ "boolean", "integer" ]
-					}
+					"oneOf": [
+						{ 
+							"type": "boolean"
+						},
+						{ 
+							"type": "array",
+							"items": {
+								"type": [ "boolean", "integer" ]
+							}
+						}
+
+					]
 				},
 				"no-console": {
 					"description": "Disallows access to the specified functions on console",
@@ -286,10 +336,17 @@
 				},
 				"no-inferrable-types": {
 					"description": "Disallows explicit type declarations for variables or parameters initialized to a number, string, or boolean",
-					"type": "array",
-					"items": {
-						"enum": [ true, false, "ignore-params" ]
-					}
+					"oneOf": [
+						{ 
+							"type": "boolean" 
+						},
+						{
+							"type": "array",
+							"items": {
+								"enum": [ true, false, "ignore-params" ]
+							}
+						}
+					]
 				},
 				"no-internal-module": {
 					"description": "Disallows internal module, use namespace instead",
@@ -440,10 +497,10 @@
 				},
 				"semicolon": {
 					"description": "Enforces semicolons at the end of every statement",
-          			"type": "array",
-          			"items": {
-            			"enum": [ true, false, "always", "never"]
-          			}
+					"type": "array",
+					"items": {
+						"enum": [ true, false, "always", "never"]
+					}
 				},
 				"switch-default": {
 					"description": "Enforces a default case in switch statements",
@@ -469,14 +526,14 @@
 					"type": "array",
 					"items": {
 						"enum": [
-						  true,
+							true,
 						  false,
 						  "call-signature",
-              			  "parameter",
-              			  "arrow-parameter",
-              			  "property-declaration",
-              			  "variable-declaration",
-              			  "member-variable-declaration"
+						  "parameter",
+						  "arrow-parameter",
+						  "property-declaration",
+						  "variable-declaration",
+						  "member-variable-declaration"
 						]
 					}
 				},