diff --git a/src/packages/migrate/src/Migrate.ts b/src/packages/migrate/src/Migrate.ts index 932347323490..74b7da023c07 100644 --- a/src/packages/migrate/src/Migrate.ts +++ b/src/packages/migrate/src/Migrate.ts @@ -234,8 +234,8 @@ export class Migrate { return fs.readFileSync(this.schemaPath, 'utf-8') } - public async reset(): Promise { - await this.engine.reset() + public reset(): Promise { + return this.engine.reset() } public async draft({ name = '' }: MigrateOptions = {}): Promise { @@ -251,16 +251,16 @@ export class Migrate { return createMigrationResult.generatedMigrationName! } - public async createMigration( + public createMigration( params: EngineArgs.CreateMigrationInput, ): Promise { - return await this.engine.createMigration(params) + return this.engine.createMigration(params) } - public async diagnoseMigrationHistory(): Promise< + public diagnoseMigrationHistory(): Promise< EngineResults.DiagnoseMigrationHistoryOutput > { - return await this.engine.diagnoseMigrationHistory({ + return this.engine.diagnoseMigrationHistory({ migrationsDirectoryPath: this.migrationsDirectoryPath, }) } @@ -282,15 +282,14 @@ export class Migrate { } } - public async listMigrationDirectories(): Promise< + public listMigrationDirectories(): Promise< EngineResults.ListMigrationDirectoriesOutput > { - const listMigrationDirectoriesResult = await this.engine.listMigrationDirectories( + const listMigrationDirectoriesResult = this.engine.listMigrationDirectories( { migrationsDirectoryPath: this.migrationsDirectoryPath, }, ) - debug({ listMigrationDirectoriesResult }) return listMigrationDirectoriesResult } @@ -309,62 +308,33 @@ export class Migrate { return markMigrationApplied } - public async markMigrationRolledBack({ + public markMigrationRolledBack({ migrationId, }: { migrationId: string }): Promise { - const markMigrationRolledBack = await this.engine.markMigrationRolledBack({ + return this.engine.markMigrationRolledBack({ migrationName: migrationId, }) - return markMigrationRolledBack } - public async applyScript({ script }: { script: string }): Promise { - const appliedScriptResult = await this.engine.applyScript({ script }) - debug({ appliedScriptResult }) - return appliedScriptResult + public applyScript({ script }: { script: string }): Promise { + return this.engine.applyScript({ script }) } - public async applyOnly(): Promise { - const { appliedMigrationNames } = await this.engine.applyMigrations({ + public applyOnly(): Promise { + return this.engine.applyMigrations({ migrationsDirectoryPath: this.migrationsDirectoryPath, }) - debug({ appliedMigrationNames }) - - return appliedMigrationNames - } - - public async evaluateDataLoss(): Promise< - EngineResults.EvaluateDataLossOutput - > { - const datamodel = this.getDatamodel() - - const evaluateDataLossResult = await this.engine.evaluateDataLoss({ - migrationsDirectoryPath: this.migrationsDirectoryPath, - prismaSchema: datamodel, - }) - - debug({ evaluateDataLossResult }) - return evaluateDataLossResult } - public async createAndApply({ name = '' }: MigrateOptions = {}): Promise< - string[] - > { + public evaluateDataLoss(): Promise { const datamodel = this.getDatamodel() - // success? - const createMigrationResult = await this.createMigration({ + return this.engine.evaluateDataLoss({ migrationsDirectoryPath: this.migrationsDirectoryPath, - migrationName: name, - draft: false, prismaSchema: datamodel, }) - debug({ createMigrationResult }) - - // success? - return this.applyOnly() } public async push({ diff --git a/src/packages/migrate/src/commands/MigrateDeploy.ts b/src/packages/migrate/src/commands/MigrateDeploy.ts index 32984d912aa4..4f994c0047be 100644 --- a/src/packages/migrate/src/commands/MigrateDeploy.ts +++ b/src/packages/migrate/src/commands/MigrateDeploy.ts @@ -95,7 +95,7 @@ ${chalk.bold('Options')} await ensureDatabaseExists('apply', true, schemaPath) - const migrationIds = await migrate.applyOnly() + const { appliedMigrationNames: migrationIds } = await migrate.applyOnly() migrate.stop() diff --git a/src/packages/migrate/src/commands/MigrateDev.ts b/src/packages/migrate/src/commands/MigrateDev.ts index b6fe918f6e7f..8a7779e6bd00 100644 --- a/src/packages/migrate/src/commands/MigrateDev.ts +++ b/src/packages/migrate/src/commands/MigrateDev.ts @@ -223,9 +223,6 @@ ${failedMigrationError.message}`, } } } else { - debug({ drift: diagnoseResult.drift }) - debug({ history: diagnoseResult.history }) - if (diagnoseResult.drift) { if (diagnoseResult.drift?.diagnostic === 'migrationFailedToApply') { // Migration has a problem (failed to cleanly apply to a temporary database) and @@ -299,7 +296,9 @@ ${diagnoseResult.drift.error.message}`, if (diagnoseResult.history) { if (diagnoseResult.history.diagnostic === 'databaseIsBehind') { - migrationIdsFromDatabaseIsBehind = await migrate.applyOnly() + const { + appliedMigrationNames: migrationIdsFromDatabaseIsBehind, + } = await migrate.applyOnly() // Inform user about applied migrations now if (migrationIdsFromDatabaseIsBehind.length > 0) { console.info( @@ -379,9 +378,16 @@ ${diagnoseResult.drift.error.message}`, } } - const migrationIds = await migrate.createAndApply({ - name: migrationName, + const createMigrationResult = await migrate.createMigration({ + migrationsDirectoryPath: migrate.migrationsDirectoryPath, + migrationName: migrationName || '', + draft: false, + prismaSchema: migrate.getDatamodel(), }) + debug({ createMigrationResult }) + + const { appliedMigrationNames: migrationIds } = await migrate.applyOnly() + migrate.stop() if (migrationIds.length === 0) { diff --git a/src/packages/migrate/src/commands/MigrateReset.ts b/src/packages/migrate/src/commands/MigrateReset.ts index 34949dd981c1..836392e5c6c9 100644 --- a/src/packages/migrate/src/commands/MigrateReset.ts +++ b/src/packages/migrate/src/commands/MigrateReset.ts @@ -52,7 +52,7 @@ ${chalk.bold('Examples')} Specify a schema ${chalk.dim( '$', - )} prisma migrate reset --schema=./schema.prisma' --early-access-feature + )} prisma migrate reset --schema=./schema.prisma --early-access-feature `) public async parse(argv: string[]): Promise { @@ -137,7 +137,7 @@ ${chalk.bold('Examples')} await migrate.reset() - const migrationIds = await migrate.applyOnly() + const { appliedMigrationNames: migrationIds } = await migrate.applyOnly() migrate.stop() if (migrationIds.length === 0) { diff --git a/src/packages/migrate/src/types.ts b/src/packages/migrate/src/types.ts index c6bfb26e405b..79ffcfb78a1f 100644 --- a/src/packages/migrate/src/types.ts +++ b/src/packages/migrate/src/types.ts @@ -116,9 +116,6 @@ export namespace EngineArgs { export interface ApplyScriptInput { script: string } - export interface InitializeInput { - migrationsDirectoryPath: string - } export interface DiagnoseMigrationHistoryInput { migrationsDirectoryPath: string } diff --git a/src/pnpm-lock.yaml b/src/pnpm-lock.yaml index d7d52c2031e2..7cd88c8a783f 100644 --- a/src/pnpm-lock.yaml +++ b/src/pnpm-lock.yaml @@ -209,7 +209,7 @@ importers: indent-string: 4.0.0 is-obj: 2.0.0 is-regexp: 2.1.0 - jest: 26.6.3_ts-node@9.0.0 + jest: 26.6.3 jest-diff: 26.6.2 js-levenshtein: 1.1.6 klona: 2.0.4 @@ -513,7 +513,7 @@ importers: eslint-plugin-jest: 24.1.3_eslint@7.14.0+typescript@4.1.2 eslint-plugin-prettier: 3.1.4_eslint@7.14.0+prettier@2.2.0 husky: 4.3.0 - jest: 26.6.3_ts-node@9.0.0 + jest: 26.6.3 lint-staged: 10.5.2 prettier: 2.2.0 ts-jest: 26.4.4_jest@26.6.3+typescript@4.1.2 @@ -581,6 +581,7 @@ importers: '@prisma/debug': 'link:../debug' '@prisma/fetch-engine': 'link:../fetch-engine' '@prisma/get-platform': 'link:../get-platform' + '@sindresorhus/slugify': 1.1.0 ansi-escapes: 4.3.1 cli-cursor: 3.1.0 dashify: 2.0.0 @@ -613,6 +614,7 @@ importers: '@types/fs-extra': 9.0.4 '@types/jest': 26.0.15 '@types/node': 12.19.7 + '@types/pg': 7.14.7 '@types/prompts': 2.0.9 '@types/sqlite3': 3.1.6 '@typescript-eslint/eslint-plugin': 4.8.2_6341bfd4e6c74608cac2d9a1d059520a @@ -629,7 +631,9 @@ importers: jest: 26.6.3 lint-staged: 10.5.2 make-dir: 3.1.0 + mariadb: 2.5.1 mock-stdin: 1.0.0 + pg: 8.5.1 prettier: 2.2.0 sqlite-async: 1.1.0 sqlite3: 4.2.0 @@ -643,12 +647,14 @@ importers: '@prisma/generator-helper': 'workspace:*' '@prisma/get-platform': 'workspace:*' '@prisma/sdk': 'workspace:*' + '@sindresorhus/slugify': ^1.1.0 '@types/charm': 1.0.2 '@types/debug': 4.1.5 '@types/diff': 4.0.2 '@types/fs-extra': 9.0.4 '@types/jest': 26.0.15 '@types/node': 12.19.7 + '@types/pg': 7.14.7 '@types/prompts': 2.0.9 '@types/sqlite3': 3.1.6 '@typescript-eslint/eslint-plugin': 4.8.2 @@ -678,10 +684,12 @@ importers: lint-staged: 10.5.2 log-update: ^4.0.0 make-dir: 3.1.0 + mariadb: 2.5.1 mock-stdin: 1.0.0 new-github-issue-url: ^0.2.1 open: ^7.0.3 p-map: ^4.0.0 + pg: 8.5.1 prettier: 2.2.0 prompts: ^2.3.2 ps-tree: 1.2.0 @@ -743,7 +751,7 @@ importers: eslint-plugin-jest: 24.1.3_eslint@7.14.0+typescript@4.1.2 eslint-plugin-prettier: 3.1.4_eslint@7.14.0+prettier@2.2.0 husky: 4.3.0 - jest: 26.6.3_ts-node@9.0.0 + jest: 26.6.3 lint-staged: 10.5.2 prettier: 2.2.0 ts-jest: 26.4.4_jest@26.6.3+typescript@4.1.2 @@ -1602,43 +1610,6 @@ packages: node: '>= 10.14.2' resolution: integrity: sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw== - /@jest/core/26.6.3_ts-node@9.0.0: - dependencies: - '@jest/console': 26.6.2 - '@jest/reporters': 26.6.2 - '@jest/test-result': 26.6.2 - '@jest/transform': 26.6.2 - '@jest/types': 26.6.2 - '@types/node': 14.14.6 - ansi-escapes: 4.3.1 - chalk: 4.1.0 - exit: 0.1.2 - graceful-fs: 4.2.4 - jest-changed-files: 26.6.2 - jest-config: 26.6.3_ts-node@9.0.0 - jest-haste-map: 26.6.2 - jest-message-util: 26.6.2 - jest-regex-util: 26.0.0 - jest-resolve: 26.6.2 - jest-resolve-dependencies: 26.6.3 - jest-runner: 26.6.3_ts-node@9.0.0 - jest-runtime: 26.6.3_ts-node@9.0.0 - jest-snapshot: 26.6.2 - jest-util: 26.6.2 - jest-validate: 26.6.2 - jest-watcher: 26.6.2 - micromatch: 4.0.2 - p-each-series: 2.1.0 - rimraf: 3.0.2 - slash: 3.0.0 - strip-ansi: 6.0.0 - dev: true - engines: - node: '>= 10.14.2' - peerDependencies: - ts-node: '*' - resolution: - integrity: sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw== /@jest/environment/26.3.0: dependencies: '@jest/fake-timers': 26.3.0 @@ -1839,20 +1810,6 @@ packages: node: '>= 10.14.2' resolution: integrity: sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw== - /@jest/test-sequencer/26.6.3_ts-node@9.0.0: - dependencies: - '@jest/test-result': 26.6.2 - graceful-fs: 4.2.4 - jest-haste-map: 26.6.2 - jest-runner: 26.6.3_ts-node@9.0.0 - jest-runtime: 26.6.3_ts-node@9.0.0 - dev: true - engines: - node: '>= 10.14.2' - peerDependencies: - ts-node: '*' - resolution: - integrity: sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw== /@jest/transform/26.3.0: dependencies: '@babel/core': 7.10.2 @@ -1973,18 +1930,18 @@ packages: dev: true resolution: integrity: sha512-RhAHY+wp6Nqu89Tp3zfUVkpGfqk4TfngeOWaMGgmhP7mB2ASDtOl8dkwxHmI8eN4edo+luyjPmbJBC4kST321A== - /@prisma/debug/2.13.0-dev.2: + /@prisma/debug/2.13.0-dev.5: dependencies: debug: 4.3.1 dev: true resolution: - integrity: sha512-TKN0RIpF7i/RsaV4suMdZMomBY2CldFfHnsj+wp0SNmMrHNDRof6Cd1CQyPrzBj0GIMTPOnJdJwUUXlJjDrefg== - /@prisma/engine-core/2.13.0-dev.2: + integrity: sha512-T9Pj3tnFvT7sLs+hPgI5WH3EZhKD/q9tmarTiaQQ7QWFWD/F20S/KeG1sHFwOpoUqnt+dHv3SbLkNjNlJhBzJQ== + /@prisma/engine-core/2.13.0-dev.5: dependencies: - '@prisma/debug': 2.13.0-dev.2 + '@prisma/debug': 2.13.0-dev.5 '@prisma/engines': 2.12.0-19.b16b3f54202ac4142340a6ab2a2bb75f7fd5ea1f - '@prisma/generator-helper': 2.13.0-dev.2 - '@prisma/get-platform': 2.13.0-dev.2 + '@prisma/generator-helper': 2.13.0-dev.5 + '@prisma/get-platform': 2.13.0-dev.5 chalk: 4.1.0 cross-fetch: 3.0.6 execa: 4.1.0 @@ -1996,7 +1953,7 @@ packages: undici: 2.2.0 dev: true resolution: - integrity: sha512-W0b+8y3hUJIiIrJHAChMqfzFM9fhhYnjCc+w1uGBISyTzkK/9Y+FyrRmI9A1IDZjxiPSe7xv6u0eP5MUdm92cg== + integrity: sha512-XpSkLYpzay7eB8m6FjLmEeTXCtWei2A3P4A/tx2QZfo5TNzwGVe0fcz2mC4N7ssVg0/8EBIMtIOou3Nit4VUSA== /@prisma/engines-version/2.12.0-19.b16b3f54202ac4142340a6ab2a2bb75f7fd5ea1f: resolution: integrity: sha512-t9CChQBObJPtfePlp6fkXBTxFdiWXWjRQm/QxgALXNzHYn0hdTw6BOzhD0ofQ2GYFTY8H7nOw4m0JaYtHs7wMw== @@ -2004,10 +1961,10 @@ packages: requiresBuild: true resolution: integrity: sha512-vtlukmPBRQcgsIh/K4xVBVQluQn8Eg8DwGTPwmbQsiKOBd93sKuLelXoAoHlOBrLUCx6w6xmhHU9KMvdHpPoew== - /@prisma/fetch-engine/2.13.0-dev.2: + /@prisma/fetch-engine/2.13.0-dev.5: dependencies: - '@prisma/debug': 2.13.0-dev.2 - '@prisma/get-platform': 2.13.0-dev.2 + '@prisma/debug': 2.13.0-dev.5 + '@prisma/get-platform': 2.13.0-dev.5 chalk: 4.1.0 execa: 4.1.0 find-cache-dir: 3.3.1 @@ -2026,30 +1983,30 @@ packages: tempy: 1.0.0 dev: true resolution: - integrity: sha512-c/GBWqBJ4/72V0d4uIETkk0cCyisRf8ghjQXlDYJWsiM8aWJKvOOvUvlVS5bx3iSrgSQbqMn6cOg8KCCJml63g== - /@prisma/generator-helper/2.13.0-dev.2: + integrity: sha512-xzidfZYP5c65flXSd8NDjUI8MuUujmtdIOJCxLKtDqu6RkwKH5CC/lDP7MxYpibnqCBBsBNABpOv9oPO5CjxcQ== + /@prisma/generator-helper/2.13.0-dev.5: dependencies: - '@prisma/debug': 2.13.0-dev.2 + '@prisma/debug': 2.13.0-dev.5 '@types/cross-spawn': 6.0.2 chalk: 4.1.0 cross-spawn: 7.0.3 dev: true resolution: - integrity: sha512-BAPe9bhp81Eaw49m/CR9zWYNaQerjuQR8GNLNPpJCD8HHglFuAUcMXdgd2pHERNe3MBq9cWiVEorUaYjLFOItw== - /@prisma/get-platform/2.13.0-dev.2: + integrity: sha512-zOPP98pPCdjXZSH3sYgmieGNYfZ3tRb5JwF/YcSAsxuikt+IqVse2va3RjJ2UC8USQxq7Rf7uqmykIlvNpAPFw== + /@prisma/get-platform/2.13.0-dev.5: dependencies: - '@prisma/debug': 2.13.0-dev.2 + '@prisma/debug': 2.13.0-dev.5 dev: true resolution: - integrity: sha512-bHXlGtxUir/7jS6XuacxdadGtRx9ffxoZnbanws/GcvAKu0tUMcsy24ltz5Lx2iY4708tuumtinRRU3AP/VXTg== - /@prisma/sdk/2.13.0-dev.2: + integrity: sha512-jtBuNeFlLusFUG4qrfO6PB5sYRt9YjcJZQesX5+kaU7XUAijvTn9twce0et1YX6tr9bahQ/aBZOYUh79klxubQ== + /@prisma/sdk/2.13.0-dev.5: dependencies: - '@prisma/debug': 2.13.0-dev.2 - '@prisma/engine-core': 2.13.0-dev.2 + '@prisma/debug': 2.13.0-dev.5 + '@prisma/engine-core': 2.13.0-dev.5 '@prisma/engines': 2.12.0-19.b16b3f54202ac4142340a6ab2a2bb75f7fd5ea1f - '@prisma/fetch-engine': 2.13.0-dev.2 - '@prisma/generator-helper': 2.13.0-dev.2 - '@prisma/get-platform': 2.13.0-dev.2 + '@prisma/fetch-engine': 2.13.0-dev.5 + '@prisma/generator-helper': 2.13.0-dev.5 + '@prisma/get-platform': 2.13.0-dev.5 '@timsuchanek/copy': 1.4.5 archiver: 4.0.2 arg: 5.0.0 @@ -2081,10 +2038,10 @@ packages: url-parse: 1.4.7 dev: true resolution: - integrity: sha512-S6DgVzicQbbpTN5YjzSHp6bm4ZrIVTehco3f7qta8aqNEcaVjGNJ5FDETO++C94graahXAPSXByev8BJFeNT2g== - /@prisma/studio-pcw/0.322.0_@prisma+sdk@2.13.0-dev.2: + integrity: sha512-GbfKB3LZb27a+bGEYqovwep1BhD7qNRvnfBM8XuEQ5LZcN9ra88NMiUlPQ6EmyXDCypwzmdePmDFkOSqHx7n6A== + /@prisma/studio-pcw/0.322.0_@prisma+sdk@2.13.0-dev.5: dependencies: - '@prisma/sdk': 2.13.0-dev.2 + '@prisma/sdk': 2.13.0-dev.5 '@prisma/studio-types': 0.322.0 rimraf: 3.0.2 dev: true @@ -2094,9 +2051,9 @@ packages: integrity: sha512-n21iFdPPRwxpnN+x7xmw2hUUXxpKuWcxesd9RpRT04Ak+KgVvJnHQtBG7lCwZm/65nQd16klC2O/jKkhxbzAtg== /@prisma/studio-server/0.322.0: dependencies: - '@prisma/sdk': 2.13.0-dev.2 + '@prisma/sdk': 2.13.0-dev.5 '@prisma/studio': 0.322.0 - '@prisma/studio-pcw': 0.322.0_@prisma+sdk@2.13.0-dev.2 + '@prisma/studio-pcw': 0.322.0_@prisma+sdk@2.13.0-dev.5 '@prisma/studio-types': 0.322.0 '@sentry/node': 5.15.5 checkpoint-client: 1.1.11 @@ -2205,7 +2162,6 @@ packages: dependencies: '@sindresorhus/transliterate': 0.1.1 escape-string-regexp: 4.0.0 - dev: true engines: node: '>=10' resolution: @@ -2214,7 +2170,6 @@ packages: dependencies: escape-string-regexp: 2.0.0 lodash.deburr: 4.1.0 - dev: true engines: node: '>=10' resolution: @@ -4426,13 +4381,11 @@ packages: resolution: integrity: sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= /escape-string-regexp/2.0.0: - dev: true engines: node: '>=8' resolution: integrity: sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w== /escape-string-regexp/4.0.0: - dev: true engines: node: '>=10' resolution: @@ -6202,29 +6155,6 @@ packages: hasBin: true resolution: integrity: sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg== - /jest-cli/26.6.3_ts-node@9.0.0: - dependencies: - '@jest/core': 26.6.3_ts-node@9.0.0 - '@jest/test-result': 26.6.2 - '@jest/types': 26.6.2 - chalk: 4.1.0 - exit: 0.1.2 - graceful-fs: 4.2.4 - import-local: 3.0.2 - is-ci: 2.0.0 - jest-config: 26.6.3_ts-node@9.0.0 - jest-util: 26.6.2 - jest-validate: 26.6.2 - prompts: 2.4.0 - yargs: 15.4.1 - dev: true - engines: - node: '>= 10.14.2' - hasBin: true - peerDependencies: - ts-node: '*' - resolution: - integrity: sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg== /jest-config/26.4.2: dependencies: '@babel/core': 7.10.2 @@ -6280,37 +6210,6 @@ packages: optional: true resolution: integrity: sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg== - /jest-config/26.6.3_ts-node@9.0.0: - dependencies: - '@babel/core': 7.12.3 - '@jest/test-sequencer': 26.6.3_ts-node@9.0.0 - '@jest/types': 26.6.2 - babel-jest: 26.6.3_@babel+core@7.12.3 - chalk: 4.1.0 - deepmerge: 4.2.2 - glob: 7.1.6 - graceful-fs: 4.2.4 - jest-environment-jsdom: 26.6.2 - jest-environment-node: 26.6.2 - jest-get-type: 26.3.0 - jest-jasmine2: 26.6.3_ts-node@9.0.0 - jest-regex-util: 26.0.0 - jest-resolve: 26.6.2 - jest-util: 26.6.2 - jest-validate: 26.6.2 - micromatch: 4.0.2 - pretty-format: 26.6.2 - ts-node: 9.0.0_typescript@4.1.2 - dev: true - engines: - node: '>= 10.14.2' - peerDependencies: - ts-node: '>=9.0.0' - peerDependenciesMeta: - ts-node: - optional: true - resolution: - integrity: sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg== /jest-diff/25.5.0: dependencies: chalk: 3.0.0 @@ -6547,33 +6446,6 @@ packages: node: '>= 10.14.2' resolution: integrity: sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg== - /jest-jasmine2/26.6.3_ts-node@9.0.0: - dependencies: - '@babel/traverse': 7.12.1 - '@jest/environment': 26.6.2 - '@jest/source-map': 26.6.2 - '@jest/test-result': 26.6.2 - '@jest/types': 26.6.2 - '@types/node': 14.14.6 - chalk: 4.1.0 - co: 4.6.0 - expect: 26.6.2 - is-generator-fn: 2.1.0 - jest-each: 26.6.2 - jest-matcher-utils: 26.6.2 - jest-message-util: 26.6.2 - jest-runtime: 26.6.3_ts-node@9.0.0 - jest-snapshot: 26.6.2 - jest-util: 26.6.2 - pretty-format: 26.6.2 - throat: 5.0.0 - dev: true - engines: - node: '>= 10.14.2' - peerDependencies: - ts-node: '*' - resolution: - integrity: sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg== /jest-leak-detector/26.4.2: dependencies: jest-get-type: 26.3.0 @@ -6799,35 +6671,6 @@ packages: node: '>= 10.14.2' resolution: integrity: sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ== - /jest-runner/26.6.3_ts-node@9.0.0: - dependencies: - '@jest/console': 26.6.2 - '@jest/environment': 26.6.2 - '@jest/test-result': 26.6.2 - '@jest/types': 26.6.2 - '@types/node': 14.14.6 - chalk: 4.1.0 - emittery: 0.7.2 - exit: 0.1.2 - graceful-fs: 4.2.4 - jest-config: 26.6.3_ts-node@9.0.0 - jest-docblock: 26.0.0 - jest-haste-map: 26.6.2 - jest-leak-detector: 26.6.2 - jest-message-util: 26.6.2 - jest-resolve: 26.6.2 - jest-runtime: 26.6.3_ts-node@9.0.0 - jest-util: 26.6.2 - jest-worker: 26.6.2 - source-map-support: 0.5.19 - throat: 5.0.0 - dev: true - engines: - node: '>= 10.14.2' - peerDependencies: - ts-node: '*' - resolution: - integrity: sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ== /jest-runtime/26.4.2: dependencies: '@jest/console': 26.3.0 @@ -6897,43 +6740,6 @@ packages: hasBin: true resolution: integrity: sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw== - /jest-runtime/26.6.3_ts-node@9.0.0: - dependencies: - '@jest/console': 26.6.2 - '@jest/environment': 26.6.2 - '@jest/fake-timers': 26.6.2 - '@jest/globals': 26.6.2 - '@jest/source-map': 26.6.2 - '@jest/test-result': 26.6.2 - '@jest/transform': 26.6.2 - '@jest/types': 26.6.2 - '@types/yargs': 15.0.9 - chalk: 4.1.0 - cjs-module-lexer: 0.6.0 - collect-v8-coverage: 1.0.1 - exit: 0.1.2 - glob: 7.1.6 - graceful-fs: 4.2.4 - jest-config: 26.6.3_ts-node@9.0.0 - jest-haste-map: 26.6.2 - jest-message-util: 26.6.2 - jest-mock: 26.6.2 - jest-regex-util: 26.0.0 - jest-resolve: 26.6.2 - jest-snapshot: 26.6.2 - jest-util: 26.6.2 - jest-validate: 26.6.2 - slash: 3.0.0 - strip-bom: 4.0.0 - yargs: 15.4.1 - dev: true - engines: - node: '>= 10.14.2' - hasBin: true - peerDependencies: - ts-node: '*' - resolution: - integrity: sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw== /jest-serializer/26.3.0: dependencies: '@types/node': 14.0.27 @@ -7119,19 +6925,6 @@ packages: hasBin: true resolution: integrity: sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q== - /jest/26.6.3_ts-node@9.0.0: - dependencies: - '@jest/core': 26.6.3_ts-node@9.0.0 - import-local: 3.0.2 - jest-cli: 26.6.3_ts-node@9.0.0 - dev: true - engines: - node: '>= 10.14.2' - hasBin: true - peerDependencies: - ts-node: '*' - resolution: - integrity: sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q== /js-levenshtein/1.1.6: dev: true engines: @@ -7503,7 +7296,6 @@ packages: resolution: integrity: sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw== /lodash.deburr/4.1.0: - dev: true resolution: integrity: sha1-3bG7s+8HRYwBd7oH3hRCLLAz/5s= /lodash.defaults/4.2.0: @@ -7630,7 +7422,7 @@ packages: /mariadb/2.5.1: dependencies: '@types/geojson': 7946.0.7 - '@types/node': 14.14.2 + '@types/node': 14.14.7 denque: 1.4.1 iconv-lite: 0.6.2 long: 4.0.0