Compare commits
6 Commits
Author | SHA1 | Date | |
---|---|---|---|
0ef6d0ccb2 | |||
8e538fd84d | |||
6745115db7 | |||
5ebce389d3 | |||
b4100688ac | |||
77d515d915 |
2
package-lock.json
generated
2
package-lock.json
generated
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@pushrocks/smartnpm",
|
||||
"version": "1.0.30",
|
||||
"version": "1.0.34",
|
||||
"lockfileVersion": 1,
|
||||
"requires": true,
|
||||
"dependencies": {
|
||||
|
@ -1,6 +1,6 @@
|
||||
{
|
||||
"name": "@pushrocks/smartnpm",
|
||||
"version": "1.0.30",
|
||||
"version": "1.0.34",
|
||||
"private": false,
|
||||
"description": "interface with npm to retrieve package information",
|
||||
"main": "dist_ts/index.js",
|
||||
|
@ -108,21 +108,20 @@ export class NpmPackage {
|
||||
if (optionsArg.distTag && optionsArg.version) {
|
||||
throw new Error('Please either specify version OR disttag, not both.');
|
||||
}
|
||||
let targetVersion: plugins.smartversion.SmartVersion;
|
||||
let targetVersionString: string;
|
||||
if (optionsArg.distTag) {
|
||||
const targetDistTag = this.allDistTags.find((distTag) => {
|
||||
return distTag.name === optionsArg.distTag;
|
||||
});
|
||||
if (targetDistTag) {
|
||||
targetVersion = new plugins.smartversion.SmartVersion(targetDistTag.targetVersion);
|
||||
targetVersionString = targetDistTag.targetVersion;
|
||||
}
|
||||
} else {
|
||||
targetVersion = plugins.smartversion.SmartVersion.fromFuzzyString(optionsArg.version);
|
||||
targetVersionString = optionsArg.version;
|
||||
}
|
||||
|
||||
// lets find the best matching release
|
||||
const versionStrings = this.allVersions.map((packageVersion) => packageVersion.version);
|
||||
const bestMatchingVersion = targetVersion.getBestMatch(versionStrings);
|
||||
const bestMatchingVersion = this.getBestMatchingVersion(targetVersionString);
|
||||
if (!bestMatchingVersion) {
|
||||
return null;
|
||||
}
|
||||
@ -173,4 +172,15 @@ export class NpmPackage {
|
||||
* updates the package with information from the registry
|
||||
*/
|
||||
update() {}
|
||||
|
||||
/** */
|
||||
public getBestMatchingVersion(versionArg: string): string {
|
||||
// lets find the best matching release
|
||||
const targetVersion = plugins.smartversion.SmartVersion.fromFuzzyString(versionArg);
|
||||
const versionStrings = this.allVersions.map((packageVersion) => packageVersion.version);
|
||||
const bestMatchingVersion = targetVersion.getBestMatch(versionStrings);
|
||||
if (!bestMatchingVersion) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -70,6 +70,14 @@ export class NpmRegistry {
|
||||
const cachedFile: plugins.smartfile.Smartfile = await this.registryCache.getCachedFile(fileId);
|
||||
if (!cachedFile) {
|
||||
const npmPackage = await this.getPackageInfo(packageNameArg);
|
||||
if (!optionsArg?.version && !optionsArg?.distTag) {
|
||||
const latestAvailable = npmPackage.allDistTags.find(packageArg => packageArg.name === 'latest');
|
||||
if (!latestAvailable) {
|
||||
optionsArg = {
|
||||
version: npmPackage.getBestMatchingVersion('*')
|
||||
};
|
||||
}
|
||||
}
|
||||
const fileResult = await npmPackage.getFileFromPackage(filePath, optionsArg);
|
||||
this.registryCache.cacheSmartFile(fileId, fileResult);
|
||||
return fileResult;
|
||||
@ -83,6 +91,14 @@ export class NpmRegistry {
|
||||
version?: string;
|
||||
}): Promise<plugins.smartfile.Smartfile[]> {
|
||||
const npmPackage = await this.getPackageInfo(packageNameArg);
|
||||
if (!optionsArg?.version && !optionsArg?.distTag) {
|
||||
const latestAvailable = npmPackage.allDistTags.find(packageDistTagArg => packageDistTagArg.name === 'latest');
|
||||
if (!latestAvailable) {
|
||||
optionsArg = {
|
||||
version: npmPackage.getBestMatchingVersion('*')
|
||||
};
|
||||
}
|
||||
}
|
||||
return npmPackage.getFilesFromPackage(filePath, optionsArg);
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user