Skip to content

use an object for Package #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 13, 2024
Merged

use an object for Package #8

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 24 additions & 16 deletions index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import parse from 'node-html-parser';
import { parse } from 'node-html-parser';
import { existsSync, mkdirSync, readFileSync, writeFileSync } from 'fs';

const cachePath = '.cache';
Expand All @@ -14,14 +14,14 @@ const getComponents = async (filename) => {
};

export const getSpringBootVersion = async (components) => {
let springBoot = components.filter(component => component.group === 'org.springframework.boot' && component.name === 'spring-boot');
if (springBoot.length === 0) {
springBoot = components.filter(component => component.name === 'spring-boot');
let springBoot = components.find(component => component.group === 'org.springframework.boot' && component.name === 'spring-boot');
if (springBoot === undefined) {
springBoot = components.find(component => component.name === 'spring-boot');
}
if (springBoot.length === 0) {
if (springBoot === undefined) {
throw new Error('no spring boot version found');
}
return springBoot[0].version;
return springBoot.version;
};

const getDefaultSpringBootComponents = async (filename) => {
Expand All @@ -38,19 +38,17 @@ const retrieveSimilarPackages = async (bomFile) => {
const mismatchedPackages = [];
components.forEach(bomPackage => defaultComponents.forEach(bootPackage => {
if (bomPackage.group === bootPackage.group && bomPackage.name === bootPackage.name && bomPackage.version !== undefined && bomPackage.version !== bootPackage.version) {
mismatchedPackages.push({
group: bomPackage.group,
name: bomPackage.name,
bomVersion: bomPackage.version,
bootVersion: bootPackage.version,
});
const existingMatches = mismatchedPackages.find(mismatchedPackage => mismatchedPackage.group === bomPackage.group && mismatchedPackage.name === bomPackage.name && mismatchedPackage.bomVersion === bomPackage.version && mismatchedPackage.bootVersion === bootPackage.version);
if (!existingMatches) {
mismatchedPackages.push(new Package(bomPackage.group, bomPackage.name, bomPackage.version, bootPackage.version));
}
}
}));
console.log('mismatchedPackages', mismatchedPackages);

console.log('components size', components.length);
console.log('defaultComponents size', defaultComponents.length);
console.log('matchingPackages size', mismatchedPackages.length);
console.log('mismatchedPackages', mismatchedPackages);
// console.log('components size', components.length);
// console.log('defaultComponents size', defaultComponents.length);
// console.log('matchingPackages size', mismatchedPackages.length);
};

const getSpringDefaultVersions = async (sbVersion) => {
Expand Down Expand Up @@ -99,6 +97,16 @@ const ensureDirExists = async () => {
}
};

class Package {
constructor(group, name, bomVersion, bootVersion) {
this.group = group;
this.name = name;
this.bomVersion = bomVersion;
this.bootVersion = bootVersion;

}
}

(async () => {
const start = Date.now();
await retrieveSimilarPackages(process.argv[2]);
Expand Down
10 changes: 5 additions & 5 deletions test/test-index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import assert from 'node:assert';
import { rejects, strictEqual } from 'node:assert';
import { getSpringBootVersion } from '../index.js';

describe('test getSpringBootVersion', () => {
Expand All @@ -7,21 +7,21 @@ describe('test getSpringBootVersion', () => {
'group': 'org.springframework.boot', 'name': 'spring-boot', 'version': '3.1.9',
}];
const springBootVersion = await getSpringBootVersion(components);
assert.strictEqual(springBootVersion, '3.1.9');
strictEqual(springBootVersion, '3.1.9');
});

it('should get spring boot with only name and version', async () => {
const components = [{
'name': 'spring-boot', 'version': '3.1.1',
}];
const springBootVersion = await getSpringBootVersion(components);
assert.strictEqual(springBootVersion, '3.1.1');
strictEqual(springBootVersion, '3.1.1');
});

it('should throw an error when spring boot versio is not found', async () => {
it('should throw an error when spring boot version is not found', async () => {
const components = [{}];
// const springBootVersion = await getSpringBootVersion(components);
await assert.rejects(async () => {
await rejects(async () => {
await getSpringBootVersion(components);
}, Error('no spring boot version found'));
});
Expand Down