fix(types): fix TS 4.9 excessive depth error on InferAttributes (sequelize#15134)

* fix(types): fix TS 4.9 error with InferAttributes

* fix: fix types

Author: ephys

src/associations/has-many.ts

@@ -1,4 +1,3 @@
-import isPlainObject from 'lodash/isPlainObject';
 import upperFirst from 'lodash/upperFirst';
 import { AssociationError } from '../errors/index.js';
 import type {
@@ -15,7 +14,7 @@ import type {
 import { Op } from '../operators';
 import { col, fn } from '../sequelize';
 import type { AllowArray } from '../utils';
-import { removeUndefined } from '../utils';
+import { isPlainObject, removeUndefined } from '../utils';
 import { isSameInitialModel } from '../utils/model-utils.js';
 import type { MultiAssociationAccessors, MultiAssociationOptions, Association, AssociationOptions } from './base';
 import { MultiAssociation } from './base';

src/dialects/abstract/replication-pool.ts

@@ -16,7 +16,7 @@ type ReplicationPoolConfig<Resource> = {
   validate(connection: Resource): boolean,
 };
 
-const OwningPool = Symbol('owning-pool');
+const owningPools = new WeakMap<object, 'read' | 'write'>();
 
 export class ReplicationPool<Resource extends object> {
   /**
@@ -42,7 +42,7 @@ export class ReplicationPool<Resource extends object> {
           const nextRead = reads++ % readConfig.length;
           const connection = await connect(readConfig[nextRead]);
 
-          Reflect.set(connection, OwningPool, 'read');
+          owningPools.set(connection, 'read');
 
           return connection;
         },
@@ -62,7 +62,7 @@ export class ReplicationPool<Resource extends object> {
       create: async () => {
         const connection = await connect(writeConfig);
 
-        Reflect.set(connection, OwningPool, 'write');
+        owningPools.set(connection, 'write');
 
         return connection;
       },
@@ -90,13 +90,19 @@ export class ReplicationPool<Resource extends object> {
   }
 
   release(client: Resource): void {
-    const connectionType = Reflect.get(client, OwningPool);
+    const connectionType = owningPools.get(client);
+    if (!connectionType) {
+      throw new Error('Unable to determine to which pool the connection belongs');
+    }
 
     this.getPool(connectionType).release(client);
   }
 
   async destroy(client: Resource): Promise<void> {
-    const connectionType = Reflect.get(client, OwningPool);
+    const connectionType = owningPools.get(client);
+    if (!connectionType) {
+      throw new Error('Unable to determine to which pool the connection belongs');
+    }
 
     await this.getPool(connectionType).destroy(client);
     debug('connection destroy');

src/model.d.ts

@@ -3796,10 +3796,10 @@ export type InferCreationAttributes<
  * - Excluded manually using {@link InferAttributesOptions#omit}
  */
 type InternalInferAttributeKeysFromFields<M extends Model, Key extends keyof M, Options extends InferAttributesOptions<keyof M | never | ''>> =
-  // functions are always excluded
-  M[Key] extends AnyFunction ? never
   // fields inherited from Model are all excluded
-  : Key extends keyof Model ? never
+  Key extends keyof Model ? never
+  // functions are always excluded
+  : M[Key] extends AnyFunction ? never
   // fields branded with NonAttribute are excluded
   : IsBranded<M[Key], typeof NonAttributeBrand> extends true ? never
   // check 'omit' option is provided & exclude those listed in it

src/utils/check.ts

@@ -1,5 +1,4 @@
 import isEmpty from 'lodash/isEmpty';
-import isPlainObject from 'lodash/isPlainObject';
 import type { DataType } from '..';
 import { getOperators } from './format';
 // eslint-disable-next-line import/order -- caused by temporarily mixing require with import
@@ -25,6 +24,16 @@ export function isString(val: any): val is string {
   return typeof val === 'string';
 }
 
+export function isPlainObject(value: unknown): value is object {
+  if (value === null || typeof value !== 'object') {
+    return false;
+  }
+
+  const prototype = Object.getPrototypeOf(value);
+
+  return prototype === null || prototype === Object.prototype;
+}
+
 /**
  * Returns whether `value` is using the nested syntax for attributes.
  *