@socketsecurity/cli-with-sentry 0.14.66 → 0.14.68

package/dist/module-sync/cmd.d.ts

@@ -1,4 +1,4 @@
-declare function cmdFlagsToString(args: string[]): string;
-declare function cmdPrefixMessage(cmdName: string, text: string): string;
-declare function isHelpFlag(cmdArg: string): boolean;
-export { cmdFlagsToString, cmdPrefixMessage, isHelpFlag };
+declare function cmdFlagsToString(args: string[]): string
+declare function cmdPrefixMessage(cmdName: string, text: string): string
+declare function isHelpFlag(cmdArg: string): boolean
+export { cmdFlagsToString, cmdPrefixMessage, isHelpFlag }

package/dist/module-sync/config.d.ts

@@ -0,0 +1,32 @@
+import config from '@socketsecurity/config'
+interface LocalConfig {
+  apiBaseUrl?: string | null | undefined
+  apiKey?: string | null | undefined
+  apiProxy?: string | null | undefined
+  apiToken?: string | null | undefined
+  defaultOrg?: string
+  enforcedOrgs?: string[] | readonly string[] | null | undefined
+}
+declare const supportedConfigKeys: Map<keyof LocalConfig, string>
+declare const sensitiveConfigKeys: Set<keyof LocalConfig>
+declare function overrideCachedConfig(config: object): void
+declare function findSocketYmlSync(dir?: string): {
+  path: string
+  parsed: config.SocketYml
+} | null
+declare function getConfigValue<Key extends keyof LocalConfig>(
+  key: Key
+): LocalConfig[Key]
+declare function updateConfigValue<Key extends keyof LocalConfig>(
+  key: keyof LocalConfig,
+  value: LocalConfig[Key]
+): void
+export {
+  LocalConfig,
+  supportedConfigKeys,
+  sensitiveConfigKeys,
+  overrideCachedConfig,
+  findSocketYmlSync,
+  getConfigValue,
+  updateConfigValue
+}

package/dist/module-sync/edge.d.ts

@@ -1,65 +1,78 @@
 /// <reference types="npmcli__arborist" />
-import { SafeNode } from "./node.js";
-import { SafeOverrideSet } from "./override-set.js";
-import { DependencyProblem } from '@npmcli/arborist';
-import { Edge as BaseEdge } from "@npmcli/arborist";
-type EdgeClass = Omit<BaseEdge, 'accept' | 'detach' | 'optional' | 'overrides' | 'peer' | 'peerConflicted' | 'rawSpec' | 'reload' | 'satisfiedBy' | 'spec' | 'to'> & {
-    optional: boolean;
-    overrides: SafeOverrideSet | undefined;
-    peer: boolean;
-    peerConflicted: boolean;
-    rawSpec: string;
-    get accept(): string | undefined;
-    get spec(): string;
-    get to(): SafeNode | null;
-    new (...args: any): EdgeClass;
-    detach(): void;
-    reload(hard?: boolean): void;
-    satisfiedBy(node: SafeNode): boolean;
-};
+import { SafeNode } from './node.js'
+import { SafeOverrideSet } from './override-set.js'
+import { DependencyProblem } from '@npmcli/arborist'
+import { Edge as BaseEdge } from '@npmcli/arborist'
+type EdgeClass = Omit<
+  BaseEdge,
+  | 'accept'
+  | 'detach'
+  | 'optional'
+  | 'overrides'
+  | 'peer'
+  | 'peerConflicted'
+  | 'rawSpec'
+  | 'reload'
+  | 'satisfiedBy'
+  | 'spec'
+  | 'to'
+> & {
+  optional: boolean
+  overrides: SafeOverrideSet | undefined
+  peer: boolean
+  peerConflicted: boolean
+  rawSpec: string
+  get accept(): string | undefined
+  get spec(): string
+  get to(): SafeNode | null
+  new (...args: any): EdgeClass
+  detach(): void
+  reload(hard?: boolean): void
+  satisfiedBy(node: SafeNode): boolean
+}
 type EdgeOptions = {
-    type: string;
-    name: string;
-    spec: string;
-    from: SafeNode;
-    accept?: string | undefined;
-    overrides?: SafeOverrideSet | undefined;
-    to?: SafeNode | undefined;
-};
-type ErrorStatus = DependencyProblem | 'OK';
+  type: string
+  name: string
+  spec: string
+  from: SafeNode
+  accept?: string | undefined
+  overrides?: SafeOverrideSet | undefined
+  to?: SafeNode | undefined
+}
+type ErrorStatus = DependencyProblem | 'OK'
 type Explanation = {
-    type: string;
-    name: string;
-    spec: string;
-    bundled: boolean;
-    overridden: boolean;
-    error: ErrorStatus | undefined;
-    rawSpec: string | undefined;
-    from: object | undefined;
-} | null;
-declare const Edge: EdgeClass;
+  type: string
+  name: string
+  spec: string
+  bundled: boolean
+  overridden: boolean
+  error: ErrorStatus | undefined
+  rawSpec: string | undefined
+  from: object | undefined
+} | null
+declare const Edge: EdgeClass
 declare class SafeEdge extends Edge {
-    #private;
-    constructor(options: EdgeOptions);
-    get bundled(): boolean;
-    get error(): "DETACHED" | "MISSING" | "PEER LOCAL" | "INVALID" | null;
-    get from(): SafeNode | null;
-    get spec(): string;
-    get to(): SafeNode | null;
-    detach(): void;
-    // Return the edge data, and an explanation of how that edge came to be here.
-    // @ts-ignore: Edge#explain is defined with an unused `seen = []` param.
-    explain(): {
-        type: string;
-        name: string;
-        spec: string;
-        bundled: boolean;
-        overridden: boolean;
-        error: ErrorStatus | undefined;
-        rawSpec: string | undefined;
-        from: object | undefined;
-    };
-    reload(hard?: boolean): void;
-    satisfiedBy(node: SafeNode): boolean;
+  #private
+  constructor(options: EdgeOptions)
+  get bundled(): boolean
+  get error(): 'DETACHED' | 'MISSING' | 'PEER LOCAL' | 'INVALID' | null
+  get from(): SafeNode | null
+  get spec(): string
+  get to(): SafeNode | null
+  detach(): void
+  // Return the edge data, and an explanation of how that edge came to be here.
+  // @ts-ignore: Edge#explain is defined with an unused `seen = []` param.
+  explain(): {
+    type: string
+    name: string
+    spec: string
+    bundled: boolean
+    overridden: boolean
+    error: ErrorStatus | undefined
+    rawSpec: string | undefined
+    from: object | undefined
+  }
+  reload(hard?: boolean): void
+  satisfiedBy(node: SafeNode): boolean
 }
-export { EdgeOptions, ErrorStatus, Explanation, Edge, SafeEdge };
+export { EdgeOptions, ErrorStatus, Explanation, Edge, SafeEdge }

package/dist/module-sync/errors.d.ts

@@ -1,14 +1,29 @@
 /// <reference types="node" />
-type EventHintOrCaptureContext = {
-    [key: string]: any;
-} | Function;
-declare class AuthError extends Error {
-}
+type EventHintOrCaptureContext =
+  | {
+      [key: string]: any
+    }
+  | Function
+declare class AuthError extends Error {}
 declare class InputError extends Error {
-    body: string | undefined;
-    constructor(message: string, body?: string);
+  body: string | undefined
+  constructor(message: string, body?: string)
+}
+declare function captureException(
+  exception: unknown,
+  hint?: EventHintOrCaptureContext | undefined
+): Promise<string>
+declare function captureExceptionSync(
+  exception: unknown,
+  hint?: EventHintOrCaptureContext | undefined
+): string
+declare function isErrnoException(
+  value: unknown
+): value is NodeJS.ErrnoException
+export {
+  AuthError,
+  InputError,
+  captureException,
+  captureExceptionSync,
+  isErrnoException
 }
-declare function captureException(exception: unknown, hint?: EventHintOrCaptureContext | undefined): Promise<string>;
-declare function captureExceptionSync(exception: unknown, hint?: EventHintOrCaptureContext | undefined): string;
-declare function isErrnoException(value: unknown): value is NodeJS.ErrnoException;
-export { AuthError, InputError, captureException, captureExceptionSync, isErrnoException };

package/dist/module-sync/fs.d.ts

@@ -0,0 +1,61 @@
+/// <reference types="node" />
+import { Remap } from '@socketsecurity/registry/lib/objects'
+import { Abortable } from 'node:events'
+import {
+  ObjectEncodingOptions,
+  OpenMode,
+  PathLike,
+  PathOrFileDescriptor
+} from 'node:fs'
+import { FileHandle } from 'node:fs/promises'
+type FindUpOptions = {
+  cwd?: string | undefined
+  signal?: AbortSignal | undefined
+}
+declare function findUp(
+  name: string | string[],
+  { cwd, signal }: FindUpOptions
+): Promise<string | undefined>
+type ReadFileOptions = Remap<
+  ObjectEncodingOptions &
+    Abortable & {
+      flag?: OpenMode | undefined
+    }
+>
+declare function readFileBinary(
+  filepath: PathLike | FileHandle,
+  options?: ReadFileOptions | undefined
+): Promise<Buffer>
+declare function readFileUtf8(
+  filepath: PathLike | FileHandle,
+  options?: ReadFileOptions | undefined
+): Promise<string>
+declare function safeReadFile(
+  filepath: PathLike | FileHandle,
+  options?:
+    | 'utf8'
+    | 'utf-8'
+    | {
+        encoding: 'utf8' | 'utf-8'
+      }
+    | undefined
+): Promise<string | undefined>
+declare function safeReadFileSync(
+  filepath: PathOrFileDescriptor,
+  options?:
+    | 'utf8'
+    | 'utf-8'
+    | {
+        encoding: 'utf8' | 'utf-8'
+      }
+    | undefined
+): string | undefined
+export {
+  FindUpOptions,
+  findUp,
+  ReadFileOptions,
+  readFileBinary,
+  readFileUtf8,
+  safeReadFile,
+  safeReadFileSync
+}

package/dist/module-sync/index.d.ts

@@ -1,23 +1,34 @@
-import { ArboristClass } from "./types.js";
-import { SafeNode } from "./node.js";
+import { ArboristClass } from './types.js'
+import { SafeNode } from './node.js'
 declare const SAFE_ARBORIST_REIFY_OPTIONS_OVERRIDES: {
-    __proto__: null;
-    audit: boolean;
-    dryRun: boolean;
-    fund: boolean;
-    ignoreScripts: boolean;
-    progress: boolean;
-    save: boolean;
-    saveBundle: boolean;
-    silent: boolean;
-};
-declare const kCtorArgs: unique symbol;
-declare const kRiskyReify: unique symbol;
-declare const Arborist: ArboristClass;
+  __proto__: null
+  audit: boolean
+  dryRun: boolean
+  fund: boolean
+  ignoreScripts: boolean
+  progress: boolean
+  save: boolean
+  saveBundle: boolean
+  silent: boolean
+}
+declare const kCtorArgs: unique symbol
+declare const kRiskyReify: unique symbol
+declare const Arborist: ArboristClass
 declare class SafeArborist extends Arborist {
-    constructor(...ctorArgs: ConstructorParameters<ArboristClass>);
-    [kRiskyReify](...args: Parameters<InstanceType<ArboristClass>['reify']>): Promise<SafeNode>;
-    // @ts-ignore Incorrectly typed.
-    reify(this: SafeArborist, ...args: Parameters<InstanceType<ArboristClass>['reify']>): Promise<SafeNode>;
+  constructor(...ctorArgs: ConstructorParameters<ArboristClass>)
+  [kRiskyReify](
+    ...args: Parameters<InstanceType<ArboristClass>['reify']>
+  ): Promise<SafeNode>
+  // @ts-ignore Incorrectly typed.
+  reify(
+    this: SafeArborist,
+    ...args: Parameters<InstanceType<ArboristClass>['reify']>
+  ): Promise<SafeNode>
+}
+export {
+  SAFE_ARBORIST_REIFY_OPTIONS_OVERRIDES,
+  kCtorArgs,
+  kRiskyReify,
+  Arborist,
+  SafeArborist
 }
-export { SAFE_ARBORIST_REIFY_OPTIONS_OVERRIDES, kCtorArgs, kRiskyReify, Arborist, SafeArborist };

package/dist/module-sync/node.d.ts

@@ -1,86 +1,121 @@
 /// <reference types="npmcli__arborist" />
-import { SafeOverrideSet } from "./override-set.js";
-import { SafeEdge } from "./edge.js";
-import { Link } from '@npmcli/arborist';
-import { Node as BaseNode } from "@npmcli/arborist";
-type NodeClass = Omit<BaseNode, 'addEdgeIn' | 'addEdgeOut' | 'canDedupe' | 'canReplace' | 'canReplaceWith' | 'children' | 'deleteEdgeIn' | 'edgesIn' | 'edgesOut' | 'from' | 'hasShrinkwrap' | 'inDepBundle' | 'inShrinkwrap' | 'integrity' | 'isTop' | 'matches' | 'meta' | 'name' | 'overrides' | 'packageName' | 'parent' | 'recalculateOutEdgesOverrides' | 'resolve' | 'resolveParent' | 'root' | 'updateOverridesEdgeInAdded' | 'updateOverridesEdgeInRemoved' | 'version' | 'versions'> & {
-    name: string;
-    version: string;
-    children: Map<string, SafeNode | Link>;
-    edgesIn: Set<SafeEdge>;
-    edgesOut: Map<string, SafeEdge>;
-    from: SafeNode | null;
-    hasShrinkwrap: boolean;
-    inShrinkwrap: boolean | undefined;
-    integrity?: string | null;
-    isTop: boolean | undefined;
-    meta: BaseNode['meta'] & {
-        addEdge(edge: SafeEdge): void;
-    };
-    overrides: SafeOverrideSet | undefined;
-    versions: string[];
-    get inDepBundle(): boolean;
-    get packageName(): string | null;
-    get parent(): SafeNode | null;
-    set parent(value: SafeNode | null);
-    get resolveParent(): SafeNode | null;
-    get root(): SafeNode | null;
-    set root(value: SafeNode | null);
-    new (...args: any): NodeClass;
-    addEdgeIn(edge: SafeEdge): void;
-    addEdgeOut(edge: SafeEdge): void;
-    canDedupe(preferDedupe?: boolean): boolean;
-    canReplace(node: SafeNode, ignorePeers?: string[]): boolean;
-    canReplaceWith(node: SafeNode, ignorePeers?: string[]): boolean;
-    deleteEdgeIn(edge: SafeEdge): void;
-    matches(node: SafeNode): boolean;
-    recalculateOutEdgesOverrides(): void;
-    resolve(name: string): SafeNode;
-    updateOverridesEdgeInAdded(otherOverrideSet: SafeOverrideSet | undefined): boolean;
-    updateOverridesEdgeInRemoved(otherOverrideSet: SafeOverrideSet): boolean;
-};
-declare const Node: NodeClass;
+import { SafeOverrideSet } from './override-set.js'
+import { SafeEdge } from './edge.js'
+import { Link } from '@npmcli/arborist'
+import { Node as BaseNode } from '@npmcli/arborist'
+type NodeClass = Omit<
+  BaseNode,
+  | 'addEdgeIn'
+  | 'addEdgeOut'
+  | 'canDedupe'
+  | 'canReplace'
+  | 'canReplaceWith'
+  | 'children'
+  | 'deleteEdgeIn'
+  | 'edgesIn'
+  | 'edgesOut'
+  | 'from'
+  | 'hasShrinkwrap'
+  | 'inDepBundle'
+  | 'inShrinkwrap'
+  | 'integrity'
+  | 'isTop'
+  | 'matches'
+  | 'meta'
+  | 'name'
+  | 'overrides'
+  | 'packageName'
+  | 'parent'
+  | 'recalculateOutEdgesOverrides'
+  | 'resolve'
+  | 'resolveParent'
+  | 'root'
+  | 'updateOverridesEdgeInAdded'
+  | 'updateOverridesEdgeInRemoved'
+  | 'version'
+  | 'versions'
+> & {
+  name: string
+  version: string
+  children: Map<string, SafeNode | Link>
+  edgesIn: Set<SafeEdge>
+  edgesOut: Map<string, SafeEdge>
+  from: SafeNode | null
+  hasShrinkwrap: boolean
+  inShrinkwrap: boolean | undefined
+  integrity?: string | null
+  isTop: boolean | undefined
+  meta: BaseNode['meta'] & {
+    addEdge(edge: SafeEdge): void
+  }
+  overrides: SafeOverrideSet | undefined
+  versions: string[]
+  get inDepBundle(): boolean
+  get packageName(): string | null
+  get parent(): SafeNode | null
+  set parent(value: SafeNode | null)
+  get resolveParent(): SafeNode | null
+  get root(): SafeNode | null
+  set root(value: SafeNode | null)
+  new (...args: any): NodeClass
+  addEdgeIn(edge: SafeEdge): void
+  addEdgeOut(edge: SafeEdge): void
+  canDedupe(preferDedupe?: boolean): boolean
+  canReplace(node: SafeNode, ignorePeers?: string[]): boolean
+  canReplaceWith(node: SafeNode, ignorePeers?: string[]): boolean
+  deleteEdgeIn(edge: SafeEdge): void
+  matches(node: SafeNode): boolean
+  recalculateOutEdgesOverrides(): void
+  resolve(name: string): SafeNode
+  updateOverridesEdgeInAdded(
+    otherOverrideSet: SafeOverrideSet | undefined
+  ): boolean
+  updateOverridesEdgeInRemoved(otherOverrideSet: SafeOverrideSet): boolean
+}
+declare const Node: NodeClass
 declare class SafeNode extends Node {
-    // Return true if it's safe to remove this node, because anything that is
-    // depending on it would be fine with the thing that they would resolve to if
-    // it was removed, or nothing is depending on it in the first place.
-    canDedupe(preferDedupe?: boolean): boolean;
-    // Is it safe to replace one node with another?  check the edges to
-    // make sure no one will get upset.  Note that the node might end up
-    // having its own unmet dependencies, if the new node has new deps.
-    // Note that there are cases where Arborist will opt to insert a node
-    // into the tree even though this function returns false!  This is
-    // necessary when a root dependency is added or updated, or when a
-    // root dependency brings peer deps along with it.  In that case, we
-    // will go ahead and create the invalid state, and then try to resolve
-    // it with more tree construction, because it's a user request.
-    canReplaceWith(node: SafeNode, ignorePeers?: string[]): boolean;
-    // Patch adding deleteEdgeIn is based on https://github.com/npm/cli/pull/8089.
-    deleteEdgeIn(edge: SafeEdge): void;
-    addEdgeIn(edge: SafeEdge): void;
-    get overridden(): boolean;
-    set parent(newParent: SafeNode);
-    // Patch adding recalculateOutEdgesOverrides is based on
-    // https://github.com/npm/cli/pull/8089.
-    recalculateOutEdgesOverrides(): void;
-    set root(newRoot: SafeNode);
-    // Patch adding updateOverridesEdgeInAdded is based on
-    // https://github.com/npm/cli/pull/7025.
-    //
-    // This logic isn't perfect either. When we have two edges in that have
-    // different override sets, then we have to decide which set is correct. This
-    // function assumes the more specific override set is applicable, so if we have
-    // dependencies A->B->C and A->C and an override set that specifies what happens
-    // for C under A->B, this will work even if the new A->C edge comes along and
-    // tries to change the override set. The strictly correct logic is not to allow
-    // two edges with different overrides to point to the same node, because even
-    // if this node can satisfy both, one of its dependencies might need to be
-    // different depending on the edge leading to it. However, this might cause a
-    // lot of duplication, because the conflict in the dependencies might never
-    // actually happen.
-    updateOverridesEdgeInAdded(otherOverrideSet: SafeOverrideSet | undefined): boolean;
-    // Patch adding updateOverridesEdgeInRemoved is based on
-    // https://github.com/npm/cli/pull/7025.
-    updateOverridesEdgeInRemoved(otherOverrideSet: SafeOverrideSet): boolean;
+  // Return true if it's safe to remove this node, because anything that is
+  // depending on it would be fine with the thing that they would resolve to if
+  // it was removed, or nothing is depending on it in the first place.
+  canDedupe(preferDedupe?: boolean): boolean
+  // Is it safe to replace one node with another?  check the edges to
+  // make sure no one will get upset.  Note that the node might end up
+  // having its own unmet dependencies, if the new node has new deps.
+  // Note that there are cases where Arborist will opt to insert a node
+  // into the tree even though this function returns false!  This is
+  // necessary when a root dependency is added or updated, or when a
+  // root dependency brings peer deps along with it.  In that case, we
+  // will go ahead and create the invalid state, and then try to resolve
+  // it with more tree construction, because it's a user request.
+  canReplaceWith(node: SafeNode, ignorePeers?: string[]): boolean
+  // Patch adding deleteEdgeIn is based on https://github.com/npm/cli/pull/8089.
+  deleteEdgeIn(edge: SafeEdge): void
+  addEdgeIn(edge: SafeEdge): void
+  get overridden(): boolean
+  set parent(newParent: SafeNode)
+  // Patch adding recalculateOutEdgesOverrides is based on
+  // https://github.com/npm/cli/pull/8089.
+  recalculateOutEdgesOverrides(): void
+  set root(newRoot: SafeNode)
+  // Patch adding updateOverridesEdgeInAdded is based on
+  // https://github.com/npm/cli/pull/7025.
+  //
+  // This logic isn't perfect either. When we have two edges in that have
+  // different override sets, then we have to decide which set is correct. This
+  // function assumes the more specific override set is applicable, so if we have
+  // dependencies A->B->C and A->C and an override set that specifies what happens
+  // for C under A->B, this will work even if the new A->C edge comes along and
+  // tries to change the override set. The strictly correct logic is not to allow
+  // two edges with different overrides to point to the same node, because even
+  // if this node can satisfy both, one of its dependencies might need to be
+  // different depending on the edge leading to it. However, this might cause a
+  // lot of duplication, because the conflict in the dependencies might never
+  // actually happen.
+  updateOverridesEdgeInAdded(
+    otherOverrideSet: SafeOverrideSet | undefined
+  ): boolean
+  // Patch adding updateOverridesEdgeInRemoved is based on
+  // https://github.com/npm/cli/pull/7025.
+  updateOverridesEdgeInRemoved(otherOverrideSet: SafeOverrideSet): boolean
 }
-export { SafeNode };
+export { SafeNode }

package/dist/module-sync/override-set.d.ts

@@ -1,37 +1,43 @@
-import { SafeEdge } from "./edge.js";
-import { SafeNode } from "./node.js";
+import { SafeEdge } from './edge.js'
+import { SafeNode } from './node.js'
 interface OverrideSetClass {
-    children: Map<string, SafeOverrideSet>;
-    key: string | undefined;
-    keySpec: string | undefined;
-    name: string | undefined;
-    parent: SafeOverrideSet | undefined;
-    value: string | undefined;
-    version: string | undefined;
-    new (...args: any[]): OverrideSetClass;
-    get isRoot(): boolean;
-    get ruleset(): Map<string, SafeOverrideSet>;
-    ancestry(): Generator<SafeOverrideSet>;
-    childrenAreEqual(otherOverrideSet: SafeOverrideSet | undefined): boolean;
-    getEdgeRule(edge: SafeEdge): SafeOverrideSet;
-    getNodeRule(node: SafeNode): SafeOverrideSet;
-    getMatchingRule(node: SafeNode): SafeOverrideSet | null;
-    isEqual(otherOverrideSet: SafeOverrideSet | undefined): boolean;
+  children: Map<string, SafeOverrideSet>
+  key: string | undefined
+  keySpec: string | undefined
+  name: string | undefined
+  parent: SafeOverrideSet | undefined
+  value: string | undefined
+  version: string | undefined
+  new (...args: any[]): OverrideSetClass
+  get isRoot(): boolean
+  get ruleset(): Map<string, SafeOverrideSet>
+  ancestry(): Generator<SafeOverrideSet>
+  childrenAreEqual(otherOverrideSet: SafeOverrideSet | undefined): boolean
+  getEdgeRule(edge: SafeEdge): SafeOverrideSet
+  getNodeRule(node: SafeNode): SafeOverrideSet
+  getMatchingRule(node: SafeNode): SafeOverrideSet | null
+  isEqual(otherOverrideSet: SafeOverrideSet | undefined): boolean
 }
-declare const OverrideSet: OverrideSetClass;
+declare const OverrideSet: OverrideSetClass
 declare class SafeOverrideSet extends OverrideSet {
-    // Patch adding doOverrideSetsConflict is based on
-    // https://github.com/npm/cli/pull/8089.
-    static doOverrideSetsConflict(first: SafeOverrideSet | undefined, second: SafeOverrideSet | undefined): boolean;
-    // Patch adding findSpecificOverrideSet is based on
-    // https://github.com/npm/cli/pull/8089.
-    static findSpecificOverrideSet(first: SafeOverrideSet | undefined, second: SafeOverrideSet | undefined): SafeOverrideSet | undefined;
-    // Patch adding childrenAreEqual is based on
-    // https://github.com/npm/cli/pull/8089.
-    childrenAreEqual(otherOverrideSet: SafeOverrideSet): boolean;
-    getEdgeRule(edge: SafeEdge): SafeOverrideSet;
-    // Patch adding isEqual is based on
-    // https://github.com/npm/cli/pull/8089.
-    isEqual(otherOverrideSet: SafeOverrideSet | undefined): boolean;
+  // Patch adding doOverrideSetsConflict is based on
+  // https://github.com/npm/cli/pull/8089.
+  static doOverrideSetsConflict(
+    first: SafeOverrideSet | undefined,
+    second: SafeOverrideSet | undefined
+  ): boolean
+  // Patch adding findSpecificOverrideSet is based on
+  // https://github.com/npm/cli/pull/8089.
+  static findSpecificOverrideSet(
+    first: SafeOverrideSet | undefined,
+    second: SafeOverrideSet | undefined
+  ): SafeOverrideSet | undefined
+  // Patch adding childrenAreEqual is based on
+  // https://github.com/npm/cli/pull/8089.
+  childrenAreEqual(otherOverrideSet: SafeOverrideSet): boolean
+  getEdgeRule(edge: SafeEdge): SafeOverrideSet
+  // Patch adding isEqual is based on
+  // https://github.com/npm/cli/pull/8089.
+  isEqual(otherOverrideSet: SafeOverrideSet | undefined): boolean
 }
-export { SafeOverrideSet };
+export { SafeOverrideSet }