[fix] 修复MacOS上，检测完成后显示组件路径错误

Author: magicyou

.gitignore

@@ -3,4 +3,5 @@
 .vscode/opensca*
 node_modules/
 out/
-engine
+engine
+opensca-*.vsix

.vscode/settings.json

@@ -9,9 +9,9 @@
   "typescript.tsc.autoDetect": "off",
   "editor.defaultFormatter": "esbenp.prettier-vscode",
   "editor.codeActionsOnSave": {
-    "source.fixAll": true,
-    "source.fixAll.eslint": true,
-    "source.organizeImports": true
+    "source.fixAll": "explicit",
+    "source.fixAll.eslint": "explicit",
+    "source.organizeImports": "explicit"
   },
   "eslint.validate": ["javascript", "javascriptreact"],
   "eslint.options": {

CHANGELOG.md

@@ -1,5 +1,9 @@
 # 更新记录
 
+## [1.0.8]
+
+- 修复：修复MacOS上，检测完成后显示组件路径错误
+
 ## [1.0.7]
 
 - 修复：修复切换检测结果，展示窗口不能自动切换到最上层

package.json

@@ -3,7 +3,7 @@
   "displayName": "OpenSCA Xcheck",
   "publisher": "Xmirror",
   "description": "OpenSCA Xcheck",
-  "version": "1.0.7",
+  "version": "1.0.8",
   "icon": "resources/xmirror_logo.png",
   "homepage": "https://opensca.xmirror.cn",
   "repository": {

src/common/utils.ts

@@ -121,11 +121,10 @@ export default class Utils {
   getScanPaths(): string[] {
     const list: ComponentDataType[] = this.getScanList();
     const pathList: string[] = [];
-
+    const splitSep = path.sep;
     list.forEach(item => {
       const path = item.paths[0];
-      // const itemPath = path.slice(0, path.indexOf('/[')).replace(this.workspacePath.replace(/\\/g, '/'), '');
-      const itemPath = path.slice(0, path.indexOf('\\['));
+      const itemPath = path.slice(0, path.indexOf(splitSep + '['));
       if (pathList.indexOf(itemPath) === -1) {
         pathList.push(itemPath);
       }
@@ -200,11 +199,12 @@ export default class Utils {
     };
 
     const newList = _uniqWith(list);
+    const splitSep = path.sep;
     return newList.map(item => {
       const completePath = item.paths[0];
-      const completeLocation = completePath.slice(0, completePath.indexOf('\\['));
-      const location = completeLocation.replace(this.workspacePath.replace(/\\/g, '/'), '');
-      const componentPath = completePath.slice(completePath.indexOf('\\[') + 1).replace(/\\\[/g, '->[');
+      const completeLocation = completePath.slice(0, completePath.indexOf(splitSep + '['));
+      const location = completeLocation.replace(this.workspacePath.replace(new RegExp(splitSep, 'g'), '/'), '');
+      const componentPath = completePath.slice(completePath.indexOf(splitSep + '[') + 1).replace(new RegExp(splitSep, 'g'), '->');
       const vulList = (item.vulnerabilities || []).sort((a: VulDataType, b: VulDataType) => a.security_level_id - b.security_level_id);
       if (vulList.length) {
         item.security_level_id = vulList[0].security_level_id;
@@ -219,7 +219,7 @@ export default class Utils {
         ...item,
         licenseStr: (item.licenses || []).map((itemLicense: ItemLicense) => itemLicense.name).join(','),
         vulnerabilities: (item.vulnerabilities || []).map(item => ({ ...item, cve_id: item.cve_id || '', cnnvd_id: item.cnnvd_id || '' })),
-        completeLocation: this.workspacePath + '' + completeLocation.slice(completePath.indexOf('\\')),
+        completeLocation: path.join(this.workspacePath, '../' + completeLocation),
         completePath,
         componentPath,
         location,

src/main/index.ts

@@ -30,7 +30,7 @@ import {
 
 import Storage from '../common/storage';
 import { BaseDataType } from '../common/types';
-import { OperationProvider } from '../provider/operationProvider';
+import { OperationProvider } from '../provider/OperationProvider';
 import { ResultProvider } from '../provider/resultProvider';
 import Webview from '../webview';
 

src/webview/index.ts

@@ -1,3 +1,4 @@
+import * as path from 'path';
 import * as vscode from 'vscode';
 import { BaseDataType, ComponentDataType, ProjectDataType, VulDataType } from '../common/types';
 
@@ -43,10 +44,11 @@ export default class Webview {
     this.panel.webview.onDidReceiveMessage(
       (message: MessageType) => {
         const { command, text } = message;
+        const splitSep = path.sep;
         switch (command) {
           case 'file':
             text &&
-              vscode.workspace.openTextDocument(((text || '') as any as string).split('====').join('\\')).then(document => {
+              vscode.workspace.openTextDocument(((text || '') as any as string).split('====').join(splitSep)).then(document => {
                 vscode.window.showTextDocument(document);
               });
             return;
@@ -206,6 +208,7 @@ export default class Webview {
    * @returns {any}
    */
   getComponentWebviewContent(baseData: null | ComponentDataType = null) {
+    const splitSep = path.sep;
     if (!!baseData && baseData.paths && baseData.paths.length) {
       baseData.path_str = baseData.paths.map(item => `<p>* ${item}</p>`).join('');
     }
@@ -291,7 +294,7 @@ export default class Webview {
             document.getElementById('btn_location').addEventListener('click', function () {
               vscode.postMessage({
                 command: 'file',
-                text: '${baseData?.completeLocation ? baseData?.completeLocation.split('\\').join('====') : ''}'
+                text: '${baseData?.completeLocation ? baseData?.completeLocation.split(splitSep).join('====') : ''}'
               });
             })
         }())