chore: update deps (#112)

stoplightio · Aug 2, 2022 · acca1b7 · acca1b7
1 parent 7f169fc
commit acca1b7
Show file tree

Hide file tree

Showing 24 changed files with 2,580 additions and 1,597 deletions.
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -0,0 +1,6 @@
+module.exports = {
+  extends: ['@stoplight'],
+  rules: {
+    'no-param-reassign': 'warn',
+  },
+};
diff --git a/.prettierrc.js b/.prettierrc.js
@@ -0,0 +1,3 @@
+module.exports = {
+  ...require('@stoplight/eslint-config/prettier.config'),
+};
diff --git a/jest.config.js b/jest.config.js
@@ -1,4 +1,4 @@
 module.exports = {
   preset: '@stoplight/scripts',
-  testEnvironment: 'node'
+  testEnvironment: 'node',
 };
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
   "scripts": {
     "build": "sl-scripts build",
     "commit": "git-cz",
-    "lint": "tslint -c tslint.json 'src/**/*.ts'",
+    "lint": "eslint --ext .js,.jsx,.ts,.tsx .",
     "lint.fix": "yarn lint --fix",
     "release": "sl-scripts release",
     "release.dryRun": "sl-scripts release --dry-run --debug",
@@ -45,16 +45,25 @@
     "safe-stable-stringify": "^1.1"
   },
   "devDependencies": {
+    "@stoplight/eslint-config": "^3.0.0",
     "@stoplight/scripts": "^7.0.4",
-    "@types/jest": "^24.0.21",
+    "@types/jest": "^28.1.6",
     "@types/lodash": "^4.14.144",
     "@types/node": "^12.12.5",
+    "@typescript-eslint/eslint-plugin": "^5.32.0",
+    "@typescript-eslint/parser": "^5.32.0",
     "benchmark": "^2.1.4",
-    "jest": "^24.9.0",
-    "ts-jest": "^24.1.0",
-    "tslint": "^5.20.0",
-    "tslint-config-stoplight": "~1.3.0",
-    "typescript": "3.6.4"
+    "eslint": "^8.21.0",
+    "eslint-plugin-import": "^2.26.0",
+    "eslint-plugin-jest": "^26.7.0",
+    "eslint-plugin-prettier": "^4.2.1",
+    "eslint-plugin-react": "^7.30.1",
+    "eslint-plugin-react-hooks": "^4.6.0",
+    "eslint-plugin-simple-import-sort": "^7.0.0",
+    "jest": "^28.1.3",
+    "prettier": "^2.3.1",
+    "ts-jest": "^28.0.7",
+    "typescript": "^4.7.4"
   },
   "lint-staged": {
     "*.{ts,tsx}$": [

diff --git a/src/__tests__/getJsonPathForPosition.spec.ts b/src/__tests__/getJsonPathForPosition.spec.ts
@@ -1,5 +1,6 @@
 import * as fs from 'fs';
 import { join } from 'path';
+
 import { getJsonPathForPosition } from '../getJsonPathForPosition';
 import { parseWithPointers } from '../parseWithPointers';
 
@@ -11,7 +12,7 @@ describe('getJsonPathForPosition', () => {
   describe('simple fixture', () => {
     const result = parseWithPointers(simple);
 
-    test.each`
+    it.each`
       line | character | path
       ${0} | ${0}      | ${void 0}
       ${1} | ${4}      | ${['hello']}
@@ -26,7 +27,7 @@ describe('getJsonPathForPosition', () => {
   describe('users fixture', () => {
     const result = parseWithPointers(users);
 
-    test.each`
+    it.each`
       line | character | path
       ${0} | ${0}      | ${void 0}
       ${0} | ${231}    | ${void 0}
@@ -44,7 +45,7 @@ describe('getJsonPathForPosition', () => {
   describe('one-liner', () => {
     const result = parseWithPointers(`{ "foo": true, "bar": false }`);
 
-    test.each`
+    it.each`
       line | character | path
       ${0} | ${3}      | ${['foo']}
       ${0} | ${12}     | ${['foo']}
@@ -57,7 +58,7 @@ describe('getJsonPathForPosition', () => {
   describe('multiline comments', () => {
     const result = parseWithPointers(multilineComments);
 
-    test.each`
+    it.each`
       line  | character | path
       ${1}  | ${4}      | ${['hello']}
       ${7}  | ${5}      | ${['address', 'street']}

diff --git a/src/__tests__/getLocationForJsonPath.spec.ts b/src/__tests__/getLocationForJsonPath.spec.ts
@@ -1,5 +1,6 @@
 import * as fs from 'fs';
 import { join } from 'path';
+
 import { getLocationForJsonPath } from '../getLocationForJsonPath';
 import { parseWithPointers } from '../parseWithPointers';
 
@@ -13,7 +14,7 @@ describe('getLocationForJsonPath', () => {
   describe('pet store fixture', () => {
     const result = parseWithPointers(petStore);
 
-    test.each`
+    it.each`
       start       | end        | path                                   | closest
       ${[8, 21]}  | ${[8, 41]} | ${['info', 'contact', 'email']}        | ${false}
       ${[8, 21]}  | ${[8, 41]} | ${['info', 'contact', 'email']}        | ${true}
@@ -53,7 +54,7 @@ describe('getLocationForJsonPath', () => {
   describe('simple fixture', () => {
     const result = parseWithPointers(simple);
 
-    test.each`
+    it.each`
       start      | end        | path
       ${[2, 13]} | ${[4, 3]}  | ${['address']}
       ${[3, 14]} | ${[3, 17]} | ${['address', 'street']}
@@ -78,7 +79,7 @@ describe('getLocationForJsonPath', () => {
   describe('users fixture', () => {
     const result = parseWithPointers(users);
 
-    test.each`
+    it.each`
       start       | end        | path
       ${[3, 14]}  | ${[3, 19]} | ${['users', 0, 'name']}
       ${[3, 14]}  | ${[3, 19]} | ${['users', '0', 'name']}
@@ -103,7 +104,7 @@ describe('getLocationForJsonPath', () => {
   describe('one-liner', () => {
     const result = parseWithPointers(`{ "foo": true, "bar": false }`);
 
-    test.each`
+    it.each`
       start      | end        | path
       ${[0, 9]}  | ${[0, 13]} | ${['foo']}
       ${[0, 22]} | ${[0, 27]} | ${['bar']}
@@ -126,7 +127,7 @@ describe('getLocationForJsonPath', () => {
   describe('multiline comments', () => {
     const result = parseWithPointers(multilineComments);
 
-    test.each`
+    it.each`
       start       | end         | path
       ${[1, 11]}  | ${[1, 18]}  | ${['hello']}
       ${[7, 14]}  | ${[7, 17]}  | ${['address', 'street']}
@@ -151,7 +152,7 @@ describe('getLocationForJsonPath', () => {
   describe('todos', () => {
     const result = parseWithPointers(todos);
 
-    test.each`
+    it.each`
       start       | end         | path                                                       | closest
       ${[42, 13]} | ${[73, 7]}  | ${['paths', '/todos/{todoId}', 'get']}                     | ${false}
       ${[42, 13]} | ${[73, 7]}  | ${['paths', '/todos/{todoId}', 'get', 'description']}      | ${true}
@@ -189,7 +190,7 @@ describe('getLocationForJsonPath', () => {
  }
 }`);
 
-    test.each`
+    it.each`
       start      | end       | path                                 | closest
       ${[2, 10]} | ${[4, 4]} | ${['foo', 'bar', 'baz', 'baz-inga']} | ${true}
       ${[]}      | ${[]}     | ${['foo', 'bar', 'baz', 'baz-inga']} | ${false}

diff --git a/src/__tests__/hasRef.spec.ts b/src/__tests__/hasRef.spec.ts
@@ -1,11 +1,11 @@
 import { hasRef } from '../hasRef';
 
 describe('hasRef', () => {
-  test('should return true for object containing property with $ref key and string value', () => {
+  it('should return true for object containing property with $ref key and string value', () => {
     expect(hasRef({ $ref: '' })).toBe(true);
   });
 
-  test('should return false for object not containing property with $ref key and string value', () => {
+  it('should return false for object not containing property with $ref key and string value', () => {
     expect(hasRef({ $ref: null })).toBe(false);
     expect(hasRef({})).toBe(false);
     expect(hasRef({ x: true })).toBe(false);

diff --git a/src/__tests__/isPlainObject.spec.ts b/src/__tests__/isPlainObject.spec.ts
@@ -1,13 +1,13 @@
 import { isPlainObject } from '../isPlainObject';
 
-it('isPlainObject', () => {
-  expect(isPlainObject(new class Foo {}())).toBe(false);
+test('isPlainObject', () => {
+  expect(isPlainObject(new (class Foo {})())).toBe(false);
   expect(isPlainObject([1, 2, 3])).toBe(false);
 
   expect(isPlainObject({ x: 0, y: 0 })).toBe(true);
   expect(isPlainObject(Object.create(null))).toBe(true);
 
-  const a = new class {}();
+  const a = new (class {})();
   a.constructor = Object;
   expect(isPlainObject(a)).toBe(true);
 });
diff --git a/src/__tests__/parseWithPointers.ts b/src/__tests__/parseWithPointers.ts
@@ -1,19 +1,20 @@
 import { DiagnosticSeverity } from '@stoplight/types';
 import * as fs from 'fs';
 import { join } from 'path';
+
 import { parseWithPointers } from '../parseWithPointers';
 
 const simple = fs.readFileSync(join(__dirname, './fixtures/simple.json'), 'utf-8');
 
 describe('json parser', () => {
-  test('parse simple', () => {
+  it('parse simple', () => {
     expect(parseWithPointers(simple)).toMatchSnapshot({
       ast: expect.any(Object),
       lineMap: expect.any(Array),
     });
   });
 
-  test('parse complex', () => {
+  it('parse complex', () => {
     expect(
       parseWithPointers(`{
   "users": [
@@ -40,7 +41,7 @@ describe('json parser', () => {
     });
   });
 
-  test('does not allow comments by default', () => {
+  it('does not allow comments by default', () => {
     expect(
       parseWithPointers(`{
       // a comment
@@ -72,7 +73,7 @@ describe('json parser', () => {
     ]);
   });
 
-  test('does not allow trailing commas by default', () => {
+  it('does not allow trailing commas by default', () => {
     expect(
       parseWithPointers(`{
       "name": "Antti",
@@ -105,7 +106,7 @@ describe('json parser', () => {
   });
 
   describe('fixtures', () => {
-    test.each(['petstore.oas2.json', 'user.jschema.json'])('parses %s', async filename => {
+    it.each(['petstore.oas2.json', 'user.jschema.json'])('parses %s', async filename => {
       expect(
         parseWithPointers((await fs.promises.readFile(join(__dirname, 'fixtures', filename), 'utf-8')) as string),
       ).toMatchSnapshot({
@@ -116,12 +117,11 @@ describe('json parser', () => {
   });
 
   describe('invalid fixtures', () => {
-    test.each(['schema.json', 'characters.json'])('parses %s', async filename => {
+    it.each(['schema.json', 'characters.json'])('parses %s', async filename => {
       expect(
-        parseWithPointers((await fs.promises.readFile(
-          join(__dirname, 'fixtures/invalid', filename),
-          'utf-8',
-        )) as string),
+        parseWithPointers(
+          (await fs.promises.readFile(join(__dirname, 'fixtures/invalid', filename), 'utf-8')) as string,
+        ),
       ).toMatchSnapshot({
         ast: expect.any(Object),
         lineMap: expect.any(Array),
@@ -130,7 +130,7 @@ describe('json parser', () => {
   });
 
   describe('duplicate keys', () => {
-    test('given object with no duplicate keys, does not report any errors', () => {
+    it('given object with no duplicate keys, does not report any errors', () => {
       expect(
         parseWithPointers(
           `{
@@ -181,7 +181,7 @@ describe('json parser', () => {
       ).toEqual([]);
     });
 
-    test('given object containing with duplicate keys, reports them', () => {
+    it('given object containing with duplicate keys, reports them', () => {
       expect(
         parseWithPointers(
           `{
@@ -278,7 +278,7 @@ describe('json parser', () => {
       ]);
     });
 
-    test('generates correct paths for dupes in arrays', () => {
+    it('generates correct paths for dupes in arrays', () => {
       expect(
         parseWithPointers('{ "A": [{}, { "foo": true, "foo": false,\n "foo": 2 }] }', { ignoreDuplicateKeys: false }),
       ).toHaveProperty('diagnostics', [
@@ -313,7 +313,7 @@ describe('json parser', () => {
     });
   });
 
-  test('includes properties with empty string as keys', () => {
+  it('includes properties with empty string as keys', () => {
     expect(parseWithPointers('{ "": [{ "foo": true, "": false }] }')).toHaveProperty('data', {
       '': [{ '': false, foo: true }],
     });
@@ -372,7 +372,9 @@ describe('json parser', () => {
       });
 
       it('does not touch arrays', () => {
-        const { data } = parseWithPointers(`[0, 1, 2]`, { preserveKeyOrder: true });
+        const { data } = parseWithPointers(`[0, 1, 2]`, {
+          preserveKeyOrder: true,
+        });
 
         expect(Object.keys(data)).toEqual(['0', '1', '2']);
         expect(Object.getOwnPropertySymbols(data)).toEqual([]);

diff --git a/src/__tests__/reparentBundleTarget.spec.ts b/src/__tests__/reparentBundleTarget.spec.ts
@@ -1,12 +1,13 @@
 import { reparentBundleTarget } from '../reparentBundleTarget';
 
 describe('reparentBundleTarget', () => {
-  it.each<[string, string]>([['#', '#/components'], ['#/components', '#'], ['#/components/schemas', '#/components']])(
-    'given %p paths, should throw',
-    (from, to) => {
-      expect(reparentBundleTarget.bind(null, {}, from, to)).toThrow();
-    },
-  );
+  it.each<[string, string]>([
+    ['#', '#/components'],
+    ['#/components', '#'],
+    ['#/components/schemas', '#/components'],
+  ])('given %p paths, should throw', (from, to) => {
+    expect(reparentBundleTarget.bind(null, {}, from, to)).toThrow();
+  });
 
   it('should reparent refs', () => {
     const document = {