Merge remote-tracking branch 'origin/alpha' into alpha

Author: ForteScarlet

README.md

@@ -11,6 +11,7 @@
   <a href="https://gitee.com/ForteScarlet/CatCode" target="_blank">gitee</a>
  </span> <br />
  <small> &gt; 感谢 <a href="https://github.com/ForteScarlet/simpler-robot" target="_blank">simple-robot</a> 开发团队成员制作的猫猫logo &lt; </small> <br />
+ &gt; 如果有点击一下⭐的话，猫猫会很开心哦~ &lt; <br />
  <a href="https://repo1.maven.org/maven2/love/forte/catcode/" target="_blank" >
   <img src="https://img.shields.io/maven-central/v/love.forte/catcode" />
  </a>
@@ -100,15 +101,19 @@
 ```
 
 ## JS
-将会通过kotlin多平台实现，并发布于github release和npm
+将会通过kotlin多平台实现，提供js库，并发布于github release\[、Maven和npm(待议)]。
+
+抢先预览：[CatCode-multiplatform](https://github.com/ForteScarlet/CatCode-multiplatform)
 
 
 ## Native
-将会通过kotlin多平台实现，提供`.h`头文件与对应`.dll`(windows)、`.so`(linux)文件。
+将会通过kotlin多平台实现，提供`.h`头文件与对应的`.dll`(windows)、`.so`(linux)文件。
+
+抢先预览：[CatCode-multiplatform](https://github.com/ForteScarlet/CatCode-multiplatform)
 
 
-## 其他语言
-敬请期待...
+<br>
+<br>
 
 > 你可以基于标准CAT码格式自行实现。
 
@@ -241,7 +246,7 @@ final Neko alAll = NekoObjects.getNekoAtAll();
 
 #### 3. 通过工具类获取
 ```java
-CatCodeUtil.toCat("at", "qq=123")
+final String at = CatCodeUtil.toCat("at", "qq=123");
 ```
 
 

UPDATE.md

@@ -8,3 +8,6 @@
 
 ## alpha.3
 - 追加 `lazy` （属性值懒加载）相关的neko，以及对应的builder。（`CatCodeUtil#getLazyNekoBuilder`）
+
+## alpha.4
+- 包路径移动: `love.forte.catcode.*` -> `catcode.*`

pom.xml

@@ -16,8 +16,11 @@
  <scm>
  <url>https://github.com/ForteScarlet/CatCode</url>
  </scm>
+
  <url>https://github.com/ForteScarlet/CatCode</url>
+
  <description>猫猫码，一个可爱的通用特殊码。/ Cat code, the spirit of CQ code continues, a cute universal special code.
+
  </description>
 
  <properties>

src/main/java/catcode/CatCodeUtil.kt

@@ -0,0 +1,155 @@
+/*
+ * Copyright (c) 2020. ForteScarlet
+ *
+ * catCode库相关代码使用 MIT License 开源，请遵守协议相关条款。
+ *
+ * about MIT: https://opensource.org/licenses/MIT
+ *
+ *
+ *
+ *
+ */
+
+@file:Suppress("unused")
+@file:JvmName("Cats")
+package catcode
+
+/*
+& -> &
+[ -> [
+] -> ]
+ */
+/*
+& -> &
+[ -> [
+] -> ]
+, -> ,
+ */
+
+internal val CAT_KV_SPLIT_ARRAY: Array<String> = arrayOf(CAT_KV)
+internal val CAT_PS_SPLIT_ARRAY: Array<String> = arrayOf(CAT_PS)
+
+/** Cat Decoder */
+@Suppress("MemberVisibilityCanBePrivate")
+object CatDecoder {
+
+ @JvmStatic
+ val instance
+ get() = this
+
+ /** 非猫猫码文本消息解义 */
+ fun decodeText(str: String): String =
+ str .replace("&#91;", "[")
+ .replace("&#93;", "]")
+ .replace("&#09;", "\t")
+ .replace("&#10;", "\r")
+ .replace("&#13;", "\n")
+ .replace("&amp;", "&")
+
+ /** 非猫猫码文本消息解义，如果[str]为null则返回null */
+ fun decodeTextOrNull(str: String?) : String? = str?.let { decodeText(it) }
+
+
+ /** 猫猫码参数值消息解义 */
+ fun decodeParams(str: String): String =
+ str .replace("&#91;", "[")
+ .replace("&#93;", "]")
+ .replace("&#44;", ",")
+ .replace("&#09;", "\t")
+ .replace("&#10;", "\r")
+ .replace("&#13;", "\n")
+ .replace("&amp;", "&")
+
+ /** 猫猫码参数值消息解义，如果[str]为null则返回null */
+ fun decodeParamsOrNull(str: String?): String? = str?.let { decodeParams(it) }
+
+}
+
+
+public fun String.deCatParam(): String = CatDecoder.decodeParams(this)
+public fun String.deCatText(): String = CatDecoder.decodeText(this)
+
+
+/** Cat Encoder */
+@Suppress("MemberVisibilityCanBePrivate")
+object CatEncoder {
+
+ @JvmStatic
+ val instance
+ get() = this
+
+ /** 非猫猫码文本消息转义 */
+ fun encodeText(str: String): String =
+ str.replace("&", "&amp;")
+ .replace("[", "&#91;")
+ .replace("]", "&#93;")
+ .replace("\t", "&#09;")
+ .replace("\r", "&#10;")
+ .replace("\n", "&#13;")
+
+ /** 非猫猫码文本消息转义。如果[str]为null则返回null */
+ fun encodeTextOrNull(str: String?): String? = str?.let { encodeText(it) }
+
+ /** 猫猫码参数值消息转义 */
+ fun encodeParams(str: String): String =
+ str.replace("&", "&amp;")
+ .replace("[", "&#91;")
+ .replace("]", "&#93;")
+ .replace(",", "&#44;")
+ .replace("\t", "&#09;")
+ .replace("\r", "&#10;")
+ .replace("\n", "&#13;")
+
+ /** 猫猫码参数值消息转义。如果[str]为null则返回null */
+ fun encodeParamsOrNull(str: String?): String? = str?.let { encodeParams(it) }
+
+}
+
+public fun String.enCatParam(): String = CatEncoder.encodeParams(this)
+public fun String.enCatText(): String = CatEncoder.encodeText(this)
+
+
+/**
+ * 猫猫码的操作工具类
+ */
+public object CatCodeUtil : NekoAibo("CAT") {
+ @JvmStatic
+ val instance
+ get() = this
+
+ override val catCodeHead: String = CAT_HEAD
+ /**
+ * 获取一个String为载体的[模板][CodeTemplate]
+ * @see StringTemplate
+ */
+ override val stringTemplate: CodeTemplate<String> get() = StringTemplate
+
+ /**
+ * 获取[Neko]为载体的[模板][CodeTemplate]
+ * @see NekoTemplate
+ */
+ override val nekoTemplate: CodeTemplate<Neko> get() = NekoTemplate
+
+ /**
+ * 构建一个String为载体类型的[构建器][CodeBuilder]
+ */
+ override fun getStringCodeBuilder(type: String, encode: Boolean): CodeBuilder<String> = StringCodeBuilder(type, encode)
+
+ /**
+ * 构建一个[Neko]为载体类型的[构建器][CodeBuilder]
+ */
+ override fun getNekoBuilder(type: String, encode: Boolean): CodeBuilder<Neko> = NekoBuilder(type)
+
+ /**
+ * 构建一个[Neko]为载体类型的[懒加载构建器][LazyCodeBuilder]
+ */
+ override fun getLazyNekoBuilder(type: String, encode: Boolean): LazyCodeBuilder<Neko> = LazyNekoBuilder(type)
+
+}
+
+
+
+
+
+
+