Skip to content

Commit f2f4581

Browse files
dderevjanikdderevjanik
committed
Eslint fix
1 parent 152307b commit f2f4581

File tree

5 files changed

+71
-33
lines changed

5 files changed

+71
-33
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
"dist": "tsc",
2222
"build": "tsc",
2323
"lint": "eslint ./src",
24-
"lint:fix": "eslint --write ./src"
24+
"lint:fix": "eslint --fix ./src"
2525
},
2626
"repository": {
2727
"type": "git",

‎src/cli.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ const conf = yargs(process.argv.slice(2))
3333
})
3434
.option("caseInsensitiveNames", {
3535
type: "boolean",
36-
description: "Case-insensitive name while parsing definition names"
36+
description: "Case-insensitive name while parsing definition names",
3737
})
3838
.option("maxRecursiveDefinitionName", {
3939
type: "number",
@@ -79,7 +79,7 @@ if (conf["no-color"] || process.env.NO_COLOR) {
7979
}
8080

8181
if (conf.verbose || process.env.DEBUG) {
82-
options.verbose = true;
82+
options.verbose = true;
8383
}
8484

8585
if (conf.quiet) {

‎src/generator.ts‎

Lines changed: 43 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -14,22 +14,26 @@ import { Logger } from "./utils/logger";
1414

1515
export interface GeneratorOptions {
1616
emitDefinitionsOnly: boolean;
17-
modelPropertyNaming: ModelPropertyNaming
17+
modelPropertyNaming: ModelPropertyNaming;
1818
}
1919

2020
const defaultOptions: GeneratorOptions = {
2121
emitDefinitionsOnly: false,
22-
modelPropertyNaming: null
22+
modelPropertyNaming: null,
2323
};
2424

2525
/**
2626
* To avoid duplicated imports
2727
*/
28-
function addSafeImport(imports: OptionalKind<ImportDeclarationStructure>[], moduleSpecifier: string, namedImport: string) {
29-
if (!imports.find(imp => imp.moduleSpecifier == moduleSpecifier)) {
28+
function addSafeImport(
29+
imports: OptionalKind<ImportDeclarationStructure>[],
30+
moduleSpecifier: string,
31+
namedImport: string
32+
) {
33+
if (!imports.find((imp) => imp.moduleSpecifier == moduleSpecifier)) {
3034
imports.push({
31-
moduleSpecifier,
32-
namedImports: [{ name: namedImport }]
35+
moduleSpecifier,
36+
namedImports: [{ name: namedImport }],
3337
});
3438
}
3539
}
@@ -39,7 +43,7 @@ const incorrectPropNameChars = [" ", "-", "."];
3943
* This is temporally method to fix this issue https://github.com/dsherret/ts-morph/issues/1160
4044
*/
4145
function sanitizePropName(propName: string) {
42-
if (incorrectPropNameChars.some(char => propName.includes(char))) {
46+
if (incorrectPropNameChars.some((char) => propName.includes(char))) {
4347
return `"${propName}"`;
4448
}
4549
return propName;
@@ -80,7 +84,7 @@ function generateDefinitionFile(
8084
const definitionImports: OptionalKind<ImportDeclarationStructure>[] = [];
8185
const definitionProperties: PropertySignatureStructure[] = [];
8286
for (const prop of definition.properties) {
83-
if(options.modelPropertyNaming) {
87+
if (options.modelPropertyNaming) {
8488
switch (options.modelPropertyNaming) {
8589
case ModelPropertyNaming.camelCase:
8690
prop.name = camelcase(prop.name);
@@ -100,7 +104,7 @@ function generateDefinitionFile(
100104
generateDefinitionFile(project, prop.ref, defDir, [...stack, prop.ref.name], generated, options);
101105
}
102106
// If a property is of the same type as its parent type, don't add import
103-
if(prop.ref.name !== definition.name) {
107+
if (prop.ref.name !== definition.name) {
104108
addSafeImport(definitionImports, `./${prop.ref.name}`, prop.ref.name);
105109
}
106110
definitionProperties.push(createProperty(prop.name, prop.ref.name, prop.sourceName, prop.isArray));
@@ -122,10 +126,14 @@ function generateDefinitionFile(
122126
defFile.saveSync();
123127
}
124128

125-
export async function generate(parsedWsdl: ParsedWsdl, outDir: string, options: Partial<GeneratorOptions>): Promise<void> {
129+
export async function generate(
130+
parsedWsdl: ParsedWsdl,
131+
outDir: string,
132+
options: Partial<GeneratorOptions>
133+
): Promise<void> {
126134
const mergedOptions: GeneratorOptions = {
127135
...defaultOptions,
128-
...options
136+
...options,
129137
};
130138
const project = new Project();
131139

@@ -167,9 +175,17 @@ export async function generate(parsedWsdl: ParsedWsdl, outDir: string, options:
167175
allDefinitions,
168176
mergedOptions
169177
);
170-
addSafeImport(clientImports, `./definitions/${method.paramDefinition.name}`, method.paramDefinition.name);
178+
addSafeImport(
179+
clientImports,
180+
`./definitions/${method.paramDefinition.name}`,
181+
method.paramDefinition.name
182+
);
171183
}
172-
addSafeImport(portImports, `../definitions/${method.paramDefinition.name}`, method.paramDefinition.name);
184+
addSafeImport(
185+
portImports,
186+
`../definitions/${method.paramDefinition.name}`,
187+
method.paramDefinition.name
188+
);
173189
}
174190
if (method.returnDefinition !== null) {
175191
if (!allDefinitions.includes(method.returnDefinition)) {
@@ -182,9 +198,17 @@ export async function generate(parsedWsdl: ParsedWsdl, outDir: string, options:
182198
allDefinitions,
183199
mergedOptions
184200
);
185-
addSafeImport(clientImports, `./definitions/${method.returnDefinition.name}`, method.returnDefinition.name);
201+
addSafeImport(
202+
clientImports,
203+
`./definitions/${method.returnDefinition.name}`,
204+
method.returnDefinition.name
205+
);
186206
}
187-
addSafeImport(portImports, `../definitions/${method.returnDefinition.name}`, method.returnDefinition.name);
207+
addSafeImport(
208+
portImports,
209+
`../definitions/${method.returnDefinition.name}`,
210+
method.returnDefinition.name
211+
);
188212
}
189213
// TODO: Deduplicate PortMethods
190214
allMethods.push(method);
@@ -269,14 +293,16 @@ export async function generate(parsedWsdl: ParsedWsdl, outDir: string, options:
269293
properties: clientServices,
270294
extends: ["SoapClient"],
271295
methods: allMethods.map<OptionalKind<MethodSignatureStructure>>((method) => ({
272-
name: sanitizePropName(`${(method.name)}Async`),
296+
name: sanitizePropName(`${method.name}Async`),
273297
parameters: [
274298
{
275299
name: camelcase(method.paramName),
276300
type: method.paramDefinition ? method.paramDefinition.name : "{}",
277301
},
278302
],
279-
returnType: `Promise<[result: ${method.returnDefinition ? method.returnDefinition.name : "unknown"}, rawResponse: any, soapHeader: any, rawRequest: any]>`,
303+
returnType: `Promise<[result: ${
304+
method.returnDefinition ? method.returnDefinition.name : "unknown"
305+
}, rawResponse: any, soapHeader: any, rawRequest: any]>`,
280306
})),
281307
},
282308
]);

‎src/index.ts‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ export { generate } from "./generator";
88
export { parseWsdl } from "./parser";
99

1010
export enum ModelPropertyNaming {
11-
'camelCase' = 'camelCase',
12-
'PascalCase' = 'PascalCase'
11+
"camelCase" = "camelCase",
12+
"PascalCase" = "PascalCase",
1313
}
1414
export interface Options {
1515
/**
@@ -34,10 +34,10 @@ export interface Options {
3434
caseInsensitiveNames: boolean;
3535
/**
3636
* Maximum count of definition's with same name but increased suffix. Will throw an error if exceed
37-
* @default 64
37+
* @default 64
3838
*/
3939
maxRecursiveDefinitionName: number;
40-
modelPropertyNaming: ModelPropertyNaming
40+
modelPropertyNaming: ModelPropertyNaming;
4141
/**
4242
* Print verbose logs
4343
* @default false
@@ -61,11 +61,11 @@ export const defaultOptions: Options = {
6161
modelNameSuffix: "",
6262
caseInsensitiveNames: false,
6363
maxRecursiveDefinitionName: 64,
64-
modelPropertyNaming: null
64+
modelPropertyNaming: null,
6565
//
6666
verbose: false,
6767
quiet: false,
68-
colors: true
68+
colors: true,
6969
};
7070

7171
export async function parseAndGenerate(

‎src/models/parsed-wsdl.ts‎

Lines changed: 19 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -85,8 +85,8 @@ export interface Options {
8585
const defaultOptions: Options = {
8686
caseInsensitiveNames: false,
8787
maxStack: 64,
88-
maxStackWarn: 32
89-
}
88+
maxStackWarn: 32,
89+
};
9090

9191
export class ParsedWsdl {
9292
/**
@@ -110,7 +110,7 @@ export class ParsedWsdl {
110110
constructor(options: Partial<Options>) {
111111
this._options = {
112112
...defaultOptions,
113-
...options
113+
...options,
114114
};
115115
this._warns = [];
116116
}
@@ -128,20 +128,32 @@ export class ParsedWsdl {
128128
findNonCollisionDefinitionName(defName: string): string {
129129
const definitionName = sanitizeFilename(defName);
130130
const isInSensitive = this._options.caseInsensitiveNames;
131-
131+
132132
const defNameToCheck = isInSensitive ? definitionName.toLowerCase() : definitionName;
133-
if (!this.definitions.find((def) => isInSensitive ? (def.name.toLowerCase() === defNameToCheck) : (def.name === defNameToCheck))) {
133+
if (
134+
!this.definitions.find((def) =>
135+
isInSensitive ? def.name.toLowerCase() === defNameToCheck : def.name === defNameToCheck
136+
)
137+
) {
134138
return definitionName;
135139
}
136140
for (let i = 1; i < this._options.maxStack; i++) {
137-
if (!this.definitions.find((def) => isInSensitive ? (def.name.toLowerCase() === `${defNameToCheck}${i}`.toLowerCase()) : (def.name === `${defNameToCheck}${i}`))) {
141+
if (
142+
!this.definitions.find((def) =>
143+
isInSensitive
144+
? def.name.toLowerCase() === `${defNameToCheck}${i}`.toLowerCase()
145+
: def.name === `${defNameToCheck}${i}`
146+
)
147+
) {
138148
return `${definitionName}${i}`;
139149
}
140150
if (i == this._options.maxStackWarn && !this._warns.includes(definitionName)) {
141151
Logger.warn(`Too many definitions with same name "${definitionName}"`);
142152
this._warns.push(definitionName);
143153
}
144154
}
145-
throw new Error(`Out of stack (${this._options.maxStack}) for "${definitionName}", there's probably cyclic definition. You can also try to increase maxStack with --TODO option`);
155+
throw new Error(
156+
`Out of stack (${this._options.maxStack}) for "${definitionName}", there's probably cyclic definition. You can also try to increase maxStack with --TODO option`
157+
);
146158
}
147159
}

0 commit comments

Comments
 (0)