From ca4aab3d010f0619f1158f1358679b04b2744682 Mon Sep 17 00:00:00 2001 From: Sangmin Yoon Date: Sun, 27 Oct 2024 00:03:28 +0900 Subject: [PATCH] refactor: remove require assign import --- packages/cormo/test/adapter.ts | 2 +- packages/cormo/test/aggregation.ts | 2 +- packages/cormo/test/archive.ts | 2 +- packages/cormo/test/association.ts | 2 +- packages/cormo/test/basic.ts | 2 +- packages/cormo/test/callbacks.ts | 2 +- packages/cormo/test/cases/adapter-mongodb.ts | 2 +- packages/cormo/test/cases/adapter-mysql.ts | 2 +- packages/cormo/test/cases/adapter-postgresql.ts | 2 +- packages/cormo/test/cases/javascript.js | 2 +- packages/cormo/test/constraint.ts | 2 +- packages/cormo/test/geospatial.ts | 2 +- packages/cormo/test/integrity.ts | 2 +- packages/cormo/test/javascript.js | 2 +- packages/cormo/test/join.ts | 2 +- packages/cormo/test/manipulate.ts | 2 +- packages/cormo/test/misc.ts | 2 +- packages/cormo/test/mixing.ts | 2 +- packages/cormo/test/nested.ts | 2 +- packages/cormo/test/query.ts | 2 +- packages/cormo/test/schema.ts | 2 +- packages/cormo/test/setup.ts | 2 +- packages/cormo/test/support/common.ts | 2 +- packages/cormo/test/timestamp.ts | 2 +- packages/cormo/test/transaction.ts | 2 +- packages/cormo/test/type.ts | 2 +- packages/cormo/test/validate.ts | 2 +- packages/graphql/test/common.ts | 2 +- packages/graphql/test/createDefaultCrudSchema/association.ts | 3 +-- packages/graphql/test/createDefaultCrudSchema/basic.ts | 3 +-- packages/graphql/test/createDefaultCrudSchema/timestamp.ts | 3 +-- 31 files changed, 31 insertions(+), 34 deletions(-) diff --git a/packages/cormo/test/adapter.ts b/packages/cormo/test/adapter.ts index deec4855..2fff0c69 100644 --- a/packages/cormo/test/adapter.ts +++ b/packages/cormo/test/adapter.ts @@ -1,5 +1,5 @@ import * as cormo from '..'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'mongodb', 'sqlite3', 'postgresql']; diff --git a/packages/cormo/test/aggregation.ts b/packages/cormo/test/aggregation.ts index aa2ab040..483d9a94 100644 --- a/packages/cormo/test/aggregation.ts +++ b/packages/cormo/test/aggregation.ts @@ -1,6 +1,6 @@ import * as cormo from '..'; import cases, { Order as OrderRef } from './cases/aggregation'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'mongodb', 'sqlite3', 'sqlite3_memory', 'postgresql']; diff --git a/packages/cormo/test/archive.ts b/packages/cormo/test/archive.ts index 430927e4..b2735803 100644 --- a/packages/cormo/test/archive.ts +++ b/packages/cormo/test/archive.ts @@ -1,6 +1,6 @@ import * as cormo from '..'; import cases, { UserRef, PostRef } from './cases/archive'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'mongodb', 'sqlite3', 'sqlite3_memory', 'postgresql']; diff --git a/packages/cormo/test/association.ts b/packages/cormo/test/association.ts index 29e6c7b2..134eb55d 100644 --- a/packages/cormo/test/association.ts +++ b/packages/cormo/test/association.ts @@ -7,7 +7,7 @@ import cases_has_many from './cases/association_has_many'; import cases_has_one from './cases/association_has_one'; import cases_include from './cases/association_include'; import cases_include_lean from './cases/association_include_lean'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'mongodb', 'sqlite3', 'sqlite3_memory', 'postgresql']; diff --git a/packages/cormo/test/basic.ts b/packages/cormo/test/basic.ts index f791d5d1..2bb57296 100644 --- a/packages/cormo/test/basic.ts +++ b/packages/cormo/test/basic.ts @@ -1,6 +1,6 @@ import * as cormo from '..'; import cases, { User as UserRef } from './cases/basic'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'mongodb', 'sqlite3', 'sqlite3_memory', 'postgresql', 'redis']; diff --git a/packages/cormo/test/callbacks.ts b/packages/cormo/test/callbacks.ts index 4e3a2c87..0a6f1572 100644 --- a/packages/cormo/test/callbacks.ts +++ b/packages/cormo/test/callbacks.ts @@ -1,6 +1,6 @@ import * as cormo from '..'; import cases, { UserRef } from './cases/callbacks'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'mongodb', 'sqlite3', 'sqlite3_memory', 'postgresql']; diff --git a/packages/cormo/test/cases/adapter-mongodb.ts b/packages/cormo/test/cases/adapter-mongodb.ts index 77c01056..de734ebf 100644 --- a/packages/cormo/test/cases/adapter-mongodb.ts +++ b/packages/cormo/test/cases/adapter-mongodb.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import { ObjectId } from 'mongodb'; import * as cormo from '../..'; -import _g = require('../support/common'); +import _g from '../support/common'; export default function (models: { connection: cormo.Connection | null }) { describe('issues', () => { diff --git a/packages/cormo/test/cases/adapter-mysql.ts b/packages/cormo/test/cases/adapter-mysql.ts index c53eb03b..2d70b34b 100644 --- a/packages/cormo/test/cases/adapter-mysql.ts +++ b/packages/cormo/test/cases/adapter-mysql.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import * as cormo from '../..'; -import _g = require('../support/common'); +import _g from '../support/common'; export default function (models: { connection: cormo.Connection | null }) { describe('issues', () => { diff --git a/packages/cormo/test/cases/adapter-postgresql.ts b/packages/cormo/test/cases/adapter-postgresql.ts index 8d5f26e1..2960ffc5 100644 --- a/packages/cormo/test/cases/adapter-postgresql.ts +++ b/packages/cormo/test/cases/adapter-postgresql.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import * as cormo from '../..'; -import _g = require('../support/common'); +import _g from '../support/common'; export default function (models: { connection: cormo.Connection | null }) { describe('issues', () => { diff --git a/packages/cormo/test/cases/javascript.js b/packages/cormo/test/cases/javascript.js index 8819106a..8135a4e5 100644 --- a/packages/cormo/test/cases/javascript.js +++ b/packages/cormo/test/cases/javascript.js @@ -1,7 +1,7 @@ /* global it */ const { expect } = require('chai'); -const _g = require('../support/common'); +const _g = require('../support/common').default; async function _createUsers(User, data) { if (!data) { diff --git a/packages/cormo/test/constraint.ts b/packages/cormo/test/constraint.ts index 05f1d3bb..5fc49835 100644 --- a/packages/cormo/test/constraint.ts +++ b/packages/cormo/test/constraint.ts @@ -1,7 +1,7 @@ import * as cormo from '..'; import cases, { PostRef, UserRef } from './cases/constraint'; import cases_multicolumn, { VersionRef } from './cases/constraint_multicolumn'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'mongodb', 'sqlite3', 'sqlite3_memory', 'postgresql']; diff --git a/packages/cormo/test/geospatial.ts b/packages/cormo/test/geospatial.ts index bc7dbb78..45c3ab81 100644 --- a/packages/cormo/test/geospatial.ts +++ b/packages/cormo/test/geospatial.ts @@ -1,7 +1,7 @@ import { expect } from 'chai'; import * as cormo from '..'; import cases, { PlaceRef } from './cases/geospatial'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'mongodb', 'postgresql']; diff --git a/packages/cormo/test/integrity.ts b/packages/cormo/test/integrity.ts index 18b892bb..6fdbeb5f 100644 --- a/packages/cormo/test/integrity.ts +++ b/packages/cormo/test/integrity.ts @@ -1,6 +1,6 @@ import * as cormo from '..'; import cases, { TeamRef, EventRef, CommentRef } from './cases/integrity'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'mongodb', 'sqlite3', 'sqlite3_memory', 'postgresql']; diff --git a/packages/cormo/test/javascript.js b/packages/cormo/test/javascript.js index 6cb7191d..e958d744 100644 --- a/packages/cormo/test/javascript.js +++ b/packages/cormo/test/javascript.js @@ -1,6 +1,6 @@ /* global describe, before, beforeEach, after */ -const _g = require('./support/common'); +const _g = require('./support/common').default; const _dbs = ['mysql', 'mongodb', 'sqlite3', 'sqlite3_memory', 'postgresql']; _dbs.forEach(function (db) { diff --git a/packages/cormo/test/join.ts b/packages/cormo/test/join.ts index d605e600..efd383ed 100644 --- a/packages/cormo/test/join.ts +++ b/packages/cormo/test/join.ts @@ -1,6 +1,6 @@ import * as cormo from '..'; import cases, { ComputerRef, PostRef, UserRef } from './cases/join'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'sqlite3', 'sqlite3_memory', 'postgresql']; diff --git a/packages/cormo/test/manipulate.ts b/packages/cormo/test/manipulate.ts index 3417d9d4..6f22cdee 100644 --- a/packages/cormo/test/manipulate.ts +++ b/packages/cormo/test/manipulate.ts @@ -1,6 +1,6 @@ import * as cormo from '..'; import cases, { UserRef, PostRef } from './cases/manipulate'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'mongodb', 'sqlite3', 'sqlite3_memory', 'postgresql']; diff --git a/packages/cormo/test/misc.ts b/packages/cormo/test/misc.ts index 931e8d70..db3eefb9 100644 --- a/packages/cormo/test/misc.ts +++ b/packages/cormo/test/misc.ts @@ -1,5 +1,5 @@ import cases from './cases/misc'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'mongodb', 'sqlite3', 'sqlite3_memory', 'postgresql']; diff --git a/packages/cormo/test/mixing.ts b/packages/cormo/test/mixing.ts index ad5c47a1..b20949df 100644 --- a/packages/cormo/test/mixing.ts +++ b/packages/cormo/test/mixing.ts @@ -3,7 +3,7 @@ import { ComputerRef, PostRef, UserRef } from './cases/association'; import cases_as from './cases/association_as'; import cases_belongs_to from './cases/association_belongs_to'; import cases_has_many from './cases/association_has_many'; -import _g = require('./support/common'); +import _g from './support/common'; if (_g.db_configs.mysql && _g.db_configs.mongodb) { describe('mixing several database', () => { diff --git a/packages/cormo/test/nested.ts b/packages/cormo/test/nested.ts index deb4264d..4d43d129 100644 --- a/packages/cormo/test/nested.ts +++ b/packages/cormo/test/nested.ts @@ -1,5 +1,5 @@ import cases from './cases/nested'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'mongodb', 'sqlite3', 'sqlite3_memory', 'postgresql']; diff --git a/packages/cormo/test/query.ts b/packages/cormo/test/query.ts index 4904b8a0..9a9cc7ae 100644 --- a/packages/cormo/test/query.ts +++ b/packages/cormo/test/query.ts @@ -7,7 +7,7 @@ import cases_op from './cases/query_op'; import cases_stream from './cases/query_stream'; import cases_update from './cases/query_update'; import cases_upsert from './cases/query_upsert'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'mongodb', 'sqlite3', 'sqlite3_memory', 'postgresql']; diff --git a/packages/cormo/test/schema.ts b/packages/cormo/test/schema.ts index 4be01edb..88465ecf 100644 --- a/packages/cormo/test/schema.ts +++ b/packages/cormo/test/schema.ts @@ -1,6 +1,6 @@ import cases from './cases/schema'; import cases_description from './cases/schema_description'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'mongodb', 'sqlite3', 'sqlite3_memory', 'postgresql']; diff --git a/packages/cormo/test/setup.ts b/packages/cormo/test/setup.ts index 89876328..c36b456e 100644 --- a/packages/cormo/test/setup.ts +++ b/packages/cormo/test/setup.ts @@ -1,6 +1,6 @@ import { expect } from 'chai'; import * as cormo from '..'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'mongodb', 'sqlite3', 'sqlite3_memory', 'postgresql', 'redis']; diff --git a/packages/cormo/test/support/common.ts b/packages/cormo/test/support/common.ts index a0dc661a..2482f37c 100644 --- a/packages/cormo/test/support/common.ts +++ b/packages/cormo/test/support/common.ts @@ -88,4 +88,4 @@ if (process.env.DIRTY_TRACKING) { console.log(`Run test with dirty_tracking=${_g.BaseModel.dirty_tracking}`); -export = _g; +export default _g; diff --git a/packages/cormo/test/timestamp.ts b/packages/cormo/test/timestamp.ts index ee622e39..ae391efc 100644 --- a/packages/cormo/test/timestamp.ts +++ b/packages/cormo/test/timestamp.ts @@ -1,6 +1,6 @@ import * as cormo from '..'; import cases, { UserRef } from './cases/timestamp'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'mongodb', 'sqlite3', 'sqlite3_memory', 'postgresql']; diff --git a/packages/cormo/test/transaction.ts b/packages/cormo/test/transaction.ts index 08be0d73..f039f20b 100644 --- a/packages/cormo/test/transaction.ts +++ b/packages/cormo/test/transaction.ts @@ -4,7 +4,7 @@ import cases_bind from './cases/transaction_bind'; import cases_block from './cases/transaction_block'; import cases_etc from './cases/transaction_etc'; import cases_full_control from './cases/transaction_full_control'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'postgresql']; diff --git a/packages/cormo/test/type.ts b/packages/cormo/test/type.ts index 380dd188..d58c0a5c 100644 --- a/packages/cormo/test/type.ts +++ b/packages/cormo/test/type.ts @@ -3,7 +3,7 @@ import cases, { Type as TypeRef } from './cases/type'; import cases_compare from './cases/type_compare'; import cases_options from './cases/type_options'; import cases_update from './cases/type_update'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'mongodb', 'sqlite3', 'sqlite3_memory', 'postgresql']; diff --git a/packages/cormo/test/validate.ts b/packages/cormo/test/validate.ts index ec3cec5c..5cee3c68 100644 --- a/packages/cormo/test/validate.ts +++ b/packages/cormo/test/validate.ts @@ -1,6 +1,6 @@ import * as cormo from '..'; import cases, { User as UserRef } from './cases/validate'; -import _g = require('./support/common'); +import _g from './support/common'; const _dbs = ['mysql', 'mongodb', 'sqlite3', 'sqlite3_memory', 'postgresql', 'redis']; diff --git a/packages/graphql/test/common.ts b/packages/graphql/test/common.ts index cbb5126a..43a78099 100644 --- a/packages/graphql/test/common.ts +++ b/packages/graphql/test/common.ts @@ -13,4 +13,4 @@ const _g = { db_configs, }; -export = _g; +export default _g; diff --git a/packages/graphql/test/createDefaultCrudSchema/association.ts b/packages/graphql/test/createDefaultCrudSchema/association.ts index 27180e49..57046a1f 100644 --- a/packages/graphql/test/createDefaultCrudSchema/association.ts +++ b/packages/graphql/test/createDefaultCrudSchema/association.ts @@ -2,8 +2,7 @@ import { expect } from 'chai'; import * as cormo from 'cormo'; import { graphql, GraphQLSchema, printSchema } from 'graphql'; import { BelongsTo, Column, createDefaultCrudSchema, Model } from '../..'; -// eslint-disable-next-line @typescript-eslint/no-require-imports -import _g = require('../common'); +import _g from '../common'; class UserRef extends cormo.BaseModel { public name!: string; diff --git a/packages/graphql/test/createDefaultCrudSchema/basic.ts b/packages/graphql/test/createDefaultCrudSchema/basic.ts index 2e2a71cf..e73b5ed4 100644 --- a/packages/graphql/test/createDefaultCrudSchema/basic.ts +++ b/packages/graphql/test/createDefaultCrudSchema/basic.ts @@ -2,8 +2,7 @@ import { expect } from 'chai'; import * as cormo from 'cormo'; import { graphql, GraphQLSchema, printSchema } from 'graphql'; import { Column, createDefaultCrudSchema, Model } from '../..'; -// eslint-disable-next-line @typescript-eslint/no-require-imports -import _g = require('../common'); +import _g from '../common'; // eslint-disable-next-line @typescript-eslint/no-unused-vars class UserRef extends cormo.BaseModel { diff --git a/packages/graphql/test/createDefaultCrudSchema/timestamp.ts b/packages/graphql/test/createDefaultCrudSchema/timestamp.ts index dcd32fd3..58057334 100644 --- a/packages/graphql/test/createDefaultCrudSchema/timestamp.ts +++ b/packages/graphql/test/createDefaultCrudSchema/timestamp.ts @@ -3,8 +3,7 @@ import * as cormo from 'cormo'; import { graphql, GraphQLSchema, printSchema } from 'graphql'; import sinon, { createSandbox } from 'sinon'; import { Column, createDefaultCrudSchema, Model } from '../..'; -// eslint-disable-next-line @typescript-eslint/no-require-imports -import _g = require('../common'); +import _g from '../common'; // eslint-disable-next-line @typescript-eslint/no-unused-vars class UserRef extends cormo.BaseModel {