@form8ion/project 22.0.0-beta.2 → 22.0.0-beta.3

package/src/language/prompt.js

@@ -1,12 +1,15 @@
-import {prompt} from '@form8ion/overridable-prompts';
-
 import {questionNames} from '../prompts/question-names.js';
 
-export default function (languages, decisions) {
-  return prompt([{
-    name: questionNames.PROJECT_LANGUAGE,
-    type: 'list',
-    message: 'What type of project is this?',
-    choices: [...Object.keys(languages), 'Other']
-  }], decisions);
+export const PROJECT_LANGUAGE_PROMPT_ID = 'PROJECT_LANGUAGE';
+
+export default function promptForProjectLanguage(languages, {prompt}) {
+  return prompt({
+    id: PROJECT_LANGUAGE_PROMPT_ID,
+    questions: [{
+      name: questionNames.PROJECT_LANGUAGE,
+      type: 'list',
+      message: 'What type of project is this?',
+      choices: [...Object.keys(languages), 'Other']
+    }]
+  });
 }

package/src/language/prompt.test.js

@@ -1,30 +1,27 @@
-import {prompt} from '@form8ion/overridable-prompts';
-
-import {afterEach, describe, expect, it, vi} from 'vitest';
+import {describe, expect, it, vi} from 'vitest';
 import any from '@travi/any';
 import {when} from 'vitest-when';
 
 import {questionNames} from '../prompts/question-names.js';
-import promptForLanguageDetails from './prompt.js';
+import promptForLanguageDetails, {PROJECT_LANGUAGE_PROMPT_ID} from './prompt.js';
 
 vi.mock('@form8ion/overridable-prompts');
 
 describe('language prompt', () => {
-  afterEach(() => {
-    vi.clearAllMocks();
-  });
-
   it('should prompt for the language details', async () => {
+    const prompt = vi.fn();
     const answers = any.simpleObject();
-    const decisions = any.simpleObject();
     const languages = any.simpleObject();
-    when(prompt).calledWith([{
-      name: questionNames.PROJECT_LANGUAGE,
-      type: 'list',
-      message: 'What type of project is this?',
-      choices: [...Object.keys(languages), 'Other']
-    }], decisions).thenResolve(answers);
+    when(prompt).calledWith({
+      id: PROJECT_LANGUAGE_PROMPT_ID,
+      questions: [{
+        name: questionNames.PROJECT_LANGUAGE,
+        type: 'list',
+        message: 'What type of project is this?',
+        choices: [...Object.keys(languages), 'Other']
+      }]
+    }).thenResolve(answers);
 
-    expect(await promptForLanguageDetails(languages, decisions)).toEqual(answers);
+    expect(await promptForLanguageDetails(languages, {prompt})).toEqual(answers);
   });
 });

package/src/language/scaffolder.js

@@ -1,8 +1,8 @@
 import {questionNames} from '../prompts/question-names.js';
 import promptForLanguageDetails from './prompt.js';
 
-export default async function (languagePlugins, decisions, options) {
-  const {[questionNames.PROJECT_LANGUAGE]: chosenLanguage} = await promptForLanguageDetails(languagePlugins, decisions);
+export default async function (languagePlugins, options, {prompt}) {
+  const {[questionNames.PROJECT_LANGUAGE]: chosenLanguage} = await promptForLanguageDetails(languagePlugins, {prompt});
 
   const plugin = languagePlugins[chosenLanguage];
 

package/src/language/scaffolder.test.js

@@ -13,15 +13,15 @@ describe('language scaffolder', () => {
     const options = any.simpleObject();
     const chosenLanguage = any.word();
     const scaffolderResult = any.simpleObject();
-    const decisions = any.simpleObject();
+    const prompt = () => undefined;
     const chosenLanguageScaffolder = vi.fn();
     const plugins = {...any.simpleObject(), [chosenLanguage]: {scaffold: chosenLanguageScaffolder}};
     when(languagePrompt.default)
-      .calledWith(plugins, decisions)
+      .calledWith(plugins, {prompt})
       .thenResolve({[questionNames.PROJECT_LANGUAGE]: chosenLanguage});
     when(chosenLanguageScaffolder).calledWith(options).thenResolve(scaffolderResult);
 
-    expect(await scaffold(plugins, decisions, options)).toEqual(scaffolderResult);
+    expect(await scaffold(plugins, options, {prompt})).toEqual(scaffolderResult);
   });
 
   it('should not result in an error when choosing a language without a defined scaffolder', async () => {

package/src/options-validator.js

@@ -4,11 +4,9 @@ import joi from 'joi';
 import languagePluginsSchema from './language/schema.js';
 import vcsHostPluginsSchema from './vcs/host/schema.js';
 import dependencyUpdaterPluginsSchema from './dependency-updater/schema.js';
-import {decisionsSchema} from './options-schemas.js';
 
 export function validate(options) {
   return validateOptions(joi.object({
-    decisions: decisionsSchema,
     plugins: joi.object({
       dependencyUpdaters: dependencyUpdaterPluginsSchema,
       languages: languagePluginsSchema,

package/src/options-validator.test.js

@@ -6,7 +6,6 @@ import any from '@travi/any';
 import {when} from 'vitest-when';
 
 import languagePluginsSchema from './language/schema.js';
-import {decisionsSchema} from './options-schemas.js';
 import vcsHostPluginsSchema from './vcs/host/schema.js';
 import dependencyUpdaterPluginsSchema from './dependency-updater/schema.js';
 import {validate} from './options-validator.js';
@@ -39,10 +38,7 @@ describe('options validator', () => {
         vcsHosts: vcsHostPluginsSchema
       })
       .thenReturn(pluginsSchema);
-    when(joi.object).calledWith({
-      decisions: decisionsSchema,
-      plugins: pluginsSchema
-    }).thenReturn(fullSchema);
+    when(joi.object).calledWith({plugins: pluginsSchema}).thenReturn(fullSchema);
     when(core.validateOptions).calledWith(fullSchema, options).thenReturn(validatedOptions);
 
     expect(validate(options)).toEqual(validatedOptions);

package/src/prompts/index.js

@@ -0,0 +1,21 @@
+import {questionNames as coreQuestionNames} from '@form8ion/core';
+
+import {BASE_DETAILS_PROMPT_ID} from './questions.js';
+import {GIT_REPOSITORY_PROMPT_ID} from '../vcs/prompt.js';
+import {PROJECT_LANGUAGE_PROMPT_ID} from '../language/prompt.js';
+import {REPOSITORY_HOST_PROMPT_ID} from '../vcs/host/prompt.js';
+import {DEPENDENCY_UPDATER_PROMPT_ID} from '../dependency-updater/prompt.js';
+import {questionNames as projectScaffolderQuestionNames} from './question-names.js';
+
+export const ids = {
+  BASE_DETAILS: BASE_DETAILS_PROMPT_ID,
+  GIT_REPOSITORY: GIT_REPOSITORY_PROMPT_ID,
+  REPOSITORY_HOST: REPOSITORY_HOST_PROMPT_ID,
+  PROJECT_LANGUAGE: PROJECT_LANGUAGE_PROMPT_ID,
+  DEPENDENCY_UPDATER: DEPENDENCY_UPDATER_PROMPT_ID
+};
+
+export const questionNames = {
+  ...coreQuestionNames,
+  ...projectScaffolderQuestionNames
+};

package/src/prompts/questions.js

@@ -1,6 +1,10 @@
 import {questionsForBaseDetails} from '@form8ion/core';
-import {prompt} from '@form8ion/overridable-prompts';
 
-export function promptForBaseDetails(projectRoot, decisions) {
-  return prompt(questionsForBaseDetails(decisions, projectRoot), decisions);
+export const BASE_DETAILS_PROMPT_ID = 'BASE_DETAILS';
+
+export function promptForBaseDetails(projectRoot, {prompt}) {
+  return prompt({
+    id: BASE_DETAILS_PROMPT_ID,
+    questions: questionsForBaseDetails(projectRoot)
+  });
 }

package/src/prompts/questions.test.js

@@ -1,11 +1,10 @@
 import * as core from '@form8ion/core';
-import * as prompts from '@form8ion/overridable-prompts';
 
 import {describe, expect, it, vi} from 'vitest';
 import any from '@travi/any';
 import {when} from 'vitest-when';
 
-import {promptForBaseDetails} from './questions.js';
+import {promptForBaseDetails, BASE_DETAILS_PROMPT_ID} from './questions.js';
 
 vi.mock('@form8ion/core');
 vi.mock('@form8ion/overridable-prompts');
@@ -13,13 +12,13 @@ vi.mock('@form8ion/overridable-prompts');
 describe('base details prompt', () => {
   const projectPath = any.string();
   const answers = any.simpleObject();
-  const decisions = any.simpleObject();
   const questions = any.listOf(any.simpleObject);
+  const prompt = vi.fn();
 
   it('should prompt for the necessary details', async () => {
-    when(core.questionsForBaseDetails).calledWith(decisions, projectPath).thenReturn(questions);
-    when(prompts.prompt).calledWith(questions, decisions).thenResolve(answers);
+    when(core.questionsForBaseDetails).calledWith(projectPath).thenReturn(questions);
+    when(prompt).calledWith({id: BASE_DETAILS_PROMPT_ID, questions}).thenResolve(answers);
 
-    expect(await promptForBaseDetails(projectPath, decisions)).toEqual(answers);
+    expect(await promptForBaseDetails(projectPath, {prompt})).toEqual(answers);
   });
 });

package/src/scaffolder.js

@@ -15,9 +15,9 @@ import {scaffold as scaffoldEditorConfig} from './editorconfig/index.js';
 import {scaffold as scaffoldContributing} from './contributing/index.js';
 import lift from './lift.js';
 
-export async function scaffold(options) {
+export async function scaffold(options, {prompt}) {
   const projectRoot = process.cwd();
-  const {decisions, plugins: {dependencyUpdaters, languages, vcsHosts = {}}} = validate(options);
+  const {plugins: {dependencyUpdaters, languages, vcsHosts = {}}} = validate(options);
 
   const {
     [coreQuestionNames.PROJECT_NAME]: projectName,
@@ -26,11 +26,11 @@ export async function scaffold(options) {
     [coreQuestionNames.DESCRIPTION]: description,
     [coreQuestionNames.COPYRIGHT_YEAR]: copyrightYear,
     [coreQuestionNames.COPYRIGHT_HOLDER]: copyHolder
-  } = await promptForBaseDetails(projectRoot, decisions);
+  } = await promptForBaseDetails(projectRoot, {prompt});
   const copyright = {year: copyrightYear, holder: copyHolder};
 
   const [vcsResults, contributing, license] = await Promise.all([
-    scaffoldVcs({projectRoot, projectName, decisions, vcsHosts, visibility, description}),
+    scaffoldVcs({projectRoot, projectName, vcsHosts, visibility, description}, {prompt}),
     scaffoldContributing({visibility}),
     scaffoldLicense({projectRoot, license: chosenLicense, copyright}),
     scaffoldReadme({projectName, projectRoot, description}),
@@ -39,14 +39,14 @@ export async function scaffold(options) {
 
   const dependencyUpdaterResults = vcsResults.vcs && await scaffoldDependencyUpdater(
     dependencyUpdaters,
-    decisions,
-    {projectRoot}
+    {projectRoot},
+    {prompt}
   );
 
   const language = await scaffoldLanguage(
     languages,
-    decisions,
-    {projectRoot, projectName, vcs: vcsResults.vcs, visibility, license: chosenLicense || 'UNLICENSED', description}
+    {projectRoot, projectName, vcs: vcsResults.vcs, visibility, license: chosenLicense || 'UNLICENSED', description},
+    {prompt}
   );
 
   const mergedResults = deepmerge.all([

package/src/scaffolder.test.js

@@ -52,7 +52,7 @@ describe('project scaffolder', () => {
   const tags = any.listOf(any.word);
   const visibility = any.word();
   const vcsIgnore = any.simpleObject();
-  const decisions = any.simpleObject();
+  const prompt = () => undefined;
 
   beforeEach(() => {
     process.cwd = vi.fn();
@@ -95,9 +95,9 @@ describe('project scaffolder', () => {
     ]);
     when(optionsValidator.validate)
       .calledWith(options)
-      .thenReturn({decisions, plugins: {dependencyUpdaters, languages, vcsHosts}});
+      .thenReturn({plugins: {dependencyUpdaters, languages, vcsHosts}});
     when(prompts.promptForBaseDetails)
-      .calledWith(projectPath, decisions)
+      .calledWith(projectPath, {prompt})
       .thenResolve({
         [coreQuestionNames.PROJECT_NAME]: projectName,
         [coreQuestionNames.LICENSE]: license,
@@ -107,18 +107,18 @@ describe('project scaffolder', () => {
         [coreQuestionNames.VISIBILITY]: visibility
       });
     when(scaffoldVcs)
-      .calledWith({projectRoot: projectPath, projectName, decisions, vcsHosts, visibility, description})
+      .calledWith({projectRoot: projectPath, projectName, vcsHosts, visibility, description}, {prompt})
       .thenResolve(vcsResults);
     when(licenseScaffolder.default)
       .calledWith({projectRoot: projectPath, license, copyright})
       .thenResolve(licenseResults);
     scaffoldLanguage.mockResolvedValue(languageResults);
     when(dependencyUpdaterScaffolder.default)
-      .calledWith(dependencyUpdaters, decisions, {projectRoot: projectPath})
+      .calledWith(dependencyUpdaters, {projectRoot: projectPath}, {prompt})
       .thenResolve(dependencyUpdaterResults);
     when(scaffoldContributing).calledWith({visibility}).thenReturn(contributingResults);
 
-    await scaffold(options);
+    await scaffold(options, {prompt});
 
     expect(scaffoldReadme).toHaveBeenCalledWith({projectName, projectRoot: projectPath, description});
     expect(scaffoldEditorconfig).toHaveBeenCalledWith({projectRoot: projectPath});
@@ -155,7 +155,7 @@ describe('project scaffolder', () => {
     const languageResults = {badges: languageBadges, vcsIgnore, documentation};
     when(optionsValidator.validate).calledWith(options).thenReturn({plugins: {vcsHosts}});
     when(prompts.promptForBaseDetails)
-      .calledWith(projectPath, undefined)
+      .calledWith(projectPath, {prompt})
       .thenResolve({
         [coreQuestionNames.DESCRIPTION]: description,
         [questionNames.GIT_REPO]: true,
@@ -168,7 +168,7 @@ describe('project scaffolder', () => {
     licenseScaffolder.default.mockResolvedValue({badges: licenseBadges});
     scaffoldVcs.mockResolvedValue(vcsResults);
 
-    await scaffold(options);
+    await scaffold(options, {prompt});
 
     expect(scaffoldReadme).toHaveBeenCalledWith({projectName, projectRoot: projectPath, description});
   });
@@ -179,7 +179,7 @@ describe('project scaffolder', () => {
     scaffoldReadme.mockResolvedValue();
     scaffoldVcs.mockResolvedValue({});
 
-    await scaffold(options);
+    await scaffold(options, {prompt});
 
     expect(dependencyUpdaterScaffolder.default).not.toHaveBeenCalled();
   });
@@ -204,9 +204,7 @@ describe('project scaffolder', () => {
       nextSteps: languageNextSteps,
       tags
     };
-    when(optionsValidator.validate)
-      .calledWith(options)
-      .thenReturn({decisions, plugins: {languages, vcsHosts}});
+    when(optionsValidator.validate).calledWith(options).thenReturn({plugins: {languages, vcsHosts}});
     scaffoldVcs.mockResolvedValue(vcsResults);
     prompts.promptForBaseDetails.mockResolvedValue({
       [coreQuestionNames.PROJECT_NAME]: projectName,
@@ -215,20 +213,20 @@ describe('project scaffolder', () => {
       [coreQuestionNames.LICENSE]: license,
       [coreQuestionNames.DESCRIPTION]: description
     });
-    when(scaffoldLanguage).calledWith(languages, decisions, {
+    when(scaffoldLanguage).calledWith(languages, {
       projectName,
       projectRoot: projectPath,
       visibility,
       license,
       vcs,
       description
-    }).thenResolve(languageResults);
+    }, {prompt}).thenResolve(languageResults);
     when(execa).calledWith(verificationCommand, {shell: true}).thenReturn({stdout: {pipe: execaPipe}});
     dependencyUpdaterScaffolder.default.mockResolvedValue({});
     licenseScaffolder.default.mockResolvedValue({});
     scaffoldContributing.mockResolvedValue({});
 
-    await scaffold(options);
+    await scaffold(options, {prompt});
 
     expect(scaffoldReadme).toHaveBeenCalledWith({projectName, projectRoot: projectPath, description});
     expect(execaPipe).toHaveBeenCalledWith(process.stdout);
@@ -238,7 +236,7 @@ describe('project scaffolder', () => {
   it('should consider the language details to be optional', async () => {
     when(optionsValidator.validate)
       .calledWith(options)
-      .thenReturn({vcsHosts, decisions, plugins: {languages}});
+      .thenReturn({vcsHosts, plugins: {languages}});
     scaffoldVcs.mockResolvedValue(vcsResults);
     prompts.promptForBaseDetails.mockResolvedValue({
       [coreQuestionNames.PROJECT_NAME]: projectName,
@@ -252,22 +250,21 @@ describe('project scaffolder', () => {
     licenseScaffolder.default.mockResolvedValue({});
     scaffoldContributing.mockResolvedValue({});
 
-    await scaffold(options);
+    await scaffold(options, {prompt});
 
     expect(scaffoldReadme).toHaveBeenCalledWith({projectName, projectRoot: projectPath, description});
     expect(execa).not.toHaveBeenCalled();
   });
 
   it('should pass the license to the language scaffolder as `UNLICENSED` when no license was chosen', async () => {
-    when(optionsValidator.validate).calledWith(options).thenReturn({plugins: {languages}, decisions});
+    when(optionsValidator.validate).calledWith(options).thenReturn({plugins: {languages}});
     prompts.promptForBaseDetails.mockResolvedValue({});
     scaffoldVcs.mockResolvedValue(vcsResults);
 
-    await scaffold(options);
+    await scaffold(options, {prompt});
 
     expect(scaffoldLanguage).toHaveBeenCalledWith(
       languages,
-      decisions,
       {
         license: 'UNLICENSED',
         description: undefined,
@@ -275,7 +272,8 @@ describe('project scaffolder', () => {
         projectRoot: projectPath,
         vcs,
         visibility: undefined
-      }
+      },
+      {prompt}
     );
   });
 
@@ -285,7 +283,7 @@ describe('project scaffolder', () => {
     scaffoldVcs.mockResolvedValue({});
     scaffoldLanguage.mockResolvedValue({badges: {}, projectDetails: {}});
 
-    await scaffold(options);
+    await scaffold(options, {prompt});
 
     expect(execa).not.toHaveBeenCalled();
   });

package/src/vcs/host/prompt.js

@@ -1,14 +1,17 @@
-import {prompt} from '@form8ion/overridable-prompts';
-
 import {questionNames} from '../../prompts/question-names.js';
 
-export default async function (hosts, decisions) {
-  const answers = await prompt([{
-    name: questionNames.REPO_HOST,
-    type: 'list',
-    message: 'Where will the repository be hosted?',
-    choices: Object.keys(hosts)
-  }], decisions);
+export const REPOSITORY_HOST_PROMPT_ID = 'REPOSITORY_HOST';
+
+export default async function promptForVcsHostChoice(hosts, {prompt}) {
+  const answers = await prompt({
+    id: REPOSITORY_HOST_PROMPT_ID,
+    questions: [{
+      name: questionNames.REPO_HOST,
+      type: 'list',
+      message: 'Where will the repository be hosted?',
+      choices: Object.keys(hosts)
+    }]
+  });
   const host = hosts[answers[questionNames.REPO_HOST]];
 
   return {...answers, ...host};

package/src/vcs/host/prompt.test.js

@@ -1,21 +1,19 @@
-import * as prompts from '@form8ion/overridable-prompts';
-
-import {afterEach, describe, expect, it, vi} from 'vitest';
+import {beforeEach, describe, expect, it, vi} from 'vitest';
 import any from '@travi/any';
 import {when} from 'vitest-when';
 
 import {questionNames} from '../../prompts/question-names.js';
-import promptForVcsHostDetails from './prompt.js';
+import promptForVcsHostDetails, {REPOSITORY_HOST_PROMPT_ID} from './prompt.js';
 
 vi.mock('@form8ion/overridable-prompts');
 vi.mock('../../prompts/conditionals');
 
 describe('vcs host details prompt', () => {
+  let prompt;
   const answers = any.simpleObject();
-  const decisions = any.simpleObject();
 
-  afterEach(() => {
-    vi.clearAllMocks();
+  beforeEach(() => {
+    prompt = vi.fn();
   });
 
   it('should prompt for the vcs hosting details', async () => {
@@ -23,25 +21,31 @@ describe('vcs host details prompt', () => {
     const hostNames = [...any.listOf(any.string), host];
     const hosts = any.objectWithKeys(hostNames, {factory: () => ({})});
     const answersWithHostChoice = {...answers, [questionNames.REPO_HOST]: host};
-    when(prompts.prompt).calledWith([{
-      name: questionNames.REPO_HOST,
-      type: 'list',
-      message: 'Where will the repository be hosted?',
-      choices: hostNames
-    }], decisions).thenResolve(answersWithHostChoice);
-
-    expect(await promptForVcsHostDetails(hosts, decisions)).toEqual(answersWithHostChoice);
+    when(prompt).calledWith({
+      id: REPOSITORY_HOST_PROMPT_ID,
+      questions: [{
+        name: questionNames.REPO_HOST,
+        type: 'list',
+        message: 'Where will the repository be hosted?',
+        choices: hostNames
+      }]
+    }).thenResolve(answersWithHostChoice);
+
+    expect(await promptForVcsHostDetails(hosts, {prompt})).toEqual(answersWithHostChoice);
   });
 
   it('should not throw an error when `Other` is chosen as the host', async () => {
     const answersWithHostChoice = {...answers, [questionNames.REPO_HOST]: 'Other'};
-    when(prompts.prompt).calledWith([{
-      name: questionNames.REPO_HOST,
-      type: 'list',
-      message: 'Where will the repository be hosted?',
-      choices: []
-    }], decisions).thenResolve(answersWithHostChoice);
-
-    expect(await promptForVcsHostDetails({}, decisions)).toEqual(answersWithHostChoice);
+    when(prompt).calledWith({
+      id: REPOSITORY_HOST_PROMPT_ID,
+      questions: [{
+        name: questionNames.REPO_HOST,
+        type: 'list',
+        message: 'Where will the repository be hosted?',
+        choices: []
+      }]
+    }).thenResolve(answersWithHostChoice);
+
+    expect(await promptForVcsHostDetails({}, {prompt})).toEqual(answersWithHostChoice);
   });
 });

package/src/vcs/host/scaffolder.js

@@ -1,8 +1,8 @@
 import {questionNames} from '../../prompts/question-names.js';
 import promptForVcsHostDetails from './prompt.js';
 
-export default async function scaffoldVcsHost(hosts, decisions, options) {
-  const {[questionNames.REPO_HOST]: chosenHost} = await promptForVcsHostDetails(hosts, decisions);
+export default async function scaffoldVcsHost(hosts, options, {prompt}) {
+  const {[questionNames.REPO_HOST]: chosenHost} = await promptForVcsHostDetails(hosts, {prompt});
 
   const lowercasedHosts = Object.fromEntries(
     Object.entries(hosts).map(([name, details]) => [name.toLowerCase(), details])

package/src/vcs/host/scaffolder.test.js

@@ -10,7 +10,7 @@ vi.mock('./prompt');
 
 describe('vcs host scaffolder', () => {
   const options = any.simpleObject();
-  const decisions = any.simpleObject();
+  const prompt = () => undefined;
 
   it('should scaffold the chosen vcs host', async () => {
     const chosenHost = `${any.word()}CAPITAL${any.word()}`;
@@ -19,19 +19,19 @@ describe('vcs host scaffolder', () => {
     const hostPlugins = {...any.simpleObject(), [chosenHost.toLowerCase()]: {scaffold: chosenHostScaffolder}};
     const owner = any.word;
     when(promptForVcsHostDetails)
-      .calledWith(hostPlugins, decisions)
+      .calledWith(hostPlugins, {prompt})
       .thenResolve({[questionNames.REPO_HOST]: chosenHost, [questionNames.REPO_OWNER]: owner});
     when(chosenHostScaffolder).calledWith(options).thenResolve(results);
 
-    expect(await scaffoldVcsHost(hostPlugins, decisions, options)).toEqual(results);
+    expect(await scaffoldVcsHost(hostPlugins, options, {prompt})).toEqual(results);
   });
 
   it('should return empty `vcs` results when no matching host is available', async () => {
     const hostPlugins = any.simpleObject();
     when(promptForVcsHostDetails)
-      .calledWith(hostPlugins, decisions)
+      .calledWith(hostPlugins, {prompt})
       .thenResolve({[questionNames.REPO_HOST]: any.word()});
 
-    expect(await scaffoldVcsHost(hostPlugins, decisions, options)).toEqual({vcs: {}});
+    expect(await scaffoldVcsHost(hostPlugins, options, {prompt})).toEqual({vcs: {}});
   });
 });

package/src/vcs/prompt.js

@@ -1,17 +1,17 @@
-import {prompt} from '@form8ion/overridable-prompts';
-
 import {questionNames} from '../prompts/question-names.js';
 
-export default async function promptForRepoCreation(decisions) {
-  const {[questionNames.GIT_REPO]: gitRepoShouldBeCreated} = await prompt(
-    [{
+export const GIT_REPOSITORY_PROMPT_ID = 'GIT_REPOSITORY';
+
+export default async function promptForRepoCreation({prompt}) {
+  const {[questionNames.GIT_REPO]: gitRepoShouldBeCreated} = await prompt({
+    id: GIT_REPOSITORY_PROMPT_ID,
+    questions: [{
       name: questionNames.GIT_REPO,
       type: 'confirm',
       default: true,
       message: 'Should a git repository be initialized?'
-    }],
-    decisions
-  );
+    }]
+  });
 
   return gitRepoShouldBeCreated;
 }

package/src/vcs/prompt.test.js

@@ -1,27 +1,28 @@
-import {prompt} from '@form8ion/overridable-prompts';
-
 import {describe, vi, it, expect} from 'vitest';
 import {when} from 'vitest-when';
 import any from '@travi/any';
 
 import {questionNames} from '../prompts/question-names.js';
-import promptForRepoCreation from './prompt.js';
+import promptForRepoCreation, {GIT_REPOSITORY_PROMPT_ID} from './prompt.js';
 
 vi.mock('@form8ion/overridable-prompts');
 
 describe('git prompt', () => {
   it('should ask whether a repository should be created', async () => {
-    const decisions = any.simpleObject();
+    const prompt = vi.fn();
     const repoShouldBeCreated = any.boolean();
     when(prompt)
-      .calledWith([{
-        name: questionNames.GIT_REPO,
-        type: 'confirm',
-        default: true,
-        message: 'Should a git repository be initialized?'
-      }], decisions)
+      .calledWith({
+        id: GIT_REPOSITORY_PROMPT_ID,
+        questions: [{
+          name: questionNames.GIT_REPO,
+          type: 'confirm',
+          default: true,
+          message: 'Should a git repository be initialized?'
+        }]
+      })
       .thenResolve({[questionNames.GIT_REPO]: repoShouldBeCreated});
 
-    expect(await promptForRepoCreation(decisions)).toBe(repoShouldBeCreated);
+    expect(await promptForRepoCreation({prompt})).toBe(repoShouldBeCreated);
   });
 });

package/src/vcs/scaffolder.js

@@ -5,8 +5,8 @@ import repositoryShouldBeCreated from './prompt.js';
 import {determineExistingVcsDetails, defineRemoteOrigin} from './git/index.js';
 import {scaffold as scaffoldVcsHost} from './host/index.js';
 
-export default async function scaffoldVcs({projectRoot, projectName, decisions, vcsHosts, visibility, description}) {
-  if (await repositoryShouldBeCreated(decisions)) {
+export default async function scaffoldVcs({projectRoot, projectName, vcsHosts, visibility, description}, {prompt}) {
+  if (await repositoryShouldBeCreated({prompt})) {
     if (await alreadyVersionedByGit({projectRoot})) {
       info('Git repository already exists');
 
@@ -14,11 +14,7 @@ export default async function scaffoldVcs({projectRoot, projectName, decisions,
     }
 
     const [{vcs: {host, owner, name, sshUrl}}] = await Promise.all([
-      scaffoldVcsHost(
-        vcsHosts,
-        decisions,
-        {projectName, projectRoot, description, visibility}
-      ),
+      scaffoldVcsHost(vcsHosts, {projectName, projectRoot, description, visibility}, {prompt}),
       scaffoldGit({projectRoot})
     ]);