Skip to content

Commit d55499b

Browse files
fraxkenfraxken
committed
chore!: update scanner to v8.x
1 parent dde24ce commit d55499b

File tree

18 files changed

+71
-39
lines changed

18 files changed

+71
-39
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@
9999
"@nodesecure/ossf-scorecard-sdk": "^3.2.1",
100100
"@nodesecure/rc": "^5.0.0",
101101
"@nodesecure/report": "4.0.0",
102-
"@nodesecure/scanner": "^7.1.0",
102+
"@nodesecure/scanner": "8.1.0",
103103
"@nodesecure/server": "1.0.0",
104104
"@nodesecure/utils": "^2.2.0",
105105
"@nodesecure/vulnera": "^2.0.1",

‎public/components/views/home/home.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -398,7 +398,7 @@ export class HomeView {
398398
handleReport() {
399399
document.querySelector(".home--header--report").addEventListener("click", async() => {
400400
const popupReport = document.createElement("popup-report");
401-
popupReport.rootDependencyName = this.secureDataSet.data.rootDependencyName;
401+
popupReport.dependencyName = this.secureDataSet.data.rootDependency.name;
402402
popupReport.theme = this.secureDataSet.theme;
403403
window.dispatchEvent(new CustomEvent(EVENTS.MODAL_OPENED, {
404404
detail: {

‎public/components/views/home/report/report.js‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ class PopupReport extends LitElement {
157157

158158
static properties = {
159159
theme: { type: String },
160-
rootDependencyName: { type: String },
160+
dependencyName: { type: String },
161161
isLoading: { type: Boolean }
162162
};
163163

@@ -193,7 +193,7 @@ class PopupReport extends LitElement {
193193

194194
render() {
195195
const { popup: { report } } = window.i18n[currentLang()];
196-
const defaultTitle = `${this.rootDependencyName}'s report`;
196+
const defaultTitle = `${this.dependencyName}'s report`;
197197

198198
return html`
199199
<div class="${this.theme} report--popup">
@@ -236,7 +236,7 @@ class PopupReport extends LitElement {
236236
}
237237
this.isLoading = true;
238238
const formData = new FormData(e.target);
239-
const title = formData.get("title") || `${this.rootDependencyName} 's report`;
239+
const title = formData.get("title") || `${this.dependencyName} 's report`;
240240
const theme = formData.get("theme");
241241
const includesAllDeps = formData.get("includesAllDeps") === "includesAllDeps";
242242

‎public/main.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,9 +57,8 @@ async function onSocketPayload(event) {
5757
const data = event.detail;
5858
const { payload } = data;
5959

60-
// TODO: implement rootDependency as a whole spec in scanner
61-
const rootDepVersion = Object.keys(payload.dependencies[payload.rootDependencyName].versions)[0];
62-
window.activePackage = payload.rootDependencyName + "@" + rootDepVersion;
60+
const { name, version } = payload.rootDependency;
61+
window.activePackage = name + "@" + version;
6362

6463
await init({ navigateToNetworkView: true });
6564
initSearchNav(payload, {

‎src/commands/summary.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,10 @@ export async function main(json = "nsecure-result.json") {
1919
await i18n.getLocalLang();
2020
const dataFilePath = path.join(process.cwd(), json);
2121
const rawAnalysis = await fs.readFile(dataFilePath, { encoding: "utf-8" });
22-
const { rootDependencyName, dependencies } = JSON.parse(rawAnalysis);
22+
const { rootDependency, dependencies } = JSON.parse(rawAnalysis);
2323

2424
const ui = cliui({ width: 80 });
25-
const title = `${white().bold(`${i18n.getTokenSync("ui.stats.title")}:`)} ${cyan().bold(rootDependencyName)}`;
25+
const title = `${white().bold(`${i18n.getTokenSync("ui.stats.title")}:`)} ${cyan().bold(rootDependency.name)}`;
2626
ui.div(
2727
{ text: title, width: 50 }
2828
);

‎test/commands/cache.test.js‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,11 @@ describe("Cache command", { concurrency: 1 }, () => {
2929
before(async() => {
3030
if (fs.existsSync(DEFAULT_PAYLOAD_PATH) === false) {
3131
dummyPayload = {
32-
rootDependencyName: "test_runner",
32+
rootDependency: {
33+
name: "test_runner",
34+
version: "1.0.0",
35+
integrity: null
36+
},
3337
dependencies: {
3438
test_runner: {
3539
versions: {

‎test/fixtures/result-test1.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"id": "mMKxqU",
3-
"rootDependencyName": "express",
3+
"rootDependency": {
4+
"name": "express",
5+
"version": "3.0.0",
6+
"integrity": null
7+
},
48
"scannerVersion": "6.1.0",
59
"vulnerabilityStrategy": "none",
610
"warnings": [],

‎test/fixtures/result-test2.json‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
{
22
"id": "RGGiTs",
3-
"rootDependencyName": "express",
3+
"rootDependency": {
4+
"name": "express",
5+
"version": "3.0.0",
6+
"integrity": null
7+
},
48
"version": "3.0.0",
59
"vulnerabilityStrategy": "none",
610
"warnings": []

‎workspaces/cache/package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"dependencies": {
2424
"@nodesecure/flags": "3.0.3",
2525
"@nodesecure/js-x-ray": "10.2.0",
26-
"@nodesecure/scanner": "7.2.0",
26+
"@nodesecure/scanner": "8.1.0",
2727
"cacache": "20.0.3"
2828
}
2929
}

‎workspaces/cache/src/index.ts‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -152,24 +152,25 @@ export class AppCache {
152152
}
153153

154154
const payload = JSON.parse(fs.readFileSync(DEFAULT_PAYLOAD_PATH, "utf-8"));
155-
const version = Object.keys(payload.dependencies[payload.rootDependencyName].versions)[0];
156-
const formatted = `${payload.rootDependencyName}@${version}`;
155+
const { name, version } = payload.rootDependency;
156+
157+
const spec = `${name}@${version}`;
157158
const payloadsList = {
158-
mru: [formatted],
159+
mru: [spec],
159160
lru: [],
160-
current: formatted,
161+
current: spec,
161162
availables: [],
162163
lastUsed: {
163-
[formatted]: Date.now()
164+
[spec]: Date.now()
164165
},
165-
root: formatted
166+
root: spec
166167
};
167168

168169
if (logging) {
169-
this.#logger.info(`[cache|init](dep: ${formatted}|version: ${version}|rootDependencyName: ${payload.rootDependencyName})`);
170+
this.#logger.info(`[cache|init](dep: ${spec})`);
170171
}
171172
await cacache.put(CACHE_PATH, `${this.prefix}${kPayloadsCache}`, JSON.stringify(payloadsList));
172-
this.updatePayload(formatted, payload);
173+
this.updatePayload(spec, payload);
173174
}
174175

175176
async initPayloadsList(options: InitPayloadListOptions = {}) {
@@ -240,8 +241,9 @@ export class AppCache {
240241
async setRootPayload(payload: Payload, options: SetRootPayloadOptions = {}) {
241242
const { logging = true, local = false } = options;
242243

243-
const version = Object.keys(payload.dependencies[payload.rootDependencyName].versions)[0];
244-
const pkg = `${payload.rootDependencyName}@${version}${local ? "#local" : ""}`;
244+
const { name, version } = payload.rootDependency;
245+
246+
const pkg = `${name}@${version}${local ? "#local" : ""}`;
245247
this.updatePayload(pkg, payload);
246248

247249
await this.initPayloadsList({ logging });

0 commit comments

Comments
 (0)