Skip to content

Commit 7be6d37

Browse files
github-actions[bot]github-actions[bot]
committed
ci(lint): auto-fix
1 parent 3b481a5 commit 7be6d37

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+732
-366
lines changed

‎extensions/vscode/index.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,4 +221,5 @@ try {
221221
if (tsExtension.isActive) {
222222
vscode.commands.executeCommand('workbench.action.restartExtensionHost');
223223
}
224-
} catch {}
224+
}
225+
catch {}

‎packages/component-meta/lib/base.ts

Lines changed: 30 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -105,17 +105,20 @@ export function baseCreate(
105105

106106
if (fileName === globalComponentName) {
107107
snapshot = globalComponentSnapshot;
108-
} else if (isMetaFileName(fileName)) {
108+
}
109+
else if (isMetaFileName(fileName)) {
109110
if (!metaSnapshots.has(fileName)) {
110111
metaSnapshots.set(fileName, ts.ScriptSnapshot.fromString(getMetaScriptContent(fileName)));
111112
}
112113
snapshot = metaSnapshots.get(fileName);
113-
} else {
114+
}
115+
else {
114116
if (!scriptSnapshots.has(fileName)) {
115117
const fileText = ts.sys.readFile(fileName);
116118
if (fileText !== undefined) {
117119
scriptSnapshots.set(fileName, ts.ScriptSnapshot.fromString(fileText));
118-
} else {
120+
}
121+
else {
119122
scriptSnapshots.set(fileName, undefined);
120123
}
121124
}
@@ -124,7 +127,8 @@ export function baseCreate(
124127

125128
if (snapshot) {
126129
language.scripts.set(fileName, snapshot);
127-
} else {
130+
}
131+
else {
128132
language.scripts.delete(fileName);
129133
}
130134
},
@@ -499,7 +503,8 @@ function createSchemaResolvers(
499503
if (typeof result === 'boolean') {
500504
return result;
501505
}
502-
} else if (name === item) {
506+
}
507+
else if (name === item) {
503508
return true;
504509
}
505510
}
@@ -588,7 +593,8 @@ function createSchemaResolvers(
588593
if ((call.parameters[1].valueDeclaration as any)?.dotDotDotToken) {
589594
subtypeStr = getFullyQualifiedName(subtype);
590595
getSchema = () => typeChecker.getTypeArguments(subtype! as ts.TypeReference).map(resolveSchema);
591-
} else {
596+
}
597+
else {
592598
subtypeStr = '[';
593599
for (let i = 1; i < call.parameters.length; i++) {
594600
subtypeStr += getFullyQualifiedName(typeChecker.getTypeOfSymbolAtLocation(call.parameters[i], symbolNode))
@@ -658,7 +664,8 @@ function createSchemaResolvers(
658664
return schema ??= subtype.types.map(resolveSchema);
659665
},
660666
};
661-
} else if (typeChecker.isArrayLikeType(subtype)) {
667+
}
668+
else if (typeChecker.isArrayLikeType(subtype)) {
662669
let schema: PropertyMetaSchema[];
663670
return {
664671
kind: 'array',
@@ -667,7 +674,8 @@ function createSchemaResolvers(
667674
return schema ??= typeChecker.getTypeArguments(subtype as ts.TypeReference).map(resolveSchema);
668675
},
669676
};
670-
} else if (
677+
}
678+
else if (
671679
subtype.getCallSignatures().length === 0
672680
&& (subtype.isClassOrInterface() || subtype.isIntersection()
673681
|| (subtype as ts.ObjectType).objectFlags & ts.ObjectFlags.Anonymous)
@@ -680,7 +688,8 @@ function createSchemaResolvers(
680688
return schema ??= subtype.getProperties().map(resolveNestedProperties).reduce(reducer, {});
681689
},
682690
};
683-
} else if (subtype.getCallSignatures().length === 1) {
691+
}
692+
else if (subtype.getCallSignatures().length === 1) {
684693
return resolveCallbackSchema(subtype.getCallSignatures()[0]);
685694
}
686695

@@ -777,15 +786,17 @@ function readVueComponentDefaultProps(
777786
}
778787
}
779788
}
780-
} else if (scriptSetupRanges?.defineProps?.argNode) {
789+
}
790+
else if (scriptSetupRanges?.defineProps?.argNode) {
781791
const obj = findObjectLiteralExpression(scriptSetupRanges.defineProps.argNode);
782792
if (obj) {
783793
result = {
784794
...result,
785795
...resolvePropsOption(ast, obj, printer, ts),
786796
};
787797
}
788-
} else if (scriptSetupRanges?.defineProps?.destructured) {
798+
}
799+
else if (scriptSetupRanges?.defineProps?.destructured) {
789800
for (const [name, initializer] of scriptSetupRanges.defineProps.destructured) {
790801
if (initializer) {
791802
const expText = printer?.printNode(ts.EmitHint.Expression, initializer, ast) ?? initializer.getText(ast);
@@ -858,7 +869,8 @@ function readTsComponentDefaultProps(
858869
result = child.expression;
859870
}
860871
});
861-
} else {
872+
}
873+
else {
862874
ast.forEachChild(child => {
863875
if (
864876
ts.isVariableStatement(child)
@@ -883,7 +895,8 @@ function readTsComponentDefaultProps(
883895
// export default { ... }
884896
if (ts.isObjectLiteralExpression(component)) {
885897
return component;
886-
} // export default defineComponent({ ... })
898+
}
899+
// export default defineComponent({ ... })
887900
else if (ts.isCallExpression(component)) {
888901
if (component.arguments.length) {
889902
const arg = component.arguments[0];
@@ -972,9 +985,11 @@ function resolveDefaultOptionExpression(
972985
if (ts.isArrowFunction(_default)) {
973986
if (ts.isBlock(_default.body)) {
974987
return _default; // TODO
975-
} else if (ts.isParenthesizedExpression(_default.body)) {
988+
}
989+
else if (ts.isParenthesizedExpression(_default.body)) {
976990
return _default.body.expression;
977-
} else {
991+
}
992+
else {
978993
return _default.body;
979994
}
980995
}

‎packages/language-core/lib/codegen/script/component.ts

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ export function* generateComponent(
2323
codeFeatures.all,
2424
);
2525
yield `{${newLine}`;
26-
} else {
26+
}
27+
else {
2728
yield `(await import('${options.vueCompilerOptions.lib}')).defineComponent({${newLine}`;
2829
}
2930

@@ -92,14 +93,16 @@ export function* generateEmitsOption(
9293
optionCodes.push(`{} as __VLS_NormalizeEmits<typeof ${name ?? '__VLS_emit'}>`);
9394
if (typeArg && !hasUnionTypeArg) {
9495
typeOptionCodes.push(`__VLS_Emit`);
95-
} else {
96+
}
97+
else {
9698
typeOptionCodes.length = 0;
9799
}
98100
}
99101

100102
if (options.vueCompilerOptions.target >= 3.5 && typeOptionCodes.length) {
101103
yield* generateIntersectMerge('__typeEmits', typeOptionCodes);
102-
} else if (optionCodes.length) {
104+
}
105+
else if (optionCodes.length) {
103106
yield* generateSpreadMerge('emits', optionCodes);
104107
}
105108
}
@@ -177,7 +180,8 @@ function* generateSpreadMerge(key: string, codes: Code[]): Generator<Code> {
177180
yield `${key}: `;
178181
if (codes.length === 1) {
179182
yield codes[0];
180-
} else {
183+
}
184+
else {
181185
yield `{${newLine}`;
182186
for (const code of codes) {
183187
yield `...`;

‎packages/language-core/lib/codegen/script/componentSelf.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,9 +62,11 @@ export function* generateComponentSelf(
6262
yield generateSfcBlockSection(options.sfc.script, args.start + 1, args.end - 1, codeFeatures.all);
6363
}
6464
yield `})${endOfLine}`; // defineComponent {
65-
} else if (options.sfc.script) {
65+
}
66+
else if (options.sfc.script) {
6667
yield `let __VLS_self!: typeof import('./${path.basename(options.fileName)}').default${endOfLine}`;
67-
} else {
68+
}
69+
else {
6870
yield `const __VLS_self = (await import('${options.vueCompilerOptions.lib}')).defineComponent({})${endOfLine}`;
6971
}
7072
}

‎packages/language-core/lib/codegen/script/index.ts

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,14 @@ export function* generateScript(options: ScriptCodegenOptions): Generator<Code,
4141
relativePath = './' + relativePath;
4242
}
4343
yield `/// <reference types="${relativePath}" />${newLine}`;
44-
} else {
44+
}
45+
else {
4546
yield `/// <reference types=".vue-global-types/${
4647
getGlobalTypesFileName(options.vueCompilerOptions)
4748
}" />${newLine}`;
4849
}
49-
} else {
50+
}
51+
else {
5052
yield `/* placeholder */${newLine}`;
5153
}
5254

@@ -70,7 +72,8 @@ export function* generateScript(options: ScriptCodegenOptions): Generator<Code,
7072
options.sfc.script.content.length,
7173
codeFeatures.all,
7274
);
73-
} else {
75+
}
76+
else {
7477
yield generateSfcBlockSection(options.sfc.script, 0, options.sfc.script.content.length, codeFeatures.all);
7578
yield* generateScriptSectionPartiallyEnding(
7679
options.sfc.script.name,
@@ -79,7 +82,8 @@ export function* generateScript(options: ScriptCodegenOptions): Generator<Code,
7982
);
8083
yield* generateScriptSetup(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges);
8184
}
82-
} else if (exportDefault && isExportRawObject && options.vueCompilerOptions.optionsWrapper.length) {
85+
}
86+
else if (exportDefault && isExportRawObject && options.vueCompilerOptions.optionsWrapper.length) {
8387
ctx.inlayHints.push({
8488
blockName: options.sfc.script.name,
8589
offset: exportDefault.expression.start,
@@ -114,10 +118,12 @@ export function* generateScript(options: ScriptCodegenOptions): Generator<Code,
114118
options.sfc.script.content.length,
115119
codeFeatures.all,
116120
);
117-
} else if (classBlockEnd !== undefined) {
121+
}
122+
else if (classBlockEnd !== undefined) {
118123
if (options.vueCompilerOptions.skipTemplateCodegen) {
119124
yield generateSfcBlockSection(options.sfc.script, 0, options.sfc.script.content.length, codeFeatures.all);
120-
} else {
125+
}
126+
else {
121127
yield generateSfcBlockSection(options.sfc.script, 0, classBlockEnd, codeFeatures.all);
122128
yield `__VLS_template = () => {${newLine}`;
123129
const templateCodegenCtx = yield* generateTemplate(options, ctx);
@@ -130,15 +136,17 @@ export function* generateScript(options: ScriptCodegenOptions): Generator<Code,
130136
codeFeatures.all,
131137
);
132138
}
133-
} else {
139+
}
140+
else {
134141
yield generateSfcBlockSection(options.sfc.script, 0, options.sfc.script.content.length, codeFeatures.all);
135142
yield* generateScriptSectionPartiallyEnding(
136143
options.sfc.script.name,
137144
options.sfc.script.content.length,
138145
'#3632/script.vue',
139146
);
140147
}
141-
} else if (options.sfc.scriptSetup && options.scriptSetupRanges) {
148+
}
149+
else if (options.sfc.scriptSetup && options.scriptSetupRanges) {
142150
yield* generateScriptSetup(options, ctx, options.sfc.scriptSetup, options.scriptSetupRanges);
143151
}
144152

‎packages/language-core/lib/codegen/script/scriptSetup.ts

Lines changed: 24 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,10 +79,12 @@ export function* generateScriptSetup(
7979
+ `}${endOfLine}`;
8080
yield `})(),${newLine}`; // __VLS_setup = (async () => {
8181
yield `) => ({} as import('${options.vueCompilerOptions.lib}').VNode & { __ctx?: Awaited<typeof __VLS_setup> }))`;
82-
} else if (!options.sfc.script) {
82+
}
83+
else if (!options.sfc.script) {
8384
// no script block, generate script setup code at root
8485
yield* generateSetupFunction(options, ctx, scriptSetup, scriptSetupRanges, 'export default');
85-
} else {
86+
}
87+
else {
8688
if (!options.scriptRanges?.exportDefault) {
8789
yield `export default `;
8890
}
@@ -152,7 +154,8 @@ function* generateSetupFunction(
152154
typeArg.start,
153155
typeArg.end,
154156
]);
155-
} else if (arg) {
157+
}
158+
else if (arg) {
156159
setupCodeModifies.push([
157160
[
158161
`const __VLS_exposed = `,
@@ -166,7 +169,8 @@ function* generateSetupFunction(
166169
arg.start,
167170
arg.end,
168171
]);
169-
} else {
172+
}
173+
else {
170174
setupCodeModifies.push([
171175
[`const __VLS_exposed = {}${endOfLine}`],
172176
callExp.start,
@@ -253,7 +257,8 @@ function* generateSetupFunction(
253257
exp.end,
254258
exp.end,
255259
]);
256-
} else {
260+
}
261+
else {
257262
setupCodeModifies.push([
258263
[`(`],
259264
callExp.start,
@@ -320,7 +325,8 @@ function* generateSetupFunction(
320325
yield endOfLine;
321326
yield `${syntax} `;
322327
yield `{} as ${ctx.localTypes.WithSlots}<typeof __VLS_component, __VLS_Slots>${endOfLine}`;
323-
} else {
328+
}
329+
else {
324330
yield `${syntax} `;
325331
yield* generateComponent(options, ctx, scriptSetup, scriptSetupRanges);
326332
yield endOfLine;
@@ -368,7 +374,8 @@ function* generateDefineWithType(
368374
if (!name) {
369375
if (statement.start === callExp.start && statement.end === callExp.end) {
370376
yield [[`const ${defaultName} = `], callExp.start, callExp.start];
371-
} else if (typeArg) {
377+
}
378+
else if (typeArg) {
372379
yield [
373380
[
374381
`const ${defaultName} = `,
@@ -387,7 +394,8 @@ function* generateDefineWithType(
387394
typeArg.end,
388395
callExp.end,
389396
];
390-
} else {
397+
}
398+
else {
391399
yield [
392400
[
393401
`const ${defaultName} = `,
@@ -494,7 +502,8 @@ function* generateComponentProps(
494502
defineModel.name.start,
495503
codeFeatures.navigation,
496504
);
497-
} else {
505+
}
506+
else {
498507
yield propName;
499508
}
500509

@@ -545,13 +554,16 @@ function* generateDefineModelType(
545554
if (defineModel.type) {
546555
// Infer from defineModel<T>
547556
yield getRangeText(scriptSetup, defineModel.type);
548-
} else if (defineModel.runtimeType && localName) {
557+
}
558+
else if (defineModel.runtimeType && localName) {
549559
// Infer from actual prop declaration code
550560
yield `typeof ${localName}['value']`;
551-
} else if (defineModel.defaultValue && propName) {
561+
}
562+
else if (defineModel.defaultValue && propName) {
552563
// Infer from defineModel({default: T})
553564
yield `typeof __VLS_defaults['${propName}']`;
554-
} else {
565+
}
566+
else {
555567
yield `any`;
556568
}
557569
}

‎packages/language-core/lib/codegen/script/src.ts

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,11 @@ export function* generateSrc(src: SfcBlockAttr): Generator<Code> {
1111

1212
if (text.endsWith('.d.ts')) {
1313
text = text.slice(0, -'.d.ts'.length);
14-
} else if (text.endsWith('.ts')) {
14+
}
15+
else if (text.endsWith('.ts')) {
1516
text = text.slice(0, -'.ts'.length);
16-
} else if (text.endsWith('.tsx')) {
17+
}
18+
else if (text.endsWith('.tsx')) {
1719
text = text.slice(0, -'.tsx'.length) + '.jsx';
1820
}
1921

0 commit comments

Comments
 (0)