fix(core): update

This commit is contained in:
Philipp Kunz 2019-09-06 13:22:54 +02:00
parent 7cc7c54587
commit 1d5e94244b
3 changed files with 36 additions and 35 deletions

View File

@ -11,15 +11,15 @@ tap.test('should create valid instances', async () => {
npmRegistry = new smartnpm.NpmRegistry();
expect(npmRegistry).to.be.instanceof(smartnpm.NpmRegistry);
testPackage = new smartnpm.NpmPackage({});
testPackage = new smartnpm.NpmPackage();
expect(testPackage).to.be.instanceof(smartnpm.NpmPackage);
});
tap.test('should produce a valid search string and this return npmts', async () => {
const packages = await npmRegistry.search({
name: 'npmts'
name: '@pushrocks/smartupdate'
});
expect(packages[0].name).to.equal('npmts');
expect(packages[0].name).to.equal('@pushrocks/smartupdate');
});
// lets test things with the verdaccio registry
@ -31,8 +31,8 @@ tap.test('should create a verdaccio registry', async () => {
});
tap.test('should get package from verdaccui', async () => {
const packageInfo = await verdaccioRegistry.getPackageInfo('@pushrocks/smartupdate');
expect(packageInfo.license).to.equal('MIT');
const npmPackage = await verdaccioRegistry.getPackageInfo('@pushrocks/smartupdate');
expect(npmPackage.license).to.equal('MIT');
});
tap.start();

View File

@ -1,27 +1,35 @@
import * as plugins from './smartnpm.plugins';
export class NpmPackage {
name: string = null;
scope: string = null;
version: string = null;
description: string = null;
keywords: string[] = null;
date: '2017-08-02T11:22:49.144Z';
links: {
public static async createFromFullMetadata(fullMetadata: plugins.packageJson.FullMetadata) {
const npmPackage = new NpmPackage();
Object.assign(npmPackage, fullMetadata);
return npmPackage;
}
// INSTANCE
public name: string = null;
public scope: string = null;
public version: string = null;
public description: string = null;
public keywords: string[] = null;
public date: string;
public license: string;
public links: {
npm: string;
homepage: string;
repository: string;
bugs: string;
} = null;
author: {
};
public author: {
name: 'Lossless GmbH';
} = null;
publisher: {
};
public publisher: {
username: 'gitzone';
email: 'npm@git.zone';
} = null;
maintainers: any = null;
score: {
};
public maintainers: any = null;
public score: {
final: number;
detail: {
quality: number;
@ -29,13 +37,5 @@ export class NpmPackage {
maintenance: number;
};
} = null;
searchScore: number = null;
constructor(descriptionArg) {
for (let key in descriptionArg) {
if (this[key] === null) {
this[key] = descriptionArg[key];
}
}
}
public searchScore: number = null;
}

View File

@ -25,12 +25,13 @@ export class NpmRegistry {
};
}
public async getPackageInfo(packageName: string) {
const result = await plugins.packageJson(packageName, {
public async getPackageInfo(packageName: string): Promise<NpmPackage> {
const fullMetadata = await plugins.packageJson(packageName, {
registryUrl: this.options.npmRegistryUrl,
fullMetadata: true
});
return result;
const npmPackage = await NpmPackage.createFromFullMetadata(fullMetadata);
return npmPackage;
}
public async search(searchObjectArg: ISearchObject) {
@ -121,9 +122,9 @@ export class NpmRegistry {
return packageArray;
}
for (const packageArg of body.results) {
const localPackage = new NpmPackage(packageArg.package);
packageArray.push(localPackage);
for (const packageSearchInfoArg of body.results) {
const npmPackage = await this.getPackageInfo(packageSearchInfoArg.package.name);
packageArray.push(npmPackage);
}
return packageArray;