fix: file tree resolve order incorrect

Author: dengzii

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

@@ -38,9 +38,6 @@ class FileWriteCommand(private var kit: PluginKit, private var module: Module) :
         val fileTreeNode = module.template
         Logger.d(TAG, "Placeholders : " + fileTreeNode.getPlaceholderInherit().toString())
         Logger.d(TAG, "FileTemplates : " + fileTreeNode.getFileTemplateInherit().toString())
-        fileTreeNode.expandPath()
-        fileTreeNode.expandPkgName(true)
-        fileTreeNode.resolveFileTemplate()
 
         var context: VelocityContext? = null
         if (module.enableApacheVelocity) {
@@ -53,6 +50,12 @@ class FileWriteCommand(private var kit: PluginKit, private var module: Module) :
         }
         fileTreeNode.context = context
 
+        fileTreeNode.resolveTreeFileName()
+        fileTreeNode.resolveFileTemplate()
+
+        fileTreeNode.expandPath()
+        fileTreeNode.expandPkgName(true)
+
         val failedList = mutableListOf<FileTreeNode>()
         fileTreeNode.children.forEach {
             failedList.addAll(createFileTree(context, it, current))

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

@@ -227,6 +227,18 @@ open class FileTreeNode() {
         }
     }
 
+    /**
+     * Resolve all file name in tree node with apache velocity, and set the resolved name to the node.
+     *
+     * @param context The velocity context
+     */
+    fun resolveTreeFileName(context: VelocityContext? = getContextInherit()) {
+        name = getRealNameInternal(context)
+        traversal({ it, _ ->
+            it.resolveTreeFileName(context)
+        })
+    }
+
     /**
      *  Resolve all file template file name in tree node.
      */

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

@@ -1,6 +1,8 @@
 package com.dengzii.plugin.template.model
 
 import junit.framework.TestCase
+import org.apache.velocity.VelocityContext
+import org.apache.velocity.util.StringUtils
 import org.junit.Test
 
 /**
@@ -82,4 +84,36 @@ class FileTreeNodeTest : TestCase() {
         m.template.expandPkgName(true)
         println(m.template.getTreeGraph())
     }
+
+    fun testExpandPkg() {
+
+        val dsl = FileTreeDsl {
+            placeholder("FT", "com_demo")
+            dir("root") {
+                dir("\${FT.replaceAll(\"[^\\w]\", \".\")}") {
+                    file("a.txt")
+                }
+                dir("\${FT.replaceAll(\"[_]\", \".\")}") {
+                    file("a.txt")
+                }
+                file("\${FT}.txt")
+            }
+        }
+        val m = Module.create(dsl, "test")
+        m.packageNameToDir = true
+        m.packageNameToDir = true
+        m.enableApacheVelocity = true
+
+        m.template.context = VelocityContext().apply {
+            put("StringUtils", StringUtils::class.java).apply {
+                put("FT", "com_demo")
+            }
+        }
+
+        m.template.resolveTreeFileName()
+        println(m.template.getTreeGraph())
+
+        m.template.expandPkgName(true)
+        println(m.template.getTreeGraph())
+    }
 }