Add asciidoc converter to core

buildSrc/build.gradle

@@ -38,6 +38,7 @@ dependencies {
     }
     implementation("com.networknt:json-schema-validator")
     implementation("io.micronaut.rss:micronaut-rss")
+    implementation("org.asciidoctor:asciidoctorj:3.0.0")
     testImplementation("org.skyscreamer:jsonassert:1.5.3")
 }
 

buildSrc/src/main/groovy/io/micronaut/guides/GuideAsciidocGenerator.groovy

@@ -5,16 +5,9 @@ import groovy.transform.CompileStatic
 import groovy.transform.Memoized
 import io.micronaut.context.ApplicationContext
 import io.micronaut.core.annotation.NonNull
-import io.micronaut.core.io.ResourceLoader
-import io.micronaut.core.io.scan.DefaultClassPathResourceLoader
 import io.micronaut.core.util.StringUtils
-import io.micronaut.guides.core.App
-import io.micronaut.guides.core.DefaultVersionLoader
-import io.micronaut.guides.core.DependencyLines
-import io.micronaut.guides.core.Guide
-import io.micronaut.guides.core.GuideUtils
-import io.micronaut.guides.core.GuidesOption
-import io.micronaut.guides.core.VersionLoader
+import io.micronaut.guides.GuideProjectGenerator
+import io.micronaut.guides.core.*
 import io.micronaut.starter.api.TestFramework
 import io.micronaut.starter.build.dependencies.Coordinate
 import io.micronaut.starter.build.dependencies.PomDependencyVersionResolver
@@ -29,12 +22,7 @@ import java.util.regex.Pattern
 import java.util.stream.Collectors
 
 import static io.micronaut.starter.api.TestFramework.SPOCK
-import static io.micronaut.starter.application.ApplicationType.CLI
-import static io.micronaut.starter.application.ApplicationType.DEFAULT
-import static io.micronaut.starter.application.ApplicationType.FUNCTION
-import static io.micronaut.starter.application.ApplicationType.GRPC
-import static io.micronaut.starter.application.ApplicationType.MESSAGING
-import static io.micronaut.starter.options.Language.GROOVY
+import static io.micronaut.starter.application.ApplicationType.*
 
 @CompileStatic
 class GuideAsciidocGenerator {
@@ -183,7 +171,7 @@ class GuideAsciidocGenerator {
                 String app = matches[1] ?: 'default'
                 cliCommandForApp(metadata, app)
                         .orElseThrow {
-                            new GradleException("No CLI command found for app: $app -- should be one of ${metadata.apps().stream().flatMap {"@$it:cli-command@"}.collect(Collectors.joining(", "))}")
+                            new GradleException("No CLI command found for app: $app -- should be one of ${metadata.apps().stream().flatMap { "@$it:cli-command@" }.collect(Collectors.joining(", "))}")
                         }
             }
 
@@ -267,12 +255,11 @@ class GuideAsciidocGenerator {
                 include rawLine, rawLines, projectDir, true
             } else if (rawLine.startsWith(EXTERNAL) && rawLine.endsWith(']')) {
                 include rawLine, rawLines, projectDir, false
-            }else if (rawLine.startsWith(COMMON_PARAMETRIZED) && rawLine.endsWith(']')){
+            } else if (rawLine.startsWith(COMMON_PARAMETRIZED) && rawLine.endsWith(']')) {
                 rawLines.addAll includeParametrized(rawLine, projectDir, true)
-            } else if (rawLine.startsWith(EXTERNAL_PARAMETRIZED) && rawLine.endsWith(']')){
+            } else if (rawLine.startsWith(EXTERNAL_PARAMETRIZED) && rawLine.endsWith(']')) {
                 rawLines.addAll includeParametrized(rawLine, projectDir, false)
-            }
-            else {
+            } else {
                 rawLines << rawLine
             }
         }
@@ -339,9 +326,9 @@ class GuideAsciidocGenerator {
                         case 'L':
                             line = line.replace(replaceString, value.toUpperCase())
                             break
-                       default:
+                        default:
                             line = line.replace(replaceString, value)
-                           break
+                            break
                     }
                     newLines[i] = line
                 }
@@ -595,7 +582,7 @@ class GuideAsciidocGenerator {
         if (features) {
             featureNames = features.tokenize('|')
         } else {
-            featureNames = ([] as List<String>) + GuideUtils.getAppVisibleFeatures(app,guidesOption.language)
+            featureNames = ([] as List<String>) + GuideUtils.getAppVisibleFeatures(app, guidesOption.language)
         }
 
         String featureExcludes = extractFromParametersLine(line, 'featureExcludes')
@@ -657,12 +644,12 @@ class GuideAsciidocGenerator {
         List<String> attrs = line.substring(line.indexOf("[") + 1, line.indexOf("]")).tokenize(",")
 
         return attrs
-            .stream()
-            .filter({ it.startsWith(attributeName) })
-            .map({ it.tokenize("=") })
-            .map({ it.get(1) })
-            .findFirst()
-            .orElse("")
+                .stream()
+                .filter({ it.startsWith(attributeName) })
+                .map({ it.tokenize("=") })
+                .map({ it.get(1) })
+                .findFirst()
+                .orElse("")
     }
 
     private static String resolveAsciidoctorLanguage(String fileName) {

buildSrc/src/main/java/io/micronaut/guides/core/CalloutMacroSubstitution.java

@@ -0,0 +1,21 @@
+package io.micronaut.guides.core;
+
+import jakarta.inject.Singleton;
+
+@Singleton
+public class CalloutMacroSubstitution extends LineMacroSubstitution {
+    @Override
+    protected String getMacroName() {
+        return "callout";
+    }
+
+    @Override
+    protected String getBaseDirectory() {
+        return "{calloutsDir}";
+    }
+
+    @Override
+    protected String getPrefix() {
+        return "callout-";
+    }
+}

buildSrc/src/main/java/io/micronaut/guides/core/CommonMacroSubstitution.java

@@ -0,0 +1,22 @@
+package io.micronaut.guides.core;
+
+import jakarta.inject.Singleton;
+
+@Singleton
+public class CommonMacroSubstitution extends LineMacroSubstitution {
+
+    @Override
+    protected String getMacroName() {
+        return "common";
+    }
+
+    @Override
+    protected String getBaseDirectory() {
+        return "{commonsDir}";
+    }
+
+    @Override
+    protected String getPrefix() {
+        return "common-";
+    }
+}

buildSrc/src/main/java/io/micronaut/guides/core/ExternalMacroSubstitution.java

@@ -0,0 +1,22 @@
+package io.micronaut.guides.core;
+
+import jakarta.inject.Singleton;
+
+@Singleton
+public class ExternalMacroSubstitution extends LineMacroSubstitution {
+
+    @Override
+    protected String getMacroName() {
+        return "external";
+    }
+
+    @Override
+    protected String getBaseDirectory() {
+        return "{guidesDir}";
+    }
+
+    @Override
+    protected String getPrefix() {
+        return "";
+    }
+}

buildSrc/src/main/java/io/micronaut/guides/core/ExternalTemplateMacroSubstitution.java

@@ -0,0 +1,21 @@
+package io.micronaut.guides.core;
+
+import jakarta.inject.Singleton;
+
+@Singleton
+public class ExternalTemplateMacroSubstitution extends LineMacroSubstitution {
+    @Override
+    protected String getMacroName() {
+        return "external-template";
+    }
+
+    @Override
+    protected String getBaseDirectory() {
+        return "{guidesDir}";
+    }
+
+    @Override
+    protected String getPrefix() {
+        return "";
+    }
+}

buildSrc/src/main/java/io/micronaut/guides/core/GuideLinkMacroSubstitution.java

@@ -0,0 +1,34 @@
+package io.micronaut.guides.core;
+
+import jakarta.inject.Singleton;
+
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import static io.micronaut.guides.core.MacroUtils.findMacroInstances;
+
+@Singleton
+public class GuideLinkMacroSubstitution implements MacroSubstitution {
+    private static final Pattern GUIDE_LINK_REGEX = Pattern.compile("guideLink:(.*?)\\[(.*?)]");
+
+    private static String processGuideLink(String line) {
+        Matcher matcher = GUIDE_LINK_REGEX.matcher(line);
+        if (matcher.find()) {
+            String slug = matcher.group(1).trim();
+            String text = matcher.group(2);
+            return "link:" + slug + ".html[" + text + "]";
+        }
+        return line;
+    }
+
+    @Override
+    public String substitute(String str, Guide guide, GuidesOption option) {
+        for (String instance : findMacroInstances(str, GUIDE_LINK_REGEX)) {
+            String res = processGuideLink(instance);
+            str = str.replace(instance, res);
+        }
+
+        return str;
+    }
+
+}

buildSrc/src/main/java/io/micronaut/guides/core/LineMacroSubstitution.java

@@ -0,0 +1,45 @@
+package io.micronaut.guides.core;
+
+import io.micronaut.guides.core.asciidoc.Argument;
+import io.micronaut.guides.core.asciidoc.AsciidocMacro;
+import io.micronaut.guides.core.asciidoc.Attribute;
+import io.micronaut.guides.core.asciidoc.IncludeDirective;
+
+import java.nio.file.Path;
+import java.util.Optional;
+
+import static io.micronaut.guides.core.MacroUtils.findMacroLines;
+
+abstract class LineMacroSubstitution implements MacroSubstitution {
+    protected abstract String getMacroName();
+
+    protected abstract String getBaseDirectory();
+
+    protected abstract String getPrefix();
+
+    @Override
+    public String substitute(String str, Guide guide, GuidesOption option) {
+        for (String line : findMacroLines(str, getMacroName())) {
+            Optional<AsciidocMacro> asciidocMacroOptional = AsciidocMacro.of(getMacroName(), line);
+            if (asciidocMacroOptional.isEmpty()) {
+                continue;
+            }
+
+            AsciidocMacro macro = asciidocMacroOptional.get();
+            StringBuilder builder = new StringBuilder();
+
+            for (Attribute attribute : macro.attributes()) {
+                Argument argument = new Argument(attribute.key(), attribute.values().get(0));
+                builder.append(argument).append("\n");
+            }
+
+            Path target = Path.of(getBaseDirectory(), getPrefix() + macro.target());
+
+            IncludeDirective.Builder includeDirectiveBuilder = IncludeDirective.builder().target(target.toString());
+            builder.append(includeDirectiveBuilder.build());
+
+            str = str.replace(line, builder.toString());
+        }
+        return str;
+    }
+}

buildSrc/src/main/java/io/micronaut/guides/core/MacroUtils.java

@@ -24,9 +24,8 @@ static List<String> findMacroLines(@NonNull String str, @NonNull String macro) {
                 .toList();
     }
 
-    static List<String> findMacroInstances(@NonNull String str, @NonNull String macro) {
+    static List<String> findMacroInstances(@NonNull String str, @NonNull Pattern pattern) {
         List<String> matches = new ArrayList<>();
-        Pattern pattern = Pattern.compile("@(?:([\\w-]*):)?" + macro + "@");
         Matcher matcher = pattern.matcher(str);
 
         while (matcher.find()) {

buildSrc/src/main/java/io/micronaut/guides/core/PlaceholderWithTargetMacroSubstitution.java

@@ -4,6 +4,7 @@
 import io.micronaut.guides.core.asciidoc.PlacheholderMacro;
 
 import java.util.Optional;
+import java.util.regex.Pattern;
 
 abstract class PlaceholderWithTargetMacroSubstitution implements MacroSubstitution {
 
@@ -12,7 +13,8 @@ abstract class PlaceholderWithTargetMacroSubstitution implements MacroSubstituti
     protected abstract String getSubstitution(Guide guide, GuidesOption option, String app);
 
     public String substitute(String str, Guide guide, GuidesOption option) {
-        for (String instance : MacroUtils.findMacroInstances(str, getMacroName())) {
+        Pattern pattern = Pattern.compile("@(?:([\\w-]*):)?" + getMacroName() + "@");
+        for (String instance : MacroUtils.findMacroInstances(str, pattern)) {
             Optional<PlacheholderMacro> macroOptional = PlacheholderMacro.of(getMacroName(), instance);
             if (macroOptional.isEmpty()) {
                 continue;

buildSrc/src/main/java/io/micronaut/guides/core/asciidoc/Argument.java

@@ -0,0 +1,30 @@
+package io.micronaut.guides.core.asciidoc;
+
+import io.micronaut.core.annotation.NonNull;
+import io.micronaut.core.util.StringUtils;
+
+import java.util.Optional;
+
+public record Argument(String key, String value) {
+    private static final String ARGUMENT_DELIMITATOR = ":";
+
+    @NonNull
+    public static Optional<Argument> of(@NonNull String str) {
+        if (StringUtils.isEmpty(str)) {
+            return Optional.empty();
+        }
+
+        String[] parts = str.split("=", 2);
+        if (parts.length == 2 && !parts[0].isBlank() && !parts[1].isBlank()) {
+            return Optional.of(new Argument(parts[0], parts[1]));
+        }
+
+        return Optional.empty();
+    }
+
+    @Override
+    public String toString() {
+        return ARGUMENT_DELIMITATOR + key + ARGUMENT_DELIMITATOR + " " + value;
+    }
+}
+

buildSrc/src/main/java/io/micronaut/guides/core/asciidoc/AsciidocConfiguration.java

@@ -0,0 +1,41 @@
+package io.micronaut.guides.core.asciidoc;
+
+import org.asciidoctor.Placement;
+
+import java.io.File;
+
+public interface AsciidocConfiguration {
+    String getSourceDir();
+
+    String getSourceHighlighter();
+
+    Placement getToc();
+
+    int getToclevels();
+
+    boolean getSectnums();
+
+    String getIdprefix();
+
+    String getIdseparator();
+
+    String getIcons();
+
+    String getImagesdir();
+
+    boolean isNofooter();
+
+    String getDocType();
+
+    String getRuby();
+
+    File getTemplateDirs();
+
+    String getCommonsDir();
+
+    String getBaseDir();
+
+    String getGuidesDir();
+
+    String getCalloutsDir();
+}