--- libelwix/inc/elwix/ajson.h	2018/04/18 14:55:45	1.4.6.2
+++ libelwix/inc/elwix/ajson.h	2025/08/25 13:00:37	1.10
@@ -3,7 +3,7 @@
 *  by Michael Pounov <misho@elwix.org>
 *
 * $Author: misho $
-* $Id: ajson.h,v 1.4.6.2 2018/04/18 14:55:45 misho Exp $
+* $Id: ajson.h,v 1.10 2025/08/25 13:00:37 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 - 2018
+Copyright 2004 - 2025
 	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
@@ -136,6 +139,7 @@ ait_val_t *json_token2val(const char *jstr, jtok_t * _
  * @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
@@ -154,15 +158,40 @@ long json_token2num(const char *jstr, jtok_t * __restr
  */
 double json_token2dbl(const char *jstr, jtok_t * __restrict tok);
 /*
- * json_token2array() - Convert token to string array
+ * 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_token2vars() - Convert token to string variable array
+ *
+ * @jstr = JSON string
+ * @tok = Token for convert
  * return: =NULL error or !=NULL allocated array with string variables, 
  * 		after use should be ait_freeVars()
  */
+array_t *json_token2vars(const char *jstr, jtok_t * __restrict tok);
+/*
+ * json_token2array() - Convert token to string array
+ *
+ * @jstr = JSON string
+ * @tok = Token for convert
+ * return: =NULL error or !=NULL allocated array with strings, 
+ * 		after use should be json_freearray()
+ */
 array_t *json_token2array(const char *jstr, jtok_t * __restrict tok);
+/*
+ * json_freearray() - Free & destroy allocated array from json_token2array function
+ *
+ * @parr = Array
+ * return -1 error or 0 ok
+ */
+int json_freearray(array_t **parr);
 
+
 /*
  * json_findbykey() - Find token data by key
  *
@@ -176,6 +205,19 @@ array_t *json_token2array(const char *jstr, jtok_t * _
 jtok_t *json_findbykey(const char *jstr, const char *key, 
 		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
@@ -184,6 +226,32 @@ jtok_t *json_findbykey(const char *jstr, const char *k
  * 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_validate() - Validate JSON
+ *
+ * @jstr = JSON string
+ * @started = if started != NULL then here will return start position of found JSON
+ * return: -1 error or >=0 where valid JSON ends
+ */
+int json_validate(const char *jstr, int *started);
+/*
+ * json_marshaling() - Prepare JSON to one continues line
+ *
+ * @jstr = JSON string
+ * @space = if it is 0 then spaces will be removed
+ * return NULL error or !=NULL ready JSON for proceeding
+ */
+char *json_marshaling(char * __restrict jstr, int space);
 
 
 /*
@@ -306,6 +374,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
@@ -317,5 +397,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