feat(depsynky): handle peerDependencies + uniform ignore dev accross …

…all commands (#533)
botpress · Jan 22, 2025 · 2c0255b · 2c0255b
1 parent e132ee4
commit 2c0255b
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 24 deletions.
diff --git a/depsynky/bin.js b/depsynky/bin.js
diff --git a/depsynky/package.json b/depsynky/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bpinternal/depsynky",
-  "version": "0.0.10",
+  "version": "0.1.0",
   "description": "CLI to synchronize dependencies accross a pnpm mono-repo",
   "main": "dist/index.js",
   "scripts": {
@@ -12,7 +12,6 @@
   "bin": {
     "depsynky": "./bin.js"
   },
-
   "author": "Botpress, Inc.",
   "license": "MIT",
   "dependencies": {

diff --git a/depsynky/src/commands/check-versions.ts b/depsynky/src/commands/check-versions.ts
@@ -10,7 +10,11 @@ export type CheckVersionsOpts = {
 }
 
 const checker =
-  (pkg: utils.pkgjson.PackageJson) => (current: Record<string, string>, target: Record<string, string>) => {
+  (pkg: utils.pkgjson.PackageJson) => (current: Record<string, string> | undefined, target: Record<string, string>) => {
+    if (!current) {
+      return
+    }
+
     for (const [name, version] of utils.objects.entries(target)) {
       const currentVersion = current[name]
       if (!currentVersion) {
@@ -35,17 +39,13 @@ export const checkVersions = (argv: YargsConfig<typeof config.checkSchema>, opts
   const allPackages = utils.pnpm.searchWorkspaces(argv.rootDir)
   const targetVersions = opts.targetVersions ?? utils.pnpm.versions(allPackages)
 
-  for (const { path: pkgPath, content } of allPackages) {
-    const { dependencies, devDependencies } = utils.pkgjson.read(pkgPath)
+  for (const { content } of allPackages) {
+    const { dependencies, devDependencies, peerDependencies } = content
 
     const check = checker(content)
-    dependencies && check(dependencies, targetVersions)
-
-    if (argv.ignoreDev) {
-      continue
-    }
-
-    devDependencies && check(devDependencies, targetVersions)
+    check(dependencies, targetVersions)
+    check(peerDependencies, targetVersions)
+    !argv.ignoreDev && check(devDependencies, targetVersions)
   }
 
   logger.info('All versions are in sync')

diff --git a/depsynky/src/commands/sync-versions.ts b/depsynky/src/commands/sync-versions.ts
@@ -8,7 +8,11 @@ export type SyncVersionsOpts = {
 }
 
 const updater =
-  (pkg: utils.pkgjson.PackageJson) => (current: Record<string, string>, target: Record<string, string>) => {
+  (pkg: utils.pkgjson.PackageJson) => (current: Record<string, string> | undefined, target: Record<string, string>) => {
+    if (!current) {
+      return current
+    }
+
     for (const [name, version] of utils.objects.entries(target)) {
       const currentVersion = current[name]
       if (!currentVersion) {
@@ -36,12 +40,18 @@ export const syncVersions = (argv: YargsConfig<typeof config.syncSchema>, opts:
   const targetVersions = opts.targetVersions ?? utils.pnpm.versions(allPackages)
 
   for (const { path: pkgPath, content } of allPackages) {
-    const { dependencies, devDependencies } = utils.pkgjson.read(pkgPath)
+    const { dependencies, devDependencies, peerDependencies } = content
 
     const update = updater(content)
-    const updatedDeps = dependencies && update(dependencies, targetVersions)
-    const updatedDevDeps = devDependencies && update(devDependencies, targetVersions)
 
-    utils.pkgjson.update(pkgPath, { dependencies: updatedDeps, devDependencies: updatedDevDeps })
+    const updatedDeps = update(dependencies, targetVersions)
+    const updatedPeerDeps = update(peerDependencies, targetVersions)
+    const updatedDevDeps = argv.ignoreDev ? devDependencies : update(devDependencies, targetVersions)
+
+    utils.pkgjson.update(pkgPath, {
+      dependencies: updatedDeps,
+      devDependencies: updatedDevDeps,
+      peerDependencies: updatedPeerDeps
+    })
   }
 }
diff --git a/depsynky/src/config.ts b/depsynky/src/config.ts
@@ -4,6 +4,11 @@ const defaultOptions = {
   rootDir: {
     type: 'string',
     default: process.cwd()
+  },
+  ignoreDev: {
+    type: 'boolean',
+    description: 'Ignore dev dependencies',
+    default: false
   }
 } satisfies YargsSchema
 
@@ -15,15 +20,12 @@ export const bumpSchema = {
   }
 } satisfies YargsSchema
 
-export const syncSchema = defaultOptions satisfies YargsSchema
+export const syncSchema = {
+  ...defaultOptions
+} satisfies YargsSchema
 
 export const checkSchema = {
-  ...defaultOptions,
-  ignoreDev: {
-    type: 'boolean',
-    description: 'Ignore dev dependencies',
-    default: false
-  }
+  ...defaultOptions
 } satisfies YargsSchema
 
 export const listSchema = defaultOptions satisfies YargsSchema
diff --git a/depsynky/src/utils/pkgjson.ts b/depsynky/src/utils/pkgjson.ts
@@ -8,6 +8,7 @@ export type PackageJson = {
   private?: boolean
   dependencies?: Record<string, string>
   devDependencies?: Record<string, string>
+  peerDependencies?: Record<string, string>
 }
 
 export const read = (filePath: string): PackageJson => {