@form8ion/project 22.0.0-beta.1 → 22.0.0-beta.11

package/src/scaffolder.test.js

@@ -2,7 +2,6 @@ import deepmerge from 'deepmerge';
 import {execa} from 'execa';
 import {questionNames as coreQuestionNames} from '@form8ion/core';
 import {scaffold as scaffoldReadme} from '@form8ion/readme';
-import * as resultsReporter from '@form8ion/results-reporter';
 
 import {afterEach, beforeEach, describe, expect, it, vi} from 'vitest';
 import any from '@travi/any';
@@ -52,7 +51,8 @@ describe('project scaffolder', () => {
   const tags = any.listOf(any.word);
   const visibility = any.word();
   const vcsIgnore = any.simpleObject();
-  const decisions = any.simpleObject();
+  const prompt = () => undefined;
+  const logger = {info: () => {}};
 
   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,25 +107,20 @@ describe('project scaffolder', () => {
         [coreQuestionNames.VISIBILITY]: visibility
       });
     when(scaffoldVcs)
-      .calledWith({projectRoot: projectPath, projectName, decisions, vcsHosts, visibility, description})
+      .calledWith({projectRoot: projectPath, projectName, vcsHosts, visibility, description}, {prompt, logger})
       .thenResolve(vcsResults);
     when(licenseScaffolder.default)
-      .calledWith({projectRoot: projectPath, license, copyright})
+      .calledWith({projectRoot: projectPath, license, copyright}, {logger})
       .thenResolve(licenseResults);
     scaffoldLanguage.mockResolvedValue(languageResults);
     when(dependencyUpdaterScaffolder.default)
-      .calledWith(dependencyUpdaters, decisions, {projectRoot: projectPath, vcs})
+      .calledWith(dependencyUpdaters, {projectRoot: projectPath}, {prompt})
       .thenResolve(dependencyUpdaterResults);
     when(scaffoldContributing).calledWith({visibility}).thenReturn(contributingResults);
 
-    await scaffold(options);
+    expect(await scaffold(options, {prompt, logger})).toEqual(mergedResults);
 
     expect(scaffoldReadme).toHaveBeenCalledWith({projectName, projectRoot: projectPath, description});
-    expect(dependencyUpdaterScaffolder.default).toHaveBeenCalledWith(
-      dependencyUpdaters,
-      decisions,
-      {projectRoot: projectPath, vcs}
-    );
     expect(scaffoldEditorconfig).toHaveBeenCalledWith({projectRoot: projectPath});
     expect(lift).toHaveBeenCalledWith({
       projectRoot: projectPath,
@@ -133,7 +128,6 @@ describe('project scaffolder', () => {
       results: mergedResults,
       enhancers: {...dependencyUpdaters, ...vcsHosts, ...languages}
     });
-    expect(resultsReporter.reportResults).toHaveBeenCalledWith(mergedResults);
   });
 
   it('should pass the lists of badges from contributors to the readme', async () => {
@@ -160,7 +154,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,
@@ -173,7 +167,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});
   });
@@ -184,7 +178,7 @@ describe('project scaffolder', () => {
     scaffoldReadme.mockResolvedValue();
     scaffoldVcs.mockResolvedValue({});
 
-    await scaffold(options);
+    await scaffold(options, {prompt});
 
     expect(dependencyUpdaterScaffolder.default).not.toHaveBeenCalled();
   });
@@ -209,9 +203,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,
@@ -220,30 +212,29 @@ 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, logger});
 
     expect(scaffoldReadme).toHaveBeenCalledWith({projectName, projectRoot: projectPath, description});
     expect(execaPipe).toHaveBeenCalledWith(process.stdout);
-    expect(resultsReporter.reportResults).toHaveBeenCalledWith(deepmerge.all([languageResults, vcsResults]));
   });
 
   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,
@@ -257,22 +248,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,
@@ -280,7 +270,8 @@ describe('project scaffolder', () => {
         projectRoot: projectPath,
         vcs,
         visibility: undefined
-      }
+      },
+      {prompt}
     );
   });
 
@@ -290,7 +281,7 @@ describe('project scaffolder', () => {
     scaffoldVcs.mockResolvedValue({});
     scaffoldLanguage.mockResolvedValue({badges: {}, projectDetails: {}});
 
-    await scaffold(options);
+    await scaffold(options, {prompt});
 
     expect(execa).not.toHaveBeenCalled();
   });

package/src/vcs/git/remotes.js

@@ -1,6 +1,5 @@
 import {simpleGit} from 'simple-git';
-import hostedGitInfo from 'hosted-git-info';
-import {warn} from '@travi/cli-messages';
+import parseGitUrl from 'git-url-parse';
 
 async function getExistingRemotes(git) {
   try {
@@ -17,14 +16,14 @@ async function getExistingRemotes(git) {
 export async function determineExistingVcsDetails({projectRoot}) {
   const git = simpleGit({baseDir: projectRoot});
   const remoteOrigin = await git.remote(['get-url', 'origin']);
-  const {user, project, type} = hostedGitInfo.fromUrl(remoteOrigin);
+  const {owner, name, host} = parseGitUrl(remoteOrigin.trimEnd());
 
-  return {vcs: {owner: user, name: project, host: type}};
+  return {vcs: {owner, name, host: 'github.com' === host ? 'github' : host}};
 }
 
-export async function defineRemoteOrigin(projectRoot, sshUrl) {
+export async function defineRemoteOrigin(projectRoot, sshUrl, {logger}) {
   if (!sshUrl) {
-    warn('URL not available to configure remote `origin`');
+    logger.warn('URL not available to configure remote `origin`');
 
     return {nextSteps: []};
   }
@@ -33,7 +32,7 @@ export async function defineRemoteOrigin(projectRoot, sshUrl) {
   const existingRemotes = await getExistingRemotes(git);
 
   if (existingRemotes.includes('origin')) {
-    warn('The `origin` remote is already defined for this repository');
+    logger.warn('The `origin` remote is already defined for this repository');
 
     return {nextSteps: []};
   }

package/src/vcs/git/remotes.test.js

@@ -1,39 +1,59 @@
 import {simpleGit} from 'simple-git';
-import hostedGitInfo from 'hosted-git-info';
+import parseGitUrl from 'git-url-parse';
 
-import {describe, vi, it, expect} from 'vitest';
+import {describe, vi, it, expect, beforeEach} from 'vitest';
 import {when} from 'vitest-when';
 import any from '@travi/any';
 
 import {determineExistingVcsDetails, defineRemoteOrigin} from './remotes.js';
 
 vi.mock('simple-git');
-vi.mock('hosted-git-info');
+vi.mock('git-url-parse');
 
 describe('Git remote', () => {
   const projectRoot = any.string();
 
   describe('determine', () => {
+    const remote = vi.fn();
+    const remoteOrigin = any.url();
+    const repoName = any.word();
+    const vcsHostAccount = any.word();
+
+    beforeEach(() => {
+      when(simpleGit).calledWith({baseDir: projectRoot}).thenReturn({remote});
+    });
+
     it('should determine existing vcs details from the remote origin definition of the local repository', async () => {
-      const remote = vi.fn();
-      const remoteOrigin = any.url();
-      const repoName = any.word();
       const vcsHost = `F${any.word()})O${any.word()}O`;
-      const vcsHostAccount = any.word();
-      when(simpleGit).calledWith({baseDir: projectRoot}).thenReturn({remote});
-      when(remote).calledWith(['get-url', 'origin']).thenResolve(remoteOrigin);
-      when(hostedGitInfo.fromUrl)
+      when(remote).calledWith(['get-url', 'origin']).thenResolve(`${remoteOrigin}\n`);
+      when(parseGitUrl)
         .calledWith(remoteOrigin)
-        .thenReturn({user: vcsHostAccount, project: repoName, type: vcsHost.toLowerCase()});
+        .thenReturn({owner: vcsHostAccount, name: repoName, host: vcsHost.toLowerCase()});
 
       const {vcs: hostDetails} = await determineExistingVcsDetails({projectRoot});
 
       expect(hostDetails).toEqual({host: vcsHost.toLowerCase(), owner: vcsHostAccount, name: repoName});
     });
+
+    it(
+      'should return `github` when the host is determined to be `github.com` until that can be a breaking change',
+      async () => {
+        when(simpleGit).calledWith({baseDir: projectRoot}).thenReturn({remote});
+        when(remote).calledWith(['get-url', 'origin']).thenResolve(`${remoteOrigin}\n`);
+        when(parseGitUrl)
+          .calledWith(remoteOrigin)
+          .thenReturn({owner: vcsHostAccount, name: repoName, host: 'github.com'});
+
+        const {vcs: hostDetails} = await determineExistingVcsDetails({projectRoot});
+
+        expect(hostDetails).toEqual({host: 'github', owner: vcsHostAccount, name: repoName});
+      }
+    );
   });
 
   describe('define', () => {
     const sshUrl = any.url();
+    const logger = {warn: () => {}};
 
     it('should define the remote origin', async () => {
       const listRemote = vi.fn();
@@ -41,7 +61,7 @@ describe('Git remote', () => {
       when(simpleGit).calledWith({baseDir: projectRoot}).thenReturn({listRemote, addRemote});
       when(listRemote).calledWith().thenResolve(any.listOf(any.word));
 
-      const {nextSteps} = await defineRemoteOrigin(projectRoot, sshUrl);
+      const {nextSteps} = await defineRemoteOrigin(projectRoot, sshUrl, {logger});
 
       expect(addRemote).toHaveBeenCalledWith('origin', sshUrl);
       expect(nextSteps).toEqual([{summary: 'Set local `master` branch to track upstream `origin/master`'}]);
@@ -53,7 +73,7 @@ describe('Git remote', () => {
       when(simpleGit).calledWith({baseDir: projectRoot}).thenReturn({listRemote, addRemote});
       when(listRemote).calledWith().thenThrow(new Error('fatal: No remote configured to list refs from.\n'));
 
-      const {nextSteps} = await defineRemoteOrigin(projectRoot, sshUrl);
+      const {nextSteps} = await defineRemoteOrigin(projectRoot, sshUrl, {logger});
 
       expect(nextSteps).toEqual([{summary: 'Set local `master` branch to track upstream `origin/master`'}]);
     });
@@ -64,7 +84,7 @@ describe('Git remote', () => {
       when(simpleGit).calledWith({baseDir: projectRoot}).thenReturn({listRemote});
       when(listRemote).calledWith().thenThrow(error);
 
-      await expect(defineRemoteOrigin(projectRoot, sshUrl)).rejects.toThrow(error);
+      await expect(defineRemoteOrigin(projectRoot, sshUrl, {logger})).rejects.toThrow(error);
     });
 
     it('should return no next-steps when the remote origin is already defined', async () => {
@@ -72,13 +92,13 @@ describe('Git remote', () => {
       when(simpleGit).calledWith({baseDir: projectRoot}).thenReturn({listRemote});
       when(listRemote).calledWith().thenResolve([...any.listOf(any.word), 'origin', ...any.listOf(any.word)]);
 
-      const {nextSteps} = await defineRemoteOrigin(projectRoot, sshUrl);
+      const {nextSteps} = await defineRemoteOrigin(projectRoot, sshUrl, {logger});
 
       expect(nextSteps).toEqual([]);
     });
 
     it('should return no next-steps when no `sshUrl` is provided', async () => {
-      const {nextSteps} = await defineRemoteOrigin(projectRoot);
+      const {nextSteps} = await defineRemoteOrigin(projectRoot, undefined, {logger});
 
       expect(nextSteps).toEqual([]);
     });

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

@@ -1,28 +1,26 @@
-import {info} from '@travi/cli-messages';
 import {scaffold as scaffoldGit, test as alreadyVersionedByGit} from '@form8ion/git';
 
 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, logger}
+) {
+  if (await repositoryShouldBeCreated({prompt})) {
     if (await alreadyVersionedByGit({projectRoot})) {
-      info('Git repository already exists');
+      logger.info('Git repository already exists');
 
-      return {vcs: await determineExistingVcsDetails({projectRoot})};
+      return determineExistingVcsDetails({projectRoot});
     }
 
     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})
     ]);
 
-    const remoteOriginResults = await defineRemoteOrigin(projectRoot, sshUrl);
+    const remoteOriginResults = await defineRemoteOrigin(projectRoot, sshUrl, {logger});
 
     return {
       vcs: {host, owner, name},

package/src/vcs/scaffolder.test.js

@@ -16,7 +16,8 @@ vi.mock('./prompt.js');
 
 describe('vcs scaffolder', () => {
   const projectRoot = any.string();
-  const decisions = any.simpleObject();
+  const prompt = () => undefined;
+  const logger = {info: () => {}};
 
   it('should scaffold the repository and vcs host details', async () => {
     const host = any.word();
@@ -29,14 +30,14 @@ describe('vcs scaffolder', () => {
     const vcsHostDetails = {host, owner, name};
     const sshUrl = any.url();
     const remoteOriginNextSteps = any.listOf(any.simpleObject);
-    when(promptForRepoCreation).calledWith(decisions).thenResolve(true);
+    when(promptForRepoCreation).calledWith({prompt}).thenResolve(true);
     when(alreadyVersionedByGit).calledWith({projectRoot}).thenResolve(false);
     when(scaffoldVcsHost)
-      .calledWith(vcsHosts, decisions, {projectName, projectRoot, description, visibility})
+      .calledWith(vcsHosts, {projectName, projectRoot, description, visibility}, {prompt})
       .thenResolve({vcs: {...vcsHostDetails, sshUrl, ...any.simpleObject()}});
-    when(defineRemoteOrigin).calledWith(projectRoot, sshUrl).thenResolve({nextSteps: remoteOriginNextSteps});
+    when(defineRemoteOrigin).calledWith(projectRoot, sshUrl, {logger}).thenResolve({nextSteps: remoteOriginNextSteps});
 
-    expect(await scaffoldVcs({projectRoot, projectName, decisions, vcsHosts, visibility, description})).toEqual({
+    expect(await scaffoldVcs({projectRoot, projectName, vcsHosts, visibility, description}, {prompt, logger})).toEqual({
       vcs: vcsHostDetails,
       nextSteps: [{summary: 'Commit scaffolded files'}, ...remoteOriginNextSteps]
     });
@@ -45,16 +46,16 @@ describe('vcs scaffolder', () => {
 
   it('should not scaffold a repository or vcs host details when the project is already versioned by git', async () => {
     const existingVcsDetails = any.simpleObject();
-    when(promptForRepoCreation).calledWith(decisions).thenResolve(true);
+    when(promptForRepoCreation).calledWith({prompt}).thenResolve(true);
     when(alreadyVersionedByGit).calledWith({projectRoot}).thenResolve(true);
     when(determineExistingVcsDetails).calledWith({projectRoot}).thenResolve(existingVcsDetails);
 
-    expect(await scaffoldVcs({projectRoot, decisions})).toEqual({vcs: existingVcsDetails});
+    expect(await scaffoldVcs({projectRoot}, {prompt, logger})).toEqual(existingVcsDetails);
   });
 
   it('should not scaffold a repository or vcs host details when a repository should not be created', async () => {
-    when(promptForRepoCreation).calledWith(decisions).thenResolve(false);
+    when(promptForRepoCreation).calledWith({prompt}).thenResolve(false);
 
-    expect(await scaffoldVcs({projectRoot, decisions})).toEqual({});
+    expect(await scaffoldVcs({projectRoot}, {prompt})).toEqual({});
   });
 });

package/src/options-schemas.js

@@ -1,3 +0,0 @@
-import joi from 'joi';
-
-export const decisionsSchema = joi.object();

package/src/options-schemas.test.js

@@ -1,20 +0,0 @@
-import {validateOptions} from '@form8ion/core';
-
-import {describe, expect, it} from 'vitest';
-import any from '@travi/any';
-
-import {decisionsSchema} from './options-schemas.js';
-
-describe('generic options schemas', () => {
-  describe('decisions', () => {
-    it('should return the validated options', () => {
-      const options = any.simpleObject();
-
-      expect(validateOptions(decisionsSchema, options)).toEqual(options);
-    });
-
-    it('should require the decisions to be defined as a map', () => {
-      expect(() => validateOptions(decisionsSchema, any.word())).toThrowError('must be of type object');
-    });
-  });
-});