From 34270a9d04c55d911a88169f8b0923a53cdecab8 Mon Sep 17 00:00:00 2001
From: tars0x9752 <46079709+tars0x9752@users.noreply.github.com>
Date: Sun, 13 Jun 2021 15:42:51 +0900
Subject: [PATCH 1/2] Improve error messages used by esm-resolver

---
 dist-raw/node-errors.js | 36 ++++++++++++++++++++++--------------
 1 file changed, 22 insertions(+), 14 deletions(-)

diff --git a/dist-raw/node-errors.js b/dist-raw/node-errors.js
index fefcd3ec7..535f05acc 100644
--- a/dist-raw/node-errors.js
+++ b/dist-raw/node-errors.js
@@ -1,21 +1,29 @@
 exports.codes = {
-  ERR_INPUT_TYPE_NOT_ALLOWED: createErrorCtor('ERR_INPUT_TYPE_NOT_ALLOWED'),
-  ERR_INVALID_ARG_VALUE: createErrorCtor('ERR_INVALID_ARG_VALUE'),
-  ERR_INVALID_MODULE_SPECIFIER: createErrorCtor('ERR_INVALID_MODULE_SPECIFIER'),
-  ERR_INVALID_PACKAGE_CONFIG: createErrorCtor('ERR_INVALID_PACKAGE_CONFIG'),
-  ERR_INVALID_PACKAGE_TARGET: createErrorCtor('ERR_INVALID_PACKAGE_TARGET'),
-  ERR_MANIFEST_DEPENDENCY_MISSING: createErrorCtor('ERR_MANIFEST_DEPENDENCY_MISSING'),
-  ERR_MODULE_NOT_FOUND: createErrorCtor('ERR_MODULE_NOT_FOUND'),
-  ERR_PACKAGE_IMPORT_NOT_DEFINED: createErrorCtor('ERR_PACKAGE_IMPORT_NOT_DEFINED'),
-  ERR_PACKAGE_PATH_NOT_EXPORTED: createErrorCtor('ERR_PACKAGE_PATH_NOT_EXPORTED'),
-  ERR_UNSUPPORTED_DIR_IMPORT: createErrorCtor('ERR_UNSUPPORTED_DIR_IMPORT'),
-  ERR_UNSUPPORTED_ESM_URL_SCHEME: createErrorCtor('ERR_UNSUPPORTED_ESM_URL_SCHEME'),
+  ERR_INPUT_TYPE_NOT_ALLOWED: createErrorCtor(joinArgs('ERR_INPUT_TYPE_NOT_ALLOWED')),
+  ERR_INVALID_ARG_VALUE: createErrorCtor(joinArgs('ERR_INVALID_ARG_VALUE')),
+  ERR_INVALID_MODULE_SPECIFIER: createErrorCtor(joinArgs('ERR_INVALID_MODULE_SPECIFIER')),
+  ERR_INVALID_PACKAGE_CONFIG: createErrorCtor(joinArgs('ERR_INVALID_PACKAGE_CONFIG')),
+  ERR_INVALID_PACKAGE_TARGET: createErrorCtor(joinArgs('ERR_INVALID_PACKAGE_TARGET')),
+  ERR_MANIFEST_DEPENDENCY_MISSING: createErrorCtor(joinArgs('ERR_MANIFEST_DEPENDENCY_MISSING')),
+  ERR_MODULE_NOT_FOUND: createErrorCtor((path, base, type = 'package') => {
+    return `Cannot find ${type} '${path}' imported from ${base}`
+  }),
+  ERR_PACKAGE_IMPORT_NOT_DEFINED: createErrorCtor(joinArgs('ERR_PACKAGE_IMPORT_NOT_DEFINED')),
+  ERR_PACKAGE_PATH_NOT_EXPORTED: createErrorCtor(joinArgs('ERR_PACKAGE_PATH_NOT_EXPORTED')),
+  ERR_UNSUPPORTED_DIR_IMPORT: createErrorCtor(joinArgs('ERR_UNSUPPORTED_DIR_IMPORT')),
+  ERR_UNSUPPORTED_ESM_URL_SCHEME: createErrorCtor(joinArgs('ERR_UNSUPPORTED_ESM_URL_SCHEME')),
 }
 
-function createErrorCtor(name) {
+function joinArgs(name) {
+  return (...args) => {
+    return [name, ...args].join(' ')
+  }
+}
+
+function createErrorCtor(errorMessageCreator) {
   return class CustomError extends Error {
     constructor(...args) {
-      super([name, ...args].join(' '))
+      super(errorMessageCreator(...args))
     }
   }
-}
+}
\ No newline at end of file

From b9fd2066d27550ef383ad11e49aa3dfc210d6413 Mon Sep 17 00:00:00 2001
From: tars0x9752 <46079709+tars0x9752@users.noreply.github.com>
Date: Sun, 13 Jun 2021 15:54:49 +0900
Subject: [PATCH 2/2] fix eof

---
 dist-raw/node-errors.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dist-raw/node-errors.js b/dist-raw/node-errors.js
index 535f05acc..f7c6edcf8 100644
--- a/dist-raw/node-errors.js
+++ b/dist-raw/node-errors.js
@@ -26,4 +26,4 @@ function createErrorCtor(errorMessageCreator) {
       super(errorMessageCreator(...args))
     }
   }
-}
\ No newline at end of file
+}