Fix jar structure

Signed-off-by: Phillip Kruger <[email protected]>

.locker/pom.xml

@@ -5,7 +5,7 @@
   xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.mvnpm</groupId>
-  <version>3.0.22-SNAPSHOT</version>
+  <version>3.0.23-SNAPSHOT</version>
   <artifactId>mvnpm-locker</artifactId>
   <packaging>pom</packaging>
 

pom.xml

@@ -3,7 +3,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>io.mvnpm</groupId>
   <artifactId>mvnpm</artifactId>
-  <version>3.0.22-SNAPSHOT</version>
+  <version>3.0.23-SNAPSHOT</version>
   <name>mvnpm</name>
   <description>Maven on NPM</description>
   <url>https://mvnpm.org/</url>

src/main/java/io/mvnpm/file/type/JarClient.java

@@ -135,19 +135,18 @@ private void tgzEntryToJarEntry(io.mvnpm.npm.model.Package p, ArchiveEntry entry
         String name = entry.getName();
         final boolean shouldAdd = !matches(FILES_TO_EXCLUDE, name);
         final boolean shouldTgz = matches(FILES_TO_TGZ, name);
-
-        // do not add entries that will result in invalid zip file systems that will not be able to be opened
-        // by quarkus because it uses the ZipFileSystem implementation.
-        final String jarEntryPath = MVN_ROOT + importMapRoot + name;
-        final String tarEntryPath = importMapRoot + name;
-        // paths that include "/./" or "/../" as path element are invalid
-        if (jarEntryPath.startsWith("./") || jarEntryPath.contains("/./")
-                || (shouldTgz && (tarEntryPath.startsWith(".") || tarEntryPath.contains("/./")))) {
-            return;
-        }
-
         if (shouldAdd || shouldTgz) {
             name = name.replaceFirst(NPM_ROOT, Constants.EMPTY);
+            // do not add entries that will result in invalid zip file systems that will not be able to be opened
+            // by quarkus because it uses the ZipFileSystem implementation.
+            final String jarEntryPath = MVN_ROOT + importMapRoot + name;
+            final String tarEntryPath = importMapRoot + name;
+            // paths that include "/./" or "/../" as path element are invalid
+            if (jarEntryPath.startsWith("./") || jarEntryPath.contains("/./")
+                    || (shouldTgz && (tarEntryPath.startsWith(".") || tarEntryPath.contains("/./")))) {
+                return;
+            }
+
             try (ByteArrayOutputStream baos = new ByteArrayOutputStream();
                     BufferedOutputStream bos = new BufferedOutputStream(baos, bufferSize)) {
                 IOUtils.copy(tar, bos, bufferSize);