@opensumi/ide-variable 2.12.1-next-079c1930 → 2.12.1-next-f93d2ec5
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.
|
@@ -47,6 +47,7 @@ export declare namespace VariableResolverService {
|
|
|
47
47
|
protected readonly options: VariableResolveOptions;
|
|
48
48
|
protected readonly resolved: Map<string, string | undefined>;
|
|
49
49
|
constructor(variableRegistry: VariableRegistry, options: VariableResolveOptions);
|
|
50
|
+
private evaluateSingleVariable;
|
|
50
51
|
get(name: string): string | undefined;
|
|
51
52
|
resolve(name: string): Promise<void>;
|
|
52
53
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variable-resolver.service.d.ts","sourceRoot":"","sources":["../../src/browser/variable-resolver.service.ts"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"variable-resolver.service.d.ts","sourceRoot":"","sources":["../../src/browser/variable-resolver.service.ts"],"names":[],"mappings":"AACA,OAAO,EAAuB,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AACnF,OAAO,EAAE,sBAAsB,EAAE,wBAAwB,EAAE,MAAM,WAAW,CAAC;AAE7E,qBACa,uBAAwB,YAAW,wBAAwB;IAEtE,SAAS,CAAC,MAAM,CAAC,UAAU,SAAkB;IAG7C,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;IAEtD;;;;OAIG;IACH,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,OAAO,GAAE,sBAA2B,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC;IAItF;;;;OAIG;IACG,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,EAAE,OAAO,GAAE,sBAA2B,GAAG,OAAO,CAAC,CAAC,CAAC;IAM5E;;;;OAIG;cACa,SAAS,CAAC,KAAK,EAAE,GAAG,EAAE,OAAO,EAAE,uBAAuB,CAAC,OAAO,GAAG,OAAO,CAAC,GAAG,CAAC;IAgB7F;;;;OAIG;cACa,eAAe,CAAC,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;IAYvG;;;;OAIG;cACa,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,CAAC,EAAE,OAAO,EAAE,uBAAuB,CAAC,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;IASjH;;;;OAIG;cACa,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB,CAAC,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC;cAQzF,gBAAgB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,uBAAuB,CAAC,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC;CAOzG;AAED,yBAAiB,uBAAuB,CAAC;IACvC,MAAa,OAAO;QAKhB,SAAS,CAAC,QAAQ,CAAC,gBAAgB,EAAE,gBAAgB;QACrD,SAAS,CAAC,QAAQ,CAAC,OAAO,EAAE,sBAAsB;QAJpD,SAAS,CAAC,QAAQ,CAAC,QAAQ,kCAAyC;oBAG/C,gBAAgB,EAAE,gBAAgB,EAClC,OAAO,EAAE,sBAAsB;gBAGtC,sBAAsB;QA2BpC,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS;QAI/B,OAAO,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;KAY3C;CACF"}
|
|
@@ -107,6 +107,29 @@ exports.VariableResolverService = VariableResolverService;
|
|
|
107
107
|
this.options = options;
|
|
108
108
|
this.resolved = new Map();
|
|
109
109
|
}
|
|
110
|
+
async evaluateSingleVariable(name) {
|
|
111
|
+
let variable;
|
|
112
|
+
const parts = name.split(':');
|
|
113
|
+
if (parts.length > 1) {
|
|
114
|
+
const [key, value] = parts;
|
|
115
|
+
variable = this.variableRegistry.getVariable(key);
|
|
116
|
+
switch (key) {
|
|
117
|
+
case 'env':
|
|
118
|
+
const environment = variable && await variable.resolve(this.options.context);
|
|
119
|
+
if (!environment) {
|
|
120
|
+
return;
|
|
121
|
+
}
|
|
122
|
+
const env = environment[ide_core_browser_1.isWindows ? value.toLowerCase() : value];
|
|
123
|
+
return env;
|
|
124
|
+
default: break;
|
|
125
|
+
}
|
|
126
|
+
}
|
|
127
|
+
else {
|
|
128
|
+
const variable = this.variableRegistry.getVariable(name);
|
|
129
|
+
const value = variable && await variable.resolve(this.options.context);
|
|
130
|
+
return value;
|
|
131
|
+
}
|
|
132
|
+
}
|
|
110
133
|
get(name) {
|
|
111
134
|
return this.resolved.get(name);
|
|
112
135
|
}
|
|
@@ -115,8 +138,7 @@ exports.VariableResolverService = VariableResolverService;
|
|
|
115
138
|
return;
|
|
116
139
|
}
|
|
117
140
|
try {
|
|
118
|
-
const
|
|
119
|
-
const value = variable && await variable.resolve(this.options.context);
|
|
141
|
+
const value = await this.evaluateSingleVariable(name);
|
|
120
142
|
this.resolved.set(name, value);
|
|
121
143
|
}
|
|
122
144
|
catch (e) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"variable-resolver.service.js","sourceRoot":"","sources":["../../src/browser/variable-resolver.service.ts"],"names":[],"mappings":";;;;;AAAA,qCAAqD;AACrD,
|
|
1
|
+
{"version":3,"file":"variable-resolver.service.js","sourceRoot":"","sources":["../../src/browser/variable-resolver.service.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@opensumi/ide-variable",
|
|
3
|
-
"version": "2.12.1-next-
|
|
3
|
+
"version": "2.12.1-next-f93d2ec5",
|
|
4
4
|
"files": [
|
|
5
5
|
"lib"
|
|
6
6
|
],
|
|
@@ -16,13 +16,13 @@
|
|
|
16
16
|
"url": "git@github.com:opensumi/core.git"
|
|
17
17
|
},
|
|
18
18
|
"dependencies": {
|
|
19
|
-
"@opensumi/ide-core-common": "2.12.1-next-
|
|
20
|
-
"@opensumi/ide-core-node": "2.12.1-next-
|
|
21
|
-
"@opensumi/ide-quick-open": "2.12.1-next-
|
|
19
|
+
"@opensumi/ide-core-common": "2.12.1-next-f93d2ec5",
|
|
20
|
+
"@opensumi/ide-core-node": "2.12.1-next-f93d2ec5",
|
|
21
|
+
"@opensumi/ide-quick-open": "2.12.1-next-f93d2ec5"
|
|
22
22
|
},
|
|
23
23
|
"devDependencies": {
|
|
24
|
-
"@opensumi/ide-core-browser": "2.12.1-next-
|
|
24
|
+
"@opensumi/ide-core-browser": "2.12.1-next-f93d2ec5",
|
|
25
25
|
"@opensumi/ide-dev-tool": "^1.3.1",
|
|
26
|
-
"@opensumi/ide-quick-open": "2.12.1-next-
|
|
26
|
+
"@opensumi/ide-quick-open": "2.12.1-next-f93d2ec5"
|
|
27
27
|
}
|
|
28
28
|
}
|