@parcel/utils 2.0.0-nightly.954 → 2.0.0-nightly.959

package/lib/config.js

@@ -7,6 +7,16 @@ exports.resolveConfig = resolveConfig;
 exports.resolveConfigSync = resolveConfigSync;
 exports.loadConfig = loadConfig;
 
+function _diagnostic() {
+  const data = _interopRequireDefault(require("@parcel/diagnostic"));
+
+  _diagnostic = function () {
+    return data;
+  };
+
+  return data;
+}
+
 function _path() {
   const data = _interopRequireDefault(require("path"));
 
@@ -120,7 +130,35 @@ async function loadConfig(fs, filepath, filenames, projectRoot, opts) {
         var _opts$parser;
 
         let parse = (_opts$parser = opts === null || opts === void 0 ? void 0 : opts.parser) !== null && _opts$parser !== void 0 ? _opts$parser : getParser(extname);
-        config = parse(configContent);
+
+        try {
+          config = parse(configContent);
+        } catch (e) {
+          if (extname !== '' && extname !== 'json') {
+            throw e;
+          }
+
+          let pos = {
+            line: e.lineNumber,
+            column: e.columnNumber
+          };
+          throw new (_diagnostic().default)({
+            diagnostic: {
+              message: `Failed to parse ${_path().default.basename(configFile)}`,
+              origin: '@parcel/utils',
+              codeFrames: [{
+                language: 'json5',
+                filePath: configFile,
+                code: configContent,
+                codeHighlights: [{
+                  start: pos,
+                  end: pos,
+                  message: e.message
+                }]
+              }]
+            }
+          });
+        }
       }
 
       let output = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/utils",
-  "version": "2.0.0-nightly.954+af76afc1",
+  "version": "2.0.0-nightly.959+13649c36",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "MIT",
   "publishConfig": {
@@ -21,11 +21,11 @@
   },
   "dependencies": {
     "@iarna/toml": "^2.2.0",
-    "@parcel/codeframe": "2.0.0-nightly.954+af76afc1",
-    "@parcel/diagnostic": "2.0.0-nightly.954+af76afc1",
-    "@parcel/hash": "2.0.2-nightly.2576+af76afc1",
-    "@parcel/logger": "2.0.0-nightly.954+af76afc1",
-    "@parcel/markdown-ansi": "2.0.0-nightly.954+af76afc1",
+    "@parcel/codeframe": "2.0.0-nightly.959+13649c36",
+    "@parcel/diagnostic": "2.0.0-nightly.959+13649c36",
+    "@parcel/hash": "2.0.2-nightly.2581+13649c36",
+    "@parcel/logger": "2.0.0-nightly.959+13649c36",
+    "@parcel/markdown-ansi": "2.0.0-nightly.959+13649c36",
     "@parcel/source-map": "^2.0.0",
     "ansi-html-community": "0.0.8",
     "chalk": "^4.1.0",
@@ -51,5 +51,5 @@
     "./src/http-server.js": false,
     "./src/openInBrowser.js": false
   },
-  "gitHead": "af76afc12109040abfbe0eaf13b2465ba99b1678"
+  "gitHead": "13649c365d36b40e548e34e2e278bdb4cd1de48a"
 }

package/src/config.js

@@ -2,6 +2,7 @@
 
 import type {ConfigResult, File, FilePath} from '@parcel/types';
 import type {FileSystem} from '@parcel/fs';
+import ThrowableDiagnostic from '@parcel/diagnostic';
 import path from 'path';
 import clone from 'clone';
 import {parse as json5} from 'json5';
@@ -88,7 +89,39 @@ export async function loadConfig(
         config = configContent;
       } else {
         let parse = opts?.parser ?? getParser(extname);
-        config = parse(configContent);
+        try {
+          config = parse(configContent);
+        } catch (e) {
+          if (extname !== '' && extname !== 'json') {
+            throw e;
+          }
+
+          let pos = {
+            line: e.lineNumber,
+            column: e.columnNumber,
+          };
+
+          throw new ThrowableDiagnostic({
+            diagnostic: {
+              message: `Failed to parse ${path.basename(configFile)}`,
+              origin: '@parcel/utils',
+              codeFrames: [
+                {
+                  language: 'json5',
+                  filePath: configFile,
+                  code: configContent,
+                  codeHighlights: [
+                    {
+                      start: pos,
+                      end: pos,
+                      message: e.message,
+                    },
+                  ],
+                },
+              ],
+            },
+          });
+        }
       }
 
       let output = {