github-settings-as-code 2.0.1 → 2.1.0

package/src/github/pages/api/get-pages-settings.mts

@@ -1,4 +1,5 @@
 import { type EndpointKeys } from 'octokit-safe-types';
+import { hasKey, isRecord } from 'ts-data-forge';
 import { octokitHeaders, OWNER, REPO } from '../../constants.mjs';
 import { octokit } from '../../octokit.mjs';
 import { PagesSettings } from '../constants.mjs';
@@ -21,12 +22,7 @@ export const getPagesSettings = async (): Promise<
     // eslint-disable-next-line unicorn/no-array-fill-with-reference-type
     return PagesSettings.fill({ build_type: response.data.build_type });
   } catch (error) {
-    if (
-      typeof error === 'object' &&
-      error !== null &&
-      Object.hasOwn(error, 'status') &&
-      (error as Readonly<{ status?: unknown }>).status === 404
-    ) {
+    if (isRecord(error) && hasKey(error, 'status') && error.status === 404) {
       return undefined;
     }
 

package/src/github/repository/apply.mts

@@ -10,6 +10,7 @@ import {
   isDirectlyExecuted,
   Result,
 } from 'ts-repo-utils';
+import { type StrictPick } from 'ts-type-forge';
 import { repositorySettingsDir, settingsJsonName } from '../constants.mjs';
 import { getRepositorySettings, updateRepository } from './api/index.mjs';
 import { backupRepositorySettings } from './backup.mjs';
@@ -52,7 +53,7 @@ export const applyRepositorySettings = async (): Promise<void> => {
       // NOTE: "RequestError [HttpError]: Allow forks can only be changed on org-owned repositories"
       // allow_forking: settings.allow_forking,
       web_commit_signoff_required: settings.web_commit_signoff_required,
-    } satisfies Pick<UpdateRepositoryRequest, RepositoryKeysToPick>,
+    } satisfies StrictPick<UpdateRepositoryRequest, RepositoryKeysToPick>,
   });
 
   // update local setting file

package/src/github/repository/constants.mts

@@ -5,7 +5,6 @@ import {
 import { expectType } from 'ts-data-forge';
 import * as t from 'ts-fortress';
 import { type StrictExclude } from 'ts-type-forge';
-import { upgradeStaleCodec } from '../upgrade-stale-codec.mjs';
 
 const keysToPickBase = [
   'allow_auto_merge',
@@ -64,9 +63,6 @@ export type RepositoryKeysToPick = StrictExclude<
 
 expectType<keyof UpdateRepositoryRequest, RepositoryKeysToPick>('>=');
 
-export const RepositoryPicked = t.pick(
-  upgradeStaleCodec(FullRepository),
-  repositoryKeysToPick,
-);
+export const RepositoryPicked = t.pick(FullRepository, repositoryKeysToPick);
 
 export type RepositoryPicked = t.TypeOf<typeof RepositoryPicked>;

package/src/github/resolve-target-repo.mts

@@ -2,7 +2,7 @@ import { execFileSync } from 'node:child_process';
 import * as fs from 'node:fs/promises';
 import * as path from 'node:path';
 import * as util from 'node:util';
-import { hasKey, isRecord, isString, Json } from 'ts-data-forge';
+import { Arr, hasKey, isRecord, isString, Json } from 'ts-data-forge';
 import { Result } from 'ts-repo-utils';
 
 export type TargetRepo = Readonly<{
@@ -12,7 +12,7 @@ export type TargetRepo = Readonly<{
 
 /** `strict: false` の解析結果は string | boolean | 配列 になりうるため絞り込む。 */
 const pickString = (value: unknown): string | undefined =>
-  isString(value) && value !== '' ? value : undefined;
+  value !== '' && isString(value) ? value : undefined;
 
 /**
  * コマンドライン引数から `--owner` / `--repo` を読む。
@@ -21,7 +21,7 @@ const pickString = (value: unknown): string | undefined =>
  */
 const fromCliArgs = (): Partial<TargetRepo> => {
   const { values } = util.parseArgs({
-    args: process.argv.slice(2),
+    args: Arr.skip(process.argv, 2),
     options: {
       owner: { type: 'string' },
       repo: { type: 'string' },

package/src/github/ruleset/constants.mts

@@ -5,7 +5,6 @@ import {
 } from 'octokit-safe-types';
 import { expectType } from 'ts-data-forge';
 import * as t from 'ts-fortress';
-import { upgradeStaleCodec } from '../upgrade-stale-codec.mjs';
 
 export const rulesetKeysToPick = [
   'id',
@@ -23,9 +22,6 @@ expectType<keyof UpdateRulesetRequest | 'id', KeysToPick>('=');
 
 expectType<keyof CreateRulesetRequest, keyof UpdateRulesetRequest>('=');
 
-export const RulesetPicked = t.pick(
-  upgradeStaleCodec(RepositoryRuleset),
-  rulesetKeysToPick,
-);
+export const RulesetPicked = t.pick(RepositoryRuleset, rulesetKeysToPick);
 
 export type RulesetPicked = t.TypeOf<typeof RulesetPicked>;

package/src/github/variables/apply.mts

@@ -9,16 +9,6 @@ import {
 
 export const applyVariables = async (): Promise<void> => {
   const variables = [
-    {
-      // noshiro-semantic-release-bot (App ID: 1442563)
-      name: 'SEMANTIC_RELEASE_BOT_CLIENT_ID',
-      value: 'Iv23liAmv2bgTYTkv2pt',
-    },
-    {
-      // noshiro-changesets-release-bot (App ID: 1576218)
-      name: 'CHANGESETS_RELEASE_BOT_CLIENT_ID',
-      value: 'Iv23limuZKrTEcXmN0lp',
-    },
     {
       // noshiro-repo-settings-bot (App ID: 4476573)
       // Administration を含む強い権限を持つ。設定の backup / apply 専用。
@@ -27,8 +17,9 @@ export const applyVariables = async (): Promise<void> => {
     },
     {
       // noshiro-repo-automation-bot (App ID: 4478721)
-      // Contents / Pull requests 権限のみ。PR を作る自動化（ pnpm-update /
-      // sync-agent-config ）用。
+      // Contents / Pull requests / Issues 権限。PR を作る自動化（ pnpm-update /
+      // sync-agent-config ）と release で共用する。実際に使う権限は各
+      // ワークフローの permission-* 入力で絞る。
       name: 'REPO_AUTOMATION_BOT_CLIENT_ID',
       value: 'Iv23lilpiDh0twq2PErv',
     },

package/dist/github/upgrade-stale-codec.d.mts

@@ -1,19 +0,0 @@
-import { type Type } from 'ts-fortress';
-import { type StrictOmit } from 'ts-type-forge';
-/**
- * Restores the full ts-fortress `Type` interface for codecs imported from
- * octokit-safe-types@1.2.19, whose declaration files were generated against
- * ts-fortress 7 (whose `Type` lacked the `prune` member). The pnpm override in
- * `pnpm-workspace.yaml` resolves ts-fortress >= 11 at runtime, so the codec
- * object itself does have `prune`; only its declared type is stale. This
- * verifies `prune` exists at runtime and rebuilds the codec with the correct
- * type, without unsafe type assertions.
- *
- * TODO: Remove this helper once octokit-safe-types is rebuilt against
- * ts-fortress >= 11.
- */
-export declare const upgradeStaleCodec: <A>(codec: Readonly<{
-    defaultValue: A;
-    prune?: Type<A>['prune'];
-}> & StrictOmit<Type<A>, 'defaultValue' | 'prune'>) => Type<A>;
-//# sourceMappingURL=upgrade-stale-codec.d.mts.map

package/dist/github/upgrade-stale-codec.d.mts.map

@@ -1 +0,0 @@
-{"version":3,"file":"upgrade-stale-codec.d.mts","sourceRoot":"","sources":["../../src/github/upgrade-stale-codec.mts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,IAAI,EAAE,MAAM,aAAa,CAAC;AACxC,OAAO,EAAE,KAAK,UAAU,EAAE,MAAM,eAAe,CAAC;AAEhD;;;;;;;;;;;GAWG;AACH,eAAO,MAAM,iBAAiB,GAAI,CAAC,SAC1B,QAAQ,CAAC;IAAE,YAAY,EAAE,CAAC,CAAC;IAAC,KAAK,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAA;CAAE,CAAC,GAC5D,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,cAAc,GAAG,OAAO,CAAC,KAC9C,IAAI,CAAC,CAAC,CAUR,CAAC"}

package/dist/github/upgrade-stale-codec.mjs

@@ -1,20 +0,0 @@
-/**
- * Restores the full ts-fortress `Type` interface for codecs imported from
- * octokit-safe-types@1.2.19, whose declaration files were generated against
- * ts-fortress 7 (whose `Type` lacked the `prune` member). The pnpm override in
- * `pnpm-workspace.yaml` resolves ts-fortress >= 11 at runtime, so the codec
- * object itself does have `prune`; only its declared type is stale. This
- * verifies `prune` exists at runtime and rebuilds the codec with the correct
- * type, without unsafe type assertions.
- *
- * TODO: Remove this helper once octokit-safe-types is rebuilt against
- * ts-fortress >= 11.
- */
-export const upgradeStaleCodec = (codec) => {
-    const { prune } = codec;
-    if (prune === undefined) {
-        throw new Error(`The codec "${codec.typeName}" has no prune function at runtime. octokit-safe-types is probably resolving an old ts-fortress version; check the pnpm overrides.`);
-    }
-    return { ...codec, prune };
-};
-//# sourceMappingURL=upgrade-stale-codec.mjs.map

package/dist/github/upgrade-stale-codec.mjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"upgrade-stale-codec.mjs","sourceRoot":"","sources":["../../src/github/upgrade-stale-codec.mts"],"names":[],"mappings":"AAGA;;;;;;;;;;;GAWG;AACH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,KAC+C,EACtC,EAAE;IACX,MAAM,EAAE,KAAK,EAAE,GAAG,KAAK,CAAC;IAExB,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,IAAI,KAAK,CACb,cAAc,KAAK,CAAC,QAAQ,oIAAoI,CACjK,CAAC;IACJ,CAAC;IAED,OAAO,EAAE,GAAG,KAAK,EAAE,KAAK,EAAE,CAAC;AAC7B,CAAC,CAAC"}

package/src/github/upgrade-stale-codec.mts

@@ -1,29 +0,0 @@
-import { type Type } from 'ts-fortress';
-import { type StrictOmit } from 'ts-type-forge';
-
-/**
- * Restores the full ts-fortress `Type` interface for codecs imported from
- * octokit-safe-types@1.2.19, whose declaration files were generated against
- * ts-fortress 7 (whose `Type` lacked the `prune` member). The pnpm override in
- * `pnpm-workspace.yaml` resolves ts-fortress >= 11 at runtime, so the codec
- * object itself does have `prune`; only its declared type is stale. This
- * verifies `prune` exists at runtime and rebuilds the codec with the correct
- * type, without unsafe type assertions.
- *
- * TODO: Remove this helper once octokit-safe-types is rebuilt against
- * ts-fortress >= 11.
- */
-export const upgradeStaleCodec = <A,>(
-  codec: Readonly<{ defaultValue: A; prune?: Type<A>['prune'] }> &
-    StrictOmit<Type<A>, 'defaultValue' | 'prune'>,
-): Type<A> => {
-  const { prune } = codec;
-
-  if (prune === undefined) {
-    throw new Error(
-      `The codec "${codec.typeName}" has no prune function at runtime. octokit-safe-types is probably resolving an old ts-fortress version; check the pnpm overrides.`,
-    );
-  }
-
-  return { ...codec, prune };
-};