-
- 
-
-
Sequelize
-
+ 
-
- `);
};
diff --git a/esdoc-ts.js b/esdoc-ts.js
new file mode 100644
index 000000000000..ee3f1f691562
--- /dev/null
+++ b/esdoc-ts.js
@@ -0,0 +1,16 @@
+const path = require('path');
+const { transformSync } = require('esbuild');
+
+module.exports = {
+ onHandleCode({ data }) {
+ if (path.extname(data.filePath) === '.ts') {
+ // @preserve tells esbuild not to omit the comment. This is intended for legal comments,
+ // but works here too as a hack.
+ data.code = transformSync(data.code.replace(/\/\*\*/g, '/**@preserve'), {
+ target: 'node10',
+ format: 'cjs',
+ loader: 'ts'
+ }).code.replace(/\/\*\*@preserve/g, '/**');
+ }
+ }
+};
diff --git a/index.js b/index.js
index 31e6c23becdd..c41e6e3916a0 100644
--- a/index.js
+++ b/index.js
@@ -1,8 +1,12 @@
'use strict';
+// TODO [>=7]: remove me. I've been moved to 'exports' in package.json
+
/**
- * The entry point.
+ * A Sequelize module that contains the sequelize entry point.
*
- * @module Sequelize
+ * @module sequelize
*/
-module.exports = require('./lib/sequelize');
+
+/** Exports the sequelize entry point. */
+module.exports = require('./lib');
diff --git a/lib/dialects/abstract/query-generator/helpers/quote.js b/lib/dialects/abstract/query-generator/helpers/quote.js
deleted file mode 100644
index 19a1d983b5e5..000000000000
--- a/lib/dialects/abstract/query-generator/helpers/quote.js
+++ /dev/null
@@ -1,87 +0,0 @@
-/**
- * Quote helpers implement quote ability for all dialects.
- * These are basic block of query building
- *
- * Its better to implement all dialect implementation together here. Which will allow
- * even abstract generator to use them by just specifying dialect type.
- *
- * Defining these helpers in each query dialect will leave
- * code in dual dependency of abstract <-> specific dialect
- */
-
-'use strict';
-
-const Utils = require('../../../../utils');
-
-/**
- * list of reserved words in PostgreSQL 10
- * source: https://www.postgresql.org/docs/10/static/sql-keywords-appendix.html
- *
- * @private
- */
-const postgresReservedWords = 'all,analyse,analyze,and,any,array,as,asc,asymmetric,authorization,binary,both,case,cast,check,collate,collation,column,concurrently,constraint,create,cross,current_catalog,current_date,current_role,current_schema,current_time,current_timestamp,current_user,default,deferrable,desc,distinct,do,else,end,except,false,fetch,for,foreign,freeze,from,full,grant,group,having,ilike,in,initially,inner,intersect,into,is,isnull,join,lateral,leading,left,like,limit,localtime,localtimestamp,natural,not,notnull,null,offset,on,only,or,order,outer,overlaps,placing,primary,references,returning,right,select,session_user,similar,some,symmetric,table,tablesample,then,to,trailing,true,union,unique,user,using,variadic,verbose,when,where,window,with'.split(',');
-
-/**
- *
- * @param {string} dialect Dialect name
- * @param {string} identifier Identifier to quote
- * @param {object} [options]
- * @param {boolean} [options.force=false]
- * @param {boolean} [options.quoteIdentifiers=true]
- *
- * @returns {string}
- * @private
- */
-function quoteIdentifier(dialect, identifier, options) {
- if (identifier === '*') return identifier;
-
- options = Utils.defaults(options || {}, {
- force: false,
- quoteIdentifiers: true
- });
-
- switch (dialect) {
- case 'sqlite':
- case 'mariadb':
- case 'mysql':
- return Utils.addTicks(Utils.removeTicks(identifier, '`'), '`');
-
- case 'postgres':
- const rawIdentifier = Utils.removeTicks(identifier, '"');
-
- if (
- options.force !== true &&
- options.quoteIdentifiers === false &&
- !identifier.includes('.') &&
- !identifier.includes('->') &&
- !postgresReservedWords.includes(rawIdentifier.toLowerCase())
- ) {
- // In Postgres, if tables or attributes are created double-quoted,
- // they are also case sensitive. If they contain any uppercase
- // characters, they must always be double-quoted. This makes it
- // impossible to write queries in portable SQL if tables are created in
- // this way. Hence, we strip quotes if we don't want case sensitivity.
- return rawIdentifier;
- }
- return Utils.addTicks(rawIdentifier, '"');
- case 'mssql':
- return `[${identifier.replace(/[[\]']+/g, '')}]`;
-
- default:
- throw new Error(`Dialect "${dialect}" is not supported`);
- }
-}
-module.exports.quoteIdentifier = quoteIdentifier;
-
-/**
- * Test if a give string is already quoted
- *
- * @param {string} identifier
- *
- * @returns {boolean}
- * @private
- */
-function isIdentifierQuoted(identifier) {
- return /^\s*(?:([`"'])(?:(?!\1).|\1{2})*\1\.?)+\s*$/i.test(identifier);
-}
-module.exports.isIdentifierQuoted = isIdentifierQuoted;
diff --git a/lib/dialects/mssql/async-queue.js b/lib/dialects/mssql/async-queue.js
deleted file mode 100644
index adebefc08a8d..000000000000
--- a/lib/dialects/mssql/async-queue.js
+++ /dev/null
@@ -1,46 +0,0 @@
-'use strict';
-
-const BaseError = require('../../errors/base-error');
-const ConnectionError = require('../../errors/connection-error');
-
-/**
- * Thrown when a connection to a database is closed while an operation is in progress
- */
-class AsyncQueueError extends BaseError {
- constructor(message) {
- super(message);
- this.name = 'SequelizeAsyncQueueError';
- }
-}
-
-exports.AsyncQueueError = AsyncQueueError;
-
-class AsyncQueue {
- constructor() {
- this.previous = Promise.resolve();
- this.closed = false;
- this.rejectCurrent = () => {};
- }
- close() {
- this.closed = true;
- this.rejectCurrent(new ConnectionError(new AsyncQueueError('the connection was closed before this query could finish executing')));
- }
- enqueue(asyncFunction) {
- // This outer promise might seems superflous since down below we return asyncFunction().then(resolve, reject).
- // However, this ensures that this.previous will never be a rejected promise so the queue will
- // always keep going, while still communicating rejection from asyncFunction to the user.
- return new Promise((resolve, reject) => {
- this.previous = this.previous.then(
- () => {
- this.rejectCurrent = reject;
- if (this.closed) {
- return reject(new ConnectionError(new AsyncQueueError('the connection was closed before this query could be executed')));
- }
- return asyncFunction().then(resolve, reject);
- }
- );
- });
- }
-}
-
-exports.default = AsyncQueue;
diff --git a/lib/dialects/postgres/index.js b/lib/dialects/postgres/index.js
deleted file mode 100644
index 3d23f6ed6c6d..000000000000
--- a/lib/dialects/postgres/index.js
+++ /dev/null
@@ -1,75 +0,0 @@
-'use strict';
-
-const _ = require('lodash');
-const AbstractDialect = require('../abstract');
-const ConnectionManager = require('./connection-manager');
-const Query = require('./query');
-const QueryGenerator = require('./query-generator');
-const DataTypes = require('../../data-types').postgres;
-const { PostgresQueryInterface } = require('./query-interface');
-
-class PostgresDialect extends AbstractDialect {
- constructor(sequelize) {
- super();
- this.sequelize = sequelize;
- this.connectionManager = new ConnectionManager(this, sequelize);
- this.queryGenerator = new QueryGenerator({
- _dialect: this,
- sequelize
- });
- this.queryInterface = new PostgresQueryInterface(sequelize, this.queryGenerator);
- }
-}
-
-PostgresDialect.prototype.supports = _.merge(_.cloneDeep(AbstractDialect.prototype.supports), {
- 'DEFAULT VALUES': true,
- 'EXCEPTION': true,
- 'ON DUPLICATE KEY': false,
- 'ORDER NULLS': true,
- returnValues: {
- returning: true
- },
- bulkDefault: true,
- schemas: true,
- lock: true,
- lockOf: true,
- lockKey: true,
- lockOuterJoinFailure: true,
- skipLocked: true,
- forShare: 'FOR SHARE',
- index: {
- concurrently: true,
- using: 2,
- where: true,
- functionBased: true,
- operator: true
- },
- inserts: {
- onConflictDoNothing: ' ON CONFLICT DO NOTHING',
- updateOnDuplicate: ' ON CONFLICT DO UPDATE SET'
- },
- NUMERIC: true,
- ARRAY: true,
- RANGE: true,
- GEOMETRY: true,
- REGEXP: true,
- GEOGRAPHY: true,
- JSON: true,
- JSONB: true,
- HSTORE: true,
- TSVECTOR: true,
- deferrableConstraints: true,
- searchPath: true
-});
-
-PostgresDialect.prototype.defaultVersion = '9.5.0';
-PostgresDialect.prototype.Query = Query;
-PostgresDialect.prototype.DataTypes = DataTypes;
-PostgresDialect.prototype.name = 'postgres';
-PostgresDialect.prototype.TICK_CHAR = '"';
-PostgresDialect.prototype.TICK_CHAR_LEFT = PostgresDialect.prototype.TICK_CHAR;
-PostgresDialect.prototype.TICK_CHAR_RIGHT = PostgresDialect.prototype.TICK_CHAR;
-
-module.exports = PostgresDialect;
-module.exports.default = PostgresDialect;
-module.exports.PostgresDialect = PostgresDialect;
diff --git a/lib/errors/aggregate-error.js b/lib/errors/aggregate-error.js
deleted file mode 100644
index 4a6eb94a4311..000000000000
--- a/lib/errors/aggregate-error.js
+++ /dev/null
@@ -1,34 +0,0 @@
-'use strict';
-
-const BaseError = require('./base-error');
-
-/**
- * A wrapper for multiple Errors
- *
- * @param {Error[]} [errors] Array of errors
- *
- * @property errors {Error[]}
- */
-class AggregateError extends BaseError {
- constructor(errors) {
- super();
- this.errors = errors;
- this.name = 'AggregateError';
- }
-
- toString() {
- const message = `AggregateError of:\n${
- this.errors.map(error =>
- error === this
- ? '[Circular AggregateError]'
- : error instanceof AggregateError
- ? String(error).replace(/\n$/, '').replace(/^/mg, ' ')
- : String(error).replace(/^/mg, ' ').substring(2)
-
- ).join('\n')
- }\n`;
- return message;
- }
-}
-
-module.exports = AggregateError;
diff --git a/lib/errors/database-error.js b/lib/errors/database-error.js
deleted file mode 100644
index c7059d3ba9e0..000000000000
--- a/lib/errors/database-error.js
+++ /dev/null
@@ -1,35 +0,0 @@
-'use strict';
-
-const BaseError = require('./base-error');
-
-/**
- * A base class for all database related errors.
- */
-class DatabaseError extends BaseError {
- constructor(parent) {
- super(parent.message);
- this.name = 'SequelizeDatabaseError';
- /**
- * @type {Error}
- */
- this.parent = parent;
- /**
- * @type {Error}
- */
- this.original = parent;
- /**
- * The SQL that triggered the error
- *
- * @type {string}
- */
- this.sql = parent.sql;
- /**
- * The parameters for the sql that triggered the error
- *
- * @type {Array