From 8621d8cbbfd710d414301bed8329a52907b1fe60 Mon Sep 17 00:00:00 2001
From: Rhys Arkins <rhys@arkins.net>
Date: Fri, 24 Feb 2023 16:28:35 +0100
Subject: [PATCH] chore: simplify package types (#20598)
---
lib/modules/manager/types.ts | 52 +++++++++++++++++-------------------
1 file changed, 24 insertions(+), 28 deletions(-)
diff --git a/lib/modules/manager/types.ts b/lib/modules/manager/types.ts
index c1fc93c79c..ee8bb0874d 100644
--- a/lib/modules/manager/types.ts
+++ b/lib/modules/manager/types.ts
@@ -73,32 +73,6 @@ export interface PackageFile<T = Record<string, any>>
packageFile: string;
}
-export interface Package<T> extends ManagerData<T> {
- currentValue?: string | null;
- currentDigest?: string;
- depName?: string;
- depType?: string;
- fileReplacePosition?: number;
- groupName?: string;
- lineNumber?: number;
- packageName?: string | null;
- target?: string;
- versioning?: string;
- dataType?: string;
- enabled?: boolean;
-
- // npm manager
- bumpVersion?: ReleaseType | string;
- npmPackageAlias?: boolean;
- packageFileVersion?: string;
- gitRef?: boolean;
- sourceUrl?: string | null;
- pinDigests?: boolean;
- currentRawValue?: string;
- major?: { enabled?: boolean };
- prettyDepType?: string;
-}
-
export interface LookupUpdate {
bucket?: string;
branchName?: string;
@@ -127,7 +101,29 @@ export interface LookupUpdate {
registryUrl?: string;
}
-export interface PackageDependency<T = Record<string, any>> extends Package<T> {
+export interface PackageDependency<T = Record<string, any>>
+ extends ManagerData<T> {
+ currentValue?: string | null;
+ currentDigest?: string;
+ depName?: string;
+ depType?: string;
+ fileReplacePosition?: number;
+ groupName?: string;
+ lineNumber?: number;
+ packageName?: string | null;
+ target?: string;
+ versioning?: string;
+ dataType?: string;
+ enabled?: boolean;
+ bumpVersion?: ReleaseType | string;
+ npmPackageAlias?: boolean;
+ packageFileVersion?: string;
+ gitRef?: boolean;
+ sourceUrl?: string | null;
+ pinDigests?: boolean;
+ currentRawValue?: string;
+ major?: { enabled?: boolean };
+ prettyDepType?: string;
newValue?: string;
warnings?: ValidationMessage[];
commitMessageTopic?: string;
@@ -155,7 +151,7 @@ export interface PackageDependency<T = Record<string, any>> extends Package<T> {
variableName?: string;
}
-export interface Upgrade<T = Record<string, any>> extends Package<T> {
+export interface Upgrade<T = Record<string, any>> extends PackageDependency<T> {
isLockfileUpdate?: boolean;
currentRawValue?: any;
depGroup?: string;
--
GitLab