fix(core): update
This commit is contained in:
@@ -1,13 +1,35 @@
|
||||
import * as plugins from './smartnpm.plugins';
|
||||
import { NpmRegistry } from './smartnpm.classes.npmregistry';
|
||||
import { PackageDisttag } from './smartnpm.classes.packagedisttag';
|
||||
import { PackageVersion, IVersionData } from './smartnpm.classes.packageversion';
|
||||
|
||||
export class NpmPackage {
|
||||
public static async createFromFullMetadata(
|
||||
public static async createFromFullMetadataAndVersionData(
|
||||
npmRegistryArg: NpmRegistry,
|
||||
fullMetadata: plugins.packageJson.FullMetadata
|
||||
fullMetadataArg: plugins.packageJson.FullMetadata,
|
||||
versionsDataArg: {
|
||||
name: string;
|
||||
'dist-tags': { [key: string]: string };
|
||||
versions: { [key: string]: IVersionData };
|
||||
}
|
||||
) {
|
||||
const npmPackage = new NpmPackage(npmRegistryArg);
|
||||
Object.assign(npmPackage, fullMetadata);
|
||||
Object.assign(npmPackage, fullMetadataArg);
|
||||
npmPackage.allVersions = [];
|
||||
npmPackage.allDistTags = [];
|
||||
for (const versionArg of Object.keys(versionsDataArg.versions)) {
|
||||
const packageVersion = PackageVersion.createFromVersionData(
|
||||
versionsDataArg.versions[versionArg]
|
||||
);
|
||||
npmPackage.allVersions.push(packageVersion);
|
||||
}
|
||||
for (const distTagArg of Object.keys(versionsDataArg['dist-tags'])) {
|
||||
const packageDistTag = new PackageDisttag(
|
||||
distTagArg,
|
||||
versionsDataArg['dist-tags'][distTagArg]
|
||||
);
|
||||
npmPackage.allDistTags.push(packageDistTag);
|
||||
}
|
||||
return npmPackage;
|
||||
}
|
||||
|
||||
@@ -15,6 +37,8 @@ export class NpmPackage {
|
||||
public name: string = null;
|
||||
public scope: string = null;
|
||||
public version: string = null;
|
||||
public allVersions: PackageVersion[];
|
||||
public allDistTags: PackageDisttag[];
|
||||
public description: string = null;
|
||||
public keywords: string[] = null;
|
||||
public date: string;
|
||||
@@ -62,23 +86,54 @@ export class NpmPackage {
|
||||
}
|
||||
|
||||
/**
|
||||
* saves the package to memory
|
||||
* saves the complete package to cache
|
||||
*/
|
||||
public async saveToMemory() {}
|
||||
public async saveToCache() {}
|
||||
|
||||
/**
|
||||
* get file from package
|
||||
*/
|
||||
public async getFileFromPackage(filePath: string): Promise<plugins.smartfile.Smartfile> {
|
||||
public async getFileFromPackage(
|
||||
filePath: string,
|
||||
optionsArg?: {
|
||||
distTag?: string;
|
||||
version?: string;
|
||||
}
|
||||
): Promise<plugins.smartfile.Smartfile> {
|
||||
const done = plugins.smartpromise.defer<plugins.smartfile.Smartfile>();
|
||||
const smartarchiveInstance = new plugins.smartarchive.SmartArchive();
|
||||
const fileObservable = await smartarchiveInstance.extractArchiveFromUrlToObservable(
|
||||
this.dist.tarball
|
||||
);
|
||||
let tarballUrl = this.dist.tarball;
|
||||
if (optionsArg && (optionsArg.version || optionsArg.distTag)) {
|
||||
if (optionsArg.distTag && optionsArg.version) {
|
||||
throw new Error('Please either sepcify version OR disttag, not both.');
|
||||
}
|
||||
let targetVersion: plugins.smartversion.SmartVersion;
|
||||
if (optionsArg.distTag) {
|
||||
const targetDistTag = this.allDistTags.find((distTag) => {
|
||||
return distTag.name === optionsArg.distTag;
|
||||
});
|
||||
if (targetDistTag) {
|
||||
targetVersion = new plugins.smartversion.SmartVersion(targetDistTag.targetVersion);
|
||||
}
|
||||
} else {
|
||||
const smartversion = plugins.smartversion.SmartVersion.fromFuzzyString(optionsArg.version);
|
||||
}
|
||||
|
||||
// lets find the best matching release
|
||||
const versionStrings = this.allVersions.map((packageVersion) => packageVersion.version);
|
||||
const bestMatchingVersion = targetVersion.getBestMatch(versionStrings);
|
||||
tarballUrl = this.allVersions.find(
|
||||
(packageVersion) => packageVersion.version === bestMatchingVersion
|
||||
).dist.tarball;
|
||||
}
|
||||
const fileObservable = await smartarchiveInstance.extractArchiveFromUrlToObservable(tarballUrl);
|
||||
const wantedFilePath = plugins.path.join('package', filePath);
|
||||
const subscription = fileObservable.subscribe(
|
||||
(fileArg) => {
|
||||
if (fileArg.path === wantedFilePath) {
|
||||
// lets care about caching
|
||||
|
||||
// lets resolve with the wanted file
|
||||
done.resolve(fileArg);
|
||||
subscription.unsubscribe();
|
||||
}
|
||||
@@ -92,4 +147,9 @@ export class NpmPackage {
|
||||
);
|
||||
return done.promise;
|
||||
}
|
||||
|
||||
/**
|
||||
* updates the package with information from the registry
|
||||
*/
|
||||
update() {}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user