Skip to content

Commit

Permalink
linter
Browse files Browse the repository at this point in the history
  • Loading branch information
pyramation committed May 25, 2024
1 parent f2e3717 commit c90d2c1
Show file tree
Hide file tree
Showing 33 changed files with 820 additions and 744 deletions.
14 changes: 12 additions & 2 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,18 @@
"ecmaVersion": "latest",
"sourceType": "module"
},
"plugins": ["@typescript-eslint", "simple-import-sort", "unused-imports"],
"plugins": [
"@typescript-eslint",
"simple-import-sort",
"unused-imports"
],
"rules": {
"indent": [
"error",
2
],
"quotes": ["error", "single", { "avoidEscape": true, "allowTemplateLiterals": true }],
"quote-props": ["error", "as-needed"],
"simple-import-sort/imports": 1,
"simple-import-sort/exports": 1,
"unused-imports/no-unused-imports": 1,
Expand All @@ -36,4 +46,4 @@
"no-implicit-globals": 0,
"@typescript-eslint/no-unsafe-declaration-merging": 0
}
}
}
1 change: 1 addition & 0 deletions .prettierrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
"trailingComma": "es5",
"tabWidth": 2,
"semi": true,
"useTabs": false,
"singleQuote": false
}
1 change: 1 addition & 0 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
"scripts": {
"clean": "lerna run clean",
"build": "lerna run build --stream",
"lint": "lerna run lint --parallel",
"symlink": "symlink-workspace --logLevel error",
"postinstall": "yarn symlink"
},
Expand Down
30 changes: 15 additions & 15 deletions packages/cli/jest.config.js
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
/** @type {import('ts-jest').JestConfigWithTsJest} */
module.exports = {
preset: "ts-jest",
testEnvironment: "node",
transform: {
"^.+\\.tsx?$": [
"ts-jest",
{
babelConfig: false,
tsconfig: "tsconfig.json",
},
],
},
transformIgnorePatterns: [`/node_modules/*`],
testRegex: "(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
moduleFileExtensions: ["ts", "tsx", "js", "jsx", "json", "node"],
modulePathIgnorePatterns: ["dist/*"]
preset: 'ts-jest',
testEnvironment: 'node',
transform: {
'^.+\\.tsx?$': [
'ts-jest',
{
babelConfig: false,
tsconfig: 'tsconfig.json',
},
],
},
transformIgnorePatterns: [`/node_modules/*`],
testRegex: '(/__tests__/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$',
moduleFileExtensions: ['ts', 'tsx', 'js', 'jsx', 'json', 'node'],
modulePathIgnorePatterns: ['dist/*']
};
1 change: 1 addition & 0 deletions packages/cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
"clean": "rimraf dist/**",
"prepare": "npm run build",
"build": "npm run clean; tsc; tsc -p tsconfig.esm.json; npm run copy",
"lint": "eslint . --fix",
"test": "jest",
"test:watch": "jest --watch"
},
Expand Down
132 changes: 66 additions & 66 deletions packages/schema-sdk/__tests__/openapi.generate.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,76 +5,76 @@ import schema from '../../../__fixtures__/openapi/swagger.json';
import { generateOpenApiClient } from '../src/openapi';

it('swagger', () => {
const options = getDefaultSchemaTSOptions({
// include: [
// '*.v1.*'
// ],
exclude: [
'*.v1beta1.*',
'*.v2beta1.*',
'io.k8s.api.events.v1.EventSeries',
'io.k8s.api.events.v1.Event',
'io.k8s.api.flowcontrol*'
]
})
const code = generateOpenApiClient({
...options,
// version: 'v1',
paths: {
exclude: [
'*flowschema*',
'*v1beta1*',
'*v2beta1*'
],
excludeRequests: [
'head',
'options'
],
excludeTags: [
'storage_v1beta1',
'*v1beta1',
'*v2beta1',
'*v1beta1*',
'*v2beta1*'
]
},
includeTypeComments: true,
includeMethodComments: true,
mergedParams: false,
namingStrategy: {
useLastSegment: true,
renameMap: {
'io.k8s.api.discovery.v1.EndpointPort': 'DiscoveryEndpointPort',
'io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.ServiceReference': 'ApiExtServiceReference',
'io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.WebhookClientConfig': 'ApiExtWebhookClientConfig',
'io.k8s.api.admissionregistration.v1.ServiceReference': 'AdmissionServiceReference'
}
}
}, schema as any);
expect(code).toMatchSnapshot();
writeFileSync(__dirname + '/../../../__fixtures__/output/swagger-client.ts', code);
const options = getDefaultSchemaTSOptions({
// include: [
// '*.v1.*'
// ],
exclude: [
'*.v1beta1.*',
'*.v2beta1.*',
'io.k8s.api.events.v1.EventSeries',
'io.k8s.api.events.v1.Event',
'io.k8s.api.flowcontrol*'
]
})
const code = generateOpenApiClient({
...options,
// version: 'v1',
paths: {
exclude: [
'*flowschema*',
'*v1beta1*',
'*v2beta1*'
],
excludeRequests: [
'head',
'options'
],
excludeTags: [
'storage_v1beta1',
'*v1beta1',
'*v2beta1',
'*v1beta1*',
'*v2beta1*'
]
},
includeTypeComments: true,
includeMethodComments: true,
mergedParams: false,
namingStrategy: {
useLastSegment: true,
renameMap: {
'io.k8s.api.discovery.v1.EndpointPort': 'DiscoveryEndpointPort',
'io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.ServiceReference': 'ApiExtServiceReference',
'io.k8s.apiextensions-apiserver.pkg.apis.apiextensions.v1.WebhookClientConfig': 'ApiExtWebhookClientConfig',
'io.k8s.api.admissionregistration.v1.ServiceReference': 'AdmissionServiceReference'
}
}
}, schema as any);
expect(code).toMatchSnapshot();
writeFileSync(__dirname + '/../../../__fixtures__/output/swagger-client.ts', code);
});

it('merged', () => {
const options = getDefaultSchemaTSOptions({
// include: [
// '*.v1.*'
// ],
includeMethodComments: true,
namingStrategy: {
useLastSegment: true
}
})
const code = generateOpenApiClient({
...options,
version: 'v1',
mergedParams: true
}, schema as any);
expect(code).toMatchSnapshot();
writeFileSync(__dirname + '/../../../__fixtures__/output/swagger-client.merged.ts', code);
const options = getDefaultSchemaTSOptions({
// include: [
// '*.v1.*'
// ],
includeMethodComments: true,
namingStrategy: {
useLastSegment: true
}
})
const code = generateOpenApiClient({
...options,
version: 'v1',
mergedParams: true
}, schema as any);
expect(code).toMatchSnapshot();
writeFileSync(__dirname + '/../../../__fixtures__/output/swagger-client.merged.ts', code);
});

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

0 comments on commit c90d2c1

Please sign in to comment.