fix(circleci): update type definitions for recursive orb

renovatebot · Oct 7, 2024 · 862acf8 · 862acf8
1 parent 97fa4cd
commit 862acf8
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/lib/modules/manager/circleci/extract.ts b/lib/modules/manager/circleci/extract.ts
@@ -5,10 +5,17 @@ import { OrbDatasource } from '../../datasource/orb';
 import * as npmVersioning from '../../versioning/npm';
 import { getDep } from '../dockerfile/extract';
 import type { PackageDependency, PackageFileContent } from '../types';
-import { CircleCiFile, type CircleCiJob } from './schema';
+import {
+  CircleCiFile,
+  type CircleCiJob,
+  CircleCiOrb,
+  type CircleCiFile as File,
+  type CircleCiOrb as Orb,
+} from './schema';
 
 function extractDefinition(
-  definition: CircleCiOrb | CircleCiFile,
+  definition: Orb | File,
+  packageFile?: string,
 ): PackageDependency[] {
   const deps: PackageDependency[] = [];
 
@@ -28,7 +35,10 @@ function extractDefinition(
           datasource: OrbDatasource.id,
         });
       } else {
-        deps.push(...extractDefinition(orb));
+        const parsed = CircleCiOrb.parse(orb);
+        if (parsed) {
+          deps.push(...extractDefinition(parsed));
+        }
       }
     }
 
@@ -62,7 +72,7 @@ export function extractPackageFile(
       customSchema: CircleCiFile,
     });
 
-    deps.push(...extractDefinition(parsed));
+    deps.push(...extractDefinition(parsed, packageFile));
 
     for (const alias of coerceArray(parsed.aliases)) {
       deps.push({

diff --git a/lib/modules/manager/circleci/schema.ts b/lib/modules/manager/circleci/schema.ts
@@ -13,9 +13,10 @@ export type CircleCiOrb = z.infer<typeof CircleCiOrb>;
 export const CircleCiOrb = z.object({
   executors: z.record(z.string(), CircleCiJob).optional(),
   jobs: z.record(z.string(), CircleCiJob).optional(),
-  orbs: z.record(z.string(), CircleCiOrb).optional(),
+  orbs: z.record(z.unknown()).optional(),
 });
 
+export type CircleCiFile = z.infer<typeof CircleCiFile>;
 export const CircleCiFile = z.object({
   aliases: z.array(CircleCiDocker).optional(),
   executors: z.record(z.string(), CircleCiJob).optional(),