Skip to content

Commit aeb7d5b

Browse files
authored
feat(core): support JSON ruleset validation (stoplightio#2062)
1 parent 4ececf0 commit aeb7d5b

25 files changed

+501
-293
lines changed

package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
"lint": "yarn lint.prettier && yarn lint.eslint",
3131
"lint.fix": "yarn lint.prettier --write && yarn lint.eslint --fix",
3232
"lint.eslint": "eslint --cache --cache-location .cache/.eslintcache --ext=.js,.mjs,.ts packages test-harness",
33-
"lint.prettier": "prettier --ignore-path .eslintignore --ignore-unknown --check packages/core/src/meta/*.json packages/rulesets/src/{asyncapi,oas}/schemas/*.json docs/**/*.md README.md",
33+
"lint.prettier": "prettier --ignore-path .eslintignore --ignore-unknown --check packages/core/src/ruleset/meta/*.json packages/rulesets/src/{asyncapi,oas}/schemas/*.json docs/**/*.md README.md",
3434
"pretest": "yarn workspace @stoplight/spectral-ruleset-migrator pretest",
3535
"test": "yarn pretest && yarn test.karma && yarn test.jest",
3636
"test.harness": "jest -c ./test-harness/jest.config.js",
@@ -116,7 +116,7 @@
116116
"README.md": [
117117
"prettier --write"
118118
],
119-
"packages/core/src/meta/*.json": [
119+
"packages/core/src/ruleset/meta/*.json": [
120120
"prettier --ignore-path .eslintignore --write"
121121
],
122122
"packages/rulesets/src/{asyncapi,oas}/schemas/*.json": [

packages/core/package.json

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
{
22
"name": "@stoplight/spectral-core",
33
"version": "1.11.1",
4-
"main": "dist/index.js",
5-
"types": "dist/index.d.ts",
64
"sideEffects": false,
75
"homepage": "https://github.com/stoplightio/spectral",
86
"bugs": "https://github.com/stoplightio/spectral/issues",
@@ -15,6 +13,19 @@
1513
"files": [
1614
"dist"
1715
],
16+
"type": "commonjs",
17+
"main": "dist/index.js",
18+
"types": "dist/index.d.ts",
19+
"exports": {
20+
".": {
21+
"types": "./dist/index.d.ts",
22+
"require": "./dist/index.js"
23+
},
24+
"./ruleset/validation": {
25+
"types": "./dist/ruleset/validation/index.d.ts",
26+
"require": "./dist/ruleset/validation/index.js"
27+
}
28+
},
1829
"engines": {
1930
"node": "^12.20 || >= 14.13"
2031
},

packages/core/src/ruleset/__tests__/__fixtures__/foo-extends-bar-ruleset.json

Lines changed: 0 additions & 12 deletions
This file was deleted.

packages/core/src/ruleset/__tests__/__fixtures__/foo-ruleset.json

Lines changed: 0 additions & 14 deletions
This file was deleted.

packages/core/src/ruleset/__tests__/__fixtures__/invalid-ruleset.json

Lines changed: 0 additions & 22 deletions
This file was deleted.

packages/core/src/ruleset/__tests__/__fixtures__/ruleset-with-merge-keys.yaml

Lines changed: 0 additions & 20 deletions
This file was deleted.

packages/core/src/ruleset/__tests__/__fixtures__/ruleset-with-missing-functions.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

packages/core/src/ruleset/__tests__/__fixtures__/valid-flat-ruleset-2.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

packages/core/src/ruleset/__tests__/__fixtures__/valid-flat-ruleset.json

Lines changed: 0 additions & 10 deletions
This file was deleted.

packages/core/src/ruleset/__tests__/ruleset.test.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import { DiagnosticSeverity } from '@stoplight/types';
66
import { Ruleset } from '../ruleset';
77
import { RulesetDefinition } from '../types';
88
import { print } from './__helpers__/print';
9-
import { RulesetValidationError } from '../validation';
9+
import { RulesetValidationError } from '../validation/index';
1010
import { isPlainObject } from '@stoplight/json';
1111
import { Format } from '../format';
1212
import { JSONSchema4, JSONSchema6, JSONSchema7 } from 'json-schema';

0 commit comments

Comments
 (0)