fix: nested extends broken in rulesets (#1465)

* fix(ruleset): nested extends not working correctly

* Update src/rule.ts

Co-authored-by: Domagoj Kriskovic <dom@stoplight.io>

Co-authored-by: Domagoj Kriskovic <dom@stoplight.io>

setupTests.ts

@@ -22,6 +22,7 @@ const removeAllRulesBut = (spectral: Spectral, ruleName: string) => {
   const patchedRule = Object.assign(rule1, {
     recommended: true,
     severity: rawRule.severity,
+    enabled: true,
   }) as IRule;
 
   const rules: RuleCollection = {};

src/__tests__/linter.test.ts

@@ -775,6 +775,7 @@ responses:: !!foo
         message: spectral.rules['operation-tag-defined'].message ?? '',
         description: spectral.rules['operation-tag-defined'].description ?? '',
         severity: 'off',
+        enabled: false,
       },
     });
 

src/rule.ts

@@ -3,26 +3,26 @@ import { JSONPathExpression } from 'nimma';
 
 import { IDocument } from './document';
 import { DEFAULT_SEVERITY_LEVEL, getDiagnosticSeverity } from './rulesets/severity';
-import { IGivenNode, IRule, IThen, SpectralDiagnosticSeverity } from './types';
+import { IGivenNode, IProcessedRule, IThen } from './types';
 import { hasIntersectingElement } from './utils';
+import { DiagnosticSeverity } from '@stoplight/types';
 
 export class Rule {
   public readonly name: string;
   public readonly description: string | null;
   public readonly message: string | null;
-  public readonly severity: SpectralDiagnosticSeverity;
+  public readonly severity: DiagnosticSeverity;
   public readonly resolved: boolean;
   public readonly formats: Optional<string[]>;
 
   public readonly then: IThen[];
   public readonly given: string[];
 
-  public get enabled(): boolean {
-    return this.severity !== -1;
-  }
+  public readonly enabled: boolean;
 
-  constructor(name: string, rule: IRule) {
+  constructor(name: string, rule: IProcessedRule) {
     this.name = name;
+    this.enabled = rule.enabled ?? true;
     this.description = rule.description ?? null;
     this.message = rule.message ?? null;
     this.severity = rule.severity === void 0 ? DEFAULT_SEVERITY_LEVEL : getDiagnosticSeverity(rule.severity);
@@ -49,7 +49,7 @@ function stub(): void {
 export class OptimizedRule extends Rule {
   public readonly expressions: JSONPathExpression[];
 
-  constructor(name: string, rule: IRule) {
+  constructor(name: string, rule: IProcessedRule) {
     super(name, rule);
     this.expressions = this.given.map(given => {
       const expr = new JSONPathExpression(given, stub, stub);

src/rulesets/__tests__/__fixtures__/customFunctionsRuleset/ruleset.json

@@ -0,0 +1,25 @@
+{
+  "functionsDir": "./customFunctions",
+  "functions": [
+    "bar",
+    "truthy"
+  ],
+  "rules": {
+    "bar-rule": {
+      "message": "should be OK",
+      "given": "$.info",
+      "recommended": true,
+      "then": {
+        "function": "bar"
+      }
+    },
+    "truthy-rule": {
+      "message": "should be OK",
+      "given": "$.x",
+      "recommended": true,
+      "then": {
+        "function": "truthy"
+      }
+    }
+  }
+}

src/rulesets/__tests__/__fixtures__/formats/oas2.json

@@ -0,0 +1,12 @@
+{
+  "formats": ["oas2"],
+  "rules": {
+    "oas2-valid-rule": {
+      "message": "should be OK",
+      "given": "$.info",
+      "then": {
+        "function": "truthy"
+      }
+    }
+  }
+}

src/rulesets/__tests__/__fixtures__/formats/oas3.json

@@ -0,0 +1,12 @@
+{
+  "formats": ["oas3"],
+  "rules": {
+    "oas3-valid-rule": {
+      "message": "should be OK",
+      "given": "$.info",
+      "then": {
+        "function": "truthy"
+      }
+    }
+  }
+}

src/rulesets/__tests__/__fixtures__/formats/ruleset.json

@@ -0,0 +1,13 @@
+{
+  "extends": ["./oas2.json", "./oas3.json"],
+  "formats": ["oas2", "oas3"],
+  "rules": {
+    "generic-valid-rule": {
+      "message": "should be OK",
+      "given": "$.info",
+      "then": {
+        "function": "truthy"
+      }
+    }
+  }
+}

src/rulesets/__tests__/__fixtures__/npm/plain.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["example-spectral-ruleset"]
+}

src/rulesets/__tests__/__fixtures__/npm/versioned.json

@@ -0,0 +1,3 @@
+{
+  "extends": ["example-spectral-ruleset@0.0.3"]
+}

src/rulesets/__tests__/__fixtures__/severity/all.json

@@ -0,0 +1,6 @@
+{
+  "extends": [["./shared.json", "all"]],
+  "rules": {
+    "description-matches-stoplight": "off"
+  }
+}

src/rulesets/__tests__/__fixtures__/severity/implicit.json

@@ -0,0 +1,3 @@
+{
+  "extends": "./shared.json"
+}

src/rulesets/__tests__/__fixtures__/severity/off-proxy.json

@@ -0,0 +1,3 @@
+{
+  "extends": "./off.json"
+}

src/rulesets/__tests__/__fixtures__/severity/off.json

@@ -0,0 +1,6 @@
+{
+  "extends": [["./shared.json", "off"]],
+  "rules": {
+    "overridable-rule": true
+  }
+}

src/rulesets/__tests__/__fixtures__/severity/recommended.json

@@ -0,0 +1,3 @@
+{
+  "extends": [["shared.json", "recommended"]]
+}

src/rulesets/__tests__/__fixtures__/inheritanceRulesets/ruleset-a.json → src/rulesets/__tests__/__fixtures__/severity/shared.json

@@ -3,7 +3,6 @@
     "description-matches-stoplight": {
       "message": "Description must contain Stoplight",
       "given": "$.info",
-      "type": "style",
       "recommended": true,
       "severity": "error",
       "then": {
@@ -17,7 +16,6 @@
     "title-matches-stoplight": {
       "message": "Title must contain Stoplight",
       "given": "$.info",
-      "type": "style",
       "then": {
         "field": "title",
         "function": "pattern",
@@ -29,7 +27,6 @@
     "contact-name-matches-stoplight": {
       "message": "Contact name must contain Stoplight",
       "given": "$.info.contact",
-      "type": "style",
       "recommended": false,
       "then": {
         "field": "name",
@@ -38,6 +35,12 @@
           "match": "Stoplight"
         }
       }
+    },
+    "overridable-rule": {
+      "given": "$",
+      "then": {
+        "function": "truthy"
+      }
     }
   }
 }

src/rulesets/__tests__/__fixtures__/valid-flat-ruleset-2.json

@@ -0,0 +1,10 @@
+{
+  "rules": {
+    "valid-rule-2": {
+      "given": "$.info",
+      "then": {
+        "function": "truthy"
+      }
+    }
+  }
+}

src/rulesets/__tests__/__fixtures__/valid-flat-ruleset.json

@@ -1,19 +1,10 @@
 {
   "rules": {
     "valid-rule": {
-      "message": "should be OK",
       "given": "$.info",
       "then": {
         "function": "truthy"
       }
-    },
-    "valid-rule-recommended": {
-      "message": "should be OK",
-      "given": "$.info",
-      "recommended": true,
-      "then": {
-        "function": "truthy"
-      }
     }
   }
 }

src/rulesets/__tests__/formats/oas2.json

@@ -0,0 +1,12 @@
+{
+  "formats": ["oas2"],
+  "rules": {
+    "oas2-valid-rule": {
+      "message": "should be OK",
+      "given": "$.info",
+      "then": {
+        "function": "truthy"
+      }
+    }
+  }
+}

src/rulesets/__tests__/formats/oas3.json

@@ -0,0 +1,12 @@
+{
+  "formats": ["oas3"],
+  "rules": {
+    "oas3-valid-rule": {
+      "message": "should be OK",
+      "given": "$.info",
+      "then": {
+        "function": "truthy"
+      }
+    }
+  }
+}

src/rulesets/__tests__/formats/ruleset.json

@@ -0,0 +1,13 @@
+{
+  "extends": ["./oas2.json", "./oas3.json"],
+  "formats": ["oas2", "oas3"],
+  "rules": {
+    "generic-valid-rule": {
+      "message": "should be OK",
+      "given": "$.info",
+      "then": {
+        "function": "truthy"
+      }
+    }
+  }
+}