feat(#1602): discover depends on place

eo-maven-plugin/src/main/java/org/eolang/maven/DiscoverMojo.java

@@ -30,14 +30,16 @@
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.HashSet;
-import java.util.Set;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.cactoos.iterable.Filtered;
+import org.cactoos.iterable.Mapped;
 import org.cactoos.set.SetOf;
 import org.eolang.maven.name.ObjectName;
+import org.eolang.maven.name.OnDefault;
 import org.eolang.maven.name.OnReplaced;
 import org.eolang.maven.name.OnSwap;
+import org.eolang.maven.name.OnVersioned;
 import org.eolang.maven.tojos.ForeignTojo;
 import org.eolang.maven.util.Rel;
 
@@ -56,27 +58,16 @@ public final class DiscoverMojo extends SafeMojo {
     @Override
     public void exec() throws FileNotFoundException {
         final Collection<ForeignTojo> tojos = this.scopedTojos().notDiscovered();
-        final Collection<ObjectName> discovered = new HashSet<>(1);
+        final Collection<String> discovered = new HashSet<>();
         for (final ForeignTojo tojo : tojos) {
             final Path src = tojo.optimized();
-            tojo.withDiscovered(
-                (int) this.discover(src)
-                    .stream()
-                    .filter(name -> !name.isEmpty())
-                    .map(
-                        name -> new OnSwap(
-                            this.withVersions,
-                            new OnReplaced(name, this.hashes)
-                        )
-                    )
-                    .peek(
-                        name -> this.scopedTojos()
-                            .add(name)
-                            .withDiscoveredAt(src)
-                    )
-                    .peek(discovered::add)
-                    .count()
-            );
+            final Collection<String> names = this.discover(src, tojo);
+            discovered.addAll(names);
+            for (final String name : names) {
+                this.scopedTojos().add(name).withDiscoveredAt(src);
+                discovered.add(name);
+            }
+            tojo.withDiscovered(discovered.size());
         }
         if (tojos.isEmpty()) {
             if (this.scopedTojos().size() == 0) {
@@ -101,13 +92,14 @@ public void exec() throws FileNotFoundException {
      * Pull all deps found in the provided XML file.
      *
      * @param file The .xmir file
+     * @param tojo Current tojo.
      * @return List of foreign objects found
      */
-    private Collection<String> discover(final Path file) {
-        final XML saxon = new SaxonDocument(file);
-        final Collection<String> names = DiscoverMojo.names(saxon);
-        if (!saxon.xpath("//o[@vararg]").isEmpty()) {
-            names.add("org.eolang.tuple");
+    private Collection<String> discover(final Path file, final ForeignTojo tojo) {
+        final XML xml = new SaxonDocument(file);
+        final Collection<String> names = this.names(xml, tojo);
+        if (!xml.xpath("//o[@vararg]").isEmpty()) {
+            names.add(this.versioned("org.eolang.tuple", tojo).toString());
         }
         if (names.isEmpty()) {
             Logger.debug(
@@ -127,28 +119,56 @@ private Collection<String> discover(final Path file) {
      * Get a unique list of object names from given XML.
      *
      * @param xml XML.
+     * @param tojo Current tojo.
      * @return Object names.
      */
-    private static Set<String> names(final XML xml) {
+    private Collection<String> names(final XML xml, final ForeignTojo tojo) {
         return new SetOf<>(
-            new Filtered<>(
-                obj -> !obj.isEmpty(),
-                xml.xpath(
-                    String.join(
-                        "",
-                        "//o[",
-                        "not(starts-with(@base,'.'))",
-                        " and @base != 'Q'",
-                        " and @base != '^'",
-                        " and @base != '$'",
-                        " and @base != '&'",
-                        " and not(@ref)",
-                        "]/string-join((@base, @ver),'",
-                        OnReplaced.DELIMITER,
-                        "')"
+            new Mapped<>(
+                (String name) -> this.versioned(name, tojo).toString(),
+                new Filtered<>(
+                    name -> !name.isEmpty(),
+                    xml.xpath(
+                        String.join(
+                            "",
+                            "//o[",
+                            "not(starts-with(@base,'.'))",
+                            " and @base != 'Q'",
+                            " and @base != '^'",
+                            " and @base != '$'",
+                            " and @base != '&'",
+                            " and not(@ref)",
+                            "]/string-join((@base,@ver),'",
+                            OnReplaced.DELIMITER,
+                            "')"
+                        )
                     )
                 )
             )
         );
     }
+
+    /**
+     * Handle versioning of given object name.
+     *
+     * @param name Object name with tag on not.
+     * @param tojo Current tojo.
+     * @return Versioned object name.
+     */
+    private ObjectName versioned(final String name, final ForeignTojo tojo) {
+        final String identifier = tojo.identifier();
+        final ObjectName replaced = new OnReplaced(name, this.hashes);
+        return new OnSwap(
+            this.withVersions,
+            new OnSwap(
+                identifier.contains(OnReplaced.DELIMITER),
+                new OnVersioned(
+                    replaced,
+                    new OnDefault(identifier)::hash,
+                    true
+                ),
+                replaced
+            )
+        );
+    }
 }

eo-maven-plugin/src/main/java/org/eolang/maven/name/OnDefault.java

@@ -0,0 +1,70 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2016-2023 Objectionary.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ */
+package org.eolang.maven.name;
+
+import org.eolang.maven.hash.CommitHash;
+
+/**
+ * Default object name that just split given raw string to name and hash.
+ *
+ * @since 0.31.0
+ */
+public final class OnDefault implements ObjectName {
+
+    /**
+     * Raw string.
+     */
+    private final String raw;
+
+    /**
+     * Ctor.
+     * @param object Object name with hash.
+     */
+    public OnDefault(final String object) {
+        this.raw = object;
+    }
+
+    @Override
+    public String value() {
+        return this.split()[0];
+    }
+
+    @Override
+    public CommitHash hash() {
+        return new CommitHash.ChConstant(this.split()[1]);
+    }
+
+    @Override
+    public String toString() {
+        return this.raw;
+    }
+
+    /**
+     * Split raw to name and hash.
+     * @return Split raw
+     */
+    private String[] split() {
+        return this.raw.split(String.format("\\%s", OnReplaced.DELIMITER));
+    }
+}

eo-maven-plugin/src/main/java/org/eolang/maven/name/OnVersioned.java

@@ -23,6 +23,7 @@
  */
 package org.eolang.maven.name;
 
+import org.cactoos.Scalar;
 import org.cactoos.scalar.Unchecked;
 import org.eolang.maven.hash.CommitHash;
 
@@ -42,15 +43,34 @@ public final class OnVersioned implements ObjectName {
     /**
      * Default hash.
      */
-    private final CommitHash hsh;
+    private final Unchecked<CommitHash> hsh;
+
+    /**
+     * Put default hash forcibly.
+     */
+    private final boolean force;
 
     /**
      * Ctor.
      * @param origin Origin object name
      * @param hash Default hash if a version in full name is absent.
      */
     public OnVersioned(final ObjectName origin, final CommitHash hash) {
-        this(new Unchecked<>(origin::toString), hash);
+        this(origin, () -> hash, false);
+    }
+
+    /**
+     * Ctor.
+     * @param origin Origin object name
+     * @param hash Default hash if a version in full name is absent
+     * @param force Put a default version forcibly
+     */
+    public OnVersioned(
+        final ObjectName origin,
+        final Scalar<CommitHash> hash,
+        final boolean force
+    ) {
+        this(new Unchecked<>(origin::toString), new Unchecked<>(hash), force);
     }
 
     /**
@@ -70,17 +90,23 @@ public OnVersioned(final String object, final String hash) {
      * @param def Default hash if a version in full name is absent.
      */
     public OnVersioned(final String object, final CommitHash def) {
-        this(new Unchecked<>(() -> object), def);
+        this(new Unchecked<>(() -> object), new Unchecked<>(() -> def), false);
     }
 
     /**
      * Ctor.
      * @param object Object full name with a version or not as scalar.
      * @param def Default hash if a version in full name is absent.
+     * @param force Put a default version forcibly.
      */
-    private OnVersioned(final Unchecked<String> object, final CommitHash def) {
+    private OnVersioned(
+        final Unchecked<String> object,
+        final Unchecked<CommitHash> def,
+        final boolean force
+    ) {
         this.object = object;
         this.hsh = def;
+        this.force = force;
     }
 
     @Override
@@ -108,8 +134,8 @@ public String toString() {
      */
     private String[] split() {
         String[] splt = this.object.value().split(String.format("\\%s", OnReplaced.DELIMITER));
-        if (splt.length == 1) {
-            splt = new String[]{splt[0], this.hsh.value()};
+        if (splt.length == 1 || this.force) {
+            splt = new String[]{splt[0], this.hsh.value().value()};
         }
         return splt;
     }

eo-maven-plugin/src/test/java/org/eolang/maven/DiscoverMojoTest.java

@@ -26,6 +26,8 @@
 import com.yegor256.tojos.MnCsv;
 import java.io.IOException;
 import java.nio.file.Path;
+import java.nio.file.Paths;
+import java.util.Arrays;
 import java.util.Deque;
 import java.util.LinkedList;
 import java.util.List;
@@ -35,6 +37,7 @@
 import org.eolang.maven.hash.CommitHash;
 import org.eolang.maven.hash.CommitHashesMap;
 import org.eolang.maven.name.ObjectName;
+import org.eolang.maven.name.OnDefault;
 import org.eolang.maven.name.OnVersioned;
 import org.eolang.maven.tojos.ForeignTojo;
 import org.eolang.maven.tojos.ForeignTojos;
@@ -174,6 +177,52 @@ void discoversWithSeveralObjectsWithDifferentVersions(
         );
     }
 
+    @Test
+    void discoversDifferentUnversionedObjectsFromDifferentVersionedObjects(@TempDir final Path tmp)
+        throws IOException {
+        final Map<String, CommitHash> hashes = new CommitHashesMap.Fake();
+        final String program = String.join("\n", "[] > sprintf", "  \"Hello world\" > @");
+        final String one = hashes.get("0.28.1").value();
+        final String two = hashes.get("0.28.2").value();
+        final String string = "org.eolang.string";
+        final String sprintf = "foo/x/sprintf";
+        final String object = "foo.x.sprintf";
+        final String ext = "%s.eo";
+        final String format = String.join("_", "%s", ext);
+        final ForeignTojos tojos = new FakeMaven(tmp)
+            .with("withVersions", true)
+            .withProgram(
+                Paths.get(String.format(format, sprintf, one)),
+                program,
+                new OnVersioned(object, one)
+            )
+            .withProgram(
+                Paths.get(String.format(format, sprintf, two)),
+                program,
+                new OnVersioned(object, two)
+            )
+            .withProgram(
+                Paths.get(String.format(ext, sprintf)),
+                program,
+                new OnDefault(object)
+            )
+            .execute(new FakeMaven.Discover())
+            .externalTojos();
+        MatcherAssert.assertThat(
+            String.format(
+                "Tojos should contained 3 similar objects %s: 2 with different hashes %s and one without; but they didn't",
+                string,
+                Arrays.toString(new String[]{one, two})
+            ),
+            tojos.contains(
+                new OnVersioned(string, one),
+                new OnVersioned(string, two),
+                new OnDefault(string)
+            ),
+            Matchers.is(true)
+        );
+    }
+
     @Test
     void doesNotDiscoverWithVersions(@TempDir final Path tmp) throws IOException {
         final FakeMaven maven = new FakeMaven(tmp)