lim 0.34.0 → 0.35.0
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.
- package/dist/base-command.d.ts +9 -15
- package/dist/base-command.d.ts.map +1 -1
- package/dist/base-command.js +37 -107
- package/dist/base-command.js.map +1 -1
- package/dist/base-command.xcode-selection.test.js +0 -20
- package/dist/base-command.xcode-selection.test.js.map +1 -1
- package/dist/commands/android/create.d.ts.map +1 -1
- package/dist/commands/android/create.js +3 -2
- package/dist/commands/android/create.js.map +1 -1
- package/dist/commands/android/tunnel/index.d.ts +6 -7
- package/dist/commands/android/tunnel/index.d.ts.map +1 -1
- package/dist/commands/android/tunnel/index.js +8 -64
- package/dist/commands/android/tunnel/index.js.map +1 -1
- package/dist/commands/android/tunnel/index.test.js +12 -45
- package/dist/commands/android/tunnel/index.test.js.map +1 -1
- package/dist/commands/android/tunnel/status.d.ts.map +1 -1
- package/dist/commands/android/tunnel/status.js +0 -2
- package/dist/commands/android/tunnel/status.js.map +1 -1
- package/dist/commands/ios/attach-xcode.d.ts.map +1 -1
- package/dist/commands/ios/attach-xcode.js +1 -1
- package/dist/commands/ios/attach-xcode.js.map +1 -1
- package/dist/commands/ios/create.d.ts.map +1 -1
- package/dist/commands/ios/create.js +2 -4
- package/dist/commands/ios/create.js.map +1 -1
- package/dist/commands/ios/get.d.ts.map +1 -1
- package/dist/commands/ios/get.js +0 -3
- package/dist/commands/ios/get.js.map +1 -1
- package/dist/commands/ios/maestro.d.ts.map +1 -1
- package/dist/commands/ios/maestro.js +2 -1
- package/dist/commands/ios/maestro.js.map +1 -1
- package/dist/commands/ios/tunnel/index.d.ts +7 -2
- package/dist/commands/ios/tunnel/index.d.ts.map +1 -1
- package/dist/commands/ios/tunnel/index.js +19 -6
- package/dist/commands/ios/tunnel/index.js.map +1 -1
- package/dist/commands/session/start.d.ts.map +1 -1
- package/dist/commands/session/start.js +3 -3
- package/dist/commands/session/start.js.map +1 -1
- package/dist/commands/session/status.d.ts.map +1 -1
- package/dist/commands/session/status.js +0 -7
- package/dist/commands/session/status.js.map +1 -1
- package/dist/commands/xcode/attach-simulator.d.ts.map +1 -1
- package/dist/commands/xcode/attach-simulator.js +1 -1
- package/dist/commands/xcode/attach-simulator.js.map +1 -1
- package/dist/commands/xcode/build.d.ts +0 -1
- package/dist/commands/xcode/build.d.ts.map +1 -1
- package/dist/commands/xcode/build.js +5 -27
- package/dist/commands/xcode/build.js.map +1 -1
- package/dist/commands/xcode/delete.d.ts.map +1 -1
- package/dist/commands/xcode/delete.js +1 -3
- package/dist/commands/xcode/delete.js.map +1 -1
- package/dist/commands/xcode/get.d.ts.map +1 -1
- package/dist/commands/xcode/get.js +0 -24
- package/dist/commands/xcode/get.js.map +1 -1
- package/dist/commands/xcode/logs.d.ts.map +1 -1
- package/dist/commands/xcode/logs.js +2 -16
- package/dist/commands/xcode/logs.js.map +1 -1
- package/dist/commands/xcode/logs.test.js +3 -12
- package/dist/commands/xcode/logs.test.js.map +1 -1
- package/dist/commands/xcode/rbe/index.d.ts.map +1 -1
- package/dist/commands/xcode/rbe/index.js +3 -4
- package/dist/commands/xcode/rbe/index.js.map +1 -1
- package/dist/commands/xcode/set-instance.d.ts.map +1 -1
- package/dist/commands/xcode/set-instance.js +2 -2
- package/dist/commands/xcode/set-instance.js.map +1 -1
- package/dist/commands/xcode/sync.d.ts.map +1 -1
- package/dist/commands/xcode/sync.js +2 -2
- package/dist/commands/xcode/sync.js.map +1 -1
- package/dist/lib/config.d.ts +3 -6
- package/dist/lib/config.d.ts.map +1 -1
- package/dist/lib/config.js +12 -84
- package/dist/lib/config.js.map +1 -1
- package/dist/lib/instance-client-factory.d.ts.map +1 -1
- package/dist/lib/instance-client-factory.js +3 -3
- package/dist/lib/instance-client-factory.js.map +1 -1
- package/dist/lib/tunnel-command.d.ts +5 -14
- package/dist/lib/tunnel-command.d.ts.map +1 -1
- package/dist/lib/tunnel-command.js +13 -13
- package/dist/lib/tunnel-command.js.map +1 -1
- package/dist/lib/tunnel-command.test.js +1 -0
- package/dist/lib/tunnel-command.test.js.map +1 -1
- package/dist/lib/tunnel-inspection-flags.d.ts +33 -0
- package/dist/lib/tunnel-inspection-flags.d.ts.map +1 -0
- package/dist/lib/tunnel-inspection-flags.js +64 -0
- package/dist/lib/tunnel-inspection-flags.js.map +1 -0
- package/dist/lib/tunnel-process.d.ts.map +1 -1
- package/dist/lib/tunnel-process.js +6 -17
- package/dist/lib/tunnel-process.js.map +1 -1
- package/dist/lib/tunnel-process.test.js +14 -2
- package/dist/lib/tunnel-process.test.js.map +1 -1
- package/dist/lib/xcode-version.js +1 -1
- package/dist/lib/xcode-version.js.map +1 -1
- package/package.json +2 -2
- package/dist/lib/xcode-sandbox.d.ts +0 -2
- package/dist/lib/xcode-sandbox.d.ts.map +0 -1
- package/dist/lib/xcode-sandbox.js +0 -7
- package/dist/lib/xcode-sandbox.js.map +0 -1
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../src/commands/xcode/logs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"logs.d.ts","sourceRoot":"","sources":["../../../src/commands/xcode/logs.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAGjD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW;IAChD,MAAM,CAAC,OAAO,SAA+D;IAC7E,MAAM,CAAC,WAAW,SACgL;IAClM,MAAM,CAAC,SAAS,EAA2C,OAAO,WAAW,CAAC,SAAS,CAAC;IAExF,MAAM,CAAC,QAAQ,WAKb;IAEF,MAAM,CAAC,IAAI;;MAKT;IAEF,MAAM,CAAC,KAAK;;;MAQV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAsC3B"}
|
|
@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
const core_1 = require("@oclif/core");
|
|
4
4
|
const base_command_1 = require("../../base-command");
|
|
5
5
|
const build_logs_1 = require("../../lib/build-logs");
|
|
6
|
-
const config_1 = require("../../lib/config");
|
|
7
6
|
class XcodeLogs extends base_command_1.BaseCommand {
|
|
8
7
|
async run() {
|
|
9
8
|
const { args, flags } = await this.parse(XcodeLogs);
|
|
@@ -14,20 +13,7 @@ class XcodeLogs extends base_command_1.BaseCommand {
|
|
|
14
13
|
instanceId: target.id,
|
|
15
14
|
...(args.execId && { execId: args.execId }),
|
|
16
15
|
follow: flags.follow,
|
|
17
|
-
listPersisted:
|
|
18
|
-
let sandboxId = (0, config_1.xcodeSandboxIdOf)(target);
|
|
19
|
-
if (!sandboxId && target.type === 'ios') {
|
|
20
|
-
const instance = await this.client.iosInstances.get(target.id);
|
|
21
|
-
sandboxId = (0, config_1.xcodeSandboxIdOf)({
|
|
22
|
-
...target,
|
|
23
|
-
sandboxXcodeUrl: instance.status.sandbox?.xcode?.url,
|
|
24
|
-
});
|
|
25
|
-
}
|
|
26
|
-
if (!sandboxId) {
|
|
27
|
-
throw new Error('No attached Xcode sandbox was found. Pass its ID with --id to read persisted logs.');
|
|
28
|
-
}
|
|
29
|
-
return this.client.xcodeInstances.listBuildLogs(sandboxId);
|
|
30
|
-
},
|
|
16
|
+
listPersisted: () => this.client.xcodeInstances.listBuildLogs(target.id),
|
|
31
17
|
observe: async (execId, options) => {
|
|
32
18
|
const xcodeClient = await this.resolveXcodeClient(target);
|
|
33
19
|
return xcodeClient.observeBuildLogs(execId, options);
|
|
@@ -66,7 +52,7 @@ XcodeLogs.args = {
|
|
|
66
52
|
};
|
|
67
53
|
XcodeLogs.flags = {
|
|
68
54
|
id: core_1.Flags.string({
|
|
69
|
-
description: 'Xcode
|
|
55
|
+
description: 'Xcode instance ID. Defaults to the most recently used Xcode target.',
|
|
70
56
|
}),
|
|
71
57
|
follow: core_1.Flags.boolean({
|
|
72
58
|
description: 'Continue streaming an active build until it reaches a terminal state.',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../../src/commands/xcode/logs.ts"],"names":[],"mappings":";;AAAA,sCAA0C;AAC1C,qDAAiD;AACjD,qDAAoD;
|
|
1
|
+
{"version":3,"file":"logs.js","sourceRoot":"","sources":["../../../src/commands/xcode/logs.ts"],"names":[],"mappings":";;AAAA,sCAA0C;AAC1C,qDAAiD;AACjD,qDAAoD;AAEpD,MAAqB,SAAU,SAAQ,0BAAW;IA8BhD,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QACpD,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAE3B,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC7B,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;YACvD,MAAM,MAAM,GAAG,MAAM,IAAA,yBAAY,EAAC;gBAChC,UAAU,EAAE,MAAM,CAAC,EAAE;gBACrB,GAAG,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC;gBAC3C,MAAM,EAAE,KAAK,CAAC,MAAM;gBACpB,aAAa,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,aAAa,CAAC,MAAM,CAAC,EAAE,CAAC;gBACxE,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;oBACjC,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;oBAC1D,OAAO,WAAW,CAAC,gBAAgB,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;gBACvD,CAAC;gBACD,GAAG,CAAC,CAAC,KAAK,CAAC,IAAI,IAAI;oBACjB,MAAM,EAAE,CAAC,IAAY,EAAE,MAA2B,EAAE,EAAE;wBACpD,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;oBACtE,CAAC;iBACF,CAAC;aACH,CAAC,CAAC;YAEH,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;gBACf,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;gBACxB,OAAO;YACT,CAAC;YACD,IAAI,CAAC,WAAW,CACd,SAAS,MAAM,CAAC,MAAM,OAAO,MAAM,CAAC,MAAM,GACxC,MAAM,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,UAAU,MAAM,CAAC,QAAQ,GAChE,GAAG,CACJ,CAAC;YACF,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,MAAM,EAAE,CAAC;gBACjD,IAAI,CAAC,WAAW,CACd,oFAAoF,CACrF,CAAC;YACJ,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;;AAlEM,iBAAO,GAAG,2DAA2D,CAAC;AACtE,qBAAW,GAChB,+LAA+L,CAAC;AAC3L,mBAAS,GAAG,0BAAW,CAAC,aAAwD,CAAC;AAEjF,kBAAQ,GAAG;IAChB,8BAA8B;IAC9B,uCAAuC;IACvC,wDAAwD;IACxD,iFAAiF;CAClF,CAAC;AAEK,cAAI,GAAG;IACZ,MAAM,EAAE,WAAI,CAAC,MAAM,CAAC;QAClB,WAAW,EAAE,+EAA+E;QAC5F,QAAQ,EAAE,KAAK;KAChB,CAAC;CACH,CAAC;AAEK,eAAK,GAAG;IACb,EAAE,EAAE,YAAK,CAAC,MAAM,CAAC;QACf,WAAW,EAAE,qEAAqE;KACnF,CAAC;IACF,MAAM,EAAE,YAAK,CAAC,OAAO,CAAC;QACpB,WAAW,EAAE,uEAAuE;QACpF,OAAO,EAAE,KAAK;KACf,CAAC;CACH,CAAC;kBA5BiB,SAAS"}
|
|
@@ -40,8 +40,7 @@ describe.each([
|
|
|
40
40
|
});
|
|
41
41
|
describe('Xcode build log ownership', () => {
|
|
42
42
|
afterEach(() => jest.restoreAllMocks());
|
|
43
|
-
test
|
|
44
|
-
const sandboxUrl = 'https://example.test/v1/xcode_instances/sandbox_test';
|
|
43
|
+
test('reads persisted logs from the Xcode target itself', async () => {
|
|
45
44
|
const listBuildLogs = jest.fn(async () => [
|
|
46
45
|
{
|
|
47
46
|
id: 'build-1',
|
|
@@ -50,27 +49,19 @@ describe('Xcode build log ownership', () => {
|
|
|
50
49
|
downloadUrl: 'https://logs.test/1',
|
|
51
50
|
},
|
|
52
51
|
]);
|
|
53
|
-
const getIos = jest.fn(async () => ({ status: { sandbox: { xcode: { url: sandboxUrl } } } }));
|
|
54
52
|
jest.spyOn(globalThis, 'fetch').mockResolvedValue(new Response('Build succeeded\n'));
|
|
55
53
|
const outputJson = jest.fn();
|
|
56
54
|
const command = Object.assign(Object.create(logs_1.default.prototype), {
|
|
57
55
|
parse: async () => ({ args: { execId: 'build-1' }, flags: { json: true } }),
|
|
58
56
|
setParsedFlags: jest.fn(),
|
|
59
57
|
withAuth: async (run) => run(),
|
|
60
|
-
resolveXcodeTarget: async () => ({
|
|
61
|
-
type: 'ios',
|
|
62
|
-
id: 'ios_test',
|
|
63
|
-
...(cached && { sandboxXcodeUrl: sandboxUrl }),
|
|
64
|
-
}),
|
|
58
|
+
resolveXcodeTarget: async () => ({ type: 'xcode', id: 'sandbox_test' }),
|
|
65
59
|
resolveXcodeClient: jest.fn(),
|
|
66
60
|
outputJson,
|
|
67
61
|
});
|
|
68
|
-
Object.defineProperty(command, 'client', {
|
|
69
|
-
value: { xcodeInstances: { listBuildLogs }, iosInstances: { get: getIos } },
|
|
70
|
-
});
|
|
62
|
+
Object.defineProperty(command, 'client', { value: { xcodeInstances: { listBuildLogs } } });
|
|
71
63
|
await command.run();
|
|
72
64
|
expect(listBuildLogs).toHaveBeenCalledWith('sandbox_test');
|
|
73
|
-
expect(getIos).toHaveBeenCalledTimes(cached ? 0 : 1);
|
|
74
65
|
expect(command.resolveXcodeClient).not.toHaveBeenCalled();
|
|
75
66
|
expect(outputJson).toHaveBeenCalledWith(expect.objectContaining({ source: 'persisted' }));
|
|
76
67
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"logs.test.js","sourceRoot":"","sources":["../../../src/commands/xcode/logs.test.ts"],"names":[],"mappings":";;;;;AAAA,kDAA+B;AAC/B,0DAAwC;AAExC,QAAQ,CAAC,IAAI,CAAC;IACZ,CAAC,OAAO,EAAE,cAAS,CAAC;IACpB,CAAC,QAAQ,EAAE,cAAU,CAAC;CACd,CAAC,CAAC,4BAA4B,EAAE,CAAC,KAAK,EAAE,WAAW,EAAE,EAAE;IAC/D,IAAI,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC,CAAC,yCAAyC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE;QACnF,MAAM,gBAAgB,GAAG,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC;YAC5C,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;YACxC,GAAG,CAAC,MAAM,IAAI,EAAE,QAAQ,EAAE,CAAC,EAAE,CAAC;SAC/B,CAAC,CAAC,CAAC;QACJ,MAAM,UAAU,GAAG,IAAI,CAAC,EAAE,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,WAAW,CAAC,SAAS,CAAC,EAAE;YAClE,KAAK,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,CAAC;YAChE,cAAc,EAAE,IAAI,CAAC,EAAE,EAAE;YACzB,QAAQ,EAAE,KAAK,EAAE,GAAwB,EAAE,EAAE,CAAC,GAAG,EAAE;YACnD,kBAAkB,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE,EAAE,cAAc,EAAE,CAAC;YACvE,mBAAmB,EAAE,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,EAAE,aAAa,EAAE,CAAC;YAClD,kBAAkB,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC;YACtD,mBAAmB,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,EAAE,gBAAgB,EAAE,CAAC;YACvD,UAAU;SACX,CAAC,CAAC;QAEH,MAAM,OAAO,CAAC,GAAG,EAAE,CAAC;QAEpB,MAAM,CAAC,gBAAgB,CAAC,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC;QAClD,MAAM,CAAC,gBAAgB,CAAC,CAAC,oBAAoB,CAAC,QAAQ,EAAE;YACtD,MAAM;YACN,OAAO,EAAE,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;SAC9B,CAAC,CAAC;QACH,MAAM,CAAC,UAAU,CAAC,CAAC,oBAAoB,CACrC,MAAM,CAAC,gBAAgB,CAAC;YACtB,MAAM,EAAE,SAAS;YACjB,MAAM,EAAE,MAAM,CAAC,CAAC,CAAC,WAAW,CAAC,CAAC,CAAC,SAAS;SACzC,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;AACL,CAAC,CAAC,CAAC;AAEH,QAAQ,CAAC,2BAA2B,EAAE,GAAG,EAAE;IACzC,SAAS,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,EAAE,CAAC,CAAC;IAExC,IAAI,CAAC,
|
|
1
|
+
{"version":3,"file":"logs.test.js","sourceRoot":"","sources":["../../../src/commands/xcode/logs.test.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/xcode/rbe/index.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAepD,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,WAAW;IAC/C,MAAM,CAAC,OAAO,SAAqF;IACnG,MAAM,CAAC,WAAW,SAKwE;IAC1F,MAAM,CAAC,QAAQ,WAOb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;MA2CV;IAEF,OAAO,CAAC,QAAQ,CAAyD;IAEnE,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/commands/xcode/rbe/index.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AAepD,MAAM,CAAC,OAAO,OAAO,QAAS,SAAQ,WAAW;IAC/C,MAAM,CAAC,OAAO,SAAqF;IACnG,MAAM,CAAC,WAAW,SAKwE;IAC1F,MAAM,CAAC,QAAQ,WAOb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;;;;;MA2CV;IAEF,OAAO,CAAC,QAAQ,CAAyD;IAEnE,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;IA8Q1B;;;;OAIG;YACW,oBAAoB;IAsElC;;;;;OAKG;YACW,wBAAwB;IAWtC;;;;;;;;;;OAUG;YACW,SAAS;IAUvB;;;OAGG;YACW,qBAAqB;IAoGnC,sDAAsD;YACxC,UAAU;IAOxB;;;;;;;;OAQG;YACW,SAAS;IAiBvB;;;;;;OAMG;YACW,WAAW;IAyEzB,iFAAiF;IACjF,OAAO,CAAC,UAAU;CA0DnB"}
|
|
@@ -115,17 +115,16 @@ class XcodeRbe extends base_command_1.BaseCommand {
|
|
|
115
115
|
let xcodeVersion;
|
|
116
116
|
for (let attempt = 0;; attempt++) {
|
|
117
117
|
const target = await this.resolveXcodeTargetOrCreate(flags.id);
|
|
118
|
-
instanceId =
|
|
118
|
+
instanceId = target.id;
|
|
119
119
|
client = await this.resolveXcodeClient(target);
|
|
120
|
-
// resolveXcodeClient
|
|
121
|
-
// but a cached standalone Xcode target is trusted without a round-trip.
|
|
120
|
+
// resolveXcodeClient trusts a cached Xcode target without a round-trip.
|
|
122
121
|
// Validate it so a stale "last instance" pointer or a deleted instance throws
|
|
123
122
|
// NotFoundError here (→ withAuth clears the cache and recreates) rather than a
|
|
124
123
|
// misleading /rbe 404. Skip an instance we created this run: create({wait:true})
|
|
125
124
|
// already proved it exists, and get() reads the central read-model that the region
|
|
126
125
|
// populates asynchronously, so validating it here would race that lag and tear down
|
|
127
126
|
// a live session for nothing.
|
|
128
|
-
if (
|
|
127
|
+
if (!this.wasCreatedThisRun(instanceId)) {
|
|
129
128
|
await this.client.xcodeInstances.get(instanceId);
|
|
130
129
|
}
|
|
131
130
|
await this.applyXcodeVersionToClient(target, client, requestedXcode);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/xcode/rbe/index.ts"],"names":[],"mappings":";;;;;AAAA,4CAAoB;AACpB,gDAAwB;AACxB,iDAAsC;AACtC,sCAAoC;AAEpC,qCAWqB;AACrB,wDAAoD;AACpD,gDAA0D;AAC1D,oDAAyD;AACzD,8DAA6F;AAC7F,kEAAsE;AACtE,0DAQkC;AAElC,MAAqB,QAAS,SAAQ,0BAAW;IAAjD;;QA8DU,aAAQ,GAAG,IAAI,2BAAgB,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAupB3E,CAAC;IArpBC,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;QAC7C,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAC3B,MAAM,cAAc,GAAG,IAAA,4CAA4B,EAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;QAC5E,0EAA0E;QAC1E,qEAAqE;QACrE,uEAAuE;QACvE,uBAAuB;QACvB,IAAI,KAAK,CAAC,aAAa,CAAC,KAAK,SAAS,IAAI,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC;YAChE,IAAI,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;QAC/D,CAAC;QACD,MAAM,UAAU,GACd,KAAK,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,aAAa,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC,SAAS,CAAC;QAEnG,2EAA2E;QAC3E,yEAAyE;QACzE,6EAA6E;QAC7E,IAAI,KAAK,CAAC,KAAK,EAAE,CAAC;YAChB,IAAI,CAAC,KAAK,CAAC,EAAE,EAAE,CAAC;gBACd,IAAI,CAAC,KAAK,CAAC,6EAA6E,CAAC,CAAC;YAC5F,CAAC;YACD,4EAA4E;YAC5E,yEAAyE;YACzE,sEAAsE;YACtE,sDAAsD;YACtD,wBAAwB,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,SAAS,GAAG,EAAE,CAAC,CAAC,CAAC;YACjE,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;gBAC7B,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAC5D,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,WAAW,CAAC,CAAC;gBAC1D,MAAM,IAAI,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,UAAU,CAAC,CAAC;YACvD,CAAC,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,sEAAsE;QACtE,6EAA6E;QAC7E,yEAAyE;QACzE,+DAA+D;QAC/D,MAAM,aAAa,GAAG,IAAA,4BAAsB,EAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC;QAC5D,IAAI,CAAC,aAAa,EAAE,CAAC;YACnB,IAAI,CAAC,KAAK,CACR,uFAAuF;gBACrF,qFAAqF,CACxF,CAAC;QACJ,CAAC;QAED,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YACf,MAAM,IAAI,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC;YAC/C,OAAO;QACT,CAAC;QAED,8EAA8E;QAC9E,6EAA6E;QAC7E,MAAM,QAAQ,GAAG,IAAA,4BAAc,EAAC,aAAa,CAAC,CAAC;QAC/C,IAAI,QAAQ,IAAI,IAAA,4BAAc,EAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7C,MAAM,OAAO,GACX,kEAAkE,QAAQ,CAAC,GAAG,IAAI;gBAClF,oBAAoB,QAAQ,CAAC,IAAI,EAAE;gBACnC,GAAG,QAAQ,CAAC,UAAU,CAAC,CAAC,CAAC,wBAAwB,QAAQ,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,EAAE,IAAI,CAAC;YACnF,wEAAwE;YACxE,uEAAuE;YACvE,oEAAoE;YACpE,yEAAyE;YACzE,IACE,KAAK,CAAC,aAAa,CAAC;gBACpB,CAAC,QAAQ,CAAC,UAAU,KAAK,KAAK,CAAC,aAAa,CAAC;oBAC3C,CAAC,KAAK,CAAC,YAAY,CAAC,KAAK,SAAS,IAAI,QAAQ,CAAC,SAAS,KAAK,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,EACpF,CAAC;gBACD,IAAI,CAAC,KAAK,CACR,GAAG,OAAO,uDAAuD;oBAC/D,iDAAiD,CACpD,CAAC;YACJ,CAAC;YACD,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;YACnB,IAAI,CAAC,IAAI,CAAC,kEAAkE,CAAC,CAAC;YAC9E,OAAO;QACT,CAAC;QACD,IAAI,QAAQ,EAAE,CAAC;YACb,sEAAsE;YACtE,4EAA4E;YAC5E,2EAA2E;YAC3E,0EAA0E;YAC1E,+DAA+D;YAC/D,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;gBAC3B,IAAI,MAAM,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC;oBACjD,IAAI,CAAC,IAAI,CAAC,wBAAwB,QAAQ,CAAC,aAAa,0BAA0B,CAAC,CAAC;gBACtF,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,IAAI,CACP,2CAA2C,QAAQ,CAAC,aAAa,gCAAgC,CAClG,CAAC;gBACJ,CAAC;YACH,CAAC;YACD,IAAA,6BAAe,EAAC,aAAa,CAAC,CAAC;QACjC,CAAC;QAED,MAAM,IAAI,CAAC,QAAQ,CAAC,KAAK,IAAI,EAAE;YAC7B,2EAA2E;YAC3E,uEAAuE;YACvE,yCAAyC;YACzC,MAAM,IAAA,iCAAmB,EAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,CAC/C,IAAI,CAAC,KAAK,CACR,cAAc,KAAK,CAAC,IAAI,6DAA6D;gBACnF,+EAA+E,CAClF,CACF,CAAC;YAEF,yEAAyE;YACzE,0EAA0E;YAC1E,yEAAyE;YACzE,wDAAwD;YACxD,IAAI,MAAoB,CAAC;YACzB,IAAI,UAAmB,CAAC;YACxB,IAAI,YAAqB,CAAC;YAC1B,KAAK,IAAI,OAAO,GAAG,CAAC,GAAI,OAAO,EAAE,EAAE,CAAC;gBAClC,MAAM,MAAM,GAAG,MAAM,IAAI,CAAC,0BAA0B,CAAC,KAAK,CAAC,EAAE,CAAC,CAAC;gBAC/D,UAAU,GAAG,OAAO,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC7D,MAAM,GAAG,MAAM,IAAI,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC;gBAC/C,0EAA0E;gBAC1E,wEAAwE;gBACxE,8EAA8E;gBAC9E,+EAA+E;gBAC/E,iFAAiF;gBACjF,mFAAmF;gBACnF,oFAAoF;gBACpF,8BAA8B;gBAC9B,IAAI,OAAO,MAAM,KAAK,QAAQ,IAAI,MAAM,CAAC,IAAI,KAAK,OAAO,IAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE,CAAC;oBACjG,MAAM,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;gBACnD,CAAC;gBACD,MAAM,IAAI,CAAC,yBAAyB,CAAC,MAAM,EAAE,MAAM,EAAE,cAAc,CAAC,CAAC;gBAErE,yEAAyE;gBACzE,wEAAwE;gBACxE,0EAA0E;gBAC1E,4DAA4D;gBAC5D,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,iCAAiC,CAAC,CAAC;gBACvD,IAAI,CAAC;oBACH,MAAM,OAAO,GAAG,MAAM,IAAA,oBAAc,EAAC,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE;wBAC5D,GAAG,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,CAAC,CAAC;qBACvC,CAAC,CAAC;oBACH,MAAM,MAAM,GAAG,MAAM,IAAA,uBAAiB,EAAC,MAAM,EAAE,OAAO,CAAC,CAAC;oBACxD,YAAY,GAAG,MAAM,CAAC,YAAY,CAAC;oBACnC,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,uCAAuC,YAAY,GAAG,CAAC,CAAC;oBACtF,MAAM;gBACR,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;oBAC9B,IAAI,GAAG,YAAY,yBAAmB,IAAI,CAAC,KAAK,CAAC,EAAE,IAAI,OAAO,KAAK,CAAC,EAAE,CAAC;wBACrE,qEAAqE;wBACrE,iEAAiE;wBACjE,qEAAqE;wBACrE,8CAA8C;wBAC9C,IAAI,IAAI,CAAC,iBAAiB,CAAC,UAAU,CAAC,EAAE,CAAC;4BACvC,IAAI,CAAC,IAAI,CACP,wFAAwF,CACzF,CAAC;4BACF,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;wBAC/C,CAAC;6BAAM,CAAC;4BACN,IAAI,CAAC,IAAI,CACP,sFAAsF,CACvF,CAAC;wBACJ,CAAC;wBACD,IAAA,4BAAmB,EAAC,UAAU,CAAC,CAAC;wBAChC,SAAS;oBACX,CAAC;oBACD,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;oBACvC,sEAAsE;oBACtE,qEAAqE;oBACrE,+CAA+C;oBAC/C,MAAM,IAAI,CAAC,qBAAqB,CAAC,UAAU,CAAC,CAAC;oBAC7C,IAAI,CAAC,KAAK,CAAC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC/D,CAAC;YACH,CAAC;YAED,IAAI,SAA4B,CAAC;YACjC,IAAI,CAAC;gBACH,SAAS,GAAG,IAAA,4BAAsB,EAAC,aAAa,EAAE,YAAY,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YAC9E,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;gBACvC,IAAI,CAAC,KAAK,CAAC,sCAAsC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;YACvG,CAAC;YACD,IAAI,CAAC,QAAQ,CAAC,OAAO,CACnB,4BAA4B,SAAS,CAAC,cAAc,CAAC,CAAC,CAAC,mCAAmC,CAAC,CAAC,CAAC,EAAE,EAAE,CAClG,CAAC;YAEF,0EAA0E;YAC1E,4EAA4E;YAC5E,0EAA0E;YAC1E,0EAA0E;YAC1E,wEAAwE;YACxE,yEAAyE;YACzE,+DAA+D;YAC/D,MAAM,cAAc,GAAG,IAAA,sBAAgB,EAAC,aAAa,CAAC,CAAC;YACvD,MAAM,MAAM,GAAG,cAAc,IAAI,eAAe,CAAC;YACjD,MAAM,QAAQ,GAAG,2DAA2D,MAAM,EAAE,CAAC;YAErF,gFAAgF;YAChF,4EAA4E;YAC5E,YAAY;YACZ,IAAI,aAAiC,CAAC;YACtC,IAAI,KAAK,CAAC,GAAG,EAAE,CAAC;gBACd,IAAI,CAAC;oBACH,aAAa,GAAG,MAAM,IAAI,CAAC,wBAAwB,CAAC,MAAM,CAAC,CAAC;gBAC9D,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,wEAAwE;oBACxE,6EAA6E;oBAC7E,wDAAwD;oBACxD,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;oBACvC,IAAI,CAAC,KAAK,CACR,uCAAuC,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAC1F,CAAC;gBACJ,CAAC;YACH,CAAC;YAED,IAAI,KAAK,CAAC,MAAM,EAAE,CAAC;gBACjB,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,qBAAqB,CAAC;wBAC/B,MAAM;wBACN,aAAa;wBACb,aAAa;wBACb,UAAU;wBACV,IAAI,EAAE,KAAK,CAAC,IAAI;wBAChB,YAAY;wBACZ,SAAS;wBACT,QAAQ;wBACR,UAAU,EAAE,KAAK,CAAC,aAAa,CAAC;wBAChC,SAAS,EAAE,KAAK,CAAC,YAAY,CAAC;qBAC/B,CAAC,CAAC;gBACL,CAAC;gBAAC,OAAO,GAAG,EAAE,CAAC;oBACb,wEAAwE;oBACxE,sEAAsE;oBACtE,qEAAqE;oBACrE,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;oBACpC,MAAM,GAAG,CAAC;gBACZ,CAAC;gBACD,OAAO;YACT,CAAC;YAED,qEAAqE;YACrE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;YACtC,IAAI,MAAc,CAAC;YACnB,IAAI,CAAC;gBACH,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;YACrD,CAAC;YAAC,OAAO,GAAG,EAAE,CAAC;gBACb,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBAC9B,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;gBACvC,0EAA0E;gBAC1E,0EAA0E;gBAC1E,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;gBACpC,IAAI,CAAC,KAAK,CACR,+CAA+C,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAClG,CAAC;YACJ,CAAC;YACD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,mCAAmC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC;YAC/E,IAAI,CAAC,UAAU,CAAC;gBACd,IAAI,EAAE,KAAK,CAAC,IAAI;gBAChB,aAAa;gBACb,YAAY;gBACZ,SAAS;gBACT,QAAQ;gBACR,UAAU;gBACV,UAAU,EAAE,KAAK;gBACjB,iBAAiB,EAAE,CAAC,CAAC,aAAa;gBAClC,UAAU,EAAE,KAAK,CAAC,aAAa,CAAC;aACjC,CAAC,CAAC;YACH,IAAI,CAAC;gBACH,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;YACrD,CAAC;oBAAS,CAAC;gBACT,MAAM,IAAI,CAAC,SAAS,CAAC,aAAa,CAAC,CAAC;YACtC,CAAC;QACH,CAAC,CAAC,CAAC;IACL,CAAC;IAED;;;;OAIG;IACK,KAAK,CAAC,oBAAoB,CAAC,aAAqB;QACtD,MAAM,IAAI,GAAG,IAAA,4BAAc,EAAC,aAAa,CAAC,CAAC;QAC3C,IAAI,CAAC,IAAI,IAAI,CAAC,IAAA,4BAAc,EAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YACvC,6EAA6E;YAC7E,2EAA2E;YAC3E,8EAA8E;YAC9E,8EAA8E;YAC9E,2DAA2D;YAC3D,IAAI,IAAI,EAAE,aAAa,EAAE,CAAC;gBACxB,IAAI,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;oBAC7C,IAAI,CAAC,IAAI,CAAC,kCAAkC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;gBACrE,CAAC;qBAAM,CAAC;oBACN,IAAI,CAAC,IAAI,CAAC,8BAA8B,IAAI,CAAC,aAAa,gCAAgC,CAAC,CAAC;gBAC9F,CAAC;YACH,CAAC;YACD,IAAA,6BAAe,EAAC,aAAa,CAAC,CAAC;YAC/B,IAAI,CAAC,IAAI,CAAC,oDAAoD,CAAC,CAAC;YAChE,OAAO;QACT,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,mCAAmC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;QAEpE,4EAA4E;QAC5E,8EAA8E;QAC9E,6EAA6E;QAC7E,uEAAuE;QACvE,MAAM,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;QACrD,IAAI,SAAS,EAAE,CAAC;YACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,IAAI,IAAA,4BAAc,EAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBACzD,MAAM,IAAA,kBAAY,EAAC,GAAG,CAAC,CAAC,CAAC,mCAAmC;YAC9D,CAAC;QACH,CAAC;QAED,6EAA6E;QAC7E,gEAAgE;QAChE,IAAI,MAAM,GAAG,KAAK,CAAC;QACnB,IAAI,IAAA,4BAAc,EAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7B,MAAM,GAAG,aAAa,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;YAC5C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,EAAE,IAAI,IAAA,4BAAc,EAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;gBACxD,MAAM,IAAA,kBAAY,EAAC,GAAG,CAAC,CAAC,CAAC,YAAY;YACvC,CAAC;QACH,CAAC;QAED,wEAAwE;QACxE,6EAA6E;QAC7E,0BAA0B;QAC1B,IAAI,IAAA,4BAAc,EAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;YAC7B,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC9B,IAAI,CAAC,KAAK,CAAC,kBAAkB,IAAI,CAAC,GAAG,yCAAyC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC;QAC5F,CAAC;QACD,IAAA,6BAAe,EAAC,aAAa,CAAC,CAAC;QAC/B,IAAI,MAAM,EAAE,CAAC;YACX,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,wCAAwC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;YACnF,IAAI,CAAC,IAAI,CACP,6FAA6F,CAC9F,CAAC;QACJ,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,kCAAkC,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;QAC/E,CAAC;QAED,2EAA2E;QAC3E,iCAAiC;QACjC,IAAI,IAAI,CAAC,aAAa,EAAE,CAAC;YACvB,IAAI,MAAM,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,aAAa,CAAC,EAAE,CAAC;gBAC7C,IAAI,CAAC,IAAI,CAAC,kCAAkC,IAAI,CAAC,aAAa,GAAG,CAAC,CAAC;YACrE,CAAC;iBAAM,CAAC;gBACN,IAAI,CAAC,IAAI,CAAC,8BAA8B,IAAI,CAAC,aAAa,gCAAgC,CAAC,CAAC;YAC9F,CAAC;QACH,CAAC;IACH,CAAC;IAED;;;;;OAKG;IACK,KAAK,CAAC,wBAAwB,CAAC,MAAmB;QACxD,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;QAC9C,+EAA+E;QAC/E,mDAAmD;QACnD,MAAM,EAAE,aAAa,EAAE,SAAS,EAAE,GAAG,MAAM,MAAM,CAAC,kBAAkB,EAAE,CAAC;QACvE,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,aAAa,aAAa,uBAAuB,CAAC,CAAC;QACjF,MAAM,SAAS,GAAG,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,IAAI,CAAC,gBAAgB,CAAC,aAAa,CAAC,CAAC;QACjG,IAAI,CAAC,IAAI,CAAC,wBAAwB,SAAS,EAAE,CAAC,CAAC;QAC/C,OAAO,aAAa,CAAC;IACvB,CAAC;IAED;;;;;;;;;;OAUG;IACK,KAAK,CAAC,SAAS,CAAC,EAAsB;QAC5C,IAAI,CAAC,EAAE;YAAE,OAAO,KAAK,CAAC;QACtB,IAAI,CAAC;YACH,MAAM,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAC1C,OAAO,IAAI,CAAC;QACd,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,KAAK,CAAC;QACf,CAAC;IACH,CAAC;IAED;;;OAGG;IACK,KAAK,CAAC,qBAAqB,CAAC,IAWnC;QACC,MAAM,MAAM,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,SAAS,CAAuB,CAAC;QACnE,MAAM,OAAO,GAAG,cAAI,CAAC,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,gBAAU,EAAE,SAAS,CAAC,CAAC;QAErE,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAClD,MAAM,KAAK,GAAG,YAAE,CAAC,QAAQ,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QACxC,MAAM,KAAK,GAAG,IAAA,qBAAK,EACjB,OAAO,CAAC,QAAQ,EAChB,IAAA,iCAAmB,EAAC;YAClB,UAAU,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YAC3B,EAAE,EAAE,IAAI,CAAC,UAAU;YACnB,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,MAAM;YACN,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,SAAS,EAAE,IAAI,CAAC,SAAS;SAC1B,CAAC,EACF,EAAE,QAAQ,EAAE,IAAI,EAAE,KAAK,EAAE,CAAC,QAAQ,EAAE,KAAK,EAAE,KAAK,CAAC,EAAE,CACpD,CAAC;QACF,YAAE,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;QACpB,KAAK,CAAC,KAAK,EAAE,CAAC;QACd,MAAM,GAAG,GAAG,KAAK,CAAC,GAAG,CAAC;QACtB,IAAI,GAAG,KAAK,SAAS,EAAE,CAAC;YACtB,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YAC5C,IAAI,CAAC,KAAK,CAAC,gDAAgD,CAAC,CAAC;QAC/D,CAAC;QAED,4EAA4E;QAC5E,4EAA4E;QAC5E,6EAA6E;QAC7E,6EAA6E;QAC7E,2EAA2E;QAC3E,+CAA+C;QAC/C,IAAI,SAAoC,CAAC;QACzC,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;YAC1B,SAAS,GAAG,IAAI,IAAI,CAAC,CAAC;QACxB,CAAC,CAAC,CAAC;QACH,IAAI,KAAK,GAAG,KAAK,CAAC;QAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,GAAG,EAAE,GAAG,KAAK,CAAC;QACpC,OAAO,SAAS,KAAK,SAAS,IAAI,IAAI,CAAC,GAAG,EAAE,GAAG,QAAQ,EAAE,CAAC;YACxD,IAAI,MAAM,IAAA,2BAAa,EAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBACnC,KAAK,GAAG,IAAI,CAAC;gBACb,MAAM;YACR,CAAC;YACD,MAAM,IAAA,kBAAY,EAAC,GAAG,CAAC,CAAC;QAC1B,CAAC;QAED,IAAI,CAAC,KAAK,EAAE,CAAC;YACX,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;YAC9B,MAAM,IAAI,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YAC5C,IAAI,SAAS,KAAK,SAAS,EAAE,CAAC;gBAC5B,IAAI,CAAC,KAAK,CACR,qDAAqD,SAAS,MAAM;oBAClE,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,OAAO,eAAe,CACzD,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,oEAAoE;gBACpE,6CAA6C;gBAC7C,aAAa,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC;gBAC9B,IAAI,CAAC,KAAK,CACR,sDAAsD,IAAI,CAAC,IAAI,aAAa;oBAC1E,GAAG,WAAW,CAAC,OAAO,CAAC,SAAS,OAAO,eAAe,CACzD,CAAC;YACJ,CAAC;QACH,CAAC;QACD,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,EAAE,qCAAqC,GAAG,GAAG,CAAC,CAAC;QAC3E,IAAA,6BAAe,EAAC,IAAI,CAAC,aAAa,EAAE;YAClC,GAAG;YACH,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,GAAG,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,EAAE,aAAa,EAAE,IAAI,CAAC,aAAa,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YACpE,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3D,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;SACzD,CAAC,CAAC;QAEH,IAAI,CAAC,UAAU,CAAC;YACd,IAAI,EAAE,IAAI,CAAC,IAAI;YACf,aAAa,EAAE,IAAI,CAAC,aAAa;YACjC,YAAY,EAAE,IAAI,CAAC,YAAY;YAC/B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,UAAU,EAAE,IAAI;YAChB,iBAAiB,EAAE,CAAC,CAAC,IAAI,CAAC,aAAa;YACvC,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,GAAG;YACH,OAAO;SACR,CAAC,CAAC;IACL,CAAC;IAED,sDAAsD;IAC9C,KAAK,CAAC,UAAU,CAAC,MAAmB,EAAE,IAAY;QACxD,OAAO,MAAM,CAAC,cAAc,CAAC;YAC3B,IAAI;YACJ,QAAQ,EAAE,IAAI,CAAC,aAAa,EAAE,IAAI,IAAI,CAAC,cAAc,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM;SAC1E,CAAC,CAAC;IACL,CAAC;IAED;;;;;;;;OAQG;IACK,KAAK,CAAC,SAAS,CACrB,MAAmB,EACnB,IAAY,EACZ,UAAgD;QAEhD,IAAI,MAAc,CAAC;QACnB,IAAI,CAAC;YACH,MAAM,GAAG,MAAM,IAAI,CAAC,UAAU,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QAC/C,CAAC;QAAC,OAAO,GAAG,EAAE,CAAC;YACb,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;YACvC,IAAI,CAAC,KAAK,CACR,+CAA+C,GAAG,YAAY,KAAK,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,EAAE,CAClG,CAAC;QACJ,CAAC;QACD,MAAM,IAAI,CAAC,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,UAAU,CAAC,CAAC;IACrD,CAAC;IAED;;;;;;OAMG;IACK,KAAK,CAAC,WAAW,CACvB,MAAc,EACd,MAAmB,EACnB,UAAgD;QAEhD,MAAM,OAAO,GACX,UAAU,CAAC,CAAC;YACV,IAAA,wCAAsB,EAAC;gBACrB,MAAM;gBACN,SAAS,EAAE,UAAU,CAAC,SAAS;gBAC/B,GAAG,EAAE,UAAU,CAAC,GAAG;gBACnB,GAAG,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;aAC7B,CAAC;YACJ,CAAC,CAAC,SAAS,CAAC;QACd,IAAI,CAAC;YACH,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;gBAC1C,MAAM,SAAS,GAAG,WAAW,CAAC,GAAG,EAAE,GAAE,CAAC,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;gBACjD,IAAI,QAAQ,GAAG,KAAK,CAAC;gBACrB,MAAM,OAAO,GAAG,GAAG,EAAE;oBACnB,aAAa,CAAC,SAAS,CAAC,CAAC;oBACzB,WAAW,EAAE,CAAC;oBACd,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;oBAChC,OAAO,CAAC,GAAG,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;gBACnC,CAAC,CAAC;gBACF,MAAM,QAAQ,GAAG,GAAG,EAAE;oBACpB,QAAQ,GAAG,IAAI,CAAC;oBAChB,OAAO,EAAE,CAAC;oBACV,IAAI,CAAC,IAAI,CAAC,yCAAyC,CAAC,CAAC;oBACrD,OAAO,EAAE,CAAC;gBACZ,CAAC,CAAC;gBACF,uEAAuE;gBACvE,2EAA2E;gBAC3E,0EAA0E;gBAC1E,IAAI,oBAAoB,GAAG,KAAK,CAAC;gBACjC,MAAM,WAAW,GAAG,MAAM,CAAC,uBAAuB,CAAC,CAAC,KAAK,EAAE,EAAE;oBAC3D,IAAI,QAAQ;wBAAE,OAAO;oBACrB,IAAI,KAAK,KAAK,cAAc,EAAE,CAAC;wBAC7B,IAAI,CAAC,oBAAoB,EAAE,CAAC;4BAC1B,oBAAoB,GAAG,IAAI,CAAC;4BAC5B,IAAI,CAAC,IAAI,CAAC,kCAAkC,CAAC,CAAC;wBAChD,CAAC;wBACD,OAAO;oBACT,CAAC;oBACD,IAAI,KAAK,KAAK,WAAW,EAAE,CAAC;wBAC1B,IAAI,oBAAoB,EAAE,CAAC;4BACzB,oBAAoB,GAAG,KAAK,CAAC;4BAC7B,IAAI,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAC;wBACvC,CAAC;wBACD,OAAO;oBACT,CAAC;oBACD,IAAI,KAAK,KAAK,cAAc,EAAE,CAAC;wBAC7B,OAAO,EAAE,CAAC;wBACV,MAAM,CACJ,IAAI,KAAK,CACP,8EAA8E;4BAC5E,+DAA+D;4BAC/D,iDAAiD,CACpD,CACF,CAAC;oBACJ,CAAC;gBACH,CAAC,CAAC,CAAC;gBACH,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC;gBACjC,OAAO,CAAC,IAAI,CAAC,SAAS,EAAE,QAAQ,CAAC,CAAC;YACpC,CAAC,CAAC,CAAC;QACL,CAAC;gBAAS,CAAC;YACT,wEAAwE;YACxE,gEAAgE;YAChE,MAAM,OAAO,EAAE,IAAI,EAAE,CAAC;YACtB,MAAM,CAAC,KAAK,EAAE,CAAC;YACf,MAAM,MAAM,CAAC,OAAO,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,GAAE,CAAC,CAAC,CAAC;QACzC,CAAC;IACH,CAAC;IAED,iFAAiF;IACzE,UAAU,CAAC,IAYlB;QACC,IAAI,IAAI,CAAC,aAAa,EAAE,EAAE,CAAC;YACzB,IAAI,CAAC,UAAU,CAAC;gBACd,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,IAAI,EAAE,IAAI,CAAC,IAAI;gBACf,YAAY,EAAE,IAAI,CAAC,YAAY;gBAC/B,aAAa,EAAE,IAAI,CAAC,aAAa;gBACjC,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,UAAU,EAAE,IAAI,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;gBAC3D,eAAe,EAAE;oBACf,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,SAAS;oBACnC,eAAe,EAAE,IAAI,CAAC,SAAS,CAAC,eAAe;iBAChD;gBACD,YAAY,EAAE,IAAI,CAAC,QAAQ;gBAC3B,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,GAAG,EAAE,OAAO,EAAE,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;aACrE,CAAC,CAAC;YACH,OAAO;QACT,CAAC;QAED,4EAA4E;QAC5E,2CAA2C;QAC3C,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAChB,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;QAC3B,IAAI,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,QAAQ,EAAE,CAAC,CAAC;QAClC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAChB,IAAI,CAAC,MAAM,CAAC,+BAA+B,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACxD,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACnE,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,CAAC,sDAAsD,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;QACxF,CAAC;QACD,IAAI,IAAI,CAAC,UAAU,EAAE,CAAC;YACpB,IAAI,CAAC,MAAM,CAAC,cAAc,IAAI,CAAC,OAAO,EAAE,CAAC,CAAC;YAC1C,IAAI,CAAC,MAAM,CAAC,+CAA+C,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC;QAC1E,CAAC;aAAM,CAAC;YACN,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;YAChB,IAAI,CAAC,IAAI,CAAC,0CAA0C,CAAC,CAAC;QACxD,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;QAChB,IAAI,CAAC,IAAI,CACP,IAAI,CAAC,iBAAiB,CAAC,CAAC;YACtB,0FAA0F;gBACxF,8FAA8F;YAClG,CAAC,CAAC,uGAAuG;gBACrG,oGAAoG,CACzG,CAAC;IACJ,CAAC;;AAntBM,gBAAO,GAAG,iFAAiF,AAApF,CAAqF;AAC5F,oBAAW,GAChB,gGAAgG;IAChG,+FAA+F;IAC/F,+FAA+F;IAC/F,iGAAiG;IACjG,uFAAuF,AALvE,CAKwE;AACnF,iBAAQ,GAAG;IAChB,6BAA6B;IAC7B,2EAA2E;IAC3E,yCAAyC;IACzC,sDAAsD;IACtD,yCAAyC;IACzC,gDAAgD;CACjD,AAPc,CAOb;AAEK,cAAK,GAAG;IACb,GAAG,0BAAW,CAAC,SAAS;IACxB,EAAE,EAAE,YAAK,CAAC,MAAM,CAAC;QACf,WAAW,EACT,2GAA2G;KAC9G,CAAC;IACF,IAAI,EAAE,YAAK,CAAC,OAAO,CAAC;QAClB,WAAW,EAAE,2DAA2D;QACxE,OAAO,EAAE,6BAAuB;KACjC,CAAC;IACF,MAAM,EAAE,YAAK,CAAC,OAAO,CAAC;QACpB,WAAW,EACT,qIAAqI;QACvI,OAAO,EAAE,IAAI;QACb,OAAO,EAAE,IAAI;KACd,CAAC;IACF,IAAI,EAAE,YAAK,CAAC,OAAO,CAAC;QAClB,WAAW,EAAE,wDAAwD;QACrE,OAAO,EAAE,KAAK;QACd,SAAS,EAAE,CAAC,aAAa,CAAC;KAC3B,CAAC;IACF,aAAa,EAAE,YAAK,CAAC,MAAM,CAAC;QAC1B,WAAW,EACT,wFAAwF;YACxF,gFAAgF;QAClF,SAAS,EAAE,CAAC,MAAM,CAAC;KACpB,CAAC;IACF,YAAY,EAAE,YAAK,CAAC,MAAM,CAAC;QACzB,WAAW,EACT,+JAA+J;QACjK,SAAS,EAAE,CAAC,aAAa,CAAC;KAC3B,CAAC;IACF,GAAG,EAAE,YAAK,CAAC,OAAO,CAAC;QACjB,WAAW,EACT,2IAA2I;QAC7I,OAAO,EAAE,KAAK;KACf,CAAC;IACF,KAAK,EAAE,YAAK,CAAC,OAAO,CAAC;QACnB,MAAM,EAAE,IAAI;QACZ,OAAO,EAAE,KAAK;QACd,WAAW,EAAE,qFAAqF;KACnG,CAAC;IACF,GAAG,iCAAiB;CACrB,AA3CW,CA2CV;kBA5DiB,QAAQ;AAutB7B,iGAAiG;AACjG,SAAS,aAAa,CAAC,GAAW,EAAE,MAAsB;IACxD,IAAI,CAAC;QACH,OAAO,CAAC,IAAI,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;QAC1B,OAAO,IAAI,CAAC;IACd,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,KAAK,CAAC;IACf,CAAC;AACH,CAAC;AAED;;;;;;;;GAQG;AACH,SAAS,wBAAwB,CAAC,GAA0B;IAC1D,OAAO,CAAC,EAAE,CAAC,oBAAoB,EAAE,CAAC,MAAM,EAAE,EAAE;QAC1C,GAAG,CAAC,kEAAkE,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC;IAC1F,CAAC,CAAC,CAAC;IACH,OAAO,CAAC,EAAE,CAAC,mBAAmB,EAAE,CAAC,GAAG,EAAE,EAAE;QACtC,GAAG,CAAC,6EAA6E,GAAG,EAAE,OAAO,IAAI,GAAG,EAAE,CAAC,CAAC;QACxG,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;IAClB,CAAC,CAAC,CAAC;AACL,CAAC;AAED,mFAAmF;AACnF,SAAS,WAAW,CAAC,OAAe,EAAE,KAAK,GAAG,EAAE;IAC9C,IAAI,CAAC;QACH,MAAM,OAAO,GAAG,YAAE,CAAC,YAAY,CAAC,OAAO,EAAE,MAAM,CAAC,CAAC,OAAO,EAAE,CAAC;QAC3D,IAAI,CAAC,OAAO,EAAE,CAAC;YACb,OAAO,qBAAqB,CAAC;QAC/B,CAAC;QACD,OAAO,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtD,CAAC;IAAC,MAAM,CAAC;QACP,OAAO,0BAA0B,CAAC;IACpC,CAAC;AACH,CAAC"}
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/commands/xcode/rbe/index.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set-instance.d.ts","sourceRoot":"","sources":["../../../src/commands/xcode/set-instance.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAIjD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,WAAW;IACvD,MAAM,CAAC,OAAO,SAA4D;IAC1E,MAAM,CAAC,WAAW,SAG0I;IAC5J,MAAM,CAAC,QAAQ,WAGb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"set-instance.d.ts","sourceRoot":"","sources":["../../../src/commands/xcode/set-instance.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAIjD,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,WAAW;IACvD,MAAM,CAAC,OAAO,SAA4D;IAC1E,MAAM,CAAC,WAAW,SAG0I;IAC5J,MAAM,CAAC,QAAQ,WAGb;IAEF,MAAM,CAAC,KAAK;;;;;;;;;MAYV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CAkB3B"}
|
|
@@ -24,7 +24,7 @@ class XcodeSetInstance extends base_command_1.BaseCommand {
|
|
|
24
24
|
}
|
|
25
25
|
XcodeSetInstance.summary = 'Set the Xcode instance targeted by subsequent commands';
|
|
26
26
|
XcodeSetInstance.description = 'Pin an existing Xcode instance as the target of subsequent `lim xcode` commands using only its API URL and token — no LIM_API_KEY needed. ' +
|
|
27
|
-
'
|
|
27
|
+
'Takes status.apiUrl and status.token from `lim xcode create --json`. ' +
|
|
28
28
|
'To target the instance without persisting anything, export LIM_XCODE_INSTANCE_URL and LIM_XCODE_INSTANCE_TOKEN instead; commands pick them up directly.';
|
|
29
29
|
XcodeSetInstance.examples = [
|
|
30
30
|
'<%= config.bin %> xcode set-instance --api-url https://eu-north1.limrun.com/v1/xcode_.../api --token lim_st_...',
|
|
@@ -33,7 +33,7 @@ XcodeSetInstance.examples = [
|
|
|
33
33
|
XcodeSetInstance.flags = {
|
|
34
34
|
...base_command_1.BaseCommand.baseFlags,
|
|
35
35
|
'api-url': core_1.Flags.string({
|
|
36
|
-
description: "The instance's API URL (status.apiUrl
|
|
36
|
+
description: "The instance's API URL (status.apiUrl). Can also be set via LIM_XCODE_INSTANCE_URL.",
|
|
37
37
|
env: 'LIM_XCODE_INSTANCE_URL',
|
|
38
38
|
required: true,
|
|
39
39
|
}),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"set-instance.js","sourceRoot":"","sources":["../../../src/commands/xcode/set-instance.ts"],"names":[],"mappings":";;AAAA,sCAAoC;AACpC,qDAAiD;AACjD,6CAAmD;AACnD,yDAAmE;AAEnE,MAAqB,gBAAiB,SAAQ,0BAAW;
|
|
1
|
+
{"version":3,"file":"set-instance.js","sourceRoot":"","sources":["../../../src/commands/xcode/set-instance.ts"],"names":[],"mappings":";;AAAA,sCAAoC;AACpC,qDAAiD;AACjD,6CAAmD;AACnD,yDAAmE;AAEnE,MAAqB,gBAAiB,SAAQ,0BAAW;IAyBvD,KAAK,CAAC,GAAG;QACP,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACrD,IAAI,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QAE3B,MAAM,MAAM,GAAG,IAAA,wCAAyB,EAAC;YACvC,IAAI,EAAE,OAAO;YACb,MAAM,EAAE,KAAK,CAAC,SAAS,CAAC;YACxB,KAAK,EAAE,KAAK,CAAC,KAAK;SACnB,CAAC,CAAC;QACH,IAAA,wBAAe,EAAC,MAAM,CAAC,CAAC;QAExB,IAAI,KAAK,CAAC,IAAI,EAAE,CAAC;YACf,IAAI,CAAC,UAAU,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;YAC7E,OAAO;QACT,CAAC;QACD,IAAI,CAAC,MAAM,CAAC,OAAO,MAAM,CAAC,EAAE,gCAAgC,IAAI,CAAC,WAAW,EAAE,GAAG,CAAC,CAAC;QACnF,IAAI,CAAC,IAAI,CAAC,iEAAiE,CAAC,CAAC;IAC/E,CAAC;;AAzCM,wBAAO,GAAG,wDAAwD,CAAC;AACnE,4BAAW,GAChB,4IAA4I;IAC5I,uEAAuE;IACvE,yJAAyJ,CAAC;AACrJ,yBAAQ,GAAG;IAChB,iHAAiH;IACjH,kGAAkG;CACnG,CAAC;AAEK,sBAAK,GAAG;IACb,GAAG,0BAAW,CAAC,SAAS;IACxB,SAAS,EAAE,YAAK,CAAC,MAAM,CAAC;QACtB,WAAW,EAAE,qFAAqF;QAClG,GAAG,EAAE,wBAAwB;QAC7B,QAAQ,EAAE,IAAI;KACf,CAAC;IACF,KAAK,EAAE,YAAK,CAAC,MAAM,CAAC;QAClB,WAAW,EAAE,oFAAoF;QACjG,GAAG,EAAE,0BAA0B;QAC/B,QAAQ,EAAE,IAAI;KACf,CAAC;CACH,CAAC;kBAvBiB,gBAAgB"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../src/commands/xcode/sync.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAQjD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW;IAChD,MAAM,CAAC,OAAO,SAA6D;IAC3E,MAAM,CAAC,WAAW,
|
|
1
|
+
{"version":3,"file":"sync.d.ts","sourceRoot":"","sources":["../../../src/commands/xcode/sync.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AAQjD,MAAM,CAAC,OAAO,OAAO,SAAU,SAAQ,WAAW;IAChD,MAAM,CAAC,OAAO,SAA6D;IAC3E,MAAM,CAAC,WAAW,SACkS;IAEpT,MAAM,CAAC,QAAQ,WAOb;IAEF,MAAM,CAAC,IAAI;;MAKT;IAEF,MAAM,CAAC,KAAK;;;;;;;;;;;;;;MAiBV;IAEI,GAAG,IAAI,OAAO,CAAC,IAAI,CAAC;CA6D3B"}
|
|
@@ -62,7 +62,7 @@ class XcodeSync extends base_command_1.BaseCommand {
|
|
|
62
62
|
}
|
|
63
63
|
}
|
|
64
64
|
XcodeSync.summary = 'Continuously sync local source code to an Xcode sandbox';
|
|
65
|
-
XcodeSync.description = 'Push local source code and project files (or the current working directory if omitted) to a remote Xcode sandbox with optional watch mode. This command is mostly useful for continuous sync workflows with `--watch`; for most one-shot builds, use `xcode build`, which already syncs the project path first.
|
|
65
|
+
XcodeSync.description = 'Push local source code and project files (or the current working directory if omitted) to a remote Xcode sandbox with optional watch mode. This command is mostly useful for continuous sync workflows with `--watch`; for most one-shot builds, use `xcode build`, which already syncs the project path first.';
|
|
66
66
|
XcodeSync.examples = [
|
|
67
67
|
'<%= config.bin %> xcode sync --watch',
|
|
68
68
|
'<%= config.bin %> xcode sync ./MyProject --id <ios-instance-ID> --no-install',
|
|
@@ -81,7 +81,7 @@ XcodeSync.flags = {
|
|
|
81
81
|
...base_command_1.BaseCommand.baseFlags,
|
|
82
82
|
...sync_flags_1.syncFlags,
|
|
83
83
|
id: core_1.Flags.string({
|
|
84
|
-
description: 'Xcode instance ID to sync to
|
|
84
|
+
description: 'Xcode instance ID to sync to. Defaults to the most recent standalone Xcode target, creating one if needed.',
|
|
85
85
|
}),
|
|
86
86
|
watch: core_1.Flags.boolean({
|
|
87
87
|
description: 'Keep watching the local source tree and push changes automatically',
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/commands/xcode/sync.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"sync.js","sourceRoot":"","sources":["../../../src/commands/xcode/sync.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/config.d.ts
CHANGED
|
@@ -42,7 +42,6 @@ export interface LastIosInstance {
|
|
|
42
42
|
mcpUrl?: IosInstance.Status['mcpUrl'];
|
|
43
43
|
signedStreamUrl?: IosInstance.Status['signedStreamUrl'];
|
|
44
44
|
targetHttpPortUrlPrefix?: IosInstance.Status['targetHttpPortUrlPrefix'];
|
|
45
|
-
sandboxXcodeUrl?: NonNullable<NonNullable<IosInstance.Status['sandbox']>['xcode']>['url'];
|
|
46
45
|
}
|
|
47
46
|
export interface LastXcodeInstance {
|
|
48
47
|
id: string;
|
|
@@ -63,24 +62,22 @@ export interface LastGradleInstance {
|
|
|
63
62
|
token?: GradleInstance.Status['token'];
|
|
64
63
|
}
|
|
65
64
|
export type InstanceInput = AndroidInstance | IosInstance | XcodeInstance | GradleInstance;
|
|
65
|
+
/** Returns the record it persisted, so callers don't rebuild the same shape. */
|
|
66
|
+
export declare function registerCreatedInstance(instanceOrId: InstanceInput): LastAndroidInstance | LastIosInstance | LastXcodeInstance | LastGradleInstance;
|
|
66
67
|
/**
|
|
67
68
|
* Persist a caller-built record as the last-used instance of its type in the
|
|
68
69
|
* current workspace scope. Used by set-instance, where the record comes from
|
|
69
70
|
* user-supplied credentials instead of an API instance object.
|
|
70
71
|
*/
|
|
71
72
|
export declare function setLastInstance(record: LastAndroidInstance | LastIosInstance | LastXcodeInstance | LastGradleInstance): void;
|
|
72
|
-
/** Returns the record it persisted, so callers don't rebuild the same shape. */
|
|
73
|
-
export declare function registerCreatedInstance(instanceOrId: InstanceInput, relatedTypes?: Array<'xcode'>): LastAndroidInstance | LastIosInstance | LastXcodeInstance | LastGradleInstance;
|
|
74
73
|
export declare function loadLastAndroidInstance(): LastAndroidInstance | null;
|
|
75
74
|
export declare function loadLastIosInstance(): LastIosInstance | null;
|
|
76
|
-
export declare function loadLastXcodeInstance():
|
|
75
|
+
export declare function loadLastXcodeInstance(): LastXcodeInstance | null;
|
|
77
76
|
export declare function loadLastGradleInstance(): LastGradleInstance | null;
|
|
78
77
|
/** The Xcode version this workspace prefers (`lim xcode version set`), or null when none. */
|
|
79
78
|
export declare function loadXcodeVersionPreference(): string | null;
|
|
80
79
|
export declare function setXcodeVersionPreference(version: string): void;
|
|
81
80
|
export declare function clearXcodeVersionPreference(): void;
|
|
82
|
-
/** The Xcode sandbox a target's daemon calls reach: the target itself, or the one behind a simulator. */
|
|
83
|
-
export declare function xcodeSandboxIdOf(target: LastXcodeInstance | LastIosInstance): string | undefined;
|
|
84
81
|
export declare function clearLastInstanceId(instanceId: string): void;
|
|
85
82
|
export declare function saveInstanceCache(instanceId: string, data: Partial<LastAndroidInstance> | Partial<LastIosInstance> | Partial<LastXcodeInstance> | Partial<LastGradleInstance>): void;
|
|
86
83
|
export declare function loadAndroidInstanceCache(instanceId: string): LastAndroidInstance | null;
|
package/dist/lib/config.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"AAAA,OAAO,eAAe,CAAC;AAKvB,OAAO,EAAE,KAAK,eAAe,EAAE,MAAM,yCAAyC,CAAC;AAC/E,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,qCAAqC,CAAC;AACvE,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,uCAAuC,CAAC;AAC3E,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,wCAAwC,CAAC;
|
|
1
|
+
{"version":3,"file":"config.d.ts","sourceRoot":"","sources":["../../src/lib/config.ts"],"names":[],"mappings":"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"}
|
package/dist/lib/config.js
CHANGED
|
@@ -7,8 +7,8 @@ exports.CONFIG_KEYS = void 0;
|
|
|
7
7
|
exports.readConfig = readConfig;
|
|
8
8
|
exports.writeConfig = writeConfig;
|
|
9
9
|
exports.clearApiKey = clearApiKey;
|
|
10
|
-
exports.setLastInstance = setLastInstance;
|
|
11
10
|
exports.registerCreatedInstance = registerCreatedInstance;
|
|
11
|
+
exports.setLastInstance = setLastInstance;
|
|
12
12
|
exports.loadLastAndroidInstance = loadLastAndroidInstance;
|
|
13
13
|
exports.loadLastIosInstance = loadLastIosInstance;
|
|
14
14
|
exports.loadLastXcodeInstance = loadLastXcodeInstance;
|
|
@@ -16,7 +16,6 @@ exports.loadLastGradleInstance = loadLastGradleInstance;
|
|
|
16
16
|
exports.loadXcodeVersionPreference = loadXcodeVersionPreference;
|
|
17
17
|
exports.setXcodeVersionPreference = setXcodeVersionPreference;
|
|
18
18
|
exports.clearXcodeVersionPreference = clearXcodeVersionPreference;
|
|
19
|
-
exports.xcodeSandboxIdOf = xcodeSandboxIdOf;
|
|
20
19
|
exports.clearLastInstanceId = clearLastInstanceId;
|
|
21
20
|
exports.saveInstanceCache = saveInstanceCache;
|
|
22
21
|
exports.loadAndroidInstanceCache = loadAndroidInstanceCache;
|
|
@@ -28,7 +27,6 @@ const fs_1 = __importDefault(require("fs"));
|
|
|
28
27
|
const path_1 = __importDefault(require("path"));
|
|
29
28
|
const os_1 = __importDefault(require("os"));
|
|
30
29
|
const js_yaml_1 = __importDefault(require("js-yaml"));
|
|
31
|
-
const xcode_sandbox_1 = require("./xcode-sandbox");
|
|
32
30
|
const scope_1 = require("./scope");
|
|
33
31
|
const CONFIG_DIR = path_1.default.join(os_1.default.homedir(), '.lim');
|
|
34
32
|
const CONFIG_FILE = path_1.default.join(CONFIG_DIR, 'config.yaml');
|
|
@@ -121,9 +119,9 @@ function sanitizeScope(value) {
|
|
|
121
119
|
scope.android = value['android'];
|
|
122
120
|
if (isLastIosInstance(value['ios']))
|
|
123
121
|
scope.ios = value['ios'];
|
|
124
|
-
|
|
122
|
+
// An iOS record here is a paired simulator from an older CLI; its embedded sandbox is no longer driven.
|
|
123
|
+
if (isLastXcodeInstance(value['xcode']))
|
|
125
124
|
scope.xcode = value['xcode'];
|
|
126
|
-
}
|
|
127
125
|
if (isLastGradleInstance(value['gradle']))
|
|
128
126
|
scope.gradle = value['gradle'];
|
|
129
127
|
return scope;
|
|
@@ -431,7 +429,6 @@ function buildLastInstanceRecord(instanceOrId) {
|
|
|
431
429
|
mcpUrl: instanceOrId.status.mcpUrl,
|
|
432
430
|
signedStreamUrl: instanceOrId.status.signedStreamUrl,
|
|
433
431
|
targetHttpPortUrlPrefix: instanceOrId.status.targetHttpPortUrlPrefix,
|
|
434
|
-
sandboxXcodeUrl: instanceOrId.status.sandbox?.xcode?.url,
|
|
435
432
|
};
|
|
436
433
|
}
|
|
437
434
|
if (isXcodeInstance(instanceOrId)) {
|
|
@@ -450,58 +447,12 @@ function buildLastInstanceRecord(instanceOrId) {
|
|
|
450
447
|
type: 'xcode',
|
|
451
448
|
};
|
|
452
449
|
}
|
|
453
|
-
|
|
454
|
-
|
|
455
|
-
if (record.type === 'xcode') {
|
|
456
|
-
return record;
|
|
457
|
-
}
|
|
458
|
-
if (record.type !== 'ios' || !isIosInstance(instanceOrId)) {
|
|
459
|
-
return null;
|
|
460
|
-
}
|
|
461
|
-
const sandboxXcodeUrl = instanceOrId.status.sandbox?.xcode?.url;
|
|
462
|
-
const sandboxXcodeId = sandboxXcodeUrl ? (0, xcode_sandbox_1.xcodeSandboxIdFromUrl)(sandboxXcodeUrl) : undefined;
|
|
463
|
-
if (!sandboxXcodeUrl || !sandboxXcodeId) {
|
|
464
|
-
return record;
|
|
465
|
-
}
|
|
466
|
-
const metadata = {
|
|
467
|
-
id: sandboxXcodeId,
|
|
468
|
-
createdAt: instanceOrId.metadata.createdAt,
|
|
469
|
-
organizationId: instanceOrId.metadata.organizationId,
|
|
470
|
-
};
|
|
471
|
-
if (instanceOrId.metadata.displayName) {
|
|
472
|
-
metadata.displayName = instanceOrId.metadata.displayName;
|
|
473
|
-
}
|
|
474
|
-
const spec = {
|
|
475
|
-
region: instanceOrId.spec.region,
|
|
476
|
-
inactivityTimeout: instanceOrId.spec.inactivityTimeout,
|
|
477
|
-
};
|
|
478
|
-
if (instanceOrId.spec.hardTimeout) {
|
|
479
|
-
spec.hardTimeout = instanceOrId.spec.hardTimeout;
|
|
480
|
-
}
|
|
481
|
-
return {
|
|
482
|
-
id: sandboxXcodeId,
|
|
483
|
-
type: 'xcode',
|
|
484
|
-
metadata,
|
|
485
|
-
spec,
|
|
486
|
-
status: {
|
|
487
|
-
state: instanceOrId.status.state,
|
|
488
|
-
apiUrl: sandboxXcodeUrl,
|
|
489
|
-
token: instanceOrId.status.token,
|
|
490
|
-
},
|
|
491
|
-
apiUrl: sandboxXcodeUrl,
|
|
492
|
-
token: instanceOrId.status.token,
|
|
493
|
-
};
|
|
494
|
-
}
|
|
495
|
-
function saveLastInstance(instanceOrId, slot) {
|
|
450
|
+
/** Returns the record it persisted, so callers don't rebuild the same shape. */
|
|
451
|
+
function registerCreatedInstance(instanceOrId) {
|
|
496
452
|
const record = buildLastInstanceRecord(instanceOrId);
|
|
497
453
|
mutate((file, scopeKey) => {
|
|
498
454
|
const scope = ensureScope(file, scopeKey);
|
|
499
|
-
if (
|
|
500
|
-
const xcodeRecord = buildLastXcodeSlotRecord(instanceOrId);
|
|
501
|
-
if (xcodeRecord)
|
|
502
|
-
scope.xcode = xcodeRecord;
|
|
503
|
-
}
|
|
504
|
-
else if (record.type === 'android') {
|
|
455
|
+
if (record.type === 'android') {
|
|
505
456
|
scope.android = record;
|
|
506
457
|
}
|
|
507
458
|
else if (record.type === 'ios') {
|
|
@@ -540,14 +491,6 @@ function setLastInstance(record) {
|
|
|
540
491
|
scope.lastUsedAt = new Date().toISOString();
|
|
541
492
|
});
|
|
542
493
|
}
|
|
543
|
-
/** Returns the record it persisted, so callers don't rebuild the same shape. */
|
|
544
|
-
function registerCreatedInstance(instanceOrId, relatedTypes = []) {
|
|
545
|
-
const record = saveLastInstance(instanceOrId);
|
|
546
|
-
if (relatedTypes.includes('xcode')) {
|
|
547
|
-
saveLastInstance(instanceOrId, 'xcode');
|
|
548
|
-
}
|
|
549
|
-
return record;
|
|
550
|
-
}
|
|
551
494
|
function loadLastAndroidInstance() {
|
|
552
495
|
return readScope((0, scope_1.getScopeKey)()).android ?? null;
|
|
553
496
|
}
|
|
@@ -581,30 +524,16 @@ function clearXcodeVersionPreference() {
|
|
|
581
524
|
return true;
|
|
582
525
|
});
|
|
583
526
|
}
|
|
584
|
-
function sandboxXcodeIdFromLastIosInstance(instance) {
|
|
585
|
-
const sandboxXcodeUrl = instance?.sandboxXcodeUrl ?? instance?.status?.sandbox?.xcode?.url;
|
|
586
|
-
return sandboxXcodeUrl ? (0, xcode_sandbox_1.xcodeSandboxIdFromUrl)(sandboxXcodeUrl) : undefined;
|
|
587
|
-
}
|
|
588
|
-
/** The Xcode sandbox a target's daemon calls reach: the target itself, or the one behind a simulator. */
|
|
589
|
-
function xcodeSandboxIdOf(target) {
|
|
590
|
-
return target.type === 'ios' ? sandboxXcodeIdFromLastIosInstance(target) : target.id;
|
|
591
|
-
}
|
|
592
527
|
function clearLastInstanceId(instanceId) {
|
|
593
528
|
mutate((file) => {
|
|
594
529
|
let changed = false;
|
|
595
530
|
for (const scope of Object.values(file.scopes)) {
|
|
596
|
-
const iosRecord = scope.ios;
|
|
597
531
|
for (const key of ['ios', 'android', 'xcode', 'gradle']) {
|
|
598
532
|
if (scope[key]?.id === instanceId) {
|
|
599
533
|
delete scope[key];
|
|
600
534
|
changed = true;
|
|
601
535
|
}
|
|
602
536
|
}
|
|
603
|
-
const sandboxXcodeId = iosRecord?.id === instanceId ? sandboxXcodeIdFromLastIosInstance(iosRecord) : undefined;
|
|
604
|
-
if (sandboxXcodeId && scope.xcode?.type === 'xcode' && scope.xcode.id === sandboxXcodeId) {
|
|
605
|
-
delete scope.xcode;
|
|
606
|
-
changed = true;
|
|
607
|
-
}
|
|
608
537
|
}
|
|
609
538
|
return changed;
|
|
610
539
|
});
|
|
@@ -630,10 +559,11 @@ function saveInstanceCache(instanceId, data) {
|
|
|
630
559
|
changed = true;
|
|
631
560
|
}
|
|
632
561
|
if (scope.xcode?.id === instanceId) {
|
|
633
|
-
scope.xcode =
|
|
634
|
-
scope.xcode
|
|
635
|
-
|
|
636
|
-
|
|
562
|
+
scope.xcode = {
|
|
563
|
+
...scope.xcode,
|
|
564
|
+
...data,
|
|
565
|
+
type: 'xcode',
|
|
566
|
+
};
|
|
637
567
|
changed = true;
|
|
638
568
|
}
|
|
639
569
|
if (scope.gradle?.id === instanceId) {
|
|
@@ -659,14 +589,12 @@ function loadIosInstanceCache(instanceId) {
|
|
|
659
589
|
for (const scope of Object.values(readNormalizedFile().scopes)) {
|
|
660
590
|
if (scope.ios?.id === instanceId)
|
|
661
591
|
return scope.ios;
|
|
662
|
-
if (scope.xcode?.type === 'ios' && scope.xcode.id === instanceId)
|
|
663
|
-
return scope.xcode;
|
|
664
592
|
}
|
|
665
593
|
return null;
|
|
666
594
|
}
|
|
667
595
|
function loadXcodeInstanceCache(instanceId) {
|
|
668
596
|
for (const scope of Object.values(readNormalizedFile().scopes)) {
|
|
669
|
-
if (scope.xcode?.
|
|
597
|
+
if (scope.xcode?.id === instanceId)
|
|
670
598
|
return scope.xcode;
|
|
671
599
|
}
|
|
672
600
|
return null;
|