@sap-ux/environment-check 0.10.2 → 0.11.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/checks/environment.d.ts +3 -1
- package/dist/checks/environment.d.ts.map +1 -1
- package/dist/checks/environment.js +8 -6
- package/dist/checks/environment.js.map +1 -1
- package/dist/checks/get-installed.d.ts +3 -1
- package/dist/checks/get-installed.d.ts.map +1 -1
- package/dist/checks/get-installed.js +35 -4
- package/dist/checks/get-installed.js.map +1 -1
- package/package.json +2 -2
|
@@ -1,10 +1,12 @@
|
|
|
1
|
+
import type { Extension } from 'vscode';
|
|
1
2
|
import type { CheckEnvironmentOptions, Environment, EnvironmentCheckResult, ResultMessage, EndpointResults, Endpoint } from '../types';
|
|
2
3
|
/**
|
|
3
4
|
* Return the environment.
|
|
4
5
|
*
|
|
6
|
+
* @param extensions - installed extensions passed from vscode
|
|
5
7
|
* @returns environment, including ide, versions, ...
|
|
6
8
|
*/
|
|
7
|
-
export declare function getEnvironment(): Promise<{
|
|
9
|
+
export declare function getEnvironment(extensions?: readonly Extension<any>[]): Promise<{
|
|
8
10
|
environment: Environment;
|
|
9
11
|
messages: ResultMessage[];
|
|
10
12
|
}>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../src/checks/environment.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EACR,uBAAuB,EACvB,WAAW,EACX,sBAAsB,EACtB,aAAa,EAEb,eAAe,EACf,QAAQ,EACX,MAAM,UAAU,CAAC;AAKlB
|
|
1
|
+
{"version":3,"file":"environment.d.ts","sourceRoot":"","sources":["../../src/checks/environment.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EACR,uBAAuB,EACvB,WAAW,EACX,sBAAsB,EACtB,aAAa,EAEb,eAAe,EACf,QAAQ,EACX,MAAM,UAAU,CAAC;AAKlB;;;;;GAKG;AACH,wBAAsB,cAAc,CAChC,UAAU,CAAC,EAAE,SAAS,SAAS,CAAC,GAAG,CAAC,EAAE,GACvC,OAAO,CAAC;IAAE,WAAW,EAAE,WAAW,CAAC;IAAC,QAAQ,EAAE,aAAa,EAAE,CAAA;CAAE,CAAC,CA+BlE;AAoHD;;;;;;;GAOG;AACH,wBAAsB,mBAAmB,CACrC,iBAAiB,EAAE,GAAG,CAAC,MAAM,CAAC,EAC9B,SAAS,EAAE,QAAQ,EAAE,EACrB,kBAAkB,CAAC,EAAE,CAAC,WAAW,EAAE,QAAQ,KAAK,OAAO,CAAC;IACpD,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,MAAM,CAAC;CACpB,CAAC,GACH,OAAO,CAAC;IAAE,QAAQ,EAAE,aAAa,EAAE,CAAC;IAAC,aAAa,EAAE;QAAE,CAAC,IAAI,EAAE,MAAM,GAAG,eAAe,CAAA;KAAE,CAAA;CAAE,CAAC,CA2B5F;AAED;;;;;GAKG;AACH,wBAAsB,gBAAgB,CAAC,OAAO,CAAC,EAAE,uBAAuB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CA8CzG"}
|
|
@@ -23,9 +23,10 @@ const i18n_1 = require("../i18n");
|
|
|
23
23
|
/**
|
|
24
24
|
* Return the environment.
|
|
25
25
|
*
|
|
26
|
+
* @param extensions - installed extensions passed from vscode
|
|
26
27
|
* @returns environment, including ide, versions, ...
|
|
27
28
|
*/
|
|
28
|
-
function getEnvironment() {
|
|
29
|
+
function getEnvironment(extensions) {
|
|
29
30
|
return __awaiter(this, void 0, void 0, function* () {
|
|
30
31
|
const logger = logger_1.getLogger();
|
|
31
32
|
const processVersions = yield get_installed_1.getProcessVersions(logger);
|
|
@@ -45,7 +46,7 @@ function getEnvironment() {
|
|
|
45
46
|
catch (error) {
|
|
46
47
|
logger.info(i18n_1.t('error.basDevSpace', { error: error.message }));
|
|
47
48
|
}
|
|
48
|
-
const toolsExtensionResults = yield getToolsExtensions();
|
|
49
|
+
const toolsExtensionResults = yield getToolsExtensions(extensions);
|
|
49
50
|
environment.toolsExtensions = toolsExtensionResults.toolsExtensions;
|
|
50
51
|
logger.push(...toolsExtensionResults.messages);
|
|
51
52
|
logger.info(i18n_1.t('info.versions', { versions: JSON.stringify(environment.versions, null, 4) }));
|
|
@@ -87,20 +88,21 @@ function getExtVersions(extensions) {
|
|
|
87
88
|
/**
|
|
88
89
|
* Returns the tools and extensions installed.
|
|
89
90
|
*
|
|
91
|
+
* @param extensions - installed extensions passed from vscode
|
|
90
92
|
* @returns tools and extension versions
|
|
91
93
|
*/
|
|
92
|
-
function getToolsExtensions() {
|
|
94
|
+
function getToolsExtensions(extensions) {
|
|
93
95
|
return __awaiter(this, void 0, void 0, function* () {
|
|
94
96
|
const logger = logger_1.getLogger();
|
|
95
|
-
const
|
|
97
|
+
const installedExtensions = yield get_installed_1.getInstalledExtensions(extensions, logger);
|
|
96
98
|
const fioriGenVersion = yield get_installed_1.getFioriGenVersion();
|
|
97
99
|
const cloudCli = yield get_installed_1.getCFCliToolVersion();
|
|
98
100
|
let toolsExtensions = {
|
|
99
101
|
cloudCli: cloudCli,
|
|
100
102
|
fioriGenVersion: fioriGenVersion
|
|
101
103
|
};
|
|
102
|
-
if (
|
|
103
|
-
const extVersions = getExtVersions(
|
|
104
|
+
if (installedExtensions) {
|
|
105
|
+
const extVersions = getExtVersions(installedExtensions);
|
|
104
106
|
toolsExtensions = Object.assign(Object.assign({}, toolsExtensions), extVersions);
|
|
105
107
|
}
|
|
106
108
|
logger.info(i18n_1.t('info.cloudCli', { cloudCli: toolsExtensions.cloudCli }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/checks/environment.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,iDAAgD;AAChD,+CAA4E;AAC5E,yCAA2C;AAC3C,mDAAqD;AACrD,2CAA2D;AAC3D,sCAAsC;AACtC,0CAAwC;
|
|
1
|
+
{"version":3,"file":"environment.js","sourceRoot":"","sources":["../../src/checks/environment.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,12 +1,14 @@
|
|
|
1
1
|
/// <reference types="node" />
|
|
2
2
|
import type { ILogger } from '../types';
|
|
3
|
+
import type { Extension } from 'vscode';
|
|
3
4
|
/**
|
|
4
5
|
* Reads the list of extensions installed and returns the id and version.
|
|
5
6
|
*
|
|
7
|
+
* @param extensions - installed extensions passed from vscode
|
|
6
8
|
* @param logger - logger to report errors
|
|
7
9
|
* @returns list of extension ids and versions
|
|
8
10
|
*/
|
|
9
|
-
export declare function getInstalledExtensions(logger?: ILogger): Promise<{
|
|
11
|
+
export declare function getInstalledExtensions(extensions?: readonly Extension<any>[], logger?: ILogger): Promise<{
|
|
10
12
|
[id: string]: {
|
|
11
13
|
version: string;
|
|
12
14
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-installed.d.ts","sourceRoot":"","sources":["../../src/checks/get-installed.ts"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;
|
|
1
|
+
{"version":3,"file":"get-installed.d.ts","sourceRoot":"","sources":["../../src/checks/get-installed.ts"],"names":[],"mappings":";AAKA,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,UAAU,CAAC;AACxC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,QAAQ,CAAC;AAgFxC;;;;;;GAMG;AACH,wBAAsB,sBAAsB,CACxC,UAAU,CAAC,EAAE,SAAS,SAAS,CAAC,GAAG,CAAC,EAAE,EACtC,MAAM,CAAC,EAAE,OAAO,GACjB,OAAO,CAAC;IAAE,CAAC,EAAE,EAAE,MAAM,GAAG;QAAE,OAAO,EAAE,MAAM,CAAA;KAAE,CAAA;CAAE,CAAC,CAsBhD;AAED;;;;GAIG;AACH,wBAAsB,mBAAmB,IAAI,OAAO,CAAC,MAAM,CAAC,CAS3D;AAwBD;;;;GAIG;AACH,wBAAsB,kBAAkB,IAAI,OAAO,CAAC,MAAM,CAAC,CA2B1D;AAED;;;;;GAKG;AACH,wBAAsB,kBAAkB,CAAC,MAAM,CAAC,EAAE,OAAO,GAAG,OAAO,CAAC,MAAM,CAAC,eAAe,CAAC,CAQ1F"}
|
|
@@ -18,6 +18,7 @@ const types_1 = require("../types");
|
|
|
18
18
|
const btp_utils_1 = require("@sap-ux/btp-utils");
|
|
19
19
|
const pluginsDirBAS = path_1.join('/extbin/plugins');
|
|
20
20
|
const globalNodeModulesBAS = path_1.join('/extbin/npm/globals/lib/node_modules');
|
|
21
|
+
const globalNodeModulePnpmBAS = path_1.join('/extbin/globals/pnpm/5/node_modules');
|
|
21
22
|
/**
|
|
22
23
|
* Checks if vsix/extension is required for results.
|
|
23
24
|
*
|
|
@@ -54,6 +55,22 @@ function getExtensionsBAS() {
|
|
|
54
55
|
return versions;
|
|
55
56
|
});
|
|
56
57
|
}
|
|
58
|
+
/**
|
|
59
|
+
* Internal function to check if the module is being ran in VSCode Insiders.
|
|
60
|
+
*
|
|
61
|
+
* @returns boolean - if ran in insiders
|
|
62
|
+
*/
|
|
63
|
+
function checkIsInsiders() {
|
|
64
|
+
var _a;
|
|
65
|
+
return __awaiter(this, void 0, void 0, function* () {
|
|
66
|
+
let isInsiders = false;
|
|
67
|
+
const processEnvProp = (_a = process.env['VSCODE_IPC_HOOK']) !== null && _a !== void 0 ? _a : process.env['TERM_PROGRAM_VERSION'];
|
|
68
|
+
if (processEnvProp === null || processEnvProp === void 0 ? void 0 : processEnvProp.includes('insider')) {
|
|
69
|
+
isInsiders = true;
|
|
70
|
+
}
|
|
71
|
+
return isInsiders;
|
|
72
|
+
});
|
|
73
|
+
}
|
|
57
74
|
/**
|
|
58
75
|
* Reads the list of extensions installed in vscode.
|
|
59
76
|
*
|
|
@@ -61,7 +78,8 @@ function getExtensionsBAS() {
|
|
|
61
78
|
*/
|
|
62
79
|
function getExtensionsVSCode() {
|
|
63
80
|
return __awaiter(this, void 0, void 0, function* () {
|
|
64
|
-
const
|
|
81
|
+
const isInsiders = yield checkIsInsiders();
|
|
82
|
+
const output = yield command_1.spawnCommand(isInsiders ? 'code-insiders' : 'code', ['--list-extensions', '--show-versions']);
|
|
65
83
|
const versions = output
|
|
66
84
|
.split('\n')
|
|
67
85
|
.filter((ext) => ext.startsWith('SAP'))
|
|
@@ -80,14 +98,26 @@ function getExtensionsVSCode() {
|
|
|
80
98
|
/**
|
|
81
99
|
* Reads the list of extensions installed and returns the id and version.
|
|
82
100
|
*
|
|
101
|
+
* @param extensions - installed extensions passed from vscode
|
|
83
102
|
* @param logger - logger to report errors
|
|
84
103
|
* @returns list of extension ids and versions
|
|
85
104
|
*/
|
|
86
|
-
function getInstalledExtensions(logger) {
|
|
105
|
+
function getInstalledExtensions(extensions, logger) {
|
|
87
106
|
return __awaiter(this, void 0, void 0, function* () {
|
|
88
107
|
let versions;
|
|
89
108
|
try {
|
|
90
|
-
if (
|
|
109
|
+
if (extensions) {
|
|
110
|
+
versions = extensions
|
|
111
|
+
.filter((ext) => isExtensionRequired(ext.packageJSON.name))
|
|
112
|
+
.reduce((returnObject, current) => {
|
|
113
|
+
const version = current.packageJSON.version;
|
|
114
|
+
returnObject[current.packageJSON.name] = {
|
|
115
|
+
version
|
|
116
|
+
};
|
|
117
|
+
return returnObject;
|
|
118
|
+
}, {});
|
|
119
|
+
}
|
|
120
|
+
else if (btp_utils_1.isAppStudio()) {
|
|
91
121
|
versions = yield getExtensionsBAS();
|
|
92
122
|
}
|
|
93
123
|
else {
|
|
@@ -155,7 +185,8 @@ function getFioriGenVersion() {
|
|
|
155
185
|
genSearchPaths.push(fioriGenPath);
|
|
156
186
|
if (btp_utils_1.isAppStudio()) {
|
|
157
187
|
const fioriGenPathBAS = path_1.join(globalNodeModulesBAS, types_1.NpmModules.FioriGenerator);
|
|
158
|
-
|
|
188
|
+
const fioriGenPathPnpmBAS = path_1.join(globalNodeModulePnpmBAS, types_1.NpmModules.FioriGenerator);
|
|
189
|
+
genSearchPaths.push(fioriGenPathBAS, fioriGenPathPnpmBAS);
|
|
159
190
|
}
|
|
160
191
|
for (const genPath of genSearchPaths) {
|
|
161
192
|
const fioriGenPkgJson = path_1.join(genPath, 'package.json');
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"get-installed.js","sourceRoot":"","sources":["../../src/checks/get-installed.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,2BAAuD;AACvD,kCAA4B;AAC5B,+BAA4B;AAC5B,wCAAsD;AACtD,oCAAkD;
|
|
1
|
+
{"version":3,"file":"get-installed.js","sourceRoot":"","sources":["../../src/checks/get-installed.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@sap-ux/environment-check",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.11.0",
|
|
4
4
|
"description": "SAP Fiori environment check",
|
|
5
5
|
"license": "Apache-2.0",
|
|
6
6
|
"bin": {
|
|
@@ -9,7 +9,7 @@
|
|
|
9
9
|
"main": "dist/index.js",
|
|
10
10
|
"private": false,
|
|
11
11
|
"dependencies": {
|
|
12
|
-
"@sap-ux/axios-extension": "0.
|
|
12
|
+
"@sap-ux/axios-extension": "0.14.0",
|
|
13
13
|
"@sap-ux/btp-utils": "0.11.3",
|
|
14
14
|
"@sap-ux/logger": "0.3.3",
|
|
15
15
|
"@sap-ux/project-access": "1.0.4",
|