fix: remove comments from path and group when minify is enabled

rafaeltonholo · Mar 3, 2024 · 475a620 · 475a620
1 parent 950b1f4
commit 475a620
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/shared/src/commonMain/kotlin/dev/tonholo/s2c/domain/AndroidVector.kt b/shared/src/commonMain/kotlin/dev/tonholo/s2c/domain/AndroidVector.kt
@@ -82,9 +82,11 @@ fun AndroidVectorNode.asNode(minified: Boolean): ImageVectorNode = when (this) {
 fun AndroidVectorNode.Path.asNode(minified: Boolean): ImageVectorNode.Path = ImageVectorNode.Path(
     fillColor = fillColor.orEmpty(),
     wrapper = pathData.asNodeWrapper(minified),
+    minified = minified,
 )
 
 fun AndroidVectorNode.Group.asNode(minified: Boolean): ImageVectorNode.Group = ImageVectorNode.Group(
     clipPath = clipPath?.pathData?.asNodeWrapper(minified),
     commands = commands.map { it.asNode(minified) },
+    minified = minified,
 )
diff --git a/shared/src/commonMain/kotlin/dev/tonholo/s2c/domain/ImageVectorNode.kt b/shared/src/commonMain/kotlin/dev/tonholo/s2c/domain/ImageVectorNode.kt
@@ -3,6 +3,7 @@ package dev.tonholo.s2c.domain
 import dev.tonholo.s2c.error.ErrorCode
 import dev.tonholo.s2c.error.ExitProgramException
 import dev.tonholo.s2c.extensions.EMPTY
+import dev.tonholo.s2c.extensions.indented
 import dev.tonholo.s2c.logger.debug
 import dev.tonholo.s2c.logger.debugEndSection
 import dev.tonholo.s2c.logger.debugSection
@@ -13,6 +14,7 @@ sealed interface ImageVectorNode {
     data class Path(
         val fillColor: String,
         val wrapper: NodeWrapper,
+        val minified: Boolean,
     ) : ImageVectorNode {
         override fun materialize(): String {
             val realColor = fillColor.uppercase().removePrefix("#").let { color ->
@@ -45,9 +47,10 @@ sealed interface ImageVectorNode {
                 ""
             }
 
+            val comment = if (minified) "" else "// ${wrapper.normalizedPath}\n|"
+
             return """
-                |// ${wrapper.normalizedPath}
-                |path$pathParamsString {
+                |${comment}path$pathParamsString {
                 |    $pathNodes
                 |}
             """.trimMargin()
@@ -57,6 +60,7 @@ sealed interface ImageVectorNode {
     data class Group(
         val clipPath: NodeWrapper?,
         val commands: List<ImageVectorNode>,
+        val minified: Boolean,
     ) : ImageVectorNode {
         override fun materialize(): String {
             val indentSize = 4
@@ -73,8 +77,13 @@ sealed interface ImageVectorNode {
                             .replace("\n", "\n${" ".repeat(indentSize * 2)}")
                             .trimEnd()
                     }
-                """(
-                |    // ${clipPath.normalizedPath}
+
+                val clipPathComment = if (minified) {
+                    ""
+                } else {
+                    "\n|${"// ${clipPath.normalizedPath}".indented(4)}"
+                }
+                """($clipPathComment
                 |    clipPathData = PathData {
                 |        $clipPathData
                 |    },

diff --git a/shared/src/commonMain/kotlin/dev/tonholo/s2c/domain/PathNodes.kt b/shared/src/commonMain/kotlin/dev/tonholo/s2c/domain/PathNodes.kt
@@ -4,6 +4,7 @@
 
 package dev.tonholo.s2c.domain
 
+import dev.tonholo.s2c.extensions.indented
 import dev.tonholo.s2c.extensions.toInt
 
 sealed class PathNodes(
@@ -39,7 +40,7 @@ sealed class PathNodes(
         if (minified) it.trim() else it
     }
 
-    protected fun Set<String>.toParameters(forceInline: Boolean = false): String {
+    private fun Set<String>.toParameters(forceInline: Boolean = false): String {
         val indentSize = if (minified || forceInline) 0 else 4
         val separator = if (minified || forceInline) "" else "\n"
         val scape = if (minified || forceInline) " " else "|"
@@ -50,8 +51,6 @@ sealed class PathNodes(
         }
     }
 
-    private fun String.indented(indentSize: Int) = " ".repeat(indentSize) + this
-
     class MoveTo(
         values: List<String>,
         isRelative: Boolean,

diff --git a/shared/src/commonMain/kotlin/dev/tonholo/s2c/domain/Svg.kt b/shared/src/commonMain/kotlin/dev/tonholo/s2c/domain/Svg.kt
@@ -81,6 +81,7 @@ fun SvgNode.asNode(masks: List<SvgNode.Mask>, minified: Boolean = false): ImageV
 fun SvgNode.Path.asNode(minified: Boolean = false): ImageVectorNode.Path = ImageVectorNode.Path(
     fillColor = fill.orEmpty(),
     wrapper = d.asNodeWrapper(minified),
+    minified = minified,
 )
 
 fun SvgNode.Group.asNode(
@@ -96,6 +97,7 @@ fun SvgNode.Group.asNode(
 
     return ImageVectorNode.Group(
         clipPath = clipPath,
-        commands = commands.mapNotNull { it.asNode(masks, minified) }
+        commands = commands.mapNotNull { it.asNode(masks, minified) },
+        minified = minified,
     )
 }
diff --git a/shared/src/commonMain/kotlin/dev/tonholo/s2c/extensions/String.extension.kt b/shared/src/commonMain/kotlin/dev/tonholo/s2c/extensions/String.extension.kt
@@ -10,3 +10,5 @@ fun String.camelCase(): String = replaceDividers()
 
 fun String.pascalCase(): String = replaceDividers()
     .replaceFirstChar { it.uppercaseChar() }
+
+fun String.indented(indentSize: Int) = " ".repeat(indentSize) + this
Original file line number	Diff line number	Diff line change
Expand Up		@@ -10,3 +10,5 @@ fun String.camelCase(): String = replaceDividers()

		fun String.pascalCase(): String = replaceDividers()
		.replaceFirstChar { it.uppercaseChar() }

		fun String.indented(indentSize: Int) = " ".repeat(indentSize) + this