Merge branch 'master' of github.com:objectionary/eo

Author: yegor256

.codacy.yml

@@ -6,4 +6,4 @@
 #  package name contains capital letter and such names are conventional.
 ---
 exclude_paths:
-  - "eo-maven-plugin/src/test/java/org/eolang/maven/ResolveMojoIT.java"
+  - "eo-maven-plugin/src/test/java/org/eolang/maven/RegisterMojoIT.java"

.github/workflows/zerocracy.yml

@@ -16,7 +16,7 @@ jobs:
     timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
-      - uses: zerocracy/[email protected].69
+      - uses: zerocracy/[email protected].71
         with:
           verbose: false
           cycles: 1
@@ -26,7 +26,7 @@ jobs:
           options: |
             vitals_url=https://www.eolang.org/zerocracy/objectionary-vitals.html
           factbase: objectionary.fb
-      - uses: zerocracy/[email protected].43
+      - uses: zerocracy/[email protected].44
         with:
           factbase: objectionary.fb
           output: pages

eo-maven-plugin/pom.xml

@@ -23,7 +23,7 @@
     <dependency>
       <groupId>org.eolang</groupId>
       <artifactId>lints</artifactId>
-      <version>0.0.39</version>
+      <version>0.0.42</version>
     </dependency>
     <dependency>
       <groupId>org.glassfish</groupId>

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

@@ -5,7 +5,6 @@
 package org.eolang.maven;
 
 import com.jcabi.log.Logger;
-import java.io.File;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
 
@@ -32,32 +31,12 @@ final void exec() {
             );
             return;
         }
-        if (this.purge(this.targetDir)) {
+        if (new Deleted(this.targetDir).get()) {
             Logger.info(
                 this,
                 "Deleted all files in the %[file]s directory",
                 this.targetDir
             );
         }
     }
-
-    /**
-     * Recursive deletion.
-     *
-     * @param dir Directory to be deleted
-     * @return State {@code true} if deleted, {@code false} otherwise
-     */
-    private boolean purge(final File dir) {
-        final File[] contents = dir.listFiles();
-        if (null != contents) {
-            for (final File file : contents) {
-                this.purge(file);
-            }
-        }
-        final boolean state = dir.delete();
-        if (state) {
-            Logger.debug(this, "The directory %[file]s purged", dir);
-        }
-        return state;
-    }
 }

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

@@ -63,8 +63,7 @@ public Iterator<Dependency> iterator() {
         );
         final Collection<Dependency> deps = new HashSet<>(0);
         for (final TjForeign tojo : list) {
-            if (ParseMojo.ZERO.equals(tojo.version())
-                && !this.discover) {
+            if (ParseMojo.ZERO.equals(tojo.version()) && !this.discover) {
                 Logger.debug(
                     this,
                     "Program %s skipped due to its zero version",
@@ -73,7 +72,7 @@ public Iterator<Dependency> iterator() {
                 continue;
             }
             final Optional<Dependency> opt = DcsDefault.artifact(tojo.xmir());
-            if (!opt.isPresent()) {
+            if (opt.isEmpty()) {
                 Logger.debug(this, "No dependencies for %s", tojo.description());
                 continue;
             }
@@ -105,10 +104,15 @@ public Iterator<Dependency> iterator() {
      */
     private static Optional<Dependency> artifact(final Path file) {
         final Collection<String> coords = DcsDefault.jvms(file);
+        if (coords.size() > 1) {
+            throw new IllegalStateException(
+                Logger.format("Too many (%d) dependencies at %[file]s", coords.size(), file)
+            );
+        }
         final Optional<Dependency> dep;
         if (coords.isEmpty()) {
             dep = Optional.empty();
-        } else if (coords.size() == 1) {
+        } else {
             final String[] parts = coords.iterator().next().split(":");
             final Dependency dependency = new Dependency();
             dependency.setGroupId(parts[0]);
@@ -122,10 +126,6 @@ private static Optional<Dependency> artifact(final Path file) {
             }
             dependency.setScope("transpile");
             dep = Optional.of(dependency);
-        } else {
-            throw new IllegalStateException(
-                Logger.format("Too many (%d) dependencies at %[file]s", coords.size(), file)
-            );
         }
         return dep;
     }
@@ -148,13 +148,13 @@ private static Collection<String> jvms(final Path file) {
                         meta -> {
                             final Xnav xnav = new Xnav(meta);
                             final Optional<String> head = xnav.element("head").text();
-                            final boolean runtime = head.isPresent() && "rt".equals(head.get());
+                            final boolean runtime = head.map("rt"::equals).orElse(false);
                             final Optional<Xnav> part = xnav.elements(
                                 Filter.withName("part")
                             ).findFirst();
                             return runtime
                                 && part.isPresent()
-                                && "jvm".equals(part.get().text().get());
+                                && part.get().text().map("jvm"::equals).orElse(false);
                         }
                     )
                 )

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

@@ -0,0 +1,56 @@
+/*
+ * SPDX-FileCopyrightText: Copyright (c) 2016-2025 Objectionary.com
+ * SPDX-License-Identifier: MIT
+ */
+package org.eolang.maven;
+
+import com.jcabi.log.Logger;
+import java.io.File;
+import java.util.function.Supplier;
+
+/**
+ * Deleting a directory with files or just a file.
+ *
+ * @since 0.52
+ */
+final class Deleted implements Supplier<Boolean> {
+    /**
+     * Target file or directory to be deleted.
+     */
+    private final File target;
+
+    /**
+     * Ctor.
+     * @param file File or directory to be deleted
+     */
+    Deleted(final File file) {
+        this.target = file;
+    }
+
+    @Override
+    public Boolean get() {
+        return this.purge(this.target);
+    }
+
+    /**
+     * Recursive deletion.
+     *
+     * @param dir File or directory to be deleted
+     * @return State {@code true} if deleted, {@code false} otherwise
+     */
+    private boolean purge(final File dir) {
+        if (dir.isDirectory()) {
+            final File[] contents = dir.listFiles();
+            if (null != contents) {
+                for (final File file : contents) {
+                    this.purge(file);
+                }
+            }
+        }
+        final boolean state = dir.delete();
+        if (state) {
+            Logger.debug(this, "The file or directory %[file]s purged", dir);
+        }
+        return state;
+    }
+}

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

@@ -160,7 +160,8 @@ private int lintAll(final ConcurrentHashMap<Severity, Integer> counts) throws IO
         for (final Map.Entry<String, Path> ent : paths.entrySet()) {
             pkg.put(ent.getKey(), new XMLDocument(ent.getValue()));
         }
-        final Collection<Defect> defects = new Programs(pkg).defects();
+        final Collection<Defect> defects = new Programs(pkg)
+            .without("unlint-non-existing-defect").defects();
         for (final Defect defect : defects) {
             counts.compute(defect.severity(), (sev, before) -> before + 1);
             LintMojo.embed(
@@ -258,15 +259,15 @@ private static String summary(final ConcurrentHashMap<Severity, Integer> counts)
      * @param xmir The XML before linting
      * @param counts Counts of errors, warnings, and critical
      * @return XML after linting
-     * @todo #3934:35min Remove .without() from Program to enable `unknown-metas`
-     *  and `unsorted-metas` lints. Currently we disabled them since lints does not
-     *  support `+spdx` meta yet. Once <a href="https://github.com/objectionary/lints/issues/354">this</a>
-     *  issue will be resolved, we should enable all lints.
+     * @todo #3977:25min Enable `unlint-non-existing-defect` lint.
+     *  Currently its disabled because of <a href="https://github.com/objectionary/lints/issues/385">this</a>
+     *  bug. Once issue will be resolved, we should enable this lint. Don't forget to enable
+     *  this lint in WPA scope too.
      */
     private static XML linted(final XML xmir, final ConcurrentHashMap<Severity, Integer> counts) {
         final Directives dirs = new Directives();
         final Collection<Defect> defects = new Program(xmir).without(
-            "unknown-metas", "unsorted-metas"
+            "unlint-non-existing-defect"
         ).defects();
         if (!defects.isEmpty()) {
             dirs.xpath("/program").addIf("errors").strict(1);

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

@@ -7,7 +7,6 @@
 import com.github.lombrozo.xnav.Filter;
 import com.github.lombrozo.xnav.Xnav;
 import com.jcabi.log.Logger;
-import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.nio.file.Path;
 import java.util.Collection;
@@ -16,7 +15,6 @@
 import java.util.stream.Stream;
 import org.apache.maven.plugins.annotations.LifecyclePhase;
 import org.apache.maven.plugins.annotations.Mojo;
-import org.cactoos.iterable.Filtered;
 import org.cactoos.iterable.IterableOf;
 import org.cactoos.iterable.Mapped;
 import org.cactoos.list.ListOf;
@@ -89,9 +87,7 @@ private void probe() throws IOException {
                     continue;
                 }
                 ++count;
-                this.scopedTojos()
-                    .add(object)
-                    .withDiscoveredAt(src);
+                this.scopedTojos().add(object).withDiscoveredAt(src);
                 probed.add(object);
             }
             tojo.withProbed(count);
@@ -123,17 +119,13 @@ private void probe() throws IOException {
      *
      * @param file The .xmir file
      * @return List of foreign objects found
-     * @throws FileNotFoundException If not found
      */
-    private Collection<String> probes(final Path file) throws FileNotFoundException {
+    private Collection<String> probes(final Path file) {
         final long start = System.currentTimeMillis();
         final Collection<String> objects = new ListOf<>(
             new Mapped<>(
                 ProbeMojo::noPrefix,
-                new Filtered<>(
-                    obj -> !obj.isEmpty(),
-                    ProbeMojo.probeMetas(file)
-                )
+                ProbeMojo.metas(file)
             ).iterator()
         );
         if (objects.isEmpty()) {
@@ -151,12 +143,13 @@ private Collection<String> probes(final Path file) throws FileNotFoundException
     }
 
     /**
-     * Return probe metas.
-     * The equivalent xpath is: "/program/metas/meta[head/text() = 'probe']/tail/text()"
+     * Return metas for probing.
+     * The equivalent xpath is:
+     * "/program/metas/meta[head/text()='probe' or head/text()='also']/tail[not(text()='')]/text()"
      * @param file XML file
      * @return Metas to probe
      */
-    private static Iterable<String> probeMetas(final Path file) {
+    private static Iterable<String> metas(final Path file) {
         return new IterableOf<>(
             new Xnav(file)
                 .element("program")
@@ -170,11 +163,14 @@ private static Iterable<String> probeMetas(final Path file) {
                                 final Optional<String> head = new Xnav(meta)
                                     .element("head")
                                     .text();
-                                return head.isPresent() && "probe".equals(head.get());
+                                return head.map(
+                                    text -> "probe".equals(text) || "also".equals(text)
+                                ).orElse(false);
                             }
                         )
                     )
                     .map(meta -> meta.element("tail").text().get())
+                    .filter(meta -> !meta.isEmpty())
                 )
                 .orElse(Stream.of())
                 .iterator()

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

@@ -5,6 +5,7 @@
 package org.eolang.maven;
 
 import com.jcabi.log.Logger;
+import java.io.File;
 import java.nio.file.Path;
 import java.util.Collection;
 import java.util.Set;
@@ -67,6 +68,7 @@ public void exec() {
                 String.format("sourcesDir is null. Please specify a valid sourcesDir for %s", this)
             );
         }
+        this.removeOldFiles();
         final Pattern pattern = Pattern.compile("^[a-zA-Z0-9\\-]+\\.eo$");
         final int before = this.scopedTojos().size();
         if (before > 0) {
@@ -104,4 +106,17 @@ public void exec() {
             sources.size(), this.sourcesDir, this.foreign, this.includeSources, this.excludeSources
         );
     }
+
+    private void removeOldFiles() {
+        final File[] files = {
+            this.foreign,
+            this.targetDir.toPath().resolve(PullMojo.DIR).toFile(),
+            this.targetDir.toPath().resolve(ResolveMojo.DIR).toFile(),
+        };
+        for (final File file : files) {
+            if (file.exists()) {
+                new Deleted(file).get();
+            }
+        }
+    }
 }

eo-maven-plugin/src/main/resources/org/eolang/maven/shake/add-probes.xsl

@@ -7,15 +7,14 @@
   <!--
   For every object FQN add probe meta
   with fully qualified name of the object.
-  Example:
-   For object:
+  For instance, for object:
    <o base=".abc" ... >
      <o base=".edf" ... >
        <o base="Q.number"/>
      </o>
    </o>
 
-   Metas will be added:
+  The next metas will be added:
    <meta>
      <head>probe</head>
      <tail>Q.org</tail>
@@ -92,9 +91,9 @@
     <xsl:variable name="parts" select="tokenize(@base, '\.')"/>
     <xsl:for-each select="$parts">
       <xsl:variable name="pos" select="position()"/>
-      <p>
+      <a>
         <xsl:value-of select="string-join($parts[position()&lt;=$pos], '.')"/>
-      </p>
+      </a>
     </xsl:for-each>
     <xsl:apply-templates select="o" mode="create"/>
   </xsl:template>