Skip to content

Commit c90d2c1

Browse files
committed
linter
1 parent f2e3717 commit c90d2c1

33 files changed

+820
-744
lines changed

.eslintrc.json

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,18 @@
1616
"ecmaVersion": "latest",
1717
"sourceType": "module"
1818
},
19-
"plugins": ["@typescript-eslint", "simple-import-sort", "unused-imports"],
19+
"plugins": [
20+
"@typescript-eslint",
21+
"simple-import-sort",
22+
"unused-imports"
23+
],
2024
"rules": {
25+
"indent": [
26+
"error",
27+
2
28+
],
29+
"quotes": ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": true }],
30+
"quote-props": ["error", "as-needed"],
2131
"simple-import-sort/imports": 1,
2232
"simple-import-sort/exports": 1,
2333
"unused-imports/no-unused-imports": 1,
@@ -36,4 +46,4 @@
3646
"no-implicit-globals": 0,
3747
"@typescript-eslint/no-unsafe-declaration-merging": 0
3848
}
39-
}
49+
}

.prettierrc.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,6 @@
22
"trailingComma": "es5",
33
"tabWidth": 2,
44
"semi": true,
5+
"useTabs": false,
56
"singleQuote": false
67
}

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"scripts": {
1818
"clean": "lerna run clean",
1919
"build": "lerna run build --stream",
20+
"lint": "lerna run lint --parallel",
2021
"symlink": "symlink-workspace --logLevel error",
2122
"postinstall": "yarn symlink"
2223
},

packages/cli/jest.config.js

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
/** @type {import('ts-jest').JestConfigWithTsJest} */
22
module.exports = {
3-
preset: "ts-jest",
4-
testEnvironment: "node",
5-
transform: {
6-
"^.+\\.tsx?$": [
7-
"ts-jest",
8-
{
9-
babelConfig: false,
10-
tsconfig: "tsconfig.json",
11-
},
12-
],
13-
},
14-
transformIgnorePatterns: [`/node_modules/*`],
15-
testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
16-
moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
17-
modulePathIgnorePatterns: ["dist/*"]
3+
preset: 'ts-jest',
4+
testEnvironment: 'node',
5+
transform: {
6+
'^.+\\.tsx?$': [
7+
'ts-jest',
8+
{
9+
babelConfig: false,
10+
tsconfig: 'tsconfig.json',
11+
},
12+
],
13+
},
14+
transformIgnorePatterns: [`/node_modules/*`],
15+
testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$',
16+
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
17+
modulePathIgnorePatterns: ['dist/*']
1818
};

packages/cli/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
"clean": "rimraf dist/**",
2525
"prepare": "npm run build",
2626
"build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
27+
"lint": "eslint . --fix",
2728
"test": "jest",
2829
"test:watch": "jest --watch"
2930
},

packages/schema-sdk/__tests__/openapi.generate.test.ts

Lines changed: 66 additions & 66 deletions
Original file line numberDiff line numberDiff line change
@@ -5,76 +5,76 @@ import schema from '../../../__fixtures__/openapi/swagger.json';
55
import { generateOpenApiClient } from '../src/openapi';
66

77
it('swagger', () => {
8-
const options = getDefaultSchemaTSOptions({
9-
// include: [
10-
// '*.v1.*'
11-
// ],
12-
exclude: [
13-
'*.v1beta1.*',
14-
'*.v2beta1.*',
15-
'io.k8s.api.events.v1.EventSeries',
16-
'io.k8s.api.events.v1.Event',
17-
'io.k8s.api.flowcontrol*'
18-
]
19-
})
20-
const code = generateOpenApiClient({
21-
...options,
22-
// version: 'v1',
23-
paths: {
24-
exclude: [
25-
'*flowschema*',
26-
'*v1beta1*',
27-
'*v2beta1*'
28-
],
29-
excludeRequests: [
30-
'head',
31-
'options'
32-
],
33-
excludeTags: [
34-
'storage_v1beta1',
35-
'*v1beta1',
36-
'*v2beta1',
37-
'*v1beta1*',
38-
'*v2beta1*'
39-
]
40-
},
41-
includeTypeComments: true,
42-
includeMethodComments: true,
43-
mergedParams: false,
44-
namingStrategy: {
45-
useLastSegment: true,
46-
renameMap: {
47-
'io.k8s.api.discovery.v1.EndpointPort': 'DiscoveryEndpointPort',
48-
'io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.ServiceReference': 'ApiExtServiceReference',
49-
'io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.WebhookClientConfig': 'ApiExtWebhookClientConfig',
50-
'io.k8s.api.admissionregistration.v1.ServiceReference': 'AdmissionServiceReference'
51-
}
52-
}
53-
}, schema as any);
54-
expect(code).toMatchSnapshot();
55-
writeFileSync(__dirname + '/../../../__fixtures__/output/swagger-client.ts', code);
8+
const options = getDefaultSchemaTSOptions({
9+
// include: [
10+
// '*.v1.*'
11+
// ],
12+
exclude: [
13+
'*.v1beta1.*',
14+
'*.v2beta1.*',
15+
'io.k8s.api.events.v1.EventSeries',
16+
'io.k8s.api.events.v1.Event',
17+
'io.k8s.api.flowcontrol*'
18+
]
19+
})
20+
const code = generateOpenApiClient({
21+
...options,
22+
// version: 'v1',
23+
paths: {
24+
exclude: [
25+
'*flowschema*',
26+
'*v1beta1*',
27+
'*v2beta1*'
28+
],
29+
excludeRequests: [
30+
'head',
31+
'options'
32+
],
33+
excludeTags: [
34+
'storage_v1beta1',
35+
'*v1beta1',
36+
'*v2beta1',
37+
'*v1beta1*',
38+
'*v2beta1*'
39+
]
40+
},
41+
includeTypeComments: true,
42+
includeMethodComments: true,
43+
mergedParams: false,
44+
namingStrategy: {
45+
useLastSegment: true,
46+
renameMap: {
47+
'io.k8s.api.discovery.v1.EndpointPort': 'DiscoveryEndpointPort',
48+
'io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.ServiceReference': 'ApiExtServiceReference',
49+
'io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.WebhookClientConfig': 'ApiExtWebhookClientConfig',
50+
'io.k8s.api.admissionregistration.v1.ServiceReference': 'AdmissionServiceReference'
51+
}
52+
}
53+
}, schema as any);
54+
expect(code).toMatchSnapshot();
55+
writeFileSync(__dirname + '/../../../__fixtures__/output/swagger-client.ts', code);
5656
});
5757

5858
it('merged', () => {
59-
const options = getDefaultSchemaTSOptions({
60-
// include: [
61-
// '*.v1.*'
62-
// ],
63-
includeMethodComments: true,
64-
namingStrategy: {
65-
useLastSegment: true
66-
}
67-
})
68-
const code = generateOpenApiClient({
69-
...options,
70-
version: 'v1',
71-
mergedParams: true
72-
}, schema as any);
73-
expect(code).toMatchSnapshot();
74-
writeFileSync(__dirname + '/../../../__fixtures__/output/swagger-client.merged.ts', code);
59+
const options = getDefaultSchemaTSOptions({
60+
// include: [
61+
// '*.v1.*'
62+
// ],
63+
includeMethodComments: true,
64+
namingStrategy: {
65+
useLastSegment: true
66+
}
67+
})
68+
const code = generateOpenApiClient({
69+
...options,
70+
version: 'v1',
71+
mergedParams: true
72+
}, schema as any);
73+
expect(code).toMatchSnapshot();
74+
writeFileSync(__dirname + '/../../../__fixtures__/output/swagger-client.merged.ts', code);
7575
});
7676

7777
it('openapi', () => {
78-
const data = Object.keys(schema.definitions)
79-
writeFileSync(__dirname + '/../../../__fixtures__/output/swagger-definitions.json', JSON.stringify(data, null, 2));
78+
const data = Object.keys(schema.definitions)
79+
writeFileSync(__dirname + '/../../../__fixtures__/output/swagger-definitions.json', JSON.stringify(data, null, 2));
8080
});

0 commit comments

Comments
 (0)