From: 三咲智子 Kevin Deng <sxzz@sxzz.moe>
Date: Fri, 1 Dec 2023 16:07:24 +0000 (+0800)
Subject: feat: source map for expressions
X-Git-Tag: v3.6.0-alpha.1~16^2~769
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=13d0993cd35617e470fdd0dcc11a7ce1ab38d2b7;p=thirdparty%2Fvuejs%2Fcore.git

feat: source map for expressions
---

diff --git a/packages/compiler-vapor/__tests__/__snapshots__/compile.test.ts.snap b/packages/compiler-vapor/__tests__/__snapshots__/compile.test.ts.snap
index 1074169fac..e3addd55d3 100644
--- a/packages/compiler-vapor/__tests__/__snapshots__/compile.test.ts.snap
+++ b/packages/compiler-vapor/__tests__/__snapshots__/compile.test.ts.snap
@@ -76,7 +76,7 @@ export function render(_ctx) {
   return n0
 }
 
-import { template as _template, children as _children, effect as _effect, withModifiers as _withModifiers, on as _on } from 'vue/vapor'
+import { template as _template, children as _children, effect as _effect, on as _on, withModifiers as _withModifiers } from 'vue/vapor'
 "
 `;
 
diff --git a/packages/compiler-vapor/src/generate.ts b/packages/compiler-vapor/src/generate.ts
index 3b8b45d04f..a72b29a08c 100644
--- a/packages/compiler-vapor/src/generate.ts
+++ b/packages/compiler-vapor/src/generate.ts
@@ -33,8 +33,16 @@ export interface CodegenContext extends Required<CodegenOptions> {
   indentLevel: number
   map?: SourceMapGenerator
 
-  push(code: string, newlineIndex?: number, node?: BaseIRNode): void
-  pushWithNewline(code: string, newlineIndex?: number, node?: BaseIRNode): void
+  push(
+    code: string,
+    newlineIndex?: number,
+    node?: Pick<BaseIRNode, 'loc'>,
+  ): void
+  pushWithNewline(
+    code: string,
+    newlineIndex?: number,
+    node?: Pick<BaseIRNode, 'loc'>,
+  ): void
   indent(): void
   deindent(): void
   newline(): void
@@ -286,8 +294,6 @@ export function generate(
       NewlineType.End,
     )
 
-  console.log(ctx.code)
-
   return {
     code: ctx.code,
     ast: ir as any,
@@ -297,60 +303,50 @@ export function generate(
 }
 
 function genOperation(oper: OperationNode, context: CodegenContext) {
-  const { vaporHelper, pushWithNewline } = context
+  const { vaporHelper, push, pushWithNewline } = context
   // TODO: cache old value
   switch (oper.type) {
     case IRNodeTypes.SET_PROP: {
-      pushWithNewline(
-        `${vaporHelper('setAttr')}(n${oper.element}, ${processExpression(
-          oper.name,
-          context,
-        )}, undefined, ${processExpression(oper.value, context)})`,
-      )
+      pushWithNewline(`${vaporHelper('setAttr')}(n${oper.element}, `)
+      genExpression(oper.name, context)
+      push(`, undefined, `)
+      genExpression(oper.value, context)
+      push(')')
       return
     }
 
     case IRNodeTypes.SET_TEXT: {
-      pushWithNewline(
-        `${vaporHelper('setText')}(n${
-          oper.element
-        }, undefined, ${processExpression(oper.value, context)})`,
-      )
+      pushWithNewline(`${vaporHelper('setText')}(n${oper.element}, undefined, `)
+      genExpression(oper.value, context)
+      push(')')
       return
     }
 
     case IRNodeTypes.SET_EVENT: {
-      let value = oper.value
-      if (oper.modifiers.length) {
-        value = `${vaporHelper('withModifiers')}(${processExpression(
-          value,
-          context,
-        )}, ${genArrayExpression(oper.modifiers)})`
-      }
-      pushWithNewline(
-        `${vaporHelper('on')}(n${oper.element}, ${processExpression(
-          oper.name,
-          context,
-        )}, ${processExpression(value, context)})`,
-      )
+      pushWithNewline(`${vaporHelper('on')}(n${oper.element}, `)
+      genExpression(oper.name, context)
+      push(', ')
+
+      const hasModifiers = oper.modifiers.length
+      hasModifiers && push(`${vaporHelper('withModifiers')}(`)
+      genExpression(oper.value, context)
+      hasModifiers && push(`, ${genArrayExpression(oper.modifiers)})`)
+
+      push(')')
       return
     }
 
     case IRNodeTypes.SET_HTML: {
-      pushWithNewline(
-        `${vaporHelper('setHtml')}(n${
-          oper.element
-        }, undefined, ${processExpression(oper.value, context)})`,
-      )
+      pushWithNewline(`${vaporHelper('setHtml')}(n${oper.element}, undefined, `)
+      genExpression(oper.value, context)
+      push(')')
       return
     }
 
     case IRNodeTypes.CREATE_TEXT_NODE: {
-      pushWithNewline(
-        `const n${oper.id} = ${vaporHelper(
-          'createTextNode',
-        )}(${processExpression(oper.value, context)})`,
-      )
+      pushWithNewline(`const n${oper.id} = ${vaporHelper('createTextNode')}(`)
+      genExpression(oper.value, context)
+      push(')')
       return
     }
 
@@ -414,37 +410,41 @@ function genChildren(children: IRDynamicChildren) {
 
 // TODO: other types (not only string)
 function genArrayExpression(elements: string[]) {
-  return `[${elements.map((it) => `"${it}"`).join(', ')}]`
+  return `[${elements.map((it) => JSON.stringify(it)).join(', ')}]`
 }
 
-function processExpression(
+function genExpression(
   exp: IRExpression,
-  { inline, prefixIdentifiers, bindingMetadata, vaporHelper }: CodegenContext,
+  {
+    inline,
+    prefixIdentifiers,
+    bindingMetadata,
+    vaporHelper,
+    push,
+  }: CodegenContext,
 ) {
-  if (isString(exp)) return exp
+  if (isString(exp)) return push(exp)
 
-  let content = ''
-  if (exp.type === NodeTypes.SIMPLE_EXPRESSION) {
-    content = exp.content
-    if (exp.isStatic) {
-      return JSON.stringify(content)
-    }
-  } else {
-    // TODO NodeTypes.COMPOUND_EXPRESSION
-  }
+  // TODO NodeTypes.COMPOUND_EXPRESSION
+  if (exp.type === NodeTypes.COMPOUND_EXPRESSION) return
 
-  switch (bindingMetadata[content]) {
-    case BindingTypes.SETUP_REF:
-      content += '.value'
-      break
-    case BindingTypes.SETUP_MAYBE_REF:
-      content = `${vaporHelper('unref')}(${content})`
-      break
-  }
+  let content = exp.content
 
-  if (prefixIdentifiers && !inline) {
-    content = `_ctx.${content}`
+  if (exp.isStatic) {
+    content = JSON.stringify(content)
+  } else {
+    switch (bindingMetadata[content]) {
+      case BindingTypes.SETUP_REF:
+        content += '.value'
+        break
+      case BindingTypes.SETUP_MAYBE_REF:
+        content = `${vaporHelper('unref')}(${content})`
+        break
+    }
+    if (prefixIdentifiers && !inline) {
+      content = `_ctx.${content}`
+    }
   }
 
-  return content
+  push(content, NewlineType.None, exp)
 }