@vue/language-core 2.0.18 → 2.0.19

package/lib/codegen/template/element.js

@@ -157,7 +157,7 @@ function* generateComponent(options, ctx, node, currentComponent, componentCtxVa
     componentCtxVar = var_defineComponentCtx;
     currentComponent = node;
     for (const failedExp of propsFailedExps) {
-        yield* (0, interpolation_1.generateInterpolation)(options, ctx, failedExp.loc.source, failedExp.loc, failedExp.loc.start.offset, ctx.codeFeatures.all, '(', ')');
+        yield* (0, interpolation_1.generateInterpolation)(options, ctx, failedExp.node.loc.source, failedExp.node.loc, failedExp.node.loc.start.offset, ctx.codeFeatures.all, failedExp.prefix, failedExp.suffix);
         yield common_1.endOfLine;
     }
     yield* generateVScope(options, ctx, node, props);
@@ -195,7 +195,7 @@ function* generateElement(options, ctx, node, currentComponent, componentCtxVar)
     yield* (0, common_1.wrapWith)(startTagOffset, startTagOffset + node.tag.length, ctx.codeFeatures.verification, `{`, ...(0, elementProps_1.generateElementProps)(options, ctx, node, node.props, true, propsFailedExps), `}`);
     yield `)${common_1.endOfLine}`;
     for (const failedExp of propsFailedExps) {
-        yield* (0, interpolation_1.generateInterpolation)(options, ctx, failedExp.loc.source, failedExp.loc, failedExp.loc.start.offset, ctx.codeFeatures.all, '(', ')');
+        yield* (0, interpolation_1.generateInterpolation)(options, ctx, failedExp.node.loc.source, failedExp.node.loc, failedExp.node.loc.start.offset, ctx.codeFeatures.all, failedExp.prefix, failedExp.suffix);
         yield common_1.endOfLine;
     }
     yield* generateVScope(options, ctx, node, node.props);

package/lib/codegen/template/elementEvents.js

@@ -51,14 +51,6 @@ function* generateElementEvents(options, ctx, node, componentVar, componentInsta
             yield* generateEventExpression(options, ctx, prop);
             yield `}${common_1.endOfLine}`;
         }
-        else if (prop.type === CompilerDOM.NodeTypes.DIRECTIVE
-            && prop.name === 'on'
-            && prop.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
-            // for vue 2 nameless event
-            // https://github.com/johnsoncodehk/vue-tsc/issues/67
-            yield* (0, interpolation_1.generateInterpolation)(options, ctx, prop.exp.content, prop.exp.loc, prop.exp.loc.start.offset, ctx.codeFeatures.all, '$event => {(', ')}');
-            yield common_1.endOfLine;
-        }
     }
     return usedComponentEventsVar;
 }
@@ -104,7 +96,7 @@ function* generateEventExpression(options, ctx, prop) {
         const ast = (0, common_1.createTsAst)(options.ts, prop.exp, prop.exp.content);
         const _isCompoundExpression = isCompoundExpression(options.ts, ast);
         if (_isCompoundExpression) {
-            yield `$event => {${common_1.newLine}`;
+            yield `(...[$event]) => {${common_1.newLine}`;
             ctx.addLocalVariable('$event');
             prefix = '';
             suffix = '';

package/lib/codegen/template/elementProps.d.ts

@@ -2,4 +2,8 @@ import * as CompilerDOM from '@vue/compiler-dom';
 import type { Code } from '../../types';
 import type { TemplateCodegenContext } from './context';
 import type { TemplateCodegenOptions } from './index';
-export declare function generateElementProps(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, node: CompilerDOM.ElementNode, props: CompilerDOM.ElementNode['props'], enableCodeFeatures: boolean, propsFailedExps?: CompilerDOM.SimpleExpressionNode[]): Generator<Code>;
+export declare function generateElementProps(options: TemplateCodegenOptions, ctx: TemplateCodegenContext, node: CompilerDOM.ElementNode, props: CompilerDOM.ElementNode['props'], enableCodeFeatures: boolean, propsFailedExps?: {
+    node: CompilerDOM.SimpleExpressionNode;
+    prefix: string;
+    suffix: string;
+}[]): Generator<Code>;

package/lib/codegen/template/elementProps.js

@@ -31,22 +31,23 @@ function* generateElementProps(options, ctx, node, props, enableCodeFeatures, pr
                     yield `...{ '${(0, shared_1.camelize)('on-' + prop.arg.loc.source)}': {} as any }, `;
                 }
             }
-            else {
-                if (prop.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION
-                    && prop.arg.loc.source.startsWith('[')
-                    && prop.arg.loc.source.endsWith(']')) {
-                    propsFailedExps?.push(prop.arg);
-                }
-                if (prop.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
-                    propsFailedExps?.push(prop.exp);
-                }
+            else if (prop.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION
+                && prop.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION
+                && prop.arg.loc.source.startsWith('[')
+                && prop.arg.loc.source.endsWith(']')) {
+                propsFailedExps?.push({ node: prop.arg, prefix: '(', suffix: ')' });
+                propsFailedExps?.push({ node: prop.exp, prefix: '() => {', suffix: '}' });
+            }
+            else if (!prop.arg
+                && prop.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
+                propsFailedExps?.push({ node: prop.exp, prefix: '(', suffix: ')' });
             }
         }
     }
     for (const prop of props) {
         if (prop.type === CompilerDOM.NodeTypes.DIRECTIVE
-            && (prop.name === 'bind' || prop.name === 'model')
-            && (prop.name === 'model' || prop.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION)
+            && ((prop.name === 'bind' && prop.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION)
+                || prop.name === 'model')
             && (!prop.exp || prop.exp.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION)) {
             let propName;
             if (prop.arg?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
@@ -60,7 +61,7 @@ function* generateElementProps(options, ctx, node, props, enableCodeFeatures, pr
             if (propName === undefined
                 || options.vueCompilerOptions.dataAttributes.some(pattern => (0, minimatch_1.minimatch)(propName, pattern))) {
                 if (prop.exp && prop.exp.constType !== CompilerDOM.ConstantTypes.CAN_STRINGIFY) {
-                    propsFailedExps?.push(prop.exp);
+                    propsFailedExps?.push({ node: prop.exp, prefix: '(', suffix: ')' });
                 }
                 continue;
             }

package/lib/codegen/template/index.d.ts

@@ -15,4 +15,3 @@ export interface TemplateCodegenOptions {
 }
 export declare function generateTemplate(options: TemplateCodegenOptions): Generator<Code, TemplateCodegenContext>;
 export declare function forEachElementNode(node: CompilerDOM.RootNode | CompilerDOM.TemplateChildNode): Generator<CompilerDOM.ElementNode>;
-export declare function isFragment(node: CompilerDOM.IfNode | CompilerDOM.ForNode): boolean | undefined;

package/lib/codegen/template/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isFragment = exports.forEachElementNode = exports.generateTemplate = void 0;
+exports.forEachElementNode = exports.generateTemplate = void 0;
 const CompilerDOM = require("@vue/compiler-dom");
 const common_1 = require("../common");
 const context_1 = require("./context");
@@ -138,8 +138,4 @@ function* forEachElementNode(node) {
     }
 }
 exports.forEachElementNode = forEachElementNode;
-function isFragment(node) {
-    return node.codegenNode && 'consequent' in node.codegenNode && 'tag' in node.codegenNode.consequent && node.codegenNode.consequent.tag === CompilerDOM.FRAGMENT;
-}
-exports.isFragment = isFragment;
 //# sourceMappingURL=index.js.map

package/lib/codegen/template/vFor.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.parseVForNode = exports.generateVFor = void 0;
 const CompilerDOM = require("@vue/compiler-dom");
 const common_1 = require("../common");
-const index_1 = require("./index");
 const interpolation_1 = require("./interpolation");
 const templateChild_1 = require("./templateChild");
 function* generateVFor(options, ctx, node, currentComponent, componentCtxVar) {
@@ -34,17 +33,25 @@ function* generateVFor(options, ctx, node, currentComponent, componentCtxVar) {
     for (const varName of forBlockVars) {
         ctx.addLocalVariable(varName);
     }
+    let isFragment = true;
     for (const argument of node.codegenNode?.children.arguments ?? []) {
         if (argument.type === CompilerDOM.NodeTypes.JS_FUNCTION_EXPRESSION
             && argument.returns.type === CompilerDOM.NodeTypes.VNODE_CALL
             && argument.returns.props?.type === CompilerDOM.NodeTypes.JS_OBJECT_EXPRESSION) {
+            if (argument.returns.tag !== CompilerDOM.FRAGMENT) {
+                isFragment = false;
+                continue;
+            }
             for (const prop of argument.returns.props.properties) {
-                yield* (0, interpolation_1.generateInterpolation)(options, ctx, prop.value.loc.source, prop.value.loc, prop.value.loc.start.offset, ctx.codeFeatures.all, '(', ')');
-                yield common_1.endOfLine;
+                if (prop.value.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION
+                    && !prop.value.isStatic) {
+                    yield* (0, interpolation_1.generateInterpolation)(options, ctx, prop.value.content, prop.value.loc, prop.value.loc.start.offset, ctx.codeFeatures.all, '(', ')');
+                    yield common_1.endOfLine;
+                }
             }
         }
     }
-    if ((0, index_1.isFragment)(node)) {
+    if (isFragment) {
         yield* ctx.resetDirectiveComments('end of v-for start');
     }
     let prev;

package/lib/codegen/template/vIf.js

@@ -4,7 +4,6 @@ exports.generateVIf = void 0;
 const language_core_1 = require("@volar/language-core");
 const CompilerDOM = require("@vue/compiler-dom");
 const common_1 = require("../common");
-const index_1 = require("./index");
 const interpolation_1 = require("./interpolation");
 const templateChild_1 = require("./templateChild");
 function* generateVIf(options, ctx, node, currentComponent, componentCtxVar) {
@@ -33,7 +32,7 @@ function* generateVIf(options, ctx, node, currentComponent, componentCtxVar) {
             yield ` `;
         }
         yield `{${common_1.newLine}`;
-        if ((0, index_1.isFragment)(node)) {
+        if (isFragment(node)) {
             yield* ctx.resetDirectiveComments('end of v-if start');
         }
         let prev;
@@ -50,4 +49,10 @@ function* generateVIf(options, ctx, node, currentComponent, componentCtxVar) {
     ctx.blockConditions.length = originalBlockConditionsLength;
 }
 exports.generateVIf = generateVIf;
+function isFragment(node) {
+    return node.codegenNode
+        && 'consequent' in node.codegenNode
+        && 'tag' in node.codegenNode.consequent
+        && node.codegenNode.consequent.tag === CompilerDOM.FRAGMENT;
+}
 //# sourceMappingURL=vIf.js.map

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "2.0.18",
+	"version": "2.0.19",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -34,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "7aac2805f03b17e4c624335f509d502002bb75a8"
+	"gitHead": "a9fae154ad1efc4359866cfd10251d53e4b0faed"
 }