@sk8metal/michi-cli 0.0.9 → 0.2.0

package/scripts/__tests__/validate-phase.test.ts

@@ -5,11 +5,13 @@
 import { describe, it, expect, beforeEach, vi } from 'vitest';
 import { existsSync, readFileSync } from 'fs';
 import { validatePhase } from '../validate-phase.js';
+import { loadConfig } from '../utils/config-loader.js';
+import type { AppConfig } from '../config/config-schema.js';
 
 // fsモジュールのモック
 vi.mock('fs', () => ({
   existsSync: vi.fn(),
-  readFileSync: vi.fn()
+  readFileSync: vi.fn(),
 }));
 
 // project-metaのモック
@@ -17,8 +19,19 @@ vi.mock('../utils/project-meta.js', () => ({
   loadProjectMeta: vi.fn(() => ({
     projectId: 'test-project',
     projectName: 'テストプロジェクト',
-    jiraProjectKey: 'TEST'
-  }))
+    jiraProjectKey: 'TEST',
+  })),
+}));
+
+// config-loaderのモック
+vi.mock('../utils/config-loader.js', () => ({
+  loadConfig: vi.fn(() => ({
+    validation: {
+      weekdayNotation: true,
+      businessDayCount: true,
+      weekendExclusion: true,
+    },
+  })),
 }));
 
 describe('validatePhase', () => {
@@ -30,17 +43,19 @@ describe('validatePhase', () => {
     it('すべての必須項目が揃っている場合、validationが成功する', () => {
       // Arrange: requirementsフェーズを代表例としてテスト
       vi.mocked(existsSync).mockReturnValue(true);
-      vi.mocked(readFileSync).mockReturnValue(JSON.stringify({
-        confluence: {
-          spaceKey: 'TEST',
-          requirementsPageId: '12345'
-        },
-        milestones: {
-          requirements: {
-            completed: true
-          }
-        }
-      }));
+      vi.mocked(readFileSync).mockReturnValue(
+        JSON.stringify({
+          confluence: {
+            spaceKey: 'TEST',
+            requirementsPageId: '12345',
+          },
+          milestones: {
+            requirements: {
+              completed: true,
+            },
+          },
+        }),
+      );
 
       // Act
       const result = validatePhase('test-feature', 'requirements');
@@ -54,19 +69,23 @@ describe('validatePhase', () => {
     it('Confluenceページが作成されていない場合、エラーを返す', () => {
       // Arrange
       vi.mocked(existsSync).mockReturnValue(true);
-      vi.mocked(readFileSync).mockReturnValue(JSON.stringify({
-        confluence: {
-          spaceKey: 'TEST'
-          // requirementsPageId が存在しない
-        }
-      }));
+      vi.mocked(readFileSync).mockReturnValue(
+        JSON.stringify({
+          confluence: {
+            spaceKey: 'TEST',
+            // requirementsPageId が存在しない
+          },
+        }),
+      );
 
       // Act
       const result = validatePhase('test-feature', 'requirements');
 
       // Assert
       expect(result.valid).toBe(false);
-      expect(result.errors).toContain('❌ Confluenceページ（要件定義）が作成されていません');
+      expect(result.errors).toContain(
+        '❌ Confluenceページ（要件定義）が作成されていません',
+      );
     });
   });
 
@@ -74,23 +93,27 @@ describe('validatePhase', () => {
     it('designフェーズ: 前提条件（requirements完了）をチェックする', () => {
       // Arrange
       vi.mocked(existsSync).mockReturnValue(true);
-      vi.mocked(readFileSync).mockReturnValue(JSON.stringify({
-        confluence: {
-          designPageId: '67890'
-        },
-        milestones: {
-          requirements: {
-            completed: false // 前提条件が満たされていない
-          }
-        }
-      }));
+      vi.mocked(readFileSync).mockReturnValue(
+        JSON.stringify({
+          confluence: {
+            designPageId: '67890',
+          },
+          milestones: {
+            requirements: {
+              completed: false, // 前提条件が満たされていない
+            },
+          },
+        }),
+      );
 
       // Act
       const result = validatePhase('test-feature', 'design');
 
       // Assert
       expect(result.valid).toBe(false);
-      expect(result.errors).toContain('❌ 要件定義が完了していません（前提条件）');
+      expect(result.errors).toContain(
+        '❌ 要件定義が完了していません（前提条件）',
+      );
     });
 
     it('tasksフェーズ: JIRA Epic/Story作成をチェックする', () => {
@@ -103,12 +126,12 @@ describe('validatePhase', () => {
         return JSON.stringify({
           milestones: {
             design: {
-              completed: true
-            }
+              completed: true,
+            },
           },
           jira: {
             // epicKey が存在しない（重要なチェック）
-          }
+          },
         });
       });
 
@@ -130,16 +153,16 @@ describe('validatePhase', () => {
         return JSON.stringify({
           milestones: {
             design: {
-              completed: true
-            }
+              completed: true,
+            },
           },
           jira: {
             epicKey: 'TEST-1',
             stories: {
               created: 5,
-              total: 5
-            }
-          }
+              total: 5,
+            },
+          },
         });
       });
 
@@ -148,7 +171,96 @@ describe('validatePhase', () => {
 
       // Assert
       expect(result.valid).toBe(true); // 警告だけなのでvalid
-      expect(result.warnings).toContain('⚠️  tasks.mdに曜日表記（月、火、水...）が含まれていません');
+      expect(result.warnings).toContain(
+        '⚠️  tasks.mdに曜日表記（月、火、水...）が含まれていません',
+      );
+    });
+
+    it('tasksフェーズ: 日本語曜日表記を受け入れる', () => {
+      // Arrange
+      vi.mocked(existsSync).mockReturnValue(true);
+      vi.mocked(readFileSync).mockImplementation((path) => {
+        if (String(path).includes('tasks.md')) {
+          return 'Day 1（月）:\n  - タスク1\nDay 2（火）:\n  - タスク2\n土日休み';
+        }
+        return JSON.stringify({
+          milestones: { design: { completed: true } },
+          jira: { epicKey: 'TEST-1', storyKeys: ['TEST-2'] },
+        });
+      });
+      vi.mocked(loadConfig).mockReturnValue({
+        validation: {
+          weekdayNotation: true,
+          businessDayCount: true,
+          weekendExclusion: true,
+        },
+      } as Partial<AppConfig> as AppConfig);
+
+      // Act
+      const result = validatePhase('test-feature', 'tasks');
+
+      // Assert
+      expect(result.warnings).not.toContain(
+        '⚠️  tasks.mdに曜日表記（月、火、水...）が含まれていません',
+      );
+    });
+
+    it('tasksフェーズ: 英語曜日表記を受け入れる', () => {
+      // Arrange
+      vi.mocked(existsSync).mockReturnValue(true);
+      vi.mocked(readFileSync).mockImplementation((path) => {
+        if (String(path).includes('tasks.md')) {
+          return 'Day 1 (Mon):\n  - Task 1\nDay 2 (Tue):\n  - Task 2\nWeekends excluded';
+        }
+        return JSON.stringify({
+          milestones: { design: { completed: true } },
+          jira: { epicKey: 'TEST-1', storyKeys: ['TEST-2'] },
+        });
+      });
+      vi.mocked(loadConfig).mockReturnValue({
+        validation: {
+          weekdayNotation: true,
+          businessDayCount: true,
+          weekendExclusion: true,
+        },
+      } as Partial<AppConfig> as AppConfig);
+
+      // Act
+      const result = validatePhase('test-feature', 'tasks');
+
+      // Assert
+      expect(result.warnings).not.toContain(
+        '⚠️  tasks.mdに曜日表記（月、火、水...）が含まれていません',
+      );
+    });
+
+    it('tasksフェーズ: バリデーション無効化設定を尊重する', () => {
+      // Arrange
+      vi.mocked(existsSync).mockReturnValue(true);
+      vi.mocked(readFileSync).mockImplementation((path) => {
+        if (String(path).includes('tasks.md')) {
+          return 'タスク一覧（曜日表記なし）'; // 営業日表記がない
+        }
+        return JSON.stringify({
+          milestones: { design: { completed: true } },
+          jira: { epicKey: 'TEST-1', storyKeys: ['TEST-2'] },
+        });
+      });
+      vi.mocked(loadConfig).mockReturnValue({
+        validation: {
+          weekdayNotation: false, // バリデーション無効化
+          businessDayCount: true,
+          weekendExclusion: true,
+        },
+      } as Partial<AppConfig> as AppConfig);
+
+      // Act
+      const result = validatePhase('test-feature', 'tasks');
+
+      // Assert
+      expect(result.warnings).not.toContain(
+        '⚠️  tasks.mdに曜日表記（月、火、水...）が含まれていません',
+      );
     });
   });
 
@@ -156,30 +268,42 @@ describe('validatePhase', () => {
     it('spec.jsonが存在しない場合、エラーを返す', () => {
       // Arrange
       // requirements.mdは存在するが、spec.jsonは存在しない
-      vi.mocked(existsSync).mockImplementation((path: string | Buffer | URL) => {
-        const pathStr = typeof path === 'string' ? path : path instanceof URL ? path.pathname : path.toString();
-        if (pathStr.includes('requirements.md')) {
-          return true;
-        }
-        if (pathStr.includes('spec.json')) {
+      vi.mocked(existsSync).mockImplementation(
+        (path: string | Buffer | URL) => {
+          const pathStr =
+            typeof path === 'string'
+              ? path
+              : path instanceof URL
+                ? path.pathname
+                : path.toString();
+          if (pathStr.includes('requirements.md')) {
+            return true;
+          }
+          if (pathStr.includes('spec.json')) {
+            return false;
+          }
           return false;
-        }
-        return false;
-      });
+        },
+      );
 
       // Act
       const result = validatePhase('test-feature', 'requirements');
 
       // Assert: エラーをスローせず、errors配列にエラーを含めて返す
       expect(result.valid).toBe(false);
-      expect(result.errors).toContainEqual(expect.stringContaining('spec.json読み込みエラー'));
-      expect(result.errors).toContainEqual(expect.stringContaining('spec.json not found'));
+      expect(result.errors).toContainEqual(
+        expect.stringContaining('spec.json読み込みエラー'),
+      );
+      expect(result.errors).toContainEqual(
+        expect.stringContaining('spec.json not found'),
+      );
     });
 
     it('不正なフェーズ名の場合、エラーをスローする', () => {
       // Act & Assert
-      expect(() => validatePhase('test-feature', 'invalid' as any)).toThrow('Unknown phase: invalid');
+      expect(() =>
+        validatePhase('test-feature', 'invalid' as 'requirements'),
+      ).toThrow('Unknown phase: invalid');
     });
   });
 });
-

package/scripts/config/config-schema.ts

@@ -17,7 +17,7 @@ export const ConfluencePageCreationGranularitySchema = z.enum([
   'single',
   'by-section',
   'by-hierarchy',
-  'manual'
+  'manual',
 ]);
 
 /**
@@ -27,41 +27,54 @@ export const ConfluenceHierarchyStructureSchema = z.object({
   mode: ConfluenceHierarchyModeSchema.optional(),
   parentPageTitle: z.string().optional(),
   createDocTypeParents: z.boolean().optional(),
-  structure: z.record(
-    z.string(),
-    z.object({
-      parent: z.string().optional(),
-      title: z.string().optional(),
-      children: z.array(
-        z.object({
-          section: z.string(),
-          title: z.string()
-        })
-      ).optional(),
-      pages: z.array(
-        z.object({
-          title: z.string(),
-          sections: z.array(z.string()),
-          labels: z.array(z.string()).optional()
-        })
-      ).optional()
-    })
-  ).optional()
+  structure: z
+    .record(
+      z.string(),
+      z.object({
+        parent: z.string().optional(),
+        title: z.string().optional(),
+        children: z
+          .array(
+            z.object({
+              section: z.string(),
+              title: z.string(),
+            }),
+          )
+          .optional(),
+        pages: z
+          .array(
+            z.object({
+              title: z.string(),
+              sections: z.array(z.string()),
+              labels: z.array(z.string()).optional(),
+            }),
+          )
+          .optional(),
+      }),
+    )
+    .optional(),
 });
 
 /**
  * Confluence設定スキーマ
  */
 export const ConfluenceConfigSchema = z.object({
-  pageCreationGranularity: ConfluencePageCreationGranularitySchema.default('single'),
-  pageTitleFormat: z.string().default('[{projectName}] {featureName} {docTypeLabel}'),
-  autoLabels: z.array(z.string()).default(['{projectLabel}', '{docType}', '{featureName}', 'github-sync']),
-  spaces: z.object({
-    requirements: z.string().optional(),
-    design: z.string().optional(),
-    tasks: z.string().optional()
-  }).optional(),
-  hierarchy: ConfluenceHierarchyStructureSchema.optional()
+  pageCreationGranularity:
+    ConfluencePageCreationGranularitySchema.default('single'),
+  pageTitleFormat: z
+    .string()
+    .default('[{projectName}] {featureName} {docTypeLabel}'),
+  autoLabels: z
+    .array(z.string())
+    .default(['{projectLabel}', '{docType}', '{featureName}', 'github-sync']),
+  spaces: z
+    .object({
+      requirements: z.string().optional(),
+      design: z.string().optional(),
+      tasks: z.string().optional(),
+    })
+    .optional(),
+  hierarchy: ConfluenceHierarchyStructureSchema.optional(),
 });
 
 /**
@@ -70,7 +83,7 @@ export const ConfluenceConfigSchema = z.object({
 export const JiraStoryCreationGranularitySchema = z.enum([
   'all',
   'by-phase',
-  'selected-phases'
+  'selected-phases',
 ]);
 
 /**
@@ -78,6 +91,15 @@ export const JiraStoryCreationGranularitySchema = z.enum([
  */
 export const JiraStoryPointsSchema = z.enum(['auto', 'manual', 'disabled']);
 
+/**
+ * JIRA ステータスマッピングスキーマ
+ * spec-impl ワークフローで使用するステータス名
+ */
+export const JiraStatusMappingSchema = z.object({
+  inProgress: z.string().default('In Progress'),
+  readyForReview: z.string().default('Ready for Review'),
+});
+
 /**
  * JIRA設定スキーマ
  */
@@ -85,25 +107,43 @@ export const JiraConfigSchema = z.object({
   storyCreationGranularity: JiraStoryCreationGranularitySchema.default('all'),
   createEpic: z.boolean().default(true),
   storyPoints: JiraStoryPointsSchema.default('auto'),
-  autoLabels: z.array(z.string()).default(['{projectLabel}', '{featureName}', '{phaseLabel}']),
-  issueTypes: z.object({
-    epic: z.string().default('Epic'),
-    story: z.string().nullish().default(null),  // null | undefined | string
-    subtask: z.string().nullish().default(null)  // null | undefined | string
-  }).optional(),
-  selectedPhases: z.array(z.string()).optional()
+  autoLabels: z
+    .array(z.string())
+    .default(['{projectLabel}', '{featureName}', '{phaseLabel}']),
+  issueTypes: z
+    .object({
+      epic: z.string().default('Epic'),
+      story: z.string().nullish().default(null), // null | undefined | string
+      subtask: z.string().nullish().default(null), // null | undefined | string
+    })
+    .optional(),
+  selectedPhases: z.array(z.string()).optional(),
+  statusMapping: JiraStatusMappingSchema.optional(),
 });
 
 /**
  * ワークフロー設定スキーマ
  */
 export const WorkflowConfigSchema = z.object({
-  enabledPhases: z.array(z.string()).default(['requirements', 'design', 'tasks']),
-  approvalGates: z.object({
-    requirements: z.array(z.string()).optional(),
-    design: z.array(z.string()).optional(),
-    release: z.array(z.string()).optional()
-  }).optional()
+  enabledPhases: z
+    .array(z.string())
+    .default(['requirements', 'design', 'tasks']),
+  approvalGates: z
+    .object({
+      requirements: z.array(z.string()).optional(),
+      design: z.array(z.string()).optional(),
+      release: z.array(z.string()).optional(),
+    })
+    .optional(),
+});
+
+/**
+ * バリデーション設定スキーマ
+ */
+export const ValidationConfigSchema = z.object({
+  weekdayNotation: z.boolean().default(true),
+  businessDayCount: z.boolean().default(true),
+  weekendExclusion: z.boolean().default(true),
 });
 
 /**
@@ -112,19 +152,29 @@ export const WorkflowConfigSchema = z.object({
 export const AppConfigSchema = z.object({
   confluence: ConfluenceConfigSchema.optional(),
   jira: JiraConfigSchema.optional(),
-  workflow: WorkflowConfigSchema.optional()
+  workflow: WorkflowConfigSchema.optional(),
+  validation: ValidationConfigSchema.optional(),
 });
 
 /**
  * 設定の型定義
  */
-export type ConfluenceHierarchyMode = z.infer<typeof ConfluenceHierarchyModeSchema>;
-export type ConfluencePageCreationGranularity = z.infer<typeof ConfluencePageCreationGranularitySchema>;
-export type ConfluenceHierarchyStructure = z.infer<typeof ConfluenceHierarchyStructureSchema>;
+export type ConfluenceHierarchyMode = z.infer<
+  typeof ConfluenceHierarchyModeSchema
+>;
+export type ConfluencePageCreationGranularity = z.infer<
+  typeof ConfluencePageCreationGranularitySchema
+>;
+export type ConfluenceHierarchyStructure = z.infer<
+  typeof ConfluenceHierarchyStructureSchema
+>;
 export type ConfluenceConfig = z.infer<typeof ConfluenceConfigSchema>;
-export type JiraStoryCreationGranularity = z.infer<typeof JiraStoryCreationGranularitySchema>;
+export type JiraStoryCreationGranularity = z.infer<
+  typeof JiraStoryCreationGranularitySchema
+>;
 export type JiraStoryPoints = z.infer<typeof JiraStoryPointsSchema>;
+export type JiraStatusMapping = z.infer<typeof JiraStatusMappingSchema>;
 export type JiraConfig = z.infer<typeof JiraConfigSchema>;
 export type WorkflowConfig = z.infer<typeof WorkflowConfigSchema>;
+export type ValidationConfig = z.infer<typeof ValidationConfigSchema>;
 export type AppConfig = z.infer<typeof AppConfigSchema>;
-