@vue/language-core 3.2.0 → 3.2.2

package/lib/codegen/names.d.ts

@@ -20,7 +20,6 @@ export declare const TemplateRefs = "__VLS_TemplateRefs";
 export declare const RootEl = "__VLS_RootEl";
 export declare const ModelEmit = "__VLS_ModelEmit";
 export declare const EmitProps = "__VLS_EmitProps";
-export declare const InternalProps = "__VLS_InternalProps";
 export declare const Emit = "__VLS_Emit";
 export declare const SetupExposed = "__VLS_SetupExposed";
 export declare const PublicProps = "__VLS_PublicProps";

package/lib/codegen/names.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.StyleModules = exports.PublicProps = exports.SetupExposed = exports.Emit = exports.InternalProps = exports.EmitProps = exports.ModelEmit = exports.RootEl = exports.TemplateRefs = exports.InheritedAttrs = exports.Slots = exports.Props = exports.ModelProps = exports._export = exports.intrinsics = exports.directives = exports.components = exports.setup = exports.exposed = exports.emit = exports.modelEmit = exports.defaultModels = exports.defaults = exports.props = exports.slots = exports.dollars = exports.ctx = void 0;
+exports.StyleModules = exports.PublicProps = exports.SetupExposed = exports.Emit = exports.EmitProps = exports.ModelEmit = exports.RootEl = exports.TemplateRefs = exports.InheritedAttrs = exports.Slots = exports.Props = exports.ModelProps = exports._export = exports.intrinsics = exports.directives = exports.components = exports.setup = exports.exposed = exports.emit = exports.modelEmit = exports.defaultModels = exports.defaults = exports.props = exports.slots = exports.dollars = exports.ctx = void 0;
 exports.ctx = '__VLS_ctx';
 exports.dollars = '__VLS_dollars';
 exports.slots = '__VLS_slots';
@@ -23,7 +23,6 @@ exports.TemplateRefs = '__VLS_TemplateRefs';
 exports.RootEl = '__VLS_RootEl';
 exports.ModelEmit = '__VLS_ModelEmit';
 exports.EmitProps = '__VLS_EmitProps';
-exports.InternalProps = '__VLS_InternalProps';
 exports.Emit = '__VLS_Emit';
 exports.SetupExposed = '__VLS_SetupExposed';
 exports.PublicProps = '__VLS_PublicProps';

package/lib/codegen/script/template.js

@@ -84,9 +84,8 @@ function* generateTemplateCtx({ vueCompilerOptions, templateAndStyleTypes, scrip
         propTypes.push(names.EmitProps);
     }
     if (propTypes.length) {
-        yield `type ${names.InternalProps} = ${propTypes.join(` & `)}${utils_1.endOfLine}`;
-        exps.push([`{} as { $props: ${names.InternalProps} }`]);
-        exps.push([`{} as ${names.InternalProps}`]);
+        exps.push([`{} as { $props: ${propTypes.join(` & `)} }`]);
+        exps.push([`{} as ${propTypes.join(` & `)}`]);
     }
     if (ctx.generatedTypes.has(names.SetupExposed)) {
         exps.push([`{} as ${names.SetupExposed}`]);

package/lib/codegen/template/element.js

@@ -58,6 +58,7 @@ function* generateComponent(options, ctx, node) {
     let { tag, props } = node;
     let [startTagOffset, endTagOffset] = (0, shared_2.getElementTagOffsets)(node, options.template);
     let isExpression = false;
+    let isIsShorthand = false;
     if (tag.includes('.')) {
         isExpression = true;
     }
@@ -67,7 +68,8 @@ function* generateComponent(options, ctx, node) {
                 && prop.name === 'bind'
                 && prop.arg?.loc.source === 'is'
                 && prop.exp?.type === CompilerDOM.NodeTypes.SIMPLE_EXPRESSION) {
-                if (prop.arg.loc.end.offset === prop.exp.loc.end.offset) {
+                isIsShorthand = prop.arg.loc.end.offset === prop.exp.loc.end.offset;
+                if (isIsShorthand) {
                     ctx.inlayHints.push((0, inlayHints_1.createVBindShorthandInlayHintInfo)(prop.exp.loc, 'is'));
                 }
                 isExpression = true;
@@ -82,7 +84,9 @@ function* generateComponent(options, ctx, node) {
     const componentVar = ctx.getInternalVariable();
     if (isExpression) {
         yield `const ${componentVar} = `;
-        yield* (0, interpolation_1.generateInterpolation)(options, ctx, options.template, codeFeatures_1.codeFeatures.all, tag, startTagOffset, `(`, `)`);
+        yield* (0, interpolation_1.generateInterpolation)(options, ctx, options.template, isIsShorthand
+            ? codeFeatures_1.codeFeatures.withoutHighlightAndCompletion
+            : codeFeatures_1.codeFeatures.all, tag, startTagOffset, `(`, `)`);
         if (endTagOffset !== undefined) {
             yield ` || `;
             yield* (0, interpolation_1.generateInterpolation)(options, ctx, options.template, codeFeatures_1.codeFeatures.withoutCompletion, tag, endTagOffset, `(`, `)`);
@@ -266,18 +270,9 @@ function* generateStyleScopedClassReferences({ template, typescript: ts }, node)
         if (prop.type === CompilerDOM.NodeTypes.ATTRIBUTE
             && prop.name === 'class'
             && prop.value) {
-            if (template.lang === 'pug') {
-                const getClassOffset = Reflect.get(prop.value.loc.start, 'getClassOffset');
-                const content = prop.value.loc.source.slice(1, -1);
-                for (const [className, pos] of forEachClassName(content)) {
-                    yield* (0, styleScopedClasses_1.generateStyleScopedClassReference)(template, className, getClassOffset(pos + 1));
-                }
-            }
-            else {
-                const [text, start] = (0, shared_2.normalizeAttributeValue)(prop.value);
-                for (const [className, offset] of forEachClassName(text)) {
-                    yield* (0, styleScopedClasses_1.generateStyleScopedClassReference)(template, className, start + offset);
-                }
+            const [text, start] = (0, shared_2.normalizeAttributeValue)(prop.value);
+            for (const [className, offset] of forEachClassName(text)) {
+                yield* (0, styleScopedClasses_1.generateStyleScopedClassReference)(template, className, start + offset);
             }
         }
         else if (prop.type === CompilerDOM.NodeTypes.DIRECTIVE

package/lib/codegen/template/elementProps.js

@@ -154,7 +154,16 @@ function* generateElementProps(options, ctx, node, props, strictPropsCheck, fail
                 yield `...{ `;
             }
             const token = yield* (0, boundary_1.startBoundary)('template', prop.loc.start.offset, codeFeatures_1.codeFeatures.verification);
-            yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, prop.name, prop.loc.start.offset, features, shouldCamelize);
+            const prefix = options.template.content.slice(prop.loc.start.offset, prop.loc.start.offset + 1);
+            if (prefix === '.' || prefix === '#') {
+                // Pug shorthand syntax
+                for (const char of prop.name) {
+                    yield [char, 'template', prop.loc.start.offset, features];
+                }
+            }
+            else {
+                yield* (0, objectProperty_1.generateObjectProperty)(options, ctx, prop.name, prop.loc.start.offset, features, shouldCamelize);
+            }
             yield `: `;
             if (prop.name === 'style') {
                 yield `{}`;

package/lib/codegen/template/slotOutlet.js

@@ -121,7 +121,9 @@ function* generateSlotOutlet(options, ctx, node) {
             }
             const expVar = ctx.getInternalVariable();
             yield `var ${expVar} = __VLS_tryAsConstant(`;
-            yield* (0, interpolation_1.generateInterpolation)(options, ctx, options.template, codeFeatures_1.codeFeatures.all, nameProp.exp.content, nameProp.exp.loc.start.offset);
+            yield* (0, interpolation_1.generateInterpolation)(options, ctx, options.template, isShortHand
+                ? codeFeatures_1.codeFeatures.withoutHighlightAndCompletion
+                : codeFeatures_1.codeFeatures.all, nameProp.exp.content, nameProp.exp.loc.start.offset);
             yield `)${utils_1.endOfLine}`;
             ctx.dynamicSlots.push({
                 expVar: ctx.getHoistVariable(expVar),

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "3.2.0",
+	"version": "3.2.2",
 	"license": "MIT",
 	"files": [
 		"**/*.js",
@@ -28,5 +28,5 @@
 		"@volar/typescript": "2.4.27",
 		"@vue/compiler-sfc": "^3.5.0"
 	},
-	"gitHead": "3138110d767d3d6110899bc46518b53c4b456271"
+	"gitHead": "17394f4e80c2267e8b7159468ab40c948ea37d65"
 }

package/types/template-helpers.d.ts

@@ -108,7 +108,7 @@ declare global {
 
 	function __VLS_vFor<T>(source: T): T extends number ? [number, number][]
 		: T extends string ? [string, number][]
-		: T extends any[] ? [T[number], number][]
+		: T extends (infer U)[] ? [U, number][]
 		: T extends Iterable<infer V> ? [V, number][]
 		: [T[keyof T], `${keyof T & (string | number)}`, number][];
 	function __VLS_vSlot<S, D extends S>(slot: S, decl?: D): D extends (...args: infer P) => any ? P : any[];