diff --git a/entry b/entry index 31f6e0e..ffc60cc 100755 --- a/entry +++ b/entry @@ -4076,8 +4076,8 @@ var require_util2 = __commonJS({ function createDeferredPromise() { let res; let rej; - const promise2 = new Promise((resolve, reject) => { - res = resolve; + const promise2 = new Promise((resolve2, reject) => { + res = resolve2; rej = reject; }); return { promise: promise2, resolve: res, reject: rej }; @@ -5581,8 +5581,8 @@ Content-Type: ${value2.type || "application/octet-stream"}\r }); } }); - const busboyResolve = new Promise((resolve, reject) => { - busboy.on("finish", resolve); + const busboyResolve = new Promise((resolve2, reject) => { + busboy.on("finish", resolve2); busboy.on("error", (err) => reject(new TypeError(err))); }); if (this.body !== null) for await (const chunk of consumeBody(this[kState].body)) busboy.write(chunk); @@ -6116,9 +6116,9 @@ var require_dispatcher_base = __commonJS({ } close(callback) { if (callback === void 0) { - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { this.close((err, data) => { - return err ? reject(err) : resolve(data); + return err ? reject(err) : resolve2(data); }); }); } @@ -6156,12 +6156,12 @@ var require_dispatcher_base = __commonJS({ err = null; } if (callback === void 0) { - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { this.destroy(err, (err2, data) => { return err2 ? ( /* istanbul ignore next: should never error */ reject(err2) - ) : resolve(data); + ) : resolve2(data); }); }); } @@ -7221,16 +7221,16 @@ var require_client = __commonJS({ return this[kNeedDrain] < 2; } async [kClose]() { - return new Promise((resolve) => { + return new Promise((resolve2) => { if (!this[kSize]) { - resolve(null); + resolve2(null); } else { - this[kClosedResolve] = resolve; + this[kClosedResolve] = resolve2; } }); } async [kDestroy](err) { - return new Promise((resolve) => { + return new Promise((resolve2) => { const requests = this[kQueue].splice(this[kPendingIdx]); for (let i = 0; i < requests.length; i++) { const request2 = requests[i]; @@ -7241,7 +7241,7 @@ var require_client = __commonJS({ this[kClosedResolve](); this[kClosedResolve] = null; } - resolve(); + resolve2(); }; if (this[kHTTP2Session] != null) { util3.destroy(this[kHTTP2Session], err); @@ -7821,7 +7821,7 @@ var require_client = __commonJS({ }); } try { - const socket = await new Promise((resolve, reject) => { + const socket = await new Promise((resolve2, reject) => { client[kConnector]({ host, hostname: hostname5, @@ -7833,7 +7833,7 @@ var require_client = __commonJS({ if (err) { reject(err); } else { - resolve(socket2); + resolve2(socket2); } }); }); @@ -8457,12 +8457,12 @@ upgrade: ${upgrade}\r cb(); } } - const waitForDrain = () => new Promise((resolve, reject) => { + const waitForDrain = () => new Promise((resolve2, reject) => { assert4(callback === null); if (socket[kError]) { reject(socket[kError]); } else { - callback = resolve; + callback = resolve2; } }); if (client[kHTTPConnVersion] === "h2") { @@ -8807,8 +8807,8 @@ var require_pool_base = __commonJS({ if (this[kQueue].isEmpty()) { return Promise.all(this[kClients].map((c) => c.close())); } else { - return new Promise((resolve) => { - this[kClosedResolve] = resolve; + return new Promise((resolve2) => { + this[kClosedResolve] = resolve2; }); } } @@ -9386,7 +9386,7 @@ var require_readable = __commonJS({ if (this.closed) { return Promise.resolve(null); } - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { const signalListenerCleanup = signal ? util3.addAbortListener(signal, () => { this.destroy(); }) : noop4; @@ -9395,7 +9395,7 @@ var require_readable = __commonJS({ if (signal && signal.aborted) { reject(signal.reason || Object.assign(new Error("The operation was aborted"), { name: "AbortError" })); } else { - resolve(null); + resolve2(null); } }).on("error", noop4).on("data", function(chunk) { limit -= chunk.length; @@ -9417,11 +9417,11 @@ var require_readable = __commonJS({ throw new TypeError("unusable"); } assert4(!stream[kConsume]); - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { stream[kConsume] = { type: type2, stream, - resolve, + resolve: resolve2, reject, length: 0, body: [] @@ -9456,12 +9456,12 @@ var require_readable = __commonJS({ } } function consumeEnd(consume2) { - const { type: type2, body, resolve, stream, length } = consume2; + const { type: type2, body, resolve: resolve2, stream, length } = consume2; try { if (type2 === "text") { - resolve(toUSVString(Buffer.concat(body))); + resolve2(toUSVString(Buffer.concat(body))); } else if (type2 === "json") { - resolve(JSON.parse(Buffer.concat(body))); + resolve2(JSON.parse(Buffer.concat(body))); } else if (type2 === "arrayBuffer") { const dst = new Uint8Array(length); let pos = 0; @@ -9469,12 +9469,12 @@ var require_readable = __commonJS({ dst.set(buf, pos); pos += buf.byteLength; } - resolve(dst.buffer); + resolve2(dst.buffer); } else if (type2 === "blob") { if (!Blob2) { Blob2 = __require("buffer").Blob; } - resolve(new Blob2(body, { type: stream[kContentType] })); + resolve2(new Blob2(body, { type: stream[kContentType] })); } consumeFinish(consume2); } catch (err) { @@ -9729,9 +9729,9 @@ var require_api_request = __commonJS({ }; function request2(opts, callback) { if (callback === void 0) { - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { request2.call(this, opts, (err, data) => { - return err ? reject(err) : resolve(data); + return err ? reject(err) : resolve2(data); }); }); } @@ -9904,9 +9904,9 @@ var require_api_stream = __commonJS({ }; function stream(opts, factory, callback) { if (callback === void 0) { - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { stream.call(this, opts, factory, (err, data) => { - return err ? reject(err) : resolve(data); + return err ? reject(err) : resolve2(data); }); }); } @@ -10187,9 +10187,9 @@ var require_api_upgrade = __commonJS({ }; function upgrade(opts, callback) { if (callback === void 0) { - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { upgrade.call(this, opts, (err, data) => { - return err ? reject(err) : resolve(data); + return err ? reject(err) : resolve2(data); }); }); } @@ -10278,9 +10278,9 @@ var require_api_connect = __commonJS({ }; function connect(opts, callback) { if (callback === void 0) { - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { connect.call(this, opts, (err, data) => { - return err ? reject(err) : resolve(data); + return err ? reject(err) : resolve2(data); }); }); } @@ -13902,7 +13902,7 @@ var require_fetch = __commonJS({ async function dispatch({ body }) { const url4 = requestCurrentURL(request2); const agent2 = fetchParams.controller.dispatcher; - return new Promise((resolve, reject) => agent2.dispatch( + return new Promise((resolve2, reject) => agent2.dispatch( { path: url4.pathname + url4.search, origin: url4.origin, @@ -13978,7 +13978,7 @@ var require_fetch = __commonJS({ } } } - resolve({ + resolve2({ status, statusText, headersList: headers[kHeadersList], @@ -14021,7 +14021,7 @@ var require_fetch = __commonJS({ const val = headersList[n + 1].toString("latin1"); headers[kHeadersList].append(key, val); } - resolve({ + resolve2({ status, statusText: STATUS_CODES[status], headersList: headers[kHeadersList], @@ -17375,11 +17375,11 @@ var require_lib = __commonJS({ }; var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) { function adopt(value2) { - return value2 instanceof P ? value2 : new P(function(resolve) { - resolve(value2); + return value2 instanceof P ? value2 : new P(function(resolve2) { + resolve2(value2); }); } - return new (P || (P = Promise))(function(resolve, reject) { + return new (P || (P = Promise))(function(resolve2, reject) { function fulfilled(value2) { try { step(generator.next(value2)); @@ -17395,7 +17395,7 @@ var require_lib = __commonJS({ } } function step(result) { - result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); + result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected); } step((generator = generator.apply(thisArg, _arguments || [])).next()); }); @@ -17481,26 +17481,26 @@ var require_lib = __commonJS({ } readBody() { return __awaiter(this, void 0, void 0, function* () { - return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () { + return new Promise((resolve2) => __awaiter(this, void 0, void 0, function* () { let output = Buffer.alloc(0); this.message.on("data", (chunk) => { output = Buffer.concat([output, chunk]); }); this.message.on("end", () => { - resolve(output.toString()); + resolve2(output.toString()); }); })); }); } readBodyBuffer() { return __awaiter(this, void 0, void 0, function* () { - return new Promise((resolve) => __awaiter(this, void 0, void 0, function* () { + return new Promise((resolve2) => __awaiter(this, void 0, void 0, function* () { const chunks = []; this.message.on("data", (chunk) => { chunks.push(chunk); }); this.message.on("end", () => { - resolve(Buffer.concat(chunks)); + resolve2(Buffer.concat(chunks)); }); })); }); @@ -17709,14 +17709,14 @@ var require_lib = __commonJS({ */ requestRaw(info2, data) { return __awaiter(this, void 0, void 0, function* () { - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { function callbackForResult(err, res) { if (err) { reject(err); } else if (!res) { reject(new Error("Unknown error")); } else { - resolve(res); + resolve2(res); } } this.requestRawWithCallback(info2, data, callbackForResult); @@ -17898,12 +17898,12 @@ var require_lib = __commonJS({ return __awaiter(this, void 0, void 0, function* () { retryNumber = Math.min(ExponentialBackoffCeiling, retryNumber); const ms = ExponentialBackoffTimeSlice * Math.pow(2, retryNumber); - return new Promise((resolve) => setTimeout(() => resolve(), ms)); + return new Promise((resolve2) => setTimeout(() => resolve2(), ms)); }); } _processResponse(res, options) { return __awaiter(this, void 0, void 0, function* () { - return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () { + return new Promise((resolve2, reject) => __awaiter(this, void 0, void 0, function* () { const statusCode = res.message.statusCode || 0; const response = { statusCode, @@ -17911,7 +17911,7 @@ var require_lib = __commonJS({ headers: {} }; if (statusCode === HttpCodes.NotFound) { - resolve(response); + resolve2(response); } function dateTimeDeserializer(key, value2) { if (typeof value2 === "string") { @@ -17950,7 +17950,7 @@ var require_lib = __commonJS({ err.result = response.result; reject(err); } else { - resolve(response); + resolve2(response); } })); }); @@ -17967,11 +17967,11 @@ var require_auth = __commonJS({ "use strict"; var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) { function adopt(value2) { - return value2 instanceof P ? value2 : new P(function(resolve) { - resolve(value2); + return value2 instanceof P ? value2 : new P(function(resolve2) { + resolve2(value2); }); } - return new (P || (P = Promise))(function(resolve, reject) { + return new (P || (P = Promise))(function(resolve2, reject) { function fulfilled(value2) { try { step(generator.next(value2)); @@ -17987,7 +17987,7 @@ var require_auth = __commonJS({ } } function step(result) { - result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); + result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected); } step((generator = generator.apply(thisArg, _arguments || [])).next()); }); @@ -18071,11 +18071,11 @@ var require_oidc_utils = __commonJS({ "use strict"; var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) { function adopt(value2) { - return value2 instanceof P ? value2 : new P(function(resolve) { - resolve(value2); + return value2 instanceof P ? value2 : new P(function(resolve2) { + resolve2(value2); }); } - return new (P || (P = Promise))(function(resolve, reject) { + return new (P || (P = Promise))(function(resolve2, reject) { function fulfilled(value2) { try { step(generator.next(value2)); @@ -18091,7 +18091,7 @@ var require_oidc_utils = __commonJS({ } } function step(result) { - result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); + result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected); } step((generator = generator.apply(thisArg, _arguments || [])).next()); }); @@ -18169,11 +18169,11 @@ var require_summary = __commonJS({ "use strict"; var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) { function adopt(value2) { - return value2 instanceof P ? value2 : new P(function(resolve) { - resolve(value2); + return value2 instanceof P ? value2 : new P(function(resolve2) { + resolve2(value2); }); } - return new (P || (P = Promise))(function(resolve, reject) { + return new (P || (P = Promise))(function(resolve2, reject) { function fulfilled(value2) { try { step(generator.next(value2)); @@ -18189,7 +18189,7 @@ var require_summary = __commonJS({ } } function step(result) { - result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); + result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected); } step((generator = generator.apply(thisArg, _arguments || [])).next()); }); @@ -18535,11 +18535,11 @@ var require_io_util = __commonJS({ }; var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) { function adopt(value2) { - return value2 instanceof P ? value2 : new P(function(resolve) { - resolve(value2); + return value2 instanceof P ? value2 : new P(function(resolve2) { + resolve2(value2); }); } - return new (P || (P = Promise))(function(resolve, reject) { + return new (P || (P = Promise))(function(resolve2, reject) { function fulfilled(value2) { try { step(generator.next(value2)); @@ -18555,7 +18555,7 @@ var require_io_util = __commonJS({ } } function step(result) { - result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); + result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected); } step((generator = generator.apply(thisArg, _arguments || [])).next()); }); @@ -18708,11 +18708,11 @@ var require_io = __commonJS({ }; var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) { function adopt(value2) { - return value2 instanceof P ? value2 : new P(function(resolve) { - resolve(value2); + return value2 instanceof P ? value2 : new P(function(resolve2) { + resolve2(value2); }); } - return new (P || (P = Promise))(function(resolve, reject) { + return new (P || (P = Promise))(function(resolve2, reject) { function fulfilled(value2) { try { step(generator.next(value2)); @@ -18728,7 +18728,7 @@ var require_io = __commonJS({ } } function step(result) { - result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); + result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected); } step((generator = generator.apply(thisArg, _arguments || [])).next()); }); @@ -18956,11 +18956,11 @@ var require_toolrunner = __commonJS({ }; var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) { function adopt(value2) { - return value2 instanceof P ? value2 : new P(function(resolve) { - resolve(value2); + return value2 instanceof P ? value2 : new P(function(resolve2) { + resolve2(value2); }); } - return new (P || (P = Promise))(function(resolve, reject) { + return new (P || (P = Promise))(function(resolve2, reject) { function fulfilled(value2) { try { step(generator.next(value2)); @@ -18976,7 +18976,7 @@ var require_toolrunner = __commonJS({ } } function step(result) { - result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); + result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected); } step((generator = generator.apply(thisArg, _arguments || [])).next()); }); @@ -19204,7 +19204,7 @@ var require_toolrunner = __commonJS({ this.toolPath = path4.resolve(process.cwd(), this.options.cwd || process.cwd(), this.toolPath); } this.toolPath = yield io.which(this.toolPath, true); - return new Promise((resolve, reject) => __awaiter(this, void 0, void 0, function* () { + return new Promise((resolve2, reject) => __awaiter(this, void 0, void 0, function* () { this._debug(`exec tool: ${this.toolPath}`); this._debug("arguments:"); for (const arg of this.args) { @@ -19287,7 +19287,7 @@ var require_toolrunner = __commonJS({ if (error50) { reject(error50); } else { - resolve(exitCode); + resolve2(exitCode); } }); if (this.options.input) { @@ -19440,11 +19440,11 @@ var require_exec = __commonJS({ }; var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) { function adopt(value2) { - return value2 instanceof P ? value2 : new P(function(resolve) { - resolve(value2); + return value2 instanceof P ? value2 : new P(function(resolve2) { + resolve2(value2); }); } - return new (P || (P = Promise))(function(resolve, reject) { + return new (P || (P = Promise))(function(resolve2, reject) { function fulfilled(value2) { try { step(generator.next(value2)); @@ -19460,7 +19460,7 @@ var require_exec = __commonJS({ } } function step(result) { - result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); + result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected); } step((generator = generator.apply(thisArg, _arguments || [])).next()); }); @@ -19551,11 +19551,11 @@ var require_platform = __commonJS({ }; var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) { function adopt(value2) { - return value2 instanceof P ? value2 : new P(function(resolve) { - resolve(value2); + return value2 instanceof P ? value2 : new P(function(resolve2) { + resolve2(value2); }); } - return new (P || (P = Promise))(function(resolve, reject) { + return new (P || (P = Promise))(function(resolve2, reject) { function fulfilled(value2) { try { step(generator.next(value2)); @@ -19571,7 +19571,7 @@ var require_platform = __commonJS({ } } function step(result) { - result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); + result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected); } step((generator = generator.apply(thisArg, _arguments || [])).next()); }); @@ -19670,11 +19670,11 @@ var require_core = __commonJS({ }; var __awaiter = exports && exports.__awaiter || function(thisArg, _arguments, P, generator) { function adopt(value2) { - return value2 instanceof P ? value2 : new P(function(resolve) { - resolve(value2); + return value2 instanceof P ? value2 : new P(function(resolve2) { + resolve2(value2); }); } - return new (P || (P = Promise))(function(resolve, reject) { + return new (P || (P = Promise))(function(resolve2, reject) { function fulfilled(value2) { try { step(generator.next(value2)); @@ -19690,7 +19690,7 @@ var require_core = __commonJS({ } } function step(result) { - result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); + result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected); } step((generator = generator.apply(thisArg, _arguments || [])).next()); }); @@ -26003,8 +26003,8 @@ var require_light = __commonJS({ return this.Promise.resolve(); } yieldLoop(t = 0) { - return new this.Promise(function(resolve, reject) { - return setTimeout(resolve, t); + return new this.Promise(function(resolve2, reject) { + return setTimeout(resolve2, t); }); } computePenalty() { @@ -26215,15 +26215,15 @@ var require_light = __commonJS({ return this._queue.length === 0; } async _tryToRun() { - var args3, cb, error50, reject, resolve, returned, task; + var args3, cb, error50, reject, resolve2, returned, task; if (this._running < 1 && this._queue.length > 0) { this._running++; - ({ task, args: args3, resolve, reject } = this._queue.shift()); + ({ task, args: args3, resolve: resolve2, reject } = this._queue.shift()); cb = await (async function() { try { returned = await task(...args3); return function() { - return resolve(returned); + return resolve2(returned); }; } catch (error1) { error50 = error1; @@ -26238,13 +26238,13 @@ var require_light = __commonJS({ } } schedule(task, ...args3) { - var promise2, reject, resolve; - resolve = reject = null; + var promise2, reject, resolve2; + resolve2 = reject = null; promise2 = new this.Promise(function(_resolve, _reject) { - resolve = _resolve; + resolve2 = _resolve; return reject = _reject; }); - this._queue.push({ task, args: args3, resolve, reject }); + this._queue.push({ task, args: args3, resolve: resolve2, reject }); this._tryToRun(); return promise2; } @@ -26645,14 +26645,14 @@ var require_light = __commonJS({ counts = this._states.counts; return counts[0] + counts[1] + counts[2] + counts[3] === at; }; - return new this.Promise((resolve, reject) => { + return new this.Promise((resolve2, reject) => { if (finished()) { - return resolve(); + return resolve2(); } else { return this.on("done", () => { if (finished()) { this.removeAllListeners("done"); - return resolve(); + return resolve2(); } }); } @@ -26745,9 +26745,9 @@ var require_light = __commonJS({ options = parser$5.load(options, this.jobDefaults); } task = (...args4) => { - return new this.Promise(function(resolve, reject) { + return new this.Promise(function(resolve2, reject) { return fn2(...args4, function(...args5) { - return (args5[0] != null ? reject : resolve)(args5); + return (args5[0] != null ? reject : resolve2)(args5); }); }); }; @@ -47545,7 +47545,7 @@ var require_compile2 = __commonJS({ const schOrFunc = root2.refs[ref]; if (schOrFunc) return schOrFunc; - let _sch = resolve.call(this, root2, ref); + let _sch = resolve2.call(this, root2, ref); if (_sch === void 0) { const schema2 = (_a2 = root2.localRefs) === null || _a2 === void 0 ? void 0 : _a2[ref]; const { schemaId } = this.opts; @@ -47572,7 +47572,7 @@ var require_compile2 = __commonJS({ function sameSchemaEnv(s1, s2) { return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId; } - function resolve(root2, ref) { + function resolve2(root2, ref) { let sch; while (typeof (sch = this.refs[ref]) == "string") ref = sch; @@ -48147,7 +48147,7 @@ var require_fast_uri2 = __commonJS({ } return uri; } - function resolve(baseURI, relativeURI, options) { + function resolve2(baseURI, relativeURI, options) { const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" }; const resolved = resolveComponent(parse6(baseURI, schemelessOptions), parse6(relativeURI, schemelessOptions), schemelessOptions, true); schemelessOptions.skipEscape = true; @@ -48374,7 +48374,7 @@ var require_fast_uri2 = __commonJS({ var fastUri = { SCHEMES, normalize: normalize2, - resolve, + resolve: resolve2, resolveComponent, equal, serialize, @@ -53670,9 +53670,9 @@ var require_dispatcher_base2 = __commonJS({ } close(callback) { if (callback === void 0) { - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { this.close((err, data) => { - return err ? reject(err) : resolve(data); + return err ? reject(err) : resolve2(data); }); }); } @@ -53710,12 +53710,12 @@ var require_dispatcher_base2 = __commonJS({ err = null; } if (callback === void 0) { - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { this.destroy(err, (err2, data) => { return err2 ? ( /* istanbul ignore next: should never error */ reject(err2) - ) : resolve(data); + ) : resolve2(data); }); }); } @@ -56963,8 +56963,8 @@ var require_promise = __commonJS({ function createDeferredPromise() { let res; let rej; - const promise2 = new Promise((resolve, reject) => { - res = resolve; + const promise2 = new Promise((resolve2, reject) => { + res = resolve2; rej = reject; }); return { promise: promise2, resolve: res, reject: rej }; @@ -58277,12 +58277,12 @@ upgrade: ${upgrade}\r cb(); } } - const waitForDrain = () => new Promise((resolve, reject) => { + const waitForDrain = () => new Promise((resolve2, reject) => { assert4(callback === null); if (socket[kError]) { reject(socket[kError]); } else { - callback = resolve; + callback = resolve2; } }); socket.on("close", onDrain).on("drain", onDrain); @@ -58997,12 +58997,12 @@ var require_client_h2 = __commonJS({ cb(); } } - const waitForDrain = () => new Promise((resolve, reject) => { + const waitForDrain = () => new Promise((resolve2, reject) => { assert4(callback === null); if (socket[kError]) { reject(socket[kError]); } else { - callback = resolve; + callback = resolve2; } }); h2stream.on("close", onDrain).on("drain", onDrain); @@ -59288,16 +59288,16 @@ var require_client2 = __commonJS({ return this[kNeedDrain] < 2; } [kClose]() { - return new Promise((resolve) => { + return new Promise((resolve2) => { if (this[kSize]) { - this[kClosedResolve] = resolve; + this[kClosedResolve] = resolve2; } else { - resolve(null); + resolve2(null); } }); } [kDestroy](err) { - return new Promise((resolve) => { + return new Promise((resolve2) => { const requests = this[kQueue].splice(this[kPendingIdx]); for (let i = 0; i < requests.length; i++) { const request2 = requests[i]; @@ -59308,7 +59308,7 @@ var require_client2 = __commonJS({ this[kClosedResolve](); this[kClosedResolve] = null; } - resolve(null); + resolve2(null); }; if (this[kHTTPContext]) { this[kHTTPContext].destroy(err, callback); @@ -59699,8 +59699,8 @@ var require_pool_base2 = __commonJS({ } return Promise.all(closeAll); } else { - return new Promise((resolve) => { - this[kClosedResolve] = resolve; + return new Promise((resolve2) => { + this[kClosedResolve] = resolve2; }); } } @@ -61152,7 +61152,7 @@ var require_readable2 = __commonJS({ if (this._readableState.closeEmitted) { return Promise.resolve(null); } - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { if (this[kContentLength] && this[kContentLength] > limit || this[kBytesRead] > limit) { this.destroy(new AbortError2()); } @@ -61166,11 +61166,11 @@ var require_readable2 = __commonJS({ if (signal.aborted) { reject(signal.reason ?? new AbortError2()); } else { - resolve(null); + resolve2(null); } }); } else { - this.on("close", resolve); + this.on("close", resolve2); } this.on("error", noop4).on("data", () => { if (this[kBytesRead] > limit) { @@ -61198,7 +61198,7 @@ var require_readable2 = __commonJS({ } function consume(stream, type2) { assert4(!stream[kConsume]); - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { if (isUnusable(stream)) { const rState = stream._readableState; if (rState.destroyed && rState.closeEmitted === false) { @@ -61213,7 +61213,7 @@ var require_readable2 = __commonJS({ stream[kConsume] = { type: type2, stream, - resolve, + resolve: resolve2, reject, length: 0, body: [] @@ -61287,18 +61287,18 @@ var require_readable2 = __commonJS({ return buffer; } function consumeEnd(consume2, encoding) { - const { type: type2, body, resolve, stream, length } = consume2; + const { type: type2, body, resolve: resolve2, stream, length } = consume2; try { if (type2 === "text") { - resolve(chunksDecode(body, length, encoding)); + resolve2(chunksDecode(body, length, encoding)); } else if (type2 === "json") { - resolve(JSON.parse(chunksDecode(body, length, encoding))); + resolve2(JSON.parse(chunksDecode(body, length, encoding))); } else if (type2 === "arrayBuffer") { - resolve(chunksConcat(body, length).buffer); + resolve2(chunksConcat(body, length).buffer); } else if (type2 === "blob") { - resolve(new Blob(body, { type: stream[kContentType] })); + resolve2(new Blob(body, { type: stream[kContentType] })); } else if (type2 === "bytes") { - resolve(chunksConcat(body, length)); + resolve2(chunksConcat(body, length)); } consumeFinish(consume2); } catch (err) { @@ -61487,9 +61487,9 @@ var require_api_request2 = __commonJS({ }; function request2(opts, callback) { if (callback === void 0) { - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { request2.call(this, opts, (err, data) => { - return err ? reject(err) : resolve(data); + return err ? reject(err) : resolve2(data); }); }); } @@ -61701,9 +61701,9 @@ var require_api_stream2 = __commonJS({ }; function stream(opts, factory, callback) { if (callback === void 0) { - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { stream.call(this, opts, factory, (err, data) => { - return err ? reject(err) : resolve(data); + return err ? reject(err) : resolve2(data); }); }); } @@ -61990,9 +61990,9 @@ var require_api_upgrade2 = __commonJS({ }; function upgrade(opts, callback) { if (callback === void 0) { - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { upgrade.call(this, opts, (err, data) => { - return err ? reject(err) : resolve(data); + return err ? reject(err) : resolve2(data); }); }); } @@ -62085,9 +62085,9 @@ var require_api_connect2 = __commonJS({ }; function connect(opts, callback) { if (callback === void 0) { - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { connect.call(this, opts, (err, data) => { - return err ? reject(err) : resolve(data); + return err ? reject(err) : resolve2(data); }); }); } @@ -63327,7 +63327,7 @@ var require_snapshot_recorder = __commonJS({ "node_modules/.pnpm/undici@7.16.0/node_modules/undici/lib/mock/snapshot-recorder.js"(exports, module) { "use strict"; var { writeFile, readFile, mkdir } = __require("node:fs/promises"); - var { dirname: dirname2, resolve } = __require("node:path"); + var { dirname: dirname2, resolve: resolve2 } = __require("node:path"); var { setTimeout: setTimeout2, clearTimeout: clearTimeout2 } = __require("node:timers"); var { InvalidArgumentError, UndiciError } = require_errors5(); var { hashId, isUrlExcludedFactory, normalizeHeaders, createHeaderFilters } = require_snapshot_utils(); @@ -63521,7 +63521,7 @@ var require_snapshot_recorder = __commonJS({ throw new InvalidArgumentError("Snapshot path is required"); } try { - const data = await readFile(resolve(path4), "utf8"); + const data = await readFile(resolve2(path4), "utf8"); const parsed2 = JSON.parse(data); if (Array.isArray(parsed2)) { this.#snapshots.clear(); @@ -63550,7 +63550,7 @@ var require_snapshot_recorder = __commonJS({ if (!path4) { throw new InvalidArgumentError("Snapshot path is required"); } - const resolvedPath = resolve(path4); + const resolvedPath = resolve2(path4); await mkdir(dirname2(resolvedPath), { recursive: true }); const data = Array.from(this.#snapshots.entries()).map(([hash2, snapshot2]) => ({ hash: hash2, @@ -69673,7 +69673,7 @@ var require_fetch2 = __commonJS({ function dispatch({ body }) { const url4 = requestCurrentURL(request2); const agent2 = fetchParams.controller.dispatcher; - return new Promise((resolve, reject) => agent2.dispatch( + return new Promise((resolve2, reject) => agent2.dispatch( { path: url4.pathname + url4.search, origin: url4.origin, @@ -69748,7 +69748,7 @@ var require_fetch2 = __commonJS({ } } const onError = this.onError.bind(this); - resolve({ + resolve2({ status, statusText, headersList, @@ -69791,7 +69791,7 @@ var require_fetch2 = __commonJS({ for (let i = 0; i < rawHeaders.length; i += 2) { headersList.append(bufferToLowerCasedHeaderName(rawHeaders[i]), rawHeaders[i + 1].toString("latin1"), true); } - resolve({ + resolve2({ status, statusText: STATUS_CODES[status], headersList, @@ -74360,6 +74360,7 @@ var init_index_CLFto6T2 = __esm({ // entry.ts var core4 = __toESM(require_core(), 1); +import { resolve, isAbsolute } from "path"; // main.ts import { mkdtemp as mkdtemp2 } from "node:fs/promises"; @@ -81276,10 +81277,10 @@ var BaseScope = class { }); }; lazyResolutions = []; - lazilyResolve(resolve, syntheticAlias) { + lazilyResolve(resolve2, syntheticAlias) { const node2 = this.node("alias", { reference: syntheticAlias ?? "synthetic", - resolve + resolve: resolve2 }, { prereduced: true }); if (!this.resolved) this.lazyResolutions.push(node2); @@ -86281,7 +86282,7 @@ var require_compile = __commonJS2((exports) => { const schOrFunc = root2.refs[ref]; if (schOrFunc) return schOrFunc; - let _sch = resolve.call(this, root2, ref); + let _sch = resolve2.call(this, root2, ref); if (_sch === void 0) { const schema2 = (_a2 = root2.localRefs) === null || _a2 === void 0 ? void 0 : _a2[ref]; const { schemaId } = this.opts; @@ -86308,7 +86309,7 @@ var require_compile = __commonJS2((exports) => { function sameSchemaEnv(s1, s2) { return s1.schema === s2.schema && s1.root === s2.root && s1.baseId === s2.baseId; } - function resolve(root2, ref) { + function resolve2(root2, ref) { let sch; while (typeof (sch = this.refs[ref]) == "string") ref = sch; @@ -86806,7 +86807,7 @@ var require_fast_uri = __commonJS2((exports, module) => { } return uri; } - function resolve(baseURI, relativeURI, options) { + function resolve2(baseURI, relativeURI, options) { const schemelessOptions = Object.assign({ scheme: "null" }, options); const resolved = resolveComponents(parse6(baseURI, schemelessOptions), parse6(relativeURI, schemelessOptions), schemelessOptions, true); return serialize(resolved, { ...schemelessOptions, skipEscape: true }); @@ -87039,7 +87040,7 @@ var require_fast_uri = __commonJS2((exports, module) => { var fastUri = { SCHEMES, normalize: normalize2, - resolve, + resolve: resolve2, resolveComponents, equal, serialize, @@ -91020,7 +91021,7 @@ var ProcessTransport = class { } return; } - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { const exitHandler = (code, signal) => { if (this.abortController.signal.aborted) { reject(new AbortError("Operation aborted")); @@ -91030,7 +91031,7 @@ var ProcessTransport = class { if (error50) { reject(error50); } else { - resolve(); + resolve2(); } }; this.process.once("exit", exitHandler); @@ -91080,17 +91081,17 @@ var Stream = class { if (this.hasError) { return Promise.reject(this.hasError); } - return new Promise((resolve, reject) => { - this.readResolve = resolve; + return new Promise((resolve2, reject) => { + this.readResolve = resolve2; this.readReject = reject; }); } enqueue(value2) { if (this.readResolve) { - const resolve = this.readResolve; + const resolve2 = this.readResolve; this.readResolve = void 0; this.readReject = void 0; - resolve({ done: false, value: value2 }); + resolve2({ done: false, value: value2 }); } else { this.queue.push(value2); } @@ -91098,10 +91099,10 @@ var Stream = class { done() { this.isDone = true; if (this.readResolve) { - const resolve = this.readResolve; + const resolve2 = this.readResolve; this.readResolve = void 0; this.readReject = void 0; - resolve({ done: true, value: void 0 }); + resolve2({ done: true, value: void 0 }); } } error(error50) { @@ -91434,10 +91435,10 @@ var Query = class { type: "control_request", request: request2 }; - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { this.pendingControlResponses.set(requestId, (response) => { if (response.subtype === "success") { - resolve(response); + resolve2(response); } else { reject(new Error(response.error)); if (response.pending_permission_requests) { @@ -91527,15 +91528,15 @@ var Query = class { logForDebugging(`[Query.waitForFirstResult] Result already received, returning immediately`); return Promise.resolve(); } - return new Promise((resolve) => { + return new Promise((resolve2) => { if (this.abortController?.signal.aborted) { - resolve(); + resolve2(); return; } - this.abortController?.signal.addEventListener("abort", () => resolve(), { + this.abortController?.signal.addEventListener("abort", () => resolve2(), { once: true }); - this.firstResultReceivedResolve = resolve; + this.firstResultReceivedResolve = resolve2; }); } handleHookCallbacks(callbackId, input, toolUseID, abortSignal) { @@ -91586,13 +91587,13 @@ var Query = class { handleMcpControlRequest(serverName, mcpRequest, transport) { const messageId = "id" in mcpRequest.message ? mcpRequest.message.id : null; const key = `${serverName}:${messageId}`; - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { const cleanup = () => { this.pendingMcpResponses.delete(key); }; const resolveAndCleanup = (response) => { cleanup(); - resolve(response); + resolve2(response); }; const rejectAndCleanup = (error50) => { cleanup(); @@ -104291,7 +104292,7 @@ async function retry(fn2, options = {}) { log.warning( `\xBB ${label} failed (attempt ${attempt}/${maxAttempts}), retrying in ${delay2}ms...` ); - await new Promise((resolve) => setTimeout(resolve, delay2)); + await new Promise((resolve2) => setTimeout(resolve2, delay2)); } } throw lastError; @@ -104615,7 +104616,7 @@ async function fetchWithRetry(url4, headers, errorMessage) { const waitSeconds = parseInt(retryAfter, 10); if (!Number.isNaN(waitSeconds) && waitSeconds > 0) { log.info(`Rate limited, waiting ${waitSeconds} seconds before retry...`); - await new Promise((resolve) => setTimeout(resolve, waitSeconds * 1e3)); + await new Promise((resolve2) => setTimeout(resolve2, waitSeconds * 1e3)); const retryResponse = await fetch(url4, { headers }); if (!retryResponse.ok) { throw new Error( @@ -105092,10 +105093,10 @@ var CodexExec = class { for await (const line of rl) { yield line; } - const exitCode = new Promise((resolve, reject) => { + const exitCode = new Promise((resolve2, reject) => { child.once("exit", (code) => { if (code === 0) { - resolve(code); + resolve2(code); } else { const stderrBuffer = Buffer.concat(stderrChunks); reject( @@ -105503,7 +105504,7 @@ var cursor = agent({ } log.info("Running Cursor CLI..."); const startTime = Date.now(); - return new Promise((resolve) => { + return new Promise((resolve2) => { const child = spawn3(cliPath, cursorArgs, { cwd: process.cwd(), env: createAgentEnv({ @@ -105546,14 +105547,14 @@ var cursor = agent({ const duration6 = ((Date.now() - startTime) / 1e3).toFixed(1); if (code === 0) { log.success(`Cursor CLI completed successfully in ${duration6}s`); - resolve({ + resolve2({ success: true, output: stdout.trim() }); } else { const errorMessage = stderr || `Cursor CLI exited with code ${code}`; log.error(`Cursor CLI failed after ${duration6}s: ${errorMessage}`); - resolve({ + resolve2({ success: false, error: errorMessage, output: stdout.trim() @@ -105564,7 +105565,7 @@ var cursor = agent({ const duration6 = ((Date.now() - startTime) / 1e3).toFixed(1); const errorMessage = error50.message || String(error50); log.error(`Cursor CLI execution failed after ${duration6}s: ${errorMessage}`); - resolve({ + resolve2({ success: false, error: errorMessage, output: stdout.trim() @@ -105640,7 +105641,7 @@ async function spawn4(options) { const startTime = Date.now(); let stdoutBuffer = ""; let stderrBuffer = ""; - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { const child = nodeSpawn(cmd, args3, { env: env3 || { PATH: process.env.PATH || "", @@ -105685,7 +105686,7 @@ async function spawn4(options) { reject(new Error(`Process timed out after ${timeout}ms`)); return; } - resolve({ + resolve2({ stdout: stdoutBuffer, stderr: stderrBuffer, exitCode: exitCode || 0, @@ -105698,7 +105699,7 @@ async function spawn4(options) { clearTimeout(timeoutId); } console.error(`[spawn] Process spawn error: ${error50.message}`); - resolve({ + resolve2({ stdout: stdoutBuffer, stderr: stderrBuffer, exitCode: 1, @@ -111150,7 +111151,7 @@ var Protocol = class { return; } const pollInterval = task2.pollInterval ?? this._options?.defaultTaskPollInterval ?? 1e3; - await new Promise((resolve) => setTimeout(resolve, pollInterval)); + await new Promise((resolve2) => setTimeout(resolve2, pollInterval)); options?.signal?.throwIfAborted(); } } catch (error50) { @@ -111167,7 +111168,7 @@ var Protocol = class { */ request(request2, resultSchema, options) { const { relatedRequestId, resumptionToken, onresumptiontoken, task, relatedTask } = options ?? {}; - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { const earlyReject = (error50) => { reject(error50); }; @@ -111245,7 +111246,7 @@ var Protocol = class { if (!parseResult.success) { reject(parseResult.error); } else { - resolve(parseResult.data); + resolve2(parseResult.data); } } catch (error50) { reject(error50); @@ -111506,12 +111507,12 @@ var Protocol = class { } } catch { } - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { if (signal.aborted) { reject(new McpError(ErrorCode2.InvalidRequest, "Request cancelled")); return; } - const timeoutId = setTimeout(resolve, interval); + const timeoutId = setTimeout(resolve2, interval); signal.addEventListener("abort", () => { clearTimeout(timeoutId); reject(new McpError(ErrorCode2.InvalidRequest, "Request cancelled")); @@ -112240,12 +112241,12 @@ var StdioServerTransport = class { this.onclose?.(); } send(message) { - return new Promise((resolve) => { + return new Promise((resolve2) => { const json4 = serializeMessage(message); if (this._stdout.write(json4)) { - resolve(); + resolve2(); } else { - this._stdout.once("drain", resolve); + this._stdout.once("drain", resolve2); } }); } @@ -131204,7 +131205,7 @@ var require_fast_uri3 = /* @__PURE__ */ __commonJSMin(((exports, module) => { else if (typeof uri$2 === "object") uri$2 = parse6(serialize(uri$2, options), options); return uri$2; } - function resolve(baseURI, relativeURI, options) { + function resolve2(baseURI, relativeURI, options) { const schemelessOptions = options ? Object.assign({ scheme: "null" }, options) : { scheme: "null" }; const resolved = resolveComponent(parse6(baseURI, schemelessOptions), parse6(relativeURI, schemelessOptions), schemelessOptions, true); schemelessOptions.skipEscape = true; @@ -131378,7 +131379,7 @@ var require_fast_uri3 = /* @__PURE__ */ __commonJSMin(((exports, module) => { const fastUri = { SCHEMES, normalize: normalize2, - resolve, + resolve: resolve2, resolveComponent, equal: equal$1, serialize, @@ -134959,7 +134960,7 @@ ${error50 instanceof Error ? error50.stack : JSON.stringify(error50)}` new Error(`Connection is in ${this.#connectionState} state`) ); } - return new Promise((resolve, reject) => { + return new Promise((resolve2, reject) => { const timeout = setTimeout(() => { reject( new Error( @@ -134969,7 +134970,7 @@ ${error50 instanceof Error ? error50.stack : JSON.stringify(error50)}` }, 5e3); this.once("ready", () => { clearTimeout(timeout); - resolve(); + resolve2(); }); this.once("error", (event) => { clearTimeout(timeout); @@ -135410,7 +135411,7 @@ ${error50 instanceof Error ? error50.stack : JSON.stringify(error50)}` } }); if (this.#needsEventLoopFlush) { - await new Promise((resolve) => setImmediate(resolve)); + await new Promise((resolve2) => setImmediate(resolve2)); } } catch (progressError) { this.#logger.warn( @@ -135468,7 +135469,7 @@ ${error50 instanceof Error ? error50.stack : JSON.stringify(error50)}` } }); if (this.#needsEventLoopFlush) { - await new Promise((resolve) => setImmediate(resolve)); + await new Promise((resolve2) => setImmediate(resolve2)); } } catch (streamError) { this.#logger.warn( @@ -138162,11 +138163,11 @@ Use this tool to: await killProcessGroup(proc); } }, timeout); - const exitCode = await new Promise((resolve) => { + const exitCode = await new Promise((resolve2) => { const done = (code) => { exited = true; clearTimeout(timeoutId); - resolve(code); + resolve2(code); }; proc.on("exit", done); proc.on("error", () => done(null)); @@ -138188,15 +138189,15 @@ ${stderr}` : stderr : stdout; // mcp/server.ts async function findAvailablePort(startPort) { const checkPort = (port2) => { - return new Promise((resolve) => { + return new Promise((resolve2) => { const server = createServer(); server.once("error", () => { server.close(); - resolve(false); + resolve2(false); }); server.listen(port2, () => { server.close(() => { - resolve(true); + resolve2(true); }); }); }); @@ -138739,7 +138740,11 @@ async function handleAgentResult(result) { // entry.ts async function run() { - const cwd2 = core4.getInput("cwd") || process.env.GITHUB_WORKSPACE; + const cwdInput = core4.getInput("cwd"); + let cwd2 = cwdInput || process.env.GITHUB_WORKSPACE; + if (cwdInput && !isAbsolute(cwdInput) && process.env.GITHUB_WORKSPACE) { + cwd2 = resolve(process.env.GITHUB_WORKSPACE, cwdInput); + } if (cwd2 && process.cwd() !== cwd2) { log.debug(`changing to working directory: ${cwd2}`); process.chdir(cwd2); diff --git a/entry.ts b/entry.ts index 7e8e66e..4df4a23 100644 --- a/entry.ts +++ b/entry.ts @@ -5,13 +5,21 @@ */ import * as core from "@actions/core"; +import { resolve, isAbsolute } from "path"; import { Inputs, main } from "./main.ts"; import { log } from "./utils/cli.ts"; async function run(): Promise { // Change to cwd input or GITHUB_WORKSPACE (where actions/checkout puts the repo) // JavaScript actions run from the action's directory, not the checked out repo - const cwd = core.getInput("cwd") || process.env.GITHUB_WORKSPACE; + const cwdInput = core.getInput("cwd"); + let cwd = cwdInput || process.env.GITHUB_WORKSPACE; + + // resolve relative paths against GITHUB_WORKSPACE + if (cwdInput && !isAbsolute(cwdInput) && process.env.GITHUB_WORKSPACE) { + cwd = resolve(process.env.GITHUB_WORKSPACE, cwdInput); + } + if (cwd && process.cwd() !== cwd) { log.debug(`changing to working directory: ${cwd}`); process.chdir(cwd);