--- parser3/src/classes/json.C 2016/10/04 13:23:46 1.46 +++ parser3/src/classes/json.C 2024/09/10 19:15:48 1.60 @@ -1,7 +1,8 @@ /** @file Parser: @b json parser class. - Copyright (c) 2000-2015 Art. Lebedev Studio (http://www.artlebedev.com) + Copyright (c) 2000-2023 Art. Lebedev Studio (http://www.artlebedev.com) + Authors: Konstantin Morshnev */ #include "classes.h" @@ -9,6 +10,7 @@ #include "pa_request.h" #include "pa_vbool.h" +#include "pa_varray.h" #include "pa_charset.h" #include "pa_charsets.h" @@ -18,7 +20,7 @@ #include "pa_vxdoc.h" #endif -volatile const char * IDENT_JSON_C="$Id: json.C,v 1.46 2016/10/04 13:23:46 moko Exp $"; +volatile const char * IDENT_JSON_C="$Id: json.C,v 1.60 2024/09/10 19:15:48 moko Exp $"; // class @@ -32,8 +34,8 @@ public: DECLARE_CLASS_VAR(json, new MJson); // methods -struct Json { - Stack stack; +struct Json : public PA_Allocated { + Stack stack; Stack key_stack; String* key; @@ -48,11 +50,12 @@ struct Json { bool handle_double; bool handle_int; + bool handle_array; enum Distinct { D_EXCEPTION, D_FIRST, D_LAST, D_ALL } distinct; Json(Charset* acharset): stack(), key_stack(), key(NULL), result(NULL), hook_object(NULL), hook_array(NULL), request(NULL), charset(acharset), taint(String::L_TAINTED), handle_double(true), handle_int(true), - distinct(D_EXCEPTION){} + handle_array(true), distinct(D_EXCEPTION){} bool set_distinct(const String &value){ if (value == "first") distinct = D_FIRST; @@ -61,12 +64,19 @@ struct Json { else return false; return true; } + + bool set_handle_array(const String &value){ + if (value == "array") handle_array = true; + else if (value == "hash") handle_array = false; + else return false; + return true; + } }; static void set_json_value(Json *json, Value *value){ - VHash *top = json->stack.top_value(); + VHashBase *top = json->stack.top_value(); if(json->key == NULL){ - top->hash().put(String(format(top->get_hash()->count(), 0)), value); + top->add(value); } else { switch (json->distinct){ case Json::D_EXCEPTION: @@ -101,13 +111,12 @@ String* json_string(Json *json, const ch } static Value *json_hook(Request &r, Junction *hook, String* key, Value* value){ - VMethodFrame frame(*hook->method, r.method_frame, hook->self); Value *params[]={new VString(key ? *key : String::Empty), value}; - - frame.store_params(params, 2); - r.execute_method(frame); - - return &frame.result(); + METHOD_FRAME_ACTION(*hook->method, r.method_frame, hook->self, { + frame.store_params(params, 2); + r.call(frame); + return &frame.result(); + }); } static int json_callback(Json *json, int type, const char *value, uint32_t length) @@ -139,14 +148,15 @@ static int json_callback(Json *json, int break; } case JSON_ARRAY_BEGIN:{ - VHash *v = new VHash(); if (json->hook_array){ json->key_stack.push(json->key); json->key=NULL; + json->stack.push(new VHash); } else { + VHashBase *v = json->handle_array ? (VHashBase *)new VArray : (VHashBase *)new VHash; if (json->stack.count()) set_json_value(json, v); + json->stack.push(v); } - json->stack.push(v); break; } case JSON_ARRAY_END: @@ -321,15 +331,21 @@ static void _parse(Request& r, MethodPar if(Value* value=options->get("object")) { json.hook_object=value->get_junction(); json.request=&r; - if (!json.hook_object || !json.hook_object->method || !json.hook_object->method->params_names || !(json.hook_object->method->params_names->count() == 2)) + if (!json.hook_object || !json.hook_object->method || !json.hook_object->method->params_names || !(json.hook_object->method->params_count == 2)) throw Exception(PARSER_RUNTIME, 0, "$.object must be parser method with 2 parameters"); valid_options++; } if(Value* value=options->get("array")) { - json.hook_array=value->get_junction(); - json.request=&r; - if (!json.hook_array || !json.hook_array->method || !json.hook_array->method->params_names || !(json.hook_array->method->params_names->count() == 2)) - throw Exception(PARSER_RUNTIME, 0, "$.array must be parser method with 2 parameters"); + if(value->get_string()){ + const String& sarray=value->as_string(); + if (!json.set_handle_array(sarray)) + throw Exception(PARSER_RUNTIME, &sarray, "$.array must be parser method with 2 parameters or 'array' or 'hash'"); + } else { + json.hook_array=value->get_junction(); + json.request=&r; + if (!json.hook_array || !json.hook_array->method || !json.hook_array->method->params_names || !(json.hook_array->method->params_count == 2)) + throw Exception(PARSER_RUNTIME, 0, "$.array must be parser method with 2 parameters or 'array' or 'hash'"); + } valid_options++; } if(valid_options!=options->count()) @@ -359,7 +375,7 @@ static void _parse(Request& r, MethodPar json_parser_free(&parser); - if (json.result) r.write_no_lang(*json.result); + if (json.result) r.write(*json.result); } const uint ANTI_ENDLESS_JSON_STRING_RECOURSION=128; @@ -367,7 +383,7 @@ const uint ANTI_ENDLESS_JSON_STRING_RECO char *get_indent(uint level){ static char* cache[ANTI_ENDLESS_JSON_STRING_RECOURSION]={}; if (!cache[level]){ - char *result = static_cast(pa_gc_malloc_atomic(level+1)); + char *result = static_cast(pa_malloc_atomic(level+1)); memset(result, '\t', level); result[level]='\0'; return cache[level]=result; @@ -375,6 +391,35 @@ char *get_indent(uint level){ return cache[level]; } +String *get_delim(uint level){ + static String* cache[ANTI_ENDLESS_JSON_STRING_RECOURSION]={}; + + if (!cache[level]){ + char *result = static_cast(pa_malloc_atomic(level+2+1+1)); + result[0]=','; + result[1]='\n'; + memset(result+2, '\t', level); + result[level+2]='"'; + result[level+3]='\0'; + return cache[level] = new String(result, String::L_AS_IS); + } + return cache[level]; +} + +String *get_array_delim(uint level){ + static String* cache[ANTI_ENDLESS_JSON_STRING_RECOURSION]={}; + + if (!cache[level]){ + char *result = static_cast(pa_malloc_atomic(level+2+1)); + result[0]=','; + result[1]='\n'; + memset(result+2, '\t', level); + result[level+2]='\0'; + return cache[level] = new String(result, String::L_AS_IS); + } + return cache[level]; +} + class Json_string_recoursion { Json_options& foptions; public: @@ -407,7 +452,7 @@ const String* Json_options::hash_json_st result << *delim; } else { result << indent << "\""; - delim = new String(",\n", String::L_AS_IS); *delim << indent << "\""; + delim = get_delim(json_string_recoursion); } result << String(i.key(), String::L_JSON) << "\":" << value_json_string(i.key(), *i.value(), *this); } @@ -428,6 +473,86 @@ const String* Json_options::hash_json_st return &result; } +const String* Json_options::array_json_string(ArrayValue *array) { + if(!array || !array->count()) + return new String("[]", String::L_AS_IS); + + Json_string_recoursion go_down(*this); + + String& result = *new String("[\n", String::L_AS_IS); + + if (indent){ + + String *delim=NULL; + indent=get_indent(json_string_recoursion); + for(ArrayValue::Iterator i(*array); i; i.next() ){ + if (delim){ + result << *delim; + } else { + result << indent; + delim = get_array_delim(json_string_recoursion); + } + result << value_json_string(i.key(), i.value() ? *i.value() : *VVoid::get(), *this); + } + result << "\n" << (indent=get_indent(json_string_recoursion-1)) << "]"; + + } else { + + bool need_delim=false; + for(ArrayValue::Iterator i(*array); i; i.next() ){ + if(need_delim) result << ",\n"; + result << value_json_string(i.key(), i.value() ? *i.value() : *VVoid::get(), *this); + need_delim=true; + } + result << "\n]"; + + } + + return &result; +} + +const String* Json_options::array_compact_json_string(ArrayValue *array) { + if(!array || !array->count()) + return new String("[]", String::L_AS_IS); + + Json_string_recoursion go_down(*this); + + String& result = *new String("[\n", String::L_AS_IS); + + if (indent){ + + String *delim=NULL; + indent=get_indent(json_string_recoursion); + for(ArrayValue::Iterator i(*array); i; i.next() ){ + if (i.value()){ + if (delim){ + result << *delim; + } else { + result << indent; + delim = get_array_delim(json_string_recoursion); + } + result << value_json_string(i.key(), *i.value(), *this); + } + } + result << "\n" << (indent=get_indent(json_string_recoursion-1)) << "]"; + + } else { + + bool need_delim=false; + for(ArrayValue::Iterator i(*array); i; i.next() ){ + if (i.value()){ + if(need_delim) result << ",\n"; + result << value_json_string(i.key(), *i.value(), *this); + need_delim=true; + } + } + result << "\n]"; + + } + + return &result; +} + static bool based_on(HashStringValue::key_type key, HashStringValue::value_type /*value*/, Value* v) { return v->is(key.cstr()); } @@ -441,17 +566,16 @@ const String& value_json_string(String:: } if(method && !method->is_void()) { Junction* junction=method->get_junction(); - VMethodFrame frame(*junction->method, options.r->method_frame, junction->self); - HashStringValue* params_hash=options.params && options.indent ? options.params->get_hash() : NULL; Temp_hash_value indent(params_hash, "indent", new VString(*new String(options.indent, String::L_AS_IS))); Value *params[]={new VString(*new String(key, String::L_JSON)), &v, options.params ? options.params : VVoid::get()}; - frame.store_params(params, 3); - - options.r->execute_method(frame); - return frame.result().as_string(); + METHOD_FRAME_ACTION(*junction->method, options.r->method_frame, junction->self, { + frame.store_params(params, 3); + options.r->call(frame); + return frame.result().as_string(); + }); } } @@ -464,7 +588,7 @@ static void _string(Request& r, MethodPa if(params.count() == 2) if(HashStringValue* options=params.as_hash(1)) { - json.params=params.get(1); + json.params=¶ms[1]; HashStringValue* methods=new HashStringValue(); int valid_options=0; HashStringValue* vvalue; @@ -474,6 +598,9 @@ static void _string(Request& r, MethodPa if(key == "skip-unknown"){ json.skip_unknown=r.process(*value).as_bool(); valid_options++; + } else if(key == "one-line"){ + json.one_line=r.process(*value).as_bool(); + valid_options++; } else if(key == "date" && value->is_string()){ const String& svalue=value->as_string(); if(!json.set_date_format(svalue)) @@ -490,6 +617,11 @@ static void _string(Request& r, MethodPa if(!json.set_table_format(svalue)) throw Exception(PARSER_RUNTIME, &svalue, "must be 'array', 'object' or 'compact'"); valid_options++; + } else if(key == "array" && value->is_string()){ + const String& svalue=value->as_string(); + if(!json.set_array_format(svalue)) + throw Exception(PARSER_RUNTIME, &svalue, "must be 'array', 'object' or 'compact'"); + valid_options++; } else if(key == "file" && value->is_string()){ const String& svalue=value->as_string(); if(!json.set_file_format(svalue)) @@ -507,7 +639,7 @@ static void _string(Request& r, MethodPa valid_options++; #endif } else if(Junction* junction=value->get_junction()){ - if(!junction->method || !junction->method->params_names || junction->method->params_names->count() != 3) + if(!junction->method || !junction->method->params_names || junction->method->params_count != 3) throw Exception(PARSER_RUNTIME, 0, "$.%s must be parser method with 3 parameters", key.cstr()); methods->put(key, value); valid_options++; @@ -522,7 +654,7 @@ static void _string(Request& r, MethodPa if(Value* value=vhash->get_default()) { if(!value->is_string()){ Junction* junction=value->get_junction(); - if(!junction || !junction->method || !junction->method->params_names || junction->method->params_names->count() != 3) + if(!junction || !junction->method || !junction->method->params_names || junction->method->params_count != 3) throw Exception(PARSER_RUNTIME, 0, "$._default must be string or parser method with 3 parameters"); } json.default_method=value; @@ -534,13 +666,20 @@ static void _string(Request& r, MethodPa const String& result_string=value_json_string(String::Body(), r.process(params[0]), json); String::Body result_body=result_string.cstr_to_string_body_untaint(String::L_JSON, r.connection(false), &r.charsets); - r.write_pass_lang(*new String(result_body, String::L_AS_IS)); - } + if(json.one_line){ + char *result=result_body.cstrm(); + for(char *c=result;*c;c++) + if(*c=='\n') + *c=' '; + result_body=result; + } + r.write(*new String(result_body, String::L_AS_IS)); +} // constructor MJson::MJson(): Methoded("json") { add_native_method("parse", Method::CT_STATIC, _parse, 1, 2); - add_native_method("string", Method::CT_ANY, _string, 1, 2); + add_native_method("string", Method::CT_STATIC, _string, 1, 2); }