refactor(repository): leverage extracted github plugin for scaffoldin…

…g repo

package.json

@@ -49,6 +49,7 @@
     }
   },
   "dependencies": {
+    "@form8ion/github": "^1.0.0-alpha.3",
     "@form8ion/overridable-prompts": "^1.1.0",
     "@form8ion/repository-settings": "^1.0.0-alpha.1",
     "@octokit/rest": "^20.0.0",

src/scaffolder.js

@@ -1,9 +1,9 @@
 import {info} from '@travi/cli-messages';
 import {scaffold as scaffoldSettings} from '@form8ion/repository-settings';
+import {scaffold as scaffoldGithub} from '@form8ion/github';
 
-import create from './create';
-import {factory} from './github-client-factory';
-import nextStepsAdder from './next-steps';
+import {factory} from './github-client-factory.js';
+import nextStepsAdder from './next-steps.js';
 
 export async function scaffold({name, owner, projectRoot, description, homepage, visibility, tags, nextSteps}) {
   info('Generating GitHub');
@@ -12,7 +12,7 @@ export async function scaffold({name, owner, projectRoot, description, homepage,
 
   const [, creationResult] = await Promise.all([
     scaffoldSettings({projectRoot, projectName: name, description, homepage, visibility, topics: tags}),
-    ...octokit ? [create(name, owner, visibility, octokit)] : []
+    scaffoldGithub({name, owner, visibility})
   ]);
 
   const nextStepsResult = await nextStepsAdder(octokit, nextSteps, name, owner);

src/scaffolder.test.js

@@ -1,16 +1,18 @@
+import {scaffold as scaffoldGithub} from '@form8ion/github';
+import {scaffold as scaffoldSettings} from '@form8ion/repository-settings';
+
 import {afterEach, describe, expect, it, vi} from 'vitest';
 import any from '@travi/any';
 import {when} from 'jest-when';
 
-import * as creator from './create';
-import * as clientFactory from './github-client-factory';
-import * as nextSteps from './next-steps';
-import {scaffold} from './scaffolder';
+import * as clientFactory from './github-client-factory.js';
+import * as nextSteps from './next-steps.js';
+import {scaffold} from './scaffolder.js';
 
 vi.mock('@form8ion/repository-settings');
-vi.mock('./create');
-vi.mock('./github-client-factory');
-vi.mock('./next-steps');
+vi.mock('@form8ion/github');
+vi.mock('./github-client-factory.js');
+vi.mock('./next-steps.js');
 
 describe('github', () => {
   const projectRoot = any.string();
@@ -30,8 +32,8 @@ describe('github', () => {
     const octokitClient = any.simpleObject();
     const topics = any.listOf(any.word);
     const providedNextSteps = any.listOf(any.simpleObject);
-    when(creator.default)
-      .calledWith(projectName, projectOwner, visibility, octokitClient)
+    when(scaffoldGithub)
+      .calledWith({name: projectName, owner: projectOwner, visibility})
       .mockResolvedValue(creationResult);
     when(nextSteps.default)
       .calledWith(octokitClient, providedNextSteps, projectName, projectOwner)
@@ -48,18 +50,7 @@ describe('github', () => {
       tags: topics,
       nextSteps: providedNextSteps
     })).toEqual({...creationResult, ...nextStepsResult});
-  });
-
-  it('should not create the repo if an octokit client is not available', async () => {
-    clientFactory.factory.mockReturnValue(undefined);
-
-    expect(await scaffold({
-      projectRoot,
-      name: projectName,
-      owner: projectOwner,
-      description,
-      homepage,
-      visibility
-    })).toEqual({});
+    expect(scaffoldSettings)
+      .toHaveBeenCalledWith({projectRoot, projectName, description, homepage, visibility, topics});
   });
 });