refactor(npm): Simplify .yarnrc parsing (#24931)

renovatebot · Oct 1, 2023 · 906c982 · 906c982
1 parent 2611b88
commit 906c982
Showing 1 changed file with 19 additions and 24 deletions.
diff --git a/lib/modules/manager/npm/extract/yarnrc.ts b/lib/modules/manager/npm/extract/yarnrc.ts
@@ -1,19 +1,22 @@
 import is from '@sindresorhus/is';
-import { load } from 'js-yaml';
 import { z } from 'zod';
 import { logger } from '../../../../logger';
 import { regEx } from '../../../../util/regex';
+import { Result } from '../../../../util/result';
+import { Yaml } from '../../../../util/schema-utils';
 
-const YarnrcYmlSchema = z.object({
-  npmRegistryServer: z.string().optional(),
-  npmScopes: z
-    .record(
-      z.object({
-        npmRegistryServer: z.string().optional(),
-      })
-    )
-    .optional(),
-});
+const YarnrcYmlSchema = Yaml.pipe(
+  z.object({
+    npmRegistryServer: z.string().optional(),
+    npmScopes: z
+      .record(
+        z.object({
+          npmRegistryServer: z.string().optional(),
+        })
+      )
+      .optional(),
+  })
+);
 
 export type YarnConfig = z.infer<typeof YarnrcYmlSchema>;
 
@@ -43,19 +46,11 @@ export function loadConfigFromLegacyYarnrc(
 }
 
 export function loadConfigFromYarnrcYml(yarnrcYml: string): YarnConfig | null {
-  try {
-    const obj = load(yarnrcYml, {
-      json: true,
-    });
-    if (!obj) {
-      // emtpy yaml file
-      return null;
-    }
-    return YarnrcYmlSchema.parse(obj);
-  } catch (err) {
-    logger.warn({ yarnrcYml, err }, `Failed to load yarnrc file`);
-    return null;
-  }
+  return Result.parse(yarnrcYml, YarnrcYmlSchema)
+    .onError((err) => {
+      logger.warn({ yarnrcYml, err }, `Failed to load yarnrc file`);
+    })
+    .unwrapOrNull();
 }
 
 export function resolveRegistryUrl(