meta: rename ./dialects/abstract to ./abstract-dialect (#17216)

packages/core/src/dialects/abstract/connection-manager.ts → packages/core/src/abstract-dialect/connection-manager.ts

@@ -2,10 +2,10 @@ import { isNodeError } from '@sequelize/utils/node';
 import cloneDeep from 'lodash/cloneDeep';
 import semver from 'semver';
 import { TimeoutError } from 'sequelize-pool';
-import { ConnectionAcquireTimeoutError } from '../../errors';
-import type { ConnectionOptions, Sequelize } from '../../sequelize.js';
-import * as deprecations from '../../utils/deprecations';
-import { logger } from '../../utils/logger';
+import { ConnectionAcquireTimeoutError } from '../errors';
+import type { ConnectionOptions, Sequelize } from '../sequelize.js';
+import * as deprecations from '../utils/deprecations';
+import { logger } from '../utils/logger';
 import type { AbstractDialect } from './index.js';
 import { ReplicationPool } from './replication-pool.js';
 

packages/core/src/dialects/abstract/data-types-utils.ts → packages/core/src/abstract-dialect/data-types-utils.ts

@@ -1,6 +1,6 @@
 import NodeUtils from 'node:util';
-import { BaseError, ValidationErrorItem } from '../../errors/index.js';
-import type { Model } from '../../model.js';
+import { BaseError, ValidationErrorItem } from '../errors/index.js';
+import type { Model } from '../model.js';
 import type {
   DataType,
   DataTypeClass,

packages/core/src/dialects/abstract/data-types.ts → packages/core/src/abstract-dialect/data-types.ts

@@ -11,16 +11,16 @@ import isObject from 'lodash/isObject';
 import { Blob } from 'node:buffer';
 import util from 'node:util';
 import type { Class } from 'type-fest';
-import { ValidationErrorItem } from '../../errors';
-import type { GeoJson, GeoJsonType } from '../../geo-json.js';
-import { assertIsGeoJson } from '../../geo-json.js';
-import type { ModelStatic, Rangable, RangePart } from '../../model.js';
-import type { Sequelize } from '../../sequelize.js';
-import { makeBufferFromTypedArray } from '../../utils/buffer.js';
-import { isValidTimeZone } from '../../utils/dayjs.js';
-import { doNotUseRealDataType } from '../../utils/deprecations.js';
-import { joinSQLFragments } from '../../utils/join-sql-fragments';
-import { validator as Validator } from '../../utils/validator-extras';
+import { ValidationErrorItem } from '../errors';
+import type { GeoJson, GeoJsonType } from '../geo-json.js';
+import { assertIsGeoJson } from '../geo-json.js';
+import type { ModelStatic, Rangable, RangePart } from '../model.js';
+import type { Sequelize } from '../sequelize.js';
+import { makeBufferFromTypedArray } from '../utils/buffer.js';
+import { isValidTimeZone } from '../utils/dayjs.js';
+import { doNotUseRealDataType } from '../utils/deprecations.js';
+import { joinSQLFragments } from '../utils/join-sql-fragments';
+import { validator as Validator } from '../utils/validator-extras';
 import {
   attributeTypeToSql,
   dataTypeClassOrInstanceToInstance,

packages/core/src/dialects/abstract/index.ts → packages/core/src/abstract-dialect/index.ts

@@ -2,9 +2,9 @@ import { freezeDeep, isFunction } from '@sequelize/utils';
 import cloneDeep from 'lodash/cloneDeep';
 import merge from 'lodash/merge';
 import type { Class } from 'type-fest';
-import type { DialectName, Sequelize } from '../../sequelize.js';
-import { logger } from '../../utils/logger.js';
-import type { DeepPartial } from '../../utils/types.js';
+import type { DialectName, Sequelize } from '../sequelize.js';
+import { logger } from '../utils/logger.js';
+import type { DeepPartial } from '../utils/types.js';
 import type { AbstractConnectionManager } from './connection-manager.js';
 import type { AbstractDataType } from './data-types.js';
 import * as BaseDataTypes from './data-types.js';

packages/core/src/dialects/abstract/query-generator-internal.ts → packages/core/src/abstract-dialect/query-generator-internal.ts

@@ -1,17 +1,17 @@
 import { EMPTY_ARRAY } from '@sequelize/utils';
-import { Deferrable } from '../../deferrable.js';
-import type { AssociationPath } from '../../expression-builders/association-path.js';
-import type { Attribute } from '../../expression-builders/attribute.js';
-import { BaseSqlExpression } from '../../expression-builders/base-sql-expression.js';
-import type { Cast } from '../../expression-builders/cast.js';
-import type { Col } from '../../expression-builders/col.js';
-import type { DialectAwareFn } from '../../expression-builders/dialect-aware-fn.js';
-import type { Fn } from '../../expression-builders/fn.js';
-import type { JsonPath } from '../../expression-builders/json-path.js';
-import type { Literal } from '../../expression-builders/literal.js';
-import type { Sequelize } from '../../sequelize.js';
-import { extractModelDefinition } from '../../utils/model-utils.js';
-import { injectReplacements } from '../../utils/sql.js';
+import { Deferrable } from '../deferrable.js';
+import type { AssociationPath } from '../expression-builders/association-path.js';
+import type { Attribute } from '../expression-builders/attribute.js';
+import { BaseSqlExpression } from '../expression-builders/base-sql-expression.js';
+import type { Cast } from '../expression-builders/cast.js';
+import type { Col } from '../expression-builders/col.js';
+import type { DialectAwareFn } from '../expression-builders/dialect-aware-fn.js';
+import type { Fn } from '../expression-builders/fn.js';
+import type { JsonPath } from '../expression-builders/json-path.js';
+import type { Literal } from '../expression-builders/literal.js';
+import type { Sequelize } from '../sequelize.js';
+import { extractModelDefinition } from '../utils/model-utils.js';
+import { injectReplacements } from '../utils/sql.js';
 import { attributeTypeToSql } from './data-types-utils.js';
 import type { AbstractDialect } from './index.js';
 import type { EscapeOptions } from './query-generator-typescript.js';

packages/core/src/dialects/abstract/query-generator-typescript.ts → packages/core/src/abstract-dialect/query-generator-typescript.ts

@@ -4,37 +4,37 @@ import isObject from 'lodash/isObject';
 import { randomUUID } from 'node:crypto';
 import NodeUtil from 'node:util';
 import type { Class } from 'type-fest';
-import { ConstraintChecking } from '../../deferrable.js';
-import { AssociationPath } from '../../expression-builders/association-path.js';
-import { Attribute } from '../../expression-builders/attribute.js';
-import { BaseSqlExpression } from '../../expression-builders/base-sql-expression.js';
-import { Cast } from '../../expression-builders/cast.js';
-import { Col } from '../../expression-builders/col.js';
-import { DialectAwareFn } from '../../expression-builders/dialect-aware-fn.js';
-import { Fn } from '../../expression-builders/fn.js';
-import { Identifier } from '../../expression-builders/identifier.js';
-import { JsonPath } from '../../expression-builders/json-path.js';
-import { List } from '../../expression-builders/list.js';
-import { Literal } from '../../expression-builders/literal.js';
-import { Value } from '../../expression-builders/value.js';
-import { Where } from '../../expression-builders/where.js';
-import { IndexHints } from '../../index-hints.js';
-import type { ModelDefinition } from '../../model-definition.js';
-import type { Attributes, Model, ModelStatic } from '../../model.js';
-import { Op } from '../../operators.js';
-import type { BindOrReplacements, Expression } from '../../sequelize.js';
-import { bestGuessDataTypeOfVal } from '../../sql-string.js';
-import { TableHints } from '../../table-hints.js';
-import type { IsolationLevel } from '../../transaction.js';
-import { rejectInvalidOptions } from '../../utils/check.js';
-import { noOpCol } from '../../utils/deprecations.js';
-import { quoteIdentifier } from '../../utils/dialect.js';
-import { joinSQLFragments } from '../../utils/join-sql-fragments.js';
+import { ConstraintChecking } from '../deferrable.js';
+import { AssociationPath } from '../expression-builders/association-path.js';
+import { Attribute } from '../expression-builders/attribute.js';
+import { BaseSqlExpression } from '../expression-builders/base-sql-expression.js';
+import { Cast } from '../expression-builders/cast.js';
+import { Col } from '../expression-builders/col.js';
+import { DialectAwareFn } from '../expression-builders/dialect-aware-fn.js';
+import { Fn } from '../expression-builders/fn.js';
+import { Identifier } from '../expression-builders/identifier.js';
+import { JsonPath } from '../expression-builders/json-path.js';
+import { List } from '../expression-builders/list.js';
+import { Literal } from '../expression-builders/literal.js';
+import { Value } from '../expression-builders/value.js';
+import { Where } from '../expression-builders/where.js';
+import { IndexHints } from '../index-hints.js';
+import type { ModelDefinition } from '../model-definition.js';
+import type { Attributes, Model, ModelStatic } from '../model.js';
+import { Op } from '../operators.js';
+import type { BindOrReplacements, Expression } from '../sequelize.js';
+import { bestGuessDataTypeOfVal } from '../sql-string.js';
+import { TableHints } from '../table-hints.js';
+import type { IsolationLevel } from '../transaction.js';
+import { rejectInvalidOptions } from '../utils/check.js';
+import { noOpCol } from '../utils/deprecations.js';
+import { quoteIdentifier } from '../utils/dialect.js';
+import { joinSQLFragments } from '../utils/join-sql-fragments.js';
 import {
   extractModelDefinition,
   extractTableIdentifier,
   isModelStatic,
-} from '../../utils/model-utils.js';
+} from '../utils/model-utils.js';
 import type { BindParamOptions, DataType } from './data-types.js';
 import { AbstractDataType } from './data-types.js';
 import type { AbstractDialect } from './index.js';

packages/core/src/dialects/abstract/query-generator.d.ts → packages/core/src/abstract-dialect/query-generator.d.ts

@@ -1,15 +1,15 @@
 // TODO: complete me - this file is a stub that will be completed when query-generator.ts is migrated to TS
 
-import type { Col } from '../../expression-builders/col.js';
-import type { Literal } from '../../expression-builders/literal.js';
+import type { Col } from '../expression-builders/col.js';
+import type { Literal } from '../expression-builders/literal.js';
 import type {
   AttributeOptions,
   FindOptions,
   Model,
   ModelStatic,
   NormalizedAttributeOptions,
   SearchPathable,
-} from '../../model.js';
+} from '../model.js';
 import type { DataType } from './data-types.js';
 import { AbstractQueryGeneratorTypeScript } from './query-generator-typescript.js';
 import type { AttributeToSqlOptions } from './query-generator.internal-types.js';

packages/core/src/dialects/abstract/query-generator.internal-types.ts → packages/core/src/abstract-dialect/query-generator.internal-types.ts

@@ -1,6 +1,6 @@
 import type { Nullish } from '@sequelize/utils';
-import type { Literal } from '../../expression-builders/literal.js';
-import type { BindOrReplacements } from '../../sequelize.js';
+import type { Literal } from '../expression-builders/literal.js';
+import type { BindOrReplacements } from '../sequelize.js';
 
 export interface AddLimitOffsetOptions {
   limit?: number | Literal | Nullish;

packages/core/src/dialects/abstract/query-generator.js → packages/core/src/abstract-dialect/query-generator.js

@@ -12,19 +12,19 @@ import pick from 'lodash/pick';
 import reduce from 'lodash/reduce';
 import uniq from 'lodash/uniq';
 import NodeUtil from 'node:util';
-import { Association } from '../../associations/base';
-import { BelongsToAssociation } from '../../associations/belongs-to';
-import { BelongsToManyAssociation } from '../../associations/belongs-to-many';
-import { HasManyAssociation } from '../../associations/has-many';
-import { BaseSqlExpression } from '../../expression-builders/base-sql-expression.js';
-import { Col } from '../../expression-builders/col.js';
-import { Literal } from '../../expression-builders/literal.js';
-import { conformIndex } from '../../model-internals';
-import { and } from '../../sequelize';
-import { mapFinderOptions, removeNullishValuesFromHash } from '../../utils/format';
-import { joinSQLFragments } from '../../utils/join-sql-fragments';
-import { isModelStatic } from '../../utils/model-utils';
-import { nameIndex, spliceStr } from '../../utils/string';
+import { Association } from '../associations/base';
+import { BelongsToAssociation } from '../associations/belongs-to';
+import { BelongsToManyAssociation } from '../associations/belongs-to-many';
+import { HasManyAssociation } from '../associations/has-many';
+import { BaseSqlExpression } from '../expression-builders/base-sql-expression.js';
+import { Col } from '../expression-builders/col.js';
+import { Literal } from '../expression-builders/literal.js';
+import { conformIndex } from '../model-internals';
+import { and } from '../sequelize';
+import { mapFinderOptions, removeNullishValuesFromHash } from '../utils/format';
+import { joinSQLFragments } from '../utils/join-sql-fragments';
+import { isModelStatic } from '../utils/model-utils';
+import { nameIndex, spliceStr } from '../utils/string';
 import { attributeTypeToSql } from './data-types-utils';
 import { AbstractQueryGeneratorInternal } from './query-generator-internal.js';
 import { AbstractQueryGeneratorTypeScript } from './query-generator-typescript';
@@ -33,10 +33,10 @@ import { joinWithLogicalOperator } from './where-sql-builder';
 const util = require('node:util');
 const crypto = require('node:crypto');
 
-const DataTypes = require('../../data-types');
-const { Op } = require('../../operators');
-const sequelizeError = require('../../errors');
-const { _validateIncludedElements } = require('../../model-internals');
+const DataTypes = require('../data-types');
+const { Op } = require('../operators');
+const sequelizeError = require('../errors');
+const { _validateIncludedElements } = require('../model-internals');
 
 export const CREATE_TABLE_QUERY_SUPPORTABLE_OPTIONS = new Set([
   'collate',

packages/core/src/dialects/abstract/query-generator.types.ts → packages/core/src/abstract-dialect/query-generator.types.ts

@@ -1,10 +1,10 @@
-import type { Deferrable } from '../../deferrable';
-import type { BaseSqlExpression } from '../../expression-builders/base-sql-expression';
-import type { Literal } from '../../expression-builders/literal';
-import type { Filterable, IndexHintable, ModelStatic, ReferentialAction } from '../../model';
-import type { ModelDefinition } from '../../model-definition.js';
-import type { TableHints } from '../../table-hints';
-import type { TransactionType } from '../../transaction';
+import type { Deferrable } from '../deferrable';
+import type { BaseSqlExpression } from '../expression-builders/base-sql-expression';
+import type { Literal } from '../expression-builders/literal';
+import type { Filterable, IndexHintable, ModelStatic, ReferentialAction } from '../model';
+import type { ModelDefinition } from '../model-definition.js';
+import type { TableHints } from '../table-hints';
+import type { TransactionType } from '../transaction';
 import type { AddLimitOffsetOptions } from './query-generator.internal-types.js';
 import type { TableName } from './query-interface.js';
 import type { ConstraintType } from './query-interface.types';

packages/core/src/dialects/abstract/query-interface-internal.ts → packages/core/src/abstract-dialect/query-interface-internal.ts

@@ -1,6 +1,6 @@
 import assert from 'node:assert';
-import { QueryTypes } from '../../query-types.js';
-import type { QueryRawOptions, Sequelize } from '../../sequelize.js';
+import { QueryTypes } from '../query-types.js';
+import type { QueryRawOptions, Sequelize } from '../sequelize.js';
 import type { AbstractDialect } from './index.js';
 import type { AbstractQueryGenerator } from './query-generator.js';
 import type { FetchDatabaseVersionOptions } from './query-interface.types.js';

packages/core/src/dialects/abstract/query-interface-typescript.ts → packages/core/src/abstract-dialect/query-interface-typescript.ts

@@ -1,19 +1,19 @@
 import isEmpty from 'lodash/isEmpty';
 import assert from 'node:assert';
-import type { ConstraintChecking } from '../../deferrable';
-import { Deferrable } from '../../deferrable';
-import { BaseError } from '../../errors';
-import { setTransactionFromCls } from '../../model-internals.js';
-import { QueryTypes } from '../../query-types';
-import type { QueryRawOptions, QueryRawOptionsWithType, Sequelize } from '../../sequelize';
-import { COMPLETES_TRANSACTION, Transaction } from '../../transaction';
-import { isErrorWithStringCode } from '../../utils/check.js';
+import type { ConstraintChecking } from '../deferrable';
+import { Deferrable } from '../deferrable';
+import { BaseError } from '../errors';
+import { setTransactionFromCls } from '../model-internals.js';
+import { QueryTypes } from '../query-types';
+import type { QueryRawOptions, QueryRawOptionsWithType, Sequelize } from '../sequelize';
+import { COMPLETES_TRANSACTION, Transaction } from '../transaction';
+import { isErrorWithStringCode } from '../utils/check.js';
 import {
   noSchemaDelimiterParameter,
   noSchemaParameter,
   showAllToListSchemas,
   showAllToListTables,
-} from '../../utils/deprecations';
+} from '../utils/deprecations';
 import type { Connection } from './connection-manager.js';
 import type { AbstractDialect } from './index.js';
 import type { TableOrModel } from './query-generator.types.js';

packages/core/src/dialects/abstract/query-interface.d.ts → packages/core/src/abstract-dialect/query-interface.d.ts

@@ -1,7 +1,7 @@
 import type { SetRequired } from 'type-fest';
-import type { Col } from '../../expression-builders/col.js';
-import type { Fn } from '../../expression-builders/fn.js';
-import type { Literal } from '../../expression-builders/literal.js';
+import type { Col } from '../expression-builders/col.js';
+import type { Fn } from '../expression-builders/fn.js';
+import type { Literal } from '../expression-builders/literal.js';
 import type {
   AttributeOptions,
   Attributes,
@@ -10,9 +10,9 @@ import type {
   Model,
   ModelStatic,
   NormalizedAttributeOptions,
-} from '../../model';
-import type { QueryRawOptions, QueryRawOptionsWithModel } from '../../sequelize';
-import type { AllowLowercase } from '../../utils/types.js';
+} from '../model';
+import type { QueryRawOptions, QueryRawOptionsWithModel } from '../sequelize';
+import type { AllowLowercase } from '../utils/types.js';
 import type { DataType } from './data-types.js';
 import type { AbstractDialect } from './index.js';
 import type { AddLimitOffsetOptions } from './query-generator.internal-types.js';

packages/core/src/dialects/abstract/query-interface.js → packages/core/src/abstract-dialect/query-interface.js

@@ -7,10 +7,10 @@ import intersection from 'lodash/intersection';
 import isObject from 'lodash/isObject';
 import mapValues from 'lodash/mapValues';
 import uniq from 'lodash/uniq';
-import * as DataTypes from '../../data-types';
-import { QueryTypes } from '../../query-types';
-import { cloneDeep, getObjectFromMap } from '../../utils/object';
-import { assertNoReservedBind, combineBinds } from '../../utils/sql';
+import * as DataTypes from '../data-types';
+import { QueryTypes } from '../query-types';
+import { cloneDeep, getObjectFromMap } from '../utils/object';
+import { assertNoReservedBind, combineBinds } from '../utils/sql';
 import { AbstractDataType } from './data-types';
 import { AbstractQueryInterfaceTypeScript } from './query-interface-typescript';
 

packages/core/src/dialects/abstract/query-interface.types.ts → packages/core/src/abstract-dialect/query-interface.types.ts

@@ -1,6 +1,6 @@
-import type { Deferrable } from '../../deferrable';
-import type { QueryRawOptions } from '../../sequelize';
-import type { IsolationLevel } from '../../transaction';
+import type { Deferrable } from '../deferrable';
+import type { QueryRawOptions } from '../sequelize';
+import type { IsolationLevel } from '../transaction';
 import type {
   AddConstraintQueryOptions,
   BulkDeleteQueryOptions,

packages/core/src/dialects/abstract/query.d.ts → packages/core/src/abstract-dialect/query.d.ts

@@ -1,6 +1,6 @@
-import type { IncludeOptions, Model, ModelStatic } from '../../model';
-import type { QueryTypes } from '../../query-types';
-import type { Sequelize } from '../../sequelize';
+import type { IncludeOptions, Model, ModelStatic } from '../model';
+import type { QueryTypes } from '../query-types';
+import type { Sequelize } from '../sequelize';
 import type { Connection } from './connection-manager';
 
 export interface AbstractQueryGroupJoinDataOptions {

packages/core/src/dialects/abstract/query.js → packages/core/src/abstract-dialect/query.js

@@ -8,9 +8,9 @@ import findKey from 'lodash/findKey';
 import isEmpty from 'lodash/isEmpty';
 import reduce from 'lodash/reduce';
 
-const { QueryTypes } = require('../../query-types');
+const { QueryTypes } = require('../query-types');
 const Dot = require('dottie');
-const deprecations = require('../../utils/deprecations');
+const deprecations = require('../utils/deprecations');
 const crypto = require('node:crypto');
 
 export class AbstractQuery {

packages/core/src/dialects/abstract/replication-pool.ts → packages/core/src/abstract-dialect/replication-pool.ts

@@ -1,6 +1,6 @@
 import { Pool } from 'sequelize-pool';
-import type { ConnectionOptions, NormalizedPoolOptions } from '../../sequelize.js';
-import { logger } from '../../utils/logger.js';
+import type { ConnectionOptions, NormalizedPoolOptions } from '../sequelize.js';
+import { logger } from '../utils/logger.js';
 
 const debug = logger.debugContext('pool');
 

packages/core/src/dialects/abstract/where-sql-builder-types.ts → packages/core/src/abstract-dialect/where-sql-builder-types.ts

@@ -1,7 +1,7 @@
 import type { AllowArray } from '@sequelize/utils';
-import type { DynamicSqlExpression } from '../../expression-builders/base-sql-expression.js';
-import type { WhereOperators } from '../../model.js';
-import type { Op } from '../../operators.js';
+import type { DynamicSqlExpression } from '../expression-builders/base-sql-expression.js';
+import type { WhereOperators } from '../model.js';
+import type { Op } from '../operators.js';
 
 /**
  * This type allows using `Op.or`, `Op.and`, and `Op.not` recursively around another type.