Skip to content

Commit 2a4fc32

Browse files
committed
wip: remove unnecessary inlinePropsIdentifier option
1 parent 4e8ef55 commit 2a4fc32

File tree

5 files changed

+12
-28
lines changed

5 files changed

+12
-28
lines changed

packages/compiler-core/src/codegen.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,7 @@ export interface CodegenResult {
6666
}
6767

6868
export interface CodegenContext
69-
extends Omit<
70-
Required<CodegenOptions>,
71-
'bindingMetadata' | 'inline' | 'inlinePropsIdentifier'
72-
> {
69+
extends Omit<Required<CodegenOptions>, 'bindingMetadata' | 'inline'> {
7370
source: string
7471
code: string
7572
line: number

packages/compiler-core/src/options.ts

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,6 @@ interface SharedTransformCodegenOptions {
9191
* This allows the function to directly access setup() local bindings.
9292
*/
9393
inline?: boolean
94-
/**
95-
* Identifier for props in setup() inline mode.
96-
*/
97-
inlinePropsIdentifier?: string
9894
}
9995

10096
export interface TransformOptions extends SharedTransformCodegenOptions {

packages/compiler-core/src/transform.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,6 @@ export function createTransformContext(
125125
ssrCssVars = ``,
126126
bindingMetadata = EMPTY_OBJ,
127127
inline = false,
128-
inlinePropsIdentifier = `$props`,
129128
onError = defaultOnError
130129
}: TransformOptions
131130
): TransformContext {
@@ -145,7 +144,6 @@ export function createTransformContext(
145144
ssrCssVars,
146145
bindingMetadata,
147146
inline,
148-
inlinePropsIdentifier,
149147
onError,
150148

151149
// state

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -98,14 +98,12 @@ export function processExpression(
9898
return node
9999
}
100100

101-
const { inline, inlinePropsIdentifier, bindingMetadata } = context
101+
const { inline, bindingMetadata } = context
102102
const prefix = (raw: string) => {
103103
const type = hasOwn(bindingMetadata, raw) && bindingMetadata[raw]
104104
if (inline) {
105105
// setup inline mode
106-
if (type === 'props') {
107-
return `${inlinePropsIdentifier}.${raw}`
108-
} else if (type === 'setup') {
106+
if (type === 'setup') {
109107
return `${context.helperString(UNREF)}(${raw})`
110108
} else if (type === 'component-import') {
111109
return raw

packages/compiler-sfc/src/compileScript.ts

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -405,20 +405,16 @@ export function compileScript(
405405
)
406406
}
407407

408-
// parse the signature to extract the identifiers users are assigning to
409-
// the arguments. props identifier is always needed for inline mode
410-
// template compilation
411-
const params = ((signatureAST as ExpressionStatement)
412-
.expression as ArrowFunctionExpression).params
413-
if (params[0] && params[0].type === 'Identifier') {
414-
propsASTNode = params[0]
415-
propsIdentifier = propsASTNode.name
416-
}
417-
418408
if (isTS) {
419409
// <script setup="xxx" lang="ts">
420-
// additional identifiers are needed for TS in order to match declared
421-
// types
410+
// parse the signature to extract the identifiers users are assigning to
411+
// the arguments. They are needed for matching type delcarations.
412+
const params = ((signatureAST as ExpressionStatement)
413+
.expression as ArrowFunctionExpression).params
414+
if (params[0] && params[0].type === 'Identifier') {
415+
propsASTNode = params[0]
416+
propsIdentifier = propsASTNode.name
417+
}
422418
if (params[1] && params[1].type === 'ObjectPattern') {
423419
setupCtxASTNode = params[1]
424420
for (const p of params[1].properties) {
@@ -701,7 +697,7 @@ export function compileScript(
701697
}
702698

703699
// 7. finalize setup argument signature.
704-
let args = options.inlineTemplate ? `$props` : ``
700+
let args = ``
705701
if (isTS) {
706702
if (slotsType === 'Slots') {
707703
helperImports.add('Slots')
@@ -787,7 +783,6 @@ export function compileScript(
787783
source: sfc.template.content,
788784
compilerOptions: {
789785
inline: true,
790-
inlinePropsIdentifier: propsIdentifier,
791786
bindingMetadata
792787
}
793788
// TODO source map

0 commit comments

Comments
 (0)