@charcoal-ui/icons-cli 2.0.0-rc.1 → 2.0.0

package/src/GitHubClient.ts

@@ -1,4 +1,5 @@
 import { Octokit } from '@octokit/rest'
+import path from 'path'
 import { getChangedFiles } from './getChangedFiles'
 
 type RefResponse = ReturnType<GithubClient['createBranch']> extends Promise<
@@ -23,11 +24,12 @@ export class GithubClient {
     repoOwner: string,
     repoName: string,
     token: string,
-    defaultBranch: string
+    defaultBranch: string,
+    outputDir: string
   ) {
     const client = new this(repoOwner, repoName, token, defaultBranch)
-
-    const diff = await client.createTreeFromDiff()
+    const outputDirFullPath = path.resolve(process.cwd(), outputDir)
+    const diff = await client.createTreeFromDiff(outputDirFullPath)
     // eslint-disable-next-line no-console
     console.log(`${diff.length} files are changed`)
     if (diff.length === 0) {
@@ -67,10 +69,10 @@ export class GithubClient {
     return `[icons-cli] Update icons ${this.now.toDateString()}`
   }
 
-  async createTreeFromDiff(): Promise<TreeItem[]> {
+  async createTreeFromDiff(outputDir: string): Promise<TreeItem[]> {
     const tree: TreeItem[] = []
 
-    for await (const file of getChangedFiles()) {
+    for await (const file of getChangedFiles(outputDir)) {
       const item = {
         path: file.relativePath,
         // 100 はファイル 644 は実行不可なファイルであるという意味

package/src/GitlabClient.ts

@@ -1,5 +1,6 @@
 import type { CommitAction } from '@gitbeaker/core/dist/types/services/Commits'
 import { Gitlab } from '@gitbeaker/node'
+import path from 'path'
 import { getChangedFiles } from './getChangedFiles'
 
 type GitlabApi = InstanceType<typeof Gitlab>
@@ -12,11 +13,12 @@ export class GitlabClient {
     host: string,
     projectId: number,
     privateToken: string,
-    defaultBranch: string
+    defaultBranch: string,
+    outputDir: string
   ) {
     const client = new this(host, projectId, privateToken, defaultBranch)
-
-    const diff = await client.createActionsFromDiff()
+    const outputDirFullPath = path.resolve(process.cwd(), outputDir)
+    const diff = await client.createActionsFromDiff(outputDirFullPath)
     // eslint-disable-next-line no-console
     console.log(`${diff.length} files are changed`)
     if (diff.length === 0) {
@@ -54,10 +56,10 @@ export class GitlabClient {
     return `[icons-cli] Update icons ${this.now.toDateString()}`
   }
 
-  async createActionsFromDiff(): Promise<CommitAction[]> {
+  async createActionsFromDiff(outputDir: string): Promise<CommitAction[]> {
     const actions: CommitAction[] = []
 
-    for await (const file of getChangedFiles()) {
+    for await (const file of getChangedFiles(outputDir)) {
       actions.push({
         action:
           file.status === 'untracked'

package/src/getChangedFiles.ts

@@ -2,12 +2,10 @@ import { promises as fs, existsSync } from 'fs'
 import path from 'path'
 import { execp } from './utils'
 
-export const targetDir = path.resolve(process.cwd(), 'packages', 'icons')
-
 /**
  * dir 内で変更があったファイル情報を for await で回せるようにするやつ
  */
-export async function* getChangedFiles(dir = targetDir) {
+export async function* getChangedFiles(dir: string) {
   if (!existsSync(dir))
     throw new Error(`icons-cli: target directory not found (${dir})`)
   const gitStatus = await collectGitStatus()

package/src/index.ts

@@ -99,12 +99,14 @@ void yargs
     async () => {
       mustBeDefined(GITLAB_PROJECT_ID, 'GITLAB_PROJECT_ID')
       mustBeDefined(GITLAB_ACCESS_TOKEN, 'GITLAB_ACCESS_TOKEN')
+      mustBeDefined(OUTPUT_ROOT_DIR, 'OUTPUT_ROOT_DIR')
 
       await GitlabClient.runFromCli(
         GITLAB_HOST ?? 'https://gitlab.com',
         Number(GITLAB_PROJECT_ID),
         GITLAB_ACCESS_TOKEN,
-        GITLAB_DEFAULT_BRANCH ?? 'main'
+        GITLAB_DEFAULT_BRANCH ?? 'main',
+        OUTPUT_ROOT_DIR
       )
     }
   )
@@ -114,12 +116,14 @@ void yargs
     {},
     async () => {
       mustBeDefined(GITHUB_ACCESS_TOKEN, 'GITHUB_ACCESS_TOKEN')
+      mustBeDefined(OUTPUT_ROOT_DIR, 'OUTPUT_ROOT_DIR')
 
       await GithubClient.runFromCli(
         GITHUB_REPO_OWNER ?? 'pixiv',
         GITHUB_REPO_NAME ?? 'charcoal',
         GITHUB_ACCESS_TOKEN,
-        GITHUB_DEFAULT_BRANCH ?? 'main'
+        GITHUB_DEFAULT_BRANCH ?? 'main',
+        OUTPUT_ROOT_DIR
       )
     }
   )