update: parse file template file name use Velocity, and support match by path

Author: dengzii

src/com/dengzii/plugin/template/FileWriteCommand.kt

@@ -40,6 +40,7 @@ class FileWriteCommand(private var kit: PluginKit, private var module: Module) :
         Logger.d(TAG, "FileTemplates : " + fileTreeNode.getFileTemplateInherit().toString())
         fileTreeNode.expandPath()
         fileTreeNode.expandPkgName(true)
+        fileTreeNode.resolveFileTemplate()
 
         var context: VelocityContext? = null
         if (module.enableApacheVelocity) {

src/com/dengzii/plugin/template/model/FileTreeDsl.kt

@@ -33,14 +33,17 @@ class FileTreeDsl() : FileTreeNode() {
         }
     }
 
-    fun FileTreeNode.file(name: String) {
-        if (!isDir) return
+    fun FileTreeNode.file(name: String): FileTreeNode {
+        if (!isDir) throw IllegalStateException("Can not create file in a file.")
+
         name.getPlaceholder().forEach {
             if (getPlaceholderInherit()?.containsKey(it) == false) {
                 placeholder(it, "")
             }
         }
-        addChild(FileTreeNode(this, name, false))
+        val r = FileTreeNode(this, name, false)
+        addChild(r)
+        return r
     }
 
     fun FileTreeNode.placeholder(name: String, value: String) {

src/com/dengzii/plugin/template/model/FileTreeNode.kt

@@ -213,8 +213,40 @@ open class FileTreeNode() {
         }
     }
 
+    /**
+     *  Resolve all file template file name in tree node.
+     */
+    fun resolveFileTemplate(context: VelocityContext? = null) {
+        val templates = getAllTemplateMap()
+        val placeholders = getPlaceholderInherit() ?: return
+        if (fileTemplates != null && templates.isNotEmpty()) {
+            templates.forEach { (key, value) ->
+                val realName = getRealNameInternal(context, key)
+                val realValue = replacePlaceholder(context, value, placeholders, false)
+                fileTemplates!![realName] = realValue
+            }
+        }
+        traversal({ it, _ ->
+            it.resolveFileTemplate()
+        })
+    }
+
+    /**
+     *  Return the most matching file template.
+     *  If the node has template, return it, otherwise return the template in parent node.
+     */
     fun getTemplateFile(): String? {
-        return template ?: getFileTemplateInherit()?.get(name)
+        if (template != null) {
+            return template
+        }
+        val tpl = getFileTemplateInherit() ?: return null
+        val path = getPath()
+        for (entry in tpl) {
+            if (entry.key != name && path.endsWith(entry.key)) {
+                return entry.value
+            }
+        }
+        return tpl[name]
     }
 
     fun setTemplate(name: String) {
@@ -425,8 +457,12 @@ open class FileTreeNode() {
      *
      * @return The tree graph of node
      */
-    fun getTreeGraph(context: VelocityContext? = null): String {
-        return getNodeGraph(context).toString()
+    fun getTreeGraph(
+        context: VelocityContext? = null,
+        templateFile: Boolean = false,
+        resolveName: Boolean = true,
+    ): String {
+        return getNodeGraph(context, templateFile = templateFile, resolveName = resolveName).toString()
     }
 
     /**
@@ -457,7 +493,9 @@ open class FileTreeNode() {
     private fun getNodeGraph(
         context: VelocityContext?,
         head: Stack<String> = Stack(),
-        str: StringBuilder = StringBuilder()
+        str: StringBuilder = StringBuilder(),
+        templateFile: Boolean = false,
+        resolveName: Boolean = true,
     ): StringBuilder {
 
         head.forEach {
@@ -475,9 +513,12 @@ open class FileTreeNode() {
                 }
             }
         )
-        str.append(getRealName(context))
-        if (isDir) {
-//            str.append("\tplaceholder: ").append(placeholders)
+        val n = if (resolveName) getRealName(context) else name
+
+        if (isDir || !templateFile) {
+            str.append(n)
+        } else {
+            str.append("$n  ${getTemplateFile()}")
         }
         str.append("\n")
 
@@ -490,7 +531,7 @@ open class FileTreeNode() {
                 }
             )
             realChildren.forEach {
-                str.append(it.getNodeGraph(context, head))
+                str.append(it.getNodeGraph(context, head, StringBuilder(), templateFile))
             }
             head.pop()
         }

test/FileTreeDslTest.kt

@@ -125,7 +125,7 @@ class FileTreeDslTest {
                 dir("test")
             }
         }
-//        println(tree.getAllPlaceholderInTree())
+        println(tree.getTreeGraph())
     }
 
 
@@ -137,6 +137,7 @@ class FileTreeDslTest {
         }
         val d = FileTreeDsl {
             file("\${StringUtils.removeAndHump(\${A})}")
+            dir("\${StringUtils.sub(\${A}, \"_\", '')}")
         }
 
         println(d.getTreeGraph(s))

test/com/dengzii/plugin/template/model/FileTreeNodeTest.kt

@@ -30,6 +30,39 @@ class FileTreeNodeTest : TestCase() {
 
     }
 
+    @Test
+    fun testFileTemplate() {
+        FileTreeDsl {
+            placeholder("PKG", "com.example")
+            placeholder("F3", "f3")
+
+            fileTemplate("f1.java", "file1.java")
+            fileTemplate("f2.java", "ff2.java")
+            fileTemplate("\${PKG}/f2.java", "file2.java")
+            fileTemplate("f3.java", "file3.java")
+
+            dir("root") {
+                dir("a/b") {
+                    dir("\${PKG}") {
+                        file("f1.java")
+                        file("f2.java")
+                        file("\${F3}.java")
+
+                    }
+                    dir("c") {
+                        file("f2.java")
+                    }
+                }
+            }
+
+            // parse file template file name use placeholder, and support mat
+
+            resolveFileTemplate()
+            println(getAllTemplateMap())
+            println(getTreeGraph(templateFile = true))
+        }
+    }
+
     @Test
     fun testExpandPath() {
         val dsl = FileTreeDsl {