refactor: use import syntax

yoshinorin · yoshinorin · commit b1a4c57b9b6f · 2022-06-22T12:02:49.000+09:00
diff --git a/src/database.ts b/src/database.ts
@@ -1,14 +1,14 @@
-import JSONStream = require('JSONStream');
-import Bluebird = require('bluebird');
+import JSONStream from 'JSONStream';
+import Bluebird from 'bluebird';
 import { writev, promises as fsPromises, createReadStream } from 'graceful-fs';
 import { pipeline, Stream } from 'stream';
-import Model = require('./model');
-import Schema = require('./schema');
-import SchemaType = require('./schematype');
-import WarehouseError = require('./error');
-// eslint-disable-next-line @typescript-eslint/no-var-requires
+import Model from './model';
+import Schema from './schema';
+import SchemaType from './schematype';
+import WarehouseError from './error';
+import log from 'hexo-log';
+
 const pkg = require('../package.json');
-const log = require('hexo-log')();
 const { open } = fsPromises;
 const pipelineAsync = Bluebird.promisify(pipeline) as (...args: Stream[]) => Bluebird<unknown>;
 
diff --git a/src/error/population.ts b/src/error/population.ts
@@ -1,4 +1,4 @@
-import WarehouseError = require('../error');
+import WarehouseError from '../error';
 
 class PopulationError extends WarehouseError {}
 
diff --git a/src/error/validation.ts b/src/error/validation.ts
@@ -1,7 +1,7 @@
-import WarehouseError = require('../error');
+import WarehouseError from '../error';
 
 class ValidationError extends WarehouseError {}
 
 ValidationError.prototype.name = 'ValidationError';
 
-export = ValidationError;
+export = ValidationError;
diff --git a/src/model.ts b/src/model.ts
@@ -1,16 +1,16 @@
 import { EventEmitter } from 'events';
-import rfdc = require('rfdc');
+import rfdc from 'rfdc';
 const cloneDeep = rfdc();
-import Promise = require('bluebird');
-import util = require('./util');
+import Promise from 'bluebird';
+import util from './util';
 const { parseArgs, getProp, setGetter, shuffle } = util;
-import Document = require('./document');
-import Query = require('./query');
-import Schema = require('./schema');
-import Types = require('./types');
-import WarehouseError = require('./error');
-import PopulationError = require('./error/population');
-import Mutex = require('./mutex');
+import Document from './document';
+import Query from './query';
+import Schema from './schema';
+import Types from './types/index';
+import WarehouseError from './error';
+import PopulationError from './error/population';
+import Mutex from './mutex';
 
 class Model extends EventEmitter {
   _mutex = new Mutex();
diff --git a/src/query.ts b/src/query.ts
@@ -1,5 +1,5 @@
-import Promise = require('bluebird');
-import util = require('./util');
+import Promise from 'bluebird';
+import util from './util';
 const { parseArgs, shuffle } = util;
 
 abstract class Query {
diff --git a/src/schema.ts b/src/schema.ts
@@ -1,10 +1,10 @@
-import SchemaType = require('./schematype');
-import Types = require('./types');
-import Promise = require('bluebird');
-import util = require('./util');
+import SchemaType from './schematype';
+import Types from './types/index';
+import Promise from 'bluebird';
+import util from './util';
 const { getProp, setProp, delProp } = util;
-import PopulationError = require('./error/population');
-import SchemaTypeVirtual = require('./types/virtual');
+import PopulationError from './error/population';
+import SchemaTypeVirtual from './types/virtual';
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const isPlainObject: (o: any) => boolean = require('is-plain-object');
 
diff --git a/src/schematype.ts b/src/schematype.ts
@@ -1,6 +1,6 @@
-import util = require('./util');
+import util from './util';
 const { setProp } = util;
-import ValidationError = require('./error/validation');
+import ValidationError from './error/validation';
 
 /**
  * This is the basic schema type.
diff --git a/src/types/array.ts b/src/types/array.ts
@@ -1,5 +1,5 @@
-import SchemaType = require('../schematype');
-import ValidationError = require('../error/validation');
+import SchemaType from '../schematype';
+import ValidationError from '../error/validation';
 
 const { isArray } = Array;
 
diff --git a/src/types/boolean.ts b/src/types/boolean.ts
@@ -1,5 +1,5 @@
-import SchemaType = require('../schematype');
-import ValidationError = require('../error/validation');
+import SchemaType from '../schematype';
+import ValidationError from '../error/validation';
 
 /**
  * Boolean schema type.
diff --git a/src/types/buffer.ts b/src/types/buffer.ts
@@ -1,5 +1,5 @@
-import SchemaType = require('../schematype');
-import ValidationError = require('../error/validation');
+import SchemaType from '../schematype';
+import ValidationError from '../error/validation';
 
 /**
  * Boolean schema type.
diff --git a/src/types/cuid.ts b/src/types/cuid.ts
@@ -1,6 +1,6 @@
-import SchemaType = require('../schematype');
-import cuid = require('cuid');
-import ValidationError = require('../error/validation');
+import SchemaType from '../schematype';
+import cuid from 'cuid';
+import ValidationError from '../error/validation';
 
 /**
  * [CUID](https://github.com/ericelliott/cuid) schema type.
diff --git a/src/types/date.ts b/src/types/date.ts
@@ -1,5 +1,5 @@
-import SchemaType = require('../schematype');
-import ValidationError = require('../error/validation');
+import SchemaType from '../schematype';
+import ValidationError from '../error/validation';
 
 /**
  * Date schema type.
diff --git a/src/types/enum.ts b/src/types/enum.ts
@@ -1,5 +1,5 @@
-import SchemaType = require('../schematype');
-import ValidationError = require('../error/validation');
+import SchemaType from '../schematype';
+import ValidationError from '../error/validation';
 
 /**
  * Enum schema type.
diff --git a/src/types/integer.ts b/src/types/integer.ts
@@ -1,5 +1,5 @@
-import SchemaTypeNumber = require('./number');
-import ValidationError = require('../error/validation');
+import SchemaTypeNumber from './number';
+import ValidationError from '../error/validation';
 
 /**
  * Integer schema type.
diff --git a/src/types/number.ts b/src/types/number.ts
@@ -1,5 +1,5 @@
-import SchemaType = require('../schematype');
-import ValidationError = require('../error/validation');
+import SchemaType from '../schematype';
+import ValidationError from '../error/validation';
 
 /**
  * Number schema type.
diff --git a/src/types/object.ts b/src/types/object.ts
@@ -1,4 +1,4 @@
-import SchemaType = require('../schematype');
+import SchemaType from '../schematype';
 
 /**
  * Object schema type.
diff --git a/src/types/string.ts b/src/types/string.ts
@@ -1,5 +1,5 @@
-import SchemaType = require('../schematype');
-import ValidationError = require('../error/validation');
+import SchemaType from '../schematype';
+import ValidationError from '../error/validation';
 
 /**
  * String schema type.
diff --git a/src/types/virtual.ts b/src/types/virtual.ts
@@ -1,5 +1,5 @@
-import SchemaType = require('../schematype');
-import util = require('../util');
+import SchemaType from '../schematype';
+import util from '../util';
 const { setGetter } = util;
 
 /**
diff --git a/test/scripts/database.js b/test/scripts/database.js
@@ -1,17 +1,20 @@
-'use strict';
-
-const should = require('chai').should(); // eslint-disable-line
-const path = require('path');
-const Promise = require('bluebird');
-const sinon = require('sinon');
-const fs = Promise.promisifyAll(require('fs'));
-
+import chai from 'chai';
+const should = chai.should(); // eslint-disable-line
+import path from 'path';
+import Promise from 'bluebird';
+import sinon from 'sinon';
+import Database from '../../lib/database';
+import Model from '../../lib/model';
+import fs from 'fs';
+const promisifyFs = Promise.promisifyAll(fs);
+
+import url from "url";
+const __filename = url.fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
 const DB_PATH = path.join(path.dirname(__dirname), 'fixtures', 'db.json');
 const DB_VERSION = 1;
 
 describe('Database', () => {
-  const Database = require('../../built/database');
-  const Model = require('../../built/model');
   const Schema = Database.Schema;
   const db = new Database({path: DB_PATH, version: DB_VERSION});
 
@@ -85,7 +88,7 @@ describe('Database', () => {
     });
   });
 
-  it('save()', () => db.save().then(() => fs.readFileAsync(DB_PATH, 'utf8')).then(data => {
+  it('save()', () => db.save().then(() => promisifyFs.readFileAsync(DB_PATH, 'utf8')).then(data => {
     const json = JSON.parse(data);
 
     json.meta.should.eql({
diff --git a/test/scripts/document.js b/test/scripts/document.js
@@ -1,10 +1,9 @@
-'use strict';
-
-const should = require('chai').should(); // eslint-disable-line
+import chai from 'chai';
+const should = chai.should(); // eslint-disable-line
+import Database from '../../lib/database';
+import Document from '../../lib/document';
 
 describe('Document', () => {
-  const Database = require('../..');
-  const Document = require('../../built/document');
   const db = new Database();
   const Schema = Database.Schema;
 
diff --git a/test/scripts/model.js b/test/scripts/model.js
@@ -1,13 +1,14 @@
-'use strict';
-
-const should = require('chai').use(require('chai-as-promised')).should();
-const sortBy = require('lodash/sortBy');
-const Promise = require('bluebird');
-const sinon = require('sinon');
-const cuid = require('cuid');
+import chai from 'chai';
+const should = chai.should(); // eslint-disable-line
+import lodash from 'lodash';
+const { sortBy } = lodash;
+import Promise from 'bluebird';
+import sinon from 'sinon';
+import cuid from 'cuid';
+import Database from '../../lib/database';
 
 describe('Model', () => {
-  const Database = require('../..');
+
   const Schema = Database.Schema;
   const SchemaType = Database.SchemaType;
 
diff --git a/test/scripts/mutex.js b/test/scripts/mutex.js
@@ -1,8 +1,7 @@
-'use strict';
-
-const should = require('chai').should(); // eslint-disable-line
-const Mutex = require('../../built/mutex');
-const sinon = require('sinon');
+import chai from 'chai';
+const should = chai.should(); // eslint-disable-line
+import Mutex from '../../lib/mutex';
+import sinon from 'sinon';
 
 describe('Mutex', () => {
   it('mutex test', callback => {
diff --git a/test/scripts/query.js b/test/scripts/query.js
@@ -1,12 +1,13 @@
-'use strict';
-
-const should = require('chai').should(); // eslint-disable-line
-const sortBy = require('lodash/sortBy');
-const Promise = require('bluebird');
-const Document = require('../../built/document');
+import chai from 'chai';
+const should = chai.should(); // eslint-disable-line
+import lodash from 'lodash';
+const { sortBy } = lodash;
+import Promise from 'bluebird';
+import Document from '../../lib/document';
+import Database from '../../lib/database';
 
 describe('Query', () => {
-  const Database = require('../..');
+
   const db = new Database();
   const Schema = Database.Schema;
 
diff --git a/test/scripts/schema.js b/test/scripts/schema.js
@@ -1,9 +1,8 @@
-'use strict';
-
-require('chai').should();
+import chai from 'chai';
+const should = chai.should(); // eslint-disable-line
+import Database from '../../lib/database';
 
 describe('Schema', () => {
-  const Database = require('../..');
   const Schema = Database.Schema;
 
   it('add()', () => {
diff --git a/test/scripts/schematype.js b/test/scripts/schematype.js
@@ -1,10 +1,9 @@
-'use strict';
-
-const should = require('chai').should(); // eslint-disable-line
-const ValidationError = require('../../built/error/validation');
+import chai from 'chai';
+const should = chai.should(); // eslint-disable-line
+import ValidationError from '../../lib/error/validation';
+import SchemaType from '../../lib/schematype';
 
 describe('SchemaType', () => {
-  const SchemaType = require('../../built/schematype');
   const type = new SchemaType('test');
 
   it('cast()', () => {
diff --git a/test/scripts/types/array.js b/test/scripts/types/array.js
@@ -1,13 +1,13 @@
-'use strict';
-
-const should = require('chai').should(); // eslint-disable-line
-const ValidationError = require('../../../built/error/validation');
+import chai from 'chai';
+const should = chai.should(); // eslint-disable-line 
+import ValidationError from '../../../lib/error/validation';
+import SchemaTypeArray from '../../../lib/types/array';
+import SchemaTypeString from '../../../lib/types/string';
+import SchemaTypeDate from '../../../lib/types/date';
+import SchemaTypeBoolean from '../../../lib/types/boolean';
 
 describe('SchemaTypeArray', () => {
-  const SchemaTypeArray = require('../../../built/types/array');
-  const SchemaTypeString = require('../../../built/types/string');
-  const SchemaTypeDate = require('../../../built/types/date');
-  const SchemaTypeBoolean = require('../../../built/types/boolean');
+
   const type = new SchemaTypeArray('test');
 
   it('cast()', () => {
diff --git a/test/scripts/types/boolean.js b/test/scripts/types/boolean.js
@@ -1,10 +1,9 @@
-'use strict';
-
-require('chai').should();
-const ValidationError = require('../../../built/error/validation');
+import chai from 'chai';
+const should = chai.should(); // eslint-disable-line
+import ValidationError from '../../../lib/error/validation';
+import SchemaTypeBoolean from '../../../lib/types/boolean';
 
 describe('SchemaTypeBoolean', () => {
-  const SchemaTypeBoolean = require('../../../built/types/boolean');
   const type = new SchemaTypeBoolean('test');
 
   it('cast()', () => {
diff --git a/test/scripts/types/buffer.js b/test/scripts/types/buffer.js
@@ -1,10 +1,9 @@
-'use strict';
-
-const should = require('chai').should();
-const ValidationError = require('../../../built/error/validation');
+import chai from 'chai';
+const should = chai.should(); // eslint-disable-line
+import ValidationError from '../../../lib/error/validation';
+import SchemaTypeBuffer from '../../../lib/types/buffer';
 
 describe('SchemaTypeBuffer', () => {
-  const SchemaTypeBuffer = require('../../../built/types/buffer');
   const type = new SchemaTypeBuffer('test');
 
   it('cast()', () => {
diff --git a/test/scripts/types/cuid.js b/test/scripts/types/cuid.js
@@ -1,10 +1,9 @@
-'use strict';
-
-const should = require('chai').should(); // eslint-disable-line
-const ValidationError = require('../../../built/error/validation');
+import chai from 'chai';
+const should = chai.should(); // eslint-disable-line
+import ValidationError from '../../../lib/error/validation';
+import SchemaTypeCUID from '../../../lib/types/cuid';
 
 describe('SchemaTypeCUID', () => {
-  const SchemaTypeCUID = require('../../../built/types/cuid');
   const type = new SchemaTypeCUID('test');
 
   it('cast()', () => {
diff --git a/test/scripts/types/date.js b/test/scripts/types/date.js
diff --git a/test/scripts/types/enum.js b/test/scripts/types/enum.js
diff --git a/test/scripts/types/integer.js b/test/scripts/types/integer.js
diff --git a/test/scripts/types/number.js b/test/scripts/types/number.js
diff --git a/test/scripts/types/object.js b/test/scripts/types/object.js
diff --git a/test/scripts/types/string.js b/test/scripts/types/string.js
diff --git a/test/scripts/types/virtual.js b/test/scripts/types/virtual.js
diff --git a/test/scripts/util.js b/test/scripts/util.js

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import WarehouseError = require('../error');`
	`1`	`+import WarehouseError from '../error';`
`2`	`2`
`3`	`3`	`class PopulationError extends WarehouseError {}`
`4`	`4`