create-typescript-app 2.4.5 → 2.5.0

package/lib/blocks/blockRepositoryBranchRuleset.js

@@ -5,19 +5,18 @@ const blockRepositoryBranchRuleset = base.createBlock({
     name: "Repository Branch Ruleset"
   },
   addons: {
-    requiredStatusChecks: z.array(z.string()).default([])
+    requiredStatusChecks: z.array(z.string()).optional()
   },
   setup({ addons, options }) {
     return {
       requests: [
         {
-          id: "branch-ruleset-create",
-          async send({ octokit }) {
-            await octokit.request(
-              "POST /repos/{owner}/{repo}/rulesets",
-              createInnerSend(addons.requiredStatusChecks, options)
-            );
-          }
+          endpoint: "POST /repos/{owner}/{repo}/rulesets",
+          parameters: createRulesetParameters(
+            addons.requiredStatusChecks,
+            options
+          ),
+          type: "octokit"
         }
       ]
     };
@@ -25,25 +24,21 @@ const blockRepositoryBranchRuleset = base.createBlock({
   transition({ addons, options }) {
     return {
       requests: [
-        {
-          id: "branch-ruleset-update",
-          async send({ octokit }) {
-            if (options.rulesetId) {
-              await octokit.request(
-                `PUT /repos/{owner}/{repo}/rulesets/{ruleset_id}`,
-                createInnerSend(
-                  addons.requiredStatusChecks,
-                  options,
-                  options.rulesetId
-                )
-              );
-            } else {
-              await octokit.request(
-                `POST /repos/{owner}/{repo}/rulesets/{ruleset_id}`,
-                createInnerSend(addons.requiredStatusChecks, options)
-              );
-            }
-          }
+        options.rulesetId ? {
+          endpoint: "PUT /repos/{owner}/{repo}/rulesets/{ruleset_id}",
+          parameters: createRulesetParameters(
+            addons.requiredStatusChecks,
+            options,
+            options.rulesetId
+          ),
+          type: "octokit"
+        } : {
+          endpoint: "POST /repos/{owner}/{repo}/rulesets",
+          parameters: createRulesetParameters(
+            addons.requiredStatusChecks,
+            options
+          ),
+          type: "octokit"
         }
       ]
     };
@@ -54,7 +49,7 @@ const blockRepositoryBranchRuleset = base.createBlock({
     return {};
   }
 });
-function createInnerSend(contexts, options, rulesetId) {
+function createRulesetParameters(contexts, options, rulesetId) {
   return {
     bypass_actors: [
       {
@@ -90,16 +85,14 @@ function createInnerSend(contexts, options, rulesetId) {
       },
       {
         parameters: {
-          required_status_checks: contexts.map((context) => ({
+          required_status_checks: contexts?.map((context) => ({
             context
-          })),
+          })) ?? [],
           strict_required_status_checks_policy: false
         },
         type: "required_status_checks"
       }
     ],
-    // Type fun because the GitHub Octokit APIs don't provide named types...
-    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     ruleset_id: rulesetId === void 0 ? rulesetId : Number(rulesetId),
     target: "branch"
   };

package/lib/blocks/blockRepositoryLabels.d.ts

@@ -21,6 +21,11 @@ declare const blockRepositoryLabels: bingo_stratum.BlockWithoutAddons<{
         profile: string;
     }[] | undefined;
     documentation?: string | undefined;
+    existingLabels?: {
+        name: string;
+        description: string;
+        color: string;
+    }[] | undefined;
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {

package/lib/blocks/blockRepositoryLabels.js

@@ -1,4 +1,4 @@
-import { setGitHubRepositoryLabels } from "set-github-repository-labels";
+import { determineLabelChanges } from "set-github-repository-labels";
 import { base } from "../base.js";
 import { outcomeLabels } from "./outcomeLabels.js";
 const blockRepositoryLabels = base.createBlock({
@@ -6,19 +6,54 @@ const blockRepositoryLabels = base.createBlock({
     name: "Repository Labels"
   },
   produce({ options }) {
+    const changes = determineLabelChanges(
+      options.existingLabels ?? [],
+      outcomeLabels
+    );
+    const requestData = {
+      owner: options.owner,
+      repo: options.repository
+    };
     return {
-      requests: [
-        {
-          id: "repository-labels",
-          async send() {
-            await setGitHubRepositoryLabels({
-              labels: outcomeLabels,
-              owner: options.owner,
-              repository: options.repository
-            });
-          }
+      requests: changes.map((change) => {
+        switch (change.type) {
+          case "delete":
+            return {
+              endpoint: "DELETE /repos/{owner}/{repo}/labels/{name}",
+              id: `delete label '${change.name}'`,
+              parameters: {
+                ...requestData,
+                name: change.name
+              },
+              type: "octokit"
+            };
+          case "patch":
+            return {
+              endpoint: "PATCH /repos/{owner}/{repo}/labels/{name}",
+              id: `patch label '${change.originalName}'`,
+              parameters: {
+                ...requestData,
+                color: change.color,
+                description: change.description,
+                name: change.originalName,
+                new_name: change.newName
+              },
+              type: "octokit"
+            };
+          case "post":
+            return {
+              endpoint: "POST /repos/{owner}/{repo}/labels",
+              id: `post label '${change.name}'`,
+              parameters: {
+                ...requestData,
+                color: change.color,
+                description: change.description,
+                name: change.name
+              },
+              type: "octokit"
+            };
         }
-      ]
+      })
     };
   }
 });

package/lib/blocks/blockRepositorySecrets.d.ts

@@ -26,6 +26,11 @@ declare const blockRepositorySecrets: bingo_stratum.BlockWithAddons<{
         profile: string;
     }[] | undefined;
     documentation?: string | undefined;
+    existingLabels?: {
+        name: string;
+        description: string;
+        color: string;
+    }[] | undefined;
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {

package/lib/blocks/blockRepositorySettings.d.ts

@@ -21,6 +21,11 @@ declare const blockRepositorySettings: bingo_stratum.BlockWithoutAddons<{
         profile: string;
     }[] | undefined;
     documentation?: string | undefined;
+    existingLabels?: {
+        name: string;
+        description: string;
+        color: string;
+    }[] | undefined;
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {

package/lib/blocks/blockRepositorySettings.js

@@ -9,30 +9,29 @@ const blockRepositorySettings = base.createBlock({
     return {
       requests: [
         {
-          id: "repository-settings",
-          async send({ octokit }) {
-            await octokit.rest.repos.update({
-              allow_auto_merge: true,
-              allow_merge_commit: false,
-              allow_rebase_merge: false,
-              allow_squash_merge: true,
-              delete_branch_on_merge: true,
-              description,
-              has_wiki: false,
-              owner: options.owner,
-              repo: options.repository,
-              security_and_analysis: {
-                secret_scanning: {
-                  status: "enabled"
-                },
-                secret_scanning_push_protection: {
-                  status: "enabled"
-                }
+          endpoint: "PATCH /repos/{owner}/{repo}",
+          parameters: {
+            allow_auto_merge: true,
+            allow_merge_commit: false,
+            allow_rebase_merge: false,
+            allow_squash_merge: true,
+            delete_branch_on_merge: true,
+            description,
+            has_wiki: false,
+            owner: options.owner,
+            repo: options.repository,
+            security_and_analysis: {
+              secret_scanning: {
+                status: "enabled"
               },
-              squash_merge_commit_message: "PR_BODY",
-              squash_merge_commit_title: "PR_TITLE"
-            });
-          }
+              secret_scanning_push_protection: {
+                status: "enabled"
+              }
+            },
+            squash_merge_commit_message: "PR_BODY",
+            squash_merge_commit_title: "PR_TITLE"
+          },
+          type: "octokit"
         }
       ]
     };

package/lib/blocks/blockSecurityDocs.d.ts

@@ -21,6 +21,11 @@ declare const blockSecurityDocs: bingo_stratum.BlockWithoutAddons<{
         profile: string;
     }[] | undefined;
     documentation?: string | undefined;
+    existingLabels?: {
+        name: string;
+        description: string;
+        color: string;
+    }[] | undefined;
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {

package/lib/blocks/blockTSup.d.ts

@@ -24,6 +24,11 @@ declare const blockTSup: bingo_stratum.BlockWithAddons<{
         profile: string;
     }[] | undefined;
     documentation?: string | undefined;
+    existingLabels?: {
+        name: string;
+        description: string;
+        color: string;
+    }[] | undefined;
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {

package/lib/blocks/blockTemplatedWith.d.ts

@@ -21,6 +21,11 @@ declare const blockTemplatedWith: bingo_stratum.BlockWithoutAddons<{
         profile: string;
     }[] | undefined;
     documentation?: string | undefined;
+    existingLabels?: {
+        name: string;
+        description: string;
+        color: string;
+    }[] | undefined;
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {

package/lib/blocks/blockTypeScript.d.ts

@@ -21,6 +21,11 @@ declare const blockTypeScript: bingo_stratum.BlockWithoutAddons<{
         profile: string;
     }[] | undefined;
     documentation?: string | undefined;
+    existingLabels?: {
+        name: string;
+        description: string;
+        color: string;
+    }[] | undefined;
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {

package/lib/blocks/blockVSCode.d.ts

@@ -30,6 +30,11 @@ declare const blockVSCode: bingo_stratum.BlockWithAddons<{
         profile: string;
     }[] | undefined;
     documentation?: string | undefined;
+    existingLabels?: {
+        name: string;
+        description: string;
+        color: string;
+    }[] | undefined;
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {

package/lib/blocks/blockVitest.d.ts

@@ -36,6 +36,11 @@ declare const blockVitest: bingo_stratum.BlockWithAddons<{
         profile: string;
     }[] | undefined;
     documentation?: string | undefined;
+    existingLabels?: {
+        name: string;
+        description: string;
+        color: string;
+    }[] | undefined;
     explainer?: string[] | undefined;
     funding?: string | undefined;
     guide?: {