@vue/language-core 1.7.11 → 1.7.12

package/out/generators/template.js

@@ -58,6 +58,7 @@ const transformContext = {
     expressionPlugins: ['typescript'],
 };
 function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourceLang, sfc, hasScriptSetupSlots, codegenStack) {
+    const nativeTags = new Set(vueCompilerOptions.nativeTags);
     const [codes, codeStacks] = codegenStack ? muggle.track([]) : [[], []];
     const [formatCodes, formatCodeStacks] = codegenStack ? muggle.track([]) : [[], []];
     const [cssCodes, cssCodeStacks] = codegenStack ? muggle.track([]) : [[], []];
@@ -144,25 +145,24 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
     }
     function generateComponentVars() {
         const data = {};
-        codes.push(`let __VLS_templateComponents!: __VLS_IntrinsicElements\n`);
+        codes.push(`let __VLS_templateComponents!: {}\n`);
         for (const tagName in tagNames) {
+            if (nativeTags.has(tagName))
+                continue;
             const isNamespacedTag = tagName.indexOf('.') >= 0;
             if (isNamespacedTag)
                 continue;
-            const varName = validTsVar.test(tagName) ? tagName : (0, shared_1.capitalize)((0, shared_1.camelize)(tagName.replace(/:/g, '-')));
-            codes.push(`& __VLS_WithComponent<'${varName}', typeof __VLS_components, `, 
+            const validName = validTsVar.test(tagName) ? tagName : (0, shared_1.capitalize)((0, shared_1.camelize)(tagName.replace(/:/g, '-')));
+            codes.push(`& __VLS_WithComponent<'${validName}', typeof __VLS_components, `, 
             // order is important: https://github.com/vuejs/language-tools/issues/2010
             `"${(0, shared_1.capitalize)((0, shared_1.camelize)(tagName))}", `, `"${(0, shared_1.camelize)(tagName)}", `, `"${tagName}"`, '>\n');
-            data[tagName] = varName;
+            data[tagName] = validName;
         }
         codes.push(`;\n`);
         for (const tagName in tagNames) {
-            const varName = data[tagName];
-            if (!varName)
-                continue;
             const tagOffsets = tagNames[tagName];
             const tagRanges = tagOffsets.map(offset => [offset, offset + tagName.length]);
-            const names = new Set([
+            const names = new Set(nativeTags.has(tagName) ? [tagName] : [
                 // order is important: https://github.com/vuejs/language-tools/issues/2010
                 (0, shared_1.capitalize)((0, shared_1.camelize)(tagName)),
                 (0, shared_1.camelize)(tagName),
@@ -170,7 +170,7 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
             ]);
             for (const name of names) {
                 for (const tagRange of tagRanges) {
-                    codes.push(name === tagName ? '__VLS_templateComponents' : '__VLS_components', ...createPropertyAccessCode([
+                    codes.push(nativeTags.has(tagName) ? '({} as __VLS_IntrinsicElements)' : '__VLS_components', ...createPropertyAccessCode([
                         name,
                         'template',
                         tagRange,
@@ -185,23 +185,26 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                 }
             }
             codes.push('\n');
-            codes.push('// @ts-ignore\n', // #2304
-            '[');
-            for (const tagRange of tagRanges) {
-                codes.push([
-                    varName,
-                    'template',
-                    tagRange,
-                    {
-                        completion: {
-                            additional: true,
-                            autoImportOnly: true,
+            const validName = data[tagName];
+            if (validName) {
+                codes.push('// @ts-ignore\n', // #2304
+                '[');
+                for (const tagRange of tagRanges) {
+                    codes.push([
+                        validName,
+                        'template',
+                        tagRange,
+                        {
+                            completion: {
+                                additional: true,
+                                autoImportOnly: true,
+                            },
                         },
-                    },
-                ]);
-                codes.push(',');
+                    ]);
+                    codes.push(',');
+                }
+                codes.push(`];\n`);
             }
-            codes.push(`];\n`);
         }
         return data;
     }
@@ -474,7 +477,16 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                 }
             }
         }
-        if (isNamespacedTag) {
+        const isIntrinsicElement = nativeTags.has(tag) && tagOffsets.length;
+        if (isIntrinsicElement) {
+            codes.push('const ', var_originalComponent, ` = ({} as __VLS_IntrinsicElements)[`, ...createStringLiteralKeyCode([
+                tag,
+                'template',
+                tagOffsets[0],
+                capabilitiesPresets.diagnosticOnly,
+            ]), '];\n');
+        }
+        else if (isNamespacedTag) {
             codes.push(`const ${var_originalComponent} = `, ...createInterpolationCode(tag, node.loc, startTagOffset, capabilitiesPresets.all, '', ''), ';\n');
         }
         else if (dynamicTagExp) {
@@ -486,7 +498,14 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
         else {
             codes.push(`const ${var_originalComponent} = {} as any;\n`);
         }
-        codes.push(`const ${var_functionalComponent} = __VLS_asFunctionalComponent(`, `${var_originalComponent}, `, `new ${var_originalComponent}({`, ...createPropsCode(node, props, 'extraReferences'), '}));\n');
+        codes.push(`const ${var_functionalComponent} = __VLS_asFunctionalComponent(`, `${var_originalComponent}, `);
+        if (isIntrinsicElement) {
+            codes.push('{}');
+        }
+        else {
+            codes.push(`new ${var_originalComponent}({`, ...createPropsCode(node, props, 'extraReferences'), '})');
+        }
+        codes.push(');\n');
         for (const offset of tagOffsets) {
             if (isNamespacedTag) {
                 continue;
@@ -495,7 +514,10 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                 continue;
             }
             else {
-                if (componentVars[tag]) {
+                if (isIntrinsicElement) {
+                    codes.push(`({} as __VLS_IntrinsicElements).`);
+                }
+                else {
                     codes.push(`__VLS_templateComponents.`);
                 }
                 codes.push([
@@ -661,9 +683,11 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                     {
                         ...capabilitiesPresets.attrReference,
                         rename: {
+                            // @click-outside -> onClickOutside
                             normalize(newName) {
                                 return (0, shared_1.camelize)('on-' + newName);
                             },
+                            // onClickOutside -> @click-outside
                             apply(newName) {
                                 const hName = (0, shared_1.hyphenate)(newName);
                                 if ((0, shared_1.hyphenate)(newName).startsWith('on-')) {
@@ -805,14 +829,12 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                     }
                     continue;
                 }
-                const isStatic = !prop.arg || (prop.arg.type === 4 /* CompilerDOM.NodeTypes.SIMPLE_EXPRESSION */ && prop.arg.isStatic);
-                const propName = isStatic
+                let camelized = false;
+                if ((!prop.arg || (prop.arg.type === 4 /* CompilerDOM.NodeTypes.SIMPLE_EXPRESSION */ && prop.arg.isStatic)) // isStatic
                     && (0, shared_1.hyphenate)(attrNameText) === attrNameText
-                    && !vueCompilerOptions.htmlAttributes.some(pattern => (0, minimatch_1.minimatch)(attrNameText, pattern))
-                    ? (0, shared_1.camelize)(attrNameText)
-                    : attrNameText;
-                if (vueCompilerOptions.strictTemplates) {
-                    attrNameText = propName;
+                    && !vueCompilerOptions.htmlAttributes.some(pattern => (0, minimatch_1.minimatch)(attrNameText, pattern))) {
+                    attrNameText = (0, shared_1.camelize)(attrNameText);
+                    camelized = true;
                 }
                 // camelize name
                 codes.push([
@@ -831,28 +853,28 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                 }
                 else if (prop.exp?.constType === 3 /* CompilerDOM.ConstantTypes.CAN_STRINGIFY */) {
                     codes.push(...createObjectPropertyCode([
-                        propName,
+                        attrNameText,
                         'template',
                         [prop.arg.loc.start.offset, prop.arg.loc.start.offset + attrNameText.length],
                         {
                             ...caps_attr,
                             rename: {
                                 normalize: shared_1.camelize,
-                                apply: getRenameApply(attrNameText),
+                                apply: camelized ? shared_1.hyphenate : noEditApply,
                             },
                         },
                     ], prop.loc.name_2 ?? (prop.loc.name_2 = {})));
                 }
                 else {
                     codes.push(...createObjectPropertyCode([
-                        propName,
+                        attrNameText,
                         'template',
                         [prop.arg.loc.start.offset, prop.arg.loc.end.offset],
                         {
                             ...caps_attr,
                             rename: {
                                 normalize: shared_1.camelize,
-                                apply: getRenameApply(attrNameText),
+                                apply: camelized ? shared_1.hyphenate : noEditApply,
                             },
                         },
                     ], prop.loc.name_2 ?? (prop.loc.name_2 = {})));
@@ -875,30 +897,6 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                     caps_diagnosticOnly,
                 ]);
                 codes.push(', ');
-                // original name
-                if (prop.arg && attrNameText !== propName) {
-                    codes.push(...createObjectPropertyCode([
-                        attrNameText,
-                        'template',
-                        [prop.arg.loc.start.offset, prop.arg.loc.end.offset],
-                        {
-                            ...caps_attr,
-                            rename: {
-                                normalize: shared_1.camelize,
-                                apply: getRenameApply(attrNameText),
-                            },
-                        },
-                    ], prop.loc.name_1 ?? (prop.loc.name_1 = {})));
-                    codes.push(': (');
-                    if (prop.exp) {
-                        codes.push(...createInterpolationCode(prop.exp.loc.source, prop.exp.loc, undefined, undefined, '(', ')'));
-                    }
-                    else {
-                        codes.push('undefined');
-                    }
-                    codes.push(')');
-                    codes.push(', ');
-                }
             }
             else if (prop.type === 6 /* CompilerDOM.NodeTypes.ATTRIBUTE */) {
                 let attrNameText = prop.name;

package/out/types.d.ts

@@ -14,6 +14,7 @@ export interface VueCompilerOptions {
     jsxSlots: boolean;
     strictTemplates: boolean;
     skipTemplateCodegen: boolean;
+    nativeTags: string[];
     dataAttributes: string[];
     htmlAttributes: string[];
     optionsWrapper: [string, string] | [];

package/out/utils/directorySharedTypes.js

@@ -11,21 +11,17 @@ type __VLS_IntrinsicElements = __VLS_PickNotAny<import('vue/jsx-runtime').JSX.In
 type __VLS_Element = __VLS_PickNotAny<import('vue/jsx-runtime').JSX.Element, JSX.Element>;
 
 type __VLS_IsAny<T> = boolean extends (T extends never ? true : false) ? true : false;
-type __VLS_PickNotAny<A, B> = __VLS_IsAny<A> extends true ? B : A;
+type __VLS_PickNotAny<A, B> = __VLS_IsAny<A & {}> extends true ? B : A; // & {} for https://github.com/microsoft/TypeScript/issues/54630
 
 type __VLS_Prettify<T> = {
 	[K in keyof T]: T[K];
 } & {};
 
 type __VLS_GlobalComponents =
-	// @ts-ignore
 	__VLS_PickNotAny<import('vue').GlobalComponents, {}>
-	// @ts-ignore
 	& __VLS_PickNotAny<import('@vue/runtime-core').GlobalComponents, {}>
-	// @ts-ignore
 	& __VLS_PickNotAny<import('@vue/runtime-dom').GlobalComponents, {}>
 	& Pick<typeof import('${vueCompilerOptions.lib}'),
-		// @ts-ignore
 		'Transition'
 		| 'TransitionGroup'
 		| 'KeepAlive'

package/out/utils/ts.js

@@ -153,6 +153,27 @@ function getPartialVueCompilerOptions(ts, tsConfigSourceFile) {
         }
     }
 }
+// https://developer.mozilla.org/en-US/docs/Web/HTML/Element
+const HTML_TAGS = 'html,body,base,head,link,meta,style,title,address,article,aside,footer,' +
+    'header,hgroup,h1,h2,h3,h4,h5,h6,nav,section,div,dd,dl,dt,figcaption,' +
+    'figure,picture,hr,img,li,main,ol,p,pre,ul,a,b,abbr,bdi,bdo,br,cite,code,' +
+    'data,dfn,em,i,kbd,mark,q,rp,rt,ruby,s,samp,small,span,strong,sub,sup,' +
+    'time,u,var,wbr,area,audio,map,track,video,embed,object,param,source,' +
+    'canvas,script,noscript,del,ins,caption,col,colgroup,table,thead,tbody,td,' +
+    'th,tr,button,datalist,fieldset,form,input,label,legend,meter,optgroup,' +
+    'option,output,progress,select,textarea,details,dialog,menu,' +
+    'summary,template,blockquote,iframe,tfoot';
+// https://developer.mozilla.org/en-US/docs/Web/SVG/Element
+const SVG_TAGS = 'svg,animate,animateMotion,animateTransform,circle,clipPath,color-profile,' +
+    'defs,desc,discard,ellipse,feBlend,feColorMatrix,feComponentTransfer,' +
+    'feComposite,feConvolveMatrix,feDiffuseLighting,feDisplacementMap,' +
+    'feDistanceLight,feDropShadow,feFlood,feFuncA,feFuncB,feFuncG,feFuncR,' +
+    'feGaussianBlur,feImage,feMerge,feMergeNode,feMorphology,feOffset,' +
+    'fePointLight,feSpecularLighting,feSpotLight,feTile,feTurbulence,filter,' +
+    'foreignObject,g,hatch,hatchpath,image,line,linearGradient,marker,mask,' +
+    'mesh,meshgradient,meshpatch,meshrow,metadata,mpath,path,pattern,' +
+    'polygon,polyline,radialGradient,rect,set,solidcolor,stop,switch,symbol,' +
+    'text,textPath,title,tspan,unknown,use,view';
 function resolveVueCompilerOptions(vueOptions) {
     const target = vueOptions.target ?? 3.3;
     const lib = vueOptions.lib || (target < 2.7 ? '@vue/runtime-dom' : 'vue');
@@ -164,6 +185,14 @@ function resolveVueCompilerOptions(vueOptions) {
         jsxSlots: vueOptions.jsxSlots ?? false,
         strictTemplates: vueOptions.strictTemplates ?? false,
         skipTemplateCodegen: vueOptions.skipTemplateCodegen ?? false,
+        nativeTags: vueOptions.nativeTags ?? [...new Set([
+                ...HTML_TAGS.split(','),
+                ...SVG_TAGS.split(','),
+                // fix https://github.com/johnsoncodehk/volar/issues/1340
+                'hgroup',
+                'slot',
+                'component',
+            ])],
         dataAttributes: vueOptions.dataAttributes ?? [],
         htmlAttributes: vueOptions.htmlAttributes ?? ['aria-*'],
         optionsWrapper: vueOptions.optionsWrapper ?? (target >= 2.7

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "1.7.11",
+	"version": "1.7.12",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -34,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "8ed51477115bf67f73eb74653b2770e5d9d586f0"
+	"gitHead": "9e712c2d603c690cd03502f5ec1a99bd80b800ac"
 }