Merge pull request objectionary#3989 from maxonfjvipon/bug/objectionary#3199/move-resolve-out-of-assemble

bug(objectionary#3199): move `ResolveMojo` out of `assemble` pipeline

Author: yegor256

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

@@ -37,9 +37,6 @@ public final class AssembleMojo extends SafeMojo {
         new Moja<>(ShakeMojo.class),
         new Moja<>(ProbeMojo.class),
         new Moja<>(PullMojo.class),
-        new Moja<>(ResolveMojo.class),
-        new Moja<>(MarkMojo.class),
-        new Moja<>(PlaceMojo.class),
     };
 
     @Override

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

@@ -26,6 +26,8 @@ public final class CompileMojo extends SafeMojo {
         new Moja<>(DownloadDepsMojo.class),
         new Moja<>(AssembleMojo.class),
         new Moja<>(LintMojo.class),
+        new Moja<>(ResolveMojo.class),
+        new Moja<>(PlaceMojo.class),
     };
 
     @Override

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

@@ -7,6 +7,7 @@
 import java.nio.file.Path;
 import java.util.function.Supplier;
 import org.cactoos.Func;
+import org.cactoos.io.InputOf;
 
 /**
  * Default footprint that covers all the scenarios of updating target
@@ -63,7 +64,15 @@ final class FpDefault extends FpEnvelope {
         final Supplier<String> hash,
         final Path tail
     ) {
-        this(new FpGenerated(content), base, semver, hash, tail);
+        this(
+            new FpGenerated(
+                src -> new InputOf(content.apply(src))
+            ),
+            base,
+            semver,
+            hash,
+            tail
+        );
     }
 
     /**

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

@@ -4,7 +4,6 @@
  */
 package org.eolang.maven;
 
-import java.io.IOException;
 import java.nio.file.Path;
 import org.cactoos.BiFunc;
 import org.cactoos.func.UncheckedBiFunc;
@@ -14,44 +13,36 @@
  * condition.
  * @since 0.41
  */
-final class FpFork implements Footprint {
+final class FpFork extends FpEnvelope {
     /**
-     * Lazy condition.
-     */
-    private final UncheckedBiFunc<Path, Path, Boolean> condition;
-
-    /**
-     * First wrapped footprint.
-     */
-    private final Footprint first;
-
-    /**
-     * Second wrapped footprint.
+     * Ctor.
+     * @param condition Condition as boolean
+     * @param first First wrapped footprint
+     * @param second Second wrapped footprint
      */
-    private final Footprint second;
+    FpFork(final boolean condition, final Footprint first, final Footprint second) {
+        this((src, tgt) -> condition, first, second);
+    }
 
     /**
      * Ctor.
      * @param condition Lazy condition
-     * @param first First wrapped condition
-     * @param second Second wrapped condition
+     * @param first First wrapped footprint
+     * @param second Second wrapped footprint
      */
     FpFork(
         final BiFunc<Path, Path, Boolean> condition, final Footprint first, final Footprint second
     ) {
-        this.condition = new UncheckedBiFunc<>(condition);
-        this.first = first;
-        this.second = second;
-    }
-
-    @Override
-    public Path apply(final Path source, final Path target) throws IOException {
-        final Footprint footprint;
-        if (this.condition.apply(source, target)) {
-            footprint = this.first;
-        } else {
-            footprint = this.second;
-        }
-        return footprint.apply(source, target);
+        super(
+            (src, tgt) -> {
+                final Footprint footprint;
+                if (new UncheckedBiFunc<>(condition).apply(src, tgt)) {
+                    footprint = first;
+                } else {
+                    footprint = second;
+                }
+                return footprint.apply(src, tgt);
+            }
+        );
     }
 }

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

@@ -7,7 +7,8 @@
 import java.io.IOException;
 import java.nio.file.Path;
 import org.cactoos.Func;
-import org.cactoos.scalar.ScalarOf;
+import org.cactoos.Input;
+import org.cactoos.func.UncheckedFunc;
 
 /**
  * Footprint that saves content generated from lambda to the target file.
@@ -17,18 +18,18 @@ final class FpGenerated implements Footprint {
     /**
      * Content function.
      */
-    private final Func<Path, String> content;
+    private final UncheckedFunc<Path, Input> content;
 
     /**
      * Ctor.
-     * @param content Content function
+     * @param content Content as bytes
      */
-    FpGenerated(final Func<Path, String> content) {
-        this.content = content;
+    FpGenerated(final Func<Path, Input> content) {
+        this.content = new UncheckedFunc<>(content);
     }
 
     @Override
     public Path apply(final Path source, final Path target) throws IOException {
-        return new Saved(new ScalarOf<>(this.content, source), target).value();
+        return new Saved(this.content.apply(source), target).value();
     }
 }

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

@@ -43,7 +43,7 @@ public final class LintMojo extends SafeMojo {
     /**
      * The directory where to transpile to.
      */
-    static final String DIR = "6-lint";
+    static final String DIR = "5-lint";
 
     /**
      * Subdirectory for optimized cache.

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

@@ -7,18 +7,21 @@
 import com.github.lombrozo.xnav.Filter;
 import com.github.lombrozo.xnav.Xnav;
 import com.jcabi.log.Logger;
+import com.jcabi.xml.XML;
 import com.jcabi.xml.XMLDocument;
+import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.file.Path;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 import org.apache.maven.plugins.annotations.ResolutionScope;
-import org.cactoos.Func;
 import org.cactoos.io.InputOf;
 import org.cactoos.iterable.Filtered;
 import org.eolang.parser.EoSyntax;
+import org.w3c.dom.Node;
 import org.xembly.Directives;
 import org.xembly.Xembler;
 
@@ -95,15 +98,20 @@ private int parsed(final TjForeign tojo) throws Exception {
         final String name = tojo.identifier();
         final Path base = this.targetDir.toPath().resolve(ParseMojo.DIR);
         final Path target = new Place(name).make(base, AssembleMojo.XMIR);
+        final List<Node> refs = new ArrayList<>(1);
         tojo.withXmir(
             new FpDefault(
-                this.parse(name),
+                src -> {
+                    final Node node = this.parsed(src, name);
+                    refs.add(node);
+                    return new XMLDocument(node).toString();
+                },
                 this.cache.toPath().resolve(ParseMojo.CACHE),
                 this.plugin.getVersion(),
                 new TojoHash(tojo),
                 base.relativize(target)
             ).apply(source, target)
-        );
+        ).withVersion(ParseMojo.version(target, refs));
         final List<Xnav> errors = new Xnav(target)
             .element("program")
             .element("errors")
@@ -126,26 +134,65 @@ private int parsed(final TjForeign tojo) throws Exception {
     }
 
     /**
-     * Function that parses EO source.
+     * Source parsed to {@link Node}.
+     * @param source Relative source path
      * @param name Name of the EO object
-     * @return Function that parses EO source
+     * @return Parsed EO object as {@link Node}
+     * @throws IOException If fails to parse
      */
-    private Func<Path, String> parse(final String name) {
-        return source -> {
-            final String parsed = new XMLDocument(
-                new Xembler(
-                    new Directives().xpath("/program").attr(
-                        "source",  this.sourcesDir.toPath().relativize(source.toAbsolutePath())
-                    )
-                ).applyQuietly(new EoSyntax(name, new InputOf(source)).parsed().inner())
-            ).toString();
-            Logger.debug(
-                ParseMojo.class,
-                "Parsed program %s:\n %s",
-                name,
-                parsed
-            );
-            return parsed;
-        };
+    private Node parsed(final Path source, final String name) throws IOException {
+        final XML xmir = new EoSyntax(name, new InputOf(source)).parsed();
+        final Path src = this.sourcesDir.toPath().relativize(source.toAbsolutePath());
+        final Node node = new Xembler(
+            new Directives().xpath("/program").attr("source",  src)
+        ).applyQuietly(xmir.inner());
+        Logger.debug(
+            ParseMojo.class,
+            "Parsed program '%s' from %[file]s:\n %s",
+            name, src, xmir
+        );
+        return node;
+    }
+
+    /**
+     * Tojo version.
+     * The version can be extracted from:
+     * 1. Parsed {@link Node} if EO object was parsed for the first time
+     * 2. XML document that was already parsed before
+     * @param target Path to result XML document
+     * @param parsed List with either one parsed {@link Node} or empty
+     * @return Tojo version
+     * @throws FileNotFoundException If XML document file does not exist
+     */
+    private static String version(
+        final Path target,
+        final List<Node> parsed
+    ) throws FileNotFoundException {
+        final Node node;
+        if (parsed.isEmpty()) {
+            node = new XMLDocument(target).inner();
+        } else {
+            node = parsed.get(0);
+        }
+        return new Xnav(node)
+            .element("program")
+            .element("metas")
+            .elements(
+                Filter.all(
+                    Filter.withName("meta"),
+                    meta -> new Xnav(meta)
+                        .elements(
+                            Filter.all(
+                                Filter.withName("head"),
+                                head -> head.text().map("version"::equals).orElse(false)
+                            )
+                        )
+                        .findAny()
+                        .isPresent()
+                )
+            )
+            .findFirst()
+            .map(meta -> meta.element("tail").text().get())
+            .orElse(ParseMojo.ZERO);
     }
 }