Merge pull request #1702 from bitshares/1701-improve-serializer

Improve the serializer to fix #1701

Author: pmconrad

programs/js_operation_serializer/main.cpp

@@ -107,19 +107,21 @@ struct js_name<fc::array<T,N>>
 {
    static std::string name(){ return  "fixed_array "+ fc::to_string(N) + ", "  + remove_namespace(fc::get_typename<T>::name()); };
 };
-template<size_t N>   struct js_name<fc::array<char,N>>    { static std::string name(){ return  "bytes "+ fc::to_string(N); }; };
-template<size_t N>   struct js_name<fc::array<uint8_t,N>> { static std::string name(){ return  "bytes "+ fc::to_string(N); }; };
-template<typename T> struct js_name< fc::optional<T> >    { static std::string name(){ return "optional " + js_name<T>::name(); } };
+template<size_t N>   struct js_name<fc::array<char,N>>    { static std::string name(){ return  "bytes("+ fc::to_string(N) + ")"; }; };
+template<size_t N>   struct js_name<fc::array<uint8_t,N>> { static std::string name(){ return  "bytes("+ fc::to_string(N) + ")"; }; };
+template<typename T> struct js_name< fc::optional<T> >    { static std::string name(){ return "optional(" + js_name<T>::name() + ")"; } };
+template<typename T> struct js_name< fc::smart_ref<T> >   { static std::string name(){ return js_name<T>::name(); } };
 template<>           struct js_name< object_id_type >     { static std::string name(){ return "object_id_type"; } };
-template<typename T> struct js_name< fc::flat_set<T> >    { static std::string name(){ return "set " + js_name<T>::name(); } };
-template<typename T> struct js_name< std::vector<T> >     { static std::string name(){ return "array " + js_name<T>::name(); } };
+template<typename T> struct js_name< fc::flat_set<T> >    { static std::string name(){ return "set(" + js_name<T>::name() + ")"; } };
+template<typename T> struct js_name< std::vector<T> >     { static std::string name(){ return "array(" + js_name<T>::name() + ")"; } };
 template<typename T> struct js_name< fc::safe<T> > { static std::string name(){ return js_name<T>::name(); } };
 
 
 template<> struct js_name< std::vector<char> > { static std::string name(){ return "bytes()";     } };
-template<> struct js_name<fc::uint160>         { static std::string name(){ return "bytes 20";   } };
-template<> struct js_name<fc::sha224>          { static std::string name(){ return "bytes 28";   } };
-template<> struct js_name<fc::sha256>          { static std::string name(){ return "bytes 32";   } };
+template<> struct js_name<fc::uint160>         { static std::string name(){ return "bytes(20)";   } };
+template<> struct js_name<fc::sha1>            { static std::string name(){ return "bytes(20)";   } };
+template<> struct js_name<fc::sha224>          { static std::string name(){ return "bytes(28)";   } };
+template<> struct js_name<fc::sha256>          { static std::string name(){ return "bytes(32)";   } };
 template<> struct js_name<fc::unsigned_int>    { static std::string name(){ return "varuint64";  } };
 template<> struct js_name< vote_id_type >      { static std::string name(){ return "vote_id";    } };
 template<> struct js_name< time_point_sec >    { static std::string name(){ return "time_point_sec"; } };
@@ -128,18 +130,18 @@ template<uint8_t S, uint8_t T, typename O>
 struct js_name<graphene::db::object_id<S,T,O> >
 {
    static std::string name(){
-      return "protocol_id_type \"" + remove_namespace(fc::get_typename<O>::name()) + "\"";
+      return "protocol_id_type(\"" + remove_namespace(fc::get_typename<O>::name()) + "\")";
    };
 };
 
 
 template<typename T> struct js_name< std::set<T> > { static std::string name(){ return "set " + js_name<T>::name(); } };
 
 template<typename K, typename V>
-struct js_name< std::map<K,V> > { static std::string name(){ return "map (" + js_name<K>::name() + "), (" + js_name<V>::name() +")"; } };
+struct js_name< std::map<K,V> > { static std::string name(){ return "map(" + js_name<K>::name() + ", " + js_name<V>::name() +")"; } };
 
 template<typename K, typename V>
-struct js_name< fc::flat_map<K,V> > { static std::string name(){ return "map (" + js_name<K>::name() + "), (" + js_name<V>::name() +")"; } };
+struct js_name< fc::flat_map<K,V> > { static std::string name(){ return "map(" + js_name<K>::name() + ", " + js_name<V>::name() +")"; } };
 
 
 template<typename... T> struct js_sv_name;
@@ -148,15 +150,15 @@ template<typename A> struct js_sv_name<A>
 { static std::string name(){ return  "\n    " + js_name<A>::name(); } };
 
 template<typename A, typename... T>
-struct js_sv_name<A,T...> { static std::string name(){ return  "\n    " + js_name<A>::name() +"    " + js_sv_name<T...>::name(); } };
+struct js_sv_name<A,T...> { static std::string name(){ return  "\n    " + js_name<A>::name() +"," + js_sv_name<T...>::name(); } };
 
 template<typename... T>
 struct js_name< fc::static_variant<T...> >
 {
    static std::string name( std::string n = ""){
       static const std::string name = n;
       if( name == "" )
-         return "static_variant [" + js_sv_name<T...>::name() + "\n]";
+         return "static_variant([" + js_sv_name<T...>::name() + "\n]);";
       else return name;
    }
 };
@@ -166,7 +168,7 @@ struct js_name< fc::static_variant<> >
    static std::string name( std::string n = ""){
       static const std::string name = n;
       if( name == "" )
-         return "static_variant []";
+         return "static_variant([]);";
       else return name;
    }
 };
@@ -208,7 +210,7 @@ class serialize_member_visitor
       template<typename Member, class Class, Member (Class::*member)>
       void operator()( const char* name )const
       {
-         std::cout << "    " << name <<": " << js_name<Member>::name() <<"\n";
+         std::cout << "    " << name <<": " << js_name<Member>::name() <<",\n";
       }
 };
 
@@ -299,7 +301,7 @@ struct serializer< fc::static_variant<T...>, false >
 
    static void generate()
    {
-      std::cout <<  js_name<fc::static_variant<T...>>::name() << " = static_variant [" + js_sv_name<T...>::name() + "\n]\n\n";
+      std::cout << "var " <<  js_name<fc::static_variant<T...>>::name() << " = static_variant([" + js_sv_name<T...>::name() + "\n]);\n\n";
    }
 };
 template<>
@@ -318,7 +320,7 @@ struct serializer< fc::static_variant<>, false >
 
    static void generate()
    {
-      std::cout <<  js_name<fc::static_variant<>>::name() << " = static_variant []\n\n";
+      std::cout <<  js_name<fc::static_variant<>>::name() << " = static_variant([]);\n\n";
    }
 };
 
@@ -351,13 +353,11 @@ struct serializer
    {
       auto name = remove_namespace( js_name<T>::name() );
       if( name == "int64" ) return;
-      std::cout << "" << name
-                << " = new Serializer( \n"
-                << "    \"" + name + "\"\n";
-
+      std::cout << "export const " << name
+                << " = new Serializer("
+                << "\"" + name + "\", {\n";
       fc::reflector<T>::visit( serialize_member_visitor() );
-
-      std::cout <<")\n\n";
+      std::cout <<"});\n\n";
    }
 };