@vue/language-core 1.7.5 → 1.7.7

package/out/generators/template.js

@@ -71,9 +71,12 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
     const blockConditions = [];
     let hasSlot = false;
     let elementIndex = 0;
+    let ignoreStart;
+    let expectedErrorStart;
+    let expectedErrorNode;
     const componentVars = generateComponentVars();
     if (sfc.templateAst) {
-        visitNode(sfc.templateAst, undefined, undefined);
+        visitNode(sfc.templateAst, undefined, undefined, undefined);
     }
     generateStyleScopedClasses();
     if (!hasScriptSetupSlots) {
@@ -237,11 +240,80 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
         });
         return tagOffsetsMap;
     }
-    function visitNode(node, parentEl, componentCtxVar) {
+    function resolveComment() {
+        if (ignoreStart !== undefined) {
+            for (let i = ignoreStart; i < codes.length; i++) {
+                const code = codes[i];
+                if (typeof code === 'string') {
+                    continue;
+                }
+                const cap = code[3];
+                if (cap.diagnostic) {
+                    code[3] = {
+                        ...cap,
+                        diagnostic: false,
+                    };
+                }
+            }
+            ignoreStart = undefined;
+        }
+        if (expectedErrorStart !== undefined && expectedErrorStart !== codes.length && expectedErrorNode) {
+            let errors = 0;
+            const suppressError = () => {
+                errors++;
+                return false;
+            };
+            for (let i = expectedErrorStart; i < codes.length; i++) {
+                const code = codes[i];
+                if (typeof code === 'string') {
+                    continue;
+                }
+                const cap = code[3];
+                if (cap.diagnostic) {
+                    code[3] = {
+                        ...cap,
+                        diagnostic: {
+                            shouldReport: suppressError,
+                        },
+                    };
+                }
+            }
+            codes.push([
+                '// @ts-expect-error',
+                'template',
+                [expectedErrorNode.loc.start.offset, expectedErrorNode.loc.end.offset],
+                {
+                    diagnostic: {
+                        shouldReport: () => errors === 0,
+                    },
+                },
+            ], '\n{};\n');
+            expectedErrorStart = undefined;
+            expectedErrorNode = undefined;
+        }
+    }
+    function visitNode(node, parentEl, prevNode, componentCtxVar) {
+        resolveComment();
+        if (prevNode?.type === 3 /* CompilerDOM.NodeTypes.COMMENT */) {
+            const commentText = prevNode.content.trim();
+            if (commentText === '@vue-skip') {
+                return;
+            }
+            else if (commentText === '@vue-ignore') {
+                ignoreStart = codes.length;
+            }
+            else if (commentText === '@vue-expected-error') {
+                expectedErrorStart = codes.length;
+                expectedErrorNode = prevNode;
+            }
+        }
         if (node.type === 0 /* CompilerDOM.NodeTypes.ROOT */) {
+            let prev;
             for (const childNode of node.children) {
-                visitNode(childNode, parentEl, componentCtxVar);
+                visitNode(childNode, parentEl, prev, componentCtxVar);
+                prev = childNode;
             }
+            resolveComment();
         }
         else if (node.type === 1 /* CompilerDOM.NodeTypes.ELEMENT */) {
             const vForNode = getVForNode(node);
@@ -258,13 +330,13 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
         }
         else if (node.type === 12 /* CompilerDOM.NodeTypes.TEXT_CALL */) {
             // {{ var }}
-            visitNode(node.content, parentEl, componentCtxVar);
+            visitNode(node.content, parentEl, undefined, componentCtxVar);
         }
         else if (node.type === 8 /* CompilerDOM.NodeTypes.COMPOUND_EXPRESSION */) {
             // {{ ... }} {{ ... }}
             for (const childNode of node.children) {
                 if (typeof childNode === 'object') {
-                    visitNode(childNode, parentEl, componentCtxVar);
+                    visitNode(childNode, parentEl, undefined, componentCtxVar);
                 }
             }
         }
@@ -300,12 +372,6 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
         else if (node.type === 2 /* CompilerDOM.NodeTypes.TEXT */) {
             // not needed progress
         }
-        else if (node.type === 3 /* CompilerDOM.NodeTypes.COMMENT */) {
-            // not needed progress
-        }
-        else {
-            codes.push(`// Unprocessed node type: ${node.type} json: ${JSON.stringify(node.loc)}\n`);
-        }
     }
     function visitVIfNode(node, parentEl, componentCtxVar) {
         let originalBlockConditionsLength = blockConditions.length;
@@ -328,9 +394,12 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                 addedBlockCondition = true;
             }
             codes.push(` {\n`);
+            let prev;
             for (const childNode of branch.children) {
-                visitNode(childNode, parentEl, componentCtxVar);
+                visitNode(childNode, parentEl, prev, componentCtxVar);
+                prev = childNode;
             }
+            resolveComment();
             generateAutoImportCompletionCode();
             codes.push('}\n');
             if (addedBlockCondition) {
@@ -357,9 +426,12 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
         if (source.type === 4 /* CompilerDOM.NodeTypes.SIMPLE_EXPRESSION */) {
             codes.push('(', ...createInterpolationCode(source.content, source.loc, source.loc.start.offset, capabilitiesPresets.all, '(', ')'), '!)', // #3102
             ') {\n');
+            let prev;
             for (const childNode of node.children) {
-                visitNode(childNode, parentEl, componentCtxVar);
+                visitNode(childNode, parentEl, prev, componentCtxVar);
+                prev = childNode;
             }
+            resolveComment();
             generateAutoImportCompletionCode();
             codes.push('}\n');
             formatCodes.push(...createFormatCode(source.content, source.loc.start.offset, formatBrackets.normal));
@@ -543,9 +615,12 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
                 localVars[varName] ??= 0;
                 localVars[varName]++;
             });
+            let prev;
             for (const childNode of node.children) {
-                visitNode(childNode, parentEl, componentCtxVar);
+                visitNode(childNode, parentEl, prev, componentCtxVar);
+                prev = childNode;
             }
+            resolveComment();
             slotBlockVars.forEach(varName => {
                 localVars[varName]--;
             });
@@ -564,9 +639,12 @@ function generate(ts, compilerOptions, vueCompilerOptions, sourceTemplate, sourc
             codes.push(`}\n`);
         }
         else {
+            let prev;
             for (const childNode of node.children) {
-                visitNode(childNode, parentEl, componentCtxVar);
+                visitNode(childNode, parentEl, prev, componentCtxVar);
+                prev = childNode;
             }
+            resolveComment();
         }
         codes.push(`}\n`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@vue/language-core",
-	"version": "1.7.5",
+	"version": "1.7.7",
 	"main": "out/index.js",
 	"license": "MIT",
 	"files": [
@@ -13,8 +13,8 @@
 		"directory": "packages/vue-language-core"
 	},
 	"dependencies": {
-		"@volar/language-core": "1.6.6",
-		"@volar/source-map": "1.6.6",
+		"@volar/language-core": "1.6.9",
+		"@volar/source-map": "1.6.9",
 		"@vue/compiler-dom": "^3.3.0",
 		"@vue/reactivity": "^3.3.0",
 		"@vue/shared": "^3.3.0",
@@ -34,5 +34,5 @@
 			"optional": true
 		}
 	},
-	"gitHead": "9959597f7bc53e9bd09aeabb67f772bf776b0ad1"
+	"gitHead": "0e9411252a4fa30cc999e30acc5db0d126c33daf"
 }