fix(core): update
This commit is contained in:
@@ -6,7 +6,7 @@ import { ISearchObject } from './smartnpm.interfaces';
|
||||
|
||||
// classes
|
||||
import { NpmPackage } from './smartnpm.classes.npmpackage';
|
||||
import { RegistryCache } from './smartnpm.classes.registrycache';
|
||||
import { ICacheDescriptor, RegistryCache } from './smartnpm.classes.registrycache';
|
||||
|
||||
export interface INpmRegistryConstructorOptions {
|
||||
npmRegistryUrl?: string;
|
||||
@@ -62,12 +62,23 @@ export class NpmRegistry {
|
||||
/**
|
||||
* gets a file from a package as Smartfile
|
||||
*/
|
||||
public async getFileFromPackage(packageNameArg: string, filePath: string, optionsArg?: {
|
||||
public async getFileFromPackage(packageNameArg: string, filePathArg: string, optionsArg?: {
|
||||
distTag?: string;
|
||||
version?: string;
|
||||
}): Promise<plugins.smartfile.Smartfile> {
|
||||
const fileId = `${this.options.npmRegistryUrl}//+//${packageNameArg}//+//${filePath}//+//${optionsArg?.distTag || optionsArg?.version}`;
|
||||
const cachedFile: plugins.smartfile.Smartfile = await this.registryCache.getCachedFile(fileId);
|
||||
// lets create a cache descriptor
|
||||
const cacheDescriptor: ICacheDescriptor = {
|
||||
registryUrl: this.options.npmRegistryUrl,
|
||||
packageName: packageNameArg,
|
||||
filePath: filePathArg,
|
||||
distTag: optionsArg?.distTag,
|
||||
version: optionsArg?.version
|
||||
};
|
||||
|
||||
// lets see if we have something cached
|
||||
const cachedFile: plugins.smartfile.Smartfile = await this.registryCache.getCachedFile(cacheDescriptor);
|
||||
|
||||
// lets handle both occasions
|
||||
if (!cachedFile) {
|
||||
const npmPackage = await this.getPackageInfo(packageNameArg);
|
||||
if (!optionsArg?.version && !optionsArg?.distTag) {
|
||||
@@ -78,8 +89,8 @@ export class NpmRegistry {
|
||||
};
|
||||
}
|
||||
}
|
||||
const fileResult = await npmPackage.getFileFromPackage(filePath, optionsArg);
|
||||
this.registryCache.cacheSmartFile(fileId, fileResult);
|
||||
const fileResult = await npmPackage.getFileFromPackage(filePathArg, optionsArg);
|
||||
this.registryCache.cacheSmartFile(cacheDescriptor, fileResult);
|
||||
return fileResult;
|
||||
} else {
|
||||
return cachedFile;
|
||||
|
||||
Reference in New Issue
Block a user