From 63aacf61943e6dd4f77256d5f0a19eec588094de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=B8=89=E5=92=B2=E6=99=BA=E5=AD=90=20Kevin=20Deng?= Date: Mon, 29 Jan 2024 03:11:30 +0800 Subject: [PATCH] style: respect root prettier config --- packages/compiler-vapor/.prettierrc | 5 ----- packages/compiler-vapor/src/generate.ts | 4 ++-- packages/compiler-vapor/src/generators/directive.ts | 4 ++-- packages/compiler-vapor/src/generators/dom.ts | 6 +++--- packages/compiler-vapor/src/generators/event.ts | 4 ++-- packages/compiler-vapor/src/transform.ts | 10 +++++----- packages/compiler-vapor/src/transforms/vIf.ts | 2 +- packages/runtime-vapor/.prettierrc | 5 ----- packages/runtime-vapor/__tests__/apiWatch.spec.ts | 2 +- packages/runtime-vapor/__tests__/renderWatch.spec.ts | 8 ++++---- packages/runtime-vapor/src/componentProps.ts | 2 +- packages/runtime-vapor/src/directives/vModel.ts | 4 ++-- packages/runtime-vapor/src/errorHandling.ts | 2 +- packages/runtime-vapor/src/if.ts | 2 +- packages/runtime-vapor/src/renderWatch.ts | 2 +- packages/runtime-vapor/src/scheduler.ts | 4 ++-- 16 files changed, 28 insertions(+), 38 deletions(-) delete mode 100644 packages/compiler-vapor/.prettierrc delete mode 100644 packages/runtime-vapor/.prettierrc diff --git a/packages/compiler-vapor/.prettierrc b/packages/compiler-vapor/.prettierrc deleted file mode 100644 index e3b414c7e..000000000 --- a/packages/compiler-vapor/.prettierrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "semi": false, - "singleQuote": true, - "trailingComma": "all" -} diff --git a/packages/compiler-vapor/src/generate.ts b/packages/compiler-vapor/src/generate.ts index 9824925db..6e1b75bec 100644 --- a/packages/compiler-vapor/src/generate.ts +++ b/packages/compiler-vapor/src/generate.ts @@ -291,11 +291,11 @@ export function generate( if (vaporHelpers.size) // TODO: extract import codegen preamble = `import { ${[...vaporHelpers] - .map((h) => `${h} as _${h}`) + .map(h => `${h} as _${h}`) .join(', ')} } from 'vue/vapor';` if (helpers.size) preamble = `import { ${[...helpers] - .map((h) => `${h} as _${h}`) + .map(h => `${h} as _${h}`) .join(', ')} } from 'vue';` if (!isSetupInlined) { diff --git a/packages/compiler-vapor/src/generators/directive.ts b/packages/compiler-vapor/src/generators/directive.ts index 0092f9ed1..f3a1af67a 100644 --- a/packages/compiler-vapor/src/generators/directive.ts +++ b/packages/compiler-vapor/src/generators/directive.ts @@ -21,7 +21,7 @@ export function genWithDirective( // directive pushMulti( ['[', ']', ', '], - ...opers.map((oper) => () => { + ...opers.map(oper => () => { push('[') const { dir, builtin } = oper @@ -73,7 +73,7 @@ export function genWithDirective( function genDirectiveModifiers(modifiers: string[]) { return modifiers .map( - (value) => + value => `${isSimpleIdentifier(value) ? value : JSON.stringify(value)}: true`, ) .join(', ') diff --git a/packages/compiler-vapor/src/generators/dom.ts b/packages/compiler-vapor/src/generators/dom.ts index b6c2440ff..dcc932406 100644 --- a/packages/compiler-vapor/src/generators/dom.ts +++ b/packages/compiler-vapor/src/generators/dom.ts @@ -8,7 +8,7 @@ import type { export function genInsertNode(oper: InsertNodeIRNode, context: CodegenContext) { const { newline, pushFnCall, vaporHelper } = context const elements = ([] as number[]).concat(oper.element) - let element = elements.map((el) => `n${el}`).join(', ') + let element = elements.map(el => `n${el}`).join(', ') if (elements.length > 1) element = `[${element}]` newline() pushFnCall( @@ -28,7 +28,7 @@ export function genPrependNode( pushFnCall( vaporHelper('prepend'), `n${oper.parent}`, - oper.elements.map((el) => `n${el}`).join(', '), + oper.elements.map(el => `n${el}`).join(', '), ) } @@ -38,6 +38,6 @@ export function genAppendNode(oper: AppendNodeIRNode, context: CodegenContext) { pushFnCall( vaporHelper('append'), `n${oper.parent}`, - oper.elements.map((el) => `n${el}`).join(', '), + oper.elements.map(el => `n${el}`).join(', '), ) } diff --git a/packages/compiler-vapor/src/generators/event.ts b/packages/compiler-vapor/src/generators/event.ts index e45fa5889..bec6528e9 100644 --- a/packages/compiler-vapor/src/generators/event.ts +++ b/packages/compiler-vapor/src/generators/event.ts @@ -50,7 +50,7 @@ export function genSetEvent(oper: SetEventIRNode, context: CodegenContext) { }, // 4th arg, gen options !!options.length && - (() => push(`{ ${options.map((v) => `${v}: true`).join(', ')} }`)), + (() => push(`{ ${options.map(v => `${v}: true`).join(', ')} }`)), ) function genEventHandler(context: CodegenContext) { @@ -83,5 +83,5 @@ export function genSetEvent(oper: SetEventIRNode, context: CodegenContext) { } function genArrayExpression(elements: string[]) { - return `[${elements.map((it) => JSON.stringify(it)).join(', ')}]` + return `[${elements.map(it => JSON.stringify(it)).join(', ')}]` } diff --git a/packages/compiler-vapor/src/transform.ts b/packages/compiler-vapor/src/transform.ts index 77f96668f..b5f66c1ca 100644 --- a/packages/compiler-vapor/src/transform.ts +++ b/packages/compiler-vapor/src/transform.ts @@ -145,7 +145,7 @@ function createRootContext( ) { return this.registerOperation(...operations) } - const existing = this.block.effect.find((e) => + const existing = this.block.effect.find(e => isSameExpression(e.expressions, expressions as IRExpression[]), ) if (existing) { @@ -174,7 +174,7 @@ function createRootContext( registerTemplate() { let templateNode: TemplateFactoryIRNode | FragmentFactoryIRNode - const existing = root.template.findIndex((t) => + const existing = root.template.findIndex(t => this.template ? t.type === IRNodeTypes.TEMPLATE_FACTORY && t.template === this.template @@ -356,7 +356,7 @@ function processDynamicChildren(ctx: TransformContext) { ctx.registerOperation({ type: IRNodeTypes.INSERT_NODE, loc: node.loc, - element: prevChildren.map((child) => child.id!), + element: prevChildren.map(child => child.id!), parent: ctx.reference(), anchor, }) @@ -364,7 +364,7 @@ function processDynamicChildren(ctx: TransformContext) { ctx.registerOperation({ type: IRNodeTypes.PREPEND_NODE, loc: node.loc, - elements: prevChildren.map((child) => child.id!), + elements: prevChildren.map(child => child.id!), parent: ctx.reference(), }) } @@ -380,7 +380,7 @@ function processDynamicChildren(ctx: TransformContext) { ctx.registerOperation({ type: IRNodeTypes.APPEND_NODE, loc: node.loc, - elements: prevChildren.map((child) => child.id!), + elements: prevChildren.map(child => child.id!), parent: ctx.reference(), }) } diff --git a/packages/compiler-vapor/src/transforms/vIf.ts b/packages/compiler-vapor/src/transforms/vIf.ts index f89727556..90d4a8c93 100644 --- a/packages/compiler-vapor/src/transforms/vIf.ts +++ b/packages/compiler-vapor/src/transforms/vIf.ts @@ -72,7 +72,7 @@ export function createIfBranch( children: [ extend({}, node, { props: node.props.filter( - (p) => p.type !== NodeTypes.DIRECTIVE && p.name !== 'if', + p => p.type !== NodeTypes.DIRECTIVE && p.name !== 'if', ), } as TemplateChildNode), ], diff --git a/packages/runtime-vapor/.prettierrc b/packages/runtime-vapor/.prettierrc deleted file mode 100644 index e3b414c7e..000000000 --- a/packages/runtime-vapor/.prettierrc +++ /dev/null @@ -1,5 +0,0 @@ -{ - "semi": false, - "singleQuote": true, - "trailingComma": "all" -} diff --git a/packages/runtime-vapor/__tests__/apiWatch.spec.ts b/packages/runtime-vapor/__tests__/apiWatch.spec.ts index 228c59cb2..bead393ab 100644 --- a/packages/runtime-vapor/__tests__/apiWatch.spec.ts +++ b/packages/runtime-vapor/__tests__/apiWatch.spec.ts @@ -16,7 +16,7 @@ describe('watchEffect and onEffectCleanup', () => { scope.run(() => { source = ref(0) - watchEffect((onCleanup) => { + watchEffect(onCleanup => { source.value onCleanup(() => (dummy += 2)) diff --git a/packages/runtime-vapor/__tests__/renderWatch.spec.ts b/packages/runtime-vapor/__tests__/renderWatch.spec.ts index 9a48df5c5..c648d184e 100644 --- a/packages/runtime-vapor/__tests__/renderWatch.spec.ts +++ b/packages/runtime-vapor/__tests__/renderWatch.spec.ts @@ -114,7 +114,7 @@ describe('renderWatch', () => { return { source, change, renderSource, changeRender } }, // render - (_ctx) => { + _ctx => { // Render Watch API renderEffect(() => { const current = _ctx.renderSource @@ -123,7 +123,7 @@ describe('renderWatch', () => { }) renderWatch( () => _ctx.renderSource, - (value) => { + value => { calls.push(`renderWatch ${value}`) onEffectCleanup(() => calls.push(`renderWatch cleanup ${value}`)) }, @@ -175,7 +175,7 @@ describe('renderWatch', () => { return { source, update } }, // render - (ctx) => { + ctx => { renderEffect(() => { ctx.source }) @@ -206,7 +206,7 @@ describe('renderWatch', () => { return { source, update } }, // render - (ctx) => { + ctx => { renderEffect(() => { ctx.source }) diff --git a/packages/runtime-vapor/src/componentProps.ts b/packages/runtime-vapor/src/componentProps.ts index 18f51a568..7b77f55bc 100644 --- a/packages/runtime-vapor/src/componentProps.ts +++ b/packages/runtime-vapor/src/componentProps.ts @@ -259,7 +259,7 @@ function getTypeIndex( expectedTypes: PropType | void | null | true, ): number { if (isArray(expectedTypes)) { - return expectedTypes.findIndex((t) => isSameType(t, type)) + return expectedTypes.findIndex(t => isSameType(t, type)) } else if (isFunction(expectedTypes)) { return isSameType(expectedTypes, type) ? 0 : -1 } diff --git a/packages/runtime-vapor/src/directives/vModel.ts b/packages/runtime-vapor/src/directives/vModel.ts index 811ef1015..2ce4ce5b6 100644 --- a/packages/runtime-vapor/src/directives/vModel.ts +++ b/packages/runtime-vapor/src/directives/vModel.ts @@ -11,7 +11,7 @@ function getModelAssigner( ): AssignerFn { const metadata = instance.metadata.get(el)! const fn: any = metadata.props['onUpdate:modelValue'] - return isArray(fn) ? (value) => invokeArrayFns(fn, value) : fn + return isArray(fn) ? value => invokeArrayFns(fn, value) : fn } function onCompositionStart(e: Event) { @@ -38,7 +38,7 @@ export const vModelText: ObjectDirective< assignKeyMap.set(el, assigner) const castToNumber = number // || (vnode.props && vnode.props.type === 'number') - on(el, lazy ? 'change' : 'input', (e) => { + on(el, lazy ? 'change' : 'input', e => { if ((e.target as any).composing) return let domValue: string | number = el.value if (trim) { diff --git a/packages/runtime-vapor/src/errorHandling.ts b/packages/runtime-vapor/src/errorHandling.ts index fa3954280..53a5e5507 100644 --- a/packages/runtime-vapor/src/errorHandling.ts +++ b/packages/runtime-vapor/src/errorHandling.ts @@ -95,7 +95,7 @@ export function callWithAsyncErrorHandling( if (isFunction(fn)) { const res = callWithErrorHandling(fn, instance, type, args) if (res && isPromise(res)) { - res.catch((err) => { + res.catch(err => { handleError(err, instance, type) }) } diff --git a/packages/runtime-vapor/src/if.ts b/packages/runtime-vapor/src/if.ts index 24f4455a0..a5072ed72 100644 --- a/packages/runtime-vapor/src/if.ts +++ b/packages/runtime-vapor/src/if.ts @@ -22,7 +22,7 @@ export const createIf = ( renderWatch( () => !!condition(), - (value) => { + value => { parent ||= anchor.parentNode if ((branch = value ? b1 : b2)) { let scope = effectScope() diff --git a/packages/runtime-vapor/src/renderWatch.ts b/packages/runtime-vapor/src/renderWatch.ts index d6943e4d4..793fff612 100644 --- a/packages/runtime-vapor/src/renderWatch.ts +++ b/packages/runtime-vapor/src/renderWatch.ts @@ -74,7 +74,7 @@ function doWatch( const createMiddleware = (instance: ComponentInternalInstance | null): BaseWatchMiddleware => - (next) => { + next => { let value: unknown // with lifecycle if (instance && instance.isMounted) { diff --git a/packages/runtime-vapor/src/scheduler.ts b/packages/runtime-vapor/src/scheduler.ts index a5e8f1fd1..758e9d30d 100644 --- a/packages/runtime-vapor/src/scheduler.ts +++ b/packages/runtime-vapor/src/scheduler.ts @@ -189,7 +189,7 @@ export const createVaporSyncScheduler: SchedulerFactory = } export const createVaporPreScheduler: SchedulerFactory = - (instance) => (job, effect, isInit) => { + instance => (job, effect, isInit) => { if (isInit) { effect.run() } else { @@ -200,7 +200,7 @@ export const createVaporPreScheduler: SchedulerFactory = } export const createVaporRenderingScheduler: SchedulerFactory = - (instance) => (job, effect, isInit) => { + instance => (job, effect, isInit) => { if (isInit) { effect.run() } else {