Use unique keys for more validations

Author: Mrtenz

packages/snaps-utils/src/manifest/validators/expected-files.test.ts

@@ -25,7 +25,7 @@ describe('expectedFiles', () => {
 
       expect(report).toHaveBeenCalledTimes(1);
       expect(report).toHaveBeenCalledWith(
-        'expected-files',
+        `expected-files-${missingFile}`,
         expect.stringContaining('Missing file'),
       );
     },

packages/snaps-utils/src/manifest/validators/expected-files.ts

@@ -18,7 +18,7 @@ export const expectedFiles: ValidatorMeta = {
     for (const expectedFile of EXPECTED_SNAP_FILES) {
       if (!files[expectedFile]) {
         context.report(
-          'expected-files',
+          `expected-files-${expectedFile}`,
           `Missing file "${SnapFileNameFromKey[expectedFile]}".`,
         );
       }

packages/snaps-utils/src/manifest/validators/is-localization-file.test.ts

@@ -52,7 +52,7 @@ describe('isLocalizationFile', () => {
     );
 
     expect(report).toHaveBeenCalledWith(
-      'is-localization-file',
+      `is-localization-file-${localizationFile.path}`,
       'Failed to validate localization file "/foo": At path: messages — Expected a value of type record, but received: "foo".',
     );
   });

packages/snaps-utils/src/manifest/validators/is-localization-file.ts

@@ -16,7 +16,7 @@ export const isLocalizationFile: ValidatorMeta = {
       if (error) {
         for (const failure of error.failures()) {
           context.report(
-            'is-localization-file',
+            `is-localization-file-${file.path}`,
             `Failed to validate localization file "${
               file.path
             }": ${getStructFailureMessage(

packages/snaps-utils/src/manifest/validators/is-package-json.test.ts

@@ -64,7 +64,7 @@ describe('isPackageJson', () => {
     );
 
     expect(report).toHaveBeenCalledWith(
-      'is-package-json',
+      'is-package-json-string-version',
       '"package.json" is invalid: At path: version — Expected SemVer version, got "foo".',
     );
   });

packages/snaps-utils/src/manifest/validators/is-package-json.ts

@@ -20,7 +20,7 @@ export const isPackageJson: ValidatorMeta = {
     if (error) {
       for (const failure of error.failures()) {
         context.report(
-          'is-package-json',
+          `is-package-json-${failure.type}-${failure.path.join('-')}`,
           `"${
             NpmSnapFileNames.PackageJson
           }" is invalid: ${getStructFailureMessage(

packages/snaps-utils/src/manifest/validators/is-snap-manifest.test.ts

@@ -42,7 +42,7 @@ describe('isSnapManifest', () => {
     );
 
     expect(report).toHaveBeenCalledWith(
-      'is-snap-manifest',
+      'is-snap-manifest-object-',
       '"snap.manifest.json" is invalid: Expected a value of type object, but received: "foo".',
     );
   });

packages/snaps-utils/src/manifest/validators/is-snap-manifest.ts

@@ -18,7 +18,7 @@ export const isSnapManifest: ValidatorMeta = {
     if (error) {
       for (const failure of error.failures()) {
         context.report(
-          'is-snap-manifest',
+          `is-snap-manifest-${failure.type}-${failure.path.join('-')}`,
           `"${NpmSnapFileNames.Manifest}" is invalid: ${getStructFailureMessage(
             SnapManifestStruct,
             failure,

packages/snaps-utils/src/manifest/validators/package-json-recommended-fields.test.ts

@@ -26,7 +26,7 @@ describe('packageJsonRecommendedFields', () => {
     await packageJsonRecommendedFields.semanticCheck(files, { report });
 
     expect(report).toHaveBeenCalledWith(
-      'package-json-recommended-fields',
+      'package-json-recommended-fields-repository',
       'Missing recommended package.json property: "repository".',
     );
   });

packages/snaps-utils/src/manifest/validators/package-json-recommended-fields.ts

@@ -11,7 +11,7 @@ export const packageJsonRecommendedFields: ValidatorMeta = {
     for (const recommendedField of RECOMMENDED_FIELDS) {
       if (!files.packageJson.result[recommendedField]) {
         context.report(
-          'package-json-recommended-fields',
+          `package-json-recommended-fields-${recommendedField}`,
           `Missing recommended package.json property: "${recommendedField}".`,
         );
       }