diff --git a/ext/cache/01_cache.js b/ext/cache/01_cache.js index a5bcde598f..269261f401 100644 --- a/ext/cache/01_cache.js +++ b/ext/cache/01_cache.js @@ -105,7 +105,7 @@ class Cache { const reqUrl = new URL(innerRequest.url()); if (reqUrl.protocol !== "http:" && reqUrl.protocol !== "https:") { throw new TypeError( - "Request url protocol must be 'http:' or 'https:'", + `Request url protocol must be 'http:' or 'https:': received '${reqUrl.protocol}'`, ); } if (innerRequest.method !== "GET") { diff --git a/ext/cache/lib.rs b/ext/cache/lib.rs index e399b08e07..f6d758b95c 100644 --- a/ext/cache/lib.rs +++ b/ext/cache/lib.rs @@ -211,7 +211,7 @@ where state.put(cache); Ok(state.borrow::().clone()) } else { - Err(type_error("CacheStorage is not available in this context.")) + Err(type_error("CacheStorage is not available in this context")) } } diff --git a/ext/canvas/01_image.js b/ext/canvas/01_image.js index 6fb1ee62fc..3ea72db6ac 100644 --- a/ext/canvas/01_image.js +++ b/ext/canvas/01_image.js @@ -307,7 +307,9 @@ function processImage(input, width, height, sx, sy, sw, sh, options) { } if (options.colorSpaceConversion === "none") { - throw new TypeError("options.colorSpaceConversion 'none' is not supported"); + throw new TypeError( + "Cannot create image: invalid colorSpaceConversion option, 'none' is not supported", + ); } /* diff --git a/ext/ffi/00_ffi.js b/ext/ffi/00_ffi.js index 06caf7c6cc..1475f8d3fc 100644 --- a/ext/ffi/00_ffi.js +++ b/ext/ffi/00_ffi.js @@ -250,7 +250,7 @@ class UnsafePointer { } } else { throw new TypeError( - "Expected ArrayBuffer, ArrayBufferView or UnsafeCallbackPrototype", + `Cannot access pointer: expected 'ArrayBuffer', 'ArrayBufferView' or 'UnsafeCallbackPrototype', received ${typeof value}`, ); } if (pointer) { @@ -335,7 +335,9 @@ function getTypeSizeAndAlignment(type, cache = new SafeMap()) { const cached = cache.get(type); if (cached !== undefined) { if (cached === null) { - throw new TypeError("Recursive struct definition"); + throw new TypeError( + "Cannot get pointer size: found recursive struct", + ); } return cached; } @@ -379,7 +381,7 @@ function getTypeSizeAndAlignment(type, cache = new SafeMap()) { case "isize": return [8, 8]; default: - throw new TypeError(`Unsupported type: ${type}`); + throw new TypeError(`Cannot get pointer size, unsupported type: ${type}`); } } @@ -395,7 +397,7 @@ class UnsafeCallback { constructor(definition, callback) { if (definition.nonblocking) { throw new TypeError( - "Invalid UnsafeCallback, cannot be nonblocking", + "Cannot construct UnsafeCallback: cannot be nonblocking", ); } const { 0: rid, 1: pointer } = op_ffi_unsafe_callback_create( @@ -467,7 +469,7 @@ class DynamicLibrary { const type = symbols[symbol].type; if (type === "void") { throw new TypeError( - "Foreign symbol of type 'void' is not supported.", + "Foreign symbol of type 'void' is not supported", ); } diff --git a/ext/ffi/call.rs b/ext/ffi/call.rs index 726f17fad0..9165972935 100644 --- a/ext/ffi/call.rs +++ b/ext/ffi/call.rs @@ -334,7 +334,9 @@ pub fn op_ffi_call_nonblocking( let symbols = &resource.symbols; *symbols .get(&symbol) - .ok_or_else(|| type_error("Invalid FFI symbol name"))? + .ok_or_else(|| { + type_error(format!("Invalid FFI symbol name: '{symbol}'")) + })? .clone() }; diff --git a/ext/ffi/callback.rs b/ext/ffi/callback.rs index 39321aa846..281208322b 100644 --- a/ext/ffi/callback.rs +++ b/ext/ffi/callback.rs @@ -174,7 +174,7 @@ unsafe extern "C" fn deno_ffi_callback( let tc_scope = &mut TryCatch::new(scope); args.run(tc_scope); if tc_scope.exception().is_some() { - log::error!("Illegal unhandled exception in nonblocking callback."); + log::error!("Illegal unhandled exception in nonblocking callback"); } }); } diff --git a/tests/ffi/tests/integration_tests.rs b/tests/ffi/tests/integration_tests.rs index 2235405a8a..c84a1b820d 100644 --- a/tests/ffi/tests/integration_tests.rs +++ b/tests/ffi/tests/integration_tests.rs @@ -300,6 +300,6 @@ fn ffi_callback_errors_test() { assert_eq!(stdout, expected); assert_eq!( stderr, - "Illegal unhandled exception in nonblocking callback.\n".repeat(3) + "Illegal unhandled exception in nonblocking callback\n".repeat(3) ); }