toolcraft 0.0.22 → 0.0.24

package/node_modules/@poe-code/task-list/dist/backends/gh-issues-sync.js

@@ -29,11 +29,14 @@ const CREATE_STATUS_FIELD_MUTATION = `mutation CreateStatusField($input: CreateP
     }
   }
 }`;
-const CREATE_STATUS_OPTION_MUTATION = `mutation CreateStatusOption($input: CreateProjectV2SingleSelectFieldOptionInput!) {
-  createProjectV2SingleSelectFieldOption(input: $input) {
-    singleSelectFieldOption {
-      id
-      name
+const UPDATE_STATUS_FIELD_OPTIONS_MUTATION = `mutation UpdateStatusFieldOptions($input: UpdateProjectV2FieldInput!) {
+  updateProjectV2Field(input: $input) {
+    projectV2Field {
+      ... on ProjectV2SingleSelectField {
+        id
+        name
+        options { id name color description }
+      }
     }
   }
 }`;
@@ -49,11 +52,12 @@ export class GhProjectSyncError extends Error {
 }
 export async function verifyGhProject(opts) {
     const client = resolveGhClient(opts);
-    const target = `project:${opts.owner}/${opts.number}`;
-    const variables = {
-        owner: opts.owner,
-        number: opts.number
-    };
+    const lookup = await lookupProject(client, opts.owner, opts.number);
+    return buildVerifyReport(lookup, opts);
+}
+async function lookupProject(client, owner, number) {
+    const target = `project:${owner}/${number}`;
+    const variables = { owner, number };
     let project;
     try {
         const organizationResult = await client.graphql(PROJECT_ORGANIZATION_QUERY, variables);
@@ -71,7 +75,13 @@ export async function verifyGhProject(opts) {
             message: "lookup_failed"
         });
     }
-    if (project === null) {
+    return {
+        project,
+        statusField: project === null ? null : selectStatusField(project)
+    };
+}
+function buildVerifyReport(lookup, opts) {
+    if (lookup.project === null) {
         return {
             ok: false,
             project: null,
@@ -81,12 +91,11 @@ export async function verifyGhProject(opts) {
             missingOptions: opts.requiredStates
         };
     }
-    const statusField = selectStatusField(project);
-    if (statusField === null) {
+    if (lookup.statusField === null) {
         return {
             ok: false,
             project: {
-                id: project.id,
+                id: lookup.project.id,
                 number: opts.number,
                 owner: opts.owner
             },
@@ -96,17 +105,17 @@ export async function verifyGhProject(opts) {
             missingOptions: opts.requiredStates
         };
     }
-    const options = statusField.options.map((option) => option.name);
+    const options = lookup.statusField.options.map((option) => option.name);
     const missingOptions = opts.requiredStates.filter((state) => !options.includes(state));
     return {
         ok: missingOptions.length === 0,
         project: {
-            id: project.id,
+            id: lookup.project.id,
             number: opts.number,
             owner: opts.owner
         },
         statusField: {
-            id: statusField.id,
+            id: lookup.statusField.id,
             options
         },
         missingProject: false,
@@ -116,47 +125,52 @@ export async function verifyGhProject(opts) {
 }
 export async function syncGhProject(opts) {
     const client = resolveGhClient(opts);
-    const verified = await verifyGhProject({ ...opts, client });
+    let lookup = await lookupProject(client, opts.owner, opts.number);
+    let resolvedNumber = opts.number;
     const created = [];
-    if (verified.ok) {
-        return {
-            ...verified,
-            created,
-            updated: []
-        };
-    }
-    let project = verified.project;
-    let statusField = verified.statusField;
-    let missingOptions = [...verified.missingOptions];
-    if (project === null) {
-        project = await createProject(client, opts);
+    if (lookup.project === null) {
+        const newProject = await createProject(client, opts);
         created.push("project");
-        statusField = null;
-        missingOptions = [...opts.requiredStates];
+        resolvedNumber = newProject.number;
+        // Re-look up against the new project number so we can pick up any
+        // auto-created Status field (GitHub adds one by default).
+        lookup = await lookupProject(client, opts.owner, resolvedNumber);
     }
+    if (lookup.project === null) {
+        throw new GhProjectSyncError({
+            op: "createProject",
+            target: `${opts.owner}/${opts.number}`,
+            message: "project was not found after creation"
+        });
+    }
+    let statusField = lookup.statusField;
     if (statusField === null) {
-        const createdStatusField = await createStatusField(client, project.id);
-        statusField = createdStatusField;
+        statusField = await createStatusField(client, lookup.project.id);
         created.push("field");
-        missingOptions = opts.requiredStates.filter((state) => !createdStatusField.options.includes(state));
     }
-    if (missingOptions.length > 0) {
-        for (const optionName of missingOptions) {
-            await createStatusOption(client, statusField.id, optionName);
-            created.push(`option:${optionName}`);
+    const existingNames = new Set(statusField.options.map((option) => option.name));
+    const missingOptionNames = opts.requiredStates.filter((state) => !existingNames.has(state));
+    if (missingOptionNames.length > 0) {
+        statusField = await addStatusOptions(client, statusField, missingOptionNames);
+        for (const name of missingOptionNames) {
+            created.push(`option:${name}`);
         }
-        statusField = {
-            id: statusField.id,
-            options: [...statusField.options, ...missingOptions]
-        };
-        missingOptions = [];
     }
+    const optionNames = statusField.options.map((option) => option.name);
+    const missingOptions = opts.requiredStates.filter((state) => !optionNames.includes(state));
     return {
-        ok: statusField !== null && missingOptions.length === 0,
-        project,
-        statusField,
+        ok: missingOptions.length === 0,
+        project: {
+            id: lookup.project.id,
+            number: resolvedNumber,
+            owner: opts.owner
+        },
+        statusField: {
+            id: statusField.id,
+            options: optionNames
+        },
         missingProject: false,
-        missingStatusField: statusField === null,
+        missingStatusField: false,
         missingOptions,
         created,
         updated: []
@@ -222,10 +236,7 @@ async function createStatusField(client, projectId) {
         if (!isStatusField(field)) {
             throw new Error("createProjectV2Field returned no Status field");
         }
-        return {
-            id: field.id,
-            options: field.options.map((option) => option.name)
-        };
+        return field;
     }
     catch (error) {
         throw new GhProjectSyncError({
@@ -236,20 +247,37 @@ async function createStatusField(client, projectId) {
         });
     }
 }
-async function createStatusOption(client, fieldId, name) {
+async function addStatusOptions(client, field, missingNames) {
+    const singleSelectOptions = [
+        ...field.options.map((option) => ({
+            id: option.id,
+            name: option.name,
+            color: option.color ?? "GRAY",
+            description: option.description ?? ""
+        })),
+        ...missingNames.map((name) => ({
+            name,
+            color: "GRAY",
+            description: ""
+        }))
+    ];
     try {
-        await client.graphql(CREATE_STATUS_OPTION_MUTATION, {
+        const result = await client.graphql(UPDATE_STATUS_FIELD_OPTIONS_MUTATION, {
             input: {
-                fieldId,
-                name,
-                color: "GRAY"
+                fieldId: field.id,
+                singleSelectOptions
             }
         });
+        const updated = result.updateProjectV2Field?.projectV2Field;
+        if (!isStatusField(updated)) {
+            throw new Error("updateProjectV2Field returned no Status field");
+        }
+        return updated;
     }
     catch (error) {
         throw new GhProjectSyncError({
             op: "createOption",
-            target: name,
+            target: missingNames.join(","),
             cause: error,
             message: errorMessage(error)
         });
@@ -295,7 +323,9 @@ function isStatusOption(value) {
         "id" in value &&
         typeof value.id === "string" &&
         "name" in value &&
-        typeof value.name === "string");
+        typeof value.name === "string" &&
+        (!("color" in value) || typeof value.color === "string") &&
+        (!("description" in value) || typeof value.description === "string"));
 }
 function isStatusField(value) {
     return (typeof value === "object" &&

package/node_modules/@poe-code/task-list/dist/backends/gh-issues.d.ts

@@ -1,12 +1,18 @@
+import { type StateMachineDef } from "../state-machine.js";
 import type { TaskDefaults, TaskList } from "../types.js";
-export declare const PROJECT_ORGANIZATION_QUERY = "query Project($owner: String!, $number: Int!) {\n  organization(login: $owner) {\n    projectV2(number: $number) {\n      id\n      title\n      field(name: \"Status\") {\n        ... on ProjectV2SingleSelectField {\n          id\n          name\n          options { id name }\n        }\n      }\n      fields(first: 100) {\n        nodes {\n          ... on ProjectV2SingleSelectField {\n            id\n            name\n            options { id name }\n          }\n        }\n      }\n    }\n  }\n}";
-export declare const PROJECT_USER_QUERY = "query Project($owner: String!, $number: Int!) {\n  user(login: $owner) {\n    projectV2(number: $number) {\n      id\n      title\n      field(name: \"Status\") {\n        ... on ProjectV2SingleSelectField {\n          id\n          name\n          options { id name }\n        }\n      }\n      fields(first: 100) {\n        nodes {\n          ... on ProjectV2SingleSelectField {\n            id\n            name\n            options { id name }\n          }\n        }\n      }\n    }\n  }\n}";
+export declare const PROJECT_ORGANIZATION_QUERY = "query Project($owner: String!, $number: Int!) {\n  organization(login: $owner) {\n    projectV2(number: $number) {\n      id\n      title\n      field(name: \"Status\") {\n        ... on ProjectV2SingleSelectField {\n          id\n          name\n          options { id name color description }\n        }\n      }\n      fields(first: 100) {\n        nodes {\n          ... on ProjectV2SingleSelectField {\n            id\n            name\n            options { id name color description }\n          }\n        }\n      }\n    }\n  }\n}";
+export declare const PROJECT_USER_QUERY = "query Project($owner: String!, $number: Int!) {\n  user(login: $owner) {\n    projectV2(number: $number) {\n      id\n      title\n      field(name: \"Status\") {\n        ... on ProjectV2SingleSelectField {\n          id\n          name\n          options { id name color description }\n        }\n      }\n      fields(first: 100) {\n        nodes {\n          ... on ProjectV2SingleSelectField {\n            id\n            name\n            options { id name color description }\n          }\n        }\n      }\n    }\n  }\n}";
 export interface GhIssuesBackendDeps {
     repo: string;
-    project: {
+    project?: {
         owner: string;
         number: number;
     };
+    filter?: string;
+    state?: {
+        labelPrefix?: string;
+    };
+    stateMachine?: StateMachineDef;
     defaults: Required<TaskDefaults>;
     token: string;
     endpoint: string;