Update expand path and pkg name, nested placeholder

Author: dengzii

resources/META-INF/plugin.xml

@@ -1,7 +1,7 @@
 <idea-plugin>
     <id>com.dengzii.plugin.template</id>
     <name>Generate Module From Template</name>
-    <version>1.5.1</version>
+    <version>1.5.2</version>
     <vendor email="[email protected]" url="https://github.com/dengzii">dengzi</vendor>
 
     <description><![CDATA[
@@ -46,6 +46,10 @@ Any question please <a href='https://github.com/dengzii/GenerateModuleFromTempla
     ]]></description>
 
     <change-notes><![CDATA[
+    <b>Version 1.5.2 (2021/03/02)</b><br>
+    0. Update: Configurable expand package name, expand path.<br>
+    1. Feat: support nested placeholder.<br>
+    <br>
     <b>Version 1.5.1 (2021/06/28)</b><br>
     0. Fix bug: file template can not use.<br>
     1. Update: Rename file use original name.<br>

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

@@ -41,7 +41,9 @@ object Config {
             return result
         }
         Logger.i(TAG, "loadModuleTemplates")
-        arr.filter { !it.isNullOrBlank() }.forEach {
+        arr.filter {
+            !it.isNullOrBlank()
+        }.forEach {
             try {
                 val module = GSON.fromJson(it, Module::class.java)
                 module.initTemplate()

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

@@ -28,7 +28,6 @@ class FileWriteCommand(private var kit: PluginKit, private var module: Module) :
     }
 
     override fun run() {
-
         val current = kit.getVirtualFile() ?: return
         if (!current.isDirectory) {
             Logger.i(TAG, "Current target is not directory.")
@@ -37,7 +36,8 @@ 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.build()
+        fileTreeNode.expandPath()
+        fileTreeNode.expandPkgName(true)
 
         val failedList = mutableListOf<FileTreeNode>()
         fileTreeNode.children.forEach {

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

@@ -44,11 +44,14 @@ open class FileTreeNode() {
     @Transient
     var parent: FileTreeNode? = null
 
+    @Transient
+    private var module: Module? = null
+
     companion object {
 
-        var packageNameToDirs = true
         private val TAG = FileTreeNode::class.java.simpleName
-        private val sPathSplitPattern = Pattern.compile("[./]")
+        private val sPathSplitPattern = Pattern.compile("[/]")
+        private val sPkgSplitPattern = Pattern.compile("[\\.]")
         private val sPlaceholderPattern = Pattern.compile("\\$\\{([A-Za-z0-9_\\-]+)}")
 
         fun root(path: String): FileTreeNode {
@@ -69,6 +72,16 @@ open class FileTreeNode() {
         this.isDir = isDir
     }
 
+    fun init(module: Module) {
+        this.module = module
+        children.forEach {
+            it.parent = this
+            if (it.isDir) {
+                it.init(module)
+            }
+        }
+    }
+
     fun getTreeNodeCount(): Int {
         var count = realChildren.size
         realChildren.forEach {
@@ -134,9 +147,11 @@ open class FileTreeNode() {
 
     private fun getRealName(fileName: String = this.name): String {
         return if (isDir) {
-            fileName.replacePlaceholder(getPlaceholderInherit(), false).toLowerCase()
+            val rn = fileName.replacePlaceholder(getPlaceholderInherit(), false)
+            if (getModuleInherit()?.lowercaseDir == true) rn.lowercase() else rn
         } else {
-            fileName.replacePlaceholder(getPlaceholderInherit(), true)
+            val capitalize = getModuleInherit()?.capitalizeFile ?: false
+            fileName.replacePlaceholder(getPlaceholderInherit(), capitalize)
         }
     }
 
@@ -315,30 +330,50 @@ open class FileTreeNode() {
     }
 
     /**
-     * build file tree
-     * replace placeholder in name
-     * if this is directory and name is a path or package name
-     * the name will expand to several dirs
+     * expand path name to dir structure
      */
-    fun build() {
-
+    fun expandPath() {
         if (!isDir) {
             return
         }
-        name = getRealName()
         if (!isRoot()) {
-            val dir = if (packageNameToDirs) {
-                name.split(sPathSplitPattern)
-            } else {
-                name.split("/")
-            }.filter {
-                it.isNotBlank()
-            }.toMutableList()
+            val dir = name.split("/")
+                .filter {
+                    it.isNotBlank()
+                }
+                .toMutableList()
+            expandDirs(dir)
+        }
+        realChildren.forEach {
+            it.expandPath()
+        }
+    }
 
+    /**
+     * expand the package name to dir structure, eg: `com.example.app` to `com/example/app`
+     */
+    fun expandPkgName(replacePlaceholder: Boolean = true) {
+        if (!isDir) {
+            return
+        }
+        val pkgName2Dir = getModuleInherit()?.packageNameToDir ?: false
+        if (!pkgName2Dir) {
+            return
+        }
+        if (replacePlaceholder) {
+            name = getRealName()
+        }
+        if (!isRoot()) {
+            val dir = name
+                .split(sPkgSplitPattern)
+                .filter {
+                    it.isNotBlank()
+                }
+                .toMutableList()
             expandDirs(dir)
         }
         realChildren.forEach {
-            it.build()
+            it.expandPkgName(replacePlaceholder)
         }
     }
 
@@ -403,6 +438,7 @@ open class FileTreeNode() {
         val clone = FileTreeNode(null, name, isDir)
         clone.fileTemplates = fileTemplates?.toMutableMap()
         clone.placeholders = placeholders?.toMutableMap()
+        clone.module = module
         realChildren.forEach {
             clone.addChild(it.clone())
         }
@@ -422,28 +458,32 @@ open class FileTreeNode() {
         head.forEach {
             str.append(it)
         }
-        str.append(when (this) {
-            parent?.realChildren?.last() -> "└─"
-            parent?.realChildren?.first() -> "├─"
-            else -> {
-                when {
-                    parent != null -> "├─"
-                    else -> ""
+        str.append(
+            when (this) {
+                parent?.realChildren?.last() -> "└─"
+                parent?.realChildren?.first() -> "├─"
+                else -> {
+                    when {
+                        parent != null -> "├─"
+                        else -> ""
+                    }
                 }
             }
-        })
+        )
         str.append(getRealName())
         if (isDir) {
 //            str.append("\tplaceholder: ").append(placeholders)
         }
         str.append("\n")
 
         if (!realChildren.isNullOrEmpty()) {
-            head.push(when {
-                parent == null -> ""
-                parent?.realChildren?.last() != this -> "│\t"
-                else -> "\t"
-            })
+            head.push(
+                when {
+                    parent == null -> ""
+                    parent?.realChildren?.last() != this -> "│\t"
+                    else -> "\t"
+                }
+            )
             realChildren.forEach {
                 str.append(it.getNodeGraph(head))
             }
@@ -471,6 +511,10 @@ open class FileTreeNode() {
         }
     }
 
+    private fun getModuleInherit(): Module? {
+        return module ?: parent?.getModuleInherit()
+    }
+
     private fun getLabel(): String {
         return "${name}_$isDir"
     }
@@ -498,13 +542,23 @@ open class FileTreeNode() {
             return this
         }
         placeholders.forEach { (k, v) ->
-            val replaced = if (capitalize) {
-                v.toLowerCase().capitalize()
-            } else {
-                v
+            var replacement = v
+            if (capitalize) {
+                replacement = v.lowercase(Locale.getDefault())
+                    .replaceFirstChar {
+                        if (it.isLowerCase()) {
+                            it.titlecase(Locale.getDefault())
+                        } else {
+                            it.toString()
+                        }
+                    }
             }
-            after = after.replace("\${$k}", replaced)
+            after = after.replace("\${$k}", replacement)
+        }
+        return if (after == this || !after.contains('$')) {
+            after
+        } else {
+            after.replacePlaceholder(placeholders, capitalize)
         }
-        return after
     }
 }

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

@@ -3,18 +3,31 @@ package com.dengzii.plugin.template.model
 import com.dengzii.plugin.template.template.AucTemplate
 import com.dengzii.plugin.template.template.Template
 import com.dengzii.plugin.template.utils.Logger
+import java.util.*
 
 class Module(
-        var template: FileTreeNode,
-        var language: String,
-        var templateName: String
+    var template: FileTreeNode,
+    var language: String,
+    var templateName: String,
+    var lowercaseDir: Boolean = true,
+    var capitalizeFile: Boolean = true,
+    var packageNameToDir: Boolean = true
 ) {
 
     companion object {
 
         fun create(template: FileTreeNode, templateName: String): Module {
             Logger.i(Module::class.java.simpleName, "create module. templateName=$templateName")
-            return Module(template, "java", templateName)
+            return Module(
+                template,
+                "java",
+                templateName,
+                lowercaseDir = false,
+                capitalizeFile = false,
+                packageNameToDir = false
+            ).apply {
+                template.init(this)
+            }
         }
 
         fun getAndroidApplication(): Module {
@@ -45,24 +58,19 @@ class Module(
             return create(Template.ANDROID_MVP, "Android MVP")
         }
 
-        fun getLangList() = Language.values().map { it.name.toLowerCase() }.toTypedArray()
+        fun getLangList() = Language.values().map { it.name.lowercase(Locale.getDefault()) }.toTypedArray()
     }
 
     enum class Language {
         JAVA;
     }
 
     fun initTemplate(node: FileTreeNode = template) {
-        node.children.forEach {
-            it.parent = node
-            if (it.isDir) {
-                initTemplate(it)
-            }
-        }
+        node.init(this)
     }
 
     fun clone(): Module {
-        return create(template.clone(), templateName)
+        return Module(template.clone(), language, templateName, lowercaseDir, capitalizeFile, packageNameToDir)
     }
 
 }