rnentjes/kotlin-css-generator
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v. 1.0.2, fix minified option

Browse Source 
Took 8 minutes
This commit is contained in:
rnentjes
2021-10-15 15:04:22 +02:00
parent 6375a0d78d
commit 7e86441d84
2 changed files with 99 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
build.gradle.kts
View File

@@ -3,10 +3,11 @@ plugins {
`maven-publish`
signing
id("org.jetbrains.dokka") version "1.5.31"
id("com.adarshr.test-logger") version "3.0.0"
}
group = "nl.astraeus"
version = "1.0.1"
version = "1.0.2"
repositories {
mavenCentral()
@@ -47,8 +48,12 @@ kotlin {
}
}
testlogger {
showStandardStreams = true
}
extra["PUBLISH_GROUP_ID"] = "nl.astraeus"
extra["PUBLISH_VERSION"] = "1.0.1"
extra["PUBLISH_VERSION"] = "1.0.2"
extra["PUBLISH_ARTIFACT_ID"] = "kotlin-css-generator"
// Stub secrets to let the project sync and build without the publication values set up

131
src/commonMain/kotlin/nl/astraeus/css/style/Style.kt
View File

@@ -35,7 +35,12 @@ abstract class CssGenerator {
abstract fun getValidator(name: String): List<Validator>?
private fun propertyCss(indent: String, name: String, props: List<CssProperty>): String {
private fun propertyCss(
indent: String,
name: String,
minified: Boolean,
props: List<CssProperty>
): String {
val builder = StringBuilder()
getValidator(name)?.forEach {
@@ -52,18 +57,23 @@ abstract class CssGenerator {
}
val paddedName = StringBuilder()
paddedName.append(indent)
if (!minified) {
paddedName.append(indent)
}
paddedName.append(name)
paddedName.append(":")
while (paddedName.length < 32) {
paddedName.append(' ')
if (!minified) {
while (paddedName.length < 32) {
paddedName.append(' ')
}
}
return "$paddedName$builder;\n"
return "$paddedName$builder;"
}
fun generatePropertyCss(
indent: String,
sortProperties: Boolean
sortProperties: Boolean,
minified: Boolean
): String {
val builder = StringBuilder()
@@ -71,11 +81,17 @@ abstract class CssGenerator {
for (name in props.keys.sorted()) {
val prop = props[name] ?: error("$name not found in properties after sorting!")
builder.append(propertyCss(indent, name, prop))
builder.append(propertyCss(indent, name, minified, prop))
if (!minified) {
builder.append("\n")
}
}
} else {
for ((name, prop) in props) {
builder.append(propertyCss(indent, name, prop))
builder.append(propertyCss(indent, name, minified, prop))
if (!minified) {
builder.append("\n")
}
}
}
@@ -107,11 +123,20 @@ abstract class CssGenerator {
) {
if (selectors.isNotEmpty() && block != null) {
append(indent)
append(selectors.joinToString(",\n"))
append(" {\n")
append(selectors.joinToString(if (minified) { "," } else { ",\n" }))
if (!minified) {
append(" ")
}
append("{")
if (!minified) {
append("\n")
}
append(block.content)
append(indent)
append("}\n\n")
append("}")
if (!minified) {
append("\n\n")
}
}
}
@@ -165,18 +190,7 @@ abstract class CssGenerator {
}
}
return if (minified) {
val stripped = StringBuilder()
val skip = arrayOf(' ', '\t', '\n', '\r')
for (char in builder) {
if (!skip.contains(char)) {
stripped.append(char)
}
}
stripped.toString()
} else {
builder.toString()
}
return builder.toString()
}
open fun generateCssBlocks(
@@ -203,7 +217,7 @@ abstract class CssGenerator {
prop(finalStyle)
}
css.append(finalStyle.generatePropertyCss(" $indent", sortProperties))
css.append(finalStyle.generatePropertyCss(" $indent", sortProperties, minified))
if (css.isNotBlank()) {
val builder = StringBuilder()
@@ -218,40 +232,79 @@ abstract class CssGenerator {
//builder.append(" {\n")
finalStyle.fontFace?.let { ff ->
builder.append(" $indent")
builder.append("@font-face {\n")
builder.append(ff.generatePropertyCss(" $indent", sortProperties))
builder.append(" $indent")
builder.append("}\n")
if (!minified) {
builder.append(" $indent")
}
builder.append("@font-face")
if (!minified) {
builder.append(" ")
}
builder.append("{")
if (!minified) {
builder.append("\n")
}
builder.append(ff.generatePropertyCss(" $indent", sortProperties, minified))
if (!minified) {
builder.append(" $indent")
}
builder.append("}")
if (!minified) {
builder.append("\n")
}
}
finalStyle.keyFrames.let { kf ->
kf.keys.sorted().forEach { frameName ->
val css = kf[frameName]
builder.append(" $indent")
if (!minified) {
builder.append(" $indent")
}
builder.append("@keyframes ")
builder.append(frameName)
builder.append(" {\n")
if (!minified) {
builder.append(" ")
}
builder.append("{")
if (!minified) {
builder.append("\n")
}
css?.let { css ->
for ((nr, style) in css.frames) {
builder.append(" $indent")
if (!minified) {
builder.append(" $indent")
}
builder.append("${nr}% ")
builder.append(" $indent")
builder.append("{\n")
if (!minified) {
builder.append(" $indent")
}
builder.append("{")
if (!minified) {
builder.append("\n")
}
val finalStyle = Style()
style(finalStyle)
builder.append(finalStyle.generatePropertyCss(" $indent", sortProperties))
builder.append(finalStyle.generatePropertyCss(" $indent", sortProperties, minified))
builder.append(" $indent")
builder.append("}\n")
if (!minified) {
builder.append(" $indent")
}
builder.append("}")
if (!minified) {
builder.append("\n")
}
}
builder.append(" $indent")
builder.append("}\n")
if (!minified) {
builder.append(" $indent")
}
builder.append("}")
if (!minified) {
builder.append("\n")
}
}
}
}