Merge branch 'main' into warn-shorthand-no-argument

# Conflicts:
#	packages/compiler-core/__tests__/__snapshots__/parse.spec.ts.snap
#	packages/compiler-core/__tests__/parse.spec.ts
#	packages/compiler-core/src/errors.ts
#	packages/compiler-core/src/parse.ts
#	packages/compiler-dom/src/errors.ts
#	packages/compiler-ssr/src/errors.ts
This commit is contained in:
skirtle 2023-12-31 00:15:38 +00:00
commit 6014976d00
521 changed files with 23450 additions and 25563 deletions

4
.eslintignore Normal file
View File

@ -0,0 +1,4 @@
node_modules
dist
temp
coverage

View File

@ -1,14 +1,22 @@
/* eslint-disable no-restricted-globals */ const { builtinModules } = require('node:module')
const DOMGlobals = ['window', 'document'] const DOMGlobals = ['window', 'document']
const NodeGlobals = ['module', 'require'] const NodeGlobals = ['module', 'require']
const banConstEnum = {
selector: 'TSEnumDeclaration[const=true]',
message:
'Please use non-const enums. This project automatically inlines enums.',
}
/**
* @type {import('eslint-define-config').ESLintConfig}
*/
module.exports = { module.exports = {
parser: '@typescript-eslint/parser', parser: '@typescript-eslint/parser',
parserOptions: { parserOptions: {
sourceType: 'module' sourceType: 'module',
}, },
plugins: ['jest'], plugins: ['jest', 'import', '@typescript-eslint'],
rules: { rules: {
'no-debugger': 'error', 'no-debugger': 'error',
// most of the codebase are expected to be env agnostic // most of the codebase are expected to be env agnostic
@ -16,14 +24,34 @@ module.exports = {
'no-restricted-syntax': [ 'no-restricted-syntax': [
'error', 'error',
banConstEnum,
// since we target ES2015 for baseline support, we need to forbid object // since we target ES2015 for baseline support, we need to forbid object
// rest spread usage in destructure as it compiles into a verbose helper. // rest spread usage in destructure as it compiles into a verbose helper.
'ObjectPattern > RestElement', 'ObjectPattern > RestElement',
// tsc compiles assignment spread into Object.assign() calls, but esbuild // tsc compiles assignment spread into Object.assign() calls, but esbuild
// still generates verbose helpers, so spread assignment is also prohiboted // still generates verbose helpers, so spread assignment is also prohiboted
'ObjectExpression > SpreadElement', 'ObjectExpression > SpreadElement',
'AwaitExpression' 'AwaitExpression',
] ],
'sort-imports': ['error', { ignoreDeclarationSort: true }],
'import/no-nodejs-modules': [
'error',
{ allow: builtinModules.map(mod => `node:${mod}`) },
],
// This rule enforces the preference for using '@ts-expect-error' comments in TypeScript
// code to indicate intentional type errors, improving code clarity and maintainability.
'@typescript-eslint/prefer-ts-expect-error': 'error',
// Enforce the use of 'import type' for importing types
'@typescript-eslint/consistent-type-imports': [
'error',
{
fixStyle: 'inline-type-imports',
disallowTypeAnnotations: false,
},
],
// Enforce the use of top-level import type qualifier when an import only has specifiers with inline type qualifiers
'@typescript-eslint/no-import-type-side-effects': 'error',
}, },
overrides: [ overrides: [
// tests, no restrictions (runs in Node / jest with jsdom) // tests, no restrictions (runs in Node / jest with jsdom)
@ -33,56 +61,66 @@ module.exports = {
'no-restricted-globals': 'off', 'no-restricted-globals': 'off',
'no-restricted-syntax': 'off', 'no-restricted-syntax': 'off',
'jest/no-disabled-tests': 'error', 'jest/no-disabled-tests': 'error',
'jest/no-focused-tests': 'error' 'jest/no-focused-tests': 'error',
} },
}, },
// shared, may be used in any env // shared, may be used in any env
{ {
files: ['packages/shared/**'], files: ['packages/shared/**', '.eslintrc.cjs'],
rules: { rules: {
'no-restricted-globals': 'off' 'no-restricted-globals': 'off',
} },
}, },
// Packages targeting DOM // Packages targeting DOM
{ {
files: ['packages/{vue,vue-compat,runtime-dom}/**'], files: ['packages/{vue,vue-compat,runtime-dom}/**'],
rules: { rules: {
'no-restricted-globals': ['error', ...NodeGlobals] 'no-restricted-globals': ['error', ...NodeGlobals],
} },
}, },
// Packages targeting Node // Packages targeting Node
{ {
files: [ files: ['packages/{compiler-sfc,compiler-ssr,server-renderer}/**'],
'packages/{compiler-sfc,compiler-ssr,server-renderer,reactivity-transform}/**'
],
rules: { rules: {
'no-restricted-globals': ['error', ...DOMGlobals], 'no-restricted-globals': ['error', ...DOMGlobals],
'no-restricted-syntax': 'off' 'no-restricted-syntax': ['error', banConstEnum],
} },
}, },
// Private package, browser only + no syntax restrictions // Private package, browser only + no syntax restrictions
{ {
files: ['packages/template-explorer/**', 'packages/sfc-playground/**'], files: ['packages/template-explorer/**', 'packages/sfc-playground/**'],
rules: { rules: {
'no-restricted-globals': ['error', ...NodeGlobals], 'no-restricted-globals': ['error', ...NodeGlobals],
'no-restricted-syntax': 'off' 'no-restricted-syntax': ['error', banConstEnum],
} },
}, },
// JavaScript files // JavaScript files
{ {
files: ['*.js', '*.cjs'], files: ['*.js', '*.cjs'],
rules: { rules: {
// We only do `no-unused-vars` checks for js files, TS files are checked by TypeScript itself. // We only do `no-unused-vars` checks for js files, TS files are checked by TypeScript itself.
'no-unused-vars': ['error', { vars: 'all', args: 'none' }] 'no-unused-vars': ['error', { vars: 'all', args: 'none' }],
} },
}, },
// Node scripts // Node scripts
{ {
files: ['scripts/**', '*.{js,ts}', 'packages/**/index.js'], files: [
'scripts/**',
'./*.{js,ts}',
'packages/*/*.js',
'packages/vue/*/*.js',
],
rules: { rules: {
'no-restricted-globals': 'off', 'no-restricted-globals': 'off',
'no-restricted-syntax': 'off' 'no-restricted-syntax': ['error', banConstEnum],
} },
} },
] // Import nodejs modules in compiler-sfc
{
files: ['packages/compiler-sfc/src/**'],
rules: {
'import/no-nodejs-modules': ['error', { allow: builtinModules }],
},
},
],
} }

2
.git-blame-ignore-revs Normal file
View File

@ -0,0 +1,2 @@
# update prettier & eslint config (#9162)
bfe6b459d3a0ce6168611ee1ac7e6e789709df9d

View File

@ -63,7 +63,7 @@ Hi! I'm really excited that you are interested in contributing to Vue.js. Before
You will need [Node.js](https://nodejs.org) **version 18.12+**, and [PNPM](https://pnpm.io) **version 8+**. You will need [Node.js](https://nodejs.org) **version 18.12+**, and [PNPM](https://pnpm.io) **version 8+**.
We also recommend installing [ni](https://github.com/antfu/ni) to help switching between repos using different package managers. `ni` also provides the handy `nr` command which running npm scripts easier. We also recommend installing [@antfu/ni](https://github.com/antfu/ni) to help switching between repos using different package managers. `ni` also provides the handy `nr` command which running npm scripts easier.
After cloning the repo, run: After cloning the repo, run:
@ -86,11 +86,11 @@ The project uses [simple-git-hooks](https://github.com/toplenboren/simple-git-ho
- Type check the entire project - Type check the entire project
- Automatically format changed files using Prettier - Automatically format changed files using Prettier
- Verify commit message format (logic in `scripts/verifyCommit.js`) - Verify commit message format (logic in `scripts/verify-commit.js`)
## Scripts ## Scripts
**The examples below will be using the `nr` command from the [ni](https://github.com/antfu/ni) package.** You can also use plain `npm run`, but you will need to pass all additional arguments after the command after an extra `--`. For example, `nr build runtime --all` is equivalent to `npm run build -- runtime --all`. **The examples below will be using the `nr` command from the [@antfu/ni](https://github.com/antfu/ni) package.** You can also use plain `npm run`, but you will need to pass all additional arguments after the command after an extra `--`. For example, `nr build runtime --all` is equivalent to `npm run build -- runtime --all`.
The `run-s` and `run-p` commands found in some scripts are from [npm-run-all](https://github.com/mysticatea/npm-run-all) for orchestrating multiple scripts. `run-s` means "run in sequence" while `run-p` means "run in parallel". The `run-s` and `run-p` commands found in some scripts are from [npm-run-all](https://github.com/mysticatea/npm-run-all) for orchestrating multiple scripts. `run-s` means "run in sequence" while `run-p` means "run in parallel".

View File

@ -7,35 +7,35 @@
packageRules: [ packageRules: [
{ {
depTypeList: ['peerDependencies'], depTypeList: ['peerDependencies'],
enabled: false enabled: false,
}, },
{ {
groupName: 'test', groupName: 'test',
matchPackageNames: ['vitest', 'jsdom', 'puppeteer'], matchPackageNames: ['vitest', 'jsdom', 'puppeteer'],
matchPackagePrefixes: ['@vitest'] matchPackagePrefixes: ['@vitest'],
}, },
{ {
groupName: 'playground', groupName: 'playground',
matchFileNames: [ matchFileNames: [
'packages/sfc-playground/package.json', 'packages/sfc-playground/package.json',
'packages/template-explorer/package.json' 'packages/template-explorer/package.json',
] ],
}, },
{ {
groupName: 'compiler', groupName: 'compiler',
matchPackageNames: ['magic-string'], matchPackageNames: ['magic-string'],
matchPackagePrefixes: ['@babel', 'postcss'] matchPackagePrefixes: ['@babel', 'postcss'],
}, },
{ {
groupName: 'build', groupName: 'build',
matchPackageNames: ['vite', 'terser'], matchPackageNames: ['vite', 'terser'],
matchPackagePrefixes: ['rollup', 'esbuild', '@rollup', '@vitejs'] matchPackagePrefixes: ['rollup', 'esbuild', '@rollup', '@vitejs'],
}, },
{ {
groupName: 'lint', groupName: 'lint',
matchPackageNames: ['simple-git-hooks', 'lint-staged'], matchPackageNames: ['simple-git-hooks', 'lint-staged'],
matchPackagePrefixes: ['@typescript-eslint', 'eslint', 'prettier'] matchPackagePrefixes: ['@typescript-eslint', 'eslint', 'prettier'],
} },
], ],
ignoreDeps: [ ignoreDeps: [
'vue', 'vue',
@ -45,6 +45,6 @@
'typescript', 'typescript',
// ESM only // ESM only
'estree-walker' 'estree-walker',
] ],
} }

View File

@ -30,4 +30,4 @@ jobs:
- name: Run prettier - name: Run prettier
run: pnpm run format run: pnpm run format
- uses: autofix-ci/action@bee19d72e71787c12ca0f29de72f2833e437e4c9 - uses: autofix-ci/action@ea32e3a12414e6d3183163c3424a7d7a8631ad84

View File

@ -58,31 +58,6 @@ jobs:
- name: Run ssr unit tests - name: Run ssr unit tests
run: pnpm run test-unit server-renderer run: pnpm run test-unit server-renderer
benchmarks:
runs-on: ubuntu-latest
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
env:
PUPPETEER_SKIP_DOWNLOAD: 'true'
steps:
- uses: actions/checkout@v4
- name: Install pnpm
uses: pnpm/action-setup@v2
- name: Install Node.js
uses: actions/setup-node@v4
with:
node-version-file: '.node-version'
cache: 'pnpm'
- run: pnpm install
- name: Run benchmarks
uses: CodSpeedHQ/action@v2
with:
run: pnpm vitest bench --run
token: ${{ secrets.CODSPEED_TOKEN }}
e2e-test: e2e-test:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
@ -110,6 +85,9 @@ jobs:
- name: Run e2e tests - name: Run e2e tests
run: pnpm run test-e2e run: pnpm run test-e2e
- name: verify treeshaking
run: node scripts/verify-treeshaking.js
lint-and-test-dts: lint-and-test-dts:
runs-on: ubuntu-latest runs-on: ubuntu-latest
if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
@ -137,3 +115,28 @@ jobs:
- name: Run type declaration tests - name: Run type declaration tests
run: pnpm run test-dts run: pnpm run test-dts
# benchmarks:
# runs-on: ubuntu-latest
# if: github.event_name == 'push' || github.event.pull_request.head.repo.full_name != github.repository
# env:
# PUPPETEER_SKIP_DOWNLOAD: 'true'
# steps:
# - uses: actions/checkout@v4
# - name: Install pnpm
# uses: pnpm/action-setup@v2
# - name: Install Node.js
# uses: actions/setup-node@v4
# with:
# node-version-file: '.node-version'
# cache: 'pnpm'
# - run: pnpm install
# - name: Run benchmarks
# uses: CodSpeedHQ/action@v2
# with:
# run: pnpm vitest bench --run
# token: ${{ secrets.CODSPEED_TOKEN }}

View File

@ -1 +1,4 @@
dist dist
*.md
*.html
pnpm-lock.yaml

View File

@ -1,5 +1,5 @@
semi: false {
singleQuote: true "semi": false,
printWidth: 80 "singleQuote": true,
trailingComma: 'none' "arrowParens": "avoid"
arrowParens: 'avoid' }

2
.vscode/launch.json vendored
View File

@ -21,7 +21,7 @@
"console": "integratedTerminal", "console": "integratedTerminal",
"sourceMaps": true, "sourceMaps": true,
"windows": { "windows": {
"program": "${workspaceFolder}/node_modules/jest/bin/jest", "program": "${workspaceFolder}/node_modules/jest/bin/jest"
} }
} }
] ]

View File

@ -1,3 +1,276 @@
## [3.4.3](https://github.com/vuejs/core/compare/v3.4.2...v3.4.3) (2023-12-30)
### Bug Fixes
* **compiler-sfc:** respect sfc parse options in cache key ([b8d58ec](https://github.com/vuejs/core/commit/b8d58ec4f42cbeb9443bf06138add46158db9af0))
## [3.4.2](https://github.com/vuejs/core/compare/v3.4.1...v3.4.2) (2023-12-30)
### Bug Fixes
* **compiler-sfc:** fix dev regression for dot / namespace component usage ([dce99c1](https://github.com/vuejs/core/commit/dce99c12df981ca45a4d848c37ba8b16496025f0)), closes [#9947](https://github.com/vuejs/core/issues/9947)
* **runtime-core:** support deep: false when watch reactive ([#9928](https://github.com/vuejs/core/issues/9928)) ([4f703d1](https://github.com/vuejs/core/commit/4f703d120d76d711084346f73ea295c73e6ef6b6)), closes [#9916](https://github.com/vuejs/core/issues/9916)
* **ssr:** fix hydration error for slot outlet inside transition-group ([#9937](https://github.com/vuejs/core/issues/9937)) ([6cb00ed](https://github.com/vuejs/core/commit/6cb00ed0f9b64428ec18fada0f68467d6a813fde)), closes [#9933](https://github.com/vuejs/core/issues/9933)
## [3.4.1](https://github.com/vuejs/core/compare/v3.4.0...v3.4.1) (2023-12-30)
### Bug Fixes
* **compat:** correct enum value for COMPILER_FILTERS feature ([#9875](https://github.com/vuejs/core/issues/9875)) ([77d33e2](https://github.com/vuejs/core/commit/77d33e263cf19983caf4e5c53a0eb0bee374843c))
* **defineModel:** always default modifiers to empty object ([9bc3c7e](https://github.com/vuejs/core/commit/9bc3c7e29cf15f5ca96703542d10cfd786a3fc55)), closes [#9945](https://github.com/vuejs/core/issues/9945)
* **defineModel:** support local mutation when only prop but no listener is passed ([97ce041](https://github.com/vuejs/core/commit/97ce041910b6ca4bef10f939493d6b5a06ea5b07))
* **types:** fix defineModel watch type error ([#9942](https://github.com/vuejs/core/issues/9942)) ([4af8583](https://github.com/vuejs/core/commit/4af85835f7e593a7dffa7dc7e99f14877eb70fd1)), closes [#9939](https://github.com/vuejs/core/issues/9939)
### Features
* **compiler-sfc:** support passing template parsing options when parsing sfc ([6fab855](https://github.com/vuejs/core/commit/6fab8551e4aeef4610987640de8b435b1ae321bb)) (necessary to fix https://github.com/vitejs/vite-plugin-vue/issues/322)
# [3.4.0 Slam Dunk](https://github.com/vuejs/core/compare/v3.4.0-rc.3...v3.4.0) (2023-12-29)
> Read [this blog post](https://blog.vuejs.org/posts/vue-3-4) for an overview of the release highlights.
### Potential Actions Needed
1. To fully leverage new features in 3.4, it is recommended to also update the following dependencies when upgrading to 3.4:
- Volar / vue-tsc@^1.8.27 (**required**)
- @vitejs/plugin-vue@^5.0.0 (if using Vite)
- nuxt@^3.9.0 (if using Nuxt)
- vue-loader@^17.4.0 (if using webpack or vue-cli)
2. If using TSX with Vue, check actions needed in [Removed: Global JSX Namespace](https://blog.vuejs.org/posts/vue-3-4#global-jsx-namespace).
3. Make sure you are no longer using any deprecated features (if you are, you should have warnings in the console telling you so). They may have been [removed in 3.4](https://blog.vuejs.org/posts/vue-3-4#other-removed-features).
### Features
* **general:** MathML support ([#7836](https://github.com/vuejs/core/issues/7836)) ([d42b6ba](https://github.com/vuejs/core/commit/d42b6ba3f530746eb1221eb7a4be0f44eb56f7d3)), closes [#7820](https://github.com/vuejs/core/issues/7820)
* **reactivity:** more efficient reactivity system ([#5912](https://github.com/vuejs/core/issues/5912)) ([16e06ca](https://github.com/vuejs/core/commit/16e06ca08f5a1e2af3fc7fb35de153dbe0c3087d)), closes [#311](https://github.com/vuejs/core/issues/311) [#1811](https://github.com/vuejs/core/issues/1811) [#6018](https://github.com/vuejs/core/issues/6018) [#7160](https://github.com/vuejs/core/issues/7160) [#8714](https://github.com/vuejs/core/issues/8714) [#9149](https://github.com/vuejs/core/issues/9149) [#9419](https://github.com/vuejs/core/issues/9419) [#9464](https://github.com/vuejs/core/issues/9464)
* **reactivity:** expose last result for computed getter ([#9497](https://github.com/vuejs/core/issues/9497)) ([48b47a1](https://github.com/vuejs/core/commit/48b47a1ab63577e2dbd91947eea544e3ef185b85))
* **runtime-core / dx:** link errors to docs in prod build ([#9165](https://github.com/vuejs/core/issues/9165)) ([9f8ba98](https://github.com/vuejs/core/commit/9f8ba9821fe166f77e63fa940e9e7e13ec3344fa))
* **runtime-core:** add `once` option to watch ([#9034](https://github.com/vuejs/core/issues/9034)) ([a645e7a](https://github.com/vuejs/core/commit/a645e7aa51006516ba668b3a4365d296eb92ee7d))
* **runtime-core:** provide full props to props validator functions ([#3258](https://github.com/vuejs/core/issues/3258)) ([8e27692](https://github.com/vuejs/core/commit/8e27692029a4645cd54287f776c0420f2b82740b))
* **compiler-core:** export error message ([#8729](https://github.com/vuejs/core/issues/8729)) ([f7e80ee](https://github.com/vuejs/core/commit/f7e80ee4a065a9eaba98720abf415d9e87756cbd))
* **compiler-core:** support specifying root namespace when parsing ([40f72d5](https://github.com/vuejs/core/commit/40f72d5e50b389cb11b7ca13461aa2a75ddacdb4))
* **compiler-core:** support v-bind shorthand for key and value with the same name ([#9451](https://github.com/vuejs/core/issues/9451)) ([26399aa](https://github.com/vuejs/core/commit/26399aa6fac1596b294ffeba06bb498d86f5508c))
* **compiler-core:** improve parsing tolerance for language-tools ([41ff68e](https://github.com/vuejs/core/commit/41ff68ea579d933333392146625560359acb728a))
* **compiler-core:** support accessing Error as global in template expressions ([#7018](https://github.com/vuejs/core/issues/7018)) ([bcca475](https://github.com/vuejs/core/commit/bcca475dbc58d76434cd8120b94929758cee2825))
* **compiler-core:** lift vnode hooks deprecation warning to error ([8abc754](https://github.com/vuejs/core/commit/8abc754d5d86d9dfd5a7927b846f1a743f352364))
* **compiler-core:** export runtime error strings ([#9301](https://github.com/vuejs/core/issues/9301)) ([feb2f2e](https://github.com/vuejs/core/commit/feb2f2edce2d91218a5e9a52c81e322e4033296b))
* **compiler-core:** add current filename to TransformContext ([#8950](https://github.com/vuejs/core/issues/8950)) ([638f1ab](https://github.com/vuejs/core/commit/638f1abbb632000553e2b7d75e87c95d8ca192d6))
* **compiler-sfc:** analyze import usage in template via AST ([#9729](https://github.com/vuejs/core/issues/9729)) ([e8bbc94](https://github.com/vuejs/core/commit/e8bbc946cba6bf74c9da56f938b67d2a04c340ba)), closes [#8897](https://github.com/vuejs/core/issues/8897) [nuxt/nuxt#22416](https://github.com/nuxt/nuxt/issues/22416)
* **compiler-sfc:** expose resolve type-based props and emits ([#8874](https://github.com/vuejs/core/issues/8874)) ([9e77580](https://github.com/vuejs/core/commit/9e77580c0c2f0d977bd0031a1d43cc334769d433))
* **compiler-sfc:** bump postcss-modules to v6 ([2a507e3](https://github.com/vuejs/core/commit/2a507e32f0e2ef73813705a568b8633f68bda7a9))
* **compiler-sfc:** promote defineModel stable ([#9598](https://github.com/vuejs/core/issues/9598)) ([ef688ba](https://github.com/vuejs/core/commit/ef688ba92bfccbc8b7ea3997eb297665d13e5249))
* **compiler-sfc:** support import attributes and `using` syntax ([#8786](https://github.com/vuejs/core/issues/8786)) ([5b2bd1d](https://github.com/vuejs/core/commit/5b2bd1df78e8ff524c3a184adaa284681aba6574))
* **compiler-sfc:** `defineModel` support local mutation by default, remove local option ([f74785b](https://github.com/vuejs/core/commit/f74785bc4ad351102dde17fdfd2c7276b823111f)), closes [/github.com/vuejs/rfcs/discussions/503#discussioncomment-7566278](https://github.com//github.com/vuejs/rfcs/discussions/503/issues/discussioncomment-7566278)
* **ssr:** add `__VUE_PROD_HYDRATION_MISMATCH_DETAILS__` feature flag ([#9550](https://github.com/vuejs/core/issues/9550)) ([bc7698d](https://github.com/vuejs/core/commit/bc7698dbfed9b5327a93565f9df336ae5a94d605))
* **ssr:** improve ssr hydration mismatch checks ([#5953](https://github.com/vuejs/core/issues/5953)) ([2ffc1e8](https://github.com/vuejs/core/commit/2ffc1e8cfdc6ec9c45c4a4dd8e3081b2aa138f1e)), closes [#5063](https://github.com/vuejs/core/issues/5063)
* **types:** use enum to replace const enum ([#9261](https://github.com/vuejs/core/issues/9261)) ([fff7b86](https://github.com/vuejs/core/commit/fff7b864f4292d0430ba2bda7098ad43876b0210)), closes [#1228](https://github.com/vuejs/core/issues/1228)
* **types:** add emits and slots type to `FunctionalComponent` ([#8644](https://github.com/vuejs/core/issues/8644)) ([927ab17](https://github.com/vuejs/core/commit/927ab17cfc645e82d061fdf227c34689491268e1))
* **types:** export `AriaAttributes` type ([#8909](https://github.com/vuejs/core/issues/8909)) ([fd0b6ba](https://github.com/vuejs/core/commit/fd0b6ba01660499fa07b0cf360eefaac8cca8287))
* **types:** export `ObjectPlugin` and `FunctionPlugin` types ([#8946](https://github.com/vuejs/core/issues/8946)) ([fa4969e](https://github.com/vuejs/core/commit/fa4969e7a3aefa6863203f9294fc5e769ddf6d8f)), closes [#8577](https://github.com/vuejs/core/issues/8577)
* **types:** expose `DefineProps` type ([096ba81](https://github.com/vuejs/core/commit/096ba81817b7da15f61bc55fc1a93f72ac9586e0))
* **types:** expose `PublicProps` type ([#2403](https://github.com/vuejs/core/issues/2403)) ([44135dc](https://github.com/vuejs/core/commit/44135dc95fb8fea26b84d1433839d28b8c21f708))
* **types:** improve event type inference when using `h` with native elements ([#9756](https://github.com/vuejs/core/issues/9756)) ([a625376](https://github.com/vuejs/core/commit/a625376ac8901eea81bf3c66cb531f2157f073ef))
* **types:** provide `ComponentInstance` type ([#5408](https://github.com/vuejs/core/issues/5408)) ([bfb8565](https://github.com/vuejs/core/commit/bfb856565d3105db4b18991ae9e404e7cc989b25))
* **types:** support passing generics when registering global directives ([#9660](https://github.com/vuejs/core/issues/9660)) ([a41409e](https://github.com/vuejs/core/commit/a41409ed02a8c7220e637f56caf6813edeb077f8))
### Performance Improvements
* **compiler-sfc:** avoid sfc source map unnecessary serialization and parsing ([f15d2f6](https://github.com/vuejs/core/commit/f15d2f6cf69c0c39f8dfb5c33122790c68bf92e2))
* **compiler-sfc:** remove magic-string trim on script ([e8e3ec6](https://github.com/vuejs/core/commit/e8e3ec6ca7392e43975c75b56eaaa711d5ea9410))
* **compiler-sfc:** use faster source map addMapping ([50cde7c](https://github.com/vuejs/core/commit/50cde7cfbcc49022ba88f5f69fa9b930b483c282))
* **compiler-core:** optimize away isBuiltInType ([66c0ed0](https://github.com/vuejs/core/commit/66c0ed0a3c1c6f37dafc6b1c52b75c6bf60e3136))
* **compiler-core:** optimize position cloning ([2073236](https://github.com/vuejs/core/commit/20732366b9b3530d33b842cf1fc985919afb9317))
* **codegen:** optimize line / column calculation during codegen ([3be53d9](https://github.com/vuejs/core/commit/3be53d9b974dae1a10eb795cade71ae765e17574))
* **codegen:** optimize source map generation ([c11002f](https://github.com/vuejs/core/commit/c11002f16afd243a2b15b546816e73882eea9e4d))
* **shared:** optimize makeMap ([ae6fba9](https://github.com/vuejs/core/commit/ae6fba94954bac6430902f77b0d1113a98a75b18))
### BREAKING CHANGES
#### Global JSX Registration Removed
Starting in 3.4, Vue no longer registers the global `JSX` namespace by default. This is necessary to avoid global namespace collision with React so that TSX of both libs can co-exist in the same project. This should not affect SFC-only users with latest version of Volar.
If you are using TSX, there are two options:
1. Explicitly set [jsxImportSource](https://www.typescriptlang.org/tsconfig#jsxImportSource) to `'vue'` in `tsconfig.json` before upgrading to 3.4. You can also opt-in per file by adding a `/* @jsxImportSource vue */` comment at the top of the file.
2. If you have code that depends on the presence of the global `JSX` namespace, e.g. usage of types like `JSX.Element` etc., you can retain the exact pre-3.4 global behavior by explicitly referencing `vue/jsx`, which registers the global `JSX` namespace.
Note that this is a type-only breaking change in a minor release, which adheres to our [release policy](https://vuejs.org/about/releases.html#semantic-versioning-edge-cases).
#### Deprecated Features Removed
- [Reactivity Transform](https://vuejs.org/guide/extras/reactivity-transform.html) was marked deprecated in 3.3 and is now removed in 3.4. This change does not require a major due to the feature being experimental. Users who wish to continue using the feature can do so via the [Vue Macros plugin](https://vue-macros.dev/features/reactivity-transform.html).
- `app.config.unwrapInjectedRef` has been removed. It was deprecated and enabled by default in 3.3. In 3.4 it is no longer possible to disable this behavior.
- `@vnodeXXX` event listeners in templates are now a compiler error instead of a deprecation warning. Use `@vue:XXX` listeners instead.
- `v-is` directive has been removed. It was deprecated in 3.3. Use the [`is` attribute with `vue:` prefix](https://vuejs.org/api/built-in-special-attributes.html#is) instead.
# [3.4.0-rc.3](https://github.com/vuejs/core/compare/v3.4.0-rc.2...v3.4.0-rc.3) (2023-12-27)
### Bug Fixes
* also export runtime error strings in all cjs builds ([38706e4](https://github.com/vuejs/core/commit/38706e4a1e5e5380e7df910b2a784d0a9bc9db29))
### Features
* **defineModel:** support modifiers and transformers ([a772031](https://github.com/vuejs/core/commit/a772031ea8431bd732ffeaeaac09bd76a0daec9b))
# [3.4.0-rc.2](https://github.com/vuejs/core/compare/v3.4.0-rc.1...v3.4.0-rc.2) (2023-12-26)
### Bug Fixes
* **deps:** update dependency @vue/repl to ^3.1.0 ([#9911](https://github.com/vuejs/core/issues/9911)) ([f96c413](https://github.com/vuejs/core/commit/f96c413e8ef2f24cacda5bb499492922f62c6e8b))
* **types:** fix distribution of union types when unwrapping setup bindings ([#9909](https://github.com/vuejs/core/issues/9909)) ([0695c69](https://github.com/vuejs/core/commit/0695c69e0dfaf99882a623fe75b433c9618ea648)), closes [#9903](https://github.com/vuejs/core/issues/9903)
* **warning:** ensure prod hydration warnings actually work ([b4ebe7a](https://github.com/vuejs/core/commit/b4ebe7ae8b904f28cdda33caf87bc05718d3a08a))
### Features
* **compiler-sfc:** export aggregated error messages for compiler-core and compiler-dom ([25c726e](https://github.com/vuejs/core/commit/25c726eca81fc384b41fafbeba5e8dfcda1f030f))
# [3.4.0-rc.1](https://github.com/vuejs/core/compare/v3.4.0-beta.4...v3.4.0-rc.1) (2023-12-25)
### Bug Fixes
* **compiler-core:** fix parsing `<script setup>` generics with > ([7aa3f25](https://github.com/vuejs/core/commit/7aa3f250f26d58ee2db82af907de8b9105e6e418)), closes [#9890](https://github.com/vuejs/core/issues/9890)
* **compiler-sfc:** fix type resolution for shared type w/ different generic parameters ([a8d0b1b](https://github.com/vuejs/core/commit/a8d0b1b38b092ec2d10b32bedcee2eea33b77657)), closes [#9871](https://github.com/vuejs/core/issues/9871)
* **ssr:** avoid hydration mismatch warning for classes with different order ([e585b0d](https://github.com/vuejs/core/commit/e585b0db43150c8b8b3d78f71e12efccc018a38d))
# [3.4.0-beta.4](https://github.com/vuejs/core/compare/v3.3.13...v3.4.0-beta.4) (2023-12-19)
### Bug Fixes
* **compile-sfc:** fix identifier prefixing edge case caused by reused AST ([#9867](https://github.com/vuejs/core/issues/9867)) ([eb51b23](https://github.com/vuejs/core/commit/eb51b23d8512f15665d6f8bcdfd51582e0cd8ce8)), closes [#9853](https://github.com/vuejs/core/issues/9853) [#9863](https://github.com/vuejs/core/issues/9863)
* **ssr:** fix hydration prop mismatch check for class on SVG elements ([e8448b0](https://github.com/vuejs/core/commit/e8448b018d9f837c08eace90cab404a27f68e31a))
### Features
* **runtime-core:** throw real error when scheduler detects infinite loop during dev ([#7447](https://github.com/vuejs/core/issues/7447)) ([1d79b64](https://github.com/vuejs/core/commit/1d79b64ebce884d97136d71aa722347470b13e35)), closes [#7437](https://github.com/vuejs/core/issues/7437)
## [3.3.13](https://github.com/vuejs/core/compare/v3.3.12...v3.3.13) (2023-12-19)
### Bug Fixes
* **compiler-core:** fix v-on with modifiers on inline expression of undefined ([#9866](https://github.com/vuejs/core/issues/9866)) ([bae79dd](https://github.com/vuejs/core/commit/bae79ddf8564a2da4a5365cfeb8d811990f42335)), closes [#9865](https://github.com/vuejs/core/issues/9865)
* **runtime-dom:** cache event handlers by key/modifiers ([#9851](https://github.com/vuejs/core/issues/9851)) ([04d2c05](https://github.com/vuejs/core/commit/04d2c05054c26b02fbc1d84839b0ed5cd36455b6)), closes [#9849](https://github.com/vuejs/core/issues/9849)
* **types:** extract properties from extended collections ([#9854](https://github.com/vuejs/core/issues/9854)) ([24b1c1d](https://github.com/vuejs/core/commit/24b1c1dd57fd55d998aa231a147500e010b10219)), closes [#9852](https://github.com/vuejs/core/issues/9852)
# [3.4.0-beta.3](https://github.com/vuejs/core/compare/v3.3.12...v3.4.0-beta.3) (2023-12-16)
### Bug Fixes
* **compiler-core:** vnode hooks error message ([#9842](https://github.com/vuejs/core/issues/9842)) ([7bc3c9e](https://github.com/vuejs/core/commit/7bc3c9e205c5158230772d9fcd25bf300809342e))
* **defineModel:** ensure trigger effect when prop changed ([#9841](https://github.com/vuejs/core/issues/9841)) ([eb12f21](https://github.com/vuejs/core/commit/eb12f211b8e312fd64d91ef1a58b2c2db618bdee)), closes [#9838](https://github.com/vuejs/core/issues/9838)
* **mathml:** update known mathML tags ([#9829](https://github.com/vuejs/core/issues/9829)) ([ebd78d2](https://github.com/vuejs/core/commit/ebd78d2c99d9587307e444e6b7baa7bc920d42e7))
* **Suspense:** fix edge case of Suspense being patched during async HOC child remount ([f0f6f7c](https://github.com/vuejs/core/commit/f0f6f7cea6e16650181e71dcfccbee405a1db503))
## [3.3.12](https://github.com/vuejs/core/compare/v3.3.11...v3.3.12) (2023-12-16)
### Bug Fixes
* **hydration:** handle appear transition before patch props ([#9837](https://github.com/vuejs/core/issues/9837)) ([e70f4c4](https://github.com/vuejs/core/commit/e70f4c47c553b6e16d8fad70743271ca23802fe7)), closes [#9832](https://github.com/vuejs/core/issues/9832)
* **sfc/cssVars:** fix loss of CSS v-bind variables when setting inline style with string value ([#9824](https://github.com/vuejs/core/issues/9824)) ([0a387df](https://github.com/vuejs/core/commit/0a387dfb1d04afb6eae4296b6da76dfdaca77af4)), closes [#9821](https://github.com/vuejs/core/issues/9821)
* **ssr:** fix suspense hydration of fallback content ([#7188](https://github.com/vuejs/core/issues/7188)) ([60415b5](https://github.com/vuejs/core/commit/60415b5d67df55f1fd6b176615299c08640fa142))
* **types:** add `xmlns:xlink` to `SVGAttributes` ([#9300](https://github.com/vuejs/core/issues/9300)) ([0d61b42](https://github.com/vuejs/core/commit/0d61b429ecf63591d31e09702058fa4c7132e1a7)), closes [#9299](https://github.com/vuejs/core/issues/9299)
* **types:** fix `shallowRef` type error ([#9839](https://github.com/vuejs/core/issues/9839)) ([9a57158](https://github.com/vuejs/core/commit/9a571582b53220270e498d8712ea59312c0bef3a))
* **types:** support for generic keyof slots ([#8374](https://github.com/vuejs/core/issues/8374)) ([213eba4](https://github.com/vuejs/core/commit/213eba479ce080efc1053fe636f6be4a4c889b44))
# [3.4.0-beta.2](https://github.com/vuejs/core/compare/v3.4.0-beta.1...v3.4.0-beta.2) (2023-12-14)
### Features
* **types:** remove default jsx global registration ([92b8d9c](https://github.com/vuejs/core/commit/92b8d9cef69146540db2bf7f2a5632ab5d38f672))
### BREAKING CHANGES
* **types:** Vue no longer registers the global `JSX` namespace by
default.
# [3.4.0-beta.1](https://github.com/vuejs/core/compare/v3.3.11...v3.4.0-beta.1) (2023-12-13)
### Bug Fixes
* **compiler-core:** use the same resolved options for all compile stages ([#9760](https://github.com/vuejs/core/issues/9760)) ([0dc875d](https://github.com/vuejs/core/commit/0dc875d53e5d869b44d0c1a70736ec859337b58f))
* **hydration:** should not warn mismatch for nullish prop ([33159a5](https://github.com/vuejs/core/commit/33159a5916bf7686fe53517befa59b450b34e974))
* **hydration:** swap client/server labels for hydration mismatch warnings ([f41fd86](https://github.com/vuejs/core/commit/f41fd86d5f26bd0009b4ca285ddc3cefaafa9f7c)), closes [#9098](https://github.com/vuejs/core/issues/9098) [#5953](https://github.com/vuejs/core/issues/5953)
* **runtime-core:** fix suspense crash when patching non-resolved async setup component ([#7290](https://github.com/vuejs/core/issues/7290)) ([bb0c889](https://github.com/vuejs/core/commit/bb0c8899cadd03af22e23c0383aaab363635c5b4)), closes [#5993](https://github.com/vuejs/core/issues/5993) [#6463](https://github.com/vuejs/core/issues/6463) [#6949](https://github.com/vuejs/core/issues/6949) [#6095](https://github.com/vuejs/core/issues/6095) [#8121](https://github.com/vuejs/core/issues/8121)
* **runtime-core:** properly pop warning context when mounting components with async setup ([69a2acc](https://github.com/vuejs/core/commit/69a2acc6ea159da8300a68ecc8953f19932c251b))
* **ssr:** fix suspense hydration of fallback content ([#7188](https://github.com/vuejs/core/issues/7188)) ([60415b5](https://github.com/vuejs/core/commit/60415b5d67df55f1fd6b176615299c08640fa142))
* **ssr:** make isInSSRComponentSetup state sharable across copies of Vue ([e04d821](https://github.com/vuejs/core/commit/e04d821422102446704e223c03e50d26cbb1fe69))
* **Suspense:** handle switching away from kept-alive component before resolve ([aa0c13f](https://github.com/vuejs/core/commit/aa0c13f637df7eb27faa2545ee731f543c0813ec)), closes [#6416](https://github.com/vuejs/core/issues/6416) [#6467](https://github.com/vuejs/core/issues/6467)
* **Suspense:** properly fix [#6416](https://github.com/vuejs/core/issues/6416) ([0db336f](https://github.com/vuejs/core/commit/0db336ff6c640fb9d3e48943c69f4c1737412be4))
* **types:** add `xmlns:xlink` to `SVGAttributes` ([#9300](https://github.com/vuejs/core/issues/9300)) ([0d61b42](https://github.com/vuejs/core/commit/0d61b429ecf63591d31e09702058fa4c7132e1a7)), closes [#9299](https://github.com/vuejs/core/issues/9299)
* **types:** support for generic keyof slots ([#8374](https://github.com/vuejs/core/issues/8374)) ([213eba4](https://github.com/vuejs/core/commit/213eba479ce080efc1053fe636f6be4a4c889b44))
### Features
* **compiler-core:** add current filename to TransformContext ([#8950](https://github.com/vuejs/core/issues/8950)) ([638f1ab](https://github.com/vuejs/core/commit/638f1abbb632000553e2b7d75e87c95d8ca192d6))
* **compiler-sfc:** promote defineModel stable ([#9598](https://github.com/vuejs/core/issues/9598)) ([ef688ba](https://github.com/vuejs/core/commit/ef688ba92bfccbc8b7ea3997eb297665d13e5249))
* **compiler-sfc:** support import attributes and `using` syntax ([#8786](https://github.com/vuejs/core/issues/8786)) ([5b2bd1d](https://github.com/vuejs/core/commit/5b2bd1df78e8ff524c3a184adaa284681aba6574))
* **defineModel:** support local mutation by default, remove local option ([f74785b](https://github.com/vuejs/core/commit/f74785bc4ad351102dde17fdfd2c7276b823111f)), closes [/github.com/vuejs/rfcs/discussions/503#discussioncomment-7566278](https://github.com//github.com/vuejs/rfcs/discussions/503/issues/discussioncomment-7566278)
* MathML support ([#7836](https://github.com/vuejs/core/issues/7836)) ([d42b6ba](https://github.com/vuejs/core/commit/d42b6ba3f530746eb1221eb7a4be0f44eb56f7d3)), closes [#7820](https://github.com/vuejs/core/issues/7820)
* **runtime-core:** provide full props to props validator functions ([#3258](https://github.com/vuejs/core/issues/3258)) ([8e27692](https://github.com/vuejs/core/commit/8e27692029a4645cd54287f776c0420f2b82740b))
* **ssr:** add `__VUE_PROD_HYDRATION_MISMATCH_DETAILS__` feature flag ([#9550](https://github.com/vuejs/core/issues/9550)) ([bc7698d](https://github.com/vuejs/core/commit/bc7698dbfed9b5327a93565f9df336ae5a94d605))
* **ssr:** improve ssr hydration mismatch checks ([#5953](https://github.com/vuejs/core/issues/5953)) ([2ffc1e8](https://github.com/vuejs/core/commit/2ffc1e8cfdc6ec9c45c4a4dd8e3081b2aa138f1e)), closes [#5063](https://github.com/vuejs/core/issues/5063)
* **types:** add emits and slots type to `FunctionalComponent` ([#8644](https://github.com/vuejs/core/issues/8644)) ([927ab17](https://github.com/vuejs/core/commit/927ab17cfc645e82d061fdf227c34689491268e1))
* **types:** export AriaAttributes type ([#8909](https://github.com/vuejs/core/issues/8909)) ([fd0b6ba](https://github.com/vuejs/core/commit/fd0b6ba01660499fa07b0cf360eefaac8cca8287))
* **types:** export ObjectPlugin and FunctionPlugin types ([#8946](https://github.com/vuejs/core/issues/8946)) ([fa4969e](https://github.com/vuejs/core/commit/fa4969e7a3aefa6863203f9294fc5e769ddf6d8f)), closes [#8577](https://github.com/vuejs/core/issues/8577)
* **types:** expose `DefineProps` type ([096ba81](https://github.com/vuejs/core/commit/096ba81817b7da15f61bc55fc1a93f72ac9586e0))
* **types:** expose `PublicProps` type ([#2403](https://github.com/vuejs/core/issues/2403)) ([44135dc](https://github.com/vuejs/core/commit/44135dc95fb8fea26b84d1433839d28b8c21f708))
* **types:** improve event type inference when using `h` with native elements ([#9756](https://github.com/vuejs/core/issues/9756)) ([a625376](https://github.com/vuejs/core/commit/a625376ac8901eea81bf3c66cb531f2157f073ef))
* **types:** provide ComponentInstance type ([#5408](https://github.com/vuejs/core/issues/5408)) ([bfb8565](https://github.com/vuejs/core/commit/bfb856565d3105db4b18991ae9e404e7cc989b25))
* **types:** support passing generics when registering global directives ([#9660](https://github.com/vuejs/core/issues/9660)) ([a41409e](https://github.com/vuejs/core/commit/a41409ed02a8c7220e637f56caf6813edeb077f8))
### Performance Improvements
* use sync watcher for defineModel local mode ([7e60d10](https://github.com/vuejs/core/commit/7e60d1058ff06e3d37c8608f3449453321220edc)), closes [/github.com/vuejs/rfcs/discussions/503#discussioncomment-7566278](https://github.com//github.com/vuejs/rfcs/discussions/503/issues/discussioncomment-7566278)
## [3.3.11](https://github.com/vuejs/core/compare/v3.3.10...v3.3.11) (2023-12-08) ## [3.3.11](https://github.com/vuejs/core/compare/v3.3.10...v3.3.11) (2023-12-08)
@ -14,6 +287,27 @@
# [3.4.0-alpha.4](https://github.com/vuejs/core/compare/v3.3.10...v3.4.0-alpha.4) (2023-12-04)
### Bug Fixes
* **compiler-core:** fix referencing typo ([#9708](https://github.com/vuejs/core/issues/9708)) ([3071de4](https://github.com/vuejs/core/commit/3071de44bc4bf669ab6b48fd8db8d728c30fdb0c))
* **parser:** fix interpolation parsing in v-pre ([53aaa1e](https://github.com/vuejs/core/commit/53aaa1eb2876baf9de16b2f2c77b2c5fd5173900))
* **parser:** properly set initial inXML state based on root ns ([47ea285](https://github.com/vuejs/core/commit/47ea285be3dcb66a83a593346995b5900d6c5478))
* **parser:** should reset inRCDATA state ([ef97e8b](https://github.com/vuejs/core/commit/ef97e8b07d8350106c940f23679444b698832067))
### Features
* **compiler-core:** support accessing Error as global in template expressions ([#7018](https://github.com/vuejs/core/issues/7018)) ([bcca475](https://github.com/vuejs/core/commit/bcca475dbc58d76434cd8120b94929758cee2825))
* **compiler-sfc:** analyze import usage in template via AST ([#9729](https://github.com/vuejs/core/issues/9729)) ([e8bbc94](https://github.com/vuejs/core/commit/e8bbc946cba6bf74c9da56f938b67d2a04c340ba)), closes [#8897](https://github.com/vuejs/core/issues/8897) [nuxt/nuxt#22416](https://github.com/nuxt/nuxt/issues/22416)
* **compiler-sfc:** bump postcss-modules to v6 ([2a507e3](https://github.com/vuejs/core/commit/2a507e32f0e2ef73813705a568b8633f68bda7a9))
* **compiler:** lift vnode hooks deprecation warning to error ([8abc754](https://github.com/vuejs/core/commit/8abc754d5d86d9dfd5a7927b846f1a743f352364))
* use enum to replace const enum ([#9261](https://github.com/vuejs/core/issues/9261)) ([fff7b86](https://github.com/vuejs/core/commit/fff7b864f4292d0430ba2bda7098ad43876b0210)), closes [#1228](https://github.com/vuejs/core/issues/1228)
## [3.3.10](https://github.com/vuejs/core/compare/v3.3.9...v3.3.10) (2023-12-04) ## [3.3.10](https://github.com/vuejs/core/compare/v3.3.9...v3.3.10) (2023-12-04)
@ -45,6 +339,62 @@
# [3.4.0-alpha.3](https://github.com/vuejs/core/compare/v3.4.0-alpha.2...v3.4.0-alpha.3) (2023-11-28)
### Bug Fixes
* **deps:** update compiler to ^7.23.4 ([#9681](https://github.com/vuejs/core/issues/9681)) ([31f6ebc](https://github.com/vuejs/core/commit/31f6ebc4df84490ed29fb75e7bf4259200eb51f0))
* **parser:** directive arg should be undefined on shorthands with no arg ([e49dffc](https://github.com/vuejs/core/commit/e49dffc9ece86bddf094b9ad4ad15eb4856d6277))
### Features
* **dx:** link errors to docs in prod build ([#9165](https://github.com/vuejs/core/issues/9165)) ([9f8ba98](https://github.com/vuejs/core/commit/9f8ba9821fe166f77e63fa940e9e7e13ec3344fa))
# [3.4.0-alpha.2](https://github.com/vuejs/core/compare/v3.3.9...v3.4.0-alpha.2) (2023-11-27)
### Bug Fixes
* avoid confusing breakage in @vitejs/plugin-vue ([ceec69c](https://github.com/vuejs/core/commit/ceec69c8ccb96c433a4a506ad2e85e276998bade))
* **compiler-core:** fix line/column tracking when fast forwarding ([2e65ea4](https://github.com/vuejs/core/commit/2e65ea481f74db8649df8110a031cbdc98f98c84))
* **compiler-sfc:** fix ast reuse for ssr ([fb619cf](https://github.com/vuejs/core/commit/fb619cf9a440239f0ba88e327d10001a6a3c8171))
* **compiler-sfc:** support `:is` and `:where` selector in scoped css rewrite ([#8929](https://github.com/vuejs/core/issues/8929)) ([c6083dc](https://github.com/vuejs/core/commit/c6083dcad31f3e9292c687fada9e32f287e2317f))
* **compiler-sfc:** use correct compiler when re-parsing in ssr mode ([678378a](https://github.com/vuejs/core/commit/678378afd559481badb486b243722b6287862e09))
* feat!: remove reactivity transform (#9321) ([79b8a09](https://github.com/vuejs/core/commit/79b8a0905bf363bf82edd2096fef10c3db6d9c3c)), closes [#9321](https://github.com/vuejs/core/issues/9321)
### Features
* **compiler-core:** support specifying root namespace when parsing ([40f72d5](https://github.com/vuejs/core/commit/40f72d5e50b389cb11b7ca13461aa2a75ddacdb4))
* **compiler-core:** support v-bind shorthand for key and value with the same name ([#9451](https://github.com/vuejs/core/issues/9451)) ([26399aa](https://github.com/vuejs/core/commit/26399aa6fac1596b294ffeba06bb498d86f5508c))
* **compiler:** improve parsing tolerance for language-tools ([41ff68e](https://github.com/vuejs/core/commit/41ff68ea579d933333392146625560359acb728a))
* **reactivity:** expose last result for computed getter ([#9497](https://github.com/vuejs/core/issues/9497)) ([48b47a1](https://github.com/vuejs/core/commit/48b47a1ab63577e2dbd91947eea544e3ef185b85))
### Performance Improvements
* avoid sfc source map unnecessary serialization and parsing ([f15d2f6](https://github.com/vuejs/core/commit/f15d2f6cf69c0c39f8dfb5c33122790c68bf92e2))
* **codegen:** optimize line / column calculation during codegen ([3be53d9](https://github.com/vuejs/core/commit/3be53d9b974dae1a10eb795cade71ae765e17574))
* **codegen:** optimize source map generation ([c11002f](https://github.com/vuejs/core/commit/c11002f16afd243a2b15b546816e73882eea9e4d))
* **compiler-sfc:** remove magic-string trim on script ([e8e3ec6](https://github.com/vuejs/core/commit/e8e3ec6ca7392e43975c75b56eaaa711d5ea9410))
* **compiler-sfc:** use faster source map addMapping ([50cde7c](https://github.com/vuejs/core/commit/50cde7cfbcc49022ba88f5f69fa9b930b483c282))
* optimize away isBuiltInType ([66c0ed0](https://github.com/vuejs/core/commit/66c0ed0a3c1c6f37dafc6b1c52b75c6bf60e3136))
* optimize makeMap ([ae6fba9](https://github.com/vuejs/core/commit/ae6fba94954bac6430902f77b0d1113a98a75b18))
* optimize position cloning ([2073236](https://github.com/vuejs/core/commit/20732366b9b3530d33b842cf1fc985919afb9317))
### BREAKING CHANGES
* Reactivity Transform was marked deprecated in 3.3 and is now removed in 3.4. This change does not require a major due to the feature being experimental. Users who wish to continue using the feature can do so via the external plugin at https://vue-macros.dev/features/reactivity-transform.html
## [3.3.9](https://github.com/vuejs/core/compare/v3.3.8...v3.3.9) (2023-11-25) ## [3.3.9](https://github.com/vuejs/core/compare/v3.3.8...v3.3.9) (2023-11-25)
@ -94,486 +444,24 @@
## [3.3.7](https://github.com/vuejs/core/compare/v3.3.6...v3.3.7) (2023-10-24) # [3.4.0-alpha.1](https://github.com/vuejs/core/compare/v3.3.7...v3.4.0-alpha.1) (2023-10-28)
### Bug Fixes
* **compiler-sfc:** avoid gen useCssVars when targeting SSR ([#6979](https://github.com/vuejs/core/issues/6979)) ([c568778](https://github.com/vuejs/core/commit/c568778ea3265d8e57f788b00864c9509bf88a4e)), closes [#6926](https://github.com/vuejs/core/issues/6926)
* **compiler-ssr:** proper scope analysis for ssr vnode slot fallback ([#7184](https://github.com/vuejs/core/issues/7184)) ([e09c26b](https://github.com/vuejs/core/commit/e09c26bc9bc4394c2c2d928806d382515c2676f3)), closes [#7095](https://github.com/vuejs/core/issues/7095)
* correctly resolve types from relative paths on Windows ([#9446](https://github.com/vuejs/core/issues/9446)) ([089d36d](https://github.com/vuejs/core/commit/089d36d167dc7834065b03ca689f9b6a44eead8a)), closes [#8671](https://github.com/vuejs/core/issues/8671)
* **hmr:** fix hmr error for hoisted children array in v-for ([7334376](https://github.com/vuejs/core/commit/733437691f70ebca8dd6cc3bc8356f5b57d4d5d8)), closes [#6978](https://github.com/vuejs/core/issues/6978) [#7114](https://github.com/vuejs/core/issues/7114)
* **reactivity:** assigning array.length while observing a symbol property ([#7568](https://github.com/vuejs/core/issues/7568)) ([e9e2778](https://github.com/vuejs/core/commit/e9e2778e9ec5cca07c1df5f0c9b7b3595a1a3244))
* **scheduler:** ensure jobs are in the correct order ([#7748](https://github.com/vuejs/core/issues/7748)) ([a8f6638](https://github.com/vuejs/core/commit/a8f663867b8cd2736b82204bc58756ef02441276)), closes [#7576](https://github.com/vuejs/core/issues/7576)
* **ssr:** fix hydration mismatch for disabled teleport at component root ([#9399](https://github.com/vuejs/core/issues/9399)) ([d8990fc](https://github.com/vuejs/core/commit/d8990fc6182d1c2cf0a8eab7b35a9d04df668507)), closes [#6152](https://github.com/vuejs/core/issues/6152)
* **Suspense:** calling hooks before the transition finishes ([#9388](https://github.com/vuejs/core/issues/9388)) ([00de3e6](https://github.com/vuejs/core/commit/00de3e61ed7a55e7d6c2e1987551d66ad0f909ff)), closes [#5844](https://github.com/vuejs/core/issues/5844) [#5952](https://github.com/vuejs/core/issues/5952)
* **transition/ssr:** make transition appear work with SSR ([#8859](https://github.com/vuejs/core/issues/8859)) ([5ea8a8a](https://github.com/vuejs/core/commit/5ea8a8a4fab4e19a71e123e4d27d051f5e927172)), closes [#6951](https://github.com/vuejs/core/issues/6951)
* **types:** fix ComponentCustomProps augmentation ([#9468](https://github.com/vuejs/core/issues/9468)) ([7374e93](https://github.com/vuejs/core/commit/7374e93f0281f273b90ab5a6724cc47332a01d6c)), closes [#8376](https://github.com/vuejs/core/issues/8376)
* **types:** improve `h` overload to support union of string and component ([#5432](https://github.com/vuejs/core/issues/5432)) ([16ecb44](https://github.com/vuejs/core/commit/16ecb44c89cd8299a3b8de33cccc2e2cc36f065b)), closes [#5431](https://github.com/vuejs/core/issues/5431)
## [3.3.6](https://github.com/vuejs/core/compare/v3.3.5...v3.3.6) (2023-10-20)
### Bug Fixes
* **compiler-sfc:** model name conflict ([#8798](https://github.com/vuejs/core/issues/8798)) ([df81da8](https://github.com/vuejs/core/commit/df81da8be97c8a1366563c7e3e01076ef02eb8f7))
* **compiler-sfc:** support asset paths containing spaces ([#8752](https://github.com/vuejs/core/issues/8752)) ([36c99a9](https://github.com/vuejs/core/commit/36c99a9c6bb6bc306be054c3c8a85ff8ce50605a))
* **compiler-ssr:** fix missing scopeId on server-rendered TransitionGroup ([#7557](https://github.com/vuejs/core/issues/7557)) ([61c1357](https://github.com/vuejs/core/commit/61c135742795aa5e3189a79c7dec6afa21bbc8d9)), closes [#7554](https://github.com/vuejs/core/issues/7554)
* **compiler-ssr:** fix ssr compile error for select with non-option children ([#9442](https://github.com/vuejs/core/issues/9442)) ([cdb2e72](https://github.com/vuejs/core/commit/cdb2e725e7ea297f1f4180fb04889a3b757bc84e)), closes [#9440](https://github.com/vuejs/core/issues/9440)
* **runtime-core:** delete stale slots which are present but undefined ([#6484](https://github.com/vuejs/core/issues/6484)) ([75b8722](https://github.com/vuejs/core/commit/75b872213574cb37e2c9e8a15f65613f867ca9a6)), closes [#9109](https://github.com/vuejs/core/issues/9109)
* **runtime-core:** fix error when using cssvars with disabled teleport ([#7341](https://github.com/vuejs/core/issues/7341)) ([8f0472c](https://github.com/vuejs/core/commit/8f0472c9abedb337dc256143b69d8ab8759dbf5c)), closes [#7342](https://github.com/vuejs/core/issues/7342)
* **teleport:** ensure descendent component would be unmounted correctly ([#6529](https://github.com/vuejs/core/issues/6529)) ([4162311](https://github.com/vuejs/core/commit/4162311efdb0db5ca458542e1604b19efa2fae0e)), closes [#6347](https://github.com/vuejs/core/issues/6347)
* **types:** support contenteditable="plaintext-only" ([#8796](https://github.com/vuejs/core/issues/8796)) ([26ca89e](https://github.com/vuejs/core/commit/26ca89e5cf734fbef81e182050d2a215ec8a437b))
### Performance Improvements
* replace Map/Set with WeakMap/WeakSet ([#8549](https://github.com/vuejs/core/issues/8549)) ([712f96d](https://github.com/vuejs/core/commit/712f96d6ac4d3d984732cba448cb84624daba850))
## [3.3.5](https://github.com/vuejs/core/compare/v3.3.4...v3.3.5) (2023-10-20)
### Bug Fixes
* add isGloballyWhitelisted back, but deprecated ([#8556](https://github.com/vuejs/core/issues/8556)) ([63dfe8e](https://github.com/vuejs/core/commit/63dfe8eab499979bcc2f7829e82464e13899c895)), closes [#8416](https://github.com/vuejs/core/issues/8416)
* **build:** disable useDefineForClassFields in esbuild ([#9252](https://github.com/vuejs/core/issues/9252)) ([6d14fa8](https://github.com/vuejs/core/commit/6d14fa88e85d4c9e264be394ddb37a54ca6738a8))
* **compat:** return value of vue compat set() ([#9377](https://github.com/vuejs/core/issues/9377)) ([e3c2d69](https://github.com/vuejs/core/commit/e3c2d699f694d9500ddee78571172a24f0e3b17a))
* **compiler-sfc:** don't hoist props and emit ([#8535](https://github.com/vuejs/core/issues/8535)) ([24db951](https://github.com/vuejs/core/commit/24db9516d8b4857182ec1a3af86cb7346691679b)), closes [#7805](https://github.com/vuejs/core/issues/7805) [#7812](https://github.com/vuejs/core/issues/7812)
* **compiler-sfc:** don't registerTS when bundling for browsers ([#8582](https://github.com/vuejs/core/issues/8582)) ([6f45f76](https://github.com/vuejs/core/commit/6f45f76df2c43796b35067ef8f8b9a7bca454040))
* **compiler-sfc:** fix using imported ref as template ref during dev ([#7593](https://github.com/vuejs/core/issues/7593)) ([776ebf2](https://github.com/vuejs/core/commit/776ebf25b2e7570e78ac1c148fc45c823c21a542)), closes [#7567](https://github.com/vuejs/core/issues/7567)
* **compiler-sfc:** handle dynamic directive arguments in template usage check ([#8538](https://github.com/vuejs/core/issues/8538)) ([e404a69](https://github.com/vuejs/core/commit/e404a699f48ae5c5a5da947f42679343192158c7)), closes [#8537](https://github.com/vuejs/core/issues/8537)
* **compiler-sfc:** ignore style v-bind in double slash comments ([#5409](https://github.com/vuejs/core/issues/5409)) ([381b497](https://github.com/vuejs/core/commit/381b4977af25ba5392704f72ec6b3f2394d87ae7))
* **compiler-sfc:** pass options directly to stylus ([#3848](https://github.com/vuejs/core/issues/3848)) ([d6446a6](https://github.com/vuejs/core/commit/d6446a6d40774b79045a9ddba7b5fd5201d51450))
* **compiler-sfc:** support resolve multiple re-export /w same source type name ([#8365](https://github.com/vuejs/core/issues/8365)) ([4fa8da8](https://github.com/vuejs/core/commit/4fa8da8576717c619e1e8c04d19038488c75fbea)), closes [#8364](https://github.com/vuejs/core/issues/8364)
* **compiler-sfc:** typo in experimental feature warnings ([#8513](https://github.com/vuejs/core/issues/8513)) ([fd1a3f9](https://github.com/vuejs/core/commit/fd1a3f95990d7c372fa1c0c40c55caca761a33a4))
* **deps:** update dependency monaco-editor to ^0.44.0 ([#9237](https://github.com/vuejs/core/issues/9237)) ([8611874](https://github.com/vuejs/core/commit/8611874e09a827b6491173836c8942284d5de22c))
* **deps:** update playground ([#9154](https://github.com/vuejs/core/issues/9154)) ([c8566a2](https://github.com/vuejs/core/commit/c8566a22b7cf37e6aefab7bad7b97ce2db9fae4c))
* **playground:** fix github button style ([#7722](https://github.com/vuejs/core/issues/7722)) ([5ee992c](https://github.com/vuejs/core/commit/5ee992cfeabc6c4b871980c6057d0ac7140ad2fa))
* **runtime-core:** swap client/server debug labels ([#9089](https://github.com/vuejs/core/issues/9089)) ([8f311c6](https://github.com/vuejs/core/commit/8f311c6f823f6776ca1c49bfbbbf8c7d9dea9cf1))
* **ssr:** render correct initial selected state for select with v-model ([#7432](https://github.com/vuejs/core/issues/7432)) ([201c46d](https://github.com/vuejs/core/commit/201c46df07a38f3c2b73f384e8e6846dc62f224e)), closes [#7392](https://github.com/vuejs/core/issues/7392)
* **ssr:** reset current instance if setting up options component errors ([#7743](https://github.com/vuejs/core/issues/7743)) ([020851e](https://github.com/vuejs/core/commit/020851e57d9a9f727c6ea07e9c1575430af02b73)), closes [#7733](https://github.com/vuejs/core/issues/7733)
* **teleport:** handle target change while disabled ([#7837](https://github.com/vuejs/core/issues/7837)) ([140a89b](https://github.com/vuejs/core/commit/140a89b833bceed60838182b875d2953c70af114)), closes [#7835](https://github.com/vuejs/core/issues/7835)
* **transition:** handle possible auto value for transition/animation durations ([96c76fa](https://github.com/vuejs/core/commit/96c76facb7de37fc241ccd55e121fd60a49a1452)), closes [#8409](https://github.com/vuejs/core/issues/8409)
* **types/jsx:** add `inert` attribute and missing `hidden` values ([#8090](https://github.com/vuejs/core/issues/8090)) ([ceb0732](https://github.com/vuejs/core/commit/ceb0732e0b1bb4c8c505d80e97ff6fc89035fa90))
* **types/jsx:** add missing loading attr for img element ([#6160](https://github.com/vuejs/core/issues/6160)) ([68d6b43](https://github.com/vuejs/core/commit/68d6b43f7e29b76aab2c6c1882885380a43fa3e3))
* **types:** correct withDefaults return type for boolean prop with undefined default value ([#8602](https://github.com/vuejs/core/issues/8602)) ([f07cb18](https://github.com/vuejs/core/commit/f07cb18fedf9a446545aadf76bcdfb957c7ebcbd))
* **types:** ensure nextTick return type reflect correct Promise value ([#8406](https://github.com/vuejs/core/issues/8406)) ([6a22b1f](https://github.com/vuejs/core/commit/6a22b1f6c287b60eda385df8a514335af8e040ea))
* **types:** support correct types for style on svg elements ([#6322](https://github.com/vuejs/core/issues/6322)) ([364dc53](https://github.com/vuejs/core/commit/364dc53c7cc6f97d812ad175199c698faa92538e))
### Performance Improvements
* **compiler-sfc:** lazy require typescript ([d2c3d8b](https://github.com/vuejs/core/commit/d2c3d8b70b2df6e16f053a7ac58e6b04e7b2078f))
* **custom-element:** cancel `MutationObserver` listener when disconnected ([#8666](https://github.com/vuejs/core/issues/8666)) ([24d98f0](https://github.com/vuejs/core/commit/24d98f03276de5b0fbced5a4c9d61b24e7d9d084))
* mark `defineComponent` as side-effects-free ([#8512](https://github.com/vuejs/core/issues/8512)) ([438027c](https://github.com/vuejs/core/commit/438027cf9ecb63260f59d3027e0b188717694795))
## [3.3.4](https://github.com/vuejs/core/compare/v3.3.3...v3.3.4) (2023-05-18)
### Bug Fixes
* **build:** ensure correct typing for node esm ([d621d4c](https://github.com/vuejs/core/commit/d621d4c646b2d7b190fbd44ad1fd04512b3de300))
* **build:** fix __DEV__ flag replacement edge case ([8b7c04b](https://github.com/vuejs/core/commit/8b7c04b18f73aad9a08dd57eba90101b5b2aef28)), closes [#8353](https://github.com/vuejs/core/issues/8353)
* **compiler-sfc:** handle imported types from default exports ([5aec717](https://github.com/vuejs/core/commit/5aec717a2402652306085f58432ba3ab91848a74)), closes [#8355](https://github.com/vuejs/core/issues/8355)
## [3.3.3](https://github.com/vuejs/core/compare/v3.3.2...v3.3.3) (2023-05-18)
### Bug Fixes
* avoid regex s flag for old browsers ([91f1c62](https://github.com/vuejs/core/commit/91f1c62e6384a8b09f90e7e43b8d347901e529a0)), closes [#8316](https://github.com/vuejs/core/issues/8316)
* **build:** fix dev flag replacement in esm-builder builds ([#8314](https://github.com/vuejs/core/issues/8314)) ([003836f](https://github.com/vuejs/core/commit/003836f90e1f00ebd04b77ec07ccfa4e649a2ff4)), closes [#8312](https://github.com/vuejs/core/issues/8312)
* **compiler-sfc:** don't hoist regexp literial ([#8300](https://github.com/vuejs/core/issues/8300)) ([8ec73a3](https://github.com/vuejs/core/commit/8ec73a3aea7a52e9479f107ae5737761166ddae6))
* **compiler-sfc:** fix props destructing default value type checking with unresolved type ([#8340](https://github.com/vuejs/core/issues/8340)) ([f69dbab](https://github.com/vuejs/core/commit/f69dbabf8794426c3e9ed33ae77dd8ce655eafd2)), closes [#8326](https://github.com/vuejs/core/issues/8326)
* **compiler-sfc:** fix type import from path aliased vue file ([fab9c72](https://github.com/vuejs/core/commit/fab9c727805c6186c490f99023e8cf5401b0b5a9)), closes [#8348](https://github.com/vuejs/core/issues/8348)
* **compiler-sfc:** handle ts files with relative imports with .js extension ([b36addd](https://github.com/vuejs/core/commit/b36addd3bde07467e9ff5641bd1c2bdc3085944c)), closes [#8339](https://github.com/vuejs/core/issues/8339)
* **compiler-sfc:** parses correctly when inline mode is off ([#8337](https://github.com/vuejs/core/issues/8337)) ([ecbd42a](https://github.com/vuejs/core/commit/ecbd42a1444e3c599e464dec002e43d548d99669)), closes [#6088](https://github.com/vuejs/core/issues/6088)
* **compiler-sfc:** support defineEmits type reference with unions ([#8299](https://github.com/vuejs/core/issues/8299)) ([b133e0f](https://github.com/vuejs/core/commit/b133e0fd97b0b4fabbb43151c19031b8fb47c05b)), closes [#7943](https://github.com/vuejs/core/issues/7943)
* **types:** support generic usage with withDefaults + defineProps ([#8335](https://github.com/vuejs/core/issues/8335)) ([216f269](https://github.com/vuejs/core/commit/216f26995b63c2df26ca0f39f390fe8d59cdabfa)), closes [#8310](https://github.com/vuejs/core/issues/8310) [#8331](https://github.com/vuejs/core/issues/8331) [#8325](https://github.com/vuejs/core/issues/8325)
## [3.3.2](https://github.com/vuejs/core/compare/v3.3.1...v3.3.2) (2023-05-12)
### Bug Fixes
* **compiler-core:** treat floating point numbers as constants ([8dc8cf8](https://github.com/vuejs/core/commit/8dc8cf852bf8057aa5c4b5670f09e8c28a168b73)), closes [#8295](https://github.com/vuejs/core/issues/8295)
* **compiler-dom:** do not throw in production on side effect tags ([c454b9d](https://github.com/vuejs/core/commit/c454b9d7f431d57abedb7184d1e4059914c4463f)), closes [#8287](https://github.com/vuejs/core/issues/8287) [#8292](https://github.com/vuejs/core/issues/8292)
* **compiler-sfc:** fix regression on props destructure when transform is not enabled ([f25bd37](https://github.com/vuejs/core/commit/f25bd37c6707fde19d164d90a38de41168941f4b)), closes [#8289](https://github.com/vuejs/core/issues/8289)
* **compiler-sfc:** handle prop keys that need escaping ([#7803](https://github.com/vuejs/core/issues/7803)) ([690ef29](https://github.com/vuejs/core/commit/690ef296357c7fc09f66ba9408df548e117f686f)), closes [#8291](https://github.com/vuejs/core/issues/8291)
* **compiler-sfc:** properly parse d.ts files when resolving types ([aa1e77d](https://github.com/vuejs/core/commit/aa1e77d532b951ea5d3a5e26214a8b0c9c02fb6f)), closes [#8285](https://github.com/vuejs/core/issues/8285)
* **compiler-sfc:** raise specific warning for failed extends and allow ignoring extends ([8235072](https://github.com/vuejs/core/commit/82350721a408e1f552c613c05971439d6c218d87)), closes [#8286](https://github.com/vuejs/core/issues/8286)
## [3.3.1](https://github.com/vuejs/core/compare/v3.3.0...v3.3.1) (2023-05-11)
### Bug Fixes
* **suspense:** handle nested sync suspense for hydration ([a3f5485](https://github.com/vuejs/core/commit/a3f54857858c8ca0e6b9f12618d151ab255fb040))
# [3.3.0 Rurouni Kenshin](https://github.com/vuejs/core/compare/v3.3.0-beta.5...v3.3.0) (2023-05-11)
- For a detailed walkthrough of the new features in 3.3, please read the [release blog post](https://blog.vuejs.org/posts/vue-3-3).
- Features and deprecations listed here are aggregated from the beta and alpha releases. For full chronological history, bug fixes, and other minor features, please consult the individual logs of the 3.3 beta and alpha releases.
## Features
* **sfc:** support imported types in SFC macros ([#8083](https://github.com/vuejs/core/pull/8083))
* **types/slots:** support slot presence / props type checks via `defineSlots` macro and `slots` option ([#7982](https://github.com/vuejs/core/issues/7982)) ([5a2f5d5](https://github.com/vuejs/core/commit/5a2f5d59cffa36a99e6f2feab6b3ba7958b7362f))
* **sfc:** support more ergnomic defineEmits type syntax ([#7992](https://github.com/vuejs/core/issues/7992)) ([8876dcc](https://github.com/vuejs/core/commit/8876dccf42a7f05375d97cb18c1afdfd0fc51c94))
* **sfc:** introduce `defineModel` macro and `useModel` helper ([#8018](https://github.com/vuejs/core/issues/8018)) ([14f3d74](https://github.com/vuejs/core/commit/14f3d747a34d45415b0036b274517d70a27ec0d3))
* **reactivity:** improve support of getter usage in reactivity APIs ([#7997](https://github.com/vuejs/core/issues/7997)) ([59e8284](https://github.com/vuejs/core/commit/59e828448e7f37643cd0eaea924a764e9d314448))
* **compiler-sfc:** add defineOptions macro ([#5738](https://github.com/vuejs/core/issues/5738)) ([bcf5841](https://github.com/vuejs/core/commit/bcf5841ddecc64d0bdbd56ce1463eb8ebf01bb9d))
* **types/jsx:** support jsxImportSource, avoid global JSX conflict ([#7958](https://github.com/vuejs/core/issues/7958)) ([d0b7ef3](https://github.com/vuejs/core/commit/d0b7ef3b61d5f83e35e5854b3c2c874e23463102))
* **dx:** improve readability of displayed types for props ([4c9bfd2](https://github.com/vuejs/core/commit/4c9bfd2b999ce472f7481aae4f9dc5bb9f76628e))
* **app:** app.runWithContext() ([#7451](https://github.com/vuejs/core/issues/7451)) ([869f3fb](https://github.com/vuejs/core/commit/869f3fb93e61400be4fd925e0850c2b1564749e2))
* hasInjectionContext() for libraries ([#8111](https://github.com/vuejs/core/issues/8111)) ([5510ce3](https://github.com/vuejs/core/commit/5510ce385abfa151c07a5253cccf4abccabdd01d))
* allow accessing console in template ([#6508](https://github.com/vuejs/core/issues/6508)) ([fe76224](https://github.com/vuejs/core/commit/fe762247f8035d28d543bc5602ad01b0c258f6d6)), closes [#7939](https://github.com/vuejs/core/issues/7939)
* **suspense:** introduce suspensible option for `<Suspense>` ([#6736](https://github.com/vuejs/core/issues/6736)) ([cb37d0b](https://github.com/vuejs/core/commit/cb37d0b9ffb5d4bb81a0367d84295dec8dd4448c)), closes [#5513](https://github.com/vuejs/core/issues/5513)
* **compiler-dom:** treat inert as boolean attribute ([#8209](https://github.com/vuejs/core/issues/8209)) ([918ec8a](https://github.com/vuejs/core/commit/918ec8a5cbc825a3947cd35fe966671c245af087)), closes [#8208](https://github.com/vuejs/core/issues/8208)
* **types:** add slots types for built-in components ([#6033](https://github.com/vuejs/core/issues/6033)) ([3cb4dc9](https://github.com/vuejs/core/commit/3cb4dc9e5538e1c2bde9fa691b001615a848c546))
* **types:** provide ExtractPublicPropTypes utility type ([bff63c5](https://github.com/vuejs/core/commit/bff63c5498f5fa098689c18defe48ae08d47eadb)), closes [#5272](https://github.com/vuejs/core/issues/5272) [#8168](https://github.com/vuejs/core/issues/8168)
* **compiler-sfc:** expose parseCache ([4576548](https://github.com/vuejs/core/commit/45765488d498d94f8760c9e82f1177070057b17c)), closes [#8202](https://github.com/vuejs/core/issues/8202)
## Deprecations
* **deprecation:** deprecate [@vnode](https://github.com/vnode) hooks in favor of vue: prefix ([5f0394a](https://github.com/vuejs/core/commit/5f0394a5ab88c82c74e240161499721f63d5462e))
* **deprecation:** deprecate v-is directive ([bbd8301](https://github.com/vuejs/core/commit/bbd8301a1344b02de635ea16d4822db1c343bd12))
* **deprecation:** unwrap injected refs in Options API by default, deprecate app.config.unwrapInjectedRefs ([526fa3b](https://github.com/vuejs/core/commit/526fa3b2ccf038375e76f8af2f1ddf79a7388878))
# [3.3.0-beta.5](https://github.com/vuejs/core/compare/v3.3.0-beta.4...v3.3.0-beta.5) (2023-05-08)
### Bug Fixes
* **build:** retain defineComponent() treeshakability in Rollup ([c2172f3](https://github.com/vuejs/core/commit/c2172f3a0ebbd7153e209dd8df6d9724bc524d9a)), closes [#8236](https://github.com/vuejs/core/issues/8236)
* **compiler-sfc:** enable props destructure when reactivity transform option is enabled ([862edfd](https://github.com/vuejs/core/commit/862edfd91a2c2f6b75f943cb1a9682c4be5d7fa8))
* **compiler-sfc:** fix built-in type resolving in external files ([6b194bc](https://github.com/vuejs/core/commit/6b194bcf3b8143895c2a472cd87998ebf9856146)), closes [#8244](https://github.com/vuejs/core/issues/8244)
* **compiler-sfc:** transform destructured props when reactivity transform option is enabled ([#8252](https://github.com/vuejs/core/issues/8252)) ([287bd99](https://github.com/vuejs/core/commit/287bd999942e58925377f50540c7134cff2a9279))
* **runtime-core:** ensure defineComponent name in extraOptions takes higher priority ([b2be75b](https://github.com/vuejs/core/commit/b2be75bad4ba70da1da6930eb914e51ce2c630b2))
* **runtime-dom:** check attribute value when setting option value ([#8246](https://github.com/vuejs/core/issues/8246)) ([4495373](https://github.com/vuejs/core/commit/4495373d28d9fa4479eedd224adb16248ae0b9f4)), closes [#8227](https://github.com/vuejs/core/issues/8227)
* **suspense:** fix nested suspensible suspense with no asyn deps ([e147512](https://github.com/vuejs/core/commit/e1475129fc6f8c086c2ec667476900b8c8f46774)), closes [#8206](https://github.com/vuejs/core/issues/8206)
* **types:** remove short syntax support in defineSlots() ([1279b17](https://github.com/vuejs/core/commit/1279b1730079f77692a0817d51bbba57eb2b871b))
# [3.3.0-beta.4](https://github.com/vuejs/core/compare/v3.3.0-beta.3...v3.3.0-beta.4) (2023-05-05)
### Bug Fixes
* **runtime-core:** handle template ref with number values ([#8233](https://github.com/vuejs/core/issues/8233)) ([1b1242f](https://github.com/vuejs/core/commit/1b1242f4d1349e361335b2815f41742d41283a94)), closes [#8230](https://github.com/vuejs/core/issues/8230)
* **types:** retain compatibility for provide() usage with explicit type parameter ([038cd83](https://github.com/vuejs/core/commit/038cd830d5b34b47d7e7e1c61f0973d27cd8b915))
### Features ### Features
* **compiler-dom:** treat inert as boolean attribute ([#8209](https://github.com/vuejs/core/issues/8209)) ([918ec8a](https://github.com/vuejs/core/commit/918ec8a5cbc825a3947cd35fe966671c245af087)), closes [#8208](https://github.com/vuejs/core/issues/8208) * **compiler-core:** export error message ([#8729](https://github.com/vuejs/core/issues/8729)) ([f7e80ee](https://github.com/vuejs/core/commit/f7e80ee4a065a9eaba98720abf415d9e87756cbd))
* **types:** add slots types for built-in components ([#6033](https://github.com/vuejs/core/issues/6033)) ([3cb4dc9](https://github.com/vuejs/core/commit/3cb4dc9e5538e1c2bde9fa691b001615a848c546)) * **compiler-sfc:** expose resolve type-based props and emits ([#8874](https://github.com/vuejs/core/issues/8874)) ([9e77580](https://github.com/vuejs/core/commit/9e77580c0c2f0d977bd0031a1d43cc334769d433))
* **types:** provide ExtractPublicPropTypes utility type ([bff63c5](https://github.com/vuejs/core/commit/bff63c5498f5fa098689c18defe48ae08d47eadb)), closes [#5272](https://github.com/vuejs/core/issues/5272) [#8168](https://github.com/vuejs/core/issues/8168) * export runtime error strings ([#9301](https://github.com/vuejs/core/issues/9301)) ([feb2f2e](https://github.com/vuejs/core/commit/feb2f2edce2d91218a5e9a52c81e322e4033296b))
* **reactivity:** more efficient reactivity system ([#5912](https://github.com/vuejs/core/issues/5912)) ([16e06ca](https://github.com/vuejs/core/commit/16e06ca08f5a1e2af3fc7fb35de153dbe0c3087d)), closes [#311](https://github.com/vuejs/core/issues/311) [#1811](https://github.com/vuejs/core/issues/1811) [#6018](https://github.com/vuejs/core/issues/6018) [#7160](https://github.com/vuejs/core/issues/7160) [#8714](https://github.com/vuejs/core/issues/8714) [#9149](https://github.com/vuejs/core/issues/9149) [#9419](https://github.com/vuejs/core/issues/9419) [#9464](https://github.com/vuejs/core/issues/9464)
* **runtime-core:** add `once` option to watch ([#9034](https://github.com/vuejs/core/issues/9034)) ([a645e7a](https://github.com/vuejs/core/commit/a645e7aa51006516ba668b3a4365d296eb92ee7d))
# [3.3.0-beta.3](https://github.com/vuejs/core/compare/v3.3.0-beta.2...v3.3.0-beta.3) (2023-05-01)
### Bug Fixes
* **compiler-core:** handle slot argument parsing edge case ([b434d12](https://github.com/vuejs/core/commit/b434d12bf6cbd49a7c99b1646d9517d8393ea49f))
* **hmr:** keep slots proxy mutable for hmr ([c117d9c](https://github.com/vuejs/core/commit/c117d9c257820481b85304db26ce5c77af5d050c)), closes [#8188](https://github.com/vuejs/core/issues/8188)
* **types:** fix provide type checking for ref value ([de87e6e](https://github.com/vuejs/core/commit/de87e6e405dfaf9a917d7eb423fcee35237c2020)), closes [#8201](https://github.com/vuejs/core/issues/8201)
### Features
* **compiler-sfc:** expose parseCache ([4576548](https://github.com/vuejs/core/commit/45765488d498d94f8760c9e82f1177070057b17c)), closes [#8202](https://github.com/vuejs/core/issues/8202)
# [3.3.0-beta.2](https://github.com/vuejs/core/compare/v3.3.0-beta.1...v3.3.0-beta.2) (2023-04-25)
### Bug Fixes
* **compiler-sfc:** avoid all hard errors when inferring runtime type ([2d9f6f9](https://github.com/vuejs/core/commit/2d9f6f926453c46f542789927bcd30d15da9c24b))
* **compiler-sfc:** normalize windows paths when resolving types ([#8136](https://github.com/vuejs/core/issues/8136)) ([29da504](https://github.com/vuejs/core/commit/29da50468770fcee16ba5d5bec7166dd5bc120ee))
* **compiler-sfc:** props bindings should not override user declared bindings ([433a58c](https://github.com/vuejs/core/commit/433a58ccb61c25512dcc3df155b8e285256917ef)), closes [#8148](https://github.com/vuejs/core/issues/8148)
### Features
* **compiler-sfc:** support project references when resolving types ([1c0be5c](https://github.com/vuejs/core/commit/1c0be5c7444966fa444460e87633cf44ec60292a)), closes [#8140](https://github.com/vuejs/core/issues/8140)
### Performance Improvements
* **compiler-sfc:** infer ref binding type for more built-in methods ([a370e80](https://github.com/vuejs/core/commit/a370e8006a70ea49a7d04c8c1a42d0947eba5dea))
# [3.3.0-beta.1](https://github.com/vuejs/core/compare/v3.3.0-alpha.13...v3.3.0-beta.1) (2023-04-21)
### Features
* allow accessing console in template ([#6508](https://github.com/vuejs/core/issues/6508)) ([fe76224](https://github.com/vuejs/core/commit/fe762247f8035d28d543bc5602ad01b0c258f6d6)), closes [#7939](https://github.com/vuejs/core/issues/7939)
* **compiler-sfc:** improve utility type Partial and Required ([#8103](https://github.com/vuejs/core/issues/8103)) ([1d1d728](https://github.com/vuejs/core/commit/1d1d72894995fde14bd09e2990462c19d5176bf9))
* **deprecation:** deprecate [@vnode](https://github.com/vnode) hooks in favor of vue: prefix ([5f0394a](https://github.com/vuejs/core/commit/5f0394a5ab88c82c74e240161499721f63d5462e))
* **deprecation:** deprecate v-is directive ([bbd8301](https://github.com/vuejs/core/commit/bbd8301a1344b02de635ea16d4822db1c343bd12))
* **deprecation:** unwrap injected refs in Options API by default, deprecate app.config.unwrapInjectedRefs ([526fa3b](https://github.com/vuejs/core/commit/526fa3b2ccf038375e76f8af2f1ddf79a7388878))
* **suspense:** introduce suspensible option for `<Suspense>` ([#6736](https://github.com/vuejs/core/issues/6736)) ([cb37d0b](https://github.com/vuejs/core/commit/cb37d0b9ffb5d4bb81a0367d84295dec8dd4448c)), closes [#5513](https://github.com/vuejs/core/issues/5513)
# [3.3.0-alpha.13](https://github.com/vuejs/core/compare/v3.3.0-alpha.12...v3.3.0-alpha.13) (2023-04-20)
### Bug Fixes
* **compiler-sfc:** handle type merging + fix namespace access when inferring type ([d53e157](https://github.com/vuejs/core/commit/d53e157805678db7a3b9ca2fccc74530e1dfbc48)), closes [#8102](https://github.com/vuejs/core/issues/8102)
* **compiler-sfc:** normalize filename when invalidating cache ([9b5a34b](https://github.com/vuejs/core/commit/9b5a34bf8c0d1b4c6ec3cf1434076b7e25065f84))
* **hmr:** always traverse static children in dev ([f17a82c](https://github.com/vuejs/core/commit/f17a82c769cfb60ee6785ef5d34d91191d153542)), closes [#7921](https://github.com/vuejs/core/issues/7921) [#8100](https://github.com/vuejs/core/issues/8100)
* **hmr:** force update cached slots during HMR ([94fa67a](https://github.com/vuejs/core/commit/94fa67a4f73b3646c8c1e29512a71b17bd56efc3)), closes [#7155](https://github.com/vuejs/core/issues/7155) [#7158](https://github.com/vuejs/core/issues/7158)
### Features
* **compiler-sfc:** support dynamic imports when resolving types ([4496456](https://github.com/vuejs/core/commit/4496456d7d9947560ef1e35ccb176b97a27bd8f4))
* **compiler-sfc:** support export * when resolving types ([7c3ca3c](https://github.com/vuejs/core/commit/7c3ca3cc3e122fe273e80a950c57d492a7f0bf4a))
* **compiler-sfc:** support ExtractPropTypes when resolving types ([50c0bbe](https://github.com/vuejs/core/commit/50c0bbe5221dbc1dc353d4960e69ec7c8ba12905)), closes [#8104](https://github.com/vuejs/core/issues/8104)
* hasInjectionContext() for libraries ([#8111](https://github.com/vuejs/core/issues/8111)) ([5510ce3](https://github.com/vuejs/core/commit/5510ce385abfa151c07a5253cccf4abccabdd01d))
# [3.3.0-alpha.12](https://github.com/vuejs/core/compare/v3.3.0-alpha.11...v3.3.0-alpha.12) (2023-04-18)
### Bug Fixes
* **compiler:** fix expression codegen for literal const bindings in non-inline mode ([0f77a2b](https://github.com/vuejs/core/commit/0f77a2b1d1047d66ccdfda70382d1a223886130c))
# [3.3.0-alpha.11](https://github.com/vuejs/core/compare/v3.3.0-alpha.10...v3.3.0-alpha.11) (2023-04-17)
### Bug Fixes
* **compiler-sfc:** normalize windows paths when resolving types ([271df09](https://github.com/vuejs/core/commit/271df09470c61d073185ba6cf3cf50358713c500))
# [3.3.0-alpha.10](https://github.com/vuejs/core/compare/v3.3.0-alpha.9...v3.3.0-alpha.10) (2023-04-17)
### Bug Fixes
* **hmr:** invalidate cached props/emits options on hmr ([4b5b384](https://github.com/vuejs/core/commit/4b5b384485cf8f6124f6738b89e3d047358f3a11))
* **runtime-core:** properly merge props and emits options from mixins ([#8052](https://github.com/vuejs/core/issues/8052)) ([c94ef02](https://github.com/vuejs/core/commit/c94ef02421d7422bc59d10cf2eee9f4e7dcea6c8)), closes [#7989](https://github.com/vuejs/core/issues/7989)
### Features
* **compiler-sfc:** expose type import deps on compiled script block ([8d8ddd6](https://github.com/vuejs/core/commit/8d8ddd686c832b2ea29b87ef47666b13c4ad5d4c))
* **compiler-sfc:** expose type resolve APIs ([f22e32e](https://github.com/vuejs/core/commit/f22e32e365bf6292cb606cb7289609e82da8b790))
* **compiler-sfc:** mark props destructure as experimental and require explicit opt-in ([6b13e04](https://github.com/vuejs/core/commit/6b13e04b4c83fcdbb180dc1d59f536a1309c2960))
* **compiler-sfc:** support intersection and union types in macros ([d1f973b](https://github.com/vuejs/core/commit/d1f973bff82581fb335d6fc05623d1ad3d84fb7c)), closes [#7553](https://github.com/vuejs/core/issues/7553)
* **compiler-sfc:** support limited built-in utility types in macros ([1cfab4c](https://github.com/vuejs/core/commit/1cfab4c695b0c28f549f8c97faee5099581792a7))
* **compiler-sfc:** support mapped types, string types & template type in macros ([fb8ecc8](https://github.com/vuejs/core/commit/fb8ecc803e58bfef0971346c63fefc529812daa7))
* **compiler-sfc:** support namespace members type in macros ([5ff40bb](https://github.com/vuejs/core/commit/5ff40bb0dc2918b7db15fe9f49db2a135a925572))
* **compiler-sfc:** support relative imported types in macros ([8aa4ea8](https://github.com/vuejs/core/commit/8aa4ea81d6e4d3110aa1619cca594543da4c9b63))
* **compiler-sfc:** support resolving type imports from modules ([3982bef](https://github.com/vuejs/core/commit/3982bef533b451d1b59fa243560184a13fe8c18c))
* **compiler-sfc:** support specifying global types for sfc macros ([4e028b9](https://github.com/vuejs/core/commit/4e028b966991937c83fb2529973fd3d41080bb61)), closes [/github.com/vuejs/core/pull/8083#issuecomment-1508468713](https://github.com//github.com/vuejs/core/pull/8083/issues/issuecomment-1508468713)
* **compiler-sfc:** support string indexed type in macros ([3f779dd](https://github.com/vuejs/core/commit/3f779ddbf85054c8915fa4537f8a79baab392d5c))
* **compiler-sfc:** support string/number indexed types in macros ([760755f](https://github.com/vuejs/core/commit/760755f4f83680bee13ad546cdab2e48ade38dff))
### Performance Improvements
* **compiler:** use source-map-js ([19e17a9](https://github.com/vuejs/core/commit/19e17a951c3387cbd6a1597e6cd9048a4aad4528))
# [3.3.0-alpha.9](https://github.com/vuejs/core/compare/v3.3.0-alpha.8...v3.3.0-alpha.9) (2023-04-08)
### Bug Fixes
* **compiler-sfc:** accept `StringLiteral` node in `defineEmit` tuple syntax ([#8041](https://github.com/vuejs/core/issues/8041)) ([3ccbea0](https://github.com/vuejs/core/commit/3ccbea08e09217b50a410d7b49ebb138e0c4c1e7)), closes [#8040](https://github.com/vuejs/core/issues/8040)
* **compiler-sfc:** fix binding type for constants when hoistStatic is disabled ([#8029](https://github.com/vuejs/core/issues/8029)) ([f7f4624](https://github.com/vuejs/core/commit/f7f4624191bbdc09600dbb0eb048b947c3a4f761))
* **compiler-sfc:** skip empty `defineOptions` and support TypeScript type assertions ([#8028](https://github.com/vuejs/core/issues/8028)) ([9557529](https://github.com/vuejs/core/commit/955752951e1d31b90d817bd20830fe3f89018771))
* **compiler-ssr:** disable v-once transform in ssr vdom fallback branch ([05f94cf](https://github.com/vuejs/core/commit/05f94cf7b01dd05ed7d3170916a38b175d5df292)), closes [#7644](https://github.com/vuejs/core/issues/7644)
* **types:** improve defineProps return type with generic arguments ([91a931a](https://github.com/vuejs/core/commit/91a931ae8707b8d43f10216e1ce8e18b12158f99))
* **types:** more public type argument order fix ([af563bf](https://github.com/vuejs/core/commit/af563bf428200367b6f5bb7944f690c85d810202))
* **types:** retain type parameters order for public types ([bdf557f](https://github.com/vuejs/core/commit/bdf557f6f233c039fff8007b1b16aec00c4e68aa))
### Features
* **app:** app.runWithContext() ([#7451](https://github.com/vuejs/core/issues/7451)) ([869f3fb](https://github.com/vuejs/core/commit/869f3fb93e61400be4fd925e0850c2b1564749e2))
* **sfc:** introduce `defineModel` macro and `useModel` helper ([#8018](https://github.com/vuejs/core/issues/8018)) ([14f3d74](https://github.com/vuejs/core/commit/14f3d747a34d45415b0036b274517d70a27ec0d3))
### Reverts
* Revert "chore: remove unused args passed to ssrRender" ([b117b88](https://github.com/vuejs/core/commit/b117b8844881a732a021432066230ff2215049ea))
# [3.3.0-alpha.8](https://github.com/vuejs/core/compare/v3.3.0-alpha.7...v3.3.0-alpha.8) (2023-04-04)
### Bug Fixes
* **compiler-sfc:** check binding is prop before erroring ([f3145a9](https://github.com/vuejs/core/commit/f3145a915aaec11c915f1df258c5209ae4782bcc)), closes [#8017](https://github.com/vuejs/core/issues/8017)
# [3.3.0-alpha.7](https://github.com/vuejs/core/compare/v3.3.0-alpha.6...v3.3.0-alpha.7) (2023-04-03)
### Bug Fixes
* **compiler-dom:** handle newlines when evaluating constants during stringification ([#7995](https://github.com/vuejs/core/issues/7995)) ([5261085](https://github.com/vuejs/core/commit/52610851137b9c5f6f57d771fd604fba309b3c97)), closes [#7994](https://github.com/vuejs/core/issues/7994)
* **compiler-sfc:** use dynamic defaults merging for methods with computed keys ([482f2e3](https://github.com/vuejs/core/commit/482f2e3434a1edc47a181890354838e206d08922)), closes [#7113](https://github.com/vuejs/core/issues/7113)
### Features
* **compiler-sfc:** codegen support for defineEmits() short syntax (followup of [#7992](https://github.com/vuejs/core/issues/7992)) ([ef73ea5](https://github.com/vuejs/core/commit/ef73ea53eaf853d43e70946d2d448ae8c0a83e4f))
* **compiler-sfc:** support arbitrary expression as withDefaults argument ([fe61944](https://github.com/vuejs/core/commit/fe619443d2e99301975de120685dbae8d66c03a6)), closes [#6459](https://github.com/vuejs/core/issues/6459)
* **reactivity:** improve support of getter usage in reactivity APIs ([#7997](https://github.com/vuejs/core/issues/7997)) ([59e8284](https://github.com/vuejs/core/commit/59e828448e7f37643cd0eaea924a764e9d314448))
* **sfc:** revert withDefaults() deprecation ([4af5d1b](https://github.com/vuejs/core/commit/4af5d1b0754035058436f9e4e5c12aedef199177))
* **sfc:** support more ergnomic defineEmits type syntax ([#7992](https://github.com/vuejs/core/issues/7992)) ([8876dcc](https://github.com/vuejs/core/commit/8876dccf42a7f05375d97cb18c1afdfd0fc51c94))
* **types/slots:** support slot presence / props type checks via `defineSlots` macro and `slots` option ([#7982](https://github.com/vuejs/core/issues/7982)) ([5a2f5d5](https://github.com/vuejs/core/commit/5a2f5d59cffa36a99e6f2feab6b3ba7958b7362f))
# [3.3.0-alpha.6](https://github.com/vuejs/core/compare/v3.3.0-alpha.5...v3.3.0-alpha.6) (2023-03-30)
### Bug Fixes
* **compiler-core:** check if expression is constant ([#7974](https://github.com/vuejs/core/issues/7974)) ([77686cf](https://github.com/vuejs/core/commit/77686cf4765e7e345bef364c0b03739e3c2da91d)), closes [#7973](https://github.com/vuejs/core/issues/7973)
* **compiler-core:** fix codegen for literal const in non-inline mode ([6bda4b6](https://github.com/vuejs/core/commit/6bda4b66886240b28993c88b7ecd4640a199be65))
* **compiler-sfc:** allow `<script>` with lang='js' ([#7398](https://github.com/vuejs/core/issues/7398)) ([9f5e20c](https://github.com/vuejs/core/commit/9f5e20ccff235946159f0e50519f5be09bc89d5b))
* **compiler-sfc:** avoid codegen conflict with user variable named `expose` ([#7949](https://github.com/vuejs/core/issues/7949)) ([c839129](https://github.com/vuejs/core/commit/c839129ab9d46f56a019b0ff234b35f27cac1e35)), closes [#7890](https://github.com/vuejs/core/issues/7890)
* **compiler-sfc:** disallow `expose` property in `defineOptions` ([#7967](https://github.com/vuejs/core/issues/7967)) ([93f7729](https://github.com/vuejs/core/commit/93f77292c9f2c4dcc83aae6b5943a8b1d7443092))
* **compiler-sfc:** fix defineExpose() codegen regression from [#7949](https://github.com/vuejs/core/issues/7949) ([a94072d](https://github.com/vuejs/core/commit/a94072dd2ca1aca4ce1fbe5da51ca2a9a07a4637))
* **compiler-sfc:** fix edge case of default export call with no args ([#7536](https://github.com/vuejs/core/issues/7536)) ([d60e58c](https://github.com/vuejs/core/commit/d60e58c9f62ae7bd1f9c888cd2e55982a64d9e96)), closes [#7534](https://github.com/vuejs/core/issues/7534)
* **compiler-sfc:** fix function default value handling w/ props destructure ([e10a89e](https://github.com/vuejs/core/commit/e10a89e608d3486c0c9a0457ee7c56d208e0aa91))
* **compiler-sfc:** handle more TS built-in utilities in defineProps inference ([4355d24](https://github.com/vuejs/core/commit/4355d2492dccdb175b18d083e20f3ec39a52801f))
* **compiler-sfc:** infer function prop type from type literal w/ callable signature ([#7119](https://github.com/vuejs/core/issues/7119)) ([3a7572c](https://github.com/vuejs/core/commit/3a7572cdb2074c5cac2231e4525296104141411c))
* **compiler-sfc:** infer object type for empty type literal ([1a04fba](https://github.com/vuejs/core/commit/1a04fba10b6462303c65f1095da86ce05c14f1f4))
* **compiler-sfc:** infer runtime type in defineProps ([#7972](https://github.com/vuejs/core/issues/7972)) ([ba4cec3](https://github.com/vuejs/core/commit/ba4cec31b91da60555892c381b00c2fa5b3e0e39))
* **compiler-sfc:** infer TS Extract&Exclude runtime type ([#7339](https://github.com/vuejs/core/issues/7339)) ([6391daf](https://github.com/vuejs/core/commit/6391daf6586e49e165b3195863b602c3cbb92ace)), closes [#7337](https://github.com/vuejs/core/issues/7337) [#6252](https://github.com/vuejs/core/issues/6252)
* **compiler-sfc:** infer TSIntersectionType in defineProps ([#7394](https://github.com/vuejs/core/issues/7394)) ([151a8ad](https://github.com/vuejs/core/commit/151a8ad6b9288784c3b2514820a112b93ecf2dca))
* **compiler-sfc:** properly handle unknown types in runtime prop inference ([5fb406e](https://github.com/vuejs/core/commit/5fb406e3e1d585076779e9ce4a588a4f9a61ef23)), closes [#7511](https://github.com/vuejs/core/issues/7511)
* **compiler-sfc:** properly remove comma of multiple macros in the same declaration ([#7423](https://github.com/vuejs/core/issues/7423)) ([336a3d7](https://github.com/vuejs/core/commit/336a3d7b9199aeda19672832ce173de298b1105a)), closes [#7422](https://github.com/vuejs/core/issues/7422) [#6778](https://github.com/vuejs/core/issues/6778)
* **compiler-sfc:** rewrite default export with AST analysis instead of regex ([#7068](https://github.com/vuejs/core/issues/7068)) ([701b95f](https://github.com/vuejs/core/commit/701b95ff3d2bad0284c03865a0b052fc8324beec)), closes [#7038](https://github.com/vuejs/core/issues/7038) [#7041](https://github.com/vuejs/core/issues/7041) [#7078](https://github.com/vuejs/core/issues/7078)
* **compiler-sfc:** unwrap TS node for defineProps ([#7340](https://github.com/vuejs/core/issues/7340)) ([1b69d5f](https://github.com/vuejs/core/commit/1b69d5f2f49ee60af4b10137c7833a76420dbba1))
* **compiler-sfc:** use prependLeft to handle CSSVars ([#7760](https://github.com/vuejs/core/issues/7760)) ([139104b](https://github.com/vuejs/core/commit/139104ba2695eecae672db98f978de78e17ab7e1))
* **jsx-runtime:** fix automatic runtime implementation ([#7959](https://github.com/vuejs/core/issues/7959)) ([5838950](https://github.com/vuejs/core/commit/5838950ecf7e4e17dd5a23acd621077390666b76))
* **jsx-runtime:** handle keys ([#7976](https://github.com/vuejs/core/issues/7976)) ([ff60b93](https://github.com/vuejs/core/commit/ff60b933ae4e02422393664ee7818cffadf9b58b))
* **types/jsx:** jsx-runtime types for global JSX namespace registration ([#7978](https://github.com/vuejs/core/issues/7978)) ([0f73f39](https://github.com/vuejs/core/commit/0f73f394dafd709298bd8c71107a323bf322a1d2))
* **types/jsx:** move JSX DOM types back to `@vue/runtime-dom` ([#7979](https://github.com/vuejs/core/issues/7979)) ([ffe679c](https://github.com/vuejs/core/commit/ffe679c490986b69956daec7166f1ab6d9f23073))
* **types/jsx:** remove $slots children override ([28e30c8](https://github.com/vuejs/core/commit/28e30c819df5e4fc301c98f7be938fa13e8be3bc))
* **types:** revert jsx global removal (to be removed in 3.4) ([e224922](https://github.com/vuejs/core/commit/e224922e972e78b4fb6cbd129d685c2317018ad1))
### Features
* **compiler-core:** support parsing `const` modifier in type parameters ([#7912](https://github.com/vuejs/core/issues/7912)) ([b7bd50f](https://github.com/vuejs/core/commit/b7bd50f5059e8755c0204f01a8c55b1724688e7e))
* **compiler-sfc:** add defineOptions macro ([#5738](https://github.com/vuejs/core/issues/5738)) ([bcf5841](https://github.com/vuejs/core/commit/bcf5841ddecc64d0bdbd56ce1463eb8ebf01bb9d))
* **compiler-sfc:** enable reactive props destructure by default ([#7986](https://github.com/vuejs/core/issues/7986)) ([ba9c2ae](https://github.com/vuejs/core/commit/ba9c2ae247fcc3960b238a04cb635158daa82004))
* **compiler-sfc:** improve runtime props inference for enum ([eded947](https://github.com/vuejs/core/commit/eded94712e37856f258dc8c85f98a26fa41ae05f))
* **compiler-sfc:** support generating variable instead of default export in compileScript ([71635be](https://github.com/vuejs/core/commit/71635be68d25887f91d624bb7f78281a851bc0cb))
* **compiler-sfc:** support module string names syntax ([#7428](https://github.com/vuejs/core/issues/7428)) ([0002567](https://github.com/vuejs/core/commit/000256772816d54976e462330a7be342c49c7304))
* **complier-sfc:** hoist literal constants for script ([#5752](https://github.com/vuejs/core/issues/5752)) ([7def8b1](https://github.com/vuejs/core/commit/7def8b15b89aa78accd9a00927db91e8091a12b7)), closes [#5750](https://github.com/vuejs/core/issues/5750)
* **runtime-core:** add skipCheck for prop ([#7548](https://github.com/vuejs/core/issues/7548)) ([63ad77f](https://github.com/vuejs/core/commit/63ad77f6f65751780aa52f817387165b4773cfe4))
* **sfc:** deprecate reactivity transform ([efb54e7](https://github.com/vuejs/core/commit/efb54e7315e93f4be7004d1c0a4de8c523dab334))
* **types:** `defineComponent()` with generics support ([#7963](https://github.com/vuejs/core/issues/7963)) ([d77557c](https://github.com/vuejs/core/commit/d77557c4038f88a676903b379505b280a88cc774)), closes [#3102](https://github.com/vuejs/core/issues/3102)
### BREAKING CHANGES
* **types:** The type of `defineComponent()` when passing in a function has changed. This overload signature is rarely used in practice and the breakage will be minimal, so repurposing it to something more useful should be worth it.
# [3.3.0-alpha.5](https://github.com/vuejs/core/compare/v3.3.0-alpha.4...v3.3.0-alpha.5) (2023-03-26)
### Bug Fixes
* **runtime-core:** support `getCurrentInstance` across mutiple builds of Vue ([8d2d5bf](https://github.com/vuejs/core/commit/8d2d5bf48a24dab44e5b03cb8fa0c5faa4b696e3))
* **types:** ensure defineProps with generics return correct types ([c288c7b](https://github.com/vuejs/core/commit/c288c7b0bd6077d690f42153c3fc49a45454a66a))
### Features
* **dx:** improve readability of displayed types for props ([4c9bfd2](https://github.com/vuejs/core/commit/4c9bfd2b999ce472f7481aae4f9dc5bb9f76628e))
* **types/jsx:** support jsxImportSource, avoid global JSX conflict ([#7958](https://github.com/vuejs/core/issues/7958)) ([d0b7ef3](https://github.com/vuejs/core/commit/d0b7ef3b61d5f83e35e5854b3c2c874e23463102))
### Note on JSX Types Change
* In the next minor (3.4), Vue no longer registers the global `JSX` namespace by default. This is necessary to avoid global namespace collision with React so that TSX of both libs can co-exist in the same project. This should not affect SFC-only users with latest version of Volar.
For TSX users, it is suggested to set [jsxImportSource](https://www.typescriptlang.org/tsconfig#jsxImportSource) to `'vue'` in `tsconfig.json` after upgrading to 3.3, or opt-in per file with `/* @jsxImportSource vue */`. This will allow you to opt-in to the new behavior now and upgrade seamlessly when 3.4 releases.
If there is code that depends on the presence of the global `JSX` namespace, you can retain the exact pre-3.4 global behavior by explicitly referencing `vue/jsx`, which registers the global `JSX` namespace.
Note that the planned change in 3.4 is a type-only breaking change in a minor release, which adheres to our [release policy](https://vuejs.org/about/releases.html#semantic-versioning-edge-cases).
# [3.3.0-alpha.4](https://github.com/vuejs/core/compare/v3.3.0-alpha.3...v3.3.0-alpha.4) (2023-02-06)
### Bug Fixes
* **build:** fix const enum w/ number values ([92bb189](https://github.com/vuejs/core/commit/92bb189ca7ecae221ebf5411da87c715780d2de3))
# [3.3.0-alpha.3](https://github.com/vuejs/core/compare/v3.3.0-alpha.2...v3.3.0-alpha.3) (2023-02-06)
### Bug Fixes
* **build:** avoid const enum conflicts ([d1181ad](https://github.com/vuejs/core/commit/d1181ad692861c140e687372efbc67a1d65d642a))
# [3.3.0-alpha.2](https://github.com/vuejs/core/compare/v3.3.0-alpha.1...v3.3.0-alpha.2) (2023-02-05)
### Bug Fixes
* **build:** fix dev flag replacement in esm-bundler builds ([5851eaa](https://github.com/vuejs/core/commit/5851eaa9339364d41860a277a99f2352de2a3834))
# [3.3.0-alpha.1](https://github.com/vuejs/core/compare/v3.2.47...v3.3.0-alpha.1) (2023-02-05)
### Bug Fixes
* **build:** ensure BaseTransition functions can be tree-shaken ([3a6f5eb](https://github.com/vuejs/core/commit/3a6f5eb0f7d60dc87d17a69c66e88ae5688b11a5))
## Previous Changelogs ## Previous Changelogs
### 3.3.x (2023-02-05 - 2023-12-29)
See [3.3 changelog](./changelogs/CHANGELOG-3.3.md)
### 3.2.x (2021-07-16 - 2023-02-02) ### 3.2.x (2021-07-16 - 2023-02-02)
See [3.2 changelog](./changelogs/CHANGELOG-3.2.md) See [3.2 changelog](./changelogs/CHANGELOG-3.2.md)

598
changelogs/CHANGELOG-3.3.md Normal file
View File

@ -0,0 +1,598 @@
## [3.3.13](https://github.com/vuejs/core/compare/v3.3.12...v3.3.13) (2023-12-19)
### Bug Fixes
* **compiler-core:** fix v-on with modifiers on inline expression of undefined ([#9866](https://github.com/vuejs/core/issues/9866)) ([bae79dd](https://github.com/vuejs/core/commit/bae79ddf8564a2da4a5365cfeb8d811990f42335)), closes [#9865](https://github.com/vuejs/core/issues/9865)
* **runtime-dom:** cache event handlers by key/modifiers ([#9851](https://github.com/vuejs/core/issues/9851)) ([04d2c05](https://github.com/vuejs/core/commit/04d2c05054c26b02fbc1d84839b0ed5cd36455b6)), closes [#9849](https://github.com/vuejs/core/issues/9849)
* **types:** extract properties from extended collections ([#9854](https://github.com/vuejs/core/issues/9854)) ([24b1c1d](https://github.com/vuejs/core/commit/24b1c1dd57fd55d998aa231a147500e010b10219)), closes [#9852](https://github.com/vuejs/core/issues/9852)
## [3.3.12](https://github.com/vuejs/core/compare/v3.3.11...v3.3.12) (2023-12-16)
### Bug Fixes
* **hydration:** handle appear transition before patch props ([#9837](https://github.com/vuejs/core/issues/9837)) ([e70f4c4](https://github.com/vuejs/core/commit/e70f4c47c553b6e16d8fad70743271ca23802fe7)), closes [#9832](https://github.com/vuejs/core/issues/9832)
* **sfc/cssVars:** fix loss of CSS v-bind variables when setting inline style with string value ([#9824](https://github.com/vuejs/core/issues/9824)) ([0a387df](https://github.com/vuejs/core/commit/0a387dfb1d04afb6eae4296b6da76dfdaca77af4)), closes [#9821](https://github.com/vuejs/core/issues/9821)
* **ssr:** fix suspense hydration of fallback content ([#7188](https://github.com/vuejs/core/issues/7188)) ([60415b5](https://github.com/vuejs/core/commit/60415b5d67df55f1fd6b176615299c08640fa142))
* **types:** add `xmlns:xlink` to `SVGAttributes` ([#9300](https://github.com/vuejs/core/issues/9300)) ([0d61b42](https://github.com/vuejs/core/commit/0d61b429ecf63591d31e09702058fa4c7132e1a7)), closes [#9299](https://github.com/vuejs/core/issues/9299)
* **types:** fix `shallowRef` type error ([#9839](https://github.com/vuejs/core/issues/9839)) ([9a57158](https://github.com/vuejs/core/commit/9a571582b53220270e498d8712ea59312c0bef3a))
* **types:** support for generic keyof slots ([#8374](https://github.com/vuejs/core/issues/8374)) ([213eba4](https://github.com/vuejs/core/commit/213eba479ce080efc1053fe636f6be4a4c889b44))
## [3.3.11](https://github.com/vuejs/core/compare/v3.3.10...v3.3.11) (2023-12-08)
### Bug Fixes
* **custom-element:** correctly handle number type props in prod ([#8989](https://github.com/vuejs/core/issues/8989)) ([d74d364](https://github.com/vuejs/core/commit/d74d364d62db8e48881af6b5a75ce4fb5f36cc35))
* **reactivity:** fix mutation on user proxy of reactive Array ([6ecbd5c](https://github.com/vuejs/core/commit/6ecbd5ce2a7f59314a8326a1d193874b87f4d8c8)), closes [#9742](https://github.com/vuejs/core/issues/9742) [#9751](https://github.com/vuejs/core/issues/9751) [#9750](https://github.com/vuejs/core/issues/9750)
* **runtime-dom:** fix width and height prop check condition ([5b00286](https://github.com/vuejs/core/commit/5b002869c533220706f9788b496b8ca8d8e98609)), closes [#9762](https://github.com/vuejs/core/issues/9762)
* **shared:** handle Map with symbol keys in toDisplayString ([#9731](https://github.com/vuejs/core/issues/9731)) ([364821d](https://github.com/vuejs/core/commit/364821d6bdb1775e2f55a69bcfb9f40f7acf1506)), closes [#9727](https://github.com/vuejs/core/issues/9727)
* **shared:** handle more Symbol cases in toDisplayString ([983d45d](https://github.com/vuejs/core/commit/983d45d4f8eb766b5a16b7ea93b86d3c51618fa6))
* **Suspense:** properly get anchor when mount fallback vnode ([#9770](https://github.com/vuejs/core/issues/9770)) ([b700328](https://github.com/vuejs/core/commit/b700328342e17dc16b19316c2e134a26107139d2)), closes [#9769](https://github.com/vuejs/core/issues/9769)
* **types:** ref() return type should not be any when initial value is any ([#9768](https://github.com/vuejs/core/issues/9768)) ([cdac121](https://github.com/vuejs/core/commit/cdac12161ec27b45ded48854c3d749664b6d4a6d))
* **watch:** should not fire pre watcher on child component unmount ([#7181](https://github.com/vuejs/core/issues/7181)) ([6784f0b](https://github.com/vuejs/core/commit/6784f0b1f8501746ea70d87d18ed63a62cf6b76d)), closes [#7030](https://github.com/vuejs/core/issues/7030)
## [3.3.10](https://github.com/vuejs/core/compare/v3.3.9...v3.3.10) (2023-12-04)
### Bug Fixes
* **app:** prevent template from being cached between apps with different options ([#9724](https://github.com/vuejs/core/issues/9724)) ([ec71585](https://github.com/vuejs/core/commit/ec715854ca12520b2afc9e9b3981cbae05ae5206)), closes [#9618](https://github.com/vuejs/core/issues/9618)
* **compiler-sfc:** avoid passing forEach index to genMap ([f12db7f](https://github.com/vuejs/core/commit/f12db7fb564a534cef2e5805cc9f54afe5d72fbf))
* **compiler-sfc:** deindent pug/jade templates ([6345197](https://github.com/vuejs/core/commit/634519720a21fb5a6871454e1cadad7053a568b8)), closes [#3231](https://github.com/vuejs/core/issues/3231) [#3842](https://github.com/vuejs/core/issues/3842) [#7723](https://github.com/vuejs/core/issues/7723)
* **compiler-sfc:** fix :where and :is selector in scoped mode with multiple selectors ([#9735](https://github.com/vuejs/core/issues/9735)) ([c3e2c55](https://github.com/vuejs/core/commit/c3e2c556b532656b50b8ab5cd2d9eabc26622d63)), closes [#9707](https://github.com/vuejs/core/issues/9707)
* **compiler-sfc:** generate more treeshaking friendly code ([#9507](https://github.com/vuejs/core/issues/9507)) ([8d74ca0](https://github.com/vuejs/core/commit/8d74ca0e6fa2738ca6854b7e879ff59419f948c7)), closes [#9500](https://github.com/vuejs/core/issues/9500)
* **compiler-sfc:** support inferring generic types ([#8511](https://github.com/vuejs/core/issues/8511)) ([eb5e307](https://github.com/vuejs/core/commit/eb5e307c0be62002e62c4c800d0dfacb39b0d4ca)), closes [#8482](https://github.com/vuejs/core/issues/8482)
* **compiler-sfc:** support resolving components from props ([#8785](https://github.com/vuejs/core/issues/8785)) ([7cbcee3](https://github.com/vuejs/core/commit/7cbcee3d831241a8bd3588ae92d3f27e3641e25f))
* **compiler-sfc:** throw error when failing to load TS during type resolution ([#8883](https://github.com/vuejs/core/issues/8883)) ([4936d2e](https://github.com/vuejs/core/commit/4936d2e11a8d0ca3704bfe408548cb26bb3fd5e9))
* **cssVars:** cssVar names should be double-escaped when generating code for ssr ([#8824](https://github.com/vuejs/core/issues/8824)) ([5199a12](https://github.com/vuejs/core/commit/5199a12f8855cd06f24bf355708b5a2134f63176)), closes [#7823](https://github.com/vuejs/core/issues/7823)
* **deps:** update compiler to ^7.23.4 ([#9681](https://github.com/vuejs/core/issues/9681)) ([31f6ebc](https://github.com/vuejs/core/commit/31f6ebc4df84490ed29fb75e7bf4259200eb51f0))
* **runtime-core:** Suspense get anchor properly in Transition ([#9309](https://github.com/vuejs/core/issues/9309)) ([65f3fe2](https://github.com/vuejs/core/commit/65f3fe273127a8b68e1222fbb306d28d85f01757)), closes [#8105](https://github.com/vuejs/core/issues/8105)
* **runtime-dom:** set width/height with units as attribute ([#8781](https://github.com/vuejs/core/issues/8781)) ([bfc1838](https://github.com/vuejs/core/commit/bfc1838f31199de3f189198a3c234fa7bae91386))
* **ssr:** avoid computed being accidentally cached before server render ([#9688](https://github.com/vuejs/core/issues/9688)) ([30d5d93](https://github.com/vuejs/core/commit/30d5d93a92b2154406ec04f8aca6b217fa01177c)), closes [#5300](https://github.com/vuejs/core/issues/5300)
* **types:** expose emits as props in functional components ([#9234](https://github.com/vuejs/core/issues/9234)) ([887e54c](https://github.com/vuejs/core/commit/887e54c347ea9eac4c721b5e2288f054873d1d30))
* **types:** fix reactive collection types ([#8960](https://github.com/vuejs/core/issues/8960)) ([ad27473](https://github.com/vuejs/core/commit/ad274737015c36906d76f3189203093fa3a2e4e7)), closes [#8904](https://github.com/vuejs/core/issues/8904)
* **types:** improve return type withKeys and withModifiers ([#9734](https://github.com/vuejs/core/issues/9734)) ([43c3cfd](https://github.com/vuejs/core/commit/43c3cfdec5ae5d70fa2a21e857abc2d73f1a0d07))
### Performance Improvements
* optimize on* prop check ([38aaa8c](https://github.com/vuejs/core/commit/38aaa8c88648c54fe2616ad9c0961288092fcb44))
* **runtime-dom:** cache modifier wrapper functions ([da4a4fb](https://github.com/vuejs/core/commit/da4a4fb5e8eee3c6d31f24ebd79a9d0feca56cb2)), closes [#8882](https://github.com/vuejs/core/issues/8882)
* **v-on:** constant handlers with modifiers should not be treated as dynamic ([4d94ebf](https://github.com/vuejs/core/commit/4d94ebfe75174b340d2b794e699cad1add3600a9))
## [3.3.9](https://github.com/vuejs/core/compare/v3.3.8...v3.3.9) (2023-11-25)
### Bug Fixes
* **compiler-core:** avoid rewriting scope variables in inline for loops ([#7245](https://github.com/vuejs/core/issues/7245)) ([a2d810e](https://github.com/vuejs/core/commit/a2d810eb40cef631f61991ca68b426ee9546aba0)), closes [#7238](https://github.com/vuejs/core/issues/7238)
* **compiler-core:** fix `resolveParserPlugins` decorators check ([#9566](https://github.com/vuejs/core/issues/9566)) ([9d0eba9](https://github.com/vuejs/core/commit/9d0eba916f3bf6fb5c03222400edae1a2db7444f)), closes [#9560](https://github.com/vuejs/core/issues/9560)
* **compiler-sfc:** consistently escape type-only prop names ([#8654](https://github.com/vuejs/core/issues/8654)) ([3e08d24](https://github.com/vuejs/core/commit/3e08d246dfd8523c54fb8e7a4a6fd5506ffb1bcc)), closes [#8635](https://github.com/vuejs/core/issues/8635) [#8910](https://github.com/vuejs/core/issues/8910) [vitejs/vite-plugin-vue#184](https://github.com/vitejs/vite-plugin-vue/issues/184)
* **compiler-sfc:** malformed filename on windows using path.posix.join() ([#9478](https://github.com/vuejs/core/issues/9478)) ([f18a174](https://github.com/vuejs/core/commit/f18a174979626b3429db93c5d5b7ae5448917c70)), closes [#8671](https://github.com/vuejs/core/issues/8671) [#9583](https://github.com/vuejs/core/issues/9583) [#9446](https://github.com/vuejs/core/issues/9446) [#9473](https://github.com/vuejs/core/issues/9473)
* **compiler-sfc:** support `:is` and `:where` selector in scoped css rewrite ([#8929](https://github.com/vuejs/core/issues/8929)) ([3227e50](https://github.com/vuejs/core/commit/3227e50b32105f8893f7dff2f29278c5b3a9f621))
* **compiler-sfc:** support resolve extends interface for defineEmits ([#8470](https://github.com/vuejs/core/issues/8470)) ([9e1b74b](https://github.com/vuejs/core/commit/9e1b74bcd5fa4151f5d1bc02c69fbbfa4762f577)), closes [#8465](https://github.com/vuejs/core/issues/8465)
* **hmr/transition:** fix kept-alive component inside transition disappearing after hmr ([#7126](https://github.com/vuejs/core/issues/7126)) ([d11e978](https://github.com/vuejs/core/commit/d11e978fc98dcc83526c167e603b8308f317f786)), closes [#7121](https://github.com/vuejs/core/issues/7121)
* **hydration:** force hydration for v-bind with .prop modifier ([364f319](https://github.com/vuejs/core/commit/364f319d214226770d97c98d8fcada80c9e8dde3)), closes [#7490](https://github.com/vuejs/core/issues/7490)
* **hydration:** properly hydrate indeterminate prop ([34b5a5d](https://github.com/vuejs/core/commit/34b5a5da4ae9c9faccac237acd7acc8e7e017571)), closes [#7476](https://github.com/vuejs/core/issues/7476)
* **reactivity:** clear method on readonly collections should return undefined ([#7316](https://github.com/vuejs/core/issues/7316)) ([657476d](https://github.com/vuejs/core/commit/657476dcdb964be4fbb1277c215c073f3275728e))
* **reactivity:** onCleanup also needs to be cleaned ([#8655](https://github.com/vuejs/core/issues/8655)) ([73fd810](https://github.com/vuejs/core/commit/73fd810eebdd383a2b4629f67736c4db1f428abd)), closes [#5151](https://github.com/vuejs/core/issues/5151) [#7695](https://github.com/vuejs/core/issues/7695)
* **ssr:** hydration `__vnode` missing for devtools ([#9328](https://github.com/vuejs/core/issues/9328)) ([5156ac5](https://github.com/vuejs/core/commit/5156ac5b38cfa80d3db26f2c9bf40cb22a7521cb))
* **types:** allow falsy value types in `StyleValue` ([#7954](https://github.com/vuejs/core/issues/7954)) ([17aa92b](https://github.com/vuejs/core/commit/17aa92b79b31d8bb8b5873ddc599420cb9806db8)), closes [#7955](https://github.com/vuejs/core/issues/7955)
* **types:** defineCustomElement using defineComponent return type with emits ([#7937](https://github.com/vuejs/core/issues/7937)) ([5d932a8](https://github.com/vuejs/core/commit/5d932a8e6d14343c9d7fc7c2ecb58ac618b2f938)), closes [#7782](https://github.com/vuejs/core/issues/7782)
* **types:** fix `unref` and `toValue` when input union type contains ComputedRef ([#8748](https://github.com/vuejs/core/issues/8748)) ([176d476](https://github.com/vuejs/core/commit/176d47671271b1abc21b1508e9a493c7efca6451)), closes [#8747](https://github.com/vuejs/core/issues/8747) [#8857](https://github.com/vuejs/core/issues/8857)
* **types:** fix instance type when props type is incompatible with setup returned type ([#7338](https://github.com/vuejs/core/issues/7338)) ([0e1e8f9](https://github.com/vuejs/core/commit/0e1e8f919e5a74cdaadf9c80ee135088b25e7fa3)), closes [#5885](https://github.com/vuejs/core/issues/5885)
* **types:** fix shallowRef return type with union value type ([#7853](https://github.com/vuejs/core/issues/7853)) ([7c44800](https://github.com/vuejs/core/commit/7c448000b0def910c2cfabfdf7ff20a3d6bc844f)), closes [#7852](https://github.com/vuejs/core/issues/7852)
* **types:** more precise types for class bindings ([#8012](https://github.com/vuejs/core/issues/8012)) ([46e3374](https://github.com/vuejs/core/commit/46e33744c890bd49482c5e5c5cdea44e00ec84d5))
* **types:** remove optional properties from defineProps return type ([#6421](https://github.com/vuejs/core/issues/6421)) ([94c049d](https://github.com/vuejs/core/commit/94c049d930d922069e38ea8700d7ff0970f71e61)), closes [#6420](https://github.com/vuejs/core/issues/6420)
* **types:** return type of withDefaults should be readonly ([#8601](https://github.com/vuejs/core/issues/8601)) ([f15debc](https://github.com/vuejs/core/commit/f15debc01acb22d23f5acee97e6f02db88cef11a))
* **types:** revert class type restrictions ([5d077c8](https://github.com/vuejs/core/commit/5d077c8754cc14f85d2d6d386df70cf8c0d93842)), closes [#8012](https://github.com/vuejs/core/issues/8012)
* **types:** update jsx type definitions ([#8607](https://github.com/vuejs/core/issues/8607)) ([58e2a94](https://github.com/vuejs/core/commit/58e2a94871ae06a909c5f8bad07fb401193e6a38))
* **types:** widen ClassValue type ([2424013](https://github.com/vuejs/core/commit/242401305944422d0c361b16101a4d18908927af))
* **v-model:** avoid overwriting number input with same value ([#7004](https://github.com/vuejs/core/issues/7004)) ([40f4b77](https://github.com/vuejs/core/commit/40f4b77bb570868cb6e47791078767797e465989)), closes [#7003](https://github.com/vuejs/core/issues/7003)
* **v-model:** unnecessary value binding error should apply to dynamic instead of static binding ([2859b65](https://github.com/vuejs/core/commit/2859b653c9a22460e60233cac10fe139e359b046)), closes [#3596](https://github.com/vuejs/core/issues/3596)
## [3.3.8](https://github.com/vuejs/core/compare/v3.3.7...v3.3.8) (2023-11-06)
### Bug Fixes
* **compile-sfc:** support `Error` type in `defineProps` ([#5955](https://github.com/vuejs/core/issues/5955)) ([a989345](https://github.com/vuejs/core/commit/a9893458ec519aae442e1b99e64e6d74685cd22c))
* **compiler-core:** known global should be shadowed by local variables in expression rewrite ([#9492](https://github.com/vuejs/core/issues/9492)) ([a75d1c5](https://github.com/vuejs/core/commit/a75d1c5c6242e91a73cc5ba01e6da620dea0b3d9)), closes [#9482](https://github.com/vuejs/core/issues/9482)
* **compiler-sfc:** fix dynamic directive arguments usage check for slots ([#9495](https://github.com/vuejs/core/issues/9495)) ([b39fa1f](https://github.com/vuejs/core/commit/b39fa1f8157647859331ce439c42ae016a49b415)), closes [#9493](https://github.com/vuejs/core/issues/9493)
* **deps:** update dependency @vue/repl to ^2.6.2 ([#9536](https://github.com/vuejs/core/issues/9536)) ([5cef325](https://github.com/vuejs/core/commit/5cef325f41e3b38657c72fa1a38dedeee1c7a60a))
* **deps:** update dependency @vue/repl to ^2.6.3 ([#9540](https://github.com/vuejs/core/issues/9540)) ([176d590](https://github.com/vuejs/core/commit/176d59058c9aecffe9da4d4311e98496684f06d4))
* **hydration:** fix tagName access error on comment/text node hydration mismatch ([dd8a0cf](https://github.com/vuejs/core/commit/dd8a0cf5dcde13d2cbd899262a0e07f16e14e489)), closes [#9531](https://github.com/vuejs/core/issues/9531)
* **types:** avoid exposing lru-cache types in generated dts ([462aeb3](https://github.com/vuejs/core/commit/462aeb3b600765e219ded2ee9a0ed1e74df61de0)), closes [#9521](https://github.com/vuejs/core/issues/9521)
* **warn:** avoid warning on empty children with Suspense ([#3962](https://github.com/vuejs/core/issues/3962)) ([405f345](https://github.com/vuejs/core/commit/405f34587a63a5f1e3d147b9848219ea98acc22d))
## [3.3.7](https://github.com/vuejs/core/compare/v3.3.6...v3.3.7) (2023-10-24)
### Bug Fixes
* **compiler-sfc:** avoid gen useCssVars when targeting SSR ([#6979](https://github.com/vuejs/core/issues/6979)) ([c568778](https://github.com/vuejs/core/commit/c568778ea3265d8e57f788b00864c9509bf88a4e)), closes [#6926](https://github.com/vuejs/core/issues/6926)
* **compiler-ssr:** proper scope analysis for ssr vnode slot fallback ([#7184](https://github.com/vuejs/core/issues/7184)) ([e09c26b](https://github.com/vuejs/core/commit/e09c26bc9bc4394c2c2d928806d382515c2676f3)), closes [#7095](https://github.com/vuejs/core/issues/7095)
* correctly resolve types from relative paths on Windows ([#9446](https://github.com/vuejs/core/issues/9446)) ([089d36d](https://github.com/vuejs/core/commit/089d36d167dc7834065b03ca689f9b6a44eead8a)), closes [#8671](https://github.com/vuejs/core/issues/8671)
* **hmr:** fix hmr error for hoisted children array in v-for ([7334376](https://github.com/vuejs/core/commit/733437691f70ebca8dd6cc3bc8356f5b57d4d5d8)), closes [#6978](https://github.com/vuejs/core/issues/6978) [#7114](https://github.com/vuejs/core/issues/7114)
* **reactivity:** assigning array.length while observing a symbol property ([#7568](https://github.com/vuejs/core/issues/7568)) ([e9e2778](https://github.com/vuejs/core/commit/e9e2778e9ec5cca07c1df5f0c9b7b3595a1a3244))
* **scheduler:** ensure jobs are in the correct order ([#7748](https://github.com/vuejs/core/issues/7748)) ([a8f6638](https://github.com/vuejs/core/commit/a8f663867b8cd2736b82204bc58756ef02441276)), closes [#7576](https://github.com/vuejs/core/issues/7576)
* **ssr:** fix hydration mismatch for disabled teleport at component root ([#9399](https://github.com/vuejs/core/issues/9399)) ([d8990fc](https://github.com/vuejs/core/commit/d8990fc6182d1c2cf0a8eab7b35a9d04df668507)), closes [#6152](https://github.com/vuejs/core/issues/6152)
* **Suspense:** calling hooks before the transition finishes ([#9388](https://github.com/vuejs/core/issues/9388)) ([00de3e6](https://github.com/vuejs/core/commit/00de3e61ed7a55e7d6c2e1987551d66ad0f909ff)), closes [#5844](https://github.com/vuejs/core/issues/5844) [#5952](https://github.com/vuejs/core/issues/5952)
* **transition/ssr:** make transition appear work with SSR ([#8859](https://github.com/vuejs/core/issues/8859)) ([5ea8a8a](https://github.com/vuejs/core/commit/5ea8a8a4fab4e19a71e123e4d27d051f5e927172)), closes [#6951](https://github.com/vuejs/core/issues/6951)
* **types:** fix ComponentCustomProps augmentation ([#9468](https://github.com/vuejs/core/issues/9468)) ([7374e93](https://github.com/vuejs/core/commit/7374e93f0281f273b90ab5a6724cc47332a01d6c)), closes [#8376](https://github.com/vuejs/core/issues/8376)
* **types:** improve `h` overload to support union of string and component ([#5432](https://github.com/vuejs/core/issues/5432)) ([16ecb44](https://github.com/vuejs/core/commit/16ecb44c89cd8299a3b8de33cccc2e2cc36f065b)), closes [#5431](https://github.com/vuejs/core/issues/5431)
## [3.3.6](https://github.com/vuejs/core/compare/v3.3.5...v3.3.6) (2023-10-20)
### Bug Fixes
* **compiler-sfc:** model name conflict ([#8798](https://github.com/vuejs/core/issues/8798)) ([df81da8](https://github.com/vuejs/core/commit/df81da8be97c8a1366563c7e3e01076ef02eb8f7))
* **compiler-sfc:** support asset paths containing spaces ([#8752](https://github.com/vuejs/core/issues/8752)) ([36c99a9](https://github.com/vuejs/core/commit/36c99a9c6bb6bc306be054c3c8a85ff8ce50605a))
* **compiler-ssr:** fix missing scopeId on server-rendered TransitionGroup ([#7557](https://github.com/vuejs/core/issues/7557)) ([61c1357](https://github.com/vuejs/core/commit/61c135742795aa5e3189a79c7dec6afa21bbc8d9)), closes [#7554](https://github.com/vuejs/core/issues/7554)
* **compiler-ssr:** fix ssr compile error for select with non-option children ([#9442](https://github.com/vuejs/core/issues/9442)) ([cdb2e72](https://github.com/vuejs/core/commit/cdb2e725e7ea297f1f4180fb04889a3b757bc84e)), closes [#9440](https://github.com/vuejs/core/issues/9440)
* **runtime-core:** delete stale slots which are present but undefined ([#6484](https://github.com/vuejs/core/issues/6484)) ([75b8722](https://github.com/vuejs/core/commit/75b872213574cb37e2c9e8a15f65613f867ca9a6)), closes [#9109](https://github.com/vuejs/core/issues/9109)
* **runtime-core:** fix error when using cssvars with disabled teleport ([#7341](https://github.com/vuejs/core/issues/7341)) ([8f0472c](https://github.com/vuejs/core/commit/8f0472c9abedb337dc256143b69d8ab8759dbf5c)), closes [#7342](https://github.com/vuejs/core/issues/7342)
* **teleport:** ensure descendent component would be unmounted correctly ([#6529](https://github.com/vuejs/core/issues/6529)) ([4162311](https://github.com/vuejs/core/commit/4162311efdb0db5ca458542e1604b19efa2fae0e)), closes [#6347](https://github.com/vuejs/core/issues/6347)
* **types:** support contenteditable="plaintext-only" ([#8796](https://github.com/vuejs/core/issues/8796)) ([26ca89e](https://github.com/vuejs/core/commit/26ca89e5cf734fbef81e182050d2a215ec8a437b))
### Performance Improvements
* replace Map/Set with WeakMap/WeakSet ([#8549](https://github.com/vuejs/core/issues/8549)) ([712f96d](https://github.com/vuejs/core/commit/712f96d6ac4d3d984732cba448cb84624daba850))
## [3.3.5](https://github.com/vuejs/core/compare/v3.3.4...v3.3.5) (2023-10-20)
### Bug Fixes
* add isGloballyWhitelisted back, but deprecated ([#8556](https://github.com/vuejs/core/issues/8556)) ([63dfe8e](https://github.com/vuejs/core/commit/63dfe8eab499979bcc2f7829e82464e13899c895)), closes [#8416](https://github.com/vuejs/core/issues/8416)
* **build:** disable useDefineForClassFields in esbuild ([#9252](https://github.com/vuejs/core/issues/9252)) ([6d14fa8](https://github.com/vuejs/core/commit/6d14fa88e85d4c9e264be394ddb37a54ca6738a8))
* **compat:** return value of vue compat set() ([#9377](https://github.com/vuejs/core/issues/9377)) ([e3c2d69](https://github.com/vuejs/core/commit/e3c2d699f694d9500ddee78571172a24f0e3b17a))
* **compiler-sfc:** don't hoist props and emit ([#8535](https://github.com/vuejs/core/issues/8535)) ([24db951](https://github.com/vuejs/core/commit/24db9516d8b4857182ec1a3af86cb7346691679b)), closes [#7805](https://github.com/vuejs/core/issues/7805) [#7812](https://github.com/vuejs/core/issues/7812)
* **compiler-sfc:** don't registerTS when bundling for browsers ([#8582](https://github.com/vuejs/core/issues/8582)) ([6f45f76](https://github.com/vuejs/core/commit/6f45f76df2c43796b35067ef8f8b9a7bca454040))
* **compiler-sfc:** fix using imported ref as template ref during dev ([#7593](https://github.com/vuejs/core/issues/7593)) ([776ebf2](https://github.com/vuejs/core/commit/776ebf25b2e7570e78ac1c148fc45c823c21a542)), closes [#7567](https://github.com/vuejs/core/issues/7567)
* **compiler-sfc:** handle dynamic directive arguments in template usage check ([#8538](https://github.com/vuejs/core/issues/8538)) ([e404a69](https://github.com/vuejs/core/commit/e404a699f48ae5c5a5da947f42679343192158c7)), closes [#8537](https://github.com/vuejs/core/issues/8537)
* **compiler-sfc:** ignore style v-bind in double slash comments ([#5409](https://github.com/vuejs/core/issues/5409)) ([381b497](https://github.com/vuejs/core/commit/381b4977af25ba5392704f72ec6b3f2394d87ae7))
* **compiler-sfc:** pass options directly to stylus ([#3848](https://github.com/vuejs/core/issues/3848)) ([d6446a6](https://github.com/vuejs/core/commit/d6446a6d40774b79045a9ddba7b5fd5201d51450))
* **compiler-sfc:** support resolve multiple re-export /w same source type name ([#8365](https://github.com/vuejs/core/issues/8365)) ([4fa8da8](https://github.com/vuejs/core/commit/4fa8da8576717c619e1e8c04d19038488c75fbea)), closes [#8364](https://github.com/vuejs/core/issues/8364)
* **compiler-sfc:** typo in experimental feature warnings ([#8513](https://github.com/vuejs/core/issues/8513)) ([fd1a3f9](https://github.com/vuejs/core/commit/fd1a3f95990d7c372fa1c0c40c55caca761a33a4))
* **deps:** update dependency monaco-editor to ^0.44.0 ([#9237](https://github.com/vuejs/core/issues/9237)) ([8611874](https://github.com/vuejs/core/commit/8611874e09a827b6491173836c8942284d5de22c))
* **deps:** update playground ([#9154](https://github.com/vuejs/core/issues/9154)) ([c8566a2](https://github.com/vuejs/core/commit/c8566a22b7cf37e6aefab7bad7b97ce2db9fae4c))
* **playground:** fix github button style ([#7722](https://github.com/vuejs/core/issues/7722)) ([5ee992c](https://github.com/vuejs/core/commit/5ee992cfeabc6c4b871980c6057d0ac7140ad2fa))
* **runtime-core:** swap client/server debug labels ([#9089](https://github.com/vuejs/core/issues/9089)) ([8f311c6](https://github.com/vuejs/core/commit/8f311c6f823f6776ca1c49bfbbbf8c7d9dea9cf1))
* **ssr:** render correct initial selected state for select with v-model ([#7432](https://github.com/vuejs/core/issues/7432)) ([201c46d](https://github.com/vuejs/core/commit/201c46df07a38f3c2b73f384e8e6846dc62f224e)), closes [#7392](https://github.com/vuejs/core/issues/7392)
* **ssr:** reset current instance if setting up options component errors ([#7743](https://github.com/vuejs/core/issues/7743)) ([020851e](https://github.com/vuejs/core/commit/020851e57d9a9f727c6ea07e9c1575430af02b73)), closes [#7733](https://github.com/vuejs/core/issues/7733)
* **teleport:** handle target change while disabled ([#7837](https://github.com/vuejs/core/issues/7837)) ([140a89b](https://github.com/vuejs/core/commit/140a89b833bceed60838182b875d2953c70af114)), closes [#7835](https://github.com/vuejs/core/issues/7835)
* **transition:** handle possible auto value for transition/animation durations ([96c76fa](https://github.com/vuejs/core/commit/96c76facb7de37fc241ccd55e121fd60a49a1452)), closes [#8409](https://github.com/vuejs/core/issues/8409)
* **types/jsx:** add `inert` attribute and missing `hidden` values ([#8090](https://github.com/vuejs/core/issues/8090)) ([ceb0732](https://github.com/vuejs/core/commit/ceb0732e0b1bb4c8c505d80e97ff6fc89035fa90))
* **types/jsx:** add missing loading attr for img element ([#6160](https://github.com/vuejs/core/issues/6160)) ([68d6b43](https://github.com/vuejs/core/commit/68d6b43f7e29b76aab2c6c1882885380a43fa3e3))
* **types:** correct withDefaults return type for boolean prop with undefined default value ([#8602](https://github.com/vuejs/core/issues/8602)) ([f07cb18](https://github.com/vuejs/core/commit/f07cb18fedf9a446545aadf76bcdfb957c7ebcbd))
* **types:** ensure nextTick return type reflect correct Promise value ([#8406](https://github.com/vuejs/core/issues/8406)) ([6a22b1f](https://github.com/vuejs/core/commit/6a22b1f6c287b60eda385df8a514335af8e040ea))
* **types:** support correct types for style on svg elements ([#6322](https://github.com/vuejs/core/issues/6322)) ([364dc53](https://github.com/vuejs/core/commit/364dc53c7cc6f97d812ad175199c698faa92538e))
### Performance Improvements
* **compiler-sfc:** lazy require typescript ([d2c3d8b](https://github.com/vuejs/core/commit/d2c3d8b70b2df6e16f053a7ac58e6b04e7b2078f))
* **custom-element:** cancel `MutationObserver` listener when disconnected ([#8666](https://github.com/vuejs/core/issues/8666)) ([24d98f0](https://github.com/vuejs/core/commit/24d98f03276de5b0fbced5a4c9d61b24e7d9d084))
* mark `defineComponent` as side-effects-free ([#8512](https://github.com/vuejs/core/issues/8512)) ([438027c](https://github.com/vuejs/core/commit/438027cf9ecb63260f59d3027e0b188717694795))
## [3.3.4](https://github.com/vuejs/core/compare/v3.3.3...v3.3.4) (2023-05-18)
### Bug Fixes
* **build:** ensure correct typing for node esm ([d621d4c](https://github.com/vuejs/core/commit/d621d4c646b2d7b190fbd44ad1fd04512b3de300))
* **build:** fix __DEV__ flag replacement edge case ([8b7c04b](https://github.com/vuejs/core/commit/8b7c04b18f73aad9a08dd57eba90101b5b2aef28)), closes [#8353](https://github.com/vuejs/core/issues/8353)
* **compiler-sfc:** handle imported types from default exports ([5aec717](https://github.com/vuejs/core/commit/5aec717a2402652306085f58432ba3ab91848a74)), closes [#8355](https://github.com/vuejs/core/issues/8355)
## [3.3.3](https://github.com/vuejs/core/compare/v3.3.2...v3.3.3) (2023-05-18)
### Bug Fixes
* avoid regex s flag for old browsers ([91f1c62](https://github.com/vuejs/core/commit/91f1c62e6384a8b09f90e7e43b8d347901e529a0)), closes [#8316](https://github.com/vuejs/core/issues/8316)
* **build:** fix dev flag replacement in esm-builder builds ([#8314](https://github.com/vuejs/core/issues/8314)) ([003836f](https://github.com/vuejs/core/commit/003836f90e1f00ebd04b77ec07ccfa4e649a2ff4)), closes [#8312](https://github.com/vuejs/core/issues/8312)
* **compiler-sfc:** don't hoist regexp literial ([#8300](https://github.com/vuejs/core/issues/8300)) ([8ec73a3](https://github.com/vuejs/core/commit/8ec73a3aea7a52e9479f107ae5737761166ddae6))
* **compiler-sfc:** fix props destructing default value type checking with unresolved type ([#8340](https://github.com/vuejs/core/issues/8340)) ([f69dbab](https://github.com/vuejs/core/commit/f69dbabf8794426c3e9ed33ae77dd8ce655eafd2)), closes [#8326](https://github.com/vuejs/core/issues/8326)
* **compiler-sfc:** fix type import from path aliased vue file ([fab9c72](https://github.com/vuejs/core/commit/fab9c727805c6186c490f99023e8cf5401b0b5a9)), closes [#8348](https://github.com/vuejs/core/issues/8348)
* **compiler-sfc:** handle ts files with relative imports with .js extension ([b36addd](https://github.com/vuejs/core/commit/b36addd3bde07467e9ff5641bd1c2bdc3085944c)), closes [#8339](https://github.com/vuejs/core/issues/8339)
* **compiler-sfc:** parses correctly when inline mode is off ([#8337](https://github.com/vuejs/core/issues/8337)) ([ecbd42a](https://github.com/vuejs/core/commit/ecbd42a1444e3c599e464dec002e43d548d99669)), closes [#6088](https://github.com/vuejs/core/issues/6088)
* **compiler-sfc:** support defineEmits type reference with unions ([#8299](https://github.com/vuejs/core/issues/8299)) ([b133e0f](https://github.com/vuejs/core/commit/b133e0fd97b0b4fabbb43151c19031b8fb47c05b)), closes [#7943](https://github.com/vuejs/core/issues/7943)
* **types:** support generic usage with withDefaults + defineProps ([#8335](https://github.com/vuejs/core/issues/8335)) ([216f269](https://github.com/vuejs/core/commit/216f26995b63c2df26ca0f39f390fe8d59cdabfa)), closes [#8310](https://github.com/vuejs/core/issues/8310) [#8331](https://github.com/vuejs/core/issues/8331) [#8325](https://github.com/vuejs/core/issues/8325)
## [3.3.2](https://github.com/vuejs/core/compare/v3.3.1...v3.3.2) (2023-05-12)
### Bug Fixes
* **compiler-core:** treat floating point numbers as constants ([8dc8cf8](https://github.com/vuejs/core/commit/8dc8cf852bf8057aa5c4b5670f09e8c28a168b73)), closes [#8295](https://github.com/vuejs/core/issues/8295)
* **compiler-dom:** do not throw in production on side effect tags ([c454b9d](https://github.com/vuejs/core/commit/c454b9d7f431d57abedb7184d1e4059914c4463f)), closes [#8287](https://github.com/vuejs/core/issues/8287) [#8292](https://github.com/vuejs/core/issues/8292)
* **compiler-sfc:** fix regression on props destructure when transform is not enabled ([f25bd37](https://github.com/vuejs/core/commit/f25bd37c6707fde19d164d90a38de41168941f4b)), closes [#8289](https://github.com/vuejs/core/issues/8289)
* **compiler-sfc:** handle prop keys that need escaping ([#7803](https://github.com/vuejs/core/issues/7803)) ([690ef29](https://github.com/vuejs/core/commit/690ef296357c7fc09f66ba9408df548e117f686f)), closes [#8291](https://github.com/vuejs/core/issues/8291)
* **compiler-sfc:** properly parse d.ts files when resolving types ([aa1e77d](https://github.com/vuejs/core/commit/aa1e77d532b951ea5d3a5e26214a8b0c9c02fb6f)), closes [#8285](https://github.com/vuejs/core/issues/8285)
* **compiler-sfc:** raise specific warning for failed extends and allow ignoring extends ([8235072](https://github.com/vuejs/core/commit/82350721a408e1f552c613c05971439d6c218d87)), closes [#8286](https://github.com/vuejs/core/issues/8286)
## [3.3.1](https://github.com/vuejs/core/compare/v3.3.0...v3.3.1) (2023-05-11)
### Bug Fixes
* **suspense:** handle nested sync suspense for hydration ([a3f5485](https://github.com/vuejs/core/commit/a3f54857858c8ca0e6b9f12618d151ab255fb040))
# [3.3.0 Rurouni Kenshin](https://github.com/vuejs/core/compare/v3.3.0-beta.5...v3.3.0) (2023-05-11)
- For a detailed walkthrough of the new features in 3.3, please read the [release blog post](https://blog.vuejs.org/posts/vue-3-3).
- Features and deprecations listed here are aggregated from the beta and alpha releases. For full chronological history, bug fixes, and other minor features, please consult the individual logs of the 3.3 beta and alpha releases.
## Features
* **sfc:** support imported types in SFC macros ([#8083](https://github.com/vuejs/core/pull/8083))
* **types/slots:** support slot presence / props type checks via `defineSlots` macro and `slots` option ([#7982](https://github.com/vuejs/core/issues/7982)) ([5a2f5d5](https://github.com/vuejs/core/commit/5a2f5d59cffa36a99e6f2feab6b3ba7958b7362f))
* **sfc:** support more ergnomic defineEmits type syntax ([#7992](https://github.com/vuejs/core/issues/7992)) ([8876dcc](https://github.com/vuejs/core/commit/8876dccf42a7f05375d97cb18c1afdfd0fc51c94))
* **sfc:** introduce `defineModel` macro and `useModel` helper ([#8018](https://github.com/vuejs/core/issues/8018)) ([14f3d74](https://github.com/vuejs/core/commit/14f3d747a34d45415b0036b274517d70a27ec0d3))
* **reactivity:** improve support of getter usage in reactivity APIs ([#7997](https://github.com/vuejs/core/issues/7997)) ([59e8284](https://github.com/vuejs/core/commit/59e828448e7f37643cd0eaea924a764e9d314448))
* **compiler-sfc:** add defineOptions macro ([#5738](https://github.com/vuejs/core/issues/5738)) ([bcf5841](https://github.com/vuejs/core/commit/bcf5841ddecc64d0bdbd56ce1463eb8ebf01bb9d))
* **types/jsx:** support jsxImportSource, avoid global JSX conflict ([#7958](https://github.com/vuejs/core/issues/7958)) ([d0b7ef3](https://github.com/vuejs/core/commit/d0b7ef3b61d5f83e35e5854b3c2c874e23463102))
* **dx:** improve readability of displayed types for props ([4c9bfd2](https://github.com/vuejs/core/commit/4c9bfd2b999ce472f7481aae4f9dc5bb9f76628e))
* **app:** app.runWithContext() ([#7451](https://github.com/vuejs/core/issues/7451)) ([869f3fb](https://github.com/vuejs/core/commit/869f3fb93e61400be4fd925e0850c2b1564749e2))
* hasInjectionContext() for libraries ([#8111](https://github.com/vuejs/core/issues/8111)) ([5510ce3](https://github.com/vuejs/core/commit/5510ce385abfa151c07a5253cccf4abccabdd01d))
* allow accessing console in template ([#6508](https://github.com/vuejs/core/issues/6508)) ([fe76224](https://github.com/vuejs/core/commit/fe762247f8035d28d543bc5602ad01b0c258f6d6)), closes [#7939](https://github.com/vuejs/core/issues/7939)
* **suspense:** introduce suspensible option for `<Suspense>` ([#6736](https://github.com/vuejs/core/issues/6736)) ([cb37d0b](https://github.com/vuejs/core/commit/cb37d0b9ffb5d4bb81a0367d84295dec8dd4448c)), closes [#5513](https://github.com/vuejs/core/issues/5513)
* **compiler-dom:** treat inert as boolean attribute ([#8209](https://github.com/vuejs/core/issues/8209)) ([918ec8a](https://github.com/vuejs/core/commit/918ec8a5cbc825a3947cd35fe966671c245af087)), closes [#8208](https://github.com/vuejs/core/issues/8208)
* **types:** add slots types for built-in components ([#6033](https://github.com/vuejs/core/issues/6033)) ([3cb4dc9](https://github.com/vuejs/core/commit/3cb4dc9e5538e1c2bde9fa691b001615a848c546))
* **types:** provide ExtractPublicPropTypes utility type ([bff63c5](https://github.com/vuejs/core/commit/bff63c5498f5fa098689c18defe48ae08d47eadb)), closes [#5272](https://github.com/vuejs/core/issues/5272) [#8168](https://github.com/vuejs/core/issues/8168)
* **compiler-sfc:** expose parseCache ([4576548](https://github.com/vuejs/core/commit/45765488d498d94f8760c9e82f1177070057b17c)), closes [#8202](https://github.com/vuejs/core/issues/8202)
## Deprecations
* **deprecation:** deprecate [@vnode](https://github.com/vnode) hooks in favor of vue: prefix ([5f0394a](https://github.com/vuejs/core/commit/5f0394a5ab88c82c74e240161499721f63d5462e))
* **deprecation:** deprecate v-is directive ([bbd8301](https://github.com/vuejs/core/commit/bbd8301a1344b02de635ea16d4822db1c343bd12))
* **deprecation:** unwrap injected refs in Options API by default, deprecate app.config.unwrapInjectedRefs ([526fa3b](https://github.com/vuejs/core/commit/526fa3b2ccf038375e76f8af2f1ddf79a7388878))
# [3.3.0-beta.5](https://github.com/vuejs/core/compare/v3.3.0-beta.4...v3.3.0-beta.5) (2023-05-08)
### Bug Fixes
* **build:** retain defineComponent() treeshakability in Rollup ([c2172f3](https://github.com/vuejs/core/commit/c2172f3a0ebbd7153e209dd8df6d9724bc524d9a)), closes [#8236](https://github.com/vuejs/core/issues/8236)
* **compiler-sfc:** enable props destructure when reactivity transform option is enabled ([862edfd](https://github.com/vuejs/core/commit/862edfd91a2c2f6b75f943cb1a9682c4be5d7fa8))
* **compiler-sfc:** fix built-in type resolving in external files ([6b194bc](https://github.com/vuejs/core/commit/6b194bcf3b8143895c2a472cd87998ebf9856146)), closes [#8244](https://github.com/vuejs/core/issues/8244)
* **compiler-sfc:** transform destructured props when reactivity transform option is enabled ([#8252](https://github.com/vuejs/core/issues/8252)) ([287bd99](https://github.com/vuejs/core/commit/287bd999942e58925377f50540c7134cff2a9279))
* **runtime-core:** ensure defineComponent name in extraOptions takes higher priority ([b2be75b](https://github.com/vuejs/core/commit/b2be75bad4ba70da1da6930eb914e51ce2c630b2))
* **runtime-dom:** check attribute value when setting option value ([#8246](https://github.com/vuejs/core/issues/8246)) ([4495373](https://github.com/vuejs/core/commit/4495373d28d9fa4479eedd224adb16248ae0b9f4)), closes [#8227](https://github.com/vuejs/core/issues/8227)
* **suspense:** fix nested suspensible suspense with no asyn deps ([e147512](https://github.com/vuejs/core/commit/e1475129fc6f8c086c2ec667476900b8c8f46774)), closes [#8206](https://github.com/vuejs/core/issues/8206)
* **types:** remove short syntax support in defineSlots() ([1279b17](https://github.com/vuejs/core/commit/1279b1730079f77692a0817d51bbba57eb2b871b))
# [3.3.0-beta.4](https://github.com/vuejs/core/compare/v3.3.0-beta.3...v3.3.0-beta.4) (2023-05-05)
### Bug Fixes
* **runtime-core:** handle template ref with number values ([#8233](https://github.com/vuejs/core/issues/8233)) ([1b1242f](https://github.com/vuejs/core/commit/1b1242f4d1349e361335b2815f41742d41283a94)), closes [#8230](https://github.com/vuejs/core/issues/8230)
* **types:** retain compatibility for provide() usage with explicit type parameter ([038cd83](https://github.com/vuejs/core/commit/038cd830d5b34b47d7e7e1c61f0973d27cd8b915))
### Features
* **compiler-dom:** treat inert as boolean attribute ([#8209](https://github.com/vuejs/core/issues/8209)) ([918ec8a](https://github.com/vuejs/core/commit/918ec8a5cbc825a3947cd35fe966671c245af087)), closes [#8208](https://github.com/vuejs/core/issues/8208)
* **types:** add slots types for built-in components ([#6033](https://github.com/vuejs/core/issues/6033)) ([3cb4dc9](https://github.com/vuejs/core/commit/3cb4dc9e5538e1c2bde9fa691b001615a848c546))
* **types:** provide ExtractPublicPropTypes utility type ([bff63c5](https://github.com/vuejs/core/commit/bff63c5498f5fa098689c18defe48ae08d47eadb)), closes [#5272](https://github.com/vuejs/core/issues/5272) [#8168](https://github.com/vuejs/core/issues/8168)
# [3.3.0-beta.3](https://github.com/vuejs/core/compare/v3.3.0-beta.2...v3.3.0-beta.3) (2023-05-01)
### Bug Fixes
* **compiler-core:** handle slot argument parsing edge case ([b434d12](https://github.com/vuejs/core/commit/b434d12bf6cbd49a7c99b1646d9517d8393ea49f))
* **hmr:** keep slots proxy mutable for hmr ([c117d9c](https://github.com/vuejs/core/commit/c117d9c257820481b85304db26ce5c77af5d050c)), closes [#8188](https://github.com/vuejs/core/issues/8188)
* **types:** fix provide type checking for ref value ([de87e6e](https://github.com/vuejs/core/commit/de87e6e405dfaf9a917d7eb423fcee35237c2020)), closes [#8201](https://github.com/vuejs/core/issues/8201)
### Features
* **compiler-sfc:** expose parseCache ([4576548](https://github.com/vuejs/core/commit/45765488d498d94f8760c9e82f1177070057b17c)), closes [#8202](https://github.com/vuejs/core/issues/8202)
# [3.3.0-beta.2](https://github.com/vuejs/core/compare/v3.3.0-beta.1...v3.3.0-beta.2) (2023-04-25)
### Bug Fixes
* **compiler-sfc:** avoid all hard errors when inferring runtime type ([2d9f6f9](https://github.com/vuejs/core/commit/2d9f6f926453c46f542789927bcd30d15da9c24b))
* **compiler-sfc:** normalize windows paths when resolving types ([#8136](https://github.com/vuejs/core/issues/8136)) ([29da504](https://github.com/vuejs/core/commit/29da50468770fcee16ba5d5bec7166dd5bc120ee))
* **compiler-sfc:** props bindings should not override user declared bindings ([433a58c](https://github.com/vuejs/core/commit/433a58ccb61c25512dcc3df155b8e285256917ef)), closes [#8148](https://github.com/vuejs/core/issues/8148)
### Features
* **compiler-sfc:** support project references when resolving types ([1c0be5c](https://github.com/vuejs/core/commit/1c0be5c7444966fa444460e87633cf44ec60292a)), closes [#8140](https://github.com/vuejs/core/issues/8140)
### Performance Improvements
* **compiler-sfc:** infer ref binding type for more built-in methods ([a370e80](https://github.com/vuejs/core/commit/a370e8006a70ea49a7d04c8c1a42d0947eba5dea))
# [3.3.0-beta.1](https://github.com/vuejs/core/compare/v3.3.0-alpha.13...v3.3.0-beta.1) (2023-04-21)
### Features
* allow accessing console in template ([#6508](https://github.com/vuejs/core/issues/6508)) ([fe76224](https://github.com/vuejs/core/commit/fe762247f8035d28d543bc5602ad01b0c258f6d6)), closes [#7939](https://github.com/vuejs/core/issues/7939)
* **compiler-sfc:** improve utility type Partial and Required ([#8103](https://github.com/vuejs/core/issues/8103)) ([1d1d728](https://github.com/vuejs/core/commit/1d1d72894995fde14bd09e2990462c19d5176bf9))
* **deprecation:** deprecate [@vnode](https://github.com/vnode) hooks in favor of vue: prefix ([5f0394a](https://github.com/vuejs/core/commit/5f0394a5ab88c82c74e240161499721f63d5462e))
* **deprecation:** deprecate v-is directive ([bbd8301](https://github.com/vuejs/core/commit/bbd8301a1344b02de635ea16d4822db1c343bd12))
* **deprecation:** unwrap injected refs in Options API by default, deprecate app.config.unwrapInjectedRefs ([526fa3b](https://github.com/vuejs/core/commit/526fa3b2ccf038375e76f8af2f1ddf79a7388878))
* **suspense:** introduce suspensible option for `<Suspense>` ([#6736](https://github.com/vuejs/core/issues/6736)) ([cb37d0b](https://github.com/vuejs/core/commit/cb37d0b9ffb5d4bb81a0367d84295dec8dd4448c)), closes [#5513](https://github.com/vuejs/core/issues/5513)
# [3.3.0-alpha.13](https://github.com/vuejs/core/compare/v3.3.0-alpha.12...v3.3.0-alpha.13) (2023-04-20)
### Bug Fixes
* **compiler-sfc:** handle type merging + fix namespace access when inferring type ([d53e157](https://github.com/vuejs/core/commit/d53e157805678db7a3b9ca2fccc74530e1dfbc48)), closes [#8102](https://github.com/vuejs/core/issues/8102)
* **compiler-sfc:** normalize filename when invalidating cache ([9b5a34b](https://github.com/vuejs/core/commit/9b5a34bf8c0d1b4c6ec3cf1434076b7e25065f84))
* **hmr:** always traverse static children in dev ([f17a82c](https://github.com/vuejs/core/commit/f17a82c769cfb60ee6785ef5d34d91191d153542)), closes [#7921](https://github.com/vuejs/core/issues/7921) [#8100](https://github.com/vuejs/core/issues/8100)
* **hmr:** force update cached slots during HMR ([94fa67a](https://github.com/vuejs/core/commit/94fa67a4f73b3646c8c1e29512a71b17bd56efc3)), closes [#7155](https://github.com/vuejs/core/issues/7155) [#7158](https://github.com/vuejs/core/issues/7158)
### Features
* **compiler-sfc:** support dynamic imports when resolving types ([4496456](https://github.com/vuejs/core/commit/4496456d7d9947560ef1e35ccb176b97a27bd8f4))
* **compiler-sfc:** support export * when resolving types ([7c3ca3c](https://github.com/vuejs/core/commit/7c3ca3cc3e122fe273e80a950c57d492a7f0bf4a))
* **compiler-sfc:** support ExtractPropTypes when resolving types ([50c0bbe](https://github.com/vuejs/core/commit/50c0bbe5221dbc1dc353d4960e69ec7c8ba12905)), closes [#8104](https://github.com/vuejs/core/issues/8104)
* hasInjectionContext() for libraries ([#8111](https://github.com/vuejs/core/issues/8111)) ([5510ce3](https://github.com/vuejs/core/commit/5510ce385abfa151c07a5253cccf4abccabdd01d))
# [3.3.0-alpha.12](https://github.com/vuejs/core/compare/v3.3.0-alpha.11...v3.3.0-alpha.12) (2023-04-18)
### Bug Fixes
* **compiler:** fix expression codegen for literal const bindings in non-inline mode ([0f77a2b](https://github.com/vuejs/core/commit/0f77a2b1d1047d66ccdfda70382d1a223886130c))
# [3.3.0-alpha.11](https://github.com/vuejs/core/compare/v3.3.0-alpha.10...v3.3.0-alpha.11) (2023-04-17)
### Bug Fixes
* **compiler-sfc:** normalize windows paths when resolving types ([271df09](https://github.com/vuejs/core/commit/271df09470c61d073185ba6cf3cf50358713c500))
# [3.3.0-alpha.10](https://github.com/vuejs/core/compare/v3.3.0-alpha.9...v3.3.0-alpha.10) (2023-04-17)
### Bug Fixes
* **hmr:** invalidate cached props/emits options on hmr ([4b5b384](https://github.com/vuejs/core/commit/4b5b384485cf8f6124f6738b89e3d047358f3a11))
* **runtime-core:** properly merge props and emits options from mixins ([#8052](https://github.com/vuejs/core/issues/8052)) ([c94ef02](https://github.com/vuejs/core/commit/c94ef02421d7422bc59d10cf2eee9f4e7dcea6c8)), closes [#7989](https://github.com/vuejs/core/issues/7989)
### Features
* **compiler-sfc:** expose type import deps on compiled script block ([8d8ddd6](https://github.com/vuejs/core/commit/8d8ddd686c832b2ea29b87ef47666b13c4ad5d4c))
* **compiler-sfc:** expose type resolve APIs ([f22e32e](https://github.com/vuejs/core/commit/f22e32e365bf6292cb606cb7289609e82da8b790))
* **compiler-sfc:** mark props destructure as experimental and require explicit opt-in ([6b13e04](https://github.com/vuejs/core/commit/6b13e04b4c83fcdbb180dc1d59f536a1309c2960))
* **compiler-sfc:** support intersection and union types in macros ([d1f973b](https://github.com/vuejs/core/commit/d1f973bff82581fb335d6fc05623d1ad3d84fb7c)), closes [#7553](https://github.com/vuejs/core/issues/7553)
* **compiler-sfc:** support limited built-in utility types in macros ([1cfab4c](https://github.com/vuejs/core/commit/1cfab4c695b0c28f549f8c97faee5099581792a7))
* **compiler-sfc:** support mapped types, string types & template type in macros ([fb8ecc8](https://github.com/vuejs/core/commit/fb8ecc803e58bfef0971346c63fefc529812daa7))
* **compiler-sfc:** support namespace members type in macros ([5ff40bb](https://github.com/vuejs/core/commit/5ff40bb0dc2918b7db15fe9f49db2a135a925572))
* **compiler-sfc:** support relative imported types in macros ([8aa4ea8](https://github.com/vuejs/core/commit/8aa4ea81d6e4d3110aa1619cca594543da4c9b63))
* **compiler-sfc:** support resolving type imports from modules ([3982bef](https://github.com/vuejs/core/commit/3982bef533b451d1b59fa243560184a13fe8c18c))
* **compiler-sfc:** support specifying global types for sfc macros ([4e028b9](https://github.com/vuejs/core/commit/4e028b966991937c83fb2529973fd3d41080bb61)), closes [/github.com/vuejs/core/pull/8083#issuecomment-1508468713](https://github.com//github.com/vuejs/core/pull/8083/issues/issuecomment-1508468713)
* **compiler-sfc:** support string indexed type in macros ([3f779dd](https://github.com/vuejs/core/commit/3f779ddbf85054c8915fa4537f8a79baab392d5c))
* **compiler-sfc:** support string/number indexed types in macros ([760755f](https://github.com/vuejs/core/commit/760755f4f83680bee13ad546cdab2e48ade38dff))
### Performance Improvements
* **compiler:** use source-map-js ([19e17a9](https://github.com/vuejs/core/commit/19e17a951c3387cbd6a1597e6cd9048a4aad4528))
# [3.3.0-alpha.9](https://github.com/vuejs/core/compare/v3.3.0-alpha.8...v3.3.0-alpha.9) (2023-04-08)
### Bug Fixes
* **compiler-sfc:** accept `StringLiteral` node in `defineEmit` tuple syntax ([#8041](https://github.com/vuejs/core/issues/8041)) ([3ccbea0](https://github.com/vuejs/core/commit/3ccbea08e09217b50a410d7b49ebb138e0c4c1e7)), closes [#8040](https://github.com/vuejs/core/issues/8040)
* **compiler-sfc:** fix binding type for constants when hoistStatic is disabled ([#8029](https://github.com/vuejs/core/issues/8029)) ([f7f4624](https://github.com/vuejs/core/commit/f7f4624191bbdc09600dbb0eb048b947c3a4f761))
* **compiler-sfc:** skip empty `defineOptions` and support TypeScript type assertions ([#8028](https://github.com/vuejs/core/issues/8028)) ([9557529](https://github.com/vuejs/core/commit/955752951e1d31b90d817bd20830fe3f89018771))
* **compiler-ssr:** disable v-once transform in ssr vdom fallback branch ([05f94cf](https://github.com/vuejs/core/commit/05f94cf7b01dd05ed7d3170916a38b175d5df292)), closes [#7644](https://github.com/vuejs/core/issues/7644)
* **types:** improve defineProps return type with generic arguments ([91a931a](https://github.com/vuejs/core/commit/91a931ae8707b8d43f10216e1ce8e18b12158f99))
* **types:** more public type argument order fix ([af563bf](https://github.com/vuejs/core/commit/af563bf428200367b6f5bb7944f690c85d810202))
* **types:** retain type parameters order for public types ([bdf557f](https://github.com/vuejs/core/commit/bdf557f6f233c039fff8007b1b16aec00c4e68aa))
### Features
* **app:** app.runWithContext() ([#7451](https://github.com/vuejs/core/issues/7451)) ([869f3fb](https://github.com/vuejs/core/commit/869f3fb93e61400be4fd925e0850c2b1564749e2))
* **sfc:** introduce `defineModel` macro and `useModel` helper ([#8018](https://github.com/vuejs/core/issues/8018)) ([14f3d74](https://github.com/vuejs/core/commit/14f3d747a34d45415b0036b274517d70a27ec0d3))
### Reverts
* Revert "chore: remove unused args passed to ssrRender" ([b117b88](https://github.com/vuejs/core/commit/b117b8844881a732a021432066230ff2215049ea))
# [3.3.0-alpha.8](https://github.com/vuejs/core/compare/v3.3.0-alpha.7...v3.3.0-alpha.8) (2023-04-04)
### Bug Fixes
* **compiler-sfc:** check binding is prop before erroring ([f3145a9](https://github.com/vuejs/core/commit/f3145a915aaec11c915f1df258c5209ae4782bcc)), closes [#8017](https://github.com/vuejs/core/issues/8017)
# [3.3.0-alpha.7](https://github.com/vuejs/core/compare/v3.3.0-alpha.6...v3.3.0-alpha.7) (2023-04-03)
### Bug Fixes
* **compiler-dom:** handle newlines when evaluating constants during stringification ([#7995](https://github.com/vuejs/core/issues/7995)) ([5261085](https://github.com/vuejs/core/commit/52610851137b9c5f6f57d771fd604fba309b3c97)), closes [#7994](https://github.com/vuejs/core/issues/7994)
* **compiler-sfc:** use dynamic defaults merging for methods with computed keys ([482f2e3](https://github.com/vuejs/core/commit/482f2e3434a1edc47a181890354838e206d08922)), closes [#7113](https://github.com/vuejs/core/issues/7113)
### Features
* **compiler-sfc:** codegen support for defineEmits() short syntax (followup of [#7992](https://github.com/vuejs/core/issues/7992)) ([ef73ea5](https://github.com/vuejs/core/commit/ef73ea53eaf853d43e70946d2d448ae8c0a83e4f))
* **compiler-sfc:** support arbitrary expression as withDefaults argument ([fe61944](https://github.com/vuejs/core/commit/fe619443d2e99301975de120685dbae8d66c03a6)), closes [#6459](https://github.com/vuejs/core/issues/6459)
* **reactivity:** improve support of getter usage in reactivity APIs ([#7997](https://github.com/vuejs/core/issues/7997)) ([59e8284](https://github.com/vuejs/core/commit/59e828448e7f37643cd0eaea924a764e9d314448))
* **sfc:** revert withDefaults() deprecation ([4af5d1b](https://github.com/vuejs/core/commit/4af5d1b0754035058436f9e4e5c12aedef199177))
* **sfc:** support more ergnomic defineEmits type syntax ([#7992](https://github.com/vuejs/core/issues/7992)) ([8876dcc](https://github.com/vuejs/core/commit/8876dccf42a7f05375d97cb18c1afdfd0fc51c94))
* **types/slots:** support slot presence / props type checks via `defineSlots` macro and `slots` option ([#7982](https://github.com/vuejs/core/issues/7982)) ([5a2f5d5](https://github.com/vuejs/core/commit/5a2f5d59cffa36a99e6f2feab6b3ba7958b7362f))
# [3.3.0-alpha.6](https://github.com/vuejs/core/compare/v3.3.0-alpha.5...v3.3.0-alpha.6) (2023-03-30)
### Bug Fixes
* **compiler-core:** check if expression is constant ([#7974](https://github.com/vuejs/core/issues/7974)) ([77686cf](https://github.com/vuejs/core/commit/77686cf4765e7e345bef364c0b03739e3c2da91d)), closes [#7973](https://github.com/vuejs/core/issues/7973)
* **compiler-core:** fix codegen for literal const in non-inline mode ([6bda4b6](https://github.com/vuejs/core/commit/6bda4b66886240b28993c88b7ecd4640a199be65))
* **compiler-sfc:** allow `<script>` with lang='js' ([#7398](https://github.com/vuejs/core/issues/7398)) ([9f5e20c](https://github.com/vuejs/core/commit/9f5e20ccff235946159f0e50519f5be09bc89d5b))
* **compiler-sfc:** avoid codegen conflict with user variable named `expose` ([#7949](https://github.com/vuejs/core/issues/7949)) ([c839129](https://github.com/vuejs/core/commit/c839129ab9d46f56a019b0ff234b35f27cac1e35)), closes [#7890](https://github.com/vuejs/core/issues/7890)
* **compiler-sfc:** disallow `expose` property in `defineOptions` ([#7967](https://github.com/vuejs/core/issues/7967)) ([93f7729](https://github.com/vuejs/core/commit/93f77292c9f2c4dcc83aae6b5943a8b1d7443092))
* **compiler-sfc:** fix defineExpose() codegen regression from [#7949](https://github.com/vuejs/core/issues/7949) ([a94072d](https://github.com/vuejs/core/commit/a94072dd2ca1aca4ce1fbe5da51ca2a9a07a4637))
* **compiler-sfc:** fix edge case of default export call with no args ([#7536](https://github.com/vuejs/core/issues/7536)) ([d60e58c](https://github.com/vuejs/core/commit/d60e58c9f62ae7bd1f9c888cd2e55982a64d9e96)), closes [#7534](https://github.com/vuejs/core/issues/7534)
* **compiler-sfc:** fix function default value handling w/ props destructure ([e10a89e](https://github.com/vuejs/core/commit/e10a89e608d3486c0c9a0457ee7c56d208e0aa91))
* **compiler-sfc:** handle more TS built-in utilities in defineProps inference ([4355d24](https://github.com/vuejs/core/commit/4355d2492dccdb175b18d083e20f3ec39a52801f))
* **compiler-sfc:** infer function prop type from type literal w/ callable signature ([#7119](https://github.com/vuejs/core/issues/7119)) ([3a7572c](https://github.com/vuejs/core/commit/3a7572cdb2074c5cac2231e4525296104141411c))
* **compiler-sfc:** infer object type for empty type literal ([1a04fba](https://github.com/vuejs/core/commit/1a04fba10b6462303c65f1095da86ce05c14f1f4))
* **compiler-sfc:** infer runtime type in defineProps ([#7972](https://github.com/vuejs/core/issues/7972)) ([ba4cec3](https://github.com/vuejs/core/commit/ba4cec31b91da60555892c381b00c2fa5b3e0e39))
* **compiler-sfc:** infer TS Extract&Exclude runtime type ([#7339](https://github.com/vuejs/core/issues/7339)) ([6391daf](https://github.com/vuejs/core/commit/6391daf6586e49e165b3195863b602c3cbb92ace)), closes [#7337](https://github.com/vuejs/core/issues/7337) [#6252](https://github.com/vuejs/core/issues/6252)
* **compiler-sfc:** infer TSIntersectionType in defineProps ([#7394](https://github.com/vuejs/core/issues/7394)) ([151a8ad](https://github.com/vuejs/core/commit/151a8ad6b9288784c3b2514820a112b93ecf2dca))
* **compiler-sfc:** properly handle unknown types in runtime prop inference ([5fb406e](https://github.com/vuejs/core/commit/5fb406e3e1d585076779e9ce4a588a4f9a61ef23)), closes [#7511](https://github.com/vuejs/core/issues/7511)
* **compiler-sfc:** properly remove comma of multiple macros in the same declaration ([#7423](https://github.com/vuejs/core/issues/7423)) ([336a3d7](https://github.com/vuejs/core/commit/336a3d7b9199aeda19672832ce173de298b1105a)), closes [#7422](https://github.com/vuejs/core/issues/7422) [#6778](https://github.com/vuejs/core/issues/6778)
* **compiler-sfc:** rewrite default export with AST analysis instead of regex ([#7068](https://github.com/vuejs/core/issues/7068)) ([701b95f](https://github.com/vuejs/core/commit/701b95ff3d2bad0284c03865a0b052fc8324beec)), closes [#7038](https://github.com/vuejs/core/issues/7038) [#7041](https://github.com/vuejs/core/issues/7041) [#7078](https://github.com/vuejs/core/issues/7078)
* **compiler-sfc:** unwrap TS node for defineProps ([#7340](https://github.com/vuejs/core/issues/7340)) ([1b69d5f](https://github.com/vuejs/core/commit/1b69d5f2f49ee60af4b10137c7833a76420dbba1))
* **compiler-sfc:** use prependLeft to handle CSSVars ([#7760](https://github.com/vuejs/core/issues/7760)) ([139104b](https://github.com/vuejs/core/commit/139104ba2695eecae672db98f978de78e17ab7e1))
* **jsx-runtime:** fix automatic runtime implementation ([#7959](https://github.com/vuejs/core/issues/7959)) ([5838950](https://github.com/vuejs/core/commit/5838950ecf7e4e17dd5a23acd621077390666b76))
* **jsx-runtime:** handle keys ([#7976](https://github.com/vuejs/core/issues/7976)) ([ff60b93](https://github.com/vuejs/core/commit/ff60b933ae4e02422393664ee7818cffadf9b58b))
* **types/jsx:** jsx-runtime types for global JSX namespace registration ([#7978](https://github.com/vuejs/core/issues/7978)) ([0f73f39](https://github.com/vuejs/core/commit/0f73f394dafd709298bd8c71107a323bf322a1d2))
* **types/jsx:** move JSX DOM types back to `@vue/runtime-dom` ([#7979](https://github.com/vuejs/core/issues/7979)) ([ffe679c](https://github.com/vuejs/core/commit/ffe679c490986b69956daec7166f1ab6d9f23073))
* **types/jsx:** remove $slots children override ([28e30c8](https://github.com/vuejs/core/commit/28e30c819df5e4fc301c98f7be938fa13e8be3bc))
* **types:** revert jsx global removal (to be removed in 3.4) ([e224922](https://github.com/vuejs/core/commit/e224922e972e78b4fb6cbd129d685c2317018ad1))
### Features
* **compiler-core:** support parsing `const` modifier in type parameters ([#7912](https://github.com/vuejs/core/issues/7912)) ([b7bd50f](https://github.com/vuejs/core/commit/b7bd50f5059e8755c0204f01a8c55b1724688e7e))
* **compiler-sfc:** add defineOptions macro ([#5738](https://github.com/vuejs/core/issues/5738)) ([bcf5841](https://github.com/vuejs/core/commit/bcf5841ddecc64d0bdbd56ce1463eb8ebf01bb9d))
* **compiler-sfc:** enable reactive props destructure by default ([#7986](https://github.com/vuejs/core/issues/7986)) ([ba9c2ae](https://github.com/vuejs/core/commit/ba9c2ae247fcc3960b238a04cb635158daa82004))
* **compiler-sfc:** improve runtime props inference for enum ([eded947](https://github.com/vuejs/core/commit/eded94712e37856f258dc8c85f98a26fa41ae05f))
* **compiler-sfc:** support generating variable instead of default export in compileScript ([71635be](https://github.com/vuejs/core/commit/71635be68d25887f91d624bb7f78281a851bc0cb))
* **compiler-sfc:** support module string names syntax ([#7428](https://github.com/vuejs/core/issues/7428)) ([0002567](https://github.com/vuejs/core/commit/000256772816d54976e462330a7be342c49c7304))
* **complier-sfc:** hoist literal constants for script ([#5752](https://github.com/vuejs/core/issues/5752)) ([7def8b1](https://github.com/vuejs/core/commit/7def8b15b89aa78accd9a00927db91e8091a12b7)), closes [#5750](https://github.com/vuejs/core/issues/5750)
* **runtime-core:** add skipCheck for prop ([#7548](https://github.com/vuejs/core/issues/7548)) ([63ad77f](https://github.com/vuejs/core/commit/63ad77f6f65751780aa52f817387165b4773cfe4))
* **sfc:** deprecate reactivity transform ([efb54e7](https://github.com/vuejs/core/commit/efb54e7315e93f4be7004d1c0a4de8c523dab334))
* **types:** `defineComponent()` with generics support ([#7963](https://github.com/vuejs/core/issues/7963)) ([d77557c](https://github.com/vuejs/core/commit/d77557c4038f88a676903b379505b280a88cc774)), closes [#3102](https://github.com/vuejs/core/issues/3102)
### BREAKING CHANGES
* **types:** The type of `defineComponent()` when passing in a function has changed. This overload signature is rarely used in practice and the breakage will be minimal, so repurposing it to something more useful should be worth it.
# [3.3.0-alpha.5](https://github.com/vuejs/core/compare/v3.3.0-alpha.4...v3.3.0-alpha.5) (2023-03-26)
### Bug Fixes
* **runtime-core:** support `getCurrentInstance` across mutiple builds of Vue ([8d2d5bf](https://github.com/vuejs/core/commit/8d2d5bf48a24dab44e5b03cb8fa0c5faa4b696e3))
* **types:** ensure defineProps with generics return correct types ([c288c7b](https://github.com/vuejs/core/commit/c288c7b0bd6077d690f42153c3fc49a45454a66a))
### Features
* **dx:** improve readability of displayed types for props ([4c9bfd2](https://github.com/vuejs/core/commit/4c9bfd2b999ce472f7481aae4f9dc5bb9f76628e))
* **types/jsx:** support jsxImportSource, avoid global JSX conflict ([#7958](https://github.com/vuejs/core/issues/7958)) ([d0b7ef3](https://github.com/vuejs/core/commit/d0b7ef3b61d5f83e35e5854b3c2c874e23463102))
### Note on JSX Types Change
* In the next minor (3.4), Vue no longer registers the global `JSX` namespace by default. This is necessary to avoid global namespace collision with React so that TSX of both libs can co-exist in the same project. This should not affect SFC-only users with latest version of Volar.
For TSX users, it is suggested to set [jsxImportSource](https://www.typescriptlang.org/tsconfig#jsxImportSource) to `'vue'` in `tsconfig.json` after upgrading to 3.3, or opt-in per file with `/* @jsxImportSource vue */`. This will allow you to opt-in to the new behavior now and upgrade seamlessly when 3.4 releases.
If there is code that depends on the presence of the global `JSX` namespace, you can retain the exact pre-3.4 global behavior by explicitly referencing `vue/jsx`, which registers the global `JSX` namespace.
Note that the planned change in 3.4 is a type-only breaking change in a minor release, which adheres to our [release policy](https://vuejs.org/about/releases.html#semantic-versioning-edge-cases).
# [3.3.0-alpha.4](https://github.com/vuejs/core/compare/v3.3.0-alpha.3...v3.3.0-alpha.4) (2023-02-06)
### Bug Fixes
* **build:** fix const enum w/ number values ([92bb189](https://github.com/vuejs/core/commit/92bb189ca7ecae221ebf5411da87c715780d2de3))
# [3.3.0-alpha.3](https://github.com/vuejs/core/compare/v3.3.0-alpha.2...v3.3.0-alpha.3) (2023-02-06)
### Bug Fixes
* **build:** avoid const enum conflicts ([d1181ad](https://github.com/vuejs/core/commit/d1181ad692861c140e687372efbc67a1d65d642a))
# [3.3.0-alpha.2](https://github.com/vuejs/core/compare/v3.3.0-alpha.1...v3.3.0-alpha.2) (2023-02-05)
### Bug Fixes
* **build:** fix dev flag replacement in esm-bundler builds ([5851eaa](https://github.com/vuejs/core/commit/5851eaa9339364d41860a277a99f2352de2a3834))
# [3.3.0-alpha.1](https://github.com/vuejs/core/compare/v3.2.47...v3.3.0-alpha.1) (2023-02-05)
### Bug Fixes
* **build:** ensure BaseTransition functions can be tree-shaken ([3a6f5eb](https://github.com/vuejs/core/commit/3a6f5eb0f7d60dc87d17a69c66e88ae5688b11a5))

View File

@ -1,7 +1,7 @@
{ {
"private": true, "private": true,
"version": "3.3.11", "version": "3.4.3",
"packageManager": "pnpm@8.12.0", "packageManager": "pnpm@8.12.1",
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "node scripts/dev.js", "dev": "node scripts/dev.js",
@ -13,9 +13,9 @@
"size-esm-runtime": "node scripts/build.js vue -f esm-bundler-runtime", "size-esm-runtime": "node scripts/build.js vue -f esm-bundler-runtime",
"size-esm": "node scripts/build.js runtime-dom runtime-core reactivity shared -f esm-bundler", "size-esm": "node scripts/build.js runtime-dom runtime-core reactivity shared -f esm-bundler",
"check": "tsc --incremental --noEmit", "check": "tsc --incremental --noEmit",
"lint": "eslint --cache --ext .ts packages/*/{src,__tests__}/**.ts", "lint": "eslint --cache --ext .js,.ts,.tsx . --ignore-path .gitignore",
"format": "prettier --write --cache \"**/*.[tj]s?(x)\"", "format": "prettier --write --cache .",
"format-check": "prettier --check --cache \"**/*.[tj]s?(x)\"", "format-check": "prettier --check --cache .",
"test": "vitest", "test": "vitest",
"test-unit": "vitest -c vitest.unit.config.ts", "test-unit": "vitest -c vitest.unit.config.ts",
"test-e2e": "node scripts/build.js vue -f global -d && vitest -c vitest.e2e.config.ts", "test-e2e": "node scripts/build.js vue -f global -d && vitest -c vitest.e2e.config.ts",
@ -34,7 +34,7 @@
"serve": "serve", "serve": "serve",
"open": "open http://localhost:3000/packages/template-explorer/local.html", "open": "open http://localhost:3000/packages/template-explorer/local.html",
"build-sfc-playground": "run-s build-all-cjs build-runtime-esm build-browser-esm build-ssr-esm build-sfc-playground-self", "build-sfc-playground": "run-s build-all-cjs build-runtime-esm build-browser-esm build-ssr-esm build-sfc-playground-self",
"build-all-cjs": "node scripts/build.js vue runtime compiler reactivity reactivity-transform shared -af cjs", "build-all-cjs": "node scripts/build.js vue runtime compiler reactivity shared -af cjs",
"build-runtime-esm": "node scripts/build.js runtime reactivity shared -af esm-bundler && node scripts/build.js vue -f esm-bundler-runtime && node scripts/build.js vue -f esm-browser-runtime", "build-runtime-esm": "node scripts/build.js runtime reactivity shared -af esm-bundler && node scripts/build.js vue -f esm-bundler-runtime && node scripts/build.js vue -f esm-browser-runtime",
"build-browser-esm": "node scripts/build.js runtime reactivity shared -af esm-bundler && node scripts/build.js vue -f esm-bundler && node scripts/build.js vue -f esm-browser", "build-browser-esm": "node scripts/build.js runtime reactivity shared -af esm-bundler && node scripts/build.js vue -f esm-bundler && node scripts/build.js vue -f esm-browser",
"build-ssr-esm": "node scripts/build.js compiler-sfc server-renderer -f esm-browser", "build-ssr-esm": "node scripts/build.js compiler-sfc server-renderer -f esm-browser",
@ -44,14 +44,14 @@
}, },
"simple-git-hooks": { "simple-git-hooks": {
"pre-commit": "pnpm lint-staged && pnpm check", "pre-commit": "pnpm lint-staged && pnpm check",
"commit-msg": "node scripts/verifyCommit.js" "commit-msg": "node scripts/verify-commit.js"
}, },
"lint-staged": { "lint-staged": {
"*.{js,json}": [ "*.{js,json}": [
"prettier --write" "prettier --write"
], ],
"*.ts?(x)": [ "*.ts?(x)": [
"eslint", "eslint --fix",
"prettier --parser=typescript --write" "prettier --parser=typescript --write"
] ]
}, },
@ -59,8 +59,8 @@
"node": ">=18.12.0" "node": ">=18.12.0"
}, },
"devDependencies": { "devDependencies": {
"@babel/parser": "^7.23.5", "@babel/parser": "^7.23.6",
"@babel/types": "^7.23.5", "@babel/types": "^7.23.6",
"@codspeed/vitest-plugin": "^2.3.1", "@codspeed/vitest-plugin": "^2.3.1",
"@rollup/plugin-alias": "^5.0.1", "@rollup/plugin-alias": "^5.0.1",
"@rollup/plugin-commonjs": "^25.0.7", "@rollup/plugin-commonjs": "^25.0.7",
@ -69,15 +69,20 @@
"@rollup/plugin-replace": "^5.0.4", "@rollup/plugin-replace": "^5.0.4",
"@rollup/plugin-terser": "^0.4.4", "@rollup/plugin-terser": "^0.4.4",
"@types/hash-sum": "^1.0.2", "@types/hash-sum": "^1.0.2",
"@types/node": "^20.10.4", "@types/minimist": "^1.2.5",
"@typescript-eslint/parser": "^6.13.2", "@types/node": "^20.10.5",
"@vitest/coverage-istanbul": "^1.0.4", "@types/semver": "^7.5.5",
"@typescript-eslint/eslint-plugin": "^6.16.0",
"@typescript-eslint/parser": "^6.15.0",
"@vitest/coverage-istanbul": "^1.1.0",
"@vue/consolidate": "0.17.3", "@vue/consolidate": "0.17.3",
"conventional-changelog-cli": "^4.1.0", "conventional-changelog-cli": "^4.1.0",
"enquirer": "^2.4.1", "enquirer": "^2.4.1",
"esbuild": "^0.19.5", "esbuild": "^0.19.5",
"esbuild-plugin-polyfill-node": "^0.3.0", "esbuild-plugin-polyfill-node": "^0.3.0",
"eslint": "^8.55.0", "eslint": "^8.56.0",
"eslint-define-config": "^1.24.1",
"eslint-plugin-import": "npm:eslint-plugin-i@^2.29.1",
"eslint-plugin-jest": "^27.6.0", "eslint-plugin-jest": "^27.6.0",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"execa": "^8.0.1", "execa": "^8.0.1",
@ -86,14 +91,14 @@
"lodash": "^4.17.21", "lodash": "^4.17.21",
"magic-string": "^0.30.5", "magic-string": "^0.30.5",
"markdown-table": "^3.0.3", "markdown-table": "^3.0.3",
"marked": "^11.0.1", "marked": "^11.1.0",
"minimist": "^1.2.8", "minimist": "^1.2.8",
"npm-run-all": "^4.1.5", "npm-run-all": "^4.1.5",
"picocolors": "^1.0.0", "picocolors": "^1.0.0",
"prettier": "^3.1.1", "prettier": "^3.1.1",
"pretty-bytes": "^6.1.1", "pretty-bytes": "^6.1.1",
"pug": "^3.0.2", "pug": "^3.0.2",
"puppeteer": "~21.6.0", "puppeteer": "~21.6.1",
"rimraf": "^5.0.5", "rimraf": "^5.0.5",
"rollup": "^4.1.4", "rollup": "^4.1.4",
"rollup-plugin-dts": "^6.1.0", "rollup-plugin-dts": "^6.1.0",
@ -105,9 +110,9 @@
"terser": "^5.22.0", "terser": "^5.22.0",
"todomvc-app-css": "^2.4.3", "todomvc-app-css": "^2.4.3",
"tslib": "^2.6.2", "tslib": "^2.6.2",
"tsx": "^4.6.2", "tsx": "^4.7.0",
"typescript": "^5.2.2", "typescript": "^5.2.2",
"vite": "^5.0.5", "vite": "^5.0.5",
"vitest": "^1.0.4" "vitest": "^1.1.0"
} }
} }

View File

@ -1,38 +1,38 @@
import { import {
locStub, ConstantTypes,
generate, type DirectiveArguments,
type ForCodegenNode,
type IfConditionalExpression,
NodeTypes, NodeTypes,
RootNode, type RootNode,
createSimpleExpression, type VNodeCall,
createArrayExpression,
createAssignmentExpression,
createBlockStatement,
createCacheExpression,
createCallExpression,
createCompoundExpression,
createConditionalExpression,
createIfStatement,
createInterpolation,
createObjectExpression, createObjectExpression,
createObjectProperty, createObjectProperty,
createArrayExpression, createSimpleExpression,
createCompoundExpression,
createInterpolation,
createCallExpression,
createConditionalExpression,
ForCodegenNode,
createCacheExpression,
createTemplateLiteral, createTemplateLiteral,
createBlockStatement,
createIfStatement,
createAssignmentExpression,
IfConditionalExpression,
createVNodeCall, createVNodeCall,
VNodeCall, generate,
DirectiveArguments, locStub,
ConstantTypes
} from '../src' } from '../src'
import { import {
CREATE_VNODE,
TO_DISPLAY_STRING,
RESOLVE_DIRECTIVE,
helperNameMap,
RESOLVE_COMPONENT,
CREATE_COMMENT, CREATE_COMMENT,
CREATE_ELEMENT_VNODE,
CREATE_VNODE,
FRAGMENT, FRAGMENT,
RENDER_LIST, RENDER_LIST,
CREATE_ELEMENT_VNODE RESOLVE_COMPONENT,
RESOLVE_DIRECTIVE,
TO_DISPLAY_STRING,
helperNameMap,
} from '../src/runtimeHelpers' } from '../src/runtimeHelpers'
import { createElementWithCodegen, genFlagText } from './testUtils' import { createElementWithCodegen, genFlagText } from './testUtils'
import { PatchFlags } from '@vue/shared' import { PatchFlags } from '@vue/shared'
@ -40,6 +40,7 @@ import { PatchFlags } from '@vue/shared'
function createRoot(options: Partial<RootNode> = {}): RootNode { function createRoot(options: Partial<RootNode> = {}): RootNode {
return { return {
type: NodeTypes.ROOT, type: NodeTypes.ROOT,
source: '',
children: [], children: [],
helpers: new Set(), helpers: new Set(),
components: [], components: [],
@ -50,59 +51,59 @@ function createRoot(options: Partial<RootNode> = {}): RootNode {
temps: 0, temps: 0,
codegenNode: createSimpleExpression(`null`, false), codegenNode: createSimpleExpression(`null`, false),
loc: locStub, loc: locStub,
...options ...options,
} }
} }
describe('compiler: codegen', () => { describe('compiler: codegen', () => {
test('module mode preamble', () => { test('module mode preamble', () => {
const root = createRoot({ const root = createRoot({
helpers: new Set([CREATE_VNODE, RESOLVE_DIRECTIVE]) helpers: new Set([CREATE_VNODE, RESOLVE_DIRECTIVE]),
}) })
const { code } = generate(root, { mode: 'module' }) const { code } = generate(root, { mode: 'module' })
expect(code).toMatch( expect(code).toMatch(
`import { ${helperNameMap[CREATE_VNODE]} as _${helperNameMap[CREATE_VNODE]}, ${helperNameMap[RESOLVE_DIRECTIVE]} as _${helperNameMap[RESOLVE_DIRECTIVE]} } from "vue"` `import { ${helperNameMap[CREATE_VNODE]} as _${helperNameMap[CREATE_VNODE]}, ${helperNameMap[RESOLVE_DIRECTIVE]} as _${helperNameMap[RESOLVE_DIRECTIVE]} } from "vue"`,
) )
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
}) })
test('module mode preamble w/ optimizeImports: true', () => { test('module mode preamble w/ optimizeImports: true', () => {
const root = createRoot({ const root = createRoot({
helpers: new Set([CREATE_VNODE, RESOLVE_DIRECTIVE]) helpers: new Set([CREATE_VNODE, RESOLVE_DIRECTIVE]),
}) })
const { code } = generate(root, { mode: 'module', optimizeImports: true }) const { code } = generate(root, { mode: 'module', optimizeImports: true })
expect(code).toMatch( expect(code).toMatch(
`import { ${helperNameMap[CREATE_VNODE]}, ${helperNameMap[RESOLVE_DIRECTIVE]} } from "vue"` `import { ${helperNameMap[CREATE_VNODE]}, ${helperNameMap[RESOLVE_DIRECTIVE]} } from "vue"`,
) )
expect(code).toMatch( expect(code).toMatch(
`const _${helperNameMap[CREATE_VNODE]} = ${helperNameMap[CREATE_VNODE]}, _${helperNameMap[RESOLVE_DIRECTIVE]} = ${helperNameMap[RESOLVE_DIRECTIVE]}` `const _${helperNameMap[CREATE_VNODE]} = ${helperNameMap[CREATE_VNODE]}, _${helperNameMap[RESOLVE_DIRECTIVE]} = ${helperNameMap[RESOLVE_DIRECTIVE]}`,
) )
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
}) })
test('function mode preamble', () => { test('function mode preamble', () => {
const root = createRoot({ const root = createRoot({
helpers: new Set([CREATE_VNODE, RESOLVE_DIRECTIVE]) helpers: new Set([CREATE_VNODE, RESOLVE_DIRECTIVE]),
}) })
const { code } = generate(root, { mode: 'function' }) const { code } = generate(root, { mode: 'function' })
expect(code).toMatch(`const _Vue = Vue`) expect(code).toMatch(`const _Vue = Vue`)
expect(code).toMatch( expect(code).toMatch(
`const { ${helperNameMap[CREATE_VNODE]}: _${helperNameMap[CREATE_VNODE]}, ${helperNameMap[RESOLVE_DIRECTIVE]}: _${helperNameMap[RESOLVE_DIRECTIVE]} } = _Vue` `const { ${helperNameMap[CREATE_VNODE]}: _${helperNameMap[CREATE_VNODE]}, ${helperNameMap[RESOLVE_DIRECTIVE]}: _${helperNameMap[RESOLVE_DIRECTIVE]} } = _Vue`,
) )
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
}) })
test('function mode preamble w/ prefixIdentifiers: true', () => { test('function mode preamble w/ prefixIdentifiers: true', () => {
const root = createRoot({ const root = createRoot({
helpers: new Set([CREATE_VNODE, RESOLVE_DIRECTIVE]) helpers: new Set([CREATE_VNODE, RESOLVE_DIRECTIVE]),
}) })
const { code } = generate(root, { const { code } = generate(root, {
mode: 'function', mode: 'function',
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect(code).not.toMatch(`const _Vue = Vue`) expect(code).not.toMatch(`const _Vue = Vue`)
expect(code).toMatch( expect(code).toMatch(
`const { ${helperNameMap[CREATE_VNODE]}: _${helperNameMap[CREATE_VNODE]}, ${helperNameMap[RESOLVE_DIRECTIVE]}: _${helperNameMap[RESOLVE_DIRECTIVE]} } = Vue` `const { ${helperNameMap[CREATE_VNODE]}: _${helperNameMap[CREATE_VNODE]}, ${helperNameMap[RESOLVE_DIRECTIVE]}: _${helperNameMap[RESOLVE_DIRECTIVE]} } = Vue`,
) )
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
}) })
@ -111,27 +112,27 @@ describe('compiler: codegen', () => {
const root = createRoot({ const root = createRoot({
components: [`Foo`, `bar-baz`, `barbaz`, `Qux__self`], components: [`Foo`, `bar-baz`, `barbaz`, `Qux__self`],
directives: [`my_dir_0`, `my_dir_1`], directives: [`my_dir_0`, `my_dir_1`],
temps: 3 temps: 3,
}) })
const { code } = generate(root, { mode: 'function' }) const { code } = generate(root, { mode: 'function' })
expect(code).toMatch( expect(code).toMatch(
`const _component_Foo = _${helperNameMap[RESOLVE_COMPONENT]}("Foo")\n` `const _component_Foo = _${helperNameMap[RESOLVE_COMPONENT]}("Foo")\n`,
) )
expect(code).toMatch( expect(code).toMatch(
`const _component_bar_baz = _${helperNameMap[RESOLVE_COMPONENT]}("bar-baz")\n` `const _component_bar_baz = _${helperNameMap[RESOLVE_COMPONENT]}("bar-baz")\n`,
) )
expect(code).toMatch( expect(code).toMatch(
`const _component_barbaz = _${helperNameMap[RESOLVE_COMPONENT]}("barbaz")\n` `const _component_barbaz = _${helperNameMap[RESOLVE_COMPONENT]}("barbaz")\n`,
) )
// implicit self reference from SFC filename // implicit self reference from SFC filename
expect(code).toMatch( expect(code).toMatch(
`const _component_Qux = _${helperNameMap[RESOLVE_COMPONENT]}("Qux", true)\n` `const _component_Qux = _${helperNameMap[RESOLVE_COMPONENT]}("Qux", true)\n`,
) )
expect(code).toMatch( expect(code).toMatch(
`const _directive_my_dir_0 = _${helperNameMap[RESOLVE_DIRECTIVE]}("my_dir_0")\n` `const _directive_my_dir_0 = _${helperNameMap[RESOLVE_DIRECTIVE]}("my_dir_0")\n`,
) )
expect(code).toMatch( expect(code).toMatch(
`const _directive_my_dir_1 = _${helperNameMap[RESOLVE_DIRECTIVE]}("my_dir_1")\n` `const _directive_my_dir_1 = _${helperNameMap[RESOLVE_DIRECTIVE]}("my_dir_1")\n`,
) )
expect(code).toMatch(`let _temp0, _temp1, _temp2`) expect(code).toMatch(`let _temp0, _temp1, _temp2`)
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
@ -145,12 +146,12 @@ describe('compiler: codegen', () => {
[ [
createObjectProperty( createObjectProperty(
createSimpleExpression(`id`, true, locStub), createSimpleExpression(`id`, true, locStub),
createSimpleExpression(`foo`, true, locStub) createSimpleExpression(`foo`, true, locStub),
) ),
],
locStub,
),
], ],
locStub
)
]
}) })
const { code } = generate(root) const { code } = generate(root)
expect(code).toMatch(`const _hoisted_1 = hello`) expect(code).toMatch(`const _hoisted_1 = hello`)
@ -160,7 +161,7 @@ describe('compiler: codegen', () => {
test('temps', () => { test('temps', () => {
const root = createRoot({ const root = createRoot({
temps: 3 temps: 3,
}) })
const { code } = generate(root) const { code } = generate(root)
expect(code).toMatch(`let _temp0, _temp1, _temp2`) expect(code).toMatch(`let _temp0, _temp1, _temp2`)
@ -173,9 +174,9 @@ describe('compiler: codegen', () => {
codegenNode: { codegenNode: {
type: NodeTypes.TEXT, type: NodeTypes.TEXT,
content: 'hello', content: 'hello',
loc: locStub loc: locStub,
} },
}) }),
) )
expect(code).toMatch(`return "hello"`) expect(code).toMatch(`return "hello"`)
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
@ -184,8 +185,8 @@ describe('compiler: codegen', () => {
test('interpolation', () => { test('interpolation', () => {
const { code } = generate( const { code } = generate(
createRoot({ createRoot({
codegenNode: createInterpolation(`hello`, locStub) codegenNode: createInterpolation(`hello`, locStub),
}) }),
) )
expect(code).toMatch(`return _${helperNameMap[TO_DISPLAY_STRING]}(hello)`) expect(code).toMatch(`return _${helperNameMap[TO_DISPLAY_STRING]}(hello)`)
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
@ -197,9 +198,9 @@ describe('compiler: codegen', () => {
codegenNode: { codegenNode: {
type: NodeTypes.COMMENT, type: NodeTypes.COMMENT,
content: 'foo', content: 'foo',
loc: locStub loc: locStub,
} },
}) }),
) )
expect(code).toMatch(`return _${helperNameMap[CREATE_COMMENT]}("foo")`) expect(code).toMatch(`return _${helperNameMap[CREATE_COMMENT]}("foo")`)
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
@ -215,15 +216,15 @@ describe('compiler: codegen', () => {
{ {
type: NodeTypes.INTERPOLATION, type: NodeTypes.INTERPOLATION,
loc: locStub, loc: locStub,
content: createSimpleExpression(`bar`, false, locStub) content: createSimpleExpression(`bar`, false, locStub),
}, },
// nested compound // nested compound
createCompoundExpression([` + `, `nested`]) createCompoundExpression([` + `, `nested`]),
]) ]),
}) }),
) )
expect(code).toMatch( expect(code).toMatch(
`return _ctx.foo + _${helperNameMap[TO_DISPLAY_STRING]}(bar) + nested` `return _ctx.foo + _${helperNameMap[TO_DISPLAY_STRING]}(bar) + nested`,
) )
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
}) })
@ -238,10 +239,10 @@ describe('compiler: codegen', () => {
codegenNode: createConditionalExpression( codegenNode: createConditionalExpression(
createSimpleExpression('foo', false), createSimpleExpression('foo', false),
createSimpleExpression('bar', false), createSimpleExpression('bar', false),
createSimpleExpression('baz', false) createSimpleExpression('baz', false),
) as IfConditionalExpression ) as IfConditionalExpression,
} },
}) }),
) )
expect(code).toMatch(/return foo\s+\? bar\s+: baz/) expect(code).toMatch(/return foo\s+\? bar\s+: baz/)
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
@ -269,10 +270,10 @@ describe('compiler: codegen', () => {
patchFlag: '1', patchFlag: '1',
dynamicProps: undefined, dynamicProps: undefined,
directives: undefined, directives: undefined,
loc: locStub loc: locStub,
} as ForCodegenNode } as ForCodegenNode,
} },
}) }),
) )
expect(code).toMatch(`openBlock(true)`) expect(code).toMatch(`openBlock(true)`)
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
@ -288,7 +289,7 @@ describe('compiler: codegen', () => {
'1 + 2', '1 + 2',
false, false,
locStub, locStub,
ConstantTypes.CAN_STRINGIFY ConstantTypes.CAN_STRINGIFY,
), ),
valueAlias: undefined, valueAlias: undefined,
keyAlias: undefined, keyAlias: undefined,
@ -305,10 +306,10 @@ describe('compiler: codegen', () => {
patchFlag: genFlagText(PatchFlags.STABLE_FRAGMENT), patchFlag: genFlagText(PatchFlags.STABLE_FRAGMENT),
dynamicProps: undefined, dynamicProps: undefined,
directives: undefined, directives: undefined,
loc: locStub loc: locStub,
} as ForCodegenNode } as ForCodegenNode,
} },
}) }),
) )
expect(code).toMatch(`openBlock()`) expect(code).toMatch(`openBlock()`)
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
@ -325,11 +326,11 @@ describe('compiler: codegen', () => {
[ [
createObjectProperty( createObjectProperty(
createSimpleExpression(`id`, true, locStub), createSimpleExpression(`id`, true, locStub),
createSimpleExpression(`foo`, true, locStub) createSimpleExpression(`foo`, true, locStub),
), ),
createObjectProperty( createObjectProperty(
createSimpleExpression(`prop`, false, locStub), createSimpleExpression(`prop`, false, locStub),
createSimpleExpression(`bar`, false, locStub) createSimpleExpression(`bar`, false, locStub),
), ),
// compound expression as computed key // compound expression as computed key
createObjectProperty( createObjectProperty(
@ -338,13 +339,13 @@ describe('compiler: codegen', () => {
loc: locStub, loc: locStub,
children: [ children: [
`foo + `, `foo + `,
createSimpleExpression(`bar`, false, locStub) createSimpleExpression(`bar`, false, locStub),
]
},
createSimpleExpression(`bar`, false, locStub)
)
], ],
locStub },
createSimpleExpression(`bar`, false, locStub),
),
],
locStub,
), ),
// ChildNode[] // ChildNode[]
[ [
@ -355,17 +356,17 @@ describe('compiler: codegen', () => {
createObjectProperty( createObjectProperty(
// should quote the key! // should quote the key!
createSimpleExpression(`some-key`, true, locStub), createSimpleExpression(`some-key`, true, locStub),
createSimpleExpression(`foo`, true, locStub) createSimpleExpression(`foo`, true, locStub),
) ),
], ],
locStub locStub,
) ),
) ),
], ],
// flag // flag
PatchFlags.FULL_PROPS + '' PatchFlags.FULL_PROPS + '',
) ),
}) }),
) )
expect(code).toMatch(` expect(code).toMatch(`
return _${helperNameMap[CREATE_ELEMENT_VNODE]}("div", { return _${helperNameMap[CREATE_ELEMENT_VNODE]}("div", {
@ -383,9 +384,9 @@ describe('compiler: codegen', () => {
createRoot({ createRoot({
codegenNode: createArrayExpression([ codegenNode: createArrayExpression([
createSimpleExpression(`foo`, false), createSimpleExpression(`foo`, false),
createCallExpression(`bar`, [`baz`]) createCallExpression(`bar`, [`baz`]),
]) ]),
}) }),
) )
expect(code).toMatch(`return [ expect(code).toMatch(`return [
foo, foo,
@ -403,17 +404,17 @@ describe('compiler: codegen', () => {
createConditionalExpression( createConditionalExpression(
createSimpleExpression(`orNot`, false), createSimpleExpression(`orNot`, false),
createCallExpression(`bar`), createCallExpression(`bar`),
createCallExpression(`baz`) createCallExpression(`baz`),
) ),
) ),
}) }),
) )
expect(code).toMatch( expect(code).toMatch(
`return ok `return ok
? foo() ? foo()
: orNot : orNot
? bar() ? bar()
: baz()` : baz()`,
) )
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
}) })
@ -424,13 +425,13 @@ describe('compiler: codegen', () => {
cached: 1, cached: 1,
codegenNode: createCacheExpression( codegenNode: createCacheExpression(
1, 1,
createSimpleExpression(`foo`, false) createSimpleExpression(`foo`, false),
) ),
}), }),
{ {
mode: 'module', mode: 'module',
prefixIdentifiers: true prefixIdentifiers: true,
} },
) )
expect(code).toMatch(`_cache[1] || (_cache[1] = foo)`) expect(code).toMatch(`_cache[1] || (_cache[1] = foo)`)
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
@ -443,13 +444,13 @@ describe('compiler: codegen', () => {
codegenNode: createCacheExpression( codegenNode: createCacheExpression(
1, 1,
createSimpleExpression(`foo`, false), createSimpleExpression(`foo`, false),
true true,
) ),
}), }),
{ {
mode: 'module', mode: 'module',
prefixIdentifiers: true prefixIdentifiers: true,
} },
) )
expect(code).toMatch( expect(code).toMatch(
` `
@ -459,7 +460,7 @@ describe('compiler: codegen', () => {
_setBlockTracking(1), _setBlockTracking(1),
_cache[1] _cache[1]
) )
`.trim() `.trim(),
) )
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
}) })
@ -471,11 +472,11 @@ describe('compiler: codegen', () => {
createTemplateLiteral([ createTemplateLiteral([
`foo`, `foo`,
createCallExpression(`_renderAttr`, ['id', 'foo']), createCallExpression(`_renderAttr`, ['id', 'foo']),
`bar` `bar`,
]) ]),
]) ]),
}), }),
{ ssr: true, mode: 'module' } { ssr: true, mode: 'module' },
) )
expect(code).toMatchInlineSnapshot(` expect(code).toMatchInlineSnapshot(`
" "
@ -492,11 +493,11 @@ describe('compiler: codegen', () => {
codegenNode: createBlockStatement([ codegenNode: createBlockStatement([
createIfStatement( createIfStatement(
createSimpleExpression('foo', false), createSimpleExpression('foo', false),
createBlockStatement([createCallExpression(`ok`)]) createBlockStatement([createCallExpression(`ok`)]),
) ),
]) ]),
}), }),
{ ssr: true, mode: 'module' } { ssr: true, mode: 'module' },
) )
expect(code).toMatchInlineSnapshot(` expect(code).toMatchInlineSnapshot(`
" "
@ -515,11 +516,11 @@ describe('compiler: codegen', () => {
createIfStatement( createIfStatement(
createSimpleExpression('foo', false), createSimpleExpression('foo', false),
createBlockStatement([createCallExpression(`foo`)]), createBlockStatement([createCallExpression(`foo`)]),
createBlockStatement([createCallExpression('bar')]) createBlockStatement([createCallExpression('bar')]),
) ),
]) ]),
}), }),
{ ssr: true, mode: 'module' } { ssr: true, mode: 'module' },
) )
expect(code).toMatchInlineSnapshot(` expect(code).toMatchInlineSnapshot(`
" "
@ -542,12 +543,12 @@ describe('compiler: codegen', () => {
createBlockStatement([createCallExpression(`foo`)]), createBlockStatement([createCallExpression(`foo`)]),
createIfStatement( createIfStatement(
createSimpleExpression('bar', false), createSimpleExpression('bar', false),
createBlockStatement([createCallExpression(`bar`)]) createBlockStatement([createCallExpression(`bar`)]),
) ),
) ),
]) ]),
}), }),
{ ssr: true, mode: 'module' } { ssr: true, mode: 'module' },
) )
expect(code).toMatchInlineSnapshot(` expect(code).toMatchInlineSnapshot(`
" "
@ -571,12 +572,12 @@ describe('compiler: codegen', () => {
createIfStatement( createIfStatement(
createSimpleExpression('bar', false), createSimpleExpression('bar', false),
createBlockStatement([createCallExpression(`bar`)]), createBlockStatement([createCallExpression(`bar`)]),
createBlockStatement([createCallExpression('baz')]) createBlockStatement([createCallExpression('baz')]),
) ),
) ),
]) ]),
}), }),
{ ssr: true, mode: 'module' } { ssr: true, mode: 'module' },
) )
expect(code).toMatchInlineSnapshot(` expect(code).toMatchInlineSnapshot(`
" "
@ -598,9 +599,9 @@ describe('compiler: codegen', () => {
createRoot({ createRoot({
codegenNode: createAssignmentExpression( codegenNode: createAssignmentExpression(
createSimpleExpression(`foo`, false), createSimpleExpression(`foo`, false),
createSimpleExpression(`bar`, false) createSimpleExpression(`bar`, false),
) ),
}) }),
) )
expect(code).toMatchInlineSnapshot(` expect(code).toMatchInlineSnapshot(`
" "
@ -616,17 +617,17 @@ describe('compiler: codegen', () => {
function genCode(node: VNodeCall) { function genCode(node: VNodeCall) {
return generate( return generate(
createRoot({ createRoot({
codegenNode: node codegenNode: node,
}) }),
).code.match(/with \(_ctx\) \{\s+([^]+)\s+\}\s+\}$/)![1] ).code.match(/with \(_ctx\) \{\s+([^]+)\s+\}\s+\}$/)![1]
} }
const mockProps = createObjectExpression([ const mockProps = createObjectExpression([
createObjectProperty(`foo`, createSimpleExpression(`bar`, true)) createObjectProperty(`foo`, createSimpleExpression(`bar`, true)),
]) ])
const mockChildren = createCompoundExpression(['children']) const mockChildren = createCompoundExpression(['children'])
const mockDirs = createArrayExpression([ const mockDirs = createArrayExpression([
createArrayExpression([`foo`, createSimpleExpression(`bar`, false)]) createArrayExpression([`foo`, createSimpleExpression(`bar`, false)]),
]) as DirectiveArguments ]) as DirectiveArguments
test('tag only', () => { test('tag only', () => {
@ -683,9 +684,9 @@ describe('compiler: codegen', () => {
undefined, undefined,
undefined, undefined,
undefined, undefined,
true true,
) ),
) ),
).toMatchInlineSnapshot(` ).toMatchInlineSnapshot(`
"return (_openBlock(), _createElementBlock("div", { foo: "bar" }, children)) "return (_openBlock(), _createElementBlock("div", { foo: "bar" }, children))
" "
@ -704,9 +705,9 @@ describe('compiler: codegen', () => {
undefined, undefined,
undefined, undefined,
true, true,
true true,
) ),
) ),
).toMatchInlineSnapshot(` ).toMatchInlineSnapshot(`
"return (_openBlock(true), _createElementBlock("div", { foo: "bar" }, children)) "return (_openBlock(true), _createElementBlock("div", { foo: "bar" }, children))
" "
@ -723,9 +724,9 @@ describe('compiler: codegen', () => {
mockChildren, mockChildren,
undefined, undefined,
undefined, undefined,
mockDirs mockDirs,
) ),
) ),
).toMatchInlineSnapshot(` ).toMatchInlineSnapshot(`
"return _withDirectives(_createElementVNode("div", { foo: "bar" }, children), [ "return _withDirectives(_createElementVNode("div", { foo: "bar" }, children), [
[foo, bar] [foo, bar]
@ -745,9 +746,9 @@ describe('compiler: codegen', () => {
undefined, undefined,
undefined, undefined,
mockDirs, mockDirs,
true true,
) ),
) ),
).toMatchInlineSnapshot(` ).toMatchInlineSnapshot(`
"return _withDirectives((_openBlock(), _createElementBlock("div", { foo: "bar" }, children)), [ "return _withDirectives((_openBlock(), _createElementBlock("div", { foo: "bar" }, children)), [
[foo, bar] [foo, bar]

View File

@ -1,5 +1,5 @@
import { baseCompile as compile } from '../src' import { baseCompile as compile } from '../src'
import { SourceMapConsumer, RawSourceMap } from 'source-map-js' import { type RawSourceMap, SourceMapConsumer } from 'source-map-js'
describe('compiler: integration tests', () => { describe('compiler: integration tests', () => {
const source = ` const source = `
@ -20,7 +20,7 @@ describe('compiler: integration tests', () => {
function getPositionInCode( function getPositionInCode(
code: string, code: string,
token: string, token: string,
expectName: string | boolean = false expectName: string | boolean = false,
): Pos { ): Pos {
const generatedOffset = code.indexOf(token) const generatedOffset = code.indexOf(token)
let line = 1 let line = 1
@ -36,7 +36,7 @@ describe('compiler: integration tests', () => {
column: column:
lastNewLinePos === -1 lastNewLinePos === -1
? generatedOffset ? generatedOffset
: generatedOffset - lastNewLinePos - 1 : generatedOffset - lastNewLinePos - 1,
} }
if (expectName) { if (expectName) {
res.name = typeof expectName === 'string' ? expectName : token res.name = typeof expectName === 'string' ? expectName : token
@ -47,7 +47,7 @@ describe('compiler: integration tests', () => {
test('function mode', () => { test('function mode', () => {
const { code, map } = compile(source, { const { code, map } = compile(source, {
sourceMap: true, sourceMap: true,
filename: `foo.vue` filename: `foo.vue`,
}) })
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
@ -57,55 +57,55 @@ describe('compiler: integration tests', () => {
const consumer = new SourceMapConsumer(map as RawSourceMap) const consumer = new SourceMapConsumer(map as RawSourceMap)
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `id`)) consumer.originalPositionFor(getPositionInCode(code, `id`)),
).toMatchObject(getPositionInCode(source, `id`)) ).toMatchObject(getPositionInCode(source, `id`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `"foo"`)) consumer.originalPositionFor(getPositionInCode(code, `"foo"`)),
).toMatchObject(getPositionInCode(source, `"foo"`)) ).toMatchObject(getPositionInCode(source, `"foo"`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `class:`)) consumer.originalPositionFor(getPositionInCode(code, `class:`)),
).toMatchObject(getPositionInCode(source, `class=`)) ).toMatchObject(getPositionInCode(source, `class=`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `bar`)) consumer.originalPositionFor(getPositionInCode(code, `bar`)),
).toMatchObject(getPositionInCode(source, `bar`)) ).toMatchObject(getPositionInCode(source, `bar`))
// without prefixIdentifiers: true, identifiers inside compound expressions // without prefixIdentifiers: true, identifiers inside compound expressions
// are mapped to closest parent expression. // are mapped to closest parent expression.
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `baz`)) consumer.originalPositionFor(getPositionInCode(code, `baz`)),
).toMatchObject(getPositionInCode(source, `bar`)) ).toMatchObject(getPositionInCode(source, `bar`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `world`)) consumer.originalPositionFor(getPositionInCode(code, `world`)),
).toMatchObject(getPositionInCode(source, `world`)) ).toMatchObject(getPositionInCode(source, `world`))
// without prefixIdentifiers: true, identifiers inside compound expressions // without prefixIdentifiers: true, identifiers inside compound expressions
// are mapped to closest parent expression. // are mapped to closest parent expression.
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `burn()`)) consumer.originalPositionFor(getPositionInCode(code, `burn()`)),
).toMatchObject(getPositionInCode(source, `world`)) ).toMatchObject(getPositionInCode(source, `world`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `ok`)) consumer.originalPositionFor(getPositionInCode(code, `ok`)),
).toMatchObject(getPositionInCode(source, `ok`)) ).toMatchObject(getPositionInCode(source, `ok`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `list`)) consumer.originalPositionFor(getPositionInCode(code, `list`)),
).toMatchObject(getPositionInCode(source, `list`)) ).toMatchObject(getPositionInCode(source, `list`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `value`)) consumer.originalPositionFor(getPositionInCode(code, `value`)),
).toMatchObject(getPositionInCode(source, `value`)) ).toMatchObject(getPositionInCode(source, `value`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `index`)) consumer.originalPositionFor(getPositionInCode(code, `index`)),
).toMatchObject(getPositionInCode(source, `index`)) ).toMatchObject(getPositionInCode(source, `index`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `value + index`)) consumer.originalPositionFor(getPositionInCode(code, `value + index`)),
).toMatchObject(getPositionInCode(source, `value + index`)) ).toMatchObject(getPositionInCode(source, `value + index`))
}) })
@ -113,7 +113,7 @@ describe('compiler: integration tests', () => {
const { code, map } = compile(source, { const { code, map } = compile(source, {
sourceMap: true, sourceMap: true,
filename: `foo.vue`, filename: `foo.vue`,
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
@ -123,64 +123,66 @@ describe('compiler: integration tests', () => {
const consumer = new SourceMapConsumer(map as RawSourceMap) const consumer = new SourceMapConsumer(map as RawSourceMap)
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `id`)) consumer.originalPositionFor(getPositionInCode(code, `id`)),
).toMatchObject(getPositionInCode(source, `id`)) ).toMatchObject(getPositionInCode(source, `id`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `"foo"`)) consumer.originalPositionFor(getPositionInCode(code, `"foo"`)),
).toMatchObject(getPositionInCode(source, `"foo"`)) ).toMatchObject(getPositionInCode(source, `"foo"`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `class:`)) consumer.originalPositionFor(getPositionInCode(code, `class:`)),
).toMatchObject(getPositionInCode(source, `class=`)) ).toMatchObject(getPositionInCode(source, `class=`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `bar`)) consumer.originalPositionFor(getPositionInCode(code, `bar`)),
).toMatchObject(getPositionInCode(source, `bar`)) ).toMatchObject(getPositionInCode(source, `bar`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `_ctx.bar`, `bar`)) consumer.originalPositionFor(getPositionInCode(code, `_ctx.bar`, `bar`)),
).toMatchObject(getPositionInCode(source, `bar`, true)) ).toMatchObject(getPositionInCode(source, `bar`, true))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `baz`)) consumer.originalPositionFor(getPositionInCode(code, `baz`)),
).toMatchObject(getPositionInCode(source, `baz`)) ).toMatchObject(getPositionInCode(source, `baz`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `world`, true)) consumer.originalPositionFor(getPositionInCode(code, `world`, true)),
).toMatchObject(getPositionInCode(source, `world`, `world`)) ).toMatchObject(getPositionInCode(source, `world`, `world`))
expect( expect(
consumer.originalPositionFor( consumer.originalPositionFor(
getPositionInCode(code, `_ctx.world`, `world`) getPositionInCode(code, `_ctx.world`, `world`),
) ),
).toMatchObject(getPositionInCode(source, `world`, `world`)) ).toMatchObject(getPositionInCode(source, `world`, `world`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `burn()`)) consumer.originalPositionFor(getPositionInCode(code, `burn()`)),
).toMatchObject(getPositionInCode(source, `burn()`)) ).toMatchObject(getPositionInCode(source, `burn()`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `ok`)) consumer.originalPositionFor(getPositionInCode(code, `ok`)),
).toMatchObject(getPositionInCode(source, `ok`)) ).toMatchObject(getPositionInCode(source, `ok`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `_ctx.ok`, `ok`)) consumer.originalPositionFor(getPositionInCode(code, `_ctx.ok`, `ok`)),
).toMatchObject(getPositionInCode(source, `ok`, true)) ).toMatchObject(getPositionInCode(source, `ok`, true))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `list`)) consumer.originalPositionFor(getPositionInCode(code, `list`)),
).toMatchObject(getPositionInCode(source, `list`)) ).toMatchObject(getPositionInCode(source, `list`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `_ctx.list`, `list`)) consumer.originalPositionFor(
getPositionInCode(code, `_ctx.list`, `list`),
),
).toMatchObject(getPositionInCode(source, `list`, true)) ).toMatchObject(getPositionInCode(source, `list`, true))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `value`)) consumer.originalPositionFor(getPositionInCode(code, `value`)),
).toMatchObject(getPositionInCode(source, `value`)) ).toMatchObject(getPositionInCode(source, `value`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `index`)) consumer.originalPositionFor(getPositionInCode(code, `index`)),
).toMatchObject(getPositionInCode(source, `index`)) ).toMatchObject(getPositionInCode(source, `index`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `value + index`)) consumer.originalPositionFor(getPositionInCode(code, `value + index`)),
).toMatchObject(getPositionInCode(source, `value + index`)) ).toMatchObject(getPositionInCode(source, `value + index`))
}) })
@ -188,7 +190,7 @@ describe('compiler: integration tests', () => {
const { code, map } = compile(source, { const { code, map } = compile(source, {
mode: 'module', mode: 'module',
sourceMap: true, sourceMap: true,
filename: `foo.vue` filename: `foo.vue`,
}) })
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
@ -198,64 +200,66 @@ describe('compiler: integration tests', () => {
const consumer = new SourceMapConsumer(map as RawSourceMap) const consumer = new SourceMapConsumer(map as RawSourceMap)
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `id`)) consumer.originalPositionFor(getPositionInCode(code, `id`)),
).toMatchObject(getPositionInCode(source, `id`)) ).toMatchObject(getPositionInCode(source, `id`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `"foo"`)) consumer.originalPositionFor(getPositionInCode(code, `"foo"`)),
).toMatchObject(getPositionInCode(source, `"foo"`)) ).toMatchObject(getPositionInCode(source, `"foo"`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `class:`)) consumer.originalPositionFor(getPositionInCode(code, `class:`)),
).toMatchObject(getPositionInCode(source, `class=`)) ).toMatchObject(getPositionInCode(source, `class=`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `bar`)) consumer.originalPositionFor(getPositionInCode(code, `bar`)),
).toMatchObject(getPositionInCode(source, `bar`)) ).toMatchObject(getPositionInCode(source, `bar`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `_ctx.bar`, `bar`)) consumer.originalPositionFor(getPositionInCode(code, `_ctx.bar`, `bar`)),
).toMatchObject(getPositionInCode(source, `bar`, true)) ).toMatchObject(getPositionInCode(source, `bar`, true))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `baz`)) consumer.originalPositionFor(getPositionInCode(code, `baz`)),
).toMatchObject(getPositionInCode(source, `baz`)) ).toMatchObject(getPositionInCode(source, `baz`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `world`, true)) consumer.originalPositionFor(getPositionInCode(code, `world`, true)),
).toMatchObject(getPositionInCode(source, `world`, `world`)) ).toMatchObject(getPositionInCode(source, `world`, `world`))
expect( expect(
consumer.originalPositionFor( consumer.originalPositionFor(
getPositionInCode(code, `_ctx.world`, `world`) getPositionInCode(code, `_ctx.world`, `world`),
) ),
).toMatchObject(getPositionInCode(source, `world`, `world`)) ).toMatchObject(getPositionInCode(source, `world`, `world`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `burn()`)) consumer.originalPositionFor(getPositionInCode(code, `burn()`)),
).toMatchObject(getPositionInCode(source, `burn()`)) ).toMatchObject(getPositionInCode(source, `burn()`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `ok`)) consumer.originalPositionFor(getPositionInCode(code, `ok`)),
).toMatchObject(getPositionInCode(source, `ok`)) ).toMatchObject(getPositionInCode(source, `ok`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `_ctx.ok`, `ok`)) consumer.originalPositionFor(getPositionInCode(code, `_ctx.ok`, `ok`)),
).toMatchObject(getPositionInCode(source, `ok`, true)) ).toMatchObject(getPositionInCode(source, `ok`, true))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `list`)) consumer.originalPositionFor(getPositionInCode(code, `list`)),
).toMatchObject(getPositionInCode(source, `list`)) ).toMatchObject(getPositionInCode(source, `list`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `_ctx.list`, `list`)) consumer.originalPositionFor(
getPositionInCode(code, `_ctx.list`, `list`),
),
).toMatchObject(getPositionInCode(source, `list`, true)) ).toMatchObject(getPositionInCode(source, `list`, true))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `value`)) consumer.originalPositionFor(getPositionInCode(code, `value`)),
).toMatchObject(getPositionInCode(source, `value`)) ).toMatchObject(getPositionInCode(source, `value`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `index`)) consumer.originalPositionFor(getPositionInCode(code, `index`)),
).toMatchObject(getPositionInCode(source, `index`)) ).toMatchObject(getPositionInCode(source, `index`))
expect( expect(
consumer.originalPositionFor(getPositionInCode(code, `value + index`)) consumer.originalPositionFor(getPositionInCode(code, `value + index`)),
).toMatchObject(getPositionInCode(source, `value + index`)) ).toMatchObject(getPositionInCode(source, `value + index`))
}) })
}) })

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
import { baseCompile } from '../src/compile' import { baseCompile } from '../src/compile'
import { PUSH_SCOPE_ID, POP_SCOPE_ID } from '../src/runtimeHelpers' import { POP_SCOPE_ID, PUSH_SCOPE_ID } from '../src/runtimeHelpers'
import { PatchFlags } from '@vue/shared' import { PatchFlags } from '@vue/shared'
import { genFlagText } from './testUtils' import { genFlagText } from './testUtils'
@ -18,7 +18,7 @@ describe('scopeId compiler support', () => {
test('should wrap default slot', () => { test('should wrap default slot', () => {
const { code } = baseCompile(`<Child><div/></Child>`, { const { code } = baseCompile(`<Child><div/></Child>`, {
mode: 'module', mode: 'module',
scopeId: 'test' scopeId: 'test',
}) })
expect(code).toMatch(`default: _withCtx(() => [`) expect(code).toMatch(`default: _withCtx(() => [`)
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
@ -33,8 +33,8 @@ describe('scopeId compiler support', () => {
`, `,
{ {
mode: 'module', mode: 'module',
scopeId: 'test' scopeId: 'test',
} },
) )
expect(code).toMatch(`foo: _withCtx(({ msg }) => [`) expect(code).toMatch(`foo: _withCtx(({ msg }) => [`)
expect(code).toMatch(`bar: _withCtx(() => [`) expect(code).toMatch(`bar: _withCtx(() => [`)
@ -50,8 +50,8 @@ describe('scopeId compiler support', () => {
`, `,
{ {
mode: 'module', mode: 'module',
scopeId: 'test' scopeId: 'test',
} },
) )
expect(code).toMatch(/name: "foo",\s+fn: _withCtx\(/) expect(code).toMatch(/name: "foo",\s+fn: _withCtx\(/)
expect(code).toMatch(/name: i,\s+fn: _withCtx\(/) expect(code).toMatch(/name: i,\s+fn: _withCtx\(/)
@ -64,8 +64,8 @@ describe('scopeId compiler support', () => {
{ {
mode: 'module', mode: 'module',
scopeId: 'test', scopeId: 'test',
hoistStatic: true hoistStatic: true,
} },
) )
expect(ast.helpers).toContain(PUSH_SCOPE_ID) expect(ast.helpers).toContain(PUSH_SCOPE_ID)
expect(ast.helpers).toContain(POP_SCOPE_ID) expect(ast.helpers).toContain(POP_SCOPE_ID)
@ -73,11 +73,11 @@ describe('scopeId compiler support', () => {
;[ ;[
`const _withScopeId = n => (_pushScopeId("test"),n=n(),_popScopeId(),n)`, `const _withScopeId = n => (_pushScopeId("test"),n=n(),_popScopeId(),n)`,
`const _hoisted_1 = /*#__PURE__*/ _withScopeId(() => /*#__PURE__*/_createElementVNode("div", null, "hello", ${genFlagText( `const _hoisted_1 = /*#__PURE__*/ _withScopeId(() => /*#__PURE__*/_createElementVNode("div", null, "hello", ${genFlagText(
PatchFlags.HOISTED PatchFlags.HOISTED,
)}))`, )}))`,
`const _hoisted_2 = /*#__PURE__*/ _withScopeId(() => /*#__PURE__*/_createElementVNode("div", null, "world", ${genFlagText( `const _hoisted_2 = /*#__PURE__*/ _withScopeId(() => /*#__PURE__*/_createElementVNode("div", null, "world", ${genFlagText(
PatchFlags.HOISTED PatchFlags.HOISTED,
)}))` )}))`,
].forEach(c => expect(code).toMatch(c)) ].forEach(c => expect(code).toMatch(c))
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
}) })

View File

@ -1,17 +1,17 @@
import { import {
NodeTypes, type ElementNode,
ElementNode,
locStub,
Namespaces,
ElementTypes, ElementTypes,
VNodeCall Namespaces,
NodeTypes,
type VNodeCall,
locStub,
} from '../src' } from '../src'
import { import {
isString,
PatchFlags,
PatchFlagNames, PatchFlagNames,
type PatchFlags,
type ShapeFlags,
isArray, isArray,
ShapeFlags isString,
} from '@vue/shared' } from '@vue/shared'
const leadingBracketRE = /^\[/ const leadingBracketRE = /^\[/
@ -30,16 +30,16 @@ export function createObjectMatcher(obj: Record<string, any>) {
key: { key: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: key.replace(bracketsRE, ''), content: key.replace(bracketsRE, ''),
isStatic: !leadingBracketRE.test(key) isStatic: !leadingBracketRE.test(key),
}, },
value: isString(obj[key]) value: isString(obj[key])
? { ? {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: obj[key].replace(bracketsRE, ''), content: obj[key].replace(bracketsRE, ''),
isStatic: !leadingBracketRE.test(obj[key]) isStatic: !leadingBracketRE.test(obj[key]),
} }
: obj[key] : obj[key],
})) })),
} }
} }
@ -48,7 +48,7 @@ export function createElementWithCodegen(
props?: VNodeCall['props'], props?: VNodeCall['props'],
children?: VNodeCall['children'], children?: VNodeCall['children'],
patchFlag?: VNodeCall['patchFlag'], patchFlag?: VNodeCall['patchFlag'],
dynamicProps?: VNodeCall['dynamicProps'] dynamicProps?: VNodeCall['dynamicProps'],
): ElementNode { ): ElementNode {
return { return {
type: NodeTypes.ELEMENT, type: NodeTypes.ELEMENT,
@ -56,7 +56,6 @@ export function createElementWithCodegen(
ns: Namespaces.HTML, ns: Namespaces.HTML,
tag: 'div', tag: 'div',
tagType: ElementTypes.ELEMENT, tagType: ElementTypes.ELEMENT,
isSelfClosing: false,
props: [], props: [],
children: [], children: [],
codegenNode: { codegenNode: {
@ -70,15 +69,15 @@ export function createElementWithCodegen(
isBlock: false, isBlock: false,
disableTracking: false, disableTracking: false,
isComponent: false, isComponent: false,
loc: locStub loc: locStub,
} },
} }
} }
type Flags = PatchFlags | ShapeFlags type Flags = PatchFlags | ShapeFlags
export function genFlagText( export function genFlagText(
flag: Flags | Flags[], flag: Flags | Flags[],
names: { [k: number]: string } = PatchFlagNames names: { [k: number]: string } = PatchFlagNames,
) { ) {
if (isArray(flag)) { if (isArray(flag)) {
let f = 0 let f = 0

View File

@ -1,18 +1,18 @@
import { baseParse } from '../src/parse' import { baseParse } from '../src/parser'
import { transform, NodeTransform } from '../src/transform' import { type NodeTransform, transform } from '../src/transform'
import { import {
ElementNode, type DirectiveNode,
type ElementNode,
type ExpressionNode,
NodeTypes, NodeTypes,
DirectiveNode, type VNodeCall,
ExpressionNode,
VNodeCall
} from '../src/ast' } from '../src/ast'
import { ErrorCodes, createCompilerError } from '../src/errors' import { ErrorCodes, createCompilerError } from '../src/errors'
import { import {
TO_DISPLAY_STRING, CREATE_COMMENT,
FRAGMENT, FRAGMENT,
RENDER_SLOT, RENDER_SLOT,
CREATE_COMMENT TO_DISPLAY_STRING,
} from '../src/runtimeHelpers' } from '../src/runtimeHelpers'
import { transformIf } from '../src/transforms/vIf' import { transformIf } from '../src/transforms/vIf'
import { transformFor } from '../src/transforms/vFor' import { transformFor } from '../src/transforms/vFor'
@ -34,7 +34,7 @@ describe('compiler: transform', () => {
} }
transform(ast, { transform(ast, {
nodeTransforms: [plugin] nodeTransforms: [plugin],
}) })
const div = ast.children[0] as ElementNode const div = ast.children[0] as ElementNode
@ -43,29 +43,29 @@ describe('compiler: transform', () => {
ast, ast,
{ {
parent: null, parent: null,
currentNode: ast currentNode: ast,
} },
]) ])
expect(calls[1]).toMatchObject([ expect(calls[1]).toMatchObject([
div, div,
{ {
parent: ast, parent: ast,
currentNode: div currentNode: div,
} },
]) ])
expect(calls[2]).toMatchObject([ expect(calls[2]).toMatchObject([
div.children[0], div.children[0],
{ {
parent: div, parent: div,
currentNode: div.children[0] currentNode: div.children[0],
} },
]) ])
expect(calls[3]).toMatchObject([ expect(calls[3]).toMatchObject([
div.children[1], div.children[1],
{ {
parent: div, parent: div,
currentNode: div.children[1] currentNode: div.children[1],
} },
]) ])
}) })
@ -81,16 +81,16 @@ describe('compiler: transform', () => {
{ {
type: NodeTypes.TEXT, type: NodeTypes.TEXT,
content: 'hello', content: 'hello',
isEmpty: false isEmpty: false,
} },
] ],
}) }),
) )
} }
} }
const spy = vi.fn(plugin) const spy = vi.fn(plugin)
transform(ast, { transform(ast, {
nodeTransforms: [spy] nodeTransforms: [spy],
}) })
expect(ast.children.length).toBe(2) expect(ast.children.length).toBe(2)
@ -115,7 +115,7 @@ describe('compiler: transform', () => {
} }
const spy = vi.fn(plugin) const spy = vi.fn(plugin)
transform(ast, { transform(ast, {
nodeTransforms: [spy] nodeTransforms: [spy],
}) })
expect(ast.children.length).toBe(2) expect(ast.children.length).toBe(2)
@ -143,7 +143,7 @@ describe('compiler: transform', () => {
} }
const spy = vi.fn(plugin) const spy = vi.fn(plugin)
transform(ast, { transform(ast, {
nodeTransforms: [spy] nodeTransforms: [spy],
}) })
expect(ast.children.length).toBe(1) expect(ast.children.length).toBe(1)
@ -170,7 +170,7 @@ describe('compiler: transform', () => {
} }
const spy = vi.fn(plugin) const spy = vi.fn(plugin)
transform(ast, { transform(ast, {
nodeTransforms: [spy] nodeTransforms: [spy],
}) })
expect(ast.children.length).toBe(1) expect(ast.children.length).toBe(1)
@ -194,31 +194,51 @@ describe('compiler: transform', () => {
} }
} }
transform(ast, { transform(ast, {
nodeTransforms: [mock] nodeTransforms: [mock],
}) })
expect(ast.hoists).toMatchObject(hoisted) expect(ast.hoists).toMatchObject(hoisted)
expect((ast as any).children[0].props[0].exp.content).toBe(`_hoisted_1`) expect((ast as any).children[0].props[0].exp.content).toBe(`_hoisted_1`)
expect((ast as any).children[1].props[0].exp.content).toBe(`_hoisted_2`) expect((ast as any).children[1].props[0].exp.content).toBe(`_hoisted_2`)
}) })
test('context.filename and selfName', () => {
const ast = baseParse(`<div />`)
const calls: any[] = []
const plugin: NodeTransform = (node, context) => {
calls.push({ ...context })
}
transform(ast, {
filename: '/the/fileName.vue',
nodeTransforms: [plugin],
})
expect(calls.length).toBe(2)
expect(calls[1]).toMatchObject({
filename: '/the/fileName.vue',
selfName: 'FileName',
})
})
test('onError option', () => { test('onError option', () => {
const ast = baseParse(`<div/>`) const ast = baseParse(`<div/>`)
const loc = ast.children[0].loc const loc = ast.children[0].loc
const plugin: NodeTransform = (node, context) => { const plugin: NodeTransform = (node, context) => {
context.onError( context.onError(
createCompilerError(ErrorCodes.X_INVALID_END_TAG, node.loc) createCompilerError(ErrorCodes.X_INVALID_END_TAG, node.loc),
) )
} }
const spy = vi.fn() const spy = vi.fn()
transform(ast, { transform(ast, {
nodeTransforms: [plugin], nodeTransforms: [plugin],
onError: spy onError: spy,
}) })
expect(spy.mock.calls[0]).toMatchObject([ expect(spy.mock.calls[0]).toMatchObject([
{ {
code: ErrorCodes.X_INVALID_END_TAG, code: ErrorCodes.X_INVALID_END_TAG,
loc loc,
} },
]) ])
}) })
@ -243,8 +263,8 @@ describe('compiler: transform', () => {
transformFor, transformFor,
transformText, transformText,
transformSlotOutlet, transformSlotOutlet,
transformElement transformElement,
] ],
}) })
return ast return ast
} }
@ -253,7 +273,7 @@ describe('compiler: transform', () => {
tag: VNodeCall['tag'], tag: VNodeCall['tag'],
props?: VNodeCall['props'], props?: VNodeCall['props'],
children?: VNodeCall['children'], children?: VNodeCall['children'],
patchFlag?: VNodeCall['patchFlag'] patchFlag?: VNodeCall['patchFlag'],
) { ) {
return { return {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
@ -261,7 +281,7 @@ describe('compiler: transform', () => {
tag, tag,
props, props,
children, children,
patchFlag patchFlag,
} }
} }
@ -275,8 +295,8 @@ describe('compiler: transform', () => {
expect(ast.codegenNode).toMatchObject({ expect(ast.codegenNode).toMatchObject({
codegenNode: { codegenNode: {
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
callee: RENDER_SLOT callee: RENDER_SLOT,
} },
}) })
}) })
@ -288,14 +308,14 @@ describe('compiler: transform', () => {
test('root v-if', () => { test('root v-if', () => {
const ast = transformWithCodegen(`<div v-if="ok" />`) const ast = transformWithCodegen(`<div v-if="ok" />`)
expect(ast.codegenNode).toMatchObject({ expect(ast.codegenNode).toMatchObject({
type: NodeTypes.IF type: NodeTypes.IF,
}) })
}) })
test('root v-for', () => { test('root v-for', () => {
const ast = transformWithCodegen(`<div v-for="i in list" />`) const ast = transformWithCodegen(`<div v-for="i in list" />`)
expect(ast.codegenNode).toMatchObject({ expect(ast.codegenNode).toMatchObject({
type: NodeTypes.FOR type: NodeTypes.FOR,
}) })
}) })
@ -303,28 +323,28 @@ describe('compiler: transform', () => {
const ast = transformWithCodegen(`<div v-foo/>`) const ast = transformWithCodegen(`<div v-foo/>`)
expect(ast.codegenNode).toMatchObject({ expect(ast.codegenNode).toMatchObject({
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
directives: { type: NodeTypes.JS_ARRAY_EXPRESSION } directives: { type: NodeTypes.JS_ARRAY_EXPRESSION },
}) })
}) })
test('single text', () => { test('single text', () => {
const ast = transformWithCodegen(`hello`) const ast = transformWithCodegen(`hello`)
expect(ast.codegenNode).toMatchObject({ expect(ast.codegenNode).toMatchObject({
type: NodeTypes.TEXT type: NodeTypes.TEXT,
}) })
}) })
test('single interpolation', () => { test('single interpolation', () => {
const ast = transformWithCodegen(`{{ foo }}`) const ast = transformWithCodegen(`{{ foo }}`)
expect(ast.codegenNode).toMatchObject({ expect(ast.codegenNode).toMatchObject({
type: NodeTypes.INTERPOLATION type: NodeTypes.INTERPOLATION,
}) })
}) })
test('single CompoundExpression', () => { test('single CompoundExpression', () => {
const ast = transformWithCodegen(`{{ foo }} bar baz`) const ast = transformWithCodegen(`{{ foo }} bar baz`)
expect(ast.codegenNode).toMatchObject({ expect(ast.codegenNode).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION type: NodeTypes.COMPOUND_EXPRESSION,
}) })
}) })
@ -336,10 +356,10 @@ describe('compiler: transform', () => {
undefined, undefined,
[ [
{ type: NodeTypes.ELEMENT, tag: `div` }, { type: NodeTypes.ELEMENT, tag: `div` },
{ type: NodeTypes.ELEMENT, tag: `div` } { type: NodeTypes.ELEMENT, tag: `div` },
] as any, ] as any,
genFlagText(PatchFlags.STABLE_FRAGMENT) genFlagText(PatchFlags.STABLE_FRAGMENT),
) ),
) )
}) })
@ -352,13 +372,13 @@ describe('compiler: transform', () => {
[ [
{ type: NodeTypes.COMMENT }, { type: NodeTypes.COMMENT },
{ type: NodeTypes.ELEMENT, tag: `div` }, { type: NodeTypes.ELEMENT, tag: `div` },
{ type: NodeTypes.COMMENT } { type: NodeTypes.COMMENT },
] as any, ] as any,
genFlagText([ genFlagText([
PatchFlags.STABLE_FRAGMENT, PatchFlags.STABLE_FRAGMENT,
PatchFlags.DEV_ROOT_FRAGMENT PatchFlags.DEV_ROOT_FRAGMENT,
]) ]),
) ),
) )
}) })
}) })

View File

@ -1,19 +1,19 @@
import { import {
type CompilerOptions,
ConstantTypes,
type ElementNode,
type ForNode,
type IfNode,
NodeTypes,
type VNodeCall,
generate,
baseParse as parse, baseParse as parse,
transform, transform,
NodeTypes,
generate,
CompilerOptions,
VNodeCall,
IfNode,
ElementNode,
ForNode,
ConstantTypes
} from '../../src' } from '../../src'
import { import {
FRAGMENT, FRAGMENT,
NORMALIZE_CLASS,
RENDER_LIST, RENDER_LIST,
NORMALIZE_CLASS
} from '../../src/runtimeHelpers' } from '../../src/runtimeHelpers'
import { transformElement } from '../../src/transforms/transformElement' import { transformElement } from '../../src/transforms/transformElement'
import { transformExpression } from '../../src/transforms/transformExpression' import { transformExpression } from '../../src/transforms/transformExpression'
@ -31,9 +31,9 @@ const hoistedChildrenArrayMatcher = (startIndex = 1, length = 1) => ({
type: NodeTypes.ELEMENT, type: NodeTypes.ELEMENT,
codegenNode: { codegenNode: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_hoisted_${startIndex + i}` content: `_hoisted_${startIndex + i}`,
} },
})) })),
}) })
function transformWithHoist(template: string, options: CompilerOptions = {}) { function transformWithHoist(template: string, options: CompilerOptions = {}) {
@ -45,17 +45,17 @@ function transformWithHoist(template: string, options: CompilerOptions = {}) {
transformFor, transformFor,
...(options.prefixIdentifiers ? [transformExpression] : []), ...(options.prefixIdentifiers ? [transformExpression] : []),
transformElement, transformElement,
transformText transformText,
], ],
directiveTransforms: { directiveTransforms: {
on: transformOn, on: transformOn,
bind: transformBind bind: transformBind,
}, },
...options ...options,
}) })
expect(ast.codegenNode).toMatchObject({ expect(ast.codegenNode).toMatchObject({
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
isBlock: true isBlock: true,
}) })
return ast return ast
} }
@ -67,14 +67,14 @@ describe('compiler: hoistStatic transform', () => {
const root = transformWithHoist(`<div/>`) const root = transformWithHoist(`<div/>`)
expect(root.hoists.length).toBe(0) expect(root.hoists.length).toBe(0)
expect(root.codegenNode).toMatchObject({ expect(root.codegenNode).toMatchObject({
tag: `"div"` tag: `"div"`,
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
test('hoist simple element', () => { test('hoist simple element', () => {
const root = transformWithHoist( const root = transformWithHoist(
`<div><span class="inline">hello</span></div>` `<div><span class="inline">hello</span></div>`,
) )
expect(root.hoists).toMatchObject([ expect(root.hoists).toMatchObject([
{ {
@ -83,15 +83,15 @@ describe('compiler: hoistStatic transform', () => {
props: createObjectMatcher({ class: 'inline' }), props: createObjectMatcher({ class: 'inline' }),
children: { children: {
type: NodeTypes.TEXT, type: NodeTypes.TEXT,
content: `hello` content: `hello`,
}
}, },
hoistedChildrenArrayMatcher() },
hoistedChildrenArrayMatcher(),
]) ])
expect(root.codegenNode).toMatchObject({ expect(root.codegenNode).toMatchObject({
tag: `"div"`, tag: `"div"`,
props: undefined, props: undefined,
children: { content: `_hoisted_2` } children: { content: `_hoisted_2` },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -105,13 +105,13 @@ describe('compiler: hoistStatic transform', () => {
props: undefined, props: undefined,
children: [ children: [
{ type: NodeTypes.ELEMENT, tag: `span` }, { type: NodeTypes.ELEMENT, tag: `span` },
{ type: NodeTypes.ELEMENT, tag: `span` } { type: NodeTypes.ELEMENT, tag: `span` },
] ],
}, },
hoistedChildrenArrayMatcher() hoistedChildrenArrayMatcher(),
]) ])
expect((root.codegenNode as VNodeCall).children).toMatchObject({ expect((root.codegenNode as VNodeCall).children).toMatchObject({
content: '_hoisted_2' content: '_hoisted_2',
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -123,12 +123,12 @@ describe('compiler: hoistStatic transform', () => {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `"div"`, tag: `"div"`,
props: undefined, props: undefined,
children: [{ type: NodeTypes.COMMENT, content: `comment` }] children: [{ type: NodeTypes.COMMENT, content: `comment` }],
}, },
hoistedChildrenArrayMatcher() hoistedChildrenArrayMatcher(),
]) ])
expect((root.codegenNode as VNodeCall).children).toMatchObject({ expect((root.codegenNode as VNodeCall).children).toMatchObject({
content: `_hoisted_2` content: `_hoisted_2`,
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -138,16 +138,16 @@ describe('compiler: hoistStatic transform', () => {
expect(root.hoists).toMatchObject([ expect(root.hoists).toMatchObject([
{ {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `"span"` tag: `"span"`,
}, },
{ {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `"div"` tag: `"div"`,
}, },
hoistedChildrenArrayMatcher(1, 2) hoistedChildrenArrayMatcher(1, 2),
]) ])
expect((root.codegenNode as VNodeCall).children).toMatchObject({ expect((root.codegenNode as VNodeCall).children).toMatchObject({
content: '_hoisted_3' content: '_hoisted_3',
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -160,9 +160,9 @@ describe('compiler: hoistStatic transform', () => {
type: NodeTypes.ELEMENT, type: NodeTypes.ELEMENT,
codegenNode: { codegenNode: {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `_component_Comp` tag: `_component_Comp`,
} },
} },
]) ])
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -177,17 +177,17 @@ describe('compiler: hoistStatic transform', () => {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `"div"`, tag: `"div"`,
props: createObjectMatcher({ props: createObjectMatcher({
id: `[foo]` id: `[foo]`,
}), }),
children: undefined, children: undefined,
patchFlag: genFlagText(PatchFlags.PROPS), patchFlag: genFlagText(PatchFlags.PROPS),
dynamicProps: { dynamicProps: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_hoisted_1`, content: `_hoisted_1`,
isStatic: false isStatic: false,
} },
} },
} },
]) ])
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -199,14 +199,14 @@ describe('compiler: hoistStatic transform', () => {
{ {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `"div"`, tag: `"div"`,
props: createObjectMatcher({ key: 'foo' }) props: createObjectMatcher({ key: 'foo' }),
}, },
hoistedChildrenArrayMatcher() hoistedChildrenArrayMatcher(),
]) ])
expect(root.codegenNode).toMatchObject({ expect(root.codegenNode).toMatchObject({
tag: `"div"`, tag: `"div"`,
props: undefined, props: undefined,
children: { content: `_hoisted_2` } children: { content: `_hoisted_2` },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -221,10 +221,10 @@ describe('compiler: hoistStatic transform', () => {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `"div"`, tag: `"div"`,
props: createObjectMatcher({ props: createObjectMatcher({
key: `[foo]` key: `[foo]`,
}) }),
} },
} },
]) ])
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -239,12 +239,12 @@ describe('compiler: hoistStatic transform', () => {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `"div"`, tag: `"div"`,
props: createObjectMatcher({ props: createObjectMatcher({
ref: `[foo]` ref: `[foo]`,
}), }),
children: undefined, children: undefined,
patchFlag: genFlagText(PatchFlags.NEED_PATCH) patchFlag: genFlagText(PatchFlags.NEED_PATCH),
} },
} },
]) ])
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -260,22 +260,22 @@ describe('compiler: hoistStatic transform', () => {
tag: `"div"`, tag: `"div"`,
props: { props: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_hoisted_1` content: `_hoisted_1`,
}, },
children: undefined, children: undefined,
patchFlag: genFlagText(PatchFlags.NEED_PATCH), patchFlag: genFlagText(PatchFlags.NEED_PATCH),
directives: { directives: {
type: NodeTypes.JS_ARRAY_EXPRESSION type: NodeTypes.JS_ARRAY_EXPRESSION,
} },
} },
} },
]) ])
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
test('hoist static props for elements with dynamic text children', () => { test('hoist static props for elements with dynamic text children', () => {
const root = transformWithHoist( const root = transformWithHoist(
`<div><div id="foo">{{ hello }}</div></div>` `<div><div id="foo">{{ hello }}</div></div>`,
) )
expect(root.hoists).toMatchObject([createObjectMatcher({ id: 'foo' })]) expect(root.hoists).toMatchObject([createObjectMatcher({ id: 'foo' })])
expect((root.codegenNode as VNodeCall).children).toMatchObject([ expect((root.codegenNode as VNodeCall).children).toMatchObject([
@ -286,9 +286,9 @@ describe('compiler: hoistStatic transform', () => {
tag: `"div"`, tag: `"div"`,
props: { content: `_hoisted_1` }, props: { content: `_hoisted_1` },
children: { type: NodeTypes.INTERPOLATION }, children: { type: NodeTypes.INTERPOLATION },
patchFlag: genFlagText(PatchFlags.TEXT) patchFlag: genFlagText(PatchFlags.TEXT),
} },
} },
]) ])
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -303,30 +303,30 @@ describe('compiler: hoistStatic transform', () => {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `"div"`, tag: `"div"`,
props: { content: `_hoisted_1` }, props: { content: `_hoisted_1` },
children: [{ type: NodeTypes.ELEMENT, tag: `Comp` }] children: [{ type: NodeTypes.ELEMENT, tag: `Comp` }],
} },
} },
]) ])
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
test('should hoist v-if props/children if static', () => { test('should hoist v-if props/children if static', () => {
const root = transformWithHoist( const root = transformWithHoist(
`<div><div v-if="ok" id="foo"><span/></div></div>` `<div><div v-if="ok" id="foo"><span/></div></div>`,
) )
expect(root.hoists).toMatchObject([ expect(root.hoists).toMatchObject([
createObjectMatcher({ createObjectMatcher({
key: `[0]`, // key injected by v-if branch key: `[0]`, // key injected by v-if branch
id: 'foo' id: 'foo',
}), }),
{ {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `"span"` tag: `"span"`,
}, },
hoistedChildrenArrayMatcher(2) hoistedChildrenArrayMatcher(2),
]) ])
expect( expect(
((root.children[0] as ElementNode).children[0] as IfNode).codegenNode ((root.children[0] as ElementNode).children[0] as IfNode).codegenNode,
).toMatchObject({ ).toMatchObject({
type: NodeTypes.JS_CONDITIONAL_EXPRESSION, type: NodeTypes.JS_CONDITIONAL_EXPRESSION,
consequent: { consequent: {
@ -334,25 +334,25 @@ describe('compiler: hoistStatic transform', () => {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `"div"`, tag: `"div"`,
props: { content: `_hoisted_1` }, props: { content: `_hoisted_1` },
children: { content: `_hoisted_3` } children: { content: `_hoisted_3` },
} },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
test('should hoist v-for children if static', () => { test('should hoist v-for children if static', () => {
const root = transformWithHoist( const root = transformWithHoist(
`<div><div v-for="i in list" id="foo"><span/></div></div>` `<div><div v-for="i in list" id="foo"><span/></div></div>`,
) )
expect(root.hoists).toMatchObject([ expect(root.hoists).toMatchObject([
createObjectMatcher({ createObjectMatcher({
id: 'foo' id: 'foo',
}), }),
{ {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `"span"` tag: `"span"`,
}, },
hoistedChildrenArrayMatcher(2) hoistedChildrenArrayMatcher(2),
]) ])
const forBlockCodegen = ( const forBlockCodegen = (
(root.children[0] as ElementNode).children[0] as ForNode (root.children[0] as ElementNode).children[0] as ForNode
@ -363,16 +363,16 @@ describe('compiler: hoistStatic transform', () => {
props: undefined, props: undefined,
children: { children: {
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
callee: RENDER_LIST callee: RENDER_LIST,
}, },
patchFlag: genFlagText(PatchFlags.UNKEYED_FRAGMENT) patchFlag: genFlagText(PatchFlags.UNKEYED_FRAGMENT),
}) })
const innerBlockCodegen = forBlockCodegen!.children.arguments[1] const innerBlockCodegen = forBlockCodegen!.children.arguments[1]
expect(innerBlockCodegen.returns).toMatchObject({ expect(innerBlockCodegen.returns).toMatchObject({
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `"div"`, tag: `"div"`,
props: { content: `_hoisted_1` }, props: { content: `_hoisted_1` },
children: { content: `_hoisted_3` } children: { content: `_hoisted_3` },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -382,8 +382,8 @@ describe('compiler: hoistStatic transform', () => {
const root = transformWithHoist( const root = transformWithHoist(
`<div><span>foo {{ 1 }} {{ true }}</span></div>`, `<div><span>foo {{ 1 }} {{ true }}</span></div>`,
{ {
prefixIdentifiers: true prefixIdentifiers: true,
} },
) )
expect(root.hoists).toMatchObject([ expect(root.hoists).toMatchObject([
{ {
@ -391,18 +391,18 @@ describe('compiler: hoistStatic transform', () => {
tag: `"span"`, tag: `"span"`,
props: undefined, props: undefined,
children: { children: {
type: NodeTypes.COMPOUND_EXPRESSION type: NodeTypes.COMPOUND_EXPRESSION,
}
}, },
hoistedChildrenArrayMatcher() },
hoistedChildrenArrayMatcher(),
]) ])
expect(root.codegenNode).toMatchObject({ expect(root.codegenNode).toMatchObject({
tag: `"div"`, tag: `"div"`,
props: undefined, props: undefined,
children: { children: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_hoisted_2` content: `_hoisted_2`,
} },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -411,8 +411,8 @@ describe('compiler: hoistStatic transform', () => {
const root = transformWithHoist( const root = transformWithHoist(
`<div><span :foo="0">{{ 1 }}</span></div>`, `<div><span :foo="0">{{ 1 }}</span></div>`,
{ {
prefixIdentifiers: true prefixIdentifiers: true,
} },
) )
expect(root.hoists).toMatchObject([ expect(root.hoists).toMatchObject([
@ -425,19 +425,19 @@ describe('compiler: hoistStatic transform', () => {
content: { content: {
content: `1`, content: `1`,
isStatic: false, isStatic: false,
constType: ConstantTypes.CAN_STRINGIFY constType: ConstantTypes.CAN_STRINGIFY,
}
}
}, },
hoistedChildrenArrayMatcher() },
},
hoistedChildrenArrayMatcher(),
]) ])
expect(root.codegenNode).toMatchObject({ expect(root.codegenNode).toMatchObject({
tag: `"div"`, tag: `"div"`,
props: undefined, props: undefined,
children: { children: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_hoisted_2` content: `_hoisted_2`,
} },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -446,8 +446,8 @@ describe('compiler: hoistStatic transform', () => {
const root = transformWithHoist( const root = transformWithHoist(
`<div><span :class="{ foo: true }">{{ bar }}</span></div>`, `<div><span :class="{ foo: true }">{{ bar }}</span></div>`,
{ {
prefixIdentifiers: true prefixIdentifiers: true,
} },
) )
expect(root.hoists).toMatchObject([ expect(root.hoists).toMatchObject([
@ -458,7 +458,7 @@ describe('compiler: hoistStatic transform', () => {
key: { key: {
content: `class`, content: `class`,
isStatic: true, isStatic: true,
constType: ConstantTypes.CAN_STRINGIFY constType: ConstantTypes.CAN_STRINGIFY,
}, },
value: { value: {
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
@ -467,13 +467,13 @@ describe('compiler: hoistStatic transform', () => {
{ {
content: `{ foo: true }`, content: `{ foo: true }`,
isStatic: false, isStatic: false,
constType: ConstantTypes.CAN_STRINGIFY constType: ConstantTypes.CAN_STRINGIFY,
} },
] ],
} },
} },
] ],
} },
]) ])
expect(root.codegenNode).toMatchObject({ expect(root.codegenNode).toMatchObject({
tag: `"div"`, tag: `"div"`,
@ -486,20 +486,20 @@ describe('compiler: hoistStatic transform', () => {
tag: `"span"`, tag: `"span"`,
props: { props: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_hoisted_1` content: `_hoisted_1`,
}, },
children: { children: {
type: NodeTypes.INTERPOLATION, type: NodeTypes.INTERPOLATION,
content: { content: {
content: `_ctx.bar`, content: `_ctx.bar`,
isStatic: false, isStatic: false,
constType: ConstantTypes.NOT_CONSTANT constType: ConstantTypes.NOT_CONSTANT,
}
}, },
patchFlag: `1 /* TEXT */` },
} patchFlag: `1 /* TEXT */`,
} },
] },
],
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -508,8 +508,8 @@ describe('compiler: hoistStatic transform', () => {
const root = transformWithHoist( const root = transformWithHoist(
`<div><p v-for="o in list"><span>{{ o }}</span></p></div>`, `<div><p v-for="o in list"><span>{{ o }}</span></p></div>`,
{ {
prefixIdentifiers: true prefixIdentifiers: true,
} },
) )
expect(root.hoists.length).toBe(0) expect(root.hoists.length).toBe(0)
@ -520,8 +520,8 @@ describe('compiler: hoistStatic transform', () => {
const root = transformWithHoist( const root = transformWithHoist(
`<div><p v-for="o in list"><span>{{ o + 'foo' }}</span></p></div>`, `<div><p v-for="o in list"><span>{{ o + 'foo' }}</span></p></div>`,
{ {
prefixIdentifiers: true prefixIdentifiers: true,
} },
) )
expect(root.hoists.length).toBe(0) expect(root.hoists.length).toBe(0)
@ -532,8 +532,8 @@ describe('compiler: hoistStatic transform', () => {
const root = transformWithHoist( const root = transformWithHoist(
`<Comp v-slot="{ foo }">{{ foo }}</Comp>`, `<Comp v-slot="{ foo }">{{ foo }}</Comp>`,
{ {
prefixIdentifiers: true prefixIdentifiers: true,
} },
) )
expect(root.hoists.length).toBe(0) expect(root.hoists.length).toBe(0)
@ -545,8 +545,8 @@ describe('compiler: hoistStatic transform', () => {
`<div><div><div @click="foo"/></div></div>`, `<div><div><div @click="foo"/></div></div>`,
{ {
prefixIdentifiers: true, prefixIdentifiers: true,
cacheHandlers: true cacheHandlers: true,
} },
) )
expect(root.cached).toBe(1) expect(root.cached).toBe(1)
@ -554,8 +554,8 @@ describe('compiler: hoistStatic transform', () => {
expect( expect(
generate(root, { generate(root, {
mode: 'module', mode: 'module',
prefixIdentifiers: true prefixIdentifiers: true,
}).code }).code,
).toMatchSnapshot() ).toMatchSnapshot()
}) })
@ -564,8 +564,8 @@ describe('compiler: hoistStatic transform', () => {
`<div><div><div :class="{}" @click="foo"/></div></div>`, `<div><div><div :class="{}" @click="foo"/></div></div>`,
{ {
prefixIdentifiers: true, prefixIdentifiers: true,
cacheHandlers: true cacheHandlers: true,
} },
) )
expect(root.cached).toBe(1) expect(root.cached).toBe(1)
@ -573,14 +573,14 @@ describe('compiler: hoistStatic transform', () => {
expect( expect(
generate(root, { generate(root, {
mode: 'module', mode: 'module',
prefixIdentifiers: true prefixIdentifiers: true,
}).code }).code,
).toMatchSnapshot() ).toMatchSnapshot()
}) })
test('should NOT hoist keyed template v-for with plain element child', () => { test('should NOT hoist keyed template v-for with plain element child', () => {
const root = transformWithHoist( const root = transformWithHoist(
`<div><template v-for="item in items" :key="item"><span/></template></div>` `<div><template v-for="item in items" :key="item"><span/></template></div>`,
) )
expect(root.hoists.length).toBe(0) expect(root.hoists.length).toBe(0)
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
@ -588,7 +588,7 @@ describe('compiler: hoistStatic transform', () => {
test('should NOT hoist SVG with directives', () => { test('should NOT hoist SVG with directives', () => {
const root = transformWithHoist( const root = transformWithHoist(
`<div><svg v-foo><path d="M2,3H5.5L12"/></svg></div>` `<div><svg v-foo><path d="M2,3H5.5L12"/></svg></div>`,
) )
expect(root.hoists.length).toBe(2) expect(root.hoists.length).toBe(2)
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
@ -596,13 +596,13 @@ describe('compiler: hoistStatic transform', () => {
test('clone hoisted array children in HMR mode', () => { test('clone hoisted array children in HMR mode', () => {
const root = transformWithHoist(`<div><span class="hi"></span></div>`, { const root = transformWithHoist(`<div><span class="hi"></span></div>`, {
hmr: true hmr: true,
}) })
expect(root.hoists.length).toBe(2) expect(root.hoists.length).toBe(2)
expect(root.codegenNode).toMatchObject({ expect(root.codegenNode).toMatchObject({
children: { children: {
content: '[..._hoisted_2]' content: '[..._hoisted_2]',
} },
}) })
}) })
}) })

View File

@ -1,9 +1,9 @@
import { import {
type ElementNode,
type VNodeCall,
noopDirectiveTransform,
baseParse as parse, baseParse as parse,
transform, transform,
ElementNode,
noopDirectiveTransform,
VNodeCall
} from '../../src' } from '../../src'
import { transformElement } from '../../src/transforms/transformElement' import { transformElement } from '../../src/transforms/transformElement'
@ -13,8 +13,8 @@ describe('compiler: noop directive transform', () => {
transform(ast, { transform(ast, {
nodeTransforms: [transformElement], nodeTransforms: [transformElement],
directiveTransforms: { directiveTransforms: {
noop: noopDirectiveTransform noop: noopDirectiveTransform,
} },
}) })
const node = ast.children[0] as ElementNode const node = ast.children[0] as ElementNode
// As v-noop adds no properties the codegen should be identical to // As v-noop adds no properties the codegen should be identical to

View File

@ -1,14 +1,14 @@
import { import {
BindingTypes,
type CompilerOptions,
ConstantTypes,
type DirectiveNode,
type ElementNode,
type InterpolationNode,
NodeTypes,
baseCompile,
baseParse as parse, baseParse as parse,
transform, transform,
ElementNode,
DirectiveNode,
NodeTypes,
CompilerOptions,
InterpolationNode,
ConstantTypes,
BindingTypes,
baseCompile
} from '../../src' } from '../../src'
import { transformIf } from '../../src/transforms/vIf' import { transformIf } from '../../src/transforms/vIf'
import { transformExpression } from '../../src/transforms/transformExpression' import { transformExpression } from '../../src/transforms/transformExpression'
@ -16,13 +16,13 @@ import { PatchFlagNames, PatchFlags } from '../../../shared/src'
function parseWithExpressionTransform( function parseWithExpressionTransform(
template: string, template: string,
options: CompilerOptions = {} options: CompilerOptions = {},
) { ) {
const ast = parse(template) const ast = parse(template, options)
transform(ast, { transform(ast, {
prefixIdentifiers: true, prefixIdentifiers: true,
nodeTransforms: [transformIf, transformExpression], nodeTransforms: [transformIf, transformExpression],
...options ...options,
}) })
return ast.children[0] return ast.children[0]
} }
@ -32,7 +32,7 @@ describe('compiler: expression transform', () => {
const node = parseWithExpressionTransform(`{{ foo }}`) as InterpolationNode const node = parseWithExpressionTransform(`{{ foo }}`) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_ctx.foo` content: `_ctx.foo`,
}) })
}) })
@ -40,34 +40,34 @@ describe('compiler: expression transform', () => {
const node = parseWithExpressionTransform(`{{}}`) as InterpolationNode const node = parseWithExpressionTransform(`{{}}`) as InterpolationNode
const node2 = parseWithExpressionTransform(`{{ }}`) as InterpolationNode const node2 = parseWithExpressionTransform(`{{ }}`) as InterpolationNode
const node3 = parseWithExpressionTransform( const node3 = parseWithExpressionTransform(
`<div>{{ }}</div>` `<div>{{ }}</div>`,
) as ElementNode ) as ElementNode
const objectToBeMatched = { const objectToBeMatched = {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `` content: ``,
} }
expect(node.content).toMatchObject(objectToBeMatched) expect(node.content).toMatchObject(objectToBeMatched)
expect(node2.content).toMatchObject(objectToBeMatched) expect(node2.content).toMatchObject(objectToBeMatched)
expect((node3.children[0] as InterpolationNode).content).toMatchObject( expect((node3.children[0] as InterpolationNode).content).toMatchObject(
objectToBeMatched objectToBeMatched,
) )
}) })
test('interpolation (children)', () => { test('interpolation (children)', () => {
const el = parseWithExpressionTransform( const el = parseWithExpressionTransform(
`<div>{{ foo }}</div>` `<div>{{ foo }}</div>`,
) as ElementNode ) as ElementNode
const node = el.children[0] as InterpolationNode const node = el.children[0] as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_ctx.foo` content: `_ctx.foo`,
}) })
}) })
test('interpolation (complex)', () => { test('interpolation (complex)', () => {
const el = parseWithExpressionTransform( const el = parseWithExpressionTransform(
`<div>{{ foo + bar(baz.qux) }}</div>` `<div>{{ foo + bar(baz.qux) }}</div>`,
) as ElementNode ) as ElementNode
const node = el.children[0] as InterpolationNode const node = el.children[0] as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
@ -80,46 +80,46 @@ describe('compiler: expression transform', () => {
{ content: `_ctx.baz` }, { content: `_ctx.baz` },
`.`, `.`,
{ content: `qux` }, { content: `qux` },
`)` `)`,
] ],
}) })
}) })
test('directive value', () => { test('directive value', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`<div v-foo:arg="baz"/>` `<div v-foo:arg="baz"/>`,
) as ElementNode ) as ElementNode
const arg = (node.props[0] as DirectiveNode).arg! const arg = (node.props[0] as DirectiveNode).arg!
expect(arg).toMatchObject({ expect(arg).toMatchObject({
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `arg` content: `arg`,
}) })
const exp = (node.props[0] as DirectiveNode).exp! const exp = (node.props[0] as DirectiveNode).exp!
expect(exp).toMatchObject({ expect(exp).toMatchObject({
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_ctx.baz` content: `_ctx.baz`,
}) })
}) })
test('dynamic directive arg', () => { test('dynamic directive arg', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`<div v-foo:[arg]="baz"/>` `<div v-foo:[arg]="baz"/>`,
) as ElementNode ) as ElementNode
const arg = (node.props[0] as DirectiveNode).arg! const arg = (node.props[0] as DirectiveNode).arg!
expect(arg).toMatchObject({ expect(arg).toMatchObject({
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_ctx.arg` content: `_ctx.arg`,
}) })
const exp = (node.props[0] as DirectiveNode).exp! const exp = (node.props[0] as DirectiveNode).exp!
expect(exp).toMatchObject({ expect(exp).toMatchObject({
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_ctx.baz` content: `_ctx.baz`,
}) })
}) })
test('should prefix complex expressions', () => { test('should prefix complex expressions', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ foo(baz + 1, { key: kuz }) }}` `{{ foo(baz + 1, { key: kuz }) }}`,
) as InterpolationNode ) as InterpolationNode
// should parse into compound expression // should parse into compound expression
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
@ -128,76 +128,57 @@ describe('compiler: expression transform', () => {
{ {
content: `_ctx.foo`, content: `_ctx.foo`,
loc: { loc: {
source: `foo`, start: { offset: 3, line: 1, column: 4 },
start: { end: { offset: 6, line: 1, column: 7 },
offset: 3,
line: 1,
column: 4
}, },
end: {
offset: 6,
line: 1,
column: 7
}
}
}, },
`(`, `(`,
{ {
content: `_ctx.baz`, content: `_ctx.baz`,
loc: { loc: {
source: `baz`, start: { offset: 7, line: 1, column: 8 },
start: { end: { offset: 10, line: 1, column: 11 },
offset: 7,
line: 1,
column: 8
}, },
end: {
offset: 10,
line: 1,
column: 11
}
}
}, },
` + 1, { key: `, ` + 1, { key: `,
{ {
content: `_ctx.kuz`, content: `_ctx.kuz`,
loc: { loc: {
source: `kuz`, start: { offset: 23, line: 1, column: 24 },
start: { end: { offset: 26, line: 1, column: 27 },
offset: 23,
line: 1,
column: 24
}, },
end: {
offset: 26,
line: 1,
column: 27
}
}
}, },
` })` ` })`,
] ],
}) })
}) })
test('should not prefix whitelisted globals', () => { test('should not prefix whitelisted globals', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ Math.max(1, 2) }}` `{{ Math.max(1, 2) }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
children: [{ content: `Math` }, `.`, { content: `max` }, `(1, 2)`] children: [{ content: `Math` }, `.`, { content: `max` }, `(1, 2)`],
})
expect(
(parseWithExpressionTransform(`{{ new Error() }}`) as InterpolationNode)
.content,
).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION,
children: ['new ', { content: 'Error' }, '()'],
}) })
}) })
test('should not prefix reserved literals', () => { test('should not prefix reserved literals', () => {
function assert(exp: string) { function assert(exp: string) {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ ${exp} }}` `{{ ${exp} }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: exp content: exp,
}) })
} }
assert(`true`) assert(`true`)
@ -208,7 +189,7 @@ describe('compiler: expression transform', () => {
test('should not prefix id of a function declaration', () => { test('should not prefix id of a function declaration', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ function foo() { return bar } }}` `{{ function foo() { return bar } }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
@ -217,14 +198,14 @@ describe('compiler: expression transform', () => {
{ content: `foo` }, { content: `foo` },
`() { return `, `() { return `,
{ content: `_ctx.bar` }, { content: `_ctx.bar` },
` }` ` }`,
] ],
}) })
}) })
test('should not prefix params of a function expression', () => { test('should not prefix params of a function expression', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ foo => foo + bar }}` `{{ foo => foo + bar }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
@ -233,14 +214,14 @@ describe('compiler: expression transform', () => {
` => `, ` => `,
{ content: `foo` }, { content: `foo` },
` + `, ` + `,
{ content: `_ctx.bar` } { content: `_ctx.bar` },
] ],
}) })
}) })
test('should prefix default value of a function expression param', () => { test('should prefix default value of a function expression param', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ (foo = baz) => foo + bar }}` `{{ (foo = baz) => foo + bar }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
@ -252,14 +233,14 @@ describe('compiler: expression transform', () => {
`) => `, `) => `,
{ content: `foo` }, { content: `foo` },
` + `, ` + `,
{ content: `_ctx.bar` } { content: `_ctx.bar` },
] ],
}) })
}) })
test('should not prefix function param destructuring', () => { test('should not prefix function param destructuring', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ ({ foo }) => foo + bar }}` `{{ ({ foo }) => foo + bar }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
@ -269,14 +250,14 @@ describe('compiler: expression transform', () => {
` }) => `, ` }) => `,
{ content: `foo` }, { content: `foo` },
` + `, ` + `,
{ content: `_ctx.bar` } { content: `_ctx.bar` },
] ],
}) })
}) })
test('function params should not affect out of scope identifiers', () => { test('function params should not affect out of scope identifiers', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ { a: foo => foo, b: foo } }}` `{{ { a: foo => foo, b: foo } }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
@ -287,14 +268,14 @@ describe('compiler: expression transform', () => {
{ content: `foo` }, { content: `foo` },
`, b: `, `, b: `,
{ content: `_ctx.foo` }, { content: `_ctx.foo` },
` }` ` }`,
] ],
}) })
}) })
test('should prefix default value of function param destructuring', () => { test('should prefix default value of function param destructuring', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ ({ foo = bar }) => foo + bar }}` `{{ ({ foo = bar }) => foo + bar }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
@ -306,13 +287,13 @@ describe('compiler: expression transform', () => {
` }) => `, ` }) => `,
{ content: `foo` }, { content: `foo` },
` + `, ` + `,
{ content: `_ctx.bar` } { content: `_ctx.bar` },
] ],
}) })
}) })
test('should not prefix an object property key', () => { test('should not prefix an object property key', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ { foo() { baz() }, value: bar } }}` `{{ { foo() { baz() }, value: bar } }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
@ -321,24 +302,24 @@ describe('compiler: expression transform', () => {
{ content: `_ctx.baz` }, { content: `_ctx.baz` },
`() }, value: `, `() }, value: `,
{ content: `_ctx.bar` }, { content: `_ctx.bar` },
` }` ` }`,
] ],
}) })
}) })
test('should not duplicate object key with same name as value', () => { test('should not duplicate object key with same name as value', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ { foo: foo } }}` `{{ { foo: foo } }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
children: [`{ foo: `, { content: `_ctx.foo` }, ` }`] children: [`{ foo: `, { content: `_ctx.foo` }, ` }`],
}) })
}) })
test('should prefix a computed object property key', () => { test('should prefix a computed object property key', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ { [foo]: bar } }}` `{{ { [foo]: bar } }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
@ -347,24 +328,24 @@ describe('compiler: expression transform', () => {
{ content: `_ctx.foo` }, { content: `_ctx.foo` },
`]: `, `]: `,
{ content: `_ctx.bar` }, { content: `_ctx.bar` },
` }` ` }`,
] ],
}) })
}) })
test('should prefix object property shorthand value', () => { test('should prefix object property shorthand value', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ { foo } }}` `{{ { foo } }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
children: [`{ foo: `, { content: `_ctx.foo` }, ` }`] children: [`{ foo: `, { content: `_ctx.foo` }, ` }`],
}) })
}) })
test('should not prefix id in a member expression', () => { test('should not prefix id in a member expression', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ foo.bar.baz }}` `{{ foo.bar.baz }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
@ -373,14 +354,14 @@ describe('compiler: expression transform', () => {
`.`, `.`,
{ content: `bar` }, { content: `bar` },
`.`, `.`,
{ content: `baz` } { content: `baz` },
] ],
}) })
}) })
test('should prefix computed id in a member expression', () => { test('should prefix computed id in a member expression', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ foo[bar][baz] }}` `{{ foo[bar][baz] }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
@ -390,8 +371,8 @@ describe('compiler: expression transform', () => {
{ content: `_ctx.bar` }, { content: `_ctx.bar` },
`][`, `][`,
{ content: '_ctx.baz' }, { content: '_ctx.baz' },
`]` `]`,
] ],
}) })
}) })
@ -399,23 +380,23 @@ describe('compiler: expression transform', () => {
const onError = vi.fn() const onError = vi.fn()
parseWithExpressionTransform(`{{ a( }}`, { onError }) parseWithExpressionTransform(`{{ a( }}`, { onError })
expect(onError.mock.calls[0][0].message).toMatch( expect(onError.mock.calls[0][0].message).toMatch(
`Error parsing JavaScript expression: Unexpected token` `Error parsing JavaScript expression: Unexpected token`,
) )
}) })
test('should prefix in assignment', () => { test('should prefix in assignment', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ x = 1 }}` `{{ x = 1 }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
children: [{ content: `_ctx.x` }, ` = 1`] children: [{ content: `_ctx.x` }, ` = 1`],
}) })
}) })
test('should prefix in assignment pattern', () => { test('should prefix in assignment pattern', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ { x, y: [z] } = obj }}` `{{ { x, y: [z] } = obj }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
@ -425,47 +406,47 @@ describe('compiler: expression transform', () => {
`, y: [`, `, y: [`,
{ content: `_ctx.z` }, { content: `_ctx.z` },
`] } = `, `] } = `,
{ content: `_ctx.obj` } { content: `_ctx.obj` },
] ],
}) })
}) })
// #8295 // #8295
test('should treat floating point number literals as constant', () => { test('should treat floating point number literals as constant', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ [1, 2.1] }}` `{{ [1, 2.1] }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
constType: ConstantTypes.CAN_STRINGIFY constType: ConstantTypes.CAN_STRINGIFY,
}) })
}) })
describe('ES Proposals support', () => { describe('ES Proposals support', () => {
test('bigInt', () => { test('bigInt', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ 13000n }}` `{{ 13000n }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `13000n`, content: `13000n`,
isStatic: false, isStatic: false,
constType: ConstantTypes.CAN_STRINGIFY constType: ConstantTypes.CAN_STRINGIFY,
}) })
}) })
test('nullish coalescing', () => { test('nullish coalescing', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ a ?? b }}` `{{ a ?? b }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
children: [{ content: `_ctx.a` }, ` ?? `, { content: `_ctx.b` }] children: [{ content: `_ctx.a` }, ` ?? `, { content: `_ctx.b` }],
}) })
}) })
test('optional chaining', () => { test('optional chaining', () => {
const node = parseWithExpressionTransform( const node = parseWithExpressionTransform(
`{{ a?.b?.c }}` `{{ a?.b?.c }}`,
) as InterpolationNode ) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
@ -474,8 +455,8 @@ describe('compiler: expression transform', () => {
`?.`, `?.`,
{ content: `b` }, { content: `b` },
`?.`, `?.`,
{ content: `c` } { content: `c` },
] ],
}) })
}) })
@ -486,14 +467,18 @@ describe('compiler: expression transform', () => {
[ [
'pipelineOperator', 'pipelineOperator',
{ {
proposal: 'minimal' proposal: 'minimal',
} },
] ],
] ],
}) as InterpolationNode }) as InterpolationNode
expect(node.content).toMatchObject({ expect(node.content).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
children: [{ content: `_ctx.a` }, ` |> `, { content: `_ctx.uppercase` }] children: [
{ content: `_ctx.a` },
` |> `,
{ content: `_ctx.uppercase` },
],
}) })
}) })
}) })
@ -507,23 +492,23 @@ describe('compiler: expression transform', () => {
options: BindingTypes.OPTIONS, options: BindingTypes.OPTIONS,
reactive: BindingTypes.SETUP_REACTIVE_CONST, reactive: BindingTypes.SETUP_REACTIVE_CONST,
literal: BindingTypes.LITERAL_CONST, literal: BindingTypes.LITERAL_CONST,
isNaN: BindingTypes.SETUP_REF isNaN: BindingTypes.SETUP_REF,
} }
function compileWithBindingMetadata( function compileWithBindingMetadata(
template: string, template: string,
options?: CompilerOptions options?: CompilerOptions,
) { ) {
return baseCompile(template, { return baseCompile(template, {
prefixIdentifiers: true, prefixIdentifiers: true,
bindingMetadata, bindingMetadata,
...options ...options,
}) })
} }
test('non-inline mode', () => { test('non-inline mode', () => {
const { code } = compileWithBindingMetadata( const { code } = compileWithBindingMetadata(
`<div>{{ props }} {{ setup }} {{ data }} {{ options }} {{ isNaN }}</div>` `<div>{{ props }} {{ setup }} {{ data }} {{ options }} {{ isNaN }}</div>`,
) )
expect(code).toMatch(`$props.props`) expect(code).toMatch(`$props.props`)
expect(code).toMatch(`$setup.setup`) expect(code).toMatch(`$setup.setup`)
@ -540,7 +525,7 @@ describe('compiler: expression transform', () => {
for (const x in list) { for (const x in list) {
log(x) log(x)
} }
}"/>` }"/>`,
) )
expect(code).not.toMatch(`_ctx.x`) expect(code).not.toMatch(`_ctx.x`)
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
@ -552,7 +537,7 @@ describe('compiler: expression transform', () => {
for (const x of list) { for (const x of list) {
log(x) log(x)
} }
}"/>` }"/>`,
) )
expect(code).not.toMatch(`_ctx.x`) expect(code).not.toMatch(`_ctx.x`)
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
@ -564,7 +549,7 @@ describe('compiler: expression transform', () => {
for (let i = 0; i < list.length; i++) { for (let i = 0; i < list.length; i++) {
log(i) log(i)
} }
}"/>` }"/>`,
) )
expect(code).not.toMatch(`_ctx.i`) expect(code).not.toMatch(`_ctx.i`)
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
@ -573,7 +558,7 @@ describe('compiler: expression transform', () => {
test('inline mode', () => { test('inline mode', () => {
const { code } = compileWithBindingMetadata( const { code } = compileWithBindingMetadata(
`<div>{{ props }} {{ setup }} {{ setupConst }} {{ data }} {{ options }} {{ isNaN }}</div>`, `<div>{{ props }} {{ setup }} {{ setupConst }} {{ data }} {{ options }} {{ isNaN }}</div>`,
{ inline: true } { inline: true },
) )
expect(code).toMatch(`__props.props`) expect(code).toMatch(`__props.props`)
expect(code).toMatch(`_unref(setup)`) expect(code).toMatch(`_unref(setup)`)
@ -586,12 +571,12 @@ describe('compiler: expression transform', () => {
test('literal const handling', () => { test('literal const handling', () => {
const { code } = compileWithBindingMetadata(`<div>{{ literal }}</div>`, { const { code } = compileWithBindingMetadata(`<div>{{ literal }}</div>`, {
inline: true inline: true,
}) })
expect(code).toMatch(`toDisplayString(literal)`) expect(code).toMatch(`toDisplayString(literal)`)
// #7973 should skip patch for literal const // #7973 should skip patch for literal const
expect(code).not.toMatch( expect(code).not.toMatch(
`${PatchFlags.TEXT} /* ${PatchFlagNames[PatchFlags.TEXT]} */` `${PatchFlags.TEXT} /* ${PatchFlagNames[PatchFlags.TEXT]} */`,
) )
}) })
@ -600,17 +585,17 @@ describe('compiler: expression transform', () => {
expect(code).toMatch(`toDisplayString($setup.literal)`) expect(code).toMatch(`toDisplayString($setup.literal)`)
// #7973 should skip patch for literal const // #7973 should skip patch for literal const
expect(code).not.toMatch( expect(code).not.toMatch(
`${PatchFlags.TEXT} /* ${PatchFlagNames[PatchFlags.TEXT]} */` `${PatchFlags.TEXT} /* ${PatchFlagNames[PatchFlags.TEXT]} */`,
) )
}) })
test('reactive const handling', () => { test('reactive const handling', () => {
const { code } = compileWithBindingMetadata(`<div>{{ reactive }}</div>`, { const { code } = compileWithBindingMetadata(`<div>{{ reactive }}</div>`, {
inline: true inline: true,
}) })
// #7973 should not skip patch for reactive const // #7973 should not skip patch for reactive const
expect(code).toMatch( expect(code).toMatch(
`${PatchFlags.TEXT} /* ${PatchFlagNames[PatchFlags.TEXT]} */` `${PatchFlags.TEXT} /* ${PatchFlagNames[PatchFlags.TEXT]} */`,
) )
}) })
}) })

View File

@ -1,10 +1,10 @@
import { import {
CompilerOptions, type CompilerOptions,
type ElementNode,
ErrorCodes,
NodeTypes,
baseParse as parse, baseParse as parse,
transform, transform,
ElementNode,
NodeTypes,
ErrorCodes
} from '../../src' } from '../../src'
import { transformElement } from '../../src/transforms/transformElement' import { transformElement } from '../../src/transforms/transformElement'
import { transformOn } from '../../src/transforms/vOn' import { transformOn } from '../../src/transforms/vOn'
@ -19,13 +19,13 @@ function parseWithSlots(template: string, options: CompilerOptions = {}) {
nodeTransforms: [ nodeTransforms: [
...(options.prefixIdentifiers ? [transformExpression] : []), ...(options.prefixIdentifiers ? [transformExpression] : []),
transformSlotOutlet, transformSlotOutlet,
transformElement transformElement,
], ],
directiveTransforms: { directiveTransforms: {
on: transformOn, on: transformOn,
bind: transformBind bind: transformBind,
}, },
...options ...options,
}) })
return ast return ast
} }
@ -36,7 +36,7 @@ describe('compiler: transform <slot> outlets', () => {
expect((ast.children[0] as ElementNode).codegenNode).toMatchObject({ expect((ast.children[0] as ElementNode).codegenNode).toMatchObject({
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
callee: RENDER_SLOT, callee: RENDER_SLOT,
arguments: [`$slots`, `"default"`] arguments: [`$slots`, `"default"`],
}) })
}) })
@ -45,7 +45,7 @@ describe('compiler: transform <slot> outlets', () => {
expect((ast.children[0] as ElementNode).codegenNode).toMatchObject({ expect((ast.children[0] as ElementNode).codegenNode).toMatchObject({
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
callee: RENDER_SLOT, callee: RENDER_SLOT,
arguments: [`$slots`, `"foo"`] arguments: [`$slots`, `"foo"`],
}) })
}) })
@ -59,15 +59,15 @@ describe('compiler: transform <slot> outlets', () => {
{ {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `foo`, content: `foo`,
isStatic: false isStatic: false,
} },
] ],
}) })
}) })
test('dynamically named slot outlet w/ prefixIdentifiers: true', () => { test('dynamically named slot outlet w/ prefixIdentifiers: true', () => {
const ast = parseWithSlots(`<slot :name="foo + bar" />`, { const ast = parseWithSlots(`<slot :name="foo + bar" />`, {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect((ast.children[0] as ElementNode).codegenNode).toMatchObject({ expect((ast.children[0] as ElementNode).codegenNode).toMatchObject({
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
@ -80,23 +80,23 @@ describe('compiler: transform <slot> outlets', () => {
{ {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_ctx.foo`, content: `_ctx.foo`,
isStatic: false isStatic: false,
}, },
` + `, ` + `,
{ {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_ctx.bar`, content: `_ctx.bar`,
isStatic: false isStatic: false,
} },
] ],
} },
] ],
}) })
}) })
test('default slot outlet with props', () => { test('default slot outlet with props', () => {
const ast = parseWithSlots( const ast = parseWithSlots(
`<slot foo="bar" :baz="qux" :foo-bar="foo-bar" />` `<slot foo="bar" :baz="qux" :foo-bar="foo-bar" />`,
) )
expect((ast.children[0] as ElementNode).codegenNode).toMatchObject({ expect((ast.children[0] as ElementNode).codegenNode).toMatchObject({
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
@ -110,36 +110,36 @@ describe('compiler: transform <slot> outlets', () => {
{ {
key: { key: {
content: `foo`, content: `foo`,
isStatic: true isStatic: true,
}, },
value: { value: {
content: `bar`, content: `bar`,
isStatic: true isStatic: true,
} },
}, },
{ {
key: { key: {
content: `baz`, content: `baz`,
isStatic: true isStatic: true,
}, },
value: { value: {
content: `qux`, content: `qux`,
isStatic: false isStatic: false,
} },
}, },
{ {
key: { key: {
content: `fooBar`, content: `fooBar`,
isStatic: true isStatic: true,
}, },
value: { value: {
content: `foo-bar`, content: `foo-bar`,
isStatic: false isStatic: false,
} },
} },
] ],
} },
] ],
}) })
}) })
@ -158,26 +158,26 @@ describe('compiler: transform <slot> outlets', () => {
{ {
key: { key: {
content: `foo`, content: `foo`,
isStatic: true isStatic: true,
}, },
value: { value: {
content: `bar`, content: `bar`,
isStatic: true isStatic: true,
} },
}, },
{ {
key: { key: {
content: `baz`, content: `baz`,
isStatic: true isStatic: true,
}, },
value: { value: {
content: `qux`, content: `qux`,
isStatic: false isStatic: false,
} },
} },
] ],
} },
] ],
}) })
}) })
@ -196,26 +196,26 @@ describe('compiler: transform <slot> outlets', () => {
{ {
key: { key: {
content: `foo`, content: `foo`,
isStatic: true isStatic: true,
}, },
value: { value: {
content: `bar`, content: `bar`,
isStatic: true isStatic: true,
} },
}, },
{ {
key: { key: {
content: `baz`, content: `baz`,
isStatic: true isStatic: true,
}, },
value: { value: {
content: `qux`, content: `qux`,
isStatic: false isStatic: false,
} },
} },
] ],
} },
] ],
}) })
}) })
@ -234,11 +234,11 @@ describe('compiler: transform <slot> outlets', () => {
returns: [ returns: [
{ {
type: NodeTypes.ELEMENT, type: NodeTypes.ELEMENT,
tag: `div` tag: `div`,
} },
] ],
} },
] ],
}) })
}) })
@ -257,11 +257,11 @@ describe('compiler: transform <slot> outlets', () => {
returns: [ returns: [
{ {
type: NodeTypes.ELEMENT, type: NodeTypes.ELEMENT,
tag: `div` tag: `div`,
} },
] ],
} },
] ],
}) })
}) })
@ -279,14 +279,14 @@ describe('compiler: transform <slot> outlets', () => {
{ {
key: { key: {
content: `foo`, content: `foo`,
isStatic: true isStatic: true,
}, },
value: { value: {
content: `bar`, content: `bar`,
isStatic: false isStatic: false,
} },
} },
] ],
}, },
{ {
type: NodeTypes.JS_FUNCTION_EXPRESSION, type: NodeTypes.JS_FUNCTION_EXPRESSION,
@ -294,11 +294,11 @@ describe('compiler: transform <slot> outlets', () => {
returns: [ returns: [
{ {
type: NodeTypes.ELEMENT, type: NodeTypes.ELEMENT,
tag: `div` tag: `div`,
} },
] ],
} },
] ],
}) })
}) })
@ -316,14 +316,14 @@ describe('compiler: transform <slot> outlets', () => {
{ {
key: { key: {
content: `foo`, content: `foo`,
isStatic: true isStatic: true,
}, },
value: { value: {
content: `bar`, content: `bar`,
isStatic: false isStatic: false,
} },
} },
] ],
}, },
{ {
type: NodeTypes.JS_FUNCTION_EXPRESSION, type: NodeTypes.JS_FUNCTION_EXPRESSION,
@ -331,11 +331,11 @@ describe('compiler: transform <slot> outlets', () => {
returns: [ returns: [
{ {
type: NodeTypes.ELEMENT, type: NodeTypes.ELEMENT,
tag: `div` tag: `div`,
} },
] ],
} },
] ],
}) })
}) })
@ -344,11 +344,11 @@ describe('compiler: transform <slot> outlets', () => {
expect((ast.children[0] as ElementNode).codegenNode).toMatchObject({ expect((ast.children[0] as ElementNode).codegenNode).toMatchObject({
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
callee: RENDER_SLOT, callee: RENDER_SLOT,
arguments: [`$slots`, `"default"`, `{}`, `undefined`, `true`] arguments: [`$slots`, `"default"`, `{}`, `undefined`, `true`],
}) })
const fallback = parseWithSlots(`<slot>fallback</slot>`, { const fallback = parseWithSlots(`<slot>fallback</slot>`, {
slotted: false, slotted: false,
scopeId: 'foo' scopeId: 'foo',
}) })
const child = { const child = {
@ -357,14 +357,14 @@ describe('compiler: transform <slot> outlets', () => {
returns: [ returns: [
{ {
type: NodeTypes.TEXT, type: NodeTypes.TEXT,
content: `fallback` content: `fallback`,
} },
] ],
} }
expect((fallback.children[0] as ElementNode).codegenNode).toMatchObject({ expect((fallback.children[0] as ElementNode).codegenNode).toMatchObject({
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
callee: RENDER_SLOT, callee: RENDER_SLOT,
arguments: [`$slots`, `"default"`, `{}`, child, `true`] arguments: [`$slots`, `"default"`, `{}`, child, `true`],
}) })
}) })
@ -376,18 +376,17 @@ describe('compiler: transform <slot> outlets', () => {
expect(onError.mock.calls[0][0]).toMatchObject({ expect(onError.mock.calls[0][0]).toMatchObject({
code: ErrorCodes.X_V_SLOT_UNEXPECTED_DIRECTIVE_ON_SLOT_OUTLET, code: ErrorCodes.X_V_SLOT_UNEXPECTED_DIRECTIVE_ON_SLOT_OUTLET,
loc: { loc: {
source: `v-foo`,
start: { start: {
offset: index, offset: index,
line: 1, line: 1,
column: index + 1 column: index + 1,
}, },
end: { end: {
offset: index + 5, offset: index + 5,
line: 1, line: 1,
column: index + 6 column: index + 6,
} },
} },
}) })
}) })
}) })

View File

@ -1,11 +1,11 @@
import { import {
CompilerOptions, type CompilerOptions,
baseParse as parse, type ElementNode,
transform, type ForNode,
NodeTypes, NodeTypes,
generate, generate,
ForNode, baseParse as parse,
ElementNode transform,
} from '../../src' } from '../../src'
import { transformFor } from '../../src/transforms/vFor' import { transformFor } from '../../src/transforms/vFor'
import { transformText } from '../../src/transforms/transformText' import { transformText } from '../../src/transforms/transformText'
@ -22,9 +22,9 @@ function transformWithTextOpt(template: string, options: CompilerOptions = {}) {
transformFor, transformFor,
...(options.prefixIdentifiers ? [transformExpression] : []), ...(options.prefixIdentifiers ? [transformExpression] : []),
transformElement, transformElement,
transformText transformText,
], ],
...options ...options,
}) })
return ast return ast
} }
@ -35,8 +35,8 @@ describe('compiler: transform text', () => {
expect(root.children[0]).toMatchObject({ expect(root.children[0]).toMatchObject({
type: NodeTypes.INTERPOLATION, type: NodeTypes.INTERPOLATION,
content: { content: {
content: `foo` content: `foo`,
} },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -51,8 +51,8 @@ describe('compiler: transform text', () => {
` + `, ` + `,
{ type: NodeTypes.TEXT, content: ` bar ` }, { type: NodeTypes.TEXT, content: ` bar ` },
` + `, ` + `,
{ type: NodeTypes.INTERPOLATION, content: { content: `baz` } } { type: NodeTypes.INTERPOLATION, content: { content: `baz` } },
] ],
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -75,12 +75,12 @@ describe('compiler: transform text', () => {
` + `, ` + `,
{ type: NodeTypes.TEXT, content: ` bar ` }, { type: NodeTypes.TEXT, content: ` bar ` },
` + `, ` + `,
{ type: NodeTypes.INTERPOLATION, content: { content: `baz` } } { type: NodeTypes.INTERPOLATION, content: { content: `baz` } },
] ],
},
genFlagText(PatchFlags.TEXT),
],
}, },
genFlagText(PatchFlags.TEXT)
]
}
}) })
expect(root.children[2].type).toBe(NodeTypes.ELEMENT) expect(root.children[2].type).toBe(NodeTypes.ELEMENT)
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
@ -99,11 +99,11 @@ describe('compiler: transform text', () => {
arguments: [ arguments: [
{ {
type: NodeTypes.TEXT, type: NodeTypes.TEXT,
content: `hello` content: `hello`,
} },
// should have no flag // should have no flag
] ],
} },
}) })
expect(root.children[2].type).toBe(NodeTypes.ELEMENT) expect(root.children[2].type).toBe(NodeTypes.ELEMENT)
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
@ -111,7 +111,7 @@ describe('compiler: transform text', () => {
test('consecutive text mixed with elements', () => { test('consecutive text mixed with elements', () => {
const root = transformWithTextOpt( const root = transformWithTextOpt(
`<div/>{{ foo }} bar {{ baz }}<div/>hello<div/>` `<div/>{{ foo }} bar {{ baz }}<div/>hello<div/>`,
) )
expect(root.children.length).toBe(5) expect(root.children.length).toBe(5)
expect(root.children[0].type).toBe(NodeTypes.ELEMENT) expect(root.children[0].type).toBe(NodeTypes.ELEMENT)
@ -128,12 +128,12 @@ describe('compiler: transform text', () => {
` + `, ` + `,
{ type: NodeTypes.TEXT, content: ` bar ` }, { type: NodeTypes.TEXT, content: ` bar ` },
` + `, ` + `,
{ type: NodeTypes.INTERPOLATION, content: { content: `baz` } } { type: NodeTypes.INTERPOLATION, content: { content: `baz` } },
] ],
},
genFlagText(PatchFlags.TEXT),
],
}, },
genFlagText(PatchFlags.TEXT)
]
}
}) })
expect(root.children[2].type).toBe(NodeTypes.ELEMENT) expect(root.children[2].type).toBe(NodeTypes.ELEMENT)
expect(root.children[3]).toMatchObject({ expect(root.children[3]).toMatchObject({
@ -144,10 +144,10 @@ describe('compiler: transform text', () => {
arguments: [ arguments: [
{ {
type: NodeTypes.TEXT, type: NodeTypes.TEXT,
content: `hello` content: `hello`,
} },
] ],
} },
}) })
expect(root.children[4].type).toBe(NodeTypes.ELEMENT) expect(root.children[4].type).toBe(NodeTypes.ELEMENT)
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
@ -155,21 +155,21 @@ describe('compiler: transform text', () => {
test('<template v-for>', () => { test('<template v-for>', () => {
const root = transformWithTextOpt( const root = transformWithTextOpt(
`<template v-for="i in list">foo</template>` `<template v-for="i in list">foo</template>`,
) )
expect(root.children[0].type).toBe(NodeTypes.FOR) expect(root.children[0].type).toBe(NodeTypes.FOR)
const forNode = root.children[0] as ForNode const forNode = root.children[0] as ForNode
// should convert template v-for text children because they are inside // should convert template v-for text children because they are inside
// fragments // fragments
expect(forNode.children[0]).toMatchObject({ expect(forNode.children[0]).toMatchObject({
type: NodeTypes.TEXT_CALL type: NodeTypes.TEXT_CALL,
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
test('with prefixIdentifiers: true', () => { test('with prefixIdentifiers: true', () => {
const root = transformWithTextOpt(`{{ foo }} bar {{ baz + qux }}`, { const root = transformWithTextOpt(`{{ foo }} bar {{ baz + qux }}`, {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect(root.children.length).toBe(1) expect(root.children.length).toBe(1)
expect(root.children[0]).toMatchObject({ expect(root.children[0]).toMatchObject({
@ -183,15 +183,15 @@ describe('compiler: transform text', () => {
type: NodeTypes.INTERPOLATION, type: NodeTypes.INTERPOLATION,
content: { content: {
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
children: [{ content: `_ctx.baz` }, ` + `, { content: `_ctx.qux` }] children: [{ content: `_ctx.baz` }, ` + `, { content: `_ctx.qux` }],
} },
} },
] ],
}) })
expect( expect(
generate(root, { generate(root, {
prefixIdentifiers: true prefixIdentifiers: true,
}).code }).code,
).toMatchSnapshot() ).toMatchSnapshot()
}) })
@ -210,12 +210,12 @@ describe('compiler: transform text', () => {
type: NodeTypes.INTERPOLATION, type: NodeTypes.INTERPOLATION,
content: { content: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: 'foo' content: 'foo',
} },
},
genFlagText(PatchFlags.TEXT),
],
}, },
genFlagText(PatchFlags.TEXT)
]
}
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })

View File

@ -1,37 +1,37 @@
import { import {
type CallExpression,
type CompilerOptions,
type ElementNode,
ErrorCodes,
NodeTypes,
type ObjectExpression,
type VNodeCall,
baseParse as parse, baseParse as parse,
transform, transform,
ElementNode,
ObjectExpression,
CompilerOptions,
ErrorCodes,
VNodeCall,
NodeTypes,
CallExpression
} from '../../src' } from '../../src'
import { transformBind } from '../../src/transforms/vBind' import { transformBind } from '../../src/transforms/vBind'
import { transformElement } from '../../src/transforms/transformElement' import { transformElement } from '../../src/transforms/transformElement'
import { import {
CAMELIZE, CAMELIZE,
NORMALIZE_PROPS,
helperNameMap, helperNameMap,
NORMALIZE_PROPS
} from '../../src/runtimeHelpers' } from '../../src/runtimeHelpers'
import { transformExpression } from '../../src/transforms/transformExpression' import { transformExpression } from '../../src/transforms/transformExpression'
function parseWithVBind( function parseWithVBind(
template: string, template: string,
options: CompilerOptions = {} options: CompilerOptions = {},
): ElementNode { ): ElementNode {
const ast = parse(template) const ast = parse(template)
transform(ast, { transform(ast, {
nodeTransforms: [ nodeTransforms: [
...(options.prefixIdentifiers ? [transformExpression] : []), ...(options.prefixIdentifiers ? [transformExpression] : []),
transformElement transformElement,
], ],
directiveTransforms: { directiveTransforms: {
bind: transformBind bind: transformBind,
}, },
...options ...options,
}) })
return ast.children[0] as ElementNode return ast.children[0] as ElementNode
} }
@ -47,13 +47,13 @@ describe('compiler: transform v-bind', () => {
loc: { loc: {
start: { start: {
line: 1, line: 1,
column: 13 column: 13,
}, },
end: { end: {
line: 1, line: 1,
column: 15 column: 15,
} },
} },
}, },
value: { value: {
content: `id`, content: `id`,
@ -61,14 +61,52 @@ describe('compiler: transform v-bind', () => {
loc: { loc: {
start: { start: {
line: 1, line: 1,
column: 17 column: 17,
}, },
end: { end: {
line: 1, line: 1,
column: 19 column: 19,
} },
} },
} },
})
})
test('no expression', () => {
const node = parseWithVBind(`<div v-bind:id />`)
const props = (node.codegenNode as VNodeCall).props as ObjectExpression
expect(props.properties[0]).toMatchObject({
key: {
content: `id`,
isStatic: true,
loc: {
start: { line: 1, column: 13, offset: 12 },
end: { line: 1, column: 15, offset: 14 },
},
},
value: {
content: `id`,
isStatic: false,
loc: {
start: { line: 1, column: 13, offset: 12 },
end: { line: 1, column: 15, offset: 14 },
},
},
})
})
test('no expression (shorthand)', () => {
const node = parseWithVBind(`<div :id />`)
const props = (node.codegenNode as VNodeCall).props as ObjectExpression
expect(props.properties[0]).toMatchObject({
key: {
content: `id`,
isStatic: true,
},
value: {
content: `id`,
isStatic: false,
},
}) })
}) })
@ -85,45 +123,45 @@ describe('compiler: transform v-bind', () => {
{ {
key: { key: {
content: `id || ""`, content: `id || ""`,
isStatic: false isStatic: false,
}, },
value: { value: {
content: `id`, content: `id`,
isStatic: false isStatic: false,
} },
} },
] ],
} },
] ],
}) })
}) })
test('should error if no expression', () => { test('should error if empty expression', () => {
const onError = vi.fn() const onError = vi.fn()
const node = parseWithVBind(`<div v-bind:arg />`, { onError }) const node = parseWithVBind(`<div v-bind:arg="" />`, { onError })
const props = (node.codegenNode as VNodeCall).props as ObjectExpression const props = (node.codegenNode as VNodeCall).props as ObjectExpression
expect(onError.mock.calls[0][0]).toMatchObject({ expect(onError.mock.calls[0][0]).toMatchObject({
code: ErrorCodes.X_V_BIND_NO_EXPRESSION, code: ErrorCodes.X_V_BIND_NO_EXPRESSION,
loc: { loc: {
start: { start: {
line: 1, line: 1,
column: 6 column: 6,
}, },
end: { end: {
line: 1, line: 1,
column: 16 column: 19,
} },
} },
}) })
expect(props.properties[0]).toMatchObject({ expect(props.properties[0]).toMatchObject({
key: { key: {
content: `arg`, content: `arg`,
isStatic: true isStatic: true,
}, },
value: { value: {
content: ``, content: ``,
isStatic: true isStatic: true,
} },
}) })
}) })
@ -133,12 +171,27 @@ describe('compiler: transform v-bind', () => {
expect(props.properties[0]).toMatchObject({ expect(props.properties[0]).toMatchObject({
key: { key: {
content: `fooBar`, content: `fooBar`,
isStatic: true isStatic: true,
}, },
value: { value: {
content: `id`, content: `id`,
isStatic: false isStatic: false,
} },
})
})
test('.camel modifier w/ no expression', () => {
const node = parseWithVBind(`<div v-bind:foo-bar.camel />`)
const props = (node.codegenNode as VNodeCall).props as ObjectExpression
expect(props.properties[0]).toMatchObject({
key: {
content: `fooBar`,
isStatic: true,
},
value: {
content: `fooBar`,
isStatic: false,
},
}) })
}) })
@ -155,22 +208,22 @@ describe('compiler: transform v-bind', () => {
{ {
key: { key: {
content: `_${helperNameMap[CAMELIZE]}(foo || "")`, content: `_${helperNameMap[CAMELIZE]}(foo || "")`,
isStatic: false isStatic: false,
}, },
value: { value: {
content: `id`, content: `id`,
isStatic: false isStatic: false,
} },
} },
] ],
} },
] ],
}) })
}) })
test('.camel modifier w/ dynamic arg + prefixIdentifiers', () => { test('.camel modifier w/ dynamic arg + prefixIdentifiers', () => {
const node = parseWithVBind(`<div v-bind:[foo(bar)].camel="id"/>`, { const node = parseWithVBind(`<div v-bind:[foo(bar)].camel="id"/>`, {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
const props = (node.codegenNode as VNodeCall).props as CallExpression const props = (node.codegenNode as VNodeCall).props as CallExpression
expect(props).toMatchObject({ expect(props).toMatchObject({
@ -190,17 +243,17 @@ describe('compiler: transform v-bind', () => {
{ content: `_ctx.bar` }, { content: `_ctx.bar` },
`)`, `)`,
`) || ""`, `) || ""`,
`)` `)`,
] ],
}, },
value: { value: {
content: `_ctx.id`, content: `_ctx.id`,
isStatic: false isStatic: false,
} },
} },
] ],
} },
] ],
}) })
}) })
@ -210,12 +263,27 @@ describe('compiler: transform v-bind', () => {
expect(props.properties[0]).toMatchObject({ expect(props.properties[0]).toMatchObject({
key: { key: {
content: `.fooBar`, content: `.fooBar`,
isStatic: true isStatic: true,
}, },
value: { value: {
content: `id`, content: `id`,
isStatic: false isStatic: false,
} },
})
})
test('.prop modifier w/ no expression', () => {
const node = parseWithVBind(`<div v-bind:fooBar.prop />`)
const props = (node.codegenNode as VNodeCall).props as ObjectExpression
expect(props.properties[0]).toMatchObject({
key: {
content: `.fooBar`,
isStatic: true,
},
value: {
content: `fooBar`,
isStatic: false,
},
}) })
}) })
@ -232,22 +300,22 @@ describe('compiler: transform v-bind', () => {
{ {
key: { key: {
content: '`.${fooBar || ""}`', content: '`.${fooBar || ""}`',
isStatic: false isStatic: false,
}, },
value: { value: {
content: `id`, content: `id`,
isStatic: false isStatic: false,
} },
} },
] ],
} },
] ],
}) })
}) })
test('.prop modifier w/ dynamic arg + prefixIdentifiers', () => { test('.prop modifier w/ dynamic arg + prefixIdentifiers', () => {
const node = parseWithVBind(`<div v-bind:[foo(bar)].prop="id"/>`, { const node = parseWithVBind(`<div v-bind:[foo(bar)].prop="id"/>`, {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
const props = (node.codegenNode as VNodeCall).props as CallExpression const props = (node.codegenNode as VNodeCall).props as CallExpression
expect(props).toMatchObject({ expect(props).toMatchObject({
@ -267,17 +335,17 @@ describe('compiler: transform v-bind', () => {
{ content: `_ctx.bar` }, { content: `_ctx.bar` },
`)`, `)`,
`) || ""`, `) || ""`,
`)` `)`,
] ],
}, },
value: { value: {
content: `_ctx.id`, content: `_ctx.id`,
isStatic: false isStatic: false,
} },
} },
] ],
} },
] ],
}) })
}) })
@ -287,12 +355,27 @@ describe('compiler: transform v-bind', () => {
expect(props.properties[0]).toMatchObject({ expect(props.properties[0]).toMatchObject({
key: { key: {
content: `.fooBar`, content: `.fooBar`,
isStatic: true isStatic: true,
}, },
value: { value: {
content: `id`, content: `id`,
isStatic: false isStatic: false,
} },
})
})
test('.prop modifier (shortband) w/ no expression', () => {
const node = parseWithVBind(`<div .fooBar />`)
const props = (node.codegenNode as VNodeCall).props as ObjectExpression
expect(props.properties[0]).toMatchObject({
key: {
content: `.fooBar`,
isStatic: true,
},
value: {
content: `fooBar`,
isStatic: false,
},
}) })
}) })
@ -302,12 +385,27 @@ describe('compiler: transform v-bind', () => {
expect(props.properties[0]).toMatchObject({ expect(props.properties[0]).toMatchObject({
key: { key: {
content: `^foo-bar`, content: `^foo-bar`,
isStatic: true isStatic: true,
}, },
value: { value: {
content: `id`, content: `id`,
isStatic: false isStatic: false,
} },
})
})
test('.attr modifier w/ no expression', () => {
const node = parseWithVBind(`<div v-bind:foo-bar.attr />`)
const props = (node.codegenNode as VNodeCall).props as ObjectExpression
expect(props.properties[0]).toMatchObject({
key: {
content: `^foo-bar`,
isStatic: true,
},
value: {
content: `fooBar`,
isStatic: false,
},
}) })
}) })
}) })

View File

@ -1,4 +1,4 @@
import { baseParse as parse } from '../../src/parse' import { baseParse as parse } from '../../src/parser'
import { transform } from '../../src/transform' import { transform } from '../../src/transform'
import { transformIf } from '../../src/transforms/vIf' import { transformIf } from '../../src/transforms/vIf'
import { transformFor } from '../../src/transforms/vFor' import { transformFor } from '../../src/transforms/vFor'
@ -7,23 +7,23 @@ import { transformElement } from '../../src/transforms/transformElement'
import { transformSlotOutlet } from '../../src/transforms/transformSlotOutlet' import { transformSlotOutlet } from '../../src/transforms/transformSlotOutlet'
import { transformExpression } from '../../src/transforms/transformExpression' import { transformExpression } from '../../src/transforms/transformExpression'
import { import {
ForNode, ConstantTypes,
type ElementNode,
type ForCodegenNode,
type ForNode,
type InterpolationNode,
NodeTypes, NodeTypes,
SimpleExpressionNode, type SimpleExpressionNode,
ElementNode,
InterpolationNode,
ForCodegenNode,
ConstantTypes
} from '../../src/ast' } from '../../src/ast'
import { ErrorCodes } from '../../src/errors' import { ErrorCodes } from '../../src/errors'
import { CompilerOptions, generate } from '../../src' import { type CompilerOptions, generate } from '../../src'
import { FRAGMENT, RENDER_LIST, RENDER_SLOT } from '../../src/runtimeHelpers' import { FRAGMENT, RENDER_LIST, RENDER_SLOT } from '../../src/runtimeHelpers'
import { PatchFlags } from '@vue/shared' import { PatchFlags } from '@vue/shared'
import { createObjectMatcher, genFlagText } from '../testUtils' import { createObjectMatcher, genFlagText } from '../testUtils'
function parseWithForTransform( function parseWithForTransform(
template: string, template: string,
options: CompilerOptions = {} options: CompilerOptions = {},
) { ) {
const ast = parse(template, options) const ast = parse(template, options)
transform(ast, { transform(ast, {
@ -32,16 +32,16 @@ function parseWithForTransform(
transformFor, transformFor,
...(options.prefixIdentifiers ? [transformExpression] : []), ...(options.prefixIdentifiers ? [transformExpression] : []),
transformSlotOutlet, transformSlotOutlet,
transformElement transformElement,
], ],
directiveTransforms: { directiveTransforms: {
bind: transformBind bind: transformBind,
}, },
...options ...options,
}) })
return { return {
root: ast, root: ast,
node: ast.children[0] as ForNode & { codegenNode: ForCodegenNode } node: ast.children[0] as ForNode & { codegenNode: ForCodegenNode },
} }
} }
@ -49,7 +49,7 @@ describe('compiler: v-for', () => {
describe('transform', () => { describe('transform', () => {
test('number expression', () => { test('number expression', () => {
const { node: forNode } = parseWithForTransform( const { node: forNode } = parseWithForTransform(
'<span v-for="index in 5" />' '<span v-for="index in 5" />',
) )
expect(forNode.keyAlias).toBeUndefined() expect(forNode.keyAlias).toBeUndefined()
expect(forNode.objectIndexAlias).toBeUndefined() expect(forNode.objectIndexAlias).toBeUndefined()
@ -59,7 +59,7 @@ describe('compiler: v-for', () => {
test('value', () => { test('value', () => {
const { node: forNode } = parseWithForTransform( const { node: forNode } = parseWithForTransform(
'<span v-for="(item) in items" />' '<span v-for="(item) in items" />',
) )
expect(forNode.keyAlias).toBeUndefined() expect(forNode.keyAlias).toBeUndefined()
expect(forNode.objectIndexAlias).toBeUndefined() expect(forNode.objectIndexAlias).toBeUndefined()
@ -69,31 +69,31 @@ describe('compiler: v-for', () => {
test('object de-structured value', () => { test('object de-structured value', () => {
const { node: forNode } = parseWithForTransform( const { node: forNode } = parseWithForTransform(
'<span v-for="({ id, value }) in items" />' '<span v-for="({ id, value }) in items" />',
) )
expect(forNode.keyAlias).toBeUndefined() expect(forNode.keyAlias).toBeUndefined()
expect(forNode.objectIndexAlias).toBeUndefined() expect(forNode.objectIndexAlias).toBeUndefined()
expect((forNode.valueAlias as SimpleExpressionNode).content).toBe( expect((forNode.valueAlias as SimpleExpressionNode).content).toBe(
'{ id, value }' '{ id, value }',
) )
expect((forNode.source as SimpleExpressionNode).content).toBe('items') expect((forNode.source as SimpleExpressionNode).content).toBe('items')
}) })
test('array de-structured value', () => { test('array de-structured value', () => {
const { node: forNode } = parseWithForTransform( const { node: forNode } = parseWithForTransform(
'<span v-for="([ id, value ]) in items" />' '<span v-for="([ id, value ]) in items" />',
) )
expect(forNode.keyAlias).toBeUndefined() expect(forNode.keyAlias).toBeUndefined()
expect(forNode.objectIndexAlias).toBeUndefined() expect(forNode.objectIndexAlias).toBeUndefined()
expect((forNode.valueAlias as SimpleExpressionNode).content).toBe( expect((forNode.valueAlias as SimpleExpressionNode).content).toBe(
'[ id, value ]' '[ id, value ]',
) )
expect((forNode.source as SimpleExpressionNode).content).toBe('items') expect((forNode.source as SimpleExpressionNode).content).toBe('items')
}) })
test('value and key', () => { test('value and key', () => {
const { node: forNode } = parseWithForTransform( const { node: forNode } = parseWithForTransform(
'<span v-for="(item, key) in items" />' '<span v-for="(item, key) in items" />',
) )
expect(forNode.keyAlias).not.toBeUndefined() expect(forNode.keyAlias).not.toBeUndefined()
expect((forNode.keyAlias as SimpleExpressionNode).content).toBe('key') expect((forNode.keyAlias as SimpleExpressionNode).content).toBe('key')
@ -104,13 +104,13 @@ describe('compiler: v-for', () => {
test('value, key and index', () => { test('value, key and index', () => {
const { node: forNode } = parseWithForTransform( const { node: forNode } = parseWithForTransform(
'<span v-for="(value, key, index) in items" />' '<span v-for="(value, key, index) in items" />',
) )
expect(forNode.keyAlias).not.toBeUndefined() expect(forNode.keyAlias).not.toBeUndefined()
expect((forNode.keyAlias as SimpleExpressionNode).content).toBe('key') expect((forNode.keyAlias as SimpleExpressionNode).content).toBe('key')
expect(forNode.objectIndexAlias).not.toBeUndefined() expect(forNode.objectIndexAlias).not.toBeUndefined()
expect((forNode.objectIndexAlias as SimpleExpressionNode).content).toBe( expect((forNode.objectIndexAlias as SimpleExpressionNode).content).toBe(
'index' 'index',
) )
expect((forNode.valueAlias as SimpleExpressionNode).content).toBe('value') expect((forNode.valueAlias as SimpleExpressionNode).content).toBe('value')
expect((forNode.source as SimpleExpressionNode).content).toBe('items') expect((forNode.source as SimpleExpressionNode).content).toBe('items')
@ -118,12 +118,12 @@ describe('compiler: v-for', () => {
test('skipped key', () => { test('skipped key', () => {
const { node: forNode } = parseWithForTransform( const { node: forNode } = parseWithForTransform(
'<span v-for="(value,,index) in items" />' '<span v-for="(value,,index) in items" />',
) )
expect(forNode.keyAlias).toBeUndefined() expect(forNode.keyAlias).toBeUndefined()
expect(forNode.objectIndexAlias).not.toBeUndefined() expect(forNode.objectIndexAlias).not.toBeUndefined()
expect((forNode.objectIndexAlias as SimpleExpressionNode).content).toBe( expect((forNode.objectIndexAlias as SimpleExpressionNode).content).toBe(
'index' 'index',
) )
expect((forNode.valueAlias as SimpleExpressionNode).content).toBe('value') expect((forNode.valueAlias as SimpleExpressionNode).content).toBe('value')
expect((forNode.source as SimpleExpressionNode).content).toBe('items') expect((forNode.source as SimpleExpressionNode).content).toBe('items')
@ -131,12 +131,12 @@ describe('compiler: v-for', () => {
test('skipped value and key', () => { test('skipped value and key', () => {
const { node: forNode } = parseWithForTransform( const { node: forNode } = parseWithForTransform(
'<span v-for="(,,index) in items" />' '<span v-for="(,,index) in items" />',
) )
expect(forNode.keyAlias).toBeUndefined() expect(forNode.keyAlias).toBeUndefined()
expect(forNode.objectIndexAlias).not.toBeUndefined() expect(forNode.objectIndexAlias).not.toBeUndefined()
expect((forNode.objectIndexAlias as SimpleExpressionNode).content).toBe( expect((forNode.objectIndexAlias as SimpleExpressionNode).content).toBe(
'index' 'index',
) )
expect(forNode.valueAlias).toBeUndefined() expect(forNode.valueAlias).toBeUndefined()
expect((forNode.source as SimpleExpressionNode).content).toBe('items') expect((forNode.source as SimpleExpressionNode).content).toBe('items')
@ -144,7 +144,7 @@ describe('compiler: v-for', () => {
test('unbracketed value', () => { test('unbracketed value', () => {
const { node: forNode } = parseWithForTransform( const { node: forNode } = parseWithForTransform(
'<span v-for="item in items" />' '<span v-for="item in items" />',
) )
expect(forNode.keyAlias).toBeUndefined() expect(forNode.keyAlias).toBeUndefined()
expect(forNode.objectIndexAlias).toBeUndefined() expect(forNode.objectIndexAlias).toBeUndefined()
@ -154,7 +154,7 @@ describe('compiler: v-for', () => {
test('unbracketed value and key', () => { test('unbracketed value and key', () => {
const { node: forNode } = parseWithForTransform( const { node: forNode } = parseWithForTransform(
'<span v-for="item, key in items" />' '<span v-for="item, key in items" />',
) )
expect(forNode.keyAlias).not.toBeUndefined() expect(forNode.keyAlias).not.toBeUndefined()
expect((forNode.keyAlias as SimpleExpressionNode).content).toBe('key') expect((forNode.keyAlias as SimpleExpressionNode).content).toBe('key')
@ -165,13 +165,13 @@ describe('compiler: v-for', () => {
test('unbracketed value, key and index', () => { test('unbracketed value, key and index', () => {
const { node: forNode } = parseWithForTransform( const { node: forNode } = parseWithForTransform(
'<span v-for="value, key, index in items" />' '<span v-for="value, key, index in items" />',
) )
expect(forNode.keyAlias).not.toBeUndefined() expect(forNode.keyAlias).not.toBeUndefined()
expect((forNode.keyAlias as SimpleExpressionNode).content).toBe('key') expect((forNode.keyAlias as SimpleExpressionNode).content).toBe('key')
expect(forNode.objectIndexAlias).not.toBeUndefined() expect(forNode.objectIndexAlias).not.toBeUndefined()
expect((forNode.objectIndexAlias as SimpleExpressionNode).content).toBe( expect((forNode.objectIndexAlias as SimpleExpressionNode).content).toBe(
'index' 'index',
) )
expect((forNode.valueAlias as SimpleExpressionNode).content).toBe('value') expect((forNode.valueAlias as SimpleExpressionNode).content).toBe('value')
expect((forNode.source as SimpleExpressionNode).content).toBe('items') expect((forNode.source as SimpleExpressionNode).content).toBe('items')
@ -179,12 +179,12 @@ describe('compiler: v-for', () => {
test('unbracketed skipped key', () => { test('unbracketed skipped key', () => {
const { node: forNode } = parseWithForTransform( const { node: forNode } = parseWithForTransform(
'<span v-for="value, , index in items" />' '<span v-for="value, , index in items" />',
) )
expect(forNode.keyAlias).toBeUndefined() expect(forNode.keyAlias).toBeUndefined()
expect(forNode.objectIndexAlias).not.toBeUndefined() expect(forNode.objectIndexAlias).not.toBeUndefined()
expect((forNode.objectIndexAlias as SimpleExpressionNode).content).toBe( expect((forNode.objectIndexAlias as SimpleExpressionNode).content).toBe(
'index' 'index',
) )
expect((forNode.valueAlias as SimpleExpressionNode).content).toBe('value') expect((forNode.valueAlias as SimpleExpressionNode).content).toBe('value')
expect((forNode.source as SimpleExpressionNode).content).toBe('items') expect((forNode.source as SimpleExpressionNode).content).toBe('items')
@ -192,12 +192,12 @@ describe('compiler: v-for', () => {
test('unbracketed skipped value and key', () => { test('unbracketed skipped value and key', () => {
const { node: forNode } = parseWithForTransform( const { node: forNode } = parseWithForTransform(
'<span v-for=", , index in items" />' '<span v-for=", , index in items" />',
) )
expect(forNode.keyAlias).toBeUndefined() expect(forNode.keyAlias).toBeUndefined()
expect(forNode.objectIndexAlias).not.toBeUndefined() expect(forNode.objectIndexAlias).not.toBeUndefined()
expect((forNode.objectIndexAlias as SimpleExpressionNode).content).toBe( expect((forNode.objectIndexAlias as SimpleExpressionNode).content).toBe(
'index' 'index',
) )
expect(forNode.valueAlias).toBeUndefined() expect(forNode.valueAlias).toBeUndefined()
expect((forNode.source as SimpleExpressionNode).content).toBe('items') expect((forNode.source as SimpleExpressionNode).content).toBe('items')
@ -212,8 +212,8 @@ describe('compiler: v-for', () => {
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: ErrorCodes.X_V_FOR_NO_EXPRESSION code: ErrorCodes.X_V_FOR_NO_EXPRESSION,
}) }),
) )
}) })
@ -224,8 +224,8 @@ describe('compiler: v-for', () => {
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION code: ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION,
}) }),
) )
}) })
@ -236,8 +236,8 @@ describe('compiler: v-for', () => {
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION code: ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION,
}) }),
) )
}) })
@ -248,8 +248,8 @@ describe('compiler: v-for', () => {
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION code: ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION,
}) }),
) )
}) })
@ -260,8 +260,8 @@ describe('compiler: v-for', () => {
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION code: ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION,
}) }),
) )
}) })
@ -272,14 +272,14 @@ describe('compiler: v-for', () => {
<template v-for="item in items"> <template v-for="item in items">
<div :key="item.id"/> <div :key="item.id"/>
</template>`, </template>`,
{ onError } { onError },
) )
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: ErrorCodes.X_V_FOR_TEMPLATE_KEY_PLACEMENT code: ErrorCodes.X_V_FOR_TEMPLATE_KEY_PLACEMENT,
}) }),
) )
// should not warn on nested v-for keys // should not warn on nested v-for keys
@ -288,7 +288,7 @@ describe('compiler: v-for', () => {
<template v-for="item in items"> <template v-for="item in items">
<div v-for="c in item.children" :key="c.id"/> <div v-for="c in item.children" :key="c.id"/>
</template>`, </template>`,
{ onError } { onError },
) )
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
}) })
@ -315,7 +315,7 @@ describe('compiler: v-for', () => {
expect(forNode.source.loc.start.column).toBe(itemsOffset + 1) expect(forNode.source.loc.start.column).toBe(itemsOffset + 1)
expect(forNode.source.loc.end.line).toBe(1) expect(forNode.source.loc.end.line).toBe(1)
expect(forNode.source.loc.end.column).toBe( expect(forNode.source.loc.end.column).toBe(
itemsOffset + 1 + `items`.length itemsOffset + 1 + `items`.length,
) )
}) })
@ -339,7 +339,7 @@ describe('compiler: v-for', () => {
expect(forNode.source.loc.start.column).toBe(itemsOffset + 1) expect(forNode.source.loc.start.column).toBe(itemsOffset + 1)
expect(forNode.source.loc.end.line).toBe(1) expect(forNode.source.loc.end.line).toBe(1)
expect(forNode.source.loc.end.column).toBe( expect(forNode.source.loc.end.column).toBe(
itemsOffset + 1 + `items`.length itemsOffset + 1 + `items`.length,
) )
}) })
@ -363,7 +363,7 @@ describe('compiler: v-for', () => {
expect(forNode.source.loc.start.column).toBe(itemsOffset + 1) expect(forNode.source.loc.start.column).toBe(itemsOffset + 1)
expect(forNode.source.loc.end.line).toBe(1) expect(forNode.source.loc.end.line).toBe(1)
expect(forNode.source.loc.end.column).toBe( expect(forNode.source.loc.end.column).toBe(
itemsOffset + 1 + `items`.length itemsOffset + 1 + `items`.length,
) )
}) })
@ -405,7 +405,7 @@ describe('compiler: v-for', () => {
expect(forNode.source.loc.start.column).toBe(itemsOffset + 1) expect(forNode.source.loc.start.column).toBe(itemsOffset + 1)
expect(forNode.source.loc.end.line).toBe(1) expect(forNode.source.loc.end.line).toBe(1)
expect(forNode.source.loc.end.column).toBe( expect(forNode.source.loc.end.column).toBe(
itemsOffset + 1 + `items`.length itemsOffset + 1 + `items`.length,
) )
}) })
@ -438,7 +438,7 @@ describe('compiler: v-for', () => {
expect(forNode.source.loc.start.column).toBe(itemsOffset + 1) expect(forNode.source.loc.start.column).toBe(itemsOffset + 1)
expect(forNode.source.loc.end.line).toBe(1) expect(forNode.source.loc.end.line).toBe(1)
expect(forNode.source.loc.end.column).toBe( expect(forNode.source.loc.end.column).toBe(
itemsOffset + 1 + `items`.length itemsOffset + 1 + `items`.length,
) )
}) })
}) })
@ -446,18 +446,18 @@ describe('compiler: v-for', () => {
describe('prefixIdentifiers: true', () => { describe('prefixIdentifiers: true', () => {
test('should prefix v-for source', () => { test('should prefix v-for source', () => {
const { node } = parseWithForTransform(`<div v-for="i in list"/>`, { const { node } = parseWithForTransform(`<div v-for="i in list"/>`, {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect(node.source).toMatchObject({ expect(node.source).toMatchObject({
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_ctx.list` content: `_ctx.list`,
}) })
}) })
test('should prefix v-for source w/ complex expression', () => { test('should prefix v-for source w/ complex expression', () => {
const { node } = parseWithForTransform( const { node } = parseWithForTransform(
`<div v-for="i in list.concat([foo])"/>`, `<div v-for="i in list.concat([foo])"/>`,
{ prefixIdentifiers: true } { prefixIdentifiers: true },
) )
expect(node.source).toMatchObject({ expect(node.source).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
@ -467,31 +467,31 @@ describe('compiler: v-for', () => {
{ content: `concat` }, { content: `concat` },
`([`, `([`,
{ content: `_ctx.foo` }, { content: `_ctx.foo` },
`])` `])`,
] ],
}) })
}) })
test('should not prefix v-for alias', () => { test('should not prefix v-for alias', () => {
const { node } = parseWithForTransform( const { node } = parseWithForTransform(
`<div v-for="i in list">{{ i }}{{ j }}</div>`, `<div v-for="i in list">{{ i }}{{ j }}</div>`,
{ prefixIdentifiers: true } { prefixIdentifiers: true },
) )
const div = node.children[0] as ElementNode const div = node.children[0] as ElementNode
expect((div.children[0] as InterpolationNode).content).toMatchObject({ expect((div.children[0] as InterpolationNode).content).toMatchObject({
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `i` content: `i`,
}) })
expect((div.children[1] as InterpolationNode).content).toMatchObject({ expect((div.children[1] as InterpolationNode).content).toMatchObject({
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_ctx.j` content: `_ctx.j`,
}) })
}) })
test('should not prefix v-for aliases (multiple)', () => { test('should not prefix v-for aliases (multiple)', () => {
const { node } = parseWithForTransform( const { node } = parseWithForTransform(
`<div v-for="(i, j, k) in list">{{ i + j + k }}{{ l }}</div>`, `<div v-for="(i, j, k) in list">{{ i + j + k }}{{ l }}</div>`,
{ prefixIdentifiers: true } { prefixIdentifiers: true },
) )
const div = node.children[0] as ElementNode const div = node.children[0] as ElementNode
expect((div.children[0] as InterpolationNode).content).toMatchObject({ expect((div.children[0] as InterpolationNode).content).toMatchObject({
@ -501,23 +501,23 @@ describe('compiler: v-for', () => {
` + `, ` + `,
{ content: `j` }, { content: `j` },
` + `, ` + `,
{ content: `k` } { content: `k` },
] ],
}) })
expect((div.children[1] as InterpolationNode).content).toMatchObject({ expect((div.children[1] as InterpolationNode).content).toMatchObject({
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_ctx.l` content: `_ctx.l`,
}) })
}) })
test('should prefix id outside of v-for', () => { test('should prefix id outside of v-for', () => {
const { node } = parseWithForTransform( const { node } = parseWithForTransform(
`<div><div v-for="i in list" />{{ i }}</div>`, `<div><div v-for="i in list" />{{ i }}</div>`,
{ prefixIdentifiers: true } { prefixIdentifiers: true },
) )
expect((node.children[1] as InterpolationNode).content).toMatchObject({ expect((node.children[1] as InterpolationNode).content).toMatchObject({
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_ctx.i` content: `_ctx.i`,
}) })
}) })
@ -526,7 +526,7 @@ describe('compiler: v-for', () => {
`<div v-for="i in list"> `<div v-for="i in list">
<div v-for="i in list">{{ i + j }}</div>{{ i }} <div v-for="i in list">{{ i + j }}</div>{{ i }}
</div>`, </div>`,
{ prefixIdentifiers: true } { prefixIdentifiers: true },
) )
const outerDiv = node.children[0] as ElementNode const outerDiv = node.children[0] as ElementNode
const innerFor = outerDiv.children[0] as ForNode const innerFor = outerDiv.children[0] as ForNode
@ -534,7 +534,7 @@ describe('compiler: v-for', () => {
.children[0] as InterpolationNode .children[0] as InterpolationNode
expect(innerExp.content).toMatchObject({ expect(innerExp.content).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
children: [{ content: 'i' }, ` + `, { content: `_ctx.j` }] children: [{ content: 'i' }, ` + `, { content: `_ctx.j` }],
}) })
// when an inner v-for shadows a variable of an outer v-for and exit, // when an inner v-for shadows a variable of an outer v-for and exit,
@ -542,7 +542,7 @@ describe('compiler: v-for', () => {
const outerExp = outerDiv.children[1] as InterpolationNode const outerExp = outerDiv.children[1] as InterpolationNode
expect(outerExp.content).toMatchObject({ expect(outerExp.content).toMatchObject({
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `i` content: `i`,
}) })
}) })
@ -551,7 +551,7 @@ describe('compiler: v-for', () => {
`<div v-for="({ foo = bar, baz: [qux = quux] }) in list"> `<div v-for="({ foo = bar, baz: [qux = quux] }) in list">
{{ foo + bar + baz + qux + quux }} {{ foo + bar + baz + qux + quux }}
</div>`, </div>`,
{ prefixIdentifiers: true } { prefixIdentifiers: true },
) )
expect(node.valueAlias!).toMatchObject({ expect(node.valueAlias!).toMatchObject({
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
@ -564,8 +564,8 @@ describe('compiler: v-for', () => {
{ content: `qux` }, { content: `qux` },
` = `, ` = `,
{ content: `_ctx.quux` }, { content: `_ctx.quux` },
`] }` `] }`,
] ],
}) })
const div = node.children[0] as ElementNode const div = node.children[0] as ElementNode
expect((div.children[0] as InterpolationNode).content).toMatchObject({ expect((div.children[0] as InterpolationNode).content).toMatchObject({
@ -579,17 +579,17 @@ describe('compiler: v-for', () => {
` + `, ` + `,
{ content: `qux` }, { content: `qux` },
` + `, ` + `,
{ content: `_ctx.quux` } { content: `_ctx.quux` },
] ],
}) })
}) })
test('element v-for key expression prefixing', () => { test('element v-for key expression prefixing', () => {
const { const {
node: { codegenNode } node: { codegenNode },
} = parseWithForTransform( } = parseWithForTransform(
'<div v-for="item in items" :key="itemKey(item)">test</div>', '<div v-for="item in items" :key="itemKey(item)">test</div>',
{ prefixIdentifiers: true } { prefixIdentifiers: true },
) )
const innerBlock = codegenNode.children.arguments[1].returns const innerBlock = codegenNode.children.arguments[1].returns
expect(innerBlock).toMatchObject({ expect(innerBlock).toMatchObject({
@ -604,20 +604,20 @@ describe('compiler: v-for', () => {
`(`, `(`,
// should NOT prefix in scope variables // should NOT prefix in scope variables
{ content: `item` }, { content: `item` },
`)` `)`,
] ],
} },
}) }),
}) })
}) })
// #2085 // #2085
test('template v-for key expression prefixing', () => { test('template v-for key expression prefixing', () => {
const { const {
node: { codegenNode } node: { codegenNode },
} = parseWithForTransform( } = parseWithForTransform(
'<template v-for="item in items" :key="itemKey(item)">test</template>', '<template v-for="item in items" :key="itemKey(item)">test</template>',
{ prefixIdentifiers: true } { prefixIdentifiers: true },
) )
const innerBlock = codegenNode.children.arguments[1].returns const innerBlock = codegenNode.children.arguments[1].returns
expect(innerBlock).toMatchObject({ expect(innerBlock).toMatchObject({
@ -632,19 +632,19 @@ describe('compiler: v-for', () => {
`(`, `(`,
// should NOT prefix in scope variables // should NOT prefix in scope variables
{ content: `item` }, { content: `item` },
`)` `)`,
] ],
} },
}) }),
}) })
}) })
test('template v-for key no prefixing on attribute key', () => { test('template v-for key no prefixing on attribute key', () => {
const { const {
node: { codegenNode } node: { codegenNode },
} = parseWithForTransform( } = parseWithForTransform(
'<template v-for="item in items" key="key">test</template>', '<template v-for="item in items" key="key">test</template>',
{ prefixIdentifiers: true } { prefixIdentifiers: true },
) )
const innerBlock = codegenNode.children.arguments[1].returns const innerBlock = codegenNode.children.arguments[1].returns
expect(innerBlock).toMatchObject({ expect(innerBlock).toMatchObject({
@ -653,9 +653,9 @@ describe('compiler: v-for', () => {
props: createObjectMatcher({ props: createObjectMatcher({
key: { key: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: 'key' content: 'key',
} },
}) }),
}) })
}) })
}) })
@ -665,7 +665,7 @@ describe('compiler: v-for', () => {
node: ForCodegenNode, node: ForCodegenNode,
keyed: boolean = false, keyed: boolean = false,
customReturn: boolean = false, customReturn: boolean = false,
disableTracking: boolean = true disableTracking: boolean = true,
) { ) {
expect(node).toMatchObject({ expect(node).toMatchObject({
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
@ -687,32 +687,34 @@ describe('compiler: v-for', () => {
? {} ? {}
: { : {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
isBlock: disableTracking isBlock: disableTracking,
} },
} },
] ],
} },
}) })
const renderListArgs = node.children.arguments const renderListArgs = node.children.arguments
return { return {
source: renderListArgs[0] as SimpleExpressionNode, source: renderListArgs[0] as SimpleExpressionNode,
params: (renderListArgs[1] as any).params, params: (renderListArgs[1] as any).params,
returns: (renderListArgs[1] as any).returns, returns: (renderListArgs[1] as any).returns,
innerVNodeCall: customReturn ? null : (renderListArgs[1] as any).returns innerVNodeCall: customReturn
? null
: (renderListArgs[1] as any).returns,
} }
} }
test('basic v-for', () => { test('basic v-for', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithForTransform('<span v-for="(item) in items" />') } = parseWithForTransform('<span v-for="(item) in items" />')
expect(assertSharedCodegen(codegenNode)).toMatchObject({ expect(assertSharedCodegen(codegenNode)).toMatchObject({
source: { content: `items` }, source: { content: `items` },
params: [{ content: `item` }], params: [{ content: `item` }],
innerVNodeCall: { innerVNodeCall: {
tag: `"span"` tag: `"span"`,
} },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -720,11 +722,11 @@ describe('compiler: v-for', () => {
test('value + key + index', () => { test('value + key + index', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithForTransform('<span v-for="(item, key, index) in items" />') } = parseWithForTransform('<span v-for="(item, key, index) in items" />')
expect(assertSharedCodegen(codegenNode)).toMatchObject({ expect(assertSharedCodegen(codegenNode)).toMatchObject({
source: { content: `items` }, source: { content: `items` },
params: [{ content: `item` }, { content: `key` }, { content: `index` }] params: [{ content: `item` }, { content: `key` }, { content: `index` }],
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -732,11 +734,11 @@ describe('compiler: v-for', () => {
test('skipped value', () => { test('skipped value', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithForTransform('<span v-for="(, key, index) in items" />') } = parseWithForTransform('<span v-for="(, key, index) in items" />')
expect(assertSharedCodegen(codegenNode)).toMatchObject({ expect(assertSharedCodegen(codegenNode)).toMatchObject({
source: { content: `items` }, source: { content: `items` },
params: [{ content: `_` }, { content: `key` }, { content: `index` }] params: [{ content: `_` }, { content: `key` }, { content: `index` }],
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -744,11 +746,11 @@ describe('compiler: v-for', () => {
test('skipped key', () => { test('skipped key', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithForTransform('<span v-for="(item,,index) in items" />') } = parseWithForTransform('<span v-for="(item,,index) in items" />')
expect(assertSharedCodegen(codegenNode)).toMatchObject({ expect(assertSharedCodegen(codegenNode)).toMatchObject({
source: { content: `items` }, source: { content: `items` },
params: [{ content: `item` }, { content: `__` }, { content: `index` }] params: [{ content: `item` }, { content: `__` }, { content: `index` }],
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -756,11 +758,11 @@ describe('compiler: v-for', () => {
test('skipped value & key', () => { test('skipped value & key', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithForTransform('<span v-for="(,,index) in items" />') } = parseWithForTransform('<span v-for="(,,index) in items" />')
expect(assertSharedCodegen(codegenNode)).toMatchObject({ expect(assertSharedCodegen(codegenNode)).toMatchObject({
source: { content: `items` }, source: { content: `items` },
params: [{ content: `_` }, { content: `__` }, { content: `index` }] params: [{ content: `_` }, { content: `__` }, { content: `index` }],
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -768,9 +770,9 @@ describe('compiler: v-for', () => {
test('v-for with constant expression', () => { test('v-for with constant expression', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithForTransform('<p v-for="item in 10">{{item}}</p>', { } = parseWithForTransform('<p v-for="item in 10">{{item}}</p>', {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect( expect(
@ -778,8 +780,8 @@ describe('compiler: v-for', () => {
codegenNode, codegenNode,
false /* keyed */, false /* keyed */,
false /* customReturn */, false /* customReturn */,
false /* disableTracking */ false /* disableTracking */,
) ),
).toMatchObject({ ).toMatchObject({
source: { content: `10`, constType: ConstantTypes.CAN_STRINGIFY }, source: { content: `10`, constType: ConstantTypes.CAN_STRINGIFY },
params: [{ content: `item` }], params: [{ content: `item` }],
@ -793,11 +795,11 @@ describe('compiler: v-for', () => {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: 'item', content: 'item',
isStatic: false, isStatic: false,
constType: ConstantTypes.NOT_CONSTANT constType: ConstantTypes.NOT_CONSTANT,
} },
},
patchFlag: genFlagText(PatchFlags.TEXT),
}, },
patchFlag: genFlagText(PatchFlags.TEXT)
}
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -805,9 +807,9 @@ describe('compiler: v-for', () => {
test('template v-for', () => { test('template v-for', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithForTransform( } = parseWithForTransform(
'<template v-for="item in items">hello<span/></template>' '<template v-for="item in items">hello<span/></template>',
) )
expect(assertSharedCodegen(codegenNode)).toMatchObject({ expect(assertSharedCodegen(codegenNode)).toMatchObject({
source: { content: `items` }, source: { content: `items` },
@ -818,10 +820,10 @@ describe('compiler: v-for', () => {
isBlock: true, isBlock: true,
children: [ children: [
{ type: NodeTypes.TEXT, content: `hello` }, { type: NodeTypes.TEXT, content: `hello` },
{ type: NodeTypes.ELEMENT, tag: `span` } { type: NodeTypes.ELEMENT, tag: `span` },
], ],
patchFlag: genFlagText(PatchFlags.STABLE_FRAGMENT) patchFlag: genFlagText(PatchFlags.STABLE_FRAGMENT),
} },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -829,19 +831,19 @@ describe('compiler: v-for', () => {
test('template v-for w/ <slot/>', () => { test('template v-for w/ <slot/>', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithForTransform( } = parseWithForTransform(
'<template v-for="item in items"><slot/></template>' '<template v-for="item in items"><slot/></template>',
) )
expect( expect(
assertSharedCodegen(codegenNode, false, true /* custom return */) assertSharedCodegen(codegenNode, false, true /* custom return */),
).toMatchObject({ ).toMatchObject({
source: { content: `items` }, source: { content: `items` },
params: [{ content: `item` }], params: [{ content: `item` }],
returns: { returns: {
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
callee: RENDER_SLOT callee: RENDER_SLOT,
} },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -850,9 +852,9 @@ describe('compiler: v-for', () => {
test('template v-for key injection with single child', () => { test('template v-for key injection with single child', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithForTransform( } = parseWithForTransform(
'<template v-for="item in items" :key="item.id"><span :id="item.id" /></template>' '<template v-for="item in items" :key="item.id"><span :id="item.id" /></template>',
) )
expect(assertSharedCodegen(codegenNode, true)).toMatchObject({ expect(assertSharedCodegen(codegenNode, true)).toMatchObject({
source: { content: `items` }, source: { content: `items` },
@ -862,9 +864,9 @@ describe('compiler: v-for', () => {
tag: `"span"`, tag: `"span"`,
props: createObjectMatcher({ props: createObjectMatcher({
key: '[item.id]', key: '[item.id]',
id: '[item.id]' id: '[item.id]',
}) }),
} },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -872,17 +874,17 @@ describe('compiler: v-for', () => {
test('v-for on <slot/>', () => { test('v-for on <slot/>', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithForTransform('<slot v-for="item in items"></slot>') } = parseWithForTransform('<slot v-for="item in items"></slot>')
expect( expect(
assertSharedCodegen(codegenNode, false, true /* custom return */) assertSharedCodegen(codegenNode, false, true /* custom return */),
).toMatchObject({ ).toMatchObject({
source: { content: `items` }, source: { content: `items` },
params: [{ content: `item` }], params: [{ content: `item` }],
returns: { returns: {
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
callee: RENDER_SLOT callee: RENDER_SLOT,
} },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -890,7 +892,7 @@ describe('compiler: v-for', () => {
test('keyed v-for', () => { test('keyed v-for', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithForTransform('<span v-for="(item) in items" :key="item" />') } = parseWithForTransform('<span v-for="(item) in items" :key="item" />')
expect(assertSharedCodegen(codegenNode, true)).toMatchObject({ expect(assertSharedCodegen(codegenNode, true)).toMatchObject({
source: { content: `items` }, source: { content: `items` },
@ -898,9 +900,9 @@ describe('compiler: v-for', () => {
innerVNodeCall: { innerVNodeCall: {
tag: `"span"`, tag: `"span"`,
props: createObjectMatcher({ props: createObjectMatcher({
key: `[item]` key: `[item]`,
}) }),
} },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -908,9 +910,9 @@ describe('compiler: v-for', () => {
test('keyed template v-for', () => { test('keyed template v-for', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithForTransform( } = parseWithForTransform(
'<template v-for="item in items" :key="item">hello<span/></template>' '<template v-for="item in items" :key="item">hello<span/></template>',
) )
expect(assertSharedCodegen(codegenNode, true)).toMatchObject({ expect(assertSharedCodegen(codegenNode, true)).toMatchObject({
source: { content: `items` }, source: { content: `items` },
@ -918,14 +920,14 @@ describe('compiler: v-for', () => {
innerVNodeCall: { innerVNodeCall: {
tag: FRAGMENT, tag: FRAGMENT,
props: createObjectMatcher({ props: createObjectMatcher({
key: `[item]` key: `[item]`,
}), }),
children: [ children: [
{ type: NodeTypes.TEXT, content: `hello` }, { type: NodeTypes.TEXT, content: `hello` },
{ type: NodeTypes.ELEMENT, tag: `span` } { type: NodeTypes.ELEMENT, tag: `span` },
], ],
patchFlag: genFlagText(PatchFlags.STABLE_FRAGMENT) patchFlag: genFlagText(PatchFlags.STABLE_FRAGMENT),
} },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -933,7 +935,7 @@ describe('compiler: v-for', () => {
test('v-if + v-for', () => { test('v-if + v-for', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithForTransform(`<div v-if="ok" v-for="i in list"/>`) } = parseWithForTransform(`<div v-if="ok" v-for="i in list"/>`)
expect(codegenNode).toMatchObject({ expect(codegenNode).toMatchObject({
type: NodeTypes.JS_CONDITIONAL_EXPRESSION, type: NodeTypes.JS_CONDITIONAL_EXPRESSION,
@ -941,7 +943,7 @@ describe('compiler: v-for', () => {
consequent: { consequent: {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
props: createObjectMatcher({ props: createObjectMatcher({
key: `[0]` key: `[0]`,
}), }),
isBlock: true, isBlock: true,
disableTracking: true, disableTracking: true,
@ -957,12 +959,12 @@ describe('compiler: v-for', () => {
returns: { returns: {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `"div"`, tag: `"div"`,
isBlock: true isBlock: true,
} },
} },
] ],
} },
} },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -971,7 +973,7 @@ describe('compiler: v-for', () => {
test('v-if + v-for on <template>', () => { test('v-if + v-for on <template>', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithForTransform(`<template v-if="ok" v-for="i in list"/>`) } = parseWithForTransform(`<template v-if="ok" v-for="i in list"/>`)
expect(codegenNode).toMatchObject({ expect(codegenNode).toMatchObject({
type: NodeTypes.JS_CONDITIONAL_EXPRESSION, type: NodeTypes.JS_CONDITIONAL_EXPRESSION,
@ -979,7 +981,7 @@ describe('compiler: v-for', () => {
consequent: { consequent: {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
props: createObjectMatcher({ props: createObjectMatcher({
key: `[0]` key: `[0]`,
}), }),
isBlock: true, isBlock: true,
disableTracking: true, disableTracking: true,
@ -995,12 +997,12 @@ describe('compiler: v-for', () => {
returns: { returns: {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: FRAGMENT, tag: FRAGMENT,
isBlock: true isBlock: true,
} },
} },
] ],
} },
} },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -1008,12 +1010,12 @@ describe('compiler: v-for', () => {
test('v-for on element with custom directive', () => { test('v-for on element with custom directive', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithForTransform('<div v-for="i in list" v-foo/>') } = parseWithForTransform('<div v-for="i in list" v-foo/>')
const { returns } = assertSharedCodegen(codegenNode, false, true) const { returns } = assertSharedCodegen(codegenNode, false, true)
expect(returns).toMatchObject({ expect(returns).toMatchObject({
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
directives: { type: NodeTypes.JS_ARRAY_EXPRESSION } directives: { type: NodeTypes.JS_ARRAY_EXPRESSION },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })

View File

@ -1,29 +1,29 @@
import { baseParse as parse } from '../../src/parse' import { baseParse as parse } from '../../src/parser'
import { transform } from '../../src/transform' import { transform } from '../../src/transform'
import { transformIf } from '../../src/transforms/vIf' import { transformIf } from '../../src/transforms/vIf'
import { transformElement } from '../../src/transforms/transformElement' import { transformElement } from '../../src/transforms/transformElement'
import { transformSlotOutlet } from '../../src/transforms/transformSlotOutlet' import { transformSlotOutlet } from '../../src/transforms/transformSlotOutlet'
import { import {
CommentNode, type CommentNode,
ConditionalExpression, type ConditionalExpression,
ElementNode, type ElementNode,
ElementTypes, ElementTypes,
IfBranchNode, type IfBranchNode,
IfConditionalExpression, type IfConditionalExpression,
IfNode, type IfNode,
NodeTypes, NodeTypes,
SimpleExpressionNode, type SimpleExpressionNode,
TextNode, type TextNode,
VNodeCall type VNodeCall,
} from '../../src/ast' } from '../../src/ast'
import { ErrorCodes } from '../../src/errors' import { ErrorCodes } from '../../src/errors'
import { CompilerOptions, generate, TO_HANDLERS } from '../../src' import { type CompilerOptions, TO_HANDLERS, generate } from '../../src'
import { import {
CREATE_COMMENT, CREATE_COMMENT,
FRAGMENT, FRAGMENT,
MERGE_PROPS, MERGE_PROPS,
NORMALIZE_PROPS, NORMALIZE_PROPS,
RENDER_SLOT RENDER_SLOT,
} from '../../src/runtimeHelpers' } from '../../src/runtimeHelpers'
import { createObjectMatcher } from '../testUtils' import { createObjectMatcher } from '../testUtils'
@ -31,12 +31,12 @@ function parseWithIfTransform(
template: string, template: string,
options: CompilerOptions = {}, options: CompilerOptions = {},
returnIndex: number = 0, returnIndex: number = 0,
childrenLen: number = 1 childrenLen: number = 1,
) { ) {
const ast = parse(template, options) const ast = parse(template, options)
transform(ast, { transform(ast, {
nodeTransforms: [transformIf, transformSlotOutlet, transformElement], nodeTransforms: [transformIf, transformSlotOutlet, transformElement],
...options ...options,
}) })
if (!options.onError) { if (!options.onError) {
expect(ast.children.length).toBe(childrenLen) expect(ast.children.length).toBe(childrenLen)
@ -48,7 +48,7 @@ function parseWithIfTransform(
root: ast, root: ast,
node: ast.children[returnIndex] as IfNode & { node: ast.children[returnIndex] as IfNode & {
codegenNode: IfConditionalExpression codegenNode: IfConditionalExpression
} },
} }
} }
@ -59,7 +59,7 @@ describe('compiler: v-if', () => {
expect(node.type).toBe(NodeTypes.IF) expect(node.type).toBe(NodeTypes.IF)
expect(node.branches.length).toBe(1) expect(node.branches.length).toBe(1)
expect((node.branches[0].condition as SimpleExpressionNode).content).toBe( expect((node.branches[0].condition as SimpleExpressionNode).content).toBe(
`ok` `ok`,
) )
expect(node.branches[0].children.length).toBe(1) expect(node.branches[0].children.length).toBe(1)
expect(node.branches[0].children[0].type).toBe(NodeTypes.ELEMENT) expect(node.branches[0].children[0].type).toBe(NodeTypes.ELEMENT)
@ -68,12 +68,12 @@ describe('compiler: v-if', () => {
test('template v-if', () => { test('template v-if', () => {
const { node } = parseWithIfTransform( const { node } = parseWithIfTransform(
`<template v-if="ok"><div/>hello<p/></template>` `<template v-if="ok"><div/>hello<p/></template>`,
) )
expect(node.type).toBe(NodeTypes.IF) expect(node.type).toBe(NodeTypes.IF)
expect(node.branches.length).toBe(1) expect(node.branches.length).toBe(1)
expect((node.branches[0].condition as SimpleExpressionNode).content).toBe( expect((node.branches[0].condition as SimpleExpressionNode).content).toBe(
`ok` `ok`,
) )
expect(node.branches[0].children.length).toBe(3) expect(node.branches[0].children.length).toBe(3)
expect(node.branches[0].children[0].type).toBe(NodeTypes.ELEMENT) expect(node.branches[0].children[0].type).toBe(NodeTypes.ELEMENT)
@ -89,16 +89,16 @@ describe('compiler: v-if', () => {
expect(node.type).toBe(NodeTypes.IF) expect(node.type).toBe(NodeTypes.IF)
expect(node.branches.length).toBe(1) expect(node.branches.length).toBe(1)
expect((node.branches[0].children[0] as ElementNode).tag).toBe( expect((node.branches[0].children[0] as ElementNode).tag).toBe(
`Component` `Component`,
) )
expect((node.branches[0].children[0] as ElementNode).tagType).toBe( expect((node.branches[0].children[0] as ElementNode).tagType).toBe(
ElementTypes.COMPONENT ElementTypes.COMPONENT,
) )
// #2058 since a component may fail to resolve and fallback to a plain // #2058 since a component may fail to resolve and fallback to a plain
// element, it still needs to be made a block // element, it still needs to be made a block
expect( expect(
((node.branches[0].children[0] as ElementNode)! ((node.branches[0].children[0] as ElementNode)!
.codegenNode as VNodeCall)!.isBlock .codegenNode as VNodeCall)!.isBlock,
).toBe(true) ).toBe(true)
}) })
@ -122,7 +122,7 @@ describe('compiler: v-if', () => {
test('v-if + v-else-if', () => { test('v-if + v-else-if', () => {
const { node } = parseWithIfTransform( const { node } = parseWithIfTransform(
`<div v-if="ok"/><p v-else-if="orNot"/>` `<div v-if="ok"/><p v-else-if="orNot"/>`,
) )
expect(node.type).toBe(NodeTypes.IF) expect(node.type).toBe(NodeTypes.IF)
expect(node.branches.length).toBe(2) expect(node.branches.length).toBe(2)
@ -142,7 +142,7 @@ describe('compiler: v-if', () => {
test('v-if + v-else-if + v-else', () => { test('v-if + v-else-if + v-else', () => {
const { node } = parseWithIfTransform( const { node } = parseWithIfTransform(
`<div v-if="ok"/><p v-else-if="orNot"/><template v-else>fine</template>` `<div v-if="ok"/><p v-else-if="orNot"/><template v-else>fine</template>`,
) )
expect(node.type).toBe(NodeTypes.IF) expect(node.type).toBe(NodeTypes.IF)
expect(node.branches.length).toBe(3) expect(node.branches.length).toBe(3)
@ -202,11 +202,11 @@ describe('compiler: v-if', () => {
test('should prefix v-if condition', () => { test('should prefix v-if condition', () => {
const { node } = parseWithIfTransform(`<div v-if="ok"/>`, { const { node } = parseWithIfTransform(`<div v-if="ok"/>`, {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect(node.branches[0].condition).toMatchObject({ expect(node.branches[0].condition).toMatchObject({
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_ctx.ok` content: `_ctx.ok`,
}) })
}) })
}) })
@ -219,32 +219,32 @@ describe('compiler: v-if', () => {
expect(onError.mock.calls[0]).toMatchObject([ expect(onError.mock.calls[0]).toMatchObject([
{ {
code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF, code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF,
loc: node1.loc loc: node1.loc,
} },
]) ])
const { node: node2 } = parseWithIfTransform( const { node: node2 } = parseWithIfTransform(
`<div/><div v-else/>`, `<div/><div v-else/>`,
{ onError }, { onError },
1 1,
) )
expect(onError.mock.calls[1]).toMatchObject([ expect(onError.mock.calls[1]).toMatchObject([
{ {
code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF, code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF,
loc: node2.loc loc: node2.loc,
} },
]) ])
const { node: node3 } = parseWithIfTransform( const { node: node3 } = parseWithIfTransform(
`<div/>foo<div v-else/>`, `<div/>foo<div v-else/>`,
{ onError }, { onError },
2 2,
) )
expect(onError.mock.calls[2]).toMatchObject([ expect(onError.mock.calls[2]).toMatchObject([
{ {
code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF, code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF,
loc: node3.loc loc: node3.loc,
} },
]) ])
}) })
@ -252,52 +252,52 @@ describe('compiler: v-if', () => {
const onError = vi.fn() const onError = vi.fn()
const { node: node1 } = parseWithIfTransform(`<div v-else-if="foo"/>`, { const { node: node1 } = parseWithIfTransform(`<div v-else-if="foo"/>`, {
onError onError,
}) })
expect(onError.mock.calls[0]).toMatchObject([ expect(onError.mock.calls[0]).toMatchObject([
{ {
code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF, code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF,
loc: node1.loc loc: node1.loc,
} },
]) ])
const { node: node2 } = parseWithIfTransform( const { node: node2 } = parseWithIfTransform(
`<div/><div v-else-if="foo"/>`, `<div/><div v-else-if="foo"/>`,
{ onError }, { onError },
1 1,
) )
expect(onError.mock.calls[1]).toMatchObject([ expect(onError.mock.calls[1]).toMatchObject([
{ {
code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF, code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF,
loc: node2.loc loc: node2.loc,
} },
]) ])
const { node: node3 } = parseWithIfTransform( const { node: node3 } = parseWithIfTransform(
`<div/>foo<div v-else-if="foo"/>`, `<div/>foo<div v-else-if="foo"/>`,
{ onError }, { onError },
2 2,
) )
expect(onError.mock.calls[2]).toMatchObject([ expect(onError.mock.calls[2]).toMatchObject([
{ {
code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF, code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF,
loc: node3.loc loc: node3.loc,
} },
]) ])
const { const {
node: { branches } node: { branches },
} = parseWithIfTransform( } = parseWithIfTransform(
`<div v-if="notOk"/><div v-else/><div v-else-if="ok"/>`, `<div v-if="notOk"/><div v-else/><div v-else-if="ok"/>`,
{ onError }, { onError },
0 0,
) )
expect(onError.mock.calls[3]).toMatchObject([ expect(onError.mock.calls[3]).toMatchObject([
{ {
code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF, code: ErrorCodes.X_V_ELSE_NO_ADJACENT_IF,
loc: branches[branches.length - 1].loc loc: branches[branches.length - 1].loc,
} },
]) ])
}) })
@ -306,21 +306,21 @@ describe('compiler: v-if', () => {
// dynamic // dynamic
parseWithIfTransform( parseWithIfTransform(
`<div v-if="ok" :key="a + 1" /><div v-else :key="a + 1" />`, `<div v-if="ok" :key="a + 1" /><div v-else :key="a + 1" />`,
{ onError } { onError },
) )
expect(onError.mock.calls[0]).toMatchObject([ expect(onError.mock.calls[0]).toMatchObject([
{ {
code: ErrorCodes.X_V_IF_SAME_KEY code: ErrorCodes.X_V_IF_SAME_KEY,
} },
]) ])
// static // static
parseWithIfTransform(`<div v-if="ok" key="1" /><div v-else key="1" />`, { parseWithIfTransform(`<div v-if="ok" key="1" /><div v-else key="1" />`, {
onError onError,
}) })
expect(onError.mock.calls[1]).toMatchObject([ expect(onError.mock.calls[1]).toMatchObject([
{ {
code: ErrorCodes.X_V_IF_SAME_KEY code: ErrorCodes.X_V_IF_SAME_KEY,
} },
]) ])
}) })
}) })
@ -329,63 +329,63 @@ describe('compiler: v-if', () => {
function assertSharedCodegen( function assertSharedCodegen(
node: IfConditionalExpression, node: IfConditionalExpression,
depth: number = 0, depth: number = 0,
hasElse: boolean = false hasElse: boolean = false,
) { ) {
expect(node).toMatchObject({ expect(node).toMatchObject({
type: NodeTypes.JS_CONDITIONAL_EXPRESSION, type: NodeTypes.JS_CONDITIONAL_EXPRESSION,
test: { test: {
content: `ok` content: `ok`,
}, },
consequent: { consequent: {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
isBlock: true isBlock: true,
}, },
alternate: alternate:
depth < 1 depth < 1
? hasElse ? hasElse
? { ? {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
isBlock: true isBlock: true,
} }
: { : {
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
callee: CREATE_COMMENT callee: CREATE_COMMENT,
} }
: { : {
type: NodeTypes.JS_CONDITIONAL_EXPRESSION, type: NodeTypes.JS_CONDITIONAL_EXPRESSION,
test: { test: {
content: `orNot` content: `orNot`,
}, },
consequent: { consequent: {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
isBlock: true isBlock: true,
}, },
alternate: hasElse alternate: hasElse
? { ? {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
isBlock: true isBlock: true,
} }
: { : {
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
callee: CREATE_COMMENT callee: CREATE_COMMENT,
} },
} },
}) })
} }
test('basic v-if', () => { test('basic v-if', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithIfTransform(`<div v-if="ok"/>`) } = parseWithIfTransform(`<div v-if="ok"/>`)
assertSharedCodegen(codegenNode) assertSharedCodegen(codegenNode)
expect(codegenNode.consequent).toMatchObject({ expect(codegenNode.consequent).toMatchObject({
tag: `"div"`, tag: `"div"`,
props: createObjectMatcher({ key: `[0]` }) props: createObjectMatcher({ key: `[0]` }),
}) })
expect(codegenNode.alternate).toMatchObject({ expect(codegenNode.alternate).toMatchObject({
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
callee: CREATE_COMMENT callee: CREATE_COMMENT,
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -393,7 +393,7 @@ describe('compiler: v-if', () => {
test('template v-if', () => { test('template v-if', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithIfTransform(`<template v-if="ok"><div/>hello<p/></template>`) } = parseWithIfTransform(`<template v-if="ok"><div/>hello<p/></template>`)
assertSharedCodegen(codegenNode) assertSharedCodegen(codegenNode)
expect(codegenNode.consequent).toMatchObject({ expect(codegenNode.consequent).toMatchObject({
@ -402,12 +402,12 @@ describe('compiler: v-if', () => {
children: [ children: [
{ type: NodeTypes.ELEMENT, tag: 'div' }, { type: NodeTypes.ELEMENT, tag: 'div' },
{ type: NodeTypes.TEXT, content: `hello` }, { type: NodeTypes.TEXT, content: `hello` },
{ type: NodeTypes.ELEMENT, tag: 'p' } { type: NodeTypes.ELEMENT, tag: 'p' },
] ],
}) })
expect(codegenNode.alternate).toMatchObject({ expect(codegenNode.alternate).toMatchObject({
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
callee: CREATE_COMMENT callee: CREATE_COMMENT,
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -415,12 +415,12 @@ describe('compiler: v-if', () => {
test('template v-if w/ single <slot/> child', () => { test('template v-if w/ single <slot/> child', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithIfTransform(`<template v-if="ok"><slot/></template>`) } = parseWithIfTransform(`<template v-if="ok"><slot/></template>`)
expect(codegenNode.consequent).toMatchObject({ expect(codegenNode.consequent).toMatchObject({
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
callee: RENDER_SLOT, callee: RENDER_SLOT,
arguments: ['$slots', '"default"', createObjectMatcher({ key: `[0]` })] arguments: ['$slots', '"default"', createObjectMatcher({ key: `[0]` })],
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -428,12 +428,12 @@ describe('compiler: v-if', () => {
test('v-if on <slot/>', () => { test('v-if on <slot/>', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithIfTransform(`<slot v-if="ok"></slot>`) } = parseWithIfTransform(`<slot v-if="ok"></slot>`)
expect(codegenNode.consequent).toMatchObject({ expect(codegenNode.consequent).toMatchObject({
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
callee: RENDER_SLOT, callee: RENDER_SLOT,
arguments: ['$slots', '"default"', createObjectMatcher({ key: `[0]` })] arguments: ['$slots', '"default"', createObjectMatcher({ key: `[0]` })],
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -441,16 +441,16 @@ describe('compiler: v-if', () => {
test('v-if + v-else', () => { test('v-if + v-else', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithIfTransform(`<div v-if="ok"/><p v-else/>`) } = parseWithIfTransform(`<div v-if="ok"/><p v-else/>`)
assertSharedCodegen(codegenNode, 0, true) assertSharedCodegen(codegenNode, 0, true)
expect(codegenNode.consequent).toMatchObject({ expect(codegenNode.consequent).toMatchObject({
tag: `"div"`, tag: `"div"`,
props: createObjectMatcher({ key: `[0]` }) props: createObjectMatcher({ key: `[0]` }),
}) })
expect(codegenNode.alternate).toMatchObject({ expect(codegenNode.alternate).toMatchObject({
tag: `"p"`, tag: `"p"`,
props: createObjectMatcher({ key: `[1]` }) props: createObjectMatcher({ key: `[1]` }),
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -458,17 +458,17 @@ describe('compiler: v-if', () => {
test('v-if + v-else-if', () => { test('v-if + v-else-if', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithIfTransform(`<div v-if="ok"/><p v-else-if="orNot" />`) } = parseWithIfTransform(`<div v-if="ok"/><p v-else-if="orNot" />`)
assertSharedCodegen(codegenNode, 1) assertSharedCodegen(codegenNode, 1)
expect(codegenNode.consequent).toMatchObject({ expect(codegenNode.consequent).toMatchObject({
tag: `"div"`, tag: `"div"`,
props: createObjectMatcher({ key: `[0]` }) props: createObjectMatcher({ key: `[0]` }),
}) })
const branch2 = codegenNode.alternate as ConditionalExpression const branch2 = codegenNode.alternate as ConditionalExpression
expect(branch2.consequent).toMatchObject({ expect(branch2.consequent).toMatchObject({
tag: `"p"`, tag: `"p"`,
props: createObjectMatcher({ key: `[1]` }) props: createObjectMatcher({ key: `[1]` }),
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -476,19 +476,19 @@ describe('compiler: v-if', () => {
test('v-if + v-else-if + v-else', () => { test('v-if + v-else-if + v-else', () => {
const { const {
root, root,
node: { codegenNode } node: { codegenNode },
} = parseWithIfTransform( } = parseWithIfTransform(
`<div v-if="ok"/><p v-else-if="orNot"/><template v-else>fine</template>` `<div v-if="ok"/><p v-else-if="orNot"/><template v-else>fine</template>`,
) )
assertSharedCodegen(codegenNode, 1, true) assertSharedCodegen(codegenNode, 1, true)
expect(codegenNode.consequent).toMatchObject({ expect(codegenNode.consequent).toMatchObject({
tag: `"div"`, tag: `"div"`,
props: createObjectMatcher({ key: `[0]` }) props: createObjectMatcher({ key: `[0]` }),
}) })
const branch2 = codegenNode.alternate as ConditionalExpression const branch2 = codegenNode.alternate as ConditionalExpression
expect(branch2.consequent).toMatchObject({ expect(branch2.consequent).toMatchObject({
tag: `"p"`, tag: `"p"`,
props: createObjectMatcher({ key: `[1]` }) props: createObjectMatcher({ key: `[1]` }),
}) })
expect(branch2.alternate).toMatchObject({ expect(branch2.alternate).toMatchObject({
tag: FRAGMENT, tag: FRAGMENT,
@ -496,9 +496,9 @@ describe('compiler: v-if', () => {
children: [ children: [
{ {
type: NodeTypes.TEXT, type: NodeTypes.TEXT,
content: `fine` content: `fine`,
} },
] ],
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -508,7 +508,7 @@ describe('compiler: v-if', () => {
`<div v-if="ok"/><p v-if="orNot"/>`, `<div v-if="ok"/><p v-if="orNot"/>`,
{}, {},
0 /* returnIndex, just give the default value */, 0 /* returnIndex, just give the default value */,
2 /* childrenLen */ 2 /* childrenLen */,
) )
const ifNode = root.children[0] as IfNode & { const ifNode = root.children[0] as IfNode & {
@ -516,14 +516,14 @@ describe('compiler: v-if', () => {
} }
expect(ifNode.codegenNode.consequent).toMatchObject({ expect(ifNode.codegenNode.consequent).toMatchObject({
tag: `"div"`, tag: `"div"`,
props: createObjectMatcher({ key: `[0]` }) props: createObjectMatcher({ key: `[0]` }),
}) })
const ifNode2 = root.children[1] as IfNode & { const ifNode2 = root.children[1] as IfNode & {
codegenNode: IfConditionalExpression codegenNode: IfConditionalExpression
} }
expect(ifNode2.codegenNode.consequent).toMatchObject({ expect(ifNode2.codegenNode.consequent).toMatchObject({
tag: `"p"`, tag: `"p"`,
props: createObjectMatcher({ key: `[1]` }) props: createObjectMatcher({ key: `[1]` }),
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -533,41 +533,41 @@ describe('compiler: v-if', () => {
`<div v-if="ok"/><p v-else/><div v-if="another"/><p v-else-if="orNot"/><p v-else/>`, `<div v-if="ok"/><p v-else/><div v-if="another"/><p v-else-if="orNot"/><p v-else/>`,
{}, {},
0 /* returnIndex, just give the default value */, 0 /* returnIndex, just give the default value */,
2 /* childrenLen */ 2 /* childrenLen */,
) )
const ifNode = root.children[0] as IfNode & { const ifNode = root.children[0] as IfNode & {
codegenNode: IfConditionalExpression codegenNode: IfConditionalExpression
} }
expect(ifNode.codegenNode.consequent).toMatchObject({ expect(ifNode.codegenNode.consequent).toMatchObject({
tag: `"div"`, tag: `"div"`,
props: createObjectMatcher({ key: `[0]` }) props: createObjectMatcher({ key: `[0]` }),
}) })
expect(ifNode.codegenNode.alternate).toMatchObject({ expect(ifNode.codegenNode.alternate).toMatchObject({
tag: `"p"`, tag: `"p"`,
props: createObjectMatcher({ key: `[1]` }) props: createObjectMatcher({ key: `[1]` }),
}) })
const ifNode2 = root.children[1] as IfNode & { const ifNode2 = root.children[1] as IfNode & {
codegenNode: IfConditionalExpression codegenNode: IfConditionalExpression
} }
expect(ifNode2.codegenNode.consequent).toMatchObject({ expect(ifNode2.codegenNode.consequent).toMatchObject({
tag: `"div"`, tag: `"div"`,
props: createObjectMatcher({ key: `[2]` }) props: createObjectMatcher({ key: `[2]` }),
}) })
const branch = ifNode2.codegenNode.alternate as IfConditionalExpression const branch = ifNode2.codegenNode.alternate as IfConditionalExpression
expect(branch.consequent).toMatchObject({ expect(branch.consequent).toMatchObject({
tag: `"p"`, tag: `"p"`,
props: createObjectMatcher({ key: `[3]` }) props: createObjectMatcher({ key: `[3]` }),
}) })
expect(branch.alternate).toMatchObject({ expect(branch.alternate).toMatchObject({
tag: `"p"`, tag: `"p"`,
props: createObjectMatcher({ key: `[4]` }) props: createObjectMatcher({ key: `[4]` }),
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
test('key injection (only v-bind)', () => { test('key injection (only v-bind)', () => {
const { const {
node: { codegenNode } node: { codegenNode },
} = parseWithIfTransform(`<div v-if="ok" v-bind="obj"/>`) } = parseWithIfTransform(`<div v-if="ok" v-bind="obj"/>`)
const branch1 = codegenNode.consequent as VNodeCall const branch1 = codegenNode.consequent as VNodeCall
expect(branch1.props).toMatchObject({ expect(branch1.props).toMatchObject({
@ -577,15 +577,18 @@ describe('compiler: v-if', () => {
{ {
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
callee: MERGE_PROPS, callee: MERGE_PROPS,
arguments: [createObjectMatcher({ key: `[0]` }), { content: `obj` }] arguments: [
} createObjectMatcher({ key: `[0]` }),
] { content: `obj` },
],
},
],
}) })
}) })
test('key injection (before v-bind)', () => { test('key injection (before v-bind)', () => {
const { const {
node: { codegenNode } node: { codegenNode },
} = parseWithIfTransform(`<div v-if="ok" id="foo" v-bind="obj"/>`) } = parseWithIfTransform(`<div v-if="ok" id="foo" v-bind="obj"/>`)
const branch1 = codegenNode.consequent as VNodeCall const branch1 = codegenNode.consequent as VNodeCall
expect(branch1.props).toMatchObject({ expect(branch1.props).toMatchObject({
@ -594,16 +597,16 @@ describe('compiler: v-if', () => {
arguments: [ arguments: [
createObjectMatcher({ createObjectMatcher({
key: '[0]', key: '[0]',
id: 'foo' id: 'foo',
}), }),
{ content: `obj` } { content: `obj` },
] ],
}) })
}) })
test('key injection (after v-bind)', () => { test('key injection (after v-bind)', () => {
const { const {
node: { codegenNode } node: { codegenNode },
} = parseWithIfTransform(`<div v-if="ok" v-bind="obj" id="foo"/>`) } = parseWithIfTransform(`<div v-if="ok" v-bind="obj" id="foo"/>`)
const branch1 = codegenNode.consequent as VNodeCall const branch1 = codegenNode.consequent as VNodeCall
expect(branch1.props).toMatchObject({ expect(branch1.props).toMatchObject({
@ -613,15 +616,15 @@ describe('compiler: v-if', () => {
createObjectMatcher({ key: `[0]` }), createObjectMatcher({ key: `[0]` }),
{ content: `obj` }, { content: `obj` },
createObjectMatcher({ createObjectMatcher({
id: 'foo' id: 'foo',
}) }),
] ],
}) })
}) })
test('key injection (w/ custom directive)', () => { test('key injection (w/ custom directive)', () => {
const { const {
node: { codegenNode } node: { codegenNode },
} = parseWithIfTransform(`<div v-if="ok" v-foo />`) } = parseWithIfTransform(`<div v-if="ok" v-foo />`)
const branch1 = codegenNode.consequent as VNodeCall const branch1 = codegenNode.consequent as VNodeCall
expect(branch1.directives).not.toBeUndefined() expect(branch1.directives).not.toBeUndefined()
@ -631,7 +634,7 @@ describe('compiler: v-if', () => {
// #6631 // #6631
test('avoid duplicate keys', () => { test('avoid duplicate keys', () => {
const { const {
node: { codegenNode } node: { codegenNode },
} = parseWithIfTransform(`<div v-if="ok" key="custom_key" v-bind="obj"/>`) } = parseWithIfTransform(`<div v-if="ok" key="custom_key" v-bind="obj"/>`)
const branch1 = codegenNode.consequent as VNodeCall const branch1 = codegenNode.consequent as VNodeCall
expect(branch1.props).toMatchObject({ expect(branch1.props).toMatchObject({
@ -639,31 +642,31 @@ describe('compiler: v-if', () => {
callee: MERGE_PROPS, callee: MERGE_PROPS,
arguments: [ arguments: [
createObjectMatcher({ createObjectMatcher({
key: 'custom_key' key: 'custom_key',
}), }),
{ content: `obj` } { content: `obj` },
] ],
}) })
}) })
test('with spaces between branches', () => { test('with spaces between branches', () => {
const { const {
node: { codegenNode } node: { codegenNode },
} = parseWithIfTransform( } = parseWithIfTransform(
`<div v-if="ok"/> <div v-else-if="no"/> <div v-else/>` `<div v-if="ok"/> <div v-else-if="no"/> <div v-else/>`,
) )
expect(codegenNode.consequent).toMatchObject({ expect(codegenNode.consequent).toMatchObject({
tag: `"div"`, tag: `"div"`,
props: createObjectMatcher({ key: `[0]` }) props: createObjectMatcher({ key: `[0]` }),
}) })
const branch = codegenNode.alternate as ConditionalExpression const branch = codegenNode.alternate as ConditionalExpression
expect(branch.consequent).toMatchObject({ expect(branch.consequent).toMatchObject({
tag: `"div"`, tag: `"div"`,
props: createObjectMatcher({ key: `[1]` }) props: createObjectMatcher({ key: `[1]` }),
}) })
expect(branch.alternate).toMatchObject({ expect(branch.alternate).toMatchObject({
tag: `"div"`, tag: `"div"`,
props: createObjectMatcher({ key: `[2]` }) props: createObjectMatcher({ key: `[2]` }),
}) })
}) })
@ -729,7 +732,7 @@ describe('compiler: v-if', () => {
<p/> <p/>
</template> </template>
`, `,
{ comments: true } { comments: true },
) )
__DEV__ = true __DEV__ = true
}) })
@ -737,21 +740,21 @@ describe('compiler: v-if', () => {
test('v-on with v-if', () => { test('v-on with v-if', () => {
const { const {
node: { codegenNode } node: { codegenNode },
} = parseWithIfTransform( } = parseWithIfTransform(
`<button v-on="{ click: clickEvent }" v-if="true">w/ v-if</button>` `<button v-on="{ click: clickEvent }" v-if="true">w/ v-if</button>`,
) )
expect((codegenNode.consequent as any).props.type).toBe( expect((codegenNode.consequent as any).props.type).toBe(
NodeTypes.JS_CALL_EXPRESSION NodeTypes.JS_CALL_EXPRESSION,
) )
expect((codegenNode.consequent as any).props.callee).toBe(MERGE_PROPS) expect((codegenNode.consequent as any).props.callee).toBe(MERGE_PROPS)
expect( expect(
(codegenNode.consequent as any).props.arguments[0].properties[0].value (codegenNode.consequent as any).props.arguments[0].properties[0].value
.content .content,
).toBe('0') ).toBe('0')
expect((codegenNode.consequent as any).props.arguments[1].callee).toBe( expect((codegenNode.consequent as any).props.arguments[1].callee).toBe(
TO_HANDLERS TO_HANDLERS,
) )
}) })
}) })

View File

@ -4,7 +4,7 @@ describe('compiler: v-memo transform', () => {
function compile(content: string) { function compile(content: string) {
return baseCompile(`<div>${content}</div>`, { return baseCompile(`<div>${content}</div>`, {
mode: 'module', mode: 'module',
prefixIdentifiers: true prefixIdentifiers: true,
}).code }).code
} }
@ -12,8 +12,8 @@ describe('compiler: v-memo transform', () => {
expect( expect(
baseCompile(`<div v-memo="[x]"></div>`, { baseCompile(`<div v-memo="[x]"></div>`, {
mode: 'module', mode: 'module',
prefixIdentifiers: true prefixIdentifiers: true,
}).code }).code,
).toMatchSnapshot() ).toMatchSnapshot()
}) })
@ -29,8 +29,8 @@ describe('compiler: v-memo transform', () => {
expect( expect(
compile( compile(
`<div v-if="ok" v-memo="[x]"><span>foo</span>bar</div> `<div v-if="ok" v-memo="[x]"><span>foo</span>bar</div>
<Comp v-else v-memo="[x]"></Comp>` <Comp v-else v-memo="[x]"></Comp>`,
) ),
).toMatchSnapshot() ).toMatchSnapshot()
}) })
@ -39,8 +39,8 @@ describe('compiler: v-memo transform', () => {
compile( compile(
`<div v-for="{ x, y } in list" :key="x" v-memo="[x, y === z]"> `<div v-for="{ x, y } in list" :key="x" v-memo="[x, y === z]">
<span>foobar</span> <span>foobar</span>
</div>` </div>`,
) ),
).toMatchSnapshot() ).toMatchSnapshot()
}) })
@ -49,8 +49,8 @@ describe('compiler: v-memo transform', () => {
compile( compile(
`<template v-for="{ x, y } in list" :key="x" v-memo="[x, y === z]"> `<template v-for="{ x, y } in list" :key="x" v-memo="[x, y === z]">
<span>foobar</span> <span>foobar</span>
</template>` </template>`,
) ),
).toMatchSnapshot() ).toMatchSnapshot()
}) })
}) })

View File

@ -1,17 +1,17 @@
import { import {
BindingTypes,
type CompilerOptions,
type ComponentNode,
type ElementNode,
type ForNode,
NORMALIZE_PROPS,
NodeTypes,
type ObjectExpression,
type PlainElementNode,
type VNodeCall,
generate,
baseParse as parse, baseParse as parse,
transform, transform,
generate,
ElementNode,
ObjectExpression,
CompilerOptions,
ForNode,
PlainElementNode,
ComponentNode,
NodeTypes,
VNodeCall,
NORMALIZE_PROPS,
BindingTypes
} from '../../src' } from '../../src'
import { ErrorCodes } from '../../src/errors' import { ErrorCodes } from '../../src/errors'
import { transformModel } from '../../src/transforms/vModel' import { transformModel } from '../../src/transforms/vModel'
@ -19,7 +19,7 @@ import { transformElement } from '../../src/transforms/transformElement'
import { transformExpression } from '../../src/transforms/transformExpression' import { transformExpression } from '../../src/transforms/transformExpression'
import { transformFor } from '../../src/transforms/vFor' import { transformFor } from '../../src/transforms/vFor'
import { trackSlotScopes } from '../../src/transforms/vSlot' import { trackSlotScopes } from '../../src/transforms/vSlot'
import { CallExpression } from '@babel/types' import type { CallExpression } from '@babel/types'
function parseWithVModel(template: string, options: CompilerOptions = {}) { function parseWithVModel(template: string, options: CompilerOptions = {}) {
const ast = parse(template) const ast = parse(template)
@ -29,13 +29,13 @@ function parseWithVModel(template: string, options: CompilerOptions = {}) {
transformFor, transformFor,
transformExpression, transformExpression,
transformElement, transformElement,
trackSlotScopes trackSlotScopes,
], ],
directiveTransforms: { directiveTransforms: {
...options.directiveTransforms, ...options.directiveTransforms,
model: transformModel model: transformModel,
}, },
...options ...options,
}) })
return ast return ast
@ -51,29 +51,29 @@ describe('compiler: transform v-model', () => {
expect(props[0]).toMatchObject({ expect(props[0]).toMatchObject({
key: { key: {
content: 'modelValue', content: 'modelValue',
isStatic: true isStatic: true,
}, },
value: { value: {
content: 'model', content: 'model',
isStatic: false isStatic: false,
} },
}) })
expect(props[1]).toMatchObject({ expect(props[1]).toMatchObject({
key: { key: {
content: 'onUpdate:modelValue', content: 'onUpdate:modelValue',
isStatic: true isStatic: true,
}, },
value: { value: {
children: [ children: [
'$event => ((', '$event => ((',
{ {
content: 'model', content: 'model',
isStatic: false isStatic: false,
},
') = $event)',
],
}, },
') = $event)'
]
}
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
@ -81,7 +81,7 @@ describe('compiler: transform v-model', () => {
test('simple expression (with prefixIdentifiers)', () => { test('simple expression (with prefixIdentifiers)', () => {
const root = parseWithVModel('<input v-model="model" />', { const root = parseWithVModel('<input v-model="model" />', {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
const node = root.children[0] as ElementNode const node = root.children[0] as ElementNode
const props = ((node.codegenNode as VNodeCall).props as ObjectExpression) const props = ((node.codegenNode as VNodeCall).props as ObjectExpression)
@ -90,29 +90,29 @@ describe('compiler: transform v-model', () => {
expect(props[0]).toMatchObject({ expect(props[0]).toMatchObject({
key: { key: {
content: 'modelValue', content: 'modelValue',
isStatic: true isStatic: true,
}, },
value: { value: {
content: '_ctx.model', content: '_ctx.model',
isStatic: false isStatic: false,
} },
}) })
expect(props[1]).toMatchObject({ expect(props[1]).toMatchObject({
key: { key: {
content: 'onUpdate:modelValue', content: 'onUpdate:modelValue',
isStatic: true isStatic: true,
}, },
value: { value: {
children: [ children: [
'$event => ((', '$event => ((',
{ {
content: '_ctx.model', content: '_ctx.model',
isStatic: false isStatic: false,
},
') = $event)',
],
}, },
') = $event)'
]
}
}) })
expect(generate(root, { mode: 'module' }).code).toMatchSnapshot() expect(generate(root, { mode: 'module' }).code).toMatchSnapshot()
@ -128,29 +128,29 @@ describe('compiler: transform v-model', () => {
expect(props[0]).toMatchObject({ expect(props[0]).toMatchObject({
key: { key: {
content: 'modelValue', content: 'modelValue',
isStatic: true isStatic: true,
}, },
value: { value: {
content: '\n model\n.\nfoo \n', content: '\n model\n.\nfoo \n',
isStatic: false isStatic: false,
} },
}) })
expect(props[1]).toMatchObject({ expect(props[1]).toMatchObject({
key: { key: {
content: 'onUpdate:modelValue', content: 'onUpdate:modelValue',
isStatic: true isStatic: true,
}, },
value: { value: {
children: [ children: [
'$event => ((', '$event => ((',
{ {
content: '\n model\n.\nfoo \n', content: '\n model\n.\nfoo \n',
isStatic: false isStatic: false,
},
') = $event)',
],
}, },
') = $event)'
]
}
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
@ -165,29 +165,29 @@ describe('compiler: transform v-model', () => {
expect(props[0]).toMatchObject({ expect(props[0]).toMatchObject({
key: { key: {
content: 'modelValue', content: 'modelValue',
isStatic: true isStatic: true,
}, },
value: { value: {
content: 'model[index]', content: 'model[index]',
isStatic: false isStatic: false,
} },
}) })
expect(props[1]).toMatchObject({ expect(props[1]).toMatchObject({
key: { key: {
content: 'onUpdate:modelValue', content: 'onUpdate:modelValue',
isStatic: true isStatic: true,
}, },
value: { value: {
children: [ children: [
'$event => ((', '$event => ((',
{ {
content: 'model[index]', content: 'model[index]',
isStatic: false isStatic: false,
},
') = $event)',
],
}, },
') = $event)'
]
}
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
@ -195,7 +195,7 @@ describe('compiler: transform v-model', () => {
test('compound expression (with prefixIdentifiers)', () => { test('compound expression (with prefixIdentifiers)', () => {
const root = parseWithVModel('<input v-model="model[index]" />', { const root = parseWithVModel('<input v-model="model[index]" />', {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
const node = root.children[0] as ElementNode const node = root.children[0] as ElementNode
const props = ((node.codegenNode as VNodeCall).props as ObjectExpression) const props = ((node.codegenNode as VNodeCall).props as ObjectExpression)
@ -204,28 +204,28 @@ describe('compiler: transform v-model', () => {
expect(props[0]).toMatchObject({ expect(props[0]).toMatchObject({
key: { key: {
content: 'modelValue', content: 'modelValue',
isStatic: true isStatic: true,
}, },
value: { value: {
children: [ children: [
{ {
content: '_ctx.model', content: '_ctx.model',
isStatic: false isStatic: false,
}, },
'[', '[',
{ {
content: '_ctx.index', content: '_ctx.index',
isStatic: false isStatic: false,
},
']',
],
}, },
']'
]
}
}) })
expect(props[1]).toMatchObject({ expect(props[1]).toMatchObject({
key: { key: {
content: 'onUpdate:modelValue', content: 'onUpdate:modelValue',
isStatic: true isStatic: true,
}, },
value: { value: {
children: [ children: [
@ -234,19 +234,19 @@ describe('compiler: transform v-model', () => {
children: [ children: [
{ {
content: '_ctx.model', content: '_ctx.model',
isStatic: false isStatic: false,
}, },
'[', '[',
{ {
content: '_ctx.index', content: '_ctx.index',
isStatic: false isStatic: false,
}, },
']' ']',
] ],
},
') = $event)',
],
}, },
') = $event)'
]
}
}) })
expect(generate(root, { mode: 'module' }).code).toMatchSnapshot() expect(generate(root, { mode: 'module' }).code).toMatchSnapshot()
@ -260,29 +260,29 @@ describe('compiler: transform v-model', () => {
expect(props[0]).toMatchObject({ expect(props[0]).toMatchObject({
key: { key: {
content: 'foo-value', content: 'foo-value',
isStatic: true isStatic: true,
}, },
value: { value: {
content: 'model', content: 'model',
isStatic: false isStatic: false,
} },
}) })
expect(props[1]).toMatchObject({ expect(props[1]).toMatchObject({
key: { key: {
content: 'onUpdate:fooValue', content: 'onUpdate:fooValue',
isStatic: true isStatic: true,
}, },
value: { value: {
children: [ children: [
'$event => ((', '$event => ((',
{ {
content: 'model', content: 'model',
isStatic: false isStatic: false,
},
') = $event)',
],
}, },
') = $event)'
]
}
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
@ -304,12 +304,12 @@ describe('compiler: transform v-model', () => {
{ {
key: { key: {
content: 'value', content: 'value',
isStatic: false isStatic: false,
}, },
value: { value: {
content: 'model', content: 'model',
isStatic: false isStatic: false,
} },
}, },
{ {
key: { key: {
@ -317,24 +317,24 @@ describe('compiler: transform v-model', () => {
'"onUpdate:" + ', '"onUpdate:" + ',
{ {
content: 'value', content: 'value',
isStatic: false isStatic: false,
} },
] ],
}, },
value: { value: {
children: [ children: [
'$event => ((', '$event => ((',
{ {
content: 'model', content: 'model',
isStatic: false isStatic: false,
}, },
') = $event)' ') = $event)',
] ],
} },
} },
] ],
} },
] ],
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
@ -342,7 +342,7 @@ describe('compiler: transform v-model', () => {
test('with dynamic argument (with prefixIdentifiers)', () => { test('with dynamic argument (with prefixIdentifiers)', () => {
const root = parseWithVModel('<input v-model:[value]="model" />', { const root = parseWithVModel('<input v-model:[value]="model" />', {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
const node = root.children[0] as ElementNode const node = root.children[0] as ElementNode
const props = (node.codegenNode as VNodeCall) const props = (node.codegenNode as VNodeCall)
@ -358,12 +358,12 @@ describe('compiler: transform v-model', () => {
{ {
key: { key: {
content: '_ctx.value', content: '_ctx.value',
isStatic: false isStatic: false,
}, },
value: { value: {
content: '_ctx.model', content: '_ctx.model',
isStatic: false isStatic: false,
} },
}, },
{ {
key: { key: {
@ -371,24 +371,24 @@ describe('compiler: transform v-model', () => {
'"onUpdate:" + ', '"onUpdate:" + ',
{ {
content: '_ctx.value', content: '_ctx.value',
isStatic: false isStatic: false,
} },
] ],
}, },
value: { value: {
children: [ children: [
'$event => ((', '$event => ((',
{ {
content: '_ctx.model', content: '_ctx.model',
isStatic: false isStatic: false,
}, },
') = $event)' ') = $event)',
] ],
} },
} },
] ],
} },
] ],
}) })
expect(generate(root, { mode: 'module' }).code).toMatchSnapshot() expect(generate(root, { mode: 'module' }).code).toMatchSnapshot()
@ -397,7 +397,7 @@ describe('compiler: transform v-model', () => {
test('should cache update handler w/ cacheHandlers: true', () => { test('should cache update handler w/ cacheHandlers: true', () => {
const root = parseWithVModel('<input v-model="foo" />', { const root = parseWithVModel('<input v-model="foo" />', {
prefixIdentifiers: true, prefixIdentifiers: true,
cacheHandlers: true cacheHandlers: true,
}) })
expect(root.cached).toBe(1) expect(root.cached).toBe(1)
const codegen = (root.children[0] as PlainElementNode) const codegen = (root.children[0] as PlainElementNode)
@ -405,7 +405,7 @@ describe('compiler: transform v-model', () => {
// should not list cached prop in dynamicProps // should not list cached prop in dynamicProps
expect(codegen.dynamicProps).toBe(`["modelValue"]`) expect(codegen.dynamicProps).toBe(`["modelValue"]`)
expect((codegen.props as ObjectExpression).properties[1].value.type).toBe( expect((codegen.props as ObjectExpression).properties[1].value.type).toBe(
NodeTypes.JS_CACHE_EXPRESSION NodeTypes.JS_CACHE_EXPRESSION,
) )
}) })
@ -414,8 +414,8 @@ describe('compiler: transform v-model', () => {
'<input v-for="i in list" v-model="foo[i]" />', '<input v-for="i in list" v-model="foo[i]" />',
{ {
prefixIdentifiers: true, prefixIdentifiers: true,
cacheHandlers: true cacheHandlers: true,
} },
) )
expect(root.cached).toBe(0) expect(root.cached).toBe(0)
const codegen = ( const codegen = (
@ -423,14 +423,14 @@ describe('compiler: transform v-model', () => {
).codegenNode as VNodeCall ).codegenNode as VNodeCall
expect(codegen.dynamicProps).toBe(`["modelValue", "onUpdate:modelValue"]`) expect(codegen.dynamicProps).toBe(`["modelValue", "onUpdate:modelValue"]`)
expect( expect(
(codegen.props as ObjectExpression).properties[1].value.type (codegen.props as ObjectExpression).properties[1].value.type,
).not.toBe(NodeTypes.JS_CACHE_EXPRESSION) ).not.toBe(NodeTypes.JS_CACHE_EXPRESSION)
}) })
test('should not cache update handler if it inside v-once', () => { test('should not cache update handler if it inside v-once', () => {
const root = parseWithVModel('<div v-once><input v-model="foo" /></div>', { const root = parseWithVModel('<div v-once><input v-model="foo" /></div>', {
prefixIdentifiers: true, prefixIdentifiers: true,
cacheHandlers: true cacheHandlers: true,
}) })
expect(root.cached).not.toBe(2) expect(root.cached).not.toBe(2)
expect(root.cached).toBe(1) expect(root.cached).toBe(1)
@ -440,8 +440,8 @@ describe('compiler: transform v-model', () => {
const root = parseWithVModel( const root = parseWithVModel(
'<Comp v-slot="{ foo }"><input v-model="foo.bar"/></Comp>', '<Comp v-slot="{ foo }"><input v-model="foo.bar"/></Comp>',
{ {
prefixIdentifiers: true prefixIdentifiers: true,
} },
) )
const codegen = ( const codegen = (
(root.children[0] as ComponentNode).children[0] as PlainElementNode (root.children[0] as ComponentNode).children[0] as PlainElementNode
@ -451,7 +451,7 @@ describe('compiler: transform v-model', () => {
test('should generate modelModifiers for component v-model', () => { test('should generate modelModifiers for component v-model', () => {
const root = parseWithVModel('<Comp v-model.trim.bar-baz="foo" />', { const root = parseWithVModel('<Comp v-model.trim.bar-baz="foo" />', {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
const vnodeCall = (root.children[0] as ComponentNode) const vnodeCall = (root.children[0] as ComponentNode)
.codegenNode as VNodeCall .codegenNode as VNodeCall
@ -462,9 +462,12 @@ describe('compiler: transform v-model', () => {
{ key: { content: `onUpdate:modelValue` } }, { key: { content: `onUpdate:modelValue` } },
{ {
key: { content: 'modelModifiers' }, key: { content: 'modelModifiers' },
value: { content: `{ trim: true, "bar-baz": true }`, isStatic: false } value: {
} content: `{ trim: true, "bar-baz": true }`,
] isStatic: false,
},
},
],
}) })
// should NOT include modelModifiers in dynamicPropNames because it's never // should NOT include modelModifiers in dynamicPropNames because it's never
// gonna change // gonna change
@ -475,8 +478,8 @@ describe('compiler: transform v-model', () => {
const root = parseWithVModel( const root = parseWithVModel(
'<Comp v-model:foo.trim="foo" v-model:bar.number="bar" />', '<Comp v-model:foo.trim="foo" v-model:bar.number="bar" />',
{ {
prefixIdentifiers: true prefixIdentifiers: true,
} },
) )
const vnodeCall = (root.children[0] as ComponentNode) const vnodeCall = (root.children[0] as ComponentNode)
.codegenNode as VNodeCall .codegenNode as VNodeCall
@ -487,20 +490,20 @@ describe('compiler: transform v-model', () => {
{ key: { content: `onUpdate:foo` } }, { key: { content: `onUpdate:foo` } },
{ {
key: { content: 'fooModifiers' }, key: { content: 'fooModifiers' },
value: { content: `{ trim: true }`, isStatic: false } value: { content: `{ trim: true }`, isStatic: false },
}, },
{ key: { content: `bar` } }, { key: { content: `bar` } },
{ key: { content: `onUpdate:bar` } }, { key: { content: `onUpdate:bar` } },
{ {
key: { content: 'barModifiers' }, key: { content: 'barModifiers' },
value: { content: `{ number: true }`, isStatic: false } value: { content: `{ number: true }`, isStatic: false },
} },
] ],
}) })
// should NOT include modelModifiers in dynamicPropNames because it's never // should NOT include modelModifiers in dynamicPropNames because it's never
// gonna change // gonna change
expect(vnodeCall.dynamicProps).toBe( expect(vnodeCall.dynamicProps).toBe(
`["foo", "onUpdate:foo", "bar", "onUpdate:bar"]` `["foo", "onUpdate:foo", "bar", "onUpdate:bar"]`,
) )
}) })
@ -512,8 +515,8 @@ describe('compiler: transform v-model', () => {
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: ErrorCodes.X_V_MODEL_NO_EXPRESSION code: ErrorCodes.X_V_MODEL_NO_EXPRESSION,
}) }),
) )
}) })
@ -524,8 +527,8 @@ describe('compiler: transform v-model', () => {
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: ErrorCodes.X_V_MODEL_MALFORMED_EXPRESSION code: ErrorCodes.X_V_MODEL_MALFORMED_EXPRESSION,
}) }),
) )
}) })
@ -536,8 +539,8 @@ describe('compiler: transform v-model', () => {
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: ErrorCodes.X_V_MODEL_MALFORMED_EXPRESSION code: ErrorCodes.X_V_MODEL_MALFORMED_EXPRESSION,
}) }),
) )
}) })
@ -552,14 +555,14 @@ describe('compiler: transform v-model', () => {
const onError = vi.fn() const onError = vi.fn()
parseWithVModel('<span v-for="i in list" v-model="i" />', { parseWithVModel('<span v-for="i in list" v-model="i" />', {
onError, onError,
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: ErrorCodes.X_V_MODEL_ON_SCOPE_VARIABLE code: ErrorCodes.X_V_MODEL_ON_SCOPE_VARIABLE,
}) }),
) )
}) })
@ -568,15 +571,15 @@ describe('compiler: transform v-model', () => {
parseWithVModel('<div v-model="p" />', { parseWithVModel('<div v-model="p" />', {
onError, onError,
bindingMetadata: { bindingMetadata: {
p: BindingTypes.PROPS p: BindingTypes.PROPS,
} },
}) })
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: ErrorCodes.X_V_MODEL_ON_PROPS code: ErrorCodes.X_V_MODEL_ON_PROPS,
}) }),
) )
}) })
}) })

View File

@ -1,14 +1,14 @@
import { import {
baseParse as parse, type CompilerOptions,
CompilerOptions, type ElementNode,
ElementNode,
ErrorCodes, ErrorCodes,
TO_HANDLER_KEY,
helperNameMap,
NodeTypes, NodeTypes,
ObjectExpression, type ObjectExpression,
TO_HANDLER_KEY,
type VNodeCall,
helperNameMap,
baseParse as parse,
transform, transform,
VNodeCall
} from '../../src' } from '../../src'
import { transformOn } from '../../src/transforms/vOn' import { transformOn } from '../../src/transforms/vOn'
import { transformElement } from '../../src/transforms/transformElement' import { transformElement } from '../../src/transforms/transformElement'
@ -19,13 +19,13 @@ function parseWithVOn(template: string, options: CompilerOptions = {}) {
transform(ast, { transform(ast, {
nodeTransforms: [transformExpression, transformElement], nodeTransforms: [transformExpression, transformElement],
directiveTransforms: { directiveTransforms: {
on: transformOn on: transformOn,
}, },
...options ...options,
}) })
return { return {
root: ast, root: ast,
node: ast.children[0] as ElementNode node: ast.children[0] as ElementNode,
} }
} }
@ -41,13 +41,13 @@ describe('compiler: transform v-on', () => {
loc: { loc: {
start: { start: {
line: 1, line: 1,
column: 11 column: 11,
}, },
end: { end: {
line: 1, line: 1,
column: 16 column: 16,
} },
} },
}, },
value: { value: {
content: `onClick`, content: `onClick`,
@ -55,16 +55,16 @@ describe('compiler: transform v-on', () => {
loc: { loc: {
start: { start: {
line: 1, line: 1,
column: 18 column: 18,
}, },
end: { end: {
line: 1, line: 1,
column: 25 column: 25,
} },
} },
} },
} },
] ],
}) })
}) })
@ -78,22 +78,22 @@ describe('compiler: transform v-on', () => {
children: [ children: [
`_${helperNameMap[TO_HANDLER_KEY]}(`, `_${helperNameMap[TO_HANDLER_KEY]}(`,
{ content: `event` }, { content: `event` },
`)` `)`,
] ],
}, },
value: { value: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `handler`, content: `handler`,
isStatic: false isStatic: false,
} },
} },
] ],
}) })
}) })
test('dynamic arg with prefixing', () => { test('dynamic arg with prefixing', () => {
const { node } = parseWithVOn(`<div v-on:[event]="handler"/>`, { const { node } = parseWithVOn(`<div v-on:[event]="handler"/>`, {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect((node.codegenNode as VNodeCall).props).toMatchObject({ expect((node.codegenNode as VNodeCall).props).toMatchObject({
properties: [ properties: [
@ -103,22 +103,22 @@ describe('compiler: transform v-on', () => {
children: [ children: [
`_${helperNameMap[TO_HANDLER_KEY]}(`, `_${helperNameMap[TO_HANDLER_KEY]}(`,
{ content: `_ctx.event` }, { content: `_ctx.event` },
`)` `)`,
] ],
}, },
value: { value: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_ctx.handler`, content: `_ctx.handler`,
isStatic: false isStatic: false,
} },
} },
] ],
}) })
}) })
test('dynamic arg with complex exp prefixing', () => { test('dynamic arg with complex exp prefixing', () => {
const { node } = parseWithVOn(`<div v-on:[event(foo)]="handler"/>`, { const { node } = parseWithVOn(`<div v-on:[event(foo)]="handler"/>`, {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect((node.codegenNode as VNodeCall).props).toMatchObject({ expect((node.codegenNode as VNodeCall).props).toMatchObject({
properties: [ properties: [
@ -131,16 +131,16 @@ describe('compiler: transform v-on', () => {
`(`, `(`,
{ content: `_ctx.foo` }, { content: `_ctx.foo` },
`)`, `)`,
`)` `)`,
] ],
}, },
value: { value: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `_ctx.handler`, content: `_ctx.handler`,
isStatic: false isStatic: false,
} },
} },
] ],
}) })
}) })
@ -152,10 +152,10 @@ describe('compiler: transform v-on', () => {
key: { content: `onClick` }, key: { content: `onClick` },
value: { value: {
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
children: [`$event => (`, { content: `i++` }, `)`] children: [`$event => (`, { content: `i++` }, `)`],
} },
} },
] ],
}) })
}) })
@ -170,10 +170,10 @@ describe('compiler: transform v-on', () => {
// should wrap with `{` for multiple statements // should wrap with `{` for multiple statements
// in this case the return value is discarded and the behavior is // in this case the return value is discarded and the behavior is
// consistent with 2.x // consistent with 2.x
children: [`$event => {`, { content: `foo();bar()` }, `}`] children: [`$event => {`, { content: `foo();bar()` }, `}`],
} },
} },
] ],
}) })
}) })
@ -188,16 +188,16 @@ describe('compiler: transform v-on', () => {
// should wrap with `{` for multiple statements // should wrap with `{` for multiple statements
// in this case the return value is discarded and the behavior is // in this case the return value is discarded and the behavior is
// consistent with 2.x // consistent with 2.x
children: [`$event => {`, { content: `\nfoo();\nbar()\n` }, `}`] children: [`$event => {`, { content: `\nfoo();\nbar()\n` }, `}`],
} },
} },
] ],
}) })
}) })
test('inline statement w/ prefixIdentifiers: true', () => { test('inline statement w/ prefixIdentifiers: true', () => {
const { node } = parseWithVOn(`<div @click="foo($event)"/>`, { const { node } = parseWithVOn(`<div @click="foo($event)"/>`, {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect((node.codegenNode as VNodeCall).props).toMatchObject({ expect((node.codegenNode as VNodeCall).props).toMatchObject({
properties: [ properties: [
@ -214,20 +214,20 @@ describe('compiler: transform v-on', () => {
`(`, `(`,
// should NOT prefix $event // should NOT prefix $event
{ content: `$event` }, { content: `$event` },
`)` `)`,
] ],
}, },
`)` `)`,
] ],
} },
} },
] ],
}) })
}) })
test('multiple inline statements w/ prefixIdentifiers: true', () => { test('multiple inline statements w/ prefixIdentifiers: true', () => {
const { node } = parseWithVOn(`<div @click="foo($event);bar()"/>`, { const { node } = parseWithVOn(`<div @click="foo($event);bar()"/>`, {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect((node.codegenNode as VNodeCall).props).toMatchObject({ expect((node.codegenNode as VNodeCall).props).toMatchObject({
properties: [ properties: [
@ -245,14 +245,14 @@ describe('compiler: transform v-on', () => {
{ content: `$event` }, { content: `$event` },
`);`, `);`,
{ content: `_ctx.bar` }, { content: `_ctx.bar` },
`()` `()`,
] ],
}, },
`}` `}`,
] ],
} },
} },
] ],
}) })
}) })
@ -264,10 +264,10 @@ describe('compiler: transform v-on', () => {
key: { content: `onClick` }, key: { content: `onClick` },
value: { value: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `$event => foo($event)` content: `$event => foo($event)`,
} },
} },
] ],
}) })
}) })
@ -279,10 +279,10 @@ describe('compiler: transform v-on', () => {
key: { content: `onClick` }, key: { content: `onClick` },
value: { value: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `(e: any): any => foo(e)` content: `(e: any): any => foo(e)`,
} },
} },
] ],
}) })
}) })
@ -292,7 +292,7 @@ describe('compiler: transform v-on', () => {
$event => { $event => {
foo($event) foo($event)
} }
"/>` "/>`,
) )
expect((node.codegenNode as VNodeCall).props).toMatchObject({ expect((node.codegenNode as VNodeCall).props).toMatchObject({
properties: [ properties: [
@ -304,10 +304,10 @@ describe('compiler: transform v-on', () => {
$event => { $event => {
foo($event) foo($event)
} }
` `,
} },
} },
] ],
}) })
}) })
@ -317,7 +317,7 @@ describe('compiler: transform v-on', () => {
function($event) { function($event) {
foo($event) foo($event)
} }
"/>` "/>`,
) )
expect((node.codegenNode as VNodeCall).props).toMatchObject({ expect((node.codegenNode as VNodeCall).props).toMatchObject({
properties: [ properties: [
@ -329,10 +329,10 @@ describe('compiler: transform v-on', () => {
function($event) { function($event) {
foo($event) foo($event)
} }
` `,
} },
} },
] ],
}) })
}) })
@ -344,16 +344,16 @@ describe('compiler: transform v-on', () => {
key: { content: `onClick` }, key: { content: `onClick` },
value: { value: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `a['b' + c]` content: `a['b' + c]`,
} },
} },
] ],
}) })
}) })
test('complex member expression w/ prefixIdentifiers: true', () => { test('complex member expression w/ prefixIdentifiers: true', () => {
const { node } = parseWithVOn(`<div @click="a['b' + c]"/>`, { const { node } = parseWithVOn(`<div @click="a['b' + c]"/>`, {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect((node.codegenNode as VNodeCall).props).toMatchObject({ expect((node.codegenNode as VNodeCall).props).toMatchObject({
properties: [ properties: [
@ -365,17 +365,17 @@ describe('compiler: transform v-on', () => {
{ content: `_ctx.a` }, { content: `_ctx.a` },
`['b' + `, `['b' + `,
{ content: `_ctx.c` }, { content: `_ctx.c` },
`]` `]`,
] ],
} },
} },
] ],
}) })
}) })
test('function expression w/ prefixIdentifiers: true', () => { test('function expression w/ prefixIdentifiers: true', () => {
const { node } = parseWithVOn(`<div @click="e => foo(e)"/>`, { const { node } = parseWithVOn(`<div @click="e => foo(e)"/>`, {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect((node.codegenNode as VNodeCall).props).toMatchObject({ expect((node.codegenNode as VNodeCall).props).toMatchObject({
properties: [ properties: [
@ -389,11 +389,11 @@ describe('compiler: transform v-on', () => {
{ content: `_ctx.foo` }, { content: `_ctx.foo` },
`(`, `(`,
{ content: `e` }, { content: `e` },
`)` `)`,
] ],
} },
} },
] ],
}) })
}) })
@ -405,13 +405,13 @@ describe('compiler: transform v-on', () => {
loc: { loc: {
start: { start: {
line: 1, line: 1,
column: 6 column: 6,
}, },
end: { end: {
line: 1, line: 1,
column: 16 column: 16,
} },
} },
}) })
}) })
@ -427,57 +427,57 @@ describe('compiler: transform v-on', () => {
properties: [ properties: [
{ {
key: { key: {
content: `onFooBar` content: `onFooBar`,
}, },
value: { value: {
content: `onMount` content: `onMount`,
} },
} },
] ],
}) })
}) })
// TODO remove in 3.4 test('error for vnode hooks', () => {
test('case conversion for vnode hooks', () => { const onError = vi.fn()
const { node } = parseWithVOn(`<div v-on:vnode-mounted="onMount"/>`) parseWithVOn(`<div v-on:vnode-mounted="onMount"/>`, { onError })
expect((node.codegenNode as VNodeCall).props).toMatchObject({ expect(onError.mock.calls[0][0]).toMatchObject({
properties: [ code: ErrorCodes.X_VNODE_HOOKS,
{ loc: {
key: { start: {
content: `onVnodeMounted` line: 1,
column: 11,
},
end: {
line: 1,
column: 24,
},
}, },
value: {
content: `onMount`
}
}
]
}) })
expect('@vnode-* hooks in templates are deprecated').toHaveBeenWarned()
}) })
test('vue: prefixed events', () => { test('vue: prefixed events', () => {
const { node } = parseWithVOn( const { node } = parseWithVOn(
`<div v-on:vue:mounted="onMount" @vue:before-update="onBeforeUpdate" />` `<div v-on:vue:mounted="onMount" @vue:before-update="onBeforeUpdate" />`,
) )
expect((node.codegenNode as VNodeCall).props).toMatchObject({ expect((node.codegenNode as VNodeCall).props).toMatchObject({
properties: [ properties: [
{ {
key: { key: {
content: `onVnodeMounted` content: `onVnodeMounted`,
}, },
value: { value: {
content: `onMount` content: `onMount`,
} },
}, },
{ {
key: { key: {
content: `onVnodeBeforeUpdate` content: `onVnodeBeforeUpdate`,
}, },
value: { value: {
content: `onBeforeUpdate` content: `onBeforeUpdate`,
} },
} },
] ],
}) })
}) })
@ -485,35 +485,35 @@ describe('compiler: transform v-on', () => {
test('empty handler', () => { test('empty handler', () => {
const { root, node } = parseWithVOn(`<div v-on:click.prevent />`, { const { root, node } = parseWithVOn(`<div v-on:click.prevent />`, {
prefixIdentifiers: true, prefixIdentifiers: true,
cacheHandlers: true cacheHandlers: true,
}) })
expect(root.cached).toBe(1) expect(root.cached).toBe(1)
const vnodeCall = node.codegenNode as VNodeCall const vnodeCall = node.codegenNode as VNodeCall
// should not treat cached handler as dynamicProp, so no flags // should not treat cached handler as dynamicProp, so no flags
expect(vnodeCall.patchFlag).toBeUndefined() expect(vnodeCall.patchFlag).toBeUndefined()
expect( expect(
(vnodeCall.props as ObjectExpression).properties[0].value (vnodeCall.props as ObjectExpression).properties[0].value,
).toMatchObject({ ).toMatchObject({
type: NodeTypes.JS_CACHE_EXPRESSION, type: NodeTypes.JS_CACHE_EXPRESSION,
index: 0, index: 0,
value: { value: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `() => {}` content: `() => {}`,
} },
}) })
}) })
test('member expression handler', () => { test('member expression handler', () => {
const { root, node } = parseWithVOn(`<div v-on:click="foo" />`, { const { root, node } = parseWithVOn(`<div v-on:click="foo" />`, {
prefixIdentifiers: true, prefixIdentifiers: true,
cacheHandlers: true cacheHandlers: true,
}) })
expect(root.cached).toBe(1) expect(root.cached).toBe(1)
const vnodeCall = node.codegenNode as VNodeCall const vnodeCall = node.codegenNode as VNodeCall
// should not treat cached handler as dynamicProp, so no flags // should not treat cached handler as dynamicProp, so no flags
expect(vnodeCall.patchFlag).toBeUndefined() expect(vnodeCall.patchFlag).toBeUndefined()
expect( expect(
(vnodeCall.props as ObjectExpression).properties[0].value (vnodeCall.props as ObjectExpression).properties[0].value,
).toMatchObject({ ).toMatchObject({
type: NodeTypes.JS_CACHE_EXPRESSION, type: NodeTypes.JS_CACHE_EXPRESSION,
index: 0, index: 0,
@ -522,23 +522,23 @@ describe('compiler: transform v-on', () => {
children: [ children: [
`(...args) => (`, `(...args) => (`,
{ content: `_ctx.foo && _ctx.foo(...args)` }, { content: `_ctx.foo && _ctx.foo(...args)` },
`)` `)`,
] ],
} },
}) })
}) })
test('compound member expression handler', () => { test('compound member expression handler', () => {
const { root, node } = parseWithVOn(`<div v-on:click="foo.bar" />`, { const { root, node } = parseWithVOn(`<div v-on:click="foo.bar" />`, {
prefixIdentifiers: true, prefixIdentifiers: true,
cacheHandlers: true cacheHandlers: true,
}) })
expect(root.cached).toBe(1) expect(root.cached).toBe(1)
const vnodeCall = node.codegenNode as VNodeCall const vnodeCall = node.codegenNode as VNodeCall
// should not treat cached handler as dynamicProp, so no flags // should not treat cached handler as dynamicProp, so no flags
expect(vnodeCall.patchFlag).toBeUndefined() expect(vnodeCall.patchFlag).toBeUndefined()
expect( expect(
(vnodeCall.props as ObjectExpression).properties[0].value (vnodeCall.props as ObjectExpression).properties[0].value,
).toMatchObject({ ).toMatchObject({
type: NodeTypes.JS_CACHE_EXPRESSION, type: NodeTypes.JS_CACHE_EXPRESSION,
index: 0, index: 0,
@ -555,12 +555,12 @@ describe('compiler: transform v-on', () => {
{ content: `_ctx.foo` }, { content: `_ctx.foo` },
`.`, `.`,
{ content: `bar` }, { content: `bar` },
`(...args)` `(...args)`,
] ],
},
`)`,
],
}, },
`)`
]
}
}) })
}) })
@ -568,7 +568,7 @@ describe('compiler: transform v-on', () => {
const { root } = parseWithVOn(`<comp v-on:click="foo" />`, { const { root } = parseWithVOn(`<comp v-on:click="foo" />`, {
prefixIdentifiers: true, prefixIdentifiers: true,
cacheHandlers: true, cacheHandlers: true,
isNativeTag: tag => tag === 'div' isNativeTag: tag => tag === 'div',
}) })
expect(root.cached).toBe(0) expect(root.cached).toBe(0)
}) })
@ -578,8 +578,8 @@ describe('compiler: transform v-on', () => {
`<div v-once><div v-on:click="foo"/></div>`, `<div v-once><div v-on:click="foo"/></div>`,
{ {
prefixIdentifiers: true, prefixIdentifiers: true,
cacheHandlers: true cacheHandlers: true,
} },
) )
expect(root.cached).not.toBe(2) expect(root.cached).not.toBe(2)
expect(root.cached).toBe(1) expect(root.cached).toBe(1)
@ -588,21 +588,21 @@ describe('compiler: transform v-on', () => {
test('inline function expression handler', () => { test('inline function expression handler', () => {
const { root, node } = parseWithVOn(`<div v-on:click="() => foo()" />`, { const { root, node } = parseWithVOn(`<div v-on:click="() => foo()" />`, {
prefixIdentifiers: true, prefixIdentifiers: true,
cacheHandlers: true cacheHandlers: true,
}) })
expect(root.cached).toBe(1) expect(root.cached).toBe(1)
const vnodeCall = node.codegenNode as VNodeCall const vnodeCall = node.codegenNode as VNodeCall
// should not treat cached handler as dynamicProp, so no flags // should not treat cached handler as dynamicProp, so no flags
expect(vnodeCall.patchFlag).toBeUndefined() expect(vnodeCall.patchFlag).toBeUndefined()
expect( expect(
(vnodeCall.props as ObjectExpression).properties[0].value (vnodeCall.props as ObjectExpression).properties[0].value,
).toMatchObject({ ).toMatchObject({
type: NodeTypes.JS_CACHE_EXPRESSION, type: NodeTypes.JS_CACHE_EXPRESSION,
index: 0, index: 0,
value: { value: {
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
children: [`() => `, { content: `_ctx.foo` }, `()`] children: [`() => `, { content: `_ctx.foo` }, `()`],
} },
}) })
}) })
@ -611,22 +611,22 @@ describe('compiler: transform v-on', () => {
`<div v-on:click="async () => await foo()" />`, `<div v-on:click="async () => await foo()" />`,
{ {
prefixIdentifiers: true, prefixIdentifiers: true,
cacheHandlers: true cacheHandlers: true,
} },
) )
expect(root.cached).toBe(1) expect(root.cached).toBe(1)
const vnodeCall = node.codegenNode as VNodeCall const vnodeCall = node.codegenNode as VNodeCall
// should not treat cached handler as dynamicProp, so no flags // should not treat cached handler as dynamicProp, so no flags
expect(vnodeCall.patchFlag).toBeUndefined() expect(vnodeCall.patchFlag).toBeUndefined()
expect( expect(
(vnodeCall.props as ObjectExpression).properties[0].value (vnodeCall.props as ObjectExpression).properties[0].value,
).toMatchObject({ ).toMatchObject({
type: NodeTypes.JS_CACHE_EXPRESSION, type: NodeTypes.JS_CACHE_EXPRESSION,
index: 0, index: 0,
value: { value: {
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
children: [`async () => await `, { content: `_ctx.foo` }, `()`] children: [`async () => await `, { content: `_ctx.foo` }, `()`],
} },
}) })
}) })
@ -635,15 +635,15 @@ describe('compiler: transform v-on', () => {
`<div v-on:click="async function () { await foo() } " />`, `<div v-on:click="async function () { await foo() } " />`,
{ {
prefixIdentifiers: true, prefixIdentifiers: true,
cacheHandlers: true cacheHandlers: true,
} },
) )
expect(root.cached).toBe(1) expect(root.cached).toBe(1)
const vnodeCall = node.codegenNode as VNodeCall const vnodeCall = node.codegenNode as VNodeCall
// should not treat cached handler as dynamicProp, so no flags // should not treat cached handler as dynamicProp, so no flags
expect(vnodeCall.patchFlag).toBeUndefined() expect(vnodeCall.patchFlag).toBeUndefined()
expect( expect(
(vnodeCall.props as ObjectExpression).properties[0].value (vnodeCall.props as ObjectExpression).properties[0].value,
).toMatchObject({ ).toMatchObject({
type: NodeTypes.JS_CACHE_EXPRESSION, type: NodeTypes.JS_CACHE_EXPRESSION,
index: 0, index: 0,
@ -652,16 +652,16 @@ describe('compiler: transform v-on', () => {
children: [ children: [
`async function () { await `, `async function () { await `,
{ content: `_ctx.foo` }, { content: `_ctx.foo` },
`() } ` `() } `,
] ],
} },
}) })
}) })
test('inline statement handler', () => { test('inline statement handler', () => {
const { root, node } = parseWithVOn(`<div v-on:click="foo++" />`, { const { root, node } = parseWithVOn(`<div v-on:click="foo++" />`, {
prefixIdentifiers: true, prefixIdentifiers: true,
cacheHandlers: true cacheHandlers: true,
}) })
expect(root.cached).toBe(1) expect(root.cached).toBe(1)
expect(root.cached).toBe(1) expect(root.cached).toBe(1)
@ -669,7 +669,7 @@ describe('compiler: transform v-on', () => {
// should not treat cached handler as dynamicProp, so no flags // should not treat cached handler as dynamicProp, so no flags
expect(vnodeCall.patchFlag).toBeUndefined() expect(vnodeCall.patchFlag).toBeUndefined()
expect( expect(
(vnodeCall.props as ObjectExpression).properties[0].value (vnodeCall.props as ObjectExpression).properties[0].value,
).toMatchObject({ ).toMatchObject({
type: NodeTypes.JS_CACHE_EXPRESSION, type: NodeTypes.JS_CACHE_EXPRESSION,
index: 0, index: 0,
@ -678,9 +678,9 @@ describe('compiler: transform v-on', () => {
children: [ children: [
`$event => (`, `$event => (`,
{ children: [{ content: `_ctx.foo` }, `++`] }, { children: [{ content: `_ctx.foo` }, `++`] },
`)` `)`,
] ],
} },
}) })
}) })
}) })

View File

@ -1,10 +1,10 @@
import { import {
baseParse as parse, type CompilerOptions,
transform,
NodeTypes, NodeTypes,
generate, generate,
CompilerOptions, getBaseTransformPreset,
getBaseTransformPreset baseParse as parse,
transform,
} from '../../src' } from '../../src'
import { RENDER_SLOT, SET_BLOCK_TRACKING } from '../../src/runtimeHelpers' import { RENDER_SLOT, SET_BLOCK_TRACKING } from '../../src/runtimeHelpers'
@ -14,7 +14,7 @@ function transformWithOnce(template: string, options: CompilerOptions = {}) {
transform(ast, { transform(ast, {
nodeTransforms, nodeTransforms,
directiveTransforms, directiveTransforms,
...options ...options,
}) })
return ast return ast
} }
@ -29,8 +29,8 @@ describe('compiler: v-once transform', () => {
index: 0, index: 0,
value: { value: {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `"div"` tag: `"div"`,
} },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -44,8 +44,8 @@ describe('compiler: v-once transform', () => {
index: 0, index: 0,
value: { value: {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `"div"` tag: `"div"`,
} },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -59,8 +59,8 @@ describe('compiler: v-once transform', () => {
index: 0, index: 0,
value: { value: {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `_component_Comp` tag: `_component_Comp`,
} },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -74,8 +74,8 @@ describe('compiler: v-once transform', () => {
index: 0, index: 0,
value: { value: {
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
callee: RENDER_SLOT callee: RENDER_SLOT,
} },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -90,7 +90,7 @@ describe('compiler: v-once transform', () => {
// cached nodes should be ignored by hoistStatic transform // cached nodes should be ignored by hoistStatic transform
test('with hoistStatic: true', () => { test('with hoistStatic: true', () => {
const root = transformWithOnce(`<div><div v-once /></div>`, { const root = transformWithOnce(`<div><div v-once /></div>`, {
hoistStatic: true hoistStatic: true,
}) })
expect(root.cached).toBe(1) expect(root.cached).toBe(1)
expect(root.helpers).toContain(SET_BLOCK_TRACKING) expect(root.helpers).toContain(SET_BLOCK_TRACKING)
@ -100,8 +100,8 @@ describe('compiler: v-once transform', () => {
index: 0, index: 0,
value: { value: {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `"div"` tag: `"div"`,
} },
}) })
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
}) })
@ -119,14 +119,14 @@ describe('compiler: v-once transform', () => {
type: NodeTypes.JS_CONDITIONAL_EXPRESSION, type: NodeTypes.JS_CONDITIONAL_EXPRESSION,
consequent: { consequent: {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `"div"` tag: `"div"`,
}, },
alternate: { alternate: {
type: NodeTypes.VNODE_CALL, type: NodeTypes.VNODE_CALL,
tag: `"p"` tag: `"p"`,
} },
} },
} },
}) })
}) })
@ -138,8 +138,8 @@ describe('compiler: v-once transform', () => {
type: NodeTypes.FOR, type: NodeTypes.FOR,
// should cache the entire v-for expression, not just a single branch // should cache the entire v-for expression, not just a single branch
codegenNode: { codegenNode: {
type: NodeTypes.JS_CACHE_EXPRESSION type: NodeTypes.JS_CACHE_EXPRESSION,
} },
}) })
}) })
}) })

File diff suppressed because it is too large Load Diff

View File

@ -1,11 +1,10 @@
import { TransformContext } from '../src' import type { TransformContext } from '../src'
import { Position } from '../src/ast' import type { Position } from '../src/ast'
import { import {
getInnerRange,
advancePositionWithClone, advancePositionWithClone,
isMemberExpressionNode,
isMemberExpressionBrowser, isMemberExpressionBrowser,
toValidAssetId isMemberExpressionNode,
toValidAssetId,
} from '../src/utils' } from '../src/utils'
function p(line: number, column: number, offset: number): Position { function p(line: number, column: number, offset: number): Position {
@ -41,32 +40,6 @@ describe('advancePositionWithClone', () => {
}) })
}) })
describe('getInnerRange', () => {
const loc1 = {
source: 'foo\nbar\nbaz',
start: p(1, 1, 0),
end: p(3, 3, 11)
}
test('at start', () => {
const loc2 = getInnerRange(loc1, 0, 4)
expect(loc2.start).toEqual(loc1.start)
expect(loc2.end.column).toBe(1)
expect(loc2.end.line).toBe(2)
expect(loc2.end.offset).toBe(4)
})
test('in between', () => {
const loc2 = getInnerRange(loc1, 4, 3)
expect(loc2.start.column).toBe(1)
expect(loc2.start.line).toBe(2)
expect(loc2.start.offset).toBe(4)
expect(loc2.end.column).toBe(4)
expect(loc2.end.line).toBe(2)
expect(loc2.end.offset).toBe(7)
})
})
describe('isMemberExpression', () => { describe('isMemberExpression', () => {
function commonAssertions(fn: (str: string) => boolean) { function commonAssertions(fn: (str: string) => boolean) {
// should work // should work
@ -122,6 +95,10 @@ describe('isMemberExpression', () => {
expect(fn(`123[a]`)).toBe(true) expect(fn(`123[a]`)).toBe(true)
expect(fn(`foo() as string`)).toBe(false) expect(fn(`foo() as string`)).toBe(false)
expect(fn(`a + b as string`)).toBe(false) expect(fn(`a + b as string`)).toBe(false)
// #9865
expect(fn('""')).toBe(false)
expect(fn('undefined')).toBe(false)
expect(fn('null')).toBe(false)
}) })
}) })
@ -131,6 +108,6 @@ test('toValidAssetId', () => {
expect(toValidAssetId('div', 'filter')).toBe('_filter_div') expect(toValidAssetId('div', 'filter')).toBe('_filter_div')
expect(toValidAssetId('foo-bar', 'component')).toBe('_component_foo_bar') expect(toValidAssetId('foo-bar', 'component')).toBe('_component_foo_bar')
expect(toValidAssetId('test-测试-1', 'component')).toBe( expect(toValidAssetId('test-测试-1', 'component')).toBe(
'_component_test_2797935797_1' '_component_test_2797935797_1',
) )
}) })

View File

@ -1,6 +1,6 @@
{ {
"name": "@vue/compiler-core", "name": "@vue/compiler-core",
"version": "3.3.11", "version": "3.4.3",
"description": "@vue/compiler-core", "description": "@vue/compiler-core",
"main": "index.js", "main": "index.js",
"module": "dist/compiler-core.esm-bundler.js", "module": "dist/compiler-core.esm-bundler.js",
@ -32,12 +32,13 @@
}, },
"homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-core#readme", "homepage": "https://github.com/vuejs/core/tree/main/packages/compiler-core#readme",
"dependencies": { "dependencies": {
"@babel/parser": "^7.23.5", "@babel/parser": "^7.23.6",
"@vue/shared": "workspace:*", "@vue/shared": "workspace:*",
"entities": "^4.5.0",
"estree-walker": "^2.0.2", "estree-walker": "^2.0.2",
"source-map-js": "^1.0.2" "source-map-js": "^1.0.2"
}, },
"devDependencies": { "devDependencies": {
"@babel/types": "^7.23.5" "@babel/types": "^7.23.6"
} }
} }

View File

@ -1,31 +1,32 @@
import { isString } from '@vue/shared' import { isString } from '@vue/shared'
import { ForParseResult } from './transforms/vFor'
import { import {
RENDER_SLOT,
CREATE_SLOTS,
RENDER_LIST,
OPEN_BLOCK,
FRAGMENT,
WITH_DIRECTIVES,
WITH_MEMO,
CREATE_VNODE,
CREATE_ELEMENT_VNODE,
CREATE_BLOCK, CREATE_BLOCK,
CREATE_ELEMENT_BLOCK CREATE_ELEMENT_BLOCK,
CREATE_ELEMENT_VNODE,
type CREATE_SLOTS,
CREATE_VNODE,
type FRAGMENT,
OPEN_BLOCK,
type RENDER_LIST,
type RENDER_SLOT,
WITH_DIRECTIVES,
type WITH_MEMO,
} from './runtimeHelpers' } from './runtimeHelpers'
import { PropsExpression } from './transforms/transformElement' import type { PropsExpression } from './transforms/transformElement'
import { ImportItem, TransformContext } from './transform' import type { ImportItem, TransformContext } from './transform'
import type { Node as BabelNode } from '@babel/types'
// Vue template is a platform-agnostic superset of HTML (syntax only). // Vue template is a platform-agnostic superset of HTML (syntax only).
// More namespaces like SVG and MathML are declared by platform specific // More namespaces can be declared by platform specific compilers.
// compilers.
export type Namespace = number export type Namespace = number
export const enum Namespaces { export enum Namespaces {
HTML HTML,
SVG,
MATH_ML,
} }
export const enum NodeTypes { export enum NodeTypes {
ROOT, ROOT,
ELEMENT, ELEMENT,
TEXT, TEXT,
@ -56,14 +57,14 @@ export const enum NodeTypes {
JS_IF_STATEMENT, JS_IF_STATEMENT,
JS_ASSIGNMENT_EXPRESSION, JS_ASSIGNMENT_EXPRESSION,
JS_SEQUENCE_EXPRESSION, JS_SEQUENCE_EXPRESSION,
JS_RETURN_STATEMENT JS_RETURN_STATEMENT,
} }
export const enum ElementTypes { export enum ElementTypes {
ELEMENT, ELEMENT,
COMPONENT, COMPONENT,
SLOT, SLOT,
TEMPLATE TEMPLATE,
} }
export interface Node { export interface Node {
@ -102,6 +103,7 @@ export type TemplateChildNode =
export interface RootNode extends Node { export interface RootNode extends Node {
type: NodeTypes.ROOT type: NodeTypes.ROOT
source: string
children: TemplateChildNode[] children: TemplateChildNode[]
helpers: Set<symbol> helpers: Set<symbol>
components: string[] components: string[]
@ -112,6 +114,7 @@ export interface RootNode extends Node {
temps: number temps: number
ssrHelpers?: symbol[] ssrHelpers?: symbol[]
codegenNode?: TemplateChildNode | JSChildNode | BlockStatement codegenNode?: TemplateChildNode | JSChildNode | BlockStatement
transformed?: boolean
// v2 compat only // v2 compat only
filters?: string[] filters?: string[]
@ -128,9 +131,10 @@ export interface BaseElementNode extends Node {
ns: Namespace ns: Namespace
tag: string tag: string
tagType: ElementTypes tagType: ElementTypes
isSelfClosing: boolean
props: Array<AttributeNode | DirectiveNode> props: Array<AttributeNode | DirectiveNode>
children: TemplateChildNode[] children: TemplateChildNode[]
isSelfClosing?: boolean
innerLoc?: SourceLocation // only for SFC root level elements
} }
export interface PlainElementNode extends BaseElementNode { export interface PlainElementNode extends BaseElementNode {
@ -182,19 +186,28 @@ export interface CommentNode extends Node {
export interface AttributeNode extends Node { export interface AttributeNode extends Node {
type: NodeTypes.ATTRIBUTE type: NodeTypes.ATTRIBUTE
name: string name: string
nameLoc: SourceLocation
value: TextNode | undefined value: TextNode | undefined
} }
export interface DirectiveNode extends Node { export interface DirectiveNode extends Node {
type: NodeTypes.DIRECTIVE type: NodeTypes.DIRECTIVE
/**
* the normalized name without prefix or shorthands, e.g. "bind", "on"
*/
name: string name: string
/**
* the raw attribute name, preserving shorthand, and including arg & modifiers
* this is only used during parse.
*/
rawName?: string
exp: ExpressionNode | undefined exp: ExpressionNode | undefined
arg: ExpressionNode | undefined arg: ExpressionNode | undefined
modifiers: string[] modifiers: string[]
/** /**
* optional property to cache the expression parse result for v-for * optional property to cache the expression parse result for v-for
*/ */
parseResult?: ForParseResult forParseResult?: ForParseResult
} }
/** /**
@ -202,11 +215,11 @@ export interface DirectiveNode extends Node {
* Higher levels implies lower levels. e.g. a node that can be stringified * Higher levels implies lower levels. e.g. a node that can be stringified
* can always be hoisted and skipped for patch. * can always be hoisted and skipped for patch.
*/ */
export const enum ConstantTypes { export enum ConstantTypes {
NOT_CONSTANT = 0, NOT_CONSTANT = 0,
CAN_SKIP_PATCH, CAN_SKIP_PATCH,
CAN_HOIST, CAN_HOIST,
CAN_STRINGIFY CAN_STRINGIFY,
} }
export interface SimpleExpressionNode extends Node { export interface SimpleExpressionNode extends Node {
@ -214,6 +227,12 @@ export interface SimpleExpressionNode extends Node {
content: string content: string
isStatic: boolean isStatic: boolean
constType: ConstantTypes constType: ConstantTypes
/**
* - `null` means the expression is a simple identifier that doesn't need
* parsing
* - `false` means there was a parsing error
*/
ast?: BabelNode | null | false
/** /**
* Indicates this is an identifier for a hoist vnode call and points to the * Indicates this is an identifier for a hoist vnode call and points to the
* hoisted node. * hoisted node.
@ -234,6 +253,12 @@ export interface InterpolationNode extends Node {
export interface CompoundExpressionNode extends Node { export interface CompoundExpressionNode extends Node {
type: NodeTypes.COMPOUND_EXPRESSION type: NodeTypes.COMPOUND_EXPRESSION
/**
* - `null` means the expression is a simple identifier that doesn't need
* parsing
* - `false` means there was a parsing error
*/
ast?: BabelNode | null | false
children: ( children: (
| SimpleExpressionNode | SimpleExpressionNode
| CompoundExpressionNode | CompoundExpressionNode
@ -276,6 +301,14 @@ export interface ForNode extends Node {
codegenNode?: ForCodegenNode codegenNode?: ForCodegenNode
} }
export interface ForParseResult {
source: ExpressionNode
value: ExpressionNode | undefined
key: ExpressionNode | undefined
index: ExpressionNode | undefined
finalized: boolean
}
export interface TextCallNode extends Node { export interface TextCallNode extends Node {
type: NodeTypes.TEXT_CALL type: NodeTypes.TEXT_CALL
content: TextNode | InterpolationNode | CompoundExpressionNode content: TextNode | InterpolationNode | CompoundExpressionNode
@ -462,7 +495,7 @@ export interface RenderSlotCall extends CallExpression {
string, string,
string | ExpressionNode, string | ExpressionNode,
PropsExpression | '{}', PropsExpression | '{}',
TemplateChildNode[] TemplateChildNode[],
] ]
} }
@ -547,17 +580,18 @@ export interface ForIteratorExpression extends FunctionExpression {
// associated with template nodes, so their source locations are just a stub. // associated with template nodes, so their source locations are just a stub.
// Container types like CompoundExpression also don't need a real location. // Container types like CompoundExpression also don't need a real location.
export const locStub: SourceLocation = { export const locStub: SourceLocation = {
source: '',
start: { line: 1, column: 1, offset: 0 }, start: { line: 1, column: 1, offset: 0 },
end: { line: 1, column: 1, offset: 0 } end: { line: 1, column: 1, offset: 0 },
source: '',
} }
export function createRoot( export function createRoot(
children: TemplateChildNode[], children: TemplateChildNode[],
loc = locStub source = '',
): RootNode { ): RootNode {
return { return {
type: NodeTypes.ROOT, type: NodeTypes.ROOT,
source,
children, children,
helpers: new Set(), helpers: new Set(),
components: [], components: [],
@ -567,7 +601,7 @@ export function createRoot(
cached: 0, cached: 0,
temps: 0, temps: 0,
codegenNode: undefined, codegenNode: undefined,
loc loc: locStub,
} }
} }
@ -582,7 +616,7 @@ export function createVNodeCall(
isBlock: VNodeCall['isBlock'] = false, isBlock: VNodeCall['isBlock'] = false,
disableTracking: VNodeCall['disableTracking'] = false, disableTracking: VNodeCall['disableTracking'] = false,
isComponent: VNodeCall['isComponent'] = false, isComponent: VNodeCall['isComponent'] = false,
loc = locStub loc = locStub,
): VNodeCall { ): VNodeCall {
if (context) { if (context) {
if (isBlock) { if (isBlock) {
@ -607,41 +641,41 @@ export function createVNodeCall(
isBlock, isBlock,
disableTracking, disableTracking,
isComponent, isComponent,
loc loc,
} }
} }
export function createArrayExpression( export function createArrayExpression(
elements: ArrayExpression['elements'], elements: ArrayExpression['elements'],
loc: SourceLocation = locStub loc: SourceLocation = locStub,
): ArrayExpression { ): ArrayExpression {
return { return {
type: NodeTypes.JS_ARRAY_EXPRESSION, type: NodeTypes.JS_ARRAY_EXPRESSION,
loc, loc,
elements elements,
} }
} }
export function createObjectExpression( export function createObjectExpression(
properties: ObjectExpression['properties'], properties: ObjectExpression['properties'],
loc: SourceLocation = locStub loc: SourceLocation = locStub,
): ObjectExpression { ): ObjectExpression {
return { return {
type: NodeTypes.JS_OBJECT_EXPRESSION, type: NodeTypes.JS_OBJECT_EXPRESSION,
loc, loc,
properties properties,
} }
} }
export function createObjectProperty( export function createObjectProperty(
key: Property['key'] | string, key: Property['key'] | string,
value: Property['value'] value: Property['value'],
): Property { ): Property {
return { return {
type: NodeTypes.JS_PROPERTY, type: NodeTypes.JS_PROPERTY,
loc: locStub, loc: locStub,
key: isString(key) ? createSimpleExpression(key, true) : key, key: isString(key) ? createSimpleExpression(key, true) : key,
value value,
} }
} }
@ -649,38 +683,38 @@ export function createSimpleExpression(
content: SimpleExpressionNode['content'], content: SimpleExpressionNode['content'],
isStatic: SimpleExpressionNode['isStatic'] = false, isStatic: SimpleExpressionNode['isStatic'] = false,
loc: SourceLocation = locStub, loc: SourceLocation = locStub,
constType: ConstantTypes = ConstantTypes.NOT_CONSTANT constType: ConstantTypes = ConstantTypes.NOT_CONSTANT,
): SimpleExpressionNode { ): SimpleExpressionNode {
return { return {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
loc, loc,
content, content,
isStatic, isStatic,
constType: isStatic ? ConstantTypes.CAN_STRINGIFY : constType constType: isStatic ? ConstantTypes.CAN_STRINGIFY : constType,
} }
} }
export function createInterpolation( export function createInterpolation(
content: InterpolationNode['content'] | string, content: InterpolationNode['content'] | string,
loc: SourceLocation loc: SourceLocation,
): InterpolationNode { ): InterpolationNode {
return { return {
type: NodeTypes.INTERPOLATION, type: NodeTypes.INTERPOLATION,
loc, loc,
content: isString(content) content: isString(content)
? createSimpleExpression(content, false, loc) ? createSimpleExpression(content, false, loc)
: content : content,
} }
} }
export function createCompoundExpression( export function createCompoundExpression(
children: CompoundExpressionNode['children'], children: CompoundExpressionNode['children'],
loc: SourceLocation = locStub loc: SourceLocation = locStub,
): CompoundExpressionNode { ): CompoundExpressionNode {
return { return {
type: NodeTypes.COMPOUND_EXPRESSION, type: NodeTypes.COMPOUND_EXPRESSION,
loc, loc,
children children,
} }
} }
@ -691,13 +725,13 @@ type InferCodegenNodeType<T> = T extends typeof RENDER_SLOT
export function createCallExpression<T extends CallExpression['callee']>( export function createCallExpression<T extends CallExpression['callee']>(
callee: T, callee: T,
args: CallExpression['arguments'] = [], args: CallExpression['arguments'] = [],
loc: SourceLocation = locStub loc: SourceLocation = locStub,
): InferCodegenNodeType<T> { ): InferCodegenNodeType<T> {
return { return {
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
loc, loc,
callee, callee,
arguments: args arguments: args,
} as InferCodegenNodeType<T> } as InferCodegenNodeType<T>
} }
@ -706,7 +740,7 @@ export function createFunctionExpression(
returns: FunctionExpression['returns'] = undefined, returns: FunctionExpression['returns'] = undefined,
newline: boolean = false, newline: boolean = false,
isSlot: boolean = false, isSlot: boolean = false,
loc: SourceLocation = locStub loc: SourceLocation = locStub,
): FunctionExpression { ): FunctionExpression {
return { return {
type: NodeTypes.JS_FUNCTION_EXPRESSION, type: NodeTypes.JS_FUNCTION_EXPRESSION,
@ -714,7 +748,7 @@ export function createFunctionExpression(
returns, returns,
newline, newline,
isSlot, isSlot,
loc loc,
} }
} }
@ -722,7 +756,7 @@ export function createConditionalExpression(
test: ConditionalExpression['test'], test: ConditionalExpression['test'],
consequent: ConditionalExpression['consequent'], consequent: ConditionalExpression['consequent'],
alternate: ConditionalExpression['alternate'], alternate: ConditionalExpression['alternate'],
newline = true newline = true,
): ConditionalExpression { ): ConditionalExpression {
return { return {
type: NodeTypes.JS_CONDITIONAL_EXPRESSION, type: NodeTypes.JS_CONDITIONAL_EXPRESSION,
@ -730,87 +764,87 @@ export function createConditionalExpression(
consequent, consequent,
alternate, alternate,
newline, newline,
loc: locStub loc: locStub,
} }
} }
export function createCacheExpression( export function createCacheExpression(
index: number, index: number,
value: JSChildNode, value: JSChildNode,
isVNode: boolean = false isVNode: boolean = false,
): CacheExpression { ): CacheExpression {
return { return {
type: NodeTypes.JS_CACHE_EXPRESSION, type: NodeTypes.JS_CACHE_EXPRESSION,
index, index,
value, value,
isVNode, isVNode,
loc: locStub loc: locStub,
} }
} }
export function createBlockStatement( export function createBlockStatement(
body: BlockStatement['body'] body: BlockStatement['body'],
): BlockStatement { ): BlockStatement {
return { return {
type: NodeTypes.JS_BLOCK_STATEMENT, type: NodeTypes.JS_BLOCK_STATEMENT,
body, body,
loc: locStub loc: locStub,
} }
} }
export function createTemplateLiteral( export function createTemplateLiteral(
elements: TemplateLiteral['elements'] elements: TemplateLiteral['elements'],
): TemplateLiteral { ): TemplateLiteral {
return { return {
type: NodeTypes.JS_TEMPLATE_LITERAL, type: NodeTypes.JS_TEMPLATE_LITERAL,
elements, elements,
loc: locStub loc: locStub,
} }
} }
export function createIfStatement( export function createIfStatement(
test: IfStatement['test'], test: IfStatement['test'],
consequent: IfStatement['consequent'], consequent: IfStatement['consequent'],
alternate?: IfStatement['alternate'] alternate?: IfStatement['alternate'],
): IfStatement { ): IfStatement {
return { return {
type: NodeTypes.JS_IF_STATEMENT, type: NodeTypes.JS_IF_STATEMENT,
test, test,
consequent, consequent,
alternate, alternate,
loc: locStub loc: locStub,
} }
} }
export function createAssignmentExpression( export function createAssignmentExpression(
left: AssignmentExpression['left'], left: AssignmentExpression['left'],
right: AssignmentExpression['right'] right: AssignmentExpression['right'],
): AssignmentExpression { ): AssignmentExpression {
return { return {
type: NodeTypes.JS_ASSIGNMENT_EXPRESSION, type: NodeTypes.JS_ASSIGNMENT_EXPRESSION,
left, left,
right, right,
loc: locStub loc: locStub,
} }
} }
export function createSequenceExpression( export function createSequenceExpression(
expressions: SequenceExpression['expressions'] expressions: SequenceExpression['expressions'],
): SequenceExpression { ): SequenceExpression {
return { return {
type: NodeTypes.JS_SEQUENCE_EXPRESSION, type: NodeTypes.JS_SEQUENCE_EXPRESSION,
expressions, expressions,
loc: locStub loc: locStub,
} }
} }
export function createReturnStatement( export function createReturnStatement(
returns: ReturnStatement['returns'] returns: ReturnStatement['returns'],
): ReturnStatement { ): ReturnStatement {
return { return {
type: NodeTypes.JS_RETURN_STATEMENT, type: NodeTypes.JS_RETURN_STATEMENT,
returns, returns,
loc: locStub loc: locStub,
} }
} }
@ -824,7 +858,7 @@ export function getVNodeBlockHelper(ssr: boolean, isComponent: boolean) {
export function convertToBlock( export function convertToBlock(
node: VNodeCall, node: VNodeCall,
{ helper, removeHelper, inSSR }: TransformContext { helper, removeHelper, inSSR }: TransformContext,
) { ) {
if (!node.isBlock) { if (!node.isBlock) {
node.isBlock = true node.isBlock = true

View File

@ -1,12 +1,12 @@
// should only use types from @babel/types // should only use types from @babel/types
// do not import runtime methods // do not import runtime methods
import type { import type {
BlockStatement,
Function,
Identifier, Identifier,
Node, Node,
Function,
ObjectProperty, ObjectProperty,
BlockStatement, Program,
Program
} from '@babel/types' } from '@babel/types'
import { walk } from 'estree-walker' import { walk } from 'estree-walker'
@ -17,20 +17,20 @@ export function walkIdentifiers(
parent: Node, parent: Node,
parentStack: Node[], parentStack: Node[],
isReference: boolean, isReference: boolean,
isLocal: boolean isLocal: boolean,
) => void, ) => void,
includeAll = false, includeAll = false,
parentStack: Node[] = [], parentStack: Node[] = [],
knownIds: Record<string, number> = Object.create(null) knownIds: Record<string, number> = Object.create(null),
) { ) {
if (__BROWSER__) { if (__BROWSER__) {
return return
} }
const rootExp = const rootExp =
root.type === 'Program' && root.type === 'Program'
root.body[0].type === 'ExpressionStatement' && ? root.body[0].type === 'ExpressionStatement' && root.body[0].expression
root.body[0].expression : root
walk(root, { walk(root, {
enter(node: Node & { scopeIds?: Set<string> }, parent: Node | undefined) { enter(node: Node & { scopeIds?: Set<string> }, parent: Node | undefined) {
@ -55,15 +55,25 @@ export function walkIdentifiers(
// mark property in destructure pattern // mark property in destructure pattern
;(node as any).inPattern = true ;(node as any).inPattern = true
} else if (isFunctionType(node)) { } else if (isFunctionType(node)) {
if (node.scopeIds) {
node.scopeIds.forEach(id => markKnownIds(id, knownIds))
} else {
// walk function expressions and add its arguments to known identifiers // walk function expressions and add its arguments to known identifiers
// so that we don't prefix them // so that we don't prefix them
walkFunctionParams(node, id => markScopeIdentifier(node, id, knownIds)) walkFunctionParams(node, id =>
markScopeIdentifier(node, id, knownIds),
)
}
} else if (node.type === 'BlockStatement') { } else if (node.type === 'BlockStatement') {
if (node.scopeIds) {
node.scopeIds.forEach(id => markKnownIds(id, knownIds))
} else {
// #3445 record block-level local variables // #3445 record block-level local variables
walkBlockDeclarations(node, id => walkBlockDeclarations(node, id =>
markScopeIdentifier(node, id, knownIds) markScopeIdentifier(node, id, knownIds),
) )
} }
}
}, },
leave(node: Node & { scopeIds?: Set<string> }, parent: Node | undefined) { leave(node: Node & { scopeIds?: Set<string> }, parent: Node | undefined) {
parent && parentStack.pop() parent && parentStack.pop()
@ -75,14 +85,14 @@ export function walkIdentifiers(
} }
} }
} }
} },
}) })
} }
export function isReferencedIdentifier( export function isReferencedIdentifier(
id: Identifier, id: Identifier,
parent: Node | null, parent: Node | null,
parentStack: Node[] parentStack: Node[],
) { ) {
if (__BROWSER__) { if (__BROWSER__) {
return false return false
@ -117,7 +127,7 @@ export function isReferencedIdentifier(
export function isInDestructureAssignment( export function isInDestructureAssignment(
parent: Node, parent: Node,
parentStack: Node[] parentStack: Node[],
): boolean { ): boolean {
if ( if (
parent && parent &&
@ -138,7 +148,7 @@ export function isInDestructureAssignment(
export function walkFunctionParams( export function walkFunctionParams(
node: Function, node: Function,
onIdent: (id: Identifier) => void onIdent: (id: Identifier) => void,
) { ) {
for (const p of node.params) { for (const p of node.params) {
for (const id of extractIdentifiers(p)) { for (const id of extractIdentifiers(p)) {
@ -149,7 +159,7 @@ export function walkFunctionParams(
export function walkBlockDeclarations( export function walkBlockDeclarations(
block: BlockStatement | Program, block: BlockStatement | Program,
onIdent: (node: Identifier) => void onIdent: (node: Identifier) => void,
) { ) {
for (const stmt of block.body) { for (const stmt of block.body) {
if (stmt.type === 'VariableDeclaration') { if (stmt.type === 'VariableDeclaration') {
@ -184,7 +194,7 @@ export function walkBlockDeclarations(
export function extractIdentifiers( export function extractIdentifiers(
param: Node, param: Node,
nodes: Identifier[] = [] nodes: Identifier[] = [],
): Identifier[] { ): Identifier[] {
switch (param.type) { switch (param.type) {
case 'Identifier': case 'Identifier':
@ -227,20 +237,24 @@ export function extractIdentifiers(
return nodes return nodes
} }
function markScopeIdentifier( function markKnownIds(name: string, knownIds: Record<string, number>) {
node: Node & { scopeIds?: Set<string> },
child: Identifier,
knownIds: Record<string, number>
) {
const { name } = child
if (node.scopeIds && node.scopeIds.has(name)) {
return
}
if (name in knownIds) { if (name in knownIds) {
knownIds[name]++ knownIds[name]++
} else { } else {
knownIds[name] = 1 knownIds[name] = 1
} }
}
function markScopeIdentifier(
node: Node & { scopeIds?: Set<string> },
child: Identifier,
knownIds: Record<string, number>,
) {
const { name } = child
if (node.scopeIds && node.scopeIds.has(name)) {
return
}
markKnownIds(name, knownIds)
;(node.scopeIds || (node.scopeIds = new Set())).add(name) ;(node.scopeIds || (node.scopeIds = new Set())).add(name)
} }
@ -439,5 +453,13 @@ export const TS_NODE_TYPES = [
'TSTypeAssertion', // (<number>foo) 'TSTypeAssertion', // (<number>foo)
'TSNonNullExpression', // foo! 'TSNonNullExpression', // foo!
'TSInstantiationExpression', // foo<string> 'TSInstantiationExpression', // foo<string>
'TSSatisfiesExpression' // foo satisfies T 'TSSatisfiesExpression', // foo satisfies T
] ]
export function unwrapTSNode(node: Node): Node {
if (TS_NODE_TYPES.includes(node.type)) {
return unwrapTSNode((node as any).expression)
} else {
return node
}
}

View File

@ -1,60 +1,60 @@
import { CodegenOptions } from './options' import type { CodegenOptions } from './options'
import { import {
RootNode, type ArrayExpression,
TemplateChildNode, type AssignmentExpression,
TextNode, type CacheExpression,
CommentNode, type CallExpression,
ExpressionNode, type CommentNode,
type CompoundExpressionNode,
type ConditionalExpression,
type ExpressionNode,
type FunctionExpression,
type IfStatement,
type InterpolationNode,
type JSChildNode,
NodeTypes, NodeTypes,
JSChildNode, type ObjectExpression,
CallExpression, type Position,
ArrayExpression, type ReturnStatement,
ObjectExpression, type RootNode,
Position, type SSRCodegenNode,
InterpolationNode, type SequenceExpression,
CompoundExpressionNode, type SimpleExpressionNode,
SimpleExpressionNode, type TemplateChildNode,
FunctionExpression, type TemplateLiteral,
ConditionalExpression, type TextNode,
CacheExpression, type VNodeCall,
locStub,
SSRCodegenNode,
TemplateLiteral,
IfStatement,
AssignmentExpression,
ReturnStatement,
VNodeCall,
SequenceExpression,
getVNodeBlockHelper, getVNodeBlockHelper,
getVNodeHelper getVNodeHelper,
locStub,
} from './ast' } from './ast'
import { SourceMapGenerator, RawSourceMap } from 'source-map-js' import { type RawSourceMap, SourceMapGenerator } from 'source-map-js'
import { import {
advancePositionWithMutation, advancePositionWithMutation,
assert, assert,
isSimpleIdentifier, isSimpleIdentifier,
toValidAssetId toValidAssetId,
} from './utils' } from './utils'
import { isString, isArray, isSymbol } from '@vue/shared' import { isArray, isString, isSymbol } from '@vue/shared'
import { import {
helperNameMap, CREATE_COMMENT,
TO_DISPLAY_STRING, CREATE_ELEMENT_VNODE,
CREATE_STATIC,
CREATE_TEXT,
CREATE_VNODE, CREATE_VNODE,
OPEN_BLOCK,
POP_SCOPE_ID,
PUSH_SCOPE_ID,
RESOLVE_COMPONENT, RESOLVE_COMPONENT,
RESOLVE_DIRECTIVE, RESOLVE_DIRECTIVE,
RESOLVE_FILTER,
SET_BLOCK_TRACKING, SET_BLOCK_TRACKING,
CREATE_COMMENT, TO_DISPLAY_STRING,
CREATE_TEXT,
PUSH_SCOPE_ID,
POP_SCOPE_ID,
WITH_DIRECTIVES,
CREATE_ELEMENT_VNODE,
OPEN_BLOCK,
CREATE_STATIC,
WITH_CTX, WITH_CTX,
RESOLVE_FILTER WITH_DIRECTIVES,
helperNameMap,
} from './runtimeHelpers' } from './runtimeHelpers'
import { ImportItem } from './transform' import type { ImportItem } from './transform'
const PURE_ANNOTATION = `/*#__PURE__*/` const PURE_ANNOTATION = `/*#__PURE__*/`
@ -69,6 +69,13 @@ export interface CodegenResult {
map?: RawSourceMap map?: RawSourceMap
} }
enum NewlineType {
Start = 0,
End = -1,
None = -2,
Unknown = -3,
}
export interface CodegenContext export interface CodegenContext
extends Omit<Required<CodegenOptions>, 'bindingMetadata' | 'inline'> { extends Omit<Required<CodegenOptions>, 'bindingMetadata' | 'inline'> {
source: string source: string
@ -80,7 +87,7 @@ export interface CodegenContext
pure: boolean pure: boolean
map?: SourceMapGenerator map?: SourceMapGenerator
helper(key: symbol): string helper(key: symbol): string
push(code: string, node?: CodegenNode): void push(code: string, newlineIndex?: number, node?: CodegenNode): void
indent(): void indent(): void
deindent(withoutNewLine?: boolean): void deindent(withoutNewLine?: boolean): void
newline(): void newline(): void
@ -100,8 +107,8 @@ function createCodegenContext(
ssrRuntimeModuleName = 'vue/server-renderer', ssrRuntimeModuleName = 'vue/server-renderer',
ssr = false, ssr = false,
isTS = false, isTS = false,
inSSR = false inSSR = false,
}: CodegenOptions }: CodegenOptions,
): CodegenContext { ): CodegenContext {
const context: CodegenContext = { const context: CodegenContext = {
mode, mode,
@ -116,7 +123,7 @@ function createCodegenContext(
ssr, ssr,
isTS, isTS,
inSSR, inSSR,
source: ast.loc.source, source: ast.source,
code: ``, code: ``,
column: 1, column: 1,
line: 1, line: 1,
@ -127,7 +134,7 @@ function createCodegenContext(
helper(key) { helper(key) {
return `_${helperNameMap[key]}` return `_${helperNameMap[key]}`
}, },
push(code, node) { push(code, newlineIndex = NewlineType.None, node) {
context.code += code context.code += code
if (!__BROWSER__ && context.map) { if (!__BROWSER__ && context.map) {
if (node) { if (node) {
@ -140,7 +147,41 @@ function createCodegenContext(
} }
addMapping(node.loc.start, name) addMapping(node.loc.start, name)
} }
if (newlineIndex === NewlineType.Unknown) {
// multiple newlines, full iteration
advancePositionWithMutation(context, code) advancePositionWithMutation(context, code)
} else {
// fast paths
context.offset += code.length
if (newlineIndex === NewlineType.None) {
// no newlines; fast path to avoid newline detection
if (__TEST__ && code.includes('\n')) {
throw new Error(
`CodegenContext.push() called newlineIndex: none, but contains` +
`newlines: ${code.replace(/\n/g, '\\n')}`,
)
}
context.column += code.length
} else {
// single newline at known index
if (newlineIndex === NewlineType.End) {
newlineIndex = code.length - 1
}
if (
__TEST__ &&
(code.charAt(newlineIndex) !== '\n' ||
code.slice(0, newlineIndex).includes('\n') ||
code.slice(newlineIndex + 1).includes('\n'))
) {
throw new Error(
`CodegenContext.push() called with newlineIndex: ${newlineIndex} ` +
`but does not conform: ${code.replace(/\n/g, '\\n')}`,
)
}
context.line++
context.column = code.length - newlineIndex
}
}
if (node && node.loc !== locStub) { if (node && node.loc !== locStub) {
addMapping(node.loc.end) addMapping(node.loc.end)
} }
@ -158,32 +199,35 @@ function createCodegenContext(
}, },
newline() { newline() {
newline(context.indentLevel) newline(context.indentLevel)
} },
} }
function newline(n: number) { function newline(n: number) {
context.push('\n' + ` `.repeat(n)) context.push('\n' + ` `.repeat(n), NewlineType.Start)
} }
function addMapping(loc: Position, name?: string) { function addMapping(loc: Position, name: string | null = null) {
context.map!.addMapping({ // we use the private property to directly add the mapping
// because the addMapping() implementation in source-map-js has a bunch of
// unnecessary arg and validation checks that are pure overhead in our case.
const { _names, _mappings } = context.map!
if (name !== null && !_names.has(name)) _names.add(name)
_mappings.add({
originalLine: loc.line,
originalColumn: loc.column - 1, // source-map column is 0 based
generatedLine: context.line,
generatedColumn: context.column - 1,
source: filename,
// @ts-expect-error it is possible to be null
name, name,
source: context.filename,
original: {
line: loc.line,
column: loc.column - 1 // source-map column is 0 based
},
generated: {
line: context.line,
column: context.column - 1
}
}) })
} }
if (!__BROWSER__ && sourceMap) { if (!__BROWSER__ && sourceMap) {
// lazy require source-map implementation, only in non-browser builds // lazy require source-map implementation, only in non-browser builds
context.map = new SourceMapGenerator() context.map = new SourceMapGenerator()
context.map!.setSourceContent(filename, context.source) context.map.setSourceContent(filename, context.source)
context.map._sources.add(filename)
} }
return context return context
@ -193,7 +237,7 @@ export function generate(
ast: RootNode, ast: RootNode,
options: CodegenOptions & { options: CodegenOptions & {
onContextCreated?: (context: CodegenContext) => void onContextCreated?: (context: CodegenContext) => void
} = {} } = {},
): CodegenResult { ): CodegenResult {
const context = createCodegenContext(ast, options) const context = createCodegenContext(ast, options)
if (options.onContextCreated) options.onContextCreated(context) if (options.onContextCreated) options.onContextCreated(context)
@ -205,7 +249,7 @@ export function generate(
deindent, deindent,
newline, newline,
scopeId, scopeId,
ssr ssr,
} = context } = context
const helpers = Array.from(ast.helpers) const helpers = Array.from(ast.helpers)
@ -250,8 +294,10 @@ export function generate(
// function mode const declarations should be inside with block // function mode const declarations should be inside with block
// also they should be renamed to avoid collision with user properties // also they should be renamed to avoid collision with user properties
if (hasHelpers) { if (hasHelpers) {
push(`const { ${helpers.map(aliasHelper).join(', ')} } = _Vue`) push(
push(`\n`) `const { ${helpers.map(aliasHelper).join(', ')} } = _Vue\n`,
NewlineType.End,
)
newline() newline()
} }
} }
@ -282,7 +328,7 @@ export function generate(
} }
} }
if (ast.components.length || ast.directives.length || ast.temps) { if (ast.components.length || ast.directives.length || ast.temps) {
push(`\n`) push(`\n`, NewlineType.Start)
newline() newline()
} }
@ -308,8 +354,7 @@ export function generate(
ast, ast,
code: context.code, code: context.code,
preamble: isSetupInlined ? preambleContext.code : ``, preamble: isSetupInlined ? preambleContext.code : ``,
// SourceMapGenerator does have toJSON() method but it's not in the types map: context.map ? context.map.toJSON() : undefined,
map: context.map ? (context.map as any).toJSON() : undefined
} }
} }
@ -321,7 +366,7 @@ function genFunctionPreamble(ast: RootNode, context: CodegenContext) {
newline, newline,
runtimeModuleName, runtimeModuleName,
runtimeGlobalName, runtimeGlobalName,
ssrRuntimeModuleName ssrRuntimeModuleName,
} = context } = context
const VueBinding = const VueBinding =
!__BROWSER__ && ssr !__BROWSER__ && ssr
@ -334,11 +379,14 @@ function genFunctionPreamble(ast: RootNode, context: CodegenContext) {
const helpers = Array.from(ast.helpers) const helpers = Array.from(ast.helpers)
if (helpers.length > 0) { if (helpers.length > 0) {
if (!__BROWSER__ && prefixIdentifiers) { if (!__BROWSER__ && prefixIdentifiers) {
push(`const { ${helpers.map(aliasHelper).join(', ')} } = ${VueBinding}\n`) push(
`const { ${helpers.map(aliasHelper).join(', ')} } = ${VueBinding}\n`,
NewlineType.End,
)
} else { } else {
// "with" mode. // "with" mode.
// save Vue in a separate variable to avoid collision // save Vue in a separate variable to avoid collision
push(`const _Vue = ${VueBinding}\n`) push(`const _Vue = ${VueBinding}\n`, NewlineType.End)
// in "with" mode, helpers are declared inside the with block to avoid // in "with" mode, helpers are declared inside the with block to avoid
// has check cost, but hoists are lifted out of the function - we need // has check cost, but hoists are lifted out of the function - we need
// to provide the helper here. // to provide the helper here.
@ -348,12 +396,12 @@ function genFunctionPreamble(ast: RootNode, context: CodegenContext) {
CREATE_ELEMENT_VNODE, CREATE_ELEMENT_VNODE,
CREATE_COMMENT, CREATE_COMMENT,
CREATE_TEXT, CREATE_TEXT,
CREATE_STATIC CREATE_STATIC,
] ]
.filter(helper => helpers.includes(helper)) .filter(helper => helpers.includes(helper))
.map(aliasHelper) .map(aliasHelper)
.join(', ') .join(', ')
push(`const { ${staticHelpers} } = _Vue\n`) push(`const { ${staticHelpers} } = _Vue\n`, NewlineType.End)
} }
} }
} }
@ -363,7 +411,8 @@ function genFunctionPreamble(ast: RootNode, context: CodegenContext) {
push( push(
`const { ${ast.ssrHelpers `const { ${ast.ssrHelpers
.map(aliasHelper) .map(aliasHelper)
.join(', ')} } = require("${ssrRuntimeModuleName}")\n` .join(', ')} } = require("${ssrRuntimeModuleName}")\n`,
NewlineType.End,
) )
} }
genHoists(ast.hoists, context) genHoists(ast.hoists, context)
@ -375,14 +424,14 @@ function genModulePreamble(
ast: RootNode, ast: RootNode,
context: CodegenContext, context: CodegenContext,
genScopeId: boolean, genScopeId: boolean,
inline?: boolean inline?: boolean,
) { ) {
const { const {
push, push,
newline, newline,
optimizeImports, optimizeImports,
runtimeModuleName, runtimeModuleName,
ssrRuntimeModuleName ssrRuntimeModuleName,
} = context } = context
if (genScopeId && ast.hoists.length) { if (genScopeId && ast.hoists.length) {
@ -402,18 +451,21 @@ function genModulePreamble(
push( push(
`import { ${helpers `import { ${helpers
.map(s => helperNameMap[s]) .map(s => helperNameMap[s])
.join(', ')} } from ${JSON.stringify(runtimeModuleName)}\n` .join(', ')} } from ${JSON.stringify(runtimeModuleName)}\n`,
NewlineType.End,
) )
push( push(
`\n// Binding optimization for webpack code-split\nconst ${helpers `\n// Binding optimization for webpack code-split\nconst ${helpers
.map(s => `_${helperNameMap[s]} = ${helperNameMap[s]}`) .map(s => `_${helperNameMap[s]} = ${helperNameMap[s]}`)
.join(', ')}\n` .join(', ')}\n`,
NewlineType.End,
) )
} else { } else {
push( push(
`import { ${helpers `import { ${helpers
.map(s => `${helperNameMap[s]} as _${helperNameMap[s]}`) .map(s => `${helperNameMap[s]} as _${helperNameMap[s]}`)
.join(', ')} } from ${JSON.stringify(runtimeModuleName)}\n` .join(', ')} } from ${JSON.stringify(runtimeModuleName)}\n`,
NewlineType.End,
) )
} }
} }
@ -422,7 +474,8 @@ function genModulePreamble(
push( push(
`import { ${ast.ssrHelpers `import { ${ast.ssrHelpers
.map(s => `${helperNameMap[s]} as _${helperNameMap[s]}`) .map(s => `${helperNameMap[s]} as _${helperNameMap[s]}`)
.join(', ')} } from "${ssrRuntimeModuleName}"\n` .join(', ')} } from "${ssrRuntimeModuleName}"\n`,
NewlineType.End,
) )
} }
@ -442,14 +495,14 @@ function genModulePreamble(
function genAssets( function genAssets(
assets: string[], assets: string[],
type: 'component' | 'directive' | 'filter', type: 'component' | 'directive' | 'filter',
{ helper, push, newline, isTS }: CodegenContext { helper, push, newline, isTS }: CodegenContext,
) { ) {
const resolver = helper( const resolver = helper(
__COMPAT__ && type === 'filter' __COMPAT__ && type === 'filter'
? RESOLVE_FILTER ? RESOLVE_FILTER
: type === 'component' : type === 'component'
? RESOLVE_COMPONENT ? RESOLVE_COMPONENT
: RESOLVE_DIRECTIVE : RESOLVE_DIRECTIVE,
) )
for (let i = 0; i < assets.length; i++) { for (let i = 0; i < assets.length; i++) {
let id = assets[i] let id = assets[i]
@ -461,7 +514,7 @@ function genAssets(
push( push(
`const ${toValidAssetId(id, type)} = ${resolver}(${JSON.stringify(id)}${ `const ${toValidAssetId(id, type)} = ${resolver}(${JSON.stringify(id)}${
maybeSelfReference ? `, true` : `` maybeSelfReference ? `, true` : ``
})${isTS ? `!` : ``}` })${isTS ? `!` : ``}`,
) )
if (i < assets.length - 1) { if (i < assets.length - 1) {
newline() newline()
@ -482,8 +535,8 @@ function genHoists(hoists: (JSChildNode | null)[], context: CodegenContext) {
if (genScopeId) { if (genScopeId) {
push( push(
`const _withScopeId = n => (${helper( `const _withScopeId = n => (${helper(
PUSH_SCOPE_ID PUSH_SCOPE_ID,
)}("${scopeId}"),n=n(),${helper(POP_SCOPE_ID)}(),n)` )}("${scopeId}"),n=n(),${helper(POP_SCOPE_ID)}(),n)`,
) )
newline() newline()
} }
@ -495,7 +548,7 @@ function genHoists(hoists: (JSChildNode | null)[], context: CodegenContext) {
push( push(
`const _hoisted_${i + 1} = ${ `const _hoisted_${i + 1} = ${
needScopeIdWrapper ? `${PURE_ANNOTATION} _withScopeId(() => ` : `` needScopeIdWrapper ? `${PURE_ANNOTATION} _withScopeId(() => ` : ``
}` }`,
) )
genNode(exp, context) genNode(exp, context)
if (needScopeIdWrapper) { if (needScopeIdWrapper) {
@ -532,7 +585,7 @@ function isText(n: string | CodegenNode) {
function genNodeListAsArray( function genNodeListAsArray(
nodes: (string | CodegenNode | TemplateChildNode[])[], nodes: (string | CodegenNode | TemplateChildNode[])[],
context: CodegenContext context: CodegenContext,
) { ) {
const multilines = const multilines =
nodes.length > 3 || nodes.length > 3 ||
@ -548,13 +601,13 @@ function genNodeList(
nodes: (string | symbol | CodegenNode | TemplateChildNode[])[], nodes: (string | symbol | CodegenNode | TemplateChildNode[])[],
context: CodegenContext, context: CodegenContext,
multilines: boolean = false, multilines: boolean = false,
comma: boolean = true comma: boolean = true,
) { ) {
const { push, newline } = context const { push, newline } = context
for (let i = 0; i < nodes.length; i++) { for (let i = 0; i < nodes.length; i++) {
const node = nodes[i] const node = nodes[i]
if (isString(node)) { if (isString(node)) {
push(node) push(node, NewlineType.Unknown)
} else if (isArray(node)) { } else if (isArray(node)) {
genNodeListAsArray(node, context) genNodeListAsArray(node, context)
} else { } else {
@ -573,7 +626,7 @@ function genNodeList(
function genNode(node: CodegenNode | symbol | string, context: CodegenContext) { function genNode(node: CodegenNode | symbol | string, context: CodegenContext) {
if (isString(node)) { if (isString(node)) {
context.push(node) context.push(node, NewlineType.Unknown)
return return
} }
if (isSymbol(node)) { if (isSymbol(node)) {
@ -588,7 +641,7 @@ function genNode(node: CodegenNode | symbol | string, context: CodegenContext) {
assert( assert(
node.codegenNode != null, node.codegenNode != null,
`Codegen node is missing for element/if/for node. ` + `Codegen node is missing for element/if/for node. ` +
`Apply appropriate transforms first.` `Apply appropriate transforms first.`,
) )
genNode(node.codegenNode!, context) genNode(node.codegenNode!, context)
break break
@ -669,14 +722,18 @@ function genNode(node: CodegenNode | symbol | string, context: CodegenContext) {
function genText( function genText(
node: TextNode | SimpleExpressionNode, node: TextNode | SimpleExpressionNode,
context: CodegenContext context: CodegenContext,
) { ) {
context.push(JSON.stringify(node.content), node) context.push(JSON.stringify(node.content), NewlineType.Unknown, node)
} }
function genExpression(node: SimpleExpressionNode, context: CodegenContext) { function genExpression(node: SimpleExpressionNode, context: CodegenContext) {
const { content, isStatic } = node const { content, isStatic } = node
context.push(isStatic ? JSON.stringify(content) : content, node) context.push(
isStatic ? JSON.stringify(content) : content,
NewlineType.Unknown,
node,
)
} }
function genInterpolation(node: InterpolationNode, context: CodegenContext) { function genInterpolation(node: InterpolationNode, context: CodegenContext) {
@ -689,12 +746,12 @@ function genInterpolation(node: InterpolationNode, context: CodegenContext) {
function genCompoundExpression( function genCompoundExpression(
node: CompoundExpressionNode, node: CompoundExpressionNode,
context: CodegenContext context: CodegenContext,
) { ) {
for (let i = 0; i < node.children!.length; i++) { for (let i = 0; i < node.children!.length; i++) {
const child = node.children![i] const child = node.children![i]
if (isString(child)) { if (isString(child)) {
context.push(child) context.push(child, NewlineType.Unknown)
} else { } else {
genNode(child, context) genNode(child, context)
} }
@ -703,7 +760,7 @@ function genCompoundExpression(
function genExpressionAsPropertyKey( function genExpressionAsPropertyKey(
node: ExpressionNode, node: ExpressionNode,
context: CodegenContext context: CodegenContext,
) { ) {
const { push } = context const { push } = context
if (node.type === NodeTypes.COMPOUND_EXPRESSION) { if (node.type === NodeTypes.COMPOUND_EXPRESSION) {
@ -715,9 +772,9 @@ function genExpressionAsPropertyKey(
const text = isSimpleIdentifier(node.content) const text = isSimpleIdentifier(node.content)
? node.content ? node.content
: JSON.stringify(node.content) : JSON.stringify(node.content)
push(text, node) push(text, NewlineType.None, node)
} else { } else {
push(`[${node.content}]`, node) push(`[${node.content}]`, NewlineType.Unknown, node)
} }
} }
@ -726,7 +783,11 @@ function genComment(node: CommentNode, context: CodegenContext) {
if (pure) { if (pure) {
push(PURE_ANNOTATION) push(PURE_ANNOTATION)
} }
push(`${helper(CREATE_COMMENT)}(${JSON.stringify(node.content)})`, node) push(
`${helper(CREATE_COMMENT)}(${JSON.stringify(node.content)})`,
NewlineType.Unknown,
node,
)
} }
function genVNodeCall(node: VNodeCall, context: CodegenContext) { function genVNodeCall(node: VNodeCall, context: CodegenContext) {
@ -740,7 +801,7 @@ function genVNodeCall(node: VNodeCall, context: CodegenContext) {
directives, directives,
isBlock, isBlock,
disableTracking, disableTracking,
isComponent isComponent,
} = node } = node
if (directives) { if (directives) {
push(helper(WITH_DIRECTIVES) + `(`) push(helper(WITH_DIRECTIVES) + `(`)
@ -754,10 +815,10 @@ function genVNodeCall(node: VNodeCall, context: CodegenContext) {
const callHelper: symbol = isBlock const callHelper: symbol = isBlock
? getVNodeBlockHelper(context.inSSR, isComponent) ? getVNodeBlockHelper(context.inSSR, isComponent)
: getVNodeHelper(context.inSSR, isComponent) : getVNodeHelper(context.inSSR, isComponent)
push(helper(callHelper) + `(`, node) push(helper(callHelper) + `(`, NewlineType.None, node)
genNodeList( genNodeList(
genNullableArgs([tag, props, children, patchFlag, dynamicProps]), genNullableArgs([tag, props, children, patchFlag, dynamicProps]),
context context,
) )
push(`)`) push(`)`)
if (isBlock) { if (isBlock) {
@ -785,7 +846,7 @@ function genCallExpression(node: CallExpression, context: CodegenContext) {
if (pure) { if (pure) {
push(PURE_ANNOTATION) push(PURE_ANNOTATION)
} }
push(callee + `(`, node) push(callee + `(`, NewlineType.None, node)
genNodeList(node.arguments, context) genNodeList(node.arguments, context)
push(`)`) push(`)`)
} }
@ -794,7 +855,7 @@ function genObjectExpression(node: ObjectExpression, context: CodegenContext) {
const { push, indent, deindent, newline } = context const { push, indent, deindent, newline } = context
const { properties } = node const { properties } = node
if (!properties.length) { if (!properties.length) {
push(`{}`, node) push(`{}`, NewlineType.None, node)
return return
} }
const multilines = const multilines =
@ -826,7 +887,7 @@ function genArrayExpression(node: ArrayExpression, context: CodegenContext) {
function genFunctionExpression( function genFunctionExpression(
node: FunctionExpression, node: FunctionExpression,
context: CodegenContext context: CodegenContext,
) { ) {
const { push, indent, deindent } = context const { push, indent, deindent } = context
const { params, returns, body, newline, isSlot } = node const { params, returns, body, newline, isSlot } = node
@ -834,7 +895,7 @@ function genFunctionExpression(
// wrap slot functions with owner context // wrap slot functions with owner context
push(`_${helperNameMap[WITH_CTX]}(`) push(`_${helperNameMap[WITH_CTX]}(`)
} }
push(`(`, node) push(`(`, NewlineType.None, node)
if (isArray(params)) { if (isArray(params)) {
genNodeList(params, context) genNodeList(params, context)
} else if (params) { } else if (params) {
@ -871,7 +932,7 @@ function genFunctionExpression(
function genConditionalExpression( function genConditionalExpression(
node: ConditionalExpression, node: ConditionalExpression,
context: CodegenContext context: CodegenContext,
) { ) {
const { test, consequent, alternate, newline: needNewline } = node const { test, consequent, alternate, newline: needNewline } = node
const { push, indent, deindent, newline } = context const { push, indent, deindent, newline } = context
@ -934,7 +995,7 @@ function genTemplateLiteral(node: TemplateLiteral, context: CodegenContext) {
for (let i = 0; i < l; i++) { for (let i = 0; i < l; i++) {
const e = node.elements[i] const e = node.elements[i]
if (isString(e)) { if (isString(e)) {
push(e.replace(/(`|\$|\\)/g, '\\$1')) push(e.replace(/(`|\$|\\)/g, '\\$1'), NewlineType.Unknown)
} else { } else {
push('${') push('${')
if (multilines) indent() if (multilines) indent()
@ -972,7 +1033,7 @@ function genIfStatement(node: IfStatement, context: CodegenContext) {
function genAssignmentExpression( function genAssignmentExpression(
node: AssignmentExpression, node: AssignmentExpression,
context: CodegenContext context: CodegenContext,
) { ) {
genNode(node.left, context) genNode(node.left, context)
context.push(` = `) context.push(` = `)
@ -981,7 +1042,7 @@ function genAssignmentExpression(
function genSequenceExpression( function genSequenceExpression(
node: SequenceExpression, node: SequenceExpression,
context: CodegenContext context: CodegenContext,
) { ) {
context.push(`(`) context.push(`(`)
genNodeList(node.expressions, context) genNodeList(node.expressions, context)
@ -990,7 +1051,7 @@ function genSequenceExpression(
function genReturnStatement( function genReturnStatement(
{ returns }: ReturnStatement, { returns }: ReturnStatement,
context: CodegenContext context: CodegenContext,
) { ) {
context.push(`return `) context.push(`return `)
if (isArray(returns)) { if (isArray(returns)) {

View File

@ -1,7 +1,7 @@
import { SourceLocation } from '../ast' import type { SourceLocation } from '../ast'
import { CompilerError } from '../errors' import type { CompilerError } from '../errors'
import { ParserContext } from '../parse' import type { MergedParserOptions } from '../parser'
import { TransformContext } from '../transform' import type { TransformContext } from '../transform'
export type CompilerCompatConfig = Partial< export type CompilerCompatConfig = Partial<
Record<CompilerDeprecationTypes, boolean | 'suppress-warning'> Record<CompilerDeprecationTypes, boolean | 'suppress-warning'>
@ -13,16 +13,15 @@ export interface CompilerCompatOptions {
compatConfig?: CompilerCompatConfig compatConfig?: CompilerCompatConfig
} }
export const enum CompilerDeprecationTypes { export enum CompilerDeprecationTypes {
COMPILER_IS_ON_ELEMENT = 'COMPILER_IS_ON_ELEMENT', COMPILER_IS_ON_ELEMENT = 'COMPILER_IS_ON_ELEMENT',
COMPILER_V_BIND_SYNC = 'COMPILER_V_BIND_SYNC', COMPILER_V_BIND_SYNC = 'COMPILER_V_BIND_SYNC',
COMPILER_V_BIND_PROP = 'COMPILER_V_BIND_PROP',
COMPILER_V_BIND_OBJECT_ORDER = 'COMPILER_V_BIND_OBJECT_ORDER', COMPILER_V_BIND_OBJECT_ORDER = 'COMPILER_V_BIND_OBJECT_ORDER',
COMPILER_V_ON_NATIVE = 'COMPILER_V_ON_NATIVE', COMPILER_V_ON_NATIVE = 'COMPILER_V_ON_NATIVE',
COMPILER_V_IF_V_FOR_PRECEDENCE = 'COMPILER_V_IF_V_FOR_PRECEDENCE', COMPILER_V_IF_V_FOR_PRECEDENCE = 'COMPILER_V_IF_V_FOR_PRECEDENCE',
COMPILER_NATIVE_TEMPLATE = 'COMPILER_NATIVE_TEMPLATE', COMPILER_NATIVE_TEMPLATE = 'COMPILER_NATIVE_TEMPLATE',
COMPILER_INLINE_TEMPLATE = 'COMPILER_INLINE_TEMPLATE', COMPILER_INLINE_TEMPLATE = 'COMPILER_INLINE_TEMPLATE',
COMPILER_FILTERS = 'COMPILER_FILTER' COMPILER_FILTERS = 'COMPILER_FILTERS',
} }
type DeprecationData = { type DeprecationData = {
@ -36,7 +35,7 @@ const deprecationData: Record<CompilerDeprecationTypes, DeprecationData> = {
`Platform-native elements with "is" prop will no longer be ` + `Platform-native elements with "is" prop will no longer be ` +
`treated as components in Vue 3 unless the "is" value is explicitly ` + `treated as components in Vue 3 unless the "is" value is explicitly ` +
`prefixed with "vue:".`, `prefixed with "vue:".`,
link: `https://v3-migration.vuejs.org/breaking-changes/custom-elements-interop.html` link: `https://v3-migration.vuejs.org/breaking-changes/custom-elements-interop.html`,
}, },
[CompilerDeprecationTypes.COMPILER_V_BIND_SYNC]: { [CompilerDeprecationTypes.COMPILER_V_BIND_SYNC]: {
@ -44,13 +43,7 @@ const deprecationData: Record<CompilerDeprecationTypes, DeprecationData> = {
`.sync modifier for v-bind has been removed. Use v-model with ` + `.sync modifier for v-bind has been removed. Use v-model with ` +
`argument instead. \`v-bind:${key}.sync\` should be changed to ` + `argument instead. \`v-bind:${key}.sync\` should be changed to ` +
`\`v-model:${key}\`.`, `\`v-model:${key}\`.`,
link: `https://v3-migration.vuejs.org/breaking-changes/v-model.html` link: `https://v3-migration.vuejs.org/breaking-changes/v-model.html`,
},
[CompilerDeprecationTypes.COMPILER_V_BIND_PROP]: {
message:
`.prop modifier for v-bind has been removed and no longer necessary. ` +
`Vue 3 will automatically set a binding as DOM property when appropriate.`
}, },
[CompilerDeprecationTypes.COMPILER_V_BIND_OBJECT_ORDER]: { [CompilerDeprecationTypes.COMPILER_V_BIND_OBJECT_ORDER]: {
@ -60,12 +53,12 @@ const deprecationData: Record<CompilerDeprecationTypes, DeprecationData> = {
`that appears before v-bind in the case of conflict. ` + `that appears before v-bind in the case of conflict. ` +
`To retain 2.x behavior, move v-bind to make it the first attribute. ` + `To retain 2.x behavior, move v-bind to make it the first attribute. ` +
`You can also suppress this warning if the usage is intended.`, `You can also suppress this warning if the usage is intended.`,
link: `https://v3-migration.vuejs.org/breaking-changes/v-bind.html` link: `https://v3-migration.vuejs.org/breaking-changes/v-bind.html`,
}, },
[CompilerDeprecationTypes.COMPILER_V_ON_NATIVE]: { [CompilerDeprecationTypes.COMPILER_V_ON_NATIVE]: {
message: `.native modifier for v-on has been removed as is no longer necessary.`, message: `.native modifier for v-on has been removed as is no longer necessary.`,
link: `https://v3-migration.vuejs.org/breaking-changes/v-on-native-modifier-removed.html` link: `https://v3-migration.vuejs.org/breaking-changes/v-on-native-modifier-removed.html`,
}, },
[CompilerDeprecationTypes.COMPILER_V_IF_V_FOR_PRECEDENCE]: { [CompilerDeprecationTypes.COMPILER_V_IF_V_FOR_PRECEDENCE]: {
@ -75,18 +68,18 @@ const deprecationData: Record<CompilerDeprecationTypes, DeprecationData> = {
`access to v-for scope variables. It is best to avoid the ambiguity ` + `access to v-for scope variables. It is best to avoid the ambiguity ` +
`with <template> tags or use a computed property that filters v-for ` + `with <template> tags or use a computed property that filters v-for ` +
`data source.`, `data source.`,
link: `https://v3-migration.vuejs.org/breaking-changes/v-if-v-for.html` link: `https://v3-migration.vuejs.org/breaking-changes/v-if-v-for.html`,
}, },
[CompilerDeprecationTypes.COMPILER_NATIVE_TEMPLATE]: { [CompilerDeprecationTypes.COMPILER_NATIVE_TEMPLATE]: {
message: message:
`<template> with no special directives will render as a native template ` + `<template> with no special directives will render as a native template ` +
`element instead of its inner content in Vue 3.` `element instead of its inner content in Vue 3.`,
}, },
[CompilerDeprecationTypes.COMPILER_INLINE_TEMPLATE]: { [CompilerDeprecationTypes.COMPILER_INLINE_TEMPLATE]: {
message: `"inline-template" has been removed in Vue 3.`, message: `"inline-template" has been removed in Vue 3.`,
link: `https://v3-migration.vuejs.org/breaking-changes/inline-template-attribute.html` link: `https://v3-migration.vuejs.org/breaking-changes/inline-template-attribute.html`,
}, },
[CompilerDeprecationTypes.COMPILER_FILTERS]: { [CompilerDeprecationTypes.COMPILER_FILTERS]: {
@ -94,18 +87,15 @@ const deprecationData: Record<CompilerDeprecationTypes, DeprecationData> = {
`filters have been removed in Vue 3. ` + `filters have been removed in Vue 3. ` +
`The "|" symbol will be treated as native JavaScript bitwise OR operator. ` + `The "|" symbol will be treated as native JavaScript bitwise OR operator. ` +
`Use method calls or computed properties instead.`, `Use method calls or computed properties instead.`,
link: `https://v3-migration.vuejs.org/breaking-changes/filters.html` link: `https://v3-migration.vuejs.org/breaking-changes/filters.html`,
} },
} }
function getCompatValue( function getCompatValue(
key: CompilerDeprecationTypes | 'MODE', key: CompilerDeprecationTypes | 'MODE',
context: ParserContext | TransformContext { compatConfig }: MergedParserOptions | TransformContext,
) { ) {
const config = (context as ParserContext).options const value = compatConfig && compatConfig[key]
? (context as ParserContext).options.compatConfig
: (context as TransformContext).compatConfig
const value = config && config[key]
if (key === 'MODE') { if (key === 'MODE') {
return value || 3 // compiler defaults to v3 behavior return value || 3 // compiler defaults to v3 behavior
} else { } else {
@ -115,7 +105,7 @@ function getCompatValue(
export function isCompatEnabled( export function isCompatEnabled(
key: CompilerDeprecationTypes, key: CompilerDeprecationTypes,
context: ParserContext | TransformContext context: MergedParserOptions | TransformContext,
) { ) {
const mode = getCompatValue('MODE', context) const mode = getCompatValue('MODE', context)
const value = getCompatValue(key, context) const value = getCompatValue(key, context)
@ -126,7 +116,7 @@ export function isCompatEnabled(
export function checkCompatEnabled( export function checkCompatEnabled(
key: CompilerDeprecationTypes, key: CompilerDeprecationTypes,
context: ParserContext | TransformContext, context: MergedParserOptions | TransformContext,
loc: SourceLocation | null, loc: SourceLocation | null,
...args: any[] ...args: any[]
): boolean { ): boolean {
@ -139,7 +129,7 @@ export function checkCompatEnabled(
export function warnDeprecation( export function warnDeprecation(
key: CompilerDeprecationTypes, key: CompilerDeprecationTypes,
context: ParserContext | TransformContext, context: MergedParserOptions | TransformContext,
loc: SourceLocation | null, loc: SourceLocation | null,
...args: any[] ...args: any[]
) { ) {

View File

@ -1,17 +1,17 @@
import { RESOLVE_FILTER } from '../runtimeHelpers' import { RESOLVE_FILTER } from '../runtimeHelpers'
import { import {
ExpressionNode, type AttributeNode,
AttributeNode, type DirectiveNode,
DirectiveNode, type ExpressionNode,
NodeTypes, NodeTypes,
SimpleExpressionNode type SimpleExpressionNode,
} from '../ast' } from '../ast'
import { import {
CompilerDeprecationTypes, CompilerDeprecationTypes,
isCompatEnabled, isCompatEnabled,
warnDeprecation warnDeprecation,
} from './compatConfig' } from './compatConfig'
import { NodeTransform, TransformContext } from '../transform' import type { NodeTransform, TransformContext } from '../transform'
import { toValidAssetId } from '../utils' import { toValidAssetId } from '../utils'
const validDivisionCharRE = /[\w).+\-_$\]]/ const validDivisionCharRE = /[\w).+\-_$\]]/
@ -162,7 +162,7 @@ function parseFilter(node: SimpleExpressionNode, context: TransformContext) {
warnDeprecation( warnDeprecation(
CompilerDeprecationTypes.COMPILER_FILTERS, CompilerDeprecationTypes.COMPILER_FILTERS,
context, context,
node.loc node.loc,
) )
for (i = 0; i < filters.length; i++) { for (i = 0; i < filters.length; i++) {
expression = wrapFilter(expression, filters[i], context) expression = wrapFilter(expression, filters[i], context)
@ -174,7 +174,7 @@ function parseFilter(node: SimpleExpressionNode, context: TransformContext) {
function wrapFilter( function wrapFilter(
exp: string, exp: string,
filter: string, filter: string,
context: TransformContext context: TransformContext,
): string { ): string {
context.helper(RESOLVE_FILTER) context.helper(RESOLVE_FILTER)
const i = filter.indexOf('(') const i = filter.indexOf('(')

View File

@ -1,9 +1,13 @@
import { CompilerOptions } from './options' import type { CompilerOptions } from './options'
import { baseParse } from './parse' import { baseParse } from './parser'
import { transform, NodeTransform, DirectiveTransform } from './transform' import {
import { generate, CodegenResult } from './codegen' type DirectiveTransform,
import { RootNode } from './ast' type NodeTransform,
import { isString, extend } from '@vue/shared' transform,
} from './transform'
import { type CodegenResult, generate } from './codegen'
import type { RootNode } from './ast'
import { extend, isString } from '@vue/shared'
import { transformIf } from './transforms/vIf' import { transformIf } from './transforms/vIf'
import { transformFor } from './transforms/vFor' import { transformFor } from './transforms/vFor'
import { transformExpression } from './transforms/transformExpression' import { transformExpression } from './transforms/transformExpression'
@ -16,16 +20,16 @@ import { transformText } from './transforms/transformText'
import { transformOnce } from './transforms/vOnce' import { transformOnce } from './transforms/vOnce'
import { transformModel } from './transforms/vModel' import { transformModel } from './transforms/vModel'
import { transformFilter } from './compat/transformFilter' import { transformFilter } from './compat/transformFilter'
import { defaultOnError, createCompilerError, ErrorCodes } from './errors' import { ErrorCodes, createCompilerError, defaultOnError } from './errors'
import { transformMemo } from './transforms/vMemo' import { transformMemo } from './transforms/vMemo'
export type TransformPreset = [ export type TransformPreset = [
NodeTransform[], NodeTransform[],
Record<string, DirectiveTransform> Record<string, DirectiveTransform>,
] ]
export function getBaseTransformPreset( export function getBaseTransformPreset(
prefixIdentifiers?: boolean prefixIdentifiers?: boolean,
): TransformPreset { ): TransformPreset {
return [ return [
[ [
@ -38,7 +42,7 @@ export function getBaseTransformPreset(
? [ ? [
// order is important // order is important
trackVForSlotScopes, trackVForSlotScopes,
transformExpression transformExpression,
] ]
: __BROWSER__ && __DEV__ : __BROWSER__ && __DEV__
? [transformExpression] ? [transformExpression]
@ -46,21 +50,21 @@ export function getBaseTransformPreset(
transformSlotOutlet, transformSlotOutlet,
transformElement, transformElement,
trackSlotScopes, trackSlotScopes,
transformText transformText,
], ],
{ {
on: transformOn, on: transformOn,
bind: transformBind, bind: transformBind,
model: transformModel model: transformModel,
} },
] ]
} }
// we name it `baseCompile` so that higher order compilers like // we name it `baseCompile` so that higher order compilers like
// @vue/compiler-dom can export `compile` while re-exporting everything else. // @vue/compiler-dom can export `compile` while re-exporting everything else.
export function baseCompile( export function baseCompile(
template: string | RootNode, source: string | RootNode,
options: CompilerOptions = {} options: CompilerOptions = {},
): CodegenResult { ): CodegenResult {
const onError = options.onError || defaultOnError const onError = options.onError || defaultOnError
const isModuleMode = options.mode === 'module' const isModuleMode = options.mode === 'module'
@ -82,7 +86,10 @@ export function baseCompile(
onError(createCompilerError(ErrorCodes.X_SCOPE_ID_NOT_SUPPORTED)) onError(createCompilerError(ErrorCodes.X_SCOPE_ID_NOT_SUPPORTED))
} }
const ast = isString(template) ? baseParse(template, options) : template const resolvedOptions = extend({}, options, {
prefixIdentifiers,
})
const ast = isString(source) ? baseParse(source, resolvedOptions) : source
const [nodeTransforms, directiveTransforms] = const [nodeTransforms, directiveTransforms] =
getBaseTransformPreset(prefixIdentifiers) getBaseTransformPreset(prefixIdentifiers)
@ -95,24 +102,18 @@ export function baseCompile(
transform( transform(
ast, ast,
extend({}, options, { extend({}, resolvedOptions, {
prefixIdentifiers,
nodeTransforms: [ nodeTransforms: [
...nodeTransforms, ...nodeTransforms,
...(options.nodeTransforms || []) // user transforms ...(options.nodeTransforms || []), // user transforms
], ],
directiveTransforms: extend( directiveTransforms: extend(
{}, {},
directiveTransforms, directiveTransforms,
options.directiveTransforms || {} // user transforms options.directiveTransforms || {}, // user transforms
) ),
}) }),
) )
return generate( return generate(ast, resolvedOptions)
ast,
extend({}, options, {
prefixIdentifiers
})
)
} }

View File

@ -1,4 +1,4 @@
import { SourceLocation } from './ast' import type { SourceLocation } from './ast'
export interface CompilerError extends SyntaxError { export interface CompilerError extends SyntaxError {
code: number | string code: number | string
@ -25,19 +25,19 @@ export function createCompilerError<T extends number>(
code: T, code: T,
loc?: SourceLocation, loc?: SourceLocation,
messages?: { [code: number]: string }, messages?: { [code: number]: string },
additionalMessage?: string additionalMessage?: string,
): InferCompilerError<T> { ): InferCompilerError<T> {
const msg = const msg =
__DEV__ || !__BROWSER__ __DEV__ || !__BROWSER__
? (messages || errorMessages)[code] + (additionalMessage || ``) ? (messages || errorMessages)[code] + (additionalMessage || ``)
: code : `https://vuejs.org/errors/#compiler-${code}`
const error = new SyntaxError(String(msg)) as InferCompilerError<T> const error = new SyntaxError(String(msg)) as InferCompilerError<T>
error.code = code error.code = code
error.loc = loc error.loc = loc
return error return error
} }
export const enum ErrorCodes { export enum ErrorCodes {
// parse errors // parse errors
ABRUPT_CLOSING_OF_EMPTY_COMMENT, ABRUPT_CLOSING_OF_EMPTY_COMMENT,
CDATA_IN_HTML_CONTENT, CDATA_IN_HTML_CONTENT,
@ -97,15 +97,12 @@ export const enum ErrorCodes {
X_MODULE_MODE_NOT_SUPPORTED, X_MODULE_MODE_NOT_SUPPORTED,
X_CACHE_HANDLER_NOT_SUPPORTED, X_CACHE_HANDLER_NOT_SUPPORTED,
X_SCOPE_ID_NOT_SUPPORTED, X_SCOPE_ID_NOT_SUPPORTED,
X_VNODE_HOOKS,
// deprecations
DEPRECATION_VNODE_HOOKS,
DEPRECATION_V_IS,
// Special value for higher-order compilers to pick up the last code // Special value for higher-order compilers to pick up the last code
// to avoid collision of error codes. This should always be kept as the last // to avoid collision of error codes. This should always be kept as the last
// item. // item.
__EXTEND_POINT__ __EXTEND_POINT__,
} }
export const errorMessages: Record<ErrorCodes, string> = { export const errorMessages: Record<ErrorCodes, string> = {
@ -177,6 +174,7 @@ export const errorMessages: Record<ErrorCodes, string> = {
[ErrorCodes.X_V_MODEL_ON_PROPS]: `v-model cannot be used on a prop, because local prop bindings are not writable.\nUse a v-bind binding combined with a v-on listener that emits update:x event instead.`, [ErrorCodes.X_V_MODEL_ON_PROPS]: `v-model cannot be used on a prop, because local prop bindings are not writable.\nUse a v-bind binding combined with a v-on listener that emits update:x event instead.`,
[ErrorCodes.X_INVALID_EXPRESSION]: `Error parsing JavaScript expression: `, [ErrorCodes.X_INVALID_EXPRESSION]: `Error parsing JavaScript expression: `,
[ErrorCodes.X_KEEP_ALIVE_INVALID_CHILDREN]: `<KeepAlive> expects exactly one child component.`, [ErrorCodes.X_KEEP_ALIVE_INVALID_CHILDREN]: `<KeepAlive> expects exactly one child component.`,
[ErrorCodes.X_VNODE_HOOKS]: `@vnode-* hooks in templates are no longer supported. Use the vue: prefix instead. For example, @vnode-mounted should be changed to @vue:mounted. @vnode-* hooks support has been removed in 3.4.`,
[ErrorCodes.X_DIRECTIVE_SHORTHAND_NO_ARGUMENT]: `Directive shorthand without an argument: `, [ErrorCodes.X_DIRECTIVE_SHORTHAND_NO_ARGUMENT]: `Directive shorthand without an argument: `,
// generic errors // generic errors
@ -185,10 +183,6 @@ export const errorMessages: Record<ErrorCodes, string> = {
[ErrorCodes.X_CACHE_HANDLER_NOT_SUPPORTED]: `"cacheHandlers" option is only supported when the "prefixIdentifiers" option is enabled.`, [ErrorCodes.X_CACHE_HANDLER_NOT_SUPPORTED]: `"cacheHandlers" option is only supported when the "prefixIdentifiers" option is enabled.`,
[ErrorCodes.X_SCOPE_ID_NOT_SUPPORTED]: `"scopeId" option is only supported in module mode.`, [ErrorCodes.X_SCOPE_ID_NOT_SUPPORTED]: `"scopeId" option is only supported in module mode.`,
// deprecations
[ErrorCodes.DEPRECATION_VNODE_HOOKS]: `@vnode-* hooks in templates are deprecated. Use the vue: prefix instead. For example, @vnode-mounted should be changed to @vue:mounted. @vnode-* hooks support will be removed in 3.4.`,
[ErrorCodes.DEPRECATION_V_IS]: `v-is="component-name" has been deprecated. Use is="vue:component-name" instead. v-is support will be removed in 3.4.`,
// just to fulfill types // just to fulfill types
[ErrorCodes.__EXTEND_POINT__]: `` [ErrorCodes.__EXTEND_POINT__]: ``,
} }

View File

@ -8,9 +8,9 @@ export {
type CodegenOptions, type CodegenOptions,
type HoistTransform, type HoistTransform,
type BindingMetadata, type BindingMetadata,
BindingTypes BindingTypes,
} from './options' } from './options'
export { baseParse, TextModes } from './parse' export { baseParse } from './parser'
export { export {
transform, transform,
type TransformContext, type TransformContext,
@ -19,14 +19,15 @@ export {
createStructuralDirectiveTransform, createStructuralDirectiveTransform,
type NodeTransform, type NodeTransform,
type StructuralDirectiveTransform, type StructuralDirectiveTransform,
type DirectiveTransform type DirectiveTransform,
} from './transform' } from './transform'
export { generate, type CodegenContext, type CodegenResult } from './codegen' export { generate, type CodegenContext, type CodegenResult } from './codegen'
export { export {
ErrorCodes, ErrorCodes,
errorMessages,
createCompilerError, createCompilerError,
type CoreCompilerError, type CoreCompilerError,
type CompilerError type CompilerError,
} from './errors' } from './errors'
export * from './ast' export * from './ast'
@ -44,20 +45,20 @@ export { processFor, createForLoopParams } from './transforms/vFor'
export { export {
transformExpression, transformExpression,
processExpression, processExpression,
stringifyExpression stringifyExpression,
} from './transforms/transformExpression' } from './transforms/transformExpression'
export { export {
buildSlots, buildSlots,
type SlotFnBuilder, type SlotFnBuilder,
trackVForSlotScopes, trackVForSlotScopes,
trackSlotScopes trackSlotScopes,
} from './transforms/vSlot' } from './transforms/vSlot'
export { export {
transformElement, transformElement,
resolveComponentType, resolveComponentType,
buildProps, buildProps,
buildDirectiveArgs, buildDirectiveArgs,
type PropsExpression type PropsExpression,
} from './transforms/transformElement' } from './transforms/transformElement'
export { processSlotOutlet } from './transforms/transformSlotOutlet' export { processSlotOutlet } from './transforms/transformSlotOutlet'
export { getConstantType } from './transforms/hoistStatic' export { getConstantType } from './transforms/hoistStatic'
@ -67,5 +68,5 @@ export { generateCodeFrame } from '@vue/shared'
export { export {
checkCompatEnabled, checkCompatEnabled,
warnDeprecation, warnDeprecation,
CompilerDeprecationTypes CompilerDeprecationTypes,
} from './compat/compatConfig' } from './compat/compatConfig'

View File

@ -1,13 +1,18 @@
import { ElementNode, Namespace, TemplateChildNode, ParentNode } from './ast' import type {
import { TextModes } from './parse' ElementNode,
import { CompilerError } from './errors' Namespace,
import { Namespaces,
NodeTransform, ParentNode,
TemplateChildNode,
} from './ast'
import type { CompilerError } from './errors'
import type {
DirectiveTransform, DirectiveTransform,
TransformContext NodeTransform,
TransformContext,
} from './transform' } from './transform'
import { CompilerCompatOptions } from './compat/compatConfig' import type { CompilerCompatOptions } from './compat/compatConfig'
import { ParserPlugin } from '@babel/parser' import type { ParserPlugin } from '@babel/parser'
export interface ErrorHandlingOptions { export interface ErrorHandlingOptions {
onWarn?: (warning: CompilerError) => void onWarn?: (warning: CompilerError) => void
@ -17,6 +22,24 @@ export interface ErrorHandlingOptions {
export interface ParserOptions export interface ParserOptions
extends ErrorHandlingOptions, extends ErrorHandlingOptions,
CompilerCompatOptions { CompilerCompatOptions {
/**
* Base mode is platform agnostic and only parses HTML-like template syntax,
* treating all tags the same way. Specific tag parsing behavior can be
* configured by higher-level compilers.
*
* HTML mode adds additional logic for handling special parsing behavior in
* `<script>`, `<style>`,`<title>` and `<textarea>`.
* The logic is handled inside compiler-core for efficiency.
*
* SFC mode treats content of all root-level tags except `<template>` as plain
* text.
*/
parseMode?: 'base' | 'html' | 'sfc'
/**
* Specify the root namespace to use when parsing a template.
* Defaults to `Namespaces.HTML` (0).
*/
ns?: Namespaces
/** /**
* e.g. platform native elements, e.g. `<div>` for browsers * e.g. platform native elements, e.g. `<div>` for browsers
*/ */
@ -40,14 +63,11 @@ export interface ParserOptions
/** /**
* Get tag namespace * Get tag namespace
*/ */
getNamespace?: (tag: string, parent: ElementNode | undefined) => Namespace getNamespace?: (
/** tag: string,
* Get text parsing mode for this element parent: ElementNode | undefined,
*/ rootNamespace: Namespace,
getTextMode?: ( ) => Namespace
node: ElementNode,
parent: ElementNode | undefined
) => TextModes
/** /**
* @default ['{{', '}}'] * @default ['{{', '}}']
*/ */
@ -57,7 +77,8 @@ export interface ParserOptions
*/ */
whitespace?: 'preserve' | 'condense' whitespace?: 'preserve' | 'condense'
/** /**
* Only needed for DOM compilers * Only used for DOM compilers that runs in the browser.
* In non-browser builds, this option is ignored.
*/ */
decodeEntities?: (rawText: string, asAttr: boolean) => string decodeEntities?: (rawText: string, asAttr: boolean) => string
/** /**
@ -65,15 +86,26 @@ export interface ParserOptions
* This defaults to `true` in development and `false` in production builds. * This defaults to `true` in development and `false` in production builds.
*/ */
comments?: boolean comments?: boolean
/**
* Parse JavaScript expressions with Babel.
* @default false
*/
prefixIdentifiers?: boolean
/**
* A list of parser plugins to enable for `@babel/parser`, which is used to
* parse expressions in bindings and interpolations.
* https://babeljs.io/docs/en/next/babel-parser#plugins
*/
expressionPlugins?: ParserPlugin[]
} }
export type HoistTransform = ( export type HoistTransform = (
children: TemplateChildNode[], children: TemplateChildNode[],
context: TransformContext, context: TransformContext,
parent: ParentNode parent: ParentNode,
) => void ) => void
export const enum BindingTypes { export enum BindingTypes {
/** /**
* returned from data() * returned from data()
*/ */
@ -116,7 +148,7 @@ export const enum BindingTypes {
/** /**
* a literal constant, e.g. 'foo', 1, true * a literal constant, e.g. 'foo', 1, true
*/ */
LITERAL_CONST = 'literal-const' LITERAL_CONST = 'literal-const',
} }
export type BindingMetadata = { export type BindingMetadata = {

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -13,7 +13,7 @@ export const CREATE_TEXT = Symbol(__DEV__ ? `createTextVNode` : ``)
export const CREATE_STATIC = Symbol(__DEV__ ? `createStaticVNode` : ``) export const CREATE_STATIC = Symbol(__DEV__ ? `createStaticVNode` : ``)
export const RESOLVE_COMPONENT = Symbol(__DEV__ ? `resolveComponent` : ``) export const RESOLVE_COMPONENT = Symbol(__DEV__ ? `resolveComponent` : ``)
export const RESOLVE_DYNAMIC_COMPONENT = Symbol( export const RESOLVE_DYNAMIC_COMPONENT = Symbol(
__DEV__ ? `resolveDynamicComponent` : `` __DEV__ ? `resolveDynamicComponent` : ``,
) )
export const RESOLVE_DIRECTIVE = Symbol(__DEV__ ? `resolveDirective` : ``) export const RESOLVE_DIRECTIVE = Symbol(__DEV__ ? `resolveDirective` : ``)
export const RESOLVE_FILTER = Symbol(__DEV__ ? `resolveFilter` : ``) export const RESOLVE_FILTER = Symbol(__DEV__ ? `resolveFilter` : ``)
@ -81,7 +81,7 @@ export const helperNameMap: Record<symbol, string> = {
[UNREF]: `unref`, [UNREF]: `unref`,
[IS_REF]: `isRef`, [IS_REF]: `isRef`,
[WITH_MEMO]: `withMemo`, [WITH_MEMO]: `withMemo`,
[IS_MEMO_SAME]: `isMemoSame` [IS_MEMO_SAME]: `isMemoSame`,
} }
export function registerRuntimeHelpers(helpers: Record<symbol, string>) { export function registerRuntimeHelpers(helpers: Record<symbol, string>) {

File diff suppressed because it is too large Load Diff

View File

@ -1,45 +1,45 @@
import { TransformOptions } from './options' import type { TransformOptions } from './options'
import { import {
RootNode, type ArrayExpression,
NodeTypes, type CacheExpression,
ParentNode,
TemplateChildNode,
ElementNode,
DirectiveNode,
Property,
ExpressionNode,
createSimpleExpression,
JSChildNode,
SimpleExpressionNode,
ElementTypes,
CacheExpression,
createCacheExpression,
TemplateLiteral,
createVNodeCall,
ConstantTypes, ConstantTypes,
ArrayExpression, type DirectiveNode,
convertToBlock type ElementNode,
ElementTypes,
type ExpressionNode,
type JSChildNode,
NodeTypes,
type ParentNode,
type Property,
type RootNode,
type SimpleExpressionNode,
type TemplateChildNode,
type TemplateLiteral,
convertToBlock,
createCacheExpression,
createSimpleExpression,
createVNodeCall,
} from './ast' } from './ast'
import { import {
isString,
isArray,
NOOP,
PatchFlags,
PatchFlagNames,
EMPTY_OBJ, EMPTY_OBJ,
NOOP,
PatchFlagNames,
PatchFlags,
camelize,
capitalize, capitalize,
camelize isArray,
isString,
} from '@vue/shared' } from '@vue/shared'
import { defaultOnError, defaultOnWarn } from './errors' import { defaultOnError, defaultOnWarn } from './errors'
import { import {
TO_DISPLAY_STRING, CREATE_COMMENT,
FRAGMENT, FRAGMENT,
TO_DISPLAY_STRING,
helperNameMap, helperNameMap,
CREATE_COMMENT
} from './runtimeHelpers' } from './runtimeHelpers'
import { isVSlot } from './utils' import { isVSlot } from './utils'
import { hoistStatic, isSingleElementRoot } from './transforms/hoistStatic' import { hoistStatic, isSingleElementRoot } from './transforms/hoistStatic'
import { CompilerCompatOptions } from './compat/compatConfig' import type { CompilerCompatOptions } from './compat/compatConfig'
// There are two types of transforms: // There are two types of transforms:
// //
@ -48,7 +48,7 @@ import { CompilerCompatOptions } from './compat/compatConfig'
// replace or remove the node being processed. // replace or remove the node being processed.
export type NodeTransform = ( export type NodeTransform = (
node: RootNode | TemplateChildNode, node: RootNode | TemplateChildNode,
context: TransformContext context: TransformContext,
) => void | (() => void) | (() => void)[] ) => void | (() => void) | (() => void)[]
// - DirectiveTransform: // - DirectiveTransform:
@ -60,7 +60,7 @@ export type DirectiveTransform = (
context: TransformContext, context: TransformContext,
// a platform specific compiler can import the base transform and augment // a platform specific compiler can import the base transform and augment
// it by passing in this optional argument. // it by passing in this optional argument.
augmentor?: (ret: DirectiveTransformResult) => DirectiveTransformResult augmentor?: (ret: DirectiveTransformResult) => DirectiveTransformResult,
) => DirectiveTransformResult ) => DirectiveTransformResult
export interface DirectiveTransformResult { export interface DirectiveTransformResult {
@ -74,7 +74,7 @@ export interface DirectiveTransformResult {
export type StructuralDirectiveTransform = ( export type StructuralDirectiveTransform = (
node: ElementNode, node: ElementNode,
dir: DirectiveNode, dir: DirectiveNode,
context: TransformContext context: TransformContext,
) => void | (() => void) ) => void | (() => void)
export interface ImportItem { export interface ImportItem {
@ -83,9 +83,7 @@ export interface ImportItem {
} }
export interface TransformContext export interface TransformContext
extends Required< extends Required<Omit<TransformOptions, keyof CompilerCompatOptions>>,
Omit<TransformOptions, 'filename' | keyof CompilerCompatOptions>
>,
CompilerCompatOptions { CompilerCompatOptions {
selfName: string | null selfName: string | null
root: RootNode root: RootNode
@ -147,12 +145,13 @@ export function createTransformContext(
isTS = false, isTS = false,
onError = defaultOnError, onError = defaultOnError,
onWarn = defaultOnWarn, onWarn = defaultOnWarn,
compatConfig compatConfig,
}: TransformOptions }: TransformOptions,
): TransformContext { ): TransformContext {
const nameMatch = filename.replace(/\?.*$/, '').match(/([^/\\]+)\.\w+$/) const nameMatch = filename.replace(/\?.*$/, '').match(/([^/\\]+)\.\w+$/)
const context: TransformContext = { const context: TransformContext = {
// options // options
filename,
selfName: nameMatch && capitalize(camelize(nameMatch[1])), selfName: nameMatch && capitalize(camelize(nameMatch[1])),
prefixIdentifiers, prefixIdentifiers,
hoistStatic, hoistStatic,
@ -191,7 +190,7 @@ export function createTransformContext(
vFor: 0, vFor: 0,
vSlot: 0, vSlot: 0,
vPre: 0, vPre: 0,
vOnce: 0 vOnce: 0,
}, },
parent: null, parent: null,
currentNode: root, currentNode: root,
@ -288,14 +287,14 @@ export function createTransformContext(
`_hoisted_${context.hoists.length}`, `_hoisted_${context.hoists.length}`,
false, false,
exp.loc, exp.loc,
ConstantTypes.CAN_HOIST ConstantTypes.CAN_HOIST,
) )
identifier.hoisted = exp identifier.hoisted = exp
return identifier return identifier
}, },
cache(exp, isVNode = false) { cache(exp, isVNode = false) {
return createCacheExpression(context.cached++, exp, isVNode) return createCacheExpression(context.cached++, exp, isVNode)
} },
} }
if (__COMPAT__) { if (__COMPAT__) {
@ -334,6 +333,7 @@ export function transform(root: RootNode, options: TransformOptions) {
root.hoists = context.hoists root.hoists = context.hoists
root.temps = context.temps root.temps = context.temps
root.cached = context.cached root.cached = context.cached
root.transformed = true
if (__COMPAT__) { if (__COMPAT__) {
root.filters = [...context.filters!] root.filters = [...context.filters!]
@ -383,7 +383,7 @@ function createRootCodegen(root: RootNode, context: TransformContext) {
undefined, undefined,
true, true,
undefined, undefined,
false /* isComponent */ false /* isComponent */,
) )
} else { } else {
// no children = noop. codegen will return null. // no children = noop. codegen will return null.
@ -392,7 +392,7 @@ function createRootCodegen(root: RootNode, context: TransformContext) {
export function traverseChildren( export function traverseChildren(
parent: ParentNode, parent: ParentNode,
context: TransformContext context: TransformContext,
) { ) {
let i = 0 let i = 0
const nodeRemoved = () => { const nodeRemoved = () => {
@ -410,7 +410,7 @@ export function traverseChildren(
export function traverseNode( export function traverseNode(
node: RootNode | TemplateChildNode, node: RootNode | TemplateChildNode,
context: TransformContext context: TransformContext,
) { ) {
context.currentNode = node context.currentNode = node
// apply transform plugins // apply transform plugins
@ -473,7 +473,7 @@ export function traverseNode(
export function createStructuralDirectiveTransform( export function createStructuralDirectiveTransform(
name: string | RegExp, name: string | RegExp,
fn: StructuralDirectiveTransform fn: StructuralDirectiveTransform,
): NodeTransform { ): NodeTransform {
const matches = isString(name) const matches = isString(name)
? (n: string) => n === name ? (n: string) => n === name

View File

@ -1,30 +1,30 @@
import { import {
type CallExpression,
type ComponentNode,
ConstantTypes, ConstantTypes,
RootNode,
NodeTypes,
TemplateChildNode,
SimpleExpressionNode,
ElementTypes, ElementTypes,
PlainElementNode, type JSChildNode,
ComponentNode, NodeTypes,
TemplateNode, type ParentNode,
VNodeCall, type PlainElementNode,
ParentNode, type RootNode,
JSChildNode, type SimpleExpressionNode,
CallExpression, type TemplateChildNode,
type TemplateNode,
type VNodeCall,
createArrayExpression, createArrayExpression,
getVNodeBlockHelper, getVNodeBlockHelper,
getVNodeHelper getVNodeHelper,
} from '../ast' } from '../ast'
import { TransformContext } from '../transform' import type { TransformContext } from '../transform'
import { PatchFlags, isString, isSymbol, isArray } from '@vue/shared' import { PatchFlags, isArray, isString, isSymbol } from '@vue/shared'
import { isSlotOutlet } from '../utils' import { isSlotOutlet } from '../utils'
import { import {
OPEN_BLOCK,
GUARD_REACTIVE_PROPS, GUARD_REACTIVE_PROPS,
NORMALIZE_CLASS, NORMALIZE_CLASS,
NORMALIZE_PROPS, NORMALIZE_PROPS,
NORMALIZE_STYLE NORMALIZE_STYLE,
OPEN_BLOCK,
} from '../runtimeHelpers' } from '../runtimeHelpers'
export function hoistStatic(root: RootNode, context: TransformContext) { export function hoistStatic(root: RootNode, context: TransformContext) {
@ -33,13 +33,13 @@ export function hoistStatic(root: RootNode, context: TransformContext) {
context, context,
// Root node is unfortunately non-hoistable due to potential parent // Root node is unfortunately non-hoistable due to potential parent
// fallthrough attributes. // fallthrough attributes.
isSingleElementRoot(root, root.children[0]) isSingleElementRoot(root, root.children[0]),
) )
} }
export function isSingleElementRoot( export function isSingleElementRoot(
root: RootNode, root: RootNode,
child: TemplateChildNode child: TemplateChildNode,
): child is PlainElementNode | ComponentNode | TemplateNode { ): child is PlainElementNode | ComponentNode | TemplateNode {
const { children } = root const { children } = root
return ( return (
@ -52,7 +52,7 @@ export function isSingleElementRoot(
function walk( function walk(
node: ParentNode, node: ParentNode,
context: TransformContext, context: TransformContext,
doNotHoistNode: boolean = false doNotHoistNode: boolean = false,
) { ) {
const { children } = node const { children } = node
const originalCount = children.length const originalCount = children.length
@ -120,7 +120,7 @@ function walk(
walk( walk(
child.branches[i], child.branches[i],
context, context,
child.branches[i].children.length === 1 child.branches[i].children.length === 1,
) )
} }
} }
@ -141,7 +141,7 @@ function walk(
isArray(node.codegenNode.children) isArray(node.codegenNode.children)
) { ) {
const hoisted = context.hoist( const hoisted = context.hoist(
createArrayExpression(node.codegenNode.children) createArrayExpression(node.codegenNode.children),
) )
// #6978, #7138, #7114 // #6978, #7138, #7114
// a hoisted children array inside v-for can caused HMR errors since // a hoisted children array inside v-for can caused HMR errors since
@ -155,7 +155,7 @@ function walk(
export function getConstantType( export function getConstantType(
node: TemplateChildNode | SimpleExpressionNode, node: TemplateChildNode | SimpleExpressionNode,
context: TransformContext context: TransformContext,
): ConstantTypes { ): ConstantTypes {
const { constantCache } = context const { constantCache } = context
switch (node.type) { switch (node.type) {
@ -244,7 +244,7 @@ export function getConstantType(
context.removeHelper(OPEN_BLOCK) context.removeHelper(OPEN_BLOCK)
context.removeHelper( context.removeHelper(
getVNodeBlockHelper(context.inSSR, codegenNode.isComponent) getVNodeBlockHelper(context.inSSR, codegenNode.isComponent),
) )
codegenNode.isBlock = false codegenNode.isBlock = false
context.helper(getVNodeHelper(context.inSSR, codegenNode.isComponent)) context.helper(getVNodeHelper(context.inSSR, codegenNode.isComponent))
@ -296,12 +296,12 @@ const allowHoistedHelperSet = new Set([
NORMALIZE_CLASS, NORMALIZE_CLASS,
NORMALIZE_STYLE, NORMALIZE_STYLE,
NORMALIZE_PROPS, NORMALIZE_PROPS,
GUARD_REACTIVE_PROPS GUARD_REACTIVE_PROPS,
]) ])
function getConstantTypeOfHelperCall( function getConstantTypeOfHelperCall(
value: CallExpression, value: CallExpression,
context: TransformContext context: TransformContext,
): ConstantTypes { ): ConstantTypes {
if ( if (
value.type === NodeTypes.JS_CALL_EXPRESSION && value.type === NodeTypes.JS_CALL_EXPRESSION &&
@ -321,7 +321,7 @@ function getConstantTypeOfHelperCall(
function getGeneratedPropsConstantType( function getGeneratedPropsConstantType(
node: PlainElementNode, node: PlainElementNode,
context: TransformContext context: TransformContext,
): ConstantTypes { ): ConstantTypes {
let returnType = ConstantTypes.CAN_STRINGIFY let returnType = ConstantTypes.CAN_STRINGIFY
const props = getNodeProps(node) const props = getNodeProps(node)

View File

@ -1,3 +1,3 @@
import { DirectiveTransform } from '../transform' import type { DirectiveTransform } from '../transform'
export const noopDirectiveTransform: DirectiveTransform = () => ({ props: [] }) export const noopDirectiveTransform: DirectiveTransform = () => ({ props: [] })

View File

@ -1,70 +1,68 @@
import { NodeTransform, TransformContext } from '../transform' import type { NodeTransform, TransformContext } from '../transform'
import { import {
NodeTypes, type ArrayExpression,
type CallExpression,
type ComponentNode,
ConstantTypes,
type DirectiveArguments,
type DirectiveNode,
type ElementNode,
ElementTypes, ElementTypes,
CallExpression, type ExpressionNode,
ObjectExpression, type JSChildNode,
ElementNode, NodeTypes,
DirectiveNode, type ObjectExpression,
ExpressionNode, type Property,
ArrayExpression, type TemplateTextChildNode,
createCallExpression, type VNodeCall,
createArrayExpression, createArrayExpression,
createCallExpression,
createObjectExpression,
createObjectProperty, createObjectProperty,
createSimpleExpression, createSimpleExpression,
createObjectExpression,
Property,
ComponentNode,
VNodeCall,
TemplateTextChildNode,
DirectiveArguments,
createVNodeCall, createVNodeCall,
ConstantTypes,
JSChildNode
} from '../ast' } from '../ast'
import { import {
PatchFlags,
PatchFlagNames, PatchFlagNames,
isSymbol, PatchFlags,
isOn,
isObject,
isReservedProp,
capitalize,
camelize, camelize,
isBuiltInDirective capitalize,
isBuiltInDirective,
isObject,
isOn,
isReservedProp,
isSymbol,
} from '@vue/shared' } from '@vue/shared'
import { createCompilerError, ErrorCodes } from '../errors' import { ErrorCodes, createCompilerError } from '../errors'
import { import {
RESOLVE_DIRECTIVE, GUARD_REACTIVE_PROPS,
RESOLVE_COMPONENT, KEEP_ALIVE,
RESOLVE_DYNAMIC_COMPONENT,
MERGE_PROPS, MERGE_PROPS,
NORMALIZE_CLASS, NORMALIZE_CLASS,
NORMALIZE_STYLE,
NORMALIZE_PROPS, NORMALIZE_PROPS,
TO_HANDLERS, NORMALIZE_STYLE,
TELEPORT, RESOLVE_COMPONENT,
KEEP_ALIVE, RESOLVE_DIRECTIVE,
RESOLVE_DYNAMIC_COMPONENT,
SUSPENSE, SUSPENSE,
TELEPORT,
TO_HANDLERS,
UNREF, UNREF,
GUARD_REACTIVE_PROPS
} from '../runtimeHelpers' } from '../runtimeHelpers'
import { import {
getInnerRange,
toValidAssetId,
findProp, findProp,
isCoreComponent, isCoreComponent,
isStaticArgOf, isStaticArgOf,
findDir, isStaticExp,
isStaticExp toValidAssetId,
} from '../utils' } from '../utils'
import { buildSlots } from './vSlot' import { buildSlots } from './vSlot'
import { getConstantType } from './hoistStatic' import { getConstantType } from './hoistStatic'
import { BindingTypes } from '../options' import { BindingTypes } from '../options'
import { import {
checkCompatEnabled,
CompilerDeprecationTypes, CompilerDeprecationTypes,
isCompatEnabled checkCompatEnabled,
isCompatEnabled,
} from '../compat/compatConfig' } from '../compat/compatConfig'
// some directive transforms (e.g. v-model) may return a symbol for runtime // some directive transforms (e.g. v-model) may return a symbol for runtime
@ -127,7 +125,7 @@ export const transformElement: NodeTransform = (node, context) => {
context, context,
undefined, undefined,
isComponent, isComponent,
isDynamicComponent isDynamicComponent,
) )
vnodeProps = propsBuildResult.props vnodeProps = propsBuildResult.props
patchFlag = propsBuildResult.patchFlag patchFlag = propsBuildResult.patchFlag
@ -136,7 +134,7 @@ export const transformElement: NodeTransform = (node, context) => {
vnodeDirectives = vnodeDirectives =
directives && directives.length directives && directives.length
? (createArrayExpression( ? (createArrayExpression(
directives.map(dir => buildDirectiveArgs(dir, context)) directives.map(dir => buildDirectiveArgs(dir, context)),
) as DirectiveArguments) ) as DirectiveArguments)
: undefined : undefined
@ -162,8 +160,8 @@ export const transformElement: NodeTransform = (node, context) => {
createCompilerError(ErrorCodes.X_KEEP_ALIVE_INVALID_CHILDREN, { createCompilerError(ErrorCodes.X_KEEP_ALIVE_INVALID_CHILDREN, {
start: node.children[0].loc.start, start: node.children[0].loc.start,
end: node.children[node.children.length - 1].loc.end, end: node.children[node.children.length - 1].loc.end,
source: '' source: '',
}) }),
) )
} }
} }
@ -241,7 +239,7 @@ export const transformElement: NodeTransform = (node, context) => {
!!shouldUseBlock, !!shouldUseBlock,
false /* disableTracking */, false /* disableTracking */,
isComponent, isComponent,
node.loc node.loc,
) )
} }
} }
@ -249,7 +247,7 @@ export const transformElement: NodeTransform = (node, context) => {
export function resolveComponentType( export function resolveComponentType(
node: ComponentNode, node: ComponentNode,
context: TransformContext, context: TransformContext,
ssr = false ssr = false,
) { ) {
let { tag } = node let { tag } = node
@ -262,7 +260,7 @@ export function resolveComponentType(
(__COMPAT__ && (__COMPAT__ &&
isCompatEnabled( isCompatEnabled(
CompilerDeprecationTypes.COMPILER_IS_ON_ELEMENT, CompilerDeprecationTypes.COMPILER_IS_ON_ELEMENT,
context context,
)) ))
) { ) {
const exp = const exp =
@ -271,7 +269,7 @@ export function resolveComponentType(
: isProp.exp : isProp.exp
if (exp) { if (exp) {
return createCallExpression(context.helper(RESOLVE_DYNAMIC_COMPONENT), [ return createCallExpression(context.helper(RESOLVE_DYNAMIC_COMPONENT), [
exp exp,
]) ])
} }
} else if ( } else if (
@ -286,19 +284,6 @@ export function resolveComponentType(
} }
} }
// 1.5 v-is (TODO: remove in 3.4)
const isDir = !isExplicitDynamic && findDir(node, 'is')
if (isDir && isDir.exp) {
if (__DEV__) {
context.onWarn(
createCompilerError(ErrorCodes.DEPRECATION_V_IS, isDir.loc)
)
}
return createCallExpression(context.helper(RESOLVE_DYNAMIC_COMPONENT), [
isDir.exp
])
}
// 2. built-in components (Teleport, Transition, KeepAlive, Suspense...) // 2. built-in components (Teleport, Transition, KeepAlive, Suspense...)
const builtIn = isCoreComponent(tag) || context.isBuiltInComponent(tag) const builtIn = isCoreComponent(tag) || context.isBuiltInComponent(tag)
if (builtIn) { if (builtIn) {
@ -403,7 +388,7 @@ export function buildProps(
props: ElementNode['props'] = node.props, props: ElementNode['props'] = node.props,
isComponent: boolean, isComponent: boolean,
isDynamicComponent: boolean, isDynamicComponent: boolean,
ssr = false ssr = false,
): { ): {
props: PropsExpression | undefined props: PropsExpression | undefined
directives: DirectiveNode[] directives: DirectiveNode[]
@ -431,7 +416,7 @@ export function buildProps(
const pushMergeArg = (arg?: PropsExpression) => { const pushMergeArg = (arg?: PropsExpression) => {
if (properties.length) { if (properties.length) {
mergeArgs.push( mergeArgs.push(
createObjectExpression(dedupeProperties(properties), elementLoc) createObjectExpression(dedupeProperties(properties), elementLoc),
) )
properties = [] properties = []
} }
@ -503,7 +488,7 @@ export function buildProps(
// static attribute // static attribute
const prop = props[i] const prop = props[i]
if (prop.type === NodeTypes.ATTRIBUTE) { if (prop.type === NodeTypes.ATTRIBUTE) {
const { loc, name, value } = prop const { loc, name, nameLoc, value } = prop
let isStatic = true let isStatic = true
if (name === 'ref') { if (name === 'ref') {
hasRef = true hasRef = true
@ -511,8 +496,8 @@ export function buildProps(
properties.push( properties.push(
createObjectProperty( createObjectProperty(
createSimpleExpression('ref_for', true), createSimpleExpression('ref_for', true),
createSimpleExpression('true') createSimpleExpression('true'),
) ),
) )
} }
// in inline mode there is no setupState object, so we can't use string // in inline mode there is no setupState object, so we can't use string
@ -529,8 +514,8 @@ export function buildProps(
properties.push( properties.push(
createObjectProperty( createObjectProperty(
createSimpleExpression('ref_key', true), createSimpleExpression('ref_key', true),
createSimpleExpression(value.content, true, value.loc) createSimpleExpression(value.content, true, value.loc),
) ),
) )
} }
} }
@ -543,24 +528,20 @@ export function buildProps(
(__COMPAT__ && (__COMPAT__ &&
isCompatEnabled( isCompatEnabled(
CompilerDeprecationTypes.COMPILER_IS_ON_ELEMENT, CompilerDeprecationTypes.COMPILER_IS_ON_ELEMENT,
context context,
))) )))
) { ) {
continue continue
} }
properties.push( properties.push(
createObjectProperty( createObjectProperty(
createSimpleExpression( createSimpleExpression(name, true, nameLoc),
name,
true,
getInnerRange(loc, 0, name.length)
),
createSimpleExpression( createSimpleExpression(
value ? value.content : '', value ? value.content : '',
isStatic, isStatic,
value ? value.loc : loc value ? value.loc : loc,
) ),
) ),
) )
} else { } else {
// directives // directives
@ -572,7 +553,7 @@ export function buildProps(
if (name === 'slot') { if (name === 'slot') {
if (!isComponent) { if (!isComponent) {
context.onError( context.onError(
createCompilerError(ErrorCodes.X_V_SLOT_MISPLACED, loc) createCompilerError(ErrorCodes.X_V_SLOT_MISPLACED, loc),
) )
} }
continue continue
@ -590,7 +571,7 @@ export function buildProps(
(__COMPAT__ && (__COMPAT__ &&
isCompatEnabled( isCompatEnabled(
CompilerDeprecationTypes.COMPILER_IS_ON_ELEMENT, CompilerDeprecationTypes.COMPILER_IS_ON_ELEMENT,
context context,
)))) ))))
) { ) {
continue continue
@ -614,8 +595,8 @@ export function buildProps(
properties.push( properties.push(
createObjectProperty( createObjectProperty(
createSimpleExpression('ref_for', true), createSimpleExpression('ref_for', true),
createSimpleExpression('true') createSimpleExpression('true'),
) ),
) )
} }
@ -653,7 +634,7 @@ export function buildProps(
checkCompatEnabled( checkCompatEnabled(
CompilerDeprecationTypes.COMPILER_V_BIND_OBJECT_ORDER, CompilerDeprecationTypes.COMPILER_V_BIND_OBJECT_ORDER,
context, context,
loc loc,
) )
} }
} }
@ -661,7 +642,7 @@ export function buildProps(
if ( if (
isCompatEnabled( isCompatEnabled(
CompilerDeprecationTypes.COMPILER_V_BIND_OBJECT_ORDER, CompilerDeprecationTypes.COMPILER_V_BIND_OBJECT_ORDER,
context context,
) )
) { ) {
mergeArgs.unshift(exp) mergeArgs.unshift(exp)
@ -676,7 +657,7 @@ export function buildProps(
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
loc, loc,
callee: context.helper(TO_HANDLERS), callee: context.helper(TO_HANDLERS),
arguments: isComponent ? [exp] : [exp, `true`] arguments: isComponent ? [exp] : [exp, `true`],
}) })
} }
} else { } else {
@ -685,8 +666,8 @@ export function buildProps(
isVBind isVBind
? ErrorCodes.X_V_BIND_NO_EXPRESSION ? ErrorCodes.X_V_BIND_NO_EXPRESSION
: ErrorCodes.X_V_ON_NO_EXPRESSION, : ErrorCodes.X_V_ON_NO_EXPRESSION,
loc loc,
) ),
) )
} }
continue continue
@ -735,7 +716,7 @@ export function buildProps(
propsExpression = createCallExpression( propsExpression = createCallExpression(
context.helper(MERGE_PROPS), context.helper(MERGE_PROPS),
mergeArgs, mergeArgs,
elementLoc elementLoc,
) )
} else { } else {
// single v-bind with nothing else - no need for a mergeProps call // single v-bind with nothing else - no need for a mergeProps call
@ -744,7 +725,7 @@ export function buildProps(
} else if (properties.length) { } else if (properties.length) {
propsExpression = createObjectExpression( propsExpression = createObjectExpression(
dedupeProperties(properties), dedupeProperties(properties),
elementLoc elementLoc,
) )
} }
@ -804,7 +785,7 @@ export function buildProps(
if (classProp && !isStaticExp(classProp.value)) { if (classProp && !isStaticExp(classProp.value)) {
classProp.value = createCallExpression( classProp.value = createCallExpression(
context.helper(NORMALIZE_CLASS), context.helper(NORMALIZE_CLASS),
[classProp.value] [classProp.value],
) )
} }
if ( if (
@ -820,14 +801,14 @@ export function buildProps(
) { ) {
styleProp.value = createCallExpression( styleProp.value = createCallExpression(
context.helper(NORMALIZE_STYLE), context.helper(NORMALIZE_STYLE),
[styleProp.value] [styleProp.value],
) )
} }
} else { } else {
// dynamic key binding, wrap with `normalizeProps` // dynamic key binding, wrap with `normalizeProps`
propsExpression = createCallExpression( propsExpression = createCallExpression(
context.helper(NORMALIZE_PROPS), context.helper(NORMALIZE_PROPS),
[propsExpression] [propsExpression],
) )
} }
break break
@ -840,9 +821,9 @@ export function buildProps(
context.helper(NORMALIZE_PROPS), context.helper(NORMALIZE_PROPS),
[ [
createCallExpression(context.helper(GUARD_REACTIVE_PROPS), [ createCallExpression(context.helper(GUARD_REACTIVE_PROPS), [
propsExpression propsExpression,
]) ]),
] ],
) )
break break
} }
@ -853,7 +834,7 @@ export function buildProps(
directives: runtimeDirectives, directives: runtimeDirectives,
patchFlag, patchFlag,
dynamicPropNames, dynamicPropNames,
shouldUseBlock shouldUseBlock,
} }
} }
@ -894,14 +875,14 @@ function mergeAsArray(existing: Property, incoming: Property) {
} else { } else {
existing.value = createArrayExpression( existing.value = createArrayExpression(
[existing.value, incoming.value], [existing.value, incoming.value],
existing.loc existing.loc,
) )
} }
} }
export function buildDirectiveArgs( export function buildDirectiveArgs(
dir: DirectiveNode, dir: DirectiveNode,
context: TransformContext context: TransformContext,
): ArrayExpression { ): ArrayExpression {
const dirArgs: ArrayExpression['elements'] = [] const dirArgs: ArrayExpression['elements'] = []
const runtime = directiveImportMap.get(dir) const runtime = directiveImportMap.get(dir)
@ -941,10 +922,10 @@ export function buildDirectiveArgs(
dirArgs.push( dirArgs.push(
createObjectExpression( createObjectExpression(
dir.modifiers.map(modifier => dir.modifiers.map(modifier =>
createObjectProperty(modifier, trueExpression) createObjectProperty(modifier, trueExpression),
),
loc,
), ),
loc
)
) )
} }
return createArrayExpression(dirArgs, dir.loc) return createArrayExpression(dirArgs, dir.loc)

View File

@ -7,36 +7,36 @@
// - This transform is only applied in non-browser builds because it relies on // - This transform is only applied in non-browser builds because it relies on
// an additional JavaScript parser. In the browser, there is no source-map // an additional JavaScript parser. In the browser, there is no source-map
// support and the code is wrapped in `with (this) { ... }`. // support and the code is wrapped in `with (this) { ... }`.
import { NodeTransform, TransformContext } from '../transform' import type { NodeTransform, TransformContext } from '../transform'
import { import {
type CompoundExpressionNode,
ConstantTypes,
type ExpressionNode,
NodeTypes, NodeTypes,
createSimpleExpression, type SimpleExpressionNode,
ExpressionNode,
SimpleExpressionNode,
CompoundExpressionNode,
createCompoundExpression, createCompoundExpression,
ConstantTypes createSimpleExpression,
} from '../ast' } from '../ast'
import { import {
isInDestructureAssignment, isInDestructureAssignment,
isStaticProperty, isStaticProperty,
isStaticPropertyKey, isStaticPropertyKey,
walkIdentifiers walkIdentifiers,
} from '../babelUtils' } from '../babelUtils'
import { advancePositionWithClone, isSimpleIdentifier } from '../utils' import { advancePositionWithClone, isSimpleIdentifier } from '../utils'
import { import {
isGloballyAllowed, genPropsAccessExp,
makeMap,
hasOwn, hasOwn,
isGloballyAllowed,
isString, isString,
genPropsAccessExp makeMap,
} from '@vue/shared' } from '@vue/shared'
import { createCompilerError, ErrorCodes } from '../errors' import { ErrorCodes, createCompilerError } from '../errors'
import { import type {
Node,
Identifier,
AssignmentExpression, AssignmentExpression,
UpdateExpression Identifier,
Node,
UpdateExpression,
} from '@babel/types' } from '@babel/types'
import { validateBrowserExpression } from '../validateExpression' import { validateBrowserExpression } from '../validateExpression'
import { parse } from '@babel/parser' import { parse } from '@babel/parser'
@ -53,7 +53,7 @@ export const transformExpression: NodeTransform = (node, context) => {
if (node.type === NodeTypes.INTERPOLATION) { if (node.type === NodeTypes.INTERPOLATION) {
node.content = processExpression( node.content = processExpression(
node.content as SimpleExpressionNode, node.content as SimpleExpressionNode,
context context,
) )
} else if (node.type === NodeTypes.ELEMENT) { } else if (node.type === NodeTypes.ELEMENT) {
// handle directives on element // handle directives on element
@ -74,7 +74,7 @@ export const transformExpression: NodeTransform = (node, context) => {
exp, exp,
context, context,
// slot args must be processed as function params // slot args must be processed as function params
dir.name === 'slot' dir.name === 'slot',
) )
} }
if (arg && arg.type === NodeTypes.SIMPLE_EXPRESSION && !arg.isStatic) { if (arg && arg.type === NodeTypes.SIMPLE_EXPRESSION && !arg.isStatic) {
@ -104,7 +104,7 @@ export function processExpression(
asParams = false, asParams = false,
// v-on handler values may contain multiple statements // v-on handler values may contain multiple statements
asRawStatements = false, asRawStatements = false,
localVars: Record<string, number> = Object.create(context.identifiers) localVars: Record<string, number> = Object.create(context.identifiers),
): ExpressionNode { ): ExpressionNode {
if (__BROWSER__) { if (__BROWSER__) {
if (__DEV__) { if (__DEV__) {
@ -163,8 +163,8 @@ export function processExpression(
context, context,
false, false,
false, false,
knownIds knownIds,
) ),
) )
return `${context.helperString(IS_REF)}(${raw})${ return `${context.helperString(IS_REF)}(${raw})${
context.isTS ? ` //@ts-ignore\n` : `` context.isTS ? ` //@ts-ignore\n` : ``
@ -223,7 +223,14 @@ export function processExpression(
// bail constant on parens (function invocation) and dot (member access) // bail constant on parens (function invocation) and dot (member access)
const bailConstant = constantBailRE.test(rawExp) const bailConstant = constantBailRE.test(rawExp)
if (isSimpleIdentifier(rawExp)) { let ast = node.ast
if (ast === false) {
// ast being false means it has caused an error already during parse phase
return node
}
if (ast === null || (!ast && isSimpleIdentifier(rawExp))) {
const isScopeVarReference = context.identifiers[rawExp] const isScopeVarReference = context.identifiers[rawExp]
const isAllowedGlobal = isGloballyAllowed(rawExp) const isAllowedGlobal = isGloballyAllowed(rawExp)
const isLiteral = isLiteralWhitelisted(rawExp) const isLiteral = isLiteralWhitelisted(rawExp)
@ -249,7 +256,7 @@ export function processExpression(
return node return node
} }
let ast: any if (!ast) {
// exp needs to be parsed differently: // exp needs to be parsed differently:
// 1. Multiple inline statements (v-on, with presence of `;`): parse as raw // 1. Multiple inline statements (v-on, with presence of `;`): parse as raw
// exp, but make sure to pad with spaces for consistent ranges // exp, but make sure to pad with spaces for consistent ranges
@ -260,7 +267,7 @@ export function processExpression(
: `(${rawExp})${asParams ? `=>{}` : ``}` : `(${rawExp})${asParams ? `=>{}` : ``}`
try { try {
ast = parse(source, { ast = parse(source, {
plugins: context.expressionPlugins plugins: context.expressionPlugins,
}).program }).program
} catch (e: any) { } catch (e: any) {
context.onError( context.onError(
@ -268,11 +275,12 @@ export function processExpression(
ErrorCodes.X_INVALID_EXPRESSION, ErrorCodes.X_INVALID_EXPRESSION,
node.loc, node.loc,
undefined, undefined,
e.message e.message,
) ),
) )
return node return node
} }
}
type QualifiedId = Identifier & PrefixMeta type QualifiedId = Identifier & PrefixMeta
const ids: QualifiedId[] = [] const ids: QualifiedId[] = []
@ -312,7 +320,7 @@ export function processExpression(
}, },
true, // invoke on ALL identifiers true, // invoke on ALL identifiers
parentStack, parentStack,
knownIds knownIds,
) )
// We break up the compound expression into an array of strings and sub // We break up the compound expression into an array of strings and sub
@ -336,12 +344,14 @@ export function processExpression(
id.name, id.name,
false, false,
{ {
source,
start: advancePositionWithClone(node.loc.start, source, start), start: advancePositionWithClone(node.loc.start, source, start),
end: advancePositionWithClone(node.loc.start, source, end) end: advancePositionWithClone(node.loc.start, source, end),
source,
}, },
id.isConstant ? ConstantTypes.CAN_STRINGIFY : ConstantTypes.NOT_CONSTANT id.isConstant
) ? ConstantTypes.CAN_STRINGIFY
: ConstantTypes.NOT_CONSTANT,
),
) )
if (i === ids.length - 1 && end < rawExp.length) { if (i === ids.length - 1 && end < rawExp.length) {
children.push(rawExp.slice(end)) children.push(rawExp.slice(end))
@ -351,6 +361,7 @@ export function processExpression(
let ret let ret
if (children.length) { if (children.length) {
ret = createCompoundExpression(children, node.loc) ret = createCompoundExpression(children, node.loc)
ret.ast = ast
} else { } else {
ret = node ret = node
ret.constType = bailConstant ret.constType = bailConstant

View File

@ -1,15 +1,15 @@
import { NodeTransform, TransformContext } from '../transform' import type { NodeTransform, TransformContext } from '../transform'
import { import {
type CallExpression,
type ExpressionNode,
NodeTypes, NodeTypes,
CallExpression, type SlotOutletNode,
createCallExpression, createCallExpression,
ExpressionNode, createFunctionExpression,
SlotOutletNode,
createFunctionExpression
} from '../ast' } from '../ast'
import { isSlotOutlet, isStaticArgOf, isStaticExp } from '../utils' import { isSlotOutlet, isStaticArgOf, isStaticExp } from '../utils'
import { buildProps, PropsExpression } from './transformElement' import { type PropsExpression, buildProps } from './transformElement'
import { createCompilerError, ErrorCodes } from '../errors' import { ErrorCodes, createCompilerError } from '../errors'
import { RENDER_SLOT } from '../runtimeHelpers' import { RENDER_SLOT } from '../runtimeHelpers'
import { camelize } from '@vue/shared' import { camelize } from '@vue/shared'
@ -23,7 +23,7 @@ export const transformSlotOutlet: NodeTransform = (node, context) => {
slotName, slotName,
'{}', '{}',
'undefined', 'undefined',
'true' 'true',
] ]
let expectedLen = 2 let expectedLen = 2
@ -45,7 +45,7 @@ export const transformSlotOutlet: NodeTransform = (node, context) => {
node.codegenNode = createCallExpression( node.codegenNode = createCallExpression(
context.helper(RENDER_SLOT), context.helper(RENDER_SLOT),
slotArgs, slotArgs,
loc loc,
) )
} }
} }
@ -57,7 +57,7 @@ interface SlotOutletProcessResult {
export function processSlotOutlet( export function processSlotOutlet(
node: SlotOutletNode, node: SlotOutletNode,
context: TransformContext context: TransformContext,
): SlotOutletProcessResult { ): SlotOutletProcessResult {
let slotName: string | ExpressionNode = `"default"` let slotName: string | ExpressionNode = `"default"`
let slotProps: PropsExpression | undefined = undefined let slotProps: PropsExpression | undefined = undefined
@ -92,7 +92,7 @@ export function processSlotOutlet(
context, context,
nonNameProps, nonNameProps,
false, false,
false false,
) )
slotProps = props slotProps = props
@ -100,14 +100,14 @@ export function processSlotOutlet(
context.onError( context.onError(
createCompilerError( createCompilerError(
ErrorCodes.X_V_SLOT_UNEXPECTED_DIRECTIVE_ON_SLOT_OUTLET, ErrorCodes.X_V_SLOT_UNEXPECTED_DIRECTIVE_ON_SLOT_OUTLET,
directives[0].loc directives[0].loc,
) ),
) )
} }
} }
return { return {
slotName, slotName,
slotProps slotProps,
} }
} }

View File

@ -1,16 +1,16 @@
import { NodeTransform } from '../transform' import type { NodeTransform } from '../transform'
import { import {
NodeTypes, type CallExpression,
CompoundExpressionNode, type CompoundExpressionNode,
createCallExpression,
CallExpression,
ElementTypes,
ConstantTypes, ConstantTypes,
createCompoundExpression ElementTypes,
NodeTypes,
createCallExpression,
createCompoundExpression,
} from '../ast' } from '../ast'
import { isText } from '../utils' import { isText } from '../utils'
import { CREATE_TEXT } from '../runtimeHelpers' import { CREATE_TEXT } from '../runtimeHelpers'
import { PatchFlags, PatchFlagNames } from '@vue/shared' import { PatchFlagNames, PatchFlags } from '@vue/shared'
import { getConstantType } from './hoistStatic' import { getConstantType } from './hoistStatic'
// Merge adjacent text nodes and expressions into a single expression // Merge adjacent text nodes and expressions into a single expression
@ -39,7 +39,7 @@ export const transformText: NodeTransform = (node, context) => {
if (!currentContainer) { if (!currentContainer) {
currentContainer = children[i] = createCompoundExpression( currentContainer = children[i] = createCompoundExpression(
[child], [child],
child.loc child.loc,
) )
} }
// merge adjacent text node into current // merge adjacent text node into current
@ -72,7 +72,7 @@ export const transformText: NodeTransform = (node, context) => {
!node.props.find( !node.props.find(
p => p =>
p.type === NodeTypes.DIRECTIVE && p.type === NodeTypes.DIRECTIVE &&
!context.directiveTransforms[p.name] !context.directiveTransforms[p.name],
) && ) &&
// in compat mode, <template> tags with no special directives // in compat mode, <template> tags with no special directives
// will be rendered as a fragment so its children must be // will be rendered as a fragment so its children must be
@ -100,7 +100,7 @@ export const transformText: NodeTransform = (node, context) => {
) { ) {
callArgs.push( callArgs.push(
PatchFlags.TEXT + PatchFlags.TEXT +
(__DEV__ ? ` /* ${PatchFlagNames[PatchFlags.TEXT]} */` : ``) (__DEV__ ? ` /* ${PatchFlagNames[PatchFlags.TEXT]} */` : ``),
) )
} }
children[i] = { children[i] = {
@ -109,8 +109,8 @@ export const transformText: NodeTransform = (node, context) => {
loc: child.loc, loc: child.loc,
codegenNode: createCallExpression( codegenNode: createCallExpression(
context.helper(CREATE_TEXT), context.helper(CREATE_TEXT),
callArgs callArgs,
) ),
} }
} }
} }

View File

@ -1,21 +1,32 @@
import { DirectiveTransform } from '../transform' import type { DirectiveTransform } from '../transform'
import { import {
type ExpressionNode,
NodeTypes,
createObjectProperty, createObjectProperty,
createSimpleExpression, createSimpleExpression,
ExpressionNode,
NodeTypes
} from '../ast' } from '../ast'
import { createCompilerError, ErrorCodes } from '../errors' import { ErrorCodes, createCompilerError } from '../errors'
import { camelize } from '@vue/shared' import { camelize } from '@vue/shared'
import { CAMELIZE } from '../runtimeHelpers' import { CAMELIZE } from '../runtimeHelpers'
import { processExpression } from './transformExpression'
// v-bind without arg is handled directly in ./transformElements.ts due to it affecting // v-bind without arg is handled directly in ./transformElements.ts due to it affecting
// codegen for the entire props object. This transform here is only for v-bind // codegen for the entire props object. This transform here is only for v-bind
// *with* args. // *with* args.
export const transformBind: DirectiveTransform = (dir, _node, context) => { export const transformBind: DirectiveTransform = (dir, _node, context) => {
const { exp, modifiers, loc } = dir const { modifiers, loc } = dir
const arg = dir.arg! const arg = dir.arg!
// :arg is replaced by :arg="arg"
let { exp } = dir
if (!exp && arg.type === NodeTypes.SIMPLE_EXPRESSION) {
const propName = camelize(arg.content)
exp = dir.exp = createSimpleExpression(propName, false, arg.loc)
if (!__BROWSER__) {
exp = dir.exp = processExpression(exp, context)
}
}
if (arg.type !== NodeTypes.SIMPLE_EXPRESSION) { if (arg.type !== NodeTypes.SIMPLE_EXPRESSION) {
arg.children.unshift(`(`) arg.children.unshift(`(`)
arg.children.push(`) || ""`) arg.children.push(`) || ""`)
@ -52,12 +63,12 @@ export const transformBind: DirectiveTransform = (dir, _node, context) => {
) { ) {
context.onError(createCompilerError(ErrorCodes.X_V_BIND_NO_EXPRESSION, loc)) context.onError(createCompilerError(ErrorCodes.X_V_BIND_NO_EXPRESSION, loc))
return { return {
props: [createObjectProperty(arg, createSimpleExpression('', true, loc))] props: [createObjectProperty(arg, createSimpleExpression('', true, loc))],
} }
} }
return { return {
props: [createObjectProperty(arg, exp)] props: [createObjectProperty(arg, exp)],
} }
} }

View File

@ -1,54 +1,52 @@
import { import {
type TransformContext,
createStructuralDirectiveTransform, createStructuralDirectiveTransform,
TransformContext
} from '../transform' } from '../transform'
import { import {
type BlockCodegenNode,
ConstantTypes,
type DirectiveNode,
type ElementNode,
type ExpressionNode,
type ForCodegenNode,
type ForIteratorExpression,
type ForNode,
type ForParseResult,
type ForRenderListExpression,
NodeTypes, NodeTypes,
ExpressionNode, type PlainElementNode,
createSimpleExpression, type RenderSlotCall,
SourceLocation, type SimpleExpressionNode,
SimpleExpressionNode, type SlotOutletNode,
type VNodeCall,
createBlockStatement,
createCallExpression, createCallExpression,
createCompoundExpression,
createFunctionExpression, createFunctionExpression,
createObjectExpression, createObjectExpression,
createObjectProperty, createObjectProperty,
ForCodegenNode, createSimpleExpression,
RenderSlotCall,
SlotOutletNode,
ElementNode,
DirectiveNode,
ForNode,
PlainElementNode,
createVNodeCall, createVNodeCall,
VNodeCall,
ForRenderListExpression,
BlockCodegenNode,
ForIteratorExpression,
ConstantTypes,
createBlockStatement,
createCompoundExpression,
getVNodeBlockHelper, getVNodeBlockHelper,
getVNodeHelper getVNodeHelper,
} from '../ast' } from '../ast'
import { createCompilerError, ErrorCodes } from '../errors' import { ErrorCodes, createCompilerError } from '../errors'
import { import {
getInnerRange,
findProp,
isTemplateNode,
isSlotOutlet,
injectProp,
findDir, findDir,
forAliasRE findProp,
injectProp,
isSlotOutlet,
isTemplateNode,
} from '../utils' } from '../utils'
import { import {
RENDER_LIST,
OPEN_BLOCK,
FRAGMENT, FRAGMENT,
IS_MEMO_SAME IS_MEMO_SAME,
OPEN_BLOCK,
RENDER_LIST,
} from '../runtimeHelpers' } from '../runtimeHelpers'
import { processExpression } from './transformExpression' import { processExpression } from './transformExpression'
import { validateBrowserExpression } from '../validateExpression' import { validateBrowserExpression } from '../validateExpression'
import { PatchFlags, PatchFlagNames } from '@vue/shared' import { PatchFlagNames, PatchFlags } from '@vue/shared'
export const transformFor = createStructuralDirectiveTransform( export const transformFor = createStructuralDirectiveTransform(
'for', 'for',
@ -58,7 +56,7 @@ export const transformFor = createStructuralDirectiveTransform(
// create the loop render function expression now, and add the // create the loop render function expression now, and add the
// iterator on exit after all children have been traversed // iterator on exit after all children have been traversed
const renderExp = createCallExpression(helper(RENDER_LIST), [ const renderExp = createCallExpression(helper(RENDER_LIST), [
forNode.source forNode.source,
]) as ForRenderListExpression ]) as ForRenderListExpression
const isTemplate = isTemplateNode(node) const isTemplate = isTemplateNode(node)
const memo = findDir(node, 'memo') const memo = findDir(node, 'memo')
@ -78,13 +76,13 @@ export const transformFor = createStructuralDirectiveTransform(
if (memo) { if (memo) {
memo.exp = processExpression( memo.exp = processExpression(
memo.exp! as SimpleExpressionNode, memo.exp! as SimpleExpressionNode,
context context,
) )
} }
if (keyProperty && keyProp!.type !== NodeTypes.ATTRIBUTE) { if (keyProperty && keyProp!.type !== NodeTypes.ATTRIBUTE) {
keyProperty.value = processExpression( keyProperty.value = processExpression(
keyProperty.value as SimpleExpressionNode, keyProperty.value as SimpleExpressionNode,
context context,
) )
} }
} }
@ -110,7 +108,7 @@ export const transformFor = createStructuralDirectiveTransform(
true /* isBlock */, true /* isBlock */,
!isStableFragment /* disableTracking */, !isStableFragment /* disableTracking */,
false /* isComponent */, false /* isComponent */,
node.loc node.loc,
) as ForCodegenNode ) as ForCodegenNode
return () => { return () => {
@ -127,8 +125,8 @@ export const transformFor = createStructuralDirectiveTransform(
context.onError( context.onError(
createCompilerError( createCompilerError(
ErrorCodes.X_V_FOR_TEMPLATE_KEY_PLACEMENT, ErrorCodes.X_V_FOR_TEMPLATE_KEY_PLACEMENT,
key.loc key.loc,
) ),
) )
return true return true
} }
@ -171,7 +169,7 @@ export const transformFor = createStructuralDirectiveTransform(
undefined, undefined,
true, true,
undefined, undefined,
false /* isComponent */ false /* isComponent */,
) )
} else { } else {
// Normal element v-for. Directly use the child's codegenNode // Normal element v-for. Directly use the child's codegenNode
@ -186,12 +184,12 @@ export const transformFor = createStructuralDirectiveTransform(
// switch from block to vnode // switch from block to vnode
removeHelper(OPEN_BLOCK) removeHelper(OPEN_BLOCK)
removeHelper( removeHelper(
getVNodeBlockHelper(context.inSSR, childBlock.isComponent) getVNodeBlockHelper(context.inSSR, childBlock.isComponent),
) )
} else { } else {
// switch from vnode to block // switch from vnode to block
removeHelper( removeHelper(
getVNodeHelper(context.inSSR, childBlock.isComponent) getVNodeHelper(context.inSSR, childBlock.isComponent),
) )
} }
} }
@ -207,8 +205,8 @@ export const transformFor = createStructuralDirectiveTransform(
if (memo) { if (memo) {
const loop = createFunctionExpression( const loop = createFunctionExpression(
createForLoopParams(forNode.parseResult, [ createForLoopParams(forNode.parseResult, [
createSimpleExpression(`_cached`) createSimpleExpression(`_cached`),
]) ]),
) )
loop.body = createBlockStatement([ loop.body = createBlockStatement([
createCompoundExpression([`const _memo = (`, memo.exp!, `)`]), createCompoundExpression([`const _memo = (`, memo.exp!, `)`]),
@ -216,30 +214,30 @@ export const transformFor = createStructuralDirectiveTransform(
`if (_cached`, `if (_cached`,
...(keyExp ? [` && _cached.key === `, keyExp] : []), ...(keyExp ? [` && _cached.key === `, keyExp] : []),
` && ${context.helperString( ` && ${context.helperString(
IS_MEMO_SAME IS_MEMO_SAME,
)}(_cached, _memo)) return _cached` )}(_cached, _memo)) return _cached`,
]), ]),
createCompoundExpression([`const _item = `, childBlock as any]), createCompoundExpression([`const _item = `, childBlock as any]),
createSimpleExpression(`_item.memo = _memo`), createSimpleExpression(`_item.memo = _memo`),
createSimpleExpression(`return _item`) createSimpleExpression(`return _item`),
]) ])
renderExp.arguments.push( renderExp.arguments.push(
loop as ForIteratorExpression, loop as ForIteratorExpression,
createSimpleExpression(`_cache`), createSimpleExpression(`_cache`),
createSimpleExpression(String(context.cached++)) createSimpleExpression(String(context.cached++)),
) )
} else { } else {
renderExp.arguments.push( renderExp.arguments.push(
createFunctionExpression( createFunctionExpression(
createForLoopParams(forNode.parseResult), createForLoopParams(forNode.parseResult),
childBlock, childBlock,
true /* force newline */ true /* force newline */,
) as ForIteratorExpression ) as ForIteratorExpression,
) )
} }
} }
}) })
} },
) )
// target-agnostic transform used for both Client and SSR // target-agnostic transform used for both Client and SSR
@ -247,29 +245,26 @@ export function processFor(
node: ElementNode, node: ElementNode,
dir: DirectiveNode, dir: DirectiveNode,
context: TransformContext, context: TransformContext,
processCodegen?: (forNode: ForNode) => (() => void) | undefined processCodegen?: (forNode: ForNode) => (() => void) | undefined,
) { ) {
if (!dir.exp) { if (!dir.exp) {
context.onError( context.onError(
createCompilerError(ErrorCodes.X_V_FOR_NO_EXPRESSION, dir.loc) createCompilerError(ErrorCodes.X_V_FOR_NO_EXPRESSION, dir.loc),
) )
return return
} }
const parseResult = parseForExpression( const parseResult = dir.forParseResult
// can only be simple expression because vFor transform is applied
// before expression transform.
dir.exp as SimpleExpressionNode,
context
)
if (!parseResult) { if (!parseResult) {
context.onError( context.onError(
createCompilerError(ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION, dir.loc) createCompilerError(ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION, dir.loc),
) )
return return
} }
finalizeForParseResult(parseResult, context)
const { addIdentifiers, removeIdentifiers, scopes } = context const { addIdentifiers, removeIdentifiers, scopes } = context
const { source, value, key, index } = parseResult const { source, value, key, index } = parseResult
@ -281,7 +276,7 @@ export function processFor(
keyAlias: key, keyAlias: key,
objectIndexAlias: index, objectIndexAlias: index,
parseResult, parseResult,
children: isTemplateNode(node) ? node.children : [node] children: isTemplateNode(node) ? node.children : [node],
} }
context.replaceNode(forNode) context.replaceNode(forNode)
@ -309,139 +304,75 @@ export function processFor(
} }
} }
// This regex doesn't cover the case if key or index aliases have destructuring, export function finalizeForParseResult(
// but those do not make sense in the first place, so this works in practice. result: ForParseResult,
const forIteratorRE = /,([^,\}\]]*)(?:,([^,\}\]]*))?$/ context: TransformContext,
const stripParensRE = /^\(|\)$/g ) {
if (result.finalized) return
export interface ForParseResult {
source: ExpressionNode
value: ExpressionNode | undefined
key: ExpressionNode | undefined
index: ExpressionNode | undefined
}
export function parseForExpression(
input: SimpleExpressionNode,
context: TransformContext
): ForParseResult | undefined {
const loc = input.loc
const exp = input.content
const inMatch = exp.match(forAliasRE)
if (!inMatch) return
const [, LHS, RHS] = inMatch
const result: ForParseResult = {
source: createAliasExpression(
loc,
RHS.trim(),
exp.indexOf(RHS, LHS.length)
),
value: undefined,
key: undefined,
index: undefined
}
if (!__BROWSER__ && context.prefixIdentifiers) { if (!__BROWSER__ && context.prefixIdentifiers) {
result.source = processExpression( result.source = processExpression(
result.source as SimpleExpressionNode, result.source as SimpleExpressionNode,
context context,
) )
if (result.key) {
result.key = processExpression(
result.key as SimpleExpressionNode,
context,
true,
)
}
if (result.index) {
result.index = processExpression(
result.index as SimpleExpressionNode,
context,
true,
)
}
if (result.value) {
result.value = processExpression(
result.value as SimpleExpressionNode,
context,
true,
)
}
} }
if (__DEV__ && __BROWSER__) { if (__DEV__ && __BROWSER__) {
validateBrowserExpression(result.source as SimpleExpressionNode, context) validateBrowserExpression(result.source as SimpleExpressionNode, context)
} if (result.key) {
let valueContent = LHS.trim().replace(stripParensRE, '').trim()
const trimmedOffset = LHS.indexOf(valueContent)
const iteratorMatch = valueContent.match(forIteratorRE)
if (iteratorMatch) {
valueContent = valueContent.replace(forIteratorRE, '').trim()
const keyContent = iteratorMatch[1].trim()
let keyOffset: number | undefined
if (keyContent) {
keyOffset = exp.indexOf(keyContent, trimmedOffset + valueContent.length)
result.key = createAliasExpression(loc, keyContent, keyOffset)
if (!__BROWSER__ && context.prefixIdentifiers) {
result.key = processExpression(result.key, context, true)
}
if (__DEV__ && __BROWSER__) {
validateBrowserExpression( validateBrowserExpression(
result.key as SimpleExpressionNode, result.key as SimpleExpressionNode,
context, context,
true true,
) )
} }
} if (result.index) {
if (iteratorMatch[2]) {
const indexContent = iteratorMatch[2].trim()
if (indexContent) {
result.index = createAliasExpression(
loc,
indexContent,
exp.indexOf(
indexContent,
result.key
? keyOffset! + keyContent.length
: trimmedOffset + valueContent.length
)
)
if (!__BROWSER__ && context.prefixIdentifiers) {
result.index = processExpression(result.index, context, true)
}
if (__DEV__ && __BROWSER__) {
validateBrowserExpression( validateBrowserExpression(
result.index as SimpleExpressionNode, result.index as SimpleExpressionNode,
context, context,
true true,
) )
} }
} if (result.value) {
}
}
if (valueContent) {
result.value = createAliasExpression(loc, valueContent, trimmedOffset)
if (!__BROWSER__ && context.prefixIdentifiers) {
result.value = processExpression(result.value, context, true)
}
if (__DEV__ && __BROWSER__) {
validateBrowserExpression( validateBrowserExpression(
result.value as SimpleExpressionNode, result.value as SimpleExpressionNode,
context, context,
true true,
) )
} }
} }
result.finalized = true
return result
}
function createAliasExpression(
range: SourceLocation,
content: string,
offset: number
): SimpleExpressionNode {
return createSimpleExpression(
content,
false,
getInnerRange(range, offset, content.length)
)
} }
export function createForLoopParams( export function createForLoopParams(
{ value, key, index }: ForParseResult, { value, key, index }: ForParseResult,
memoArgs: ExpressionNode[] = [] memoArgs: ExpressionNode[] = [],
): ExpressionNode[] { ): ExpressionNode[] {
return createParamsList([value, key, index, ...memoArgs]) return createParamsList([value, key, index, ...memoArgs])
} }
function createParamsList( function createParamsList(
args: (ExpressionNode | undefined)[] args: (ExpressionNode | undefined)[],
): ExpressionNode[] { ): ExpressionNode[] {
let i = args.length let i = args.length
while (i--) { while (i--) {

View File

@ -1,43 +1,37 @@
import { import {
type TransformContext,
createStructuralDirectiveTransform, createStructuralDirectiveTransform,
TransformContext, traverseNode,
traverseNode
} from '../transform' } from '../transform'
import { import {
NodeTypes, type AttributeNode,
type BlockCodegenNode,
type CacheExpression,
ConstantTypes,
type DirectiveNode,
type ElementNode,
ElementTypes, ElementTypes,
ElementNode, type IfBranchNode,
DirectiveNode, type IfConditionalExpression,
IfBranchNode, type IfNode,
SimpleExpressionNode, type MemoExpression,
NodeTypes,
type SimpleExpressionNode,
convertToBlock,
createCallExpression, createCallExpression,
createConditionalExpression, createConditionalExpression,
createSimpleExpression,
createObjectProperty,
createObjectExpression, createObjectExpression,
IfConditionalExpression, createObjectProperty,
BlockCodegenNode, createSimpleExpression,
IfNode,
createVNodeCall, createVNodeCall,
AttributeNode,
locStub, locStub,
CacheExpression,
ConstantTypes,
MemoExpression,
convertToBlock
} from '../ast' } from '../ast'
import { createCompilerError, ErrorCodes } from '../errors' import { ErrorCodes, createCompilerError } from '../errors'
import { processExpression } from './transformExpression' import { processExpression } from './transformExpression'
import { validateBrowserExpression } from '../validateExpression' import { validateBrowserExpression } from '../validateExpression'
import { FRAGMENT, CREATE_COMMENT } from '../runtimeHelpers' import { CREATE_COMMENT, FRAGMENT } from '../runtimeHelpers'
import { import { findDir, findProp, getMemoedVNodeCall, injectProp } from '../utils'
injectProp, import { PatchFlagNames, PatchFlags } from '@vue/shared'
findDir,
findProp,
isBuiltInType,
getMemoedVNodeCall
} from '../utils'
import { PatchFlags, PatchFlagNames } from '@vue/shared'
export const transformIf = createStructuralDirectiveTransform( export const transformIf = createStructuralDirectiveTransform(
/^(if|else|else-if)$/, /^(if|else|else-if)$/,
@ -63,7 +57,7 @@ export const transformIf = createStructuralDirectiveTransform(
ifNode.codegenNode = createCodegenNodeForBranch( ifNode.codegenNode = createCodegenNodeForBranch(
branch, branch,
key, key,
context context,
) as IfConditionalExpression ) as IfConditionalExpression
} else { } else {
// attach this branch's codegen node to the v-if root. // attach this branch's codegen node to the v-if root.
@ -71,12 +65,12 @@ export const transformIf = createStructuralDirectiveTransform(
parentCondition.alternate = createCodegenNodeForBranch( parentCondition.alternate = createCodegenNodeForBranch(
branch, branch,
key + ifNode.branches.length - 1, key + ifNode.branches.length - 1,
context context,
) )
} }
} }
}) })
} },
) )
// target-agnostic transform used for both Client and SSR // target-agnostic transform used for both Client and SSR
@ -87,8 +81,8 @@ export function processIf(
processCodegen?: ( processCodegen?: (
node: IfNode, node: IfNode,
branch: IfBranchNode, branch: IfBranchNode,
isRoot: boolean isRoot: boolean,
) => (() => void) | undefined ) => (() => void) | undefined,
) { ) {
if ( if (
dir.name !== 'else' && dir.name !== 'else' &&
@ -96,7 +90,7 @@ export function processIf(
) { ) {
const loc = dir.exp ? dir.exp.loc : node.loc const loc = dir.exp ? dir.exp.loc : node.loc
context.onError( context.onError(
createCompilerError(ErrorCodes.X_V_IF_NO_EXPRESSION, dir.loc) createCompilerError(ErrorCodes.X_V_IF_NO_EXPRESSION, dir.loc),
) )
dir.exp = createSimpleExpression(`true`, false, loc) dir.exp = createSimpleExpression(`true`, false, loc)
} }
@ -116,7 +110,7 @@ export function processIf(
const ifNode: IfNode = { const ifNode: IfNode = {
type: NodeTypes.IF, type: NodeTypes.IF,
loc: node.loc, loc: node.loc,
branches: [branch] branches: [branch],
} }
context.replaceNode(ifNode) context.replaceNode(ifNode)
if (processCodegen) { if (processCodegen) {
@ -151,7 +145,7 @@ export function processIf(
sibling.branches[sibling.branches.length - 1].condition === undefined sibling.branches[sibling.branches.length - 1].condition === undefined
) { ) {
context.onError( context.onError(
createCompilerError(ErrorCodes.X_V_ELSE_NO_ADJACENT_IF, node.loc) createCompilerError(ErrorCodes.X_V_ELSE_NO_ADJACENT_IF, node.loc),
) )
} }
@ -165,7 +159,8 @@ export function processIf(
!( !(
context.parent && context.parent &&
context.parent.type === NodeTypes.ELEMENT && context.parent.type === NodeTypes.ELEMENT &&
isBuiltInType(context.parent.tag, 'transition') (context.parent.tag === 'transition' ||
context.parent.tag === 'Transition')
) )
) { ) {
branch.children = [...comments, ...branch.children] branch.children = [...comments, ...branch.children]
@ -180,8 +175,8 @@ export function processIf(
context.onError( context.onError(
createCompilerError( createCompilerError(
ErrorCodes.X_V_IF_SAME_KEY, ErrorCodes.X_V_IF_SAME_KEY,
branch.userKey!.loc branch.userKey!.loc,
) ),
) )
} }
}) })
@ -200,7 +195,7 @@ export function processIf(
context.currentNode = null context.currentNode = null
} else { } else {
context.onError( context.onError(
createCompilerError(ErrorCodes.X_V_ELSE_NO_ADJACENT_IF, node.loc) createCompilerError(ErrorCodes.X_V_ELSE_NO_ADJACENT_IF, node.loc),
) )
} }
break break
@ -216,14 +211,14 @@ function createIfBranch(node: ElementNode, dir: DirectiveNode): IfBranchNode {
condition: dir.name === 'else' ? undefined : dir.exp, condition: dir.name === 'else' ? undefined : dir.exp,
children: isTemplateIf && !findDir(node, 'for') ? node.children : [node], children: isTemplateIf && !findDir(node, 'for') ? node.children : [node],
userKey: findProp(node, `key`), userKey: findProp(node, `key`),
isTemplateIf isTemplateIf,
} }
} }
function createCodegenNodeForBranch( function createCodegenNodeForBranch(
branch: IfBranchNode, branch: IfBranchNode,
keyIndex: number, keyIndex: number,
context: TransformContext context: TransformContext,
): IfConditionalExpression | BlockCodegenNode | MemoExpression { ): IfConditionalExpression | BlockCodegenNode | MemoExpression {
if (branch.condition) { if (branch.condition) {
return createConditionalExpression( return createConditionalExpression(
@ -233,8 +228,8 @@ function createCodegenNodeForBranch(
// closes the current block. // closes the current block.
createCallExpression(context.helper(CREATE_COMMENT), [ createCallExpression(context.helper(CREATE_COMMENT), [
__DEV__ ? '"v-if"' : '""', __DEV__ ? '"v-if"' : '""',
'true' 'true',
]) ]),
) as IfConditionalExpression ) as IfConditionalExpression
} else { } else {
return createChildrenCodegenNode(branch, keyIndex, context) return createChildrenCodegenNode(branch, keyIndex, context)
@ -244,7 +239,7 @@ function createCodegenNodeForBranch(
function createChildrenCodegenNode( function createChildrenCodegenNode(
branch: IfBranchNode, branch: IfBranchNode,
keyIndex: number, keyIndex: number,
context: TransformContext context: TransformContext,
): BlockCodegenNode | MemoExpression { ): BlockCodegenNode | MemoExpression {
const { helper } = context const { helper } = context
const keyProperty = createObjectProperty( const keyProperty = createObjectProperty(
@ -253,8 +248,8 @@ function createChildrenCodegenNode(
`${keyIndex}`, `${keyIndex}`,
false, false,
locStub, locStub,
ConstantTypes.CAN_HOIST ConstantTypes.CAN_HOIST,
) ),
) )
const { children } = branch const { children } = branch
const firstChild = children[0] const firstChild = children[0]
@ -291,7 +286,7 @@ function createChildrenCodegenNode(
true, true,
false, false,
false /* isComponent */, false /* isComponent */,
branch.loc branch.loc,
) )
} }
} else { } else {
@ -311,7 +306,7 @@ function createChildrenCodegenNode(
function isSameKey( function isSameKey(
a: AttributeNode | DirectiveNode | undefined, a: AttributeNode | DirectiveNode | undefined,
b: AttributeNode | DirectiveNode b: AttributeNode | DirectiveNode,
): boolean { ): boolean {
if (!a || a.type !== b.type) { if (!a || a.type !== b.type) {
return false return false
@ -339,7 +334,7 @@ function isSameKey(
} }
function getParentCondition( function getParentCondition(
node: IfConditionalExpression | CacheExpression node: IfConditionalExpression | CacheExpression,
): IfConditionalExpression { ): IfConditionalExpression {
while (true) { while (true) {
if (node.type === NodeTypes.JS_CONDITIONAL_EXPRESSION) { if (node.type === NodeTypes.JS_CONDITIONAL_EXPRESSION) {

View File

@ -1,13 +1,13 @@
import { NodeTransform } from '../transform' import type { NodeTransform } from '../transform'
import { findDir } from '../utils' import { findDir } from '../utils'
import { import {
ElementTypes,
type MemoExpression,
NodeTypes,
type PlainElementNode,
convertToBlock, convertToBlock,
createCallExpression, createCallExpression,
createFunctionExpression, createFunctionExpression,
ElementTypes,
MemoExpression,
NodeTypes,
PlainElementNode
} from '../ast' } from '../ast'
import { WITH_MEMO } from '../runtimeHelpers' import { WITH_MEMO } from '../runtimeHelpers'
@ -33,7 +33,7 @@ export const transformMemo: NodeTransform = (node, context) => {
dir.exp!, dir.exp!,
createFunctionExpression(undefined, codegenNode), createFunctionExpression(undefined, codegenNode),
`_cache`, `_cache`,
String(context.cached++) String(context.cached++),
]) as MemoExpression ]) as MemoExpression
} }
} }

View File

@ -1,20 +1,20 @@
import { DirectiveTransform } from '../transform' import type { DirectiveTransform } from '../transform'
import { import {
createSimpleExpression, ConstantTypes,
createObjectProperty,
createCompoundExpression,
NodeTypes,
Property,
ElementTypes, ElementTypes,
ExpressionNode, type ExpressionNode,
ConstantTypes NodeTypes,
type Property,
createCompoundExpression,
createObjectProperty,
createSimpleExpression,
} from '../ast' } from '../ast'
import { createCompilerError, ErrorCodes } from '../errors' import { ErrorCodes, createCompilerError } from '../errors'
import { import {
hasScopeRef,
isMemberExpression, isMemberExpression,
isSimpleIdentifier, isSimpleIdentifier,
hasScopeRef, isStaticExp,
isStaticExp
} from '../utils' } from '../utils'
import { IS_REF } from '../runtimeHelpers' import { IS_REF } from '../runtimeHelpers'
import { BindingTypes } from '../options' import { BindingTypes } from '../options'
@ -24,11 +24,13 @@ export const transformModel: DirectiveTransform = (dir, node, context) => {
const { exp, arg } = dir const { exp, arg } = dir
if (!exp) { if (!exp) {
context.onError( context.onError(
createCompilerError(ErrorCodes.X_V_MODEL_NO_EXPRESSION, dir.loc) createCompilerError(ErrorCodes.X_V_MODEL_NO_EXPRESSION, dir.loc),
) )
return createTransformProps() return createTransformProps()
} }
// we assume v-model directives are always parsed
// (not artificially created by a transform)
const rawExp = exp.loc.source const rawExp = exp.loc.source
const expString = const expString =
exp.type === NodeTypes.SIMPLE_EXPRESSION ? exp.content : rawExp exp.type === NodeTypes.SIMPLE_EXPRESSION ? exp.content : rawExp
@ -58,7 +60,7 @@ export const transformModel: DirectiveTransform = (dir, node, context) => {
(!isMemberExpression(expString, context) && !maybeRef) (!isMemberExpression(expString, context) && !maybeRef)
) { ) {
context.onError( context.onError(
createCompilerError(ErrorCodes.X_V_MODEL_MALFORMED_EXPRESSION, exp.loc) createCompilerError(ErrorCodes.X_V_MODEL_MALFORMED_EXPRESSION, exp.loc),
) )
return createTransformProps() return createTransformProps()
} }
@ -70,7 +72,7 @@ export const transformModel: DirectiveTransform = (dir, node, context) => {
context.identifiers[expString] context.identifiers[expString]
) { ) {
context.onError( context.onError(
createCompilerError(ErrorCodes.X_V_MODEL_ON_SCOPE_VARIABLE, exp.loc) createCompilerError(ErrorCodes.X_V_MODEL_ON_SCOPE_VARIABLE, exp.loc),
) )
return createTransformProps() return createTransformProps()
} }
@ -90,7 +92,7 @@ export const transformModel: DirectiveTransform = (dir, node, context) => {
assignmentExp = createCompoundExpression([ assignmentExp = createCompoundExpression([
`${eventArg} => ((`, `${eventArg} => ((`,
createSimpleExpression(rawExp, false, exp.loc), createSimpleExpression(rawExp, false, exp.loc),
`).value = $event)` `).value = $event)`,
]) ])
} else { } else {
// v-model used on a potentially ref binding in <script setup> inline mode. // v-model used on a potentially ref binding in <script setup> inline mode.
@ -100,14 +102,14 @@ export const transformModel: DirectiveTransform = (dir, node, context) => {
assignmentExp = createCompoundExpression([ assignmentExp = createCompoundExpression([
`${eventArg} => (${context.helperString(IS_REF)}(${rawExp}) ? (`, `${eventArg} => (${context.helperString(IS_REF)}(${rawExp}) ? (`,
createSimpleExpression(rawExp, false, exp.loc), createSimpleExpression(rawExp, false, exp.loc),
`).value = $event : ${altAssignment})` `).value = $event : ${altAssignment})`,
]) ])
} }
} else { } else {
assignmentExp = createCompoundExpression([ assignmentExp = createCompoundExpression([
`${eventArg} => ((`, `${eventArg} => ((`,
exp, exp,
`) = $event)` `) = $event)`,
]) ])
} }
@ -115,7 +117,7 @@ export const transformModel: DirectiveTransform = (dir, node, context) => {
// modelValue: foo // modelValue: foo
createObjectProperty(propName, dir.exp!), createObjectProperty(propName, dir.exp!),
// "onUpdate:modelValue": $event => (foo = $event) // "onUpdate:modelValue": $event => (foo = $event)
createObjectProperty(eventName, assignmentExp) createObjectProperty(eventName, assignmentExp),
] ]
// cache v-model handler if applicable (when it doesn't refer any scope vars) // cache v-model handler if applicable (when it doesn't refer any scope vars)
@ -146,9 +148,9 @@ export const transformModel: DirectiveTransform = (dir, node, context) => {
`{ ${modifiers} }`, `{ ${modifiers} }`,
false, false,
dir.loc, dir.loc,
ConstantTypes.CAN_HOIST ConstantTypes.CAN_HOIST,
) ),
) ),
) )
} }

View File

@ -1,16 +1,16 @@
import { DirectiveTransform, DirectiveTransformResult } from '../transform' import type { DirectiveTransform, DirectiveTransformResult } from '../transform'
import { import {
type DirectiveNode,
ElementTypes,
type ExpressionNode,
NodeTypes,
type SimpleExpressionNode,
createCompoundExpression, createCompoundExpression,
createObjectProperty, createObjectProperty,
createSimpleExpression, createSimpleExpression,
DirectiveNode,
ElementTypes,
ExpressionNode,
NodeTypes,
SimpleExpressionNode
} from '../ast' } from '../ast'
import { camelize, toHandlerKey } from '@vue/shared' import { camelize, toHandlerKey } from '@vue/shared'
import { createCompilerError, ErrorCodes } from '../errors' import { ErrorCodes, createCompilerError } from '../errors'
import { processExpression } from './transformExpression' import { processExpression } from './transformExpression'
import { validateBrowserExpression } from '../validateExpression' import { validateBrowserExpression } from '../validateExpression'
import { hasScopeRef, isMemberExpression } from '../utils' import { hasScopeRef, isMemberExpression } from '../utils'
@ -33,7 +33,7 @@ export const transformOn: DirectiveTransform = (
dir, dir,
node, node,
context, context,
augmentor augmentor,
) => { ) => {
const { loc, modifiers, arg } = dir as VOnDirectiveNode const { loc, modifiers, arg } = dir as VOnDirectiveNode
if (!dir.exp && !modifiers.length) { if (!dir.exp && !modifiers.length) {
@ -44,9 +44,7 @@ export const transformOn: DirectiveTransform = (
if (arg.isStatic) { if (arg.isStatic) {
let rawName = arg.content let rawName = arg.content
if (__DEV__ && rawName.startsWith('vnode')) { if (__DEV__ && rawName.startsWith('vnode')) {
context.onWarn( context.onError(createCompilerError(ErrorCodes.X_VNODE_HOOKS, arg.loc))
createCompilerError(ErrorCodes.DEPRECATION_VNODE_HOOKS, arg.loc)
)
} }
if (rawName.startsWith('vue:')) { if (rawName.startsWith('vue:')) {
rawName = `vnode-${rawName.slice(4)}` rawName = `vnode-${rawName.slice(4)}`
@ -67,7 +65,7 @@ export const transformOn: DirectiveTransform = (
eventName = createCompoundExpression([ eventName = createCompoundExpression([
`${context.helperString(TO_HANDLER_KEY)}(`, `${context.helperString(TO_HANDLER_KEY)}(`,
arg, arg,
`)` `)`,
]) ])
} }
} else { } else {
@ -97,7 +95,7 @@ export const transformOn: DirectiveTransform = (
exp, exp,
context, context,
false, false,
hasMultipleStatements hasMultipleStatements,
) )
isInlineStatement && context.removeIdentifiers(`$event`) isInlineStatement && context.removeIdentifiers(`$event`)
// with scope analysis, the function is hoistable if it has no reference // with scope analysis, the function is hoistable if it has no reference
@ -136,7 +134,7 @@ export const transformOn: DirectiveTransform = (
exp as SimpleExpressionNode, exp as SimpleExpressionNode,
context, context,
false, false,
hasMultipleStatements hasMultipleStatements,
) )
} }
@ -153,7 +151,7 @@ export const transformOn: DirectiveTransform = (
}(...args)` }(...args)`
} => ${hasMultipleStatements ? `{` : `(`}`, } => ${hasMultipleStatements ? `{` : `(`}`,
exp, exp,
hasMultipleStatements ? `}` : `)` hasMultipleStatements ? `}` : `)`,
]) ])
} }
} }
@ -162,9 +160,9 @@ export const transformOn: DirectiveTransform = (
props: [ props: [
createObjectProperty( createObjectProperty(
eventName, eventName,
exp || createSimpleExpression(`() => {}`, false, loc) exp || createSimpleExpression(`() => {}`, false, loc),
) ),
] ],
} }
// apply extended compiler augmentor // apply extended compiler augmentor

View File

@ -1,6 +1,6 @@
import { NodeTransform } from '../transform' import type { NodeTransform } from '../transform'
import { findDir } from '../utils' import { findDir } from '../utils'
import { ElementNode, ForNode, IfNode, NodeTypes } from '../ast' import { type ElementNode, type ForNode, type IfNode, NodeTypes } from '../ast'
import { SET_BLOCK_TRACKING } from '../runtimeHelpers' import { SET_BLOCK_TRACKING } from '../runtimeHelpers'
const seen = new WeakSet() const seen = new WeakSet()

View File

@ -1,38 +1,37 @@
import { import {
ElementNode, type CallExpression,
ObjectExpression, type ConditionalExpression,
createObjectExpression, type DirectiveNode,
type ElementNode,
ElementTypes,
type ExpressionNode,
type FunctionExpression,
NodeTypes, NodeTypes,
type ObjectExpression,
type Property,
type SlotsExpression,
type SourceLocation,
type TemplateChildNode,
createArrayExpression,
createCallExpression,
createConditionalExpression,
createFunctionExpression,
createObjectExpression,
createObjectProperty, createObjectProperty,
createSimpleExpression, createSimpleExpression,
createFunctionExpression,
DirectiveNode,
ElementTypes,
ExpressionNode,
Property,
TemplateChildNode,
SourceLocation,
createConditionalExpression,
ConditionalExpression,
SimpleExpressionNode,
FunctionExpression,
CallExpression,
createCallExpression,
createArrayExpression,
SlotsExpression
} from '../ast' } from '../ast'
import { TransformContext, NodeTransform } from '../transform' import type { NodeTransform, TransformContext } from '../transform'
import { createCompilerError, ErrorCodes } from '../errors' import { ErrorCodes, createCompilerError } from '../errors'
import { import {
findDir,
isTemplateNode,
assert, assert,
isVSlot, findDir,
hasScopeRef, hasScopeRef,
isStaticExp isStaticExp,
isTemplateNode,
isVSlot,
} from '../utils' } from '../utils'
import { CREATE_SLOTS, RENDER_LIST, WITH_CTX } from '../runtimeHelpers' import { CREATE_SLOTS, RENDER_LIST, WITH_CTX } from '../runtimeHelpers'
import { parseForExpression, createForLoopParams } from './vFor' import { createForLoopParams, finalizeForParseResult } from './vFor'
import { SlotFlags, slotFlagsText } from '@vue/shared' import { SlotFlags, slotFlagsText } from '@vue/shared'
const defaultFallback = createSimpleExpression(`undefined`, false) const defaultFallback = createSimpleExpression(`undefined`, false)
@ -78,11 +77,9 @@ export const trackVForSlotScopes: NodeTransform = (node, context) => {
node.props.some(isVSlot) && node.props.some(isVSlot) &&
(vFor = findDir(node, 'for')) (vFor = findDir(node, 'for'))
) { ) {
const result = (vFor.parseResult = parseForExpression( const result = vFor.forParseResult
vFor.exp as SimpleExpressionNode,
context
))
if (result) { if (result) {
finalizeForParseResult(result, context)
const { value, key, index } = result const { value, key, index } = result
const { addIdentifiers, removeIdentifiers } = context const { addIdentifiers, removeIdentifiers } = context
value && addIdentifiers(value) value && addIdentifiers(value)
@ -100,9 +97,9 @@ export const trackVForSlotScopes: NodeTransform = (node, context) => {
export type SlotFnBuilder = ( export type SlotFnBuilder = (
slotProps: ExpressionNode | undefined, slotProps: ExpressionNode | undefined,
vForExp: ExpressionNode | undefined, vFor: DirectiveNode | undefined,
slotChildren: TemplateChildNode[], slotChildren: TemplateChildNode[],
loc: SourceLocation loc: SourceLocation,
) => FunctionExpression ) => FunctionExpression
const buildClientSlotFn: SlotFnBuilder = (props, _vForExp, children, loc) => const buildClientSlotFn: SlotFnBuilder = (props, _vForExp, children, loc) =>
@ -111,7 +108,7 @@ const buildClientSlotFn: SlotFnBuilder = (props, _vForExp, children, loc) =>
children, children,
false /* newline */, false /* newline */,
true /* isSlot */, true /* isSlot */,
children.length ? children[0].loc : loc children.length ? children[0].loc : loc,
) )
// Instead of being a DirectiveTransform, v-slot processing is called during // Instead of being a DirectiveTransform, v-slot processing is called during
@ -119,7 +116,7 @@ const buildClientSlotFn: SlotFnBuilder = (props, _vForExp, children, loc) =>
export function buildSlots( export function buildSlots(
node: ElementNode, node: ElementNode,
context: TransformContext, context: TransformContext,
buildSlotFn: SlotFnBuilder = buildClientSlotFn buildSlotFn: SlotFnBuilder = buildClientSlotFn,
): { ): {
slots: SlotsExpression slots: SlotsExpression
hasDynamicSlots: boolean hasDynamicSlots: boolean
@ -150,8 +147,8 @@ export function buildSlots(
slotsProperties.push( slotsProperties.push(
createObjectProperty( createObjectProperty(
arg || createSimpleExpression('default', true), arg || createSimpleExpression('default', true),
buildSlotFn(exp, undefined, children, loc) buildSlotFn(exp, undefined, children, loc),
) ),
) )
} }
@ -181,7 +178,7 @@ export function buildSlots(
if (onComponentSlot) { if (onComponentSlot) {
// already has on-component slot - this is incorrect usage. // already has on-component slot - this is incorrect usage.
context.onError( context.onError(
createCompilerError(ErrorCodes.X_V_SLOT_MIXED_SLOT_USAGE, slotDir.loc) createCompilerError(ErrorCodes.X_V_SLOT_MIXED_SLOT_USAGE, slotDir.loc),
) )
break break
} }
@ -191,7 +188,7 @@ export function buildSlots(
const { const {
arg: slotName = createSimpleExpression(`default`, true), arg: slotName = createSimpleExpression(`default`, true),
exp: slotProps, exp: slotProps,
loc: dirLoc loc: dirLoc,
} = slotDir } = slotDir
// check if name is dynamic. // check if name is dynamic.
@ -203,12 +200,7 @@ export function buildSlots(
} }
const vFor = findDir(slotElement, 'for') const vFor = findDir(slotElement, 'for')
const slotFunction = buildSlotFn( const slotFunction = buildSlotFn(slotProps, vFor, slotChildren, slotLoc)
slotProps,
vFor?.exp,
slotChildren,
slotLoc
)
// check if this slot is conditional (v-if/v-for) // check if this slot is conditional (v-if/v-for)
let vIf: DirectiveNode | undefined let vIf: DirectiveNode | undefined
@ -219,8 +211,8 @@ export function buildSlots(
createConditionalExpression( createConditionalExpression(
vIf.exp!, vIf.exp!,
buildDynamicSlot(slotName, slotFunction, conditionalBranchIndex++), buildDynamicSlot(slotName, slotFunction, conditionalBranchIndex++),
defaultFallback defaultFallback,
) ),
) )
} else if ( } else if (
(vElse = findDir(slotElement, /^else(-if)?$/, true /* allowEmpty */)) (vElse = findDir(slotElement, /^else(-if)?$/, true /* allowEmpty */))
@ -254,22 +246,21 @@ export function buildSlots(
buildDynamicSlot( buildDynamicSlot(
slotName, slotName,
slotFunction, slotFunction,
conditionalBranchIndex++ conditionalBranchIndex++,
), ),
defaultFallback defaultFallback,
) )
: buildDynamicSlot(slotName, slotFunction, conditionalBranchIndex++) : buildDynamicSlot(slotName, slotFunction, conditionalBranchIndex++)
} else { } else {
context.onError( context.onError(
createCompilerError(ErrorCodes.X_V_ELSE_NO_ADJACENT_IF, vElse.loc) createCompilerError(ErrorCodes.X_V_ELSE_NO_ADJACENT_IF, vElse.loc),
) )
} }
} else if (vFor) { } else if (vFor) {
hasDynamicSlots = true hasDynamicSlots = true
const parseResult = const parseResult = vFor.forParseResult
vFor.parseResult ||
parseForExpression(vFor.exp as SimpleExpressionNode, context)
if (parseResult) { if (parseResult) {
finalizeForParseResult(parseResult, context)
// Render the dynamic slots as an array and add it to the createSlot() // Render the dynamic slots as an array and add it to the createSlot()
// args. The runtime knows how to handle it appropriately. // args. The runtime knows how to handle it appropriately.
dynamicSlots.push( dynamicSlots.push(
@ -278,13 +269,16 @@ export function buildSlots(
createFunctionExpression( createFunctionExpression(
createForLoopParams(parseResult), createForLoopParams(parseResult),
buildDynamicSlot(slotName, slotFunction), buildDynamicSlot(slotName, slotFunction),
true /* force newline */ true /* force newline */,
) ),
]) ]),
) )
} else { } else {
context.onError( context.onError(
createCompilerError(ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION, vFor.loc) createCompilerError(
ErrorCodes.X_V_FOR_MALFORMED_EXPRESSION,
vFor.loc,
),
) )
} }
} else { } else {
@ -294,8 +288,8 @@ export function buildSlots(
context.onError( context.onError(
createCompilerError( createCompilerError(
ErrorCodes.X_V_SLOT_DUPLICATE_SLOT_NAMES, ErrorCodes.X_V_SLOT_DUPLICATE_SLOT_NAMES,
dirLoc dirLoc,
) ),
) )
continue continue
} }
@ -311,7 +305,7 @@ export function buildSlots(
if (!onComponentSlot) { if (!onComponentSlot) {
const buildDefaultSlotProperty = ( const buildDefaultSlotProperty = (
props: ExpressionNode | undefined, props: ExpressionNode | undefined,
children: TemplateChildNode[] children: TemplateChildNode[],
) => { ) => {
const fn = buildSlotFn(props, undefined, children, loc) const fn = buildSlotFn(props, undefined, children, loc)
if (__COMPAT__ && context.compatConfig) { if (__COMPAT__ && context.compatConfig) {
@ -335,12 +329,12 @@ export function buildSlots(
context.onError( context.onError(
createCompilerError( createCompilerError(
ErrorCodes.X_V_SLOT_EXTRANEOUS_DEFAULT_SLOT_CHILDREN, ErrorCodes.X_V_SLOT_EXTRANEOUS_DEFAULT_SLOT_CHILDREN,
implicitDefaultChildren[0].loc implicitDefaultChildren[0].loc,
) ),
) )
} else { } else {
slotsProperties.push( slotsProperties.push(
buildDefaultSlotProperty(undefined, implicitDefaultChildren) buildDefaultSlotProperty(undefined, implicitDefaultChildren),
) )
} }
} }
@ -360,37 +354,37 @@ export function buildSlots(
// 1 = compiled and static = can skip normalization AND diff as optimized // 1 = compiled and static = can skip normalization AND diff as optimized
createSimpleExpression( createSimpleExpression(
slotFlag + (__DEV__ ? ` /* ${slotFlagsText[slotFlag]} */` : ``), slotFlag + (__DEV__ ? ` /* ${slotFlagsText[slotFlag]} */` : ``),
false false,
)
)
), ),
loc ),
),
loc,
) as SlotsExpression ) as SlotsExpression
if (dynamicSlots.length) { if (dynamicSlots.length) {
slots = createCallExpression(context.helper(CREATE_SLOTS), [ slots = createCallExpression(context.helper(CREATE_SLOTS), [
slots, slots,
createArrayExpression(dynamicSlots) createArrayExpression(dynamicSlots),
]) as SlotsExpression ]) as SlotsExpression
} }
return { return {
slots, slots,
hasDynamicSlots hasDynamicSlots,
} }
} }
function buildDynamicSlot( function buildDynamicSlot(
name: ExpressionNode, name: ExpressionNode,
fn: FunctionExpression, fn: FunctionExpression,
index?: number index?: number,
): ObjectExpression { ): ObjectExpression {
const props = [ const props = [
createObjectProperty(`name`, name), createObjectProperty(`name`, name),
createObjectProperty(`fn`, fn) createObjectProperty(`fn`, fn),
] ]
if (index != null) { if (index != null) {
props.push( props.push(
createObjectProperty(`key`, createSimpleExpression(String(index), true)) createObjectProperty(`key`, createSimpleExpression(String(index), true)),
) )
} }
return createObjectExpression(props) return createObjectExpression(props)

View File

@ -1,61 +1,63 @@
import { import {
SourceLocation, type BlockCodegenNode,
Position, type CallExpression,
ElementNode, type DirectiveNode,
NodeTypes, type ElementNode,
CallExpression,
createCallExpression,
DirectiveNode,
ElementTypes, ElementTypes,
TemplateChildNode, type ExpressionNode,
RootNode, type IfBranchNode,
ObjectExpression, type InterpolationNode,
Property, type JSChildNode,
JSChildNode, type MemoExpression,
NodeTypes,
type ObjectExpression,
type Position,
type Property,
type RenderSlotCall,
type RootNode,
type SimpleExpressionNode,
type SlotOutletNode,
type TemplateChildNode,
type TemplateNode,
type TextNode,
type VNodeCall,
createCallExpression,
createObjectExpression, createObjectExpression,
SlotOutletNode,
TemplateNode,
RenderSlotCall,
ExpressionNode,
IfBranchNode,
TextNode,
InterpolationNode,
VNodeCall,
SimpleExpressionNode,
BlockCodegenNode,
MemoExpression
} from './ast' } from './ast'
import { TransformContext } from './transform' import type { TransformContext } from './transform'
import { import {
MERGE_PROPS,
TELEPORT,
SUSPENSE,
KEEP_ALIVE,
BASE_TRANSITION, BASE_TRANSITION,
TO_HANDLERS,
NORMALIZE_PROPS,
GUARD_REACTIVE_PROPS, GUARD_REACTIVE_PROPS,
WITH_MEMO KEEP_ALIVE,
MERGE_PROPS,
NORMALIZE_PROPS,
SUSPENSE,
TELEPORT,
TO_HANDLERS,
WITH_MEMO,
} from './runtimeHelpers' } from './runtimeHelpers'
import { isString, isObject, hyphenate, extend, NOOP } from '@vue/shared' import { NOOP, isObject, isString } from '@vue/shared'
import { PropsExpression } from './transforms/transformElement' import type { PropsExpression } from './transforms/transformElement'
import { parseExpression } from '@babel/parser' import { parseExpression } from '@babel/parser'
import { Expression } from '@babel/types' import type { Expression } from '@babel/types'
import { unwrapTSNode } from './babelUtils'
export const isStaticExp = (p: JSChildNode): p is SimpleExpressionNode => export const isStaticExp = (p: JSChildNode): p is SimpleExpressionNode =>
p.type === NodeTypes.SIMPLE_EXPRESSION && p.isStatic p.type === NodeTypes.SIMPLE_EXPRESSION && p.isStatic
export const isBuiltInType = (tag: string, expected: string): boolean =>
tag === expected || tag === hyphenate(expected)
export function isCoreComponent(tag: string): symbol | void { export function isCoreComponent(tag: string): symbol | void {
if (isBuiltInType(tag, 'Teleport')) { switch (tag) {
case 'Teleport':
case 'teleport':
return TELEPORT return TELEPORT
} else if (isBuiltInType(tag, 'Suspense')) { case 'Suspense':
case 'suspense':
return SUSPENSE return SUSPENSE
} else if (isBuiltInType(tag, 'KeepAlive')) { case 'KeepAlive':
case 'keep-alive':
return KEEP_ALIVE return KEEP_ALIVE
} else if (isBuiltInType(tag, 'BaseTransition')) { case 'BaseTransition':
case 'base-transition':
return BASE_TRANSITION return BASE_TRANSITION
} }
} }
@ -64,11 +66,11 @@ const nonIdentifierRE = /^\d|[^\$\w]/
export const isSimpleIdentifier = (name: string): boolean => export const isSimpleIdentifier = (name: string): boolean =>
!nonIdentifierRE.test(name) !nonIdentifierRE.test(name)
const enum MemberExpLexState { enum MemberExpLexState {
inMemberExp, inMemberExp,
inBrackets, inBrackets,
inParens, inParens,
inString inString,
} }
const validFirstIdentCharRE = /[A-Za-z_$\xA0-\uFFFF]/ const validFirstIdentCharRE = /[A-Za-z_$\xA0-\uFFFF]/
@ -155,15 +157,13 @@ export const isMemberExpressionNode = __BROWSER__
: (path: string, context: TransformContext): boolean => { : (path: string, context: TransformContext): boolean => {
try { try {
let ret: Expression = parseExpression(path, { let ret: Expression = parseExpression(path, {
plugins: context.expressionPlugins plugins: context.expressionPlugins,
}) })
if (ret.type === 'TSAsExpression' || ret.type === 'TSTypeAssertion') { ret = unwrapTSNode(ret) as Expression
ret = ret.expression
}
return ( return (
ret.type === 'MemberExpression' || ret.type === 'MemberExpression' ||
ret.type === 'OptionalMemberExpression' || ret.type === 'OptionalMemberExpression' ||
ret.type === 'Identifier' (ret.type === 'Identifier' && ret.name !== 'undefined')
) )
} catch (e) { } catch (e) {
return false return false
@ -174,40 +174,19 @@ export const isMemberExpression = __BROWSER__
? isMemberExpressionBrowser ? isMemberExpressionBrowser
: isMemberExpressionNode : isMemberExpressionNode
export function getInnerRange(
loc: SourceLocation,
offset: number,
length: number
): SourceLocation {
__TEST__ && assert(offset <= loc.source.length)
const source = loc.source.slice(offset, offset + length)
const newLoc: SourceLocation = {
source,
start: advancePositionWithClone(loc.start, loc.source, offset),
end: loc.end
}
if (length != null) {
__TEST__ && assert(offset + length <= loc.source.length)
newLoc.end = advancePositionWithClone(
loc.start,
loc.source,
offset + length
)
}
return newLoc
}
export function advancePositionWithClone( export function advancePositionWithClone(
pos: Position, pos: Position,
source: string, source: string,
numberOfCharacters: number = source.length numberOfCharacters: number = source.length,
): Position { ): Position {
return advancePositionWithMutation( return advancePositionWithMutation(
extend({}, pos), {
offset: pos.offset,
line: pos.line,
column: pos.column,
},
source, source,
numberOfCharacters numberOfCharacters,
) )
} }
@ -216,7 +195,7 @@ export function advancePositionWithClone(
export function advancePositionWithMutation( export function advancePositionWithMutation(
pos: Position, pos: Position,
source: string, source: string,
numberOfCharacters: number = source.length numberOfCharacters: number = source.length,
): Position { ): Position {
let linesCount = 0 let linesCount = 0
let lastNewLinePos = -1 let lastNewLinePos = -1
@ -247,7 +226,7 @@ export function assert(condition: boolean, msg?: string) {
export function findDir( export function findDir(
node: ElementNode, node: ElementNode,
name: string | RegExp, name: string | RegExp,
allowEmpty: boolean = false allowEmpty: boolean = false,
): DirectiveNode | undefined { ): DirectiveNode | undefined {
for (let i = 0; i < node.props.length; i++) { for (let i = 0; i < node.props.length; i++) {
const p = node.props[i] const p = node.props[i]
@ -265,7 +244,7 @@ export function findProp(
node: ElementNode, node: ElementNode,
name: string, name: string,
dynamicOnly: boolean = false, dynamicOnly: boolean = false,
allowEmpty: boolean = false allowEmpty: boolean = false,
): ElementNode['props'][0] | undefined { ): ElementNode['props'][0] | undefined {
for (let i = 0; i < node.props.length; i++) { for (let i = 0; i < node.props.length; i++) {
const p = node.props[i] const p = node.props[i]
@ -286,7 +265,7 @@ export function findProp(
export function isStaticArgOf( export function isStaticArgOf(
arg: DirectiveNode['arg'], arg: DirectiveNode['arg'],
name: string name: string,
): boolean { ): boolean {
return !!(arg && isStaticExp(arg) && arg.content === name) return !!(arg && isStaticExp(arg) && arg.content === name)
} }
@ -298,12 +277,12 @@ export function hasDynamicKeyVBind(node: ElementNode): boolean {
p.name === 'bind' && p.name === 'bind' &&
(!p.arg || // v-bind="obj" (!p.arg || // v-bind="obj"
p.arg.type !== NodeTypes.SIMPLE_EXPRESSION || // v-bind:[_ctx.foo] p.arg.type !== NodeTypes.SIMPLE_EXPRESSION || // v-bind:[_ctx.foo]
!p.arg.isStatic) // v-bind:[foo] !p.arg.isStatic), // v-bind:[foo]
) )
} }
export function isText( export function isText(
node: TemplateChildNode node: TemplateChildNode,
): node is TextNode | InterpolationNode { ): node is TextNode | InterpolationNode {
return node.type === NodeTypes.INTERPOLATION || node.type === NodeTypes.TEXT return node.type === NodeTypes.INTERPOLATION || node.type === NodeTypes.TEXT
} }
@ -313,7 +292,7 @@ export function isVSlot(p: ElementNode['props'][0]): p is DirectiveNode {
} }
export function isTemplateNode( export function isTemplateNode(
node: RootNode | TemplateChildNode node: RootNode | TemplateChildNode,
): node is TemplateNode { ): node is TemplateNode {
return ( return (
node.type === NodeTypes.ELEMENT && node.tagType === ElementTypes.TEMPLATE node.type === NodeTypes.ELEMENT && node.tagType === ElementTypes.TEMPLATE
@ -321,7 +300,7 @@ export function isTemplateNode(
} }
export function isSlotOutlet( export function isSlotOutlet(
node: RootNode | TemplateChildNode node: RootNode | TemplateChildNode,
): node is SlotOutletNode { ): node is SlotOutletNode {
return node.type === NodeTypes.ELEMENT && node.tagType === ElementTypes.SLOT return node.type === NodeTypes.ELEMENT && node.tagType === ElementTypes.SLOT
} }
@ -330,7 +309,7 @@ const propsHelperSet = new Set([NORMALIZE_PROPS, GUARD_REACTIVE_PROPS])
function getUnnormalizedProps( function getUnnormalizedProps(
props: PropsExpression | '{}', props: PropsExpression | '{}',
callPath: CallExpression[] = [] callPath: CallExpression[] = [],
): [PropsExpression | '{}', CallExpression[]] { ): [PropsExpression | '{}', CallExpression[]] {
if ( if (
props && props &&
@ -341,7 +320,7 @@ function getUnnormalizedProps(
if (!isString(callee) && propsHelperSet.has(callee)) { if (!isString(callee) && propsHelperSet.has(callee)) {
return getUnnormalizedProps( return getUnnormalizedProps(
props.arguments[0] as PropsExpression, props.arguments[0] as PropsExpression,
callPath.concat(props) callPath.concat(props),
) )
} }
} }
@ -350,7 +329,7 @@ function getUnnormalizedProps(
export function injectProp( export function injectProp(
node: VNodeCall | RenderSlotCall, node: VNodeCall | RenderSlotCall,
prop: Property, prop: Property,
context: TransformContext context: TransformContext,
) { ) {
let propsWithInjection: ObjectExpression | CallExpression | undefined let propsWithInjection: ObjectExpression | CallExpression | undefined
/** /**
@ -393,7 +372,7 @@ export function injectProp(
// #2366 // #2366
propsWithInjection = createCallExpression(context.helper(MERGE_PROPS), [ propsWithInjection = createCallExpression(context.helper(MERGE_PROPS), [
createObjectExpression([prop]), createObjectExpression([prop]),
props props,
]) ])
} else { } else {
props.arguments.unshift(createObjectExpression([prop])) props.arguments.unshift(createObjectExpression([prop]))
@ -409,7 +388,7 @@ export function injectProp(
// single v-bind with expression, return a merged replacement // single v-bind with expression, return a merged replacement
propsWithInjection = createCallExpression(context.helper(MERGE_PROPS), [ propsWithInjection = createCallExpression(context.helper(MERGE_PROPS), [
createObjectExpression([prop]), createObjectExpression([prop]),
props props,
]) ])
// in the case of nested helper call, e.g. `normalizeProps(guardReactiveProps(props))`, // in the case of nested helper call, e.g. `normalizeProps(guardReactiveProps(props))`,
// it will be rewritten as `normalizeProps(mergeProps({ key: 0 }, props))`, // it will be rewritten as `normalizeProps(mergeProps({ key: 0 }, props))`,
@ -441,7 +420,7 @@ function hasProp(prop: Property, props: ObjectExpression) {
result = props.properties.some( result = props.properties.some(
p => p =>
p.key.type === NodeTypes.SIMPLE_EXPRESSION && p.key.type === NodeTypes.SIMPLE_EXPRESSION &&
p.key.content === propKeyName p.key.content === propKeyName,
) )
} }
return result return result
@ -449,7 +428,7 @@ function hasProp(prop: Property, props: ObjectExpression) {
export function toValidAssetId( export function toValidAssetId(
name: string, name: string,
type: 'component' | 'directive' | 'filter' type: 'component' | 'directive' | 'filter',
): string { ): string {
// see issue#4422, we need adding identifier on validAssetId if variable `name` has specific character // see issue#4422, we need adding identifier on validAssetId if variable `name` has specific character
return `_${type}_${name.replace(/[^\w]/g, (searchValue, replaceValue) => { return `_${type}_${name.replace(/[^\w]/g, (searchValue, replaceValue) => {
@ -460,7 +439,7 @@ export function toValidAssetId(
// Check if a node contains expressions that reference current context scope ids // Check if a node contains expressions that reference current context scope ids
export function hasScopeRef( export function hasScopeRef(
node: TemplateChildNode | IfBranchNode | ExpressionNode | undefined, node: TemplateChildNode | IfBranchNode | ExpressionNode | undefined,
ids: TransformContext['identifiers'] ids: TransformContext['identifiers'],
): boolean { ): boolean {
if (!node || Object.keys(ids).length === 0) { if (!node || Object.keys(ids).length === 0) {
return false return false

View File

@ -1,6 +1,6 @@
import { SimpleExpressionNode } from './ast' import type { SimpleExpressionNode } from './ast'
import { TransformContext } from './transform' import type { TransformContext } from './transform'
import { createCompilerError, ErrorCodes } from './errors' import { ErrorCodes, createCompilerError } from './errors'
// these keywords should not appear inside expressions, but operators like // these keywords should not appear inside expressions, but operators like
// 'typeof', 'instanceof', and 'in' are allowed // 'typeof', 'instanceof', and 'in' are allowed
@ -13,7 +13,7 @@ const prohibitedKeywordRE = new RegExp(
) )
.split(',') .split(',')
.join('\\b|\\b') + .join('\\b|\\b') +
'\\b' '\\b',
) )
// strip strings in expressions // strip strings in expressions
@ -29,7 +29,7 @@ export function validateBrowserExpression(
node: SimpleExpressionNode, node: SimpleExpressionNode,
context: TransformContext, context: TransformContext,
asParams = false, asParams = false,
asRawStatements = false asRawStatements = false,
) { ) {
const exp = node.content const exp = node.content
@ -43,7 +43,7 @@ export function validateBrowserExpression(
new Function( new Function(
asRawStatements asRawStatements
? ` ${exp} ` ? ` ${exp} `
: `return ${asParams ? `(${exp}) => {}` : `(${exp})`}` : `return ${asParams ? `(${exp}) => {}` : `(${exp})`}`,
) )
} catch (e: any) { } catch (e: any) {
let message = e.message let message = e.message
@ -58,8 +58,8 @@ export function validateBrowserExpression(
ErrorCodes.X_INVALID_EXPRESSION, ErrorCodes.X_INVALID_EXPRESSION,
node.loc, node.loc,
undefined, undefined,
message message,
) ),
) )
} }
} }

View File

@ -29,16 +29,16 @@ describe('decodeHtmlBrowser', () => {
// #3001 html tags inside attribute values // #3001 html tags inside attribute values
expect(decodeHtmlBrowser('<strong>Text</strong>', true)).toBe( expect(decodeHtmlBrowser('<strong>Text</strong>', true)).toBe(
'<strong>Text</strong>' '<strong>Text</strong>',
) )
expect(decodeHtmlBrowser('<strong>&amp;</strong>', true)).toBe( expect(decodeHtmlBrowser('<strong>&amp;</strong>', true)).toBe(
'<strong>&</strong>' '<strong>&</strong>',
) )
expect( expect(
decodeHtmlBrowser( decodeHtmlBrowser(
'<strong>&lt;strong&gt;&amp;&lt;/strong&gt;</strong>', '<strong>&lt;strong&gt;&amp;&lt;/strong&gt;</strong>',
true true,
) ),
).toBe('<strong><strong>&</strong></strong>') ).toBe('<strong><strong>&</strong></strong>')
}) })
}) })

View File

@ -1,22 +1,22 @@
import { import {
baseParse as parse, type AttributeNode,
NodeTypes, ConstantTypes,
ElementNode, type ElementNode,
TextNode,
ErrorCodes,
ElementTypes, ElementTypes,
InterpolationNode, type InterpolationNode,
AttributeNode, Namespaces,
ConstantTypes NodeTypes,
type TextNode,
baseParse as parse,
} from '@vue/compiler-core' } from '@vue/compiler-core'
import { parserOptions, DOMNamespaces } from '../src/parserOptions' import { parserOptions } from '../src/parserOptions'
describe('DOM parser', () => { describe('DOM parser', () => {
describe('Text', () => { describe('Text', () => {
test('textarea handles comments/elements as just text', () => { test('textarea handles comments/elements as just text', () => {
const ast = parse( const ast = parse(
'<textarea>some<div>text</div>and<!--comment--></textarea>', '<textarea>some<div>text</div>and<!--comment--></textarea>',
parserOptions parserOptions,
) )
const element = ast.children[0] as ElementNode const element = ast.children[0] as ElementNode
const text = element.children[0] as TextNode const text = element.children[0] as TextNode
@ -27,12 +27,12 @@ describe('DOM parser', () => {
loc: { loc: {
start: { offset: 10, line: 1, column: 11 }, start: { offset: 10, line: 1, column: 11 },
end: { offset: 46, line: 1, column: 47 }, end: { offset: 46, line: 1, column: 47 },
source: 'some<div>text</div>and<!--comment-->' source: 'some<div>text</div>and<!--comment-->',
} },
}) })
}) })
test('textarea handles character references', () => { test('textarea handles entities', () => {
const ast = parse('<textarea>&amp;</textarea>', parserOptions) const ast = parse('<textarea>&amp;</textarea>', parserOptions)
const element = ast.children[0] as ElementNode const element = ast.children[0] as ElementNode
const text = element.children[0] as TextNode const text = element.children[0] as TextNode
@ -43,8 +43,8 @@ describe('DOM parser', () => {
loc: { loc: {
start: { offset: 10, line: 1, column: 11 }, start: { offset: 10, line: 1, column: 11 },
end: { offset: 15, line: 1, column: 16 }, end: { offset: 15, line: 1, column: 16 },
source: '&amp;' source: '&amp;',
} },
}) })
}) })
@ -58,16 +58,16 @@ describe('DOM parser', () => {
content: { content: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `foo`, content: `foo`,
isStatic: false isStatic: false,
} },
} },
]) ])
}) })
test('style handles comments/elements as just a text', () => { test('style handles comments/elements as just a text', () => {
const ast = parse( const ast = parse(
'<style>some<div>text</div>and<!--comment--></style>', '<style>some<div>text</div>and<!--comment--></style>',
parserOptions parserOptions,
) )
const element = ast.children[0] as ElementNode const element = ast.children[0] as ElementNode
const text = element.children[0] as TextNode const text = element.children[0] as TextNode
@ -78,8 +78,8 @@ describe('DOM parser', () => {
loc: { loc: {
start: { offset: 7, line: 1, column: 8 }, start: { offset: 7, line: 1, column: 8 },
end: { offset: 43, line: 1, column: 44 }, end: { offset: 43, line: 1, column: 44 },
source: 'some<div>text</div>and<!--comment-->' source: 'some<div>text</div>and<!--comment-->',
} },
}) })
}) })
@ -94,8 +94,8 @@ describe('DOM parser', () => {
loc: { loc: {
start: { offset: 7, line: 1, column: 8 }, start: { offset: 7, line: 1, column: 8 },
end: { offset: 12, line: 1, column: 13 }, end: { offset: 12, line: 1, column: 13 },
source: '&amp;' source: '&amp;',
} },
}) })
}) })
@ -109,8 +109,8 @@ describe('DOM parser', () => {
loc: { loc: {
start: { offset: 14, line: 1, column: 15 }, start: { offset: 14, line: 1, column: 15 },
end: { offset: 23, line: 1, column: 24 }, end: { offset: 23, line: 1, column: 24 },
source: 'some text' source: 'some text',
} },
}) })
}) })
@ -120,21 +120,21 @@ describe('DOM parser', () => {
expect((ast.children[0] as ElementNode).children).toMatchObject([ expect((ast.children[0] as ElementNode).children).toMatchObject([
{ {
type: NodeTypes.TEXT, type: NodeTypes.TEXT,
content: ` \na ` content: ` \na `,
}, },
{ {
type: NodeTypes.ELEMENT, type: NodeTypes.ELEMENT,
children: [ children: [
{ {
type: NodeTypes.TEXT, type: NodeTypes.TEXT,
content: `foo \n bar` content: `foo \n bar`,
} },
] ],
}, },
{ {
type: NodeTypes.TEXT, type: NodeTypes.TEXT,
content: ` \n c` content: ` \n c`,
} },
]) ])
}) })
@ -145,7 +145,7 @@ describe('DOM parser', () => {
expect((ast.children[0] as ElementNode).children).toMatchObject([ expect((ast.children[0] as ElementNode).children).toMatchObject([
{ {
type: NodeTypes.TEXT, type: NodeTypes.TEXT,
content: `hello` content: `hello`,
}, },
{ {
type: NodeTypes.ELEMENT, type: NodeTypes.ELEMENT,
@ -153,10 +153,10 @@ describe('DOM parser', () => {
{ {
type: NodeTypes.TEXT, type: NodeTypes.TEXT,
// should not remove the leading newline for nested elements // should not remove the leading newline for nested elements
content: `\nbye` content: `\nbye`,
} },
] ],
} },
]) ])
}) })
@ -166,7 +166,7 @@ describe('DOM parser', () => {
const ast = parse(`foo&nbsp;&nbsp;bar`, parserOptions) const ast = parse(`foo&nbsp;&nbsp;bar`, parserOptions)
expect(ast.children[0]).toMatchObject({ expect(ast.children[0]).toMatchObject({
type: NodeTypes.TEXT, type: NodeTypes.TEXT,
content: `foo${nbsp}${nbsp}bar` content: `foo${nbsp}${nbsp}bar`,
}) })
}) })
@ -181,8 +181,8 @@ describe('DOM parser', () => {
loc: { loc: {
start: { offset: 0, line: 1, column: 1 }, start: { offset: 0, line: 1, column: 1 },
end: { offset: 11, line: 1, column: 12 }, end: { offset: 11, line: 1, column: 12 },
source: '&ampersand;' source: '&ampersand;',
} },
}) })
}) })
@ -190,7 +190,7 @@ describe('DOM parser', () => {
test('HTML entities compatibility in attribute', () => { test('HTML entities compatibility in attribute', () => {
const ast = parse( const ast = parse(
'<div a="&ampersand;" b="&amp;ersand;" c="&amp!"></div>', '<div a="&ampersand;" b="&amp;ersand;" c="&amp!"></div>',
parserOptions parserOptions,
) )
const element = ast.children[0] as ElementNode const element = ast.children[0] as ElementNode
const text1 = (element.props[0] as AttributeNode).value const text1 = (element.props[0] as AttributeNode).value
@ -203,8 +203,8 @@ describe('DOM parser', () => {
loc: { loc: {
start: { offset: 7, line: 1, column: 8 }, start: { offset: 7, line: 1, column: 8 },
end: { offset: 20, line: 1, column: 21 }, end: { offset: 20, line: 1, column: 21 },
source: '"&ampersand;"' source: '"&ampersand;"',
} },
}) })
expect(text2).toStrictEqual({ expect(text2).toStrictEqual({
type: NodeTypes.TEXT, type: NodeTypes.TEXT,
@ -212,8 +212,8 @@ describe('DOM parser', () => {
loc: { loc: {
start: { offset: 23, line: 1, column: 24 }, start: { offset: 23, line: 1, column: 24 },
end: { offset: 37, line: 1, column: 38 }, end: { offset: 37, line: 1, column: 38 },
source: '"&amp;ersand;"' source: '"&amp;ersand;"',
} },
}) })
expect(text3).toStrictEqual({ expect(text3).toStrictEqual({
type: NodeTypes.TEXT, type: NodeTypes.TEXT,
@ -221,8 +221,8 @@ describe('DOM parser', () => {
loc: { loc: {
start: { offset: 40, line: 1, column: 41 }, start: { offset: 40, line: 1, column: 41 },
end: { offset: 47, line: 1, column: 48 }, end: { offset: 47, line: 1, column: 48 },
source: '"&amp!"' source: '"&amp!"',
} },
}) })
}) })
@ -236,8 +236,8 @@ describe('DOM parser', () => {
loc: { loc: {
start: { offset: 0, line: 1, column: 1 }, start: { offset: 0, line: 1, column: 1 },
end: { offset: 6, line: 1, column: 7 }, end: { offset: 6, line: 1, column: 7 },
source: '&#x86;' source: '&#x86;',
} },
}) })
}) })
}) })
@ -258,14 +258,14 @@ describe('DOM parser', () => {
loc: { loc: {
start: { offset: 8, line: 1, column: 9 }, start: { offset: 8, line: 1, column: 9 },
end: { offset: 16, line: 1, column: 17 }, end: { offset: 16, line: 1, column: 17 },
source: 'a &lt; b' source: 'a &lt; b',
} },
}, },
loc: { loc: {
start: { offset: 5, line: 1, column: 6 }, start: { offset: 5, line: 1, column: 6 },
end: { offset: 19, line: 1, column: 20 }, end: { offset: 19, line: 1, column: 20 },
source: '{{ a &lt; b }}' source: '{{ a &lt; b }}',
} },
}) })
}) })
}) })
@ -277,18 +277,17 @@ describe('DOM parser', () => {
expect(element).toStrictEqual({ expect(element).toStrictEqual({
type: NodeTypes.ELEMENT, type: NodeTypes.ELEMENT,
ns: DOMNamespaces.HTML, ns: Namespaces.HTML,
tag: 'img', tag: 'img',
tagType: ElementTypes.ELEMENT, tagType: ElementTypes.ELEMENT,
props: [], props: [],
isSelfClosing: false,
children: [], children: [],
loc: { loc: {
start: { offset: 0, line: 1, column: 1 }, start: { offset: 0, line: 1, column: 1 },
end: { offset: 5, line: 1, column: 6 }, end: { offset: 5, line: 1, column: 6 },
source: '<img>' source: '<img>',
}, },
codegenNode: undefined codegenNode: undefined,
}) })
}) })
@ -298,33 +297,26 @@ describe('DOM parser', () => {
expect(ast.children[0]).toMatchObject({ expect(ast.children[0]).toMatchObject({
type: NodeTypes.ELEMENT, type: NodeTypes.ELEMENT,
tag: 'div', tag: 'div',
tagType: ElementTypes.ELEMENT tagType: ElementTypes.ELEMENT,
}) })
expect(ast.children[1]).toMatchObject({ expect(ast.children[1]).toMatchObject({
type: NodeTypes.ELEMENT, type: NodeTypes.ELEMENT,
tag: 'comp', tag: 'comp',
tagType: ElementTypes.COMPONENT tagType: ElementTypes.COMPONENT,
}) })
expect(ast.children[2]).toMatchObject({ expect(ast.children[2]).toMatchObject({
type: NodeTypes.ELEMENT, type: NodeTypes.ELEMENT,
tag: 'Comp', tag: 'Comp',
tagType: ElementTypes.COMPONENT tagType: ElementTypes.COMPONENT,
}) })
}) })
test('Strict end tag detection for textarea.', () => { test('Strict end tag detection for textarea.', () => {
const ast = parse( const ast = parse(
'<textarea>hello</textarea</textarea0></texTArea a="<>">', '<textarea>hello</textarea</textarea0></texTArea>',
{ parserOptions,
...parserOptions,
onError: err => {
if (err.code !== ErrorCodes.END_TAG_WITH_ATTRIBUTES) {
throw err
}
}
}
) )
const element = ast.children[0] as ElementNode const element = ast.children[0] as ElementNode
const text = element.children[0] as TextNode const text = element.children[0] as TextNode
@ -336,8 +328,8 @@ describe('DOM parser', () => {
loc: { loc: {
start: { offset: 10, line: 1, column: 11 }, start: { offset: 10, line: 1, column: 11 },
end: { offset: 37, line: 1, column: 38 }, end: { offset: 37, line: 1, column: 38 },
source: 'hello</textarea</textarea0>' source: 'hello</textarea</textarea0>',
} },
}) })
}) })
}) })
@ -347,74 +339,74 @@ describe('DOM parser', () => {
const ast = parse('<html>test</html>', parserOptions) const ast = parse('<html>test</html>', parserOptions)
const element = ast.children[0] as ElementNode const element = ast.children[0] as ElementNode
expect(element.ns).toBe(DOMNamespaces.HTML) expect(element.ns).toBe(Namespaces.HTML)
}) })
test('SVG namespace', () => { test('SVG namespace', () => {
const ast = parse('<svg>test</svg>', parserOptions) const ast = parse('<svg>test</svg>', parserOptions)
const element = ast.children[0] as ElementNode const element = ast.children[0] as ElementNode
expect(element.ns).toBe(DOMNamespaces.SVG) expect(element.ns).toBe(Namespaces.SVG)
}) })
test('MATH_ML namespace', () => { test('MATH_ML namespace', () => {
const ast = parse('<math>test</math>', parserOptions) const ast = parse('<math>test</math>', parserOptions)
const element = ast.children[0] as ElementNode const element = ast.children[0] as ElementNode
expect(element.ns).toBe(DOMNamespaces.MATH_ML) expect(element.ns).toBe(Namespaces.MATH_ML)
}) })
test('SVG in MATH_ML namespace', () => { test('SVG in MATH_ML namespace', () => {
const ast = parse( const ast = parse(
'<math><annotation-xml><svg></svg></annotation-xml></math>', '<math><annotation-xml><svg></svg></annotation-xml></math>',
parserOptions parserOptions,
) )
const elementMath = ast.children[0] as ElementNode const elementMath = ast.children[0] as ElementNode
const elementAnnotation = elementMath.children[0] as ElementNode const elementAnnotation = elementMath.children[0] as ElementNode
const elementSvg = elementAnnotation.children[0] as ElementNode const elementSvg = elementAnnotation.children[0] as ElementNode
expect(elementMath.ns).toBe(DOMNamespaces.MATH_ML) expect(elementMath.ns).toBe(Namespaces.MATH_ML)
expect(elementSvg.ns).toBe(DOMNamespaces.SVG) expect(elementSvg.ns).toBe(Namespaces.SVG)
}) })
test('html text/html in MATH_ML namespace', () => { test('html text/html in MATH_ML namespace', () => {
const ast = parse( const ast = parse(
'<math><annotation-xml encoding="text/html"><test/></annotation-xml></math>', '<math><annotation-xml encoding="text/html"><test/></annotation-xml></math>',
parserOptions parserOptions,
) )
const elementMath = ast.children[0] as ElementNode const elementMath = ast.children[0] as ElementNode
const elementAnnotation = elementMath.children[0] as ElementNode const elementAnnotation = elementMath.children[0] as ElementNode
const element = elementAnnotation.children[0] as ElementNode const element = elementAnnotation.children[0] as ElementNode
expect(elementMath.ns).toBe(DOMNamespaces.MATH_ML) expect(elementMath.ns).toBe(Namespaces.MATH_ML)
expect(element.ns).toBe(DOMNamespaces.HTML) expect(element.ns).toBe(Namespaces.HTML)
}) })
test('html application/xhtml+xml in MATH_ML namespace', () => { test('html application/xhtml+xml in MATH_ML namespace', () => {
const ast = parse( const ast = parse(
'<math><annotation-xml encoding="application/xhtml+xml"><test/></annotation-xml></math>', '<math><annotation-xml encoding="application/xhtml+xml"><test/></annotation-xml></math>',
parserOptions parserOptions,
) )
const elementMath = ast.children[0] as ElementNode const elementMath = ast.children[0] as ElementNode
const elementAnnotation = elementMath.children[0] as ElementNode const elementAnnotation = elementMath.children[0] as ElementNode
const element = elementAnnotation.children[0] as ElementNode const element = elementAnnotation.children[0] as ElementNode
expect(elementMath.ns).toBe(DOMNamespaces.MATH_ML) expect(elementMath.ns).toBe(Namespaces.MATH_ML)
expect(element.ns).toBe(DOMNamespaces.HTML) expect(element.ns).toBe(Namespaces.HTML)
}) })
test('mtext malignmark in MATH_ML namespace', () => { test('mtext malignmark in MATH_ML namespace', () => {
const ast = parse( const ast = parse(
'<math><mtext><malignmark/></mtext></math>', '<math><mtext><malignmark/></mtext></math>',
parserOptions parserOptions,
) )
const elementMath = ast.children[0] as ElementNode const elementMath = ast.children[0] as ElementNode
const elementText = elementMath.children[0] as ElementNode const elementText = elementMath.children[0] as ElementNode
const element = elementText.children[0] as ElementNode const element = elementText.children[0] as ElementNode
expect(elementMath.ns).toBe(DOMNamespaces.MATH_ML) expect(elementMath.ns).toBe(Namespaces.MATH_ML)
expect(element.ns).toBe(DOMNamespaces.MATH_ML) expect(element.ns).toBe(Namespaces.MATH_ML)
}) })
test('mtext and not malignmark tag in MATH_ML namespace', () => { test('mtext and not malignmark tag in MATH_ML namespace', () => {
@ -423,21 +415,21 @@ describe('DOM parser', () => {
const elementText = elementMath.children[0] as ElementNode const elementText = elementMath.children[0] as ElementNode
const element = elementText.children[0] as ElementNode const element = elementText.children[0] as ElementNode
expect(elementMath.ns).toBe(DOMNamespaces.MATH_ML) expect(elementMath.ns).toBe(Namespaces.MATH_ML)
expect(element.ns).toBe(DOMNamespaces.HTML) expect(element.ns).toBe(Namespaces.HTML)
}) })
test('foreignObject tag in SVG namespace', () => { test('foreignObject tag in SVG namespace', () => {
const ast = parse( const ast = parse(
'<svg><foreignObject><test/></foreignObject></svg>', '<svg><foreignObject><test/></foreignObject></svg>',
parserOptions parserOptions,
) )
const elementSvg = ast.children[0] as ElementNode const elementSvg = ast.children[0] as ElementNode
const elementForeignObject = elementSvg.children[0] as ElementNode const elementForeignObject = elementSvg.children[0] as ElementNode
const element = elementForeignObject.children[0] as ElementNode const element = elementForeignObject.children[0] as ElementNode
expect(elementSvg.ns).toBe(DOMNamespaces.SVG) expect(elementSvg.ns).toBe(Namespaces.SVG)
expect(element.ns).toBe(DOMNamespaces.HTML) expect(element.ns).toBe(Namespaces.HTML)
}) })
test('desc tag in SVG namespace', () => { test('desc tag in SVG namespace', () => {
@ -446,8 +438,8 @@ describe('DOM parser', () => {
const elementDesc = elementSvg.children[0] as ElementNode const elementDesc = elementSvg.children[0] as ElementNode
const element = elementDesc.children[0] as ElementNode const element = elementDesc.children[0] as ElementNode
expect(elementSvg.ns).toBe(DOMNamespaces.SVG) expect(elementSvg.ns).toBe(Namespaces.SVG)
expect(element.ns).toBe(DOMNamespaces.HTML) expect(element.ns).toBe(Namespaces.HTML)
}) })
test('title tag in SVG namespace', () => { test('title tag in SVG namespace', () => {
@ -456,8 +448,8 @@ describe('DOM parser', () => {
const elementTitle = elementSvg.children[0] as ElementNode const elementTitle = elementSvg.children[0] as ElementNode
const element = elementTitle.children[0] as ElementNode const element = elementTitle.children[0] as ElementNode
expect(elementSvg.ns).toBe(DOMNamespaces.SVG) expect(elementSvg.ns).toBe(Namespaces.SVG)
expect(element.ns).toBe(DOMNamespaces.HTML) expect(element.ns).toBe(Namespaces.HTML)
}) })
test('SVG in HTML namespace', () => { test('SVG in HTML namespace', () => {
@ -465,8 +457,8 @@ describe('DOM parser', () => {
const elementHtml = ast.children[0] as ElementNode const elementHtml = ast.children[0] as ElementNode
const element = elementHtml.children[0] as ElementNode const element = elementHtml.children[0] as ElementNode
expect(elementHtml.ns).toBe(DOMNamespaces.HTML) expect(elementHtml.ns).toBe(Namespaces.HTML)
expect(element.ns).toBe(DOMNamespaces.SVG) expect(element.ns).toBe(Namespaces.SVG)
}) })
test('MATH in HTML namespace', () => { test('MATH in HTML namespace', () => {
@ -474,8 +466,35 @@ describe('DOM parser', () => {
const elementHtml = ast.children[0] as ElementNode const elementHtml = ast.children[0] as ElementNode
const element = elementHtml.children[0] as ElementNode const element = elementHtml.children[0] as ElementNode
expect(elementHtml.ns).toBe(DOMNamespaces.HTML) expect(elementHtml.ns).toBe(Namespaces.HTML)
expect(element.ns).toBe(DOMNamespaces.MATH_ML) expect(element.ns).toBe(Namespaces.MATH_ML)
})
test('root ns', () => {
const ast = parse('<foreignObject><test/></foreignObject>', {
...parserOptions,
ns: Namespaces.SVG,
})
const elementForieng = ast.children[0] as ElementNode
const element = elementForieng.children[0] as ElementNode
expect(elementForieng.ns).toBe(Namespaces.SVG)
expect(element.ns).toBe(Namespaces.HTML)
})
test('correct XML handling with root ns', () => {
// when root ns is an XML namespace, there should be no special content
// treatment for <script>, <style>, <textarea> etc.
const ast = parse('<script><g/><g/></script>', {
...parserOptions,
ns: Namespaces.SVG,
})
const elementSvg = ast.children[0] as ElementNode
// should parse as nodes instead of text
expect(elementSvg.children).toMatchObject([
{ type: NodeTypes.ELEMENT, tag: 'g' },
{ type: NodeTypes.ELEMENT, tag: 'g' },
])
}) })
}) })
}) })

View File

@ -4,7 +4,7 @@ describe('Transition multi children warnings', () => {
function checkWarning( function checkWarning(
template: string, template: string,
shouldWarn: boolean, shouldWarn: boolean,
message = `<Transition> expects exactly one child element or component.` message = `<Transition> expects exactly one child element or component.`,
) { ) {
const spy = vi.fn() const spy = vi.fn()
compile(template.trim(), { compile(template.trim(), {
@ -12,7 +12,7 @@ describe('Transition multi children warnings', () => {
transformHoist: null, transformHoist: null,
onError: err => { onError: err => {
spy(err.message) spy(err.message)
} },
}) })
if (shouldWarn) expect(spy).toHaveBeenCalledWith(message) if (shouldWarn) expect(spy).toHaveBeenCalledWith(message)
@ -27,7 +27,7 @@ describe('Transition multi children warnings', () => {
<div>hey</div> <div>hey</div>
</transition> </transition>
`, `,
true true,
) )
}) })
@ -38,7 +38,7 @@ describe('Transition multi children warnings', () => {
<div v-for="i in items">hey</div> <div v-for="i in items">hey</div>
</transition> </transition>
`, `,
true true,
) )
}) })
@ -50,7 +50,7 @@ describe('Transition multi children warnings', () => {
<div v-else v-for="i in items">hey</div> <div v-else v-for="i in items">hey</div>
</transition> </transition>
`, `,
true true,
) )
}) })
@ -61,7 +61,7 @@ describe('Transition multi children warnings', () => {
<template v-if="ok"></template> <template v-if="ok"></template>
</transition> </transition>
`, `,
true true,
) )
}) })
@ -73,7 +73,7 @@ describe('Transition multi children warnings', () => {
<template v-else></template> <template v-else></template>
</transition> </transition>
`, `,
true true,
) )
}) })
@ -85,7 +85,7 @@ describe('Transition multi children warnings', () => {
<div v-if="other">hey</div> <div v-if="other">hey</div>
</transition> </transition>
`, `,
true true,
) )
}) })
@ -96,7 +96,7 @@ describe('Transition multi children warnings', () => {
<div>hey</div> <div>hey</div>
</transition> </transition>
`, `,
false false,
) )
}) })
@ -107,7 +107,7 @@ describe('Transition multi children warnings', () => {
<div v-if="a">hey</div> <div v-if="a">hey</div>
</transition> </transition>
`, `,
false false,
) )
}) })
@ -120,7 +120,7 @@ describe('Transition multi children warnings', () => {
<div v-else>hey</div> <div v-else>hey</div>
</transition> </transition>
`, `,
false false,
) )
}) })
@ -132,7 +132,7 @@ describe('Transition multi children warnings', () => {
<div v-else>hey</div> <div v-else>hey</div>
</transition> </transition>
`, `,
false false,
) )
}) })
}) })
@ -143,7 +143,7 @@ test('inject persisted when child has v-show', () => {
<transition> <transition>
<div v-show="ok" /> <div v-show="ok" />
</transition> </transition>
`).code `).code,
).toMatchSnapshot() ).toMatchSnapshot()
}) })
@ -161,6 +161,6 @@ test('the v-if/else-if/else branches in Transition should ignore comments', () =
<p v-else/> <p v-else/>
</div> </div>
</transition> </transition>
`).code `).code,
).toMatchSnapshot() ).toMatchSnapshot()
}) })

View File

@ -1,4 +1,4 @@
import { compile, CompilerError } from '../../src' import { type CompilerError, compile } from '../../src'
describe('compiler: ignore side effect tags', () => { describe('compiler: ignore side effect tags', () => {
it('should ignore script', () => { it('should ignore script', () => {
@ -6,7 +6,7 @@ describe('compiler: ignore side effect tags', () => {
const { code } = compile(`<script>console.log(1)</script>`, { const { code } = compile(`<script>console.log(1)</script>`, {
onError(e) { onError(e) {
err = e err = e
} },
}) })
expect(code).not.toMatch('script') expect(code).not.toMatch('script')
expect(err).toBeDefined() expect(err).toBeDefined()
@ -18,7 +18,7 @@ describe('compiler: ignore side effect tags', () => {
const { code } = compile(`<style>h1 { color: red }</style>`, { const { code } = compile(`<style>h1 { color: red }</style>`, {
onError(e) { onError(e) {
err = e err = e
} },
}) })
expect(code).not.toMatch('style') expect(code).not.toMatch('style')
expect(err).toBeDefined() expect(err).toBeDefined()

View File

@ -1,13 +1,13 @@
import { import {
compile,
NodeTypes,
CREATE_STATIC, CREATE_STATIC,
ConstantTypes,
NodeTypes,
compile,
createSimpleExpression, createSimpleExpression,
ConstantTypes
} from '../../src' } from '../../src'
import { import {
StringifyThresholds,
stringifyStatic, stringifyStatic,
StringifyThresholds
} from '../../src/transforms/stringifyStatic' } from '../../src/transforms/stringifyStatic'
describe('stringify static html', () => { describe('stringify static html', () => {
@ -15,7 +15,7 @@ describe('stringify static html', () => {
return compile(template, { return compile(template, {
hoistStatic: true, hoistStatic: true,
prefixIdentifiers: true, prefixIdentifiers: true,
transformHoist: stringifyStatic transformHoist: stringifyStatic,
}) })
} }
@ -25,7 +25,7 @@ describe('stringify static html', () => {
test('should bail on non-eligible static trees', () => { test('should bail on non-eligible static trees', () => {
const { ast } = compileWithStringify( const { ast } = compileWithStringify(
`<div><div><div>hello</div><div>hello</div></div></div>` `<div><div><div>hello</div><div>hello</div></div></div>`,
) )
// should be a normal vnode call // should be a normal vnode call
expect(ast.hoists[0]!.type).toBe(NodeTypes.VNODE_CALL) expect(ast.hoists[0]!.type).toBe(NodeTypes.VNODE_CALL)
@ -35,8 +35,8 @@ describe('stringify static html', () => {
const { ast } = compileWithStringify( const { ast } = compileWithStringify(
`<div><div>${repeat( `<div><div>${repeat(
`<span class="foo"/>`, `<span class="foo"/>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}</div></div>` )}</div></div>`,
) )
// should be optimized now // should be optimized now
expect(ast.hoists).toMatchObject([ expect(ast.hoists).toMatchObject([
@ -47,15 +47,15 @@ describe('stringify static html', () => {
JSON.stringify( JSON.stringify(
`<div>${repeat( `<div>${repeat(
`<span class="foo"></span>`, `<span class="foo"></span>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}</div>` )}</div>`,
), ),
'1' '1',
] ],
}, // the children array is hoisted as well }, // the children array is hoisted as well
{ {
type: NodeTypes.JS_ARRAY_EXPRESSION type: NodeTypes.JS_ARRAY_EXPRESSION,
} },
]) ])
}) })
@ -63,8 +63,8 @@ describe('stringify static html', () => {
const { ast } = compileWithStringify( const { ast } = compileWithStringify(
`<div><div>${repeat( `<div><div>${repeat(
`<span/>`, `<span/>`,
StringifyThresholds.NODE_COUNT StringifyThresholds.NODE_COUNT,
)}</div></div>` )}</div></div>`,
) )
// should be optimized now // should be optimized now
expect(ast.hoists).toMatchObject([ expect(ast.hoists).toMatchObject([
@ -75,16 +75,16 @@ describe('stringify static html', () => {
JSON.stringify( JSON.stringify(
`<div>${repeat( `<div>${repeat(
`<span></span>`, `<span></span>`,
StringifyThresholds.NODE_COUNT StringifyThresholds.NODE_COUNT,
)}</div>` )}</div>`,
), ),
'1' '1',
] ],
}, },
// the children array is hoisted as well // the children array is hoisted as well
{ {
type: NodeTypes.JS_ARRAY_EXPRESSION type: NodeTypes.JS_ARRAY_EXPRESSION,
} },
]) ])
}) })
@ -92,8 +92,8 @@ describe('stringify static html', () => {
const { ast } = compileWithStringify( const { ast } = compileWithStringify(
`<div>${repeat( `<div>${repeat(
`<span class="foo"/>`, `<span class="foo"/>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}</div>` )}</div>`,
) )
// should have 6 hoisted nodes (including the entire array), // should have 6 hoisted nodes (including the entire array),
// but 2~5 should be null because they are merged into 1 // but 2~5 should be null because they are merged into 1
@ -105,19 +105,19 @@ describe('stringify static html', () => {
JSON.stringify( JSON.stringify(
repeat( repeat(
`<span class="foo"></span>`, `<span class="foo"></span>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)
), ),
'5' ),
] '5',
],
}, },
null, null,
null, null,
null, null,
null, null,
{ {
type: NodeTypes.JS_ARRAY_EXPRESSION type: NodeTypes.JS_ARRAY_EXPRESSION,
} },
]) ])
}) })
@ -125,8 +125,8 @@ describe('stringify static html', () => {
const { ast } = compileWithStringify( const { ast } = compileWithStringify(
`<div><div :style="{ color: 'red' }">${repeat( `<div><div :style="{ color: 'red' }">${repeat(
`<span :class="[{ foo: true }, { bar: true }]">{{ 1 }} + {{ false }}</span>`, `<span :class="[{ foo: true }, { bar: true }]">{{ 1 }} + {{ false }}</span>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}</div></div>` )}</div></div>`,
) )
// should be optimized now // should be optimized now
expect(ast.hoists).toMatchObject([ expect(ast.hoists).toMatchObject([
@ -137,15 +137,15 @@ describe('stringify static html', () => {
JSON.stringify( JSON.stringify(
`<div style="color:red;">${repeat( `<div style="color:red;">${repeat(
`<span class="foo bar">1 + false</span>`, `<span class="foo bar">1 + false</span>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}</div>` )}</div>`,
), ),
'1' '1',
] ],
}, },
{ {
type: NodeTypes.JS_ARRAY_EXPRESSION type: NodeTypes.JS_ARRAY_EXPRESSION,
} },
]) ])
}) })
@ -154,8 +154,8 @@ describe('stringify static html', () => {
`<div><div>${repeat( `<div><div>${repeat(
`<span :class="'foo' + '&gt;ar'">{{ 1 }} + {{ '<' }}</span>` + `<span :class="'foo' + '&gt;ar'">{{ 1 }} + {{ '<' }}</span>` +
`<span>&amp;</span>`, `<span>&amp;</span>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}</div></div>` )}</div></div>`,
) )
// should be optimized now // should be optimized now
expect(ast.hoists).toMatchObject([ expect(ast.hoists).toMatchObject([
@ -166,15 +166,15 @@ describe('stringify static html', () => {
JSON.stringify( JSON.stringify(
`<div>${repeat( `<div>${repeat(
`<span class="foo&gt;ar">1 + &lt;</span>` + `<span>&amp;</span>`, `<span class="foo&gt;ar">1 + &lt;</span>` + `<span>&amp;</span>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}</div>` )}</div>`,
), ),
'1' '1',
] ],
}, },
{ {
type: NodeTypes.JS_ARRAY_EXPRESSION type: NodeTypes.JS_ARRAY_EXPRESSION,
} },
]) ])
}) })
@ -182,7 +182,7 @@ describe('stringify static html', () => {
const { ast, code } = compile( const { ast, code } = compile(
`<div><div>${repeat( `<div><div>${repeat(
`<span class="foo">foo</span>`, `<span class="foo">foo</span>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}<img src="./foo" /></div></div>`, )}<img src="./foo" /></div></div>`,
{ {
hoistStatic: true, hoistStatic: true,
@ -195,7 +195,7 @@ describe('stringify static html', () => {
'_imports_0_', '_imports_0_',
false, false,
node.loc, node.loc,
ConstantTypes.CAN_HOIST ConstantTypes.CAN_HOIST,
) )
node.props[0] = { node.props[0] = {
type: NodeTypes.DIRECTIVE, type: NodeTypes.DIRECTIVE,
@ -203,23 +203,23 @@ describe('stringify static html', () => {
arg: createSimpleExpression('src', true), arg: createSimpleExpression('src', true),
exp, exp,
modifiers: [], modifiers: [],
loc: node.loc loc: node.loc,
} }
} }
} },
] ],
} },
) )
expect(ast.hoists).toMatchObject([ expect(ast.hoists).toMatchObject([
{ {
// the expression and the tree are still hoistable // the expression and the tree are still hoistable
// but should stay NodeTypes.VNODE_CALL // but should stay NodeTypes.VNODE_CALL
// if it's stringified it will be NodeTypes.JS_CALL_EXPRESSION // if it's stringified it will be NodeTypes.JS_CALL_EXPRESSION
type: NodeTypes.VNODE_CALL type: NodeTypes.VNODE_CALL,
}, },
{ {
type: NodeTypes.JS_ARRAY_EXPRESSION type: NodeTypes.JS_ARRAY_EXPRESSION,
} },
]) ])
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
}) })
@ -230,7 +230,7 @@ describe('stringify static html', () => {
const { ast, code } = compile( const { ast, code } = compile(
`<div><div>${repeat( `<div><div>${repeat(
`<span class="foo">foo</span>`, `<span class="foo">foo</span>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}<img src="./foo" /></div></div>`, )}<img src="./foo" /></div></div>`,
{ {
hoistStatic: true, hoistStatic: true,
@ -243,7 +243,7 @@ describe('stringify static html', () => {
'_imports_0_', '_imports_0_',
false, false,
node.loc, node.loc,
ConstantTypes.CAN_STRINGIFY ConstantTypes.CAN_STRINGIFY,
) )
node.props[0] = { node.props[0] = {
type: NodeTypes.DIRECTIVE, type: NodeTypes.DIRECTIVE,
@ -251,22 +251,22 @@ describe('stringify static html', () => {
arg: createSimpleExpression('src', true), arg: createSimpleExpression('src', true),
exp, exp,
modifiers: [], modifiers: [],
loc: node.loc loc: node.loc,
} }
} }
} },
] ],
} },
) )
expect(ast.hoists).toMatchObject([ expect(ast.hoists).toMatchObject([
{ {
// the hoisted node should be NodeTypes.JS_CALL_EXPRESSION // the hoisted node should be NodeTypes.JS_CALL_EXPRESSION
// of `createStaticVNode()` instead of dynamic NodeTypes.VNODE_CALL // of `createStaticVNode()` instead of dynamic NodeTypes.VNODE_CALL
type: NodeTypes.JS_CALL_EXPRESSION type: NodeTypes.JS_CALL_EXPRESSION,
}, },
{ {
type: NodeTypes.JS_ARRAY_EXPRESSION type: NodeTypes.JS_ARRAY_EXPRESSION,
} },
]) ])
expect(code).toMatchSnapshot() expect(code).toMatchSnapshot()
}) })
@ -276,31 +276,31 @@ describe('stringify static html', () => {
const { ast } = compileWithStringify( const { ast } = compileWithStringify(
`<div><div><input indeterminate>${repeat( `<div><div><input indeterminate>${repeat(
`<span class="foo">foo</span>`, `<span class="foo">foo</span>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}</div></div>` )}</div></div>`,
) )
expect(ast.hoists).toMatchObject([ expect(ast.hoists).toMatchObject([
{ {
type: NodeTypes.VNODE_CALL // not CALL_EXPRESSION type: NodeTypes.VNODE_CALL, // not CALL_EXPRESSION
}, },
{ {
type: NodeTypes.JS_ARRAY_EXPRESSION type: NodeTypes.JS_ARRAY_EXPRESSION,
} },
]) ])
const { ast: ast2 } = compileWithStringify( const { ast: ast2 } = compileWithStringify(
`<div><div><input :indeterminate="true">${repeat( `<div><div><input :indeterminate="true">${repeat(
`<span class="foo">foo</span>`, `<span class="foo">foo</span>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}</div></div>` )}</div></div>`,
) )
expect(ast2.hoists).toMatchObject([ expect(ast2.hoists).toMatchObject([
{ {
type: NodeTypes.VNODE_CALL // not CALL_EXPRESSION type: NodeTypes.VNODE_CALL, // not CALL_EXPRESSION
}, },
{ {
type: NodeTypes.JS_ARRAY_EXPRESSION type: NodeTypes.JS_ARRAY_EXPRESSION,
} },
]) ])
}) })
@ -308,31 +308,31 @@ describe('stringify static html', () => {
const { ast } = compileWithStringify( const { ast } = compileWithStringify(
`<div><div>${repeat( `<div><div>${repeat(
`<span class="foo">foo</span>`, `<span class="foo">foo</span>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}<input indeterminate></div></div>` )}<input indeterminate></div></div>`,
) )
expect(ast.hoists).toMatchObject([ expect(ast.hoists).toMatchObject([
{ {
type: NodeTypes.VNODE_CALL // not CALL_EXPRESSION type: NodeTypes.VNODE_CALL, // not CALL_EXPRESSION
}, },
{ {
type: NodeTypes.JS_ARRAY_EXPRESSION type: NodeTypes.JS_ARRAY_EXPRESSION,
} },
]) ])
const { ast: ast2 } = compileWithStringify( const { ast: ast2 } = compileWithStringify(
`<div><div>${repeat( `<div><div>${repeat(
`<span class="foo">foo</span>`, `<span class="foo">foo</span>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}<input :indeterminate="true"></div></div>` )}<input :indeterminate="true"></div></div>`,
) )
expect(ast2.hoists).toMatchObject([ expect(ast2.hoists).toMatchObject([
{ {
type: NodeTypes.VNODE_CALL // not CALL_EXPRESSION type: NodeTypes.VNODE_CALL, // not CALL_EXPRESSION
}, },
{ {
type: NodeTypes.JS_ARRAY_EXPRESSION type: NodeTypes.JS_ARRAY_EXPRESSION,
} },
]) ])
}) })
@ -340,16 +340,16 @@ describe('stringify static html', () => {
const { ast } = compileWithStringify( const { ast } = compileWithStringify(
`<table><tbody>${repeat( `<table><tbody>${repeat(
`<tr class="foo"><td>foo</td></tr>`, `<tr class="foo"><td>foo</td></tr>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}</tbody></table>` )}</tbody></table>`,
) )
expect(ast.hoists).toMatchObject([ expect(ast.hoists).toMatchObject([
{ {
type: NodeTypes.VNODE_CALL // not CALL_EXPRESSION type: NodeTypes.VNODE_CALL, // not CALL_EXPRESSION
}, },
{ {
type: NodeTypes.JS_ARRAY_EXPRESSION type: NodeTypes.JS_ARRAY_EXPRESSION,
} },
]) ])
}) })
@ -357,30 +357,30 @@ describe('stringify static html', () => {
const { ast } = compileWithStringify( const { ast } = compileWithStringify(
`<foo>${repeat( `<foo>${repeat(
`<div class="foo"></div>`, `<div class="foo"></div>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}</foo>` )}</foo>`,
) )
expect(ast.hoists.length).toBe( expect(ast.hoists.length).toBe(
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
) )
ast.hoists.forEach(node => { ast.hoists.forEach(node => {
expect(node).toMatchObject({ expect(node).toMatchObject({
type: NodeTypes.VNODE_CALL // not CALL_EXPRESSION type: NodeTypes.VNODE_CALL, // not CALL_EXPRESSION
}) })
}) })
const { ast: ast2 } = compileWithStringify( const { ast: ast2 } = compileWithStringify(
`<foo><template #foo>${repeat( `<foo><template #foo>${repeat(
`<div class="foo"></div>`, `<div class="foo"></div>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}</template></foo>` )}</template></foo>`,
) )
expect(ast2.hoists.length).toBe( expect(ast2.hoists.length).toBe(
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
) )
ast2.hoists.forEach(node => { ast2.hoists.forEach(node => {
expect(node).toMatchObject({ expect(node).toMatchObject({
type: NodeTypes.VNODE_CALL // not CALL_EXPRESSION type: NodeTypes.VNODE_CALL, // not CALL_EXPRESSION
}) })
}) })
}) })
@ -389,8 +389,8 @@ describe('stringify static html', () => {
const { ast } = compileWithStringify( const { ast } = compileWithStringify(
`<div>${repeat( `<div>${repeat(
`<span :title="null"></span>`, `<span :title="null"></span>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}</div>` )}</div>`,
) )
expect(ast.hoists[0]).toMatchObject({ expect(ast.hoists[0]).toMatchObject({
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
@ -399,11 +399,11 @@ describe('stringify static html', () => {
JSON.stringify( JSON.stringify(
`${repeat( `${repeat(
`<span></span>`, `<span></span>`,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}` )}`,
), ),
'5' '5',
] ],
}) })
}) })
@ -412,8 +412,8 @@ describe('stringify static html', () => {
const { ast } = compileWithStringify( const { ast } = compileWithStringify(
`<button :disabled="false">enable</button>${repeat( `<button :disabled="false">enable</button>${repeat(
`<div></div>`, `<div></div>`,
StringifyThresholds.NODE_COUNT StringifyThresholds.NODE_COUNT,
)}` )}`,
) )
expect(ast.hoists[0]).toMatchObject({ expect(ast.hoists[0]).toMatchObject({
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
@ -422,11 +422,11 @@ describe('stringify static html', () => {
JSON.stringify( JSON.stringify(
`<button>enable</button>${repeat( `<button>enable</button>${repeat(
`<div></div>`, `<div></div>`,
StringifyThresholds.NODE_COUNT StringifyThresholds.NODE_COUNT,
)}` )}`,
), ),
'21' '21',
] ],
}) })
}) })
@ -436,8 +436,8 @@ describe('stringify static html', () => {
const { ast } = compileWithStringify( const { ast } = compileWithStringify(
`<div>${svg}${repeat( `<div>${svg}${repeat(
repeated, repeated,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}</svg></div>` )}</svg></div>`,
) )
expect(ast.hoists[0]).toMatchObject({ expect(ast.hoists[0]).toMatchObject({
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
@ -446,11 +446,11 @@ describe('stringify static html', () => {
JSON.stringify( JSON.stringify(
`${svg}${repeat( `${svg}${repeat(
repeated, repeated,
StringifyThresholds.ELEMENT_WITH_BINDING_COUNT StringifyThresholds.ELEMENT_WITH_BINDING_COUNT,
)}</svg>` )}</svg>`,
), ),
'1' '1',
] ],
}) })
}) })

View File

@ -1,10 +1,10 @@
import { import {
type CompilerOptions,
type ElementNode,
NodeTypes,
type VNodeCall,
baseParse as parse, baseParse as parse,
transform, transform,
CompilerOptions,
ElementNode,
NodeTypes,
VNodeCall
} from '@vue/compiler-core' } from '@vue/compiler-core'
import { transformBind } from '../../../compiler-core/src/transforms/vBind' import { transformBind } from '../../../compiler-core/src/transforms/vBind'
import { transformElement } from '../../../compiler-core/src/transforms/transformElement' import { transformElement } from '../../../compiler-core/src/transforms/transformElement'
@ -12,16 +12,16 @@ import { transformStyle } from '../../src/transforms/transformStyle'
function transformWithStyleTransform( function transformWithStyleTransform(
template: string, template: string,
options: CompilerOptions = {} options: CompilerOptions = {},
) { ) {
const ast = parse(template) const ast = parse(template)
transform(ast, { transform(ast, {
nodeTransforms: [transformStyle], nodeTransforms: [transformStyle],
...options ...options,
}) })
return { return {
root: ast, root: ast,
node: ast.children[0] as ElementNode node: ast.children[0] as ElementNode,
} }
} }
@ -34,13 +34,13 @@ describe('compiler: style transform', () => {
arg: { arg: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `style`, content: `style`,
isStatic: true isStatic: true,
}, },
exp: { exp: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `{"color":"red"}`, content: `{"color":"red"}`,
isStatic: false isStatic: false,
} },
}) })
}) })
@ -48,8 +48,8 @@ describe('compiler: style transform', () => {
const { node } = transformWithStyleTransform(`<div style="color: red"/>`, { const { node } = transformWithStyleTransform(`<div style="color: red"/>`, {
nodeTransforms: [transformStyle, transformElement], nodeTransforms: [transformStyle, transformElement],
directiveTransforms: { directiveTransforms: {
bind: transformBind bind: transformBind,
} },
}) })
expect((node.codegenNode as VNodeCall).props).toMatchObject({ expect((node.codegenNode as VNodeCall).props).toMatchObject({
type: NodeTypes.JS_OBJECT_EXPRESSION, type: NodeTypes.JS_OBJECT_EXPRESSION,
@ -58,15 +58,15 @@ describe('compiler: style transform', () => {
key: { key: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `style`, content: `style`,
isStatic: true isStatic: true,
}, },
value: { value: {
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `{"color":"red"}`, content: `{"color":"red"}`,
isStatic: false isStatic: false,
} },
} },
] ],
}) })
// should not cause the STYLE patchFlag to be attached // should not cause the STYLE patchFlag to be attached
expect((node.codegenNode as VNodeCall).patchFlag).toBeUndefined() expect((node.codegenNode as VNodeCall).patchFlag).toBeUndefined()

View File

@ -1,14 +1,14 @@
import { import {
type CompilerOptions,
type PlainElementNode,
baseParse as parse, baseParse as parse,
transform, transform,
PlainElementNode,
CompilerOptions
} from '@vue/compiler-core' } from '@vue/compiler-core'
import { transformVHtml } from '../../src/transforms/vHtml' import { transformVHtml } from '../../src/transforms/vHtml'
import { transformElement } from '../../../compiler-core/src/transforms/transformElement' import { transformElement } from '../../../compiler-core/src/transforms/transformElement'
import { import {
createObjectMatcher, createObjectMatcher,
genFlagText genFlagText,
} from '../../../compiler-core/__tests__/testUtils' } from '../../../compiler-core/__tests__/testUtils'
import { PatchFlags } from '@vue/shared' import { PatchFlags } from '@vue/shared'
import { DOMErrorCodes } from '../../src/errors' import { DOMErrorCodes } from '../../src/errors'
@ -18,9 +18,9 @@ function transformWithVHtml(template: string, options: CompilerOptions = {}) {
transform(ast, { transform(ast, {
nodeTransforms: [transformElement], nodeTransforms: [transformElement],
directiveTransforms: { directiveTransforms: {
html: transformVHtml html: transformVHtml,
}, },
...options ...options,
}) })
return ast return ast
} }
@ -31,40 +31,40 @@ describe('compiler: v-html transform', () => {
expect((ast.children[0] as PlainElementNode).codegenNode).toMatchObject({ expect((ast.children[0] as PlainElementNode).codegenNode).toMatchObject({
tag: `"div"`, tag: `"div"`,
props: createObjectMatcher({ props: createObjectMatcher({
innerHTML: `[test]` innerHTML: `[test]`,
}), }),
children: undefined, children: undefined,
patchFlag: genFlagText(PatchFlags.PROPS), patchFlag: genFlagText(PatchFlags.PROPS),
dynamicProps: `["innerHTML"]` dynamicProps: `["innerHTML"]`,
}) })
}) })
it('should raise error and ignore children when v-html is present', () => { it('should raise error and ignore children when v-html is present', () => {
const onError = vi.fn() const onError = vi.fn()
const ast = transformWithVHtml(`<div v-html="test">hello</div>`, { const ast = transformWithVHtml(`<div v-html="test">hello</div>`, {
onError onError,
}) })
expect(onError.mock.calls).toMatchObject([ expect(onError.mock.calls).toMatchObject([
[{ code: DOMErrorCodes.X_V_HTML_WITH_CHILDREN }] [{ code: DOMErrorCodes.X_V_HTML_WITH_CHILDREN }],
]) ])
expect((ast.children[0] as PlainElementNode).codegenNode).toMatchObject({ expect((ast.children[0] as PlainElementNode).codegenNode).toMatchObject({
tag: `"div"`, tag: `"div"`,
props: createObjectMatcher({ props: createObjectMatcher({
innerHTML: `[test]` innerHTML: `[test]`,
}), }),
children: undefined, // <-- children should have been removed children: undefined, // <-- children should have been removed
patchFlag: genFlagText(PatchFlags.PROPS), patchFlag: genFlagText(PatchFlags.PROPS),
dynamicProps: `["innerHTML"]` dynamicProps: `["innerHTML"]`,
}) })
}) })
it('should raise error if has no expression', () => { it('should raise error if has no expression', () => {
const onError = vi.fn() const onError = vi.fn()
transformWithVHtml(`<div v-html></div>`, { transformWithVHtml(`<div v-html></div>`, {
onError onError,
}) })
expect(onError.mock.calls).toMatchObject([ expect(onError.mock.calls).toMatchObject([
[{ code: DOMErrorCodes.X_V_HTML_NO_EXPRESSION }] [{ code: DOMErrorCodes.X_V_HTML_NO_EXPRESSION }],
]) ])
}) })
}) })

View File

@ -1,8 +1,8 @@
import { import {
type CompilerOptions,
generate,
baseParse as parse, baseParse as parse,
transform, transform,
CompilerOptions,
generate
} from '@vue/compiler-core' } from '@vue/compiler-core'
import { transformModel } from '../../src/transforms/vModel' import { transformModel } from '../../src/transforms/vModel'
import { transformElement } from '../../../compiler-core/src/transforms/transformElement' import { transformElement } from '../../../compiler-core/src/transforms/transformElement'
@ -12,7 +12,7 @@ import {
V_MODEL_DYNAMIC, V_MODEL_DYNAMIC,
V_MODEL_RADIO, V_MODEL_RADIO,
V_MODEL_SELECT, V_MODEL_SELECT,
V_MODEL_TEXT V_MODEL_TEXT,
} from '../../src/runtimeHelpers' } from '../../src/runtimeHelpers'
function transformWithModel(template: string, options: CompilerOptions = {}) { function transformWithModel(template: string, options: CompilerOptions = {}) {
@ -20,9 +20,9 @@ function transformWithModel(template: string, options: CompilerOptions = {}) {
transform(ast, { transform(ast, {
nodeTransforms: [transformElement], nodeTransforms: [transformElement],
directiveTransforms: { directiveTransforms: {
model: transformModel model: transformModel,
}, },
...options ...options,
}) })
return ast return ast
} }
@ -70,7 +70,7 @@ describe('compiler: transform v-model', () => {
expect(generate(root).code).toMatchSnapshot() expect(generate(root).code).toMatchSnapshot()
const root2 = transformWithModel( const root2 = transformWithModel(
'<input v-bind:[key]="val" v-model="model" />' '<input v-bind:[key]="val" v-model="model" />',
) )
expect(root2.helpers).toContain(V_MODEL_DYNAMIC) expect(root2.helpers).toContain(V_MODEL_DYNAMIC)
expect(generate(root2).code).toMatchSnapshot() expect(generate(root2).code).toMatchSnapshot()
@ -98,8 +98,8 @@ describe('compiler: transform v-model', () => {
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: DOMErrorCodes.X_V_MODEL_ARG_ON_ELEMENT code: DOMErrorCodes.X_V_MODEL_ARG_ON_ELEMENT,
}) }),
) )
}) })
@ -110,8 +110,8 @@ describe('compiler: transform v-model', () => {
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: DOMErrorCodes.X_V_MODEL_ON_INVALID_ELEMENT code: DOMErrorCodes.X_V_MODEL_ON_INVALID_ELEMENT,
}) }),
) )
}) })
@ -119,7 +119,7 @@ describe('compiler: transform v-model', () => {
const onError = vi.fn() const onError = vi.fn()
const root = transformWithModel('<my-input v-model="model" />', { const root = transformWithModel('<my-input v-model="model" />', {
onError, onError,
isCustomElement: tag => tag.startsWith('my-') isCustomElement: tag => tag.startsWith('my-'),
}) })
expect(root.helpers).toContain(V_MODEL_TEXT) expect(root.helpers).toContain(V_MODEL_TEXT)
expect(onError).not.toHaveBeenCalled() expect(onError).not.toHaveBeenCalled()
@ -129,24 +129,24 @@ describe('compiler: transform v-model', () => {
test('should raise error if used file input element', () => { test('should raise error if used file input element', () => {
const onError = vi.fn() const onError = vi.fn()
transformWithModel(`<input type="file" v-model="test"/>`, { transformWithModel(`<input type="file" v-model="test"/>`, {
onError onError,
}) })
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: DOMErrorCodes.X_V_MODEL_ON_FILE_INPUT_ELEMENT code: DOMErrorCodes.X_V_MODEL_ON_FILE_INPUT_ELEMENT,
}) }),
) )
}) })
test('should error on dynamic value binding alongside v-model', () => { test('should error on dynamic value binding alongside v-model', () => {
const onError = vi.fn() const onError = vi.fn()
transformWithModel(`<input v-model="test" :value="test" />`, { transformWithModel(`<input v-model="test" :value="test" />`, {
onError onError,
}) })
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: DOMErrorCodes.X_V_MODEL_UNNECESSARY_VALUE code: DOMErrorCodes.X_V_MODEL_UNNECESSARY_VALUE,
}) }),
) )
}) })
@ -154,7 +154,7 @@ describe('compiler: transform v-model', () => {
test('should NOT error on static value binding alongside v-model', () => { test('should NOT error on static value binding alongside v-model', () => {
const onError = vi.fn() const onError = vi.fn()
transformWithModel(`<input v-model="test" value="test" />`, { transformWithModel(`<input v-model="test" value="test" />`, {
onError onError,
}) })
expect(onError).not.toHaveBeenCalled() expect(onError).not.toHaveBeenCalled()
}) })

View File

@ -1,14 +1,14 @@
import { import {
baseParse as parse, BindingTypes,
CompilerOptions, type CompilerOptions,
ElementNode, type ElementNode,
TO_HANDLER_KEY,
helperNameMap,
NodeTypes, NodeTypes,
ObjectExpression, type ObjectExpression,
TO_HANDLER_KEY,
type VNodeCall,
helperNameMap,
baseParse as parse,
transform, transform,
VNodeCall,
BindingTypes
} from '@vue/compiler-core' } from '@vue/compiler-core'
import { transformOn } from '../../src/transforms/vOn' import { transformOn } from '../../src/transforms/vOn'
import { V_ON_WITH_KEYS, V_ON_WITH_MODIFIERS } from '../../src/runtimeHelpers' import { V_ON_WITH_KEYS, V_ON_WITH_MODIFIERS } from '../../src/runtimeHelpers'
@ -22,31 +22,31 @@ function parseWithVOn(template: string, options: CompilerOptions = {}) {
transform(ast, { transform(ast, {
nodeTransforms: [transformExpression, transformElement], nodeTransforms: [transformExpression, transformElement],
directiveTransforms: { directiveTransforms: {
on: transformOn on: transformOn,
}, },
...options ...options,
}) })
const node = (ast.children[0] as ElementNode).codegenNode as VNodeCall const node = (ast.children[0] as ElementNode).codegenNode as VNodeCall
return { return {
root: ast, root: ast,
node, node,
props: (node.props as ObjectExpression).properties props: (node.props as ObjectExpression).properties,
} }
} }
describe('compiler-dom: transform v-on', () => { describe('compiler-dom: transform v-on', () => {
it('should support multiple modifiers w/ prefixIdentifiers: true', () => { it('should support multiple modifiers w/ prefixIdentifiers: true', () => {
const { const {
props: [prop] props: [prop],
} = parseWithVOn(`<div @click.stop.prevent="test"/>`, { } = parseWithVOn(`<div @click.stop.prevent="test"/>`, {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect(prop).toMatchObject({ expect(prop).toMatchObject({
type: NodeTypes.JS_PROPERTY, type: NodeTypes.JS_PROPERTY,
value: { value: {
callee: V_ON_WITH_MODIFIERS, callee: V_ON_WITH_MODIFIERS,
arguments: [{ content: '_ctx.test' }, '["stop","prevent"]'] arguments: [{ content: '_ctx.test' }, '["stop","prevent"]'],
} },
}) })
}) })
@ -54,8 +54,8 @@ describe('compiler-dom: transform v-on', () => {
const { props } = parseWithVOn( const { props } = parseWithVOn(
`<div @click.stop="test" @keyup.enter="test" />`, `<div @click.stop="test" @keyup.enter="test" />`,
{ {
prefixIdentifiers: true prefixIdentifiers: true,
} },
) )
const [clickProp, keyUpProp] = props const [clickProp, keyUpProp] = props
@ -64,95 +64,95 @@ describe('compiler-dom: transform v-on', () => {
type: NodeTypes.JS_PROPERTY, type: NodeTypes.JS_PROPERTY,
value: { value: {
callee: V_ON_WITH_MODIFIERS, callee: V_ON_WITH_MODIFIERS,
arguments: [{ content: '_ctx.test' }, '["stop"]'] arguments: [{ content: '_ctx.test' }, '["stop"]'],
} },
}) })
expect(keyUpProp).toMatchObject({ expect(keyUpProp).toMatchObject({
type: NodeTypes.JS_PROPERTY, type: NodeTypes.JS_PROPERTY,
value: { value: {
callee: V_ON_WITH_KEYS, callee: V_ON_WITH_KEYS,
arguments: [{ content: '_ctx.test' }, '["enter"]'] arguments: [{ content: '_ctx.test' }, '["enter"]'],
} },
}) })
}) })
it('should support multiple modifiers and event options w/ prefixIdentifiers: true', () => { it('should support multiple modifiers and event options w/ prefixIdentifiers: true', () => {
const { const {
props: [prop] props: [prop],
} = parseWithVOn(`<div @click.stop.capture.once="test"/>`, { } = parseWithVOn(`<div @click.stop.capture.once="test"/>`, {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect(prop).toMatchObject({ expect(prop).toMatchObject({
type: NodeTypes.JS_PROPERTY, type: NodeTypes.JS_PROPERTY,
key: { key: {
content: `onClickCaptureOnce` content: `onClickCaptureOnce`,
}, },
value: { value: {
callee: V_ON_WITH_MODIFIERS, callee: V_ON_WITH_MODIFIERS,
arguments: [{ content: '_ctx.test' }, '["stop"]'] arguments: [{ content: '_ctx.test' }, '["stop"]'],
} },
}) })
}) })
it('should wrap keys guard for keyboard events or dynamic events', () => { it('should wrap keys guard for keyboard events or dynamic events', () => {
const { const {
props: [prop] props: [prop],
} = parseWithVOn(`<div @keydown.stop.capture.ctrl.a="test"/>`, { } = parseWithVOn(`<div @keydown.stop.capture.ctrl.a="test"/>`, {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect(prop).toMatchObject({ expect(prop).toMatchObject({
type: NodeTypes.JS_PROPERTY, type: NodeTypes.JS_PROPERTY,
key: { key: {
content: `onKeydownCapture` content: `onKeydownCapture`,
}, },
value: { value: {
callee: V_ON_WITH_KEYS, callee: V_ON_WITH_KEYS,
arguments: [ arguments: [
{ {
callee: V_ON_WITH_MODIFIERS, callee: V_ON_WITH_MODIFIERS,
arguments: [{ content: '_ctx.test' }, '["stop","ctrl"]'] arguments: [{ content: '_ctx.test' }, '["stop","ctrl"]'],
},
'["a"]',
],
}, },
'["a"]'
]
}
}) })
}) })
it('should not wrap keys guard if no key modifier is present', () => { it('should not wrap keys guard if no key modifier is present', () => {
const { const {
props: [prop] props: [prop],
} = parseWithVOn(`<div @keyup.exact="test"/>`, { } = parseWithVOn(`<div @keyup.exact="test"/>`, {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect(prop).toMatchObject({ expect(prop).toMatchObject({
type: NodeTypes.JS_PROPERTY, type: NodeTypes.JS_PROPERTY,
value: { value: {
callee: V_ON_WITH_MODIFIERS, callee: V_ON_WITH_MODIFIERS,
arguments: [{ content: '_ctx.test' }, '["exact"]'] arguments: [{ content: '_ctx.test' }, '["exact"]'],
} },
}) })
}) })
it('should wrap keys guard for static key event w/ left/right modifiers', () => { it('should wrap keys guard for static key event w/ left/right modifiers', () => {
const { const {
props: [prop] props: [prop],
} = parseWithVOn(`<div @keyup.left="test"/>`, { } = parseWithVOn(`<div @keyup.left="test"/>`, {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect(prop).toMatchObject({ expect(prop).toMatchObject({
type: NodeTypes.JS_PROPERTY, type: NodeTypes.JS_PROPERTY,
value: { value: {
callee: V_ON_WITH_KEYS, callee: V_ON_WITH_KEYS,
arguments: [{ content: '_ctx.test' }, '["left"]'] arguments: [{ content: '_ctx.test' }, '["left"]'],
} },
}) })
}) })
it('should wrap both for dynamic key event w/ left/right modifiers', () => { it('should wrap both for dynamic key event w/ left/right modifiers', () => {
const { const {
props: [prop] props: [prop],
} = parseWithVOn(`<div @[e].left="test"/>`, { } = parseWithVOn(`<div @[e].left="test"/>`, {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect(prop).toMatchObject({ expect(prop).toMatchObject({
type: NodeTypes.JS_PROPERTY, type: NodeTypes.JS_PROPERTY,
@ -161,41 +161,41 @@ describe('compiler-dom: transform v-on', () => {
arguments: [ arguments: [
{ {
callee: V_ON_WITH_MODIFIERS, callee: V_ON_WITH_MODIFIERS,
arguments: [{ content: `_ctx.test` }, `["left"]`] arguments: [{ content: `_ctx.test` }, `["left"]`],
},
'["left"]',
],
}, },
'["left"]'
]
}
}) })
}) })
it('should not wrap normal guard if there is only keys guard', () => { it('should not wrap normal guard if there is only keys guard', () => {
const { const {
props: [prop] props: [prop],
} = parseWithVOn(`<div @keyup.enter="test"/>`, { } = parseWithVOn(`<div @keyup.enter="test"/>`, {
prefixIdentifiers: true prefixIdentifiers: true,
}) })
expect(prop).toMatchObject({ expect(prop).toMatchObject({
type: NodeTypes.JS_PROPERTY, type: NodeTypes.JS_PROPERTY,
value: { value: {
callee: V_ON_WITH_KEYS, callee: V_ON_WITH_KEYS,
arguments: [{ content: '_ctx.test' }, '["enter"]'] arguments: [{ content: '_ctx.test' }, '["enter"]'],
} },
}) })
}) })
test('should transform click.right', () => { test('should transform click.right', () => {
const { const {
props: [prop] props: [prop],
} = parseWithVOn(`<div @click.right="test"/>`) } = parseWithVOn(`<div @click.right="test"/>`)
expect(prop.key).toMatchObject({ expect(prop.key).toMatchObject({
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `onContextmenu` content: `onContextmenu`,
}) })
// dynamic // dynamic
const { const {
props: [prop2] props: [prop2],
} = parseWithVOn(`<div @[event].right="test"/>`) } = parseWithVOn(`<div @[event].right="test"/>`)
// (_toHandlerKey(event)).toLowerCase() === "onclick" ? "onContextmenu" : (_toHandlerKey(event)) // (_toHandlerKey(event)).toLowerCase() === "onclick" ? "onContextmenu" : (_toHandlerKey(event))
expect(prop2.key).toMatchObject({ expect(prop2.key).toMatchObject({
@ -206,34 +206,34 @@ describe('compiler-dom: transform v-on', () => {
children: [ children: [
`_${helperNameMap[TO_HANDLER_KEY]}(`, `_${helperNameMap[TO_HANDLER_KEY]}(`,
{ content: 'event' }, { content: 'event' },
`)` `)`,
] ],
}, },
`) === "onClick" ? "onContextmenu" : (`, `) === "onClick" ? "onContextmenu" : (`,
{ {
children: [ children: [
`_${helperNameMap[TO_HANDLER_KEY]}(`, `_${helperNameMap[TO_HANDLER_KEY]}(`,
{ content: 'event' }, { content: 'event' },
`)` `)`,
] ],
}, },
`)` `)`,
] ],
}) })
}) })
test('should transform click.middle', () => { test('should transform click.middle', () => {
const { const {
props: [prop] props: [prop],
} = parseWithVOn(`<div @click.middle="test"/>`) } = parseWithVOn(`<div @click.middle="test"/>`)
expect(prop.key).toMatchObject({ expect(prop.key).toMatchObject({
type: NodeTypes.SIMPLE_EXPRESSION, type: NodeTypes.SIMPLE_EXPRESSION,
content: `onMouseup` content: `onMouseup`,
}) })
// dynamic // dynamic
const { const {
props: [prop2] props: [prop2],
} = parseWithVOn(`<div @[event].middle="test"/>`) } = parseWithVOn(`<div @[event].middle="test"/>`)
// (_eventNaming(event)).toLowerCase() === "onclick" ? "onMouseup" : (_eventNaming(event)) // (_eventNaming(event)).toLowerCase() === "onclick" ? "onMouseup" : (_eventNaming(event))
expect(prop2.key).toMatchObject({ expect(prop2.key).toMatchObject({
@ -244,48 +244,48 @@ describe('compiler-dom: transform v-on', () => {
children: [ children: [
`_${helperNameMap[TO_HANDLER_KEY]}(`, `_${helperNameMap[TO_HANDLER_KEY]}(`,
{ content: 'event' }, { content: 'event' },
`)` `)`,
] ],
}, },
`) === "onClick" ? "onMouseup" : (`, `) === "onClick" ? "onMouseup" : (`,
{ {
children: [ children: [
`_${helperNameMap[TO_HANDLER_KEY]}(`, `_${helperNameMap[TO_HANDLER_KEY]}(`,
{ content: 'event' }, { content: 'event' },
`)` `)`,
] ],
}, },
`)` `)`,
] ],
}) })
}) })
test('cache handler w/ modifiers', () => { test('cache handler w/ modifiers', () => {
const { const {
root, root,
props: [prop] props: [prop],
} = parseWithVOn(`<div @keyup.enter.capture="foo" />`, { } = parseWithVOn(`<div @keyup.enter.capture="foo" />`, {
prefixIdentifiers: true, prefixIdentifiers: true,
cacheHandlers: true cacheHandlers: true,
}) })
expect(root.cached).toBe(1) expect(root.cached).toBe(1)
// should not treat cached handler as dynamicProp, so it should have no // should not treat cached handler as dynamicProp, so it should have no
// dynamicProps flags and only the hydration flag // dynamicProps flags and only the hydration flag
expect((root as any).children[0].codegenNode.patchFlag).toBe( expect((root as any).children[0].codegenNode.patchFlag).toBe(
genFlagText(PatchFlags.NEED_HYDRATION) genFlagText(PatchFlags.NEED_HYDRATION),
) )
expect(prop).toMatchObject({ expect(prop).toMatchObject({
key: { key: {
content: `onKeyupCapture` content: `onKeyupCapture`,
}, },
value: { value: {
type: NodeTypes.JS_CACHE_EXPRESSION, type: NodeTypes.JS_CACHE_EXPRESSION,
index: 0, index: 0,
value: { value: {
type: NodeTypes.JS_CALL_EXPRESSION, type: NodeTypes.JS_CALL_EXPRESSION,
callee: V_ON_WITH_KEYS callee: V_ON_WITH_KEYS,
} },
} },
}) })
}) })
@ -293,11 +293,11 @@ describe('compiler-dom: transform v-on', () => {
const { node } = parseWithVOn(`<div @keydown.up="foo" />`, { const { node } = parseWithVOn(`<div @keydown.up="foo" />`, {
prefixIdentifiers: true, prefixIdentifiers: true,
bindingMetadata: { bindingMetadata: {
foo: BindingTypes.SETUP_CONST foo: BindingTypes.SETUP_CONST,
}, },
directiveTransforms: { directiveTransforms: {
on: transformOn on: transformOn,
} },
}) })
// should only have hydration flag // should only have hydration flag
expect(node.patchFlag).toBe(genFlagText(PatchFlags.NEED_HYDRATION)) expect(node.patchFlag).toBe(genFlagText(PatchFlags.NEED_HYDRATION))

View File

@ -1,8 +1,8 @@
import { import {
type CompilerOptions,
generate,
baseParse as parse, baseParse as parse,
transform, transform,
generate,
CompilerOptions
} from '@vue/compiler-core' } from '@vue/compiler-core'
import { transformElement } from '../../../compiler-core/src/transforms/transformElement' import { transformElement } from '../../../compiler-core/src/transforms/transformElement'
import { transformShow } from '../../src/transforms/vShow' import { transformShow } from '../../src/transforms/vShow'
@ -13,9 +13,9 @@ function transformWithShow(template: string, options: CompilerOptions = {}) {
transform(ast, { transform(ast, {
nodeTransforms: [transformElement], nodeTransforms: [transformElement],
directiveTransforms: { directiveTransforms: {
show: transformShow show: transformShow,
}, },
...options ...options,
}) })
return ast return ast
} }
@ -34,8 +34,8 @@ describe('compiler: v-show transform', () => {
expect(onError).toHaveBeenCalledTimes(1) expect(onError).toHaveBeenCalledTimes(1)
expect(onError).toHaveBeenCalledWith( expect(onError).toHaveBeenCalledWith(
expect.objectContaining({ expect.objectContaining({
code: DOMErrorCodes.X_V_SHOW_NO_EXPRESSION code: DOMErrorCodes.X_V_SHOW_NO_EXPRESSION,
}) }),
) )
}) })
}) })

View File

@ -1,14 +1,14 @@
import { import {
type CompilerOptions,
type PlainElementNode,
baseParse as parse, baseParse as parse,
transform, transform,
PlainElementNode,
CompilerOptions
} from '@vue/compiler-core' } from '@vue/compiler-core'
import { transformVText } from '../../src/transforms/vText' import { transformVText } from '../../src/transforms/vText'
import { transformElement } from '../../../compiler-core/src/transforms/transformElement' import { transformElement } from '../../../compiler-core/src/transforms/transformElement'
import { import {
createObjectMatcher, createObjectMatcher,
genFlagText genFlagText,
} from '../../../compiler-core/__tests__/testUtils' } from '../../../compiler-core/__tests__/testUtils'
import { PatchFlags } from '@vue/shared' import { PatchFlags } from '@vue/shared'
import { DOMErrorCodes } from '../../src/errors' import { DOMErrorCodes } from '../../src/errors'
@ -18,9 +18,9 @@ function transformWithVText(template: string, options: CompilerOptions = {}) {
transform(ast, { transform(ast, {
nodeTransforms: [transformElement], nodeTransforms: [transformElement],
directiveTransforms: { directiveTransforms: {
text: transformVText text: transformVText,
}, },
...options ...options,
}) })
return ast return ast
} }
@ -32,43 +32,43 @@ describe('compiler: v-text transform', () => {
tag: `"div"`, tag: `"div"`,
props: createObjectMatcher({ props: createObjectMatcher({
textContent: { textContent: {
arguments: [{ content: 'test' }] arguments: [{ content: 'test' }],
} },
}), }),
children: undefined, children: undefined,
patchFlag: genFlagText(PatchFlags.PROPS), patchFlag: genFlagText(PatchFlags.PROPS),
dynamicProps: `["textContent"]` dynamicProps: `["textContent"]`,
}) })
}) })
it('should raise error and ignore children when v-text is present', () => { it('should raise error and ignore children when v-text is present', () => {
const onError = vi.fn() const onError = vi.fn()
const ast = transformWithVText(`<div v-text="test">hello</div>`, { const ast = transformWithVText(`<div v-text="test">hello</div>`, {
onError onError,
}) })
expect(onError.mock.calls).toMatchObject([ expect(onError.mock.calls).toMatchObject([
[{ code: DOMErrorCodes.X_V_TEXT_WITH_CHILDREN }] [{ code: DOMErrorCodes.X_V_TEXT_WITH_CHILDREN }],
]) ])
expect((ast.children[0] as PlainElementNode).codegenNode).toMatchObject({ expect((ast.children[0] as PlainElementNode).codegenNode).toMatchObject({
tag: `"div"`, tag: `"div"`,
props: createObjectMatcher({ props: createObjectMatcher({
textContent: { textContent: {
arguments: [{ content: 'test' }] arguments: [{ content: 'test' }],
} },
}), }),
children: undefined, // <-- children should have been removed children: undefined, // <-- children should have been removed
patchFlag: genFlagText(PatchFlags.PROPS), patchFlag: genFlagText(PatchFlags.PROPS),
dynamicProps: `["textContent"]` dynamicProps: `["textContent"]`,
}) })
}) })
it('should raise error if has no expression', () => { it('should raise error if has no expression', () => {
const onError = vi.fn() const onError = vi.fn()
transformWithVText(`<div v-text></div>`, { transformWithVText(`<div v-text></div>`, {
onError onError,
}) })
expect(onError.mock.calls).toMatchObject([ expect(onError.mock.calls).toMatchObject([
[{ code: DOMErrorCodes.X_V_TEXT_NO_EXPRESSION }] [{ code: DOMErrorCodes.X_V_TEXT_NO_EXPRESSION }],
]) ])
}) })
}) })

View File

@ -1,6 +1,6 @@
{ {
"name": "@vue/compiler-dom", "name": "@vue/compiler-dom",
"version": "3.3.11", "version": "3.4.3",
"description": "@vue/compiler-dom", "description": "@vue/compiler-dom",
"main": "index.js", "main": "index.js",
"module": "dist/compiler-dom.esm-bundler.js", "module": "dist/compiler-dom.esm-bundler.js",

View File

@ -1,133 +0,0 @@
import { ParserOptions } from '@vue/compiler-core'
import namedCharacterReferences from './namedChars.json'
// lazy compute this to make this file tree-shakable for browser
let maxCRNameLength: number
export const decodeHtml: ParserOptions['decodeEntities'] = (
rawText,
asAttr
) => {
let offset = 0
const end = rawText.length
let decodedText = ''
function advance(length: number) {
offset += length
rawText = rawText.slice(length)
}
while (offset < end) {
const head = /&(?:#x?)?/i.exec(rawText)
if (!head || offset + head.index >= end) {
const remaining = end - offset
decodedText += rawText.slice(0, remaining)
advance(remaining)
break
}
// Advance to the "&".
decodedText += rawText.slice(0, head.index)
advance(head.index)
if (head[0] === '&') {
// Named character reference.
let name = ''
let value: string | undefined = undefined
if (/[0-9a-z]/i.test(rawText[1])) {
if (!maxCRNameLength) {
maxCRNameLength = Object.keys(namedCharacterReferences).reduce(
(max, name) => Math.max(max, name.length),
0
)
}
for (let length = maxCRNameLength; !value && length > 0; --length) {
name = rawText.slice(1, 1 + length)
value = (namedCharacterReferences as Record<string, string>)[name]
}
if (value) {
const semi = name.endsWith(';')
if (
asAttr &&
!semi &&
/[=a-z0-9]/i.test(rawText[name.length + 1] || '')
) {
decodedText += '&' + name
advance(1 + name.length)
} else {
decodedText += value
advance(1 + name.length)
}
} else {
decodedText += '&' + name
advance(1 + name.length)
}
} else {
decodedText += '&'
advance(1)
}
} else {
// Numeric character reference.
const hex = head[0] === '&#x'
const pattern = hex ? /^&#x([0-9a-f]+);?/i : /^&#([0-9]+);?/
const body = pattern.exec(rawText)
if (!body) {
decodedText += head[0]
advance(head[0].length)
} else {
// https://html.spec.whatwg.org/multipage/parsing.html#numeric-character-reference-end-state
let cp = Number.parseInt(body[1], hex ? 16 : 10)
if (cp === 0) {
cp = 0xfffd
} else if (cp > 0x10ffff) {
cp = 0xfffd
} else if (cp >= 0xd800 && cp <= 0xdfff) {
cp = 0xfffd
} else if ((cp >= 0xfdd0 && cp <= 0xfdef) || (cp & 0xfffe) === 0xfffe) {
// noop
} else if (
(cp >= 0x01 && cp <= 0x08) ||
cp === 0x0b ||
(cp >= 0x0d && cp <= 0x1f) ||
(cp >= 0x7f && cp <= 0x9f)
) {
cp = CCR_REPLACEMENTS[cp] || cp
}
decodedText += String.fromCodePoint(cp)
advance(body[0].length)
}
}
}
return decodedText
}
// https://html.spec.whatwg.org/multipage/parsing.html#numeric-character-reference-end-state
const CCR_REPLACEMENTS: Record<number, number | undefined> = {
0x80: 0x20ac,
0x82: 0x201a,
0x83: 0x0192,
0x84: 0x201e,
0x85: 0x2026,
0x86: 0x2020,
0x87: 0x2021,
0x88: 0x02c6,
0x89: 0x2030,
0x8a: 0x0160,
0x8b: 0x2039,
0x8c: 0x0152,
0x8e: 0x017d,
0x91: 0x2018,
0x92: 0x2019,
0x93: 0x201c,
0x94: 0x201d,
0x95: 0x2022,
0x96: 0x2013,
0x97: 0x2014,
0x98: 0x02dc,
0x99: 0x2122,
0x9a: 0x0161,
0x9b: 0x203a,
0x9c: 0x0153,
0x9e: 0x017e,
0x9f: 0x0178
}

View File

@ -1,8 +1,8 @@
import { import {
SourceLocation, type CompilerError,
CompilerError, ErrorCodes,
type SourceLocation,
createCompilerError, createCompilerError,
ErrorCodes
} from '@vue/compiler-core' } from '@vue/compiler-core'
export interface DOMCompilerError extends CompilerError { export interface DOMCompilerError extends CompilerError {
@ -11,16 +11,16 @@ export interface DOMCompilerError extends CompilerError {
export function createDOMCompilerError( export function createDOMCompilerError(
code: DOMErrorCodes, code: DOMErrorCodes,
loc?: SourceLocation loc?: SourceLocation,
) { ) {
return createCompilerError( return createCompilerError(
code, code,
loc, loc,
__DEV__ || !__BROWSER__ ? DOMErrorMessages : undefined __DEV__ || !__BROWSER__ ? DOMErrorMessages : undefined,
) as DOMCompilerError ) as DOMCompilerError
} }
export const enum DOMErrorCodes { export enum DOMErrorCodes {
X_V_HTML_NO_EXPRESSION = 54 /* ErrorCodes.__EXTEND_POINT__ */, X_V_HTML_NO_EXPRESSION = 54 /* ErrorCodes.__EXTEND_POINT__ */,
X_V_HTML_WITH_CHILDREN, X_V_HTML_WITH_CHILDREN,
X_V_TEXT_NO_EXPRESSION, X_V_TEXT_NO_EXPRESSION,
@ -32,18 +32,18 @@ export const enum DOMErrorCodes {
X_V_SHOW_NO_EXPRESSION, X_V_SHOW_NO_EXPRESSION,
X_TRANSITION_INVALID_CHILDREN, X_TRANSITION_INVALID_CHILDREN,
X_IGNORED_SIDE_EFFECT_TAG, X_IGNORED_SIDE_EFFECT_TAG,
__EXTEND_POINT__ __EXTEND_POINT__,
} }
if (__TEST__) { if (__TEST__) {
// esbuild cannot infer const enum increments if first value is from another // esbuild cannot infer enum increments if first value is from another
// file, so we have to manually keep them in sync. this check ensures it // file, so we have to manually keep them in sync. this check ensures it
// errors out if there are collisions. // errors out if there are collisions.
if (DOMErrorCodes.X_V_HTML_NO_EXPRESSION < ErrorCodes.__EXTEND_POINT__) { if (DOMErrorCodes.X_V_HTML_NO_EXPRESSION < ErrorCodes.__EXTEND_POINT__) {
throw new Error( throw new Error(
`DOMErrorCodes need to be updated to ${ `DOMErrorCodes need to be updated to ${
ErrorCodes.__EXTEND_POINT__ + 1 ErrorCodes.__EXTEND_POINT__ + 1
} to match extension point from core ErrorCodes.` } to match extension point from core ErrorCodes.`,
) )
} }
} }
@ -59,5 +59,5 @@ export const DOMErrorMessages: { [code: number]: string } = {
[DOMErrorCodes.X_V_MODEL_UNNECESSARY_VALUE]: `Unnecessary value binding used alongside v-model. It will interfere with v-model's behavior.`, [DOMErrorCodes.X_V_MODEL_UNNECESSARY_VALUE]: `Unnecessary value binding used alongside v-model. It will interfere with v-model's behavior.`,
[DOMErrorCodes.X_V_SHOW_NO_EXPRESSION]: `v-show is missing expression.`, [DOMErrorCodes.X_V_SHOW_NO_EXPRESSION]: `v-show is missing expression.`,
[DOMErrorCodes.X_TRANSITION_INVALID_CHILDREN]: `<Transition> expects exactly one child element or component.`, [DOMErrorCodes.X_TRANSITION_INVALID_CHILDREN]: `<Transition> expects exactly one child element or component.`,
[DOMErrorCodes.X_IGNORED_SIDE_EFFECT_TAG]: `Tags with side effect (<script> and <style>) are ignored in client component templates.` [DOMErrorCodes.X_IGNORED_SIDE_EFFECT_TAG]: `Tags with side effect (<script> and <style>) are ignored in client component templates.`,
} }

View File

@ -1,13 +1,13 @@
import { import {
type CodegenResult,
type CompilerOptions,
type DirectiveTransform,
type NodeTransform,
type ParserOptions,
type RootNode,
baseCompile, baseCompile,
baseParse, baseParse,
CompilerOptions,
CodegenResult,
ParserOptions,
RootNode,
noopDirectiveTransform, noopDirectiveTransform,
NodeTransform,
DirectiveTransform
} from '@vue/compiler-core' } from '@vue/compiler-core'
import { parserOptions } from './parserOptions' import { parserOptions } from './parserOptions'
import { transformStyle } from './transforms/transformStyle' import { transformStyle } from './transforms/transformStyle'
@ -25,7 +25,7 @@ export { parserOptions }
export const DOMNodeTransforms: NodeTransform[] = [ export const DOMNodeTransforms: NodeTransform[] = [
transformStyle, transformStyle,
...(__DEV__ ? [transformTransition] : []) ...(__DEV__ ? [transformTransition] : []),
] ]
export const DOMDirectiveTransforms: Record<string, DirectiveTransform> = { export const DOMDirectiveTransforms: Record<string, DirectiveTransform> = {
@ -34,15 +34,15 @@ export const DOMDirectiveTransforms: Record<string, DirectiveTransform> = {
text: transformVText, text: transformVText,
model: transformModel, // override compiler-core model: transformModel, // override compiler-core
on: transformOn, // override compiler-core on: transformOn, // override compiler-core
show: transformShow show: transformShow,
} }
export function compile( export function compile(
template: string, src: string | RootNode,
options: CompilerOptions = {} options: CompilerOptions = {},
): CodegenResult { ): CodegenResult {
return baseCompile( return baseCompile(
template, src,
extend({}, parserOptions, options, { extend({}, parserOptions, options, {
nodeTransforms: [ nodeTransforms: [
// ignore <script> and <tag> // ignore <script> and <tag>
@ -50,15 +50,15 @@ export function compile(
// by compiler-ssr to generate vnode fallback branches // by compiler-ssr to generate vnode fallback branches
ignoreSideEffectTags, ignoreSideEffectTags,
...DOMNodeTransforms, ...DOMNodeTransforms,
...(options.nodeTransforms || []) ...(options.nodeTransforms || []),
], ],
directiveTransforms: extend( directiveTransforms: extend(
{}, {},
DOMDirectiveTransforms, DOMDirectiveTransforms,
options.directiveTransforms || {} options.directiveTransforms || {},
), ),
transformHoist: __BROWSER__ ? null : stringifyStatic transformHoist: __BROWSER__ ? null : stringifyStatic,
}) }),
) )
} }
@ -68,5 +68,9 @@ export function parse(template: string, options: ParserOptions = {}): RootNode {
export * from './runtimeHelpers' export * from './runtimeHelpers'
export { transformStyle } from './transforms/transformStyle' export { transformStyle } from './transforms/transformStyle'
export { createDOMCompilerError, DOMErrorCodes } from './errors' export {
createDOMCompilerError,
DOMErrorCodes,
DOMErrorMessages,
} from './errors'
export * from '@vue/compiler-core' export * from '@vue/compiler-core'

File diff suppressed because it is too large Load Diff

View File

@ -1,48 +1,30 @@
import { import { Namespaces, NodeTypes, type ParserOptions } from '@vue/compiler-core'
TextModes, import { isHTMLTag, isMathMLTag, isSVGTag, isVoidTag } from '@vue/shared'
ParserOptions,
ElementNode,
NodeTypes,
isBuiltInType
} from '@vue/compiler-core'
import { makeMap, isVoidTag, isHTMLTag, isSVGTag } from '@vue/shared'
import { TRANSITION, TRANSITION_GROUP } from './runtimeHelpers' import { TRANSITION, TRANSITION_GROUP } from './runtimeHelpers'
import { decodeHtml } from './decodeHtml'
import { decodeHtmlBrowser } from './decodeHtmlBrowser' import { decodeHtmlBrowser } from './decodeHtmlBrowser'
const isRawTextContainer = /*#__PURE__*/ makeMap(
'style,iframe,script,noscript',
true
)
export const enum DOMNamespaces {
HTML = 0 /* Namespaces.HTML */,
SVG,
MATH_ML
}
export const parserOptions: ParserOptions = { export const parserOptions: ParserOptions = {
parseMode: 'html',
isVoidTag, isVoidTag,
isNativeTag: tag => isHTMLTag(tag) || isSVGTag(tag), isNativeTag: tag => isHTMLTag(tag) || isSVGTag(tag) || isMathMLTag(tag),
isPreTag: tag => tag === 'pre', isPreTag: tag => tag === 'pre',
decodeEntities: __BROWSER__ ? decodeHtmlBrowser : decodeHtml, decodeEntities: __BROWSER__ ? decodeHtmlBrowser : undefined,
isBuiltInComponent: (tag: string): symbol | undefined => { isBuiltInComponent: tag => {
if (isBuiltInType(tag, `Transition`)) { if (tag === 'Transition' || tag === 'transition') {
return TRANSITION return TRANSITION
} else if (isBuiltInType(tag, `TransitionGroup`)) { } else if (tag === 'TransitionGroup' || tag === 'transition-group') {
return TRANSITION_GROUP return TRANSITION_GROUP
} }
}, },
// https://html.spec.whatwg.org/multipage/parsing.html#tree-construction-dispatcher // https://html.spec.whatwg.org/multipage/parsing.html#tree-construction-dispatcher
getNamespace(tag: string, parent: ElementNode | undefined): DOMNamespaces { getNamespace(tag, parent, rootNamespace) {
let ns = parent ? parent.ns : DOMNamespaces.HTML let ns = parent ? parent.ns : rootNamespace
if (parent && ns === Namespaces.MATH_ML) {
if (parent && ns === DOMNamespaces.MATH_ML) {
if (parent.tag === 'annotation-xml') { if (parent.tag === 'annotation-xml') {
if (tag === 'svg') { if (tag === 'svg') {
return DOMNamespaces.SVG return Namespaces.SVG
} }
if ( if (
parent.props.some( parent.props.some(
@ -51,49 +33,36 @@ export const parserOptions: ParserOptions = {
a.name === 'encoding' && a.name === 'encoding' &&
a.value != null && a.value != null &&
(a.value.content === 'text/html' || (a.value.content === 'text/html' ||
a.value.content === 'application/xhtml+xml') a.value.content === 'application/xhtml+xml'),
) )
) { ) {
ns = DOMNamespaces.HTML ns = Namespaces.HTML
} }
} else if ( } else if (
/^m(?:[ions]|text)$/.test(parent.tag) && /^m(?:[ions]|text)$/.test(parent.tag) &&
tag !== 'mglyph' && tag !== 'mglyph' &&
tag !== 'malignmark' tag !== 'malignmark'
) { ) {
ns = DOMNamespaces.HTML ns = Namespaces.HTML
} }
} else if (parent && ns === DOMNamespaces.SVG) { } else if (parent && ns === Namespaces.SVG) {
if ( if (
parent.tag === 'foreignObject' || parent.tag === 'foreignObject' ||
parent.tag === 'desc' || parent.tag === 'desc' ||
parent.tag === 'title' parent.tag === 'title'
) { ) {
ns = DOMNamespaces.HTML ns = Namespaces.HTML
} }
} }
if (ns === DOMNamespaces.HTML) { if (ns === Namespaces.HTML) {
if (tag === 'svg') { if (tag === 'svg') {
return DOMNamespaces.SVG return Namespaces.SVG
} }
if (tag === 'math') { if (tag === 'math') {
return DOMNamespaces.MATH_ML return Namespaces.MATH_ML
} }
} }
return ns return ns
}, },
// https://html.spec.whatwg.org/multipage/parsing.html#parsing-html-fragments
getTextMode({ tag, ns }: ElementNode): TextModes {
if (ns === DOMNamespaces.HTML) {
if (tag === 'textarea' || tag === 'title') {
return TextModes.RCDATA
}
if (isRawTextContainer(tag)) {
return TextModes.RAWTEXT
}
}
return TextModes.DATA
}
} }

View File

@ -24,5 +24,5 @@ registerRuntimeHelpers({
[V_ON_WITH_KEYS]: `withKeys`, [V_ON_WITH_KEYS]: `withKeys`,
[V_SHOW]: `vShow`, [V_SHOW]: `vShow`,
[TRANSITION]: `Transition`, [TRANSITION]: `Transition`,
[TRANSITION_GROUP]: `TransitionGroup` [TRANSITION_GROUP]: `TransitionGroup`,
}) })

View File

@ -1,12 +1,12 @@
import { import {
NodeTransform, type ComponentNode,
NodeTypes,
ElementTypes, ElementTypes,
ComponentNode, type IfBranchNode,
IfBranchNode type NodeTransform,
NodeTypes,
} from '@vue/compiler-core' } from '@vue/compiler-core'
import { TRANSITION } from '../runtimeHelpers' import { TRANSITION } from '../runtimeHelpers'
import { createDOMCompilerError, DOMErrorCodes } from '../errors' import { DOMErrorCodes, createDOMCompilerError } from '../errors'
export const transformTransition: NodeTransform = (node, context) => { export const transformTransition: NodeTransform = (node, context) => {
if ( if (
@ -28,9 +28,9 @@ export const transformTransition: NodeTransform = (node, context) => {
{ {
start: node.children[0].loc.start, start: node.children[0].loc.start,
end: node.children[node.children.length - 1].loc.end, end: node.children[node.children.length - 1].loc.end,
source: '' source: '',
} },
) ),
) )
} }
@ -43,8 +43,9 @@ export const transformTransition: NodeTransform = (node, context) => {
node.props.push({ node.props.push({
type: NodeTypes.ATTRIBUTE, type: NodeTypes.ATTRIBUTE,
name: 'persisted', name: 'persisted',
nameLoc: node.loc,
value: undefined, value: undefined,
loc: node.loc loc: node.loc,
}) })
} }
} }
@ -59,7 +60,7 @@ function hasMultipleChildren(node: ComponentNode | IfBranchNode): boolean {
const children = (node.children = node.children.filter( const children = (node.children = node.children.filter(
c => c =>
c.type !== NodeTypes.COMMENT && c.type !== NodeTypes.COMMENT &&
!(c.type === NodeTypes.TEXT && !c.content.trim()) !(c.type === NodeTypes.TEXT && !c.content.trim()),
)) ))
const child = children[0] const child = children[0]
return ( return (

View File

@ -1,4 +1,4 @@
import { NodeTransform, NodeTypes, ElementTypes } from '@vue/compiler-core' import { ElementTypes, type NodeTransform, NodeTypes } from '@vue/compiler-core'
import { DOMErrorCodes, createDOMCompilerError } from '../errors' import { DOMErrorCodes, createDOMCompilerError } from '../errors'
export const ignoreSideEffectTags: NodeTransform = (node, context) => { export const ignoreSideEffectTags: NodeTransform = (node, context) => {
@ -11,8 +11,8 @@ export const ignoreSideEffectTags: NodeTransform = (node, context) => {
context.onError( context.onError(
createDOMCompilerError( createDOMCompilerError(
DOMErrorCodes.X_IGNORED_SIDE_EFFECT_TAG, DOMErrorCodes.X_IGNORED_SIDE_EFFECT_TAG,
node.loc node.loc,
) ),
) )
context.removeNode() context.removeNode()
} }

View File

@ -2,40 +2,40 @@
* This module is Node-only. * This module is Node-only.
*/ */
import { import {
NodeTypes,
ElementNode,
TransformContext,
TemplateChildNode,
SimpleExpressionNode,
createCallExpression,
HoistTransform,
CREATE_STATIC, CREATE_STATIC,
ExpressionNode, ConstantTypes,
type ElementNode,
ElementTypes, ElementTypes,
PlainElementNode, type ExpressionNode,
JSChildNode, type HoistTransform,
TextCallNode, type JSChildNode,
ConstantTypes Namespaces,
NodeTypes,
type PlainElementNode,
type SimpleExpressionNode,
type TemplateChildNode,
type TextCallNode,
type TransformContext,
createCallExpression,
} from '@vue/compiler-core' } from '@vue/compiler-core'
import { import {
isVoidTag, escapeHtml,
isBooleanAttr,
isKnownHtmlAttr,
isKnownSvgAttr,
isString, isString,
isSymbol, isSymbol,
isKnownHtmlAttr, isVoidTag,
escapeHtml, makeMap,
toDisplayString,
normalizeClass, normalizeClass,
normalizeStyle, normalizeStyle,
stringifyStyle, stringifyStyle,
makeMap, toDisplayString,
isKnownSvgAttr,
isBooleanAttr
} from '@vue/shared' } from '@vue/shared'
import { DOMNamespaces } from '../parserOptions'
export const enum StringifyThresholds { export enum StringifyThresholds {
ELEMENT_WITH_BINDING_COUNT = 5, ELEMENT_WITH_BINDING_COUNT = 5,
NODE_COUNT = 20 NODE_COUNT = 20,
} }
type StringifiableNode = PlainElementNode | TextCallNode type StringifiableNode = PlainElementNode | TextCallNode
@ -87,11 +87,11 @@ export const stringifyStatic: HoistTransform = (children, context, parent) => {
// combine all currently eligible nodes into a single static vnode call // combine all currently eligible nodes into a single static vnode call
const staticCall = createCallExpression(context.helper(CREATE_STATIC), [ const staticCall = createCallExpression(context.helper(CREATE_STATIC), [
JSON.stringify( JSON.stringify(
currentChunk.map(node => stringifyNode(node, context)).join('') currentChunk.map(node => stringifyNode(node, context)).join(''),
).replace(expReplaceRE, `" + $1 + "`), ).replace(expReplaceRE, `" + $1 + "`),
// the 2nd argument indicates the number of DOM nodes this static vnode // the 2nd argument indicates the number of DOM nodes this static vnode
// will insert / hydrate // will insert / hydrate
String(currentChunk.length) String(currentChunk.length),
]) ])
// replace the first node's hoisted expression with the static vnode call // replace the first node's hoisted expression with the static vnode call
replaceHoist(currentChunk[0], staticCall, context) replaceHoist(currentChunk[0], staticCall, context)
@ -148,11 +148,11 @@ const getHoistedNode = (node: TemplateChildNode) =>
node.codegenNode.hoisted node.codegenNode.hoisted
const dataAriaRE = /^(data|aria)-/ const dataAriaRE = /^(data|aria)-/
const isStringifiableAttr = (name: string, ns: DOMNamespaces) => { const isStringifiableAttr = (name: string, ns: Namespaces) => {
return ( return (
(ns === DOMNamespaces.HTML (ns === Namespaces.HTML
? isKnownHtmlAttr(name) ? isKnownHtmlAttr(name)
: ns === DOMNamespaces.SVG : ns === Namespaces.SVG
? isKnownSvgAttr(name) ? isKnownSvgAttr(name)
: false) || dataAriaRE.test(name) : false) || dataAriaRE.test(name)
) )
@ -161,14 +161,14 @@ const isStringifiableAttr = (name: string, ns: DOMNamespaces) => {
const replaceHoist = ( const replaceHoist = (
node: StringifiableNode, node: StringifiableNode,
replacement: JSChildNode | null, replacement: JSChildNode | null,
context: TransformContext context: TransformContext,
) => { ) => {
const hoistToReplace = (node.codegenNode as SimpleExpressionNode).hoisted! const hoistToReplace = (node.codegenNode as SimpleExpressionNode).hoisted!
context.hoists[context.hoists.indexOf(hoistToReplace)] = replacement context.hoists[context.hoists.indexOf(hoistToReplace)] = replacement
} }
const isNonStringifiable = /*#__PURE__*/ makeMap( const isNonStringifiable = /*#__PURE__*/ makeMap(
`caption,thead,tr,th,tbody,td,tfoot,colgroup,col` `caption,thead,tr,th,tbody,td,tfoot,colgroup,col`,
) )
/** /**
@ -248,7 +248,7 @@ function analyzeNode(node: StringifiableNode): [number, number] | false {
function stringifyNode( function stringifyNode(
node: string | TemplateChildNode, node: string | TemplateChildNode,
context: TransformContext context: TransformContext,
): string { ): string {
if (isString(node)) { if (isString(node)) {
return node return node
@ -277,7 +277,7 @@ function stringifyNode(
function stringifyElement( function stringifyElement(
node: ElementNode, node: ElementNode,
context: TransformContext context: TransformContext,
): string { ): string {
let res = `<${node.tag}` let res = `<${node.tag}`
let innerHTML = '' let innerHTML = ''
@ -316,7 +316,7 @@ function stringifyElement(
evaluated = stringifyStyle(normalizeStyle(evaluated)) evaluated = stringifyStyle(normalizeStyle(evaluated))
} }
res += ` ${(p.arg as SimpleExpressionNode).content}="${escapeHtml( res += ` ${(p.arg as SimpleExpressionNode).content}="${escapeHtml(
evaluated evaluated,
)}"` )}"`
} }
} else if (p.name === 'html') { } else if (p.name === 'html') {
@ -325,7 +325,7 @@ function stringifyElement(
innerHTML = evaluateConstant(p.exp as SimpleExpressionNode) innerHTML = evaluateConstant(p.exp as SimpleExpressionNode)
} else if (p.name === 'text') { } else if (p.name === 'text') {
innerHTML = escapeHtml( innerHTML = escapeHtml(
toDisplayString(evaluateConstant(p.exp as SimpleExpressionNode)) toDisplayString(evaluateConstant(p.exp as SimpleExpressionNode)),
) )
} }
} }

View File

@ -1,10 +1,10 @@
import { import {
NodeTransform, ConstantTypes,
type NodeTransform,
NodeTypes, NodeTypes,
type SimpleExpressionNode,
type SourceLocation,
createSimpleExpression, createSimpleExpression,
SimpleExpressionNode,
SourceLocation,
ConstantTypes
} from '@vue/compiler-core' } from '@vue/compiler-core'
import { parseStringStyle } from '@vue/shared' import { parseStringStyle } from '@vue/shared'
@ -25,7 +25,7 @@ export const transformStyle: NodeTransform = node => {
arg: createSimpleExpression(`style`, true, p.loc), arg: createSimpleExpression(`style`, true, p.loc),
exp: parseInlineCSS(p.value.content, p.loc), exp: parseInlineCSS(p.value.content, p.loc),
modifiers: [], modifiers: [],
loc: p.loc loc: p.loc,
} }
} }
}) })
@ -34,13 +34,13 @@ export const transformStyle: NodeTransform = node => {
const parseInlineCSS = ( const parseInlineCSS = (
cssText: string, cssText: string,
loc: SourceLocation loc: SourceLocation,
): SimpleExpressionNode => { ): SimpleExpressionNode => {
const normalized = parseStringStyle(cssText) const normalized = parseStringStyle(cssText)
return createSimpleExpression( return createSimpleExpression(
JSON.stringify(normalized), JSON.stringify(normalized),
false, false,
loc, loc,
ConstantTypes.CAN_STRINGIFY ConstantTypes.CAN_STRINGIFY,
) )
} }

View File

@ -1,20 +1,20 @@
import { import {
DirectiveTransform, type DirectiveTransform,
createObjectProperty, createObjectProperty,
createSimpleExpression createSimpleExpression,
} from '@vue/compiler-core' } from '@vue/compiler-core'
import { createDOMCompilerError, DOMErrorCodes } from '../errors' import { DOMErrorCodes, createDOMCompilerError } from '../errors'
export const transformVHtml: DirectiveTransform = (dir, node, context) => { export const transformVHtml: DirectiveTransform = (dir, node, context) => {
const { exp, loc } = dir const { exp, loc } = dir
if (!exp) { if (!exp) {
context.onError( context.onError(
createDOMCompilerError(DOMErrorCodes.X_V_HTML_NO_EXPRESSION, loc) createDOMCompilerError(DOMErrorCodes.X_V_HTML_NO_EXPRESSION, loc),
) )
} }
if (node.children.length) { if (node.children.length) {
context.onError( context.onError(
createDOMCompilerError(DOMErrorCodes.X_V_HTML_WITH_CHILDREN, loc) createDOMCompilerError(DOMErrorCodes.X_V_HTML_WITH_CHILDREN, loc),
) )
node.children.length = 0 node.children.length = 0
} }
@ -22,8 +22,8 @@ export const transformVHtml: DirectiveTransform = (dir, node, context) => {
props: [ props: [
createObjectProperty( createObjectProperty(
createSimpleExpression(`innerHTML`, true, loc), createSimpleExpression(`innerHTML`, true, loc),
exp || createSimpleExpression('', true) exp || createSimpleExpression('', true),
) ),
] ],
} }
} }

View File

@ -1,20 +1,20 @@
import { import {
transformModel as baseTransform, type DirectiveTransform,
DirectiveTransform,
ElementTypes, ElementTypes,
findProp,
NodeTypes, NodeTypes,
hasDynamicKeyVBind, transformModel as baseTransform,
findDir, findDir,
isStaticArgOf findProp,
hasDynamicKeyVBind,
isStaticArgOf,
} from '@vue/compiler-core' } from '@vue/compiler-core'
import { createDOMCompilerError, DOMErrorCodes } from '../errors' import { DOMErrorCodes, createDOMCompilerError } from '../errors'
import { import {
V_MODEL_CHECKBOX, V_MODEL_CHECKBOX,
V_MODEL_DYNAMIC,
V_MODEL_RADIO, V_MODEL_RADIO,
V_MODEL_SELECT, V_MODEL_SELECT,
V_MODEL_TEXT, V_MODEL_TEXT,
V_MODEL_DYNAMIC
} from '../runtimeHelpers' } from '../runtimeHelpers'
export const transformModel: DirectiveTransform = (dir, node, context) => { export const transformModel: DirectiveTransform = (dir, node, context) => {
@ -28,8 +28,8 @@ export const transformModel: DirectiveTransform = (dir, node, context) => {
context.onError( context.onError(
createDOMCompilerError( createDOMCompilerError(
DOMErrorCodes.X_V_MODEL_ARG_ON_ELEMENT, DOMErrorCodes.X_V_MODEL_ARG_ON_ELEMENT,
dir.arg.loc dir.arg.loc,
) ),
) )
} }
@ -39,8 +39,8 @@ export const transformModel: DirectiveTransform = (dir, node, context) => {
context.onError( context.onError(
createDOMCompilerError( createDOMCompilerError(
DOMErrorCodes.X_V_MODEL_UNNECESSARY_VALUE, DOMErrorCodes.X_V_MODEL_UNNECESSARY_VALUE,
value.loc value.loc,
) ),
) )
} }
} }
@ -74,8 +74,8 @@ export const transformModel: DirectiveTransform = (dir, node, context) => {
context.onError( context.onError(
createDOMCompilerError( createDOMCompilerError(
DOMErrorCodes.X_V_MODEL_ON_FILE_INPUT_ELEMENT, DOMErrorCodes.X_V_MODEL_ON_FILE_INPUT_ELEMENT,
dir.loc dir.loc,
) ),
) )
break break
default: default:
@ -108,8 +108,8 @@ export const transformModel: DirectiveTransform = (dir, node, context) => {
context.onError( context.onError(
createDOMCompilerError( createDOMCompilerError(
DOMErrorCodes.X_V_MODEL_ON_INVALID_ELEMENT, DOMErrorCodes.X_V_MODEL_ON_INVALID_ELEMENT,
dir.loc dir.loc,
) ),
) )
} }
@ -120,7 +120,7 @@ export const transformModel: DirectiveTransform = (dir, node, context) => {
!( !(
p.key.type === NodeTypes.SIMPLE_EXPRESSION && p.key.type === NodeTypes.SIMPLE_EXPRESSION &&
p.key.content === 'modelValue' p.key.content === 'modelValue'
) ),
) )
return baseResult return baseResult

View File

@ -1,21 +1,21 @@
import { import {
transformOn as baseTransform,
DirectiveTransform,
createObjectProperty,
createCallExpression,
createSimpleExpression,
NodeTypes,
createCompoundExpression,
ExpressionNode,
SimpleExpressionNode,
isStaticExp,
CompilerDeprecationTypes, CompilerDeprecationTypes,
TransformContext, type DirectiveTransform,
SourceLocation, type ExpressionNode,
checkCompatEnabled NodeTypes,
type SimpleExpressionNode,
type SourceLocation,
type TransformContext,
transformOn as baseTransform,
checkCompatEnabled,
createCallExpression,
createCompoundExpression,
createObjectProperty,
createSimpleExpression,
isStaticExp,
} from '@vue/compiler-core' } from '@vue/compiler-core'
import { V_ON_WITH_MODIFIERS, V_ON_WITH_KEYS } from '../runtimeHelpers' import { V_ON_WITH_KEYS, V_ON_WITH_MODIFIERS } from '../runtimeHelpers'
import { makeMap, capitalize } from '@vue/shared' import { capitalize, makeMap } from '@vue/shared'
const isEventOptionModifier = /*#__PURE__*/ makeMap(`passive,once,capture`) const isEventOptionModifier = /*#__PURE__*/ makeMap(`passive,once,capture`)
const isNonKeyModifier = /*#__PURE__*/ makeMap( const isNonKeyModifier = /*#__PURE__*/ makeMap(
@ -24,20 +24,20 @@ const isNonKeyModifier = /*#__PURE__*/ makeMap(
// system modifiers + exact // system modifiers + exact
`ctrl,shift,alt,meta,exact,` + `ctrl,shift,alt,meta,exact,` +
// mouse // mouse
`middle` `middle`,
) )
// left & right could be mouse or key modifiers based on event type // left & right could be mouse or key modifiers based on event type
const maybeKeyModifier = /*#__PURE__*/ makeMap('left,right') const maybeKeyModifier = /*#__PURE__*/ makeMap('left,right')
const isKeyboardEvent = /*#__PURE__*/ makeMap( const isKeyboardEvent = /*#__PURE__*/ makeMap(
`onkeyup,onkeydown,onkeypress`, `onkeyup,onkeydown,onkeypress`,
true true,
) )
const resolveModifiers = ( const resolveModifiers = (
key: ExpressionNode, key: ExpressionNode,
modifiers: string[], modifiers: string[],
context: TransformContext, context: TransformContext,
loc: SourceLocation loc: SourceLocation,
) => { ) => {
const keyModifiers = [] const keyModifiers = []
const nonKeyModifiers = [] const nonKeyModifiers = []
@ -52,7 +52,7 @@ const resolveModifiers = (
checkCompatEnabled( checkCompatEnabled(
CompilerDeprecationTypes.COMPILER_V_ON_NATIVE, CompilerDeprecationTypes.COMPILER_V_ON_NATIVE,
context, context,
loc loc,
) )
) { ) {
eventOptionModifiers.push(modifier) eventOptionModifiers.push(modifier)
@ -86,7 +86,7 @@ const resolveModifiers = (
return { return {
keyModifiers, keyModifiers,
nonKeyModifiers, nonKeyModifiers,
eventOptionModifiers eventOptionModifiers,
} }
} }
@ -101,7 +101,7 @@ const transformClick = (key: ExpressionNode, event: string) => {
key, key,
`) === "onClick" ? "${event}" : (`, `) === "onClick" ? "${event}" : (`,
key, key,
`)` `)`,
]) ])
: key : key
} }
@ -126,7 +126,7 @@ export const transformOn: DirectiveTransform = (dir, node, context) => {
if (nonKeyModifiers.length) { if (nonKeyModifiers.length) {
handlerExp = createCallExpression(context.helper(V_ON_WITH_MODIFIERS), [ handlerExp = createCallExpression(context.helper(V_ON_WITH_MODIFIERS), [
handlerExp, handlerExp,
JSON.stringify(nonKeyModifiers) JSON.stringify(nonKeyModifiers),
]) ])
} }
@ -137,7 +137,7 @@ export const transformOn: DirectiveTransform = (dir, node, context) => {
) { ) {
handlerExp = createCallExpression(context.helper(V_ON_WITH_KEYS), [ handlerExp = createCallExpression(context.helper(V_ON_WITH_KEYS), [
handlerExp, handlerExp,
JSON.stringify(keyModifiers) JSON.stringify(keyModifiers),
]) ])
} }
@ -149,7 +149,7 @@ export const transformOn: DirectiveTransform = (dir, node, context) => {
} }
return { return {
props: [createObjectProperty(key, handlerExp)] props: [createObjectProperty(key, handlerExp)],
} }
}) })
} }

View File

@ -1,17 +1,17 @@
import { DirectiveTransform } from '@vue/compiler-core' import type { DirectiveTransform } from '@vue/compiler-core'
import { createDOMCompilerError, DOMErrorCodes } from '../errors' import { DOMErrorCodes, createDOMCompilerError } from '../errors'
import { V_SHOW } from '../runtimeHelpers' import { V_SHOW } from '../runtimeHelpers'
export const transformShow: DirectiveTransform = (dir, node, context) => { export const transformShow: DirectiveTransform = (dir, node, context) => {
const { exp, loc } = dir const { exp, loc } = dir
if (!exp) { if (!exp) {
context.onError( context.onError(
createDOMCompilerError(DOMErrorCodes.X_V_SHOW_NO_EXPRESSION, loc) createDOMCompilerError(DOMErrorCodes.X_V_SHOW_NO_EXPRESSION, loc),
) )
} }
return { return {
props: [], props: [],
needRuntime: context.helper(V_SHOW) needRuntime: context.helper(V_SHOW),
} }
} }

View File

@ -1,23 +1,23 @@
import { import {
DirectiveTransform, type DirectiveTransform,
createObjectProperty,
createSimpleExpression,
TO_DISPLAY_STRING, TO_DISPLAY_STRING,
createCallExpression, createCallExpression,
getConstantType createObjectProperty,
createSimpleExpression,
getConstantType,
} from '@vue/compiler-core' } from '@vue/compiler-core'
import { createDOMCompilerError, DOMErrorCodes } from '../errors' import { DOMErrorCodes, createDOMCompilerError } from '../errors'
export const transformVText: DirectiveTransform = (dir, node, context) => { export const transformVText: DirectiveTransform = (dir, node, context) => {
const { exp, loc } = dir const { exp, loc } = dir
if (!exp) { if (!exp) {
context.onError( context.onError(
createDOMCompilerError(DOMErrorCodes.X_V_TEXT_NO_EXPRESSION, loc) createDOMCompilerError(DOMErrorCodes.X_V_TEXT_NO_EXPRESSION, loc),
) )
} }
if (node.children.length) { if (node.children.length) {
context.onError( context.onError(
createDOMCompilerError(DOMErrorCodes.X_V_TEXT_WITH_CHILDREN, loc) createDOMCompilerError(DOMErrorCodes.X_V_TEXT_WITH_CHILDREN, loc),
) )
node.children.length = 0 node.children.length = 0
} }
@ -31,10 +31,10 @@ export const transformVText: DirectiveTransform = (dir, node, context) => {
: createCallExpression( : createCallExpression(
context.helperString(TO_DISPLAY_STRING), context.helperString(TO_DISPLAY_STRING),
[exp], [exp],
loc loc,
) )
: createSimpleExpression('', true) : createSimpleExpression('', true),
) ),
] ],
} }
} }

View File

@ -14,7 +14,8 @@ return { a }
`; `;
exports[`SFC analyze <script> bindings > auto name inference > do not overwrite manual name (call) 1`] = ` exports[`SFC analyze <script> bindings > auto name inference > do not overwrite manual name (call) 1`] = `
"import { defineComponent } from 'vue' "
import { defineComponent } from 'vue'
const __default__ = defineComponent({ const __default__ = defineComponent({
name: 'Baz' name: 'Baz'
}) })
@ -30,7 +31,8 @@ return { a, defineComponent }
`; `;
exports[`SFC analyze <script> bindings > auto name inference > do not overwrite manual name (object) 1`] = ` exports[`SFC analyze <script> bindings > auto name inference > do not overwrite manual name (object) 1`] = `
"const __default__ = { "
const __default__ = {
name: 'Baz' name: 'Baz'
} }
@ -45,7 +47,8 @@ return { a }
`; `;
exports[`SFC compile <script setup> > <script> and <script setup> co-usage > export call expression as default 1`] = ` exports[`SFC compile <script setup> > <script> and <script setup> co-usage > export call expression as default 1`] = `
"function fn() { "
function fn() {
return "hello, world"; return "hello, world";
} }
const __default__ = fn(); const __default__ = fn();
@ -63,7 +66,8 @@ return { fn }
`; `;
exports[`SFC compile <script setup> > <script> and <script setup> co-usage > keep original semi style 1`] = ` exports[`SFC compile <script setup> > <script> and <script setup> co-usage > keep original semi style 1`] = `
"export default { "
export default {
props: ['item'], props: ['item'],
emits: ['change'], emits: ['change'],
setup(__props, { expose: __expose, emit: __emit }) { setup(__props, { expose: __expose, emit: __emit }) {
@ -515,27 +519,28 @@ return { }
`; `;
exports[`SFC compile <script setup> > async/await detection > ref 1`] = ` exports[`SFC compile <script setup> > async/await detection > ref 1`] = `
"import { withAsyncContext as _withAsyncContext, ref as _ref } from 'vue' "import { withAsyncContext as _withAsyncContext } from 'vue'
export default { export default {
async setup(__props, { expose: __expose }) { async setup(__props, { expose: __expose }) {
__expose(); __expose();
let __temp, __restore let __temp, __restore
let a = _ref(1 + (( let a = ref(1 + ((
([__temp,__restore] = _withAsyncContext(() => foo)), ([__temp,__restore] = _withAsyncContext(() => foo)),
__temp = await __temp, __temp = await __temp,
__restore(), __restore(),
__temp __temp
))) )))
return { a } return { get a() { return a }, set a(v) { a = v } }
} }
}" }"
`; `;
exports[`SFC compile <script setup> > async/await detection > should ignore await inside functions 1`] = ` exports[`SFC compile <script setup> > async/await detection > should ignore await inside functions 1`] = `
"export default { "
export default {
setup(__props, { expose: __expose }) { setup(__props, { expose: __expose }) {
__expose(); __expose();
async function foo() { await bar } async function foo() { await bar }
@ -546,7 +551,8 @@ return { foo }
`; `;
exports[`SFC compile <script setup> > async/await detection > should ignore await inside functions 2`] = ` exports[`SFC compile <script setup> > async/await detection > should ignore await inside functions 2`] = `
"export default { "
export default {
setup(__props, { expose: __expose }) { setup(__props, { expose: __expose }) {
__expose(); __expose();
const foo = async () => { await bar } const foo = async () => { await bar }
@ -557,7 +563,8 @@ return { foo }
`; `;
exports[`SFC compile <script setup> > async/await detection > should ignore await inside functions 3`] = ` exports[`SFC compile <script setup> > async/await detection > should ignore await inside functions 3`] = `
"export default { "
export default {
setup(__props, { expose: __expose }) { setup(__props, { expose: __expose }) {
__expose(); __expose();
const obj = { async method() { await bar }} const obj = { async method() { await bar }}
@ -568,7 +575,8 @@ return { obj }
`; `;
exports[`SFC compile <script setup> > async/await detection > should ignore await inside functions 4`] = ` exports[`SFC compile <script setup> > async/await detection > should ignore await inside functions 4`] = `
"export default { "
export default {
setup(__props, { expose: __expose }) { setup(__props, { expose: __expose }) {
__expose(); __expose();
const cls = class Foo { async method() { await bar }} const cls = class Foo { async method() { await bar }}
@ -618,7 +626,8 @@ return { a }
`; `;
exports[`SFC compile <script setup> > binding analysis for destructure 1`] = ` exports[`SFC compile <script setup> > binding analysis for destructure 1`] = `
"export default { "
export default {
setup(__props, { expose: __expose }) { setup(__props, { expose: __expose }) {
__expose(); __expose();
@ -630,145 +639,6 @@ return { foo, bar, baz, y, z }
}" }"
`; `;
exports[`SFC compile <script setup> > dev mode import usage check > TS annotations 1`] = `
"import { defineComponent as _defineComponent } from 'vue'
import { Foo, Bar, Baz, Qux, Fred } from './x'
const a = 1
export default /*#__PURE__*/_defineComponent({
setup(__props, { expose: __expose }) {
__expose();
function b() {}
return { a, b, get Baz() { return Baz } }
}
})"
`;
exports[`SFC compile <script setup> > dev mode import usage check > attribute expressions 1`] = `
"import { defineComponent as _defineComponent } from 'vue'
import { bar, baz } from './x'
const cond = true
export default /*#__PURE__*/_defineComponent({
setup(__props, { expose: __expose }) {
__expose();
return { cond, get bar() { return bar }, get baz() { return baz } }
}
})"
`;
exports[`SFC compile <script setup> > dev mode import usage check > components 1`] = `
"import { defineComponent as _defineComponent } from 'vue'
import { FooBar, FooBaz, FooQux, foo } from './x'
const fooBar: FooBar = 1
export default /*#__PURE__*/_defineComponent({
setup(__props, { expose: __expose }) {
__expose();
return { fooBar, get FooBaz() { return FooBaz }, get FooQux() { return FooQux }, get foo() { return foo } }
}
})"
`;
exports[`SFC compile <script setup> > dev mode import usage check > directive 1`] = `
"import { defineComponent as _defineComponent } from 'vue'
import { vMyDir } from './x'
export default /*#__PURE__*/_defineComponent({
setup(__props, { expose: __expose }) {
__expose();
return { get vMyDir() { return vMyDir } }
}
})"
`;
exports[`SFC compile <script setup> > dev mode import usage check > dynamic arguments 1`] = `
"import { defineComponent as _defineComponent } from 'vue'
import { FooBar, foo, bar, unused, baz } from './x'
export default /*#__PURE__*/_defineComponent({
setup(__props, { expose: __expose }) {
__expose();
return { get FooBar() { return FooBar }, get foo() { return foo }, get bar() { return bar }, get baz() { return baz } }
}
})"
`;
exports[`SFC compile <script setup> > dev mode import usage check > js template string interpolations 1`] = `
"import { defineComponent as _defineComponent } from 'vue'
import { VAR, VAR2, VAR3 } from './x'
export default /*#__PURE__*/_defineComponent({
setup(__props, { expose: __expose }) {
__expose();
return { get VAR() { return VAR }, get VAR3() { return VAR3 } }
}
})"
`;
exports[`SFC compile <script setup> > dev mode import usage check > last tag 1`] = `
"import { defineComponent as _defineComponent } from 'vue'
import { FooBaz, Last } from './x'
export default /*#__PURE__*/_defineComponent({
setup(__props, { expose: __expose }) {
__expose();
return { get FooBaz() { return FooBaz }, get Last() { return Last } }
}
})"
`;
exports[`SFC compile <script setup> > dev mode import usage check > template ref 1`] = `
"import { defineComponent as _defineComponent } from 'vue'
import { foo, bar, Baz } from './foo'
export default /*#__PURE__*/_defineComponent({
setup(__props, { expose: __expose }) {
__expose();
return { get foo() { return foo }, get bar() { return bar }, get Baz() { return Baz } }
}
})"
`;
exports[`SFC compile <script setup> > dev mode import usage check > vue interpolations 1`] = `
"import { defineComponent as _defineComponent } from 'vue'
import { x, y, z, x$y } from './x'
export default /*#__PURE__*/_defineComponent({
setup(__props, { expose: __expose }) {
__expose();
return { get x() { return x }, get z() { return z }, get x$y() { return x$y } }
}
})"
`;
exports[`SFC compile <script setup> > errors > should allow defineProps/Emit() referencing imported binding 1`] = ` exports[`SFC compile <script setup> > errors > should allow defineProps/Emit() referencing imported binding 1`] = `
"import { bar } from './bar' "import { bar } from './bar'
@ -818,23 +688,29 @@ return { bar }
`; `;
exports[`SFC compile <script setup> > imports > dedupe between user & helper 1`] = ` exports[`SFC compile <script setup> > imports > dedupe between user & helper 1`] = `
"import { ref as _ref } from 'vue' "import { useCssVars as _useCssVars, unref as _unref } from 'vue'
import { ref } from 'vue' import { useCssVars, ref } from 'vue'
export default { export default {
setup(__props, { expose: __expose }) { setup(__props, { expose: __expose }) {
__expose(); __expose();
let foo = _ref(1) _useCssVars(_ctx => ({
"xxxxxxxx-msg": (msg.value)
}))
return { foo, ref } const msg = ref()
return { msg, useCssVars, ref }
} }
}" }"
`; `;
exports[`SFC compile <script setup> > imports > import dedupe between <script> and <script setup> 1`] = ` exports[`SFC compile <script setup> > imports > import dedupe between <script> and <script setup> 1`] = `
"import { x } from './x' "
import { x } from './x'
export default { export default {
setup(__props, { expose: __expose }) { setup(__props, { expose: __expose }) {
@ -898,7 +774,9 @@ return { ref }
`; `;
exports[`SFC compile <script setup> > imports > should support module string names syntax 1`] = ` exports[`SFC compile <script setup> > imports > should support module string names syntax 1`] = `
"import { "😏" as foo } from './foo' "
import { "😏" as foo } from './foo'
export default { export default {
setup(__props, { expose: __expose }) { setup(__props, { expose: __expose }) {
@ -1187,7 +1065,8 @@ return (_ctx, _cache) => {
`; `;
exports[`SFC compile <script setup> > inlineTemplate mode > with defineExpose() 1`] = ` exports[`SFC compile <script setup> > inlineTemplate mode > with defineExpose() 1`] = `
"export default { "
export default {
setup(__props, { expose: __expose }) { setup(__props, { expose: __expose }) {
const count = ref(0) const count = ref(0)
@ -1320,6 +1199,21 @@ return { D, C, B, Foo }
})" })"
`; `;
exports[`SFC compile <script setup> > with TypeScript > with generic attribute 1`] = `
"import { defineComponent as _defineComponent } from 'vue'
type Bar = {}
export default /*#__PURE__*/_defineComponent({
setup(__props, { expose: __expose }) {
__expose();
return { }
}
})"
`;
exports[`SFC genDefaultAs > <script setup> only 1`] = ` exports[`SFC genDefaultAs > <script setup> only 1`] = `
"const a = 1 "const a = 1
@ -1350,7 +1244,8 @@ return { a }
`; `;
exports[`SFC genDefaultAs > <script> + <script setup> 1`] = ` exports[`SFC genDefaultAs > <script> + <script setup> 1`] = `
"const __default__ = {} "
const __default__ = {}
const _sfc_ = /*#__PURE__*/Object.assign(__default__, { const _sfc_ = /*#__PURE__*/Object.assign(__default__, {
setup(__props, { expose: __expose }) { setup(__props, { expose: __expose }) {
@ -1365,7 +1260,8 @@ return { a }
`; `;
exports[`SFC genDefaultAs > <script> + <script setup> 2`] = ` exports[`SFC genDefaultAs > <script> + <script setup> 2`] = `
"const __default__ = {} "
const __default__ = {}
const _sfc_ = /*#__PURE__*/Object.assign(__default__, { const _sfc_ = /*#__PURE__*/Object.assign(__default__, {
setup(__props, { expose: __expose }) { setup(__props, { expose: __expose }) {
@ -1418,3 +1314,31 @@ _sfc_.setup = __setup__
: __injectCSSVars__ : __injectCSSVars__
" "
`; `;
exports[`SFC genDefaultAs > parser plugins > import attributes (user override for deprecated syntax) 1`] = `
"import { foo } from './foo.js' assert { type: 'foobar' }
export default {
setup(__props, { expose: __expose }) {
__expose();
return { get foo() { return foo } }
}
}"
`;
exports[`SFC genDefaultAs > parser plugins > import attributes 1`] = `
"import { foo } from './foo.js' with { type: 'foobar' }
export default {
setup(__props, { expose: __expose }) {
__expose();
return { get foo() { return foo } }
}
}"
`;

View File

@ -58,28 +58,9 @@ export function ssrRender(_ctx, _push, _parent, _attrs) {
}" }"
`; `;
exports[`source map 1`] = `
{
"mappings": ";;;wBACE,oBAA8B;IAAzB,oBAAmB,4BAAbA,WAAM",
"names": [
"render",
],
"sources": [
"example.vue",
],
"sourcesContent": [
"
<div><p>{{ render }}</p></div>
",
],
"version": 3,
}
`;
exports[`template errors 1`] = ` exports[`template errors 1`] = `
[ [
[SyntaxError: Error parsing JavaScript expression: Unexpected token (1:3)], [SyntaxError: Error parsing JavaScript expression: Unexpected token (1:3)],
[SyntaxError: v-bind is missing expression.],
[SyntaxError: v-model can only be used on <input>, <textarea> and <select> elements.], [SyntaxError: v-model can only be used on <input>, <textarea> and <select> elements.],
] ]
`; `;

View File

@ -1,5 +1,5 @@
import { BindingTypes } from '@vue/compiler-core' import { BindingTypes } from '@vue/compiler-core'
import { compileSFCScript as compile, assertCode, mockId } from './utils' import { assertCode, compileSFCScript as compile, mockId } from './utils'
describe('SFC compile <script setup>', () => { describe('SFC compile <script setup>', () => {
test('should compile JS syntax', () => { test('should compile JS syntax', () => {
@ -34,7 +34,7 @@ describe('SFC compile <script setup>', () => {
expect(content).toMatch( expect(content).toMatch(
`return { get aa() { return aa }, set aa(v) { aa = v }, ` + `return { get aa() { return aa }, set aa(v) { aa = v }, ` +
`bb, cc, dd, get a() { return a }, set a(v) { a = v }, b, c, d, ` + `bb, cc, dd, get a() { return a }, set a(v) { a = v }, b, c, d, ` +
`get xx() { return xx }, get x() { return x } }` `get xx() { return xx }, get x() { return x } }`,
) )
expect(bindings).toStrictEqual({ expect(bindings).toStrictEqual({
x: BindingTypes.SETUP_MAYBE_REF, x: BindingTypes.SETUP_MAYBE_REF,
@ -46,7 +46,7 @@ describe('SFC compile <script setup>', () => {
aa: BindingTypes.SETUP_LET, aa: BindingTypes.SETUP_LET,
bb: BindingTypes.LITERAL_CONST, bb: BindingTypes.LITERAL_CONST,
cc: BindingTypes.SETUP_CONST, cc: BindingTypes.SETUP_CONST,
dd: BindingTypes.SETUP_CONST dd: BindingTypes.SETUP_CONST,
}) })
assertCode(content) assertCode(content)
}) })
@ -63,7 +63,7 @@ describe('SFC compile <script setup>', () => {
bar: BindingTypes.SETUP_MAYBE_REF, bar: BindingTypes.SETUP_MAYBE_REF,
baz: BindingTypes.SETUP_MAYBE_REF, baz: BindingTypes.SETUP_MAYBE_REF,
y: BindingTypes.SETUP_MAYBE_REF, y: BindingTypes.SETUP_MAYBE_REF,
z: BindingTypes.SETUP_MAYBE_REF z: BindingTypes.SETUP_MAYBE_REF,
}) })
assertCode(content) assertCode(content)
}) })
@ -209,7 +209,7 @@ describe('SFC compile <script setup>', () => {
compile(`<script setup> compile(`<script setup>
import { ref } from 'vue' import { ref } from 'vue'
import 'foo/css' import 'foo/css'
</script>`).content </script>`).content,
) )
}) })
@ -220,7 +220,7 @@ describe('SFC compile <script setup>', () => {
import a from 'a' // comment import a from 'a' // comment
import b from 'b' import b from 'b'
</script> </script>
`).content `).content,
) )
}) })
@ -232,7 +232,7 @@ describe('SFC compile <script setup>', () => {
defineProps(['foo']) defineProps(['foo'])
defineEmits(['bar']) defineEmits(['bar'])
const r = ref(0) const r = ref(0)
</script>`).content </script>`).content,
) )
}) })
@ -240,14 +240,22 @@ describe('SFC compile <script setup>', () => {
const { content } = compile( const { content } = compile(
` `
<script setup> <script setup>
import { ref } from 'vue' import { useCssVars, ref } from 'vue'
let foo = $ref(1) const msg = ref()
</script> </script>
<style>
.foo {
color: v-bind(msg)
}
</style>
`, `,
{ reactivityTransform: true }
) )
assertCode(content) assertCode(content)
expect(content).toMatch(`import { ref } from 'vue'`) expect(content).toMatch(
`import { useCssVars as _useCssVars, unref as _unref } from 'vue'`,
)
expect(content).toMatch(`import { useCssVars, ref } from 'vue'`)
}) })
test('import dedupe between <script> and <script setup>', () => { test('import dedupe between <script> and <script setup>', () => {
@ -262,7 +270,7 @@ describe('SFC compile <script setup>', () => {
`) `)
assertCode(content) assertCode(content)
expect(content.indexOf(`import { x }`)).toEqual( expect(content.indexOf(`import { x }`)).toEqual(
content.lastIndexOf(`import { x }`) content.lastIndexOf(`import { x }`),
) )
}) })
@ -280,7 +288,7 @@ describe('SFC compile <script setup>', () => {
ref: BindingTypes.SETUP_MAYBE_REF, ref: BindingTypes.SETUP_MAYBE_REF,
reactive: BindingTypes.SETUP_MAYBE_REF, reactive: BindingTypes.SETUP_MAYBE_REF,
foo: BindingTypes.SETUP_MAYBE_REF, foo: BindingTypes.SETUP_MAYBE_REF,
bar: BindingTypes.SETUP_MAYBE_REF bar: BindingTypes.SETUP_MAYBE_REF,
}) })
}) })
@ -297,7 +305,7 @@ describe('SFC compile <script setup>', () => {
_reactive: BindingTypes.SETUP_MAYBE_REF, _reactive: BindingTypes.SETUP_MAYBE_REF,
_ref: BindingTypes.SETUP_MAYBE_REF, _ref: BindingTypes.SETUP_MAYBE_REF,
foo: BindingTypes.SETUP_MAYBE_REF, foo: BindingTypes.SETUP_MAYBE_REF,
bar: BindingTypes.SETUP_MAYBE_REF bar: BindingTypes.SETUP_MAYBE_REF,
}) })
}) })
@ -310,7 +318,7 @@ describe('SFC compile <script setup>', () => {
`) `)
expect(bindings).toStrictEqual({ expect(bindings).toStrictEqual({
bar: BindingTypes.SETUP_REACTIVE_CONST, bar: BindingTypes.SETUP_REACTIVE_CONST,
x: BindingTypes.SETUP_CONST x: BindingTypes.SETUP_CONST,
}) })
}) })
}) })
@ -326,192 +334,11 @@ describe('SFC compile <script setup>', () => {
`) `)
assertCode(content) assertCode(content)
expect(bindings).toStrictEqual({ expect(bindings).toStrictEqual({
foo: BindingTypes.SETUP_MAYBE_REF foo: BindingTypes.SETUP_MAYBE_REF,
}) })
}) })
}) })
// in dev mode, declared bindings are returned as an object from setup()
// when using TS, users may import types which should not be returned as
// values, so we need to check import usage in the template to determine
// what to be returned.
describe('dev mode import usage check', () => {
test('components', () => {
const { content } = compile(`
<script setup lang="ts">
import { FooBar, FooBaz, FooQux, foo } from './x'
const fooBar: FooBar = 1
</script>
<template>
<FooBaz></FooBaz>
<foo-qux/>
<foo/>
FooBar
</template>
`)
// FooBar: should not be matched by plain text or incorrect case
// FooBaz: used as PascalCase component
// FooQux: used as kebab-case component
// foo: lowercase component
expect(content).toMatch(
`return { fooBar, get FooBaz() { return FooBaz }, ` +
`get FooQux() { return FooQux }, get foo() { return foo } }`
)
assertCode(content)
})
test('directive', () => {
const { content } = compile(`
<script setup lang="ts">
import { vMyDir } from './x'
</script>
<template>
<div v-my-dir></div>
</template>
`)
expect(content).toMatch(`return { get vMyDir() { return vMyDir } }`)
assertCode(content)
})
test('dynamic arguments', () => {
const { content } = compile(`
<script setup lang="ts">
import { FooBar, foo, bar, unused, baz } from './x'
</script>
<template>
<FooBar #[foo.slotName] />
<FooBar #unused />
<div :[bar.attrName]="15"></div>
<div unused="unused"></div>
<div #[\`item:\${baz.key}\`]="{ value }"></div>
</template>
`)
expect(content).toMatch(
`return { get FooBar() { return FooBar }, get foo() { return foo }, ` +
`get bar() { return bar }, get baz() { return baz } }`
)
assertCode(content)
})
// https://github.com/vuejs/core/issues/4599
test('attribute expressions', () => {
const { content } = compile(`
<script setup lang="ts">
import { bar, baz } from './x'
const cond = true
</script>
<template>
<div :class="[cond ? '' : bar(), 'default']" :style="baz"></div>
</template>
`)
expect(content).toMatch(
`return { cond, get bar() { return bar }, get baz() { return baz } }`
)
assertCode(content)
})
test('vue interpolations', () => {
const { content } = compile(`
<script setup lang="ts">
import { x, y, z, x$y } from './x'
</script>
<template>
<div :id="z + 'y'">{{ x }} {{ yy }} {{ x$y }}</div>
</template>
`)
// x: used in interpolation
// y: should not be matched by {{ yy }} or 'y' in binding exps
// x$y: #4274 should escape special chars when creating Regex
expect(content).toMatch(
`return { get x() { return x }, get z() { return z }, get x$y() { return x$y } }`
)
assertCode(content)
})
// #4340 interpolations in template strings
test('js template string interpolations', () => {
const { content } = compile(`
<script setup lang="ts">
import { VAR, VAR2, VAR3 } from './x'
</script>
<template>
{{ \`\${VAR}VAR2\${VAR3}\` }}
</template>
`)
// VAR2 should not be matched
expect(content).toMatch(
`return { get VAR() { return VAR }, get VAR3() { return VAR3 } }`
)
assertCode(content)
})
// edge case: last tag in template
test('last tag', () => {
const { content } = compile(`
<script setup lang="ts">
import { FooBaz, Last } from './x'
</script>
<template>
<FooBaz></FooBaz>
<Last/>
</template>
`)
expect(content).toMatch(
`return { get FooBaz() { return FooBaz }, get Last() { return Last } }`
)
assertCode(content)
})
test('TS annotations', () => {
const { content } = compile(`
<script setup lang="ts">
import { Foo, Bar, Baz, Qux, Fred } from './x'
const a = 1
function b() {}
</script>
<template>
{{ a as Foo }}
{{ b<Bar>() }}
{{ Baz }}
<Comp v-slot="{ data }: Qux">{{ data }}</Comp>
<div v-for="{ z = x as Qux } in list as Fred"/>
</template>
`)
expect(content).toMatch(`return { a, b, get Baz() { return Baz } }`)
assertCode(content)
})
// vuejs/vue#12591
test('v-on inline statement', () => {
// should not error
compile(`
<script setup lang="ts">
import { foo } from './foo'
</script>
<template>
<div @click="$emit('update:a');"></div>
</template>
`)
})
test('template ref', () => {
const { content } = compile(`
<script setup lang="ts">
import { foo, bar, Baz } from './foo'
</script>
<template>
<div ref="foo"></div>
<div ref=""></div>
<Baz ref="bar" />
</template>
`)
expect(content).toMatch(
'return { get foo() { return foo }, get bar() { return bar }, get Baz() { return Baz } }'
)
assertCode(content)
})
})
describe('inlineTemplate mode', () => { describe('inlineTemplate mode', () => {
test('should work', () => { test('should work', () => {
const { content } = compile( const { content } = compile(
@ -525,7 +352,7 @@ describe('SFC compile <script setup>', () => {
<div>static</div> <div>static</div>
</template> </template>
`, `,
{ inlineTemplate: true } { inlineTemplate: true },
) )
// check snapshot and make sure helper imports and // check snapshot and make sure helper imports and
// hoists are placed correctly. // hoists are placed correctly.
@ -543,7 +370,7 @@ describe('SFC compile <script setup>', () => {
defineExpose({ count }) defineExpose({ count })
</script> </script>
`, `,
{ inlineTemplate: true } { inlineTemplate: true },
) )
assertCode(content) assertCode(content)
expect(content).toMatch(`setup(__props, { expose: __expose })`) expect(content).toMatch(`setup(__props, { expose: __expose })`)
@ -564,7 +391,7 @@ describe('SFC compile <script setup>', () => {
<some-other-comp/> <some-other-comp/>
</template> </template>
`, `,
{ inlineTemplate: true } { inlineTemplate: true },
) )
expect(content).toMatch('[_unref(vMyDir)]') expect(content).toMatch('[_unref(vMyDir)]')
expect(content).toMatch('_createVNode(ChildComp)') expect(content).toMatch('_createVNode(ChildComp)')
@ -593,7 +420,7 @@ describe('SFC compile <script setup>', () => {
{{ tree.foo() }} {{ tree.foo() }}
</template> </template>
`, `,
{ inlineTemplate: true } { inlineTemplate: true },
) )
// no need to unref vue component import // no need to unref vue component import
expect(content).toMatch(`createVNode(Foo,`) expect(content).toMatch(`createVNode(Foo,`)
@ -632,7 +459,7 @@ describe('SFC compile <script setup>', () => {
<input v-model="lett"> <input v-model="lett">
</template> </template>
`, `,
{ inlineTemplate: true } { inlineTemplate: true },
) )
// known const ref: set value // known const ref: set value
expect(content).toMatch(`(count).value = $event`) expect(content).toMatch(`(count).value = $event`)
@ -640,7 +467,7 @@ describe('SFC compile <script setup>', () => {
expect(content).toMatch(`_isRef(maybe) ? (maybe).value = $event : null`) expect(content).toMatch(`_isRef(maybe) ? (maybe).value = $event : null`)
// let: handle both cases // let: handle both cases
expect(content).toMatch( expect(content).toMatch(
`_isRef(lett) ? (lett).value = $event : lett = $event` `_isRef(lett) ? (lett).value = $event : lett = $event`,
) )
assertCode(content) assertCode(content)
}) })
@ -660,7 +487,7 @@ describe('SFC compile <script setup>', () => {
<input v-model="foo"> <input v-model="foo">
</template> </template>
`, `,
{ inlineTemplate: true } { inlineTemplate: true },
) )
expect(content).not.toMatch(`_isRef(foo)`) expect(content).not.toMatch(`_isRef(foo)`)
}) })
@ -698,7 +525,7 @@ describe('SFC compile <script setup>', () => {
}"/> }"/>
</template> </template>
`, `,
{ inlineTemplate: true } { inlineTemplate: true },
) )
// known const ref: set value // known const ref: set value
expect(content).toMatch(`count.value = 1`) expect(content).toMatch(`count.value = 1`)
@ -706,7 +533,7 @@ describe('SFC compile <script setup>', () => {
expect(content).toMatch(`maybe.value = count.value`) expect(content).toMatch(`maybe.value = count.value`)
// let: handle both cases // let: handle both cases
expect(content).toMatch( expect(content).toMatch(
`_isRef(lett) ? lett.value = count.value : lett = count.value` `_isRef(lett) ? lett.value = count.value : lett = count.value`,
) )
expect(content).toMatch(`_isRef(v) ? v.value += 1 : v += 1`) expect(content).toMatch(`_isRef(v) ? v.value += 1 : v += 1`)
expect(content).toMatch(`_isRef(v) ? v.value -= 1 : v -= 1`) expect(content).toMatch(`_isRef(v) ? v.value -= 1 : v -= 1`)
@ -732,7 +559,7 @@ describe('SFC compile <script setup>', () => {
<div @click="--lett"/> <div @click="--lett"/>
</template> </template>
`, `,
{ inlineTemplate: true } { inlineTemplate: true },
) )
// known const ref: set value // known const ref: set value
expect(content).toMatch(`count.value++`) expect(content).toMatch(`count.value++`)
@ -761,7 +588,7 @@ describe('SFC compile <script setup>', () => {
<div @click="({ lett } = val)"/> <div @click="({ lett } = val)"/>
</template> </template>
`, `,
{ inlineTemplate: true } { inlineTemplate: true },
) )
// known const ref: set value // known const ref: set value
expect(content).toMatch(`({ count: count.value } = val)`) expect(content).toMatch(`({ count: count.value } = val)`)
@ -792,9 +619,9 @@ describe('SFC compile <script setup>', () => {
{ {
inlineTemplate: true, inlineTemplate: true,
templateOptions: { templateOptions: {
ssr: true ssr: true,
} },
} },
) )
expect(content).toMatch(`\n __ssrInlineRender: true,\n`) expect(content).toMatch(`\n __ssrInlineRender: true,\n`)
expect(content).toMatch(`return (_ctx, _push`) expect(content).toMatch(`return (_ctx, _push`)
@ -818,9 +645,9 @@ describe('SFC compile <script setup>', () => {
</template> </template>
`, `,
{ {
inlineTemplate: false inlineTemplate: false,
} },
) ),
).not.toThrowError() ).not.toThrowError()
}) })
}) })
@ -839,11 +666,11 @@ describe('SFC compile <script setup>', () => {
const { content, bindings } = compile( const { content, bindings } = compile(
`<script setup lang="ts"> `<script setup lang="ts">
enum Foo { A = 123 } enum Foo { A = 123 }
</script>` </script>`,
) )
assertCode(content) assertCode(content)
expect(bindings).toStrictEqual({ expect(bindings).toStrictEqual({
Foo: BindingTypes.LITERAL_CONST Foo: BindingTypes.LITERAL_CONST,
}) })
}) })
@ -856,14 +683,14 @@ describe('SFC compile <script setup>', () => {
</script> </script>
<script setup lang="ts"> <script setup lang="ts">
enum Foo { A = 123 } enum Foo { A = 123 }
</script>` </script>`,
) )
assertCode(content) assertCode(content)
expect(bindings).toStrictEqual({ expect(bindings).toStrictEqual({
D: BindingTypes.LITERAL_CONST, D: BindingTypes.LITERAL_CONST,
C: BindingTypes.LITERAL_CONST, C: BindingTypes.LITERAL_CONST,
B: BindingTypes.LITERAL_CONST, B: BindingTypes.LITERAL_CONST,
Foo: BindingTypes.LITERAL_CONST Foo: BindingTypes.LITERAL_CONST,
}) })
}) })
@ -872,11 +699,11 @@ describe('SFC compile <script setup>', () => {
`<script setup lang="ts"> `<script setup lang="ts">
const enum Foo { A = 123 } const enum Foo { A = 123 }
</script>`, </script>`,
{ hoistStatic: true } { hoistStatic: true },
) )
assertCode(content) assertCode(content)
expect(bindings).toStrictEqual({ expect(bindings).toStrictEqual({
Foo: BindingTypes.LITERAL_CONST Foo: BindingTypes.LITERAL_CONST,
}) })
}) })
@ -885,18 +712,24 @@ describe('SFC compile <script setup>', () => {
`<script setup lang="ts"> `<script setup lang="ts">
import type { Foo } from './main.ts' import type { Foo } from './main.ts'
import { type Bar, Baz } from './main.ts' import { type Bar, Baz } from './main.ts'
</script>` </script>`,
) )
expect(content).toMatch(`return { get Baz() { return Baz } }`) expect(content).toMatch(`return { get Baz() { return Baz } }`)
assertCode(content) assertCode(content)
}) })
test('with generic attribute', () => {
const { content } = compile(`
<script setup lang="ts" generic="T extends Record<string,string>">
type Bar = {}
</script>`)
assertCode(content)
})
}) })
describe('async/await detection', () => { describe('async/await detection', () => {
function assertAwaitDetection(code: string, shouldAsync = true) { function assertAwaitDetection(code: string, shouldAsync = true) {
const { content } = compile(`<script setup>${code}</script>`, { const { content } = compile(`<script setup>${code}</script>`)
reactivityTransform: true
})
if (shouldAsync) { if (shouldAsync) {
expect(content).toMatch(`let __temp, __restore`) expect(content).toMatch(`let __temp, __restore`)
} }
@ -914,7 +747,7 @@ describe('SFC compile <script setup>', () => {
}) })
test('ref', () => { test('ref', () => {
assertAwaitDetection(`let a = $ref(1 + (await foo))`) assertAwaitDetection(`let a = ref(1 + (await foo))`)
}) })
// #4448 // #4448
@ -1003,7 +836,7 @@ describe('SFC compile <script setup>', () => {
// class method // class method
assertAwaitDetection( assertAwaitDetection(
`const cls = class Foo { async method() { await bar }}`, `const cls = class Foo { async method() { await bar }}`,
false false,
) )
}) })
}) })
@ -1011,7 +844,7 @@ describe('SFC compile <script setup>', () => {
describe('errors', () => { describe('errors', () => {
test('<script> and <script setup> must have same lang', () => { test('<script> and <script setup> must have same lang', () => {
expect(() => expect(() =>
compile(`<script>foo()</script><script setup lang="ts">bar()</script>`) compile(`<script>foo()</script><script setup lang="ts">bar()</script>`),
).toThrow(`<script> and <script setup> must have the same language type`) ).toThrow(`<script> and <script setup> must have the same language type`)
}) })
@ -1021,20 +854,20 @@ describe('SFC compile <script setup>', () => {
expect(() => expect(() =>
compile(`<script setup> compile(`<script setup>
export const a = 1 export const a = 1
</script>`) </script>`),
).toThrow(moduleErrorMsg) ).toThrow(moduleErrorMsg)
expect(() => expect(() =>
compile(`<script setup> compile(`<script setup>
export * from './foo' export * from './foo'
</script>`) </script>`),
).toThrow(moduleErrorMsg) ).toThrow(moduleErrorMsg)
expect(() => expect(() =>
compile(`<script setup> compile(`<script setup>
const bar = 1 const bar = 1
export { bar as default } export { bar as default }
</script>`) </script>`),
).toThrow(moduleErrorMsg) ).toThrow(moduleErrorMsg)
}) })
@ -1047,14 +880,14 @@ describe('SFC compile <script setup>', () => {
default: () => bar default: () => bar
} }
}) })
</script>`) </script>`),
).toThrow(`cannot reference locally declared variables`) ).toThrow(`cannot reference locally declared variables`)
expect(() => expect(() =>
compile(`<script setup> compile(`<script setup>
let bar = 'hello' let bar = 'hello'
defineEmits([bar]) defineEmits([bar])
</script>`) </script>`),
).toThrow(`cannot reference locally declared variables`) ).toThrow(`cannot reference locally declared variables`)
// #4644 // #4644
@ -1067,7 +900,7 @@ describe('SFC compile <script setup>', () => {
default: () => bar default: () => bar
} }
}) })
</script>`) </script>`),
).not.toThrow(`cannot reference locally declared variables`) ).not.toThrow(`cannot reference locally declared variables`)
}) })
@ -1083,7 +916,7 @@ describe('SFC compile <script setup>', () => {
defineEmits({ defineEmits({
foo: bar => bar > 1 foo: bar => bar > 1
}) })
</script>`).content </script>`).content,
) )
}) })
@ -1099,7 +932,7 @@ describe('SFC compile <script setup>', () => {
defineEmits({ defineEmits({
foo: () => bar > 1 foo: () => bar > 1
}) })
</script>`).content </script>`).content,
) )
}) })
}) })
@ -1133,7 +966,7 @@ describe('SFC analyze <script> bindings', () => {
`) `)
expect(bindings).toStrictEqual({ expect(bindings).toStrictEqual({
foo: BindingTypes.PROPS, foo: BindingTypes.PROPS,
bar: BindingTypes.PROPS bar: BindingTypes.PROPS,
}) })
expect(bindings!.__isScriptSetup).toBe(false) expect(bindings!.__isScriptSetup).toBe(false)
}) })
@ -1157,7 +990,7 @@ describe('SFC analyze <script> bindings', () => {
foo: BindingTypes.PROPS, foo: BindingTypes.PROPS,
bar: BindingTypes.PROPS, bar: BindingTypes.PROPS,
baz: BindingTypes.PROPS, baz: BindingTypes.PROPS,
qux: BindingTypes.PROPS qux: BindingTypes.PROPS,
}) })
expect(bindings!.__isScriptSetup).toBe(false) expect(bindings!.__isScriptSetup).toBe(false)
}) })
@ -1178,7 +1011,7 @@ describe('SFC analyze <script> bindings', () => {
`) `)
expect(bindings).toStrictEqual({ expect(bindings).toStrictEqual({
foo: BindingTypes.SETUP_MAYBE_REF, foo: BindingTypes.SETUP_MAYBE_REF,
bar: BindingTypes.SETUP_MAYBE_REF bar: BindingTypes.SETUP_MAYBE_REF,
}) })
expect(bindings!.__isScriptSetup).toBe(false) expect(bindings!.__isScriptSetup).toBe(false)
}) })
@ -1193,7 +1026,7 @@ describe('SFC analyze <script> bindings', () => {
</script> </script>
`) `)
expect(bindings).toStrictEqual({ expect(bindings).toStrictEqual({
foo: BindingTypes.LITERAL_CONST foo: BindingTypes.LITERAL_CONST,
}) })
}) })
@ -1213,7 +1046,7 @@ describe('SFC analyze <script> bindings', () => {
`) `)
expect(bindings).toStrictEqual({ expect(bindings).toStrictEqual({
foo: BindingTypes.SETUP_MAYBE_REF, foo: BindingTypes.SETUP_MAYBE_REF,
bar: BindingTypes.SETUP_MAYBE_REF bar: BindingTypes.SETUP_MAYBE_REF,
}) })
expect(bindings!.__isScriptSetup).toBe(false) expect(bindings!.__isScriptSetup).toBe(false)
}) })
@ -1234,7 +1067,7 @@ describe('SFC analyze <script> bindings', () => {
`) `)
expect(bindings).toStrictEqual({ expect(bindings).toStrictEqual({
foo: BindingTypes.DATA, foo: BindingTypes.DATA,
bar: BindingTypes.DATA bar: BindingTypes.DATA,
}) })
}) })
@ -1267,7 +1100,7 @@ describe('SFC analyze <script> bindings', () => {
`) `)
expect(bindings).toStrictEqual({ expect(bindings).toStrictEqual({
foo: BindingTypes.OPTIONS, foo: BindingTypes.OPTIONS,
bar: BindingTypes.OPTIONS bar: BindingTypes.OPTIONS,
}) })
}) })
@ -1281,7 +1114,7 @@ describe('SFC analyze <script> bindings', () => {
`) `)
expect(bindings).toStrictEqual({ expect(bindings).toStrictEqual({
foo: BindingTypes.OPTIONS, foo: BindingTypes.OPTIONS,
bar: BindingTypes.OPTIONS bar: BindingTypes.OPTIONS,
}) })
}) })
@ -1298,7 +1131,7 @@ describe('SFC analyze <script> bindings', () => {
`) `)
expect(bindings).toStrictEqual({ expect(bindings).toStrictEqual({
foo: BindingTypes.OPTIONS, foo: BindingTypes.OPTIONS,
bar: BindingTypes.OPTIONS bar: BindingTypes.OPTIONS,
}) })
}) })
@ -1335,7 +1168,7 @@ describe('SFC analyze <script> bindings', () => {
baz: BindingTypes.SETUP_MAYBE_REF, baz: BindingTypes.SETUP_MAYBE_REF,
qux: BindingTypes.DATA, qux: BindingTypes.DATA,
quux: BindingTypes.OPTIONS, quux: BindingTypes.OPTIONS,
quuz: BindingTypes.OPTIONS quuz: BindingTypes.OPTIONS,
}) })
}) })
@ -1362,7 +1195,7 @@ describe('SFC analyze <script> bindings', () => {
c: BindingTypes.LITERAL_CONST, c: BindingTypes.LITERAL_CONST,
d: BindingTypes.SETUP_MAYBE_REF, d: BindingTypes.SETUP_MAYBE_REF,
e: BindingTypes.SETUP_LET, e: BindingTypes.SETUP_LET,
foo: BindingTypes.PROPS foo: BindingTypes.PROPS,
}) })
}) })
@ -1373,8 +1206,8 @@ describe('SFC analyze <script> bindings', () => {
<template>{{ a }}</template>`, <template>{{ a }}</template>`,
undefined, undefined,
{ {
filename: 'FooBar.vue' filename: 'FooBar.vue',
} },
) )
expect(content).toMatch(`export default { expect(content).toMatch(`export default {
__name: 'FooBar'`) __name: 'FooBar'`)
@ -1392,8 +1225,8 @@ describe('SFC analyze <script> bindings', () => {
<template>{{ a }}</template>`, <template>{{ a }}</template>`,
undefined, undefined,
{ {
filename: 'FooBar.vue' filename: 'FooBar.vue',
} },
) )
expect(content).not.toMatch(`name: 'FooBar'`) expect(content).not.toMatch(`name: 'FooBar'`)
expect(content).toMatch(`name: 'Baz'`) expect(content).toMatch(`name: 'Baz'`)
@ -1412,8 +1245,8 @@ describe('SFC analyze <script> bindings', () => {
<template>{{ a }}</template>`, <template>{{ a }}</template>`,
undefined, undefined,
{ {
filename: 'FooBar.vue' filename: 'FooBar.vue',
} },
) )
expect(content).not.toMatch(`name: 'FooBar'`) expect(content).not.toMatch(`name: 'FooBar'`)
expect(content).toMatch(`name: 'Baz'`) expect(content).toMatch(`name: 'Baz'`)
@ -1429,8 +1262,8 @@ describe('SFC genDefaultAs', () => {
export default {} export default {}
</script>`, </script>`,
{ {
genDefaultAs: '_sfc_' genDefaultAs: '_sfc_',
} },
) )
expect(content).not.toMatch('export default') expect(content).not.toMatch('export default')
expect(content).toMatch(`const _sfc_ = {}`) expect(content).toMatch(`const _sfc_ = {}`)
@ -1446,8 +1279,8 @@ describe('SFC genDefaultAs', () => {
.foo { color: v-bind(x) } .foo { color: v-bind(x) }
</style>`, </style>`,
{ {
genDefaultAs: '_sfc_' genDefaultAs: '_sfc_',
} },
) )
expect(content).not.toMatch('export default') expect(content).not.toMatch('export default')
expect(content).not.toMatch('__default__') expect(content).not.toMatch('__default__')
@ -1464,12 +1297,12 @@ describe('SFC genDefaultAs', () => {
const a = 1 const a = 1
</script>`, </script>`,
{ {
genDefaultAs: '_sfc_' genDefaultAs: '_sfc_',
} },
) )
expect(content).not.toMatch('export default') expect(content).not.toMatch('export default')
expect(content).toMatch( expect(content).toMatch(
`const _sfc_ = /*#__PURE__*/Object.assign(__default__` `const _sfc_ = /*#__PURE__*/Object.assign(__default__`,
) )
assertCode(content) assertCode(content)
}) })
@ -1483,12 +1316,12 @@ describe('SFC genDefaultAs', () => {
const a = 1 const a = 1
</script>`, </script>`,
{ {
genDefaultAs: '_sfc_' genDefaultAs: '_sfc_',
} },
) )
expect(content).not.toMatch('export default') expect(content).not.toMatch('export default')
expect(content).toMatch( expect(content).toMatch(
`const _sfc_ = /*#__PURE__*/Object.assign(__default__` `const _sfc_ = /*#__PURE__*/Object.assign(__default__`,
) )
assertCode(content) assertCode(content)
}) })
@ -1499,8 +1332,8 @@ describe('SFC genDefaultAs', () => {
const a = 1 const a = 1
</script>`, </script>`,
{ {
genDefaultAs: '_sfc_' genDefaultAs: '_sfc_',
} },
) )
expect(content).not.toMatch('export default') expect(content).not.toMatch('export default')
expect(content).toMatch(`const _sfc_ = {\n setup`) expect(content).toMatch(`const _sfc_ = {\n setup`)
@ -1513,8 +1346,8 @@ describe('SFC genDefaultAs', () => {
const a = 1 const a = 1
</script>`, </script>`,
{ {
genDefaultAs: '_sfc_' genDefaultAs: '_sfc_',
} },
) )
expect(content).not.toMatch('export default') expect(content).not.toMatch('export default')
expect(content).toMatch(`const _sfc_ = /*#__PURE__*/_defineComponent(`) expect(content).toMatch(`const _sfc_ = /*#__PURE__*/_defineComponent(`)
@ -1530,12 +1363,12 @@ describe('SFC genDefaultAs', () => {
const a = 1 const a = 1
</script>`, </script>`,
{ {
genDefaultAs: '_sfc_' genDefaultAs: '_sfc_',
} },
) )
expect(content).not.toMatch('export default') expect(content).not.toMatch('export default')
expect(content).toMatch( expect(content).toMatch(
`const _sfc_ = /*#__PURE__*/_defineComponent({\n ...__default__` `const _sfc_ = /*#__PURE__*/_defineComponent({\n ...__default__`,
) )
assertCode(content) assertCode(content)
}) })
@ -1546,12 +1379,46 @@ describe('SFC genDefaultAs', () => {
import { toRef } from 'vue' import { toRef } from 'vue'
const props = defineProps<{foo: string}>() const props = defineProps<{foo: string}>()
const foo = toRef(() => props.foo) const foo = toRef(() => props.foo)
</script>` </script>`,
) )
expect(bindings).toStrictEqual({ expect(bindings).toStrictEqual({
toRef: BindingTypes.SETUP_CONST, toRef: BindingTypes.SETUP_CONST,
props: BindingTypes.SETUP_REACTIVE_CONST, props: BindingTypes.SETUP_REACTIVE_CONST,
foo: BindingTypes.SETUP_REF foo: BindingTypes.SETUP_REF,
})
})
describe('parser plugins', () => {
test('import attributes', () => {
const { content } = compile(`
<script setup>
import { foo } from './foo.js' with { type: 'foobar' }
</script>
`)
assertCode(content)
expect(() =>
compile(`
<script setup>
import { foo } from './foo.js' assert { type: 'foobar' }
</script>`),
).toThrow()
})
test('import attributes (user override for deprecated syntax)', () => {
const { content } = compile(
`
<script setup>
import { foo } from './foo.js' assert { type: 'foobar' }
</script>
`,
{
babelParserPlugins: [
['importAttributes', { deprecatedAssertSyntax: true }],
],
},
)
assertCode(content)
}) })
}) })
}) })

View File

@ -1,7 +1,8 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
exports[`defineEmits > basic usage 1`] = ` exports[`defineEmits > basic usage 1`] = `
"export default { "
export default {
emits: ['foo', 'bar'], emits: ['foo', 'bar'],
setup(__props, { expose: __expose, emit: __emit }) { setup(__props, { expose: __expose, emit: __emit }) {
__expose(); __expose();

View File

@ -16,7 +16,8 @@ return { n, get x() { return x } }
`; `;
exports[`defineExpose() 1`] = ` exports[`defineExpose() 1`] = `
"export default { "
export default {
setup(__props, { expose: __expose }) { setup(__props, { expose: __expose }) {
__expose({ foo: 123 }) __expose({ foo: 123 })

View File

@ -6,8 +6,11 @@ exports[`defineModel() > basic usage 1`] = `
export default { export default {
props: { props: {
"modelValue": { required: true }, "modelValue": { required: true },
"modelModifiers": {},
"count": {}, "count": {},
"countModifiers": {},
"toString": { type: Function }, "toString": { type: Function },
"toStringModifiers": {},
}, },
emits: ["update:modelValue", "update:count", "update:toString"], emits: ["update:modelValue", "update:count", "update:toString"],
setup(__props, { expose: __expose }) { setup(__props, { expose: __expose }) {
@ -23,12 +26,58 @@ return { modelValue, c, toString }
}" }"
`; `;
exports[`defineModel() > get / set transformers 1`] = `
"import { useModel as _useModel, defineComponent as _defineComponent } from 'vue'
export default /*#__PURE__*/_defineComponent({
props: {
"modelValue": {
required: true
},
"modelModifiers": {},
},
emits: ["update:modelValue"],
setup(__props, { expose: __expose }) {
__expose();
const modelValue = _useModel(__props, "modelValue", { get(v) { return v - 1 }, set: (v) => { return v + 1 }, })
return { modelValue }
}
})"
`;
exports[`defineModel() > get / set transformers 2`] = `
"import { useModel as _useModel, defineComponent as _defineComponent } from 'vue'
export default /*#__PURE__*/_defineComponent({
props: {
"modelValue": {
default: 0,
required: true,
},
"modelModifiers": {},
},
emits: ["update:modelValue"],
setup(__props, { expose: __expose }) {
__expose();
const modelValue = _useModel(__props, "modelValue", { get(v) { return v - 1 }, set: (v) => { return v + 1 }, })
return { modelValue }
}
})"
`;
exports[`defineModel() > w/ array props 1`] = ` exports[`defineModel() > w/ array props 1`] = `
"import { useModel as _useModel, mergeModels as _mergeModels } from 'vue' "import { useModel as _useModel, mergeModels as _mergeModels } from 'vue'
export default { export default {
props: /*#__PURE__*/_mergeModels(['foo', 'bar'], { props: /*#__PURE__*/_mergeModels(['foo', 'bar'], {
"count": {}, "count": {},
"countModifiers": {},
}), }),
emits: ["update:count"], emits: ["update:count"],
setup(__props, { expose: __expose }) { setup(__props, { expose: __expose }) {
@ -49,6 +98,7 @@ exports[`defineModel() > w/ defineProps and defineEmits 1`] = `
export default { export default {
props: /*#__PURE__*/_mergeModels({ foo: String }, { props: /*#__PURE__*/_mergeModels({ foo: String }, {
"modelValue": { default: 0 }, "modelValue": { default: 0 },
"modelModifiers": {},
}), }),
emits: /*#__PURE__*/_mergeModels(['change'], ["update:modelValue"]), emits: /*#__PURE__*/_mergeModels(['change'], ["update:modelValue"]),
setup(__props, { expose: __expose }) { setup(__props, { expose: __expose }) {
@ -64,47 +114,19 @@ return { count }
}" }"
`; `;
exports[`defineModel() > w/ local flag 1`] = `
"import { useModel as _useModel } from 'vue'
const local = true
export default {
props: {
"modelValue": { local: true, default: 1 },
"bar": { [key]: true },
"baz": { ...x },
"qux": x,
"foo2": { local: true, ...x },
"hoist": { local },
},
emits: ["update:modelValue", "update:bar", "update:baz", "update:qux", "update:foo2", "update:hoist"],
setup(__props, { expose: __expose }) {
__expose();
const foo = _useModel(__props, "modelValue", { local: true })
const bar = _useModel(__props, "bar", { [key]: true })
const baz = _useModel(__props, "baz", { ...x })
const qux = _useModel(__props, "qux", x)
const foo2 = _useModel(__props, "foo2", { local: true })
const hoist = _useModel(__props, "hoist", { local })
return { foo, bar, baz, qux, foo2, local, hoist }
}
}"
`;
exports[`defineModel() > w/ types, basic usage 1`] = ` exports[`defineModel() > w/ types, basic usage 1`] = `
"import { useModel as _useModel, defineComponent as _defineComponent } from 'vue' "import { useModel as _useModel, defineComponent as _defineComponent } from 'vue'
export default /*#__PURE__*/_defineComponent({ export default /*#__PURE__*/_defineComponent({
props: { props: {
"modelValue": { type: [Boolean, String] }, "modelValue": { type: [Boolean, String] },
"modelModifiers": {},
"count": { type: Number }, "count": { type: Number },
"countModifiers": {},
"disabled": { type: Number, ...{ required: false } }, "disabled": { type: Number, ...{ required: false } },
"disabledModifiers": {},
"any": { type: Boolean, skipCheck: true }, "any": { type: Boolean, skipCheck: true },
"anyModifiers": {},
}, },
emits: ["update:modelValue", "update:count", "update:disabled", "update:any"], emits: ["update:modelValue", "update:count", "update:disabled", "update:any"],
setup(__props, { expose: __expose }) { setup(__props, { expose: __expose }) {
@ -127,10 +149,15 @@ exports[`defineModel() > w/ types, production mode 1`] = `
export default /*#__PURE__*/_defineComponent({ export default /*#__PURE__*/_defineComponent({
props: { props: {
"modelValue": { type: Boolean }, "modelValue": { type: Boolean },
"modelModifiers": {},
"fn": {}, "fn": {},
"fnModifiers": {},
"fnWithDefault": { type: Function, ...{ default: () => null } }, "fnWithDefault": { type: Function, ...{ default: () => null } },
"fnWithDefaultModifiers": {},
"str": {}, "str": {},
"strModifiers": {},
"optional": { required: false }, "optional": { required: false },
"optionalModifiers": {},
}, },
emits: ["update:modelValue", "update:fn", "update:fnWithDefault", "update:str", "update:optional"], emits: ["update:modelValue", "update:fn", "update:fnWithDefault", "update:str", "update:optional"],
setup(__props, { expose: __expose }) { setup(__props, { expose: __expose }) {

View File

@ -1,7 +1,8 @@
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html // Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
exports[`defineOptions() > basic usage 1`] = ` exports[`defineOptions() > basic usage 1`] = `
"export default /*#__PURE__*/Object.assign({ name: 'FooApp' }, { "
export default /*#__PURE__*/Object.assign({ name: 'FooApp' }, {
setup(__props, { expose: __expose }) { setup(__props, { expose: __expose }) {
__expose(); __expose();
@ -14,7 +15,8 @@ return { }
`; `;
exports[`defineOptions() > empty argument 1`] = ` exports[`defineOptions() > empty argument 1`] = `
"export default { "
export default {
setup(__props, { expose: __expose }) { setup(__props, { expose: __expose }) {
__expose(); __expose();

Some files were not shown because too many files have changed in this diff Show More