@foundation0/git 1.2.3 → 1.2.5

package/src/git-service-api.ts

@@ -3,6 +3,7 @@ import { getGitPlatformConfig, type GitPlatformConfig } from './platform/config'
 import { type GitServiceFlag, type GitServiceFeature, gitServiceFeatureSpec } from './git-service-feature-spec.generated'
 import { type GitApiFeatureMapping } from './platform/gitea-adapter'
 import { attachGitLabelManagementApi } from './label-management'
+import { attachGitActionsApi } from './actions-api'
 import { spawn } from 'node:child_process'
 import crypto from 'node:crypto'
 
@@ -41,7 +42,10 @@ export type GitServiceApi = {
 
 type ApiCallOptions = {
   method?: string
-  body?: unknown
+  requestBody?: unknown
+  requestJson?: unknown
+  requestData?: unknown
+  requestPayload?: unknown
   json?: unknown
   data?: unknown
   payload?: unknown
@@ -134,7 +138,18 @@ const mapFlagValues = (
     alias.set(canonical, flag.name)
   }
 
-  const reserved = new Set(['body', 'json', 'data', 'payload', 'headers', 'query', 'method'])
+  const reserved = new Set([
+    'json',
+    'data',
+    'payload',
+    'headers',
+    'query',
+    'method',
+    'requestbody',
+    'requestjson',
+    'requestdata',
+    'requestpayload',
+  ])
 
   for (const [key, value] of Object.entries(options)) {
     const normalizedKey = normalizeFlagLookup(key)
@@ -164,30 +179,28 @@ const mapFlagValues = (
 const buildRequestBody = (
   method: string,
   options: Record<string, unknown>,
-  unmappedOptions: Record<string, unknown>,
+  defaultBody: Record<string, unknown>,
 ): unknown | undefined => {
-  if (!['POST', 'PUT', 'PATCH', 'DELETE'].includes(method.toUpperCase())) {
-    return undefined
-  }
-
-  if (options.body !== undefined) {
-    return options.body
-  }
-
-  if (options.json !== undefined) {
-    return options.json
-  }
+  const normalizedMethod = method.toUpperCase()
+  const explicit =
+    options.requestBody ??
+    options.requestJson ??
+    options.requestData ??
+    options.requestPayload ??
+    options.json ??
+    options.data ??
+    options.payload
 
-  if (options.data !== undefined) {
-    return options.data
+  if (explicit !== undefined) {
+    return explicit
   }
 
-  if (options.payload !== undefined) {
-    return options.payload
+  if (!['POST', 'PUT', 'PATCH'].includes(normalizedMethod)) {
+    return undefined
   }
 
-  if (Object.keys(unmappedOptions).length > 0) {
-    return unmappedOptions
+  if (Object.keys(defaultBody).length > 0) {
+    return defaultBody
   }
 
   return undefined
@@ -240,6 +253,48 @@ const canUseAbortSignalTimeout = (): boolean =>
 const isTestRuntime = (): boolean =>
   Boolean(process.env.VITEST) || process.env.NODE_ENV === 'test'
 
+const toQueryRecord = (raw: Record<string, unknown>): Record<string, string | number | boolean> => {
+  const query: Record<string, string | number | boolean> = {}
+  for (const [key, value] of Object.entries(raw)) {
+    if (typeof value === 'string') {
+      query[key] = value
+      continue
+    }
+    if (typeof value === 'number' && Number.isFinite(value)) {
+      query[key] = value
+      continue
+    }
+    if (typeof value === 'boolean') {
+      query[key] = value
+    }
+  }
+  return query
+}
+
+const buildDefaultWriteBody = (options: Record<string, unknown>): Record<string, unknown> => {
+  const reserved = new Set([
+    'headers',
+    'query',
+    'method',
+    'requestBody',
+    'requestJson',
+    'requestData',
+    'requestPayload',
+    'json',
+    'data',
+    'payload',
+  ])
+
+  const body: Record<string, unknown> = {}
+  for (const [key, value] of Object.entries(options)) {
+    if (reserved.has(key)) continue
+    if (value !== undefined) {
+      body[key] = value
+    }
+  }
+  return body
+}
+
 const resolveHttpTransport = (requested?: string): 'fetch' | 'curl' => {
   const normalized = (requested ?? '').trim().toLowerCase()
   if (normalized === 'fetch' || normalized === 'curl') {
@@ -364,17 +419,33 @@ const createMethod = (
 ): GitServiceApiMethod => {
   return async (...rawArgs: unknown[]) => {
     const { args, options } = splitArgsAndOptions(rawArgs)
-    const { flags, unhandled } = mapFlagValues(feature, options)
     const { query: additionalQuery, method: methodOverride, ...bodyOptions } = (options as ApiCallOptions)
 
-    const mapping = await adapter.mapFeature({
+    const baseMapping = await adapter.mapFeature({
       feature,
       args,
-      flagValues: flags,
+      flagValues: {},
       method: methodOverride,
     })
+    const normalizedMethod = baseMapping.method.toUpperCase()
+
+    const { mapping, extraQuery } = normalizedMethod === 'GET'
+      ? (() => {
+          const { flags, unhandled } = mapFlagValues(feature, options)
+          return {
+            mapping: adapter.mapFeature({ feature, args, flagValues: flags, method: methodOverride }),
+            extraQuery: toQueryRecord(unhandled),
+          }
+        })()
+      : { mapping: Promise.resolve(baseMapping), extraQuery: {} }
+
+    const resolvedMapping = await mapping
+    const mergedQuery = {
+      ...(additionalQuery ?? {}),
+      ...(normalizedMethod === 'GET' ? extraQuery : {}),
+    }
 
-    const hydratedPath = mapping.mappedPath.map((segment) => {
+    const hydratedPath = resolvedMapping.mappedPath.map((segment) => {
       if (segment === '{owner}' && defaults.defaultOwner) {
         return defaults.defaultOwner
       }
@@ -387,9 +458,13 @@ const createMethod = (
     })
     assertResolvedMappedPath(hydratedPath, feature.path)
 
-    const requestBody = buildRequestBody(mapping.method, bodyOptions, unhandled)
+    const requestBody = buildRequestBody(
+      resolvedMapping.method,
+      bodyOptions,
+      normalizedMethod === 'GET' ? {} : buildDefaultWriteBody(options),
+    )
     const headers = {
-      ...toHeaderRecord(mapping.headers),
+      ...toHeaderRecord(resolvedMapping.headers),
       ...(options.headers ?? {}),
     }
 
@@ -397,15 +472,15 @@ const createMethod = (
       headers['Content-Type'] = 'application/json'
     }
 
-    const requestUrl = buildUrl(mapping.apiBase, hydratedPath, mapping.query, additionalQuery ?? {})
+    const requestUrl = buildUrl(resolvedMapping.apiBase, hydratedPath, resolvedMapping.query, mergedQuery)
     const requestInit: RequestInit = {
-      method: mapping.method,
+      method: resolvedMapping.method,
       headers,
       body: requestBody !== undefined ? JSON.stringify(requestBody) : undefined,
     }
 
     const startedAt = Date.now()
-    log?.(`http:request ${mapping.method} ${requestUrl}`)
+    log?.(`http:request ${resolvedMapping.method} ${requestUrl}`)
     try {
       const responseHeaders: Record<string, string> = {}
       let status = 0
@@ -416,7 +491,7 @@ const createMethod = (
         const curlResult = await callCurl(
           requestUrl,
           {
-            method: mapping.method,
+            method: resolvedMapping.method,
             headers,
             ...(requestInit.body !== undefined ? { body: String(requestInit.body) } : {}),
           },
@@ -465,7 +540,7 @@ const createMethod = (
           }
         } catch (error) {
           if ((timeoutSignal && timeoutSignal.aborted) || controller?.signal.aborted) {
-            throw new Error(`Request timed out after ${requestTimeoutMs}ms: ${mapping.method} ${requestUrl}`)
+            throw new Error(`Request timed out after ${requestTimeoutMs}ms: ${resolvedMapping.method} ${requestUrl}`)
           }
           throw error
         } finally {
@@ -475,17 +550,17 @@ const createMethod = (
         }
       }
 
-      log?.(`http:response ${mapping.method} ${requestUrl} -> ${status} (${Date.now() - startedAt}ms)`)
+      log?.(`http:response ${resolvedMapping.method} ${requestUrl} -> ${status} (${Date.now() - startedAt}ms)`)
       return {
         mapping: {
-          ...mapping,
+          ...resolvedMapping,
           mappedPath: hydratedPath,
         },
         request: {
           url: requestUrl,
-          method: mapping.method,
+          method: resolvedMapping.method,
           headers,
-          query: [...mapping.query],
+          query: [...resolvedMapping.query],
           body: requestBody,
         },
         response: {
@@ -575,6 +650,12 @@ export const createGitServiceApi = (options: GitServiceApiFactoryOptions = {}):
   }
 
   attachGitLabelManagementApi(root, defaults)
+  attachGitActionsApi(root, {
+    config,
+    defaults,
+    requestTimeoutMs,
+    log,
+  })
 
   return root
 }

package/src/index.ts

@@ -44,6 +44,7 @@ export {
   type GitLabelManagementDefaults,
   type GitRepositoryLabel,
 } from './label-management'
+export { attachGitActionsApi, createGitActionsApi, type GitActionsApiContext, type GitActionsApiDefaults, type GitActionsHelpBody } from './actions-api'
 export { resolveProjectRepoIdentity, type GitRepositoryIdentity } from './repository'
 export type {
   GitServiceApi,

package/src/platform/gitea-rules.ts

@@ -82,6 +82,9 @@ export const EXACT_GITEA_RULES: GiteaRouteRule[] = [
   rule(['workflow', 'run'], 'POST', '/repos/{owner}/{repo}/actions/workflows/{workflow_id}/dispatches'),
   rule(['workflow', 'view'], 'GET', '/repos/{owner}/{repo}/actions/workflows/{workflow_id}'),
 
+  // Run commands (Gitea Actions tasks list is the closest analogue)
+  rule(['run', 'list'], 'GET', '/repos/{owner}/{repo}/actions/tasks', 'maps run.list to action task list'),
+
   // Secret and variable commands
   rule(['secret', 'delete'], 'DELETE', '/repos/{owner}/{repo}/actions/secrets/{secretname}'),
   rule(['secret', 'list'], 'GET', '/repos/{owner}/{repo}/actions/secrets'),
@@ -112,7 +115,6 @@ export const DEFAULT_GITEA_FIRST_TOKEN_RULES = new Map<string, GiteaRouteRule>([
   ['pr', rule(['pr'], 'GET', '/repos/{owner}/{repo}/pulls', 'fallback to pull request list')],
   ['repo', rule(['repo'], 'GET', '/repos/{owner}/{repo}', 'fallback to repository read')],
   ['release', rule(['release'], 'GET', '/repos/{owner}/{repo}/releases', 'fallback to release list')],
-  ['run', rule(['run'], 'GET', '/repos/{owner}/{repo}/actions/tasks', 'fallback to workflow task list')],
   ['workflow', rule(['workflow'], 'GET', '/repos/{owner}/{repo}/actions/workflows', 'fallback to workflow list')],
   ['search', rule(['search'], 'GET', '/repos/search', 'fallback to global repo search')],
   ['secret', rule(['secret'], 'GET', '/repos/{owner}/{repo}/actions/secrets', 'fallback to repository secret list')],