--- libelwix/inc/elwix/ajson.h	2017/11/29 00:49:47	1.1.2.8
+++ libelwix/inc/elwix/ajson.h	2024/12/05 12:33:49	1.7.60.2
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: ajson.h,v 1.1.2.8 2017/11/29 00:49:47 misho Exp $
+* $Id: ajson.h,v 1.7.60.2 2024/12/05 12:33:49 misho Exp $
 *
 **************************************************************************
 The ELWIX and AITNET software is distributed under the following
@@ -12,7 +12,7 @@ terms:
 All of the documentation and software included in the ELWIX and AITNET
 Releases is copyrighted by ELWIX - Sofia/Bulgaria <info@elwix.org>
 
-Copyright 2004 - 2017
+Copyright 2004 - 2024
 	by Michael Pounov <misho@elwix.org>.  All rights reserved.
 
 Redistribution and use in source and binary forms, with or without
@@ -89,6 +89,9 @@ typedef struct _tagToken {
 #define json_tokstrcpy(d, j, x)	{ strncpy((d), json_tokstr((j), (x)), json_toklen(x)); \
 					(d)[json_toklen(x)] = 0; } 
 
+#ifdef __cplusplus
+extern "C" {
+#endif
 
 /*
  * json_init() - Initialize JSON handler
@@ -133,9 +136,11 @@ ait_val_t *json_token2val(const char *jstr, jtok_t * _
  *
  * @jstr = JSON string
  * @tok = Token for convert
- * @return =NULL error or !=NULL allocated str, after use should be e_free()
+ * @return =NULL error or !=NULL allocated str, after use should be json_freestr()|e_free()
  */
 char *json_token2str(const char *jstr, jtok_t * __restrict tok);
+#define json_token2obj		json_token2str
+#define json_freestr(x)		e_free((x))
 /*
  * json_token2num() - Return token to numeric
  *
@@ -145,6 +150,22 @@ char *json_token2str(const char *jstr, jtok_t * __rest
  */
 long json_token2num(const char *jstr, jtok_t * __restrict tok);
 /*
+ * json_token2dbl() - Return token to double
+ *
+ * @jstr = JSON string
+ * @tok = Token for convert
+ * @return number
+ */
+double json_token2dbl(const char *jstr, jtok_t * __restrict tok);
+/*
+ * json_token2bool() - Return token to bool int
+ *
+ * @jstr = JSON string
+ * @tok = Token for convert
+ * @return 0 for FALSE and !=0 for TRUE
+ */
+int json_token2bool(const char *jstr, jtok_t * __restrict tok);
+/*
  * json_token2array() - Convert token to string array
  *
  * @jstr = JSON string
@@ -155,19 +176,76 @@ long json_token2num(const char *jstr, jtok_t * __restr
 array_t *json_token2array(const char *jstr, jtok_t * __restrict tok);
 
 /*
- * json_findbykey() - Find data by key
+ * json_findbykey() - Find token data by key
  *
  * @jstr = JSON string
  * @key = Search key
+ * @type = Search key for particular token type, if is J_UNDEF this mean any type
  * @toks = Parsed tokens
  * @toksnum = Number of parsed tokens
  * return: =NULL error or !=NULL data token found 
  */
 jtok_t *json_findbykey(const char *jstr, const char *key, 
-		jtok_t * __restrict toks, int toksnum);
+		jtype_t type, jtok_t * __restrict toks, int toksnum);
+/*
+ * json_findbykeyatscope() - Find token data by key at particular scope
+ *
+ * @scope = Search at object scope, =0 main object scope
+ * @jstr = JSON string
+ * @key = Search key
+ * @type = Search key for particular token type, if is J_UNDEF this mean any type
+ * @toks = Parsed tokens
+ * @toksnum = Number of parsed tokens
+ * return: =NULL error or !=NULL data token found 
+ */
+jtok_t *json_findbykeyatscope(long scope, const char *jstr, const char *key, 
+		jtype_t type, jtok_t * __restrict toks, int toksnum);
+/*
+ * json_findbypos() - Find token by position on JSON string
+ *
+ * @pos = Offset from begin of JSON string
+ * @toks = Parsed tokens
+ * @toksnum = Number of parsed tokens
+ * return: =NULL error or !=NULL token found 
+ */
+jtok_t *json_findbypos(unsigned long pos, jtok_t * __restrict toks, int toksnum);
+/*
+ * json_objscope() - Find object scope of key
+ *
+ * @key = Key of object, if it is =NULL, then return 0 (default scope)
+ * @jstr = JSON string
+ * @toks = JSON tokens
+ * @toksnum = Number of tokens
+ * return: -1 on error or >=0 scope of object
+ */
+long json_objscope(const char *key, const char *jstr, jtok_t * __restrict toks, int toksnum);
 
 
 /*
+ * json_dump_yaml() - Dump parsed JSON string to YAML format
+ *
+ * @f = Output handler
+ * @jstr = JSON string
+ * @toks = JSON tokens
+ * @toksnum = Number of tokens
+ * @indent = Start indent spaces
+ * return: 0 done and 1 added one more item
+ */
+int json_dump_yaml(FILE *f, const char *jstr, jtok_t *toks, int toksnum, int indent);
+/*
+ * json_dump() - Dump parsed JSON string to structure format
+ *
+ * @f = Output handler
+ * @jstr = JSON string
+ * @toks = JSON tokens
+ * @toksnum = Number of tokens
+ * @indent = Start indent spaces
+ * return: 0 done and 1 added one more item
+ */
+int json_dump(FILE *f, const char *jstr, jtok_t *toks, int toksnum, int indent);
+
+
+/*
  * json_add_begin_object() - Adds begin of object {
  *
  * @jstr = JSON string
@@ -263,6 +341,18 @@ int json_add_value(char * __restrict jstr, int jlen, i
 int json_add_pair(char * __restrict jstr, int jlen, int wspace, 
 		const char *key, const char *val);
 /*
+ * json_add_pair2() - Adds key/value pair with formated args
+ *
+ * @jstr = JSON string
+ * @jlen = JSON string length
+ * @wspace = whitespace include
+ * @key = Key string
+ * @fmt = Format string for values
+ * return: -1 error or !=-1 actual JSON string length
+ */
+int json_add_pair2(char * __restrict jstr, int jlen, int wspace, 
+		const char *key, const char *fmt, ...);
+/*
  * json_add_array() - Adds array
  *
  * @jstr = JSON string
@@ -274,5 +364,8 @@ int json_add_pair(char * __restrict jstr, int jlen, in
 int json_add_array(char * __restrict jstr, int jlen, int wspace, 
 		array_t * __restrict arr);
 
+#ifdef __cplusplus
+}
+#endif
 
 #endif