skuba 4.2.2 → 4.3.0-beta.0

package/jest-preset.js

@@ -21,10 +21,14 @@ module.exports = {
     '!<rootDir>/jest.*.ts',
   ],
   coverageDirectory: 'coverage',
+  reporters: ['default', require.resolve('./lib/cli/test/reporters/github')],
   testEnvironment: 'node',
   testPathIgnorePatterns: [
     '/node_modules.*/',
     '<rootDir>/(coverage|dist|lib|tmp).*/',
   ],
-  reporters: ['default', require.resolve('./lib/cli/test/reporters/github')],
+  watchPlugins: [
+    require.resolve('jest-watch-typeahead/filename'),
+    require.resolve('jest-watch-typeahead/testname'),
+  ],
 };

package/lib/api/git/index.d.ts

@@ -5,4 +5,5 @@ export { getChangedFiles } from './getChangedFiles';
 export { getHeadCommitId, getHeadCommitMessage } from './log';
 export { getOwnerAndRepo } from './remote';
 export { push } from './push';
+export { fastForwardBranch } from './pull';
 export { reset } from './reset';

package/lib/api/git/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.reset = exports.push = exports.getOwnerAndRepo = exports.getHeadCommitMessage = exports.getHeadCommitId = exports.getChangedFiles = exports.currentBranch = exports.commitAllChanges = exports.commit = void 0;
+exports.reset = exports.fastForwardBranch = exports.push = exports.getOwnerAndRepo = exports.getHeadCommitMessage = exports.getHeadCommitId = exports.getChangedFiles = exports.currentBranch = exports.commitAllChanges = exports.commit = void 0;
 var commit_1 = require("./commit");
 Object.defineProperty(exports, "commit", { enumerable: true, get: function () { return commit_1.commit; } });
 var commitAllChanges_1 = require("./commitAllChanges");
@@ -16,6 +16,8 @@ var remote_1 = require("./remote");
 Object.defineProperty(exports, "getOwnerAndRepo", { enumerable: true, get: function () { return remote_1.getOwnerAndRepo; } });
 var push_1 = require("./push");
 Object.defineProperty(exports, "push", { enumerable: true, get: function () { return push_1.push; } });
+var pull_1 = require("./pull");
+Object.defineProperty(exports, "fastForwardBranch", { enumerable: true, get: function () { return pull_1.fastForwardBranch; } });
 var reset_1 = require("./reset");
 Object.defineProperty(exports, "reset", { enumerable: true, get: function () { return reset_1.reset; } });
 //# sourceMappingURL=index.js.map

package/lib/api/git/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/git/index.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAAzB,gGAAA,MAAM,OAAA;AACf,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AACzB,iDAAgD;AAAvC,8GAAA,aAAa,OAAA;AACtB,qDAAoD;AAA3C,kHAAA,eAAe,OAAA;AACxB,6BAA8D;AAArD,sGAAA,eAAe,OAAA;AAAE,2GAAA,oBAAoB,OAAA;AAC9C,mCAA2C;AAAlC,yGAAA,eAAe,OAAA;AACxB,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,iCAAgC;AAAvB,8FAAA,KAAK,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/git/index.ts"],"names":[],"mappings":";;;AAAA,mCAAkC;AAAzB,gGAAA,MAAM,OAAA;AACf,uDAAsD;AAA7C,oHAAA,gBAAgB,OAAA;AACzB,iDAAgD;AAAvC,8GAAA,aAAa,OAAA;AACtB,qDAAoD;AAA3C,kHAAA,eAAe,OAAA;AACxB,6BAA8D;AAArD,sGAAA,eAAe,OAAA;AAAE,2GAAA,oBAAoB,OAAA;AAC9C,mCAA2C;AAAlC,yGAAA,eAAe,OAAA;AACxB,+BAA8B;AAArB,4FAAA,IAAI,OAAA;AACb,+BAA2C;AAAlC,yGAAA,iBAAiB,OAAA;AAC1B,iCAAgC;AAAvB,8FAAA,KAAK,OAAA"}

package/lib/api/git/pull.d.ts

@@ -0,0 +1,35 @@
+/**
+ * Use a GitHub app token to auth the Git push.
+ *
+ * This defaults to the `GITHUB_API_TOKEN` and `GITHUB_TOKEN` environment
+ * variables if `token` is not provided.
+ */
+interface GitHubAppAuth {
+    type: 'gitHubApp';
+    token?: string;
+}
+interface PullParameters {
+    /**
+     * The auth mechanism for the push.
+     *
+     * Currently, only GitHub app tokens are supported.
+     */
+    auth: GitHubAppAuth;
+    dir: string;
+    /**
+     * The branch to merge into
+     */
+    ref: string;
+    remote?: string;
+    /**
+     * The destination branch or tag on the remote.
+     *
+     * This defaults to `ref`.
+     */
+    remoteRef?: string;
+}
+/**
+ * Fast forwards the local branch to the remote state
+ */
+export declare const fastForwardBranch: ({ auth, dir, ref, remote, remoteRef, }: PullParameters) => Promise<void>;
+export {};

package/lib/api/git/pull.js

@@ -0,0 +1,34 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fastForwardBranch = void 0;
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const isomorphic_git_1 = __importDefault(require("isomorphic-git"));
+const node_1 = __importDefault(require("isomorphic-git/http/node"));
+const environment_1 = require("../github/environment");
+const remote_1 = require("./remote");
+/**
+ * Fast forwards the local branch to the remote state
+ */
+const fastForwardBranch = async ({ auth, dir, ref, remote, remoteRef, }) => {
+    const { owner, repo } = await (0, remote_1.getOwnerAndRepo)({ dir });
+    const url = `https://github.com/${encodeURIComponent(owner)}/${encodeURIComponent(repo)}`;
+    return isomorphic_git_1.default.fastForward({
+        onAuth: () => ({
+            username: 'x-access-token',
+            password: auth.token ?? (0, environment_1.apiTokenFromEnvironment)(),
+        }),
+        dir,
+        fs: fs_extra_1.default,
+        http: node_1.default,
+        ref,
+        remote,
+        remoteRef,
+        url,
+        singleBranch: true,
+    });
+};
+exports.fastForwardBranch = fastForwardBranch;
+//# sourceMappingURL=pull.js.map

package/lib/api/git/pull.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pull.js","sourceRoot":"","sources":["../../../src/api/git/pull.ts"],"names":[],"mappings":";;;;;;AAAA,wDAA0B;AAC1B,oEAAiC;AACjC,oEAA4C;AAE5C,uDAAgE;AAEhE,qCAA2C;AAsC3C;;GAEG;AACI,MAAM,iBAAiB,GAAG,KAAK,EAAE,EACtC,IAAI,EACJ,GAAG,EACH,GAAG,EACH,MAAM,EACN,SAAS,GACM,EAAE,EAAE;IACnB,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,IAAA,wBAAe,EAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAEvD,MAAM,GAAG,GAAG,sBAAsB,kBAAkB,CAClD,KAAK,CACN,IAAI,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC;IAEhC,OAAO,wBAAG,CAAC,WAAW,CAAC;QACrB,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC;YACb,QAAQ,EAAE,gBAAgB;YAC1B,QAAQ,EAAE,IAAI,CAAC,KAAK,IAAI,IAAA,qCAAuB,GAAE;SAClD,CAAC;QACF,GAAG;QACH,EAAE,EAAF,kBAAE;QACF,IAAI,EAAJ,cAAI;QACJ,GAAG;QACH,MAAM;QACN,SAAS;QACT,GAAG;QACH,YAAY,EAAE,IAAI;KACnB,CAAC,CAAC;AACL,CAAC,CAAC;AA3BW,QAAA,iBAAiB,qBA2B5B"}

package/lib/api/github/index.d.ts

@@ -4,3 +4,4 @@ export { createCheckRun } from './checkRun';
 export { enabledFromEnvironment } from './environment';
 export { getPullRequestNumber } from './pullRequest';
 export { putIssueComment } from './issueComment';
+export { commitAndPush, commitAndPushAllChanges, mapChangedFilesToFileChanges, } from './push';

package/lib/api/github/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.putIssueComment = exports.getPullRequestNumber = exports.enabledFromEnvironment = exports.createCheckRun = exports.buildNameFromEnvironment = void 0;
+exports.mapChangedFilesToFileChanges = exports.commitAndPushAllChanges = exports.commitAndPush = exports.putIssueComment = exports.getPullRequestNumber = exports.enabledFromEnvironment = exports.createCheckRun = exports.buildNameFromEnvironment = void 0;
 var environment_1 = require("./environment");
 Object.defineProperty(exports, "buildNameFromEnvironment", { enumerable: true, get: function () { return environment_1.buildNameFromEnvironment; } });
 var checkRun_1 = require("./checkRun");
@@ -11,4 +11,8 @@ var pullRequest_1 = require("./pullRequest");
 Object.defineProperty(exports, "getPullRequestNumber", { enumerable: true, get: function () { return pullRequest_1.getPullRequestNumber; } });
 var issueComment_1 = require("./issueComment");
 Object.defineProperty(exports, "putIssueComment", { enumerable: true, get: function () { return issueComment_1.putIssueComment; } });
+var push_1 = require("./push");
+Object.defineProperty(exports, "commitAndPush", { enumerable: true, get: function () { return push_1.commitAndPush; } });
+Object.defineProperty(exports, "commitAndPushAllChanges", { enumerable: true, get: function () { return push_1.commitAndPushAllChanges; } });
+Object.defineProperty(exports, "mapChangedFilesToFileChanges", { enumerable: true, get: function () { return push_1.mapChangedFilesToFileChanges; } });
 //# sourceMappingURL=index.js.map

package/lib/api/github/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/github/index.ts"],"names":[],"mappings":";;;AACA,6CAAyD;AAAhD,uHAAA,wBAAwB,OAAA;AACjC,uCAA4C;AAAnC,0GAAA,cAAc,OAAA;AACvB,6CAAuD;AAA9C,qHAAA,sBAAsB,OAAA;AAC/B,6CAAqD;AAA5C,mHAAA,oBAAoB,OAAA;AAC7B,+CAAiD;AAAxC,+GAAA,eAAe,OAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/api/github/index.ts"],"names":[],"mappings":";;;AACA,6CAAyD;AAAhD,uHAAA,wBAAwB,OAAA;AACjC,uCAA4C;AAAnC,0GAAA,cAAc,OAAA;AACvB,6CAAuD;AAA9C,qHAAA,sBAAsB,OAAA;AAC/B,6CAAqD;AAA5C,mHAAA,oBAAoB,OAAA;AAC7B,+CAAiD;AAAxC,+GAAA,eAAe,OAAA;AACxB,+BAIgB;AAHd,qGAAA,aAAa,OAAA;AACb,+GAAA,uBAAuB,OAAA;AACvB,oHAAA,4BAA4B,OAAA"}

package/lib/api/github/push.d.ts

@@ -0,0 +1,62 @@
+import type { FileAddition, FileDeletion } from '@octokit/graphql-schema';
+import type { ChangedFile } from '../git/getChangedFiles';
+interface CommitAndPushAllChangesParams {
+    dir: string;
+    /**
+     * The branch name
+     */
+    branch: string;
+    /**
+     * The headline of the commit message
+     */
+    messageHeadline: string;
+    /**
+     * The body of the commit message
+     */
+    messageBody?: string;
+    /**
+     * Updates the local git working directory to reflect the new remote state
+     */
+    updateLocal?: boolean;
+}
+/**
+ * Commits and pushes all changes from the local git repository up to a GitHub branch.
+ * Returns the commit id or `undefined` if there are no changes to commit.
+ */
+export declare const commitAndPushAllChanges: ({ dir, branch, messageHeadline, messageBody, updateLocal, }: CommitAndPushAllChangesParams) => Promise<string | undefined>;
+export interface FileChanges {
+    additions: FileAddition[];
+    deletions: FileDeletion[];
+}
+/**
+ * Maps ChangedFiles to {@link https://docs.github.com/en/graphql/reference/input-objects#filechanges| FileChanges}
+ */
+export declare const mapChangedFilesToFileChanges: (changedFiles: ChangedFile[]) => Promise<FileChanges>;
+interface CommitAndPushParams {
+    dir: string;
+    /**
+     * The branch name
+     */
+    branch: string;
+    /**
+     * The headline of the commit message
+     */
+    messageHeadline: string;
+    /**
+     * The body of the commit message
+     */
+    messageBody?: string;
+    /**
+     * File additions and deletions
+     */
+    fileChanges: FileChanges;
+    /**
+     * Updates the local git working directory to reflect the new remote state
+     */
+    updateLocal?: boolean;
+}
+/**
+ * Commits and pushes file changes up to a GitHub branch
+ */
+export declare const commitAndPush: ({ dir, branch, messageHeadline, messageBody, fileChanges, updateLocal, }: CommitAndPushParams) => Promise<string>;
+export {};

package/lib/api/github/push.js

@@ -0,0 +1,133 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.commitAndPush = exports.mapChangedFilesToFileChanges = exports.commitAndPushAllChanges = void 0;
+const graphql_1 = require("@octokit/graphql");
+const fs_extra_1 = __importDefault(require("fs-extra"));
+const Git = __importStar(require("../git"));
+const environment_1 = require("./environment");
+/**
+ * Commits and pushes all changes from the local git repository up to a GitHub branch.
+ * Returns the commit id or `undefined` if there are no changes to commit.
+ */
+const commitAndPushAllChanges = async ({ dir, branch, messageHeadline, messageBody, updateLocal, }) => {
+    const changedFiles = await Git.getChangedFiles({ dir });
+    if (!changedFiles.length) {
+        return undefined;
+    }
+    const fileChanges = await (0, exports.mapChangedFilesToFileChanges)(changedFiles);
+    return await (0, exports.commitAndPush)({
+        dir,
+        branch,
+        messageHeadline,
+        messageBody,
+        fileChanges,
+        updateLocal,
+    });
+};
+exports.commitAndPushAllChanges = commitAndPushAllChanges;
+/**
+ * Maps ChangedFiles to {@link https://docs.github.com/en/graphql/reference/input-objects#filechanges| FileChanges}
+ */
+const mapChangedFilesToFileChanges = async (changedFiles) => {
+    const { added, deleted } = changedFiles.reduce((files, changedFile) => {
+        const filePath = changedFile.path;
+        if (changedFile.state === 'deleted') {
+            files.deleted.push(filePath);
+        }
+        else {
+            files.added.push(filePath);
+        }
+        return files;
+    }, { added: [], deleted: [] });
+    const additions = await Promise.all(added.map(async (filePath) => ({
+        path: filePath,
+        contents: await fs_extra_1.default.promises.readFile(filePath, {
+            encoding: 'base64',
+        }),
+    })));
+    const deletions = deleted.map((filePath) => ({
+        path: filePath,
+    }));
+    return {
+        additions,
+        deletions,
+    };
+};
+exports.mapChangedFilesToFileChanges = mapChangedFilesToFileChanges;
+/**
+ * Commits and pushes file changes up to a GitHub branch
+ */
+const commitAndPush = async ({ dir, branch, messageHeadline, messageBody, fileChanges, updateLocal = false, }) => {
+    const authToken = (0, environment_1.apiTokenFromEnvironment)();
+    if (!authToken) {
+        throw new Error('Could not determine API token from the environment');
+    }
+    const [{ owner, repo }, headCommitId] = await Promise.all([
+        Git.getOwnerAndRepo({ dir }),
+        Git.getHeadCommitId({ dir }),
+    ]);
+    const input = {
+        branch: {
+            repositoryNameWithOwner: `${owner}/${repo}`,
+            branchName: branch,
+        },
+        message: {
+            headline: messageHeadline,
+            body: messageBody,
+        },
+        expectedHeadOid: headCommitId,
+        clientMutationId: 'skuba',
+        fileChanges,
+    };
+    const result = await (0, graphql_1.graphql)(`
+      mutation Mutation($input: CreateCommitOnBranchInput!) {
+        createCommitOnBranch(input: $input) {
+          commit {
+            id
+          }
+        }
+      }
+    `, {
+        input,
+        headers: {
+            authorization: `bearer ${authToken}`,
+        },
+    });
+    if (updateLocal) {
+        await Promise.all([...fileChanges.additions, ...fileChanges.deletions].map((file) => fs_extra_1.default.rm(file.path)));
+        await Git.fastForwardBranch({
+            ref: branch,
+            auth: { type: 'gitHubApp' },
+            dir,
+        });
+    }
+    return result.createCommitOnBranch.commit.id;
+};
+exports.commitAndPush = commitAndPush;
+//# sourceMappingURL=push.js.map

package/lib/api/github/push.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"push.js","sourceRoot":"","sources":["../../../src/api/github/push.ts"],"names":[],"mappings":"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"}

package/lib/cli/configure/analysis/diff.d.ts

@@ -1 +1 @@
-export declare const determineOperation: (oldData?: string | undefined, newData?: string | undefined) => string;
+export declare const determineOperation: (oldData?: string, newData?: string) => string;

package/lib/cli/configure/analysis/package.d.ts

@@ -3,7 +3,7 @@ import type { DependencyDiff, DependencySet } from '../types';
 interface GetDestinationManifestProps {
     cwd?: string;
 }
-export declare const getDestinationManifest: (props?: GetDestinationManifestProps | undefined) => Promise<readPkgUp.NormalizedReadResult>;
+export declare const getDestinationManifest: (props?: GetDestinationManifestProps) => Promise<readPkgUp.NormalizedReadResult>;
 interface DiffDependenciesProps {
     old: Record<string, string | undefined>;
     new: Record<string, string | undefined>;

package/lib/cli/configure/processing/ignoreFile.d.ts

@@ -5,4 +5,4 @@
  * than `lib/`) but they generally represent the same _intent_.
  */
 export declare const generateSimpleVariants: (patterns: string[]) => Set<string>;
-export declare const mergeWithIgnoreFile: (rawTemplateFile: string) => (rawInputFile?: string | undefined) => string;
+export declare const mergeWithIgnoreFile: (rawTemplateFile: string) => (rawInputFile?: string) => string;

package/lib/cli/configure/processing/javascript.d.ts

@@ -1,2 +1,2 @@
-export declare const prependImport: (name: string, file?: string | undefined) => string;
+export declare const prependImport: (name: string, file?: string) => string;
 export declare const stripImports: (names: readonly string[], inputFile: string) => string;

package/lib/cli/configure/processing/json.d.ts

@@ -1,2 +1,2 @@
-export declare const formatObject: (data: Record<Exclude<PropertyKey, symbol>, unknown>, filepath?: string | undefined) => string;
+export declare const formatObject: (data: Record<Exclude<PropertyKey, symbol>, unknown>, filepath?: string) => string;
 export declare const parseObject: (input: string | undefined) => Record<Exclude<PropertyKey, symbol>, unknown> | undefined;

package/lib/cli/configure/processing/package.d.ts

@@ -22,7 +22,7 @@ export declare const createDependencyFilter: (names: readonly string[], type: 'd
     main?: string | undefined;
     exports?: import("type-fest").PackageJson.Exports | undefined;
     imports?: import("type-fest").PackageJson.Imports | undefined;
-    bin?: string | Record<string, string> | undefined;
+    bin?: string | Partial<Record<string, string>> | undefined;
     man?: string | string[] | undefined;
     directories?: import("type-fest").PackageJson.DirectoryLocations | undefined;
     repository?: string | {
@@ -32,17 +32,17 @@ export declare const createDependencyFilter: (names: readonly string[], type: 'd
     } | undefined;
     scripts?: import("type-fest").PackageJson.Scripts | undefined;
     config?: Record<string, unknown> | undefined;
-    dependencies?: import("type-fest").PackageJson.Dependency | undefined;
-    devDependencies?: import("type-fest").PackageJson.Dependency | undefined;
-    optionalDependencies?: import("type-fest").PackageJson.Dependency | undefined;
-    peerDependencies?: import("type-fest").PackageJson.Dependency | undefined;
-    peerDependenciesMeta?: Record<string, {
+    dependencies?: Partial<Record<string, string>> | undefined;
+    devDependencies?: Partial<Record<string, string>> | undefined;
+    optionalDependencies?: Partial<Record<string, string>> | undefined;
+    peerDependencies?: Partial<Record<string, string>> | undefined;
+    peerDependenciesMeta?: Partial<Record<string, {
         optional: true;
-    }> | undefined;
+    }>> | undefined;
     bundledDependencies?: string[] | undefined;
     bundleDependencies?: string[] | undefined;
     engines?: {
-        [x: string]: string;
+        [x: string]: string | undefined;
     } | undefined;
     engineStrict?: boolean | undefined;
     os?: import("type-fest").LiteralUnion<"aix" | "darwin" | "freebsd" | "linux" | "openbsd" | "sunos" | "win32" | "!aix" | "!darwin" | "!freebsd" | "!linux" | "!openbsd" | "!sunos" | "!win32", string>[] | undefined;
@@ -60,14 +60,14 @@ export declare const createDependencyFilter: (names: readonly string[], type: 'd
         main?: string | undefined;
         browser?: string | undefined;
     } | undefined;
-    browser?: string | Record<string, string | false> | undefined;
+    browser?: string | Partial<Record<string, string | false>> | undefined;
     sideEffects?: boolean | string[] | undefined;
     types?: string | undefined;
-    typesVersions?: Record<string, Record<string, string[]>> | undefined;
+    typesVersions?: Partial<Record<string, Partial<Record<string, string[]>>>> | undefined;
     typings?: string | undefined;
     workspaces?: string[] | import("type-fest").PackageJson.WorkspaceConfig | undefined;
     flat?: boolean | undefined;
-    resolutions?: import("type-fest").PackageJson.Dependency | undefined;
+    resolutions?: Partial<Record<string, string>> | undefined;
     jspm?: import("type-fest").PackageJson | undefined;
 };
 export declare const withPackage: (fn: (data: PackageJson) => PackageJson) => (input: string | undefined) => string;

package/lib/cli/lint/autofix.js

@@ -30,6 +30,7 @@ exports.autofix = void 0;
 const util_1 = require("util");
 const simple_git_1 = __importDefault(require("simple-git"));
 const Git = __importStar(require("../../api/git"));
+const GitHub = __importStar(require("../../api/github"));
 const eslint_1 = require("../../cli/adapter/eslint");
 const prettier_1 = require("../../cli/adapter/prettier");
 const env_1 = require("../../utils/env");
@@ -87,23 +88,32 @@ const autofix = async (params) => {
         // Unconditionally re-run Prettier; reaching here means we have pre-existing
         // format violations or may have created new ones through ESLint fixes.
         await (0, prettier_1.runPrettier)('format', logger);
-        const ref = await Git.commitAllChanges({
+        if (process.env.GITHUB_ACTIONS) {
+            // GitHub runners have Git installed locally
+            const ref = await Git.commitAllChanges({
+                dir,
+                message: AUTOFIX_COMMIT_MESSAGE,
+            });
+            if (!ref) {
+                return logging_1.log.warn('No autofixes detected.');
+            }
+            await (0, wait_1.throwOnTimeout)((0, simple_git_1.default)().push(), { s: 30 });
+            logging_1.log.warn(`Pushed fix commit ${ref}.`);
+            return;
+        }
+        // Other CI Environments, use GitHub API
+        if (!currentBranch) {
+            logging_1.log.warn('Could not determine the current branch');
+            return;
+        }
+        const ref = await (0, wait_1.throwOnTimeout)(GitHub.commitAndPushAllChanges({
             dir,
-            message: AUTOFIX_COMMIT_MESSAGE,
-        });
+            branch: currentBranch,
+            messageHeadline: AUTOFIX_COMMIT_MESSAGE,
+        }), { s: 30 });
         if (!ref) {
             return logging_1.log.warn('No autofixes detected.');
         }
-        await (0, wait_1.throwOnTimeout)(process.env.GITHUB_ACTIONS
-            ? // GitHub's checkout action should preconfigure the Git CLI.
-                (0, simple_git_1.default)().push()
-            : // In other CI environments (Buildkite) we fall back to GitHub App auth.
-                Git.push({
-                    auth: { type: 'gitHubApp' },
-                    dir: process.cwd(),
-                    ref,
-                    remoteRef: currentBranch,
-                }), { s: 30 });
         logging_1.log.warn(`Pushed fix commit ${ref}.`);
     }
     catch (err) {

package/lib/cli/lint/autofix.js.map

@@ -1 +1 @@
-{"version":3,"file":"autofix.js","sourceRoot":"","sources":["../../../src/cli/lint/autofix.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"autofix.js","sourceRoot":"","sources":["../../../src/cli/lint/autofix.ts"],"names":[],"mappings":"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"}

package/lib/cli/lint/external.d.ts

@@ -1,4 +1,5 @@
 /// <reference types="node" />
+/// <reference types="node" />
 import stream from 'stream';
 import type { Input } from './types';
 export declare class StreamInterceptor extends stream.Transform {

package/lib/cli/test/reporters/github/annotations.js

@@ -21,13 +21,25 @@ const strip_ansi_1 = __importDefault(require("strip-ansi"));
  *     ...
  * ```
  *
+ * or:
+ *
+ * ```console
+ * Error: expect(received).toBe(expected) // Object.is equality
+ *
+ * Expected: "a"
+ * Received: "b"
+ *     at /workdir/skuba/src/test.test.ts:2:15
+ *     at Promise.then.completed (/workdir/skuba/node_modules/jest-circus/build/utils.js:390:28)
+ *     ...
+ * ```
+ *
  * This pattern will produce the following matches:
  *
  * 1. /workdir/skuba/src/test.test.ts
  * 2. 2
  * 2. 15
  */
-const JEST_LOCATION_REGEX = /\((.+?):(\d+):(\d+)\)/;
+const JEST_LOCATION_REGEX = /\n +at (.+\()?(.+?):(\d+):(\d+)/;
 const createAnnotations = (testResults) => {
     const cwd = process.cwd();
     return testResults.flatMap((testResult) => {
@@ -44,14 +56,14 @@ const createAnnotations = (testResults) => {
         if (testResult.numFailingTests > 0) {
             return testResult.testResults.flatMap((assertionResult) => assertionResult.failureMessages.flatMap((failureMessage) => {
                 const match = JEST_LOCATION_REGEX.exec(failureMessage);
-                if (match?.length === 4) {
+                if (match?.length === 5) {
                     return {
                         annotation_level: 'failure',
-                        path: path_1.default.relative(cwd, match[1]),
-                        start_line: Number(match[2]),
-                        end_line: Number(match[2]),
-                        start_column: Number(match[3]),
-                        end_column: Number(match[3]),
+                        path: path_1.default.relative(cwd, match[2]),
+                        start_line: Number(match[3]),
+                        end_line: Number(match[3]),
+                        start_column: Number(match[4]),
+                        end_column: Number(match[4]),
                         message: (0, strip_ansi_1.default)(failureMessage),
                         title: 'Jest',
                     };

package/lib/cli/test/reporters/github/annotations.js.map

@@ -1 +1 @@
-{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../../../../src/cli/test/reporters/github/annotations.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"annotations.js","sourceRoot":"","sources":["../../../../../src/cli/test/reporters/github/annotations.ts"],"names":[],"mappings":"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"}

package/lib/utils/error.d.ts

@@ -19,7 +19,7 @@ export declare const ConcurrentlyErrors: t.Array<t.Record<{
  *
  * https://nodejs.org/api/util.html#custom-inspection-functions-on-objects
  */
-export declare const createTerseError: (message?: string | undefined) => Error & {
+export declare const createTerseError: (message?: string) => Error & {
     [inspect.custom]: () => string | undefined;
 };
 export declare const handleCliError: (err: unknown) => void;

package/lib/wrapper/http.d.ts

@@ -11,4 +11,4 @@ export declare const createRequestListenerFromFunction: (fn: (...args: unknown[]
  *
  * This function resolves when the server is closed.
  */
-export declare const serveRequestListener: (requestListener: http.RequestListener, port?: number | undefined) => Promise<void>;
+export declare const serveRequestListener: (requestListener: http.RequestListener, port?: number) => Promise<void>;

package/package.json

@@ -6,9 +6,11 @@
     "url": "https://github.com/seek-oss/skuba/issues"
   },
   "dependencies": {
+    "@octokit/graphql": "^4.8.0",
+    "@octokit/graphql-schema": "^10.73.0",
     "@octokit/rest": "^18.12.0",
     "@octokit/types": "^6.34.0",
-    "@types/jest": "^27.5.0",
+    "@types/jest": "^28.0.0",
     "@types/node": ">=14.18",
     "chalk": "^4.1.0",
     "concurrently": "^7.0.0",
@@ -26,6 +28,7 @@
     "is-installed-globally": "^0.4.0",
     "isomorphic-git": "^1.11.1",
     "jest": "^28.1.0",
+    "jest-watch-typeahead": "^1.1.0",
     "latest-version": "^5.1.0",
     "lodash.mergewith": "^4.6.2",
     "normalize-package-data": "^4.0.0",
@@ -41,10 +44,10 @@
     "strip-ansi": "^6.0.1",
     "ts-jest": "^28.0.2",
     "ts-node": "^10.7.0",
-    "ts-node-dev": "^2.0.0-0",
+    "ts-node-dev": "^2.0.0",
     "tsconfig-paths": "^4.0.0",
     "tsconfig-seek": "1.0.2",
-    "typescript": "~4.6.4"
+    "typescript": "~4.7.0"
   },
   "description": "SEEK development toolkit for backend applications and packages",
   "devDependencies": {
@@ -62,12 +65,13 @@
     "@types/supertest": "2.0.12",
     "enhanced-resolve": "5.9.3",
     "express": "4.18.1",
+    "graphql-tag": "2.12.6",
     "jsonfile": "6.1.0",
     "koa": "2.13.4",
-    "memfs": "3.4.3",
+    "memfs": "3.4.4",
     "semver": "7.3.7",
     "supertest": "6.2.3",
-    "type-fest": "2.12.2"
+    "type-fest": "2.13.0"
   },
   "engines": {
     "node": ">=14.18"
@@ -123,5 +127,5 @@
     "version": "4.0.0"
   },
   "types": "./lib/index.d.ts",
-  "version": "4.2.2"
+  "version": "4.3.0-beta.0"
 }

package/template/express-rest-api/.buildkite/pipeline.yml

@@ -61,7 +61,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - seek-jobs/gantry#v1.7.0:
+      - seek-jobs/gantry#v1.8.1:
           command: build
           file: gantry.build.yml
           region: <%- region %>
@@ -78,7 +78,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
     key: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.7.0:
+      - seek-jobs/gantry#v1.8.1:
           command: apply
           environment: <%- devGantryEnvironmentName %>
           file: gantry.apply.yml
@@ -93,7 +93,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.7.0:
+      - seek-jobs/gantry#v1.8.1:
           command: apply
           environment: <%- prodGantryEnvironmentName %>
           file: gantry.apply.yml

package/template/express-rest-api/package.json

@@ -8,7 +8,7 @@
     "@types/express": "^4.17.13",
     "@types/node": "^16.0.0",
     "@types/supertest": "^2.0.11",
-    "pino-pretty": "^7.1.0",
+    "pino-pretty": "^8.0.0",
     "skuba": "*",
     "supertest": "^6.1.6"
   },

package/template/koa-rest-api/.buildkite/pipeline.yml

@@ -61,7 +61,7 @@ steps:
       - *aws-sm
       - *private-npm
       - *docker-ecr-cache
-      - seek-jobs/gantry#v1.7.0:
+      - seek-jobs/gantry#v1.8.1:
           command: build
           file: gantry.build.yml
           region: <%- region %>
@@ -78,7 +78,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- devGantryEnvironmentName %>
     key: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.7.0:
+      - seek-jobs/gantry#v1.8.1:
           command: apply
           environment: <%- devGantryEnvironmentName %>
           file: gantry.apply.yml
@@ -93,7 +93,7 @@ steps:
     concurrency_group: <%- teamName %>/deploy/gantry/<%- prodGantryEnvironmentName %>
     depends_on: deploy-dev
     plugins:
-      - seek-jobs/gantry#v1.7.0:
+      - seek-jobs/gantry#v1.8.1:
           command: apply
           environment: <%- prodGantryEnvironmentName %>
           file: gantry.apply.yml

package/template/koa-rest-api/package.json

@@ -15,7 +15,7 @@
     "runtypes": "^6.4.1",
     "runtypes-filter": "^0.6.0",
     "seek-datadog-custom-metrics": "^4.0.0",
-    "seek-koala": "^5.2.1",
+    "seek-koala": "^6.0.0",
     "skuba-dive": "^2.0.0",
     "uuid": "^8.3.2"
   },
@@ -28,7 +28,7 @@
     "@types/supertest": "^2.0.11",
     "@types/uuid": "^8.3.1",
     "chance": "^1.1.8",
-    "pino-pretty": "^7.1.0",
+    "pino-pretty": "^8.0.0",
     "skuba": "*",
     "supertest": "^6.1.6"
   },

package/template/lambda-sqs-worker/package.json

@@ -12,7 +12,7 @@
     "@types/chance": "^1.1.3",
     "@types/node": "^16.0.0",
     "chance": "^1.1.8",
-    "pino-pretty": "^7.1.0",
+    "pino-pretty": "^8.0.0",
     "serverless": "^3.17.0",
     "serverless-plugin-canary-deployments": "^0.8.0",
     "serverless-prune-plugin": "^2.0.0",