Merge branch 'main' into fix-slots-level

Author: Doctor-wu

packages/compiler-vapor/__tests__/compile.spec.ts

@@ -1,6 +1,10 @@
 import { BindingTypes, type RootNode } from '@vue/compiler-dom'
 import { type CompilerOptions, compile as _compile } from '../src'
 
+// TODO This is a temporary test case for initial implementation.
+// Remove it once we have more comprehensive tests.
+// DO NOT ADD MORE TESTS HERE.
+
 function compile(template: string | RootNode, options: CompilerOptions = {}) {
   let { code } = _compile(template, {
     ...options,

packages/compiler-vapor/__tests__/transforms/__snapshots__/vFor.spec.ts.snap

@@ -30,6 +30,20 @@ export function render(_ctx) {
 }"
 `;
 
+exports[`compiler: v-for > function params w/ prefixIdentifiers: false 1`] = `
+"import { renderEffect as _renderEffect, setText as _setText, createFor as _createFor, template as _template } from 'vue/vapor';
+const t0 = _template("<div></div>")
+
+export function render(_ctx) {
+  const n0 = _createFor(() => (items), ([item, __, k]) => {
+    const n2 = t0()
+    _renderEffect(() => _setText(n2, item))
+    return n2
+  }, (item, __, k) => (k))
+  return n0
+}"
+`;
+
 exports[`compiler: v-for > multi effect 1`] = `
 "import { renderEffect as _renderEffect, setDynamicProp as _setDynamicProp, createFor as _createFor, template as _template } from 'vue/vapor';
 const t0 = _template("<div></div>")

packages/compiler-vapor/__tests__/transforms/vFor.spec.ts

@@ -223,4 +223,17 @@ describe('compiler: v-for', () => {
       index: undefined,
     })
   })
+
+  test('function params w/ prefixIdentifiers: false', () => {
+    const { code } = compileWithVFor(
+      `<div v-for="(item, , k) of items" :key="k">{{ item }}</div>`,
+      {
+        prefixIdentifiers: false,
+      },
+    )
+
+    expect(code).contains(`_createFor(() => (items), ([item, __, k]) => {`)
+    expect(code).contain(`_setText(n2, item)`)
+    expect(code).matchSnapshot()
+  })
 })

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

@@ -42,13 +42,18 @@ export function genFor(
   }
 
   const [depth, exitScope] = context.enterScope()
-  const propsName = `_ctx${depth}`
+  let propsName: string
   const idMap: Record<string, string | null> = {}
-  Array.from(idsOfValue).forEach(
-    (id, idIndex) => (idMap[id] = `${propsName}[${idIndex}]`),
-  )
-  if (rawKey) idMap[rawKey] = `${propsName}[${idsOfValue.size}]`
-  if (rawIndex) idMap[rawIndex] = `${propsName}[${idsOfValue.size + 1}]`
+  if (context.options.prefixIdentifiers) {
+    propsName = `_ctx${depth}`
+    Array.from(idsOfValue).forEach(
+      (id, idIndex) => (idMap[id] = `${propsName}[${idIndex}]`),
+    )
+    if (rawKey) idMap[rawKey] = `${propsName}[${idsOfValue.size}]`
+    if (rawIndex) idMap[rawIndex] = `${propsName}[${idsOfValue.size + 1}]`
+  } else {
+    propsName = `[${[rawValue || ((rawKey || rawIndex) && '_'), rawKey || (rawIndex && '__'), rawIndex].filter(Boolean).join(', ')}]`
+  }
 
   let blockFn = context.withId(
     () => genBlock(render, context, [propsName]),

packages/runtime-vapor/__tests__/apiCreateVaporApp.spec.ts

@@ -332,4 +332,16 @@ describe('api: createVaporApp', () => {
       expect(window.performance.getEntries()).lengthOf(0)
     })
   })
+
+  test('config.globalProperty', () => {
+    const { app, mount, html } = define({
+      render() {
+        const instance = getCurrentInstance()!
+        return createTextNode([instance.appContext.config.globalProperties.msg])
+      },
+    }).create()
+    app.config.globalProperties.msg = 'hello world'
+    mount()
+    expect(html()).toBe('hello world')
+  })
 })