@gcmdev/faxios 0.2.1 → 0.2.2

package/src/lib/types.ts

@@ -10,30 +10,30 @@ export type StringLiteralsOrString<Literals extends string> =
   | (string & {});
 
 export type FaxiosHeaderValue =
-  | string
   | Array<string>
-  | number
   | boolean
-  | null;
+  | null
+  | number
+  | string;
 
 export interface RawFaxiosHeaders {
   [key: string]: FaxiosHeaderValue;
 }
 
 type UppercaseMethod =
-  | "GET"
   | "DELETE"
+  | "GET"
   | "HEAD"
+  | "LINK"
   | "OPTIONS"
-  | "POST"
-  | "PUT"
   | "PATCH"
+  | "POST"
   | "PURGE"
-  | "LINK"
-  | "UNLINK"
-  | "QUERY";
+  | "PUT"
+  | "QUERY"
+  | "UNLINK";
 
-export type Method = UppercaseMethod | Lowercase<UppercaseMethod>;
+export type Method = Lowercase<UppercaseMethod> | UppercaseMethod;
 
 type CommonRequestHeadersList =
   | "Accept"
@@ -51,21 +51,21 @@ type CommonRequestHeadersList =
   | "X-Requested-With";
 
 type ContentType =
+  | Exclude<FaxiosHeaderValue, string>
   | StringLiteralsOrString<
-    | "text/html"
-    | "text/plain"
-    | "multipart/form-data"
+    | "application/graphql-response+json"
     | "application/json"
-    | "application/x-www-form-urlencoded"
+    | "application/json-patch+json"
+    | "application/ld+json"
+    | "application/merge-patch+json"
     | "application/octet-stream"
     | "application/problem+json"
-    | "application/ld+json"
+    | "application/x-www-form-urlencoded"
+    | "multipart/form-data"
     | "text/event-stream"
-    | "application/graphql-response+json"
-    | "application/merge-patch+json"
-    | "application/json-patch+json"
-  >
-  | Exclude<FaxiosHeaderValue, string>;
+    | "text/html"
+    | "text/plain"
+  >;
 
 /**
  * A header bag: header names mapped to header values. Any header name is
@@ -86,42 +86,42 @@ export type ResponseType =
   | "arraybuffer"
   | "blob"
   | "document"
+  | "formdata"
   | "json"
-  | "text"
+  | "response"
   | "stream"
-  | "formdata"
-  | "response";
+  | "text";
 
 type UppercaseResponseEncoding =
-  | "ASCII"
   | "ANSI"
-  | "BINARY"
+  | "ASCII"
   | "BASE64"
   | "BASE64URL"
+  | "BINARY"
   | "HEX"
   | "LATIN1"
-  | "UCS-2"
   | "UCS2"
-  | "UTF-8"
+  | "UCS-2"
   | "UTF8"
-  | "UTF16LE";
+  | "UTF16LE"
+  | "UTF-8";
 
 export type responseEncoding =
-  | UppercaseResponseEncoding
-  | Lowercase<UppercaseResponseEncoding>;
+  | Lowercase<UppercaseResponseEncoding>
+  | UppercaseResponseEncoding;
 
 export interface TransitionalOptions {
-  silentJSONParsing?: boolean;
-  forcedJSONParsing?: boolean;
-  clarifyTimeoutError?: boolean;
   advertiseZstdAcceptEncoding?: boolean;
+  clarifyTimeoutError?: boolean;
+  forcedJSONParsing?: boolean;
+  silentJSONParsing?: boolean;
   validateStatusUndefinedResolves?: boolean;
 }
 
 export interface GenericAbortSignal {
   readonly aborted: boolean;
-  onabort?: ((event: Event) => void) | null;
   addEventListener?: (...args: Array<unknown>) => unknown;
+  onabort?: ((event: Event) => void) | null;
   removeEventListener?: (...args: Array<unknown>) => unknown;
 }
 
@@ -130,14 +130,14 @@ export interface GenericFormData {
 }
 
 export interface GenericHTMLFormElement {
-  name: string;
   method: string;
+  name: string;
   submit: () => void;
 }
 
 export interface FormDataVisitorHelpers {
-  defaultVisitor: SerializerVisitor;
   convertValue: (value: unknown) => unknown;
+  defaultVisitor: SerializerVisitor;
   isVisitable: (value: unknown) => boolean;
 }
 
@@ -145,19 +145,19 @@ export interface SerializerVisitor {
   (
     this: GenericFormData,
     value: unknown,
-    key: string | number,
-    path: null | Array<string | number>,
+    key: number | string,
+    path: Array<number | string> | null,
     helpers: FormDataVisitorHelpers,
   ): boolean;
 }
 
 export interface SerializerOptions {
-  visitor?: SerializerVisitor;
   dots?: boolean;
-  metaTokens?: boolean;
   indexes?: boolean | null;
   /** Maximum nesting depth to serialize; deeper objects throw `ERR_FORM_DATA_DEPTH_EXCEEDED`. `Infinity` disables the check. */
   maxDepth?: number;
+  metaTokens?: boolean;
+  visitor?: SerializerVisitor;
 }
 
 // tslint:disable-next-line
@@ -180,59 +180,59 @@ type BrowserProgressEvent = unknown;
 type Milliseconds = number;
 
 export interface FaxiosProgressEvent {
-  loaded: number;
-  total?: number;
-  progress?: number;
   bytes: number;
-  rate?: number;
-  estimated?: number;
-  upload?: boolean;
   download?: boolean;
+  estimated?: number;
   event?: BrowserProgressEvent;
   lengthComputable: boolean;
+  loaded: number;
+  progress?: number;
+  rate?: number;
+  total?: number;
+  upload?: boolean;
 }
 
 export interface FaxiosBasicCredentials {
-  username: string;
   password: string;
+  username: string;
 }
 
 // forward-declared; implemented in core/FaxiosHeaders.ts
 // Using a structural type that matches FaxiosHeaders class methods
 type HeaderMatcher =
-  | string
+  | ((value: string, name: string) => boolean)
   | RegExp
-  | ((value: string, name: string) => boolean);
+  | string;
 
-type HeaderGetResult = string | Array<string> | Record<string, string> | RegExpExecArray | true | null | undefined;
+type HeaderGetResult = Array<string> | null | Record<string, string> | RegExpExecArray | string | true | undefined;
 
 export type FaxiosRequestHeaders = Record<string, FaxiosHeaderValue> & {
-  set: (header: string | Record<string, unknown>, value?: FaxiosHeaderValue, rewrite?: boolean) => FaxiosRequestHeaders;
-  get: (header: string, parser?: boolean | RegExp) => HeaderGetResult;
-  has: (header: string, matcher?: HeaderMatcher) => boolean;
-  delete: (header: string | Array<string>, matcher?: HeaderMatcher) => boolean;
   clear: (matcher?: HeaderMatcher) => boolean;
-  normalize: (format?: boolean) => FaxiosRequestHeaders;
   concat: (...targets: Array<unknown>) => FaxiosRequestHeaders;
-  getContentType: (matcher?: HeaderMatcher) => HeaderGetResult;
-  setContentType: (value: FaxiosHeaderValue, rewrite?: boolean) => FaxiosRequestHeaders;
-  hasContentType: (matcher?: HeaderMatcher) => boolean;
-  getContentLength: (matcher?: HeaderMatcher) => HeaderGetResult;
-  setContentLength: (value: FaxiosHeaderValue, rewrite?: boolean) => FaxiosRequestHeaders;
-  hasContentLength: (matcher?: HeaderMatcher) => boolean;
+  delete: (header: Array<string> | string, matcher?: HeaderMatcher) => boolean;
+  get: (header: string, parser?: boolean | RegExp) => HeaderGetResult;
   getAccept: (matcher?: HeaderMatcher) => HeaderGetResult;
-  setAccept: (value: FaxiosHeaderValue, rewrite?: boolean) => FaxiosRequestHeaders;
-  hasAccept: (matcher?: HeaderMatcher) => boolean;
   getAcceptEncoding: (matcher?: HeaderMatcher) => HeaderGetResult;
-  setAcceptEncoding: (value: FaxiosHeaderValue, rewrite?: boolean) => FaxiosRequestHeaders;
-  hasAcceptEncoding: (matcher?: HeaderMatcher) => boolean;
+  getAuthorization: (matcher?: HeaderMatcher) => HeaderGetResult;
+  getContentLength: (matcher?: HeaderMatcher) => HeaderGetResult;
+  getContentType: (matcher?: HeaderMatcher) => HeaderGetResult;
   getUserAgent: (matcher?: HeaderMatcher) => HeaderGetResult;
-  setUserAgent: (value: FaxiosHeaderValue, rewrite?: boolean) => FaxiosRequestHeaders;
+  has: (header: string, matcher?: HeaderMatcher) => boolean;
+  hasAccept: (matcher?: HeaderMatcher) => boolean;
+  hasAcceptEncoding: (matcher?: HeaderMatcher) => boolean;
+  hasAuthorization: (matcher?: HeaderMatcher) => boolean;
+  hasContentLength: (matcher?: HeaderMatcher) => boolean;
+  hasContentType: (matcher?: HeaderMatcher) => boolean;
   hasUserAgent: (matcher?: HeaderMatcher) => boolean;
-
-  getAuthorization: (matcher?: HeaderMatcher) => HeaderGetResult;
+  normalize: (format?: boolean) => FaxiosRequestHeaders;
+  set: (header: Record<string, unknown> | string, value?: FaxiosHeaderValue, rewrite?: boolean) => FaxiosRequestHeaders;
+  setAccept: (value: FaxiosHeaderValue, rewrite?: boolean) => FaxiosRequestHeaders;
+  setAcceptEncoding: (value: FaxiosHeaderValue, rewrite?: boolean) => FaxiosRequestHeaders;
   setAuthorization: (value: FaxiosHeaderValue, rewrite?: boolean) => FaxiosRequestHeaders;
-  hasAuthorization: (matcher?: HeaderMatcher) => boolean;
+
+  setContentLength: (value: FaxiosHeaderValue, rewrite?: boolean) => FaxiosRequestHeaders;
+  setContentType: (value: FaxiosHeaderValue, rewrite?: boolean) => FaxiosRequestHeaders;
+  setUserAgent: (value: FaxiosHeaderValue, rewrite?: boolean) => FaxiosRequestHeaders;
   toJSON: (asStrings?: boolean) => Record<string, FaxiosHeaderValue>;
 };
 
@@ -254,63 +254,42 @@ export interface FaxiosResponseTransformer {
 }
 
 export interface FaxiosRequestConfig<D = unknown> {
-  url?: string;
-  method?: StringLiteralsOrString<Method>;
-  baseURL?: string;
   allowAbsoluteUrls?: boolean;
-  transformRequest?: FaxiosRequestTransformer | Array<FaxiosRequestTransformer>;
-  transformResponse?:
-    | FaxiosResponseTransformer
-    | Array<FaxiosResponseTransformer>;
-  headers?: FaxiosConfigHeaders;
-  params?: Record<string, unknown> | URLSearchParams;
-  paramsSerializer?: ParamsSerializerOptions | CustomParamsSerializer;
-  data?: D;
-  timeout?: Milliseconds;
-  timeoutErrorMessage?: string;
-  withCredentials?: boolean;
   auth?: FaxiosBasicCredentials;
-  responseType?: ResponseType;
-  responseEncoding?: StringLiteralsOrString<responseEncoding>;
-  xsrfCookieName?: string;
-  xsrfHeaderName?: string;
-  onUploadProgress?: (progressEvent: FaxiosProgressEvent) => void;
-  onDownloadProgress?: (progressEvent: FaxiosProgressEvent) => void;
-  maxContentLength?: number;
-  validateStatus?: ((status: number) => boolean) | null;
-  maxBodyLength?: number;
-  transitional?: TransitionalOptions;
-  signal?: AbortSignal | GenericAbortSignal;
+  baseURL?: string;
+  data?: D;
   env?: {
-    /** Constructed with no arguments to serialize `multipart/form-data` payloads; `null` falls back to the global `FormData`. */
-    FormData?: (new () => object) | null;
     fetch?: (
-      input: string | URL | Request,
+      input: Request | string | URL,
       init?: RequestInit
     ) => Promise<Response>;
+    /** Constructed with no arguments to serialize `multipart/form-data` payloads; `null` falls back to the global `FormData`. */
+    FormData?: (new () => object) | null;
     /** `null` disables the constructor, e.g. when a custom `fetch` is incompatible with the global one. */
     Request?: (new (
-      input: string | URL | Request,
+      input: Request | string | URL,
       init?: RequestInit,
     ) => unknown) | null;
     Response?: (new (...args: Array<unknown>) => unknown) | null;
   };
+  fetchOptions?: Record<string, unknown>;
+  formDataHeaderPolicy?: "content-only" | "legacy";
   formSerializer?: FormSerializerOptions;
-  withXSRFToken?:
-    | boolean
-    | ((config: InternalFaxiosRequestConfig) => boolean | undefined);
+  headers?: FaxiosConfigHeaders;
+  maxBodyLength?: number;
+  maxContentLength?: number;
+  method?: StringLiteralsOrString<Method>;
+  onDownloadProgress?: (progressEvent: FaxiosProgressEvent) => void;
+  onUploadProgress?: (progressEvent: FaxiosProgressEvent) => void;
+  params?: Record<string, unknown> | URLSearchParams;
+  paramsSchema?: StandardSchemaV1;
+  paramsSerializer?: CustomParamsSerializer | ParamsSerializerOptions;
   parseReviver?: (
     this: unknown,
     key: string,
     value: unknown,
     context?: { source?: string; }
   ) => unknown;
-  fetchOptions?: Record<string, unknown>;
-  formDataHeaderPolicy?: "legacy" | "content-only";
-  redact?: Array<string>;
-  responseSchema?: StandardSchemaV1;
-  requestSchema?: StandardSchemaV1;
-  paramsSchema?: StandardSchemaV1;
   /**
    * Values for `{key}` placeholders in `url` (braces, not `:key`). Only own properties count.
    * Each value goes through `String()` then `encodeURIComponent`. A placeholder whose key is
@@ -324,6 +303,27 @@ export interface FaxiosRequestConfig<D = unknown> {
    * A validation failure, or output that isn't a plain object, rejects with `ERR_BAD_PATH_PARAMS_SCHEMA`.
    */
   pathParamsSchema?: StandardSchemaV1<unknown, Record<string, unknown>>;
+  redact?: Array<string>;
+  requestSchema?: StandardSchemaV1;
+  responseEncoding?: StringLiteralsOrString<responseEncoding>;
+  responseSchema?: StandardSchemaV1;
+  responseType?: ResponseType;
+  signal?: AbortSignal | GenericAbortSignal;
+  timeout?: Milliseconds;
+  timeoutErrorMessage?: string;
+  transformRequest?: Array<FaxiosRequestTransformer> | FaxiosRequestTransformer;
+  transformResponse?:
+    | Array<FaxiosResponseTransformer>
+    | FaxiosResponseTransformer;
+  transitional?: TransitionalOptions;
+  url?: string;
+  validateStatus?: ((status: number) => boolean) | null;
+  withCredentials?: boolean;
+  withXSRFToken?:
+    | ((config: InternalFaxiosRequestConfig) => boolean | undefined)
+    | boolean;
+  xsrfCookieName?: string;
+  xsrfHeaderName?: string;
 }
 
 export type SchemaConfig<O, D = unknown> = FaxiosRequestConfig<D> & { responseSchema: StandardSchemaV1<unknown, O>; };
@@ -358,12 +358,12 @@ export interface FaxiosResponseHeadersLike {
 }
 
 export interface FaxiosResponse<T = unknown, D = unknown> {
+  config: InternalFaxiosRequestConfig<D>;
   data: T;
+  headers: FaxiosResponseHeadersLike;
+  request?: null | Request;
   status: number;
   statusText: string;
-  headers: FaxiosResponseHeadersLike;
-  config: InternalFaxiosRequestConfig<D>;
-  request?: Request | null;
 }
 
 export type FaxiosPromise<T = unknown> = Promise<FaxiosResponse<T>>;
@@ -373,14 +373,14 @@ export interface HeadersDefaults {
   delete: RawFaxiosRequestHeaders;
   get: RawFaxiosRequestHeaders;
   head: RawFaxiosRequestHeaders;
-  post: RawFaxiosRequestHeaders;
-  put: RawFaxiosRequestHeaders;
-  patch: RawFaxiosRequestHeaders;
+  link?: RawFaxiosRequestHeaders;
   options?: RawFaxiosRequestHeaders;
+  patch: RawFaxiosRequestHeaders;
+  post: RawFaxiosRequestHeaders;
   purge?: RawFaxiosRequestHeaders;
-  link?: RawFaxiosRequestHeaders;
-  unlink?: RawFaxiosRequestHeaders;
+  put: RawFaxiosRequestHeaders;
   query?: RawFaxiosRequestHeaders;
+  unlink?: RawFaxiosRequestHeaders;
 }
 
 export interface FaxiosDefaults<D = unknown> extends Omit<
@@ -397,9 +397,9 @@ export interface FaxiosDefaults<D = unknown> extends Omit<
  * `FaxiosHeaders` instance.
  */
 export type FaxiosConfigHeaders =
-  | RawFaxiosRequestHeaders
+  | FaxiosHeadersInstance
   | Partial<HeadersDefaults>
-  | FaxiosHeadersInstance;
+  | RawFaxiosRequestHeaders;
 
 /** Config accepted by `create()`; identical to a request config. */
 export type CreateFaxiosDefaults<D = unknown> = FaxiosRequestConfig<D>;
@@ -409,7 +409,7 @@ export type CreateFaxiosDefaults<D = unknown> = FaxiosRequestConfig<D>;
 // next middleware would read it back expecting set()/get().
 interface ContextHeaders {
   get headers(): FaxiosRequestHeaders;
-  set headers(value: FaxiosRequestHeaders | FaxiosHeadersInstance);
+  set headers(value: FaxiosHeadersInstance | FaxiosRequestHeaders);
 }
 
 /**
@@ -419,12 +419,12 @@ interface ContextHeaders {
 // `{}` defaults match a FaxiosInstance with no plugins, so a plain `FaxiosMiddleware` installs on one.
 // eslint-disable-next-line @typescript-eslint/no-empty-object-type -- see above
 export interface FaxiosContext<TOptions = {}, TCapabilities = {}> {
+  /** Values provided by installed plugins, shared by every request of the instance. */
+  capabilities: TCapabilities;
   /** The merged request config. `headers` is a `FaxiosHeaders` instance. */
   config: Omit<InternalFaxiosRequestConfig, "headers"> & ContextHeaders & TOptions;
   /** Null-prototype scratch space shared by middleware for this request only. */
   state: Record<PropertyKey, unknown>;
-  /** Values provided by installed plugins, shared by every request of the instance. */
-  capabilities: TCapabilities;
 }
 
 /**
@@ -452,9 +452,9 @@ export type FaxiosMiddleware<TOptions = {}, TCapabilities = {}> = (
  * the request options it adds to every config-taking member.
  */
 export interface FaxiosPluginSpec {
-  requires?: unknown;
-  provides?: unknown;
   options?: unknown;
+  provides?: unknown;
+  requires?: unknown;
 }
 
 // A slot the spec leaves out is `unknown`: nothing required, provided or added.
@@ -469,13 +469,13 @@ type OnlyPluginSlots<TSpec> = { [K in Exclude<keyof TSpec, keyof FaxiosPluginSpe
  * and `TOptions` through this.
  */
 export interface FaxiosPluginBase<TRequires = unknown, TProvides = unknown, TOptions = unknown> {
-  name: string;
   middleware: FaxiosMiddleware<TOptions, TRequires & TProvides>;
+  name: string;
   /** Internal, type-only marker that carries the type parameters for inference. Never set it. */
   readonly "~plugin"?: {
-    readonly requires: TRequires;
-    readonly provides: TProvides;
     readonly options: TOptions;
+    readonly provides: TProvides;
+    readonly requires: TRequires;
   };
 }
 

package/src/lib/utils.ts

@@ -8,6 +8,13 @@ const { iterator, toStringTag } = Symbol;
 
 const hasOwnProperty = (obj: unknown, prop: PropertyKey) => Object.hasOwn(obj as object, prop);
 
+/**
+ * The one dangerous-key check: `__proto__`, `constructor` and `prototype` are skipped wherever
+ * config, route or form data keys are materialized into objects, to block prototype-pollution writes.
+ */
+const isDangerousKey = (key: PropertyKey): boolean =>
+  key === "__proto__" || key === "constructor" || key === "prototype";
+
 /**
  * Walk the prototype chain (excluding the shared Object.prototype) looking for
  * an own `prop`. This distinguishes genuine own/inherited members — including
@@ -21,7 +28,7 @@ const hasOwnProperty = (obj: unknown, prop: PropertyKey) => Object.hasOwn(obj as
  * @returns {boolean} True when `prop` is owned below Object.prototype
  */
 const hasOwnInPrototypeChain = (thing: unknown, prop: PropertyKey): boolean => {
-  let obj: object | null = thing != null && typeof thing === "object" ? thing : null;
+  let obj: null | object = thing != null && typeof thing === "object" ? thing : null;
   if (obj === null) return false;
   const seen: Array<object> = [];
 
@@ -34,7 +41,7 @@ const hasOwnInPrototypeChain = (thing: unknown, prop: PropertyKey): boolean => {
     if (hasOwnProperty(obj, prop)) {
       return true;
     }
-    obj = getPrototypeOf(obj) as object | null;
+    obj = getPrototypeOf(obj) as null | object;
   }
   return false;
 };
@@ -390,7 +397,7 @@ function forEach(obj: unknown, fn: (value: unknown, key: unknown, obj: unknown)
  * @param {string} key - The key to find (case-insensitive).
  * @returns {?string} The actual key name if found, otherwise null.
  */
-function findKey(obj: unknown, key: string): string | null {
+function findKey(obj: unknown, key: string): null | string {
   if (isBuffer(obj)) {
     return null;
   }
@@ -411,8 +418,8 @@ function findKey(obj: unknown, key: string): string | null {
 type GlobalWithEvents = typeof globalThis & {
   addEventListener?: (type: string, listener: (event: Record<string, unknown>) => void, capture?: boolean) => void;
   postMessage?: (message: unknown, targetOrigin: string) => void;
-  setImmediate?: (cb: () => void) => void;
   process?: { nextTick?: (cb: () => void) => void; };
+  setImmediate?: (cb: () => void) => void;
 };
 const _global = globalThis as GlobalWithEvents;
 
@@ -437,14 +444,14 @@ const isContextDefined = (context: unknown) => !isUndefined(context) && context
  * @returns {Object} Result of all merge properties
  */
 function merge(this: unknown, ...objs: Array<unknown>): Record<string, unknown> {
-  const ctx = (isContextDefined(this) && this) as { caseless?: unknown; skipUndefined?: unknown; } | false;
+  const ctx = (isContextDefined(this) && this) as false | { caseless?: unknown; skipUndefined?: unknown; };
   const caseless = ctx && ctx.caseless;
   const skipUndefined = ctx && ctx.skipUndefined;
   const result: Record<string | symbol, unknown> = {};
   const assignValue = (val: unknown, key: unknown) => {
     const keyStr = key as string | symbol;
     // Skip dangerous property names to prevent prototype pollution
-    if (keyStr === "__proto__" || keyStr === "constructor" || keyStr === "prototype") {
+    if (isDangerousKey(keyStr)) {
       return;
     }
 
@@ -556,7 +563,8 @@ const toFlatObject = (sourceObj: unknown, destObj?: Record<string, unknown>, fil
   let props: Array<string>;
   let i: number;
   let prop: string | undefined;
-  const merged: Record<string, boolean> = {};
+  // Null prototype: a polluted Object.prototype[prop] must not mark an own prop as already copied.
+  const merged: Record<string, boolean> = Object.create(null);
 
   const dest: Record<string, unknown> = destObj ?? {};
 
@@ -596,7 +604,7 @@ const toArray = (thing?: unknown): Array<unknown> | null => {
  * @returns {Array}
  */
 
-const isTypedArray = ((TypedArray: false | (abstract new (...args: Array<unknown>) => unknown)) =>
+const isTypedArray = ((TypedArray: (abstract new (...args: Array<unknown>) => unknown) | false) =>
 
   (thing: unknown) => TypedArray && thing instanceof TypedArray
 )(typeof Uint8Array !== "undefined" && getPrototypeOf(Uint8Array) as abstract new (...args: Array<unknown>) => unknown);
@@ -616,7 +624,7 @@ const forEachEntry = (obj: unknown, fn: (key: unknown, value: unknown) => void)
  * @returns {Array<boolean>}
  */
 const matchAll = (regExp: RegExp, str: string) => {
-  let matches: RegExpExecArray | null;
+  let matches: null | RegExpExecArray;
   const arr: Array<RegExpExecArray> = [];
 
   while ((matches = regExp.exec(str)) !== null) {
@@ -644,7 +652,7 @@ const { propertyIsEnumerable } = Object.prototype;
  */
 const isRegExp = kindOfTest("RegExp");
 
-const reduceDescriptors = (obj: object, reducer: (descriptor: PropertyDescriptor, name: string, obj: object) => PropertyDescriptor | false | undefined) => {
+const reduceDescriptors = (obj: object, reducer: (descriptor: PropertyDescriptor, name: string, obj: object) => false | PropertyDescriptor | undefined) => {
   const descriptors = Object.getOwnPropertyDescriptors(obj);
   const reducedDescriptors: PropertyDescriptorMap = {};
 
@@ -665,7 +673,7 @@ const reduceDescriptors = (obj: object, reducer: (descriptor: PropertyDescriptor
 
 const freezeMethods = (obj: object) => {
   // eslint-disable-next-line sonarjs/function-return-type
-  reduceDescriptors(obj, (descriptor, name): PropertyDescriptor | false => {
+  reduceDescriptors(obj, (descriptor, name): false | PropertyDescriptor => {
     // skip restricted props in strict mode
     if (isFunction(obj) && [ "arguments", "caller", "callee" ].includes(name)) {
       return false;
@@ -759,7 +767,7 @@ const toJSONObject = (obj: unknown): unknown => {
       if (!("toJSON" in source)) {
         // add-on descent / delete-on-ascent: preserves path semantics, so DAG nodes serialise at every occurrence (see #7230).
         visited.add(source);
-        const target: Record<string | number, unknown> = isArray(source) ? ([] as Record<number, unknown>) : {};
+        const target: Record<number | string, unknown> = isArray(source) ? ([] as Record<number, unknown>) : {};
 
         forEach(source, (value, key) => {
           const reducedValue = visit(value);
@@ -910,6 +918,7 @@ export default {
   isHTMLForm,
   hasOwnProperty,
   hasOwnProp: hasOwnProperty, // an alias to avoid ESLint no-prototype-builtins detection
+  isDangerousKey,
   hasOwnInPrototypeChain,
   getSafeProp,
   reduceDescriptors,