From d542dba8ddb2d5f647d1ae260f56c8a63cea9bff Mon Sep 17 00:00:00 2001
From: Nat Quayle Nelson <natquaylenelson@gmail.com>
Date: Fri, 12 Jul 2024 13:40:43 -0600
Subject: [PATCH] Change Jsonable types' naming convention

---
 src/kiss_tools/{JsonableArray.hx => JsonArray.hx}       | 2 +-
 src/kiss_tools/{JsonableArray.kiss => JsonArray.kiss}   | 2 +-
 src/kiss_tools/JsonMap.hx                               | 2 +-
 src/kiss_tools/{JsonableString.hx => JsonString.hx}     | 2 +-
 src/kiss_tools/{JsonableString.kiss => JsonString.kiss} | 2 +-
 src/test/Main_.kiss                                     | 6 +++---
 6 files changed, 8 insertions(+), 8 deletions(-)
 rename src/kiss_tools/{JsonableArray.hx => JsonArray.hx} (80%)
 rename src/kiss_tools/{JsonableArray.kiss => JsonArray.kiss} (86%)
 rename src/kiss_tools/{JsonableString.hx => JsonString.hx} (81%)
 rename src/kiss_tools/{JsonableString.kiss => JsonString.kiss} (53%)

diff --git a/src/kiss_tools/JsonableArray.hx b/src/kiss_tools/JsonArray.hx
similarity index 80%
rename from src/kiss_tools/JsonableArray.hx
rename to src/kiss_tools/JsonArray.hx
index 8c773d2..f3fd117 100644
--- a/src/kiss_tools/JsonableArray.hx
+++ b/src/kiss_tools/JsonArray.hx
@@ -7,4 +7,4 @@ import haxe.Json;
 import haxe.DynamicAccess;
 
 @:build(kiss.Kiss.build())
-class JsonableArray<T:Jsonable<T>> {}
+class JsonArray<T:Jsonable<T>> {}
diff --git a/src/kiss_tools/JsonableArray.kiss b/src/kiss_tools/JsonArray.kiss
similarity index 86%
rename from src/kiss_tools/JsonableArray.kiss
rename to src/kiss_tools/JsonArray.kiss
index fcdeb46..fd85ebf 100644
--- a/src/kiss_tools/JsonableArray.kiss
+++ b/src/kiss_tools/JsonArray.kiss
@@ -3,7 +3,7 @@
 
 (method parse [:String representation]
     (let [:Array<String> arr (Json.parse representation)]
-        (new JsonableArray<T>  
+        (new JsonArray<T>  
             (for elem arr
                 (defaultVal.parse elem))
             defaultVal)))
diff --git a/src/kiss_tools/JsonMap.hx b/src/kiss_tools/JsonMap.hx
index a4ba0d2..8f8a1de 100644
--- a/src/kiss_tools/JsonMap.hx
+++ b/src/kiss_tools/JsonMap.hx
@@ -17,7 +17,7 @@ typedef Jsonable<T> = {
     function parse(s:String):T;
 }
 
-typedef JsonStringMap = JsonMap<JsonableString>;
+typedef JsonStringMap = JsonMap<JsonString>;
 
 @:build(kiss.Kiss.build())
 class JsonMap<T:Jsonable<T>> {}
diff --git a/src/kiss_tools/JsonableString.hx b/src/kiss_tools/JsonString.hx
similarity index 81%
rename from src/kiss_tools/JsonableString.hx
rename to src/kiss_tools/JsonString.hx
index 27542f9..320b952 100644
--- a/src/kiss_tools/JsonableString.hx
+++ b/src/kiss_tools/JsonString.hx
@@ -5,4 +5,4 @@ import kiss.List;
 import haxe.Json;
 
 @:build(kiss.Kiss.build())
-class JsonableString {}
+class JsonString {}
diff --git a/src/kiss_tools/JsonableString.kiss b/src/kiss_tools/JsonString.kiss
similarity index 53%
rename from src/kiss_tools/JsonableString.kiss
rename to src/kiss_tools/JsonString.kiss
index fb483cb..9d996f1 100644
--- a/src/kiss_tools/JsonableString.kiss
+++ b/src/kiss_tools/JsonString.kiss
@@ -1,7 +1,7 @@
 (defNew [&prop :String value])
 
 (method parse [:String representation]
-    (new JsonableString (Json.parse representation)))
+    (new JsonString (Json.parse representation)))
 
 (method stringify []
     (Json.stringify value))
\ No newline at end of file
diff --git a/src/test/Main_.kiss b/src/test/Main_.kiss
index c9d6e65..1cc683c 100644
--- a/src/test/Main_.kiss
+++ b/src/test/Main_.kiss
@@ -1,7 +1,7 @@
 (import sys.io.File)
 (import sys.FileSystem)
 (import kiss_tools.JsonMap)
-(import kiss_tools.JsonableArray)
+(import kiss_tools.JsonArray)
 
 // Test FuzzyJson
 (loadFrom "kiss-tools" "src/kiss_tools/FuzzyJson.kiss")
@@ -18,11 +18,11 @@
 (assertThrowsAtCompileTime (getFuzzyJson "dogs" "Rangie"))
 
 
-// Test JsonMap<JsonableArray>
+// Test JsonMap<JsonArray>
 (var TEST_JSON_FILE "testJsonFile.json")
 
 (File.saveContent TEST_JSON_FILE (File.getContent "test/map-start.json"))
-(let [jsonMap (new JsonMap<JsonableArray<TestJsonable>> TEST_JSON_FILE (new JsonableArray<TestJsonable>> [] (new TestJsonable "")))
+(let [jsonMap (new JsonMap<JsonArray<TestJsonable>> TEST_JSON_FILE (new JsonArray<TestJsonable>> [] (new TestJsonable "")))
         a (jsonMap.get "a")
         aString (a.elements.toString)
         b (jsonMap.get "b")