feat: allow passing array to experimentalModelPropName ignore setting

#1821 (comment)
vuejs · Oct 13, 2022 · d2b50d2 · d2b50d2
1 parent 01610bb
commit d2b50d2
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 14 deletions.
diff --git a/vue-language-tools/vue-language-core/src/generators/template.ts b/vue-language-tools/vue-language-core/src/generators/template.ts
@@ -1779,22 +1779,34 @@ function getModelValuePropName(node: CompilerDOM.ElementNode, vueVersion: number
 		const tags = vueCompilerOptions.experimentalModelPropName[modelName];
 		for (const tag in tags) {
 			if (node.tag === tag || node.tag === hyphenate(tag)) {
-				const attrs = tags[tag];
-				if (typeof attrs === 'object') {
-					let failed = false;
-					for (const attr in attrs) {
-						const attrNode = node.props.find(prop => prop.type === CompilerDOM.NodeTypes.ATTRIBUTE && prop.name === attr) as CompilerDOM.AttributeNode | undefined;
-						if (!attrNode || attrNode.value?.content !== attrs[attr]) {
-							failed = true;
-							break;
+				const v = tags[tag];
+				if (typeof v === 'object') {
+					const arr = Array.isArray(v) ? v : [v];
+					for (const attrs of arr) {
+						let failed = false;
+						for (const attr in attrs) {
+							const attrNode = node.props.find(prop => prop.type === CompilerDOM.NodeTypes.ATTRIBUTE && prop.name === attr) as CompilerDOM.AttributeNode | undefined;
+							if (!attrNode || attrNode.value?.content !== attrs[attr]) {
+								failed = true;
+								break;
+							}
+						}
+						if (!failed) {
+							// all match
+							return modelName || undefined;
 						}
-					}
-					if (!failed) {
-						// all match
-						return modelName || undefined;
 					}
 				}
-				else if (attrs === true) {
+			}
+		}
+	}
+
+	for (const modelName in vueCompilerOptions.experimentalModelPropName) {
+		const tags = vueCompilerOptions.experimentalModelPropName[modelName];
+		for (const tag in tags) {
+			if (node.tag === tag || node.tag === hyphenate(tag)) {
+				const attrs = tags[tag];
+				if (attrs === true) {
 					return modelName || undefined;
 				}
 			}

diff --git a/vue-language-tools/vue-language-core/src/types.ts b/vue-language-tools/vue-language-core/src/types.ts
@@ -29,7 +29,7 @@ export interface ResolvedVueCompilerOptions {
 	experimentalRuntimeMode: 'runtime-dom' | 'runtime-uni-app';
 	experimentalResolveStyleCssClasses: 'scoped' | 'always' | 'never';
 	experimentalRfc436: boolean;
-	experimentalModelPropName: Record<string, Record<string, boolean | Record<string, string>>>;
+	experimentalModelPropName: Record<string, Record<string, boolean | Record<string, string> | Record<string, string>[]>>;
 }
 
 export type VueLanguagePlugin = (ctx: {