From 0643fca8847ec6e36dea761ff562596ac67f8e6c Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 5 May 2025 11:33:03 +0200 Subject: [PATCH 1/6] Improve error message for routing --- pkgs/hooks/lib/src/validation.dart | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/pkgs/hooks/lib/src/validation.dart b/pkgs/hooks/lib/src/validation.dart index 8e7f537e6..a5312da1a 100644 --- a/pkgs/hooks/lib/src/validation.dart +++ b/pkgs/hooks/lib/src/validation.dart @@ -151,9 +151,23 @@ class ProtocolBase { final errors = []; if (!input.config.linkingEnabled) { if (output.assets.encodedAssetsForLinking.isNotEmpty) { - const error = - 'BuildOutput.assets_for_linking is not empty while ' - 'BuildInput.config.linkingEnabled is false'; + const error = ''' +`BuildOutput.assets_for_linking` is not empty while `BuildInput.config.linkingEnabled` is `false`. + +This might be caused by writing something like + +``` +routing: ToLinkHook(input.packageName), +``` + +Try instead: + +``` +routing: input.config.linkingEnabled + ? ToAppBundle() + : ToLinkHook(input.packageName) +``` +'''; errors.add(error); } } From bcf35eeb3395d5b787b95c1d43078d1138b0a3c3 Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 5 May 2025 11:36:44 +0200 Subject: [PATCH 2/6] Fix --- pkgs/hooks/lib/src/validation.dart | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/hooks/lib/src/validation.dart b/pkgs/hooks/lib/src/validation.dart index a5312da1a..a4f258f3d 100644 --- a/pkgs/hooks/lib/src/validation.dart +++ b/pkgs/hooks/lib/src/validation.dart @@ -164,8 +164,8 @@ Try instead: ``` routing: input.config.linkingEnabled - ? ToAppBundle() - : ToLinkHook(input.packageName) + ? ToLinkHook(input.packageName) + : ToAppBundle(), ``` '''; errors.add(error); From 43af52c756b6090ab568e05ca1b89611eb638bed Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 5 May 2025 11:39:32 +0200 Subject: [PATCH 3/6] Improve more --- pkgs/hooks/lib/src/validation.dart | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/hooks/lib/src/validation.dart b/pkgs/hooks/lib/src/validation.dart index a4f258f3d..9b674b21f 100644 --- a/pkgs/hooks/lib/src/validation.dart +++ b/pkgs/hooks/lib/src/validation.dart @@ -151,16 +151,19 @@ class ProtocolBase { final errors = []; if (!input.config.linkingEnabled) { if (output.assets.encodedAssetsForLinking.isNotEmpty) { - const error = ''' + final error = + ''' `BuildOutput.assets_for_linking` is not empty while `BuildInput.config.linkingEnabled` is `false`. +The assets ${output.assets.encodedAssetsForLinking} where sent to linking, but should either be bundled with the app or linked only when linking is enabled. + This might be caused by writing something like ``` routing: ToLinkHook(input.packageName), ``` -Try instead: +Try writing this instead: ``` routing: input.config.linkingEnabled From a6882f5d9bbe9b09458d348f7b46c93553a1b4ba Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 5 May 2025 11:45:15 +0200 Subject: [PATCH 4/6] Improve other --- pkgs/code_assets/lib/src/code_assets/validation.dart | 4 ++-- pkgs/data_assets/lib/src/data_assets/validation.dart | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/code_assets/lib/src/code_assets/validation.dart b/pkgs/code_assets/lib/src/code_assets/validation.dart index 6915d8cb0..1ae5ae44a 100644 --- a/pkgs/code_assets/lib/src/code_assets/validation.dart +++ b/pkgs/code_assets/lib/src/code_assets/validation.dart @@ -295,10 +295,10 @@ ValidationErrors _validateFile( }) { final errors = []; if (mustBeAbsolute && !uri.isAbsolute) { - errors.add('$name (${uri.toFilePath()}) must be an absolute path.'); + errors.add('$name at ${uri.toFilePath()} must be an absolute path.'); } if (mustExist && !File.fromUri(uri).existsSync()) { - errors.add('$name (${uri.toFilePath()}) does not exist as a file.'); + errors.add('$name at ${uri.toFilePath()} does not exist as a file.'); } return errors; } diff --git a/pkgs/data_assets/lib/src/data_assets/validation.dart b/pkgs/data_assets/lib/src/data_assets/validation.dart index fc6687524..73a5bb38e 100644 --- a/pkgs/data_assets/lib/src/data_assets/validation.dart +++ b/pkgs/data_assets/lib/src/data_assets/validation.dart @@ -98,7 +98,7 @@ void _validateDataAsset( errors.add('More than one data asset with same "${dataAsset.name}" name.'); } final file = dataAsset.file; - errors.addAll(_validateFile('Data asset ${dataAsset.name} file', file)); + errors.addAll(_validateFile('Data asset "${dataAsset.name}" file', file)); } ValidationErrors _validateDataAssetSyntax(EncodedAsset encodedAsset) { @@ -132,7 +132,7 @@ ValidationErrors _validateFile( errors.add('$name (${uri.toFilePath()}) must be an absolute path.'); } if (mustExist && !File.fromUri(uri).existsSync()) { - errors.add('$name (${uri.toFilePath()}) does not exist as a file.'); + errors.add('$name at "${uri.toFilePath()}" does not exist.'); } return errors; } From eedcae1f9fa01728b1d962cbd7cfb74faadc07dd Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 5 May 2025 11:45:34 +0200 Subject: [PATCH 5/6] more --- pkgs/data_assets/lib/src/data_assets/validation.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data_assets/lib/src/data_assets/validation.dart b/pkgs/data_assets/lib/src/data_assets/validation.dart index 73a5bb38e..2566866e4 100644 --- a/pkgs/data_assets/lib/src/data_assets/validation.dart +++ b/pkgs/data_assets/lib/src/data_assets/validation.dart @@ -129,7 +129,7 @@ ValidationErrors _validateFile( }) { final errors = []; if (mustBeAbsolute && !uri.isAbsolute) { - errors.add('$name (${uri.toFilePath()}) must be an absolute path.'); + errors.add('$name at "${uri.toFilePath()}" must be an absolute path.'); } if (mustExist && !File.fromUri(uri).existsSync()) { errors.add('$name at "${uri.toFilePath()}" does not exist.'); From f411df788d5fdf522b2b4ac9bb08b8b8edd467d6 Mon Sep 17 00:00:00 2001 From: Moritz Date: Mon, 5 May 2025 13:25:55 +0200 Subject: [PATCH 6/6] Adapt messaging --- pkgs/data_assets/lib/src/data_assets/validation.dart | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/data_assets/lib/src/data_assets/validation.dart b/pkgs/data_assets/lib/src/data_assets/validation.dart index 2566866e4..abecec1c9 100644 --- a/pkgs/data_assets/lib/src/data_assets/validation.dart +++ b/pkgs/data_assets/lib/src/data_assets/validation.dart @@ -31,7 +31,7 @@ List _validateHookInput(List assets) { final dataAsset = DataAsset.fromEncoded(asset); errors.addAll( _validateFile( - 'LinkInput.assets.data asset "${dataAsset.id}" file', + 'LinkInput.assets.data asset "${dataAsset.id}"', dataAsset.file, ), ); @@ -98,7 +98,7 @@ void _validateDataAsset( errors.add('More than one data asset with same "${dataAsset.name}" name.'); } final file = dataAsset.file; - errors.addAll(_validateFile('Data asset "${dataAsset.name}" file', file)); + errors.addAll(_validateFile('Data asset "${dataAsset.name}"', file)); } ValidationErrors _validateDataAssetSyntax(EncodedAsset encodedAsset) { @@ -129,10 +129,12 @@ ValidationErrors _validateFile( }) { final errors = []; if (mustBeAbsolute && !uri.isAbsolute) { - errors.add('$name at "${uri.toFilePath()}" must be an absolute path.'); + errors.add( + '$name points to "${uri.toFilePath()}", which must be an absolute path.', + ); } if (mustExist && !File.fromUri(uri).existsSync()) { - errors.add('$name at "${uri.toFilePath()}" does not exist.'); + errors.add('$name points to "${uri.toFilePath()}", which does not exist.'); } return errors; }