refactor: isolatedDeclarations for vapor

Author: sxzz

.github/workflows/ci.yml

@@ -6,6 +6,7 @@ on:
   pull_request:
     branches:
       - main
+      - minor
 
 jobs:
   test:

packages/compiler-core/src/transforms/transformExpression.ts

@@ -44,9 +44,8 @@ import { parseExpression } from '@babel/parser'
 import { IS_REF, UNREF } from '../runtimeHelpers'
 import { BindingTypes } from '../options'
 
-export const isLiteralWhitelisted = /*#__PURE__*/ makeMap(
-  'true,false,null,this',
-)
+export const isLiteralWhitelisted: (key: string) => boolean =
+  /*#__PURE__*/ makeMap('true,false,null,this')
 
 export const transformExpression: NodeTransform = (node, context) => {
   if (node.type === NodeTypes.INTERPOLATION) {

packages/compiler-core/src/transforms/vOn.ts

@@ -16,7 +16,7 @@ import { validateBrowserExpression } from '../validateExpression'
 import { hasScopeRef, isMemberExpression } from '../utils'
 import { TO_HANDLER_KEY } from '../runtimeHelpers'
 
-export const fnExpRE =
+export const fnExpRE: RegExp =
   /^\s*(async\s*)?(\([^)]*?\)|[\w$_]+)\s*(:[^=]+)?=>|^\s*(async\s+)?function(?:\s+[\w$]+)?\s*\(/
 
 export interface VOnDirectiveNode extends DirectiveNode {

packages/compiler-core/src/utils.ts

@@ -158,7 +158,7 @@ export const isMemberExpressionNode: (
   context: Pick<TransformContext, 'expressionPlugins'>,
 ) => boolean = __BROWSER__
   ? (NOOP as any)
-  : (path, context): boolean => {
+  : (path, context) => {
       try {
         let ret: Expression = parseExpression(path, {
           plugins: context.expressionPlugins,
@@ -176,7 +176,7 @@ export const isMemberExpressionNode: (
 
 export const isMemberExpression: (
   path: string,
-  context: TransformContext,
+  context: Pick<TransformContext, 'expressionPlugins'>,
 ) => boolean = __BROWSER__ ? isMemberExpressionBrowser : isMemberExpressionNode
 
 export function advancePositionWithClone(

packages/compiler-dom/src/transforms/vOn.ts

@@ -37,7 +37,11 @@ export const resolveModifiers = (
   modifiers: string[],
   context: TransformContext | null,
   loc: SourceLocation,
-) => {
+): {
+  keyModifiers: string[]
+  nonKeyModifiers: string[]
+  eventOptionModifiers: string[]
+} => {
   const keyModifiers = []
   const nonKeyModifiers = []
   const eventOptionModifiers = []

packages/compiler-vapor/src/generate.ts

@@ -22,8 +22,8 @@ export type CodegenOptions = Omit<BaseCodegenOptions, 'optimizeImports'>
 export class CodegenContext {
   options: Required<CodegenOptions>
 
-  helpers = new Set<string>([])
-  vaporHelpers = new Set<string>([])
+  helpers: Set<string> = new Set<string>([])
+  vaporHelpers: Set<string> = new Set<string>([])
   helper = (name: string) => {
     this.helpers.add(name)
     return `_${name}`
@@ -33,7 +33,7 @@ export class CodegenContext {
     return `_${name}`
   }
 
-  delegates = new Set<string>()
+  delegates: Set<string> = new Set<string>()
 
   identifiers: Record<string, string[]> = Object.create(null)
 
@@ -56,11 +56,11 @@ export class CodegenContext {
   enterBlock(block: BlockIRNode) {
     const parent = this.block
     this.block = block
-    return () => (this.block = parent)
+    return (): BlockIRNode => (this.block = parent)
   }
 
   scopeLevel: number = 0
-  enterScope() {
+  enterScope(): [level: number, exit: () => number] {
     return [this.scopeLevel++, () => this.scopeLevel--] as const
   }
 

packages/compiler-vapor/src/generators/component.ts

@@ -76,7 +76,10 @@ export function genCreateComponent(
   }
 }
 
-export function genRawProps(props: IRProps[], context: CodegenContext) {
+export function genRawProps(
+  props: IRProps[],
+  context: CodegenContext,
+): CodeFragment[] | undefined {
   const { vaporHelper } = context
   const frag = props
     .map(props => {

packages/compiler-vapor/src/generators/directive.ts

@@ -20,7 +20,10 @@ import {
   type WithDirectiveIRNode,
 } from '../ir'
 
-export function genDirectivesForElement(id: number, context: CodegenContext) {
+export function genDirectivesForElement(
+  id: number,
+  context: CodegenContext,
+): CodeFragment[] {
   const dirs = filterDirectives(id, context.block.operation)
   return dirs.length ? genWithDirective(dirs, context) : []
 }
@@ -78,7 +81,7 @@ export function genWithDirective(
   }
 }
 
-export function genDirectiveModifiers(modifiers: string[]) {
+export function genDirectiveModifiers(modifiers: string[]): string {
   return modifiers
     .map(
       value =>

packages/compiler-vapor/src/generators/event.ts

@@ -90,7 +90,7 @@ function genArrayExpression(elements: string[]) {
 export function genEventHandler(
   context: CodegenContext,
   value: SimpleExpressionNode | undefined,
-) {
+): CodeFragment[] {
   if (value && value.content.trim()) {
     const isMemberExp = isMemberExpression(value.content, context.options)
     const isInlineStatement = !(isMemberExp || fnExpRE.test(value.content))

packages/compiler-vapor/src/generators/modelValue.ts

@@ -25,7 +25,7 @@ export function genSetModelValue(
 export function genModelHandler(
   value: SimpleExpressionNode,
   context: CodegenContext,
-) {
+): CodeFragment[] {
   const {
     options: { isTS },
   } = context