From 2ed3de92d8f3a7af096c19800d40aa4897cd7a73 Mon Sep 17 00:00:00 2001 From: Dan Lynch Date: Fri, 26 Dec 2025 23:02:34 +0000 Subject: [PATCH 1/3] feat: update imports from inquirerer to genomic - Update all imports from 'inquirerer' to 'genomic' - Update all imports from 'create-gen-app' to '@genomic/scaffolds' - Rename Inquirerer class references to Genomic - Update package.json dependencies to use new package names: - inquirerer@^2.4.0 -> genomic@^3.0.0 - create-gen-app@^0.10.0 -> @genomic/scaffolds@^1.0.0 BREAKING CHANGE: This PR depends on constructive-io/dev-utils#39 being merged and the genomic packages being published to npm first. --- packages/cli/__tests__/cli.test.ts | 6 ++-- packages/cli/package.json | 2 +- packages/cli/src/commands.ts | 4 +-- packages/cli/src/commands/codegen.ts | 4 +-- packages/cli/src/commands/explorer.ts | 4 +-- .../cli/src/commands/get-graphql-schema.ts | 4 +-- packages/cli/src/commands/server.ts | 4 +-- packages/cli/src/index.ts | 2 +- packages/cli/test-utils/cli.ts | 2 +- packages/cli/test-utils/fixtures.ts | 4 +-- packages/csv-to-pg/package.json | 2 +- packages/csv-to-pg/src/cli.ts | 2 +- pgpm/cli/__tests__/add.test.ts | 6 ++-- pgpm/cli/__tests__/extensions.test.ts | 4 +-- pgpm/cli/__tests__/init.test.ts | 20 +++++------ pgpm/cli/__tests__/package.test.ts | 4 +-- pgpm/cli/package.json | 34 +++++++++---------- pgpm/cli/src/commands.ts | 4 +-- pgpm/cli/src/commands/add.ts | 4 +-- pgpm/cli/src/commands/admin-users.ts | 4 +-- pgpm/cli/src/commands/admin-users/add.ts | 4 +-- .../cli/src/commands/admin-users/bootstrap.ts | 4 +-- pgpm/cli/src/commands/admin-users/remove.ts | 4 +-- pgpm/cli/src/commands/analyze.ts | 4 +-- pgpm/cli/src/commands/cache.ts | 6 ++-- pgpm/cli/src/commands/clear.ts | 4 +-- pgpm/cli/src/commands/deploy.ts | 4 +-- pgpm/cli/src/commands/docker.ts | 4 +-- pgpm/cli/src/commands/env.ts | 4 +-- pgpm/cli/src/commands/export.ts | 4 +-- pgpm/cli/src/commands/extension.ts | 4 +-- pgpm/cli/src/commands/init/index.ts | 12 +++---- pgpm/cli/src/commands/init/workspace.ts | 4 +-- pgpm/cli/src/commands/install.ts | 4 +-- pgpm/cli/src/commands/kill.ts | 4 +-- pgpm/cli/src/commands/migrate.ts | 4 +-- pgpm/cli/src/commands/migrate/deps.ts | 4 +-- pgpm/cli/src/commands/migrate/init.ts | 4 +-- pgpm/cli/src/commands/migrate/list.ts | 4 +-- pgpm/cli/src/commands/migrate/status.ts | 4 +-- pgpm/cli/src/commands/package.ts | 4 +-- pgpm/cli/src/commands/plan.ts | 4 +-- pgpm/cli/src/commands/remove.ts | 4 +-- pgpm/cli/src/commands/rename.ts | 4 +-- pgpm/cli/src/commands/revert.ts | 4 +-- pgpm/cli/src/commands/tag.ts | 4 +-- pgpm/cli/src/commands/test-packages.ts | 4 +-- pgpm/cli/src/commands/update.ts | 4 +-- pgpm/cli/src/commands/upgrade-modules.ts | 6 ++-- pgpm/cli/src/commands/verify.ts | 4 +-- pgpm/cli/src/index.ts | 2 +- pgpm/cli/src/utils/database.ts | 6 ++-- pgpm/cli/src/utils/deployed-changes.ts | 6 ++-- pgpm/cli/src/utils/module-utils.ts | 4 +-- pgpm/cli/test-utils/CLIDeployTestFixture.ts | 4 +-- pgpm/cli/test-utils/cli.ts | 2 +- pgpm/cli/test-utils/fixtures.ts | 4 +-- pgpm/core/package.json | 4 +-- pgpm/core/src/core/template-scaffold.ts | 8 ++--- 59 files changed, 146 insertions(+), 146 deletions(-) diff --git a/packages/cli/__tests__/cli.test.ts b/packages/cli/__tests__/cli.test.ts index 83fc8ac0b..754da145e 100644 --- a/packages/cli/__tests__/cli.test.ts +++ b/packages/cli/__tests__/cli.test.ts @@ -1,10 +1,10 @@ -import { Inquirerer, Question } from 'inquirerer'; +import { Genomic, Question } from 'genomic'; import { KEY_SEQUENCES, setupTests, TestEnvironment } from '../test-utils'; const beforeEachSetup = setupTests(); -describe('Inquirerer', () => { +describe('Genomic', () => { let environment: TestEnvironment; beforeEach(() => { @@ -14,7 +14,7 @@ describe('Inquirerer', () => { it('prompts user and correctly processes delayed input', async () => { const { mockInput, mockOutput, writeResults, transformResults, enqueueInputResponse } = environment; - const prompter = new Inquirerer({ + const prompter = new Genomic({ input: mockInput, output: mockOutput, noTty: false diff --git a/packages/cli/package.json b/packages/cli/package.json index c6a161c4d..37042e924 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -55,7 +55,7 @@ "@pgpmjs/server-utils": "workspace:^", "@pgpmjs/types": "workspace:^", "find-and-require-package-json": "^0.8.2", - "inquirerer": "^2.4.0", + "genomic": "^3.0.0", "js-yaml": "^4.1.0", "minimist": "^1.2.8", "pg-cache": "workspace:^", diff --git a/packages/cli/src/commands.ts b/packages/cli/src/commands.ts index a46a1b3a2..5678d8a40 100644 --- a/packages/cli/src/commands.ts +++ b/packages/cli/src/commands.ts @@ -1,5 +1,5 @@ import { findAndRequirePackageJson } from 'find-and-require-package-json'; -import { CLIOptions, Inquirerer } from 'inquirerer'; +import { CLIOptions, Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import codegen from './commands/codegen'; @@ -18,7 +18,7 @@ const createCommandMap = (): Record => { }; }; -export const commands = async (argv: Partial, prompter: Inquirerer, options: CLIOptions & { skipPgTeardown?: boolean }) => { +export const commands = async (argv: Partial, prompter: Genomic, options: CLIOptions & { skipPgTeardown?: boolean }) => { let { first: command, newArgv } = extractFirst(argv); // Run update check early so it shows on help/version paths too diff --git a/packages/cli/src/commands/codegen.ts b/packages/cli/src/commands/codegen.ts index b3fd5a93a..cbf783ea9 100644 --- a/packages/cli/src/commands/codegen.ts +++ b/packages/cli/src/commands/codegen.ts @@ -1,4 +1,4 @@ -import { CLIOptions, Inquirerer } from 'inquirerer' +import { CLIOptions, Genomic } from 'genomic' import { ParsedArgs } from 'minimist' import { promises as fs } from 'fs' import { join } from 'path' @@ -48,7 +48,7 @@ async function loadConfig(path: string): Promise> export default async ( argv: Partial, - _prompter: Inquirerer, + _prompter: Genomic, _options: CLIOptions ) => { if (argv.help || argv.h) { diff --git a/packages/cli/src/commands/explorer.ts b/packages/cli/src/commands/explorer.ts index f58c0117d..308499b16 100644 --- a/packages/cli/src/commands/explorer.ts +++ b/packages/cli/src/commands/explorer.ts @@ -2,7 +2,7 @@ import { getEnvOptions } from '@constructive-io/graphql-env'; import { GraphQLExplorer as explorer } from '@constructive-io/graphql-explorer'; import { Logger } from '@pgpmjs/logger'; import { PgpmOptions } from '@pgpmjs/types'; -import { CLIOptions, Inquirerer, Question } from 'inquirerer'; +import { CLIOptions, Genomic, Question } from 'genomic'; const log = new Logger('explorer'); @@ -72,7 +72,7 @@ const questions: Question[] = [ export default async ( argv: Partial>, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/packages/cli/src/commands/get-graphql-schema.ts b/packages/cli/src/commands/get-graphql-schema.ts index eb189f9ca..1aea39cb0 100644 --- a/packages/cli/src/commands/get-graphql-schema.ts +++ b/packages/cli/src/commands/get-graphql-schema.ts @@ -1,4 +1,4 @@ -import { CLIOptions, Inquirerer } from 'inquirerer' +import { CLIOptions, Genomic } from 'genomic' import { ParsedArgs } from 'minimist' import { promises as fs } from 'fs' import { buildSchemaSDL, fetchEndpointSchemaSDL } from '@constructive-io/graphql-server' @@ -26,7 +26,7 @@ const defaultSchemas = [ export default async ( argv: Partial, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { if (argv.help || argv.h) { diff --git a/packages/cli/src/commands/server.ts b/packages/cli/src/commands/server.ts index f2e7b8a2c..b412b5fbd 100644 --- a/packages/cli/src/commands/server.ts +++ b/packages/cli/src/commands/server.ts @@ -2,7 +2,7 @@ import { getEnvOptions } from '@constructive-io/graphql-env'; import { Logger } from '@pgpmjs/logger'; import { GraphQLServer as server } from '@constructive-io/graphql-server'; import { PgpmOptions } from '@pgpmjs/types'; -import { CLIOptions, Inquirerer, OptionValue,Question } from 'inquirerer'; +import { CLIOptions, Genomic, OptionValue,Question } from 'genomic'; import { getPgPool } from 'pg-cache'; const log = new Logger('server'); @@ -83,7 +83,7 @@ const questions: Question[] = [ export default async ( argv: Partial>, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/packages/cli/src/index.ts b/packages/cli/src/index.ts index 120f76063..d1b5173ae 100755 --- a/packages/cli/src/index.ts +++ b/packages/cli/src/index.ts @@ -1,6 +1,6 @@ #!/usr/bin/env node import { findAndRequirePackageJson } from 'find-and-require-package-json'; -import { CLI, CLIOptions } from 'inquirerer'; +import { CLI, CLIOptions } from 'genomic'; import { commands } from './commands'; diff --git a/packages/cli/test-utils/cli.ts b/packages/cli/test-utils/cli.ts index e09059fd4..4ef404d5b 100644 --- a/packages/cli/test-utils/cli.ts +++ b/packages/cli/test-utils/cli.ts @@ -1,4 +1,4 @@ -import { CLIOptions } from 'inquirerer'; +import { CLIOptions } from 'genomic'; import readline from 'readline'; import { Readable, Transform, Writable } from 'stream'; import { cleanAnsi } from 'clean-ansi'; diff --git a/packages/cli/test-utils/fixtures.ts b/packages/cli/test-utils/fixtures.ts index 93a5a72b8..0783740f5 100644 --- a/packages/cli/test-utils/fixtures.ts +++ b/packages/cli/test-utils/fixtures.ts @@ -1,5 +1,5 @@ import fs from 'fs'; -import { Inquirerer } from 'inquirerer'; +import { Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import os from 'os'; import path from 'path'; @@ -53,7 +53,7 @@ export class TestFixture { transformResults } = this.environment; - const prompter = new Inquirerer({ + const prompter = new Genomic({ input: mockInput, output: mockOutput, noTty: true diff --git a/packages/csv-to-pg/package.json b/packages/csv-to-pg/package.json index 94b994041..a52b04c22 100644 --- a/packages/csv-to-pg/package.json +++ b/packages/csv-to-pg/package.json @@ -46,7 +46,7 @@ "@pgsql/types": "^17.6.2", "@pgsql/utils": "^17.8.4", "csv-parser": "^2.3.3", - "inquirerer": "^2.4.0", + "genomic": "^3.0.0", "js-yaml": "^3.14.0", "pgsql-deparser": "^17.15.0" } diff --git a/packages/csv-to-pg/src/cli.ts b/packages/csv-to-pg/src/cli.ts index c7f6c1a80..e4b4c2245 100644 --- a/packages/csv-to-pg/src/cli.ts +++ b/packages/csv-to-pg/src/cli.ts @@ -1,5 +1,5 @@ #!/usr/bin/env node -import { CLI, type CommandHandler } from 'inquirerer'; +import { CLI, type CommandHandler } from 'genomic'; import { readConfig } from './parse'; import { Parser } from './parser'; import { normalizePath } from './utils'; diff --git a/pgpm/cli/__tests__/add.test.ts b/pgpm/cli/__tests__/add.test.ts index d1d93a101..8a42baeeb 100644 --- a/pgpm/cli/__tests__/add.test.ts +++ b/pgpm/cli/__tests__/add.test.ts @@ -1,6 +1,6 @@ import * as fs from 'fs'; import { sync as glob } from 'glob'; -import { Inquirerer } from 'inquirerer'; +import { Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import * as path from 'path'; @@ -28,7 +28,7 @@ describe('cmds:add', () => { const runAddTest = async (argv: ParsedArgs, label: string) => { const { mockInput, mockOutput, writeResults, transformResults } = environment; - const prompter = new Inquirerer({ + const prompter = new Genomic({ input: mockInput, output: mockOutput, noTty: true @@ -198,7 +198,7 @@ superuser = false await setupModule(moduleDir); const { mockInput, mockOutput } = environment; - const prompter = new Inquirerer({ + const prompter = new Genomic({ input: mockInput, output: mockOutput, noTty: true diff --git a/pgpm/cli/__tests__/extensions.test.ts b/pgpm/cli/__tests__/extensions.test.ts index f0036ed5a..058ccb98c 100644 --- a/pgpm/cli/__tests__/extensions.test.ts +++ b/pgpm/cli/__tests__/extensions.test.ts @@ -3,7 +3,7 @@ process.env.PGPM_SKIP_UPDATE_CHECK = 'true'; import { PgpmPackage } from '@pgpmjs/core'; import { sync as glob } from 'glob'; -import { Inquirerer } from 'inquirerer'; +import { Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import * as path from 'path'; @@ -31,7 +31,7 @@ describe('cmds:extension', () => { }); const runCommand = async (argv: ParsedArgs) => { - const prompter = new Inquirerer({ + const prompter = new Genomic({ input: environment.mockInput, output: environment.mockOutput, noTty: true diff --git a/pgpm/cli/__tests__/init.test.ts b/pgpm/cli/__tests__/init.test.ts index e3ab46a55..1de80b4bb 100644 --- a/pgpm/cli/__tests__/init.test.ts +++ b/pgpm/cli/__tests__/init.test.ts @@ -4,7 +4,7 @@ process.env.PGPM_SKIP_UPDATE_CHECK = 'true'; import { PgpmPackage } from '@pgpmjs/core'; import { existsSync } from 'fs'; import { sync as glob } from 'glob'; -import { Inquirerer } from 'inquirerer'; +import { Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import * as path from 'path'; @@ -37,7 +37,7 @@ describe('cmds:init', () => { const runInitTest = async (argv: ParsedArgs, label: string) => { const { mockInput, mockOutput, writeResults, transformResults } = environment; - const prompter = new Inquirerer({ + const prompter = new Genomic({ input: mockInput, output: mockOutput, noTty: true @@ -112,7 +112,7 @@ describe('cmds:init', () => { describe('with custom templates', () => { it('initializes workspace with --template-path', async () => { const { mockInput, mockOutput } = environment; - const prompter = new Inquirerer({ + const prompter = new Genomic({ input: mockInput, output: mockOutput, noTty: true @@ -144,7 +144,7 @@ describe('cmds:init', () => { // First create a workspace const workspaceDir = path.join(fixture.tempDir, 'test-workspace-for-module'); const { mockInput, mockOutput } = environment; - const prompter = new Inquirerer({ + const prompter = new Genomic({ input: mockInput, output: mockOutput, noTty: true @@ -193,7 +193,7 @@ describe('cmds:init', () => { 'initializes workspace with --repo', async () => { const { mockInput, mockOutput } = environment; - const prompter = new Inquirerer({ + const prompter = new Genomic({ input: mockInput, output: mockOutput, noTty: true @@ -225,7 +225,7 @@ describe('cmds:init', () => { 'initializes workspace with --repo and --from-branch', async () => { const { mockInput, mockOutput } = environment; - const prompter = new Inquirerer({ + const prompter = new Genomic({ input: mockInput, output: mockOutput, noTty: true @@ -258,7 +258,7 @@ describe('cmds:init', () => { describe('init from packages/ folder', () => { it('initializes module from packages/ folder (empty workspace)', async () => { const { mockInput, mockOutput } = environment; - const prompter = new Inquirerer({ + const prompter = new Genomic({ input: mockInput, output: mockOutput, noTty: true @@ -305,7 +305,7 @@ describe('cmds:init', () => { it('initializes module from packages/ folder (with existing modules)', async () => { const { mockInput, mockOutput } = environment; - const prompter = new Inquirerer({ + const prompter = new Genomic({ input: mockInput, output: mockOutput, noTty: true @@ -369,7 +369,7 @@ describe('cmds:init', () => { describe('prevent nested module creation', () => { it('prevents nested module creation inside existing module', async () => { const { mockInput, mockOutput } = environment; - const prompter = new Inquirerer({ + const prompter = new Genomic({ input: mockInput, output: mockOutput, noTty: true @@ -444,7 +444,7 @@ describe('cmds:init', () => { describe('workspace root behavior', () => { it('initializes module from workspace root (existing behavior)', async () => { const { mockInput, mockOutput } = environment; - const prompter = new Inquirerer({ + const prompter = new Genomic({ input: mockInput, output: mockOutput, noTty: true diff --git a/pgpm/cli/__tests__/package.test.ts b/pgpm/cli/__tests__/package.test.ts index 0662b4f34..c8a31a27f 100644 --- a/pgpm/cli/__tests__/package.test.ts +++ b/pgpm/cli/__tests__/package.test.ts @@ -1,7 +1,7 @@ import { PgpmPackage } from '@pgpmjs/core'; import * as fs from 'fs'; import { sync as glob } from 'glob'; -import { Inquirerer } from 'inquirerer'; +import { Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import * as os from 'os'; import * as path from 'path'; @@ -31,7 +31,7 @@ describe('cmds:package', () => { }); const runCommand = async (argv: ParsedArgs) => { - const prompter = new Inquirerer({ + const prompter = new Genomic({ input: environment.mockInput, output: environment.mockOutput, noTty: true diff --git a/pgpm/cli/package.json b/pgpm/cli/package.json index a80759b6e..dfb90d95c 100644 --- a/pgpm/cli/package.json +++ b/pgpm/cli/package.json @@ -45,23 +45,23 @@ "pg": "^8.16.3", "ts-node": "^10.9.2" }, - "dependencies": { - "@pgpmjs/core": "workspace:^", - "@pgpmjs/env": "workspace:^", - "@pgpmjs/logger": "workspace:^", - "@pgpmjs/types": "workspace:^", - "appstash": "^0.2.6", - "create-gen-app": "^0.10.0", - "find-and-require-package-json": "^0.8.2", - "inquirerer": "^2.4.0", - "js-yaml": "^4.1.0", - "minimist": "^1.2.8", - "pg-cache": "workspace:^", - "pg-env": "workspace:^", - "semver": "^7.6.2", - "shelljs": "^0.10.0", - "yanse": "^0.1.8" - }, + "dependencies": { + "@genomic/scaffolds": "^1.0.0", + "@pgpmjs/core": "workspace:^", + "@pgpmjs/env": "workspace:^", + "@pgpmjs/logger": "workspace:^", + "@pgpmjs/types": "workspace:^", + "appstash": "^0.2.6", + "find-and-require-package-json": "^0.8.2", + "genomic": "^3.0.0", + "js-yaml": "^4.1.0", + "minimist": "^1.2.8", + "pg-cache": "workspace:^", + "pg-env": "workspace:^", + "semver": "^7.6.2", + "shelljs": "^0.10.0", + "yanse": "^0.1.8" + }, "keywords": [ "cli", "command-line", diff --git a/pgpm/cli/src/commands.ts b/pgpm/cli/src/commands.ts index 9be4235a9..5ef5df76e 100644 --- a/pgpm/cli/src/commands.ts +++ b/pgpm/cli/src/commands.ts @@ -1,5 +1,5 @@ import { findAndRequirePackageJson } from 'find-and-require-package-json'; -import { CLIOptions, Inquirerer } from 'inquirerer'; +import { CLIOptions, Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import { teardownPgPools } from 'pg-cache'; @@ -71,7 +71,7 @@ export const createPgpmCommandMap = (skipPgTeardown: boolean = false): Record, prompter: Inquirerer, options: CLIOptions & { skipPgTeardown?: boolean }) => { +export const commands = async (argv: Partial, prompter: Genomic, options: CLIOptions & { skipPgTeardown?: boolean }) => { if (argv.version || argv.v) { const pkg = findAndRequirePackageJson(__dirname); console.log(pkg.version); diff --git a/pgpm/cli/src/commands/add.ts b/pgpm/cli/src/commands/add.ts index d8eb086b9..9f3bd1932 100644 --- a/pgpm/cli/src/commands/add.ts +++ b/pgpm/cli/src/commands/add.ts @@ -1,5 +1,5 @@ import { PgpmPackage } from '@pgpmjs/core'; -import { CLIOptions, Inquirerer } from 'inquirerer'; +import { CLIOptions, Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import * as path from 'path'; @@ -30,7 +30,7 @@ Examples: export default async ( argv: Partial, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/admin-users.ts b/pgpm/cli/src/commands/admin-users.ts index a1894aabe..ffb7701d6 100644 --- a/pgpm/cli/src/commands/admin-users.ts +++ b/pgpm/cli/src/commands/admin-users.ts @@ -1,4 +1,4 @@ -import { CLIOptions, Inquirerer } from 'inquirerer'; +import { CLIOptions, Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import { extractFirst } from '../utils'; @@ -24,7 +24,7 @@ Options: --cwd Working directory (default: current directory) `; -export default async (argv: Partial, prompter: Inquirerer, options: CLIOptions) => { +export default async (argv: Partial, prompter: Genomic, options: CLIOptions) => { let { first: subcommand, newArgv } = extractFirst(argv); // Prompt if no subcommand provided diff --git a/pgpm/cli/src/commands/admin-users/add.ts b/pgpm/cli/src/commands/admin-users/add.ts index 6b5ec2537..ea8a03f83 100644 --- a/pgpm/cli/src/commands/admin-users/add.ts +++ b/pgpm/cli/src/commands/admin-users/add.ts @@ -1,7 +1,7 @@ import { PgpmInit } from '@pgpmjs/core'; import { getConnEnvOptions } from '@pgpmjs/env'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Inquirerer, Question } from 'inquirerer'; +import { CLIOptions, Genomic, Question } from 'genomic'; import { ParsedArgs } from 'minimist'; import { getPgEnvOptions } from 'pg-env'; @@ -30,7 +30,7 @@ Examples: export default async ( argv: Partial, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/admin-users/bootstrap.ts b/pgpm/cli/src/commands/admin-users/bootstrap.ts index 59140f62b..965338274 100644 --- a/pgpm/cli/src/commands/admin-users/bootstrap.ts +++ b/pgpm/cli/src/commands/admin-users/bootstrap.ts @@ -1,7 +1,7 @@ import { PgpmInit } from '@pgpmjs/core'; import { getConnEnvOptions } from '@pgpmjs/env'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Inquirerer } from 'inquirerer'; +import { CLIOptions, Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import { getPgEnvOptions } from 'pg-env'; @@ -25,7 +25,7 @@ Examples: export default async ( argv: Partial, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/admin-users/remove.ts b/pgpm/cli/src/commands/admin-users/remove.ts index 6ca7c50d1..6d471287a 100644 --- a/pgpm/cli/src/commands/admin-users/remove.ts +++ b/pgpm/cli/src/commands/admin-users/remove.ts @@ -1,7 +1,7 @@ import { PgpmInit } from '@pgpmjs/core'; import { getConnEnvOptions } from '@pgpmjs/env'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Inquirerer, Question } from 'inquirerer'; +import { CLIOptions, Genomic, Question } from 'genomic'; import { ParsedArgs } from 'minimist'; import { getPgEnvOptions } from 'pg-env'; @@ -28,7 +28,7 @@ Examples: export default async ( argv: Partial, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/analyze.ts b/pgpm/cli/src/commands/analyze.ts index 0b66c9fc5..710e2bfd8 100644 --- a/pgpm/cli/src/commands/analyze.ts +++ b/pgpm/cli/src/commands/analyze.ts @@ -1,9 +1,9 @@ import { PgpmPackage } from '@pgpmjs/core'; -import { Inquirerer } from 'inquirerer'; +import { Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import path from 'path'; -export default async (argv: Partial, _prompter: Inquirerer) => { +export default async (argv: Partial, _prompter: Genomic) => { const cwd = (argv.cwd as string) || process.cwd(); const proj = new PgpmPackage(path.resolve(cwd)); const result = proj.analyzeModule(); diff --git a/pgpm/cli/src/commands/cache.ts b/pgpm/cli/src/commands/cache.ts index 32f4f5fae..bd6f365b4 100644 --- a/pgpm/cli/src/commands/cache.ts +++ b/pgpm/cli/src/commands/cache.ts @@ -1,5 +1,5 @@ -import { CLIOptions, Inquirerer } from 'inquirerer'; -import { CacheManager } from 'create-gen-app'; +import { CLIOptions, Genomic } from 'genomic'; +import { CacheManager } from '@genomic/scaffolds'; import { cliExitWithError } from '../utils/cli-error'; const cacheUsageText = ` @@ -14,7 +14,7 @@ Options: export default async ( argv: Partial>, - _prompter: Inquirerer, + _prompter: Genomic, _options: CLIOptions ) => { if (argv.help || argv.h) { diff --git a/pgpm/cli/src/commands/clear.ts b/pgpm/cli/src/commands/clear.ts index e87841c7a..b53fc4591 100644 --- a/pgpm/cli/src/commands/clear.ts +++ b/pgpm/cli/src/commands/clear.ts @@ -3,7 +3,7 @@ import { parsePlanFile } from '@pgpmjs/core'; import { getEnvOptions } from '@pgpmjs/env'; import { Logger } from '@pgpmjs/logger'; import { errors } from '@pgpmjs/types'; -import { CLIOptions, Inquirerer, Question } from 'inquirerer'; +import { CLIOptions, Genomic, Question } from 'genomic'; import path from 'path'; import { getPgEnvOptions } from 'pg-env'; @@ -13,7 +13,7 @@ const log = new Logger('clear'); export default async ( argv: Partial>, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { diff --git a/pgpm/cli/src/commands/deploy.ts b/pgpm/cli/src/commands/deploy.ts index 286920f7d..a32f91c7d 100644 --- a/pgpm/cli/src/commands/deploy.ts +++ b/pgpm/cli/src/commands/deploy.ts @@ -2,7 +2,7 @@ import { PgpmPackage } from '@pgpmjs/core'; import { getEnvOptions } from '@pgpmjs/env'; import { Logger } from '@pgpmjs/logger'; import { execSync } from 'child_process'; -import { CLIOptions, Inquirerer, Question } from 'inquirerer'; +import { CLIOptions, Genomic, Question } from 'genomic'; import { ParsedArgs } from 'minimist'; import { getPgEnvOptions, @@ -41,7 +41,7 @@ Examples: export default async ( argv: Partial, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/docker.ts b/pgpm/cli/src/commands/docker.ts index 5a9e9ef6a..999a223f0 100644 --- a/pgpm/cli/src/commands/docker.ts +++ b/pgpm/cli/src/commands/docker.ts @@ -1,5 +1,5 @@ import { spawn } from 'child_process'; -import { CLIOptions, Inquirerer } from 'inquirerer'; +import { CLIOptions, Genomic } from 'genomic'; import { cliExitWithError,extractFirst } from '../utils'; @@ -196,7 +196,7 @@ async function stopContainer(name: string): Promise { export default async ( argv: Partial>, - _prompter: Inquirerer, + _prompter: Genomic, _options: CLIOptions ) => { if (argv.help || argv.h) { diff --git a/pgpm/cli/src/commands/env.ts b/pgpm/cli/src/commands/env.ts index 52c61cf9a..c895aa94a 100644 --- a/pgpm/cli/src/commands/env.ts +++ b/pgpm/cli/src/commands/env.ts @@ -1,5 +1,5 @@ import { spawn } from 'child_process'; -import { Inquirerer } from 'inquirerer'; +import { Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import { defaultPgConfig, PgConfig } from 'pg-env'; @@ -89,7 +89,7 @@ function executeCommand(config: PgConfig, command: string, args: string[]): Prom export default async ( argv: Partial, - _prompter: Inquirerer + _prompter: Genomic ) => { if (argv.help || argv.h) { console.log(envUsageText); diff --git a/pgpm/cli/src/commands/export.ts b/pgpm/cli/src/commands/export.ts index 3173cb6c7..795ae9fe1 100644 --- a/pgpm/cli/src/commands/export.ts +++ b/pgpm/cli/src/commands/export.ts @@ -1,7 +1,7 @@ import { exportMigrations,PgpmPackage } from '@pgpmjs/core'; import { getEnvOptions } from '@pgpmjs/env'; import { getGitConfigInfo } from '@pgpmjs/types'; -import { CLIOptions, Inquirerer, OptionValue } from 'inquirerer'; +import { CLIOptions, Genomic, OptionValue } from 'genomic'; import { resolve } from 'path'; import { getPgPool } from 'pg-cache'; @@ -25,7 +25,7 @@ Examples: export default async ( argv: Partial>, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/extension.ts b/pgpm/cli/src/commands/extension.ts index 86811143b..de091b3d1 100644 --- a/pgpm/cli/src/commands/extension.ts +++ b/pgpm/cli/src/commands/extension.ts @@ -1,5 +1,5 @@ import { PgpmPackage } from '@pgpmjs/core'; -import { CLIOptions, Inquirerer, OptionValue, Question } from 'inquirerer'; +import { CLIOptions, Genomic, OptionValue, Question } from 'genomic'; import { ParsedArgs } from 'minimist'; const extensionUsageText = ` @@ -19,7 +19,7 @@ Examples: export default async ( argv: Partial, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/init/index.ts b/pgpm/cli/src/commands/init/index.ts index 952201c99..cbe296f4d 100644 --- a/pgpm/cli/src/commands/init/index.ts +++ b/pgpm/cli/src/commands/init/index.ts @@ -12,7 +12,7 @@ import { sluggify, } from '@pgpmjs/core'; import { errors } from '@pgpmjs/types'; -import { CLIOptions, Inquirerer, OptionValue, Question, registerDefaultResolver } from 'inquirerer'; +import { CLIOptions, Genomic, OptionValue, Question, registerDefaultResolver } from 'genomic'; const DEFAULT_MOTD = ` | _ _ @@ -53,7 +53,7 @@ Examples: export default async ( argv: Partial>, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { // Show usage if explicitly requested @@ -65,7 +65,7 @@ export default async ( return handleInit(argv, prompter); }; -async function handleInit(argv: Partial>, prompter: Inquirerer) { +async function handleInit(argv: Partial>, prompter: Genomic) { const { cwd = process.cwd() } = argv; const templateRepo = (argv.repo as string) ?? DEFAULT_TEMPLATE_REPO; const branch = argv.fromBranch as string | undefined; @@ -139,7 +139,7 @@ interface BoilerplateInitContext { async function handleBoilerplateInit( argv: Partial>, - prompter: Inquirerer, + prompter: Genomic, ctx: BoilerplateInitContext ) { let fromPath: string; @@ -242,7 +242,7 @@ interface InitContext { async function handleWorkspaceInit( argv: Partial>, - prompter: Inquirerer, + prompter: Genomic, ctx: InitContext ) { const workspaceQuestions: Question[] = [ @@ -301,7 +301,7 @@ async function handleWorkspaceInit( async function handleModuleInit( argv: Partial>, - prompter: Inquirerer, + prompter: Genomic, ctx: InitContext, wasExplicitModuleRequest: boolean = false ) { diff --git a/pgpm/cli/src/commands/init/workspace.ts b/pgpm/cli/src/commands/init/workspace.ts index cdcb01bbd..f3b60690f 100644 --- a/pgpm/cli/src/commands/init/workspace.ts +++ b/pgpm/cli/src/commands/init/workspace.ts @@ -2,7 +2,7 @@ import fs from 'fs'; import path from 'path'; import { DEFAULT_TEMPLATE_REPO, DEFAULT_TEMPLATE_TOOL_NAME, scaffoldTemplate, sluggify } from '@pgpmjs/core'; -import { Inquirerer, Question, registerDefaultResolver } from 'inquirerer'; +import { Genomic, Question, registerDefaultResolver } from 'genomic'; const DEFAULT_MOTD = ` | _ _ @@ -13,7 +13,7 @@ ooO--(_)--Ooo-ooO--(_)--Ooo-ooO--(_)--Ooo- export default async function runWorkspaceSetup( argv: Partial>, - prompter: Inquirerer + prompter: Genomic ) { const workspaceQuestions: Question[] = [ { diff --git a/pgpm/cli/src/commands/install.ts b/pgpm/cli/src/commands/install.ts index d7a331ba4..72c93c62f 100644 --- a/pgpm/cli/src/commands/install.ts +++ b/pgpm/cli/src/commands/install.ts @@ -1,5 +1,5 @@ import { PgpmPackage } from '@pgpmjs/core'; -import { CLIOptions, Inquirerer } from 'inquirerer'; +import { CLIOptions, Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; const installUsageText = ` @@ -23,7 +23,7 @@ Examples: export default async ( argv: Partial, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/kill.ts b/pgpm/cli/src/commands/kill.ts index 5fcdb4487..0b393d08d 100644 --- a/pgpm/cli/src/commands/kill.ts +++ b/pgpm/cli/src/commands/kill.ts @@ -1,5 +1,5 @@ import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Inquirerer, OptionValue } from 'inquirerer'; +import { CLIOptions, Genomic, OptionValue } from 'genomic'; import { getPgPool } from 'pg-cache'; const log = new Logger('db-kill'); @@ -27,7 +27,7 @@ Examples: export default async ( argv: Partial>, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/migrate.ts b/pgpm/cli/src/commands/migrate.ts index e57790316..16faac0ce 100644 --- a/pgpm/cli/src/commands/migrate.ts +++ b/pgpm/cli/src/commands/migrate.ts @@ -1,4 +1,4 @@ -import { CLIOptions, Inquirerer } from 'inquirerer'; +import { CLIOptions, Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import { extractFirst } from '../utils'; @@ -28,7 +28,7 @@ Options: --cwd Working directory (default: current directory) `; -export default async (argv: Partial, prompter: Inquirerer, options: CLIOptions) => { +export default async (argv: Partial, prompter: Genomic, options: CLIOptions) => { let { first: subcommand, newArgv } = extractFirst(argv); // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/migrate/deps.ts b/pgpm/cli/src/commands/migrate/deps.ts index 3366a158d..7d4361b91 100644 --- a/pgpm/cli/src/commands/migrate/deps.ts +++ b/pgpm/cli/src/commands/migrate/deps.ts @@ -2,7 +2,7 @@ import { PgpmMigrate } from '@pgpmjs/core'; import { parsePlanFile } from '@pgpmjs/core'; import { Logger } from '@pgpmjs/logger'; import { existsSync } from 'fs'; -import { CLIOptions, Inquirerer } from 'inquirerer'; +import { CLIOptions, Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import { join } from 'path'; import { getPgEnvOptions } from 'pg-env'; @@ -11,7 +11,7 @@ import { getTargetDatabase } from '../../utils/database'; const log = new Logger('migrate-deps'); -export default async (argv: Partial, prompter: Inquirerer, options: CLIOptions) => { +export default async (argv: Partial, prompter: Genomic, options: CLIOptions) => { const cwd = argv.cwd || process.cwd(); const planPath = join(cwd, 'pgpm.plan'); diff --git a/pgpm/cli/src/commands/migrate/init.ts b/pgpm/cli/src/commands/migrate/init.ts index 74bcf12ce..ac1223518 100644 --- a/pgpm/cli/src/commands/migrate/init.ts +++ b/pgpm/cli/src/commands/migrate/init.ts @@ -1,6 +1,6 @@ import { PgpmMigrate } from '@pgpmjs/core'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Inquirerer, Question } from 'inquirerer'; +import { CLIOptions, Genomic, Question } from 'genomic'; import { ParsedArgs } from 'minimist'; import { getPgEnvOptions } from 'pg-env'; @@ -10,7 +10,7 @@ const log = new Logger('migrate-init'); export default async ( argv: Partial, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { const pgEnv = getPgEnvOptions(); diff --git a/pgpm/cli/src/commands/migrate/list.ts b/pgpm/cli/src/commands/migrate/list.ts index 464d11f55..37c8ceff6 100644 --- a/pgpm/cli/src/commands/migrate/list.ts +++ b/pgpm/cli/src/commands/migrate/list.ts @@ -2,7 +2,7 @@ import { PgpmMigrate } from '@pgpmjs/core'; import { parsePlanFile } from '@pgpmjs/core'; import { Logger } from '@pgpmjs/logger'; import { existsSync } from 'fs'; -import { CLIOptions, Inquirerer } from 'inquirerer'; +import { CLIOptions, Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import { join } from 'path'; import { getPgEnvOptions } from 'pg-env'; @@ -11,7 +11,7 @@ import { getTargetDatabase } from '../../utils/database'; const log = new Logger('migrate-list'); -export default async (argv: Partial, prompter: Inquirerer, options: CLIOptions) => { +export default async (argv: Partial, prompter: Genomic, options: CLIOptions) => { const cwd = argv.cwd || process.cwd(); const planPath = join(cwd, 'pgpm.plan'); diff --git a/pgpm/cli/src/commands/migrate/status.ts b/pgpm/cli/src/commands/migrate/status.ts index 781b6e9eb..9acced084 100644 --- a/pgpm/cli/src/commands/migrate/status.ts +++ b/pgpm/cli/src/commands/migrate/status.ts @@ -2,7 +2,7 @@ import { PgpmMigrate } from '@pgpmjs/core'; import { parsePlanFile } from '@pgpmjs/core'; import { Logger } from '@pgpmjs/logger'; import { existsSync } from 'fs'; -import { CLIOptions, Inquirerer } from 'inquirerer'; +import { CLIOptions, Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import { join } from 'path'; import { getPgEnvOptions } from 'pg-env'; @@ -10,7 +10,7 @@ import { getPgEnvOptions } from 'pg-env'; import { getTargetDatabase } from '../../utils/database'; const log = new Logger('migrate-status'); -export default async (argv: Partial, prompter: Inquirerer, options: CLIOptions) => { +export default async (argv: Partial, prompter: Genomic, options: CLIOptions) => { const cwd = argv.cwd || process.cwd(); const planPath = join(cwd, 'pgpm.plan'); diff --git a/pgpm/cli/src/commands/package.ts b/pgpm/cli/src/commands/package.ts index 0b4272cf6..38411d9a3 100644 --- a/pgpm/cli/src/commands/package.ts +++ b/pgpm/cli/src/commands/package.ts @@ -1,5 +1,5 @@ import { PgpmPackage, writePackage } from '@pgpmjs/core'; -import { CLIOptions, Inquirerer, Question } from 'inquirerer'; +import { CLIOptions, Genomic, Question } from 'genomic'; const packageUsageText = ` Package Command: @@ -22,7 +22,7 @@ Examples: export default async ( argv: Partial>, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/plan.ts b/pgpm/cli/src/commands/plan.ts index 24bdfb452..7f1d0180d 100644 --- a/pgpm/cli/src/commands/plan.ts +++ b/pgpm/cli/src/commands/plan.ts @@ -1,6 +1,6 @@ import { PgpmPackage } from '@pgpmjs/core'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Inquirerer, Question } from 'inquirerer'; +import { CLIOptions, Genomic, Question } from 'genomic'; const log = new Logger('plan'); @@ -25,7 +25,7 @@ Examples: export default async ( argv: Partial>, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/remove.ts b/pgpm/cli/src/commands/remove.ts index ce60fc61b..4687c6e1c 100644 --- a/pgpm/cli/src/commands/remove.ts +++ b/pgpm/cli/src/commands/remove.ts @@ -1,7 +1,7 @@ import { PgpmPackage } from '@pgpmjs/core'; import { getEnvOptions } from '@pgpmjs/env'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Inquirerer, Question } from 'inquirerer'; +import { CLIOptions, Genomic, Question } from 'genomic'; import { getPgEnvOptions } from 'pg-env'; import { getTargetDatabase } from '../utils'; @@ -11,7 +11,7 @@ const log = new Logger('remove'); export default async ( argv: Partial>, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { diff --git a/pgpm/cli/src/commands/rename.ts b/pgpm/cli/src/commands/rename.ts index 45bb2b1e6..dcf7ef815 100644 --- a/pgpm/cli/src/commands/rename.ts +++ b/pgpm/cli/src/commands/rename.ts @@ -1,11 +1,11 @@ import { PgpmPackage } from '@pgpmjs/core'; -import { Inquirerer } from 'inquirerer'; +import { Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import path from 'path'; import { cliExitWithError } from '../utils/cli-error'; -export default async (argv: Partial, _prompter: Inquirerer) => { +export default async (argv: Partial, _prompter: Genomic) => { const cwd = (argv.cwd as string) || process.cwd(); const to = (argv.to as string) || (argv._ && argv._[0] as string); if (!to) { diff --git a/pgpm/cli/src/commands/revert.ts b/pgpm/cli/src/commands/revert.ts index 9c7d3e302..3304885ba 100644 --- a/pgpm/cli/src/commands/revert.ts +++ b/pgpm/cli/src/commands/revert.ts @@ -1,7 +1,7 @@ import { PgpmPackage } from '@pgpmjs/core'; import { getEnvOptions } from '@pgpmjs/env'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Inquirerer, Question } from 'inquirerer'; +import { CLIOptions, Genomic, Question } from 'genomic'; import { getPgEnvOptions } from 'pg-env'; import { getTargetDatabase, resolvePackageAlias } from '../utils'; @@ -35,7 +35,7 @@ Examples: export default async ( argv: Partial>, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/tag.ts b/pgpm/cli/src/commands/tag.ts index 61cfa1f8c..589aa5081 100644 --- a/pgpm/cli/src/commands/tag.ts +++ b/pgpm/cli/src/commands/tag.ts @@ -1,7 +1,7 @@ import { PgpmPackage } from '@pgpmjs/core'; import { Logger } from '@pgpmjs/logger'; import { errors } from '@pgpmjs/types'; -import { CLIOptions, Inquirerer, Question } from 'inquirerer'; +import { CLIOptions, Genomic, Question } from 'genomic'; import * as path from 'path'; import { extractFirst } from '../utils/argv'; @@ -35,7 +35,7 @@ Examples: export default async ( argv: Partial>, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/test-packages.ts b/pgpm/cli/src/commands/test-packages.ts index b60b04ed5..2fa031ebf 100644 --- a/pgpm/cli/src/commands/test-packages.ts +++ b/pgpm/cli/src/commands/test-packages.ts @@ -2,7 +2,7 @@ import { PgpmPackage } from '@pgpmjs/core'; import { getEnvOptions } from '@pgpmjs/env'; import { Logger } from '@pgpmjs/logger'; import path from 'path'; -import { CLIOptions, Inquirerer } from 'inquirerer'; +import { CLIOptions, Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import { getPgEnvOptions } from 'pg-env'; import { getPgPool } from 'pg-cache'; @@ -225,7 +225,7 @@ async function testModule( export default async ( argv: Partial, - _prompter: Inquirerer, + _prompter: Genomic, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/update.ts b/pgpm/cli/src/commands/update.ts index 258aafde7..188d3c041 100644 --- a/pgpm/cli/src/commands/update.ts +++ b/pgpm/cli/src/commands/update.ts @@ -1,6 +1,6 @@ import { findAndRequirePackageJson } from 'find-and-require-package-json'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Inquirerer } from 'inquirerer'; +import { CLIOptions, Genomic } from 'genomic'; import { spawn } from 'child_process'; import { fetchLatestVersion } from '../utils/npm-version'; import { cliExitWithError } from '../utils/cli-error'; @@ -43,7 +43,7 @@ const runNpmInstall = (pkgName: string, registry?: string): Promise => { export default async ( argv: Partial>, - _prompter: Inquirerer, + _prompter: Genomic, _options: CLIOptions ) => { if (argv.help || argv.h) { diff --git a/pgpm/cli/src/commands/upgrade-modules.ts b/pgpm/cli/src/commands/upgrade-modules.ts index 17debcfd4..2687d8d78 100644 --- a/pgpm/cli/src/commands/upgrade-modules.ts +++ b/pgpm/cli/src/commands/upgrade-modules.ts @@ -1,6 +1,6 @@ import { PgpmPackage } from '@pgpmjs/core'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Inquirerer, OptionValue, Question } from 'inquirerer'; +import { CLIOptions, Genomic, OptionValue, Question } from 'genomic'; import { ParsedArgs } from 'minimist'; import { fetchLatestVersion } from '../utils/npm-version'; @@ -60,7 +60,7 @@ async function fetchModuleVersions( async function upgradeModulesForProject( project: PgpmPackage, argv: Partial, - prompter: Inquirerer, + prompter: Genomic, dryRun: boolean, upgradeAll: boolean, specificModules: string[] | undefined, @@ -154,7 +154,7 @@ async function upgradeModulesForProject( export default async ( argv: Partial, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { if (argv.help || argv.h) { diff --git a/pgpm/cli/src/commands/verify.ts b/pgpm/cli/src/commands/verify.ts index 767a83351..4bf57ad84 100644 --- a/pgpm/cli/src/commands/verify.ts +++ b/pgpm/cli/src/commands/verify.ts @@ -1,7 +1,7 @@ import { PgpmPackage } from '@pgpmjs/core'; import { getEnvOptions } from '@pgpmjs/env'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Inquirerer, Question } from 'inquirerer'; +import { CLIOptions, Genomic, Question } from 'genomic'; import { getPgEnvOptions } from 'pg-env'; import { getTargetDatabase, resolvePackageAlias } from '../utils'; @@ -33,7 +33,7 @@ Examples: export default async ( argv: Partial>, - prompter: Inquirerer, + prompter: Genomic, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/index.ts b/pgpm/cli/src/index.ts index 1dc50fb83..cd89b8fd1 100644 --- a/pgpm/cli/src/index.ts +++ b/pgpm/cli/src/index.ts @@ -1,6 +1,6 @@ #!/usr/bin/env node import { findAndRequirePackageJson } from 'find-and-require-package-json'; -import { CLI, CLIOptions } from 'inquirerer'; +import { CLI, CLIOptions } from 'genomic'; import { commands, createPgpmCommandMap } from './commands'; export { createInitUsageText } from './commands/init'; diff --git a/pgpm/cli/src/utils/database.ts b/pgpm/cli/src/utils/database.ts index c5b45cd15..9d6286137 100644 --- a/pgpm/cli/src/utils/database.ts +++ b/pgpm/cli/src/utils/database.ts @@ -1,4 +1,4 @@ -import { Inquirerer } from 'inquirerer'; +import { Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import { getPgPool } from 'pg-cache'; import { getPgEnvOptions } from 'pg-env'; @@ -53,7 +53,7 @@ export async function getAvailableDatabases(options: DatabaseSelectionOptions = */ export async function selectDatabase( argv: Partial, - prompter: Inquirerer, + prompter: Genomic, options: DatabaseSelectionOptions = {} ): Promise { const { @@ -97,7 +97,7 @@ export async function selectDatabase( */ export async function getTargetDatabase( argv: Partial, - prompter: Inquirerer, + prompter: Genomic, options: DatabaseSelectionOptions = {} ): Promise { // If database is specified in args, use it diff --git a/pgpm/cli/src/utils/deployed-changes.ts b/pgpm/cli/src/utils/deployed-changes.ts index 72974c83a..3d43c49c6 100644 --- a/pgpm/cli/src/utils/deployed-changes.ts +++ b/pgpm/cli/src/utils/deployed-changes.ts @@ -1,6 +1,6 @@ import { PgpmMigrate } from '@pgpmjs/core'; import { Logger } from '@pgpmjs/logger'; -import { Inquirerer } from 'inquirerer'; +import { Genomic } from 'genomic'; import { getPgEnvOptions } from 'pg-env'; import { resolvePackageAlias } from './package-alias'; @@ -8,7 +8,7 @@ import { resolvePackageAlias } from './package-alias'; export async function selectDeployedChange( database: string, argv: Partial>, - prompter: Inquirerer, + prompter: Genomic, log: Logger, action: 'revert' | 'verify' = 'revert', cwd: string = process.cwd() @@ -67,7 +67,7 @@ export async function selectDeployedChange( export async function selectDeployedPackage( database: string, argv: Partial>, - prompter: Inquirerer, + prompter: Genomic, log: Logger, action: 'revert' | 'verify' = 'revert', cwd: string = process.cwd() diff --git a/pgpm/cli/src/utils/module-utils.ts b/pgpm/cli/src/utils/module-utils.ts index e6eba11d3..efd075db6 100644 --- a/pgpm/cli/src/utils/module-utils.ts +++ b/pgpm/cli/src/utils/module-utils.ts @@ -1,7 +1,7 @@ import { PgpmPackage } from '@pgpmjs/core'; import { Logger } from '@pgpmjs/logger'; import { errors } from '@pgpmjs/types'; -import { Inquirerer } from 'inquirerer'; +import { Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import { resolvePackageAlias } from './package-alias'; @@ -12,7 +12,7 @@ import { resolvePackageAlias } from './package-alias'; */ export async function selectPackage( argv: Partial, - prompter: Inquirerer, + prompter: Genomic, cwd: string, operationName: string, log?: Logger diff --git a/pgpm/cli/test-utils/CLIDeployTestFixture.ts b/pgpm/cli/test-utils/CLIDeployTestFixture.ts index ead2f80a6..dc35fd43d 100644 --- a/pgpm/cli/test-utils/CLIDeployTestFixture.ts +++ b/pgpm/cli/test-utils/CLIDeployTestFixture.ts @@ -1,5 +1,5 @@ import { PgpmMigrate } from '@pgpmjs/core'; -import { CLIOptions,Inquirerer } from 'inquirerer'; +import { CLIOptions,Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import { Pool } from 'pg'; import { getPgPool } from 'pg-cache'; @@ -240,7 +240,7 @@ export class CLIDeployTestFixture extends TestFixture { } private async runPgpmCommand(argv: ParsedArgs): Promise { - const prompter = new Inquirerer({ + const prompter = new Genomic({ input: process.stdin, output: process.stdout, noTty: true diff --git a/pgpm/cli/test-utils/cli.ts b/pgpm/cli/test-utils/cli.ts index c05d8d82d..787aee759 100644 --- a/pgpm/cli/test-utils/cli.ts +++ b/pgpm/cli/test-utils/cli.ts @@ -1,4 +1,4 @@ -import { CLIOptions } from 'inquirerer'; +import { CLIOptions } from 'genomic'; import readline from 'readline'; import { Readable, Transform, Writable } from 'stream'; import { cleanAnsi } from 'clean-ansi'; diff --git a/pgpm/cli/test-utils/fixtures.ts b/pgpm/cli/test-utils/fixtures.ts index e23a1fab1..b1f2b1def 100644 --- a/pgpm/cli/test-utils/fixtures.ts +++ b/pgpm/cli/test-utils/fixtures.ts @@ -1,5 +1,5 @@ import fs from 'fs'; -import { Inquirerer } from 'inquirerer'; +import { Genomic } from 'genomic'; import { ParsedArgs } from 'minimist'; import os from 'os'; import path from 'path'; @@ -59,7 +59,7 @@ export class TestFixture { // flows so tests are stable and do not rely on local machine config. argv = withInitDefaults(argv, DEFAULT_TEMPLATE_REPO); - const prompter = new Inquirerer({ + const prompter = new Genomic({ input: mockInput, output: mockOutput, noTty: true diff --git a/pgpm/core/package.json b/pgpm/core/package.json index a1a7e4857..941c79b39 100644 --- a/pgpm/core/package.json +++ b/pgpm/core/package.json @@ -44,7 +44,7 @@ "@pgsql/types": "^17.6.2", "@types/pg": "^8.16.0", "copyfiles": "^2.4.1", - "inquirerer": "^2.4.0", + "genomic": "^3.0.0", "makage": "^0.1.9" }, "dependencies": { @@ -52,7 +52,7 @@ "@pgpmjs/logger": "workspace:^", "@pgpmjs/server-utils": "workspace:^", "@pgpmjs/types": "workspace:^", - "create-gen-app": "^0.10.0", + "@genomic/scaffolds": "^1.0.0", "csv-to-pg": "workspace:^", "glob": "^13.0.0", "komoji": "^0.7.11", diff --git a/pgpm/core/src/core/template-scaffold.ts b/pgpm/core/src/core/template-scaffold.ts index bd1531636..5401f7891 100644 --- a/pgpm/core/src/core/template-scaffold.ts +++ b/pgpm/core/src/core/template-scaffold.ts @@ -1,7 +1,7 @@ import os from 'os'; import path from 'path'; -import { TemplateScaffolder, BoilerplateConfig } from 'create-gen-app'; -import type { Inquirerer, Question } from 'inquirerer'; +import { TemplateScaffolder, BoilerplateConfig } from '@genomic/scaffolds'; +import type { Genomic, Question } from 'genomic'; export interface InspectTemplateOptions { /** @@ -56,11 +56,11 @@ export interface ScaffoldTemplateOptions { */ dir?: string; /** - * Optional Inquirerer instance to reuse for prompting. + * Optional Genomic instance to reuse for prompting. * If provided, the caller retains ownership and is responsible for closing it. * If not provided, a new instance will be created and closed automatically. */ - prompter?: Inquirerer; + prompter?: Genomic; } export interface ScaffoldTemplateResult { From 67225d4d3d8a78951edfe5e9ca27ed9ed3faffd7 Mon Sep 17 00:00:00 2001 From: Dan Lynch Date: Fri, 26 Dec 2025 23:20:08 +0000 Subject: [PATCH 2/3] refactor: rename Genomic class to Prompter - Update all imports to use Prompter instead of Genomic - Update all imports to use PrompterOptions instead of GenomicOptions This matches the upstream change in dev-utils --- packages/cli/__tests__/cli.test.ts | 6 +++--- packages/cli/src/commands.ts | 4 ++-- packages/cli/src/commands/codegen.ts | 4 ++-- packages/cli/src/commands/explorer.ts | 4 ++-- .../cli/src/commands/get-graphql-schema.ts | 4 ++-- packages/cli/src/commands/server.ts | 4 ++-- packages/cli/test-utils/fixtures.ts | 4 ++-- pgpm/cli/__tests__/add.test.ts | 6 +++--- pgpm/cli/__tests__/extensions.test.ts | 4 ++-- pgpm/cli/__tests__/init.test.ts | 20 +++++++++---------- pgpm/cli/__tests__/package.test.ts | 4 ++-- pgpm/cli/src/commands.ts | 4 ++-- pgpm/cli/src/commands/add.ts | 4 ++-- pgpm/cli/src/commands/admin-users.ts | 4 ++-- pgpm/cli/src/commands/admin-users/add.ts | 4 ++-- .../cli/src/commands/admin-users/bootstrap.ts | 4 ++-- pgpm/cli/src/commands/admin-users/remove.ts | 4 ++-- pgpm/cli/src/commands/analyze.ts | 4 ++-- pgpm/cli/src/commands/cache.ts | 4 ++-- pgpm/cli/src/commands/clear.ts | 4 ++-- pgpm/cli/src/commands/deploy.ts | 4 ++-- pgpm/cli/src/commands/docker.ts | 4 ++-- pgpm/cli/src/commands/env.ts | 4 ++-- pgpm/cli/src/commands/export.ts | 4 ++-- pgpm/cli/src/commands/extension.ts | 4 ++-- pgpm/cli/src/commands/init/index.ts | 12 +++++------ pgpm/cli/src/commands/init/workspace.ts | 4 ++-- pgpm/cli/src/commands/install.ts | 4 ++-- pgpm/cli/src/commands/kill.ts | 4 ++-- pgpm/cli/src/commands/migrate.ts | 4 ++-- pgpm/cli/src/commands/migrate/deps.ts | 4 ++-- pgpm/cli/src/commands/migrate/init.ts | 4 ++-- pgpm/cli/src/commands/migrate/list.ts | 4 ++-- pgpm/cli/src/commands/migrate/status.ts | 4 ++-- pgpm/cli/src/commands/package.ts | 4 ++-- pgpm/cli/src/commands/plan.ts | 4 ++-- pgpm/cli/src/commands/remove.ts | 4 ++-- pgpm/cli/src/commands/rename.ts | 4 ++-- pgpm/cli/src/commands/revert.ts | 4 ++-- pgpm/cli/src/commands/tag.ts | 4 ++-- pgpm/cli/src/commands/test-packages.ts | 4 ++-- pgpm/cli/src/commands/update.ts | 4 ++-- pgpm/cli/src/commands/upgrade-modules.ts | 6 +++--- pgpm/cli/src/commands/verify.ts | 4 ++-- pgpm/cli/src/utils/database.ts | 6 +++--- pgpm/cli/src/utils/deployed-changes.ts | 6 +++--- pgpm/cli/src/utils/module-utils.ts | 4 ++-- pgpm/cli/test-utils/CLIDeployTestFixture.ts | 4 ++-- pgpm/cli/test-utils/fixtures.ts | 4 ++-- pgpm/core/src/core/template-scaffold.ts | 6 +++--- 50 files changed, 118 insertions(+), 118 deletions(-) diff --git a/packages/cli/__tests__/cli.test.ts b/packages/cli/__tests__/cli.test.ts index 754da145e..a64655764 100644 --- a/packages/cli/__tests__/cli.test.ts +++ b/packages/cli/__tests__/cli.test.ts @@ -1,10 +1,10 @@ -import { Genomic, Question } from 'genomic'; +import { Prompter, Question } from 'genomic'; import { KEY_SEQUENCES, setupTests, TestEnvironment } from '../test-utils'; const beforeEachSetup = setupTests(); -describe('Genomic', () => { +describe('Prompter', () => { let environment: TestEnvironment; beforeEach(() => { @@ -14,7 +14,7 @@ describe('Genomic', () => { it('prompts user and correctly processes delayed input', async () => { const { mockInput, mockOutput, writeResults, transformResults, enqueueInputResponse } = environment; - const prompter = new Genomic({ + const prompter = new Prompter({ input: mockInput, output: mockOutput, noTty: false diff --git a/packages/cli/src/commands.ts b/packages/cli/src/commands.ts index 5678d8a40..ec0feac66 100644 --- a/packages/cli/src/commands.ts +++ b/packages/cli/src/commands.ts @@ -1,5 +1,5 @@ import { findAndRequirePackageJson } from 'find-and-require-package-json'; -import { CLIOptions, Genomic } from 'genomic'; +import { CLIOptions, Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import codegen from './commands/codegen'; @@ -18,7 +18,7 @@ const createCommandMap = (): Record => { }; }; -export const commands = async (argv: Partial, prompter: Genomic, options: CLIOptions & { skipPgTeardown?: boolean }) => { +export const commands = async (argv: Partial, prompter: Prompter, options: CLIOptions & { skipPgTeardown?: boolean }) => { let { first: command, newArgv } = extractFirst(argv); // Run update check early so it shows on help/version paths too diff --git a/packages/cli/src/commands/codegen.ts b/packages/cli/src/commands/codegen.ts index cbf783ea9..7562dc8c4 100644 --- a/packages/cli/src/commands/codegen.ts +++ b/packages/cli/src/commands/codegen.ts @@ -1,4 +1,4 @@ -import { CLIOptions, Genomic } from 'genomic' +import { CLIOptions, Prompter } from 'genomic' import { ParsedArgs } from 'minimist' import { promises as fs } from 'fs' import { join } from 'path' @@ -48,7 +48,7 @@ async function loadConfig(path: string): Promise> export default async ( argv: Partial, - _prompter: Genomic, + _prompter: Prompter, _options: CLIOptions ) => { if (argv.help || argv.h) { diff --git a/packages/cli/src/commands/explorer.ts b/packages/cli/src/commands/explorer.ts index 308499b16..1bbd23dc0 100644 --- a/packages/cli/src/commands/explorer.ts +++ b/packages/cli/src/commands/explorer.ts @@ -2,7 +2,7 @@ import { getEnvOptions } from '@constructive-io/graphql-env'; import { GraphQLExplorer as explorer } from '@constructive-io/graphql-explorer'; import { Logger } from '@pgpmjs/logger'; import { PgpmOptions } from '@pgpmjs/types'; -import { CLIOptions, Genomic, Question } from 'genomic'; +import { CLIOptions, Prompter, Question } from 'genomic'; const log = new Logger('explorer'); @@ -72,7 +72,7 @@ const questions: Question[] = [ export default async ( argv: Partial>, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/packages/cli/src/commands/get-graphql-schema.ts b/packages/cli/src/commands/get-graphql-schema.ts index 1aea39cb0..91b8bf783 100644 --- a/packages/cli/src/commands/get-graphql-schema.ts +++ b/packages/cli/src/commands/get-graphql-schema.ts @@ -1,4 +1,4 @@ -import { CLIOptions, Genomic } from 'genomic' +import { CLIOptions, Prompter } from 'genomic' import { ParsedArgs } from 'minimist' import { promises as fs } from 'fs' import { buildSchemaSDL, fetchEndpointSchemaSDL } from '@constructive-io/graphql-server' @@ -26,7 +26,7 @@ const defaultSchemas = [ export default async ( argv: Partial, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { if (argv.help || argv.h) { diff --git a/packages/cli/src/commands/server.ts b/packages/cli/src/commands/server.ts index b412b5fbd..f7165b107 100644 --- a/packages/cli/src/commands/server.ts +++ b/packages/cli/src/commands/server.ts @@ -2,7 +2,7 @@ import { getEnvOptions } from '@constructive-io/graphql-env'; import { Logger } from '@pgpmjs/logger'; import { GraphQLServer as server } from '@constructive-io/graphql-server'; import { PgpmOptions } from '@pgpmjs/types'; -import { CLIOptions, Genomic, OptionValue,Question } from 'genomic'; +import { CLIOptions, Prompter, OptionValue,Question } from 'genomic'; import { getPgPool } from 'pg-cache'; const log = new Logger('server'); @@ -83,7 +83,7 @@ const questions: Question[] = [ export default async ( argv: Partial>, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/packages/cli/test-utils/fixtures.ts b/packages/cli/test-utils/fixtures.ts index 0783740f5..7b1840b3a 100644 --- a/packages/cli/test-utils/fixtures.ts +++ b/packages/cli/test-utils/fixtures.ts @@ -1,5 +1,5 @@ import fs from 'fs'; -import { Genomic } from 'genomic'; +import { Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import os from 'os'; import path from 'path'; @@ -53,7 +53,7 @@ export class TestFixture { transformResults } = this.environment; - const prompter = new Genomic({ + const prompter = new Prompter({ input: mockInput, output: mockOutput, noTty: true diff --git a/pgpm/cli/__tests__/add.test.ts b/pgpm/cli/__tests__/add.test.ts index 8a42baeeb..888741164 100644 --- a/pgpm/cli/__tests__/add.test.ts +++ b/pgpm/cli/__tests__/add.test.ts @@ -1,6 +1,6 @@ import * as fs from 'fs'; import { sync as glob } from 'glob'; -import { Genomic } from 'genomic'; +import { Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import * as path from 'path'; @@ -28,7 +28,7 @@ describe('cmds:add', () => { const runAddTest = async (argv: ParsedArgs, label: string) => { const { mockInput, mockOutput, writeResults, transformResults } = environment; - const prompter = new Genomic({ + const prompter = new Prompter({ input: mockInput, output: mockOutput, noTty: true @@ -198,7 +198,7 @@ superuser = false await setupModule(moduleDir); const { mockInput, mockOutput } = environment; - const prompter = new Genomic({ + const prompter = new Prompter({ input: mockInput, output: mockOutput, noTty: true diff --git a/pgpm/cli/__tests__/extensions.test.ts b/pgpm/cli/__tests__/extensions.test.ts index 058ccb98c..7882fe44d 100644 --- a/pgpm/cli/__tests__/extensions.test.ts +++ b/pgpm/cli/__tests__/extensions.test.ts @@ -3,7 +3,7 @@ process.env.PGPM_SKIP_UPDATE_CHECK = 'true'; import { PgpmPackage } from '@pgpmjs/core'; import { sync as glob } from 'glob'; -import { Genomic } from 'genomic'; +import { Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import * as path from 'path'; @@ -31,7 +31,7 @@ describe('cmds:extension', () => { }); const runCommand = async (argv: ParsedArgs) => { - const prompter = new Genomic({ + const prompter = new Prompter({ input: environment.mockInput, output: environment.mockOutput, noTty: true diff --git a/pgpm/cli/__tests__/init.test.ts b/pgpm/cli/__tests__/init.test.ts index 1de80b4bb..6650779ca 100644 --- a/pgpm/cli/__tests__/init.test.ts +++ b/pgpm/cli/__tests__/init.test.ts @@ -4,7 +4,7 @@ process.env.PGPM_SKIP_UPDATE_CHECK = 'true'; import { PgpmPackage } from '@pgpmjs/core'; import { existsSync } from 'fs'; import { sync as glob } from 'glob'; -import { Genomic } from 'genomic'; +import { Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import * as path from 'path'; @@ -37,7 +37,7 @@ describe('cmds:init', () => { const runInitTest = async (argv: ParsedArgs, label: string) => { const { mockInput, mockOutput, writeResults, transformResults } = environment; - const prompter = new Genomic({ + const prompter = new Prompter({ input: mockInput, output: mockOutput, noTty: true @@ -112,7 +112,7 @@ describe('cmds:init', () => { describe('with custom templates', () => { it('initializes workspace with --template-path', async () => { const { mockInput, mockOutput } = environment; - const prompter = new Genomic({ + const prompter = new Prompter({ input: mockInput, output: mockOutput, noTty: true @@ -144,7 +144,7 @@ describe('cmds:init', () => { // First create a workspace const workspaceDir = path.join(fixture.tempDir, 'test-workspace-for-module'); const { mockInput, mockOutput } = environment; - const prompter = new Genomic({ + const prompter = new Prompter({ input: mockInput, output: mockOutput, noTty: true @@ -193,7 +193,7 @@ describe('cmds:init', () => { 'initializes workspace with --repo', async () => { const { mockInput, mockOutput } = environment; - const prompter = new Genomic({ + const prompter = new Prompter({ input: mockInput, output: mockOutput, noTty: true @@ -225,7 +225,7 @@ describe('cmds:init', () => { 'initializes workspace with --repo and --from-branch', async () => { const { mockInput, mockOutput } = environment; - const prompter = new Genomic({ + const prompter = new Prompter({ input: mockInput, output: mockOutput, noTty: true @@ -258,7 +258,7 @@ describe('cmds:init', () => { describe('init from packages/ folder', () => { it('initializes module from packages/ folder (empty workspace)', async () => { const { mockInput, mockOutput } = environment; - const prompter = new Genomic({ + const prompter = new Prompter({ input: mockInput, output: mockOutput, noTty: true @@ -305,7 +305,7 @@ describe('cmds:init', () => { it('initializes module from packages/ folder (with existing modules)', async () => { const { mockInput, mockOutput } = environment; - const prompter = new Genomic({ + const prompter = new Prompter({ input: mockInput, output: mockOutput, noTty: true @@ -369,7 +369,7 @@ describe('cmds:init', () => { describe('prevent nested module creation', () => { it('prevents nested module creation inside existing module', async () => { const { mockInput, mockOutput } = environment; - const prompter = new Genomic({ + const prompter = new Prompter({ input: mockInput, output: mockOutput, noTty: true @@ -444,7 +444,7 @@ describe('cmds:init', () => { describe('workspace root behavior', () => { it('initializes module from workspace root (existing behavior)', async () => { const { mockInput, mockOutput } = environment; - const prompter = new Genomic({ + const prompter = new Prompter({ input: mockInput, output: mockOutput, noTty: true diff --git a/pgpm/cli/__tests__/package.test.ts b/pgpm/cli/__tests__/package.test.ts index c8a31a27f..11e019fe7 100644 --- a/pgpm/cli/__tests__/package.test.ts +++ b/pgpm/cli/__tests__/package.test.ts @@ -1,7 +1,7 @@ import { PgpmPackage } from '@pgpmjs/core'; import * as fs from 'fs'; import { sync as glob } from 'glob'; -import { Genomic } from 'genomic'; +import { Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import * as os from 'os'; import * as path from 'path'; @@ -31,7 +31,7 @@ describe('cmds:package', () => { }); const runCommand = async (argv: ParsedArgs) => { - const prompter = new Genomic({ + const prompter = new Prompter({ input: environment.mockInput, output: environment.mockOutput, noTty: true diff --git a/pgpm/cli/src/commands.ts b/pgpm/cli/src/commands.ts index 5ef5df76e..4b3397399 100644 --- a/pgpm/cli/src/commands.ts +++ b/pgpm/cli/src/commands.ts @@ -1,5 +1,5 @@ import { findAndRequirePackageJson } from 'find-and-require-package-json'; -import { CLIOptions, Genomic } from 'genomic'; +import { CLIOptions, Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import { teardownPgPools } from 'pg-cache'; @@ -71,7 +71,7 @@ export const createPgpmCommandMap = (skipPgTeardown: boolean = false): Record, prompter: Genomic, options: CLIOptions & { skipPgTeardown?: boolean }) => { +export const commands = async (argv: Partial, prompter: Prompter, options: CLIOptions & { skipPgTeardown?: boolean }) => { if (argv.version || argv.v) { const pkg = findAndRequirePackageJson(__dirname); console.log(pkg.version); diff --git a/pgpm/cli/src/commands/add.ts b/pgpm/cli/src/commands/add.ts index 9f3bd1932..6cc5e3556 100644 --- a/pgpm/cli/src/commands/add.ts +++ b/pgpm/cli/src/commands/add.ts @@ -1,5 +1,5 @@ import { PgpmPackage } from '@pgpmjs/core'; -import { CLIOptions, Genomic } from 'genomic'; +import { CLIOptions, Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import * as path from 'path'; @@ -30,7 +30,7 @@ Examples: export default async ( argv: Partial, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/admin-users.ts b/pgpm/cli/src/commands/admin-users.ts index ffb7701d6..744d49b92 100644 --- a/pgpm/cli/src/commands/admin-users.ts +++ b/pgpm/cli/src/commands/admin-users.ts @@ -1,4 +1,4 @@ -import { CLIOptions, Genomic } from 'genomic'; +import { CLIOptions, Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import { extractFirst } from '../utils'; @@ -24,7 +24,7 @@ Options: --cwd Working directory (default: current directory) `; -export default async (argv: Partial, prompter: Genomic, options: CLIOptions) => { +export default async (argv: Partial, prompter: Prompter, options: CLIOptions) => { let { first: subcommand, newArgv } = extractFirst(argv); // Prompt if no subcommand provided diff --git a/pgpm/cli/src/commands/admin-users/add.ts b/pgpm/cli/src/commands/admin-users/add.ts index ea8a03f83..1b784a1a3 100644 --- a/pgpm/cli/src/commands/admin-users/add.ts +++ b/pgpm/cli/src/commands/admin-users/add.ts @@ -1,7 +1,7 @@ import { PgpmInit } from '@pgpmjs/core'; import { getConnEnvOptions } from '@pgpmjs/env'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Genomic, Question } from 'genomic'; +import { CLIOptions, Prompter, Question } from 'genomic'; import { ParsedArgs } from 'minimist'; import { getPgEnvOptions } from 'pg-env'; @@ -30,7 +30,7 @@ Examples: export default async ( argv: Partial, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/admin-users/bootstrap.ts b/pgpm/cli/src/commands/admin-users/bootstrap.ts index 965338274..187e3ad08 100644 --- a/pgpm/cli/src/commands/admin-users/bootstrap.ts +++ b/pgpm/cli/src/commands/admin-users/bootstrap.ts @@ -1,7 +1,7 @@ import { PgpmInit } from '@pgpmjs/core'; import { getConnEnvOptions } from '@pgpmjs/env'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Genomic } from 'genomic'; +import { CLIOptions, Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import { getPgEnvOptions } from 'pg-env'; @@ -25,7 +25,7 @@ Examples: export default async ( argv: Partial, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/admin-users/remove.ts b/pgpm/cli/src/commands/admin-users/remove.ts index 6d471287a..7b8518554 100644 --- a/pgpm/cli/src/commands/admin-users/remove.ts +++ b/pgpm/cli/src/commands/admin-users/remove.ts @@ -1,7 +1,7 @@ import { PgpmInit } from '@pgpmjs/core'; import { getConnEnvOptions } from '@pgpmjs/env'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Genomic, Question } from 'genomic'; +import { CLIOptions, Prompter, Question } from 'genomic'; import { ParsedArgs } from 'minimist'; import { getPgEnvOptions } from 'pg-env'; @@ -28,7 +28,7 @@ Examples: export default async ( argv: Partial, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/analyze.ts b/pgpm/cli/src/commands/analyze.ts index 710e2bfd8..fbc738252 100644 --- a/pgpm/cli/src/commands/analyze.ts +++ b/pgpm/cli/src/commands/analyze.ts @@ -1,9 +1,9 @@ import { PgpmPackage } from '@pgpmjs/core'; -import { Genomic } from 'genomic'; +import { Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import path from 'path'; -export default async (argv: Partial, _prompter: Genomic) => { +export default async (argv: Partial, _prompter: Prompter) => { const cwd = (argv.cwd as string) || process.cwd(); const proj = new PgpmPackage(path.resolve(cwd)); const result = proj.analyzeModule(); diff --git a/pgpm/cli/src/commands/cache.ts b/pgpm/cli/src/commands/cache.ts index bd6f365b4..34cde15a3 100644 --- a/pgpm/cli/src/commands/cache.ts +++ b/pgpm/cli/src/commands/cache.ts @@ -1,4 +1,4 @@ -import { CLIOptions, Genomic } from 'genomic'; +import { CLIOptions, Prompter } from 'genomic'; import { CacheManager } from '@genomic/scaffolds'; import { cliExitWithError } from '../utils/cli-error'; @@ -14,7 +14,7 @@ Options: export default async ( argv: Partial>, - _prompter: Genomic, + _prompter: Prompter, _options: CLIOptions ) => { if (argv.help || argv.h) { diff --git a/pgpm/cli/src/commands/clear.ts b/pgpm/cli/src/commands/clear.ts index b53fc4591..e5f152738 100644 --- a/pgpm/cli/src/commands/clear.ts +++ b/pgpm/cli/src/commands/clear.ts @@ -3,7 +3,7 @@ import { parsePlanFile } from '@pgpmjs/core'; import { getEnvOptions } from '@pgpmjs/env'; import { Logger } from '@pgpmjs/logger'; import { errors } from '@pgpmjs/types'; -import { CLIOptions, Genomic, Question } from 'genomic'; +import { CLIOptions, Prompter, Question } from 'genomic'; import path from 'path'; import { getPgEnvOptions } from 'pg-env'; @@ -13,7 +13,7 @@ const log = new Logger('clear'); export default async ( argv: Partial>, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { diff --git a/pgpm/cli/src/commands/deploy.ts b/pgpm/cli/src/commands/deploy.ts index a32f91c7d..77a7ba5dc 100644 --- a/pgpm/cli/src/commands/deploy.ts +++ b/pgpm/cli/src/commands/deploy.ts @@ -2,7 +2,7 @@ import { PgpmPackage } from '@pgpmjs/core'; import { getEnvOptions } from '@pgpmjs/env'; import { Logger } from '@pgpmjs/logger'; import { execSync } from 'child_process'; -import { CLIOptions, Genomic, Question } from 'genomic'; +import { CLIOptions, Prompter, Question } from 'genomic'; import { ParsedArgs } from 'minimist'; import { getPgEnvOptions, @@ -41,7 +41,7 @@ Examples: export default async ( argv: Partial, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/docker.ts b/pgpm/cli/src/commands/docker.ts index 999a223f0..048c3bcd1 100644 --- a/pgpm/cli/src/commands/docker.ts +++ b/pgpm/cli/src/commands/docker.ts @@ -1,5 +1,5 @@ import { spawn } from 'child_process'; -import { CLIOptions, Genomic } from 'genomic'; +import { CLIOptions, Prompter } from 'genomic'; import { cliExitWithError,extractFirst } from '../utils'; @@ -196,7 +196,7 @@ async function stopContainer(name: string): Promise { export default async ( argv: Partial>, - _prompter: Genomic, + _prompter: Prompter, _options: CLIOptions ) => { if (argv.help || argv.h) { diff --git a/pgpm/cli/src/commands/env.ts b/pgpm/cli/src/commands/env.ts index c895aa94a..24b329e45 100644 --- a/pgpm/cli/src/commands/env.ts +++ b/pgpm/cli/src/commands/env.ts @@ -1,5 +1,5 @@ import { spawn } from 'child_process'; -import { Genomic } from 'genomic'; +import { Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import { defaultPgConfig, PgConfig } from 'pg-env'; @@ -89,7 +89,7 @@ function executeCommand(config: PgConfig, command: string, args: string[]): Prom export default async ( argv: Partial, - _prompter: Genomic + _prompter: Prompter ) => { if (argv.help || argv.h) { console.log(envUsageText); diff --git a/pgpm/cli/src/commands/export.ts b/pgpm/cli/src/commands/export.ts index 795ae9fe1..3e3c9f843 100644 --- a/pgpm/cli/src/commands/export.ts +++ b/pgpm/cli/src/commands/export.ts @@ -1,7 +1,7 @@ import { exportMigrations,PgpmPackage } from '@pgpmjs/core'; import { getEnvOptions } from '@pgpmjs/env'; import { getGitConfigInfo } from '@pgpmjs/types'; -import { CLIOptions, Genomic, OptionValue } from 'genomic'; +import { CLIOptions, Prompter, OptionValue } from 'genomic'; import { resolve } from 'path'; import { getPgPool } from 'pg-cache'; @@ -25,7 +25,7 @@ Examples: export default async ( argv: Partial>, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/extension.ts b/pgpm/cli/src/commands/extension.ts index de091b3d1..041bb33fa 100644 --- a/pgpm/cli/src/commands/extension.ts +++ b/pgpm/cli/src/commands/extension.ts @@ -1,5 +1,5 @@ import { PgpmPackage } from '@pgpmjs/core'; -import { CLIOptions, Genomic, OptionValue, Question } from 'genomic'; +import { CLIOptions, Prompter, OptionValue, Question } from 'genomic'; import { ParsedArgs } from 'minimist'; const extensionUsageText = ` @@ -19,7 +19,7 @@ Examples: export default async ( argv: Partial, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/init/index.ts b/pgpm/cli/src/commands/init/index.ts index cbe296f4d..52aa3258e 100644 --- a/pgpm/cli/src/commands/init/index.ts +++ b/pgpm/cli/src/commands/init/index.ts @@ -12,7 +12,7 @@ import { sluggify, } from '@pgpmjs/core'; import { errors } from '@pgpmjs/types'; -import { CLIOptions, Genomic, OptionValue, Question, registerDefaultResolver } from 'genomic'; +import { CLIOptions, Prompter, OptionValue, Question, registerDefaultResolver } from 'genomic'; const DEFAULT_MOTD = ` | _ _ @@ -53,7 +53,7 @@ Examples: export default async ( argv: Partial>, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { // Show usage if explicitly requested @@ -65,7 +65,7 @@ export default async ( return handleInit(argv, prompter); }; -async function handleInit(argv: Partial>, prompter: Genomic) { +async function handleInit(argv: Partial>, prompter: Prompter) { const { cwd = process.cwd() } = argv; const templateRepo = (argv.repo as string) ?? DEFAULT_TEMPLATE_REPO; const branch = argv.fromBranch as string | undefined; @@ -139,7 +139,7 @@ interface BoilerplateInitContext { async function handleBoilerplateInit( argv: Partial>, - prompter: Genomic, + prompter: Prompter, ctx: BoilerplateInitContext ) { let fromPath: string; @@ -242,7 +242,7 @@ interface InitContext { async function handleWorkspaceInit( argv: Partial>, - prompter: Genomic, + prompter: Prompter, ctx: InitContext ) { const workspaceQuestions: Question[] = [ @@ -301,7 +301,7 @@ async function handleWorkspaceInit( async function handleModuleInit( argv: Partial>, - prompter: Genomic, + prompter: Prompter, ctx: InitContext, wasExplicitModuleRequest: boolean = false ) { diff --git a/pgpm/cli/src/commands/init/workspace.ts b/pgpm/cli/src/commands/init/workspace.ts index f3b60690f..85cc1b76e 100644 --- a/pgpm/cli/src/commands/init/workspace.ts +++ b/pgpm/cli/src/commands/init/workspace.ts @@ -2,7 +2,7 @@ import fs from 'fs'; import path from 'path'; import { DEFAULT_TEMPLATE_REPO, DEFAULT_TEMPLATE_TOOL_NAME, scaffoldTemplate, sluggify } from '@pgpmjs/core'; -import { Genomic, Question, registerDefaultResolver } from 'genomic'; +import { Prompter, Question, registerDefaultResolver } from 'genomic'; const DEFAULT_MOTD = ` | _ _ @@ -13,7 +13,7 @@ ooO--(_)--Ooo-ooO--(_)--Ooo-ooO--(_)--Ooo- export default async function runWorkspaceSetup( argv: Partial>, - prompter: Genomic + prompter: Prompter ) { const workspaceQuestions: Question[] = [ { diff --git a/pgpm/cli/src/commands/install.ts b/pgpm/cli/src/commands/install.ts index 72c93c62f..6ba09b74a 100644 --- a/pgpm/cli/src/commands/install.ts +++ b/pgpm/cli/src/commands/install.ts @@ -1,5 +1,5 @@ import { PgpmPackage } from '@pgpmjs/core'; -import { CLIOptions, Genomic } from 'genomic'; +import { CLIOptions, Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; const installUsageText = ` @@ -23,7 +23,7 @@ Examples: export default async ( argv: Partial, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/kill.ts b/pgpm/cli/src/commands/kill.ts index 0b393d08d..9658da5f5 100644 --- a/pgpm/cli/src/commands/kill.ts +++ b/pgpm/cli/src/commands/kill.ts @@ -1,5 +1,5 @@ import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Genomic, OptionValue } from 'genomic'; +import { CLIOptions, Prompter, OptionValue } from 'genomic'; import { getPgPool } from 'pg-cache'; const log = new Logger('db-kill'); @@ -27,7 +27,7 @@ Examples: export default async ( argv: Partial>, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/migrate.ts b/pgpm/cli/src/commands/migrate.ts index 16faac0ce..29d965b21 100644 --- a/pgpm/cli/src/commands/migrate.ts +++ b/pgpm/cli/src/commands/migrate.ts @@ -1,4 +1,4 @@ -import { CLIOptions, Genomic } from 'genomic'; +import { CLIOptions, Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import { extractFirst } from '../utils'; @@ -28,7 +28,7 @@ Options: --cwd Working directory (default: current directory) `; -export default async (argv: Partial, prompter: Genomic, options: CLIOptions) => { +export default async (argv: Partial, prompter: Prompter, options: CLIOptions) => { let { first: subcommand, newArgv } = extractFirst(argv); // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/migrate/deps.ts b/pgpm/cli/src/commands/migrate/deps.ts index 7d4361b91..e6f81dacc 100644 --- a/pgpm/cli/src/commands/migrate/deps.ts +++ b/pgpm/cli/src/commands/migrate/deps.ts @@ -2,7 +2,7 @@ import { PgpmMigrate } from '@pgpmjs/core'; import { parsePlanFile } from '@pgpmjs/core'; import { Logger } from '@pgpmjs/logger'; import { existsSync } from 'fs'; -import { CLIOptions, Genomic } from 'genomic'; +import { CLIOptions, Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import { join } from 'path'; import { getPgEnvOptions } from 'pg-env'; @@ -11,7 +11,7 @@ import { getTargetDatabase } from '../../utils/database'; const log = new Logger('migrate-deps'); -export default async (argv: Partial, prompter: Genomic, options: CLIOptions) => { +export default async (argv: Partial, prompter: Prompter, options: CLIOptions) => { const cwd = argv.cwd || process.cwd(); const planPath = join(cwd, 'pgpm.plan'); diff --git a/pgpm/cli/src/commands/migrate/init.ts b/pgpm/cli/src/commands/migrate/init.ts index ac1223518..1aa927d2a 100644 --- a/pgpm/cli/src/commands/migrate/init.ts +++ b/pgpm/cli/src/commands/migrate/init.ts @@ -1,6 +1,6 @@ import { PgpmMigrate } from '@pgpmjs/core'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Genomic, Question } from 'genomic'; +import { CLIOptions, Prompter, Question } from 'genomic'; import { ParsedArgs } from 'minimist'; import { getPgEnvOptions } from 'pg-env'; @@ -10,7 +10,7 @@ const log = new Logger('migrate-init'); export default async ( argv: Partial, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { const pgEnv = getPgEnvOptions(); diff --git a/pgpm/cli/src/commands/migrate/list.ts b/pgpm/cli/src/commands/migrate/list.ts index 37c8ceff6..8566d3ada 100644 --- a/pgpm/cli/src/commands/migrate/list.ts +++ b/pgpm/cli/src/commands/migrate/list.ts @@ -2,7 +2,7 @@ import { PgpmMigrate } from '@pgpmjs/core'; import { parsePlanFile } from '@pgpmjs/core'; import { Logger } from '@pgpmjs/logger'; import { existsSync } from 'fs'; -import { CLIOptions, Genomic } from 'genomic'; +import { CLIOptions, Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import { join } from 'path'; import { getPgEnvOptions } from 'pg-env'; @@ -11,7 +11,7 @@ import { getTargetDatabase } from '../../utils/database'; const log = new Logger('migrate-list'); -export default async (argv: Partial, prompter: Genomic, options: CLIOptions) => { +export default async (argv: Partial, prompter: Prompter, options: CLIOptions) => { const cwd = argv.cwd || process.cwd(); const planPath = join(cwd, 'pgpm.plan'); diff --git a/pgpm/cli/src/commands/migrate/status.ts b/pgpm/cli/src/commands/migrate/status.ts index 9acced084..a2618820b 100644 --- a/pgpm/cli/src/commands/migrate/status.ts +++ b/pgpm/cli/src/commands/migrate/status.ts @@ -2,7 +2,7 @@ import { PgpmMigrate } from '@pgpmjs/core'; import { parsePlanFile } from '@pgpmjs/core'; import { Logger } from '@pgpmjs/logger'; import { existsSync } from 'fs'; -import { CLIOptions, Genomic } from 'genomic'; +import { CLIOptions, Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import { join } from 'path'; import { getPgEnvOptions } from 'pg-env'; @@ -10,7 +10,7 @@ import { getPgEnvOptions } from 'pg-env'; import { getTargetDatabase } from '../../utils/database'; const log = new Logger('migrate-status'); -export default async (argv: Partial, prompter: Genomic, options: CLIOptions) => { +export default async (argv: Partial, prompter: Prompter, options: CLIOptions) => { const cwd = argv.cwd || process.cwd(); const planPath = join(cwd, 'pgpm.plan'); diff --git a/pgpm/cli/src/commands/package.ts b/pgpm/cli/src/commands/package.ts index 38411d9a3..3a21c0fdd 100644 --- a/pgpm/cli/src/commands/package.ts +++ b/pgpm/cli/src/commands/package.ts @@ -1,5 +1,5 @@ import { PgpmPackage, writePackage } from '@pgpmjs/core'; -import { CLIOptions, Genomic, Question } from 'genomic'; +import { CLIOptions, Prompter, Question } from 'genomic'; const packageUsageText = ` Package Command: @@ -22,7 +22,7 @@ Examples: export default async ( argv: Partial>, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/plan.ts b/pgpm/cli/src/commands/plan.ts index 7f1d0180d..a902fef7a 100644 --- a/pgpm/cli/src/commands/plan.ts +++ b/pgpm/cli/src/commands/plan.ts @@ -1,6 +1,6 @@ import { PgpmPackage } from '@pgpmjs/core'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Genomic, Question } from 'genomic'; +import { CLIOptions, Prompter, Question } from 'genomic'; const log = new Logger('plan'); @@ -25,7 +25,7 @@ Examples: export default async ( argv: Partial>, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/remove.ts b/pgpm/cli/src/commands/remove.ts index 4687c6e1c..9ac8d9eba 100644 --- a/pgpm/cli/src/commands/remove.ts +++ b/pgpm/cli/src/commands/remove.ts @@ -1,7 +1,7 @@ import { PgpmPackage } from '@pgpmjs/core'; import { getEnvOptions } from '@pgpmjs/env'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Genomic, Question } from 'genomic'; +import { CLIOptions, Prompter, Question } from 'genomic'; import { getPgEnvOptions } from 'pg-env'; import { getTargetDatabase } from '../utils'; @@ -11,7 +11,7 @@ const log = new Logger('remove'); export default async ( argv: Partial>, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { diff --git a/pgpm/cli/src/commands/rename.ts b/pgpm/cli/src/commands/rename.ts index dcf7ef815..ef4c0711f 100644 --- a/pgpm/cli/src/commands/rename.ts +++ b/pgpm/cli/src/commands/rename.ts @@ -1,11 +1,11 @@ import { PgpmPackage } from '@pgpmjs/core'; -import { Genomic } from 'genomic'; +import { Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import path from 'path'; import { cliExitWithError } from '../utils/cli-error'; -export default async (argv: Partial, _prompter: Genomic) => { +export default async (argv: Partial, _prompter: Prompter) => { const cwd = (argv.cwd as string) || process.cwd(); const to = (argv.to as string) || (argv._ && argv._[0] as string); if (!to) { diff --git a/pgpm/cli/src/commands/revert.ts b/pgpm/cli/src/commands/revert.ts index 3304885ba..d4703598f 100644 --- a/pgpm/cli/src/commands/revert.ts +++ b/pgpm/cli/src/commands/revert.ts @@ -1,7 +1,7 @@ import { PgpmPackage } from '@pgpmjs/core'; import { getEnvOptions } from '@pgpmjs/env'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Genomic, Question } from 'genomic'; +import { CLIOptions, Prompter, Question } from 'genomic'; import { getPgEnvOptions } from 'pg-env'; import { getTargetDatabase, resolvePackageAlias } from '../utils'; @@ -35,7 +35,7 @@ Examples: export default async ( argv: Partial>, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/tag.ts b/pgpm/cli/src/commands/tag.ts index 589aa5081..540c68efe 100644 --- a/pgpm/cli/src/commands/tag.ts +++ b/pgpm/cli/src/commands/tag.ts @@ -1,7 +1,7 @@ import { PgpmPackage } from '@pgpmjs/core'; import { Logger } from '@pgpmjs/logger'; import { errors } from '@pgpmjs/types'; -import { CLIOptions, Genomic, Question } from 'genomic'; +import { CLIOptions, Prompter, Question } from 'genomic'; import * as path from 'path'; import { extractFirst } from '../utils/argv'; @@ -35,7 +35,7 @@ Examples: export default async ( argv: Partial>, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/test-packages.ts b/pgpm/cli/src/commands/test-packages.ts index 2fa031ebf..98cef22cf 100644 --- a/pgpm/cli/src/commands/test-packages.ts +++ b/pgpm/cli/src/commands/test-packages.ts @@ -2,7 +2,7 @@ import { PgpmPackage } from '@pgpmjs/core'; import { getEnvOptions } from '@pgpmjs/env'; import { Logger } from '@pgpmjs/logger'; import path from 'path'; -import { CLIOptions, Genomic } from 'genomic'; +import { CLIOptions, Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import { getPgEnvOptions } from 'pg-env'; import { getPgPool } from 'pg-cache'; @@ -225,7 +225,7 @@ async function testModule( export default async ( argv: Partial, - _prompter: Genomic, + _prompter: Prompter, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/commands/update.ts b/pgpm/cli/src/commands/update.ts index 188d3c041..9de9f00c7 100644 --- a/pgpm/cli/src/commands/update.ts +++ b/pgpm/cli/src/commands/update.ts @@ -1,6 +1,6 @@ import { findAndRequirePackageJson } from 'find-and-require-package-json'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Genomic } from 'genomic'; +import { CLIOptions, Prompter } from 'genomic'; import { spawn } from 'child_process'; import { fetchLatestVersion } from '../utils/npm-version'; import { cliExitWithError } from '../utils/cli-error'; @@ -43,7 +43,7 @@ const runNpmInstall = (pkgName: string, registry?: string): Promise => { export default async ( argv: Partial>, - _prompter: Genomic, + _prompter: Prompter, _options: CLIOptions ) => { if (argv.help || argv.h) { diff --git a/pgpm/cli/src/commands/upgrade-modules.ts b/pgpm/cli/src/commands/upgrade-modules.ts index 2687d8d78..1cd9bae77 100644 --- a/pgpm/cli/src/commands/upgrade-modules.ts +++ b/pgpm/cli/src/commands/upgrade-modules.ts @@ -1,6 +1,6 @@ import { PgpmPackage } from '@pgpmjs/core'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Genomic, OptionValue, Question } from 'genomic'; +import { CLIOptions, Prompter, OptionValue, Question } from 'genomic'; import { ParsedArgs } from 'minimist'; import { fetchLatestVersion } from '../utils/npm-version'; @@ -60,7 +60,7 @@ async function fetchModuleVersions( async function upgradeModulesForProject( project: PgpmPackage, argv: Partial, - prompter: Genomic, + prompter: Prompter, dryRun: boolean, upgradeAll: boolean, specificModules: string[] | undefined, @@ -154,7 +154,7 @@ async function upgradeModulesForProject( export default async ( argv: Partial, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { if (argv.help || argv.h) { diff --git a/pgpm/cli/src/commands/verify.ts b/pgpm/cli/src/commands/verify.ts index 4bf57ad84..ae0e6beff 100644 --- a/pgpm/cli/src/commands/verify.ts +++ b/pgpm/cli/src/commands/verify.ts @@ -1,7 +1,7 @@ import { PgpmPackage } from '@pgpmjs/core'; import { getEnvOptions } from '@pgpmjs/env'; import { Logger } from '@pgpmjs/logger'; -import { CLIOptions, Genomic, Question } from 'genomic'; +import { CLIOptions, Prompter, Question } from 'genomic'; import { getPgEnvOptions } from 'pg-env'; import { getTargetDatabase, resolvePackageAlias } from '../utils'; @@ -33,7 +33,7 @@ Examples: export default async ( argv: Partial>, - prompter: Genomic, + prompter: Prompter, _options: CLIOptions ) => { // Show usage if explicitly requested diff --git a/pgpm/cli/src/utils/database.ts b/pgpm/cli/src/utils/database.ts index 9d6286137..a43dea4d5 100644 --- a/pgpm/cli/src/utils/database.ts +++ b/pgpm/cli/src/utils/database.ts @@ -1,4 +1,4 @@ -import { Genomic } from 'genomic'; +import { Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import { getPgPool } from 'pg-cache'; import { getPgEnvOptions } from 'pg-env'; @@ -53,7 +53,7 @@ export async function getAvailableDatabases(options: DatabaseSelectionOptions = */ export async function selectDatabase( argv: Partial, - prompter: Genomic, + prompter: Prompter, options: DatabaseSelectionOptions = {} ): Promise { const { @@ -97,7 +97,7 @@ export async function selectDatabase( */ export async function getTargetDatabase( argv: Partial, - prompter: Genomic, + prompter: Prompter, options: DatabaseSelectionOptions = {} ): Promise { // If database is specified in args, use it diff --git a/pgpm/cli/src/utils/deployed-changes.ts b/pgpm/cli/src/utils/deployed-changes.ts index 3d43c49c6..22f6d1223 100644 --- a/pgpm/cli/src/utils/deployed-changes.ts +++ b/pgpm/cli/src/utils/deployed-changes.ts @@ -1,6 +1,6 @@ import { PgpmMigrate } from '@pgpmjs/core'; import { Logger } from '@pgpmjs/logger'; -import { Genomic } from 'genomic'; +import { Prompter } from 'genomic'; import { getPgEnvOptions } from 'pg-env'; import { resolvePackageAlias } from './package-alias'; @@ -8,7 +8,7 @@ import { resolvePackageAlias } from './package-alias'; export async function selectDeployedChange( database: string, argv: Partial>, - prompter: Genomic, + prompter: Prompter, log: Logger, action: 'revert' | 'verify' = 'revert', cwd: string = process.cwd() @@ -67,7 +67,7 @@ export async function selectDeployedChange( export async function selectDeployedPackage( database: string, argv: Partial>, - prompter: Genomic, + prompter: Prompter, log: Logger, action: 'revert' | 'verify' = 'revert', cwd: string = process.cwd() diff --git a/pgpm/cli/src/utils/module-utils.ts b/pgpm/cli/src/utils/module-utils.ts index efd075db6..ea1e71e5a 100644 --- a/pgpm/cli/src/utils/module-utils.ts +++ b/pgpm/cli/src/utils/module-utils.ts @@ -1,7 +1,7 @@ import { PgpmPackage } from '@pgpmjs/core'; import { Logger } from '@pgpmjs/logger'; import { errors } from '@pgpmjs/types'; -import { Genomic } from 'genomic'; +import { Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import { resolvePackageAlias } from './package-alias'; @@ -12,7 +12,7 @@ import { resolvePackageAlias } from './package-alias'; */ export async function selectPackage( argv: Partial, - prompter: Genomic, + prompter: Prompter, cwd: string, operationName: string, log?: Logger diff --git a/pgpm/cli/test-utils/CLIDeployTestFixture.ts b/pgpm/cli/test-utils/CLIDeployTestFixture.ts index dc35fd43d..192bdc55f 100644 --- a/pgpm/cli/test-utils/CLIDeployTestFixture.ts +++ b/pgpm/cli/test-utils/CLIDeployTestFixture.ts @@ -1,5 +1,5 @@ import { PgpmMigrate } from '@pgpmjs/core'; -import { CLIOptions,Genomic } from 'genomic'; +import { CLIOptions,Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import { Pool } from 'pg'; import { getPgPool } from 'pg-cache'; @@ -240,7 +240,7 @@ export class CLIDeployTestFixture extends TestFixture { } private async runPgpmCommand(argv: ParsedArgs): Promise { - const prompter = new Genomic({ + const prompter = new Prompter({ input: process.stdin, output: process.stdout, noTty: true diff --git a/pgpm/cli/test-utils/fixtures.ts b/pgpm/cli/test-utils/fixtures.ts index b1f2b1def..53cf53a5b 100644 --- a/pgpm/cli/test-utils/fixtures.ts +++ b/pgpm/cli/test-utils/fixtures.ts @@ -1,5 +1,5 @@ import fs from 'fs'; -import { Genomic } from 'genomic'; +import { Prompter } from 'genomic'; import { ParsedArgs } from 'minimist'; import os from 'os'; import path from 'path'; @@ -59,7 +59,7 @@ export class TestFixture { // flows so tests are stable and do not rely on local machine config. argv = withInitDefaults(argv, DEFAULT_TEMPLATE_REPO); - const prompter = new Genomic({ + const prompter = new Prompter({ input: mockInput, output: mockOutput, noTty: true diff --git a/pgpm/core/src/core/template-scaffold.ts b/pgpm/core/src/core/template-scaffold.ts index 5401f7891..4f41a556c 100644 --- a/pgpm/core/src/core/template-scaffold.ts +++ b/pgpm/core/src/core/template-scaffold.ts @@ -1,7 +1,7 @@ import os from 'os'; import path from 'path'; import { TemplateScaffolder, BoilerplateConfig } from '@genomic/scaffolds'; -import type { Genomic, Question } from 'genomic'; +import type { Prompter, Question } from 'genomic'; export interface InspectTemplateOptions { /** @@ -56,11 +56,11 @@ export interface ScaffoldTemplateOptions { */ dir?: string; /** - * Optional Genomic instance to reuse for prompting. + * Optional Prompter instance to reuse for prompting. * If provided, the caller retains ownership and is responsible for closing it. * If not provided, a new instance will be created and closed automatically. */ - prompter?: Genomic; + prompter?: Prompter; } export interface ScaffoldTemplateResult { From 94ef24c2faeec5a7e75f9b1ff017fe2bc5d3ddd4 Mon Sep 17 00:00:00 2001 From: Dan Lynch Date: Fri, 26 Dec 2025 23:51:47 +0000 Subject: [PATCH 3/3] chore: update genomic package versions to match published versions --- packages/cli/package.json | 2 +- packages/csv-to-pg/package.json | 2 +- pgpm/cli/package.json | 4 ++-- pgpm/core/package.json | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/packages/cli/package.json b/packages/cli/package.json index 37042e924..0b9fef3af 100644 --- a/packages/cli/package.json +++ b/packages/cli/package.json @@ -55,7 +55,7 @@ "@pgpmjs/server-utils": "workspace:^", "@pgpmjs/types": "workspace:^", "find-and-require-package-json": "^0.8.2", - "genomic": "^3.0.0", + "genomic": "^4.0.0", "js-yaml": "^4.1.0", "minimist": "^1.2.8", "pg-cache": "workspace:^", diff --git a/packages/csv-to-pg/package.json b/packages/csv-to-pg/package.json index a52b04c22..c3776f0dd 100644 --- a/packages/csv-to-pg/package.json +++ b/packages/csv-to-pg/package.json @@ -46,7 +46,7 @@ "@pgsql/types": "^17.6.2", "@pgsql/utils": "^17.8.4", "csv-parser": "^2.3.3", - "genomic": "^3.0.0", + "genomic": "^4.0.0", "js-yaml": "^3.14.0", "pgsql-deparser": "^17.15.0" } diff --git a/pgpm/cli/package.json b/pgpm/cli/package.json index dfb90d95c..bffec39e0 100644 --- a/pgpm/cli/package.json +++ b/pgpm/cli/package.json @@ -46,14 +46,14 @@ "ts-node": "^10.9.2" }, "dependencies": { - "@genomic/scaffolds": "^1.0.0", + "@genomic/scaffolds": "^2.0.0", "@pgpmjs/core": "workspace:^", "@pgpmjs/env": "workspace:^", "@pgpmjs/logger": "workspace:^", "@pgpmjs/types": "workspace:^", "appstash": "^0.2.6", "find-and-require-package-json": "^0.8.2", - "genomic": "^3.0.0", + "genomic": "^4.0.0", "js-yaml": "^4.1.0", "minimist": "^1.2.8", "pg-cache": "workspace:^", diff --git a/pgpm/core/package.json b/pgpm/core/package.json index 941c79b39..8147e4f8c 100644 --- a/pgpm/core/package.json +++ b/pgpm/core/package.json @@ -44,7 +44,7 @@ "@pgsql/types": "^17.6.2", "@types/pg": "^8.16.0", "copyfiles": "^2.4.1", - "genomic": "^3.0.0", + "genomic": "^4.0.0", "makage": "^0.1.9" }, "dependencies": { @@ -52,7 +52,7 @@ "@pgpmjs/logger": "workspace:^", "@pgpmjs/server-utils": "workspace:^", "@pgpmjs/types": "workspace:^", - "@genomic/scaffolds": "^1.0.0", + "@genomic/scaffolds": "^2.0.0", "csv-to-pg": "workspace:^", "glob": "^13.0.0", "komoji": "^0.7.11",