skuba 4.2.0-beta.6 → 4.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (232) hide show
  1. package/README.md +1 -1
  2. package/lib/api/buildkite/annotate.js +8 -19
  3. package/lib/api/buildkite/annotate.js.map +1 -1
  4. package/lib/api/git/commit.js +6 -17
  5. package/lib/api/git/commit.js.map +1 -1
  6. package/lib/api/git/commitAllChanges.js +4 -13
  7. package/lib/api/git/commitAllChanges.js.map +1 -1
  8. package/lib/api/git/currentBranch.js +5 -14
  9. package/lib/api/git/currentBranch.js.map +1 -1
  10. package/lib/api/git/getChangedFiles.js +3 -12
  11. package/lib/api/git/getChangedFiles.js.map +1 -1
  12. package/lib/api/git/log.js +7 -17
  13. package/lib/api/git/log.js.map +1 -1
  14. package/lib/api/git/push.js +7 -19
  15. package/lib/api/git/push.js.map +1 -1
  16. package/lib/api/git/remote.js +5 -14
  17. package/lib/api/git/remote.js.map +1 -1
  18. package/lib/api/git/reset.js +6 -15
  19. package/lib/api/git/reset.js.map +1 -1
  20. package/lib/api/github/checkRun.js +4 -13
  21. package/lib/api/github/checkRun.js.map +1 -1
  22. package/lib/api/github/environment.js +2 -3
  23. package/lib/api/github/environment.js.map +1 -1
  24. package/lib/api/github/issueComment.js +15 -28
  25. package/lib/api/github/issueComment.js.map +1 -1
  26. package/lib/api/github/pullRequest.js +8 -17
  27. package/lib/api/github/pullRequest.js.map +1 -1
  28. package/lib/api/jest/index.d.ts +26 -11
  29. package/lib/api/net/compose.js +3 -12
  30. package/lib/api/net/compose.js.map +1 -1
  31. package/lib/api/net/socket.js +30 -43
  32. package/lib/api/net/socket.js.map +1 -1
  33. package/lib/api/net/waitFor.js +4 -13
  34. package/lib/api/net/waitFor.js.map +1 -1
  35. package/lib/cli/adapter/eslint.d.ts +2 -1
  36. package/lib/cli/adapter/eslint.js +10 -15
  37. package/lib/cli/adapter/eslint.js.map +1 -1
  38. package/lib/cli/adapter/prettier.js +12 -24
  39. package/lib/cli/adapter/prettier.js.map +1 -1
  40. package/lib/cli/build/tsc.js +2 -11
  41. package/lib/cli/build/tsc.js.map +1 -1
  42. package/lib/cli/configure/analyseConfiguration.js +7 -16
  43. package/lib/cli/configure/analyseConfiguration.js.map +1 -1
  44. package/lib/cli/configure/analyseDependencies.js +22 -28
  45. package/lib/cli/configure/analyseDependencies.js.map +1 -1
  46. package/lib/cli/configure/analysis/files.js +3 -12
  47. package/lib/cli/configure/analysis/files.js.map +1 -1
  48. package/lib/cli/configure/analysis/git.js +4 -13
  49. package/lib/cli/configure/analysis/git.js.map +1 -1
  50. package/lib/cli/configure/analysis/package.js +7 -13
  51. package/lib/cli/configure/analysis/package.js.map +1 -1
  52. package/lib/cli/configure/analysis/project.js +13 -23
  53. package/lib/cli/configure/analysis/project.js.map +1 -1
  54. package/lib/cli/configure/ensureTemplateCompletion.js +6 -15
  55. package/lib/cli/configure/ensureTemplateCompletion.js.map +1 -1
  56. package/lib/cli/configure/getEntryPoint.js +3 -12
  57. package/lib/cli/configure/getEntryPoint.js.map +1 -1
  58. package/lib/cli/configure/getProjectType.js +3 -13
  59. package/lib/cli/configure/getProjectType.js.map +1 -1
  60. package/lib/cli/configure/index.js +21 -30
  61. package/lib/cli/configure/index.js.map +1 -1
  62. package/lib/cli/configure/modules/eslint.js +10 -29
  63. package/lib/cli/configure/modules/eslint.js.map +1 -1
  64. package/lib/cli/configure/modules/ignore.js +3 -12
  65. package/lib/cli/configure/modules/ignore.js.map +1 -1
  66. package/lib/cli/configure/modules/jest.js +14 -33
  67. package/lib/cli/configure/modules/jest.js.map +1 -1
  68. package/lib/cli/configure/modules/package.js +21 -21
  69. package/lib/cli/configure/modules/package.js.map +1 -1
  70. package/lib/cli/configure/modules/prettier.js +9 -28
  71. package/lib/cli/configure/modules/prettier.js.map +1 -1
  72. package/lib/cli/configure/modules/renovate.js +13 -30
  73. package/lib/cli/configure/modules/renovate.js.map +1 -1
  74. package/lib/cli/configure/modules/skubaDive.js +7 -5
  75. package/lib/cli/configure/modules/skubaDive.js.map +1 -1
  76. package/lib/cli/configure/modules/tsconfig.js +12 -18
  77. package/lib/cli/configure/modules/tsconfig.js.map +1 -1
  78. package/lib/cli/configure/processing/json.js +1 -1
  79. package/lib/cli/configure/processing/json.js.map +1 -1
  80. package/lib/cli/configure/processing/package.js +5 -5
  81. package/lib/cli/configure/processing/package.js.map +1 -1
  82. package/lib/cli/configure/processing/prettier.js +4 -1
  83. package/lib/cli/configure/processing/prettier.js.map +1 -1
  84. package/lib/cli/configure/processing/typescript.js +4 -7
  85. package/lib/cli/configure/processing/typescript.js.map +1 -1
  86. package/lib/cli/configure/refreshIgnoreFiles.js +13 -21
  87. package/lib/cli/configure/refreshIgnoreFiles.js.map +1 -1
  88. package/lib/cli/format.js +5 -14
  89. package/lib/cli/format.js.map +1 -1
  90. package/lib/cli/help.js +3 -12
  91. package/lib/cli/help.js.map +1 -1
  92. package/lib/cli/init/getConfig.js +63 -56
  93. package/lib/cli/init/getConfig.js.map +1 -1
  94. package/lib/cli/init/git.js +9 -18
  95. package/lib/cli/init/git.js.map +1 -1
  96. package/lib/cli/init/index.js +14 -23
  97. package/lib/cli/init/index.js.map +1 -1
  98. package/lib/cli/init/prompts.js +3 -12
  99. package/lib/cli/init/prompts.js.map +1 -1
  100. package/lib/cli/init/types.js +7 -2
  101. package/lib/cli/init/types.js.map +1 -1
  102. package/lib/cli/init/writePackageJson.js +5 -14
  103. package/lib/cli/init/writePackageJson.js.map +1 -1
  104. package/lib/cli/lint/annotate/buildkite/index.js +3 -12
  105. package/lib/cli/lint/annotate/buildkite/index.js.map +1 -1
  106. package/lib/cli/lint/annotate/github/eslint.js +10 -2
  107. package/lib/cli/lint/annotate/github/eslint.js.map +1 -1
  108. package/lib/cli/lint/annotate/github/index.js +3 -12
  109. package/lib/cli/lint/annotate/github/index.js.map +1 -1
  110. package/lib/cli/lint/annotate/github/tsc.js +1 -1
  111. package/lib/cli/lint/annotate/github/tsc.js.map +1 -1
  112. package/lib/cli/lint/annotate/index.js +3 -12
  113. package/lib/cli/lint/annotate/index.js.map +1 -1
  114. package/lib/cli/lint/autofix.d.ts +7 -1
  115. package/lib/cli/lint/autofix.js +26 -27
  116. package/lib/cli/lint/autofix.js.map +1 -1
  117. package/lib/cli/lint/external.js +37 -59
  118. package/lib/cli/lint/external.js.map +1 -1
  119. package/lib/cli/lint/index.js +5 -14
  120. package/lib/cli/lint/index.js.map +1 -1
  121. package/lib/cli/lint/internal.js +7 -16
  122. package/lib/cli/lint/internal.js.map +1 -1
  123. package/lib/cli/lint/tsc.js +4 -13
  124. package/lib/cli/lint/tsc.js.map +1 -1
  125. package/lib/cli/node.js +3 -12
  126. package/lib/cli/node.js.map +1 -1
  127. package/lib/cli/release.js +3 -12
  128. package/lib/cli/release.js.map +1 -1
  129. package/lib/cli/start.js +4 -14
  130. package/lib/cli/start.js.map +1 -1
  131. package/lib/cli/test/index.js +1 -2
  132. package/lib/cli/test/index.js.map +1 -1
  133. package/lib/cli/test/reporters/github/annotations.js +7 -7
  134. package/lib/cli/test/reporters/github/annotations.js.map +1 -1
  135. package/lib/cli/test/reporters/github/index.d.ts +2 -2
  136. package/lib/cli/test/reporters/github/index.js +37 -37
  137. package/lib/cli/test/reporters/github/index.js.map +1 -1
  138. package/lib/cli/version.js +3 -12
  139. package/lib/cli/version.js.map +1 -1
  140. package/lib/skuba.js +3 -12
  141. package/lib/skuba.js.map +1 -1
  142. package/lib/utils/args.d.ts +1 -1
  143. package/lib/utils/args.js +7 -11
  144. package/lib/utils/args.js.map +1 -1
  145. package/lib/utils/command.d.ts +1 -1
  146. package/lib/utils/command.js +0 -1
  147. package/lib/utils/command.js.map +1 -1
  148. package/lib/utils/copy.js +11 -20
  149. package/lib/utils/copy.js.map +1 -1
  150. package/lib/utils/dir.js +9 -18
  151. package/lib/utils/dir.js.map +1 -1
  152. package/lib/utils/error.d.ts +14 -0
  153. package/lib/utils/error.js +16 -2
  154. package/lib/utils/error.js.map +1 -1
  155. package/lib/utils/exec.js +25 -29
  156. package/lib/utils/exec.js.map +1 -1
  157. package/lib/utils/logo.js +4 -14
  158. package/lib/utils/logo.js.map +1 -1
  159. package/lib/utils/manifest.js +6 -15
  160. package/lib/utils/manifest.js.map +1 -1
  161. package/lib/utils/version.js +12 -22
  162. package/lib/utils/version.js.map +1 -1
  163. package/lib/utils/wait.d.ts +17 -0
  164. package/lib/utils/wait.js +32 -0
  165. package/lib/utils/wait.js.map +1 -0
  166. package/lib/utils/worker.js +4 -12
  167. package/lib/utils/worker.js.map +1 -1
  168. package/lib/wrapper/functionHandler.js +2 -11
  169. package/lib/wrapper/functionHandler.js.map +1 -1
  170. package/lib/wrapper/http.js +6 -15
  171. package/lib/wrapper/http.js.map +1 -1
  172. package/lib/wrapper/main.js +2 -11
  173. package/lib/wrapper/main.js.map +1 -1
  174. package/lib/wrapper/requestListener.js +3 -13
  175. package/lib/wrapper/requestListener.js.map +1 -1
  176. package/package.json +19 -29
  177. package/template/base/tsconfig.json +2 -1
  178. package/template/express-rest-api/.buildkite/pipeline.yml +5 -4
  179. package/template/express-rest-api/Dockerfile +3 -3
  180. package/template/greeter/.buildkite/pipeline.yml +2 -1
  181. package/template/koa-rest-api/.buildkite/pipeline.yml +5 -4
  182. package/template/koa-rest-api/Dockerfile +3 -3
  183. package/template/koa-rest-api/package.json +5 -5
  184. package/template/koa-rest-api/src/api/jobs/getJobs.ts +2 -2
  185. package/template/koa-rest-api/src/api/jobs/postJob.ts +2 -2
  186. package/template/koa-rest-api/src/framework/logging.ts +8 -5
  187. package/template/koa-rest-api/src/framework/metrics.ts +2 -2
  188. package/template/koa-rest-api/src/framework/server.test.ts +21 -21
  189. package/template/koa-rest-api/src/framework/server.ts +4 -3
  190. package/template/koa-rest-api/src/listen.ts +2 -2
  191. package/template/koa-rest-api/src/testing/logging.ts +5 -20
  192. package/template/lambda-sqs-worker/.buildkite/pipeline.yml +2 -1
  193. package/template/lambda-sqs-worker/.nvmrc +1 -1
  194. package/template/lambda-sqs-worker/Dockerfile +1 -1
  195. package/template/lambda-sqs-worker/package.json +4 -4
  196. package/template/lambda-sqs-worker/serverless.yml +2 -2
  197. package/template/lambda-sqs-worker/src/app.test.ts +9 -9
  198. package/template/lambda-sqs-worker/src/app.ts +2 -1
  199. package/template/lambda-sqs-worker/src/framework/handler.test.ts +10 -10
  200. package/template/lambda-sqs-worker/src/framework/handler.ts +14 -17
  201. package/template/lambda-sqs-worker/src/framework/logging.ts +11 -6
  202. package/template/lambda-sqs-worker/src/testing/logging.ts +7 -5
  203. package/template/lambda-sqs-worker-cdk/.buildkite/pipeline.yml +2 -1
  204. package/template/lambda-sqs-worker-cdk/.nvmrc +1 -1
  205. package/template/lambda-sqs-worker-cdk/Dockerfile +1 -1
  206. package/template/lambda-sqs-worker-cdk/infra/__snapshots__/appStack.test.ts.snap +2 -2
  207. package/template/lambda-sqs-worker-cdk/infra/appStack.ts +1 -1
  208. package/template/lambda-sqs-worker-cdk/package.json +9 -11
  209. package/template/oss-npm-package/tsconfig.json +2 -1
  210. package/template/private-npm-package/.buildkite/pipeline.yml +1 -1
  211. package/template/private-npm-package/tsconfig.json +2 -1
  212. package/lib/cli/changesets/coreAdapter.d.ts +0 -9
  213. package/lib/cli/changesets/coreAdapter.js +0 -19
  214. package/lib/cli/changesets/coreAdapter.js.map +0 -1
  215. package/lib/cli/changesets/gitUtils.d.ts +0 -17
  216. package/lib/cli/changesets/gitUtils.js +0 -128
  217. package/lib/cli/changesets/gitUtils.js.map +0 -1
  218. package/lib/cli/changesets/githubAdapter.d.ts +0 -3
  219. package/lib/cli/changesets/githubAdapter.js +0 -8
  220. package/lib/cli/changesets/githubAdapter.js.map +0 -1
  221. package/lib/cli/changesets/index.d.ts +0 -1
  222. package/lib/cli/changesets/index.js +0 -94
  223. package/lib/cli/changesets/index.js.map +0 -1
  224. package/lib/cli/changesets/readChangesetState.d.ts +0 -6
  225. package/lib/cli/changesets/readChangesetState.js +0 -34
  226. package/lib/cli/changesets/readChangesetState.js.map +0 -1
  227. package/lib/cli/changesets/run.d.ts +0 -22
  228. package/lib/cli/changesets/run.js +0 -196
  229. package/lib/cli/changesets/run.js.map +0 -1
  230. package/lib/cli/changesets/utils.d.ts +0 -30
  231. package/lib/cli/changesets/utils.js +0 -130
  232. package/lib/cli/changesets/utils.js.map +0 -1
@@ -22,25 +22,16 @@ var __importStar = (this && this.__importStar) || function (mod) {
22
22
  __setModuleDefault(result, mod);
23
23
  return result;
24
24
  };
25
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
26
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
27
- return new (P || (P = Promise))(function (resolve, reject) {
28
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
29
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
30
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
31
- step((generator = generator.apply(thisArg, _arguments || [])).next());
32
- });
33
- };
34
25
  Object.defineProperty(exports, "__esModule", { value: true });
35
26
  exports.putIssueComment = void 0;
36
27
  const rest_1 = require("@octokit/rest");
37
28
  const Git = __importStar(require("../git"));
38
29
  const environment_1 = require("./environment");
39
30
  const pullRequest_1 = require("./pullRequest");
40
- const getUserId = (client) => __awaiter(void 0, void 0, void 0, function* () {
41
- const { data } = yield client.users.getAuthenticated();
31
+ const getUserId = async (client) => {
32
+ const { data } = await client.users.getAuthenticated();
42
33
  return data.id;
43
- });
34
+ };
44
35
  /**
45
36
  * Asynchronously creates or updates a GitHub issue comment.
46
37
  *
@@ -52,33 +43,29 @@ const getUserId = (client) => __awaiter(void 0, void 0, void 0, function* () {
52
43
  * A `GITHUB_API_TOKEN` or `GITHUB_TOKEN` with write permissions must be present
53
44
  * on the environment.
54
45
  */
55
- const putIssueComment = (params) => __awaiter(void 0, void 0, void 0, function* () {
56
- var _a, _b, _c, _d;
57
- const env = (_a = params.env) !== null && _a !== void 0 ? _a : process.env;
46
+ const putIssueComment = async (params) => {
47
+ const env = params.env ?? process.env;
58
48
  const dir = process.cwd();
59
- const { owner, repo } = yield Git.getOwnerAndRepo({ dir });
49
+ const { owner, repo } = await Git.getOwnerAndRepo({ dir });
60
50
  const client = new rest_1.Octokit({ auth: (0, environment_1.apiTokenFromEnvironment)() });
61
- const issueNumber = (_b = params.issueNumber) !== null && _b !== void 0 ? _b : (yield (0, pullRequest_1.getPullRequestNumber)({ client, env }));
51
+ const issueNumber = params.issueNumber ?? (await (0, pullRequest_1.getPullRequestNumber)({ client, env }));
62
52
  if (!issueNumber) {
63
53
  throw new Error('Failed to infer an issue number');
64
54
  }
65
- const comments = yield client.issues.listComments({
55
+ const comments = await client.issues.listComments({
66
56
  issue_number: issueNumber,
67
57
  owner,
68
58
  repo,
69
59
  });
70
- const userId = (_c = params.userId) !== null && _c !== void 0 ? _c : (yield getUserId(client));
71
- const commentId = (_d = comments.data.find((comment) => {
72
- var _a, _b;
73
- return ((_a = comment.user) === null || _a === void 0 ? void 0 : _a.id) === userId &&
74
- (params.internalId
75
- ? (_b = comment.body) === null || _b === void 0 ? void 0 : _b.endsWith(`\n\n<!-- ${params.internalId} -->`)
76
- : true);
77
- })) === null || _d === void 0 ? void 0 : _d.id;
60
+ const userId = params.userId ?? (await getUserId(client));
61
+ const commentId = comments.data.find((comment) => comment.user?.id === userId &&
62
+ (params.internalId
63
+ ? comment.body?.endsWith(`\n\n<!-- ${params.internalId} -->`)
64
+ : true))?.id;
78
65
  const body = params.internalId
79
66
  ? [params.body.trim(), `<!-- ${params.internalId} -->`].join('\n\n')
80
67
  : params.body.trim();
81
- const response = yield (commentId
68
+ const response = await (commentId
82
69
  ? client.issues.updateComment({
83
70
  body,
84
71
  comment_id: commentId,
@@ -95,6 +82,6 @@ const putIssueComment = (params) => __awaiter(void 0, void 0, void 0, function*
95
82
  return {
96
83
  id: response.data.id,
97
84
  };
98
- });
85
+ };
99
86
  exports.putIssueComment = putIssueComment;
100
87
  //# sourceMappingURL=issueComment.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"issueComment.js","sourceRoot":"","sources":["../../../src/api/github/issueComment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAwC;AAExC,4CAA8B;AAE9B,+CAAwD;AACxD,+CAAqD;AAErD,MAAM,SAAS,GAAG,CAAO,MAAe,EAAmB,EAAE;IAC3D,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;IAEvD,OAAO,IAAI,CAAC,EAAE,CAAC;AACjB,CAAC,CAAA,CAAC;AAsDF;;;;;;;;;;GAUG;AACI,MAAM,eAAe,GAAG,CAC7B,MAAiC,EACV,EAAE;;IACzB,MAAM,GAAG,GAAG,MAAA,MAAM,CAAC,GAAG,mCAAI,OAAO,CAAC,GAAG,CAAC;IAEtC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE1B,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,CAAC,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAE3D,MAAM,MAAM,GAAG,IAAI,cAAO,CAAC,EAAE,IAAI,EAAE,IAAA,qCAAuB,GAAE,EAAE,CAAC,CAAC;IAEhE,MAAM,WAAW,GACf,MAAA,MAAM,CAAC,WAAW,mCAAI,CAAC,MAAM,IAAA,kCAAoB,EAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IAEtE,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACpD;IAED,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;QAChD,YAAY,EAAE,WAAW;QACzB,KAAK;QACL,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAA,MAAM,CAAC,MAAM,mCAAI,CAAC,MAAM,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IAE1D,MAAM,SAAS,GAAG,MAAA,QAAQ,CAAC,IAAI,CAAC,IAAI,CAClC,CAAC,OAAO,EAAE,EAAE;;QACV,OAAA,CAAA,MAAA,OAAO,CAAC,IAAI,0CAAE,EAAE,MAAK,MAAM;YAC3B,CAAC,MAAM,CAAC,UAAU;gBAChB,CAAC,CAAC,MAAA,OAAO,CAAC,IAAI,0CAAE,QAAQ,CAAC,YAAY,MAAM,CAAC,UAAU,MAAM,CAAC;gBAC7D,CAAC,CAAC,IAAI,CAAC,CAAA;KAAA,CACZ,0CAAE,EAAE,CAAC;IAEN,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU;QAC5B,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,QAAQ,MAAM,CAAC,UAAU,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;QACpE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAEvB,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS;QAC/B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC;YAC1B,IAAI;YACJ,UAAU,EAAE,SAAS;YACrB,YAAY,EAAE,WAAW;YACzB,KAAK;YACL,IAAI;SACL,CAAC;QACJ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC;YAC1B,IAAI;YACJ,YAAY,EAAE,WAAW;YACzB,KAAK;YACL,IAAI;SACL,CAAC,CAAC,CAAC;IAER,OAAO;QACL,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE;KACrB,CAAC;AACJ,CAAC,CAAA,CAAC;AAxDW,QAAA,eAAe,mBAwD1B"}
1
+ {"version":3,"file":"issueComment.js","sourceRoot":"","sources":["../../../src/api/github/issueComment.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAwC;AAExC,4CAA8B;AAE9B,+CAAwD;AACxD,+CAAqD;AAErD,MAAM,SAAS,GAAG,KAAK,EAAE,MAAe,EAAmB,EAAE;IAC3D,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,gBAAgB,EAAE,CAAC;IAEvD,OAAO,IAAI,CAAC,EAAE,CAAC;AACjB,CAAC,CAAC;AAsDF;;;;;;;;;;GAUG;AACI,MAAM,eAAe,GAAG,KAAK,EAClC,MAAiC,EACV,EAAE;IACzB,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAEtC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE1B,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,GAAG,MAAM,GAAG,CAAC,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC,CAAC;IAE3D,MAAM,MAAM,GAAG,IAAI,cAAO,CAAC,EAAE,IAAI,EAAE,IAAA,qCAAuB,GAAE,EAAE,CAAC,CAAC;IAEhE,MAAM,WAAW,GACf,MAAM,CAAC,WAAW,IAAI,CAAC,MAAM,IAAA,kCAAoB,EAAC,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,CAAC,CAAC;IAEtE,IAAI,CAAC,WAAW,EAAE;QAChB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;KACpD;IAED,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC;QAChD,YAAY,EAAE,WAAW;QACzB,KAAK;QACL,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,IAAI,CAAC,MAAM,SAAS,CAAC,MAAM,CAAC,CAAC,CAAC;IAE1D,MAAM,SAAS,GAAG,QAAQ,CAAC,IAAI,CAAC,IAAI,CAClC,CAAC,OAAO,EAAE,EAAE,CACV,OAAO,CAAC,IAAI,EAAE,EAAE,KAAK,MAAM;QAC3B,CAAC,MAAM,CAAC,UAAU;YAChB,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,QAAQ,CAAC,YAAY,MAAM,CAAC,UAAU,MAAM,CAAC;YAC7D,CAAC,CAAC,IAAI,CAAC,CACZ,EAAE,EAAE,CAAC;IAEN,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU;QAC5B,CAAC,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,EAAE,QAAQ,MAAM,CAAC,UAAU,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC;QACpE,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;IAEvB,MAAM,QAAQ,GAAG,MAAM,CAAC,SAAS;QAC/B,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC;YAC1B,IAAI;YACJ,UAAU,EAAE,SAAS;YACrB,YAAY,EAAE,WAAW;YACzB,KAAK;YACL,IAAI;SACL,CAAC;QACJ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC;YAC1B,IAAI;YACJ,YAAY,EAAE,WAAW;YACzB,KAAK;YACL,IAAI;SACL,CAAC,CAAC,CAAC;IAER,OAAO;QACL,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE;KACrB,CAAC;AACJ,CAAC,CAAC;AAxDW,QAAA,eAAe,mBAwD1B"}
@@ -22,15 +22,6 @@ var __importStar = (this && this.__importStar) || function (mod) {
22
22
  __setModuleDefault(result, mod);
23
23
  return result;
24
24
  };
25
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
26
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
27
- return new (P || (P = Promise))(function (resolve, reject) {
28
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
29
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
30
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
31
- step((generator = generator.apply(thisArg, _arguments || [])).next());
32
- });
33
- };
34
25
  Object.defineProperty(exports, "__esModule", { value: true });
35
26
  exports.getPullRequestNumber = void 0;
36
27
  const rest_1 = require("@octokit/rest");
@@ -44,20 +35,20 @@ const environment_1 = require("./environment");
44
35
  * associated with the head commit. An error is thrown if there are no
45
36
  * associated pull requests, or if they are all closed or locked.
46
37
  */
47
- const getPullRequestNumber = (params = {}) => __awaiter(void 0, void 0, void 0, function* () {
48
- var _a, _b, _c, _d;
49
- const env = (_a = params.env) !== null && _a !== void 0 ? _a : process.env;
38
+ const getPullRequestNumber = async (params = {}) => {
39
+ const env = params.env ?? process.env;
50
40
  const dir = process.cwd();
51
- const number = Number((_b = env.BUILDKITE_PULL_REQUEST) !== null && _b !== void 0 ? _b : (_c = env.GITHUB_REF) === null || _c === void 0 ? void 0 : _c.replace(/^refs\/pull\/(\d+).*$/, '$1'));
41
+ const number = Number(env.BUILDKITE_PULL_REQUEST ??
42
+ env.GITHUB_REF?.replace(/^refs\/pull\/(\d+).*$/, '$1'));
52
43
  if (Number.isSafeInteger(number)) {
53
44
  return number;
54
45
  }
55
- const client = (_d = params.client) !== null && _d !== void 0 ? _d : new rest_1.Octokit({ auth: (0, environment_1.apiTokenFromEnvironment)() });
56
- const [commitId, { owner, repo }] = yield Promise.all([
46
+ const client = params.client ?? new rest_1.Octokit({ auth: (0, environment_1.apiTokenFromEnvironment)() });
47
+ const [commitId, { owner, repo }] = await Promise.all([
57
48
  Git.getHeadCommitId({ dir, env }),
58
49
  Git.getOwnerAndRepo({ dir }),
59
50
  ]);
60
- const response = yield client.repos.listPullRequestsAssociatedWithCommit({
51
+ const response = await client.repos.listPullRequestsAssociatedWithCommit({
61
52
  commit_sha: commitId,
62
53
  owner,
63
54
  repo,
@@ -69,6 +60,6 @@ const getPullRequestNumber = (params = {}) => __awaiter(void 0, void 0, void 0,
69
60
  throw new Error(`Commit ${commitId} is not associated with an open GitHub pull request`);
70
61
  }
71
62
  return data[0].number;
72
- });
63
+ };
73
64
  exports.getPullRequestNumber = getPullRequestNumber;
74
65
  //# sourceMappingURL=pullRequest.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"pullRequest.js","sourceRoot":"","sources":["../../../src/api/github/pullRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAwC;AAExC,4CAA8B;AAE9B,+CAAwD;AAcxD;;;;;;;GAOG;AACI,MAAM,oBAAoB,GAAG,CAClC,SAAmC,EAAE,EACpB,EAAE;;IACnB,MAAM,GAAG,GAAG,MAAA,MAAM,CAAC,GAAG,mCAAI,OAAO,CAAC,GAAG,CAAC;IAEtC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE1B,MAAM,MAAM,GAAG,MAAM,CACnB,MAAA,GAAG,CAAC,sBAAsB,mCACxB,MAAA,GAAG,CAAC,UAAU,0CAAE,OAAO,CAAC,uBAAuB,EAAE,IAAI,CAAC,CACzD,CAAC;IAEF,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;QAChC,OAAO,MAAM,CAAC;KACf;IAED,MAAM,MAAM,GACV,MAAA,MAAM,CAAC,MAAM,mCAAI,IAAI,cAAO,CAAC,EAAE,IAAI,EAAE,IAAA,qCAAuB,GAAE,EAAE,CAAC,CAAC;IAEpE,MAAM,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpD,GAAG,CAAC,eAAe,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;QACjC,GAAG,CAAC,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC;KAC7B,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC;QACvE,UAAU,EAAE,QAAQ;QACpB,KAAK;QACL,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI;SACvB,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,KAAK,MAAM,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC;SACjD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IAE5D,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,UAAU,QAAQ,qDAAqD,CACxE,CAAC;KACH;IAED,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AACxB,CAAC,CAAA,CAAC;AAzCW,QAAA,oBAAoB,wBAyC/B"}
1
+ {"version":3,"file":"pullRequest.js","sourceRoot":"","sources":["../../../src/api/github/pullRequest.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAwC;AAExC,4CAA8B;AAE9B,+CAAwD;AAcxD;;;;;;;GAOG;AACI,MAAM,oBAAoB,GAAG,KAAK,EACvC,SAAmC,EAAE,EACpB,EAAE;IACnB,MAAM,GAAG,GAAG,MAAM,CAAC,GAAG,IAAI,OAAO,CAAC,GAAG,CAAC;IAEtC,MAAM,GAAG,GAAG,OAAO,CAAC,GAAG,EAAE,CAAC;IAE1B,MAAM,MAAM,GAAG,MAAM,CACnB,GAAG,CAAC,sBAAsB;QACxB,GAAG,CAAC,UAAU,EAAE,OAAO,CAAC,uBAAuB,EAAE,IAAI,CAAC,CACzD,CAAC;IAEF,IAAI,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE;QAChC,OAAO,MAAM,CAAC;KACf;IAED,MAAM,MAAM,GACV,MAAM,CAAC,MAAM,IAAI,IAAI,cAAO,CAAC,EAAE,IAAI,EAAE,IAAA,qCAAuB,GAAE,EAAE,CAAC,CAAC;IAEpE,MAAM,CAAC,QAAQ,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;QACpD,GAAG,CAAC,eAAe,CAAC,EAAE,GAAG,EAAE,GAAG,EAAE,CAAC;QACjC,GAAG,CAAC,eAAe,CAAC,EAAE,GAAG,EAAE,CAAC;KAC7B,CAAC,CAAC;IAEH,MAAM,QAAQ,GAAG,MAAM,MAAM,CAAC,KAAK,CAAC,oCAAoC,CAAC;QACvE,UAAU,EAAE,QAAQ;QACpB,KAAK;QACL,IAAI;KACL,CAAC,CAAC;IAEH,MAAM,IAAI,GAAG,QAAQ,CAAC,IAAI;SACvB,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,EAAE,CAAC,KAAK,KAAK,MAAM,IAAI,CAAC,EAAE,CAAC,MAAM,CAAC;SACjD,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,UAAU,CAAC,aAAa,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;IAE5D,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE;QAChB,MAAM,IAAI,KAAK,CACb,UAAU,QAAQ,qDAAqD,CACxE,CAAC;KACH;IAED,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;AACxB,CAAC,CAAC;AAzCW,QAAA,oBAAoB,wBAyC/B"}
@@ -11,7 +11,7 @@ declare type DefaultOptions = 'collectCoverage' | 'collectCoverageFrom' | 'colle
11
11
  *
12
12
  * This concatenates array options like `testPathIgnorePatterns`.
13
13
  */
14
- export declare const mergePreset: <AdditionalOptions extends "filter" | "json" | "silent" | "name" | "cache" | "runner" | "projects" | "timers" | "rootDir" | "automock" | "bail" | "cacheDirectory" | "ci" | "clearMocks" | "changedFilesWithAncestor" | "changedSince" | "collectCoverage" | "collectCoverageFrom" | "collectCoverageOnlyFrom" | "coverageDirectory" | "coveragePathIgnorePatterns" | "coverageProvider" | "coverageReporters" | "coverageThreshold" | "dependencyExtractor" | "detectLeaks" | "detectOpenHandles" | "displayName" | "expand" | "extensionsToTreatAsEsm" | "extraGlobals" | "findRelatedTests" | "forceCoverageMatch" | "forceExit" | "globals" | "globalSetup" | "globalTeardown" | "haste" | "injectGlobals" | "reporters" | "logHeapUsage" | "lastCommit" | "listTests" | "maxConcurrency" | "maxWorkers" | "moduleDirectories" | "moduleFileExtensions" | "moduleLoader" | "moduleNameMapper" | "modulePathIgnorePatterns" | "modulePaths" | "noStackTrace" | "notify" | "notifyMode" | "onlyChanged" | "onlyFailures" | "outputFile" | "passWithNoTests" | "preprocessorIgnorePatterns" | "preset" | "prettierPath" | "replname" | "resetMocks" | "resetModules" | "resolver" | "restoreMocks" | "roots" | "runTestsByPath" | "scriptPreprocessor" | "setupFiles" | "setupTestFrameworkScriptFile" | "setupFilesAfterEnv" | "skipFilter" | "skipNodeResolution" | "slowTestThreshold" | "snapshotResolver" | "snapshotSerializers" | "snapshotFormat" | "errorOnDeprecated" | "testEnvironment" | "testEnvironmentOptions" | "testFailureExitCode" | "testLocationInResults" | "testMatch" | "testNamePattern" | "testPathDirs" | "testPathIgnorePatterns" | "testRegex" | "testResultsProcessor" | "testRunner" | "testSequencer" | "testURL" | "testTimeout" | "transform" | "transformIgnorePatterns" | "watchPathIgnorePatterns" | "unmockedModulePathPatterns" | "updateSnapshot" | "useStderr" | "verbose" | "watch" | "watchAll" | "watchman" | "watchPlugins">(options: Pick<Partial<{
14
+ export declare const mergePreset: <AdditionalOptions extends "filter" | "json" | "silent" | "cache" | "runner" | "projects" | "id" | "automock" | "cacheDirectory" | "clearMocks" | "coveragePathIgnorePatterns" | "dependencyExtractor" | "detectLeaks" | "detectOpenHandles" | "displayName" | "errorOnDeprecated" | "extensionsToTreatAsEsm" | "fakeTimers" | "forceCoverageMatch" | "globalSetup" | "globalTeardown" | "globals" | "haste" | "injectGlobals" | "moduleDirectories" | "moduleFileExtensions" | "moduleNameMapper" | "modulePathIgnorePatterns" | "modulePaths" | "prettierPath" | "resetMocks" | "resetModules" | "resolver" | "restoreMocks" | "rootDir" | "roots" | "runtime" | "sandboxInjectedGlobals" | "setupFiles" | "setupFilesAfterEnv" | "skipFilter" | "skipNodeResolution" | "slowTestThreshold" | "snapshotResolver" | "snapshotSerializers" | "snapshotFormat" | "testEnvironment" | "testEnvironmentOptions" | "testMatch" | "testLocationInResults" | "testPathIgnorePatterns" | "testRegex" | "testRunner" | "transform" | "transformIgnorePatterns" | "watchPathIgnorePatterns" | "unmockedModulePathPatterns" | "bail" | "ci" | "changedFilesWithAncestor" | "changedSince" | "collectCoverage" | "collectCoverageFrom" | "collectCoverageOnlyFrom" | "coverageDirectory" | "coverageProvider" | "coverageReporters" | "coverageThreshold" | "expand" | "findRelatedTests" | "forceExit" | "reporters" | "logHeapUsage" | "lastCommit" | "listTests" | "maxConcurrency" | "maxWorkers" | "noStackTrace" | "notify" | "notifyMode" | "onlyChanged" | "onlyFailures" | "outputFile" | "passWithNoTests" | "preset" | "replname" | "runTestsByPath" | "testFailureExitCode" | "testNamePattern" | "testResultsProcessor" | "testSequencer" | "testTimeout" | "updateSnapshot" | "useStderr" | "verbose" | "watch" | "watchAll" | "watchman" | "watchPlugins">(options: Pick<Partial<{
15
15
  automock: boolean;
16
16
  bail: number | boolean;
17
17
  cache: boolean;
@@ -39,7 +39,9 @@ export declare const mergePreset: <AdditionalOptions extends "filter" | "json" |
39
39
  displayName: string | Config.DisplayName;
40
40
  expand: boolean;
41
41
  extensionsToTreatAsEsm: string[];
42
- extraGlobals: string[];
42
+ fakeTimers: Config.GlobalFakeTimersConfig & ((Config.FakeTimersConfig & {
43
+ now?: number | undefined;
44
+ }) | Config.LegacyFakeTimersConfig);
43
45
  filter: string;
44
46
  findRelatedTests: boolean;
45
47
  forceCoverageMatch: string[];
@@ -49,6 +51,7 @@ export declare const mergePreset: <AdditionalOptions extends "filter" | "json" |
49
51
  globalSetup: string | null | undefined;
50
52
  globalTeardown: string | null | undefined;
51
53
  haste: Config.HasteConfig;
54
+ id: string;
52
55
  injectGlobals: boolean;
53
56
  reporters: (string | Config.ReporterConfig)[];
54
57
  logHeapUsage: boolean;
@@ -58,13 +61,11 @@ export declare const mergePreset: <AdditionalOptions extends "filter" | "json" |
58
61
  maxWorkers: string | number;
59
62
  moduleDirectories: string[];
60
63
  moduleFileExtensions: string[];
61
- moduleLoader: string;
62
64
  moduleNameMapper: {
63
65
  [key: string]: string | string[];
64
66
  };
65
67
  modulePathIgnorePatterns: string[];
66
68
  modulePaths: string[];
67
- name: string;
68
69
  noStackTrace: boolean;
69
70
  notify: boolean;
70
71
  notifyMode: string;
@@ -72,7 +73,6 @@ export declare const mergePreset: <AdditionalOptions extends "filter" | "json" |
72
73
  onlyFailures: boolean;
73
74
  outputFile: string;
74
75
  passWithNoTests: boolean;
75
- preprocessorIgnorePatterns: string[];
76
76
  preset: string | null | undefined;
77
77
  prettierPath: string | null | undefined;
78
78
  projects: (string | Config.InitialProjectOptions)[];
@@ -85,9 +85,9 @@ export declare const mergePreset: <AdditionalOptions extends "filter" | "json" |
85
85
  roots: string[];
86
86
  runner: string;
87
87
  runTestsByPath: boolean;
88
- scriptPreprocessor: string;
88
+ runtime: string;
89
+ sandboxInjectedGlobals: string[];
89
90
  setupFiles: string[];
90
- setupTestFrameworkScriptFile: string;
91
91
  setupFilesAfterEnv: string[];
92
92
  silent: boolean;
93
93
  skipFilter: boolean;
@@ -95,7 +95,25 @@ export declare const mergePreset: <AdditionalOptions extends "filter" | "json" |
95
95
  slowTestThreshold: number;
96
96
  snapshotResolver: string;
97
97
  snapshotSerializers: string[];
98
- snapshotFormat: Config.PrettyFormatOptions;
98
+ snapshotFormat: {
99
+ readonly callToJSON?: boolean | undefined;
100
+ readonly escapeRegex?: boolean | undefined;
101
+ readonly escapeString?: boolean | undefined;
102
+ readonly highlight?: boolean | undefined;
103
+ readonly indent?: number | undefined;
104
+ readonly maxDepth?: number | undefined;
105
+ readonly maxWidth?: number | undefined;
106
+ readonly min?: boolean | undefined;
107
+ readonly printBasicPrototype?: boolean | undefined;
108
+ readonly printFunctionName?: boolean | undefined;
109
+ readonly theme?: {
110
+ readonly value?: string | undefined;
111
+ readonly tag?: string | undefined;
112
+ readonly content?: string | undefined;
113
+ readonly comment?: string | undefined;
114
+ readonly prop?: string | undefined;
115
+ } | undefined;
116
+ };
99
117
  errorOnDeprecated: boolean;
100
118
  testEnvironment: string;
101
119
  testEnvironmentOptions: Record<string, unknown>;
@@ -103,15 +121,12 @@ export declare const mergePreset: <AdditionalOptions extends "filter" | "json" |
103
121
  testLocationInResults: boolean;
104
122
  testMatch: string[];
105
123
  testNamePattern: string;
106
- testPathDirs: string[];
107
124
  testPathIgnorePatterns: string[];
108
125
  testRegex: string | string[];
109
126
  testResultsProcessor: string;
110
127
  testRunner: string;
111
128
  testSequencer: string;
112
- testURL: string;
113
129
  testTimeout: number;
114
- timers: "real" | "fake" | "modern" | "legacy";
115
130
  transform: {
116
131
  [regex: string]: string | Config.TransformerConfig;
117
132
  };
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.resolveComposeAddress = void 0;
13
4
  const exec_1 = require("../../utils/exec");
@@ -18,14 +9,14 @@ const portStringToNumber = (portString) => {
18
9
  }
19
10
  return port;
20
11
  };
21
- const resolveComposeAddress = (privateHost, privatePort) => __awaiter(void 0, void 0, void 0, function* () {
12
+ const resolveComposeAddress = async (privateHost, privatePort) => {
22
13
  const exec = (0, exec_1.createExec)({ stdio: 'pipe' });
23
- const { stdout } = yield exec('docker-compose', 'port', privateHost, String(privatePort));
14
+ const { stdout } = await exec('docker-compose', 'port', privateHost, String(privatePort));
24
15
  const [host, portString] = stdout.trim().split(':');
25
16
  if (!host || !portString) {
26
17
  throw Error(`Docker Compose returned unrecognised address: '${stdout}'`);
27
18
  }
28
19
  return { host, port: portStringToNumber(portString) };
29
- });
20
+ };
30
21
  exports.resolveComposeAddress = resolveComposeAddress;
31
22
  //# sourceMappingURL=compose.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"compose.js","sourceRoot":"","sources":["../../../src/api/net/compose.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2CAA8C;AAE9C,MAAM,kBAAkB,GAAG,CAAC,UAAkB,EAAE,EAAE;IAChD,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;IAEhC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE;QAC/B,MAAM,KAAK,CAAC,+BAA+B,UAAU,GAAG,CAAC,CAAC;KAC3D;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,CACnC,WAAmB,EACnB,WAAmB,EACnB,EAAE;IACF,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3C,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAC3B,gBAAgB,EAChB,MAAM,EACN,WAAW,EACX,MAAM,CAAC,WAAW,CAAC,CACpB,CAAC;IAEF,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEpD,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;QACxB,MAAM,KAAK,CAAC,kDAAkD,MAAM,GAAG,CAAC,CAAC;KAC1E;IAED,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;AACxD,CAAC,CAAA,CAAC;AApBW,QAAA,qBAAqB,yBAoBhC"}
1
+ {"version":3,"file":"compose.js","sourceRoot":"","sources":["../../../src/api/net/compose.ts"],"names":[],"mappings":";;;AAAA,2CAA8C;AAE9C,MAAM,kBAAkB,GAAG,CAAC,UAAkB,EAAE,EAAE;IAChD,MAAM,IAAI,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC;IAEhC,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,EAAE;QAC/B,MAAM,KAAK,CAAC,+BAA+B,UAAU,GAAG,CAAC,CAAC;KAC3D;IAED,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAEK,MAAM,qBAAqB,GAAG,KAAK,EACxC,WAAmB,EACnB,WAAmB,EACnB,EAAE;IACF,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3C,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,IAAI,CAC3B,gBAAgB,EAChB,MAAM,EACN,WAAW,EACX,MAAM,CAAC,WAAW,CAAC,CACpB,CAAC;IAEF,MAAM,CAAC,IAAI,EAAE,UAAU,CAAC,GAAG,MAAM,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IAEpD,IAAI,CAAC,IAAI,IAAI,CAAC,UAAU,EAAE;QACxB,MAAM,KAAK,CAAC,kDAAkD,MAAM,GAAG,CAAC,CAAC;KAC1E;IAED,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,kBAAkB,CAAC,UAAU,CAAC,EAAE,CAAC;AACxD,CAAC,CAAC;AApBW,QAAA,qBAAqB,yBAoBhC"}
@@ -1,55 +1,42 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
12
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
4
  };
14
5
  Object.defineProperty(exports, "__esModule", { value: true });
15
6
  exports.pollSocket = void 0;
16
7
  const net_1 = __importDefault(require("net"));
17
- const trySocket = (host, port) => __awaiter(void 0, void 0, void 0, function* () {
18
- return new Promise((resolve) => {
19
- const socket = new net_1.default.Socket();
20
- const onFailure = () => {
21
- socket.destroy();
22
- resolve(false);
23
- };
24
- const onSuccess = () => socket.end(() => resolve(true));
25
- socket
26
- .connect(port, host, onSuccess)
27
- .once('error', onFailure)
28
- .once('timeout', onFailure)
29
- .setTimeout(1000);
30
- });
8
+ const trySocket = async (host, port) => new Promise((resolve) => {
9
+ const socket = new net_1.default.Socket();
10
+ const onFailure = () => {
11
+ socket.destroy();
12
+ resolve(false);
13
+ };
14
+ const onSuccess = () => socket.end(() => resolve(true));
15
+ socket
16
+ .connect(port, host, onSuccess)
17
+ .once('error', onFailure)
18
+ .once('timeout', onFailure)
19
+ .setTimeout(1000);
31
20
  });
32
- const pollSocket = (host, port, timeout) => __awaiter(void 0, void 0, void 0, function* () {
33
- return new Promise((resolve, reject) => {
34
- const callPort = () => __awaiter(void 0, void 0, void 0, function* () {
35
- const success = yield trySocket(host, port);
36
- if (!success) {
37
- return;
38
- }
39
- clearTimeout(intervalId);
40
- clearTimeout(timeoutId);
41
- resolve();
42
- });
43
- const intervalId = setInterval(() => {
44
- callPort().catch(() => undefined);
45
- }, 250);
46
- const timeoutId = setTimeout(() => {
47
- clearTimeout(intervalId);
48
- clearTimeout(timeoutId);
49
- reject(Error(`could not reach ${host}:${port} within ${timeout}ms`));
50
- }, timeout);
21
+ const pollSocket = async (host, port, timeout) => new Promise((resolve, reject) => {
22
+ const callPort = async () => {
23
+ const success = await trySocket(host, port);
24
+ if (!success) {
25
+ return;
26
+ }
27
+ clearTimeout(intervalId);
28
+ clearTimeout(timeoutId);
29
+ resolve();
30
+ };
31
+ const intervalId = setInterval(() => {
51
32
  callPort().catch(() => undefined);
52
- });
33
+ }, 250);
34
+ const timeoutId = setTimeout(() => {
35
+ clearTimeout(intervalId);
36
+ clearTimeout(timeoutId);
37
+ reject(Error(`could not reach ${host}:${port} within ${timeout}ms`));
38
+ }, timeout);
39
+ callPort().catch(() => undefined);
53
40
  });
54
41
  exports.pollSocket = pollSocket;
55
42
  //# sourceMappingURL=socket.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../src/api/net/socket.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAAA,8CAAsB;AAOtB,MAAM,SAAS,GAAG,CAAO,IAAY,EAAE,IAAY,EAAE,EAAE;IACrD,OAAA,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;QACtB,MAAM,MAAM,GAAG,IAAI,aAAG,CAAC,MAAM,EAAE,CAAC;QAEhC,MAAM,SAAS,GAAG,GAAG,EAAE;YACrB,MAAM,CAAC,OAAO,EAAE,CAAC;YACjB,OAAO,CAAC,KAAK,CAAC,CAAC;QACjB,CAAC,CAAC;QAEF,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAExD,MAAM;aACH,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC;aAC9B,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC;aACxB,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC;aAC1B,UAAU,CAAC,IAAK,CAAC,CAAC;IACvB,CAAC,CAAC,CAAA;EAAA,CAAC;AAEE,MAAM,UAAU,GAAG,CAAO,IAAY,EAAE,IAAY,EAAE,OAAe,EAAE,EAAE;IAC9E,OAAA,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACpC,MAAM,QAAQ,GAAG,GAAS,EAAE;YAC1B,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YAE5C,IAAI,CAAC,OAAO,EAAE;gBACZ,OAAO;aACR;YAED,YAAY,CAAC,UAAU,CAAC,CAAC;YACzB,YAAY,CAAC,SAAS,CAAC,CAAC;YAExB,OAAO,EAAE,CAAC;QACZ,CAAC,CAAA,CAAC;QAEF,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;YAClC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;QACpC,CAAC,EAAE,GAAG,CAAC,CAAC;QAER,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;YAChC,YAAY,CAAC,UAAU,CAAC,CAAC;YACzB,YAAY,CAAC,SAAS,CAAC,CAAC;YAExB,MAAM,CAAC,KAAK,CAAC,mBAAmB,IAAI,IAAI,IAAI,WAAW,OAAO,IAAI,CAAC,CAAC,CAAC;QACvE,CAAC,EAAE,OAAO,CAAC,CAAC;QAEZ,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC,CAAC,CAAA;EAAA,CAAC;AA3BQ,QAAA,UAAU,cA2BlB"}
1
+ {"version":3,"file":"socket.js","sourceRoot":"","sources":["../../../src/api/net/socket.ts"],"names":[],"mappings":";;;;;;AAAA,8CAAsB;AAOtB,MAAM,SAAS,GAAG,KAAK,EAAE,IAAY,EAAE,IAAY,EAAE,EAAE,CACrD,IAAI,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;IACtB,MAAM,MAAM,GAAG,IAAI,aAAG,CAAC,MAAM,EAAE,CAAC;IAEhC,MAAM,SAAS,GAAG,GAAG,EAAE;QACrB,MAAM,CAAC,OAAO,EAAE,CAAC;QACjB,OAAO,CAAC,KAAK,CAAC,CAAC;IACjB,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;IAExD,MAAM;SACH,OAAO,CAAC,IAAI,EAAE,IAAI,EAAE,SAAS,CAAC;SAC9B,IAAI,CAAC,OAAO,EAAE,SAAS,CAAC;SACxB,IAAI,CAAC,SAAS,EAAE,SAAS,CAAC;SAC1B,UAAU,CAAC,IAAK,CAAC,CAAC;AACvB,CAAC,CAAC,CAAC;AAEE,MAAM,UAAU,GAAG,KAAK,EAAE,IAAY,EAAE,IAAY,EAAE,OAAe,EAAE,EAAE,CAC9E,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;IACpC,MAAM,QAAQ,GAAG,KAAK,IAAI,EAAE;QAC1B,MAAM,OAAO,GAAG,MAAM,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;QAE5C,IAAI,CAAC,OAAO,EAAE;YACZ,OAAO;SACR;QAED,YAAY,CAAC,UAAU,CAAC,CAAC;QACzB,YAAY,CAAC,SAAS,CAAC,CAAC;QAExB,OAAO,EAAE,CAAC;IACZ,CAAC,CAAC;IAEF,MAAM,UAAU,GAAG,WAAW,CAAC,GAAG,EAAE;QAClC,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;IACpC,CAAC,EAAE,GAAG,CAAC,CAAC;IAER,MAAM,SAAS,GAAG,UAAU,CAAC,GAAG,EAAE;QAChC,YAAY,CAAC,UAAU,CAAC,CAAC;QACzB,YAAY,CAAC,SAAS,CAAC,CAAC;QAExB,MAAM,CAAC,KAAK,CAAC,mBAAmB,IAAI,IAAI,IAAI,WAAW,OAAO,IAAI,CAAC,CAAC,CAAC;IACvE,CAAC,EAAE,OAAO,CAAC,CAAC;IAEZ,QAAQ,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC;AACpC,CAAC,CAAC,CAAC;AA3BQ,QAAA,UAAU,cA2BlB"}
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  Object.defineProperty(exports, "__esModule", { value: true });
12
3
  exports.waitFor = void 0;
13
4
  const compose_1 = require("./compose");
@@ -18,12 +9,12 @@ const socket_1 = require("./socket");
18
9
  * The socket is polled on an interval until it accepts a connection or the
19
10
  * `timeout` is reached.
20
11
  */
21
- const waitFor = ({ host = 'localhost', port, resolveCompose = false, timeout = 15000, }) => __awaiter(void 0, void 0, void 0, function* () {
12
+ const waitFor = async ({ host = 'localhost', port, resolveCompose = false, timeout = 15000, }) => {
22
13
  const resolvedAddress = resolveCompose
23
- ? yield (0, compose_1.resolveComposeAddress)(host, port)
14
+ ? await (0, compose_1.resolveComposeAddress)(host, port)
24
15
  : { host, port };
25
- yield (0, socket_1.pollSocket)(resolvedAddress.host, resolvedAddress.port, timeout);
16
+ await (0, socket_1.pollSocket)(resolvedAddress.host, resolvedAddress.port, timeout);
26
17
  return resolvedAddress;
27
- });
18
+ };
28
19
  exports.waitFor = waitFor;
29
20
  //# sourceMappingURL=waitFor.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"waitFor.js","sourceRoot":"","sources":["../../../src/api/net/waitFor.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,uCAAkD;AAElD,qCAAsC;AAEtC;;;;;GAKG;AACI,MAAM,OAAO,GAAG,CAAO,EAC5B,IAAI,GAAG,WAAW,EAClB,IAAI,EACJ,cAAc,GAAG,KAAK,EACtB,OAAO,GAAG,KAAM,GAkBjB,EAA0B,EAAE;IAC3B,MAAM,eAAe,GAAG,cAAc;QACpC,CAAC,CAAC,MAAM,IAAA,+BAAqB,EAAC,IAAI,EAAE,IAAI,CAAC;QACzC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAEnB,MAAM,IAAA,mBAAU,EAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEtE,OAAO,eAAe,CAAC;AACzB,CAAC,CAAA,CAAC;AA9BW,QAAA,OAAO,WA8BlB"}
1
+ {"version":3,"file":"waitFor.js","sourceRoot":"","sources":["../../../src/api/net/waitFor.ts"],"names":[],"mappings":";;;AAAA,uCAAkD;AAElD,qCAAsC;AAEtC;;;;;GAKG;AACI,MAAM,OAAO,GAAG,KAAK,EAAE,EAC5B,IAAI,GAAG,WAAW,EAClB,IAAI,EACJ,cAAc,GAAG,KAAK,EACtB,OAAO,GAAG,KAAM,GAkBjB,EAA0B,EAAE;IAC3B,MAAM,eAAe,GAAG,cAAc;QACpC,CAAC,CAAC,MAAM,IAAA,+BAAqB,EAAC,IAAI,EAAE,IAAI,CAAC;QACzC,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC;IAEnB,MAAM,IAAA,mBAAU,EAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAEtE,OAAO,eAAe,CAAC;AACzB,CAAC,CAAC;AA9BW,QAAA,OAAO,WA8BlB"}
@@ -6,8 +6,9 @@ export interface ESLintResult {
6
6
  }
7
7
  export interface ESLintOutput {
8
8
  errors: ESLintResult[];
9
- warnings: ESLintResult[];
9
+ fixable: boolean;
10
10
  ok: boolean;
11
11
  output: string;
12
+ warnings: ESLintResult[];
12
13
  }
13
14
  export declare const runESLint: (mode: 'format' | 'lint', logger: Logger) => Promise<ESLintOutput>;
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
12
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
4
  };
@@ -23,7 +14,7 @@ const symbolForResult = (result) => {
23
14
  }
24
15
  return result.warningCount ? chalk_1.default.yellow('◍') : chalk_1.default.green('○');
25
16
  };
26
- const runESLint = (mode, logger) => __awaiter(void 0, void 0, void 0, function* () {
17
+ const runESLint = async (mode, logger) => {
27
18
  logger.debug('Initialising ESLint...');
28
19
  const engine = new eslint_1.ESLint({
29
20
  cache: true,
@@ -47,7 +38,7 @@ const runESLint = (mode, logger) => __awaiter(void 0, void 0, void 0, function*
47
38
  ogConsoleError(...args);
48
39
  }
49
40
  };
50
- const [formatter, results] = yield Promise.all([
41
+ const [formatter, results] = await Promise.all([
51
42
  engine.loadFormatter(),
52
43
  engine.lintFiles('.'),
53
44
  ]);
@@ -57,8 +48,12 @@ const runESLint = (mode, logger) => __awaiter(void 0, void 0, void 0, function*
57
48
  logger.plain(`Processed ${(0, logging_1.pluralise)(results.length, 'file')} in ${logger.timing(start, end)}.`);
58
49
  const errors = [];
59
50
  const warnings = [];
51
+ let fixable = false;
60
52
  for (const result of results) {
61
53
  const relativePath = path_1.default.relative(cwd, result.filePath);
54
+ if (result.fixableErrorCount + result.fixableWarningCount) {
55
+ fixable = true;
56
+ }
62
57
  if (result.errorCount) {
63
58
  errors.push({
64
59
  filePath: relativePath,
@@ -74,12 +69,12 @@ const runESLint = (mode, logger) => __awaiter(void 0, void 0, void 0, function*
74
69
  logger.debug(symbolForResult(result), relativePath);
75
70
  }
76
71
  const ok = errors.length === 0;
77
- yield eslint_1.ESLint.outputFixes(results);
78
- const output = yield formatter.format(results);
72
+ await eslint_1.ESLint.outputFixes(results);
73
+ const output = await formatter.format(results);
79
74
  if (output) {
80
75
  logger.plain(output);
81
76
  }
82
- return { ok, output, errors, warnings };
83
- });
77
+ return { errors, fixable, ok, output, warnings };
78
+ };
84
79
  exports.runESLint = runESLint;
85
80
  //# sourceMappingURL=eslint.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../src/cli/adapter/eslint.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"eslint.js","sourceRoot":"","sources":["../../../src/cli/adapter/eslint.ts"],"names":[],"mappings":"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"}
@@ -1,13 +1,4 @@
1
1
  "use strict";
2
- var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
3
- function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
4
- return new (P || (P = Promise))(function (resolve, reject) {
5
- function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
6
- function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
7
- function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
8
- step((generator = generator.apply(thisArg, _arguments || [])).next());
9
- });
10
- };
11
2
  var __importDefault = (this && this.__importDefault) || function (mod) {
12
3
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
4
  };
@@ -42,13 +33,10 @@ let languages;
42
33
  */
43
34
  const inferParser = (filepath) => {
44
35
  const filename = path_1.default.basename(filepath).toLowerCase();
45
- languages !== null && languages !== void 0 ? languages : (languages = (0, prettier_1.getSupportInfo)().languages.filter((language) => language.since));
46
- const firstLanguage = languages.find((language) => {
47
- var _a, _b;
48
- return ((_a = language.extensions) === null || _a === void 0 ? void 0 : _a.some((extension) => filename.endsWith(extension))) ||
49
- ((_b = language.filenames) === null || _b === void 0 ? void 0 : _b.some((name) => name.toLowerCase() === filename));
50
- });
51
- return firstLanguage === null || firstLanguage === void 0 ? void 0 : firstLanguage.parsers[0];
36
+ languages ?? (languages = (0, prettier_1.getSupportInfo)().languages.filter((language) => language.since));
37
+ const firstLanguage = languages.find((language) => language.extensions?.some((extension) => filename.endsWith(extension)) ||
38
+ language.filenames?.some((name) => name.toLowerCase() === filename));
39
+ return firstLanguage?.parsers[0];
52
40
  };
53
41
  exports.inferParser = inferParser;
54
42
  const formatOrLintFile = ({ data, filepath, options }, mode, result) => {
@@ -88,11 +76,11 @@ const formatOrLintFile = ({ data, filepath, options }, mode, result) => {
88
76
  * On the other hand, this affords more flexibility in how we track and report
89
77
  * on progress and results.
90
78
  */
91
- const runPrettier = (mode, logger) => __awaiter(void 0, void 0, void 0, function* () {
79
+ const runPrettier = async (mode, logger) => {
92
80
  logger.debug('Initialising Prettier...');
93
81
  const start = process.hrtime.bigint();
94
82
  let directory = process.cwd();
95
- const manifest = yield (0, manifest_1.getConsumerManifest)();
83
+ const manifest = await (0, manifest_1.getConsumerManifest)();
96
84
  if (manifest) {
97
85
  directory = path_1.default.dirname(manifest.path);
98
86
  }
@@ -101,7 +89,7 @@ const runPrettier = (mode, logger) => __awaiter(void 0, void 0, void 0, function
101
89
  // Match Prettier's opinion of not respecting `.gitignore`.
102
90
  // This avoids exhibiting different behaviour than a Prettier IDE integration,
103
91
  // and the headache of conflicting `.gitignore` and `.prettierignore` rules.
104
- const filepaths = yield (0, dir_1.crawlDirectory)(directory, '.prettierignore');
92
+ const filepaths = await (0, dir_1.crawlDirectory)(directory, '.prettierignore');
105
93
  logger.debug(`Discovered ${(0, logging_1.pluralise)(filepaths.length, 'file')}.`);
106
94
  const result = {
107
95
  count: filepaths.length,
@@ -114,23 +102,23 @@ const runPrettier = (mode, logger) => __awaiter(void 0, void 0, void 0, function
114
102
  // Infer parser upfront so we can skip unsupported files.
115
103
  const parser = (0, exports.inferParser)(filepath);
116
104
  logger.debug(filepath);
117
- logger.debug(' parser:', parser !== null && parser !== void 0 ? parser : '-');
105
+ logger.debug(' parser:', parser ?? '-');
118
106
  if (!parser) {
119
107
  result.unparsed.push(filepath);
120
108
  continue;
121
109
  }
122
- const [config, data] = yield Promise.all([
110
+ const [config, data] = await Promise.all([
123
111
  (0, prettier_1.resolveConfig)(filepath),
124
112
  fs_extra_1.default.promises.readFile(filepath, 'utf-8'),
125
113
  ]);
126
114
  const file = {
127
115
  data,
128
116
  filepath,
129
- options: Object.assign(Object.assign({}, config), { filepath }),
117
+ options: { ...config, filepath },
130
118
  };
131
119
  const formatted = formatOrLintFile(file, mode, result);
132
120
  if (typeof formatted === 'string') {
133
- yield fs_extra_1.default.promises.writeFile(filepath, formatted);
121
+ await fs_extra_1.default.promises.writeFile(filepath, formatted);
134
122
  }
135
123
  }
136
124
  const end = process.hrtime.bigint();
@@ -148,6 +136,6 @@ const runPrettier = (mode, logger) => __awaiter(void 0, void 0, void 0, function
148
136
  }
149
137
  }
150
138
  return { ok: result.errored.length === 0, result };
151
- });
139
+ };
152
140
  exports.runPrettier = runPrettier;
153
141
  //# sourceMappingURL=prettier.js.map