1.0.32

package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartnpm",
-  "version": "1.0.29",
+  "version": "1.0.32",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartnpm",
-  "version": "1.0.29",
+  "version": "1.0.32",
   "private": false,
   "description": "interface with npm to retrieve package information",
   "main": "dist_ts/index.js",

test/test.ts

@@ -37,11 +37,21 @@ tap.test('should get package from verdaccio', async () => {
 });
 
 tap.test('should get a specific file from a package', async () => {
-  const bundleFile = await verdaccioRegistry.getFileFromPackage(
+  const wantedFile = await verdaccioRegistry.getFileFromPackage(
     '@pushrocks/websetup',
     'ts/index.ts'
   );
-  console.log(bundleFile.contentBuffer.toString());
+  console.log(wantedFile.contentBuffer.toString());
+});
+
+tap.test('should get a specific file from a package', async () => {
+  const wantedFiles = await verdaccioRegistry.getFilesFromPackage(
+    '@pushrocks/websetup',
+    'ts/'
+  );
+  for(const file of wantedFiles) {
+    console.log(file.path);
+  }
 });
 
 tap.start();

ts/smartnpm.classes.npmpackage.ts

@@ -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;
       }
@@ -140,7 +139,7 @@ export class NpmPackage {
           // lets resolve with the wanted file
           done.resolve([fileArg]);
           subscription.unsubscribe();
-        } else if(fileArg.path.startsWith(wantedFilePath)) {
+        } else if(!returnOnFirstArg && fileArg.path.startsWith(wantedFilePath)) {
           allMatchingFiles.push(fileArg);
         }
       },
@@ -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;
+    }
+  }
 }

ts/smartnpm.classes.npmregistry.ts

@@ -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;
@@ -78,11 +86,20 @@ export class NpmRegistry {
     }
   }
 
-  public async getFilesFromPackage(packageNameArg: string, filePath: string, optionsArg: {
+  public async getFilesFromPackage(packageNameArg: string, filePath: string, optionsArg?: {
     distTag?: string;
     version?: string;
   }): Promise<plugins.smartfile.Smartfile[]> {
-    return [];
+    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('*')
+        };
+      }
+    }
+    return npmPackage.getFilesFromPackage(filePath, optionsArg);
   }
 
   public async getPackageAsSmartfileVirtualDir(packageNameArg: string): Promise<plugins.smartfile.VirtualDirectory> {