Fix the NPM package listing

Author: sswguo

addons/content-browse/ftests/src/main/java/org/commonjava/indy/content/browse/ftest/StoreNPMThenListingDirTest.java

@@ -0,0 +1,110 @@
+/**
+ * Copyright (C) 2011-2020 Red Hat, Inc. (https://github.com/Commonjava/indy)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.commonjava.indy.content.browse.ftest;
+
+import org.apache.commons.io.IOUtils;
+import org.commonjava.indy.ftest.core.AbstractContentManagementTest;
+import org.commonjava.indy.model.core.HostedRepository;
+import org.commonjava.indy.model.core.StoreKey;
+import org.commonjava.indy.pkg.maven.model.MavenPackageTypeDescriptor;
+import org.commonjava.indy.pkg.npm.model.NPMPackageTypeDescriptor;
+import org.junit.Test;
+
+import java.io.ByteArrayInputStream;
+import java.io.InputStream;
+import java.net.URL;
+
+import static org.commonjava.indy.model.core.StoreType.hosted;
+import static org.hamcrest.CoreMatchers.equalTo;
+import static org.hamcrest.CoreMatchers.notNullValue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThat;
+
+/**
+ * Verifies that the available packages are listed via browse api.
+ * <br/>
+ * Given:
+ * <ul>
+ *     <li>Content is stored in a NPM hosted repository</li>
+ * </ul>
+ * <br/>
+ * When:
+ * <ul>
+ *     <li>A directory on the stored content's path is requested via GET.
+ *        <br/>
+ *        <ul>
+ *          <li>directly from the hosted repository or from the scoped level</li>
+ *          <li>without a trailing '/' or a '/index.html' in the requested path</li>
+ *          <li>without using Accept: application/json</li>
+ *        </ul>
+ *      </li>
+ * </ul>
+ * <br/>
+ * Then:
+ * <ul>
+ *     <li>The directory listing should be rendered to HTML</li>
+ * </ul>
+ */
+public class StoreNPMThenListingDirTest
+        extends AbstractContentManagementTest
+{
+
+    @Test
+    public void run()
+        throws Exception
+    {
+
+        final String changelog = "Create test structures";
+
+        final HostedRepository hostedRepository =
+                this.client.stores()
+                        .create( new HostedRepository(NPMPackageTypeDescriptor.NPM_PKG_KEY, STORE ), changelog, HostedRepository.class );
+
+        final String content = "This is a test: " + System.nanoTime();
+        final InputStream stream = new ByteArrayInputStream( content.getBytes() );
+
+        final String dirPath = "/@babel/opossum";
+        final String path = dirPath + "/package.json";
+
+        final StoreKey testKey = hostedRepository.getKey();
+
+        assertThat( client.content().exists( testKey, path ), equalTo( false ) );
+
+        client.content().store( testKey, path, stream );
+
+        assertThat( client.content().exists( testKey, path ), equalTo( true ) );
+
+        try(InputStream jsonIn = client.content().get( testKey, "@babel" ))
+        {
+            assertThat( jsonIn, notNullValue() );
+            String json = IOUtils.toString( jsonIn );
+            assertThat( json.startsWith( "{" ), equalTo( true ) );
+            assertThat( json.contains( "/@babel/opossum/" ), equalTo( true ) );
+        }
+
+        try(InputStream jsonIn = client.content().get( testKey, "/" ))
+        {
+            assertThat( jsonIn, notNullValue() );
+            String json = IOUtils.toString( jsonIn );
+            assertThat( json.startsWith( "{" ), equalTo( true ) );
+            assertThat( json.contains( "/@babel/" ), equalTo( true ) );
+        }
+
+        assertThat( client.content()
+                          .exists( testKey, path ), equalTo( true ) );
+
+    }
+}

addons/pkg-npm/common/src/main/java/org/commonjava/indy/pkg/npm/content/NPMStoragePathCalculator.java

@@ -86,9 +86,9 @@ public String calculateStoragePath( final StoreKey key, final String path )
             }
 
             // This is considering the single path for npm standard like "/jquery"
-            final boolean isSinglePath = pkg.split( "/" ).length < 2;
+            final boolean isSinglePath = !pkg.startsWith( "@" ) && pkg.split( "/" ).length == 1;
             // This is considering the scoped path for npm standard like "/@type/jquery"
-            final boolean isScopedPath = pkg.startsWith( "@" ) && pkg.split( "/" ).length < 3;
+            final boolean isScopedPath = pkg.startsWith( "@" ) && pkg.split( "/" ).length == 2;
             if ( isSinglePath || isScopedPath )
             {
                 logger.debug( "Modifying target path: {}, appending '{}', store {}", path, NPM_METADATA_NAME,