Code review changes

MetaMask · Jul 25, 2024 · 6d81688 · 6d81688
1 parent e7313f5
commit 6d81688
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 3 deletions.
diff --git a/packages/snaps-utils/src/index.ts b/packages/snaps-utils/src/index.ts
@@ -29,3 +29,4 @@ export * from './ui';
 export * from './validation';
 export * from './versions';
 export * from './virtual-file';
+export * from './promise';
diff --git a/packages/snaps-utils/src/manifest/validator-types.ts b/packages/snaps-utils/src/manifest/validator-types.ts
@@ -1,11 +1,12 @@
+import type { Promisable } from '../promise';
 import type { SnapFiles, UnvalidatedSnapFiles } from '../types';
 import type { SnapManifest } from './validation';
 
 // Eslint uses patch based fixing, but it's too complex for our needs.
 // https://eslint.org/docs/latest/extend/custom-rules#applying-fixes
 export type ValidatorFix = (files: {
   manifest: SnapManifest;
-}) => { manifest: SnapManifest } | Promise<{ manifest: SnapManifest }>;
+}) => Promisable<{ manifest: SnapManifest }>;
 
 export type ValidatorSeverity = 'error' | 'warning';
 

diff --git a/packages/snaps-utils/src/manifest/validator.ts b/packages/snaps-utils/src/manifest/validator.ts
@@ -18,6 +18,8 @@ export type ValidatorResults = {
 class Context implements ValidatorContext {
   reports: ValidatorReport[] = [];
 
+  #nextSeverity?: ValidatorSeverity = undefined;
+
   report(message: string, fix?: ValidatorFix): void {
     assert(this.#nextSeverity !== undefined);
     this.reports.push({
@@ -34,8 +36,6 @@ class Context implements ValidatorContext {
   get hasErrors() {
     return this.reports.some((report) => report.severity === 'error');
   }
-
-  #nextSeverity?: ValidatorSeverity = undefined;
 }
 
 /**

diff --git a/packages/snaps-utils/src/promise.ts b/packages/snaps-utils/src/promise.ts
@@ -0,0 +1 @@
+export type Promisable<Type> = Type | Promise<Type>;