Refactor and JSON

icdevsorg · Jan 3, 2023 · f46a585 · f46a585
1 parent 2f238a7
commit f46a585
Show file tree

Hide file tree

Showing 7 changed files with 2,473 additions and 2,366 deletions.
diff --git a/README.md b/README.md
@@ -93,3 +93,10 @@ Note: This project was a part of the [ARAMAKME expirament](https://hwqwz-ryaaa-a
 
     printf "yes" | bash test_runner.sh
 
+## Release
+
+v0.1.12
+
+* Refactor - Cleaned up code
+* JSON - added a library to dump values to JSON
+
diff --git a/src/clone.mo b/src/clone.mo
@@ -15,36 +15,25 @@ import Array "mo:base/Array";
 
 module {
 
-        type CandyValue = Types.CandyValue;
-        type CandyValueUnstable = Types.CandyValueUnstable;
-        type PropertyUnstable = Types.PropertyUnstable;
-
-
-        public func cloneValueUnstable(val : CandyValueUnstable) : CandyValueUnstable{
-            switch(val){
-                case(#Class(val)){
-
-                    return #Class(Array.tabulate<PropertyUnstable>(val.size(), func(idx){
-                        {name= val[idx].name; value=cloneValueUnstable(val[idx].value); immutable = val[idx].immutable};
-                    }));
-                };
-                case(#Bytes(val)){
-                    switch(val){
-                        case(#frozen(val)){
-
-                            #Bytes(#frozen(val));
-                        };
-                        case(#thawed(val)){
-
-                            #Bytes(#thawed(val.clone()));
-                        };
-                    }
-                };
-                case(_){
-
-                    val;
-                }
-            };
+  type CandyValue = Types.CandyValue;
+  type CandyValueUnstable = Types.CandyValueUnstable;
+  type PropertyUnstable = Types.PropertyUnstable;
+
+  public func cloneValueUnstable(val : CandyValueUnstable) : CandyValueUnstable{
+    switch(val){
+      case(#Class(val)){
+
+        return #Class(Array.tabulate<PropertyUnstable>(val.size(), func(idx){
+            {name= val[idx].name; value=cloneValueUnstable(val[idx].value); immutable = val[idx].immutable};
+        }));
+      };
+      case(#Bytes(val)){
+        switch(val){
+          case(#frozen(val)) #Bytes(#frozen(val));
+          case(#thawed(val)) #Bytes(#thawed(val.clone()));
         };
-
+      };
+      case(_) val;
+    };
+  };
 }
diff --git a/src/conversion.mo b/src/conversion.mo
diff --git a/src/json.mo b/src/json.mo
@@ -0,0 +1,143 @@
+
+import Buffer "mo:base/Buffer";
+import Nat "mo:base/Nat";
+import Nat16 "mo:base/Nat16";
+import Nat32 "mo:base/Nat32";
+import Nat64 "mo:base/Nat64";
+import Nat8 "mo:base/Nat8";
+import Float "mo:base/Float";
+import Int "mo:base/Int";
+import Int8 "mo:base/Int8";
+import Int16 "mo:base/Int16";
+import Int32 "mo:base/Int32";
+import Int64 "mo:base/Int64";
+import Bool "mo:base/Bool";
+import Blob "mo:base/Blob";
+import Principal "mo:base/Principal";
+import Text "mo:base/Text";
+
+import Types "types";
+import CandyHex "hex";
+
+module {
+//convert a candy value to JSON
+    public func value_to_json(val: Types.CandyValue): Text {
+        switch(val){
+            //nat
+            case(#Nat(val)){ Nat.toText(val)};
+            case(#Nat64(val)){ Nat64.toText(val)};
+            case(#Nat32(val)){ Nat32.toText(val)};
+            case(#Nat16(val)){ Nat16.toText(val)};
+            case(#Nat8(val)){ Nat8.toText(val)};
+            //text
+            case(#Text(val)){ "\"" # val # "\""; };
+            //class
+            case(#Class(val)){
+                var body: Buffer.Buffer<Text> = Buffer.Buffer<Text>(1);
+                for(this_item in val.vals()){
+                    body.add("\"" # this_item.name # "\"" # ":" # value_to_json(this_item.value));
+                };
+
+                return "{" # Text.join(",", body.vals()) # "}";
+            };
+            //array
+            case(#Array(val)){
+                switch(val){
+                    case(#frozen(val)){
+                        var body: Buffer.Buffer<Text> = Buffer.Buffer<Text>(1);
+                        for(this_item in val.vals()){
+                            body.add(value_to_json(this_item));
+                        };
+
+                        return "[" # Text.join(",", body.vals()) # "]";
+                    };
+                    case(#thawed(val)){
+                        var body: Buffer.Buffer<Text> = Buffer.Buffer<Text>(1);
+                        for(this_item in val.vals()){
+                            body.add(value_to_json(this_item));
+                        };
+
+                        return "[" # Text.join(",", body.vals()) # "]";
+                    };
+                };
+            };
+            case(#Option(val)){
+              switch(val){
+                case(null){"null";};
+                case(?val){value_to_json(val);}
+              }
+            };
+            case(#Nats(val)){
+                switch(val){
+                    case(#frozen(val)){
+                        var body: Buffer.Buffer<Text> = Buffer.Buffer<Text>(1);
+                        for(this_item in val.vals()){
+                            body.add(Nat.toText(this_item));
+                        };
+
+                        return "[" # Text.join(",", body.vals()) # "]";
+                    };
+                    case(#thawed(val)){
+                        var body: Buffer.Buffer<Text> = Buffer.Buffer<Text>(1);
+                        for(this_item in val.vals()){
+                            body.add(Nat.toText(this_item));
+                        };
+
+                        return "[" # Text.join(",", body.vals()) # "]";
+                    };
+                };
+            };
+            case(#Floats(val)){
+                switch(val){
+                    case(#frozen(val)){
+                        var body: Buffer.Buffer<Text> = Buffer.Buffer<Text>(1);
+                        for(this_item in val.vals()){
+                           body.add(Float.toText(this_item));
+                        };
+
+                        return "[" # Text.join(",", body.vals()) # "]";
+                    };
+                    case(#thawed(val)){
+                        var body: Buffer.Buffer<Text> = Buffer.Buffer<Text>(1);
+                        for(this_item in val.vals()){
+                           body.add(Float.toText(this_item));
+                        };
+
+                        return "[" # Text.join(",", body.vals()) # "]";
+                    };
+                };
+            };
+            //bytes
+            case(#Bytes(val)){
+                switch(val){
+                    case(#frozen(val)){
+                        return "\"" # CandyHex.encode(val) # "\"";//CandyHex.encode(val);
+                    };
+                    case(#thawed(val)){
+                        return "\"" # CandyHex.encode(val) # "\"";//CandyHex.encode(val);
+                    };
+                };
+            };
+            //bytes
+            case(#Blob(val)){
+
+                return "\"" # CandyHex.encode(Blob.toArray(val)) # "\"";//CandyHex.encode(val);
+
+            };
+            //principal
+            case(#Principal(val)){ "\"" # Principal.toText(val) # "\"";};
+            //bool	
+            case(#Bool(val)){ "\"" # Bool.toText(val) # "\"";};	
+
+            //float	
+            case(#Float(val)){ Float.format(#exact, val) ;};
+            case(#Empty){ "null";};
+            case(#Int(val)){Int.toText(val);};
+            case(#Int64(val)){Int64.toText(val);};
+            case(#Int32(val)){Int32.toText(val);};
+            case(#Int16(val)){Int16.toText(val);};
+            case(#Int8(val)){Int8.toText(val);};
+            case(_){"";};
+        };
+    };
+};