@vue/compiler-core 3.2.16 → 3.2.20

package/dist/compiler-core.cjs.js

@@ -452,24 +452,24 @@ const isMemberExpressionBrowser = (path) => {
     return !currentOpenBracketCount && !currentOpenParensCount;
 };
 const isMemberExpressionNode = (path, context) => {
-    try {
-        let ret = parser.parseExpression(path, {
-            plugins: [...context.expressionPlugins, ...shared.babelParserDefaultPlugins]
-        });
-        if (ret.type === 'TSAsExpression' || ret.type === 'TSTypeAssertion') {
-            ret = ret.expression;
+        try {
+            let ret = parser.parseExpression(path, {
+                plugins: context.expressionPlugins
+            });
+            if (ret.type === 'TSAsExpression' || ret.type === 'TSTypeAssertion') {
+                ret = ret.expression;
+            }
+            return (ret.type === 'MemberExpression' ||
+                ret.type === 'OptionalMemberExpression' ||
+                ret.type === 'Identifier');
         }
-        return (ret.type === 'MemberExpression' ||
-            ret.type === 'OptionalMemberExpression' ||
-            ret.type === 'Identifier');
-    }
-    catch (e) {
-        return false;
-    }
-};
+        catch (e) {
+            return false;
+        }
+    };
 const isMemberExpression = isMemberExpressionNode;
 function getInnerRange(loc, offset, length) {
-    const source = loc.source.substr(offset, length);
+    const source = loc.source.slice(offset, offset + length);
     const newLoc = {
         source,
         start: advancePositionWithClone(loc.start, loc.source, offset),
@@ -1383,10 +1383,10 @@ function parseAttribute(context, nameSet) {
                 isStatic = false;
                 if (!content.endsWith(']')) {
                     emitError(context, 27 /* X_MISSING_DYNAMIC_DIRECTIVE_ARGUMENT_END */);
-                    content = content.substr(1);
+                    content = content.slice(1);
                 }
                 else {
-                    content = content.substr(1, content.length - 2);
+                    content = content.slice(1, content.length - 1);
                 }
             }
             else if (isSlot) {
@@ -1412,7 +1412,7 @@ function parseAttribute(context, nameSet) {
             valueLoc.end = advancePositionWithClone(valueLoc.start, value.content);
             valueLoc.source = valueLoc.source.slice(1, -1);
         }
-        const modifiers = match[3] ? match[3].substr(1).split('.') : [];
+        const modifiers = match[3] ? match[3].slice(1).split('.') : [];
         if (isPropShorthand)
             modifiers.push('prop');
         // 2.x compat v-bind:foo.sync -> v-model:foo
@@ -1633,7 +1633,7 @@ function isEnd(context, mode, ancestors) {
 }
 function startsWithEndTagOpen(source, tag) {
     return (startsWith(source, '</') &&
-        source.substr(2, tag.length).toLowerCase() === tag.toLowerCase() &&
+        source.slice(2, 2 + tag.length).toLowerCase() === tag.toLowerCase() &&
         /[\t\r\n\f />]/.test(source[2 + tag.length] || '>'));
 }
 
@@ -3433,12 +3433,19 @@ asRawStatements = false, localVars = Object.create(context.identifiers)) {
                 // it gets correct type
                 return `__props.${raw}`;
             }
+            else if (type === "props-aliased" /* PROPS_ALIASED */) {
+                // prop with a different local alias (from defineProps() destructure)
+                return `__props.${bindingMetadata.__propsAliases[raw]}`;
+            }
         }
         else {
             if (type && type.startsWith('setup')) {
                 // setup bindings in non-inline mode
                 return `$setup.${raw}`;
             }
+            else if (type === "props-aliased" /* PROPS_ALIASED */) {
+                return `$props.${bindingMetadata.__propsAliases[raw]}`;
+            }
             else if (type) {
                 return `$${type}.${raw}`;
             }
@@ -3483,7 +3490,7 @@ asRawStatements = false, localVars = Object.create(context.identifiers)) {
         : `(${rawExp})${asParams ? `=>{}` : ``}`;
     try {
         ast = parser.parse(source, {
-            plugins: [...context.expressionPlugins, ...shared.babelParserDefaultPlugins]
+            plugins: context.expressionPlugins
         }).program;
     }
     catch (e) {
@@ -3818,7 +3825,9 @@ const transformFor = createStructuralDirectiveTransform('for', (node, dir, conte
                 ? createSimpleExpression(keyProp.value.content, true)
                 : keyProp.exp);
         const keyProperty = keyProp ? createObjectProperty(`key`, keyExp) : null;
-        if (context.prefixIdentifiers && keyProperty) {
+        if (context.prefixIdentifiers &&
+            keyProperty &&
+            keyProp.type !== 6 /* ATTRIBUTE */) {
             // #2085 process :key expression needs to be processed in order for it
             // to behave consistently for <template v-for> and <div v-for>.
             // In the case of `<template v-for>`, the node is discarded and never

package/dist/compiler-core.cjs.prod.js

@@ -451,24 +451,24 @@ const isMemberExpressionBrowser = (path) => {
     return !currentOpenBracketCount && !currentOpenParensCount;
 };
 const isMemberExpressionNode = (path, context) => {
-    try {
-        let ret = parser.parseExpression(path, {
-            plugins: [...context.expressionPlugins, ...shared.babelParserDefaultPlugins]
-        });
-        if (ret.type === 'TSAsExpression' || ret.type === 'TSTypeAssertion') {
-            ret = ret.expression;
+        try {
+            let ret = parser.parseExpression(path, {
+                plugins: context.expressionPlugins
+            });
+            if (ret.type === 'TSAsExpression' || ret.type === 'TSTypeAssertion') {
+                ret = ret.expression;
+            }
+            return (ret.type === 'MemberExpression' ||
+                ret.type === 'OptionalMemberExpression' ||
+                ret.type === 'Identifier');
         }
-        return (ret.type === 'MemberExpression' ||
-            ret.type === 'OptionalMemberExpression' ||
-            ret.type === 'Identifier');
-    }
-    catch (e) {
-        return false;
-    }
-};
+        catch (e) {
+            return false;
+        }
+    };
 const isMemberExpression = isMemberExpressionNode;
 function getInnerRange(loc, offset, length) {
-    const source = loc.source.substr(offset, length);
+    const source = loc.source.slice(offset, offset + length);
     const newLoc = {
         source,
         start: advancePositionWithClone(loc.start, loc.source, offset),
@@ -1359,10 +1359,10 @@ function parseAttribute(context, nameSet) {
                 isStatic = false;
                 if (!content.endsWith(']')) {
                     emitError(context, 27 /* X_MISSING_DYNAMIC_DIRECTIVE_ARGUMENT_END */);
-                    content = content.substr(1);
+                    content = content.slice(1);
                 }
                 else {
-                    content = content.substr(1, content.length - 2);
+                    content = content.slice(1, content.length - 1);
                 }
             }
             else if (isSlot) {
@@ -1388,7 +1388,7 @@ function parseAttribute(context, nameSet) {
             valueLoc.end = advancePositionWithClone(valueLoc.start, value.content);
             valueLoc.source = valueLoc.source.slice(1, -1);
         }
-        const modifiers = match[3] ? match[3].substr(1).split('.') : [];
+        const modifiers = match[3] ? match[3].slice(1).split('.') : [];
         if (isPropShorthand)
             modifiers.push('prop');
         // 2.x compat v-bind:foo.sync -> v-model:foo
@@ -1606,7 +1606,7 @@ function isEnd(context, mode, ancestors) {
 }
 function startsWithEndTagOpen(source, tag) {
     return (startsWith(source, '</') &&
-        source.substr(2, tag.length).toLowerCase() === tag.toLowerCase() &&
+        source.slice(2, 2 + tag.length).toLowerCase() === tag.toLowerCase() &&
         /[\t\r\n\f />]/.test(source[2 + tag.length] || '>'));
 }
 
@@ -3371,12 +3371,19 @@ asRawStatements = false, localVars = Object.create(context.identifiers)) {
                 // it gets correct type
                 return `__props.${raw}`;
             }
+            else if (type === "props-aliased" /* PROPS_ALIASED */) {
+                // prop with a different local alias (from defineProps() destructure)
+                return `__props.${bindingMetadata.__propsAliases[raw]}`;
+            }
         }
         else {
             if (type && type.startsWith('setup')) {
                 // setup bindings in non-inline mode
                 return `$setup.${raw}`;
             }
+            else if (type === "props-aliased" /* PROPS_ALIASED */) {
+                return `$props.${bindingMetadata.__propsAliases[raw]}`;
+            }
             else if (type) {
                 return `$${type}.${raw}`;
             }
@@ -3421,7 +3428,7 @@ asRawStatements = false, localVars = Object.create(context.identifiers)) {
         : `(${rawExp})${asParams ? `=>{}` : ``}`;
     try {
         ast = parser.parse(source, {
-            plugins: [...context.expressionPlugins, ...shared.babelParserDefaultPlugins]
+            plugins: context.expressionPlugins
         }).program;
     }
     catch (e) {
@@ -3737,7 +3744,9 @@ const transformFor = createStructuralDirectiveTransform('for', (node, dir, conte
                 ? createSimpleExpression(keyProp.value.content, true)
                 : keyProp.exp);
         const keyProperty = keyProp ? createObjectProperty(`key`, keyExp) : null;
-        if (context.prefixIdentifiers && keyProperty) {
+        if (context.prefixIdentifiers &&
+            keyProperty &&
+            keyProp.type !== 6 /* ATTRIBUTE */) {
             // #2085 process :key expression needs to be processed in order for it
             // to behave consistently for <template v-for> and <div v-for>.
             // In the case of `<template v-for>`, the node is discarded and never

package/dist/compiler-core.d.ts

@@ -52,6 +52,7 @@ export declare type BindingMetadata = {
     [key: string]: BindingTypes | undefined;
 } & {
     __isScriptSetup?: boolean;
+    __propsAliases?: Record<string, string>;
 };
 
 export declare const enum BindingTypes {
@@ -63,6 +64,11 @@ export declare const enum BindingTypes {
      * declared as a prop
      */
     PROPS = "props",
+    /**
+     * a local alias of a `<script setup>` destructured prop.
+     * the original is stored in __propsAliases of the bindingMetadata object.
+     */
+    PROPS_ALIASED = "props-aliased",
     /**
      * a let binding (may or may not be a ref)
      */
@@ -520,7 +526,7 @@ export { generateCodeFrame }
 
 export declare function getBaseTransformPreset(prefixIdentifiers?: boolean): TransformPreset;
 
-export declare function getInnerRange(loc: SourceLocation, offset: number, length?: number): SourceLocation;
+export declare function getInnerRange(loc: SourceLocation, offset: number, length: number): SourceLocation;
 
 export declare function getMemoedVNodeCall(node: BlockCodegenNode | MemoExpression): VNodeCall | RenderSlotCall;
 

package/dist/compiler-core.esm-bundler.js

@@ -1,6 +1,5 @@
-import { isString, hyphenate, babelParserDefaultPlugins, extend, isObject, NO, isArray, makeMap, isSymbol, NOOP, EMPTY_OBJ, capitalize, camelize as camelize$1, PatchFlagNames, slotFlagsText, isOn, isReservedProp, toHandlerKey } from '@vue/shared';
+import { isString, hyphenate, NOOP, extend, isObject, NO, isArray, makeMap, isSymbol, EMPTY_OBJ, capitalize, camelize as camelize$1, PatchFlagNames, slotFlagsText, isOn, isReservedProp, toHandlerKey } from '@vue/shared';
 export { generateCodeFrame } from '@vue/shared';
-import { parseExpression } from '@babel/parser';
 
 function defaultOnError(error) {
     throw error;
@@ -447,26 +446,12 @@ const isMemberExpressionBrowser = (path) => {
     }
     return !currentOpenBracketCount && !currentOpenParensCount;
 };
-const isMemberExpressionNode = (path, context) => {
-    try {
-        let ret = parseExpression(path, {
-            plugins: [...context.expressionPlugins, ...babelParserDefaultPlugins]
-        });
-        if (ret.type === 'TSAsExpression' || ret.type === 'TSTypeAssertion') {
-            ret = ret.expression;
-        }
-        return (ret.type === 'MemberExpression' ||
-            ret.type === 'OptionalMemberExpression' ||
-            ret.type === 'Identifier');
-    }
-    catch (e) {
-        return false;
-    }
-};
+const isMemberExpressionNode = NOOP
+    ;
 const isMemberExpression = isMemberExpressionBrowser
     ;
 function getInnerRange(loc, offset, length) {
-    const source = loc.source.substr(offset, length);
+    const source = loc.source.slice(offset, offset + length);
     const newLoc = {
         source,
         start: advancePositionWithClone(loc.start, loc.source, offset),
@@ -1383,10 +1368,10 @@ function parseAttribute(context, nameSet) {
                 isStatic = false;
                 if (!content.endsWith(']')) {
                     emitError(context, 27 /* X_MISSING_DYNAMIC_DIRECTIVE_ARGUMENT_END */);
-                    content = content.substr(1);
+                    content = content.slice(1);
                 }
                 else {
-                    content = content.substr(1, content.length - 2);
+                    content = content.slice(1, content.length - 1);
                 }
             }
             else if (isSlot) {
@@ -1412,7 +1397,7 @@ function parseAttribute(context, nameSet) {
             valueLoc.end = advancePositionWithClone(valueLoc.start, value.content);
             valueLoc.source = valueLoc.source.slice(1, -1);
         }
-        const modifiers = match[3] ? match[3].substr(1).split('.') : [];
+        const modifiers = match[3] ? match[3].slice(1).split('.') : [];
         if (isPropShorthand)
             modifiers.push('prop');
         // 2.x compat v-bind:foo.sync -> v-model:foo
@@ -1633,7 +1618,7 @@ function isEnd(context, mode, ancestors) {
 }
 function startsWithEndTagOpen(source, tag) {
     return (startsWith(source, '</') &&
-        source.substr(2, tag.length).toLowerCase() === tag.toLowerCase() &&
+        source.slice(2, 2 + tag.length).toLowerCase() === tag.toLowerCase() &&
         /[\t\r\n\f />]/.test(source[2 + tag.length] || '>'));
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vue/compiler-core",
-  "version": "3.2.16",
+  "version": "3.2.20",
   "description": "@vue/compiler-core",
   "main": "index.js",
   "module": "dist/compiler-core.esm-bundler.js",
@@ -32,7 +32,7 @@
   },
   "homepage": "https://github.com/vuejs/vue-next/tree/master/packages/compiler-core#readme",
   "dependencies": {
-    "@vue/shared": "3.2.16",
+    "@vue/shared": "3.2.20",
     "@babel/parser": "^7.15.0",
     "estree-walker": "^2.0.2",
     "source-map": "^0.6.1"