Merge pull request microsoft#8080 from Microsoft/pathsValidation

vladima · vladima · commit 81ebab4c391b · 2016-04-13T21:52:46.000-07:00
added validation of paths option
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -2292,7 +2292,14 @@
         "category": "Error",
         "code": 5062
     },
-
+    "Substututions for pattern '{0}' should be an array.": {
+        "category": "Error",
+        "code": 5063
+    },
+    "Substitution '{0}' for pattern '{1}' has incorrect type, expected 'string', got '{2}'.": {
+        "category": "Error",
+        "code": 5064
+    },
     "Concatenate and emit output to single file.": {
         "category": "Message",
         "code": 6001
diff --git a/src/compiler/program.ts b/src/compiler/program.ts
@@ -1985,11 +1985,22 @@ namespace ts {
                     if (!hasZeroOrOneAsteriskCharacter(key)) {
                         programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Pattern_0_can_have_at_most_one_Asterisk_character, key));
                     }
-                    for (const subst of options.paths[key]) {
-                        if (!hasZeroOrOneAsteriskCharacter(subst)) {
-                            programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character, subst, key));
+                    if (isArray(options.paths[key])) {
+                        for (const subst of options.paths[key]) {
+                            const typeOfSubst = typeof subst;
+                            if (typeOfSubst === "string") {
+                                if (!hasZeroOrOneAsteriskCharacter(subst)) {
+                                    programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character, subst, key));
+                                }
+                            }
+                            else {
+                                programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2, subst, key, typeOfSubst));
+                            }
                         }
                     }
+                    else {
+                        programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Substututions_for_pattern_0_should_be_an_array, key));
+                    }
                 }
             }
 
diff --git a/tests/baselines/reference/pathsValidation1.errors.txt b/tests/baselines/reference/pathsValidation1.errors.txt
@@ -0,0 +1,6 @@
+error TS5063: Substututions for pattern '*' should be an array.
+
+
+!!! error TS5063: Substututions for pattern '*' should be an array.
+==== tests/cases/compiler/a.ts (0 errors) ====
+    let x = 1;
diff --git a/tests/baselines/reference/pathsValidation1.js b/tests/baselines/reference/pathsValidation1.js
@@ -0,0 +1,5 @@
+//// [a.ts]
+let x = 1;
+
+//// [a.js]
+var x = 1;
diff --git a/tests/baselines/reference/pathsValidation2.errors.txt b/tests/baselines/reference/pathsValidation2.errors.txt
@@ -0,0 +1,6 @@
+error TS5064: Substitution '1' for pattern '*' has incorrect type, expected 'string', got 'number'.
+
+
+!!! error TS5064: Substitution '1' for pattern '*' has incorrect type, expected 'string', got 'number'.
+==== tests/cases/compiler/a.ts (0 errors) ====
+    let x = 1;
diff --git a/tests/baselines/reference/pathsValidation2.js b/tests/baselines/reference/pathsValidation2.js
@@ -0,0 +1,5 @@
+//// [a.ts]
+let x = 1;
+
+//// [a.js]
+var x = 1;
diff --git a/tests/cases/compiler/pathsValidation1.ts b/tests/cases/compiler/pathsValidation1.ts
@@ -0,0 +1,11 @@
+// @filename: tsconfig.json
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+            "*": "*"
+        }
+    }
+}
+// @filename: a.ts
+let x = 1;
diff --git a/tests/cases/compiler/pathsValidation2.ts b/tests/cases/compiler/pathsValidation2.ts
@@ -0,0 +1,11 @@
+// @filename: tsconfig.json
+{
+    "compilerOptions": {
+        "baseUrl": ".",
+        "paths": {
+            "*": [1]
+        }
+    }
+}
+// @filename: a.ts
+let x = 1;

Original file line number	Diff line number	Diff line change
`@@ -1985,11 +1985,22 @@ namespace ts {`
`1985`	`1985`	`if (!hasZeroOrOneAsteriskCharacter(key)) {`
`1986`	`1986`	`programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Pattern_0_can_have_at_most_one_Asterisk_character, key));`
`1987`	`1987`	`}`
`1988`		`- for (const subst of options.paths[key]) {`
`1989`		`- if (!hasZeroOrOneAsteriskCharacter(subst)) {`
`1990`		`- programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character, subst, key));`
	`1988`	`+ if (isArray(options.paths[key])) {`
	`1989`	`+ for (const subst of options.paths[key]) {`
	`1990`	`+ const typeOfSubst = typeof subst;`
	`1991`	`+ if (typeOfSubst === "string") {`
	`1992`	`+ if (!hasZeroOrOneAsteriskCharacter(subst)) {`
	`1993`	`+ programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Substitution_0_in_pattern_1_in_can_have_at_most_one_Asterisk_character, subst, key));`
	`1994`	`+ }`
	`1995`	`+ }`
	`1996`	`+ else {`
	`1997`	`+ programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Substitution_0_for_pattern_1_has_incorrect_type_expected_string_got_2, subst, key, typeOfSubst));`
	`1998`	`+ }`
`1991`	`1999`	`}`
`1992`	`2000`	`}`
	`2001`	`+ else {`
	`2002`	`+ programDiagnostics.add(createCompilerDiagnostic(Diagnostics.Substututions_for_pattern_0_should_be_an_array, key));`
	`2003`	`+ }`
`1993`	`2004`	`}`
`1994`	`2005`	`}`
`1995`	`2006`