1.0.32

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pushrocks/smartnpm",
-  "version": "1.0.24",
+  "version": "1.0.32",
   "private": false,
   "description": "interface with npm to retrieve package information",
   "main": "dist_ts/index.js",
@@ -14,9 +14,9 @@
   "devDependencies": {
     "@gitzone/tsbuild": "^2.1.25",
     "@gitzone/tsrun": "^1.2.12",
-    "@gitzone/tstest": "^1.0.52",
+    "@gitzone/tstest": "^1.0.54",
     "@pushrocks/tapbundle": "^3.2.14",
-    "@types/node": "^14.14.41",
+    "@types/node": "^15.0.1",
     "tslint": "^6.1.3",
     "tslint-config-prettier": "^1.18.0"
   },

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

@@ -91,65 +91,96 @@ export class NpmPackage {
   public async saveToCache() {}
 
   /**
-   * get file from package
+   * get files from package
    */
-  public async getFileFromPackage(
+  public async getFilesFromPackage(
     filePath: string,
-    optionsArg?: {
+    optionsArg: {
       distTag?: string;
       version?: string;
-    }
+    },
-  ): Promise<plugins.smartfile.Smartfile> {
+    returnOnFirstArg = false
-    const done = plugins.smartpromise.defer<plugins.smartfile.Smartfile>();
+  ): Promise<plugins.smartfile.Smartfile[]> {
+    const done = plugins.smartpromise.defer<plugins.smartfile.Smartfile[]>();
     const smartarchiveInstance = new plugins.smartarchive.SmartArchive();
-    let tarballUrl = this.dist.tarball;
+    let tarballUrl = this.dist?.tarball;
-    if (optionsArg && (optionsArg.version || optionsArg.distTag)) {
+    if (optionsArg?.version || optionsArg?.distTag) {
       if (optionsArg.distTag && optionsArg.version) {
-        throw new Error('Please either sepcify version OR disttag, not both.');
+        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 {
-        const smartversion = 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 = this.getBestMatchingVersion(targetVersionString);
-      const bestMatchingVersion = targetVersion.getBestMatch(versionStrings);
+      if (!bestMatchingVersion) {
+        return null;
+      }
       tarballUrl = this.allVersions.find(
         (packageVersion) => packageVersion.version === bestMatchingVersion
       ).dist.tarball;
     }
     const fileObservable = await smartarchiveInstance.extractArchiveFromUrlToObservable(tarballUrl);
     const wantedFilePath = plugins.path.join('package', filePath);
+    const allMatchingFiles: plugins.smartfile.Smartfile[] = [];
     const subscription = fileObservable.subscribe(
       (fileArg) => {
-        if (fileArg.path === wantedFilePath) {
+        // returnOnFirstArg requires exact match
-          // lets care about caching
+        if (returnOnFirstArg && fileArg.path === wantedFilePath) {
-
           // lets resolve with the wanted file
-          done.resolve(fileArg);
+          done.resolve([fileArg]);
           subscription.unsubscribe();
+        } else if(!returnOnFirstArg && fileArg.path.startsWith(wantedFilePath)) {
+          allMatchingFiles.push(fileArg);
         }
       },
       (err) => {
         console.log(err);
       },
       () => {
+        done.resolve(allMatchingFiles);
         subscription.unsubscribe();
       }
     );
     return done.promise;
   }
 
+  /**
+   * get files from package
+   */
+   public async getFileFromPackage(
+    filePath: string,
+    optionsArg?: {
+      distTag?: string;
+      version?: string;
+    }
+  ): Promise<plugins.smartfile.Smartfile> {
+    const result = await this.getFilesFromPackage(filePath, optionsArg, true);
+    return result[0];
+  }
+
   /**
    * 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

@@ -36,6 +36,9 @@ export class NpmRegistry {
     const fullMetadata = await plugins.packageJson(packageName, {
       registryUrl: this.options.npmRegistryUrl,
       fullMetadata: true,
+    }).catch(err => {
+      console.log(err);
+      return null;
     });
     const versionData = await plugins.packageJson(packageName, {
       registryUrl: this.options.npmRegistryUrl,
@@ -67,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;
@@ -75,6 +86,22 @@ export class NpmRegistry {
     }
   }
 
+  public async getFilesFromPackage(packageNameArg: string, filePath: string, optionsArg?: {
+    distTag?: string;
+    version?: string;
+  }): Promise<plugins.smartfile.Smartfile[]> {
+    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> {
     /**
      * TODO: rewrite as memory only

ts/smartnpm.classes.registrycache.ts

@@ -22,9 +22,11 @@ export class RegistryCache {
   }
 
   public async cacheSmartFile (fileIdArg: string, smartfileArg: plugins.smartfile.Smartfile) {
-    await this.levelCache.storeCacheEntryByKey(fileIdArg, new plugins.levelcache.CacheEntry({
+    if (smartfileArg) {
-      contents: Buffer.from(smartfileArg.foldToJson()),
+      await this.levelCache.storeCacheEntryByKey(fileIdArg, new plugins.levelcache.CacheEntry({
-      ttl: 60000
+        contents: Buffer.from(smartfileArg.foldToJson()),
-    }));
+        ttl: 60000
+      }));
+    }
   }
 }