@theia/task 1.34.0-next.7 → 1.34.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. package/lib/browser/task-configuration-model.d.ts.map +1 -1
  2. package/lib/browser/task-configuration-model.js +4 -5
  3. package/lib/browser/task-configuration-model.js.map +1 -1
  4. package/lib/node/task-server.slow-spec.js +18 -33
  5. package/lib/node/task-server.slow-spec.js.map +1 -1
  6. package/package.json +13 -13
  7. package/src/browser/task-configuration-model.ts +4 -5
  8. package/src/node/task-server.slow-spec.ts +18 -36
package/lib/browser/task-configuration-model.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"task-configuration-model.d.ts","sourceRoot":"","sources":["../../src/browser/task-configuration-model.ts"],"names":[],"mappings":"AAgBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACvG,OAAO,EAAE,kBAAkB,EAA+D,MAAM,yBAAyB,CAAC;AAE1H;;;GAGG;AACH,qBAAa,sBAAuB,YAAW,UAAU;IAYjD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,sBAAsB;IAChD,QAAQ,CAAC,WAAW,EAAE,kBAAkB;IAX5C,SAAS,CAAC,IAAI,EAAE,sBAAsB,CAAC,WAAW,CAAC;IAEnD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,gBAAuB;IAC5D,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAiC;IAElE,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAE1B;gBAGqB,KAAK,EAAE,sBAAsB,EACvC,WAAW,EAAE,kBAAkB;IAW5C,IAAI,GAAG,IAAI,GAAG,GAAG,SAAS,CAEzB;IAED,kBAAkB,IAAI,MAAM,GAAG,SAAS;IAIxC,OAAO,IAAI,IAAI;IAGf,IAAI,SAAS,IAAI,KAAK,CAAC,IAAI,CAAC,CAE3B;IAED,IAAI,cAAc,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC,EAAE,CAE9D;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIlD,SAAS,CAAC,mBAAmB,IAAI,sBAAsB,CAAC,WAAW;CAiBtE;AACD,yBAAiB,sBAAsB,CAAC;IACpC,UAAiB,WAAW;QACxB,GAAG,CAAC,EAAE,GAAG,CAAC;QACV,cAAc,EAAE,CAAC,iBAAiB,GAAG,iBAAiB,CAAC,EAAE,CAAC;KAC7D;CACJ"}
1
+ {"version":3,"file":"task-configuration-model.d.ts","sourceRoot":"","sources":["../../src/browser/task-configuration-model.ts"],"names":[],"mappings":"AAgBA,OAAO,GAAG,MAAM,4BAA4B,CAAC;AAC7C,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,UAAU,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AACrF,OAAO,EAAE,iBAAiB,EAAE,iBAAiB,EAAE,sBAAsB,EAAE,MAAM,yBAAyB,CAAC;AACvG,OAAO,EAAE,kBAAkB,EAA+D,MAAM,yBAAyB,CAAC;AAG1H;;;GAGG;AACH,qBAAa,sBAAuB,YAAW,UAAU;IAYjD,SAAS,CAAC,QAAQ,CAAC,KAAK,EAAE,sBAAsB;IAChD,QAAQ,CAAC,WAAW,EAAE,kBAAkB;IAX5C,SAAS,CAAC,IAAI,EAAE,sBAAsB,CAAC,WAAW,CAAC;IAEnD,SAAS,CAAC,QAAQ,CAAC,kBAAkB,gBAAuB;IAC5D,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC,IAAI,CAAC,CAAiC;IAElE,SAAS,CAAC,QAAQ,CAAC,SAAS,uBAE1B;gBAGqB,KAAK,EAAE,sBAAsB,EACvC,WAAW,EAAE,kBAAkB;IAW5C,IAAI,GAAG,IAAI,GAAG,GAAG,SAAS,CAEzB;IAED,kBAAkB,IAAI,MAAM,GAAG,SAAS;IAIxC,OAAO,IAAI,IAAI;IAGf,IAAI,SAAS,IAAI,KAAK,CAAC,IAAI,CAAC,CAE3B;IAED,IAAI,cAAc,IAAI,CAAC,iBAAiB,GAAG,iBAAiB,CAAC,EAAE,CAE9D;IAED,SAAS,CAAC,SAAS,IAAI,IAAI;IAK3B,iBAAiB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IAIlD,SAAS,CAAC,mBAAmB,IAAI,sBAAsB,CAAC,WAAW;CAetE;AACD,yBAAiB,sBAAsB,CAAC;IACpC,UAAiB,WAAW;QACxB,GAAG,CAAC,EAAE,GAAG,CAAC;QACV,cAAc,EAAE,CAAC,iBAAiB,GAAG,iBAAiB,CAAC,EAAE,CAAC;KAC7D;CACJ"}
package/lib/browser/task-configuration-model.js CHANGED
@@ -19,6 +19,7 @@ exports.TaskConfigurationModel = void 0;
19
19
  const event_1 = require("@theia/core/lib/common/event");
20
20
  const disposable_1 = require("@theia/core/lib/common/disposable");
21
21
  const browser_1 = require("@theia/core/lib/browser");
22
+ const common_1 = require("@theia/core/lib/common");
22
23
  /**
23
24
  * Holds the task configurations associated with a particular file. Uses an editor model to facilitate
24
25
  * non-destructive editing and coordination with editing the file by hand.
@@ -64,11 +65,9 @@ class TaskConfigurationModel {
64
65
  const configurations = [];
65
66
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
66
67
  const { configUri, value } = this.preferences.resolve('tasks', this.getWorkspaceFolder());
67
- if (value && typeof value === 'object' && 'tasks' in value) {
68
- if (Array.isArray(value.tasks)) {
69
- for (const taskConfig of value.tasks) {
70
- configurations.push(taskConfig);
71
- }
68
+ if ((0, common_1.isObject)(value) && Array.isArray(value.tasks)) {
69
+ for (const taskConfig of value.tasks) {
70
+ configurations.push(taskConfig);
72
71
  }
73
72
  }
74
73
  return {
package/lib/browser/task-configuration-model.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"task-configuration-model.js","sourceRoot":"","sources":["../../src/browser/task-configuration-model.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAGhF,wDAA8D;AAC9D,kEAAqF;AAErF,qDAA0H;AAE1H;;;GAGG;AACH,MAAa,sBAAsB;IAW/B,YACuB,KAA6B,EACvC,WAA+B;QADrB,UAAK,GAAL,KAAK,CAAwB;QACvC,gBAAW,GAAX,WAAW,CAAoB;QATzB,uBAAkB,GAAG,IAAI,eAAO,EAAQ,CAAC;QACnD,gBAAW,GAAgB,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;QAE/C,cAAS,GAAG,IAAI,iCAAoB,CACnD,IAAI,CAAC,kBAAkB,CAC1B,CAAC;QAME,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAC,CAAgC,EAAE,EAAE;YAC9F,MAAM,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;YAC1B,IAAI,MAAM,IAAI,sCAA4B,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC,EAAE;gBACnF,IAAI,CAAC,SAAS,EAAE,CAAC;aACpB;QACL,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAED,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IACzB,CAAC;IAED,kBAAkB;QACd,OAAO,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IACnE,CAAC;IAED,OAAO;QACH,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IACD,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;IACpC,CAAC;IAED,IAAI,cAAc;QACd,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;IACpC,CAAC;IAES,SAAS;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACvC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IAED,iBAAiB,CAAC,KAAa;QAC3B,OAAO,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAC3F,CAAC;IAES,mBAAmB;QACzB,MAAM,cAAc,GAA8C,EAAE,CAAC;QACrE,8DAA8D;QAC9D,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAM,OAAO,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAC/F,IAAI,KAAK,IAAI,OAAO,KAAK,KAAK,QAAQ,IAAI,OAAO,IAAI,KAAK,EAAE;YACxD,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;gBAC5B,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,KAAK,EAAE;oBAClC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;iBACnC;aACJ;SACJ;QACD,OAAO;YACH,GAAG,EAAE,SAAS;YACd,cAAc;SACjB,CAAC;IACN,CAAC;CAEJ;AArED,wDAqEC"}
1
+ {"version":3,"file":"task-configuration-model.js","sourceRoot":"","sources":["../../src/browser/task-configuration-model.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,0CAA0C;AAC1C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;;AAGhF,wDAA8D;AAC9D,kEAAqF;AAErF,qDAA0H;AAC1H,mDAAkD;AAElD;;;GAGG;AACH,MAAa,sBAAsB;IAW/B,YACuB,KAA6B,EACvC,WAA+B;QADrB,UAAK,GAAL,KAAK,CAAwB;QACvC,gBAAW,GAAX,WAAW,CAAoB;QATzB,uBAAkB,GAAG,IAAI,eAAO,EAAQ,CAAC;QACnD,gBAAW,GAAgB,IAAI,CAAC,kBAAkB,CAAC,KAAK,CAAC;QAE/C,cAAS,GAAG,IAAI,iCAAoB,CACnD,IAAI,CAAC,kBAAkB,CAC1B,CAAC;QAME,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,WAAW,CAAC,uBAAuB,CAAC,CAAC,CAAgC,EAAE,EAAE;YAC9F,MAAM,MAAM,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC;YAC1B,IAAI,MAAM,IAAI,sCAA4B,CAAC,OAAO,CAAC,MAAM,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC,EAAE;gBACnF,IAAI,CAAC,SAAS,EAAE,CAAC;aACpB;QACL,CAAC,CAAC,CAAC,CAAC;IACR,CAAC;IAED,IAAI,GAAG;QACH,OAAO,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;IACzB,CAAC;IAED,kBAAkB;QACd,OAAO,OAAO,IAAI,CAAC,KAAK,KAAK,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IACnE,CAAC;IAED,OAAO;QACH,IAAI,CAAC,SAAS,CAAC,OAAO,EAAE,CAAC;IAC7B,CAAC;IACD,IAAI,SAAS;QACT,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;IACpC,CAAC;IAED,IAAI,cAAc;QACd,OAAO,IAAI,CAAC,IAAI,CAAC,cAAc,CAAC;IACpC,CAAC;IAES,SAAS;QACf,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;QACvC,IAAI,CAAC,kBAAkB,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;IAC5C,CAAC;IAED,iBAAiB,CAAC,KAAa;QAC3B,OAAO,IAAI,CAAC,WAAW,CAAC,aAAa,CAAC,aAAa,EAAE,KAAK,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;IAC3F,CAAC;IAES,mBAAmB;QACzB,MAAM,cAAc,GAA8C,EAAE,CAAC;QACrE,8DAA8D;QAC9D,MAAM,EAAE,SAAS,EAAE,KAAK,EAAE,GAAG,IAAI,CAAC,WAAW,CAAC,OAAO,CAAM,OAAO,EAAE,IAAI,CAAC,kBAAkB,EAAE,CAAC,CAAC;QAC/F,IAAI,IAAA,iBAAQ,EAAC,KAAK,CAAC,IAAI,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YAC/C,KAAK,MAAM,UAAU,IAAI,KAAK,CAAC,KAAK,EAAE;gBAClC,cAAc,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;aACnC;SACJ;QACD,OAAO;YACH,GAAG,EAAE,SAAS;YACd,cAAc;SACjB,CAAC;IACN,CAAC;CAEJ;AAnED,wDAmEC"}
package/lib/node/task-server.slow-spec.js CHANGED
@@ -26,7 +26,7 @@ const terminal_protocol_1 = require("@theia/terminal/lib/common/terminal-protoco
26
26
  const expect_1 = require("@theia/core/lib/common/test/expect");
27
27
  const test_web_socket_channel_1 = require("@theia/core/lib/node/messaging/test/test-web-socket-channel");
28
28
  const chai_1 = require("chai");
29
- const core_1 = require("@theia/core");
29
+ const buffering_stream_1 = require("@theia/terminal/lib/node/buffering-stream");
30
30
  // test scripts that we bundle with tasks
31
31
  const commandShortRunning = './task';
32
32
  const commandShortRunningOsx = './task-osx';
@@ -74,48 +74,33 @@ describe('Task server / back-end', function () {
74
74
  });
75
75
  it('task running in terminal - expected data is received from the terminal ws server', async function () {
76
76
  const someString = 'someSingleWordString';
77
- // This test is flaky on Windows and fails intermittently. Disable it for now
78
- if (os_1.isWindows) {
79
- this.skip();
80
- return;
81
- }
82
77
  // create task using terminal process
83
78
  const command = os_1.isWindows ? commandShortRunningWindows : (os_1.isOSX ? commandShortRunningOsx : commandShortRunning);
84
79
  const taskInfo = await taskServer.run(createProcessTaskConfig('shell', `${command} ${someString}`), wsRoot);
85
80
  const terminalId = taskInfo.terminalId;
86
81
  const messagesToWaitFor = 10;
87
82
  const messages = [];
83
+ // check output of task on terminal is what we expect
84
+ const expected = `${os_1.isOSX ? 'tasking osx' : 'tasking'}... ${someString}`;
88
85
  // hook-up to terminal's ws and confirm that it outputs expected tasks' output
89
86
  await new Promise((resolve, reject) => {
90
87
  const setup = new test_web_socket_channel_1.TestWebSocketChannelSetup({ server, path: `${terminal_protocol_1.terminalsPath}/${terminalId}` });
88
+ const stringBuffer = new buffering_stream_1.StringBufferingStream();
91
89
  setup.multiplexer.onDidOpenChannel(event => {
92
- const channel = event.channel;
93
- const connection = new core_1.RpcProtocol(channel, async (method, args) => {
94
- const error = new Error(`Received unexpected request: ${method} with args: ${args} `);
95
- reject(error);
96
- throw error;
97
- });
98
- channel.onError(reject);
99
- channel.onClose(() => reject(new Error('Channel has been closed')));
100
- connection.onNotification(not => {
101
- // check output of task on terminal is what we expect
102
- const expected = `${os_1.isOSX ? 'tasking osx' : 'tasking'}... ${someString}`;
103
- // Instead of waiting for one message from the terminal, we wait for several ones as the very first message can be something unexpected.
104
- // For instance: `nvm is not compatible with the \"PREFIX\" environment variable: currently set to \"/usr/local\"\r\n`
105
- const currentMessage = not.args[0];
106
- messages.unshift(currentMessage);
107
- if (currentMessage.indexOf(expected) !== -1) {
108
- resolve();
109
- channel.close();
110
- return;
111
- }
112
- if (messages.length >= messagesToWaitFor) {
113
- reject(new Error(`expected sub-string not found in terminal output. Expected: "${expected}" vs Actual messages: ${JSON.stringify(messages)}`));
114
- channel.close();
115
- }
116
- });
117
- channel.onMessage(reader => {
118
- });
90
+ event.channel.onMessage(e => stringBuffer.push(e().readString()));
91
+ event.channel.onError(reject);
92
+ event.channel.onClose(() => reject(new Error('Channel has been closed')));
93
+ });
94
+ stringBuffer.onData(currentMessage => {
95
+ // Instead of waiting for one message from the terminal, we wait for several ones as the very first message can be something unexpected.
96
+ // For instance: `nvm is not compatible with the \"PREFIX\" environment variable: currently set to \"/usr/local\"\r\n`
97
+ messages.unshift(currentMessage);
98
+ if (currentMessage.includes(expected)) {
99
+ resolve();
100
+ }
101
+ else if (messages.length >= messagesToWaitFor) {
102
+ reject(new Error(`expected sub-string not found in terminal output. Expected: "${expected}" vs Actual messages: ${JSON.stringify(messages)}`));
103
+ }
119
104
  });
120
105
  });
121
106
  });
package/lib/node/task-server.slow-spec.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"task-server.slow-spec.js","sourceRoot":"","sources":["../../src/node/task-server.slow-spec.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,+CAA+C;AAC/C,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,2EAA2E;AAC3E,gFAAgF;;AAEhF,oDAAoD;AACpD,4BAA0B;AAC1B,oEAAqE;AACrE,kFAA8E;AAC9E,sCAAkG;AAIlG,kDAA6D;AAC7D,+CAA+C;AAC/C,oFAA6E;AAC7E,+DAAuE;AACvE,yGAAwG;AACxG,+BAA8B;AAE9B,sCAA0C;AAE1C,yCAAyC;AACzC,MAAM,mBAAmB,GAAG,QAAQ,CAAC;AACrC,MAAM,sBAAsB,GAAG,YAAY,CAAC;AAC5C,MAAM,0BAA0B,GAAG,aAAa,CAAC;AAEjD,MAAM,kBAAkB,GAAG,qBAAqB,CAAC;AACjD,MAAM,qBAAqB,GAAG,yBAAyB,CAAC;AACxD,MAAM,yBAAyB,GAAG,0BAA0B,CAAC;AAE7D,MAAM,YAAY,GAAG,wBAAwB,CAAC;AAE9C,MAAM,eAAe,GAAG,MAAM,CAAC;AAC/B,MAAM,kBAAkB,GAAG,cAAc,CAAC;AAE1C,yCAAyC;AACzC,MAAM,OAAO,GAAG,uBAAuB,CAAC;AACxC,4CAA4C;AAC5C,MAAM,OAAO,GAAG,uBAAuB,CAAC;AACxC,0CAA0C;AAC1C,MAAM,OAAO,GAAG,uBAAuB,CAAC;AAExC,6EAA6E;AAC7E,qCAAqC;AACrC,MAAM,SAAS,GAAQ,cAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,sBAAsB,CAAC,CAAC;AACjF,MAAM,MAAM,GAAW,cAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;AAEjD,QAAQ,CAAC,wBAAwB,EAAE;IAC/B,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAEpB,IAAI,OAA2B,CAAC;IAChC,IAAI,MAAkC,CAAC;IACvC,IAAI,UAAsB,CAAC;IAC3B,IAAI,WAAwB,CAAC;IAE7B,UAAU,CAAC,KAAK,IAAI,EAAE;QAClB,OAAO,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QAC5C,MAAM,aAAa,GAAG,IAAA,6CAAuB,GAAE,CAAC;QAChD,WAAW,GAAG,aAAa,CAAC,GAAG,CAAC,oBAAW,CAAC,CAAC;QAC7C,UAAU,GAAG,aAAa,CAAC,GAAG,CAAC,mBAAU,CAAC,CAAC;QAC3C,UAAU,CAAC,SAAS,CAAC,WAAW,CAAC,aAAa,EAAE,CAAC,CAAC;QAClD,OAAO,GAAG,aAAa,CAAC,GAAG,CAAC,wCAAkB,CAAC,CAAC;QAChD,MAAM,GAAG,MAAM,OAAO,CAAC,KAAK,EAAE,CAAC;IACnC,CAAC,CAAC,CAAC;IAEH,SAAS,CAAC,KAAK,IAAI,EAAE;QACjB,MAAM,QAAQ,GAAG,OAAO,CAAC;QACzB,MAAM,OAAO,GAAG,MAAM,CAAC;QACvB,OAAO,GAAG,SAAU,CAAC;QACrB,UAAU,GAAG,SAAU,CAAC;QACxB,WAAW,GAAG,SAAU,CAAC;QACzB,MAAM,GAAG,SAAU,CAAC;QACpB,QAAQ,CAAC,QAAQ,CAAC,EAAE,CAAC;QACrB,OAAO,CAAC,KAAK,EAAE,CAAC;IACpB,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,kFAAkF,EAAE,KAAK;QACxF,MAAM,UAAU,GAAG,sBAAsB,CAAC;QAE1C,6EAA6E;QAC7E,IAAI,cAAS,EAAE;YACX,IAAI,CAAC,IAAI,EAAE,CAAC;YACZ,OAAO;SACV;QAED,qCAAqC;QACrC,MAAM,OAAO,GAAG,cAAS,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,UAAK,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;QAChH,MAAM,QAAQ,GAAa,MAAM,UAAU,CAAC,GAAG,CAAC,uBAAuB,CAAC,OAAO,EAAE,GAAG,OAAO,IAAI,UAAU,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QACtH,MAAM,UAAU,GAAG,QAAQ,CAAC,UAAU,CAAC;QAEvC,MAAM,iBAAiB,GAAG,EAAE,CAAC;QAC7B,MAAM,QAAQ,GAAa,EAAE,CAAC;QAE9B,8EAA8E;QAC9E,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACxC,MAAM,KAAK,GAAG,IAAI,mDAAyB,CAAC,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,iCAAa,IAAI,UAAU,EAAE,EAAE,CAAC,CAAC;YAChG,KAAK,CAAC,WAAW,CAAC,gBAAgB,CAAC,KAAK,CAAC,EAAE;gBACvC,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;gBAC9B,MAAM,UAAU,GAAG,IAAI,kBAAW,CAAC,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,IAAI,EAAE,EAAE;oBAC/D,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,gCAAgC,MAAM,eAAe,IAAI,GAAG,CAAC,CAAC;oBACtF,MAAM,CAAC,KAAK,CAAC,CAAC;oBACd,MAAM,KAAK,CAAC;gBAChB,CAAC,CAAC,CAAC;gBACH,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;gBACxB,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC,CAAC,CAAC;gBACpE,UAAU,CAAC,cAAc,CAAC,GAAG,CAAC,EAAE;oBAC5B,qDAAqD;oBACrD,MAAM,QAAQ,GAAG,GAAG,UAAK,CAAC,CAAC,CAAC,aAAa,CAAC,CAAC,CAAC,SAAS,OAAO,UAAU,EAAE,CAAC;oBACzE,wIAAwI;oBACxI,sHAAsH;oBACtH,MAAM,cAAc,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;oBACnC,QAAQ,CAAC,OAAO,CAAC,cAAc,CAAC,CAAC;oBACjC,IAAI,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,EAAE;wBACzC,OAAO,EAAE,CAAC;wBACV,OAAO,CAAC,KAAK,EAAE,CAAC;wBAChB,OAAO;qBACV;oBACD,IAAI,QAAQ,CAAC,MAAM,IAAI,iBAAiB,EAAE;wBACtC,MAAM,CAAC,IAAI,KAAK,CAAC,gEAAgE,QAAQ,yBAAyB,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,CAAC;wBAC/I,OAAO,CAAC,KAAK,EAAE,CAAC;qBACnB;gBACL,CAAC,CAAC,CAAC;gBACH,OAAO,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE;gBAE3B,CAAC,CAAC,CAAC;YACP,CAAC,CAAC,CAAC;QAEP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uFAAuF,EAAE,KAAK;QAC7F,MAAM,UAAU,GAAG,sBAAsB,CAAC;QAC1C,MAAM,OAAO,GAAG,cAAS,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,UAAK,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;QAChH,MAAM,UAAU,GAAG,cAAO,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAE9D,gCAAgC;QAChC,MAAM,QAAQ,GAAa,MAAM,UAAU,CAAC,GAAG,CAAC,uBAAuB,CAAC,SAAS,EAAE,UAAU,EAAE,CAAC,UAAU,CAAC,CAAC,EAAE,MAAM,CAAC,CAAC;QAEtH,MAAM,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACxC,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC,KAAsB,EAAE,EAAE;gBAChE,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE;oBACtD,IAAI,OAAO,QAAQ,CAAC,UAAU,KAAK,QAAQ,EAAE;wBACzC,OAAO,EAAE,CAAC;qBACb;yBAAM;wBACH,MAAM,CAAC,IAAI,KAAK,CAAC,iDAAiD,OAAO,QAAQ,CAAC,UAAU,EAAE,CAAC,CAAC,CAAC;qBACpG;oBACD,SAAS,CAAC,OAAO,EAAE,CAAC;iBACvB;YACL,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK;QAC5D,MAAM,OAAO,GAAG,cAAS,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,UAAK,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;QAChH,MAAM,MAAM,GAAG,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,cAAO,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;QACvG,MAAM,QAAQ,GAAa,MAAM,UAAU,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;QAChE,MAAM,0BAA0B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,sDAAsD,EAAE,KAAK;QAC5D,MAAM,OAAO,GAAG,cAAS,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,UAAK,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;QAChH,MAAM,QAAQ,GAAa,MAAM,UAAU,CAAC,GAAG,CAAC,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;QAC9G,MAAM,0BAA0B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iDAAiD,EAAE,KAAK;QACvD,MAAM,OAAO,GAAG,cAAS,CAAC,CAAC,CAAC,0BAA0B,CAAC,CAAC,CAAC,CAAC,UAAK,CAAC,CAAC,CAAC,sBAAsB,CAAC,CAAC,CAAC,mBAAmB,CAAC,CAAC;QAChH,MAAM,UAAU,GAAG,cAAO,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;QAC9D,MAAM,QAAQ,GAAa,MAAM,UAAU,CAAC,GAAG,CAAC,uBAAuB,CAAC,SAAS,EAAE,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;QACpG,MAAM,0BAA0B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4EAA4E,EAAE,KAAK;QAClF,MAAM,OAAO,GAAG,cAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,eAAe,CAAC;QAEjE,uDAAuD;QACvD,MAAM,UAAU,GAAsB,gBAAgB,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;QAC3E,MAAM,QAAQ,GAAa,MAAM,UAAU,CAAC,GAAG,CAAC,UAAU,EAAE,MAAM,CAAC,CAAC;QACpE,MAAM,0BAA0B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,qFAAqF,EAAE,KAAK;QAC3F,MAAM,OAAO,GAAG,cAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,eAAe,CAAC;QACjE,MAAM,IAAI,GAAsB,uBAAuB,CAAC,OAAO,EAAE,OAAO,EAAE,EAAE,CAAC,CAAC;QAC9E,MAAM,QAAQ,GAAa,MAAM,UAAU,CAAC,GAAG,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;QAC9D,MAAM,0BAA0B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,gFAAgF,EAAE,KAAK;QACtF,MAAM,OAAO,GAAG,cAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,CAAC,CAAC,eAAe,CAAC;QACjE,MAAM,QAAQ,GAAa,MAAM,UAAU,CAAC,GAAG,CAAC,uBAAuB,CAAC,SAAS,EAAE,OAAO,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QACzG,MAAM,0BAA0B,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;IAC5D,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,uCAAuC,EAAE,KAAK;QAC7C,MAAM,QAAQ,GAAa,MAAM,UAAU,CAAC,GAAG,CAAC,+BAA+B,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC,CAAC;QAElG,MAAM,iBAAiB,GAAG,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC/D,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACjC,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC;QAE3C,mEAAmE;QACnE,mEAAmE;QACnE,iEAAiE;QACjE,qDAAqD;QACrD,IAAI,cAAS,EAAE;YACX,uDAAuD;YACvD,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;SAChC;aAAM;YACH,qEAAqE;YACrE,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;SACvC;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yCAAyC,EAAE,KAAK;QAC/C,MAAM,QAAQ,GAAa,MAAM,UAAU,CAAC,GAAG,CAAC,+BAA+B,CAAC,SAAS,CAAC,EAAE,MAAM,CAAC,CAAC;QAEpG,MAAM,iBAAiB,GAAG,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC/D,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;QACjC,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC;QAE3C,mEAAmE;QACnE,mEAAmE;QACnE,iEAAiE;QACjE,qDAAqD;QACrD,IAAI,cAAS,EAAE;YACX,uDAAuD;YACvD,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;SAChC;aAAM;YACH,qEAAqE;YACrE,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;SACvC;IACL,CAAC,CAAC,CAAC;IAEH;;OAEG;IACH,EAAE,CAAC,oEAAoE,EAAE,KAAK;QAC1E,MAAM,QAAQ,GAAa,MAAM,UAAU,CAAC,GAAG,CAAC,wBAAwB,CAAC,OAAO,EAAE,YAAY,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QAC7G,MAAM,IAAI,GAAG,MAAM,IAAI,OAAO,CAAS,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;YACvD,WAAW,CAAC,UAAU,CAAC,CAAC,KAAsB,EAAE,EAAE;gBAC9C,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;oBAC9D,MAAM,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;iBAC5C;qBAAM;oBACH,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;iBACvB;YACL,CAAC,CAAC,CAAC;QACP,CAAC,CAAC,CAAC;QACH,mEAAmE;QACnE,mEAAmE;QACnE,iEAAiE;QACjE,qDAAqD;QACrD,IAAI,cAAS,EAAE;YACX,IAAA,aAAM,EAAC,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;SAC1B;aAAM;YACH,IAAA,aAAM,EAAC,IAAI,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC;SAC5B;IACL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,+DAA+D,EAAE,KAAK;QACrE,MAAM,CAAC,GAAG,UAAU,CAAC,GAAG,CAAC,wBAAwB,CAAC,SAAS,EAAE,YAAY,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,CAAC;QACxF,MAAM,IAAA,0BAAiB,EAAC,CAAC,EAAE,QAAQ,CAAC,CAAC;IACzC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK;QAChE,MAAM,QAAQ,GAAG,UAAU,CAAC;QAC5B,MAAM,QAAQ,GAAG,gBAAgB,CAAC;QAElC,oDAAoD;QACpD,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,+BAA+B,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAC;QACvF,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,+BAA+B,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC;QACzF,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,+BAA+B,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAC;QACvF,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,+BAA+B,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC;QACzF,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,+BAA+B,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,CAAC;QACvF,MAAM,KAAK,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,+BAA+B,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,CAAC;QAEzF,MAAM,gBAAgB,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,wBAAwB;QACtF,MAAM,gBAAgB,GAAG,MAAM,UAAU,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,wBAAwB;QACtF,MAAM,eAAe,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,CAAC,CAAC,wBAAwB;QAE7E,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;YAC/B,MAAM,IAAI,KAAK,CAAC,iFAAiF,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC;SAC/H;QAAC,IAAI,gBAAgB,CAAC,MAAM,KAAK,CAAC,EAAE;YACjC,MAAM,IAAI,KAAK,CAAC,iFAAiF,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC;SAC/H;QAAC,IAAI,eAAe,CAAC,MAAM,KAAK,CAAC,EAAE;YAChC,MAAM,IAAI,KAAK,CAAC,2FAA2F,gBAAgB,CAAC,MAAM,EAAE,CAAC,CAAC;SACzI;QAED,UAAU;QACV,MAAM,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACpC,MAAM,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACpC,MAAM,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACpC,MAAM,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACpC,MAAM,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;QACpC,MAAM,UAAU,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;IACxC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yDAAyD,EAAE,KAAK;QAC/D,+GAA+G;QAC/G,MAAM,QAAQ,GAAG,EAAE,CAAC;QACpB,MAAM,QAAQ,GAAe,EAAE,CAAC;QAEhC,6CAA6C;QAC7C,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,EAAE,CAAC,EAAE,EAAE;YAC/B,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE;gBACb,QAAQ,CAAC,IAAI,CAAC,MAAM,UAAU,CAAC,GAAG,CAAC,+BAA+B,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;aACjF;iBAAM;gBACH,QAAQ,CAAC,IAAI,CAAC,MAAM,UAAU,CAAC,GAAG,CAAC,+BAA+B,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;aACnF;SACJ;QAED,MAAM,2BAA2B,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,CAAC;QAEhE,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACtC,MAAM,UAAU,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;SAC7C;QACD,MAAM,0BAA0B,GAAG,MAAM,UAAU,CAAC,QAAQ,EAAE,CAAC;QAE/D,IAAI,2BAA2B,CAAC,MAAM,KAAK,QAAQ,EAAE;YACjD,MAAM,IAAI,KAAK,CAAC,wDAAwD,QAAQ,aAAa,2BAA2B,CAAC,MAAM,EAAE,CAAC,CAAC;SACtI;QAAC,IAAI,0BAA0B,CAAC,MAAM,KAAK,CAAC,EAAE;YAC3C,MAAM,IAAI,KAAK,CAAC,0EAA0E,0BAA0B,CAAC,MAAM,EAAE,CAAC,CAAC;SAClI;IAEL,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,iFAAiF,EAAE,KAAK;QACvF,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,wBAAwB,CAAC,OAAO,EAAE,QAAQ,OAAO,sBAAsB,CAAC,CAAC,CAAC;QAChH,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC9D,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0EAA0E,EAAE,KAAK;QAChF,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,wBAAwB,CAAC,OAAO,EAAE,QAAQ,OAAO,sBAAsB,EAAE,EAAE,CAAC,CAAC,CAAC;QACpH,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC9D,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,0DAA0D,EAAE,KAAK;QAChE,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC;QAC5H,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC9D,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,wEAAwE,EAAE,KAAK;QAC9E,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,OAAO,EAAE,cAAc,EAAE,GAAG,EAAE,GAAG,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC;QAC9H,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC9D,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,4DAA4D,EAAE,KAAK;QAClE,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;QAC7H,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC9D,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACjC,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,yFAAyF,EAAE,KAAK;QAC/F,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,QAAQ,EAAE,CAAC,CAAC,CAAC,CAAC;QAC3J,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC9D,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;IAEH,EAAE,CAAC,8FAA8F,EAAE,KAAK;QACpG,MAAM,QAAQ,GAAG,MAAM,UAAU,CAAC,GAAG,CAAC,wBAAwB,CAAC,OAAO,EAAE,MAAM,EAAE,CAAC,IAAI,EAAE,kCAAkC,CAAC,CAAC,CAAC,CAAC;QAC7H,MAAM,UAAU,GAAG,MAAM,aAAa,CAAC,QAAQ,EAAE,WAAW,CAAC,CAAC;QAC9D,IAAA,aAAM,EAAC,UAAU,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IAC7B,CAAC,CAAC,CAAC;AAEP,CAAC,CAAC,CAAC;AAEH,SAAS,gBAAgB,CAAC,QAAgB,EAAE,OAAe,EAAE,IAAc;IACvE,MAAM,OAAO,GAAsB;QAC/B,KAAK,EAAE,WAAW;QAClB,IAAI,EAAE,QAAQ;QACd,OAAO,EAAE,gBAAgB;QACzB,MAAM,EAAE,gBAAgB;QACxB,OAAO;QACP,IAAI;QACJ,OAAO,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE;KAC3B,CAAC;IACF,OAAO,OAAO,CAAC;AACnB,CAAC;AAED,SAAS,uBAAuB,CAAC,WAAwB,EAAE,OAAe,EAAE,IAAe,EAAE,MAAc,MAAM;IAC7G,OAAiC;QAC7B,KAAK,EAAE,WAAW;QAClB,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,gBAAgB;QACzB,MAAM,EAAE,gBAAgB;QACxB,OAAO;QACP,IAAI;QACJ,OAAO,EAAE,EAAE,GAAG,EAAE;KACnB,CAAC;AACN,CAAC;AAED,8DAA8D;AAC9D,SAAS,wBAAwB,CAAC,WAAwB,EAAE,OAAe,EAAE,IAAY;IACrF,OAAiC;QAC7B,KAAK,EAAE,WAAW;QAClB,IAAI,EAAE,WAAW;QACjB,OAAO;QACP,IAAI;QACJ,OAAO,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE;KAC3B,CAAC;AACN,CAAC;AAED,SAAS,+BAA+B,CAAC,WAAwB;IAC7D,OAAiC;QAC7B,KAAK,EAAE,uCAAuC;QAC9C,IAAI,EAAE,WAAW;QACjB,OAAO,EAAE,gBAAgB;QACzB,MAAM,EAAE,gBAAgB;QACxB,OAAO,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE;QACxB,OAAO,EAAE,kBAAkB;QAC3B,OAAO,EAAE;YACL,OAAO,EAAE,cAAO,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,yBAAyB,CAAC,CAAC;YACrE,OAAO,EAAE,EAAE,GAAG,EAAE,MAAM,EAAE;SAC3B;QACD,GAAG,EAAE;YACD,OAAO,EAAE,cAAO,CAAC,MAAM,CAAC,SAAS,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;SACpE;KACJ,CAAC;AACN,CAAC;AAED,SAAS,0BAA0B,CAAC,QAAkB,EAAE,WAAwB;IAC5E,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACzC,MAAM,SAAS,GAAG,WAAW,CAAC,UAAU,CAAC,CAAC,KAAsB,EAAE,EAAE;YAChE,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,IAAI,KAAK,CAAC,IAAI,KAAK,CAAC,EAAE;gBACtD,SAAS,CAAC,OAAO,EAAE,CAAC;gBACpB,OAAO,EAAE,CAAC;aACb;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC;AAED,SAAS,aAAa,CAAC,QAAkB,EAAE,WAAwB;IAC/D,OAAO,IAAI,OAAO,CAAkB,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;QACpD,WAAW,CAAC,UAAU,CAAC,CAAC,KAAsB,EAAE,EAAE;YAC9C,IAAI,KAAK,CAAC,MAAM,KAAK,QAAQ,CAAC,MAAM,EAAE;gBAClC,IAAI,OAAO,KAAK,CAAC,MAAM,KAAK,QAAQ,EAAE;oBAClC,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;iBACzB;qBAAM,IAAI,OAAO,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE;oBACvC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;iBACvB;qBAAM;oBACH,MAAM,CAAC,IAAI,KAAK,CAAC,oBAAoB,CAAC,CAAC,CAAC;iBAC3C;aACJ;QACL,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;AACP,CAAC"}
1
+ {"version":3,"file":"task-server.slow-spec.js","sourceRoot":"","sources":["../../src/node/task-server.slow-spec.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,19 +1,19 @@
1
1
  {
2
2
  "name": "@theia/task",
3
- "version": "1.34.0-next.7+a73305748",
3
+ "version": "1.34.1",
4
4
  "description": "Theia - Task extension. This extension adds support for executing raw or terminal processes in the backend.",
5
5
  "dependencies": {
6
- "@theia/core": "1.34.0-next.7+a73305748",
7
- "@theia/editor": "1.34.0-next.7+a73305748",
8
- "@theia/filesystem": "1.34.0-next.7+a73305748",
9
- "@theia/markers": "1.34.0-next.7+a73305748",
10
- "@theia/monaco": "1.34.0-next.7+a73305748",
6
+ "@theia/core": "1.34.1",
7
+ "@theia/editor": "1.34.1",
8
+ "@theia/filesystem": "1.34.1",
9
+ "@theia/markers": "1.34.1",
10
+ "@theia/monaco": "1.34.1",
11
11
  "@theia/monaco-editor-core": "1.72.3",
12
- "@theia/process": "1.34.0-next.7+a73305748",
13
- "@theia/terminal": "1.34.0-next.7+a73305748",
14
- "@theia/userstorage": "1.34.0-next.7+a73305748",
15
- "@theia/variable-resolver": "1.34.0-next.7+a73305748",
16
- "@theia/workspace": "1.34.0-next.7+a73305748",
12
+ "@theia/process": "1.34.1",
13
+ "@theia/terminal": "1.34.1",
14
+ "@theia/userstorage": "1.34.1",
15
+ "@theia/variable-resolver": "1.34.1",
16
+ "@theia/workspace": "1.34.1",
17
17
  "async-mutex": "^0.3.1",
18
18
  "jsonc-parser": "^2.2.0",
19
19
  "p-debounce": "^2.1.0"
@@ -52,10 +52,10 @@
52
52
  "watch": "theiaext watch"
53
53
  },
54
54
  "devDependencies": {
55
- "@theia/ext-scripts": "1.33.0"
55
+ "@theia/ext-scripts": "1.34.1"
56
56
  },
57
57
  "nyc": {
58
58
  "extends": "../../configs/nyc.json"
59
59
  },
60
- "gitHead": "a73305748c89f9608c5f94ecc6d15924b49aaa0c"
60
+ "gitHead": "474bdc10b58be92953496b8bcac2af25ee2b48a3"
61
61
  }
package/src/browser/task-configuration-model.ts CHANGED
@@ -19,6 +19,7 @@ import { Emitter, Event } from '@theia/core/lib/common/event';
19
19
  import { Disposable, DisposableCollection } from '@theia/core/lib/common/disposable';
20
20
  import { TaskCustomization, TaskConfiguration, TaskConfigurationScope } from '../common/task-protocol';
21
21
  import { PreferenceProvider, PreferenceProviderDataChanges, PreferenceProviderDataChange } from '@theia/core/lib/browser';
22
+ import { isObject } from '@theia/core/lib/common';
22
23
 
23
24
  /**
24
25
  * Holds the task configurations associated with a particular file. Uses an editor model to facilitate
@@ -80,11 +81,9 @@ export class TaskConfigurationModel implements Disposable {
80
81
  const configurations: (TaskCustomization | TaskConfiguration)[] = [];
81
82
  // eslint-disable-next-line @typescript-eslint/no-explicit-any
82
83
  const { configUri, value } = this.preferences.resolve<any>('tasks', this.getWorkspaceFolder());
83
- if (value && typeof value === 'object' && 'tasks' in value) {
84
- if (Array.isArray(value.tasks)) {
85
- for (const taskConfig of value.tasks) {
86
- configurations.push(taskConfig);
87
- }
84
+ if (isObject(value) && Array.isArray(value.tasks)) {
85
+ for (const taskConfig of value.tasks) {
86
+ configurations.push(taskConfig);
88
87
  }
89
88
  }
90
89
  return {
package/src/node/task-server.slow-spec.ts CHANGED
@@ -29,7 +29,7 @@ import { expectThrowsAsync } from '@theia/core/lib/common/test/expect';
29
29
  import { TestWebSocketChannelSetup } from '@theia/core/lib/node/messaging/test/test-web-socket-channel';
30
30
  import { expect } from 'chai';
31
31
  import URI from '@theia/core/lib/common/uri';
32
- import { RpcProtocol } from '@theia/core';
32
+ import { StringBufferingStream } from '@theia/terminal/lib/node/buffering-stream';
33
33
 
34
34
  // test scripts that we bundle with tasks
35
35
  const commandShortRunning = './task';
@@ -89,12 +89,6 @@ describe('Task server / back-end', function (): void {
89
89
  it('task running in terminal - expected data is received from the terminal ws server', async function (): Promise<void> {
90
90
  const someString = 'someSingleWordString';
91
91
 
92
- // This test is flaky on Windows and fails intermittently. Disable it for now
93
- if (isWindows) {
94
- this.skip();
95
- return;
96
- }
97
-
98
92
  // create task using terminal process
99
93
  const command = isWindows ? commandShortRunningWindows : (isOSX ? commandShortRunningOsx : commandShortRunning);
100
94
  const taskInfo: TaskInfo = await taskServer.run(createProcessTaskConfig('shell', `${command} ${someString}`), wsRoot);
@@ -103,40 +97,28 @@ describe('Task server / back-end', function (): void {
103
97
  const messagesToWaitFor = 10;
104
98
  const messages: string[] = [];
105
99
 
100
+ // check output of task on terminal is what we expect
101
+ const expected = `${isOSX ? 'tasking osx' : 'tasking'}... ${someString}`;
102
+
106
103
  // hook-up to terminal's ws and confirm that it outputs expected tasks' output
107
104
  await new Promise<void>((resolve, reject) => {
108
105
  const setup = new TestWebSocketChannelSetup({ server, path: `${terminalsPath}/${terminalId}` });
106
+ const stringBuffer = new StringBufferingStream();
109
107
  setup.multiplexer.onDidOpenChannel(event => {
110
- const channel = event.channel;
111
- const connection = new RpcProtocol(channel, async (method, args) => {
112
- const error = new Error(`Received unexpected request: ${method} with args: ${args} `);
113
- reject(error);
114
- throw error;
115
- });
116
- channel.onError(reject);
117
- channel.onClose(() => reject(new Error('Channel has been closed')));
118
- connection.onNotification(not => {
119
- // check output of task on terminal is what we expect
120
- const expected = `${isOSX ? 'tasking osx' : 'tasking'}... ${someString}`;
121
- // Instead of waiting for one message from the terminal, we wait for several ones as the very first message can be something unexpected.
122
- // For instance: `nvm is not compatible with the \"PREFIX\" environment variable: currently set to \"/usr/local\"\r\n`
123
- const currentMessage = not.args[0];
124
- messages.unshift(currentMessage);
125
- if (currentMessage.indexOf(expected) !== -1) {
126
- resolve();
127
- channel.close();
128
- return;
129
- }
130
- if (messages.length >= messagesToWaitFor) {
131
- reject(new Error(`expected sub-string not found in terminal output. Expected: "${expected}" vs Actual messages: ${JSON.stringify(messages)}`));
132
- channel.close();
133
- }
134
- });
135
- channel.onMessage(reader => {
136
-
137
- });
108
+ event.channel.onMessage(e => stringBuffer.push(e().readString()));
109
+ event.channel.onError(reject);
110
+ event.channel.onClose(() => reject(new Error('Channel has been closed')));
111
+ });
112
+ stringBuffer.onData(currentMessage => {
113
+ // Instead of waiting for one message from the terminal, we wait for several ones as the very first message can be something unexpected.
114
+ // For instance: `nvm is not compatible with the \"PREFIX\" environment variable: currently set to \"/usr/local\"\r\n`
115
+ messages.unshift(currentMessage);
116
+ if (currentMessage.includes(expected)) {
117
+ resolve();
118
+ } else if (messages.length >= messagesToWaitFor) {
119
+ reject(new Error(`expected sub-string not found in terminal output. Expected: "${expected}" vs Actual messages: ${JSON.stringify(messages)}`));
120
+ }
138
121
  });
139
-
140
122
  });
141
123
  });
142
124