From bc96e8b9405c66451f94dd746ab9a2abae380d43 Mon Sep 17 00:00:00 2001
From: Tim Seckinger <seckinger.tim@gmail.com>
Date: Tue, 19 Feb 2019 11:14:47 +0100
Subject: [PATCH] moar PR feedback

---
 .../jest-resolve-dependencies/src/index.ts    |  6 ++---
 packages/jest-snapshot/src/index.ts           |  5 ++--
 .../jest-snapshot/src/snapshot_resolver.ts    | 24 +++++++------------
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/packages/jest-resolve-dependencies/src/index.ts b/packages/jest-resolve-dependencies/src/index.ts
index 9abccf98910b..6d3315962612 100644
--- a/packages/jest-resolve-dependencies/src/index.ts
+++ b/packages/jest-resolve-dependencies/src/index.ts
@@ -15,9 +15,9 @@ import {isSnapshotPath} from 'jest-snapshot';
  * to retrieve a list of all transitive inverse dependencies.
  */
 class DependencyResolver {
-  _hasteFS: HasteFS;
-  _resolver: Resolver;
-  _snapshotResolver: Snapshot.SnapshotResolver;
+  private _resolver: Resolver;
+  private _hasteFS: HasteFS;
+  private _snapshotResolver: Snapshot.SnapshotResolver;
 
   constructor(
     resolver: Resolver,
diff --git a/packages/jest-snapshot/src/index.ts b/packages/jest-snapshot/src/index.ts
index bc22a7e4b9d9..b9b60ec9bab8 100644
--- a/packages/jest-snapshot/src/index.ts
+++ b/packages/jest-snapshot/src/index.ts
@@ -6,7 +6,7 @@
  */
 
 import fs from 'fs';
-import {Config, Matchers} from '@jest/types';
+import {Config, Matchers, Snapshot} from '@jest/types';
 import {FS as HasteFS} from 'jest-haste-map';
 
 import diff from 'jest-diff';
@@ -14,7 +14,6 @@ import {EXPECTED_COLOR, matcherHint, RECEIVED_COLOR} from 'jest-matcher-utils';
 import {
   buildSnapshotResolver,
   isSnapshotPath,
-  SnapshotResolver,
   EXTENSION,
 } from './snapshot_resolver';
 import SnapshotState from './State';
@@ -31,7 +30,7 @@ const fileExists = (filePath: Config.Path, hasteFS: HasteFS): boolean =>
 const cleanup = (
   hasteFS: HasteFS,
   update: Config.SnapshotUpdateState,
-  snapshotResolver: SnapshotResolver,
+  snapshotResolver: Snapshot.SnapshotResolver,
 ) => {
   const pattern = '\\.' + EXTENSION + '$';
   const files = hasteFS.matchFiles(pattern);
diff --git a/packages/jest-snapshot/src/snapshot_resolver.ts b/packages/jest-snapshot/src/snapshot_resolver.ts
index 824fb5307dfa..838345c30b23 100644
--- a/packages/jest-snapshot/src/snapshot_resolver.ts
+++ b/packages/jest-snapshot/src/snapshot_resolver.ts
@@ -6,25 +6,19 @@
  */
 
 import path from 'path';
-import {Config} from '@jest/types';
+import {Config, Snapshot} from '@jest/types';
 import chalk from 'chalk';
 
-export type SnapshotResolver = {
-  testPathForConsistencyCheck: string;
-  resolveSnapshotPath(testPath: Config.Path, extension?: string): Config.Path;
-  resolveTestPath(snapshotPath: Config.Path, extension?: string): Config.Path;
-};
-
 export const EXTENSION = 'snap';
 export const DOT_EXTENSION = '.' + EXTENSION;
 
 export const isSnapshotPath = (path: string): boolean =>
   path.endsWith(DOT_EXTENSION);
 
-const cache: Map<Config.Path, SnapshotResolver> = new Map();
+const cache: Map<Config.Path, Snapshot.SnapshotResolver> = new Map();
 export const buildSnapshotResolver = (
   config: Config.ProjectConfig,
-): SnapshotResolver => {
+): Snapshot.SnapshotResolver => {
   const key = config.rootDir;
   if (!cache.has(key)) {
     cache.set(key, createSnapshotResolver(config.snapshotResolver));
@@ -34,13 +28,13 @@ export const buildSnapshotResolver = (
 
 function createSnapshotResolver(
   snapshotResolverPath?: Config.Path | null,
-): SnapshotResolver {
+): Snapshot.SnapshotResolver {
   return typeof snapshotResolverPath === 'string'
     ? createCustomSnapshotResolver(snapshotResolverPath)
     : createDefaultSnapshotResolver();
 }
 
-function createDefaultSnapshotResolver(): SnapshotResolver {
+function createDefaultSnapshotResolver(): Snapshot.SnapshotResolver {
   return {
     resolveSnapshotPath: (testPath: Config.Path) =>
       path.join(
@@ -65,10 +59,10 @@ function createDefaultSnapshotResolver(): SnapshotResolver {
 
 function createCustomSnapshotResolver(
   snapshotResolverPath: Config.Path,
-): SnapshotResolver {
-  const custom: SnapshotResolver = require(snapshotResolverPath);
+): Snapshot.SnapshotResolver {
+  const custom: Snapshot.SnapshotResolver = require(snapshotResolverPath);
 
-  const keys: [keyof SnapshotResolver, string][] = [
+  const keys: [keyof Snapshot.SnapshotResolver, string][] = [
     ['resolveSnapshotPath', 'function'],
     ['resolveTestPath', 'function'],
     ['testPathForConsistencyCheck', 'string'],
@@ -101,7 +95,7 @@ function mustImplement(propName: string, requiredType: string) {
   );
 }
 
-function verifyConsistentTransformations(custom: SnapshotResolver) {
+function verifyConsistentTransformations(custom: Snapshot.SnapshotResolver) {
   const resolvedSnapshotPath = custom.resolveSnapshotPath(
     custom.testPathForConsistencyCheck,
   );