|
@@ -14,8 +14,8 @@ export function genSetText(
|
|
|
context: CodegenContext,
|
|
context: CodegenContext,
|
|
|
): CodeFragment[] {
|
|
): CodeFragment[] {
|
|
|
const { helper } = context
|
|
const { helper } = context
|
|
|
- const { element, values, generated } = oper
|
|
|
|
|
- const texts = combineValues(values, context)
|
|
|
|
|
|
|
+ const { element, values, generated, jsx } = oper
|
|
|
|
|
+ const texts = combineValues(values, context, jsx)
|
|
|
return [
|
|
return [
|
|
|
NEWLINE,
|
|
NEWLINE,
|
|
|
...genCall(helper('setText'), `${generated ? 'x' : 'n'}${element}`, texts),
|
|
...genCall(helper('setText'), `${generated ? 'x' : 'n'}${element}`, texts),
|
|
@@ -27,13 +27,13 @@ export function genCreateTextNode(
|
|
|
context: CodegenContext,
|
|
context: CodegenContext,
|
|
|
): CodeFragment[] {
|
|
): CodeFragment[] {
|
|
|
const { helper } = context
|
|
const { helper } = context
|
|
|
- const { id, values } = oper
|
|
|
|
|
|
|
+ const { id, values, jsx } = oper
|
|
|
return [
|
|
return [
|
|
|
NEWLINE,
|
|
NEWLINE,
|
|
|
`const n${id} = `,
|
|
`const n${id} = `,
|
|
|
...genCall(
|
|
...genCall(
|
|
|
helper('createTextNode'),
|
|
helper('createTextNode'),
|
|
|
- values && combineValues(values, context),
|
|
|
|
|
|
|
+ values && combineValues(values, context, jsx),
|
|
|
),
|
|
),
|
|
|
]
|
|
]
|
|
|
}
|
|
}
|
|
@@ -41,15 +41,16 @@ export function genCreateTextNode(
|
|
|
function combineValues(
|
|
function combineValues(
|
|
|
values: SimpleExpressionNode[],
|
|
values: SimpleExpressionNode[],
|
|
|
context: CodegenContext,
|
|
context: CodegenContext,
|
|
|
|
|
+ jsx?: boolean,
|
|
|
): CodeFragment[] {
|
|
): CodeFragment[] {
|
|
|
return values.flatMap((value, i) => {
|
|
return values.flatMap((value, i) => {
|
|
|
let exp = genExpression(value, context)
|
|
let exp = genExpression(value, context)
|
|
|
- if (getLiteralExpressionValue(value) == null) {
|
|
|
|
|
|
|
+ if (!jsx && getLiteralExpressionValue(value) == null) {
|
|
|
// dynamic, wrap with toDisplayString
|
|
// dynamic, wrap with toDisplayString
|
|
|
exp = genCall(context.helper('toDisplayString'), exp)
|
|
exp = genCall(context.helper('toDisplayString'), exp)
|
|
|
}
|
|
}
|
|
|
if (i > 0) {
|
|
if (i > 0) {
|
|
|
- exp.unshift(' + ')
|
|
|
|
|
|
|
+ exp.unshift(jsx ? ', ' : ' + ')
|
|
|
}
|
|
}
|
|
|
return exp
|
|
return exp
|
|
|
})
|
|
})
|