@theia/scanoss 1.58.3 → 1.59.0-next.72
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/scanoss-service.d.ts +3 -1
- package/lib/common/scanoss-service.d.ts.map +1 -1
- package/lib/common/scanoss-service.js +2 -2
- package/lib/common/scanoss-service.js.map +1 -1
- package/lib/node/scanoss-service-impl.d.ts.map +1 -1
- package/lib/node/scanoss-service-impl.js +2 -3
- package/lib/node/scanoss-service-impl.js.map +1 -1
- package/package.json +4 -4
- package/src/common/scanoss-service.ts +5 -1
- package/src/node/scanoss-service-impl.ts +2 -3
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { ScannerComponent } from 'scanoss';
|
|
1
2
|
export declare const SCANOSS_SERVICE_PATH = "/services/scanoss/service";
|
|
2
3
|
export declare const ScanOSSService: unique symbol;
|
|
3
4
|
export interface ScanOSSResultClean {
|
|
@@ -7,7 +8,8 @@ export interface ScanOSSResultMatch {
|
|
|
7
8
|
type: 'match';
|
|
8
9
|
matched: string;
|
|
9
10
|
url: string;
|
|
10
|
-
raw:
|
|
11
|
+
raw: ScannerComponent;
|
|
12
|
+
file?: string;
|
|
11
13
|
}
|
|
12
14
|
export interface ScanOSSResultError {
|
|
13
15
|
type: 'error';
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scanoss-service.d.ts","sourceRoot":"","sources":["../../src/common/scanoss-service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"scanoss-service.d.ts","sourceRoot":"","sources":["../../src/common/scanoss-service.ts"],"names":[],"mappings":"AAgBA,OAAO,EAAE,gBAAgB,EAAE,MAAM,SAAS,CAAC;AAE3C,eAAO,MAAM,oBAAoB,8BAA8B,CAAC;AAChE,eAAO,MAAM,cAAc,eAA2B,CAAC;AACvD,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,OAAO,CAAC;CACjB;AACD,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;IAChB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,gBAAgB,CAAC;IACtB,IAAI,CAAC,EAAE,MAAM,CAAC;CACjB;AACD,MAAM,WAAW,kBAAkB;IAC/B,IAAI,EAAE,OAAO,CAAC;IACd,OAAO,EAAE,MAAM,CAAC;CACnB;AACD,MAAM,MAAM,aAAa,GAAG,kBAAkB,GAAG,kBAAkB,GAAG,kBAAkB,CAAC;AACzF,MAAM,WAAW,cAAc;IAC3B,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC,CAAC;CACzE"}
|
|
@@ -1,6 +1,4 @@
|
|
|
1
1
|
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.ScanOSSService = exports.SCANOSS_SERVICE_PATH = void 0;
|
|
4
2
|
// *****************************************************************************
|
|
5
3
|
// Copyright (C) 2024 EclipseSource GmbH.
|
|
6
4
|
//
|
|
@@ -16,6 +14,8 @@ exports.ScanOSSService = exports.SCANOSS_SERVICE_PATH = void 0;
|
|
|
16
14
|
//
|
|
17
15
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
18
16
|
// *****************************************************************************
|
|
17
|
+
Object.defineProperty(exports, "__esModule", { value: true });
|
|
18
|
+
exports.ScanOSSService = exports.SCANOSS_SERVICE_PATH = void 0;
|
|
19
19
|
exports.SCANOSS_SERVICE_PATH = '/services/scanoss/service';
|
|
20
20
|
exports.ScanOSSService = Symbol('ScanOSSService');
|
|
21
21
|
//# sourceMappingURL=scanoss-service.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scanoss-service.js","sourceRoot":"","sources":["../../src/common/scanoss-service.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"scanoss-service.js","sourceRoot":"","sources":["../../src/common/scanoss-service.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;AAInE,QAAA,oBAAoB,GAAG,2BAA2B,CAAC;AACnD,QAAA,cAAc,GAAG,MAAM,CAAC,gBAAgB,CAAC,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scanoss-service-impl.d.ts","sourceRoot":"","sources":["../../src/node/scanoss-service-impl.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAkB1D,qBACa,kBAAmB,YAAW,cAAc;IAErD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA4C;IAEhE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAIrE,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"scanoss-service-impl.d.ts","sourceRoot":"","sources":["../../src/node/scanoss-service-impl.ts"],"names":[],"mappings":"AAiBA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,WAAW,CAAC;AAkB1D,qBACa,kBAAmB,YAAW,cAAc;IAErD,OAAO,CAAC,QAAQ,CAAC,SAAS,CAA4C;IAEhE,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;IAIrE,aAAa,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,CAAC;CA4EhF"}
|
|
@@ -52,7 +52,7 @@ let ScanOSSServiceImpl = class ScanOSSServiceImpl {
|
|
|
52
52
|
});
|
|
53
53
|
}
|
|
54
54
|
catch (e) {
|
|
55
|
-
console.
|
|
55
|
+
console.debug('SCANOSS error', e);
|
|
56
56
|
// map known errors to a more user-friendly message
|
|
57
57
|
// Invalid API key message
|
|
58
58
|
if ((_a = e.message) === null || _a === void 0 ? void 0 : _a.includes('Forbidden')) {
|
|
@@ -83,8 +83,7 @@ let ScanOSSServiceImpl = class ScanOSSServiceImpl {
|
|
|
83
83
|
message: 'Scan request unsuccessful'
|
|
84
84
|
};
|
|
85
85
|
}
|
|
86
|
-
|
|
87
|
-
console.log('SCANOSS results', JSON.stringify(results, null, 2));
|
|
86
|
+
console.debug('SCANOSS results', JSON.stringify(results, undefined, 2));
|
|
88
87
|
let contentScanning = results['/content_scanning'];
|
|
89
88
|
if (!contentScanning) {
|
|
90
89
|
// #14648: The scanoss library prefixes the property with the path of a temporary file on Windows, so we need to search for it
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scanoss-service-impl.js","sourceRoot":"","sources":["../../src/node/scanoss-service-impl.ts"],"names":[],"mappings":";AAAA,gFAAgF;AAChF,yCAAyC;AACzC,EAAE;AACF,2EAA2E;AAC3E,mEAAmE;AACnE,wCAAwC;AACxC,EAAE;AACF,4EAA4E;AAC5E,8EAA8E;AAC9E,6EAA6E;AAC7E,yDAAyD;AACzD,uDAAuD;AACvD,EAAE;AACF,gFAAgF;AAChF,gFAAgF;;;;AAEhF,4DAA0D;AAG1D,qCAAgE;AAOhE,6CAA6C;AAC7C,MAAM,mBAAmB;IAAzB;QACY,UAAK,GAAe,OAAO,CAAC,OAAO,EAAgB,CAAC;IAKhE,CAAC;IAJU,KAAK,CAAC,WAAW,CAAC,IAAsB;QAC3C,IAAI,CAAC,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,CAAC,CAAC;QAC3C,OAAO,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;CACJ;AAGM,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAAxB;QAEc,cAAS,GAAG,IAAI,mBAAmB,EAAiB,CAAC;
|
|
1
|
+
{"version":3,"file":"scanoss-service-impl.js","sourceRoot":"","sources":["../../src/node/scanoss-service-impl.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@theia/scanoss",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.59.0-next.72+f41d8efcd",
|
|
4
4
|
"description": "Theia - SCANOSS Integration",
|
|
5
5
|
"dependencies": {
|
|
6
|
-
"@theia/core": "1.
|
|
6
|
+
"@theia/core": "1.59.0-next.72+f41d8efcd",
|
|
7
7
|
"scanoss": "^0.15.2"
|
|
8
8
|
},
|
|
9
9
|
"publishConfig": {
|
|
@@ -41,10 +41,10 @@
|
|
|
41
41
|
"watch": "theiaext watch"
|
|
42
42
|
},
|
|
43
43
|
"devDependencies": {
|
|
44
|
-
"@theia/ext-scripts": "1.58.
|
|
44
|
+
"@theia/ext-scripts": "1.58.0"
|
|
45
45
|
},
|
|
46
46
|
"nyc": {
|
|
47
47
|
"extends": "../../configs/nyc.json"
|
|
48
48
|
},
|
|
49
|
-
"gitHead": "
|
|
49
|
+
"gitHead": "f41d8efcd4abb79167b74bf476eafc7857e97306"
|
|
50
50
|
}
|
|
@@ -13,6 +13,9 @@
|
|
|
13
13
|
//
|
|
14
14
|
// SPDX-License-Identifier: EPL-2.0 OR GPL-2.0-only WITH Classpath-exception-2.0
|
|
15
15
|
// *****************************************************************************
|
|
16
|
+
|
|
17
|
+
import { ScannerComponent } from 'scanoss';
|
|
18
|
+
|
|
16
19
|
export const SCANOSS_SERVICE_PATH = '/services/scanoss/service';
|
|
17
20
|
export const ScanOSSService = Symbol('ScanOSSService');
|
|
18
21
|
export interface ScanOSSResultClean {
|
|
@@ -22,7 +25,8 @@ export interface ScanOSSResultMatch {
|
|
|
22
25
|
type: 'match';
|
|
23
26
|
matched: string; // e.g. "75%"
|
|
24
27
|
url: string;
|
|
25
|
-
raw:
|
|
28
|
+
raw: ScannerComponent;
|
|
29
|
+
file?: string;
|
|
26
30
|
}
|
|
27
31
|
export interface ScanOSSResultError {
|
|
28
32
|
type: 'error';
|
|
@@ -56,7 +56,7 @@ export class ScanOSSServiceImpl implements ScanOSSService {
|
|
|
56
56
|
key: 'content_scanning',
|
|
57
57
|
});
|
|
58
58
|
} catch (e) {
|
|
59
|
-
console.
|
|
59
|
+
console.debug('SCANOSS error', e);
|
|
60
60
|
|
|
61
61
|
// map known errors to a more user-friendly message
|
|
62
62
|
|
|
@@ -90,8 +90,7 @@ export class ScanOSSServiceImpl implements ScanOSSService {
|
|
|
90
90
|
};
|
|
91
91
|
}
|
|
92
92
|
|
|
93
|
-
|
|
94
|
-
console.log('SCANOSS results', JSON.stringify(results, null, 2));
|
|
93
|
+
console.debug('SCANOSS results', JSON.stringify(results, undefined, 2));
|
|
95
94
|
|
|
96
95
|
let contentScanning: ScannerComponent[] | undefined = results['/content_scanning'];
|
|
97
96
|
if (!contentScanning) {
|