Merge pull request microsoft#25949 from Microsoft/resolveJsonModuleError

sheetalkamat · web-flow · commit 2b14bcbb56e8 · 2018-07-25T17:50:43.000-07:00
When json module is not found, include enabling --resolveJsonModule might help.
diff --git a/src/compiler/checker.ts b/src/compiler/checker.ts
@@ -2220,6 +2220,12 @@ namespace ts {
                         const diag = Diagnostics.An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead;
                         error(errorNode, diag, tsExtension, removeExtension(moduleReference, tsExtension));
                     }
+                    else if (!compilerOptions.resolveJsonModule &&
+                        fileExtensionIs(moduleReference, Extension.Json) &&
+                        getEmitModuleResolutionKind(compilerOptions) === ModuleResolutionKind.NodeJs &&
+                        getEmitModuleKind(compilerOptions) === ModuleKind.CommonJS) {
+                        error(errorNode, Diagnostics.Cannot_find_module_0_Consider_using_resolveJsonModule_to_import_module_with_json_extension, moduleReference);
+                    }
                     else {
                         error(errorNode, moduleNotFoundError, moduleReference);
                     }
diff --git a/src/compiler/diagnosticMessages.json b/src/compiler/diagnosticMessages.json
@@ -2425,6 +2425,10 @@
         "category": "Error",
         "code": 2731
     },
+    "Cannot find module '{0}'. Consider using '--resolveJsonModule' to import module with '.json' extension": {
+        "category": "Error",
+        "code": 2732
+    },
 
     "Import declaration '{0}' is using private name '{1}'.": {
         "category": "Error",
diff --git a/tests/baselines/reference/requireOfJsonFileWithoutResolveJsonModule.errors.txt b/tests/baselines/reference/requireOfJsonFileWithoutResolveJsonModule.errors.txt
@@ -1,15 +1,15 @@
-tests/cases/compiler/file1.ts(1,21): error TS2307: Cannot find module './b.json'.
-tests/cases/compiler/file1.ts(3,21): error TS2307: Cannot find module './b.json'.
+tests/cases/compiler/file1.ts(1,21): error TS2732: Cannot find module './b.json'. Consider using '--resolveJsonModule' to import module with '.json' extension
+tests/cases/compiler/file1.ts(3,21): error TS2732: Cannot find module './b.json'. Consider using '--resolveJsonModule' to import module with '.json' extension
 
 
 ==== tests/cases/compiler/file1.ts (2 errors) ====
     import b1 = require('./b.json'); // error
                         ~~~~~~~~~~
-!!! error TS2307: Cannot find module './b.json'.
+!!! error TS2732: Cannot find module './b.json'. Consider using '--resolveJsonModule' to import module with '.json' extension
     let x = b1.a;
     import b2 = require('./b.json'); // error
                         ~~~~~~~~~~
-!!! error TS2307: Cannot find module './b.json'.
+!!! error TS2732: Cannot find module './b.json'. Consider using '--resolveJsonModule' to import module with '.json' extension
     if (x) {
         let b = b2.b;
         x = (b1.b === b);

Original file line number	Diff line number	Diff line change
`@@ -2220,6 +2220,12 @@ namespace ts {`
`2220`	`2220`	`const diag = Diagnostics.An_import_path_cannot_end_with_a_0_extension_Consider_importing_1_instead;`
`2221`	`2221`	`error(errorNode, diag, tsExtension, removeExtension(moduleReference, tsExtension));`
`2222`	`2222`	`}`
	`2223`	`+ else if (!compilerOptions.resolveJsonModule &&`
	`2224`	`+ fileExtensionIs(moduleReference, Extension.Json) &&`
	`2225`	`+ getEmitModuleResolutionKind(compilerOptions) === ModuleResolutionKind.NodeJs &&`
	`2226`	`+ getEmitModuleKind(compilerOptions) === ModuleKind.CommonJS) {`
	`2227`	`+ error(errorNode, Diagnostics.Cannot_find_module_0_Consider_using_resolveJsonModule_to_import_module_with_json_extension, moduleReference);`
	`2228`	`+ }`
`2223`	`2229`	`else {`
`2224`	`2230`	`error(errorNode, moduleNotFoundError, moduleReference);`
`2225`	`2231`	`}`