diff --git a/package-lock.json b/package-lock.json index 4cb60a23a2..7151d5b666 100644 --- a/package-lock.json +++ b/package-lock.json @@ -3982,6 +3982,15 @@ "supports-color": "5.4.0" }, "dependencies": { + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, "supports-color": { "version": "5.4.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.4.0.tgz", @@ -4944,6 +4953,21 @@ "integrity": "sha1-nZ55MWXOAXoA8AQYxD+UKnsdEfo=", "dev": true }, + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "mkdirp": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz", + "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, "resolve": { "version": "1.1.7", "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.1.7.tgz", @@ -5748,7 +5772,8 @@ "minimist": { "version": "0.0.8", "resolved": "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz", - "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=" + "integrity": "sha1-hX/Kv8M5fSYluCKCYuhqp6ARsF0=", + "dev": true }, "minimist-options": { "version": "3.0.2", @@ -5809,12 +5834,9 @@ } }, "mkdirp": { - "version": "0.5.1", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", - "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", - "requires": { - "minimist": "0.0.8" - } + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.3.tgz", + "integrity": "sha512-6uCP4Qc0sWsgMLy1EOqqS/3rjDHOEnsStVr/4vtAIK2Y5i2kA7lFFejYrpIyiN9w0pYf4ckeCYT9f1r1P9KX5g==" }, "mocha": { "version": "6.1.4", @@ -5974,6 +5996,15 @@ "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==", "dev": true }, + "mkdirp": { + "version": "0.5.1", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz", + "integrity": "sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM=", + "dev": true, + "requires": { + "minimist": "0.0.8" + } + }, "os-locale": { "version": "3.1.0", "resolved": "https://registry.npmjs.org/os-locale/-/os-locale-3.1.0.tgz", @@ -6327,6 +6358,21 @@ "tar": "^4" }, "dependencies": { + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "mkdirp": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz", + "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, "nopt": { "version": "4.0.1", "resolved": "https://registry.npmjs.org/nopt/-/nopt-4.0.1.tgz", @@ -8180,6 +8226,21 @@ "yallist": "^3.0.3" }, "dependencies": { + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "mkdirp": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz", + "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + }, "yallist": { "version": "3.0.3", "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.0.3.tgz", @@ -8435,6 +8496,23 @@ "semver": "^5.3.0", "tslib": "^1.8.0", "tsutils": "^2.27.2" + }, + "dependencies": { + "minimist": { + "version": "1.2.5", + "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz", + "integrity": "sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw==", + "dev": true + }, + "mkdirp": { + "version": "0.5.3", + "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.3.tgz", + "integrity": "sha512-P+2gwrFqx8lhew375MQHHeTlY8AuOJSrGf0R5ddkEndUkmwpgUob/vQuBD1V22/Cw1/lJr4x+EjllSezBThzBg==", + "dev": true, + "requires": { + "minimist": "^1.2.5" + } + } } }, "tsutils": { diff --git a/package.json b/package.json index 044756b8e0..c5bb8ab233 100644 --- a/package.json +++ b/package.json @@ -103,7 +103,7 @@ "dotenv": "^6.2.0", "glob": "^7.1.2", "js-yaml": "^3.13.1", - "mkdirp": "^0.5.1", + "mkdirp": "^1.0.3", "reflect-metadata": "^0.1.13", "sha.js": "^2.4.11", "tslib": "^1.9.0", diff --git a/src/commands/CommandUtils.ts b/src/commands/CommandUtils.ts index 5a3c9739ec..75f43b41ae 100644 --- a/src/commands/CommandUtils.ts +++ b/src/commands/CommandUtils.ts @@ -11,7 +11,7 @@ export class CommandUtils { * Creates directories recursively. */ static createDirectories(directory: string) { - return new Promise((ok, fail) => mkdirp(directory, (err: any) => err ? fail(err) : ok())); + return mkdirp(directory); } /** diff --git a/src/driver/sqlite/SqliteDriver.ts b/src/driver/sqlite/SqliteDriver.ts index 747c5ed307..cdd6226127 100644 --- a/src/driver/sqlite/SqliteDriver.ts +++ b/src/driver/sqlite/SqliteDriver.ts @@ -1,12 +1,12 @@ -import {DriverPackageNotInstalledError} from "../../error/DriverPackageNotInstalledError"; -import {SqliteQueryRunner} from "./SqliteQueryRunner"; -import {DriverOptionNotSetError} from "../../error/DriverOptionNotSetError"; -import {PlatformTools} from "../../platform/PlatformTools"; -import {Connection} from "../../connection/Connection"; -import {SqliteConnectionOptions} from "./SqliteConnectionOptions"; -import {ColumnType} from "../types/ColumnTypes"; -import {QueryRunner} from "../../query-runner/QueryRunner"; -import {AbstractSqliteDriver} from "../sqlite-abstract/AbstractSqliteDriver"; +import { DriverPackageNotInstalledError } from "../../error/DriverPackageNotInstalledError"; +import { SqliteQueryRunner } from "./SqliteQueryRunner"; +import { DriverOptionNotSetError } from "../../error/DriverOptionNotSetError"; +import { PlatformTools } from "../../platform/PlatformTools"; +import { Connection } from "../../connection/Connection"; +import { SqliteConnectionOptions } from "./SqliteConnectionOptions"; +import { ColumnType } from "../types/ColumnTypes"; +import { QueryRunner } from "../../query-runner/QueryRunner"; +import { AbstractSqliteDriver } from "../sqlite-abstract/AbstractSqliteDriver"; /** * Organizes communication with sqlite DBMS. @@ -63,14 +63,14 @@ export class SqliteDriver extends AbstractSqliteDriver { /** * Creates a query runner used to execute database queries. */ - createQueryRunner(mode: "master"|"slave" = "master"): QueryRunner { + createQueryRunner(mode: "master" | "slave" = "master"): QueryRunner { if (!this.queryRunner) this.queryRunner = new SqliteQueryRunner(this); return this.queryRunner; } - normalizeType(column: { type?: ColumnType, length?: number | string, precision?: number|null, scale?: number }): string { + normalizeType(column: { type?: ColumnType, length?: number | string, precision?: number | null, scale?: number }): string { if ((column.type as any) === Buffer) { return "blob"; } @@ -133,11 +133,9 @@ export class SqliteDriver extends AbstractSqliteDriver { * Auto creates database directory if it does not exist. */ protected createDatabaseDirectory(fullPath: string): Promise { - return new Promise((resolve, reject) => { - const mkdirp = PlatformTools.load("mkdirp"); - const path = PlatformTools.load("path"); - mkdirp(path.dirname(fullPath), (err: any) => err ? reject(err) : resolve()); - }); + const mkdirp = PlatformTools.load("mkdirp"); + const path = PlatformTools.load("path"); + return mkdirp(path.dirname(fullPath)); } }