Move some code

src/lib/lockfile/helpers/generate-pnpm-lockfile.ts

@@ -10,7 +10,7 @@ import { useConfig } from "~/lib/config";
 import { useLogger } from "~/lib/logger";
 import type { PackagesRegistry } from "~/lib/types";
 import { getErrorMessage } from "~/lib/utils";
-import { pnpmMapImporter } from "../process-lockfile";
+import { pnpmMapImporter } from "./pnpm-map-importer";
 
 export async function generatePnpmLockfile({
   workspaceRootDir,

src/lib/lockfile/helpers/pnpm-map-importer.ts

@@ -0,0 +1,38 @@
+import type {
+  ProjectSnapshot,
+  ResolvedDependencies,
+} from "@pnpm/lockfile-file";
+import { mapValues } from "remeda";
+
+/** Convert dependency links */
+export function pnpmMapImporter(
+  { dependencies, devDependencies, ...rest }: ProjectSnapshot,
+  {
+    includeDevDependencies,
+    directoryByPackageName,
+  }: {
+    includeDevDependencies: boolean;
+    includePatchedDependencies: boolean;
+    directoryByPackageName: { [packageName: string]: string };
+  }
+): ProjectSnapshot {
+  return {
+    dependencies: dependencies
+      ? pnpmMapDependenciesLinks(dependencies, directoryByPackageName)
+      : undefined,
+    devDependencies:
+      includeDevDependencies && devDependencies
+        ? pnpmMapDependenciesLinks(devDependencies, directoryByPackageName)
+        : undefined,
+    ...rest,
+  };
+}
+
+function pnpmMapDependenciesLinks(
+  def: ResolvedDependencies,
+  directoryByPackageName: { [packageName: string]: string }
+): ResolvedDependencies {
+  return mapValues(def, (value, key) =>
+    value.startsWith("link:") ? `link:./${directoryByPackageName[key]}` : value
+  );
+}

src/lib/lockfile/process-lockfile.ts

@@ -1,8 +1,3 @@
-import type {
-  ProjectSnapshot,
-  ResolvedDependencies,
-} from "@pnpm/lockfile-file";
-import { mapValues } from "remeda";
 import { useConfig } from "../config";
 import { useLogger } from "../logger";
 import { usePackageManager } from "../package-manager";
@@ -11,39 +6,6 @@ import { generateNpmLockfile } from "./helpers/generate-npm-lockfile";
 import { generatePnpmLockfile } from "./helpers/generate-pnpm-lockfile";
 import { generateYarnLockfile } from "./helpers/generate-yarn-lockfile";
 
-/** Convert dependency links */
-export function pnpmMapImporter(
-  { dependencies, devDependencies, ...rest }: ProjectSnapshot,
-  {
-    includeDevDependencies,
-    directoryByPackageName,
-  }: {
-    includeDevDependencies: boolean;
-    includePatchedDependencies: boolean;
-    directoryByPackageName: { [packageName: string]: string };
-  }
-): ProjectSnapshot {
-  return {
-    dependencies: dependencies
-      ? pnpmMapDependenciesLinks(dependencies, directoryByPackageName)
-      : undefined,
-    devDependencies:
-      includeDevDependencies && devDependencies
-        ? pnpmMapDependenciesLinks(devDependencies, directoryByPackageName)
-        : undefined,
-    ...rest,
-  };
-}
-
-function pnpmMapDependenciesLinks(
-  def: ResolvedDependencies,
-  directoryByPackageName: { [packageName: string]: string }
-): ResolvedDependencies {
-  return mapValues(def, (value, key) =>
-    value.startsWith("link:") ? `link:./${directoryByPackageName[key]}` : value
-  );
-}
-
 /**
  * Adapt the lockfile and write it to the isolate directory. Because we keep the
  * structure of packages in the isolate directory the same as they were in the