diff --git a/packages/core/src/dialects/abstract/connection-manager.ts b/packages/core/src/abstract-dialect/connection-manager.ts similarity index 97% rename from packages/core/src/dialects/abstract/connection-manager.ts rename to packages/core/src/abstract-dialect/connection-manager.ts index 65c5d6312bed..e4d425af3070 100644 --- a/packages/core/src/dialects/abstract/connection-manager.ts +++ b/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'; diff --git a/packages/core/src/dialects/abstract/data-types-utils.ts b/packages/core/src/abstract-dialect/data-types-utils.ts similarity index 96% rename from packages/core/src/dialects/abstract/data-types-utils.ts rename to packages/core/src/abstract-dialect/data-types-utils.ts index e1c414bb13e6..92a91744e7aa 100644 --- a/packages/core/src/dialects/abstract/data-types-utils.ts +++ b/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, diff --git a/packages/core/src/dialects/abstract/data-types.ts b/packages/core/src/abstract-dialect/data-types.ts similarity index 99% rename from packages/core/src/dialects/abstract/data-types.ts rename to packages/core/src/abstract-dialect/data-types.ts index 0c784402a321..8010c1bb1f2c 100644 --- a/packages/core/src/dialects/abstract/data-types.ts +++ b/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, diff --git a/packages/core/src/dialects/abstract/index.ts b/packages/core/src/abstract-dialect/index.ts similarity index 99% rename from packages/core/src/dialects/abstract/index.ts rename to packages/core/src/abstract-dialect/index.ts index 37403da8b2c4..1a49e470dc06 100644 --- a/packages/core/src/dialects/abstract/index.ts +++ b/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'; diff --git a/packages/core/src/dialects/abstract/query-generator-internal.ts b/packages/core/src/abstract-dialect/query-generator-internal.ts similarity index 93% rename from packages/core/src/dialects/abstract/query-generator-internal.ts rename to packages/core/src/abstract-dialect/query-generator-internal.ts index e942f53552a5..aad0d5fe4632 100644 --- a/packages/core/src/dialects/abstract/query-generator-internal.ts +++ b/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'; diff --git a/packages/core/src/dialects/abstract/query-generator-typescript.ts b/packages/core/src/abstract-dialect/query-generator-typescript.ts similarity index 94% rename from packages/core/src/dialects/abstract/query-generator-typescript.ts rename to packages/core/src/abstract-dialect/query-generator-typescript.ts index 111a9519d6de..ea3851cc721c 100644 --- a/packages/core/src/dialects/abstract/query-generator-typescript.ts +++ b/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'; diff --git a/packages/core/src/dialects/abstract/query-generator.d.ts b/packages/core/src/abstract-dialect/query-generator.d.ts similarity index 96% rename from packages/core/src/dialects/abstract/query-generator.d.ts rename to packages/core/src/abstract-dialect/query-generator.d.ts index 2c8653f731c8..20567d1dfd2b 100644 --- a/packages/core/src/dialects/abstract/query-generator.d.ts +++ b/packages/core/src/abstract-dialect/query-generator.d.ts @@ -1,7 +1,7 @@ // 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, @@ -9,7 +9,7 @@ import type { 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'; diff --git a/packages/core/src/dialects/abstract/query-generator.internal-types.ts b/packages/core/src/abstract-dialect/query-generator.internal-types.ts similarity index 75% rename from packages/core/src/dialects/abstract/query-generator.internal-types.ts rename to packages/core/src/abstract-dialect/query-generator.internal-types.ts index d335970d6b88..4b7566964742 100644 --- a/packages/core/src/dialects/abstract/query-generator.internal-types.ts +++ b/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; diff --git a/packages/core/src/dialects/abstract/query-generator.js b/packages/core/src/abstract-dialect/query-generator.js similarity index 98% rename from packages/core/src/dialects/abstract/query-generator.js rename to packages/core/src/abstract-dialect/query-generator.js index 2a590bf5c9d8..ab51a7a3ef03 100644 --- a/packages/core/src/dialects/abstract/query-generator.js +++ b/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', diff --git a/packages/core/src/dialects/abstract/query-generator.types.ts b/packages/core/src/abstract-dialect/query-generator.types.ts similarity index 92% rename from packages/core/src/dialects/abstract/query-generator.types.ts rename to packages/core/src/abstract-dialect/query-generator.types.ts index 3f0d281c41fe..c654de68283e 100644 --- a/packages/core/src/dialects/abstract/query-generator.types.ts +++ b/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'; diff --git a/packages/core/src/dialects/abstract/query-interface-internal.ts b/packages/core/src/abstract-dialect/query-interface-internal.ts similarity index 91% rename from packages/core/src/dialects/abstract/query-interface-internal.ts rename to packages/core/src/abstract-dialect/query-interface-internal.ts index 9c819410429b..d9b6be2d7fe6 100644 --- a/packages/core/src/dialects/abstract/query-interface-internal.ts +++ b/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'; diff --git a/packages/core/src/dialects/abstract/query-interface-typescript.ts b/packages/core/src/abstract-dialect/query-interface-typescript.ts similarity index 98% rename from packages/core/src/dialects/abstract/query-interface-typescript.ts rename to packages/core/src/abstract-dialect/query-interface-typescript.ts index 0efe0b05be15..e8bf5287ac7d 100644 --- a/packages/core/src/dialects/abstract/query-interface-typescript.ts +++ b/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'; diff --git a/packages/core/src/dialects/abstract/query-interface.d.ts b/packages/core/src/abstract-dialect/query-interface.d.ts similarity index 97% rename from packages/core/src/dialects/abstract/query-interface.d.ts rename to packages/core/src/abstract-dialect/query-interface.d.ts index a87f52fdf9e5..aa8ef9edb86b 100644 --- a/packages/core/src/dialects/abstract/query-interface.d.ts +++ b/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'; diff --git a/packages/core/src/dialects/abstract/query-interface.js b/packages/core/src/abstract-dialect/query-interface.js similarity index 99% rename from packages/core/src/dialects/abstract/query-interface.js rename to packages/core/src/abstract-dialect/query-interface.js index c8b0b1f8461c..35ed29780749 100644 --- a/packages/core/src/dialects/abstract/query-interface.js +++ b/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'; diff --git a/packages/core/src/dialects/abstract/query-interface.types.ts b/packages/core/src/abstract-dialect/query-interface.types.ts similarity index 97% rename from packages/core/src/dialects/abstract/query-interface.types.ts rename to packages/core/src/abstract-dialect/query-interface.types.ts index a1bdcf687970..2b31591d4e94 100644 --- a/packages/core/src/dialects/abstract/query-interface.types.ts +++ b/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, diff --git a/packages/core/src/dialects/abstract/query.d.ts b/packages/core/src/abstract-dialect/query.d.ts similarity index 96% rename from packages/core/src/dialects/abstract/query.d.ts rename to packages/core/src/abstract-dialect/query.d.ts index 6ed52108590a..5019242c6c48 100644 --- a/packages/core/src/dialects/abstract/query.d.ts +++ b/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 { diff --git a/packages/core/src/dialects/abstract/query.js b/packages/core/src/abstract-dialect/query.js similarity index 99% rename from packages/core/src/dialects/abstract/query.js rename to packages/core/src/abstract-dialect/query.js index 41a67b7b76ea..9aa4348a9b2d 100644 --- a/packages/core/src/dialects/abstract/query.js +++ b/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 { diff --git a/packages/core/src/dialects/abstract/replication-pool.ts b/packages/core/src/abstract-dialect/replication-pool.ts similarity index 98% rename from packages/core/src/dialects/abstract/replication-pool.ts rename to packages/core/src/abstract-dialect/replication-pool.ts index f7e0018a29ab..fd4e0a3461fc 100644 --- a/packages/core/src/dialects/abstract/replication-pool.ts +++ b/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'); diff --git a/packages/core/src/dialects/abstract/where-sql-builder-types.ts b/packages/core/src/abstract-dialect/where-sql-builder-types.ts similarity index 95% rename from packages/core/src/dialects/abstract/where-sql-builder-types.ts rename to packages/core/src/abstract-dialect/where-sql-builder-types.ts index 634e63b91e68..6272340fc19f 100644 --- a/packages/core/src/dialects/abstract/where-sql-builder-types.ts +++ b/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. diff --git a/packages/core/src/dialects/abstract/where-sql-builder.ts b/packages/core/src/abstract-dialect/where-sql-builder.ts similarity index 96% rename from packages/core/src/dialects/abstract/where-sql-builder.ts rename to packages/core/src/abstract-dialect/where-sql-builder.ts index e301cc00d75b..e21cb32e09e7 100644 --- a/packages/core/src/dialects/abstract/where-sql-builder.ts +++ b/packages/core/src/abstract-dialect/where-sql-builder.ts @@ -1,24 +1,24 @@ import type { Nullish } from '@sequelize/utils'; import { EMPTY_ARRAY, EMPTY_OBJECT, isPlainObject, isString } from '@sequelize/utils'; import NodeUtil from 'node:util'; -import { BaseError } from '../../errors/base-error.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 { JsonPath } from '../../expression-builders/json-path.js'; -import { SQL_NULL } from '../../expression-builders/json-sql-null.js'; -import { Literal } from '../../expression-builders/literal.js'; -import { Value } from '../../expression-builders/value.js'; -import { Where } from '../../expression-builders/where.js'; -import type { AbstractDialect, Expression, ModelDefinition, WhereOptions } from '../../index.js'; -import { Op } from '../../operators'; -import type { ParsedJsonPropertyKey } from '../../utils/attribute-syntax.js'; -import { parseAttributeSyntax, parseNestedJsonKeySyntax } from '../../utils/attribute-syntax.js'; -import { noOpCol } from '../../utils/deprecations.js'; -import { extractModelDefinition } from '../../utils/model-utils.js'; -import { getComplexKeys, getOperators } from '../../utils/where.js'; +import { BaseError } from '../errors/base-error.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 { JsonPath } from '../expression-builders/json-path.js'; +import { SQL_NULL } from '../expression-builders/json-sql-null.js'; +import { Literal } from '../expression-builders/literal.js'; +import { Value } from '../expression-builders/value.js'; +import { Where } from '../expression-builders/where.js'; +import type { AbstractDialect, Expression, ModelDefinition, WhereOptions } from '../index.js'; +import { Op } from '../operators'; +import type { ParsedJsonPropertyKey } from '../utils/attribute-syntax.js'; +import { parseAttributeSyntax, parseNestedJsonKeySyntax } from '../utils/attribute-syntax.js'; +import { noOpCol } from '../utils/deprecations.js'; +import { extractModelDefinition } from '../utils/model-utils.js'; +import { getComplexKeys, getOperators } from '../utils/where.js'; import type { NormalizedDataType } from './data-types.js'; import * as DataTypes from './data-types.js'; import type { FormatWhereOptions } from './query-generator-typescript.js'; diff --git a/packages/core/src/associations/belongs-to-many.ts b/packages/core/src/associations/belongs-to-many.ts index e16a516baa6c..ab2ecb53ed41 100644 --- a/packages/core/src/associations/belongs-to-many.ts +++ b/packages/core/src/associations/belongs-to-many.ts @@ -4,7 +4,7 @@ import each from 'lodash/each'; import isEqual from 'lodash/isEqual'; import omit from 'lodash/omit'; import upperFirst from 'lodash/upperFirst'; -import type { WhereOptions } from '../dialects/abstract/where-sql-builder-types.js'; +import type { WhereOptions } from '../abstract-dialect/where-sql-builder-types.js'; import { AssociationError } from '../errors'; import { col } from '../expression-builders/col.js'; import { fn } from '../expression-builders/fn.js'; diff --git a/packages/core/src/associations/belongs-to.ts b/packages/core/src/associations/belongs-to.ts index 11fe7b0fd84f..1e9586aa1cc0 100644 --- a/packages/core/src/associations/belongs-to.ts +++ b/packages/core/src/associations/belongs-to.ts @@ -2,7 +2,7 @@ import isEqual from 'lodash/isEqual'; import isObject from 'lodash/isObject.js'; import upperFirst from 'lodash/upperFirst'; import assert from 'node:assert'; -import { cloneDataType } from '../dialects/abstract/data-types-utils.js'; +import { cloneDataType } from '../abstract-dialect/data-types-utils.js'; import { AssociationError } from '../errors/index.js'; import type { AttributeNames, diff --git a/packages/core/src/associations/has-many.ts b/packages/core/src/associations/has-many.ts index e0406075f24a..2f98c7c3161a 100644 --- a/packages/core/src/associations/has-many.ts +++ b/packages/core/src/associations/has-many.ts @@ -2,7 +2,7 @@ import type { AllowIterable } from '@sequelize/utils'; import { isPlainObject } from '@sequelize/utils'; import isObject from 'lodash/isObject'; import upperFirst from 'lodash/upperFirst'; -import type { WhereOptions } from '../dialects/abstract/where-sql-builder-types.js'; +import type { WhereOptions } from '../abstract-dialect/where-sql-builder-types.js'; import { AssociationError } from '../errors/index.js'; import { col } from '../expression-builders/col.js'; import { fn } from '../expression-builders/fn.js'; diff --git a/packages/core/src/data-types.ts b/packages/core/src/data-types.ts index 9baae498a3e7..89b9f22f4754 100644 --- a/packages/core/src/data-types.ts +++ b/packages/core/src/data-types.ts @@ -11,10 +11,10 @@ * @module DataTypes */ -import * as DataTypes from './dialects/abstract/data-types.js'; +import * as DataTypes from './abstract-dialect/data-types.js'; import { classToInvokable } from './utils/class-to-invokable.js'; -export { AbstractDataType as ABSTRACT } from './dialects/abstract/data-types.js'; +export { AbstractDataType as ABSTRACT } from './abstract-dialect/data-types.js'; /** This is a simple wrapper to make the DataType constructable without `new`. See the return type for all available options. */ export const STRING = classToInvokable(DataTypes.STRING); diff --git a/packages/core/src/decorators/legacy/attribute.ts b/packages/core/src/decorators/legacy/attribute.ts index 866da3ef6dea..6ce943b9dd9e 100644 --- a/packages/core/src/decorators/legacy/attribute.ts +++ b/packages/core/src/decorators/legacy/attribute.ts @@ -1,6 +1,6 @@ import type { NonUndefined } from '@sequelize/utils'; -import { isDataType } from '../../dialects/abstract/data-types-utils.js'; -import type { DataType } from '../../dialects/abstract/data-types.js'; +import { isDataType } from '../../abstract-dialect/data-types-utils.js'; +import type { DataType } from '../../abstract-dialect/data-types.js'; import type { AttributeIndexOptions, AttributeOptions } from '../../model.js'; import { columnToAttribute } from '../../utils/deprecations.js'; import { underscore } from '../../utils/string.js'; diff --git a/packages/core/src/decorators/shared/model.ts b/packages/core/src/decorators/shared/model.ts index e065f39aed3b..6e5b40b81d5a 100644 --- a/packages/core/src/decorators/shared/model.ts +++ b/packages/core/src/decorators/shared/model.ts @@ -1,5 +1,5 @@ import { EMPTY_OBJECT } from '@sequelize/utils'; -import { cloneDataType } from '../../dialects/abstract/data-types-utils.js'; +import { cloneDataType } from '../../abstract-dialect/data-types-utils.js'; import { BaseError } from '../../errors/base-error.js'; import { mergeModelOptions } from '../../model-definition.js'; import { initModel } from '../../model-typescript.js'; diff --git a/packages/core/src/expression-builders/cast.ts b/packages/core/src/expression-builders/cast.ts index 8c59b6781b29..cbf870163671 100644 --- a/packages/core/src/expression-builders/cast.ts +++ b/packages/core/src/expression-builders/cast.ts @@ -1,5 +1,5 @@ import { isPlainObject } from '@sequelize/utils'; -import type { DataType } from '../dialects/abstract/data-types.js'; +import type { DataType } from '../abstract-dialect/data-types.js'; import { Op } from '../operators.js'; import type { Expression } from '../sequelize.js'; import { BaseSqlExpression } from './base-sql-expression.js'; diff --git a/packages/core/src/expression-builders/dialect-aware-fn.ts b/packages/core/src/expression-builders/dialect-aware-fn.ts index e4ff66649a2f..d191043eca44 100644 --- a/packages/core/src/expression-builders/dialect-aware-fn.ts +++ b/packages/core/src/expression-builders/dialect-aware-fn.ts @@ -1,6 +1,6 @@ import type { Class } from 'type-fest'; -import type { AbstractDialect } from '../dialects/abstract/index.js'; -import type { EscapeOptions } from '../dialects/abstract/query-generator-typescript.js'; +import type { AbstractDialect } from '../abstract-dialect/index.js'; +import type { EscapeOptions } from '../abstract-dialect/query-generator-typescript.js'; import type { Expression } from '../sequelize.js'; import { BaseSqlExpression } from './base-sql-expression.js'; import { JsonPath } from './json-path.js'; diff --git a/packages/core/src/expression-builders/json-sql-null.ts b/packages/core/src/expression-builders/json-sql-null.ts index 36f0426e2dce..e8e0612e8131 100644 --- a/packages/core/src/expression-builders/json-sql-null.ts +++ b/packages/core/src/expression-builders/json-sql-null.ts @@ -1,4 +1,4 @@ -import type { AbstractDialect } from '../dialects/abstract/index.js'; +import type { AbstractDialect } from '../abstract-dialect/index.js'; import { DialectAwareFn } from './dialect-aware-fn.js'; import { literal } from './literal.js'; diff --git a/packages/core/src/expression-builders/uuid.ts b/packages/core/src/expression-builders/uuid.ts index 59b8f46eb0be..2056208a750e 100644 --- a/packages/core/src/expression-builders/uuid.ts +++ b/packages/core/src/expression-builders/uuid.ts @@ -1,6 +1,6 @@ import crypto from 'node:crypto'; import { v1 as generateUuidV1 } from 'uuid'; -import type { AbstractDialect } from '../dialects/abstract/index.js'; +import type { AbstractDialect } from '../abstract-dialect/index.js'; import { DialectAwareFn } from './dialect-aware-fn.js'; export class SqlUuidV4 extends DialectAwareFn { diff --git a/packages/core/src/expression-builders/where.ts b/packages/core/src/expression-builders/where.ts index c46ab2dfe31b..14207ee14467 100644 --- a/packages/core/src/expression-builders/where.ts +++ b/packages/core/src/expression-builders/where.ts @@ -1,8 +1,8 @@ import type { WhereAttributeHashValue, WhereOptions, -} from '../dialects/abstract/where-sql-builder-types.js'; -import { PojoWhere } from '../dialects/abstract/where-sql-builder.js'; +} from '../abstract-dialect/where-sql-builder-types.js'; +import { PojoWhere } from '../abstract-dialect/where-sql-builder.js'; import type { WhereOperators } from '../model.js'; import type { Op } from '../operators.js'; import type { Expression } from '../sequelize.js'; diff --git a/packages/core/src/index.d.ts b/packages/core/src/index.d.ts index d0f8f3227123..1cc75d0275b7 100644 --- a/packages/core/src/index.d.ts +++ b/packages/core/src/index.d.ts @@ -11,10 +11,7 @@ * @module */ -export * from './associations/index.js'; -export * as DataTypes from './data-types.js'; -export { ConstraintChecking, Deferrable } from './deferrable.js'; -export * from './dialects/abstract/connection-manager.js'; +export * from './abstract-dialect/connection-manager.js'; export type { ArrayOptions, BindParamOptions, @@ -33,14 +30,17 @@ export type { TextOptions, TimeOptions, VirtualOptions, -} from './dialects/abstract/data-types.js'; -export { AbstractDialect } from './dialects/abstract/index.js'; -export { AbstractQueryGenerator } from './dialects/abstract/query-generator.js'; -export * from './dialects/abstract/query-generator.types.js'; -export * from './dialects/abstract/query-interface.js'; -export * from './dialects/abstract/query-interface.types.js'; -export * from './dialects/abstract/query.js'; -export type { WhereOptions } from './dialects/abstract/where-sql-builder-types.js'; +} from './abstract-dialect/data-types.js'; +export { AbstractDialect } from './abstract-dialect/index.js'; +export { AbstractQueryGenerator } from './abstract-dialect/query-generator.js'; +export * from './abstract-dialect/query-generator.types.js'; +export * from './abstract-dialect/query-interface.js'; +export * from './abstract-dialect/query-interface.types.js'; +export * from './abstract-dialect/query.js'; +export type { WhereOptions } from './abstract-dialect/where-sql-builder-types.js'; +export * from './associations/index.js'; +export * as DataTypes from './data-types.js'; +export { ConstraintChecking, Deferrable } from './deferrable.js'; export * from './errors/index.js'; export { AssociationPath } from './expression-builders/association-path.js'; export { Attribute } from './expression-builders/attribute.js'; diff --git a/packages/core/src/instance-validator.js b/packages/core/src/instance-validator.js index 569015e69c18..8fda70bc9bd5 100644 --- a/packages/core/src/instance-validator.js +++ b/packages/core/src/instance-validator.js @@ -4,9 +4,9 @@ import difference from 'lodash/difference'; import forIn from 'lodash/forIn'; import get from 'lodash/get'; import { promisify } from 'node:util'; +import { AbstractDataType } from './abstract-dialect/data-types'; +import { validateDataType } from './abstract-dialect/data-types-utils'; import { BelongsToAssociation } from './associations/belongs-to'; -import { AbstractDataType } from './dialects/abstract/data-types'; -import { validateDataType } from './dialects/abstract/data-types-utils'; import * as SequelizeError from './errors'; import { BaseSqlExpression } from './expression-builders/base-sql-expression.js'; import { getAllOwnKeys } from './utils/object'; diff --git a/packages/core/src/model-definition.ts b/packages/core/src/model-definition.ts index b1e48e6e9025..d5b218d4f75e 100644 --- a/packages/core/src/model-definition.ts +++ b/packages/core/src/model-definition.ts @@ -2,11 +2,11 @@ import { MapView, SetView, pojo, some } from '@sequelize/utils'; import isPlainObject from 'lodash/isPlainObject'; import omit from 'lodash/omit'; import NodeUtil from 'node:util'; +import { isDataTypeClass } from './abstract-dialect/data-types-utils.js'; +import { AbstractDataType } from './abstract-dialect/data-types.js'; +import type { IndexOptions, TableNameWithSchema } from './abstract-dialect/query-interface.js'; import type { Association } from './associations/index.js'; import * as DataTypes from './data-types.js'; -import { isDataTypeClass } from './dialects/abstract/data-types-utils.js'; -import { AbstractDataType } from './dialects/abstract/data-types.js'; -import type { IndexOptions, TableNameWithSchema } from './dialects/abstract/query-interface.js'; import { BaseError } from './errors/index.js'; import type { HookHandler } from './hooks.js'; import type { ModelHooks } from './model-hooks.js'; diff --git a/packages/core/src/model-internals.ts b/packages/core/src/model-internals.ts index 6185f08069c4..c516b6d266a6 100644 --- a/packages/core/src/model-internals.ts +++ b/packages/core/src/model-internals.ts @@ -1,6 +1,6 @@ import NodeUtil from 'node:util'; -import type { IndexOptions } from './dialects/abstract/query-interface.js'; -import type { WhereAttributeHash } from './dialects/abstract/where-sql-builder-types.js'; +import type { IndexOptions } from './abstract-dialect/query-interface.js'; +import type { WhereAttributeHash } from './abstract-dialect/where-sql-builder-types.js'; import { EagerLoadingError } from './errors'; import type { Attributes, Model, Transactionable } from './model'; import type { ModelDefinition } from './model-definition.js'; diff --git a/packages/core/src/model-repository.types.ts b/packages/core/src/model-repository.types.ts index fe3080dc7833..778c3b542a4f 100644 --- a/packages/core/src/model-repository.types.ts +++ b/packages/core/src/model-repository.types.ts @@ -1,4 +1,4 @@ -import type { QiBulkDeleteOptions } from './dialects/abstract/query-interface.types.js'; +import type { QiBulkDeleteOptions } from './abstract-dialect/query-interface.types.js'; import type { NewHookable } from './hooks.js'; /** diff --git a/packages/core/src/model-set-view.ts b/packages/core/src/model-set-view.ts index 6b6aab194146..0c1383760bf7 100644 --- a/packages/core/src/model-set-view.ts +++ b/packages/core/src/model-set-view.ts @@ -2,7 +2,7 @@ import { SetView } from '@sequelize/utils'; import { inspect } from 'node:util'; // @ts-expect-error -- toposort-class definition will be added to sequelize/toposort later import Toposort from 'toposort-class'; -import type { AbstractDialect } from './dialects/abstract/index.js'; +import type { AbstractDialect } from './abstract-dialect/index.js'; import type { Model, ModelStatic } from './model'; import type { SequelizeTypeScript } from './sequelize-typescript.js'; diff --git a/packages/core/src/model.d.ts b/packages/core/src/model.d.ts index a58271bf20dd..41790d92bf36 100644 --- a/packages/core/src/model.d.ts +++ b/packages/core/src/model.d.ts @@ -6,6 +6,9 @@ import type { StrictRequiredBy, } from '@sequelize/utils'; import type { SetRequired } from 'type-fest'; +import type { Connection } from './abstract-dialect/connection-manager.js'; +import type { DataType, NormalizedDataType } from './abstract-dialect/data-types.js'; +import type { IndexField, IndexOptions, TableName } from './abstract-dialect/query-interface'; import type { Association, BelongsToAssociation, @@ -18,9 +21,6 @@ import type { HasOneOptions, } from './associations/index'; import type { Deferrable } from './deferrable'; -import type { Connection } from './dialects/abstract/connection-manager.js'; -import type { DataType, NormalizedDataType } from './dialects/abstract/data-types.js'; -import type { IndexField, IndexOptions, TableName } from './dialects/abstract/query-interface'; import type { DynamicSqlExpression } from './expression-builders/base-sql-expression.js'; import type { Cast } from './expression-builders/cast.js'; import type { Col } from './expression-builders/col.js'; diff --git a/packages/core/src/model.js b/packages/core/src/model.js index 0a2ab43fee9d..0aa026159fc6 100644 --- a/packages/core/src/model.js +++ b/packages/core/src/model.js @@ -28,6 +28,7 @@ import uniq from 'lodash/uniq'; import without from 'lodash/without'; import assert from 'node:assert'; import NodeUtil from 'node:util'; +import { AbstractDataType } from './abstract-dialect/data-types'; import { Association, BelongsToAssociation, @@ -37,7 +38,6 @@ import { } from './associations'; import { AssociationSecret } from './associations/helpers'; import * as DataTypes from './data-types'; -import { AbstractDataType } from './dialects/abstract/data-types'; import * as SequelizeErrors from './errors'; import { BaseSqlExpression } from './expression-builders/base-sql-expression.js'; import { InstanceValidator } from './instance-validator'; diff --git a/packages/core/src/sequelize-typescript.ts b/packages/core/src/sequelize-typescript.ts index 0b87aebdb581..baaee0c0019b 100644 --- a/packages/core/src/sequelize-typescript.ts +++ b/packages/core/src/sequelize-typescript.ts @@ -14,15 +14,15 @@ import type { SyncOptions, TruncateOptions, } from '.'; +import type { Connection, GetConnectionOptions } from './abstract-dialect/connection-manager.js'; +import { normalizeDataType, validateDataType } from './abstract-dialect/data-types-utils.js'; +import type { AbstractDataType } from './abstract-dialect/data-types.js'; +import type { AbstractDialect } from './abstract-dialect/index.js'; +import type { EscapeOptions } from './abstract-dialect/query-generator-typescript.js'; +import type { QiDropAllSchemasOptions } from './abstract-dialect/query-interface.types.js'; +import type { AbstractQuery } from './abstract-dialect/query.js'; import { initDecoratedAssociations } from './decorators/legacy/associations.js'; import { initDecoratedModel } from './decorators/shared/model.js'; -import type { Connection, GetConnectionOptions } from './dialects/abstract/connection-manager.js'; -import { normalizeDataType, validateDataType } from './dialects/abstract/data-types-utils.js'; -import type { AbstractDataType } from './dialects/abstract/data-types.js'; -import type { AbstractDialect } from './dialects/abstract/index.js'; -import type { EscapeOptions } from './dialects/abstract/query-generator-typescript.js'; -import type { QiDropAllSchemasOptions } from './dialects/abstract/query-interface.types.js'; -import type { AbstractQuery } from './dialects/abstract/query.js'; import { legacyBuildAddAnyHook, legacyBuildAddHook, diff --git a/packages/core/src/sequelize.d.ts b/packages/core/src/sequelize.d.ts index 8ed2f92287d3..5bfea037f3f3 100644 --- a/packages/core/src/sequelize.d.ts +++ b/packages/core/src/sequelize.d.ts @@ -9,12 +9,12 @@ import type { TransactionNestMode, TransactionType, } from '.'; -import type { AbstractDialect, DialectOptions } from './dialects/abstract'; -import type { DataType } from './dialects/abstract/data-types.js'; +import type { AbstractDialect, DialectOptions } from './abstract-dialect'; +import type { DataType } from './abstract-dialect/data-types.js'; import type { ColumnsDescription, RawConstraintDescription, -} from './dialects/abstract/query-interface.types'; +} from './abstract-dialect/query-interface.types'; import type { BaseSqlExpression, DynamicSqlExpression, diff --git a/packages/core/src/sequelize.internals.ts b/packages/core/src/sequelize.internals.ts index 71ad97059daf..6eab9fd60d19 100644 --- a/packages/core/src/sequelize.internals.ts +++ b/packages/core/src/sequelize.internals.ts @@ -1,4 +1,4 @@ -import type { AbstractDialect } from './dialects/abstract/index.js'; +import type { AbstractDialect } from './abstract-dialect/index.js'; import type { DialectName } from './sequelize.js'; export function importDialect(dialect: DialectName): typeof AbstractDialect { diff --git a/packages/core/src/sequelize.js b/packages/core/src/sequelize.js index 2a460490f619..9d244ece1188 100644 --- a/packages/core/src/sequelize.js +++ b/packages/core/src/sequelize.js @@ -7,6 +7,11 @@ import isPlainObject from 'lodash/isPlainObject'; import map from 'lodash/map'; import pick from 'lodash/pick'; import retry from 'retry-as-promised'; +import { AbstractConnectionManager } from './abstract-dialect/connection-manager.js'; +import { AbstractDialect } from './abstract-dialect/index.js'; +import { AbstractQueryGenerator } from './abstract-dialect/query-generator.js'; +import { AbstractQueryInterface } from './abstract-dialect/query-interface'; +import { AbstractQuery } from './abstract-dialect/query.js'; import { BelongsToAssociation } from './associations/belongs-to'; import { BelongsToManyAssociation } from './associations/belongs-to-many'; import { HasManyAssociation } from './associations/has-many'; @@ -14,11 +19,6 @@ import { HasOneAssociation } from './associations/has-one'; import { Association } from './associations/index'; import * as DataTypes from './data-types'; import { ConstraintChecking, Deferrable } from './deferrable'; -import { AbstractConnectionManager } from './dialects/abstract/connection-manager.js'; -import { AbstractDialect } from './dialects/abstract/index.js'; -import { AbstractQueryGenerator } from './dialects/abstract/query-generator.js'; -import { AbstractQueryInterface } from './dialects/abstract/query-interface'; -import { AbstractQuery } from './dialects/abstract/query.js'; import * as SequelizeErrors from './errors'; import { AssociationPath } from './expression-builders/association-path'; import { Attribute } from './expression-builders/attribute'; diff --git a/packages/core/src/sql-string.ts b/packages/core/src/sql-string.ts index 3f9f2030881f..857f089f40fc 100644 --- a/packages/core/src/sql-string.ts +++ b/packages/core/src/sql-string.ts @@ -1,6 +1,6 @@ +import type { AbstractDataType } from './abstract-dialect/data-types.js'; +import type { AbstractDialect } from './abstract-dialect/index.js'; import * as DataTypes from './data-types'; -import type { AbstractDataType } from './dialects/abstract/data-types.js'; -import type { AbstractDialect } from './dialects/abstract/index.js'; import { logger } from './utils/logger'; const textDataTypeMap = new Map>(); diff --git a/packages/core/src/utils/check.ts b/packages/core/src/utils/check.ts index 53a6543b64f1..65d16b7d35e8 100644 --- a/packages/core/src/utils/check.ts +++ b/packages/core/src/utils/check.ts @@ -1,6 +1,6 @@ import { isIterable } from '@sequelize/utils'; import pickBy from 'lodash/pickBy'; -import type { AbstractDialect } from '../dialects/abstract/index.js'; +import type { AbstractDialect } from '../abstract-dialect/index.js'; /** * Some dialects emit an Error with a string code, that are not ErrnoException. diff --git a/packages/core/src/utils/dialect.ts b/packages/core/src/utils/dialect.ts index dadf2b7955a8..5d9443db8f17 100644 --- a/packages/core/src/utils/dialect.ts +++ b/packages/core/src/utils/dialect.ts @@ -2,7 +2,7 @@ import { isPlainObject, isString } from '@sequelize/utils'; import { randomUUID } from 'node:crypto'; import NodeUtil from 'node:util'; import { v1 as uuidv1 } from 'uuid'; -import * as DataTypes from '../dialects/abstract/data-types.js'; +import * as DataTypes from '../abstract-dialect/data-types.js'; import { DialectAwareFn } from '../expression-builders/dialect-aware-fn.js'; import { noDataTypesUuid } from './deprecations.js'; diff --git a/packages/core/src/utils/model-utils.ts b/packages/core/src/utils/model-utils.ts index 15224c1169ac..eec0ad31f885 100644 --- a/packages/core/src/utils/model-utils.ts +++ b/packages/core/src/utils/model-utils.ts @@ -1,6 +1,6 @@ import { isString } from '@sequelize/utils'; -import type { TableOrModel } from '../dialects/abstract/query-generator.types.js'; -import type { TableNameWithSchema } from '../dialects/abstract/query-interface.js'; +import type { TableOrModel } from '../abstract-dialect/query-generator.types.js'; +import type { TableNameWithSchema } from '../abstract-dialect/query-interface.js'; import type { Model, ModelStatic } from '../model'; import { ModelDefinition } from '../model-definition.js'; diff --git a/packages/core/src/utils/query-builder-utils.ts b/packages/core/src/utils/query-builder-utils.ts index 9b81335ccf7b..298677679ab0 100644 --- a/packages/core/src/utils/query-builder-utils.ts +++ b/packages/core/src/utils/query-builder-utils.ts @@ -1,6 +1,6 @@ import isEmpty from 'lodash/isEmpty.js'; +import type { AbstractDialect } from '../abstract-dialect/index.js'; import * as DataTypes from '../data-types'; -import type { AbstractDialect } from '../dialects/abstract/index.js'; import { DialectAwareFn } from '../expression-builders/dialect-aware-fn.js'; import { getOperators } from './where.js'; diff --git a/packages/core/src/utils/sql.ts b/packages/core/src/utils/sql.ts index 834e99f634bd..6b0533e4dae7 100644 --- a/packages/core/src/utils/sql.ts +++ b/packages/core/src/utils/sql.ts @@ -1,8 +1,8 @@ import isPlainObject from 'lodash/isPlainObject'; -import type { AbstractDialect, BindCollector } from '../dialects/abstract/index.js'; -import type { EscapeOptions } from '../dialects/abstract/query-generator-typescript.js'; -import type { AddLimitOffsetOptions } from '../dialects/abstract/query-generator.internal-types.js'; -import type { AbstractQueryGenerator } from '../dialects/abstract/query-generator.js'; +import type { AbstractDialect, BindCollector } from '../abstract-dialect/index.js'; +import type { EscapeOptions } from '../abstract-dialect/query-generator-typescript.js'; +import type { AddLimitOffsetOptions } from '../abstract-dialect/query-generator.internal-types.js'; +import type { AbstractQueryGenerator } from '../abstract-dialect/query-generator.js'; import { BaseSqlExpression } from '../expression-builders/base-sql-expression.js'; import type { BindOrReplacements, QueryRawOptions, Sequelize } from '../sequelize.js'; diff --git a/packages/core/src/utils/string.ts b/packages/core/src/utils/string.ts index 99d2c72b96ec..c340214c092b 100644 --- a/packages/core/src/utils/string.ts +++ b/packages/core/src/utils/string.ts @@ -1,7 +1,7 @@ import * as _inflection from 'inflection'; import lowerFirst from 'lodash/lowerFirst'; import NodeUtil from 'node:util'; -import type { IndexOptions, TableName } from '../dialects/abstract/query-interface.js'; +import type { IndexOptions, TableName } from '../abstract-dialect/query-interface.js'; import { BaseSqlExpression } from '../expression-builders/base-sql-expression.js'; /* Inflection */ diff --git a/packages/core/src/utils/url.ts b/packages/core/src/utils/url.ts index 38480cce4dfd..3210c88a1175 100644 --- a/packages/core/src/utils/url.ts +++ b/packages/core/src/utils/url.ts @@ -2,7 +2,7 @@ import path from 'node:path'; import { URL } from 'node:url'; import type { ConnectionOptions } from 'pg-connection-string'; import pgConnectionString from 'pg-connection-string'; -import type { AbstractDialect } from '../dialects/abstract/index.js'; +import type { AbstractDialect } from '../abstract-dialect/index.js'; import type { DialectName, LegacyDialectOptions, Options } from '../sequelize'; import { SUPPORTED_DIALECTS } from '../sequelize-typescript'; import { encodeHost } from './deprecations'; diff --git a/packages/core/test/integration/dialects/abstract/connection-manager.test.ts b/packages/core/test/integration/dialects/abstract/connection-manager.test.ts index b84cdeda0559..9fffb9e7cfa4 100644 --- a/packages/core/test/integration/dialects/abstract/connection-manager.test.ts +++ b/packages/core/test/integration/dialects/abstract/connection-manager.test.ts @@ -1,6 +1,6 @@ import type { Connection } from '@sequelize/core'; -import type { GetConnectionOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/connection-manager.js'; -import { ReplicationPool } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/replication-pool.js'; +import type { GetConnectionOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/connection-manager.js'; +import { ReplicationPool } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/replication-pool.js'; import chai from 'chai'; import { Pool } from 'sequelize-pool'; import type { SinonSandbox } from 'sinon'; diff --git a/packages/core/test/integration/support.ts b/packages/core/test/integration/support.ts index e846353bfc32..4aec4703d599 100644 --- a/packages/core/test/integration/support.ts +++ b/packages/core/test/integration/support.ts @@ -1,6 +1,6 @@ import type { AbstractDialect, Options } from '@sequelize/core'; import { QueryTypes, Sequelize } from '@sequelize/core'; -import type { AbstractQuery } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query.js'; +import type { AbstractQuery } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query.js'; import uniq from 'lodash/uniq'; import fs from 'node:fs'; import pTimeout from 'p-timeout'; diff --git a/packages/core/test/support.ts b/packages/core/test/support.ts index 1dd43a3db215..54e84dc71773 100644 --- a/packages/core/test/support.ts +++ b/packages/core/test/support.ts @@ -17,7 +17,6 @@ import { Config } from './config/config'; const expect = chai.expect; -const distDir = path.resolve(__dirname, '..', 'lib'); const packagesDir = path.resolve(__dirname, '..', '..'); const NON_DIALECT_PACKAGES = Object.freeze(['utils', 'validator-js', 'core']); @@ -175,12 +174,7 @@ export function getSequelizeInstance(options?: Options): Sequel } export function getSupportedDialects() { - return [ - ...fs - .readdirSync(path.join(distDir, 'dialects')) - .filter(file => !file.includes('.js') && !file.includes('abstract')), - ...fs.readdirSync(packagesDir).filter(file => !NON_DIALECT_PACKAGES.includes(file)), - ]; + return fs.readdirSync(packagesDir).filter(file => !NON_DIALECT_PACKAGES.includes(file)); } export function getTestDialect(): DialectName { diff --git a/packages/core/test/types/hooks.ts b/packages/core/test/types/hooks.ts index f60bce984473..28ed292cf5d6 100644 --- a/packages/core/test/types/hooks.ts +++ b/packages/core/test/types/hooks.ts @@ -6,16 +6,16 @@ import type { UpsertOptions, } from '@sequelize/core'; import { Model, Sequelize } from '@sequelize/core'; +import type { + Connection, + GetConnectionOptions, +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/connection-manager.js'; +import type { AbstractQuery } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query.js'; import type { AfterAssociateEventData, AssociationOptions, BeforeAssociateEventData, } from '@sequelize/core/_non-semver-use-at-your-own-risk_/associations/index.js'; -import type { - Connection, - GetConnectionOptions, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/connection-manager.js'; -import type { AbstractQuery } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query.js'; import type { ValidationOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/instance-validator.js'; import type { ModelHooks } from '@sequelize/core/_non-semver-use-at-your-own-risk_/model-hooks.js'; import { expectTypeOf } from 'expect-type'; diff --git a/packages/core/test/unit/data-types/misc-data-types.test.ts b/packages/core/test/unit/data-types/misc-data-types.test.ts index 8ab8598d21f8..60c43e7a94d2 100644 --- a/packages/core/test/unit/data-types/misc-data-types.test.ts +++ b/packages/core/test/unit/data-types/misc-data-types.test.ts @@ -1,6 +1,6 @@ import type { DataTypeInstance } from '@sequelize/core'; import { DataTypes, JSON_NULL, SQL_NULL, ValidationErrorItem } from '@sequelize/core'; -import type { ENUM } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types.js'; +import type { ENUM } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types.js'; import { expect } from 'chai'; import assert from 'node:assert'; import { createSequelizeInstance, expectsql, sequelize, typeTest } from '../../support'; diff --git a/packages/core/test/unit/dialects/abstract/query.test.js b/packages/core/test/unit/dialects/abstract/query.test.js index 21c165d11ee6..4bcfa60d7900 100644 --- a/packages/core/test/unit/dialects/abstract/query.test.js +++ b/packages/core/test/unit/dialects/abstract/query.test.js @@ -3,7 +3,7 @@ const { DataTypes } = require('@sequelize/core'); const { AbstractQuery: Query, -} = require('@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query.js'); +} = require('@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query.js'); const Support = require('../../../support'); const chai = require('chai'); diff --git a/packages/core/test/unit/sql/where.test.ts b/packages/core/test/unit/sql/where.test.ts index 8f419a5d1d66..d1eac7f2ae9a 100644 --- a/packages/core/test/unit/sql/where.test.ts +++ b/packages/core/test/unit/sql/where.test.ts @@ -11,7 +11,7 @@ import type { WhereOptions, } from '@sequelize/core'; import { DataTypes, JSON_NULL, Model, Op, SQL_NULL, and, json, or, sql } from '@sequelize/core'; -import type { FormatWhereOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-typescript.js'; +import type { FormatWhereOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-typescript.js'; import { expect } from 'chai'; import { expectTypeOf } from 'expect-type'; import attempt from 'lodash/attempt'; diff --git a/packages/db2/src/_internal/data-types-overrides.ts b/packages/db2/src/_internal/data-types-overrides.ts index 3a3060d80936..128dcd455a27 100644 --- a/packages/db2/src/_internal/data-types-overrides.ts +++ b/packages/db2/src/_internal/data-types-overrides.ts @@ -1,6 +1,6 @@ import type { AbstractDialect } from '@sequelize/core'; -import type { AcceptedDate } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types.js'; -import * as BaseTypes from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types.js'; +import type { AcceptedDate } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types.js'; +import * as BaseTypes from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types.js'; import dayjs from 'dayjs'; import utc from 'dayjs/plugin/utc'; import maxBy from 'lodash/maxBy.js'; diff --git a/packages/db2/src/query-generator-typescript.internal.ts b/packages/db2/src/query-generator-typescript.internal.ts index 877deda1c604..6d0f5b8e3b16 100644 --- a/packages/db2/src/query-generator-typescript.internal.ts +++ b/packages/db2/src/query-generator-typescript.internal.ts @@ -15,7 +15,7 @@ import { REMOVE_INDEX_QUERY_SUPPORTABLE_OPTIONS, RENAME_TABLE_QUERY_SUPPORTABLE_OPTIONS, TRUNCATE_TABLE_QUERY_SUPPORTABLE_OPTIONS, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-typescript.js'; +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-typescript.js'; import { rejectInvalidOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/check.js'; import { joinSQLFragments } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/join-sql-fragments.js'; import { EMPTY_SET } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/object.js'; diff --git a/packages/db2/src/query-generator.internal.ts b/packages/db2/src/query-generator.internal.ts index 7bf5592a34e9..7ec0b105215e 100644 --- a/packages/db2/src/query-generator.internal.ts +++ b/packages/db2/src/query-generator.internal.ts @@ -1,5 +1,5 @@ -import { AbstractQueryGeneratorInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-internal.js'; -import type { AddLimitOffsetOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator.internal-types.js'; +import { AbstractQueryGeneratorInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-internal.js'; +import type { AddLimitOffsetOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator.internal-types.js'; import { formatDb2StyleLimitOffset } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/sql.js'; import type { Db2Dialect } from './dialect.js'; diff --git a/packages/db2/src/query-generator.js b/packages/db2/src/query-generator.js index 10217e4926f4..73d0262db2cf 100644 --- a/packages/db2/src/query-generator.js +++ b/packages/db2/src/query-generator.js @@ -4,11 +4,11 @@ import { DataTypes, Op } from '@sequelize/core'; import { attributeTypeToSql, normalizeDataType, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types-utils.js'; +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types-utils.js'; import { ADD_COLUMN_QUERY_SUPPORTABLE_OPTIONS, CREATE_TABLE_QUERY_SUPPORTABLE_OPTIONS, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator.js'; +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator.js'; import { rejectInvalidOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/check.js'; import { removeNullishValuesFromHash } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/format.js'; import { EMPTY_SET } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/object.js'; diff --git a/packages/db2/src/query-interface-typescript.internal.ts b/packages/db2/src/query-interface-typescript.internal.ts index 6a5c06fa5cc4..78e3cf944413 100644 --- a/packages/db2/src/query-interface-typescript.internal.ts +++ b/packages/db2/src/query-interface-typescript.internal.ts @@ -6,7 +6,7 @@ import type { StartTransactionOptions, } from '@sequelize/core'; import { AbstractQueryInterface, QueryTypes, Transaction } from '@sequelize/core'; -import { START_TRANSACTION_QUERY_SUPPORTABLE_OPTIONS } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-typescript.js'; +import { START_TRANSACTION_QUERY_SUPPORTABLE_OPTIONS } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-typescript.js'; import { rejectInvalidOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/check.js'; import type { Db2Connection } from './connection-manager.js'; import type { Db2Dialect } from './dialect.js'; diff --git a/packages/db2/src/query-interface.internal.ts b/packages/db2/src/query-interface.internal.ts index 56ed048bf524..54117dba3186 100644 --- a/packages/db2/src/query-interface.internal.ts +++ b/packages/db2/src/query-interface.internal.ts @@ -1,5 +1,5 @@ import { IsolationLevel } from '@sequelize/core'; -import { AbstractQueryInterfaceInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-interface-internal.js'; +import { AbstractQueryInterfaceInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-interface-internal.js'; import type { Db2Dialect } from './dialect.js'; export class Db2QueryInterfaceInternal extends AbstractQueryInterfaceInternal { diff --git a/packages/ibmi/src/_internal/data-types-overrides.ts b/packages/ibmi/src/_internal/data-types-overrides.ts index d60d47eb3bf0..edc92ad7b704 100644 --- a/packages/ibmi/src/_internal/data-types-overrides.ts +++ b/packages/ibmi/src/_internal/data-types-overrides.ts @@ -1,6 +1,6 @@ import type { AbstractDialect } from '@sequelize/core'; -import type { AcceptedDate } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types.js'; -import * as BaseTypes from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types.js'; +import type { AcceptedDate } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types.js'; +import * as BaseTypes from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types.js'; import dayjs from 'dayjs'; import utc from 'dayjs/plugin/utc'; import maxBy from 'lodash/maxBy.js'; diff --git a/packages/ibmi/src/query-generator-typescript.internal.ts b/packages/ibmi/src/query-generator-typescript.internal.ts index 15b35ef2a416..976d7bd34046 100644 --- a/packages/ibmi/src/query-generator-typescript.internal.ts +++ b/packages/ibmi/src/query-generator-typescript.internal.ts @@ -12,7 +12,7 @@ import { REMOVE_INDEX_QUERY_SUPPORTABLE_OPTIONS, RENAME_TABLE_QUERY_SUPPORTABLE_OPTIONS, TRUNCATE_TABLE_QUERY_SUPPORTABLE_OPTIONS, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-typescript.js'; +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-typescript.js'; import { rejectInvalidOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/check.js'; import { joinSQLFragments } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/join-sql-fragments.js'; import { EMPTY_SET } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/object.js'; diff --git a/packages/ibmi/src/query-generator.internal.ts b/packages/ibmi/src/query-generator.internal.ts index 55bd832196d3..d550145e0acd 100644 --- a/packages/ibmi/src/query-generator.internal.ts +++ b/packages/ibmi/src/query-generator.internal.ts @@ -1,5 +1,5 @@ -import { AbstractQueryGeneratorInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-internal.js'; -import type { AddLimitOffsetOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator.internal-types.js'; +import { AbstractQueryGeneratorInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-internal.js'; +import type { AddLimitOffsetOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator.internal-types.js'; import { formatDb2StyleLimitOffset } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/sql.js'; import type { IBMiDialect } from './dialect.js'; diff --git a/packages/ibmi/src/query-generator.js b/packages/ibmi/src/query-generator.js index 25ad0b5297f3..a122703869c4 100644 --- a/packages/ibmi/src/query-generator.js +++ b/packages/ibmi/src/query-generator.js @@ -4,11 +4,11 @@ import { DataTypes } from '@sequelize/core'; import { attributeTypeToSql, normalizeDataType, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types-utils.js'; +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types-utils.js'; import { ADD_COLUMN_QUERY_SUPPORTABLE_OPTIONS, CREATE_TABLE_QUERY_SUPPORTABLE_OPTIONS, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator.js'; +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator.js'; import { BaseSqlExpression } from '@sequelize/core/_non-semver-use-at-your-own-risk_/expression-builders/base-sql-expression.js'; import { conformIndex } from '@sequelize/core/_non-semver-use-at-your-own-risk_/model-internals.js'; import { rejectInvalidOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/check.js'; diff --git a/packages/ibmi/src/query-interface.internal.ts b/packages/ibmi/src/query-interface.internal.ts index e8ab9ad5b9c5..fab131a93e70 100644 --- a/packages/ibmi/src/query-interface.internal.ts +++ b/packages/ibmi/src/query-interface.internal.ts @@ -1,5 +1,5 @@ import { IsolationLevel } from '@sequelize/core'; -import { AbstractQueryInterfaceInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-interface-internal.js'; +import { AbstractQueryInterfaceInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-interface-internal.js'; import type { IBMiDialect } from './dialect.js'; export class IBMiQueryInterfaceInternal extends AbstractQueryInterfaceInternal { diff --git a/packages/ibmi/src/query-interface.ts b/packages/ibmi/src/query-interface.ts index 237888a3c4f5..a4ccebff122a 100644 --- a/packages/ibmi/src/query-interface.ts +++ b/packages/ibmi/src/query-interface.ts @@ -5,7 +5,7 @@ import type { StartTransactionOptions, } from '@sequelize/core'; import { AbstractQueryInterface, Transaction } from '@sequelize/core'; -import { START_TRANSACTION_QUERY_SUPPORTABLE_OPTIONS } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-typescript.js'; +import { START_TRANSACTION_QUERY_SUPPORTABLE_OPTIONS } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-typescript.js'; import { rejectInvalidOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/check.js'; import type { IBMiConnection } from './connection-manager'; import type { IBMiDialect } from './dialect.js'; diff --git a/packages/mariadb/src/_internal/data-types-overrides.ts b/packages/mariadb/src/_internal/data-types-overrides.ts index 39689ef77ff9..b16bc8cc900f 100644 --- a/packages/mariadb/src/_internal/data-types-overrides.ts +++ b/packages/mariadb/src/_internal/data-types-overrides.ts @@ -1,6 +1,6 @@ import type { BindParamOptions, GeoJson } from '@sequelize/core'; -import type { AcceptedDate } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types.js'; -import * as BaseTypes from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types.js'; +import type { AcceptedDate } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types.js'; +import * as BaseTypes from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types.js'; import { isValidTimeZone } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/dayjs.js'; import { isString } from '@sequelize/utils'; import dayjs from 'dayjs'; diff --git a/packages/mariadb/src/dialect.ts b/packages/mariadb/src/dialect.ts index 13d7b86d34f7..a54a8ff54826 100644 --- a/packages/mariadb/src/dialect.ts +++ b/packages/mariadb/src/dialect.ts @@ -1,6 +1,6 @@ import type { Sequelize } from '@sequelize/core'; import { AbstractDialect } from '@sequelize/core'; -import type { SupportableNumericOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/index.js'; +import type { SupportableNumericOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/index.js'; import { createUnspecifiedOrderedBindCollector, escapeMysqlMariaDbString, diff --git a/packages/mariadb/src/query-generator-typescript.internal.ts b/packages/mariadb/src/query-generator-typescript.internal.ts index 8c43db379d51..195e3fe31cde 100644 --- a/packages/mariadb/src/query-generator-typescript.internal.ts +++ b/packages/mariadb/src/query-generator-typescript.internal.ts @@ -8,11 +8,11 @@ import type { TruncateTableQueryOptions, } from '@sequelize/core'; import { AbstractQueryGenerator, Op } from '@sequelize/core'; -import type { EscapeOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-typescript.js'; +import type { EscapeOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-typescript.js'; import { REMOVE_INDEX_QUERY_SUPPORTABLE_OPTIONS, TRUNCATE_TABLE_QUERY_SUPPORTABLE_OPTIONS, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-typescript.js'; +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-typescript.js'; import { rejectInvalidOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/check.js'; import { joinSQLFragments } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/join-sql-fragments.js'; import { buildJsonPath } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/json.js'; diff --git a/packages/mariadb/src/query-generator.internal.ts b/packages/mariadb/src/query-generator.internal.ts index 6df3a2dfe937..af2fd6273482 100644 --- a/packages/mariadb/src/query-generator.internal.ts +++ b/packages/mariadb/src/query-generator.internal.ts @@ -1,5 +1,5 @@ -import { AbstractQueryGeneratorInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-internal.js'; -import type { AddLimitOffsetOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator.internal-types.js'; +import { AbstractQueryGeneratorInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-internal.js'; +import type { AddLimitOffsetOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator.internal-types.js'; import { formatMySqlStyleLimitOffset } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/sql.js'; import type { MariaDbDialect } from './dialect.js'; diff --git a/packages/mariadb/src/query-generator.js b/packages/mariadb/src/query-generator.js index 223de52e4ccf..be7d3d1c46bd 100644 --- a/packages/mariadb/src/query-generator.js +++ b/packages/mariadb/src/query-generator.js @@ -3,7 +3,7 @@ import { attributeTypeToSql, normalizeDataType, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types-utils.js'; +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types-utils.js'; import { joinSQLFragments } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/join-sql-fragments.js'; import { defaultValueSchemable } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/query-builder-utils.js'; import each from 'lodash/each'; diff --git a/packages/mssql/src/_internal/data-types-overrides.ts b/packages/mssql/src/_internal/data-types-overrides.ts index e6b6868e762a..919fdc6151af 100644 --- a/packages/mssql/src/_internal/data-types-overrides.ts +++ b/packages/mssql/src/_internal/data-types-overrides.ts @@ -1,6 +1,6 @@ import type { AbstractDialect } from '@sequelize/core'; import { BaseError } from '@sequelize/core'; -import * as BaseTypes from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types.js'; +import * as BaseTypes from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types.js'; import maxBy from 'lodash/maxBy'; import NodeUtil from 'node:util'; diff --git a/packages/mssql/src/query-generator-typescript.internal.ts b/packages/mssql/src/query-generator-typescript.internal.ts index e5c2e8319b3e..ab16a464ad3a 100644 --- a/packages/mssql/src/query-generator-typescript.internal.ts +++ b/packages/mssql/src/query-generator-typescript.internal.ts @@ -13,12 +13,12 @@ import type { TruncateTableQueryOptions, } from '@sequelize/core'; import { AbstractQueryGenerator } from '@sequelize/core'; -import type { EscapeOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-typescript.js'; +import type { EscapeOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-typescript.js'; import { CREATE_DATABASE_QUERY_SUPPORTABLE_OPTIONS, REMOVE_INDEX_QUERY_SUPPORTABLE_OPTIONS, TRUNCATE_TABLE_QUERY_SUPPORTABLE_OPTIONS, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-typescript.js'; +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-typescript.js'; import { rejectInvalidOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/check.js'; import { joinSQLFragments } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/join-sql-fragments.js'; import { buildJsonPath } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/json.js'; diff --git a/packages/mssql/src/query-generator.internal.ts b/packages/mssql/src/query-generator.internal.ts index 6dddf8048491..67e8a7188158 100644 --- a/packages/mssql/src/query-generator.internal.ts +++ b/packages/mssql/src/query-generator.internal.ts @@ -1,5 +1,5 @@ -import { AbstractQueryGeneratorInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-internal.js'; -import type { AddLimitOffsetOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator.internal-types.js'; +import { AbstractQueryGeneratorInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-internal.js'; +import type { AddLimitOffsetOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator.internal-types.js'; import type { MsSqlDialect } from './dialect.js'; const TECHNICAL_DATABASE_NAMES = Object.freeze(['master', 'model', 'msdb', 'tempdb']); diff --git a/packages/mssql/src/query-generator.js b/packages/mssql/src/query-generator.js index 316f27c1f281..0f21b2a07202 100644 --- a/packages/mssql/src/query-generator.js +++ b/packages/mssql/src/query-generator.js @@ -4,11 +4,11 @@ import { DataTypes, Op } from '@sequelize/core'; import { attributeTypeToSql, normalizeDataType, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types-utils.js'; +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types-utils.js'; import { ADD_COLUMN_QUERY_SUPPORTABLE_OPTIONS, CREATE_TABLE_QUERY_SUPPORTABLE_OPTIONS, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator.js'; +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator.js'; import { rejectInvalidOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/check.js'; import { joinSQLFragments } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/join-sql-fragments.js'; import { EMPTY_SET } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/object.js'; diff --git a/packages/mssql/src/query-interface-typescript.internal.ts b/packages/mssql/src/query-interface-typescript.internal.ts index 463e9eb6e42c..573610afafa6 100644 --- a/packages/mssql/src/query-interface-typescript.internal.ts +++ b/packages/mssql/src/query-interface-typescript.internal.ts @@ -6,7 +6,7 @@ import type { StartTransactionOptions, } from '@sequelize/core'; import { AbstractQueryInterface, Transaction } from '@sequelize/core'; -import { START_TRANSACTION_QUERY_SUPPORTABLE_OPTIONS } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-typescript.js'; +import { START_TRANSACTION_QUERY_SUPPORTABLE_OPTIONS } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-typescript.js'; import { rejectInvalidOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/check.js'; import { ASYNC_QUEUE } from './_internal/symbols.js'; import type { MsSqlConnection } from './connection-manager.js'; diff --git a/packages/mssql/src/query-interface.internal.ts b/packages/mssql/src/query-interface.internal.ts index 04be7c571fa0..8c0580b77ff3 100644 --- a/packages/mssql/src/query-interface.internal.ts +++ b/packages/mssql/src/query-interface.internal.ts @@ -1,5 +1,5 @@ import { IsolationLevel } from '@sequelize/core'; -import { AbstractQueryInterfaceInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-interface-internal.js'; +import { AbstractQueryInterfaceInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-interface-internal.js'; import type { MsSqlDialect } from './dialect.js'; export class MsSqlQueryInterfaceInternal extends AbstractQueryInterfaceInternal { diff --git a/packages/mysql/src/_internal/data-types-overrides.ts b/packages/mysql/src/_internal/data-types-overrides.ts index 2b3f3d57cfa3..27939561e156 100644 --- a/packages/mysql/src/_internal/data-types-overrides.ts +++ b/packages/mysql/src/_internal/data-types-overrides.ts @@ -1,6 +1,6 @@ import type { BindParamOptions, GeoJson } from '@sequelize/core'; -import type { AcceptedDate } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types.js'; -import * as BaseTypes from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types.js'; +import type { AcceptedDate } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types.js'; +import * as BaseTypes from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types.js'; import { isValidTimeZone } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/dayjs.js'; import { isString } from '@sequelize/utils'; import dayjs from 'dayjs'; diff --git a/packages/mysql/src/dialect.ts b/packages/mysql/src/dialect.ts index 8273407bc163..3410b732249f 100644 --- a/packages/mysql/src/dialect.ts +++ b/packages/mysql/src/dialect.ts @@ -1,6 +1,6 @@ import type { Sequelize } from '@sequelize/core'; import { AbstractDialect } from '@sequelize/core'; -import type { SupportableNumericOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/index.js'; +import type { SupportableNumericOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/index.js'; import { createUnspecifiedOrderedBindCollector, escapeMysqlMariaDbString, diff --git a/packages/mysql/src/query-generator-typescript.internal.ts b/packages/mysql/src/query-generator-typescript.internal.ts index e2bf5291d2fa..ca631ed17d4a 100644 --- a/packages/mysql/src/query-generator-typescript.internal.ts +++ b/packages/mysql/src/query-generator-typescript.internal.ts @@ -8,11 +8,11 @@ import type { TruncateTableQueryOptions, } from '@sequelize/core'; import { AbstractQueryGenerator, Op } from '@sequelize/core'; -import type { EscapeOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-typescript.js'; +import type { EscapeOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-typescript.js'; import { REMOVE_INDEX_QUERY_SUPPORTABLE_OPTIONS, TRUNCATE_TABLE_QUERY_SUPPORTABLE_OPTIONS, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-typescript.js'; +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-typescript.js'; import { rejectInvalidOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/check.js'; import { joinSQLFragments } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/join-sql-fragments.js'; import { buildJsonPath } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/json.js'; diff --git a/packages/mysql/src/query-generator.internal.ts b/packages/mysql/src/query-generator.internal.ts index 3549da62e1b8..4d91765b4848 100644 --- a/packages/mysql/src/query-generator.internal.ts +++ b/packages/mysql/src/query-generator.internal.ts @@ -1,5 +1,5 @@ -import { AbstractQueryGeneratorInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-internal.js'; -import type { AddLimitOffsetOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator.internal-types.js'; +import { AbstractQueryGeneratorInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-internal.js'; +import type { AddLimitOffsetOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator.internal-types.js'; import { formatMySqlStyleLimitOffset } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/sql.js'; import type { MySqlDialect } from './dialect.js'; diff --git a/packages/mysql/src/query-generator.js b/packages/mysql/src/query-generator.js index d71d54da99d5..a5a5653b8486 100644 --- a/packages/mysql/src/query-generator.js +++ b/packages/mysql/src/query-generator.js @@ -3,8 +3,8 @@ import { attributeTypeToSql, normalizeDataType, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types-utils.js'; -import { ADD_COLUMN_QUERY_SUPPORTABLE_OPTIONS } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator.js'; +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types-utils.js'; +import { ADD_COLUMN_QUERY_SUPPORTABLE_OPTIONS } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator.js'; import { BaseSqlExpression } from '@sequelize/core/_non-semver-use-at-your-own-risk_/expression-builders/base-sql-expression.js'; import { rejectInvalidOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/check.js'; import { joinSQLFragments } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/join-sql-fragments.js'; diff --git a/packages/postgres/src/_internal/data-types-db.ts b/packages/postgres/src/_internal/data-types-db.ts index ef7c255673b9..b3073e4e2ea9 100644 --- a/packages/postgres/src/_internal/data-types-db.ts +++ b/packages/postgres/src/_internal/data-types-db.ts @@ -1,5 +1,5 @@ -import { getDataTypeParser } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types-utils.js'; -import * as BaseTypes from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types.js'; +import { getDataTypeParser } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types-utils.js'; +import * as BaseTypes from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types.js'; import identity from 'lodash/identity'; import assert from 'node:assert'; import wkx from 'wkx'; diff --git a/packages/postgres/src/_internal/data-types-overrides.ts b/packages/postgres/src/_internal/data-types-overrides.ts index abe1760740e3..da82c5b5cb97 100644 --- a/packages/postgres/src/_internal/data-types-overrides.ts +++ b/packages/postgres/src/_internal/data-types-overrides.ts @@ -1,12 +1,12 @@ import type { AbstractDialect, Rangable } from '@sequelize/core'; -import { attributeTypeToSql } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types-utils.js'; +import { attributeTypeToSql } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types-utils.js'; import type { AbstractDataType, AcceptableTypeOf, AcceptedDate, BindParamOptions, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types.js'; -import * as BaseTypes from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types.js'; +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types.js'; +import * as BaseTypes from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types.js'; import { inspect, isBigInt, isNumber, isString } from '@sequelize/utils'; import identity from 'lodash/identity.js'; import assert from 'node:assert'; diff --git a/packages/postgres/src/_internal/hstore.ts b/packages/postgres/src/_internal/hstore.ts index 35b345aae904..c7b08361ef80 100644 --- a/packages/postgres/src/_internal/hstore.ts +++ b/packages/postgres/src/_internal/hstore.ts @@ -1,4 +1,4 @@ -import type { HstoreRecord } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types.js'; +import type { HstoreRecord } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types.js'; // @ts-expect-error -- TODO: fork pg-hstore and add types import PgHstore from 'pg-hstore'; diff --git a/packages/postgres/src/dialect.ts b/packages/postgres/src/dialect.ts index eccb6464e1f7..e3fab53962fc 100644 --- a/packages/postgres/src/dialect.ts +++ b/packages/postgres/src/dialect.ts @@ -3,7 +3,7 @@ import { AbstractDialect } from '@sequelize/core'; import type { BindCollector, DialectSupports, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/index.js'; +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/index.js'; import { createSpecifiedOrderedBindCollector } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/sql.js'; import { EMPTY_OBJECT, shallowClonePojo } from '@sequelize/utils'; import { registerPostgresDbDataTypeParsers } from './_internal/data-types-db.js'; diff --git a/packages/postgres/src/query-generator-typescript.internal.ts b/packages/postgres/src/query-generator-typescript.internal.ts index c4fc537ca429..6034d57829b8 100644 --- a/packages/postgres/src/query-generator-typescript.internal.ts +++ b/packages/postgres/src/query-generator-typescript.internal.ts @@ -11,8 +11,8 @@ import type { TruncateTableQueryOptions, } from '@sequelize/core'; import { AbstractQueryGenerator } from '@sequelize/core'; -import type { EscapeOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-typescript.js'; -import { CREATE_DATABASE_QUERY_SUPPORTABLE_OPTIONS } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-typescript.js'; +import type { EscapeOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-typescript.js'; +import { CREATE_DATABASE_QUERY_SUPPORTABLE_OPTIONS } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-typescript.js'; import { rejectInvalidOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/check.js'; import { joinSQLFragments } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/join-sql-fragments.js'; import { generateIndexName } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/string.js'; diff --git a/packages/postgres/src/query-generator.internal.ts b/packages/postgres/src/query-generator.internal.ts index ef522c931a30..137156049876 100644 --- a/packages/postgres/src/query-generator.internal.ts +++ b/packages/postgres/src/query-generator.internal.ts @@ -1,5 +1,5 @@ -import { AbstractQueryGeneratorInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-internal.js'; -import type { AddLimitOffsetOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator.internal-types.js'; +import { AbstractQueryGeneratorInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-internal.js'; +import type { AddLimitOffsetOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator.internal-types.js'; import type { PostgresDialect } from './dialect.js'; const TECHNICAL_DATABASE_NAMES = Object.freeze(['postgres']); diff --git a/packages/postgres/src/query-generator.js b/packages/postgres/src/query-generator.js index 6e2bf682dae1..ce15878ffb26 100644 --- a/packages/postgres/src/query-generator.js +++ b/packages/postgres/src/query-generator.js @@ -1,7 +1,7 @@ 'use strict'; import { DataTypes } from '@sequelize/core'; -import { CREATE_TABLE_QUERY_SUPPORTABLE_OPTIONS } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator.js'; +import { CREATE_TABLE_QUERY_SUPPORTABLE_OPTIONS } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator.js'; import { rejectInvalidOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/check.js'; import { quoteIdentifier } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/dialect.js'; import { defaultValueSchemable } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/query-builder-utils.js'; diff --git a/packages/postgres/src/query-interface-typescript.internal.ts b/packages/postgres/src/query-interface-typescript.internal.ts index b2975dbe7a6d..a977dea57099 100644 --- a/packages/postgres/src/query-interface-typescript.internal.ts +++ b/packages/postgres/src/query-interface-typescript.internal.ts @@ -1,6 +1,6 @@ import type { FetchDatabaseVersionOptions } from '@sequelize/core'; import { AbstractQueryInterface } from '@sequelize/core'; -import { AbstractQueryInterfaceInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-interface-internal.js'; +import { AbstractQueryInterfaceInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-interface-internal.js'; import type { PostgresDialect } from './dialect.js'; export class PostgresQueryInterfaceTypescript< diff --git a/packages/snowflake/src/_internal/data-types-overrides.ts b/packages/snowflake/src/_internal/data-types-overrides.ts index 098636e8adf3..19808726cb6f 100644 --- a/packages/snowflake/src/_internal/data-types-overrides.ts +++ b/packages/snowflake/src/_internal/data-types-overrides.ts @@ -1,6 +1,6 @@ import type { AbstractDialect } from '@sequelize/core'; -import type { AcceptedDate } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types.js'; -import * as BaseTypes from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types.js'; +import type { AcceptedDate } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types.js'; +import * as BaseTypes from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types.js'; import maxBy from 'lodash/maxBy.js'; export class DATE extends BaseTypes.DATE { diff --git a/packages/snowflake/src/query-generator-typescript.internal.ts b/packages/snowflake/src/query-generator-typescript.internal.ts index 7495cf8f85c8..6f6a184439d2 100644 --- a/packages/snowflake/src/query-generator-typescript.internal.ts +++ b/packages/snowflake/src/query-generator-typescript.internal.ts @@ -15,7 +15,7 @@ import { SHOW_CONSTRAINTS_QUERY_SUPPORTABLE_OPTIONS, START_TRANSACTION_QUERY_SUPPORTABLE_OPTIONS, TRUNCATE_TABLE_QUERY_SUPPORTABLE_OPTIONS, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-typescript.js'; +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-typescript.js'; import { rejectInvalidOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/check.js'; import { joinSQLFragments } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/join-sql-fragments.js'; import { EMPTY_SET } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/object.js'; diff --git a/packages/snowflake/src/query-generator.internal.ts b/packages/snowflake/src/query-generator.internal.ts index 276cf034c01f..6cb037a598fd 100644 --- a/packages/snowflake/src/query-generator.internal.ts +++ b/packages/snowflake/src/query-generator.internal.ts @@ -1,5 +1,5 @@ -import { AbstractQueryGeneratorInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-internal.js'; -import type { AddLimitOffsetOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator.internal-types.js'; +import { AbstractQueryGeneratorInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-internal.js'; +import type { AddLimitOffsetOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator.internal-types.js'; import type { SnowflakeDialect } from './dialect.js'; const TECHNICAL_SCHEMA_NAMES = Object.freeze([ diff --git a/packages/snowflake/src/query-generator.js b/packages/snowflake/src/query-generator.js index 6e066228b798..8a3c9c87a815 100644 --- a/packages/snowflake/src/query-generator.js +++ b/packages/snowflake/src/query-generator.js @@ -3,7 +3,7 @@ import { ADD_COLUMN_QUERY_SUPPORTABLE_OPTIONS, CREATE_TABLE_QUERY_SUPPORTABLE_OPTIONS, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator.js'; +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator.js'; import { rejectInvalidOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/check.js'; import { quoteIdentifier } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/dialect.js'; import { joinSQLFragments } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/join-sql-fragments.js'; diff --git a/packages/sqlite/src/_internal/data-types-overrides.ts b/packages/sqlite/src/_internal/data-types-overrides.ts index b1799420e237..bae6d240c51c 100644 --- a/packages/sqlite/src/_internal/data-types-overrides.ts +++ b/packages/sqlite/src/_internal/data-types-overrides.ts @@ -1,6 +1,6 @@ import type { AbstractDialect } from '@sequelize/core'; import { BaseError } from '@sequelize/core'; -import * as BaseTypes from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/data-types.js'; +import * as BaseTypes from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/data-types.js'; import NodeUtil from 'node:util'; function removeUnsupportedIntegerOptions( diff --git a/packages/sqlite/src/query-generator-typescript.internal.ts b/packages/sqlite/src/query-generator-typescript.internal.ts index e59a28094da4..ea9d3acabd21 100644 --- a/packages/sqlite/src/query-generator-typescript.internal.ts +++ b/packages/sqlite/src/query-generator-typescript.internal.ts @@ -15,7 +15,7 @@ import { REMOVE_INDEX_QUERY_SUPPORTABLE_OPTIONS, START_TRANSACTION_QUERY_SUPPORTABLE_OPTIONS, TRUNCATE_TABLE_QUERY_SUPPORTABLE_OPTIONS, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-typescript.js'; +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-typescript.js'; import { rejectInvalidOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/check.js'; import { joinSQLFragments } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/join-sql-fragments.js'; import { extractModelDefinition } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/model-utils.js'; diff --git a/packages/sqlite/src/query-generator.internal.ts b/packages/sqlite/src/query-generator.internal.ts index 794c12a03ab5..c4cda22876a1 100644 --- a/packages/sqlite/src/query-generator.internal.ts +++ b/packages/sqlite/src/query-generator.internal.ts @@ -1,5 +1,5 @@ -import { AbstractQueryGeneratorInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator-internal.js'; -import type { AddLimitOffsetOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator.internal-types.js'; +import { AbstractQueryGeneratorInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator-internal.js'; +import type { AddLimitOffsetOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator.internal-types.js'; import type { SqliteDialect } from './dialect.js'; export class SqliteQueryGeneratorInternal< diff --git a/packages/sqlite/src/query-generator.js b/packages/sqlite/src/query-generator.js index ef16bed326f2..99d3f57f0026 100644 --- a/packages/sqlite/src/query-generator.js +++ b/packages/sqlite/src/query-generator.js @@ -3,7 +3,7 @@ import { ADD_COLUMN_QUERY_SUPPORTABLE_OPTIONS, CREATE_TABLE_QUERY_SUPPORTABLE_OPTIONS, -} from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-generator.js'; +} from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-generator.js'; import { rejectInvalidOptions } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/check.js'; import { removeNullishValuesFromHash } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/format.js'; import { EMPTY_SET } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/object.js'; diff --git a/packages/sqlite/src/query-interface.internal.ts b/packages/sqlite/src/query-interface.internal.ts index b9115830df74..d6b059031a77 100644 --- a/packages/sqlite/src/query-interface.internal.ts +++ b/packages/sqlite/src/query-interface.internal.ts @@ -1,6 +1,6 @@ import type { QueryRawOptions, Sequelize, TableOrModel } from '@sequelize/core'; import { ForeignKeyConstraintError, QueryTypes, TransactionNestMode } from '@sequelize/core'; -import { AbstractQueryInterfaceInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/dialects/abstract/query-interface-internal.js'; +import { AbstractQueryInterfaceInternal } from '@sequelize/core/_non-semver-use-at-your-own-risk_/abstract-dialect/query-interface-internal.js'; import { withSqliteForeignKeysOff } from '@sequelize/core/_non-semver-use-at-your-own-risk_/utils/sql.js'; import type { SqliteDialect } from './dialect.js'; import type { SqliteQueryGenerator } from './query-generator.js';