diff --git a/.run/debug-test-project.run.xml b/.run/debug-test-project.run.xml
new file mode 100644
index 0000000..b7ef759
--- /dev/null
+++ b/.run/debug-test-project.run.xml
@@ -0,0 +1,16 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.run/launch-debug-test-project.run.xml b/.run/launch-debug-test-project.run.xml
new file mode 100644
index 0000000..27124ba
--- /dev/null
+++ b/.run/launch-debug-test-project.run.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/.run/run-test-project.run.xml b/.run/run-test-project.run.xml
new file mode 100644
index 0000000..890c4e0
--- /dev/null
+++ b/.run/run-test-project.run.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/api/build.gradle b/api/build.gradle
index 8a11427..ea99501 100644
--- a/api/build.gradle
+++ b/api/build.gradle
@@ -3,6 +3,7 @@ plugins {
id 'groovy'
id 'java-library'
id 'java-test-fixtures'
+ id 'maven-publish'
}
repositories {
@@ -18,26 +19,26 @@ configurations {
dependencies {
api libs.groovy
+ api libs.groovy.yaml
api libs.groowt.all
compileOnlyApi libs.jetbrains.anontations
- implementation libs.groovy.templates
+ implementation libs.classgraph
implementation libs.commonmark
implementation libs.commonmark.frontmatter
implementation libs.jsoup
-
- // https://archiva.jessebrault.com/#artifact/com.jessebrault.gst/lib
- implementation 'com.jessebrault.gst:lib:0.0.5'
-
- // https://mvnrepository.com/artifact/org.jgrapht/jgrapht-core
- implementation 'org.jgrapht:jgrapht-core:1.5.2'
-
- // So we can use Grape dependency management
- // https://mvnrepository.com/artifact/org.apache.ivy/ivy
- runtimeOnly 'org.apache.ivy:ivy:2.5.2'
}
jar {
archivesBaseName = 'ssg-api'
}
+
+publishing {
+ publications {
+ create('ssgApi', MavenPublication) {
+ artifactId = 'ssg-api'
+ from components.java
+ }
+ }
+}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/BuildScriptBasedStaticSiteGenerator.groovy b/api/src/main/groovy/com/jessebrault/ssg/BuildScriptBasedStaticSiteGenerator.groovy
deleted file mode 100644
index 2282efd..0000000
--- a/api/src/main/groovy/com/jessebrault/ssg/BuildScriptBasedStaticSiteGenerator.groovy
+++ /dev/null
@@ -1,158 +0,0 @@
-package com.jessebrault.ssg
-
-import com.jessebrault.ssg.buildscript.BuildSpec
-import com.jessebrault.ssg.buildscript.BuildScriptConfiguratorFactory
-import com.jessebrault.ssg.buildscript.FileBuildScriptGetter
-import com.jessebrault.ssg.util.Diagnostic
-import groovy.transform.EqualsAndHashCode
-import groovy.transform.NullCheck
-import groovy.transform.TupleConstructor
-import org.jetbrains.annotations.Nullable
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-import org.slf4j.Marker
-import org.slf4j.MarkerFactory
-
-import java.util.function.Consumer
-
-final class BuildScriptBasedStaticSiteGenerator implements StaticSiteGenerator {
-
- private static final Logger logger = LoggerFactory.getLogger(BuildScriptBasedStaticSiteGenerator)
- private static final Marker enter = MarkerFactory.getMarker('enter')
- private static final Marker exit = MarkerFactory.getMarker('exit')
-
- private final Collection buildScriptClassLoaderUrls
- private final @Nullable File buildScript
- private final Collection builds = []
-
- private GroovyClassLoader buildScriptClassLoader
-
- /**
- * @param buildScriptClassLoaderUrls the urls to pass to the buildScriptRunner's GroovyClassLoader.
- * These should include the URL needed to find the given buildScript file, if present, as
- * well as any script dependencies (such as the buildSrc dir).
- * @param buildScript The buildScript File, may be null.
- */
- BuildScriptBasedStaticSiteGenerator(
- Collection buildScriptClassLoaderUrls,
- @Nullable File buildScript = null
- ) {
- this.buildScriptClassLoaderUrls = buildScriptClassLoaderUrls
- this.buildScript = buildScript
- }
-
- private void runBuildScript(
- Collection configuratorFactories,
- Map buildScriptArgs
- ) {
- logger.trace(enter, 'configuratorFactories: {}, buildScriptArgs: {}', configuratorFactories, buildScriptArgs)
-
- if (this.buildScript == null) {
- logger.info('no specified build script; using defaults')
- def result = FileBuildScriptGetter.runClosureScript { base ->
- configuratorFactories.each {
- it.get().accept(base)
- }
- }
- this.builds.addAll(result)
- } else if (this.buildScript.exists() && this.buildScript.isFile()) {
- logger.info('running buildScript: {}', this.buildScript)
- def buildScriptRunner = new FileBuildScriptGetter(this.buildScriptClassLoaderUrls)
- this.buildScriptClassLoader = buildScriptRunner.getBuildScriptClassLoader()
- def result = buildScriptRunner.getBuildScript(
- this.buildScript.name,
- [args: buildScriptArgs]
- ) { base ->
- configuratorFactories.each { it.get().accept(base) }
- }
- this.builds.addAll(result)
- } else {
- throw new IllegalArgumentException("given buildScript ${ this.buildScript } either does not exist or is not a file")
- }
-
- logger.trace(exit, '')
- }
-
- /**
- * @return The classLoader used to load the buildScript.
- * @throws NullPointerException if the buildScriptRunner was not initialized yet (make sure to call
- * {@link #doBuild} first).
- */
- GroovyClassLoader getBuildScriptClassLoader() {
- Objects.requireNonNull(this.buildScriptClassLoader)
- }
-
- @TupleConstructor(defaults = false)
- @NullCheck(includeGenerated = true)
- @EqualsAndHashCode
- private static final class IncludedBuildsResult {
- final Collection builds
- final Collection diagnostics
- }
-
- // TODO: cache build script results
- @Override
- boolean doBuild(
- String buildName,
- Collection configuratorFactories,
- Map buildScriptArgs,
- Consumer> diagnosticsConsumer
- ) {
- logger.trace(enter, 'buildName: {}, diagnosticsConsumer: {}', buildName, diagnosticsConsumer)
-
- this.runBuildScript(configuratorFactories, buildScriptArgs)
-
- def build = this.builds.find { it.name == buildName }
- if (!build) {
- throw new IllegalArgumentException("there is no registered build with name: ${ buildName }")
- }
-
- def includedBuildsResult = build.includedBuilds.inject(
- new IncludedBuildsResult([], [])
- ) { acc, includedBuildName ->
- def includedBuild = this.builds.find { it.name == includedBuildName }
- if (includedBuild == null) {
- acc.diagnostics << new Diagnostic("There is no registered build ${ includedBuildName } that can be included.")
- } else {
- acc.builds << includedBuild
- }
- acc
- }
-
- if (includedBuildsResult.diagnostics.size() > 0) {
- diagnosticsConsumer.accept(includedBuildsResult.diagnostics)
- logger.trace(exit, 'result: false')
- return false
- }
-
- def buildTasksConverter = new SimpleBuildTasksConverter()
-
- def allBuilds = includedBuildsResult.builds + build
- def allBuildsConvertResults = allBuilds.collect {
- buildTasksConverter.convert(it)
- }
- def allBuildsConvertDiagnostics = allBuildsConvertResults.collectMany {
- it.diagnostics
- }
-
- if (allBuildsConvertDiagnostics.size() > 0) {
- diagnosticsConsumer.accept(allBuildsConvertDiagnostics)
- logger.trace(exit, 'result: false')
- return false
- }
-
- def allTasks = allBuildsConvertResults.collectMany {
- it.get()
- }
- def allTasksDiagnostics = allTasks.collectMany { it.execute(allTasks) }
- if (allTasksDiagnostics.size() > 0) {
- diagnosticsConsumer.accept(allTasksDiagnostics)
- logger.trace(exit, 'result: false')
- return false
- }
-
- logger.trace(exit, 'result: true')
- return true
- }
-
-}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/BuildTasksConverter.groovy b/api/src/main/groovy/com/jessebrault/ssg/BuildTasksConverter.groovy
deleted file mode 100644
index fbbff9c..0000000
--- a/api/src/main/groovy/com/jessebrault/ssg/BuildTasksConverter.groovy
+++ /dev/null
@@ -1,9 +0,0 @@
-package com.jessebrault.ssg
-
-import com.jessebrault.ssg.buildscript.BuildSpec
-import com.jessebrault.ssg.task.Task
-import com.jessebrault.ssg.util.Result
-
-interface BuildTasksConverter {
- Result> convert(BuildSpec buildScriptResult)
-}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/DefaultStaticSiteGenerator.groovy b/api/src/main/groovy/com/jessebrault/ssg/DefaultStaticSiteGenerator.groovy
new file mode 100644
index 0000000..337a6be
--- /dev/null
+++ b/api/src/main/groovy/com/jessebrault/ssg/DefaultStaticSiteGenerator.groovy
@@ -0,0 +1,228 @@
+package com.jessebrault.ssg
+
+import com.jessebrault.ssg.buildscript.BuildScriptGetter
+import com.jessebrault.ssg.buildscript.BuildScriptToBuildSpecConverter
+import com.jessebrault.ssg.buildscript.BuildSpec
+import com.jessebrault.ssg.buildscript.delegates.BuildDelegate
+import com.jessebrault.ssg.di.*
+import com.jessebrault.ssg.page.DefaultPage
+import com.jessebrault.ssg.page.Page
+import com.jessebrault.ssg.page.PageFactory
+import com.jessebrault.ssg.page.PageSpec
+import com.jessebrault.ssg.text.Text
+import com.jessebrault.ssg.util.Diagnostic
+import com.jessebrault.ssg.view.PageView
+import groovy.transform.TupleConstructor
+import groowt.util.di.RegistryObjectFactory
+import io.github.classgraph.ClassGraph
+import org.slf4j.Logger
+import org.slf4j.LoggerFactory
+
+import java.nio.file.Files
+
+import static groowt.util.di.BindingUtil.named
+import static groowt.util.di.BindingUtil.toSingleton
+
+@TupleConstructor(includeFields = true, defaults = false)
+class DefaultStaticSiteGenerator implements StaticSiteGenerator {
+
+ private static final Logger logger = LoggerFactory.getLogger(DefaultStaticSiteGenerator)
+
+ protected final GroovyClassLoader groovyClassLoader
+ protected final URL[] buildScriptBaseUrls
+ protected final boolean dryRun
+
+ protected Set getTexts(String buildScriptFqn, BuildSpec buildSpec) {
+ def textConverters = buildSpec.textConverters.get {
+ new SsgException("The textConverters Property in $buildScriptFqn must contain at least an empty Set.")
+ }
+ def textDirs = buildSpec.textsDirs.get {
+ new SsgException("The textDirs Property in $buildScriptFqn must contain at least an empty Set.")
+ }
+ def texts = [] as Set
+ textDirs.each { textDir ->
+ if (textDir.exists()) {
+ Files.walk(textDir.toPath()).each {
+ def asFile = it.toFile()
+ def lastDot = asFile.name.lastIndexOf('.')
+ if (lastDot != -1) {
+ def extension = asFile.name.substring(lastDot)
+ def converter = textConverters.find {
+ it.handledExtensions.contains(extension)
+ }
+ texts << converter.convert(textDir, asFile)
+ }
+ }
+ }
+ }
+ texts
+ }
+
+ @Override
+ Collection doBuild(
+ File projectDir,
+ String buildName,
+ String buildScriptFqn,
+ Map buildScriptCliArgs
+ ) {
+ // run build script(s) and get buildSpec
+ def buildScriptGetter = new BuildScriptGetter(
+ this.groovyClassLoader,
+ this.buildScriptBaseUrls,
+ buildScriptCliArgs,
+ projectDir
+ )
+ def buildScriptToBuildSpecConverter = new BuildScriptToBuildSpecConverter(
+ buildScriptGetter,
+ BuildDelegate.withDefaults(projectDir)
+ )
+ def buildSpec = buildScriptToBuildSpecConverter.convert(buildScriptFqn)
+
+ // prepare objectFactory
+ def objectFactoryBuilder = buildSpec.objectFactoryBuilder.get {
+ new SsgException(
+ "the objectFactoryBuilder Property in $buildScriptFqn " +
+ "must contain a RegistryObjectFactory.Builder instance."
+ )
+ }
+
+ // configure for Page instantiation
+ objectFactoryBuilder.configureRegistry {
+ // extensions
+ addExtension(new TextsExtension().tap {
+ allTexts.addAll(this.getTexts(buildScriptFqn, buildSpec))
+ })
+ addExtension(new ModelsExtension().tap {
+ allModels.addAll(buildSpec.models.get {
+ new SsgException("The models Property in $buildScriptFqn must contain at least an empty Set.")
+ })
+ })
+ addExtension(new GlobalsExtension().tap {
+ globals.putAll(buildSpec.globals.get {
+ new SsgException("The globals Property in $buildScriptFqn must contain at least an empty Map.")
+ })
+ })
+
+ // bindings
+ bind(named('buildName', String), toSingleton(buildSpec.name))
+ bind(named('siteName', String), toSingleton(buildSpec.siteName.get {
+ new SsgException("The siteName Property in $buildScriptFqn must be set.")
+ }))
+ bind(named('baseUrl', String), toSingleton(buildSpec.baseUrl.get {
+ new SsgException("The baseUrl Property in $buildScriptFqn must be set.")
+ }))
+ }
+
+ // get the objectFactory
+ def objectFactory = objectFactoryBuilder.build()
+ objectFactory.configureRegistry {
+ bind(RegistryObjectFactory, toSingleton(objectFactory))
+ }
+
+ // prepare for basePackages scan for Pages and PageFactories
+ def basePackages = buildSpec.basePackages.get {
+ new SsgException("The basePackages Property in $buildScriptFqn must contain at least an empty Set.")
+ }
+ def classgraph = new ClassGraph()
+ .enableAnnotationInfo()
+ .addClassLoader(groovyClassLoader)
+ basePackages.each { classgraph.acceptPackages(it) }
+
+
+ def pages = [] as Set
+
+ try (def scanResult = classgraph.scan()) {
+ // single pages
+ def pageViewInfoList = scanResult.getClassesImplementing(PageView)
+ pageViewInfoList.each { pageViewInfo ->
+ def pageSpecInfo = pageViewInfo.getAnnotationInfo(PageSpec)
+ if (pageSpecInfo != null) {
+ def pageSpec = (PageSpec) pageSpecInfo.loadClassAndInstantiate()
+ pages << new DefaultPage(
+ pageSpec.name(),
+ pageSpec.path(),
+ pageSpec.fileExtension(),
+ (Class) pageViewInfo.loadClass()
+ )
+ }
+ }
+
+ // page factories
+ def pageFactoryTypes = [] as Set>
+
+ def pageFactoryInfoList = scanResult.getClassesImplementing(PageFactory)
+ pageFactoryInfoList.each { pageFactoryInfo ->
+ pageFactoryTypes << (pageFactoryInfo.loadClass() as Class)
+ }
+
+ // instantiate page factory and create the pages
+ pageFactoryTypes.each { pageFactoryType ->
+ def pageFactory = objectFactory.createInstance(pageFactoryType)
+ pages.addAll(pageFactory.create())
+ }
+ }
+
+ // Configure for PageView instantiation
+ objectFactoryBuilder.configureRegistry {
+ // extensions
+ addExtension(new PagesExtension().tap {
+ allPages.addAll(pages)
+ })
+ addExtension(new SelfPageExtension())
+ }
+
+ def diagnostics = [] as Collection
+
+ pages.each {
+ // instantiate PageView
+ PageView pageView
+ try {
+ objectFactory.registry.getExtension(SelfPageExtension).currentPage = it
+ pageView = objectFactory.createInstance(it.viewType)
+ } catch (Exception exception) {
+ diagnostics << new Diagnostic(
+ "There was an exception while constructing $it.viewType.name for $it.name",
+ exception
+ )
+ return
+ }
+
+ // Render the page
+ def sw = new StringWriter()
+ try {
+ pageView.renderTo(sw)
+ } catch (Exception exception) {
+ diagnostics << new Diagnostic(
+ "There was an exception while rendering $it.name as $pageView.class.name",
+ exception
+ )
+ return
+ }
+
+ // Output the page if not dryRun
+ if (!this.dryRun) {
+ def outputDir = buildSpec.outputDir.get {
+ new SsgException("The outputDir Property in $buildScriptFqn must be set.")
+ }
+ outputDir.mkdirs()
+
+ def outputFile = new File(
+ outputDir,
+ it.path.replace('/', File.separator) + it.fileExtension
+ )
+ try {
+ outputFile.write(sw.toString())
+ } catch (Exception exception) {
+ diagnostics << new Diagnostic(
+ "There was an exception while writing $it.name to $outputFile",
+ exception
+ )
+ }
+ }
+ }
+
+ // return diagnostics
+ diagnostics
+ }
+
+}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/SimpleBuildTasksConverter.groovy b/api/src/main/groovy/com/jessebrault/ssg/SimpleBuildTasksConverter.groovy
deleted file mode 100644
index aa2308e..0000000
--- a/api/src/main/groovy/com/jessebrault/ssg/SimpleBuildTasksConverter.groovy
+++ /dev/null
@@ -1,33 +0,0 @@
-package com.jessebrault.ssg
-
-import com.jessebrault.ssg.buildscript.BuildSpec
-import com.jessebrault.ssg.task.Task
-import com.jessebrault.ssg.task.TaskSpec
-import com.jessebrault.ssg.util.Diagnostic
-import com.jessebrault.ssg.util.Result
-
-final class SimpleBuildTasksConverter implements BuildTasksConverter {
-
- @Override
- Result> convert(BuildSpec build) {
- def taskSpec = new TaskSpec(
- build.name,
- build.outputDirFunction.apply(build).asFile(),
- build.siteSpec,
- build.globals
- )
- Collection tasks = []
- Collection diagnostics = []
-
- build.taskFactorySpecs.each {
- def factory = it.supplier.get()
- it.configurators.each { it.accept(factory) }
- def result = factory.getTasks(taskSpec)
- diagnostics.addAll(result.diagnostics)
- tasks.addAll(result.get())
- }
-
- Result.of(diagnostics, tasks)
- }
-
-}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/SiteSpec.groovy b/api/src/main/groovy/com/jessebrault/ssg/SiteSpec.groovy
deleted file mode 100644
index 04c068d..0000000
--- a/api/src/main/groovy/com/jessebrault/ssg/SiteSpec.groovy
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.jessebrault.ssg
-
-import com.jessebrault.ssg.util.Monoid
-import com.jessebrault.ssg.util.Monoids
-import groovy.transform.EqualsAndHashCode
-import groovy.transform.NullCheck
-import groovy.transform.TupleConstructor
-
-@TupleConstructor(defaults = false)
-@NullCheck(includeGenerated = true)
-@EqualsAndHashCode
-final class SiteSpec {
-
- static final Monoid DEFAULT_MONOID = Monoids.of(getBlank(), SiteSpec::concat)
-
- static SiteSpec getBlank() {
- new SiteSpec('', '')
- }
-
- static SiteSpec concat(SiteSpec s0, SiteSpec s1) {
- new SiteSpec(
- s1.name.blank ? s0.name : s1.name,
- s1.baseUrl.blank ? s0.baseUrl : s1.baseUrl
- )
- }
-
- final String name
- final String baseUrl
-
- @Override
- String toString() {
- "SiteSpec(${ this.name }, ${ this.baseUrl })"
- }
-
-}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/SsgException.groovy b/api/src/main/groovy/com/jessebrault/ssg/SsgException.groovy
new file mode 100644
index 0000000..1bad588
--- /dev/null
+++ b/api/src/main/groovy/com/jessebrault/ssg/SsgException.groovy
@@ -0,0 +1,13 @@
+package com.jessebrault.ssg
+
+class SsgException extends RuntimeException {
+
+ SsgException(String message) {
+ super(message)
+ }
+
+ SsgException(String message, Throwable cause) {
+ super(message, cause)
+ }
+
+}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy b/api/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy
index f9b0e70..fa6729e 100644
--- a/api/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy
+++ b/api/src/main/groovy/com/jessebrault/ssg/StaticSiteGenerator.groovy
@@ -1,15 +1,12 @@
package com.jessebrault.ssg
-import com.jessebrault.ssg.buildscript.BuildScriptConfiguratorFactory
import com.jessebrault.ssg.util.Diagnostic
-import java.util.function.Consumer
-
interface StaticSiteGenerator {
- boolean doBuild(
+ Collection doBuild(
+ File projectDir,
String buildName,
- Collection configuratorFactories,
- Map buildScriptArgs,
- Consumer> diagnosticsConsumer
+ String buildScriptFqn,
+ Map buildScriptCliArgs
)
-}
\ No newline at end of file
+}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/build/Build.groovy b/api/src/main/groovy/com/jessebrault/ssg/build/Build.groovy
deleted file mode 100644
index 0cc64d9..0000000
--- a/api/src/main/groovy/com/jessebrault/ssg/build/Build.groovy
+++ /dev/null
@@ -1,38 +0,0 @@
-package com.jessebrault.ssg.build
-
-import com.jessebrault.ssg.model.Model
-import com.jessebrault.ssg.page.Page
-import groowt.util.di.RegistryObjectFactory
-import groowt.util.fp.provider.NamedSetProvider
-
-import static com.jessebrault.ssg.util.ObjectUtil.*
-
-class Build {
-
- final String name
- final String siteName
- final String baseUrl
- final File outputDir
- final Map globals
- final Set textsDirs
- final NamedSetProvider pages
- final RegistryObjectFactory objectFactory
-
- Build(Map args) {
- this.name = requireString(args.name)
- this.siteName = requireString(args.siteName)
- this.baseUrl = requireString(args.baseUrl)
- this.outputDir = requireFile(args.outputDir)
- this.globals = requireMap(args.globals)
- this.textsDirs = requireSet(args.textsDirs)
- this.pages = requireType(NamedSetProvider, args.pages)
- this.objectFactory = requireType(RegistryObjectFactory, args.objectFactory)
- }
-
- void doBuild() {
- // set up object factory for di
- // container should have: Build and all its properties
- // container should also have @Text, @Texts, @Page, and @Pages resolvers
- }
-
-}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildScriptBase.groovy b/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildScriptBase.groovy
index e76e1e1..b56cc0f 100644
--- a/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildScriptBase.groovy
+++ b/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildScriptBase.groovy
@@ -13,26 +13,26 @@ import static java.util.Objects.requireNonNull
@SuppressWarnings('unused')
abstract class BuildScriptBase extends Script {
+ /* --- Logging --- */
+
static final Logger logger = LoggerFactory.getLogger(BuildScriptBase)
static final Marker enter = MarkerFactory.getMarker('ENTER')
static final Marker exit = MarkerFactory.getMarker('EXIT')
+ /* --- build script proper --- */
+
private String extending
- private Closure buildClosure
+ private Closure buildClosure = { }
private File projectRoot
- File getProjectRoot() {
- requireNonNull(this.projectRoot)
- }
-
- void setProjectRoot(File projectRoot) {
- this.projectRoot = requireNonNull(projectRoot)
- }
+ /* --- Instance DSL helpers --- */
File file(String name) {
new File(this.projectRoot, name)
}
+ /* --- DSL --- */
+
void build(@Nullable String extending, @DelegatesTo(value = BuildDelegate) Closure buildClosure) {
this.extending = extending
this.buildClosure = buildClosure
@@ -43,8 +43,21 @@ abstract class BuildScriptBase extends Script {
this.buildClosure = buildClosure
}
+ /* --- internal --- */
+
@ApiStatus.Internal
- @Nullable String getExtending() {
+ File getProjectRoot() {
+ requireNonNull(this.projectRoot)
+ }
+
+ @ApiStatus.Internal
+ void setProjectRoot(File projectRoot) {
+ this.projectRoot = requireNonNull(projectRoot)
+ }
+
+ @ApiStatus.Internal
+ @Nullable
+ String getExtending() {
this.extending
}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildScriptGetter.groovy b/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildScriptGetter.groovy
new file mode 100644
index 0000000..f6f4b26
--- /dev/null
+++ b/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildScriptGetter.groovy
@@ -0,0 +1,29 @@
+package com.jessebrault.ssg.buildscript
+
+import groovy.transform.NullCheck
+import groovy.transform.TupleConstructor
+import org.codehaus.groovy.control.CompilerConfiguration
+
+@NullCheck(includeGenerated = true)
+@TupleConstructor(includeFields = true, defaults = false)
+final class BuildScriptGetter {
+
+ private final GroovyClassLoader groovyClassLoader
+ private final URL[] scriptBaseUrls
+ private final Map scriptCliArgs
+ private final File projectDir
+
+ BuildScriptBase getAndRunBuildScript(String fqn) {
+ def gcl = new GroovyClassLoader(this.groovyClassLoader, new CompilerConfiguration().tap {
+ it.scriptBaseClass = BuildScriptBase.name
+ })
+ this.scriptBaseUrls.each { gcl.addURL(it) }
+ def scriptClass = gcl.loadClass(fqn, true, true) as Class
+ def buildScript = scriptClass.getConstructor().newInstance()
+ buildScript.binding = new Binding(this.scriptCliArgs)
+ buildScript.projectRoot = projectDir
+ buildScript.run()
+ buildScript
+ }
+
+}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildDelegateToBuildSpecConverter.groovy b/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildScriptToBuildSpecConverter.groovy
similarity index 67%
rename from api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildDelegateToBuildSpecConverter.groovy
rename to api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildScriptToBuildSpecConverter.groovy
index 7164e6d..53acaad 100644
--- a/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildDelegateToBuildSpecConverter.groovy
+++ b/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildScriptToBuildSpecConverter.groovy
@@ -8,29 +8,32 @@ import java.util.function.Supplier
@NullCheck
@TupleConstructor(includeFields = true)
-class BuildDelegateToBuildSpecConverter {
+class BuildScriptToBuildSpecConverter {
- private final FileBuildScriptGetter buildScriptGetter
+ private final BuildScriptGetter buildScriptGetter
private final Supplier buildDelegateSupplier
protected BuildSpec getFromDelegate(String name, BuildDelegate delegate) {
new BuildSpec(
name: name,
+ basePackages: delegate.basePackages,
siteName: delegate.siteName,
baseUrl: delegate.baseUrl,
outputDir: delegate.outputDir,
globals: delegate.globals,
+ models: delegate.models,
textsDirs: delegate.textsDirs,
- models: delegate.models
+ textConverters: delegate.textConverters,
+ objectFactoryBuilder: delegate.objectFactoryBuilder
)
}
- BuildSpec convert(final String name, final BuildScriptBase buildScript) {
+ protected BuildSpec doConvert(String name, BuildScriptBase buildScript) {
final Deque buildHierarchy = new LinkedList<>()
buildHierarchy.push(buildScript)
String extending = buildScript.extending
while (extending != null) {
- def from = this.buildScriptGetter.getBuildScript(extending)
+ def from = this.buildScriptGetter.getAndRunBuildScript(extending)
buildHierarchy.push(from)
extending = from.extending
}
@@ -45,4 +48,9 @@ class BuildDelegateToBuildSpecConverter {
this.getFromDelegate(name, delegate)
}
+ BuildSpec convert(String buildScriptFqn) {
+ def start = this.buildScriptGetter.getAndRunBuildScript(buildScriptFqn)
+ this.doConvert(buildScriptFqn, start)
+ }
+
}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildSpec.groovy b/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildSpec.groovy
index 7380cec..1d93ee0 100644
--- a/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildSpec.groovy
+++ b/api/src/main/groovy/com/jessebrault/ssg/buildscript/BuildSpec.groovy
@@ -1,37 +1,48 @@
package com.jessebrault.ssg.buildscript
import com.jessebrault.ssg.model.Model
+import com.jessebrault.ssg.text.TextConverter
import groovy.transform.EqualsAndHashCode
import groovy.transform.NullCheck
-import groowt.util.fp.provider.NamedProvider
+import groowt.util.di.RegistryObjectFactory
import groowt.util.fp.provider.Provider
-import static com.jessebrault.ssg.util.ObjectUtil.*
+import static com.jessebrault.ssg.util.ObjectUtil.requireProvider
+import static com.jessebrault.ssg.util.ObjectUtil.requireString
@NullCheck(includeGenerated = true)
@EqualsAndHashCode
final class BuildSpec {
final String name
+ final Provider> basePackages
final Provider siteName
final Provider baseUrl
final Provider outputDir
final Provider> globals
- final Set> textsDirs
+ final Provider> models
+ final Provider> textsDirs
+ final Provider> textConverters
+ final Provider objectFactoryBuilder
@SuppressWarnings('GroovyAssignabilityCheck')
BuildSpec(Map args) {
this.name = requireString(args.name)
+ this.basePackages = requireProvider(args.basePackages)
this.siteName = requireProvider(args.siteName)
this.baseUrl = requireProvider(args.baseUrl)
this.outputDir = requireProvider(args.outputDir)
- this.globals = requireMap(args.globals)
- this.textsDirs = requireSet(args.textsDirs)
+ this.globals = requireProvider(args.globals)
+ this.models = requireProvider(args.models)
+ this.textsDirs = requireProvider(args.textsDirs)
+ this.textConverters = requireProvider(args.textConverters)
+ this.objectFactoryBuilder = requireProvider(args.objectFactoryBuilder)
}
@Override
String toString() {
- "Build(name: ${ this.name })"
+ "Build(name: ${this.name}, basePackages: $basePackages, siteName: $siteName, " +
+ "baseUrl: $baseUrl, outputDir: $outputDir, textsDirs: $textsDirs)"
}
}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/buildscript/FileBuildScriptGetter.groovy b/api/src/main/groovy/com/jessebrault/ssg/buildscript/FileBuildScriptGetter.groovy
deleted file mode 100644
index a3283ab..0000000
--- a/api/src/main/groovy/com/jessebrault/ssg/buildscript/FileBuildScriptGetter.groovy
+++ /dev/null
@@ -1,19 +0,0 @@
-package com.jessebrault.ssg.buildscript
-
-import groovy.transform.NullCheck
-import groovy.transform.TupleConstructor
-
-@NullCheck
-@TupleConstructor(includeFields = true)
-final class FileBuildScriptGetter {
-
- private final GroovyClassLoader groovyClassLoader
-
- BuildScriptBase getBuildScript(String name) {
- Class scriptClass = this.groovyClassLoader.loadClass(name, true, false)
- def scriptObject = scriptClass.getConstructor().newInstance()
- assert scriptObject instanceof BuildScriptBase
- scriptObject
- }
-
-}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/buildscript/delegates/BuildDelegate.groovy b/api/src/main/groovy/com/jessebrault/ssg/buildscript/delegates/BuildDelegate.groovy
index b70a863..43a6df2 100644
--- a/api/src/main/groovy/com/jessebrault/ssg/buildscript/delegates/BuildDelegate.groovy
+++ b/api/src/main/groovy/com/jessebrault/ssg/buildscript/delegates/BuildDelegate.groovy
@@ -1,37 +1,61 @@
package com.jessebrault.ssg.buildscript.delegates
-import groovy.transform.EqualsAndHashCode
-import groovy.transform.NullCheck
+import com.jessebrault.ssg.model.Model
+import com.jessebrault.ssg.model.Models
+import com.jessebrault.ssg.text.MarkdownTextConverter
+import com.jessebrault.ssg.text.TextConverter
import groowt.util.di.DefaultRegistryObjectFactory
import groowt.util.di.RegistryObjectFactory
+import groowt.util.fp.property.DefaultProperty
import groowt.util.fp.property.Property
-import groowt.util.fp.provider.DefaultSetProvider
+import groowt.util.fp.provider.DefaultProvider
+import groowt.util.fp.provider.NamedProvider
import groowt.util.fp.provider.Provider
-import groowt.util.fp.provider.SetProvider
import java.util.function.Supplier
-@NullCheck(includeGenerated = true)
-@EqualsAndHashCode(includeFields = true)
final class BuildDelegate {
- static Supplier withDefaults() {
+ static Supplier withDefaults(File projectDir) {
return {
- new BuildDelegate().tap {
- outputDir.convention = 'dist'
+ new BuildDelegate(projectDir).tap {
+ basePackages.convention = [] as Set
+ outputDir.convention = new File(projectDir, 'dist')
globals.convention = [:]
- objectFactory.convention = DefaultRegistryObjectFactory.Builder.withDefaults()
+ models.convention = [] as Set
+ textsDirs.convention = [new File(projectDir, 'texts')] as Set
+ textConverters.convention = [new MarkdownTextConverter()] as Set
+ objectFactoryBuilder.convention = DefaultRegistryObjectFactory.Builder.withDefaults()
}
}
}
- final Property siteName = Property.empty()
- final Property baseUrl = Property.empty()
- final Property outputDir = Property.empty()
- final Property> globals = Property.empty()
- final Property objectFactory = Property.empty()
+ final File projectDir
- private final Set> textsDirs = []
+ final Property> basePackages = DefaultProperty.>empty(Set)
+ final Property siteName = DefaultProperty.empty(String)
+ final Property baseUrl = DefaultProperty.empty(String)
+ final Property outputDir = DefaultProperty.empty(File)
+ final Property> globals = DefaultProperty.>empty(Map)
+ final Property> models = DefaultProperty.>empty(Set)
+ final Property> textsDirs = DefaultProperty.>empty(Set)
+ final Property> textConverters = DefaultProperty.>empty(Set)
+ final Property objectFactoryBuilder =
+ DefaultProperty.empty(RegistryObjectFactory.Builder)
+
+ private BuildDelegate(File projectDir) {
+ this.projectDir = projectDir
+ }
+
+ /* TODO: add friendly DSL methods for setting all properties */
+
+ void basePackage(String toAdd) {
+ this.basePackages.configure { it.add(toAdd) }
+ }
+
+ void basePackages(String... toAdd) {
+ toAdd.each { this.basePackage(it) }
+ }
void siteName(String siteName) {
this.siteName.set(siteName)
@@ -62,25 +86,49 @@ final class BuildDelegate {
globalsClosure.delegate = globalsDelegate
globalsClosure.resolveStrategy = Closure.DELEGATE_FIRST
globalsClosure()
- this.globals.set {
+ this.globals.set DefaultProvider.ofLazy(Map) {
this.globals.get() + globalsDelegate
}
}
+ void model(String name, Object obj) {
+ this.models.configure {it.add(Models.of(name, obj)) }
+ }
+
+ void model(Model model) {
+ this.models.configure { it.add(model) }
+ }
+
+ void model(String name, Provider tProvider) {
+ this.models.configure { it.add(Models.ofProvider(name, tProvider)) }
+ }
+
+ void model(String name, Class type, Supplier tSupplier) {
+ this.models.configure { it.add(Models.ofSupplier(name, type, tSupplier)) }
+ }
+
+ void model(NamedProvider namedProvider) {
+ this.models.configure { it.add(Models.ofNamedProvider(namedProvider)) }
+ }
+
void textsDir(File textsDir) {
- this.textsDirs.add { textsDir }
+ this.textsDirs.configure { it.add(textsDir) }
}
- void textsDir(Provider textsDirProvider) {
- this.textsDirs << textsDirProvider
+ void textsDirs(File... textsDirs) {
+ textsDirs.each { this.textsDir(it) }
}
- void textsDirs(Set> textsDirProviders) {
- textsDirProviders.each { this.textsDir(it) }
+ void textConverter(TextConverter textConverter) {
+ this.textConverters.configure { it.add(textConverter) }
}
- SetProvider getTextsDirs() {
- new DefaultSetProvider(this.textsDirs)
+ void textConverters(TextConverter... textConverters) {
+ textConverters.each { this.textConverter(it) }
+ }
+
+ void objectFactoryBuilder(RegistryObjectFactory.Builder builder) {
+ this.objectFactoryBuilder.set(builder)
}
}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/Global.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/Global.groovy
new file mode 100644
index 0000000..23c607d
--- /dev/null
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/Global.groovy
@@ -0,0 +1,15 @@
+package com.jessebrault.ssg.di
+
+import jakarta.inject.Qualifier
+
+import java.lang.annotation.ElementType
+import java.lang.annotation.Retention
+import java.lang.annotation.RetentionPolicy
+import java.lang.annotation.Target
+
+@Qualifier
+@Retention(RetentionPolicy.RUNTIME)
+@Target([ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD])
+@interface Global {
+ String value()
+}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/GlobalsExtension.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/GlobalsExtension.groovy
new file mode 100644
index 0000000..46e581d
--- /dev/null
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/GlobalsExtension.groovy
@@ -0,0 +1,43 @@
+package com.jessebrault.ssg.di
+
+import groovy.transform.TupleConstructor
+import groowt.util.di.Binding
+import groowt.util.di.QualifierHandler
+import groowt.util.di.QualifierHandlerContainer
+import groowt.util.di.RegistryExtension
+import groowt.util.di.SingletonBinding
+
+import java.lang.annotation.Annotation
+
+class GlobalsExtension implements QualifierHandlerContainer, RegistryExtension {
+
+ @TupleConstructor(includeFields = true)
+ static class GlobalQualifierHandler implements QualifierHandler {
+
+ private final GlobalsExtension extension
+
+ @Override
+ Binding handle(Global global, Class aClass) {
+ if (extension.globals.containsKey(global.value())) {
+ return new SingletonBinding(extension.globals.get(global.value()) as T)
+ } else {
+ throw new IllegalArgumentException("There is no global for ${global.value()}")
+ }
+ }
+
+ }
+
+ final Map globals = [:]
+
+ private final GlobalQualifierHandler globalQualifierHandler = new GlobalQualifierHandler(this)
+
+ @Override
+ QualifierHandler getQualifierHandler(Class aClass) {
+ if (Global.is(aClass)) {
+ return this.globalQualifierHandler as QualifierHandler
+ } else {
+ return null
+ }
+ }
+
+}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/InjectModel.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/InjectModel.groovy
new file mode 100644
index 0000000..93c7eb9
--- /dev/null
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/InjectModel.groovy
@@ -0,0 +1,15 @@
+package com.jessebrault.ssg.di
+
+import jakarta.inject.Qualifier
+
+import java.lang.annotation.ElementType
+import java.lang.annotation.Retention
+import java.lang.annotation.RetentionPolicy
+import java.lang.annotation.Target
+
+@Qualifier
+@Retention(RetentionPolicy.RUNTIME)
+@Target([ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD])
+@interface InjectModel {
+ String value()
+}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/InjectModelQualifierHandler.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/InjectModelQualifierHandler.groovy
new file mode 100644
index 0000000..9f8c5bb
--- /dev/null
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/InjectModelQualifierHandler.groovy
@@ -0,0 +1,26 @@
+package com.jessebrault.ssg.di
+
+import groovy.transform.TupleConstructor
+import groowt.util.di.Binding
+import groowt.util.di.QualifierHandler
+import groowt.util.di.SingletonBinding
+
+@TupleConstructor(includeFields = true)
+class InjectModelQualifierHandler implements QualifierHandler {
+
+ private final ModelsExtension extension
+
+ @Override
+ Binding handle(InjectModel injectModel, Class requestedClass) {
+ def found = this.extension.allModels.find {
+ requestedClass.isAssignableFrom(it.class) && it.name == injectModel.value()
+ }
+ if (found == null) {
+ throw new IllegalArgumentException(
+ "Could not find a Model with name ${injectModel.value()} and/or type $requestedClass.name"
+ )
+ }
+ new SingletonBinding(found.get() as T)
+ }
+
+}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/InjectModels.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/InjectModels.groovy
new file mode 100644
index 0000000..84c945d
--- /dev/null
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/InjectModels.groovy
@@ -0,0 +1,15 @@
+package com.jessebrault.ssg.di
+
+import jakarta.inject.Qualifier
+
+import java.lang.annotation.ElementType
+import java.lang.annotation.Retention
+import java.lang.annotation.RetentionPolicy
+import java.lang.annotation.Target
+
+@Qualifier
+@Retention(RetentionPolicy.RUNTIME)
+@Target([ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD])
+@interface InjectModels {
+ String[] value()
+}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/InjectModelsQualifierHandler.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/InjectModelsQualifierHandler.groovy
new file mode 100644
index 0000000..033ef55
--- /dev/null
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/InjectModelsQualifierHandler.groovy
@@ -0,0 +1,27 @@
+package com.jessebrault.ssg.di
+
+import groovy.transform.TupleConstructor
+import groowt.util.di.Binding
+import groowt.util.di.QualifierHandler
+import groowt.util.di.SingletonBinding
+
+@TupleConstructor(includeFields = true)
+class InjectModelsQualifierHandler implements QualifierHandler {
+
+ private final ModelsExtension extension
+
+ @Override
+ Binding handle(InjectModels injectModels, Class requestedType) {
+ if (!List.is(requestedType)) {
+ throw new IllegalArgumentException("@InjectModels must be used with List.")
+ }
+ def allFound = this.extension.allModels.inject([] as T) { acc, model ->
+ if (model.type.isAssignableFrom(requestedType) && model.name in injectModels.value()) {
+ acc << model.get()
+ }
+ acc
+ }
+ new SingletonBinding(allFound as T)
+ }
+
+}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/objects/InjectPage.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/InjectPage.groovy
similarity index 92%
rename from api/src/main/groovy/com/jessebrault/ssg/objects/InjectPage.groovy
rename to api/src/main/groovy/com/jessebrault/ssg/di/InjectPage.groovy
index bc6ddcf..c472e79 100644
--- a/api/src/main/groovy/com/jessebrault/ssg/objects/InjectPage.groovy
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/InjectPage.groovy
@@ -1,4 +1,4 @@
-package com.jessebrault.ssg.objects
+package com.jessebrault.ssg.di
import jakarta.inject.Qualifier
diff --git a/api/src/main/groovy/com/jessebrault/ssg/objects/InjectPageQualifierHandler.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/InjectPageQualifierHandler.groovy
similarity index 87%
rename from api/src/main/groovy/com/jessebrault/ssg/objects/InjectPageQualifierHandler.groovy
rename to api/src/main/groovy/com/jessebrault/ssg/di/InjectPageQualifierHandler.groovy
index 862562b..2f45ef2 100644
--- a/api/src/main/groovy/com/jessebrault/ssg/objects/InjectPageQualifierHandler.groovy
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/InjectPageQualifierHandler.groovy
@@ -1,4 +1,4 @@
-package com.jessebrault.ssg.objects
+package com.jessebrault.ssg.di
import com.jessebrault.ssg.page.Page
import groovy.transform.TupleConstructor
@@ -17,7 +17,7 @@ class InjectPageQualifierHandler implements QualifierHandler {
throw new IllegalArgumentException("Cannot inject a Page into a non-Page parameter/setter/field.")
}
def requested = injectPage.value()
- def found = this.pagesExtension.pageProviders.find {
+ def found = this.pagesExtension.allPages.find {
if (requested.startsWith('/')) {
it.path == requested
} else {
@@ -27,7 +27,7 @@ class InjectPageQualifierHandler implements QualifierHandler {
if (found == null) {
throw new IllegalArgumentException("Cannot find a page with the following name or path: $requested")
}
- new SingletonBinding(found.get() as T)
+ new SingletonBinding(found as T)
}
}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/objects/InjectPages.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/InjectPages.groovy
similarity index 92%
rename from api/src/main/groovy/com/jessebrault/ssg/objects/InjectPages.groovy
rename to api/src/main/groovy/com/jessebrault/ssg/di/InjectPages.groovy
index b74d09d..0cf96ed 100644
--- a/api/src/main/groovy/com/jessebrault/ssg/objects/InjectPages.groovy
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/InjectPages.groovy
@@ -1,4 +1,4 @@
-package com.jessebrault.ssg.objects
+package com.jessebrault.ssg.di
import jakarta.inject.Qualifier
diff --git a/api/src/main/groovy/com/jessebrault/ssg/objects/InjectPagesQualifierHandler.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/InjectPagesQualifierHandler.groovy
similarity index 76%
rename from api/src/main/groovy/com/jessebrault/ssg/objects/InjectPagesQualifierHandler.groovy
rename to api/src/main/groovy/com/jessebrault/ssg/di/InjectPagesQualifierHandler.groovy
index 1c3a5c1..adf5174 100644
--- a/api/src/main/groovy/com/jessebrault/ssg/objects/InjectPagesQualifierHandler.groovy
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/InjectPagesQualifierHandler.groovy
@@ -1,4 +1,4 @@
-package com.jessebrault.ssg.objects
+package com.jessebrault.ssg.di
import com.jessebrault.ssg.page.Page
import com.jessebrault.ssg.util.Glob
@@ -23,19 +23,19 @@ class InjectPagesQualifierHandler implements QualifierHandler {
for (final String requested : injectPages.value()) {
if (requested.startsWith('/')) {
def glob = new Glob(requested)
- def allFound = this.pagesExtension.pageProviders.inject([] as Set) { acc, pageProvider ->
- if (glob.matches(pageProvider.path)) {
- acc << pageProvider.get()
+ def allFound = this.pagesExtension.allPages.inject([] as Set) { acc, page ->
+ if (glob.matches(page.path)) {
+ acc << page
}
acc
}
allFound.each { foundPages << it }
} else {
- def found = this.pagesExtension.pageProviders.find { it.name == requested }
+ def found = this.pagesExtension.allPages.find { it.name == requested }
if (found == null) {
throw new IllegalArgumentException("Cannot find page with the name: $requested")
}
- foundPages << found.get()
+ foundPages << found
}
}
new SingletonBinding(foundPages as T)
diff --git a/api/src/main/groovy/com/jessebrault/ssg/objects/InjectText.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/InjectText.groovy
similarity index 92%
rename from api/src/main/groovy/com/jessebrault/ssg/objects/InjectText.groovy
rename to api/src/main/groovy/com/jessebrault/ssg/di/InjectText.groovy
index c19c9b5..3f4d66e 100644
--- a/api/src/main/groovy/com/jessebrault/ssg/objects/InjectText.groovy
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/InjectText.groovy
@@ -1,4 +1,4 @@
-package com.jessebrault.ssg.objects
+package com.jessebrault.ssg.di
import jakarta.inject.Qualifier
diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/InjectTextQualifierHandler.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/InjectTextQualifierHandler.groovy
new file mode 100644
index 0000000..1c98ecc
--- /dev/null
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/InjectTextQualifierHandler.groovy
@@ -0,0 +1,28 @@
+package com.jessebrault.ssg.di
+
+import com.jessebrault.ssg.text.Text
+import groovy.transform.TupleConstructor
+import groowt.util.di.Binding
+import groowt.util.di.QualifierHandler
+import groowt.util.di.SingletonBinding
+
+@TupleConstructor(includeFields = true)
+class InjectTextQualifierHandler implements QualifierHandler {
+
+ private final TextsExtension extension
+
+ @Override
+ Binding handle(InjectText injectText, Class requestedClass) {
+ if (!Text.isAssignableFrom(requestedClass)) {
+ throw new IllegalArgumentException("Cannot @InjectText on a non-Text parameter/method/field.")
+ }
+ def found = this.extension.allTexts.find {
+ it.name == injectText.value() || it.path == injectText.value()
+ }
+ if (found == null) {
+ throw new IllegalArgumentException("Could not find a Text with name or path ${injectText.value()}")
+ }
+ new SingletonBinding(found as T)
+ }
+
+}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/objects/InjectTexts.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/InjectTexts.groovy
similarity index 92%
rename from api/src/main/groovy/com/jessebrault/ssg/objects/InjectTexts.groovy
rename to api/src/main/groovy/com/jessebrault/ssg/di/InjectTexts.groovy
index b6bbf89..7642e26 100644
--- a/api/src/main/groovy/com/jessebrault/ssg/objects/InjectTexts.groovy
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/InjectTexts.groovy
@@ -1,4 +1,4 @@
-package com.jessebrault.ssg.objects
+package com.jessebrault.ssg.di
import jakarta.inject.Qualifier
diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/InjectTextsQualifierHandler.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/InjectTextsQualifierHandler.groovy
new file mode 100644
index 0000000..63961ff
--- /dev/null
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/InjectTextsQualifierHandler.groovy
@@ -0,0 +1,39 @@
+package com.jessebrault.ssg.di
+
+import com.jessebrault.ssg.text.Text
+import com.jessebrault.ssg.util.Glob
+import groovy.transform.TupleConstructor
+import groowt.util.di.Binding
+import groowt.util.di.QualifierHandler
+import groowt.util.di.SingletonBinding
+
+@TupleConstructor(includeFields = true)
+class InjectTextsQualifierHandler implements QualifierHandler {
+
+ private final TextsExtension extension
+
+ @Override
+ Binding handle(InjectTexts injectTexts, Class aClass) {
+ if (!Set.is(aClass)) {
+ throw new IllegalArgumentException('Cannot @InjectTexts on a non-Set parameter/method/field.')
+ }
+ def allFound = injectTexts.value().inject([] as Set) { acc, nameOrPathGlob ->
+ if (nameOrPathGlob.startsWith('/')) {
+ def glob = new Glob(nameOrPathGlob)
+ def matching = this.extension.allTexts.inject([] as Set) { matchingAcc, text ->
+ if (glob.matches(text.path)) {
+ matchingAcc << text
+ }
+ matchingAcc
+ }
+ acc.addAll(matching)
+ } else {
+ def found = this.extension.allTexts.find { it.name == nameOrPathGlob }
+ acc << found
+ }
+ acc
+ }
+ new SingletonBinding(allFound as T)
+ }
+
+}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/ModelsExtension.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/ModelsExtension.groovy
new file mode 100644
index 0000000..b65d97d
--- /dev/null
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/ModelsExtension.groovy
@@ -0,0 +1,28 @@
+package com.jessebrault.ssg.di
+
+import com.jessebrault.ssg.model.Model
+import groowt.util.di.QualifierHandler
+import groowt.util.di.QualifierHandlerContainer
+import groowt.util.di.RegistryExtension
+
+import java.lang.annotation.Annotation
+
+class ModelsExtension implements QualifierHandlerContainer, RegistryExtension {
+
+ final Set allModels = []
+
+ private final QualifierHandler injectModelQualifierHandler = new InjectModelQualifierHandler(this)
+ private final QualifierHandler injectModelsQualifierHandler = new InjectModelsQualifierHandler(this)
+
+ @Override
+ QualifierHandler getQualifierHandler(Class aClass) {
+ if (aClass == InjectModel) {
+ return this.injectModelQualifierHandler as QualifierHandler
+ } else if (aClass == InjectModels) {
+ return this.injectModelsQualifierHandler as QualifierHandler
+ } else {
+ return null
+ }
+ }
+
+}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/objects/PagesExtension.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/PagesExtension.groovy
similarity index 85%
rename from api/src/main/groovy/com/jessebrault/ssg/objects/PagesExtension.groovy
rename to api/src/main/groovy/com/jessebrault/ssg/di/PagesExtension.groovy
index 3833888..b6491d5 100644
--- a/api/src/main/groovy/com/jessebrault/ssg/objects/PagesExtension.groovy
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/PagesExtension.groovy
@@ -1,7 +1,6 @@
-package com.jessebrault.ssg.objects
+package com.jessebrault.ssg.di
-
-import com.jessebrault.ssg.provider.PageProvider
+import com.jessebrault.ssg.page.Page
import groowt.util.di.QualifierHandler
import groowt.util.di.QualifierHandlerContainer
import groowt.util.di.RegistryExtension
@@ -10,7 +9,7 @@ import java.lang.annotation.Annotation
class PagesExtension implements QualifierHandlerContainer, RegistryExtension {
- final Set pageProviders = []
+ final Set allPages = []
private final QualifierHandler injectPage = new InjectPageQualifierHandler(this)
private final QualifierHandler injectPages = new InjectPagesQualifierHandler(this)
diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/SelfPage.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/SelfPage.groovy
new file mode 100644
index 0000000..4868434
--- /dev/null
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/SelfPage.groovy
@@ -0,0 +1,13 @@
+package com.jessebrault.ssg.di
+
+import jakarta.inject.Qualifier
+
+import java.lang.annotation.ElementType
+import java.lang.annotation.Retention
+import java.lang.annotation.RetentionPolicy
+import java.lang.annotation.Target
+
+@Qualifier
+@Retention(RetentionPolicy.RUNTIME)
+@Target([ElementType.PARAMETER, ElementType.METHOD, ElementType.FIELD])
+@interface SelfPage {}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/SelfPageExtension.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/SelfPageExtension.groovy
new file mode 100644
index 0000000..d8f6537
--- /dev/null
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/SelfPageExtension.groovy
@@ -0,0 +1,42 @@
+package com.jessebrault.ssg.di
+
+import com.jessebrault.ssg.page.Page
+import groovy.transform.TupleConstructor
+import groowt.util.di.*
+
+import java.lang.annotation.Annotation
+
+class SelfPageExtension implements RegistryExtension, QualifierHandlerContainer {
+
+ @TupleConstructor(includeFields = true)
+ static class SelfPageQualifierHandler implements QualifierHandler {
+
+ private final SelfPageExtension extension
+
+ @Override
+ Binding handle(SelfPage selfPage, Class requestedType) {
+ if (!Page.class.isAssignableFrom(requestedType)) {
+ throw new IllegalArgumentException('Cannot put @SelfPage on a non-Page parameter/method/field.')
+ }
+ if (this.extension.currentPage == null) {
+ throw new IllegalStateException('Cannot get @SelfPage because extension.currentPage is null.')
+ }
+ new SingletonBinding(this.extension.currentPage as T)
+ }
+
+ }
+
+ Page currentPage
+
+ private final SelfPageQualifierHandler selfPageQualifierHandler = new SelfPageQualifierHandler(this)
+
+ @Override
+ QualifierHandler getQualifierHandler(Class annotationType) {
+ if (SelfPage.is(annotationType)) {
+ return this.selfPageQualifierHandler as QualifierHandler
+ } else {
+ return null
+ }
+ }
+
+}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/objects/SsgObjectFactory.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/SsgObjectFactory.groovy
similarity index 92%
rename from api/src/main/groovy/com/jessebrault/ssg/objects/SsgObjectFactory.groovy
rename to api/src/main/groovy/com/jessebrault/ssg/di/SsgObjectFactory.groovy
index e6a690c..6e071bd 100644
--- a/api/src/main/groovy/com/jessebrault/ssg/objects/SsgObjectFactory.groovy
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/SsgObjectFactory.groovy
@@ -1,4 +1,4 @@
-package com.jessebrault.ssg.objects
+package com.jessebrault.ssg.di
import groowt.util.di.DefaultRegistryObjectFactory
import groowt.util.di.RegistryObjectFactory
diff --git a/api/src/main/groovy/com/jessebrault/ssg/di/TextsExtension.groovy b/api/src/main/groovy/com/jessebrault/ssg/di/TextsExtension.groovy
new file mode 100644
index 0000000..d74f823
--- /dev/null
+++ b/api/src/main/groovy/com/jessebrault/ssg/di/TextsExtension.groovy
@@ -0,0 +1,28 @@
+package com.jessebrault.ssg.di
+
+import com.jessebrault.ssg.text.Text
+import groowt.util.di.QualifierHandler
+import groowt.util.di.QualifierHandlerContainer
+import groowt.util.di.RegistryExtension
+
+import java.lang.annotation.Annotation
+
+class TextsExtension implements QualifierHandlerContainer, RegistryExtension {
+
+ final Set allTexts = []
+
+ private final QualifierHandler injectTextQualifierHandler = new InjectTextQualifierHandler(this)
+ private final QualifierHandler injectTextsQualifierHandler = new InjectTextsQualifierHandler(this)
+
+ @Override
+ QualifierHandler getQualifierHandler(Class aClass) {
+ if (InjectText.is(aClass)) {
+ return this.injectTextQualifierHandler as QualifierHandler
+ } else if (InjectTexts.is(aClass)) {
+ return this.injectTextsQualifierHandler as QualifierHandler
+ } else {
+ return null
+ }
+ }
+
+}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/dsl/EmbeddablePart.groovy b/api/src/main/groovy/com/jessebrault/ssg/dsl/EmbeddablePart.groovy
deleted file mode 100644
index c54dcb7..0000000
--- a/api/src/main/groovy/com/jessebrault/ssg/dsl/EmbeddablePart.groovy
+++ /dev/null
@@ -1,56 +0,0 @@
-package com.jessebrault.ssg.dsl
-
-import com.jessebrault.ssg.part.Part
-import com.jessebrault.ssg.render.RenderContext
-import com.jessebrault.ssg.text.Text
-import com.jessebrault.ssg.util.Diagnostic
-import groovy.transform.EqualsAndHashCode
-import org.jetbrains.annotations.Nullable
-
-import java.util.function.Consumer
-
-import static java.util.Objects.requireNonNull
-
-@EqualsAndHashCode(includeFields = true)
-final class EmbeddablePart {
-
- private final Part part
- private final RenderContext context
- private final Consumer> diagnosticsConsumer
-
- @Nullable
- private final Text text
-
- EmbeddablePart(
- Part part,
- RenderContext context,
- Consumer> diagnosticsConsumer,
- @Nullable Text text
- ) {
- this.part = requireNonNull(part)
- this.context = requireNonNull(context)
- this.diagnosticsConsumer = requireNonNull(diagnosticsConsumer)
- this.text = text
- }
-
- String render(Map binding = [:]) {
- def result = this.part.type.renderer.render(
- this.part,
- binding,
- this.context,
- this.text
- )
- if (result.hasDiagnostics()) {
- this.diagnosticsConsumer.accept(result.diagnostics)
- ''
- } else {
- result.get()
- }
- }
-
- @Override
- String toString() {
- "EmbeddablePart(part: ${ this.part })"
- }
-
-}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/dsl/EmbeddablePartsMap.groovy b/api/src/main/groovy/com/jessebrault/ssg/dsl/EmbeddablePartsMap.groovy
deleted file mode 100644
index bc4878a..0000000
--- a/api/src/main/groovy/com/jessebrault/ssg/dsl/EmbeddablePartsMap.groovy
+++ /dev/null
@@ -1,36 +0,0 @@
-package com.jessebrault.ssg.dsl
-
-import com.jessebrault.ssg.render.RenderContext
-import com.jessebrault.ssg.text.Text
-import com.jessebrault.ssg.util.Diagnostic
-import groovy.transform.EqualsAndHashCode
-import org.jetbrains.annotations.Nullable
-
-import java.util.function.Consumer
-
-import static java.util.Objects.requireNonNull
-
-@EqualsAndHashCode(includeFields = true)
-final class EmbeddablePartsMap {
-
- @Delegate
- private final Map partsMap = [:]
-
- EmbeddablePartsMap(
- RenderContext context,
- Consumer> diagnosticsConsumer,
- @Nullable Text text = null
- ) {
- requireNonNull(context)
- requireNonNull(diagnosticsConsumer)
- context.parts.each {
- this[it.path] = new EmbeddablePart(it, context, diagnosticsConsumer, text)
- }
- }
-
- @Override
- String toString() {
- "EmbeddablePartsMap(partsMap: ${ this.partsMap })"
- }
-
-}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/dsl/EmbeddableText.groovy b/api/src/main/groovy/com/jessebrault/ssg/dsl/EmbeddableText.groovy
deleted file mode 100644
index 77f3f6b..0000000
--- a/api/src/main/groovy/com/jessebrault/ssg/dsl/EmbeddableText.groovy
+++ /dev/null
@@ -1,63 +0,0 @@
-package com.jessebrault.ssg.dsl
-
-import com.jessebrault.ssg.text.FrontMatter
-import com.jessebrault.ssg.text.Text
-import com.jessebrault.ssg.util.Diagnostic
-import groovy.transform.EqualsAndHashCode
-import groovy.transform.Memoized
-import groovy.transform.NullCheck
-import groovy.transform.TupleConstructor
-
-import java.util.function.Consumer
-
-@TupleConstructor(includeFields = true, defaults = false)
-@NullCheck(includeGenerated = true)
-@EqualsAndHashCode(includeFields = true)
-final class EmbeddableText {
-
- private final Text text
- private final Consumer> diagnosticsConsumer
-
- @Memoized
- String render() {
- def result = this.text.type.renderer.render(this.text)
- if (result.diagnostics.size() > 0) {
- this.diagnosticsConsumer.accept(result.diagnostics)
- ''
- } else {
- result.get()
- }
- }
-
- @Memoized
- FrontMatter getFrontMatter() {
- def result = this.text.type.frontMatterGetter.get(this.text)
- if (result.hasDiagnostics()) {
- this.diagnosticsConsumer.accept(result.diagnostics)
- new FrontMatter(this.text, [:])
- } else {
- result.get()
- }
- }
-
- @Memoized
- String getExcerpt(int limit) {
- def result = this.text.type.excerptGetter.getExcerpt(this.text, limit)
- if (result.hasDiagnostics()) {
- this.diagnosticsConsumer.accept(result.diagnostics)
- ''
- } else {
- result.get()
- }
- }
-
- String getPath() {
- this.text.path
- }
-
- @Override
- String toString() {
- "EmbeddableText(text: ${ this.text })"
- }
-
-}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/dsl/EmbeddableTextsCollection.groovy b/api/src/main/groovy/com/jessebrault/ssg/dsl/EmbeddableTextsCollection.groovy
deleted file mode 100644
index 7165db2..0000000
--- a/api/src/main/groovy/com/jessebrault/ssg/dsl/EmbeddableTextsCollection.groovy
+++ /dev/null
@@ -1,28 +0,0 @@
-package com.jessebrault.ssg.dsl
-
-import com.jessebrault.ssg.text.Text
-import com.jessebrault.ssg.util.Diagnostic
-import groovy.transform.EqualsAndHashCode
-import groovy.transform.NullCheck
-
-import java.util.function.Consumer
-
-@NullCheck
-@EqualsAndHashCode(includeFields = true)
-final class EmbeddableTextsCollection {
-
- @Delegate
- private final Collection embeddableTexts = []
-
- EmbeddableTextsCollection(Collection texts, Consumer> diagnosticsConsumer) {
- texts.each {
- this << new EmbeddableText(it, diagnosticsConsumer)
- }
- }
-
- @Override
- String toString() {
- "EmbeddableTextsCollection(embeddableTexts: ${ this.embeddableTexts })"
- }
-
-}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/dsl/ModelCollection.groovy b/api/src/main/groovy/com/jessebrault/ssg/dsl/ModelCollection.groovy
deleted file mode 100644
index 2a6987f..0000000
--- a/api/src/main/groovy/com/jessebrault/ssg/dsl/ModelCollection.groovy
+++ /dev/null
@@ -1,84 +0,0 @@
-package com.jessebrault.ssg.dsl
-
-import com.jessebrault.ssg.model.Model
-import groovy.transform.EqualsAndHashCode
-import groovy.transform.NullCheck
-import org.jetbrains.annotations.Nullable
-import org.slf4j.Logger
-import org.slf4j.LoggerFactory
-import org.slf4j.Marker
-import org.slf4j.MarkerFactory
-
-import java.util.function.Predicate
-
-@NullCheck
-@EqualsAndHashCode(includeFields = true)
-final class ModelCollection {
-
- private static final Logger logger = LoggerFactory.getLogger(ModelCollection)
- private static final Marker enter = MarkerFactory.getMarker('ENTER')
- private static final Marker exit = MarkerFactory.getMarker('EXIT')
-
- @Delegate
- private final Collection> models = []
-
- ModelCollection(Collection> models) {
- this.models.addAll(models)
- }
-
- @Nullable
- Model getByName(String name) {
- this.models.find { it.name == name }
- }
-
- @Nullable
- Model getByNameAndType(String name, Class type) {
- this.models.find { it.name == name && type.isAssignableFrom(it.get().class) } as Model
- }
-
- Optional> findByName(String name) {
- Optional.ofNullable(this.getByName(name))
- }
-
- def Optional> findByNameAndType(String name, Class type) {
- Optional.ofNullable(this.getByNameAndType(name, type))
- }
-
- def ModelCollection findAllByType(Class type) {
- logger.trace(enter, 'type: {}', type)
- def es = this.models.findResults {
- def itType = it.get().class
- def itResult = type.isAssignableFrom(itType)
- logger.debug(
- 'it: {}, itType: {}, itType.classLoader: {}, itResult: {}',
- it, itType, itType.classLoader, itResult
- )
- itResult ? it as Model : null
- }
- def result = new ModelCollection<>(es)
- logger.trace(exit, 'result: {}', result)
- result
- }
-
- def Optional> findOne(Class type, Predicate filter) {
- Optional.ofNullable(this.models.find {
- def t = it.get()
- if (type.isAssignableFrom(t.class)) {
- filter.test(t as E) ? it : null
- } else {
- null
- }
- } as Model)
- }
-
- def Optional> findOne(Class type) {
- this.findOne(type) { true }
- }
-
- Optional> findOne(Predicate filter) {
- Optional.ofNullable(this.models.find {
- filter.test(it.get()) ? it : null
- })
- }
-
-}
diff --git a/api/src/main/groovy/com/jessebrault/ssg/dsl/StandardDslMap.groovy b/api/src/main/groovy/com/jessebrault/ssg/dsl/StandardDslMap.groovy
deleted file mode 100644
index 40d986c..0000000
--- a/api/src/main/groovy/com/jessebrault/ssg/dsl/StandardDslMap.groovy
+++ /dev/null
@@ -1,81 +0,0 @@
-package com.jessebrault.ssg.dsl
-
-import com.jessebrault.ssg.dsl.tagbuilder.DynamicTagBuilder
-import com.jessebrault.ssg.dsl.urlbuilder.PathBasedUrlBuilder
-import com.jessebrault.ssg.render.RenderContext
-import com.jessebrault.ssg.text.Text
-import com.jessebrault.ssg.util.Diagnostic
-import groovy.transform.NullCheck
-import org.slf4j.LoggerFactory
-
-import java.util.function.Consumer
-
-final class StandardDslMap {
-
- @NullCheck(includeGenerated = true)
- static final class Builder {
-
- private final Map custom = [:]
-
- Consumer> diagnosticsConsumer = { }
- String loggerName = ''
- Text text = null
-
- void putCustom(String key, Object value) {
- this.custom.put(key, value)
- }
-
- void putAllCustom(Map m) {
- this.custom.putAll(m)
- }
-
- }
-
- static Map get(
- RenderContext context,
- Consumer builderConsumer
- ) {
- def b = new Builder()
- builderConsumer.accept(b)
-
- [:].tap {
- // standard variables
- it.globals = context.globals
- it.logger = LoggerFactory.getLogger(b.loggerName)
- it.models = new ModelCollection