canopycms 0.0.0 → 0.0.2

package/src/api/branch-status.test.ts

@@ -1,85 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import type { BranchName } from '../paths/types'
-
-const mockMetadataUpdate = vi.fn().mockResolvedValue({
-  schemaVersion: 1,
-  branch: {
-    name: 'feature/x',
-    status: 'submitted',
-    access: {},
-    createdBy: 'u1',
-    createdAt: 'now',
-    updatedAt: 'now',
-  },
-})
-
-vi.mock('../branch-metadata', () => ({
-  BranchMetadataFileManager: vi.fn().mockImplementation(() => ({
-    save: mockMetadataUpdate,
-  })),
-  getBranchMetadataFileManager: vi.fn().mockImplementation(() => ({
-    save: mockMetadataUpdate,
-  })),
-}))
-
-import { WORKFLOW_ROUTES } from './branch-status'
-import { createMockApiContext, createMockBranchContext, createMockGitManager } from '../test-utils'
-
-// Extract handlers for testing
-const getBranchStatus = WORKFLOW_ROUTES.getStatus.handler
-const submitBranchForMerge = WORKFLOW_ROUTES.submit.handler
-
-const baseContext = createMockBranchContext({
-  branchName: 'feature/x',
-  createdBy: 'u1',
-})
-
-const makeCtx = (allowed = true) => {
-  const mockGit = createMockGitManager()
-  mockGit.status.mockResolvedValue({
-    files: [{ path: 'content/home.json' } as any],
-    ahead: 0,
-    behind: 0,
-    current: 'feature/x',
-  })
-
-  return createMockApiContext({
-    branchContext: baseContext,
-    allowBranchAccess: allowed,
-    services: {
-      createGitManagerFor: vi.fn().mockReturnValue(mockGit),
-      config: { defaultBranchAccess: 'allow' } as any,
-    },
-  })
-}
-
-describe('branch status api', () => {
-  it('gets status', async () => {
-    const res = await getBranchStatus(
-      makeCtx(),
-      { user: { type: 'authenticated', userId: 'u1', groups: [] } },
-      { branch: 'feature/x' as BranchName },
-    )
-    expect(res.ok).toBe(true)
-    expect(res.data?.branch.name).toBe('feature/x')
-  })
-
-  it('denies submit when access forbidden', async () => {
-    // User 'u2' is not the creator (u1) and has no ACL access
-    const res = await submitBranchForMerge(
-      makeCtx(false),
-      { user: { type: 'authenticated', userId: 'u2', groups: [] } },
-      { branch: 'feature/x' as BranchName },
-    )
-    expect(res.status).toBe(403)
-  })
-
-  it('submits branch when allowed', async () => {
-    const res = await submitBranchForMerge(
-      makeCtx(true),
-      { user: { type: 'authenticated', userId: 'u1', groups: [] } },
-      { branch: 'feature/x' as BranchName },
-    )
-    expect(res.ok).toBe(true)
-  })
-})

package/src/api/branch-status.ts

@@ -1,153 +0,0 @@
-import { z } from 'zod'
-import { branchNameSchema } from './validators'
-import type { ApiContext, ApiRequest } from './types'
-import type { BranchContext } from '../types'
-import type { BranchResponse } from './branch'
-import { getBranchMetadataFileManager } from '../branch-metadata'
-import { withdrawBranch } from './branch-withdraw'
-import { requestChanges, approveBranch } from './branch-review'
-import { markAsMerged } from './branch-merge'
-import { defineEndpoint } from './route-builder'
-import { canPerformWorkflowAction } from '../authorization'
-import { syncSubmitPr } from './github-sync'
-
-// Re-export for client generation
-export type { BranchMergeResponse } from './branch-merge'
-
-// ============================================================================
-// Zod Schemas for Validation
-// ============================================================================
-
-const branchParamSchema = z.object({
-  branch: branchNameSchema,
-})
-
-const getBranchStatusHandler = async (
-  gc: { branchContext: BranchContext },
-  _ctx: ApiContext,
-  _req: ApiRequest,
-  _params: z.infer<typeof branchParamSchema>,
-): Promise<BranchResponse> => {
-  const { branchContext } = gc
-
-  return { ok: true, status: 200, data: { branch: branchContext.branch } }
-}
-
-const submitBranchForMergeHandler = async (
-  gc: { branchContext: BranchContext },
-  ctx: ApiContext,
-  req: ApiRequest,
-  _params: z.infer<typeof branchParamSchema>,
-): Promise<BranchResponse> => {
-  const { branchContext } = gc
-
-  // Check if user can perform workflow actions (creator OR ACL access)
-  const defaultAccess = ctx.services.config.defaultBranchAccess ?? 'deny'
-  const canSubmit = canPerformWorkflowAction(branchContext, req.user, defaultAccess)
-  if (!canSubmit) {
-    return {
-      ok: false,
-      status: 403,
-      error: 'Only the branch creator or users with explicit branch access can submit this branch',
-    }
-  }
-
-  // Commit and push changes
-  try {
-    await ctx.services.submitBranch({ context: branchContext })
-  } catch (err) {
-    const message = err instanceof Error ? err.message : 'Failed to push branch changes'
-    return {
-      ok: false,
-      status: 500,
-      error: `Failed to push branch changes (${branchContext.branchRoot}): ${message}`,
-    }
-  }
-
-  // Create or update PR (sync via githubService, or async via task queue)
-  const prResult = await syncSubmitPr(ctx, branchContext)
-
-  // Update metadata with status and PR info
-  const meta = getBranchMetadataFileManager(branchContext.branchRoot, branchContext.baseRoot)
-  const updated = await meta.save({
-    branch: {
-      name: branchContext.branch.name,
-      status: 'submitted',
-      pullRequestUrl: prResult.prUrl ?? branchContext.branch.pullRequestUrl,
-      pullRequestNumber: prResult.prNumber ?? branchContext.branch.pullRequestNumber,
-      ...(prResult.syncStatus !== undefined ? { syncStatus: prResult.syncStatus } : {}),
-    },
-  })
-
-  return { ok: true, status: 200, data: { branch: updated.branch } }
-}
-
-// ============================================================================
-// Route Definitions with defineEndpoint
-// ============================================================================
-
-/**
- * Get branch status
- * GET /:branch/status
- */
-const getBranchStatus = defineEndpoint({
-  namespace: 'workflow',
-  name: 'getStatus',
-  method: 'GET',
-  path: '/:branch/status',
-  params: branchParamSchema,
-  responseType: 'BranchResponse',
-  response: {} as BranchResponse,
-  defaultMockData: {
-    branch: {
-      name: 'test-branch',
-      status: 'editing',
-      access: {},
-      createdBy: 'user-1',
-      createdAt: '2024-01-01',
-      updatedAt: '2024-01-01',
-    },
-  },
-  guards: ['branchAccess'] as const,
-  handler: getBranchStatusHandler,
-})
-
-/**
- * Submit branch for merge/review
- * POST /:branch/submit
- */
-const submitBranchForMerge = defineEndpoint({
-  namespace: 'workflow',
-  name: 'submit',
-  method: 'POST',
-  path: '/:branch/submit',
-  params: branchParamSchema,
-  responseType: 'BranchResponse',
-  response: {} as BranchResponse,
-  defaultMockData: {
-    branch: {
-      name: 'test-branch',
-      status: 'submitted',
-      access: {},
-      createdBy: 'user-1',
-      createdAt: '2024-01-01',
-      updatedAt: '2024-01-01',
-    },
-  },
-  // Branch-level access not checked here — handler uses canPerformWorkflowAction() for
-  // finer-grained authorization (creator OR ACL access).
-  guards: ['branch'] as const,
-  handler: submitBranchForMergeHandler,
-})
-
-/**
- * Exported routes for router registration
- */
-export const WORKFLOW_ROUTES = {
-  getStatus: getBranchStatus,
-  submit: submitBranchForMerge,
-  withdraw: withdrawBranch,
-  requestChanges: requestChanges,
-  approve: approveBranch,
-  markMerged: markAsMerged,
-} as const

package/src/api/branch-withdraw.test.ts

@@ -1,146 +0,0 @@
-import { describe, expect, it, vi } from 'vitest'
-import type { BranchName } from '../paths/types'
-
-const mockMetadataSave = vi.fn().mockResolvedValue({
-  schemaVersion: 1,
-  branch: {
-    name: 'feature/x',
-    status: 'editing',
-    access: {},
-    createdBy: 'u1',
-    createdAt: 'now',
-    updatedAt: 'now',
-    pullRequestNumber: 123,
-    pullRequestUrl: 'https://github.com/owner/repo/pull/123',
-  },
-})
-
-vi.mock('../branch-metadata', () => ({
-  BranchMetadataFileManager: vi.fn().mockImplementation(() => ({
-    save: mockMetadataSave,
-  })),
-  getBranchMetadataFileManager: vi.fn().mockImplementation(() => ({
-    save: mockMetadataSave,
-  })),
-}))
-
-import { withdrawBranch } from './branch-withdraw'
-import { mockConsole, createMockApiContext, createMockBranchContext } from '../test-utils'
-
-// Extract handler for testing
-const withdrawHandler = withdrawBranch.handler
-
-const baseContext = createMockBranchContext({
-  branchName: 'feature/x',
-  status: 'submitted',
-  pullRequestNumber: 123,
-  pullRequestUrl: 'https://github.com/owner/repo/pull/123',
-  createdBy: 'u1',
-})
-
-const makeCtx = (allowed = true, githubService?: any) =>
-  createMockApiContext({
-    branchContext: baseContext,
-    allowBranchAccess: allowed,
-    services: {
-      ...(githubService && { githubService }),
-      config: { defaultBranchAccess: 'allow' } as any,
-    },
-  })
-
-describe('branch withdraw api', () => {
-  it('returns 404 if branch not found', async () => {
-    const ctx = makeCtx()
-    ctx.getBranchContext = vi.fn().mockResolvedValue(null)
-    const res = await withdrawHandler(
-      ctx,
-      { user: { type: 'authenticated', userId: 'u1', groups: [] } },
-      { branch: 'missing' as BranchName },
-    )
-    expect(res.status).toBe(404)
-    expect(res.error).toBe('Branch not found')
-  })
-
-  it('returns 403 if access forbidden', async () => {
-    // User 'u2' is not the creator (u1) and has no ACL access
-    const res = await withdrawHandler(
-      makeCtx(false),
-      { user: { type: 'authenticated', userId: 'u2', groups: [] } },
-      { branch: 'feature/x' as BranchName },
-    )
-    expect(res.status).toBe(403)
-    expect(res.error).toContain(
-      'Only the branch creator or users with explicit branch access can withdraw this branch',
-    )
-  })
-
-  it('returns 400 if branch not submitted', async () => {
-    const ctx = makeCtx()
-    ctx.getBranchContext = vi.fn().mockResolvedValue({
-      ...baseContext,
-      branch: { ...baseContext.branch, status: 'editing' },
-    })
-    const res = await withdrawHandler(
-      ctx,
-      { user: { type: 'authenticated', userId: 'u1', groups: [] } },
-      { branch: 'feature/x' as BranchName },
-    )
-    expect(res.status).toBe(400)
-    expect(res.error).toContain("Only 'submitted' branches can be withdrawn")
-  })
-
-  it('withdraws branch when allowed', async () => {
-    const res = await withdrawHandler(
-      makeCtx(true),
-      { user: { type: 'authenticated', userId: 'u1', groups: [] } },
-      { branch: 'feature/x' as BranchName },
-    )
-    expect(res.ok).toBe(true)
-    expect(res.status).toBe(200)
-  })
-
-  it('converts PR to draft if github service available', async () => {
-    const convertToDraft = vi.fn().mockResolvedValue(undefined)
-    const githubService = { convertToDraft }
-    const res = await withdrawHandler(
-      makeCtx(true, githubService),
-      { user: { type: 'authenticated', userId: 'u1', groups: [] } },
-      { branch: 'feature/x' as BranchName },
-    )
-    expect(res.ok).toBe(true)
-    expect(convertToDraft).toHaveBeenCalledWith(123)
-  })
-
-  it('handles github service errors gracefully', async () => {
-    const consoleSpy = mockConsole()
-    const convertToDraft = vi.fn().mockRejectedValue(new Error('API error'))
-    const githubService = { convertToDraft }
-    const res = await withdrawHandler(
-      makeCtx(true, githubService),
-      { user: { type: 'authenticated', userId: 'u1', groups: [] } },
-      { branch: 'feature/x' as BranchName },
-    )
-    // Should still succeed even if GitHub API fails
-    expect(res.ok).toBe(true)
-    expect(res.status).toBe(200)
-    expect(consoleSpy).toHaveErrored('Failed to convert PR to draft')
-    consoleSpy.restore()
-  })
-
-  it('skips PR conversion if no PR number', async () => {
-    const convertToDraft = vi.fn()
-    const githubService = { convertToDraft }
-    const ctx = makeCtx(true, githubService)
-    ctx.getBranchContext = vi.fn().mockResolvedValue({
-      ...baseContext,
-      branch: { ...baseContext.branch, pullRequestNumber: undefined },
-    })
-    const res = await withdrawHandler(
-      ctx,
-      { user: { type: 'authenticated', userId: 'u1', groups: [] } },
-      { branch: 'feature/x' as BranchName },
-    )
-    expect(res.ok).toBe(true)
-    expect(convertToDraft).not.toHaveBeenCalled()
-  })
-})

package/src/api/branch-withdraw.ts

@@ -1,81 +0,0 @@
-import { z } from 'zod'
-import { branchNameSchema } from './validators'
-import type { ApiContext, ApiRequest } from './types'
-import type { BranchContext } from '../types'
-import type { BranchResponse } from './branch'
-import { getBranchMetadataFileManager } from '../branch-metadata'
-import { defineEndpoint } from './route-builder'
-import { canPerformWorkflowAction } from '../authorization'
-import { syncConvertToDraft } from './github-sync'
-
-const branchParamSchema = z.object({
-  branch: branchNameSchema,
-})
-
-const withdrawBranchHandler = async (
-  gc: { branchContext: BranchContext },
-  ctx: ApiContext,
-  req: ApiRequest,
-  _params: z.infer<typeof branchParamSchema>,
-): Promise<BranchResponse> => {
-  const { branchContext } = gc
-
-  // Check if user can perform workflow actions (creator OR ACL access)
-  const defaultAccess = ctx.services.config.defaultBranchAccess ?? 'deny'
-  const canWithdraw = canPerformWorkflowAction(branchContext, req.user, defaultAccess)
-  if (!canWithdraw) {
-    return {
-      ok: false,
-      status: 403,
-      error:
-        'Only the branch creator or users with explicit branch access can withdraw this branch',
-    }
-  }
-
-  // Verify branch is in submitted status
-  if (branchContext.branch.status !== 'submitted') {
-    return {
-      ok: false,
-      status: 400,
-      error: `Cannot withdraw branch with status '${branchContext.branch.status}'. Only 'submitted' branches can be withdrawn.`,
-    }
-  }
-
-  // Convert PR to draft (sync via githubService, or async via task queue)
-  await syncConvertToDraft(ctx, branchContext)
-
-  // Update branch status to 'editing'
-  const meta = getBranchMetadataFileManager(branchContext.branchRoot, branchContext.baseRoot)
-
-  const updated = await meta.save({
-    branch: { name: branchContext.branch.name, status: 'editing' },
-  })
-
-  return { ok: true, status: 200, data: { branch: updated.branch } }
-}
-
-/**
- * Withdraw a submitted branch, converting the PR to draft and unlocking editing
- * POST /:branch/withdraw
- */
-export const withdrawBranch = defineEndpoint({
-  namespace: 'workflow',
-  name: 'withdraw',
-  method: 'POST',
-  path: '/:branch/withdraw',
-  params: branchParamSchema,
-  responseType: 'BranchResponse',
-  response: {} as BranchResponse,
-  defaultMockData: {
-    branch: {
-      name: 'test-branch',
-      status: 'editing',
-      access: {},
-      createdBy: 'user-1',
-      createdAt: '2024-01-01',
-      updatedAt: '2024-01-01',
-    },
-  },
-  guards: ['branch'] as const,
-  handler: withdrawBranchHandler,
-})