Allow unused "detectImport" (zotero#1916)

adam3smith · Apr 1, 2019 · a6a842687f6b379a4e39346c76ac3d11fa1665d2 · a6a8426
1 parent e87fc64
commit a6a842687f6b379a4e39346c76ac3d11fa1665d2
Unified Split

Showing with 9 additions and 12 deletions.

+8 −11 .ci/eslint-plugin-zotero-translator/lib/rules/translator-type.js

+1 −1 .eslintrc
diff --git a/.ci/eslint-plugin-zotero-translator/lib/rules/translator-type.js b/.ci/eslint-plugin-zotero-translator/lib/rules/translator-type.js
@@ -53,20 +53,17 @@ module.exports = {
 					}
 				}
-  
-				const doWeb = getFunction(node, 'doWeb');
-  
-				const doDetect = getFunction(node, 'doDetect');
-  
-				const doImport = getFunction(node, 'doImport');
-  
-				const doExport = getFunction(node, 'doExport');
-  
-
 				if (browserSupportNode && !(translatorType & type.web)) context.report(browserSupportNode, `browserSupport set, but translatorType (${translatorType}) does not include web (${type.web})`);
-  
-				for (const [f, mode] of [[doWeb, 'Web'], [doDetect, 'Import'], [doImport, 'Import'], [doExport, 'Export']]) {
-  
-					const bit = type[mode.toLowerCase()];
-  
-					if (f && !(translatorType & bit)) {
-  
-						context.report(f, `do${mode} present, but translatorType (${translatorType}) does not specify ${mode.toLowerCase()} (${bit})`);
+  
+				for (const name of ['detectWeb', 'doWeb', 'detectImport', 'doImport', 'doExport']) {
+  
+					const handler = getFunction(node, name);
+  
+					const mode = name.replace(/^(detect|do)/, '').toLowerCase();
+  
+					const bit = type[mode];
+  
+					if (handler && !(translatorType & bit)) {
+  
+						context.report(handler, `${name} present, but translatorType (${translatorType}) does not specify ${mode} (${bit})`);
 					}
-  
-					if (!f && (translatorType & bit)) {
-  
-						context.report(translatorTypeNode, `translatorType specifies ${mode.toLowerCase()} (${bit}), but no do${mode} present`);
+  
+					if (!handler && (translatorType & bit)) {
+  
+						context.report(translatorTypeNode, `translatorType specifies ${mode} (${bit}), but no ${name} present`);
 					}
 				}
 			}

diff --git a/.eslintrc b/.eslintrc
@@ -23,7 +23,7 @@
 			"error",
 			{
 				"argsIgnorePattern": "^_",
-  
-				"varsIgnorePattern": "^doWeb$|^detectWeb$|^doImport$|^doExport$"
+  
+				"varsIgnorePattern": "^detectWeb$|^doWeb$|^detectImport$|^doImport$|^doExport$"
 			}
 		],