@opensumi/ide-terminal-next 3.5.1-next-1731638201.0 → 3.5.1-next-1731935606.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/lib/common/environmentVariable.d.ts +5 -0
- package/lib/common/environmentVariable.d.ts.map +1 -1
- package/lib/common/environmentVariable.js.map +1 -1
- package/lib/common/environmentVariableCollection.d.ts.map +1 -1
- package/lib/common/environmentVariableCollection.js +15 -11
- package/lib/common/environmentVariableCollection.js.map +1 -1
- package/package.json +18 -18
- package/src/common/environmentVariable.ts +6 -0
- package/src/common/environmentVariableCollection.ts +14 -11
|
@@ -75,9 +75,13 @@ export declare enum EnvironmentVariableMutatorType {
|
|
|
75
75
|
Append = 2,
|
|
76
76
|
Prepend = 3
|
|
77
77
|
}
|
|
78
|
+
export interface EnvironmentVariableMutatorOptions {
|
|
79
|
+
applyAtProcessCreation?: boolean;
|
|
80
|
+
}
|
|
78
81
|
export interface EnvironmentVariableMutator {
|
|
79
82
|
readonly value: string;
|
|
80
83
|
readonly type: EnvironmentVariableMutatorType;
|
|
84
|
+
readonly options: EnvironmentVariableMutatorOptions;
|
|
81
85
|
}
|
|
82
86
|
export interface ExtensionOwnedEnvironmentVariableMutator extends EnvironmentVariableMutator {
|
|
83
87
|
readonly extensionIdentifier: string;
|
|
@@ -103,6 +107,7 @@ export type SerializableEnvironmentVariableCollection = [string, EnvironmentVari
|
|
|
103
107
|
export interface IEnvironmentVariableMutator {
|
|
104
108
|
readonly value: string;
|
|
105
109
|
readonly type: EnvironmentVariableMutatorType;
|
|
110
|
+
readonly options: EnvironmentVariableMutatorOptions;
|
|
106
111
|
}
|
|
107
112
|
/** [variable, mutator] */
|
|
108
113
|
export type ISerializableEnvironmentVariableCollection = [string, IEnvironmentVariableMutator][];
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environmentVariable.d.ts","sourceRoot":"","sources":["../../src/common/environmentVariable.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAExF,eAAO,MAAM,+BAA+B,eAA4C,CAAC;AAOzF;;;;GAIG;AAEH,MAAM,WAAW,8BAA8B;IAC7C,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC,MAAM,EAAE,2BAA2B,CAAC,CAAC;CAChE;AAED,MAAM,WAAW,6CAA8C,SAAQ,8BAA8B;IACnG,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAC9B;AAED,MAAM,WAAW,yCAA0C,SAAQ,2BAA2B;IAC5F,QAAQ,CAAC,mBAAmB,EAAE,MAAM,CAAC;CACtC;AAED,MAAM,WAAW,wCAAwC;IACvD,KAAK,EAAE,WAAW,CAAC,MAAM,EAAE,yCAAyC,EAAE,CAAC,CAAC;IACxE,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,yCAAyC,EAAE,CAAC,CAAC;IAC1E,OAAO,EAAE,WAAW,CAAC,MAAM,EAAE,yCAAyC,EAAE,CAAC,CAAC;CAC3E;AAED;;;GAGG;AACH,MAAM,WAAW,oCAAoC;IACnD,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC,MAAM,EAAE,yCAAyC,EAAE,CAAC,CAAC;IAE/E;;;;OAIG;IACH,yBAAyB,CACvB,GAAG,EAAE,mBAAmB,EACxB,EAAE,EAAE,eAAe,EACnB,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,WAAW,CAAC,MAAM,CAAC,GACtD,OAAO,CAAC,IAAI,CAAC,CAAC;IAEjB;;;OAGG;IACH,IAAI,CAAC,KAAK,EAAE,oCAAoC,GAAG,wCAAwC,GAAG,SAAS,CAAC;CACzG;AAED,MAAM,WAAW,2BAA2B;IAC1C,kCAAkC,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;IAEpD;;;OAGG;IACH,QAAQ,CAAC,WAAW,EAAE,WAAW,CAAC,MAAM,EAAE,8BAA8B,CAAC,CAAC;IAE1E;;;OAGG;IACH,QAAQ,CAAC,gBAAgB,EAAE,oCAAoC,GAAG,SAAS,CAAC;IAE5E;;;OAGG;IACH,sBAAsB,EAAE,KAAK,CAAC,oCAAoC,CAAC,CAAC;IAEpE;;OAEG;IACH,GAAG,CAAC,mBAAmB,EAAE,MAAM,EAAE,UAAU,EAAE,8BAA8B,GAAG,IAAI,CAAC;IAEnF;;OAEG;IACH,MAAM,CAAC,mBAAmB,EAAE,MAAM,GAAG,IAAI,CAAC;CAC3C;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,GAAG,EAAE,WAAW,CAAC,MAAM,EAAE,0BAA0B,CAAC,CAAC;CAC/D;AAED,MAAM,WAAW,4CAA6C,SAAQ,6BAA6B;IACjG,QAAQ,CAAC,UAAU,EAAE,OAAO,CAAC;CAC9B;AAED,wBAAgB,gBAAgB,CAAC,IAAI,EAAE,8BAA8B,EAAE,KAAK,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,GAAG,MAAM,CAS9G;AAED,oBAAY,8BAA8B;IACxC,OAAO,IAAI;IACX,MAAM,IAAI;IACV,OAAO,IAAI;CACZ;AAED,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"environmentVariable.d.ts","sourceRoot":"","sources":["../../src/common/environmentVariable.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environmentVariable.js","sourceRoot":"","sources":["../../src/common/environmentVariable.ts"],"names":[],"mappings":";;;AAkGA,4CASC;
|
|
1
|
+
{"version":3,"file":"environmentVariable.js","sourceRoot":"","sources":["../../src/common/environmentVariable.ts"],"names":[],"mappings":";;;AAkGA,4CASC;AAmDD,wFAIC;AAED,4FAIC;AAtKY,QAAA,+BAA+B,GAAG,MAAM,CAAC,iCAAiC,CAAC,CAAC;AAgGzF,SAAgB,gBAAgB,CAAC,IAAoC,EAAE,KAAa,EAAE,QAAgB;IACpG,QAAQ,IAAI,EAAE,CAAC;QACb,KAAK,8BAA8B,CAAC,OAAO;YACzC,OAAO,GAAG,QAAQ,IAAI,KAAK,UAAU,QAAQ,GAAG,CAAC;QACnD,KAAK,8BAA8B,CAAC,MAAM;YACxC,OAAO,GAAG,QAAQ,WAAW,QAAQ,IAAI,KAAK,EAAE,CAAC;QACnD;YACE,OAAO,GAAG,QAAQ,IAAI,KAAK,EAAE,CAAC;IAClC,CAAC;AACH,CAAC;AAED,IAAY,8BAIX;AAJD,WAAY,8BAA8B;IACxC,yFAAW,CAAA;IACX,uFAAU,CAAA;IACV,yFAAW,CAAA;AACb,CAAC,EAJW,8BAA8B,8CAA9B,8BAA8B,QAIzC;AA6CD,SAAgB,sCAAsC,CACpD,UAA4D;IAE5D,OAAO,CAAC,GAAG,UAAU,CAAC,OAAO,EAAE,CAAC,CAAC;AACnC,CAAC;AAED,SAAgB,wCAAwC,CACtD,oBAA+D;IAE/D,OAAO,IAAI,GAAG,CAAsC,oBAAoB,CAAC,CAAC;AAC5E,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environmentVariableCollection.d.ts","sourceRoot":"","sources":["../../src/common/environmentVariableCollection.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjF,OAAO,EAEL,8BAA8B,EAC9B,yCAAyC,EACzC,oCAAoC,EACpC,wCAAwC,EACzC,MAAM,uBAAuB,CAAC;AAC/B,qBAAa,mCAAoC,YAAW,oCAAoC;IAC9F,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,yCAAyC,EAAE,CAAC,CAAa;gBAEvE,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"environmentVariableCollection.d.ts","sourceRoot":"","sources":["../../src/common/environmentVariableCollection.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,mBAAmB,EAAE,eAAe,EAAE,MAAM,2BAA2B,CAAC;AAEjF,OAAO,EAEL,8BAA8B,EAC9B,yCAAyC,EACzC,oCAAoC,EACpC,wCAAwC,EACzC,MAAM,uBAAuB,CAAC;AAC/B,qBAAa,mCAAoC,YAAW,oCAAoC;IAC9F,QAAQ,CAAC,GAAG,EAAE,GAAG,CAAC,MAAM,EAAE,yCAAyC,EAAE,CAAC,CAAa;gBAEvE,WAAW,EAAE,GAAG,CAAC,MAAM,EAAE,8BAA8B,CAAC;IAiC9D,yBAAyB,CAC7B,GAAG,EAAE,mBAAmB,EACxB,EAAE,EAAE,eAAe,EACnB,gBAAgB,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,GAClD,OAAO,CAAC,IAAI,CAAC;IA4BhB,IAAI,CAAC,KAAK,EAAE,oCAAoC,GAAG,wCAAwC,GAAG,SAAS;CAsCxG"}
|
|
@@ -33,6 +33,7 @@ class MergedEnvironmentVariableCollection {
|
|
|
33
33
|
extensionIdentifier,
|
|
34
34
|
value: mutator.value,
|
|
35
35
|
type: mutator.type,
|
|
36
|
+
options: mutator.options,
|
|
36
37
|
});
|
|
37
38
|
next = it.next();
|
|
38
39
|
}
|
|
@@ -47,17 +48,20 @@ class MergedEnvironmentVariableCollection {
|
|
|
47
48
|
this.map.forEach((mutators, variable) => {
|
|
48
49
|
const actualVariable = os === ide_core_common_1.OperatingSystem.Windows ? lowerToActualVariableNames[variable.toLowerCase()] || variable : variable;
|
|
49
50
|
mutators.forEach(async (mutator) => {
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
51
|
+
var _a, _b;
|
|
52
|
+
if ((_b = (_a = mutator.options) === null || _a === void 0 ? void 0 : _a.applyAtProcessCreation) !== null && _b !== void 0 ? _b : true) {
|
|
53
|
+
const value = variableResolver ? await variableResolver(mutator.value) : mutator.value;
|
|
54
|
+
switch (mutator.type) {
|
|
55
|
+
case environmentVariable_1.EnvironmentVariableMutatorType.Append:
|
|
56
|
+
env[actualVariable] = (env[actualVariable] || '') + value;
|
|
57
|
+
break;
|
|
58
|
+
case environmentVariable_1.EnvironmentVariableMutatorType.Prepend:
|
|
59
|
+
env[actualVariable] = value + (env[actualVariable] || '');
|
|
60
|
+
break;
|
|
61
|
+
case environmentVariable_1.EnvironmentVariableMutatorType.Replace:
|
|
62
|
+
env[actualVariable] = value;
|
|
63
|
+
break;
|
|
64
|
+
}
|
|
61
65
|
}
|
|
62
66
|
});
|
|
63
67
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environmentVariableCollection.js","sourceRoot":"","sources":["../../src/common/environmentVariableCollection.ts"],"names":[],"mappings":";AAAA;;;gGAGgG;;;AAEhG,+JAA+J;AAE/J,+DAAiF;AAEjF,+DAM+B;AAC/B,MAAa,mCAAmC;IAG9C,YAAY,WAAwD;QAF3D,QAAG,GAA6D,IAAI,GAAG,EAAE,CAAC;QAGjF,WAAW,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,mBAAmB,EAAE,EAAE;YACtD,MAAM,EAAE,GAAG,UAAU,CAAC,GAAG,CAAC,OAAO,EAAE,CAAC;YACpC,IAAI,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC;YACrB,OAAO,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBAClB,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC/B,IAAI,KAAK,GAAG,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBACnC,IAAI,CAAC,KAAK,EAAE,CAAC;oBACX,KAAK,GAAG,EAAE,CAAC;oBACX,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;gBAChC,CAAC;gBAED,mFAAmF;gBACnF,iCAAiC;gBACjC,IAAI,KAAK,CAAC,MAAM,GAAG,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,oDAA8B,CAAC,OAAO,EAAE,CAAC;oBACjF,IAAI,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC;oBACjB,SAAS;gBACX,CAAC;gBAED,kEAAkE;gBAClE,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC9B,KAAK,CAAC,OAAO,CAAC;oBACZ,mBAAmB;oBACnB,KAAK,EAAE,OAAO,CAAC,KAAK;oBACpB,IAAI,EAAE,OAAO,CAAC,IAAI;
|
|
1
|
+
{"version":3,"file":"environmentVariableCollection.js","sourceRoot":"","sources":["../../src/common/environmentVariableCollection.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-terminal-next",
|
|
3
|
-
"version": "3.5.1-next-
|
|
3
|
+
"version": "3.5.1-next-1731935606.0",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib",
|
|
6
6
|
"src"
|
|
@@ -17,11 +17,11 @@
|
|
|
17
17
|
"url": "git@github.com:opensumi/core.git"
|
|
18
18
|
},
|
|
19
19
|
"dependencies": {
|
|
20
|
-
"@opensumi/ide-connection": "3.5.1-next-
|
|
21
|
-
"@opensumi/ide-core-common": "3.5.1-next-
|
|
22
|
-
"@opensumi/ide-core-node": "3.5.1-next-
|
|
23
|
-
"@opensumi/ide-file-service": "3.5.1-next-
|
|
24
|
-
"@opensumi/ide-utils": "3.5.1-next-
|
|
20
|
+
"@opensumi/ide-connection": "3.5.1-next-1731935606.0",
|
|
21
|
+
"@opensumi/ide-core-common": "3.5.1-next-1731935606.0",
|
|
22
|
+
"@opensumi/ide-core-node": "3.5.1-next-1731935606.0",
|
|
23
|
+
"@opensumi/ide-file-service": "3.5.1-next-1731935606.0",
|
|
24
|
+
"@opensumi/ide-utils": "3.5.1-next-1731935606.0",
|
|
25
25
|
"@xterm/addon-canvas": "0.7.0",
|
|
26
26
|
"@xterm/addon-fit": "0.10.0",
|
|
27
27
|
"@xterm/addon-search": "0.15.0",
|
|
@@ -31,19 +31,19 @@
|
|
|
31
31
|
"os-locale": "^4.0.0"
|
|
32
32
|
},
|
|
33
33
|
"devDependencies": {
|
|
34
|
-
"@opensumi/ide-components": "3.5.1-next-
|
|
35
|
-
"@opensumi/ide-core-browser": "3.5.1-next-
|
|
36
|
-
"@opensumi/ide-dev-tool": "3.5.1-next-
|
|
37
|
-
"@opensumi/ide-editor": "3.5.1-next-
|
|
38
|
-
"@opensumi/ide-main-layout": "3.5.1-next-
|
|
39
|
-
"@opensumi/ide-monaco": "3.5.1-next-
|
|
40
|
-
"@opensumi/ide-overlay": "3.5.1-next-
|
|
41
|
-
"@opensumi/ide-status-bar": "3.5.1-next-
|
|
42
|
-
"@opensumi/ide-theme": "3.5.1-next-
|
|
43
|
-
"@opensumi/ide-variable": "3.5.1-next-
|
|
44
|
-
"@opensumi/ide-workspace": "3.5.1-next-
|
|
34
|
+
"@opensumi/ide-components": "3.5.1-next-1731935606.0",
|
|
35
|
+
"@opensumi/ide-core-browser": "3.5.1-next-1731935606.0",
|
|
36
|
+
"@opensumi/ide-dev-tool": "3.5.1-next-1731935606.0",
|
|
37
|
+
"@opensumi/ide-editor": "3.5.1-next-1731935606.0",
|
|
38
|
+
"@opensumi/ide-main-layout": "3.5.1-next-1731935606.0",
|
|
39
|
+
"@opensumi/ide-monaco": "3.5.1-next-1731935606.0",
|
|
40
|
+
"@opensumi/ide-overlay": "3.5.1-next-1731935606.0",
|
|
41
|
+
"@opensumi/ide-status-bar": "3.5.1-next-1731935606.0",
|
|
42
|
+
"@opensumi/ide-theme": "3.5.1-next-1731935606.0",
|
|
43
|
+
"@opensumi/ide-variable": "3.5.1-next-1731935606.0",
|
|
44
|
+
"@opensumi/ide-workspace": "3.5.1-next-1731935606.0",
|
|
45
45
|
"@types/http-proxy": "^1.17.2",
|
|
46
46
|
"http-proxy": "^1.18.0"
|
|
47
47
|
},
|
|
48
|
-
"gitHead": "
|
|
48
|
+
"gitHead": "5849361f31f3affe436c41a791112e3c7352c98c"
|
|
49
49
|
}
|
|
@@ -113,9 +113,14 @@ export enum EnvironmentVariableMutatorType {
|
|
|
113
113
|
Prepend = 3,
|
|
114
114
|
}
|
|
115
115
|
|
|
116
|
+
export interface EnvironmentVariableMutatorOptions {
|
|
117
|
+
applyAtProcessCreation?: boolean;
|
|
118
|
+
}
|
|
119
|
+
|
|
116
120
|
export interface EnvironmentVariableMutator {
|
|
117
121
|
readonly value: string;
|
|
118
122
|
readonly type: EnvironmentVariableMutatorType;
|
|
123
|
+
readonly options: EnvironmentVariableMutatorOptions;
|
|
119
124
|
}
|
|
120
125
|
|
|
121
126
|
export interface ExtensionOwnedEnvironmentVariableMutator extends EnvironmentVariableMutator {
|
|
@@ -145,6 +150,7 @@ export type SerializableEnvironmentVariableCollection = [string, EnvironmentVari
|
|
|
145
150
|
export interface IEnvironmentVariableMutator {
|
|
146
151
|
readonly value: string;
|
|
147
152
|
readonly type: EnvironmentVariableMutatorType;
|
|
153
|
+
readonly options: EnvironmentVariableMutatorOptions;
|
|
148
154
|
}
|
|
149
155
|
|
|
150
156
|
/** [variable, mutator] */
|
|
@@ -42,6 +42,7 @@ export class MergedEnvironmentVariableCollection implements IMergedEnvironmentVa
|
|
|
42
42
|
extensionIdentifier,
|
|
43
43
|
value: mutator.value,
|
|
44
44
|
type: mutator.type,
|
|
45
|
+
options: mutator.options,
|
|
45
46
|
});
|
|
46
47
|
|
|
47
48
|
next = it.next();
|
|
@@ -63,17 +64,19 @@ export class MergedEnvironmentVariableCollection implements IMergedEnvironmentVa
|
|
|
63
64
|
const actualVariable =
|
|
64
65
|
os === OperatingSystem.Windows ? lowerToActualVariableNames![variable.toLowerCase()] || variable : variable;
|
|
65
66
|
mutators.forEach(async (mutator) => {
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
67
|
+
if (mutator.options?.applyAtProcessCreation ?? true) {
|
|
68
|
+
const value = variableResolver ? await variableResolver(mutator.value) : mutator.value;
|
|
69
|
+
switch (mutator.type) {
|
|
70
|
+
case EnvironmentVariableMutatorType.Append:
|
|
71
|
+
env[actualVariable] = (env[actualVariable] || '') + value;
|
|
72
|
+
break;
|
|
73
|
+
case EnvironmentVariableMutatorType.Prepend:
|
|
74
|
+
env[actualVariable] = value + (env[actualVariable] || '');
|
|
75
|
+
break;
|
|
76
|
+
case EnvironmentVariableMutatorType.Replace:
|
|
77
|
+
env[actualVariable] = value;
|
|
78
|
+
break;
|
|
79
|
+
}
|
|
77
80
|
}
|
|
78
81
|
});
|
|
79
82
|
});
|