From ee2250eb658a9d185c371071007d3cb338a91d53 Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Tue, 8 Aug 2023 19:27:26 +0200
Subject: [PATCH 01/38] Preserve cursor character fields size

This change preserves the character fields size in conversions from cursor to json and json to cursor.
---
 jsonfox.app           | Bin 80418 -> 80647 bytes
 src/cursortoarray.prg |  14 ++++++++++----
 src/jsonclass.prg     |   2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/jsonfox.app b/jsonfox.app
index 56a373f5eb7c71eb22f2a48595184fcf1090c875..810ee4107d531034b2ee2333b298ccdae07ca205 100644
GIT binary patch
delta 2853
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

delta 2672
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

diff --git a/src/cursortoarray.prg b/src/cursortoarray.prg
index 3b414ea..27e326f 100644
--- a/src/cursortoarray.prg
+++ b/src/cursortoarray.prg
@@ -37,7 +37,7 @@ define class CursorToArray as session
 					lcValue  = evaluate(.CurName + "." + aColumns[i, 1])
 					if vartype(lcValue) = 'X'
 						lcValue = "null"
-						lcOutput = lcOutput + alltrim(lcValue)
+						lcOutput = lcOutput + lcValue
 					else
 						do case
 						case aColumns[i, 2] $ "CDTBGMQVW"
@@ -54,10 +54,16 @@ define class CursorToArray as session
 								else
 									lcValue = 'null'
 								endif
-							otherwise
-								lcValue = JSONUtils.GetString(alltrim(lcValue))
+							Otherwise
+								&& IRODG 08/08/2023 Inicio
+								*lcValue = JSONUtils.GetString(alltrim(lcValue))
+								lcValue = JSONUtils.GetString(lcValue)
+								&& IRODG 08/08/2023 Fin
 							endcase
-							lcOutput = lcOutput + alltrim(lcValue)
+							&& IRODG 08/08/2023 Inicio
+							*lcOutput = lcOutput + alltrim(lcValue)
+							lcOutput = lcOutput + lcValue
+							&& IRODG 08/08/2023 Fin
 						case aColumns[i, 2] $ "YFIN"
 							lcOutput = lcOutput + transform(lcValue)
 						case aColumns[i, 2] = "L"
diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 06a4a55..605ff10 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.7"
+	version 		= "9.8"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]

From bb86cb2f0e9248bf9e574a2e71f195f01b3c3639 Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Fri, 11 Aug 2023 23:16:53 +0200
Subject: [PATCH 02/38] Prevent the input source from invalid characters

In the Tokenizer we sanitize the input by removing possible invalid characters.
---
 jsonfox.app       | Bin 80647 -> 80715 bytes
 src/tokenizer.prg |  19 ++++++-------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/jsonfox.app b/jsonfox.app
index 810ee4107d531034b2ee2333b298ccdae07ca205..411a1c28842930783896720adb9e681d6da5f5d1 100644
GIT binary patch
delta 1002
zcmZvbZ%7ky9LB%D+aGndv8^T36eY;A5V9a$Q2x1AP!NKKVsE-`zuGl-TX!c`V8bGM
zQ7<Y93+jbIVy~q3%9p{Sz`%T)RA{{jdLc<V%Q<_tQybBaXZLxY@9%fpJ>1<|vQ92p
zUD<`T8ljAAv@^hH;GU~o&?jEhJ*>9q6Q#*i^;kIzB%^`m=l<TUM0?7J`u#)|j7S74
z6Qx~4skxb6KP#f~G*Q+`qnR|L)n7Ib%ets@E-jEdv&`74=`49it63j)V!b;f;#*v1
zR5SK(COH0+Icvs}Q(r2*iGG0y|AMR(=RER$-4*BEDSp{#vY2xh=@BK~6;=$c$0eDM
zujdX@LR>YJ^9tA6t>#)gseRFNTpP7*c-_zx^}>qX^u;9iX&P7MEA~W*8M%q;vJ~fH
zSkfff;F><=FehG;!(5J>RuwrG;>TiIR5I?DnllGsliC@Ja8+O0VrC_OvjwLa6_XSS
z<yUpM&BSS5RFsC+y!OU!&*s)}tUst}F)h6w6_KL18bLL5*1K^nBlmM1hBlI{O($60
zYaiMpkp_iXK_U+uVS}ud_OS-KMAI~jLu9Qu=8|uhXPE6NMk7O`zk`Vublro-s<6ER
zx(@yX?FUyw7PJ?I0^nL`80<rXZQyz+2&N*UlQ=a(d%-=ZvkQC_8U(kYs0g?lQoxgF
z<OWzJO3+W3&nV<Ef;-SWSjBC=0zZJRfhFACJMc5;CiuxV>;b=o-hjX2DgFVTh8Do>
zxD!8~r;qRnaBw@(F8FWo9pDep0r>B<n`i~5p^~Tx!8{f;gIiF?VfaP(+c=-7N_sN<
zNX3~95#AKCqP5LWE=&#IJ;Z!+DvNeJEWhS>;hJ2ySZ@w477XmUa7P29s|XVXgM2t}
K(A@E;VDJanQrO=B

delta 926
zcmYk4T}V@L7{;IfHg(QibAIc{$f6H03@aQ`Dq==p7p4|;b=;159L{;pv9AlKH;G0U
zwZOcJilS~383cVmT?kP@A4E49fzlTt5ni~Ixq8mdv~4`>_dM_W{@MTK|7yuLx@2=E
z7XNOx6d?n1wF2JD&Qi-z{q)Xj71r&O_UKH--BM8-?eo^(E2+*0eiZ^WB|wn?vWkEg
z;}1I{GxM|6pOA&A7?8-top?-Obvfe$5>B+w$1HHg{|K>aI&0D)n)Aiu4%b-#o&+00
zvK+XYa`vP<DxcNksl*8_poEV1D7vhLB%iEV%{d1YzZ}$+ZbeoLY-W~;;9y^utoCNC
zc}-W9;HjsXrnkd4sH$?%ckX4G-Hcq2HJ=ocn|dTw^69dwMIz6Z%Ii9F%(??C2iyAt
za!`A;!OXJ%XAg4MPL}-sWLL2(^4ne5;K^I>?dd<$tg8L$<5ZLdMQhZXgZ{1VwPD>j
z|Cp}IsU%xWRO}Ol(czdRD#r@ACNyEhGG~#HCvJ!l(TE1I2LpJAIpZ63EYAw-E!>a%
zTxkwBadll>(<Y7;Q{&`sR2A7n<#1ht)LwEWb)D?t$_|isQLSV<S9XYO^wf~MxUV*H
zBQ-`o;sCnI9n=8%J$Exi4gg`qX})g+CX8k(Mn28kKOtYCE|3*IspsUI)Ftw5-tr@P
zih4s{;6Gm=zou5mCrW{QJ{Y5Cl-ybdY@z>3f08^;?WX^M9e}kQ@KQAlj6+(;hk12A
zb1c$d<ZqiN+7XuzhKu8T)68t#+WN-`hZAODTYA9=-?~I{q9wgxgws`Kp*O9NX@sAv
U1<o@JrxlW+cfZ>lnM|wv18m>9hyVZp

diff --git a/src/tokenizer.prg b/src/tokenizer.prg
index 17b0e8b..02c33fa 100644
--- a/src/tokenizer.prg
+++ b/src/tokenizer.prg
@@ -1,15 +1,3 @@
-* <<DEBUG>>
-* =========================================
-*!*	Clear
-*!*	Cd f:\desarrollo\github\jsonfox\src\
-*!*	sc = CreateObject("Tokenizer", '"string"')
-*!*	tokens = sc.scanTokens()
-*!*	For i = 1 to Alen(tokens)
-*!*		? sc.tokenStr(tokens[i])
-*!*	Endfor
-* =========================================
-* <<DEBUG>>
-
 #include "JSONFox.h"
 * Tokenizer
 define class Tokenizer as custom
@@ -26,11 +14,16 @@ define class Tokenizer as custom
 	Dimension tokens[1]
 	sourceLen = 0
 	
-	
 	function init(tcSource)
 		With this
 			.length = 1
 			.capacity = 0
+			&& IRODG 11/08/2023 Inicio
+			* We remove possible invalid characters from the input source.
+			tcSource = STRTRAN(tcSource, CHR(0))
+			tcSource = STRTRAN(tcSource, CHR(10))
+			tcSource = STRTRAN(tcSource, CHR(13))
+			&& IRODG 11/08/2023 Fin
 			.source = tcSource
 			.start = 0
 			.current = 1

From 5eae1791fbf607d638efc4cf47f819951727e6ef Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Sat, 2 Sep 2023 01:32:15 +0200
Subject: [PATCH 03/38] do not alter blank spaces

---
 .gitignore        | 27 +++++++++++++++++++++++++++
 src/jsonclass.prg |  2 +-
 src/jsonutils.prg |  8 ++++++--
 3 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index bb21aae..610f760 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,30 @@ src/jsonstringify.ERR
 *.zip
 *.PJT
 *.pjx
+src/arraytocursor.BAK
+JSONFoxHelper/obj/x86/Release/JSONFoxHelper.pdb
+JSONFoxHelper/obj/x86/Release/JSONFoxHelper.dll
+jsonfox_ref.FPT
+jsonfox_ref.DBF
+jsonfox_ref.CDX
+JSONFoxHelper/.vs/JSONFoxHelper/FileContentIndex/ce6bbe6c-b547-4029-a444-eb439cf20c46.vsidx
+JSONFoxHelper/.vs/JSONFoxHelper/FileContentIndex/read.lock
+JSONFoxHelper/.vs/JSONFoxHelper/v16/.suo
+JSONFoxHelper/.vs/JSONFoxHelper/v17/.suo
+JSONFoxHelper/bin/Debug/JSONFoxHelper.dll
+JSONFoxHelper/bin/Debug/JSONFoxHelper.pdb
+JSONFoxHelper/bin/Debug/JSONFoxHelper.tlb
+JSONFoxHelper/bin/Release/JSONFoxHelper.dll
+JSONFoxHelper/bin/Release/JSONFoxHelper.pdb
+JSONFoxHelper/bin/x86/Debug/JSONFoxHelper.dll
+JSONFoxHelper/bin/x86/Debug/JSONFoxHelper.pdb
+JSONFoxHelper/bin/x86/Debug/JSONFoxHelper.tlb
+JSONFoxHelper/bin/x86/Release/JSONFoxHelper.dll
+JSONFoxHelper/bin/x86/Release/JSONFoxHelper.pdb
+JSONFoxHelper/obj/x86/Release/DesignTimeResolveAssemblyReferences.cache
+JSONFoxHelper/obj/x86/Release/DesignTimeResolveAssemblyReferencesInput.cache
+JSONFoxHelper/obj/x86/Release/JSONFoxHelper.csproj.AssemblyReference.cache
+JSONFoxHelper/obj/x86/Release/JSONFoxHelper.csproj.CoreCompileInputs.cache
+JSONFoxHelper/obj/x86/Release/JSONFoxHelper.csproj.FileListAbsolute.txt
+*.BAK
+*.FXP
diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 605ff10..271d30d 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.8"
+	version 		= "9.9"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
diff --git a/src/jsonutils.prg b/src/jsonutils.prg
index 5b81cc1..d7bcf0c 100644
--- a/src/jsonutils.prg
+++ b/src/jsonutils.prg
@@ -44,7 +44,9 @@ define class jsonutils as custom
 			Otherwise
 				tcvalue = this.getstring(tcvalue)
 			endcase
-			tcvalue = alltrim(tcvalue)
+			&& IRODG 08/08/2023 Inicio
+			*tcvalue = alltrim(tcValue)
+			&& IRODG 08/08/2023 Fin
 		case tctype $ "YFIN"
 			tcvalue = strtran(transform(tcvalue), ',', '.')
 		case tctype == 'L'
@@ -132,7 +134,9 @@ define class jsonutils as custom
 	&& ======================================================================== &&
 	function getstring as string
 		lparameters tcString as string, tlParseUtf8 as Boolean
-		tcString = allt(tcString)
+		&& IRODG 08/08/2023 Inicio
+		*tcString = Alltrim(tcString)
+		&& IRODG 08/08/2023 Fin		
 		tcString = strtran(tcString, '\', '\\' )		
 		tcString = strtran(tcString, chr(9),  '\t' )
 		tcString = strtran(tcString, chr(10), '\n' )

From ed6f7b95fe667a94bed4acaa443cbefa34825e96 Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Mon, 11 Sep 2023 09:05:29 +0200
Subject: [PATCH 04/38] ObjectToJSON() bug fixed

---
 jsonfox.app          | Bin 80715 -> 81025 bytes
 src/jsonclass.prg    |  32 +++++++++++++++++++++++++++++---
 src/objecttojson.prg |   9 ++++++---
 3 files changed, 35 insertions(+), 6 deletions(-)

diff --git a/jsonfox.app b/jsonfox.app
index 411a1c28842930783896720adb9e681d6da5f5d1..fdf41a80d79753ea057cfe058b40b005e6106783 100644
GIT binary patch
delta 3743
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

delta 3514
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

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 271d30d..5d542dd 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.9"
+	version 		= "9.10"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
@@ -56,7 +56,33 @@ define class JSONClass as session
 		Else
 			return loJSONObj
 		EndIf		
-	endfunc
+	ENDFUNC
+	
+	* tokenize
+	FUNCTION dumpTokens
+		lparameters tcJsonStr as memo, tcOutput as string
+		try
+			this.ResetError()
+			local lexer
+			if this.NETScanner
+				lexer = createobject("NetScanner", tcJsonStr)
+			else
+				lexer = createobject("Tokenizer", tcJsonStr)
+			endif
+			Local laTokens
+			laTokens = lexer.scanTokens()
+			IF FILE(tcOutput)
+				DELETE FILE (tcOutput)
+			ENDIF
+			FOR EACH loToken IN laTokens
+				STRTOFILE(tokenStr(loToken), tcOutput, 1)
+			ENDFOR
+		catch to loEx
+			this.ShowExceptionError(loEx)
+		finally
+			release lexer, laTokens
+		ENDTRY
+	ENDFUNC
 
 	* Stringify
 	function Stringify as memo
@@ -292,7 +318,7 @@ define class JSONClass as session
 		return lcOutput
 	endfunc
 	* tokenize
-	function dumpTokens	
+	function dumpTokens2	
 		lparameters tcJsonStr as memo
 		try
 			this.ResetError()
diff --git a/src/objecttojson.prg b/src/objecttojson.prg
index 5db27cb..35dbbaa 100644
--- a/src/objecttojson.prg
+++ b/src/objecttojson.prg
@@ -46,8 +46,9 @@ define class ObjectToJSON as session
 				for k = 1 to alen(tValue)
 					lcArray = lcArray + iif(len(lcArray) > 1, ',', '')
 					try
+						local array laLista[1]
 						*local array aLista(alen(tValue[k]))
-						=acopy(tValue[k], aLista)
+						=acopy(tValue[k], laLista)
 						lcArray = lcArray + this.AnyToJson(@aLista)
 					catch
 						lcArray = lcArray + this.AnyToJson(tValue[k])
@@ -67,7 +68,8 @@ define class ObjectToJSON as session
 							lcArray = lcArray + ','
 						endif
 						try
-							=acopy(tValue[k, j], aLista)
+							local array laLista[1]
+							=acopy(tValue[k, j], laLista)
 							lcArray = lcArray + this.AnyToJson(@aLista)
 						catch
 							lcArray = lcArray + this.AnyToJson(tValue[k, j])
@@ -91,7 +93,8 @@ define class ObjectToJSON as session
 				lcJSONStr = lcJSONStr + iif(len(lcJSONStr) > 1, ',', '') + '"' + lcProp + '":'
 				try
 					*local array aCopia(alen(tValue. &gaMembers[j]))
-					=acopy(tValue. &gaMembers[j], aCopia)
+					local array laLista[1]
+					=acopy(tValue. &gaMembers[j], laLista)
 					lcJSONStr = lcJSONStr + this.AnyToJson(@aCopia)
 				catch
 					try

From 92503810b66d63db1ea7c5c685654456930bfd01 Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Mon, 11 Sep 2023 15:33:41 +0200
Subject: [PATCH 05/38] replace aCopia for laLista

---
 jsonfox.app          | Bin 81025 -> 81017 bytes
 src/jsonclass.prg    |   2 +-
 src/objecttojson.prg |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/jsonfox.app b/jsonfox.app
index fdf41a80d79753ea057cfe058b40b005e6106783..17475ea3a11aecc71cfb94e4f72db0b7f7b624bd 100644
GIT binary patch
delta 648
zcmZqt$@23D3*Wy_{}q_T7+4vCtr!_rPvnzi%Ko-dbA~(<Z_Vbz^6AoyhMTpmuc(V<
za4<0Fb22bkaWOEIGcYjt0NI>1n?;kgSQ%L+J7lyu^Dzkg(f#|6gJIWC)`cwp{24;N
zgM_{?Fns4{xXH!foS&1Enp~2ZpC|G`lmR3xfF{g2`D2E}WW`JoUOtAuKUuR_|EU2D
z5t{6jsmmxdxgb-6QF!vqOk+lo$!9Yo`9&GNi81{B$HE}<kC`D<e6nd)*5u_`znFfr
zPhOn8h;h|sw;XLo?I2zT21THI(}B1a$bJCC%|Lc85Ssz<D<Gc<NE?W8Z=RDIbyjL3
zP(}<Wz{?0Epnwx3=s8`$no*?Qvy6cudN~7wDNr65WC#Ef6xjjM9ET*q1`_1j&%lra
z6wF7K00}Z2gGf{%OMnCgP5>PW6zo8f01EmsFoa)#Sh5OP1|+Eb5F&9FSpp=u@d-rY
zIkE&uuyguHpr2|w|1vOq`VUc~3JMJv00}w?F@gic9a#b-sH_i>$U>4}0|^EgF)~yE
S1?!O{z=EsIAv$IvNdN%tPks6T

delta 662
zcmezQgQf8&3*Wy_{}q_T7+4vitr!_LPvnziYS7xKIYXYw&u#Nz`E+SUgU#C3SJcG{
zI2ahrIT;w7xEL7985kHsfb5-an?;kgSQ+^yJ7lzZ^D_wi(f#|6gJIWC)`cwp{24;N
zgM_{?FnkwaxXH!foS&1Enp~2ZpC|G`lmR3xh$hSl6&IQ;n5n|c&+zvrYZmK2HK0Ml
zlbtek8HFboWNI*qOrDu(%qTkfY-S|C7{fPlhQI$<7-ar2GlWV^HqFZ7U}JD}_7CuM
zoIF447ZWqb<k{Ja7&mRU%h6`k4&-HEPy{+Y9f)gy?E6663}oj5u^AA*1oD}Hw1GJ1
z<|(;RXN_k9WyF92yo^8s3OGT6fn^K~azH_4Bnf7aVDfZDYetd!<mC(uGCLre<B-&_
zfdqy2Gce=;1@n<5K!O~{AQDx`5+Ff|6F`Ro1v`)=z=H7?Aa<-mmWaO~!@!{Z5F&FH
zSq3DybNU643wJ(YV3_z9qJ{<JX&3+r{`wD*P(_vi33>@Jf&;`ISpp=etq+mNLXuzu
b2}T$(GE@Nt>yadYf?~kbW)9IZ6G;XD%6ET#

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 5d542dd..6944a40 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.10"
+	version 		= "9.11"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
diff --git a/src/objecttojson.prg b/src/objecttojson.prg
index 35dbbaa..900fdd7 100644
--- a/src/objecttojson.prg
+++ b/src/objecttojson.prg
@@ -95,7 +95,7 @@ define class ObjectToJSON as session
 					*local array aCopia(alen(tValue. &gaMembers[j]))
 					local array laLista[1]
 					=acopy(tValue. &gaMembers[j], laLista)
-					lcJSONStr = lcJSONStr + this.AnyToJson(@aCopia)
+					lcJSONStr = lcJSONStr + this.AnyToJson(@laLista)
 				catch
 					try
 						lcJSONStr = lcJSONStr + this.AnyToJson(tValue. &gaMembers[j])

From b1b53b51368a417892f174145dc6f5e8a2f68151 Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Tue, 12 Sep 2023 08:37:13 +0200
Subject: [PATCH 06/38] added support for scientific notation in number parsing

---
 jsonfox.app       | Bin 81017 -> 81117 bytes
 src/jsonclass.prg |   2 +-
 src/tokenizer.prg |  13 ++++++++++++-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/jsonfox.app b/jsonfox.app
index 17475ea3a11aecc71cfb94e4f72db0b7f7b624bd..ac84308b6c4542aa553d7a962702c70f75c37bb7 100644
GIT binary patch
delta 709
zcmYk3O=uHQ6ot>5CNWy$)R4AGV@ZO<AEHQ$XfRT!F$gLMRw}qqLo&50CNhag1ryYT
z3sI0!u*FS5ilQLH2nvF_s2kk`iVLNsAVM+V4=T1PN%Tyo)y!}n-#zDYd2^>SXPc_n
z<ob_4L8%RPJl!E6M{mkrsb{;s@lK%W$nH(XcwoRUx{XNe#)I~sZa{AZs_lSJ0B^`D
zdrF_4*;XACE{s)Yfm+4BPiSu+`n1QNN5g)EtMQM&o4~^k$9oA%#KRV^s5fKSjBKcB
zfwEun2xDjYwrlfc2f*QQB6Utxl}u{ry3=x6pyX1?vr2q0sU}l-Ma}hV^;v(+*KFl0
zz&LX#ds@llF0Qn^<^R1Q*V5o*I=#^KLDs&zTcgu0|9S_r=M$=$RST;vYZ*@Fdh>})
zdS=mZB5%&`%c~pQ#^_u@Nc%lnX#TEj2pu{?JbU?07%%2e2q`FO>#HNhwY=a_e$ruT
zFZmH~a*2F~dPjc63yhGjQ6=&LF8U?;7Ilog%fn@p?@<Hf0vA6;)~WmC*IwWoxkOEn
zyE=e2?r@Uz@eahX&JToX%+T0Meol3<F0-B_yVn5QSbt?5B!@bI80%lG6I7(rxKdMk
zieG9R%-SaLSb9vepTEou!i|Axj=8O1Ph()3SGQQfsfNH|noqg~F3>DC1Pi7dU7R)C
Gko*M<Fq)<S

delta 675
zcmYk4TWHf@9K}y+HrvkF*|ocMGFkCP1#jTI;cZl3d?-xWgCK<To1MjEq|qS=V=y0v
zsEi2P#Q8Xwicq4UPd@02Z#wW%5F89PCNglE*;-FXrwyF&JLmjAzAqp7?8@#hIr3+v
zvMtbzI`kfu@U(k8(i+IG7I#l}ZcuKeoOhl532DERI(BciWjYF6iUX4^KvV)OvirKh
z`7r-V-duu$nbJ?7?AHB&eSSG_cYW)yw=N!ZW)?@3;XU;L*B}V(x@ihsyV)J|lSYVw
zrVfgpoNB6?CCmcCeiMb36I%YFKA;&{an>-esn*+S7X}yU7mU2n3p+RY^P&G)Qd!?l
z&1N|z3w<<Ve~-pbjWzxo&KW~#(=^OoTl{Dv1`4OGw4NQW20>Wf2ECR!S4~3FMDdUm
zcVez81y-Bvp|wZSN2lxe6)7+%*>_40hf5*gGCwp!C3)D}JlqX(KlPkE6#?#(N2yt|
zxA_b5UFtA7(FD99Pg5t!eKBB;{Dc}IKj!VvliyR%$l*4ifj9e!{zw~oP+`!{;0pt#
z9e6<Pp#Mt$lDtHv=ojc+@>&AeN54#;rsNK1p)5{_u`<x?`2b(*j~A{~{9=1;;e}`T
lS9mMV)fQfu-0K%tYl?a=%uE!IOR?6>0q@uIXQpaq{sMj}kX!%&

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 6944a40..08cf3f1 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.11"
+	version 		= "9.12"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
diff --git a/src/tokenizer.prg b/src/tokenizer.prg
index 02c33fa..9719345 100644
--- a/src/tokenizer.prg
+++ b/src/tokenizer.prg
@@ -109,7 +109,18 @@ define class Tokenizer as custom
 				do while isdigit(.peek())
 					.advance()
 				enddo
-			EndIf
+			endif
+
+			&& Check if number is a Scientific Notation in Tokenizer.Number()
+			IF .peek() + .peekNext() == "e+" 
+			  .advance()
+			  .advance()
+			  do while isdigit(.peek())
+				  .advance()
+			  enddo	
+			endif
+			*****************************************************************			
+			
 			lexeme = Substr(.source, .start, .current-.start)
 			return .addToken(T_NUMBER, lexeme)
 		endwith

From b585ed1a8dbcb2d66b9c93b8eef28289ad36dc43 Mon Sep 17 00:00:00 2001
From: Daniel Carlos <89362488+DanielCarlos231@users.noreply.github.com>
Date: Tue, 12 Sep 2023 16:28:30 -0300
Subject: [PATCH 07/38] adding more RegEx dates to jsonutils.Init()

---
 JSONFox.PJT       | Bin 109923 -> 109923 bytes
 JSONFox.pjx       | Bin 9253 -> 9253 bytes
 src/jsonclass.prg |   2 +-
 src/jsonutils.prg |  38 +++++++++++++++++++++++++++++++++-----
 4 files changed, 34 insertions(+), 6 deletions(-)

diff --git a/JSONFox.PJT b/JSONFox.PJT
index 347ae8ab3bc35f1141bd6a558b002eddd3ea5f15..838c47cd1566d0b9025099d19851e67e3194cd78 100644
GIT binary patch
delta 135
zcmaESi|z3(whiJ;@^a2rG47rr9-&S#Ucvr;ZvGK4S}(vWf?;w6lQI!%T!e*^tzyzM
jOEOB6VzP?!^V0Gw7$yrc>xnR6k!TiV-Y&?@7_<riP^u~n

delta 81
zcmaESi|z3(whiJ;e41`nF)psbjzK~GK0f}FW0+(nH#13K7q(=SoxJgf%w%b16($BS
Ovss#XyEHSS$0`6Xni(np

diff --git a/JSONFox.pjx b/JSONFox.pjx
index d3af685c03426dba1a7c9ea2b0f4a51809f196a1..5e062dc726606c90fea4b0e63d9d32996d05eb07 100644
GIT binary patch
delta 13
UcmZ4LvDAabK%A3jBa5O602`tMH2?qr

delta 13
UcmZ4LvDAabK#WIjBa5O602~JcNdN!<

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 08cf3f1..96c6879 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.12"
+	version 		= "9.13"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
diff --git a/src/jsonutils.prg b/src/jsonutils.prg
index d7bcf0c..1f5d10a 100644
--- a/src/jsonutils.prg
+++ b/src/jsonutils.prg
@@ -5,24 +5,45 @@
 && ======================================================================== &&
 define class jsonutils as custom
 	
-	Dimension aPattern[5, 2]
+	Dimension aPattern[8, 2]
 	
 	Function init
+		&& Match a date format in the following pattern 
+		&& "YYYY-MM-DD"
 		this.aPattern[1,1] = "^\d\d\d\d-(0?[1-9]|1[0-2])-(0?[1-9]|[12][0-9]|3[01])$"
 		this.aPattern[1,2] = .f.
 		
+		&& Match a date and time format in the following pattern
+		&& "YYYY-MM-DD HH:MM:SS"
 		this.aPattern[2,1] = "^\d\d\d\d-(0?[1-9]|1[0-2])-(0?[1-9]|[12][0-9]|3[01]) (00|0?[0-9]|1[0-9]|2[0-3]):([0-9]|[0-5][0-9]):([0-9]|[0-5][0-9])$"
 		this.aPattern[2,2] = .f.
 		
+		&& Match ISO 8601 date and time formats that include a time zone offset
+		&& "YYYY-MM-DDTHH:MM:SSZ" OR "YYYY-MM-DDTHH:MM:SS+HH:MM" OR "YYYY-MM-DDTHH:MM:SS-HH:MM"
 		this.aPattern[3,1] = "^(\d{4})-(\d{2})-(\d{2})T(\d{2})\:(\d{2})(\:(\d{2}))?(Z|[+-](\d{2})\:(\d{2}))?$"
 		this.aPattern[3,2] = .f.
 		
+		&& Match a date and time format in ISO 8601 combined with a single-character time zone identifier
+		&& "YYYY-MM-DDTHH:MM(:SS)?.SSS(W)" 
 		this.aPattern[4,1] = "^(\d{4})-(\d{2})-(\d{2})T(\d{2})\:(\d{2})(\:(\d{2}))?[.](\d{3})(\w{1})$"
 		this.aPattern[4,2] = .f.
-
+		
+		&& "DD/MM/YYYY" OR "DD-MM-YYYY"
 		this.aPattern[5,1] = "^([0-2][0-9]|(3)[0-1])[\/-](((0)[0-9])|((1)[0-2]))[\/-]\d{4}$"
 		this.aPattern[5,2] = .t.
-
+		
+		&& "DD/MM/YYYY HH:MM:SS" or "DD-MM-YYYY HH:MM:SS"
+		this.aPattern[6,1] = "^(\d{2})([\/-])(\d{2})\2(\d{4}) (\d{2}):(\d{2}):(\d{2})$"
+		this.aPattern[6,2] = .t.
+		
+		&& "DD/MM/YY HH:MM:SS" or "DD-MM-YY HH:MM:SS"
+		this.aPattern[7,1] = "^(\d{2})([\/-])(\d{2})\2(\d{2}) ([0-1]\d|2[0-3]):([0-5]\d):([0-5]\d)$"
+		this.aPattern[7,2] = .t.
+		
+		&& "DD/MM/YY" or "DD-MM-YY"
+		this.aPattern[8,1] = "^(\d{2})([\/-])(\d{2})\2(\d{2})$"
+		this.aPattern[8,2] = .t.
+		
 		_screen.oRegEx.global = .t.
 
 	EndFunc
@@ -101,10 +122,17 @@ define class jsonutils as custom
 			finally
 				set date &setDateAct
 			endtry
-		case occurs(':', tcDate) >= 2 && VFP Date Time Format. 'YYYY-mm-dd HH:mm:ss'
+		case occurs(':', tcDate) >= 2 && VFP Date Time Format. 'YYYY-mm-dd HH:mm:ss' and also 'dd-mm-yyyy hh:mm:ss'
 			try
 				setDateAct = set('Date')
-				set date ymd
+				*	set date ymd
+				&& (DCA) - 12/09/2023 - Also verify if the DateTime is DMY Format
+				if !tlUseDMY
+					set date ymd
+				else
+					set date dmy
+				endif
+				
 				lDate = ctot(tcDate)
 			catch
 				lDate = {//::}

From 0c1b08b80aed889eb07ad53b32b76f558dd61a3c Mon Sep 17 00:00:00 2001
From: Daniel Carlos <89362488+DanielCarlos231@users.noreply.github.com>
Date: Wed, 13 Sep 2023 10:15:47 -0300
Subject: [PATCH 08/38] scientific notation case insensitive

---
 JSONFox.PJT       | Bin 109923 -> 110814 bytes
 JSONFox.pjx       | Bin 9253 -> 9253 bytes
 jsonfox.app       | Bin 81117 -> 81491 bytes
 src/jsonclass.prg |   2 +-
 src/tokenizer.prg |   2 +-
 5 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/JSONFox.PJT b/JSONFox.PJT
index 838c47cd1566d0b9025099d19851e67e3194cd78..03447489db8ef9f50b1b60973716deb0bfdaf7c8 100644
GIT binary patch
delta 6148
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

delta 4818
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
H!R-29e_<Ks

diff --git a/JSONFox.pjx b/JSONFox.pjx
index 5e062dc726606c90fea4b0e63d9d32996d05eb07..bae074e019733aa74986b2b328c236a2cf587bc7 100644
GIT binary patch
delta 764
zcmZ9KKWGzC9LL{F?ym1HwrIHK?wYih-W3Wi-rskZ6mf8=6eL-MqJrt-B<QG+)=XxQ
z4*e}Dh*+V6LWd9#U8Finhl*Pf6-p6waO|Lize^!^?Qp|;zwhVw`~JS~wimY-1xJ&|
z`@$Q6aW9M`Ui0Cj@Gm*|uJ3YaF!e%}5^^m^$ZLg=s_SzHKAR>e(%Y;|7k5#%2|uOp
zC#^y+Mp~a(M^Zb7B=?*k1V@{PGHcQWxX0S!4J`hKKWxa1CKhL~)m1DVv4q1;HRLRq
zQM}>E(Ba|G*=5vSLEZfV>ik+1z=JUpo+&(acA!+K2*=9p^eS;xK&m^2lpA|-01aGd
ztFTOu2Y(A~mP#M1I#pp)ZKYS3h&+vR1MKhv%*hUI!Pew0IT&Rol^$kJ-O_V<6XvxJ
zH3qM=Jf#$N^bTEtOGbzGpl`Ito7ieUk7m3m@}aMp@Kl<E)hRB2!3tW${gcSAYjYdr
zVrpfo{3t!(R$>=@-Gz7Mwpd4S9TqB?wO>?p=?Pw23cRm;%Yv#LA-IOM`ryO#Ax&y=
z6!^oCVb>I-ulNwlGJG<Z=y~W>Td-!Cxr@a?ubQVui4f9o{n!b^*bPHBO#(f^-fYv*
zvkLB>QmDmWIQ$U52`P!d=lHmHYztPcSwlikqt<6Z*t3}OGJyj8bAtrhu-#1bb^BC4
OD(u@Vx5MDTUiuFoHL*$n

delta 765
zcmZ8eJ!lhQ7``t*m+x{>nwa#GCe7uiP;~LWpZo3$5(Nh-R7xvd6csBviG!m;TH{ot
zOMRD$Me0z&!65|1E>b&62Ssq`V22EXgYMeF_bx3Ihl9I&pXYs^_jxv_Hm4GvV`X}Y
zcL^$#^p#Q!b`l3vFebU@1u#qV*%~p7%Q3^)N*hLv3FW~T*M+qCe#nun5LQfXBWxXh
znEQvT{OI?|Rb=j1$W+YZ3_NEN%5;vLhx@dXyo$qL@SE;auDu`-QiqDUDz3VOqnU{3
zbKOE-1FC7B3USKQkS!ImZG>G!SdZd*(F!CyNV%|{R#bSXCRG4?>54^79M`mv(6wEt
z+Bgnx^<`wxwsFHs3L!oRlBvUneU1F-|Ft`m3e2I!qz8}lMdHBo{6b1_p9>M`TjQu7
zAbS9Ap-b+-tHO0lD6PE~X9CR8hsVB_M_-bgFzIwjrT@l>6Ow?p#V)xEXG>l30(zy+
ziFsW0HI7C&CILOig%xuG7RQwJ4JS3GF@`Yt8E4{IITt2|$zVrg<wr+Ncu^C}=<6PA
zl{?8c5?A3|<p!R@rDU4JMx|&z#otRde5ib<JkWs>JS66=0Etg<*6x2CACSYCRMZJ<
zy9qOuF^mft_~cHL0<6^*V5#B8&YbG6)#9X-L*gtG=*rj3_mAGR3_ZbaeXf)}j!<lf
z2m%%&^0}WVKENjz*2RTVKHO?HV6jmzjr>QH!vb~W8g?7hdL5D^o)UF@(D31Oy$)BJ
WxAE|nkCu3-0iT;RHj;t8=JY=sT(GME

diff --git a/jsonfox.app b/jsonfox.app
index ac84308b6c4542aa553d7a962702c70f75c37bb7..69136411c253f1d03e0dc8df5034e8f947d36857 100644
GIT binary patch
delta 2172
zcmai0e{54#82#>RU)OGKjINvey^0Jr#t_C_aO00*nMw$gA7v9MNNKwt&b3QdHs&A|
z#AF~*$wL-J6B`kX8fAInA`nGMoCwh=D8T>`P>4f;m@z1{#dF{5N;49@$!X6$=icwT
z@4Me?dM2nn9@3^o{<&ioGDxJ-*^D+n!f2Nu1=>tP?*47Xx!Pgh)cU@8hciV^YUS}+
zdv#*Z!qWN<`I`b~4l9>Sst$^ZxkLV|IxA&T?|7mfBheBQ(J3MdfWPtL)cP;LLmJZ1
zQlhgOx#Y>Mg5OHkVWJU6p_@z>PQWJ%XQYNs&7ze>HfML)`r@MHwueer6h~*aGEU0Z
z7n`F(<(Th@;Yjv9F$Ese9*)@KoCKcDA5B;DpXqQ4bJ6nYr88F8oa@R!X09l%<if)c
z;@FtnN(MHXdv;uI{pgdH<5A83mwQZDz5KzV%YyKsAT6vnOa0bdwo^V~HM7K9ETX6V
zLGb{Sy6Xz+x3fqRJ)U%1LtU*-I5|OaPfT*Qc15(5A4w(a4S`ZamK#Jv8^c(3ASnLA
zB56_mBJNBX+&UN(N0@Z2E-yt-WkGSLpysnl&)1nv6~aB~=1Cvd73Ovdv1nJuMC+BW
z)-BWfr)h~8tR%8Dxg0G^eBNev<M*N}CQ^gP+iLgCwfkHrb*g5dMwhQ$S+>tGDmnPx
zHm|2`T8b*Akk8ZNa$CFFTviW)=8sc#8>LbD2zv1*Q!YYaLhoP&%aSg)7^Uv2e95?K
z!lZmOEm0+<i2*jz5MZC`0<0X6Ft-3{;D<F*?W(m&7pRXm0CPx?j;y+#yjKX&Ar>Gr
za7a38FZA~(5G5j98t|5$s33``0(>%HyN^hR6E6lY2ly!kyg3cvO~57a*K&#81($%`
zd010GbQ1g>pcLFPf#?tL?||FD0?bh=WfWqYXLY*rf}WK&uim1tVL8+B%v^;&A+OuB
z*R0T2<Qd;Ss#oZKdF|jpszOi5bI+~OWL-x^<aDCQ{X|)~u4CXO_#L<+|MdH3+GHzB
zrrja5Q8*|rkmmpWoHXG|u9P=4GbfJ<Ll(>V5e?x(Bwh6>fm|gftjm^~hbFTOdE3yA
zWdEk<<?6|?#_M&t9bK=YRJ<=z$<^+#x4A4$cCX#xb9vjJLN&Q#B<0qZx|<yyr|U7L
zQF2gR?j;g7xvjhf+Wjap*9>>H?qpTclilgWDy_?XdYp94m|lG@HMY3P(^=#7db}^-
zCynn<pyu{Dz8bgl&#0hRdkoz*1?5pvu-?83mM)uucE)O@j$3cD<Fe`Yc)>pf2V03C
z^}r%<87J5P-U^%sA3)wW!CwYWg4ZG9m*Crh2Jm_41b)N2fL8FAZ~<q)`+!ftk7W{F
z1s?={1)r5olz}6i#=J3`9;MP8qCyClAXI^W4a~rN2=fczS!lBg%=v3N8N3LsR)zU6
z<~2Z>bTRy((h@0hO2jEBbo#zdHs7ew#r*?DW>8ycWB<=(Y?-LHdwuO)K38jh<t(;E
z$exWbv2hKDd=KrL0ma#SwvuJ~dtxTY(Q0&4t?GXiZ*cK9hidSrjSVh(oT_m-rh;(M
z;86_&9%*zKxcF5kQ8vT^<{#CGG+aIYzFHw(mDu3o*3Z>gPsbTLE^a)8*A`++yurn_
z1FF#xZ*Z~a2$3J+Cg5&<uKw_&nq+s}7De27UNw%y8(b{Ds2UgI4K6m`Q4JDekD-c#
xj4AbhKrx<;x?DAzRL2s(g^LV5!>_C%&d_mjS~;T*h~069BJ%$fe8=l?#=kx>76bqQ

delta 1740
zcmZ8i3s6*582-;)4(x&`EDN!KvWD0LGf>KcY(QWf)G{8+YBkETy9ydCb6G_gbH^TN
zW+mK)jG1hhDW$B2?KV+h#?+)~Q^}Y!J=97|W|ERjdE|n9hl_ZpGxP2J&iCE_Kj-}a
zxw9vOA!kNIV#Y6Dw@GotsVj@ojQbdMNJ_M9kse&sd`D79ebYnsK;h@{yuHonC|0Ab
zouT~E{CSQ>^+>Wiku6ZuvJY`S$B=AqQwMUa)8{UXBAOFT^plzBTOwKvz8A5dfd>s_
zAUo0PlA5-1x1<ggpOp+vl1<5(KTEl4pUF0>F=aMpI>p9~)IG{um4jtAWxFFbDZs{K
zsB~DOsNe-8niykv>Ch<eQ<!6xa>Bt)n<Xu5k#g2yvqVed5wtYont>Xs-7peI`5eW(
zDmAHCn#%Rp|8mJ{$*R>x|0Rit!HS@~N{?$}iBGPoS^rXqCWg~GuUzf)<vV?zy<F2w
zwBF;Zn|Q6rctdiD*jm|JdwiNEO(&msqo<~{q1IFCMbhp_O@EwXD0T?t8DV@ZEI6X1
zIja-8QAeUIistR?R#Q8BKeU}K09v?m*tx|JAg1J2T#YYh?bHj{fJY4Nlmom+dnBd&
z**O0^9Adyg6pl<-i~4Yc(lDag-~!FqYc|Zq;PZi!2%@bsh>F1108Z>7Jf3I=_;Y~G
zie4rV^?<hm2f#m>NpuXn7q|u-#XJ;G4CTDb%2PHJ*v~1<y^EW+ra4B`J?^#nyuPi%
zzCyjy(P`s%?%QW?QQtbY#K?dDIKpvQ9qc<A#eWGT+P_y1o!exv{)3AYh(&d7A+q8?
z$H8UXz{~2g3m=9=7PCm&9~>qc8|BND$csJJL`n_jof|R`emI5xAdx4{0ykbcfAKbE
zQ6mOgBky_&dqgral53MJdum(_FHANriad2LXRRl%(kVM#K95{irhGG+m~BOIL_|2j
zt|=9rtb1~@v!<I`!(>y9<aE0y-uiKdGH8xn^fQVn;_+^!x4uA@z4A7E8$t@Bs=8cX
zL5;hAQZQ;a1$X3jwf0{>V=I)wYp*d?eK8m<`BShH(H;k|4E!A|xgES3I0fE|mD<3c
z2Tp*mL<K(ue;HT{zQlqmg1-T*1K);<o&gU49pGP}<(I%u04KpS(B?So^EBq=3ABXf
zCK9DW=!cLA-UDP{{s-o#!OclT_hK$SFB|x5+=*<=uV7vPq$%asQ+VaOg~eud=XJNl
zTMiZ$XLkL~*m5&}1{b2NE7!tIHonTa#opAlGLx<5)2ih9s+ziO8S~TA)4MwFXS<|@
zImk6N2C>sOld)4Ml~XE+5WmXNjNPwPKfvPsoqB)lVFXlY{&#vqh{KbHsK?Y0Vl%2O
zmWsr=ZVZzU3pW$Zf|#N+3_^VD0MR`VvzY%z0G>j%e5B=CqYDWYVmR9N1Vpdi5F#DX
zj7Gg7#HcTco`$$nXH19=bW`m2Z5TJ#7i!9{n)9_jM2LakG^1Z{2=UJ`%?Ocn2N7Z!
yuCrJqRc{D!zgaVuP8da#VM5(;x8`ing@g+6g9VHlA^LU3ged-_#3HZijQ;?&D|Ze6

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 96c6879..a277125 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.13"
+	version 		= "9.14"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
diff --git a/src/tokenizer.prg b/src/tokenizer.prg
index 9719345..b273e7f 100644
--- a/src/tokenizer.prg
+++ b/src/tokenizer.prg
@@ -112,7 +112,7 @@ define class Tokenizer as custom
 			endif
 
 			&& Check if number is a Scientific Notation in Tokenizer.Number()
-			IF .peek() + .peekNext() == "e+" 
+			IF Lower(.peek() + .peekNext()) == "e+" 
 			  .advance()
 			  .advance()
 			  do while isdigit(.peek())

From b05b5c6b7f9d81997c0055d714b4a790c21ac91b Mon Sep 17 00:00:00 2001
From: Daniel Carlos <89362488+DanielCarlos231@users.noreply.github.com>
Date: Thu, 14 Sep 2023 11:27:08 -0300
Subject: [PATCH 09/38] update on regex to validate days and months

---
 src/jsonutils.prg | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/jsonutils.prg b/src/jsonutils.prg
index 1f5d10a..d7fdeab 100644
--- a/src/jsonutils.prg
+++ b/src/jsonutils.prg
@@ -33,16 +33,16 @@ define class jsonutils as custom
 		this.aPattern[5,2] = .t.
 		
 		&& "DD/MM/YYYY HH:MM:SS" or "DD-MM-YYYY HH:MM:SS"
-		this.aPattern[6,1] = "^(\d{2})([\/-])(\d{2})\2(\d{4}) (\d{2}):(\d{2}):(\d{2})$"
-		this.aPattern[6,2] = .t.
-		
-		&& "DD/MM/YY HH:MM:SS" or "DD-MM-YY HH:MM:SS"
-		this.aPattern[7,1] = "^(\d{2})([\/-])(\d{2})\2(\d{2}) ([0-1]\d|2[0-3]):([0-5]\d):([0-5]\d)$"
-		this.aPattern[7,2] = .t.
-		
+		this.aPattern[06,1] = "^([0-2][0-9]|(3)[0-1])[\/-](((0)[0-9])|((1)[0-2]))[\/-]\d{4} (\d{2}):(\d{2}):(\d{2})$"
+		this.aPattern[06,2] = .t.
+
 		&& "DD/MM/YY" or "DD-MM-YY"
-		this.aPattern[8,1] = "^(\d{2})([\/-])(\d{2})\2(\d{2})$"
-		this.aPattern[8,2] = .t.
+		this.aPattern[07,1] = "^([0-2][0-9]|(3)[0-1])[\/-](((0)[0-9])|((1)[0-2]))[\/-]\d{2}$" 
+		this.aPattern[07,2] = .t.
+
+		&& "DD/MM/YY HH:MM:SS" or "DD-MM-YY HH:MM:SS"
+		this.aPattern[08,1] =  "^([0-2][0-9]|(3)[0-1])[\/-](((0)[0-9])|((1)[0-2]))[\/-]\d{2} (\d{2}):(\d{2}):(\d{2})$" 
+		this.aPattern[08,2] = .t.
 		
 		_screen.oRegEx.global = .t.
 

From 5ca3698923d372bbdada2516405235802e911e6d Mon Sep 17 00:00:00 2001
From: Daniel Carlos <89362488+DanielCarlos231@users.noreply.github.com>
Date: Thu, 14 Sep 2023 11:31:29 -0300
Subject: [PATCH 10/38] updated regEx to validate days and months

---
 src/jsonclass.prg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index a277125..63c44db 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.14"
+	version 		= "9.15"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]

From 1a4d914a46488fa685f92cca6499c4fcb4a73664 Mon Sep 17 00:00:00 2001
From: Daniel Carlos <89362488+DanielCarlos231@users.noreply.github.com>
Date: Sun, 1 Oct 2023 13:11:52 -0300
Subject: [PATCH 11/38] Validate hour in DD/MM/YYYY HH:MM:SS and Empty dates
 return

---
 JSONFox.PJT       | Bin 110814 -> 110979 bytes
 JSONFox.pjx       | Bin 9253 -> 9253 bytes
 jsonfox.app       | Bin 81491 -> 81653 bytes
 src/jsonutils.prg |   6 +++---
 4 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/JSONFox.PJT b/JSONFox.PJT
index 03447489db8ef9f50b1b60973716deb0bfdaf7c8..a136c78f5014837acb77d851b8eb7ae5b8fe7a60 100644
GIT binary patch
delta 657
zcmZ9J-%FEG7{|ZQdF`FsEX8!CR%*2sUC1(vN*3vg)h-HcX#;QO*!&UYm@AmI7T86w
zVZkmA1cA1@UF@PkZ_tg`+7Iu-i-eH=f%3<o_gy`k38Mqwb3W($obx=K=d68KXV=wQ
zVDB*iorQqKDl*Q-nv7rc7yRP2Lp*FK6i;?_&gQ&Y&PyM=q%lVx<@9Ku=6ONkHae^2
zbL3QIBu;9^?v2=ew|s-wZ+OBA%<gMfIV%CS_R`Nk9fAp}4ahgkmpydQxx8lLsGZ#l
zjlik>z-AM$%6m7nGSN5O!>lV%a2uGZ(Z0kfEm~f|w*hPs^rBD=lU^h;Yz_MA6G@NB
zC7;jG%|rhJq8tbqC4bcwliYknp7Y&_<3_2q+OMSAy-{7H_WvTiqB~KkLqba@Xq{+T
zMv^o_ALOSbopER=+0n1N-Pq>0V4F}Ru_3Ufpgfz(c59v1@sylaT9N}PYU-U-E3JYB
z;i>4oK<r8&7K)p8JTt~ZvFTWJ;{MpMW!DOhhk|z_(W%IaoKMjKT9ofo^o$o*n%XQ`
z^8#h|EKt@gN7Hmk3<&K_nkFfEhku)MfIAGA8CbLe=a^5hj5^@mK46f!-1^V;z+3*3
zF!MM|HUpOr16k$_Yv>4{X$QVC&$GTU|2hi%U|wSVW*NNary+Q8<iT_(DpPYb)RN~!
O<>A;_Dzon9uKWe$g}2uL

delta 835
zcmaiy-Ahw(7{|ZQnVz}LTsjSU+e_KpsI9fF7ls76q%s0=ixSU*F*hyAjkzEx@nT&F
zbx|xh^af5L2ttu%=MRW(y6C10u?s;Yy67s42-;T9aSCHW9r&K}dA{fOd%ow#d9rKb
z%Bt7^Y%>F}6{32Bkn^<E<@$xLLcj3Lo_pD0EYv$~Hu>XYN;Y*TG%y6ub_dUg!hPqm
zmLA2@Lm%9&Z4>47-&TRR$zU7M$h!QXxy@r1v>+T{TW$uXT7Xb1u*`Ly`BC=JB|mdf
z0}U<$D;nkX6S^l%h7tY_{2&y6l33F6ok}~l7ne`qibEQ_<(+Uk2BgETh;y@&yejx7
zoYqYvQ1fgrm3RHsQ&4+GOXX<Q8?Bl)xf$2}&p7@Ht7E|9IuelvZ+jVh5obU(j<Qij
zHQ5^pw3XdimEEv)QXe1H`oHX&wu*6@)`;H9-|{5UqTD+}KJ5a^7IYQmyEC*?c`-vC
z!?3#!{6_!-g2VCHNGOxOIy&^ezGCW;NT#nxGpD1O_>x%hbQp?f#x|BM>b9(yx;K?h
zrrb>xs|lIpNPILro{EQ)+|(?enxi{*Gyi2E08@RQ+I4w)CFaS`%5fcJnV8>b<S%n{
zQus>B!FjqylZqD5^EMOfDbJ?G032iPU`dUD$eDf2>gbq_fWRY_U>;_DX1>1%m}Snf
zp6}%~7GQ~an&n~+?gKtCzhnJkUErDzi&#LqF&0nDBR<+MA73D!PMu@*vgcOqCVBlP
VozYD7x|GgwO6(@TGW(D`;vZfd=|unl

diff --git a/JSONFox.pjx b/JSONFox.pjx
index bae074e019733aa74986b2b328c236a2cf587bc7..06c79995b424fa6441394ecaeac379afbad6fe6e 100644
GIT binary patch
delta 361
zcmX9)JxIe~6#QPA|5!n=#M;_~R&X@Ue-UvKI;e=CLP06G>L3mx($b(EEKWY%L~y9!
zB9sj3;GmlzNH>KJI&~2o998NU93C9^j(c~nS!@<rLzSV$UbBK#Fl@&%!Ur}D@o9#T
z3z-l-Z@C7xH4SCH11H$!-*_rCJr~<z0?Pu+H>h-7!4IJZ9&U&gZh;bA{1kirQxv_6
z)Wvm7zkr6C#f)tIU&=c;FAfe&0wG&{glyB%t%7Icrl8@eT#|sNjP6@D28xCmr3Cx9
zqXh63ek(Z%I;bTASP9P)b%5n?Osxa+8^f!i8m!`YGJs=jB`fh+8sRBMolMWOu%&8v
z$d6)m*p;5?M$h{+S5$9K9X(3jz#87B0%+hwy29;IK?d*AJ#LpGH@qK-G29ESvlu>V
k2aGI70Zq$w9W3XvSj{d;XAx!l^gB`JpKJ#%@ijN|2b@1)bN~PV

delta 358
zcmW-dKS%-r6vpqJcjx^{AxKWsJUNBN&O7gqNi?(=MARZ=OSLowH8yD8AQgl|Zz*Ug
za0v?JhH7Z2t*vMZ99*KIps}IAo^Frt{ocp-y>_`><_uMebhsNXY}%gd6s_QqOF?9w
zWtdBuVKRBkG4MsxP!_syiXTF62->EHOJZDT5vPveSGWNs+!AYig@jN17W>gTn%+gS
za0o7<q3W2HExNXB!?EdlY;*<~W|pvRg)pn=7H}u5;h9{Oc!89RXBE&_G)ya1IKW-S
zho9hA$x6^eE#|{|a2{&{tOk>66IkHzI^KW{oJ#m`f}KPyvP|C3A#yTZ*TRmf;gOKT
z`nV&#(k7GlDA%CdqMAES-ohr{C4FdNDOKb53DEIA)#vwUnhqW&LM-2<IxE4GcF4-n
fK|s@TsL5JZ$GTpTE(TJ8o;b|>r+48B-?9t;G%8;-

diff --git a/jsonfox.app b/jsonfox.app
index 69136411c253f1d03e0dc8df5034e8f947d36857..ef5bcf0c933ff26edd48908bb56a7bf32beddcc6 100644
GIT binary patch
delta 1020
zcmZ9KT}V@57{~wbySaJPG@VLmwTfxzAks|AkH{8uDYKasc5zx~exb9qBr6+4ml4Dv
ztgezl5M6{FC@>I>E=r@MF3O;*^>tl-4BA;e?>P!D9e8%0{eJKBK0MF%A>&*&okiJS
zf4B2;<ltQkgTLuk(I&p(=48zsucPivoAJ^csbu>MfAeQg^??$g)&ne;0*e3wlso#`
zx~3`5IN(4haLH--+i&pA_YhhFRv0pA?lRq(G-GD@#?0bX{dBNZ|JvTZWeszIRWo~1
zDsbz;;L-i{V?HxmA!F;F^#Zv=?tdMcdHtAZ!npCXBgNRf{wCDTp6fN8d#j%zTZO}!
zKme;W0#+H)j4yGlI3PaV0#_6mS339PC+3_0qv`Sy=+(jl$KtWRp`L!14f7C*#s<~+
z5jC!jx^1SQM~k1gj&<d&qp+wQjzxzT3T;$~cyvG;3XKkHp(tHCQ)KgQcu=-N%S<zC
zBHgbJvKjrZTA7zrCYYWx!IFwTtsdk-Ze-PdmN=0MP#>xTS`}a>A84d}7ll~>Jf)5u
zls8bkr7lnCr;AYDOEF#s9NG#bDc32EZ=*9_;3MVtDZWttdnfRX@;Qn>6efMA@vWx{
zFn)v|f2zE87APmQuqLdRfW_MQWDD~oiZ$R-)IOw$eXc!<fZ>a@Z-QP)I0U@#5U3;A
zC<zPhp0ckxB?*^+zFC@#;D9WAvk7YO$~Ggi5wMmfOAx#+2@9TkZ#Q`$3jteGws<WI
z0q4KlA|(p}6AJx_#Dc)rC#Sc7F>Z?;vJmh^sVxGs5HLv_5m!Yd;SzA6fnkK;Wl31j
L-&A6k+?LEgyH(gM

delta 1125
zcmaiyUr3Wt7{;ITZEkKxt0t?|+=~8e*v$P&@(*6Lx{M^9LC$D%&Xv@}h6N^r+QkN5
zR3j{kPy*>L<io-)q9_TwD8mc0i-@GU=&Gm)+Gg+hz6}lw>Vx+?&-Z)Id7r(9{m5w-
zvszRB+p0~npbXAdhIG>v(<Z6r;k4trRg-FW%FnEkYUY*eTHcy>j;{w&8-R{VU>U$9
z=^K}JAALkRtAPf7;GIUUJ3J;OI??$Z_{os{#dJA6y;;t(F1x%B$L)deh<nsw?+)y7
z_BaY(0XG-kQHQMnnoHL0xqQ`MJtf{Vn9BzRN6*s|g}8(NjH6#+vv)T*T|I&D1vd##
zkE5A`y#xeRlC31LVs@*LU0$5jL!;XMmtE3UPIjy?HkXO|18gQU=lAHRk+))h_G;H=
zxwfmJqP<=VFuLpt_@aHi10C_9lV|#0mZ{K)NNnhIFn%By?_1KT%z*yB_*rG!jG>5n
z`Pspt*kFC;c5oxB&D;+r>D>~lHu}mYnOQf<o@z2DLT%DlCQpP;vBU#CV5D3#)va>C
zS^+eY-bEEy1L)QQM@W0AYE6Jde~<|2DAi}umurAKq%%}gTWF6JSRy?^<s|Lf27Dy_
zg6cQbA^N5XlxGJZr^EN&B;NM|7D5XJLs>YCg;nE=XmDtVsfK~yS>Z8o_~aZ=MbIi3
z8V(ol0xp7$f}y~%*@W8bnBeHfW`T>3X-<LzqQT+$=c+L*8XTtPfds*%U?}j_Yc*p^
zG&sEZfllz*=S7E8$0zm3ifC}yzp5IL3WM{7!v)5aYuqXt9NH>X!zUUXGP)59#%J1?
X$;EZOmtmMTjffjLOgE_=t_j8;R?+&1

diff --git a/src/jsonutils.prg b/src/jsonutils.prg
index d7fdeab..62a6670 100644
--- a/src/jsonutils.prg
+++ b/src/jsonutils.prg
@@ -33,7 +33,7 @@ define class jsonutils as custom
 		this.aPattern[5,2] = .t.
 		
 		&& "DD/MM/YYYY HH:MM:SS" or "DD-MM-YYYY HH:MM:SS"
-		this.aPattern[06,1] = "^([0-2][0-9]|(3)[0-1])[\/-](((0)[0-9])|((1)[0-2]))[\/-]\d{4} (\d{2}):(\d{2}):(\d{2})$"
+		this.aPattern[06,1] = "^([0-2][0-9]|(3)[0-1])[\/-](((0)[0-9])|((1)[0-2]))[\/-]\d{4} (00|0?[0-9]|1[0-9]|2[0-3]):([0-9]|[0-5][0-9]):([0-9]|[0-5][0-9])$"
 		this.aPattern[06,2] = .t.
 
 		&& "DD/MM/YY" or "DD-MM-YY"
@@ -41,7 +41,7 @@ define class jsonutils as custom
 		this.aPattern[07,2] = .t.
 
 		&& "DD/MM/YY HH:MM:SS" or "DD-MM-YY HH:MM:SS"
-		this.aPattern[08,1] =  "^([0-2][0-9]|(3)[0-1])[\/-](((0)[0-9])|((1)[0-2]))[\/-]\d{2} (\d{2}):(\d{2}):(\d{2})$" 
+		this.aPattern[08,1] =  "^([0-2][0-9]|(3)[0-1])[\/-](((0)[0-9])|((1)[0-2]))[\/-]\d{2} (00|0?[0-9]|1[0-9]|2[0-3]):([0-9]|[0-5][0-9]):([0-9]|[0-5][0-9])$" 
 		this.aPattern[08,2] = .t.
 		
 		_screen.oRegEx.global = .t.
@@ -89,7 +89,7 @@ define class jsonutils as custom
 		For i = 1 to Alen(this.aPattern, 1)
 			_screen.oRegEx.pattern = this.aPattern[i, 1]
 			if _screen.oRegEx.Test(tcString)
-				return this.formatDate(tcString, this.aPattern[i, 2])
+				return Evl(this.formatDate(tcString, this.aPattern[i, 2]), tcString)
 			endif
 		EndFor
 		* It is a normal String

From a1425a4fdbe82200d3d6e5e8191e7e3c17d9ad8b Mon Sep 17 00:00:00 2001
From: Daniel Carlos <89362488+DanielCarlos231@users.noreply.github.com>
Date: Sun, 1 Oct 2023 13:19:44 -0300
Subject: [PATCH 12/38] update version

---
 src/jsonclass.prg | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 63c44db..0a2e5fe 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.15"
+	version 		= "9.16"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]

From e24cc830ee2f445baca364705fdd1386fc19eff5 Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Sat, 7 Oct 2023 17:21:35 +0200
Subject: [PATCH 13/38] new boolean property ParseUTF8 in JsonToCursor()
 method.

---
 JSONFox.PJT           | Bin 110979 -> 111441 bytes
 JSONFox.pjx           | Bin 9253 -> 9253 bytes
 jsonfox.app           | Bin 81653 -> 81874 bytes
 src/cursortoarray.prg |  20 ++++++++++++++++++--
 src/jsonclass.prg     |   7 +++++--
 5 files changed, 23 insertions(+), 4 deletions(-)

diff --git a/JSONFox.PJT b/JSONFox.PJT
index a136c78f5014837acb77d851b8eb7ae5b8fe7a60..9aa1848a8cea99461602d9649222eed8c9508e70 100644
GIT binary patch
delta 3830
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

delta 3728
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
F|1T)cVvYa+

diff --git a/JSONFox.pjx b/JSONFox.pjx
index 06c79995b424fa6441394ecaeac379afbad6fe6e..4c6e112f2bf910eb69d77f9f7365ea2d8ea361e9 100644
GIT binary patch
delta 749
zcmYjPJ!lj`7~Q$t?(N>0;=<i+E_b=z+?@zE?)=XhwXg_5f+(a*2-*r3f(i*FVXaaq
z{(Oys1T7*6iiRsBjc6r;h`~z1M6vOY2v$K;`0b|2z!dX+@4b27n^_rO8P7+4v9Owd
zmftT}EU1YpmSz1VmKBDRlVf8v44I1RSWDM7fzSC3ms2W4Bqf}3E9DTe$8(l-xriLf
zRRrrn07Yl5kO?Y*s6poiqW<iIZ_eg!S?jcHUqRw`_*qDZ59i%^`!t?k!EbldWhRQH
zHc@)VKnvMNu=Ui%JCtN5hRAP2tH>R}IE`XhcdO;2h}ub!B}DO93%F1S;BHa5JW`ZN
zD&b?X>1`n-3=J2Mlmcj#j4hOwF_i0dyM&ia!E7lZ?|c7Bi>@uC5DXS8by9{qm9s8q
zl1ag7YRel&C5nt51l5F0!~N>C$CWXZGDX3u&F(oZ)s~5d1Aanky@!4uA)ny!U_y?;
zp?X3t!fJiK-$JQJeQ1tp&0*CK;HuMwg(2lV!A?jGj-6(E((m4C45SH3Vel1(8gnjJ
zLK?|Umg*Av8ilpSyseRV4n~_Zg@_x4x^S;K=$ydnmIu$98!ppE8}yvbqmeg<y&Ak6
zew(XWy_>BH*^{tmWAg#-F1!vV;Cib7%i$C(wu9V34{nD^&bOd3a>L_jO+}2e)K32|
zl)Z+mP)3Glp>L1K3?pN$QcPvw2V%bB{$i)|bEPDl>9k>?&2~pqEVBr2+OBuWL5wh3
gWm-G!T`iuy)Zq?h!DES^Hv2m8uH%vfK6EDj18&)}d;kCd

delta 753
zcmY*XKWNl&6wWWr|Fft^u1R{=B+XR>7nA&wUvd?3vUI3Yq|!x8i>nUeAXTnM(4iCu
z^(iPw(V;>IhvNq6B0361?WQ7DaZprra1pf7cQ;(_0uS=?z3+S9doOE~Ym<U+Xrw7T
z6%NpvAH~$yIgTq~xbDo%#6;k_A@eQF+mFG)C*h;Q!k7j$U@)!d`(46u$9ax>tRW|$
z%!e(<0ZrPF^D0w%j#YPg_$F;j*e6UFY$+v}mj!VJx#!`BoRI`BD0T4^=3n8rvfbCF
zXrsU}ggz_ShQ(o81K;q#)~MVu9>g6tN3rbE9*(<=;nG?X!A04D2O7)O-fI<=NC>+r
zjUX#HU>8!UJCP|Cu+4Q?EM(+Q>tCUvh#d?Xx<z!juP@|MIKMiA9V29X0H>6Zv+$^N
zMvb}~l7<$0vgM&wG7ATdj99I8V}Otycw%N`4h~xxxdTnBK6nD9HV4pMm?RXMh66XG
zF<2UA>T5*YAjQGk3qEO#-7Xh%E5qe0c`~h-;xhU=2OH(OIF7^>I8vGGUgTlLl&;}d
zTZ3nn{(Gtk@~$Gr;Kj%*elOp;W$Of)X%f-Sj#U-Ww|Iur@Y0zg`{16t01eOK4;Aq>
z<24@2qc?k|MmK{$QS}#w8~Z8kEdB3j+*hL)za#zyLu(%=q>RNdU-e+g3wtNiVbfF8
e)pkvk;(ydW;D4`IYrNXG3LV~56|xTRs#CkFim*)p

diff --git a/jsonfox.app b/jsonfox.app
index ef5bcf0c933ff26edd48908bb56a7bf32beddcc6..dae667a1afe2f5ec9a4175b1c3cde7833947f75d 100644
GIT binary patch
delta 2703
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

delta 2410
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
TeNqTG;h5!rP(0<ioGJeTs1cB@

diff --git a/src/cursortoarray.prg b/src/cursortoarray.prg
index 27e326f..fd7dead 100644
--- a/src/cursortoarray.prg
+++ b/src/cursortoarray.prg
@@ -2,6 +2,9 @@
 define class CursorToArray as session
 	nSessionID = 0
 	CurName    = ""
+	&& IRODG 07/10/2023 Inicio
+	ParseUTF8 = .f.
+	&& IRODG 07/10/2023 Fin
 	* Function CursorToArray
 	function CursorToArray as memo
 		if !empty(this.nSessionID)
@@ -9,7 +12,17 @@ define class CursorToArray as session
 		endif
 		private JSONUtils
 		JSONUtils = _screen.JSONUtils
-		local lcOutput as memo, i as Integer
+		local lcOutput as memo, ;
+			i as Integer, ;
+			lcValue as Variant, ;
+			llCentury as Boolean, ;
+			llDeleted as Boolean, ;
+			lcDateAct as string, ;
+			nCounter as Integer, ;
+			lnTotField as Integer, ;
+			lnTotal as Integer, ;
+			lnRecNo as Integer
+
 		lcOutput = "["
 		llCentury = set("Century") == "OFF"
 		llDeleted = set("Deleted") == "OFF"
@@ -57,7 +70,10 @@ define class CursorToArray as session
 							Otherwise
 								&& IRODG 08/08/2023 Inicio
 								*lcValue = JSONUtils.GetString(alltrim(lcValue))
-								lcValue = JSONUtils.GetString(lcValue)
+								&& IRODG 07/10/2023 Inicio
+*!*									lcValue = JSONUtils.GetString(lcValue)
+								lcValue = JSONUtils.GetString(lcValue, this.ParseUTF8)
+								&& IRODG 07/10/2023 Fin
 								&& IRODG 08/08/2023 Fin
 							endcase
 							&& IRODG 08/08/2023 Inicio
diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 0a2e5fe..2b85de5 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.16"
+	version 		= "9.17"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
@@ -244,7 +244,7 @@ define class JSONClass as session
 	endfunc
 	* CursorToJSON
 	function CursorToJSON as memo
-		lparameters tcCursor as string, tbCurrentRow as Boolean, tnDataSession as integer, tlJustArray as Boolean
+		lparameters tcCursor as string, tbCurrentRow as Boolean, tnDataSession as integer, tlJustArray as Boolean, tlParseUTF8 as Boolean
 		local lcJsonXML as memo, loParser, lcCursor
 		lcJsonXML = ''
 		lcCursor  = SYS(2015)
@@ -262,6 +262,9 @@ define class JSONClass as session
 			loParser = createobject("CursorToArray")
 			loParser.CurName 	 = lcCursor
 			loParser.nSessionID  = tnDataSession
+			&& IRODG 07/10/2023 Inicio
+			loParser.ParseUTF8 = tlParseUTF8
+			&& IRODG 07/10/2023 Fin
 			lcJsonXML = loParser.CursorToArray()
 		catch to loEx
 			this.ShowExceptionError(loEx)

From 8fe5169572daf86850bbe5c229444aa4ef1641b9 Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Mon, 9 Oct 2023 22:12:27 +0200
Subject: [PATCH 14/38] Delete null character (chr(0) from conversion string in
 checkUnicodeFormat() method.

---
 JSONFox.PJT       | Bin 111441 -> 111441 bytes
 JSONFox.pjx       | Bin 9253 -> 9253 bytes
 jsonfox.app       | Bin 81874 -> 81882 bytes
 src/jsonclass.prg |   2 +-
 src/tokenizer.prg |   8 ++++++--
 5 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/JSONFox.PJT b/JSONFox.PJT
index 9aa1848a8cea99461602d9649222eed8c9508e70..8aeb2734d83f0c12b832bc0012e9cad4b10af6d3 100644
GIT binary patch
delta 451
zcmX|-&nx6{7{}kwcNnwsV@%NuW6UN=;UHpMH1jnk7pax(9+ZqCHQ)N0xEXOk{(#TL
z)*fuh$>i`o$mC3lk`pbpkx{f(4K2gllEd@#dcFJf`8=QJ;M{(2ZeLG@wEo78?a)=)
zd6T_;_G<#*$O9N2<zE!{=dLvu1T{>bT)<{2V0Qx^9y=sQlHJx_gFNPIc2T!&vLw%H
zIv|zuPb~+es{RJqYV>6Q=cCS^$$_r3-D}Qt%BJ57{Hv=^SqC;Bax>Pifb8Ve&KH0W
z0-rE3JQV9Q#z$gvg>R7qL(%B}<ae=J_eyE&rSs$Ps4*2bO~YI$d5iKeHW7@6W6?kF
zfdlc^%f7_TCd(U=gh;=&tV>XA&DyLw?UWPgRjIJ-CEEG39geWV8YEAa0cYeS>j!y@
z`}s@WXYG>fDu8m%d`ur8`@GEP7xa4a2CIdhrXP~?D}i?UHQi12_<#=j9X$-#Q0-HN
g5i!M3GZCq?k`ehCwDoY;Ul-+jg|u0j75P^50)azyGynhq

delta 475
zcmX|;JxE(o7>3{PrcGk;=PLdrjiQ1<5d-R=2A3xBHn?<Y78MjRVvCqS3^)k>426oL
z!&!8Z3~p5{+(D4y;2^f@S`=CYQzIy-B^Bb;w<-?r<#}E{&UX&?;KY7#Vqe`1YW-X5
z--2fuJ#Agy)o23XhZ`7itC~4+)#e6DAn>yNTLP??0agXz=GZQIBl_07_DSxQW<gzc
z$h>6LlwYdkN-g@Ox-JdNgGd(8b0L1SFA!q>X?kXJ<<@dy<L2dsnfA+$qkcLcTm<A{
zd}uHhiH{D)CJP=bCkCU@hvu+ItyW6eo8S8L@Q3(>kx0Z7GsTaU10Tl&Nh20LeJY$t
z{y*$}GSSEvJggA4$5Yf^L>y*!P<ln)nW>Nj#I`20>Q9#(iLSN{`99rU3heM!DQ1lP
ziH|-auQ6Z9yDs2@ywCh3cf1D5x#N&NLiTw8FFj4~ByTY-^bGx&?5+gb=;!o$azhp8
z=+|@uu%nfQP3bQ2DI+XFjsNA>XK7k!?sAx4!?GN()%JzWo;g|aNV}O$NpImjSsZ*r

diff --git a/JSONFox.pjx b/JSONFox.pjx
index 4c6e112f2bf910eb69d77f9f7365ea2d8ea361e9..25dec43207a2a98c84c3e12848d1a251d09e472c 100644
GIT binary patch
delta 56
zcmZ4LvDAabK%9$nBg+mJHWL$bV-uszhgjH{!E8f=$pIV^o1d{C5N8F+8B7+G6y1D4
HK9vOkqUa9s

delta 50
zcmZ4LvDAabK%9$xBg+mJHX}<DLkok=hgjH{!EAH$$pIV^o1d{C5T6{xCAIm0d@2h7
DRtyd*

diff --git a/jsonfox.app b/jsonfox.app
index dae667a1afe2f5ec9a4175b1c3cde7833947f75d..082d689f6bcd72f21d1e1cb90aa4185d7a7ea7bc 100644
GIT binary patch
delta 555
zcmYk2T_|K>9LAsboH2$5V`?xy#*{WGSF){qrfHIk)fUN>l2N-mHB)1v+)V9mt&$6!
zD;G*}F;O%fu0%<>uqkb>#D!8a%GanNW{&4L=)Cp+_dLJn{r<06jx<YQ_D=IkCCI^A
zn}B_$&@IJx6Ln2qxhK)B2E20>qDhrnmzGO2PGG|YSjzyn01m0UIA`blIbX60W&3VQ
zXv)`Am3UHusp|S`WNXlu1{}{m_Ot~)AKQcENN&l#2LW$9p2^y<@tBiVS5kYqwSVmZ
zH%1;thlfIa;owN<cY%Ry7zzYl$yt$d<8*zwaD2@D9v=5cBH_qnv4L{&W3)5s4+U=D
zfDKW7uij{+LA`v63DK_xGo3<ilzu6z*%R?inb!7W&3w-uPhVsWQje7Yr_>47JoTm<
zNKqfK{!!Oe0Oh>yG5r9wr;?2RoW7n~Wqqbk(jQXiR{_oRSM+7nZV%8we^2iRWYl=p
zkHtuPEXhycd9X-q??Z>ZvJreT2RdAE89|ph(BYp3Blu|wtU65aW)p-lQ}7DyEly*}
HtSNZ`?A&{4

delta 547
zcmcchpXJhj7QTO<{wpwvF|abMv1MdnnaC%}BxJl%(?Wq+G1`4|io#rJM)S=~Hmg>P
ze-&b2*euGx@K2n9L6VVy;S7+yJH>7D;pcz2nEo+LKKQAd@%v=o&$5i4Cue__S9#9x
zPnsd*I|GBjA7>!>orS>}h<`8%yxO<o?>`QP-9K61Z{GI#6uWvo4+8_xKn6~R;^f4<
zko@e_ylP&E5C=nIN(xxy4*%p2LZapm1>kBk^2=R|it>vZ1R+A~44K7_C9ZiXFQEb)
z3?(45f=i0DHh=zI&&cSvx%jUmBlAYa#>w0N-DMP*JoW$CdQTAshEqV>mjH1tklhOO
z*IgicBM`3#vd>5`FuVt{F97i^AlpKUfk6!D+&e&iI*_d^&A^}v<Ua@Ut%2-AKx_!)
zzXI|f1KE-?3=C#K{yQLF9mv*@1*!w`zX18J3=GT+MzUL<Fs9noKLQ4V7*LRf2}r;I
zNYI-ZBB6>b0TP@o3XyO}mH-LX7(pbmkR;eZf-6lK8LEJS^+*z6K^AKvh?bd1G5|o(
BdBFex

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 2b85de5..3a04815 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.17"
+	version 		= "9.18"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
diff --git a/src/tokenizer.prg b/src/tokenizer.prg
index b273e7f..4db99d8 100644
--- a/src/tokenizer.prg
+++ b/src/tokenizer.prg
@@ -210,8 +210,12 @@ define class Tokenizer as custom
 		If Type('loResult') == 'O'
 			For i = 0 to loResult.Count-1
 				lcValue = loResult.Item[i].Value
-				Try
-					tcLexeme = Strtran(tcLexeme, lcValue, Strconv(lcValue, 16))
+				try
+					&& IRODG 09/10/2023 Inicio
+					** Replace null character (chr(0)) from conversion result (strconv(lcValue, 16))
+*!*						tcLexeme = Strtran(tcLexeme, lcValue, (strconv(lcValue, 16)))
+					tcLexeme = Strtran(tcLexeme, lcValue, strtran((strconv(lcValue, 16)), chr(0)))
+					&& IRODG 09/10/2023 Fin
 				Catch
 				EndTry
 			EndFor

From 30d6daddcd260d2cdd1a8bd7e25f662af335ae56 Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Mon, 9 Oct 2023 23:24:55 +0200
Subject: [PATCH 15/38] Better performance in checkUnicodeFormat() method.

---
 JSONFox.PJT       | Bin 111441 -> 111408 bytes
 JSONFox.pjx       | Bin 9253 -> 9253 bytes
 jsonfox.app       | Bin 81882 -> 81857 bytes
 src/jsonclass.prg |   2 +-
 src/tokenizer.prg |  58 ++++++++++++++++++++++++++++++++--------------
 5 files changed, 41 insertions(+), 19 deletions(-)

diff --git a/JSONFox.PJT b/JSONFox.PJT
index 8aeb2734d83f0c12b832bc0012e9cad4b10af6d3..0b98ff4e275e50a9850a40c34798f04c99f0a037 100644
GIT binary patch
delta 798
zcmZuvUr1AN6#mZLe|5Grabvnafy4@FgI?;P+^!dq);4q-Y9m-qD1r^9QP9KiCGaU?
z(5082d=Lpze7GP~238<~j7sdKhX@5jSbt=*+^sXWgs6Kt_k7>?`<?Th`@6TWsh``_
z8v(NyfO{d?&?w}+E!zCB5Lg%%#(IQT-i4*W=WWZn`t_GfAl~)V2E=W$Yl^I{hbt{0
zbg{b80z7B~cG>|aZ+pVHxTt*Vrb>g*O!@m;j+_>j{W4KSZG!dGezLNsGmzSdXi38h
z-4)fzkQj<3K>R5nag#wwi_S9X6BV@;UA#m%&-54<-@##VvZ5Mc-_tGQ-zKp?O>+P3
zvh-IMEgWh!%<RQuu}cZ+ah?nHx!7N<4p9~?+t0)@!8J2eH`frCx(~{EW>tfj4n{=9
zpfn_1l1%Uf#aO6c4EIV+2#R7j6qg1D`@<m<f`I`k67-9b4#7|)Jg6kjQOt1SY7_W$
z0TaeYlj&&Y##s7_xh5HrOr;K#=SSqZ4r=RJwj6H0mboQmvzhGZ(VAqy^>P1%luoVI
z1tTV^%?2m3X8vpk79_867kMp82BkkhBSb!BTBOtDIYR}!z&yT?kLEF1&wlt(fLoa4
zT)iXYlZ(CdPM8zq*AlJfcH4m!9)6a?W(9ow+wdtu;keBBb_c&0Tdy;}%lK0#;AQ@i
zd8-3>&vAkI4)ZO>X(w=zd6D@&#xFS{%)c{#!}zTWh%x`cTmtm?z=B4$SgBi<`Y2$J
kvuX7@SxdF2hf~I;%=Xb^zp%Tg3{BA^JDpWZ(=^ij8w{G-cmMzZ

delta 827
zcmYLHT}V@57=GTfzvI+gD{V_1hKv+kSsA7`b#^>1VQw<dM9YGeMv*w0vo0cr{gB-S
zyBKs4U06sLrtD&nWOZ9z6qpfoBb1RrVoFooj=gUEoR9b8d7k%upYwfu@8p8<-GWgB
ziVpzTlMI;)g?PPHAMX*|$sVEqn9#K^`NI8u(YmDl+^iCatLE%Lm?Iu?mQ}Srwu0bf
zIco)`O97(|uyfrkW6xA-#YI_j%t$6YNduY_>U`5GAuYg?`M3kUy~8ypL#}g@tF_+M
zbn0ruwc4y!f{C;arnH{J0L}8Z$H+aQ?0;^`^IcH6+>(*Of5^H25|Py^;LOMyA_l^N
zSpU%QK=jN8!M`)RZrFt8z)iNcWY!4Tn#`&W=>n_~iJaYlW@ATv-q8R~ela6m$d)3W
zt{ax1RdXI&dEU8DmU&wfEQ>QbnGLJP$G1wS*9~cCddz707;Z6eXgUOoAVQVBO1ILk
z7~u~n9;Mra4oOv&fKP;%mCm47HNh))N#3ABXfvbD<6~WxI=RK;^}8jn3G5&TRmA|=
zAM~kuw5dwF0lA)gD8{1<pN(%5hqeu=<IU7!+IzbQ{8&H%hR%it)$qms!5hVSNkpix
zFQ<GiNlaEyY2!D`zvA=ZD@r61j*M>4OD0?xlA_9B-|`<pM0CrnGa5OV+LS0p)Rl_K
zw4W*i!ZL`zOZ1ZFX@o}5AY6x(TZa-KTIjvdL5T^4-o%=DU|#X*#yCzhzFfwy$#{z6
z0pn*pb1RJBa=d0-TMq2z>wIF~&Dc@F8uPEr>li0F4l`e5KFio#2{beR!Q95!?f{N5
xUuCZF+@hKVUBY4`SE9~CZXs+>JRhZ+)Ljoflmy>Ys__opFQ+4^xiLDi?Kk%>=urRw

diff --git a/JSONFox.pjx b/JSONFox.pjx
index 25dec43207a2a98c84c3e12848d1a251d09e472c..66928caf3fd6c3743b0c31e4c04a43678acc4608 100644
GIT binary patch
delta 104
zcmV-u0GI!zNTo=yz61n0I504?!UP}z33Unp03b0lHZYUXA0Lwn2HXMhljjEG135Q1
zlK~YKlVAq~1%d(q0O+&p2Z;g+I|~2+ATv2PG?Q@$AG4eaAQA!Xv%MVa0t7iXH#U<{
K2o$rxA7un&zaHrT

delta 100
zcmZ4LvD9P3J{A^pV-uszhgcLCIm@^h7!(YR%?u`Al$W2(#de4B)8yxDkAW%-4JHS0
zNU%0BF)+N`{F=R!iPMG~sMgrh++=bgyZq)kTna*r?>6t1dCkOZZfr1FP*QaB0r^xG
E0QguP=Kufz

diff --git a/jsonfox.app b/jsonfox.app
index 082d689f6bcd72f21d1e1cb90aa4185d7a7ea7bc..1a526634e13926d5c60545d5966495decb348e81 100644
GIT binary patch
delta 835
zcmZuuUuaTM82_E?b!usvOXpZq7mOhz$|x$Sh21VOGL=muXauH%YM`J-Q4g}09(suo
zRuS|()<el9iaoRz>m~LgtEe7&h`}IOSZ?Ur?zQi#8%EvBchB$7{r;SDzSQ{H8gEv9
z)!dvNT0A<=Q1;z3JGhsLg6D{vTb-8T?#Es1sKgzcdSd@%1tx63atGjIz*EAdY3a?9
zyp7wz?*Hgx&KwWRMwKyHF~ZTm5tG-nI;Lz#q@p2XudKKTGJ-+{5Y{=2Tq987(OqS2
zBeK$tUa}Yli0-1~Ti8mD$%-CbYuY*dTO_(!B=_Gcum7sT!>OoYqFyu>b*VtvLvx`y
z7xfp^A*!6^`zxW!;GUdpHrFsp?Ww2J%!&q4E%b;80r9+eRy4p95Te0BA#_SKA|ME%
z;5l(<crX++AaHU>3<vyzs6`+c4h>8FD^XqFB_lv52?H|mSTd3t8%<s`H6%S^i9}tQ
zG3QHG+u=FO*1wli*Tr-?m5%RhNIG1}__Ja%G2ayQ$f~u5vuTr5Ue7V+l``@^<~hiU
zm_-3UnU@tX-dz3gqlg}EoL2P>GjD!I`M^En@)NcB+-e8#j)t6~=yU+yPP#I}FDNb$
zzOkD&K)d)z{5IjmZeTz0Z^YZ3z-NjR#FvRL5l*^*GsH{8?-G7X5hlJue1Y(LHxMQM
zo45#Q@YVf%k&O=IigZ?X5_yh3n~y5`G!3J-)lkJdwuW)K)lkK;0}bP9i_xZv4-PTh
SBr(@w)Wx#T+DLiW;`{;a=+|EW

delta 885
zcmYjPT}V?=9RHoW-QDY&xk~3u9Ro2GlFE$ysN{CL4PkDw-HDI|ON~Cn(VPX949lq3
z*hADq1cgXJF;*{0f<5$*5k1&L(Th+>dnl~Yl<nU2-<Gv|`5%5C=l?tB+;bOl#!oq8
zh5j?=<ZR&a>>z`s>sE!Gn|&Q`Zg+B?cw)$Tua>nZxC4(K+qA8~Toqul12qg-BJ7GM
zUae^6sEG-9ng;YnsLLHGhBOCj_Tx4T4o);33$~n+T8{2+={SD5ZL(R@EAS+3fRHv)
z@zAXsJtpc2YX7-V<ke7Vx-~0<Rw$(Z7NO~NXw1qP5u+hrbYy&DG;%V-;H}iw`5bfy
zrYYK*U1QLivMB@7WmscOBsT-yPKm~1A`ddZnvvc_ks@BK^FN?BkdM4iBTbZL8rC>#
za^4_QpmTOMKXq=MPeV6iUN=T@oq$6(AYg$ARdy=_O0Qyq*QdCY0RerIswzH@2sbJI
zfLj&dmir}lKw;=HqsQeTU6%aR;&OWrOKt&_AO}>1hwKe_R3my+rI$yc=Pt@Ilcl}U
zX=2bfBT=0?BJ8+f0q9;(hVh}`m>N1aGIp)JD2WIT4;Pd#v8jx0|2ONusi#91m2fx|
zzPY6+2{<z@MU=7O)xUy>NIuFR3AZNRWulDrCp_9NR`26h!RR^97T7YIVpC}2u0krj
zdt)>D2d<CBCUbA2o%Ex;p?y81Izjk?jjoY!oa#Q|mo>mI!tbdT2{+dQ+vy;mi4PEV
z)R9Jfh4@aw395a>lf;(@o9ls2;@^qe3D-D)ZsIB83SdBk<M|>RImD8;_jI$$D@poF
xeggw7jYf`!jVCWYs45z+QX?-;w-$}FC59<4#%V8?NQ{;k1<}$~?6^~6`~eQR=>7lz

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 3a04815..8bf2c7f 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.18"
+	version 		= "9.19"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
diff --git a/src/tokenizer.prg b/src/tokenizer.prg
index 4db99d8..af03a63 100644
--- a/src/tokenizer.prg
+++ b/src/tokenizer.prg
@@ -202,24 +202,46 @@ define class Tokenizer as custom
 		
 	procedure checkUnicodeFormat(tcLexeme)		
 		* Look for unicode format
-		_Screen.oRegEx.Pattern = "\\u([a-fA-F0-9]{4})"
-		Local loResult, lcValue, i
-		_Screen.oRegEx.IgnoreCase = .t.
-		_Screen.oRegEx.global = .t.
-		loResult = _Screen.oRegEx.Execute(tcLexeme)
-		If Type('loResult') == 'O'
-			For i = 0 to loResult.Count-1
-				lcValue = loResult.Item[i].Value
-				try
-					&& IRODG 09/10/2023 Inicio
-					** Replace null character (chr(0)) from conversion result (strconv(lcValue, 16))
-*!*						tcLexeme = Strtran(tcLexeme, lcValue, (strconv(lcValue, 16)))
-					tcLexeme = Strtran(tcLexeme, lcValue, strtran((strconv(lcValue, 16)), chr(0)))
-					&& IRODG 09/10/2023 Fin
-				Catch
-				EndTry
-			EndFor
-		EndIf
+		** This conversion is better (in performance) than Regular Expressions.
+		&& IRODG 09/10/2023 Inicio
+		local lcUnicode, lcConversion, lbReplace, lnPos
+		lnPos = 1
+		do while .T.
+			lbReplace = .F.
+			lcUnicode = substr(tcLexeme, at('\u', tcLexeme, lnPos), 6)
+			if len(lcUnicode) == 6
+				lbReplace = .T.
+			else
+				lcUnicode = substr(tcLexeme, at('\U', tcLexeme, lnPos), 6)
+				if len(lcUnicode) == 6
+					lbReplace = .T.
+				endif
+			endif
+			if lbReplace
+				tcLexeme = strtran(tcLexeme, lcUnicode, strtran(strconv(lcUnicode,16), chr(0)))
+			else
+				exit
+			endif
+		enddo
+		&& IRODG 09/10/2023 Fin
+*!*			_Screen.oRegEx.Pattern = "\\u([a-fA-F0-9]{4})"
+*!*			Local loResult, lcValue, i
+*!*			_Screen.oRegEx.IgnoreCase = .t.
+*!*			_Screen.oRegEx.global = .t.
+*!*			loResult = _Screen.oRegEx.Execute(tcLexeme)
+*!*			If Type('loResult') == 'O'
+*!*				For i = 0 to loResult.Count-1
+*!*					lcValue = loResult.Item[i].Value
+*!*					try
+*!*						&& IRODG 09/10/2023 Inicio
+*!*						** Replace null character (chr(0)) from conversion result (strconv(lcValue, 16))
+*!*	*!*						tcLexeme = Strtran(tcLexeme, lcValue, (strconv(lcValue, 16)))
+*!*						tcLexeme = Strtran(tcLexeme, lcValue, strtran((strconv(lcValue, 16)), chr(0)))
+*!*						&& IRODG 09/10/2023 Fin
+*!*					Catch
+*!*					EndTry
+*!*				EndFor
+*!*			EndIf
 	EndProc
 
 	Function scanTokens

From dc81bd43082a3680dcbe63064a809eb282e0b5ab Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Fri, 27 Oct 2023 22:39:16 +0200
Subject: [PATCH 16/38] trim characters in CursorToJSON() method.

---
 JSONFox.PJT           | Bin 111408 -> 111507 bytes
 JSONFox.pjx           | Bin 9253 -> 9253 bytes
 jsonfox.app           | Bin 81857 -> 81986 bytes
 src/cursortoarray.prg |  13 +++++++++++--
 src/jsonclass.prg     |   7 +++++--
 5 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/JSONFox.PJT b/JSONFox.PJT
index 0b98ff4e275e50a9850a40c34798f04c99f0a037..3f1d23f884128a2b2e18e71935ff86e457a94675 100644
GIT binary patch
delta 1263
zcmZuwSxj7I6#mY=bLY;mFJ*wTv><d9S!&TLjlejT8WsyvE7GPR>A0lJ$P6UX#x&7r
zN}5y&Y5&sVlf;JBLMe?C?P5>^i4T3ys4+1yHAbIIEG3MSnYsF1sl^8$zTEFS%YV=L
z&-t(X>Kysa=>pQX04SU3O-a>8YH}PS-CFZo-CCqulQZw+G+7IOt<{7P8_I#%GGL^)
z(o^Oi%Y~ql=K9q@YYEV@7U*N#OXROy>xn!*B!d}xt+rRaHzxUN|4}j3*Gj6MH=_o2
z#Z5GKbhP@K+O2#{MxC@c(B^CFFry~Ss0&s){4{4J;y}{MqHs}oV~(H9eM!rOPh-Y}
zFlaR4U36n9MLly?p7j@rmC4XlJ2VP(B&`wz^Ae<ba(*u1?XX?R8#fa?O}CFJiW!fI
zwQ42kfzN?bCi|nN8a^Wh$63LmiD(*6X6`=~**e|U+KSGwwPQtR+S;JbzTb|QSxZ?o
zq~ZF8Xf|TToY2WOKxMa*L#GQjV#e=crP>AXh+le=mWc*(w!F*3=3Lmr1{}C$J<6C|
z#(1MT7M$Rv-77|1!?AL&eFx_oofPFyIO%Z41#dX(la?FJ2__{i9lKYlxlw6O=dW7*
zojcpSElr(W%5_d&Om$<$a6-w($jNgu;FcLB<5J+clnbr^kctBXhhOst4+f5e>n2q7
zxRi)bwT(;B`s?}2At~q#gaiG)P$(GsqhQ%);y@tW9|{iU7OHp0#i!NPM7|rBLn1Q~
z?}suZ+N_~&UyusXBX=+GOlee^6LRNx@fu)>|Gh(OBfrg^T+KrMq;_*hM=O9W)G5SQ
z<n!x*9poiM+Irw5v6sA(m?VF4BM>03CXSJxBKpZ|iBHI1-%OD2Bx(Q+Z>qkF64qwR
z)MqEelTWj&{lP2Q$_F)P0>R<zyy{Jd<o+vJ=L9B*!*q4A(0TIh*LwCekSBC-3_xQf
zcuCqteo(hQ;yrw;HeZ%)^1cdOmYW%)4o<$HC1!lC#f;OcW>U&B9{SgIm$tatKPf-%
zj_Xzx7s9X?!n+82sTN%D(s2Hs4u0xwV-6Oz<u!Dm*s5THZZE2i|4&f|r#OHvH8dp;
z%W3uTl$<Km49kff#v1NmDNCzNa5<APqtH<MuE-;jtDf^nsk(SY-gd8SQPs4RtDimc
zf*P9^_on|WSUS7|p>Qzd4>pBDy@MvgfpGZM;F0aTD4;=oIV~@n-)m39r+uU9u1d8z
mgAdT?tR3mwn&+vpXO+hJGPad?iufW;4PTX`+MH?6spN0}&wsH1

delta 1194
zcmYLIZA_b06n@V8*$-Nvl)?l$I$@&Bu9$5ZW{HkUzzHG@wxBTvSu>ZIm9<5gPKHqz
z(8RdB%dX7CM29**_$bpf&P_8-=0A=5>&!4w7k(`2tTYYnJI~wV_T%Jzo^zgi-gEDL
zu5nFU_(QV+t`LC0*&&BhGD0537?j#x8I)3k5}iEev6(k+)=R{SKLfxdhcVRX3#|87
zfY8Y4o9lqeI-s;37-8LJ#{ZssIJJF>4!dQK)NPE<`o(2I_jZ_7n9Hc>T~*NC-rb{T
zH0T)}rVIU?F3YU~d9#d(&Lo^wuIf+bO&iW-)z^td)46ckh84RQc$;?hmylV?QimnY
z06lrL4$;aSLplHbrChkjD&@~#$Z<E>YEzR{o5=Lu7Tu~T@blvSj3$nsr0SzQL0Ut`
z$(?y^VIqr{SX{czT^3iEm#>W<X4Q(D6D9bnDN~B9`Vn!F#|ATN^fE5ma6YU4K&I3B
zA-DJ~Z|c~=kayVY<GnnhV=oV^;A?XWYsy&@&d9jIBdGYN7ON6o+z__*{LX_KlMVN4
zT+mhtFKOHIrX6iLUX(Xw40y!v)6^!moTA55)2HZN`yEHh!S}|uh45%B9*ylz#72h`
zqp?Ur^v;lXC{|gld(kx%PqfEk(O7?EEb-LNc>KWrgYK$g)q~y7M4xXT8;*=54nz+Y
zWUsE(9O#S0BgLg(Ru}a;_C?}}SoH9fYH?|X+NGA(l<Na}mgq?8g%4?pq@NU_o}q?R
z^BJloDifU_)2~No{J;tiyToyk@g8<x6;IDw$8pAi1|Y=T&e6xXXCv?s<64drj4SQ}
z1{pVSY-9Xg6Yw<SAcuT6;Nv*N*y^#9F`9u<#+_D<C2%ww7x#q3&!146G#L=zOwuM}
zVyo)4X}4a*bsZSzh#D<#_=3;T+N)Smfng13<We7ZewnfNiH^NH80TbeJpk0C-ujdt
zCHh=k{fy6IL3GVhD~*X`vvk3oP}mREomur;DXWf%-Z=`mO?fT%H|Lhc#2j4-Ez4%j
z|NgTKlIG(nM_MYHO+jtJp0edt*{X}=Jk?Q9{5VgWXhh`Z>CJV&D5i!Ebv=8|&wpqv
z*gmVK6>)ljg5(j8`N%K+TA<g&M3U<1KJi|XHo6^nf4N{L%WAS%N>V^fC8<=@ERtP!
z@s5F3(Y#3e^)D!l3c4(&7iqJ48cS-6acFC$?;0zDPQF0?c5ytwvE5lX^Lx(HE@@o1
I&iu~*0LP(dg#Z8m

diff --git a/JSONFox.pjx b/JSONFox.pjx
index 66928caf3fd6c3743b0c31e4c04a43678acc4608..b9ca94ba3c28e9835e9d07853bc96d4142650aca 100644
GIT binary patch
delta 68
zcmZ4LvDAabK%7f@Bg=Lcc2hGWb8}OZ&4*YRnb^P_gUJ^;L?<V(v#=guWMKF-`8nGI
Rs4An$0UQ#WpRwD^004Ks69E7K

delta 68
zcmZ4LvDAabK%9$nBg=Lcb`uj5OA7;o&4*YRnb=K?EKLl}OeP0#NU$DYWMKF>`8nGI
XHjol?i^+_lqLUNYSvEgox0e9`V5kx)

diff --git a/jsonfox.app b/jsonfox.app
index 1a526634e13926d5c60545d5966495decb348e81..a4c69420c2dcd79b74bd5bed5e5baa1f205e6e73 100644
GIT binary patch
delta 1638
zcmZvaVN6?96vzMfweP)_QeZ1~6#9T6-CT5|u*n<+2Gj~u7z~OSnHm#1r(>(MU1GOr
zjhZ;4l9-!iA<O)-Pt0V|bYCXJWSETT;+8m#SzL5WmgonK$_TZ#ee+zN!294!PwzSZ
z-#PEzbKkjq-#YiET&geJua(@8;caI~1U@RQkcO*2+j70aw@Cq}$quW)5P*5|+b)cb
z43eL>z=C0*BdvM%GIo=XSB|sq`OV5*><o8R&6Z4Abtfu%vhtjil~3}Ysy3E9xFY>U
zQjR;lw}x{TeJjEl8D;rka1qF?!-5S#5>DT<fR<(<uE(N;r7{$BE4+F=6<DZ%{{Fv&
zdo+y=@txWu>?9x4COwj@E9jPMsJxm^<;!PO6tc2M=8o!Z%*9)(&)UO-d-{Ssor6RC
z$Lc!n`SzLZ0~CaY!%sYB$0~Fpcr+G|#=_CgSnS25ig+X*e>r-jjjjf0<*}NV)E}hB
z5t453+cgbJ8fVd=@N4h71AYcvEC%R@Ub5X}Us52^>H>q0*5*oL8qiY<Oi=y-@(*4Z
zO^?+kODv7jetvt~Q%|dOE&FmRy88QjL!Eo|4LF}sNU@?X)Yq?4Z)(N{>N8AoSw084
zw=xQB;*zu0pVj9Ix(%Oa<!MGqQ~BVc9ZN+#*6?Jwis_}4=@6M2pueDNh(3@f*HW0j
zk`ML^RJb&or<Ym8TdK11PNtWyC9N`X)f&A^<z;?vN=2qvd@`GHmPLx4B9_+T5)oV1
z;!+XI6tDZQkswtq4?!_z9-=|X%2yacYCw#QXktBO+i)o>|IT!W*qdH)x1g&SX(gYU
z-RGvhY#5=lTk(aygK}Jy6QogEP(asp&x@Rd<8?vN{^<^dg1Q!kfRbZ)U1=`pc68;b
zsG!sMm-7XGmy>qtT^$g<qw!gXX<*WmjUU@tnr{tMxIb}$zBAy!*wMqUhNFifN8(M>
zd^Di35KjiGHqUG@5{fVwiANHlSS%X*v%=6+j78#!STyPK@R>kJYVxP0)^Wzt>1f+~
zOu8)df7<JrC9Un&80+AHjyoxD4X{M}-67jW{<V!jB^}^zitTm4R6Ver;v%xI$)Dc@
zbd#@<6>kRKC)-cHkL*18fh|CU{06e)<WG_%$ZsUONd9XNlaarN%r6G}t@N2rZ$9;5
zE#Rg-50b4uLiBYR;Dc3_93hSj7~oSg5aO+f0lqT>As#wlfIrMYi1GwopxE6>r&@XJ
z@&qt@YM`B!r)HDD^>e_Z#9K@`%i@U{qxg9fP=xr#957B|)C`1}_{sps%s`0mTm{}H
z@q`JGm;$ceFg7`7CPF-Q*8ty`fe?Ma8sHZ*5aJ+X%gtJ)l~!pL;*7-rJ~I&F3l6tI
hy3It0zcm@)6%$Z|=xJs+Mq<hYmc>NCsF*T=e*s1Pi}(Nl

delta 1539
zcmYk6duZEL6vw|ezgN>XkG|5hd3Ln5Lrov(u#c^4W9%HZWwkoyeBjpLwA~Vu6xTV)
zhW%q3B8)qjW1!#$!Wgm<g}Jq2=N~G9QWaq`b;4kDe<)jPLum4==jPYd-w#giIp5E@
z_nv$1CD)HAbE~pLzrPx^xS-(dW`@PClMc7#%Gl+NKf0Ti6=1IlG-<#HfTQGB?;hAG
z{JaDS&jFr{uWpF3&-g_B1iQp<)OWIjyvj3cPszFs?rk~cx+SN?`5&GJyDqIs_efgc
zHt)^01xfc{G^@aw4}*p!AX|YY3znTI=rX)|1!0LW{SfC{d_ET9FZv!~aemzQe%<e~
zu3|t5P_Ca=Z^~yi6mrUv%-j4SR>@!SpX0Vbkah4-pxIuEj~BqGe4UDy`2IixcLf|y
z4asOS`FiYtjZO%3@+*PYw9i=>RqQ9;9Bh@(;g-UOkGZ<<5Dt|ARvMon>m_@FVhfE`
zv~m-Tt93w)4{!v5IBnKS{=ZkB&Rh&m*`-R$Aiw;ApFh?5=zv~}Pw7lMR%8rD28Xq*
z3XRIAV;CJ-0rkL1fhO9MlmFCSD(EG+no~|NN;;DdFO^`~%D-#fUQ*6<2W6IWPg{Mu
z6wboTtZ0QKCU|m63)8C+tI20U(l_f&G|flTRI$Mg8^V)`WGpcn>q{hFow_?z+<i$!
zwoF_AHC9w3;&KsN{*P@UmMIpurKH7bl(uXqr5x8<vJT{wPZ&|E85D`S#RZpOCa3(s
z^s==YZWnY7JyZ@IZ-*-%ragDk5oCO+KSn7PVqtm+_o)O0i(af)@b-pqm`-(et4hI!
zE|q{wU14}f-Bi%6=+D!vg1GKVzN@{Te-*0Xv+a?Lt>Z&0JIpV3yIrX&6yHP{#wPd2
zM`PpB1IdmA|E=2>w$~b{63_07y%jmQHyTgTGl?V;vBdNmE5%4O8BG<nFWg4HhOuZe
zm55E<bn~vBh^4(VbF^oIvBR0aHy>w~d6`f3HfBER^)lw<Gh6>kpZ5dH^mcBM&5{3n
z15itEhfao*<To?|Z4_I{M#vv-2A(9}OLmI<s)vAG<TsLSBLC|aU=R5rGHD~=B72j3
zu|^;Hco>)@f1A+6^DWKz`@Q*eBuKf0_mQoCLOkDRfcMr_a)kKnumLWafe?2`4e*N@
z2=VS3_{R){I31_<iQR2f)q~GE9S3?&&u?MX>7FTI=mPLK@h($NQPi#(lV3IgRfvT-
zV1mS$83=LlTLT<210hP^1MiY}%mhgE0^5H!Ho0IXMe+2JUaHV_o4P`O65<qh%sE1w
zr)MUBEdDJXd_wG!4A5i-LOfApfB`cQ;&_Jv-Y@}myrY%j18UA8Qqv|<6c?#uV)rv9
F@E;8YY^4AI

diff --git a/src/cursortoarray.prg b/src/cursortoarray.prg
index fd7dead..327db3f 100644
--- a/src/cursortoarray.prg
+++ b/src/cursortoarray.prg
@@ -5,6 +5,9 @@ define class CursorToArray as session
 	&& IRODG 07/10/2023 Inicio
 	ParseUTF8 = .f.
 	&& IRODG 07/10/2023 Fin
+	&& IRODG 27/10/2023 Inicio
+	TrimChars = .F.
+	&& IRODG 27/10/2023 Fin
 	* Function CursorToArray
 	function CursorToArray as memo
 		if !empty(this.nSessionID)
@@ -72,13 +75,19 @@ define class CursorToArray as session
 								*lcValue = JSONUtils.GetString(alltrim(lcValue))
 								&& IRODG 07/10/2023 Inicio
 *!*									lcValue = JSONUtils.GetString(lcValue)
-								lcValue = JSONUtils.GetString(lcValue, this.ParseUTF8)
+								&& IRODG 27/10/2023 Inicio
+								* lcValue = JSONUtils.GetString(lcValue, this.ParseUTF8)
+								lcValue = JSONUtils.GetString(Iif(this.TrimChars, Alltrim(lcValue), lcValue), this.ParseUTF8)
+								&& IRODG 27/10/2023 Fin
 								&& IRODG 07/10/2023 Fin
 								&& IRODG 08/08/2023 Fin
 							endcase
 							&& IRODG 08/08/2023 Inicio
 							*lcOutput = lcOutput + alltrim(lcValue)
-							lcOutput = lcOutput + lcValue
+							&& IRODG 27/10/2023 Inicio
+*!*								lcOutput = lcOutput + lcValue
+							lcOutput = lcOutput + Iif(this.TrimChars, Alltrim(lcValue), lcValue)
+							&& IRODG 27/10/2023 Fin
 							&& IRODG 08/08/2023 Fin
 						case aColumns[i, 2] $ "YFIN"
 							lcOutput = lcOutput + transform(lcValue)
diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 8bf2c7f..fbc8cef 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.19"
+	version 		= "9.20"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
@@ -244,7 +244,7 @@ define class JSONClass as session
 	endfunc
 	* CursorToJSON
 	function CursorToJSON as memo
-		lparameters tcCursor as string, tbCurrentRow as Boolean, tnDataSession as integer, tlJustArray as Boolean, tlParseUTF8 as Boolean
+		lparameters tcCursor as string, tbCurrentRow as Boolean, tnDataSession as integer, tlJustArray as Boolean, tlParseUTF8 as Boolean, tlTrimChars as Boolean
 		local lcJsonXML as memo, loParser, lcCursor
 		lcJsonXML = ''
 		lcCursor  = SYS(2015)
@@ -265,6 +265,9 @@ define class JSONClass as session
 			&& IRODG 07/10/2023 Inicio
 			loParser.ParseUTF8 = tlParseUTF8
 			&& IRODG 07/10/2023 Fin
+			&& IRODG 27/10/2023 Inicio
+			loParser.TrimChars = tlTrimChars
+			&& IRODG 27/10/2023 Fin
 			lcJsonXML = loParser.CursorToArray()
 		catch to loEx
 			this.ShowExceptionError(loEx)

From ec36708ad63bbe2582ce7d376cdf3b02e3c2c231 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=93=E6=96=87=E7=BF=B0=20=28Irwin=29?=
 <rodriguez.irwin@gmail.com>
Date: Fri, 27 Oct 2023 22:45:16 +0200
Subject: [PATCH 17/38] Update README.md

---
 README.md | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/README.md b/README.md
index 451efb0..9cac699 100644
--- a/README.md
+++ b/README.md
@@ -70,6 +70,9 @@ Insert into cGames Values('The Legend of Zelda', 1986)
 * ![](docs/prop.gif) **tcCursor:** the name of your cursor.
 * ![](docs/prop.gif) **tbCurrentRow:** ¿Would you like to serialize the current row? .F. as default.
 * ![](docs/prop.gif) **tnDataSession:** Provide this parameter if you're working in a private session.
+* ![](docs/prop.gif) **tbJustArray:** if is set to .T. then you get just an array with the data, otherwise you'll get an object containing both the cursor name and the array data.
+* ![](docs/prop.gif) **tbParseUTF8:** if is set to .T. then all special characters will be encoded. Eg: 'é' => '\u00e9'
+* ![](docs/prop.gif) **tbTrimChars:** if is set to .T. then all right blank spaces will be trimed.
 
 <hr>
 

From 31b318a20931e912f198bed94691831453f168ed Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Tue, 14 Nov 2023 09:00:56 +0100
Subject: [PATCH 18/38] =?UTF-8?q?Sanitize=20the=20=C2=BA=20character.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 JSONFox.PJT       | Bin 111507 -> 111540 bytes
 JSONFox.pjx       | Bin 9253 -> 9253 bytes
 jsonfox.app       | Bin 81986 -> 82016 bytes
 src/jsonclass.prg |   2 +-
 src/jsonutils.prg |   1 +
 5 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/JSONFox.PJT b/JSONFox.PJT
index 3f1d23f884128a2b2e18e71935ff86e457a94675..6bdb99a7fb87bd5a625e574bfe1993f631760372 100644
GIT binary patch
delta 526
zcmXw$Ur3W-6vof<?ek4H)ct9zu{O2%P?E`34Hlt-u6<o};e{4sQ8}c$21#`hEfco3
z>cZL^`|bjngTj*R3*SoUVz){ckq|MuY*7)R7eO=YCD_Gt_&pEjaNrzXXD{lkm8ks)
z5%rjpR-3{@PL(H=5i_A=_Oqpmo(xRzfaYT>^(OL9S|{(-oa(?kJ;|T-?&gEeqr7vp
z#hlapikiOrKfTFLIhqr!G|)so-IrD4XZ57{yU*`dJ#)pF=^N6ZzAYDHJU09iDf7>8
zRk19{mg>kW2P)?E@kfX7*wpd|kD+XiRb4KW%&CovAD2z*)@d7xW@;zzKuLV<L`xeI
z;^$s;Fl9Bc(uK_qJQrI*eDPvg)O5(c8)7PfL9Y>A#0fkRvx{)H@|g%TeiWcvuIgzK
zy^Z%ighhJ={mkw;xwHAVTY)^%VGq%|u{;fL&;5m61kz+U;UtQ?h+J->kJ6u$tjE*h
z+cct9<(kSfPrHrd8RT$YtYz@f;@wB%zliMHqp~(YuN#ccTnU9zlj6cGn2PVl#T@pa
zX5@0nq9&}jpuq^{ai?v}GEYl%PYLr&5x23CM=X-|6P4xO2U6Jp(RLTn2g&nNwr=^^
d14N%CuSqqe`lV-vJ&3R|Q@{|`jW-1Z{{ay|pQ-==

delta 503
zcmXw!T}V@59LE38ImeSt+T58Njj=D`pcuv~iX{9%#d)!ds8x(WSep?A8bgB8qCm2X
z!0?4$5E@2QLN#XZ=*<F=K{s9W0eukkaTN=%!cj!w>Lu944}SlL=ehWoDkiI#jYL~^
z5m8j69ZedGSq4jK{UW8EZ#BpK@l5Ct3)um4<!W8oXWPZvY|9v_#51he*2222F6J6&
z5VLkrGk(thPcNE7v-O3!=R#dsu6^1#el4C6zuSXe<6U7cAp$)%jM}rg1RLyqjFV!c
zx2)+gRVnu`yYWCwB^P&MN!T+T`*2U}FMB-5i|pImK}-op^+*%u#j)Cq8+p0rLc?aH
z<@c>{nwlPd6vny}Ph_<d-~3pXALCHH%QBlnx8LL2UR(bg(V(99`iKf%B9^v&(a3>K
z1hQ4!Wf66Fh<>yXeNgv+@~7D$dHn|VIxxat-o+gZ$}@||>oRs9y5WE2BsC^-(!}_w
z(Xr&&)1%4pgA=(`o+x4(tMYXbHu$e4TtOed^bqOYeL<pIYQhwULqspaMDLX^C_X8#
zwi10+{#@}#v7v60H+NzO9~S7*3SR!@93pJN?c&-b;`)iwQJI*;n*d@m%CXJlH**+9
KNv`E!HU0yG9hvU{

diff --git a/JSONFox.pjx b/JSONFox.pjx
index b9ca94ba3c28e9835e9d07853bc96d4142650aca..9fa35fb3d090180c86700f39db3007a39a3ef132 100644
GIT binary patch
delta 319
zcmXYrJxjx26onIW^DTmq#E({L+g;wg-_bu%oJ4SUs!&`6M-Ad2PA+%tCj9}Df{w+x
zgRWiNq}YP~1e54?&pqckoKbJo1F{jWJ;5`$QgcDLetZQJC?N`uya;FZ(h^dl8OM0)
zf-^A<;~>Pj^YNdTWo*;FT``QSV&Q(8wo;7in*H+6oU)WFj_X@7o(G<Pw`v%>EGs`3
zZVQLOJ`gSy&Vn3-;G*g(E<?`;%9O^ND7P5XHJ!u@n`AU)=p@&FS8<;_08m{{-EQO{
zc}A)N95?0`rxf447{|>eNJc9oDqePeOi+r}^NLC9+q8vFHLs~@yI*=~B_cfR3_uE9
XV>s;$aIf9O<8B{_5VTIbbx(c)vW`~Z

delta 317
zcmXYsy-EX75QX=e+27a*o7K2V)V#pGckkcE7YJ51_ErjFBiOo#m6gr37DC7agcY<5
z)+w}2V<(Fd6raG|8@o9(=M3K&5645G>rpy^C-9}>T1zo{0Rn<biHAXqbN8#IHO04}
zgU3F2Q{p(kt5|vO|9)QEHr$&P$EnJN|3TbbYC~=IGd%SK&lt^Z{5%T6{kG%mWVsf2
z;rH-98UU9};yfx^TIRUc?UtAAAOs<}!t1yIDKciCC7p%K7*`Cv<Z3yUx5*uVFg5CC
zT7Z$6X<+a%t)S^Lde|ahGSzJ3@_GA*K(4j2YTElIuA)4%{5ab^sc)(gF&^xlfl=JX
Ua8?Uh<KUoQ09SNb?X`dO2hI&v*8l(j

diff --git a/jsonfox.app b/jsonfox.app
index a4c69420c2dcd79b74bd5bed5e5baa1f205e6e73..32dc72456e4e8c5b47c5a71699cb01e8b163dc5b 100644
GIT binary patch
delta 753
zcmYk2Ur19?9LK-EJGa)t%g|a4|FjrBNI|Cb2MdEXwwFku6;xv8x)K$e#S+{@F7iQx
zB6mxPB2Y<aNMWb3$R~XWVo#w&r4KzwDI`%Zfs^WYc1zBI-@QLRpWiw6p6^V`{yAmW
zfB*dB(>$=Fv5Al#)V*50XRx-4u1|*FY@-RGdmnDFb%$eO!Z%kzd&G@H({^pDS_F?&
z=vz;e0iklBd<*aiz*+9Yp_u4yIpCtC`TX=awTqKy9^1T?i2MTFYXN>12(Jqcv|g*L
z>o_NVv^h$=-*kZZ03C_=B_kH;=`tem<B6*araRh43*vsXhRj#zZ#i3RBY1|pn%Ug%
zG24w`eXI%?<DK`o`l^Ao?Z5}_N4PfmfE|9|3-@`h0@qHz`QGqThq-Fpp@bOdj0Pz!
zRx&SrG$cmzAtz0W<=MQOo{H?^Z5zE1fu&tudXnoRx}ecm?xT&G%V;Q9>!DH~oyzUs
zN5`B;R}H|!$Io%CF9`=aE%AMwawDPtiX}?rz5lI^63!35Yog7)^F6>y2H4BKQJE>i
z@hNL_n<5+%KAHh8GmNW3!t`59Bvm2dC?|81VZS06Rszej)<-g`kuW=)I?R8VT?7J4
z*34IRMnaCO7)Xis|8o46kn<~w8dXThffhwr6%x7{EOAj04p+l&0%wmT(_Y0CVfvu8
I<$)sp0!8JTBLDyZ

delta 716
zcmYk2Ur19?9LK-Ed%J3h7g1SW)Hx=5D0~P(=^rUI+*^gI4++JXcZf#QxCDwcBZ<8v
z$bA?Uj36k`BE}hv8o}}*s8I<HN+{@Ikq<%8A9{%X{LXI4Iq>Ct`Fwuoa?g3cV5}_|
z=I<|m0-6s7+K&*NWz*6|{L6bf=xR3dw3Twgv~Jew6S*;QFHmlyed6-rCx)hXity1k
zbN7KJU~e<<y#?3=aEyCld{A6Gxqla(aUYz%Lt!yGmeEDyS$&7KZUV$(CY;2SeSUa$
z+8$1vaxN6z?${y~MK%^9_sw{U2HdC}?HT9*Zu7Xy8TA7%JAv2SZ*ksn{~827aDUGE
z$@vv@zu8?h>9)p~XkOfn$HH_&)UW0Olo7?!U>!XawdGPHWyMD2nof^IbgSE<`}rlJ
z35{0sKXf|LM45cVM-2gr=12PIcwO?X4fy!;WzP1Ja4PPJ&)bxXgvN{~8sugFt(_7+
zo(232yA+{I_-X~{Wq42#RhTNIgZ<Q;Ocj7jYrr`kNGL-!5<1U3F{cU%7fZkuhABl<
zVQItr!xdFXn67x@g(}jOb|AFnnUAWGa45arPc8F9L@4M~eX5Z5|JuAuSnu;hL=_T#
b>hZ*+B5EYG`UrCjlZvQ9=a6^ex+4Apb2^RS

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index fbc8cef..3cc8735 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.20"
+	version 		= "9.21"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
diff --git a/src/jsonutils.prg b/src/jsonutils.prg
index 62a6670..cc12b32 100644
--- a/src/jsonutils.prg
+++ b/src/jsonutils.prg
@@ -205,6 +205,7 @@ define class jsonutils as custom
 			tcString = StrTran(tcString,'©','\u00a9')
 			tcString = StrTran(tcString,'®','\u00ae')
 			tcString = StrTran(tcString,'ç','\u00e7')
+			tcString = StrTran(tcString,'º','\u00ba')
 		endif
 
 		return '"' +tcString + '"'

From a08a2aaa794f87494566a5096f9cc7b94d62b66f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=93=E6=96=87=E7=BF=B0=20=28Irwin=29?=
 <rodriguez.irwin@gmail.com>
Date: Tue, 14 Nov 2023 09:07:04 +0100
Subject: [PATCH 19/38] Update README.md

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 9cac699..6fa7b1d 100644
--- a/README.md
+++ b/README.md
@@ -66,7 +66,7 @@ Insert into cGames Values('The Legend of Zelda', 1986)
 ?_Screen.Json.CursorStructure('cGames')
 ```
 ## Full Documentation
-* ![](docs/meth.gif) **_Screen.Json.CursorToJSON(tcCursor As String *[, tbCurrentRow As Boolean [, tnDataSession As Integer]]*)**
+* ![](docs/meth.gif) **_Screen.Json.CursorToJSON(tcCursor As String *[, tbCurrentRow, tnDataSession, tbJustArray, tbParseUTF8, tbTrimChars]*)**
 * ![](docs/prop.gif) **tcCursor:** the name of your cursor.
 * ![](docs/prop.gif) **tbCurrentRow:** ¿Would you like to serialize the current row? .F. as default.
 * ![](docs/prop.gif) **tnDataSession:** Provide this parameter if you're working in a private session.

From f4bd5de85f7a03ee5d0bc8d77c797706b8527b86 Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Sun, 19 Nov 2023 10:53:09 +0100
Subject: [PATCH 20/38] Apply UTF-8 in attributes (stringify function)

---
 jsonfox.app           | Bin 82016 -> 82064 bytes
 src/jsonclass.prg     |   2 +-
 src/jsonstringify.prg |   5 +++--
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/jsonfox.app b/jsonfox.app
index 32dc72456e4e8c5b47c5a71699cb01e8b163dc5b..3cc19586a0e728706b45f46f9f45cc0bedff6d28 100644
GIT binary patch
delta 949
zcmYk3TSyd90EYjWb$1<2(K0VsV%j}?F*4G!>t+dFK(l&~7{^J|b~hahl4!LHT?k4h
zkRnQm5YjALf})pLdI^gp#HXMOO7)TuqAzCs$61#%@H7AUzH^3i&V221-|BWJ&;R+C
ztER(^mQn?gp5!cb-QD30UAeBdIx9SwJC>~!hP$^9x-%ORfRZIZLlSTqz!CPkI_q%Q
zx95hczJ;CmJl~$#w<#wNwX+IR=JrmjnD$`S3zpe<eA_l1hZ%c#sKBoG<!fGe{?5B_
zNVBi`*4jyBh2b~8&z{hT3sCrZH}v*){jBA7hVdw`*&l58>m60z#R(i3&6lD>FN|Qo
zI_)=q#k|pM8m-Wr>0aoKXY_z!nlW&~+TGy`G>%3=B2JlRLhCWzFigvu)9loj8EQd7
zxU@o3lq&l`rBBUM?VFWD$`iY^N)J8ax*go<YUU{~=L;|7Ap2HkhL_Zq0yMFgGYzRg
zKXabFf_cHdekpK)y_P9r?^y<1XRl`-uxF$Jx7iJ57kfW*kG+}sn1(`35j^Ceg~?vd
z%`pA!CmBC`4>Q0XV7~KC?}w|ai+_i%R0HWm&zRUF;Kt*Q7>iLB0bfPMlq>|SX>(R2
zi9Z&7GyxMkfgHkoNw@@DIgkl#AuW~+DKOr<YNwJG8h;JEkMI!mL1~Uhz{opCbjm`&
zPb0uZ!mE;4fLT0@IP7Ct2sk<6h!3)uoLB)^KOOT!HUjqbj&g_R`V<9PoU-uQHR|HA
m`4;eKx+BVDAz<-lN3=-7BVbdJf=<GaBo<(##947i68`}Kf1*DC

delta 928
zcmYk3Ur19?9LIm>j=Q;;rnr{<K?k!)dU9dHEX!;emS#2SrHI@0#`4eI+DuZ6ZA6gZ
zL+wI;(1$SaVGJq9pztAx9*PQrjEH=Q68ZyHL=;3?-?O{Px$xzF&*yW_<(zY`B;<E-
zxpeu*Keyx}nS4!*l2=RDNnY38+PK>?*s5pJ?zs)DE|b`imMgsuqT*FV-V&lqM6?CH
zX11y;<KHtTNm())XFSHQy;~g>6!^`k?C(#>n4k6<eSVK!ChO9&g}SW94gY52wXHn!
z-9K-Qja!HqJ|&Y9i6}!YvN<fGwxjz(k$z>M+E$o=ff@|thc;3}dh}esc7MgIK~3#_
zQDjcHk<vY==&Dw4FMu=A<^jLneJc-&DXeLZ-jj-|YSHL3yU~1at+Zs%=<RmKs*Up<
zeyNTb4?3n<+RzUvu_IWw6FaRzj^iT6aQOY`4ajX=NL3lpY4kQ^bvaQ0xq#k|oI-zv
zB+vuM2lS>2qEYk{$U*c+h=Hymi|7F-(Kvb#8F7-ACIBWe=s_N%e?g|u`;hf(@IfSn
zt|RYprw20ePT$wqu}&fv&>dvu;qZ@Uin$ev!r>^6!B>0}1&5xqrYPZmEdSU!d^?2m
z19}8u;czikNmLK&6AUPJe*N$+=8R3v5=}hBA>c#894m*(C#Dz{1&5PQi7o<O7DNty
zerfJ7B?=C+3#NE3itNHhqLxpl`6wC=!`F5*=SY|_dShX^3)v(UPK`H*wJuY%ih@JO
bHdFKn!pdR8c1FX1F+t>Dve8^|QxN|Fp7)$-

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 3cc8735..95d924f 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.21"
+	version 		= "9.22"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
diff --git a/src/jsonstringify.prg b/src/jsonstringify.prg
index d57a609..0b586ca 100644
--- a/src/jsonstringify.prg
+++ b/src/jsonstringify.prg
@@ -62,8 +62,9 @@ define class JSONStringify as custom
 		lparameters tnSpaceIdent as integer
 		local lcProp as string
 		this.consume(T_STRING, "Expect right key element")
-		lcProp = this.previous.value
-		this.consume(T_COLON, "Expect ':' after key element.")
+*!*			lcProp = this.previous.value
+		lcProp = _screen.JSONUtils.GetString(this.previous.value, this.ParseUtf8)
+		this.consume(T_COLON, "Expect ':' after key element.")		
 		return '"' + lcProp + '": ' + this.value(tnSpaceIdent)
 	endfunc
 	&& ======================================================================== &&

From 89bea72479b1c429d24f8e266f695cedca5cf7ac Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Sun, 19 Nov 2023 12:53:55 +0100
Subject: [PATCH 21/38] TrimChars parameter added in JSONUtils.getValue()

---
 jsonfox.app           | Bin 82064 -> 82600 bytes
 src/jsonclass.prg     |  10 +++++-----
 src/jsonstringify.prg |   8 ++++++--
 src/jsonutils.prg     |  15 ++++++++++-----
 src/objecttojson.prg  |   8 ++++++--
 5 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/jsonfox.app b/jsonfox.app
index 3cc19586a0e728706b45f46f9f45cc0bedff6d28..ccea73b08271d2dd97bdcc26a12a2422052976dd 100644
GIT binary patch
delta 3838
zcmZ`*3s98T6+ZXhH_J-|77!G~^?@-JB`AqfmX$>;4~2#Jh^EW(D+uf^yNilrMM-LG
zOpWGFVja^OY?~LODWS1eW2(_<rVkr+Y)4HW(aFS)eW-*18QE>WyZ<iTW_01q|DAL0
zfA9J4J?Fb;-%icj-_;}p2mg~TrILnvN*G;VygwmLGP3?zZP}@>XAr%gMRY8isDlyx
z9(b!f(3ibNt<p-x++d!{*A`4Fi=%^M)*&?wYbX#j(XkON=|*%AJ*{}4rmC{4nqVr~
zVM-jcKG2chX=`(A@HGa4*|2JbbwtNI%;`+e_n0$G6)dQylcSn=7Sv%j0|hfN&cHu3
zPw&>z14h<_K{d_!N<|}#3Wp3d9D{{p>D0^-BaLciv)}{~5kV7C#loql4@Wg+ENB!H
zVZko~n0k?zT1_88CMzrcLX0>z5{KC1DVT-9aU!~F2C}<bWmn5q{$gQ_CI|L-?wOwI
zj-%VvfnYjxy%<OM7#dO0P&^GMM2B?cQ6UYpU;-^eI5Q)Q8WC1_eG!_0O2;sHAgH4H
zM1F624nLG1H;^>rq)N4e7V}T@viQ1rdhRGN@juVVwPj(rHEo0t1`cdQQo;!z4W`iI
zob5F=rOR|=x7sQ#<#k%JSJvBY3$Zhm_S%Xn>rzYYK+)`L39dOhB1}Rtw5+bCx}inh
zEPHPm6q}aHTuyhByfG%CFOh|AHY&QFD&3AITT7eV6t={W#p`u++1)FvD&Gm)3<SmQ
zUgmSVcJLifrKAPpmDgiwBW!lJwbSc!d()Hn(WgwN3CW7nNKKvXp3s5#<|U-^&z{OG
z?K3I9B&ut6Z!X*7ls*0yx2w$Sb$fHt6kiP0%0Ag2vNfbDHXSv|KEK!9)y0bzm9zN+
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
OLdNThl{XGXIsOZ2&BuHI

delta 3603
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
TjX;c~7~<miMzzK96vKZ3*L-!j

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 95d924f..908f851 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.22"
+	version 		= "9.23"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
@@ -86,7 +86,7 @@ define class JSONClass as session
 
 	* Stringify
 	function Stringify as memo
-		lparameters tvNewVal as Variant, tcFlags as string, tlParseUtf8
+		lparameters tvNewVal as Variant, tcFlags as string, tlParseUtf8 as Boolean, tlTrimChars as Boolean
 		this.ResetError()
 		local llParseUtf8, lcTypeFlag, loJSONStr as memo
 		lcTypeFlag = type('tcFlags')
@@ -110,7 +110,7 @@ define class JSONClass as session
 			local lexer, parser
 			lexer = createobject("Tokenizer", tvNewVal)
 			parser = createobject("JSONStringify", lexer)
-			loJSONStr = parser.Stringify(llParseUtf8)
+			loJSONStr = parser.Stringify(llParseUtf8, tlTrimChars)
 		catch to loEx
 			this.ShowExceptionError(loEx)
 		finally
@@ -174,10 +174,10 @@ define class JSONClass as session
 	&& Function Encode
 	&& <<Deprecated>> please use Stringify function instead.
 	&& ======================================================================== &&
-	function Encode(toObj as object, tcFlags as string) as memo
+	function Encode(toObj as object, tcFlags as string, tlUtf8 as Boolean, tlTrimChars as Boolean) as memo
 		local loEncode
 		loEncode = createobject("ObjectToJson")
-		return loEncode.Encode(@toObj, tcFlags)
+		return loEncode.Encode(@toObj, tcFlags, tlUtf8, tlTrimChars)
 	endfunc
 	&& ======================================================================== &&
 	&& Function decode
diff --git a/src/jsonstringify.prg b/src/jsonstringify.prg
index 0b586ca..6697b04 100644
--- a/src/jsonstringify.prg
+++ b/src/jsonstringify.prg
@@ -10,6 +10,7 @@
 define class JSONStringify as custom
 
 	ParseUtf8 = .f.
+	TrimChars = .f.
 
 	Dimension tokens[1]
 	Hidden current
@@ -25,8 +26,10 @@ define class JSONStringify as custom
 	
 	* Stringify
 	function Stringify as memo
-		lparameters tlParseUtf8
+		lparameters tlParseUtf8, tlTrimChars
 		this.ParseUtf8 = tlParseUtf8
+		this.TrimChars = tlTrimChars
+
 		return this.value(0)
 	endfunc
 	&& ======================================================================== &&
@@ -74,7 +77,8 @@ define class JSONStringify as custom
 	hidden function value(tnSpaceBlock)
 		do case
 		case this.match(T_STRING)
-			return _screen.JSONUtils.GetString(this.previous.value, this.ParseUtf8)
+*!*				return _screen.JSONUtils.GetString(this.previous.value, this.ParseUtf8)
+			return _screen.JSONUtils.GetString(Iif(this.TrimChars, Alltrim(this.previous.value), this.previous.value), this.ParseUtf8)			
 
 		case this.match(T_NUMBER)
 			return this.previous.value
diff --git a/src/jsonutils.prg b/src/jsonutils.prg
index cc12b32..580395f 100644
--- a/src/jsonutils.prg
+++ b/src/jsonutils.prg
@@ -51,8 +51,8 @@ define class jsonutils as custom
 	&& ======================================================================== &&
 	&& Function GetValue
 	&& ======================================================================== &&
-	function getvalue as string
-		lparameters tcvalue as string, tctype as character
+	function getValue as string
+		lparameters tcvalue as string, tctype as character, tlParseUTF8 as Boolean, tlTrimChars as Boolean
 		do case
 		case tctype $ "CDTBGMQVWX"
 			do case
@@ -63,7 +63,8 @@ define class jsonutils as custom
 			Case tctype == 'X'
 				tcvalue = "null"
 			Otherwise
-				tcvalue = this.getstring(tcvalue)
+*!*					tcvalue = this.getstring(tcvalue)
+				tcValue = this.getString(Iif(tlTrimChars, Alltrim(tcValue), tcValue), tlParseUTF8)
 			endcase
 			&& IRODG 08/08/2023 Inicio
 			*tcvalue = alltrim(tcValue)
@@ -169,6 +170,10 @@ define class jsonutils as custom
 		tcString = strtran(tcString, chr(9),  '\t' )
 		tcString = strtran(tcString, chr(10), '\n' )
 		tcString = strtran(tcString, chr(13), '\r' )
+		
+		If Left(tcString, 1) == '"' and Right(tcString,1) == '"'
+			tcString = Substr(tcString, 2, Len(tcString)-2)
+		EndIf
 		tcString = strtran(tcString, '"', '\"' )
 
 		if tlParseUtf8
@@ -206,8 +211,8 @@ define class jsonutils as custom
 			tcString = StrTran(tcString,'®','\u00ae')
 			tcString = StrTran(tcString,'ç','\u00e7')
 			tcString = StrTran(tcString,'º','\u00ba')
-		endif
-
+		EndIf
+		
 		return '"' +tcString + '"'
 	endfunc
 	&& ======================================================================== &&
diff --git a/src/objecttojson.prg b/src/objecttojson.prg
index 900fdd7..a88c9d3 100644
--- a/src/objecttojson.prg
+++ b/src/objecttojson.prg
@@ -6,6 +6,8 @@ define class ObjectToJSON as session
 	cDateAct = ''
 	nOrden   = 0
 	cFlags 	 = ''
+	parseUTF8 = .f.
+	TrimChars = .f.
 	* Function Init
 	function init
 		this.lCentury = set("Century") == "OFF"
@@ -15,7 +17,7 @@ define class ObjectToJSON as session
 		mvcount = 60000
 	endfunc
 	* Encode
-	function Encode(toRefObj, tcFlags)
+	function Encode(toRefObj, tcFlags, tlParseUTF8, tlTrimChars)
 		lPassByRef = .t.
 		try
 			external array toRefObj
@@ -23,6 +25,8 @@ define class ObjectToJSON as session
 			lPassByRef = .f.
 		endtry
 		this.cFlags = evl(tcFlags, ALL_MEMBERS)
+		this.parseUTF8 = tlParseUTF8
+		this.TrimChars = tlTrimChars
 		if lPassByRef
 			return this.AnyToJson(@toRefObj)
 		else
@@ -124,7 +128,7 @@ define class ObjectToJSON as session
 			lcJSONStr = lcJSONStr + '}'
 			return lcJSONStr
 		otherwise
-			return _screen.JSONUtils.GetValue(tValue, vartype(tValue))
+			return _screen.JSONUtils.GetValue(tValue, vartype(tValue), this.parseUTF8, this.TrimChars)
 		endcase
 	endfunc
 	* Destroy

From cf1bec8c9e19603f6709f9ee788126641ffa49ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=93=E6=96=87=E7=BF=B0=20=28Irwin=29?=
 <rodriguez.irwin@gmail.com>
Date: Sun, 26 Nov 2023 11:15:53 +0100
Subject: [PATCH 22/38] Update README.md

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 6fa7b1d..351e5b5 100644
--- a/README.md
+++ b/README.md
@@ -208,3 +208,7 @@ _Screen.Json.JSONViewer(lcStr)
 ```
 ![](docs/sample1.png)
 ![](docs/sample2.png)
+
+**SIN GARANT�A**
+
+EL SOFTWARE SE PROPORCIONA "TAL CUAL", SIN GARANT�A DE NINGÚN TIPO, EXPRESA O IMPL�CITA, INCLUYENDO PERO NO LIMITADO A LAS GARANT�AS DE COMERCIABILIDAD, IDONEIDAD PARA UN PROPÓSITO PARTICULAR Y NO INFRACCIÓN. EN NINGÚN CASO LOS AUTORES O TITULARES DE DERECHOS DE AUTOR SER�N RESPONSABLES DE NINGÚN RECLAMO, DAÑO U OTRA RESPONSABILIDAD, YA SEA EN UNA ACCIÓN CONTRACTUAL, AGRAVIO O DE OTRA MANERA, QUE SURJA DE, FUERA DE O EN RELACIÓN CON EL SOFTWARE O EL USO U OTRAS NEGOCIOS EN EL SOFTWARE.

From 8db8bf615ed47ae007e71fce8f35a842d518516d Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Thu, 21 Dec 2023 10:09:19 +0100
Subject: [PATCH 23/38] cursorToJSONObject, masterDetailToJSON

---
 JSONFox.PJT                | Bin 111540 -> 115764 bytes
 JSONFox.pjx                | Bin 9253 -> 9383 bytes
 jsonfox.app                | Bin 82600 -> 85838 bytes
 src/cursortojsonobject.prg |  82 +++++++++++++++++++++++++++++++++++++
 src/frmjsonviewer.scx      | Bin 2232 -> 2232 bytes
 src/jsonclass.prg          |  63 +++++++++++++++++++++++++++-
 src/loader.prg             |   1 +
 7 files changed, 144 insertions(+), 2 deletions(-)
 create mode 100644 src/cursortojsonobject.prg

diff --git a/JSONFox.PJT b/JSONFox.PJT
index 6bdb99a7fb87bd5a625e574bfe1993f631760372..0156c87d14da9cb28717929c1bc653bda6e02324 100644
GIT binary patch
delta 6837
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

delta 3711
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
F{|Ej~=#T&a

diff --git a/JSONFox.pjx b/JSONFox.pjx
index 9fa35fb3d090180c86700f39db3007a39a3ef132..67f1514192632e16e22f7f8f91a40a0a9148ca0d 100644
GIT binary patch
delta 486
zcmY*VF=!M)6rF#$o1NW_hbLJ!n@h6m<shZIGrKc8C<u{2OduCgQrp;windoASs~a6
zg1-`i*r=pPaV&@_1Wg&RxJrbBq>G)UMJ${>vG7-)|KEH6zxQ_S{mn+~PkYygjSqE8
zr?C)%mq+yo>@|mwC=oKoQ5d2_$I!$xdP*lCj;$bQzOV@CPaBv>@|<JrFJqhCf)+kx
z1svf|c4A4DD4j|K&%3k;gj}l;0u@DOJlBTO!9_<<mE>`n<A{0qz+raJtwgm-@rf1U
zo^xnbfGmq~i_KEkXuM+BcX!}xdF~F_zsGTB<~8h<p=Z^Am&^Vxz&AXYEg;7$K>?3&
z7!>xqDWlDm5;*ijd``PKn3MLt(Tt1>J#o9~cVD(YLKhF)1>D1{^96jyPxHo(=30x1
zot83o`i6F~UQuJI@k=`_e=LlFzA@uptUL~B4W8lXa^Z{{)m0&7hIf}bIOuHKkEt1@
zxsq78A^z@+;XZy}+6bau!`@2LzqdHAIw4e?RheISYL?q3_b5quHi@Tcv4!>9z0Kar
O`s$54(SJou&HVx4xpz4L

delta 410
zcmXYsKP*F06vp4F_P&48LDXxNzG|Cvbo>6?cZHaVL|7~qvoJ_>X{2!_Of1eSHY|kZ
zC8C4HBC&}{Qo+O`><muD`kn9hedjxwKAK8#$4*bSQkO|x$ROl_jBk=fFzc446>GlW
zc<;Jsu?~#m8+-XT37j*s>8*sOZP?@!9uGp~P8IXUJUF;&D7eK><Js^ek0L*i<nQk*
zfTm3lb76Fu(34}tl(1m=jJks;K*(fp#WKvDUUK+jq^#*K9$0PN3q%-F3H36YG8T1g
z*qiVWf7?xiuA%2g5;yw~A&%XQo`5K>I@<tGc$QT#iK96M>)6UE^R$PuJ^Bh;j*Gjj
zg3Uo;o>OMACh4W_-dU%zpTDBX?Yx3z93N8ff!9N{Cz6ryJ^r^RqCE}b29jNtb6LYL
zR*2t+JHU=fubA<j%M!4M_an-BO?7*HAwpa#m#|q{Fzbw@fD%#JF8-7{pzyIg1B1V0
C(`ups

diff --git a/jsonfox.app b/jsonfox.app
index ccea73b08271d2dd97bdcc26a12a2422052976dd..ae1f72ff5708c4a94194806547483c24d5e0f0df 100644
GIT binary patch
delta 3687
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
Gj^KZHr4>*B

delta 944
zcmYk5Pe>F|9LK+JHWl4cY-Mx(le?*;73H>wA*HU1S%Hy%(o2MrgOTRs%r3YhZ4^Od
zhv*$73J+b<tgr^mOP#!xoutG=b%;va-0~37AM5vgDeu9L`M%HRH}B27VP1|Tjb2W2
ztt|ibYHlRqVhzLm0fteH`v$W#Cwo-d=`C=9p%}pJ9N=+2@X!nNG2jK|0o}6idw*s+
zde|=BQJ8Drs;Ew_+K4lj(c5B#BBo`Sp3R^YfDFiabJ&cW3P(&mGfN65IwNP#wHV!c
zueCSB&5s51wDB#xH<+{Amn~b;(4<>>xXv^Uv(+P63OaQwY#Pz%e^A0FgVij+zXxa2
zM;1WaVkHfC7U1IX+N+u;&+ZRRGZwJ#)}=75M&nZl<FT;<plTbCLy!1_?ub%OrPmG6
zJdLW7a>aI_o^n3bAmv|FCny(FZ7l)DO97qo9;(ljSE$02{ZyqpfKNMte#(cb%4m;e
znrn1T2eU(m-jq4qPN!WI9kJZ!9e|I_e!9LJ%RN3vcl>tnx%ecX`0|#G^Xp3yR>YGN
z?d$^YO0=@q{8^&i_I~BfPs)$5QEfP*fmP%V)dFr><{H)d5U{OrxTAr&Vr`AUjV{?V
zyWT-TK;LO85~>ie+md1vJ=NMs6|iuS4uW8zA{+viKcFI5sR)8GVCkt`>!f0m1$;jZ
z^bj;uA>jOTDF##_;NlE$iQpAQtU~`QxyL<K2pIeGL7ExW2spGT#Ya^LIOSlgN4i0L
xxV0gmFIkFWRS4LZEk(U51Z*lF{&tkP{7rN+v3(2!)DTmf1Qh?F_=GnV@edcat-1gJ

diff --git a/src/cursortojsonobject.prg b/src/cursortojsonobject.prg
new file mode 100644
index 0000000..29a8223
--- /dev/null
+++ b/src/cursortojsonobject.prg
@@ -0,0 +1,82 @@
+* CursorToJsonObject Parser
+define class CursorToJsonObject as session
+	nSessionID = 0
+	CurName    = ""
+	ParseUTF8 = .f.
+	TrimChars = .F.
+
+	* Function CursorToArray
+	function CursorToJsonObject as object
+		if !empty(this.nSessionID)
+			set datasession to this.nSessionID
+		EndIf
+		Local laArray, loRow, lnRecno
+		laArray = createobject("TParserInternalArray")
+		
+		select (this.CurName)
+		lnRecno = Recno()
+		Scan
+			Scatter memo name loRow
+			laArray.Push(loRow)
+		EndScan
+
+		Try
+			Go lnRecno
+		Catch
+		EndTry
+		return @laArray.getArray()		
+	EndFunc
+	
+	* MasterDetail
+	Function MasterDetailToJSON(tcMaster as String, tcDetail as String, tcExpr as String, tcDetailAttribute as String, tnSessionID as Integer) as Object		
+		if !empty(tnSessionID)
+			set datasession to tnSessionID
+		EndIf
+		Local laArray, loRow, lnRecno, lbContinue, laDetail, lcMacro, lcCursor
+		laArray = createobject("TParserInternalArray")
+		** Set Detail cursor		
+		this.nSessionID = tnSessionID
+		
+		select (tcMaster)
+		lnRecno = Recno()
+		Scan
+			Scatter memo name loRow
+			* Filter detail
+			lcCursor = Sys(2015)
+			try
+				Select * from (tcDetail) where &tcExpr into cursor (lcCursor)
+				lbContinue = Used(lcCursor)
+			Catch
+				lbContinue = .f.
+			EndTry
+			If !lbContinue
+				Loop
+			EndIf
+
+			If Reccount(lcCursor) > 0
+				this.curName = lcCursor
+				laDetail = this.CursorToJsonObject()
+				Local array laRows[1]
+				Acopy(laDetail, laRows)
+				lcMacro = 'AddProperty(loRow, "'+tcDetailAttribute+'[1]", .null.)'
+				&lcMacro
+				lcMacro = 'Acopy(laRows, loRow.'+tcDetailAttribute+')'
+				&lcMacro
+			Else
+				lcMacro = 'AddProperty(loRow, "'+tcDetailAttribute+'", .null.)'
+				&lcMacro
+			EndIf
+			
+			Use in (lcCursor)
+			
+			laArray.Push(loRow)
+		EndScan
+
+		Try
+			Go lnRecno in (tcMaster)
+		Catch
+		EndTry
+		
+		return @laArray.getArray()
+	EndFunc
+enddefine
\ No newline at end of file
diff --git a/src/frmjsonviewer.scx b/src/frmjsonviewer.scx
index 0b3951ef5a1b2dc9d256fa8b06b523dc334f285c..4de32367348ad60ae358934d2d7f66ec3973b638 100644
GIT binary patch
delta 13
UcmdlXxI>V|K%7T(Bg+;J02%oMZ~y=R

delta 13
UcmdlXxI>V|K#ZGvBg+;J02#UiWB>pF

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 908f851..4fbc2b3 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.23"
+	version 		= "9.24"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
@@ -278,7 +278,66 @@ define class JSONClass as session
 		endtry
 		lcOutput = iif(tlJustArray, lcJsonXML, '{"' + lower(alltrim(tcCursor)) + '":' + lcJsonXML + '}')
 		return lcOutput
-	endfunc
+	EndFunc
+
+	* CursorToJSONObject
+	function CursorToJSONObject(tcCursor as string, tbCurrentRow as Boolean, tnDataSession as integer) as object
+		local loParser, lcCursor, lnRecno, loResult as Variant
+		lcCursor = SYS(2015)
+		try
+			this.ResetError()
+			tcCursor = evl(tcCursor, alias())
+			tnDataSession = evl(tnDataSession, set("Datasession"))
+			set datasession to tnDataSession
+			if tbCurrentRow
+				lnRecno = recno(tcCursor)
+				select * from (tcCursor) where recno() = lnRecno into cursor (lcCursor)
+			else
+				select * from (tcCursor) into cursor (lcCursor)
+			endif
+			loParser = createobject("CursorToJsonObject")
+			loParser.CurName 	 = lcCursor
+			loParser.nSessionID  = tnDataSession			
+			loResult = loParser.CursorToJsonObject()
+		catch to loEx
+			this.ShowExceptionError(loEx)
+		finally
+			loParser = .null.
+			release loParser
+			use in (select(lcCursor))
+		endtry		
+		If Type('loResult', 1) == 'A'
+			Local i
+			For i = 1 to Alen(loResult, 1)
+				Dimension this.aCustomArray[i]
+				this.aCustomArray[i] = loResult[i]
+			endfor
+			return @this.aCustomArray
+		Else
+			return loResult
+		EndIf
+	EndFunc
+	
+	Function MasterDetailToJSON(tcMaster as String, tcDetail as String, tcExpr as String, tcDetailAttribute as String, tnSessionID as Integer)
+		local loClass, loResult, lcResult
+		try
+			this.ResetError()
+			tnSessionID = evl(tnSessionID, set("Datasession"))
+			set datasession to tnSessionID
+			loClass  = createobject("CursorToJsonObject")
+			loResult = loClass.MasterDetailToJSON(tcMaster, tcDetail, tcExpr, tcDetailAttribute, tnSessionID)
+		catch to loEx
+			this.ShowExceptionError(loEx)
+		finally
+			loClass = .null.
+			release loClass
+		EndTry
+
+		*lcResult = this.stringify(@loResult)
+		lcResult = this.Encode(@loResult, "", .t.)
+		Return lcResult
+	EndFunc
+	
 	* JSONToCursor
 	function jsonToCursor(tcJsonStr as memo, tcCursor as string, tnDataSession as integer) as Void
 		try
diff --git a/src/loader.prg b/src/loader.prg
index ff8e8f8..3137e84 100644
--- a/src/loader.prg
+++ b/src/loader.prg
@@ -8,6 +8,7 @@ Set Procedure To "src\Parser" 			Additive
 Set Procedure To "src\JSONUtils" 		Additive
 Set Procedure To "src\ArrayToCursor" 	Additive
 Set Procedure To "src\CursorToArray" 	Additive
+Set Procedure To "src\CursorToJsonObject" Additive
 Set Procedure To "src\JSONStringify" 	Additive
 Set Procedure To "src\ObjectToJSON" 	Additive
 Set Procedure To "src\JSONToRTF" 		Additive

From 55da2194934be135d6cab6c520a595e122f672b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=98=93=E6=96=87=E7=BF=B0=20=28Irwin=29?=
 <rodriguez.irwin@gmail.com>
Date: Thu, 21 Dec 2023 17:30:20 +0100
Subject: [PATCH 24/38] Update README.md

---
 README.md | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 351e5b5..4ce482a 100644
--- a/README.md
+++ b/README.md
@@ -2,8 +2,10 @@
 
 **JSONFox** is a free **JSON / XML** ***parser*** for Visual FoxPro 9.0
 
-Si te gusta mi trabajo puedes apoyarme con un donativo:   
-[![DONATE!](http://www.pngall.com/wp-content/uploads/2016/05/PayPal-Donate-Button-PNG-File-180x100.png)](https://www.paypal.com/donate/?hosted_button_id=LXQYXFP77AD2G) 
+Formas de apoyar:
+1. Donativo en Paypal [![DONATE!](http://www.pngall.com/wp-content/uploads/2016/05/PayPal-Donate-Button-PNG-File-180x100.png)](https://www.paypal.com/donate/?hosted_button_id=LXQYXFP77AD2G)
+2. Patrocinio en [Patreon](www.patreon.com/IrwinRodriguez)
+3. Seguir este proyecto (es gratis) [Stargazer](https://github.com/Irwin1985/JSONFox/stargazers)
 
     Gracias por tu apoyo!
 

From 5eeec05828300caf7dad3d8927eec9a949db1486 Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Fri, 22 Dec 2023 20:53:13 +0100
Subject: [PATCH 25/38] update MasterDetailToJson()

---
 JSONFox.PJT                | Bin 115764 -> 115764 bytes
 JSONFox.pjx                | Bin 9383 -> 9383 bytes
 jsonfox.app                | Bin 85838 -> 85845 bytes
 src/cursortojsonobject.prg |   1 +
 src/frmjsonviewer.scx      | Bin 2232 -> 2232 bytes
 src/jsonclass.prg          |   4 ++--
 src/loader.prg             |   4 +---
 7 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/JSONFox.PJT b/JSONFox.PJT
index 0156c87d14da9cb28717929c1bc653bda6e02324..19ba88b5b9e1a93c35c252274377f062f7b012cf 100644
GIT binary patch
delta 504
zcmdne!M>$~eZw^swl+=oXt~hIa;nm7-_F69lkchWPgYkIW;CC?PF-xWt&rtperMLr
z{i?D|Ol^yRVohv)S}?_I)8t{y$weA1OnJvP|Im;ZWfEJkS<+6Ok*Tj>vy*)dGt)eg
z%?F&qorV4XefqD!#K^$FV8+70aFv;XA#tLhs76^5P=rAhL_onDpp+tz9R;KxE}a%`
z3S|FL+??Jf&pf%SGj#I9&I+ch%##blgeNCl;oV%?wIW^E3vRd}I|IWGHU@@Dpy7&&
z?o14fV8cHE?VQKTz~B#*at9iC5Xg31Hf?j-Cn-k8cas}G-_YI4^pBGvPTK1`8^b?t
zhLG=^3<7_i{QV~YWO4(U&Ocf1v&a7Z$HB1cCu`W`>M!APnT%kC96(v!zyDYm_Wk2y
zQ2q0rgMsVsPuBX$AHGO2`c3Bkx}S0C<kMfXBrh@n4O15T^PPc#`R||a><l2ocK>9(
zx!LdAN=8PF$v?i^Gj5!0_QQX2fVjluxj#gNnt;BM13K3Zh&_S0hkd$%G^4@f&p$$#
tcCbOifOB)v&)FW#kC#r{F5txYJ(9V9*|hCka~M4p8BMo`>}7nw1^`Z-s(Szc

delta 450
zcmX|*-z$S*6vv<Qy!I{>=C#d_+0fp$KY$Chk$3VlqOhbEH<bL&R>}<_c7qP(!WAVy
zN_b>N;>smAORGgnT)DxESA>T)r_Omko%7V^yFabppVseO+QrV^$~J2=T4jqaEk-$b
zEvKSGmO#dBhY8*3#hB{Ru~|8n(zQLl8y5p|{IhuPh$9X;CuoJrG^fo-x6fHti34a~
zgej$?0!_(er;67jHGe&Q=TRVpxDp773WRjb8;s5e9p4c7cf@Lip9(np_`7<D-XhMQ
zGV7YM2|@x<aB`*v6g0Rbv^A#S+@l4}K^Kh*IM^a#dsxr>!Syc5{jam@3E2_}8R5G8
z-7!kwPj|;tAeSrrRKXPooUiH@Sm#qVz%7nFN0K+`S0eG{)VzrV`&ARv;*{zIA6}~#
z7{(7Z8$4)wIe{QvzI4MGmc5$coVC7g0OX>em14P84|&*VHshw2Vd&vOtlZ@0UCldy
t7uqD<5@W$790-fd|Grcu-0dcZ(iC`W6^<GfLrKd}oezbfrenAfe*pHMjz$0g

diff --git a/JSONFox.pjx b/JSONFox.pjx
index 67f1514192632e16e22f7f8f91a40a0a9148ca0d..fc69008053d505c51e67376de34e80e506c552ca 100644
GIT binary patch
delta 94
zcmZ4Px!jY*K%7TxBg;+}7E1#Qlg$TNIG9<1EMvpT0UQ#WpRrHn0dY+XH#dk#a<EyN
qSQ?m_PQJ(?I(duCD>g9C9H>%c^A6btHdY|t+;p;_q~zo<l|TTt%o&CN

delta 92
zcmZ4Px!jY*K%7T(Bg;+}76W5r<IM+IIG8~!qsfAjlAE8gPvv0+i5qQh5Rv3yGcdL=
rF*2HbkwbLy7MWM9MwXVwW|J93MK|w|ZD3<HHa0gf1?ig{rV<DMZkiZ+

diff --git a/jsonfox.app b/jsonfox.app
index ae1f72ff5708c4a94194806547483c24d5e0f0df..67888dd6212d64ac106f986f58f4e335fb0d482a 100644
GIT binary patch
delta 475
zcmYk1|0_dL6u{4Uch9VqrtE2Gwpj54Q8Z;unr-bBD_={jh#&X|#4qGmBwpT4X+Nkb
zMOiPcNRr=$Qj|oLU&N9ud3)UFmENh-x%cxq_jK-AlD|swMcVt1hbsjhgieION|B3m
z-luElJY;!GR(3owFE%Tm?R9<>l<MibQSz9Q75?_fA#4x;F8~a(`jC<bt`R`>D%UTS
zMEZW~Q@XPgJ*8O-K#~WD7XU<A^9eh*Z^@a<5SAf%<wPkx;*|E9n`lcImxO&zvq7R<
z%oTuUhu)kG9O_e^o`+Gue)=570i2+15v;&jIuv0ey698{k8zFqqd4ih;4}wR32F|2
z<kg%N@>(Gre(^V%gD7qz*3hvSwqcrX#xPDANTW2j>ZCRiON!^M0B*KmkY$YJVy0fi
zVas?T3m~xjGyC0t=y1V?f5O83V*`HJ4dF8j9d@`45j6`P`e?QbOGIBQLU#~hhWS}@
Uj}CW3#^ZIf&|yF{#HmUA0x$q^0RR91

delta 512
zcmYk2O(;ZB6oAip_r3Y?YK)lCkTHH{Az6$}6h>w;(>(bpGBz_sHe@NK6l-O{qnphv
zSdoS4l_^3}R<ctTeio9AA`8>#y~lm?O7GU`-t&FuoKE*HE8J!Um;Ut|;Hp7@@*#xq
zhRerw*>Wwb0dhLJtsDlD4cMW4_qTPTM`>PqnkKI~Q4t=_+}>RR&<Fq-cJH0Yse1%a
zgUbDTJs~_q<?oLPjM7UHE0xS=YOMN|2apATs0|>_`i|NAacC=l6T=!LFPtRjrabad
zxP!J2;CkZ$r#m52D-~>@yJ5T_f?JIh`Dc4t(;aY96b9-00H*vI)J3KpOt)z|59hiI
zf-1|)w4$&;r{ZjSj4sFV0@r9y0_S|!92?l=RSN(_Qww%52A&p$+x$fW_Yv#pY!dtE
zK@x{afQ01LO%HWTSXD7^2k^7ads!q|Eat-!rumhbPXI5=-`EfQ9|LYUu_SozADi$;
xG)2%V3@G_ck+2E_wsxCh&LV6EoQ%+l5v&YNMi7*kS+rv*DnYhqX^|_7_ycf&e3AeF

diff --git a/src/cursortojsonobject.prg b/src/cursortojsonobject.prg
index 29a8223..59f2600 100644
--- a/src/cursortojsonobject.prg
+++ b/src/cursortojsonobject.prg
@@ -41,6 +41,7 @@ define class CursorToJsonObject as session
 		lnRecno = Recno()
 		Scan
 			Scatter memo name loRow
+			laDetail = .null.
 			* Filter detail
 			lcCursor = Sys(2015)
 			try
diff --git a/src/frmjsonviewer.scx b/src/frmjsonviewer.scx
index 4de32367348ad60ae358934d2d7f66ec3973b638..8567f4afb11a2ce85257a1cd3677c3e58483e8cd 100644
GIT binary patch
delta 13
UcmdlXxI>V|K%7TxBg+;J02%%RaR2}S

delta 13
UcmdlXxI>V|K%7T(Bg+;J02%oMZ~y=R

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 4fbc2b3..b75e986 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.24"
+	version 		= "9.25"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
@@ -320,7 +320,7 @@ define class JSONClass as session
 	
 	Function MasterDetailToJSON(tcMaster as String, tcDetail as String, tcExpr as String, tcDetailAttribute as String, tnSessionID as Integer)
 		local loClass, loResult, lcResult
-		try
+		Try
 			this.ResetError()
 			tnSessionID = evl(tnSessionID, set("Datasession"))
 			set datasession to tnSessionID
diff --git a/src/loader.prg b/src/loader.prg
index 3137e84..166061f 100644
--- a/src/loader.prg
+++ b/src/loader.prg
@@ -42,6 +42,4 @@ Endif
 If Type("_Screen.Toml") != "U"
 	=Removeproperty(_Screen, 'Toml')
 Endif
-=AddProperty(_Screen, "Toml", Createobject("TomlClass"))
-
-Return
\ No newline at end of file
+=AddProperty(_Screen, "Toml", Createobject("TomlClass"))
\ No newline at end of file

From 590d7c08f638697c3f9dcf67943aff0ed3d86a52 Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Sun, 24 Dec 2023 17:37:10 +0100
Subject: [PATCH 26/38] update masterdetailtojson()

---
 JSONFox.PJT                | Bin 115764 -> 115863 bytes
 JSONFox.pjx                | Bin 9383 -> 9383 bytes
 jsonfox.app                | Bin 85845 -> 85930 bytes
 src/cursortojsonobject.prg |  16 +++++++++++-----
 src/frmjsonviewer.scx      | Bin 2232 -> 2232 bytes
 src/jsonclass.prg          |   2 +-
 6 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/JSONFox.PJT b/JSONFox.PJT
index 19ba88b5b9e1a93c35c252274377f062f7b012cf..541eb8750ed5d4acb86af19569fadbedd1cb4925 100644
GIT binary patch
delta 609
zcmXw#O=uHQ5XWcUW;ZcyJ~mAn(ln`2mXwO3r4*_(Hi@7SM8y;-)k7~iH$p{0trjhc
z2bBR+L6BPM!9%UA7!dqAc@ZTb^;Q*xf*&BwHrdc*by^IMKX2y$=KbEhd3N1ixM6ny
zxQYM})5n}Gf_D3CG$K;^h`6{-N%S2YjSf>(3oCa^&5)Kg55+Z~IJ<)u;_Wo(8z4_w
z)^BMMA*`e9O)2wB&1z-Wmu5(3y041oE4ta;6%g*ddMFV`F(1)W`!7i1!*Bgf>eQ3s
zVgNmgK2h7(S$rMFLzksUZl>tGkC_<u7qc(%t3u<S6u<p}wfc9fKyG~6&OczCzoQ0X
z6cm7<u{|IItgs#_07p1?@*c{~=(*Jn6n#>`T*SllzTAb|=~p=-*{iMOFnVk*sJf}&
zh-xm#R$IYaHxU|^11{C%&%#pwn|xv-Dh(Pndhi@g8z=E5EgPLUOY25QVq92W$QsP@
zFrnJQgpHe9I7zcx@v`B9g^CJ{$40y5gM0P#PcHZos;YEiZ3>IDw07F<<3bxu^7}7p
za+#8q;NZGo=N0p``eqlPHfnNIvfPleF<pjA+h)Vzn!Ho8?2xK|-(W;735NZYuS`k^
z8U0VihnOeH+~e&PNg?ndyoC~60TpS;915%Wjgveip_lCvJmob9$8Z*I)A3-C9-Dsk
c9S=RqlRd!7uuAmNyoRoVI)QD4u{jL<1M<1g!~g&Q

delta 625
zcmXw0Ur1A76hG(N?!D7Fx82RfO1D;AHVs3A3Ln~ZdszA~qtuWJ>Luu5QN0P(N<s=k
zk+1yd#mXS42V-1iQaZOLJqAWEy@d2=5GAp@(RS?wjl+TS`~A+p?|kBcvUFdu0XUWb
zAf#Vvwlm(NTKPDO>*MU!0ePx3c`h)@1KK{h{IL=8ubPvGHI=1~^Tn`_pHTa_Ga>0S
zS_flO3&c&z(_M{hc`n!p`HjducJ+f^i3Ho2@0sq8hLKHQ)8nz57B=tI3-R-ByvmTd
zv%8-mZPcp(tjGWpv+lM~D9HdpBl@QmU|s?kCMij{Nb$hSx!j>O+>7i76Hi~^keJP5
z5Q8F{#}4r+kDb;QFdSkxj{$n|?W(lQM0_2)a7?7v@oeS_nsyj5Y~ZSO*G((r%~sHA
zgq!PCDTBluCJ&e%ViSfPQWXR@NhxN!VB|M7Z>3Ta>ZY6eG!aM;TXquRfW@*4Y8Aw~
z&s5<_E%BWaw*7_+wjFiz80CvZ0VnXWSS#R#sGDl6kTGrWwkmD@8*tE9GXO00nxT+p
zgLhTw3;Vxi+)9%qD66DcVALbFUSq#lEn-Yy9=$?+k0wThyM(<hzi@ytT!13n1#!BB
z{qApY1UAXCWG~<pKIg-G{9>boUUibrAE5h2$p^_FDk8RuJtCb(8}B<~7u_4wZbjzT
o$2|Pv=O#T;iMH$QJ5D)w*^4LdSZ3%`vX5{ughz9KmT^n|3ktl_WB>pF

diff --git a/JSONFox.pjx b/JSONFox.pjx
index fc69008053d505c51e67376de34e80e506c552ca..cc051ba2954080056f0be7d970653cdd365c0364 100644
GIT binary patch
delta 184
zcmZ4Px!jY*K%7TnBg+mJHZucL6GOAjhgcLCIr+I57!(YR%?u`Al$W2(#de43D%a!}
zY!ASS3`{2na7eJWvNJF^Zhp<q&ct<s8>rmO)X2hevVpkLWI3)dPBD;>v8B1m<U)4&
z$#b~wFeYrS<YwfASYtZ5L1Z4|q|Nf8GuarWHt&>XW@K#NyjO;snQ`Cdlk)s5OkwPk
YZz;z?>@x(}$JWHez);OQIYz}B0PUSGApigX

delta 183
zcmZ4Px!jY*K%7TxBg+mJHWNz&3lpQwhgcLCIX$=-7!(YR%?u`Al$W2(#de2@k9+b9
zwg+HE#)gvvI3!s6*%=tBHos<PXX0Yy0V+2$HL|drY#^>QS&l1=)1MnCWNc|}GP#gl
ze)1fyJB%|oS8_9QLaZ^I+#oWKan5FW(V1+FDw}soGcz(C*t}PUo0;+Z=9BXLEKFG(
dlW!@<u>u`sZaP^|Qj)ESiGd-EeR7P7HvoQpE~@|l

diff --git a/jsonfox.app b/jsonfox.app
index 67888dd6212d64ac106f986f58f4e335fb0d482a..a9b5b4a88afc6378ad8f69b4df28079018afe809 100644
GIT binary patch
delta 550
zcmXYuKWGzC9LK-EcX>&gCh@N3kE!%bsT~x8G&B`Kv}sK31qu!oCx><@h#<|Ti&j@1
zj5oXrqEy8}q!=;;6@=m-h)V`>a1sPTom6r?ygU25(D(Sf$M665@jgA2&mYNj@cVyJ
z<RNi+k<e<T3!-wTePq3;jje8UUKFiyn(6ebrQ>v<bNE{8L;i#WzB5mwz#@PI--XqU
z?#CL9k~Xb1?Dlfjep#7T<vJZ2pTL$Q5p$wUjEOTtOoAC^lIlvGjz&^&(&|B-%*hm%
zoFsH_hu{ZsTzBPX5g2<;j_eRceYMR+bXEPT(*^T31;ZSVb5Y3;B6u65G3l|L@Ljp7
zmgi~o)S3u%EdAv%`#6m!`-7fCY}DA>*V&Q6R^I>*CO;R9;J#P;$x?q597DaDr(4uj
zC(qKwl@U&j;09}Z?aDu4--(>(0GjXd3q#FsT=`E7gczZaP%{kHVrr~xF2WNf`uhi|
z2VGgxf*9t!Z(&z6&~QFuf0>z8`2{+y5iEO6WYsZ?qN=$-4mH&!i>CCls0u-kv5g*X
z!XWj`qS-NnzOvOs6=nAK(B}OF=V%jmwJCf3URLQ1${6osfXQEXhOwAlx6+`b%(NPW
L9NX^%AA4&T`ChQ`

delta 488
zcmXYtOK4L;6o&sZ$uzfZa!nd@O9hjN5qwb5V%tqA#*nrN7+q9dDY$g!wi}}^MUWEg
z;HKIZx+tYIMky!=#htk6!i6iPx~d?)$Zg=>(O<|MzG2RPUNf`yRDW31uKo2luLhyv
zT@*~ryF)7Txq0GlKJsXFp|zf`9FfshyEr^9UaK%S|8DR{6j;>2r5<1!z&6jt)rGD1
zB{?LK@2c8p-pn*MN6(p&vg8UmZ1@^6zlX$#LwZRc>4z;~*4K?syE!L`**|gk3G=Kh
z*_eYn9sN?7FJ(C?SB*O**Xp;#_A}i<G8hhR6mP7HV*&lXu%qij<uu9KG}RKD*Y*V|
zhHA=oo4YJ!Ahap=>7`TR$o2sW32d~J2=+xn&ko>8Q2NG%y&*q|y+mlom~XyL$(%ek
zH>TzKWQsLW)UAV89li5^z)>&ofk+tenIZMp9sN;tZ+RigNgC||Mk2V9Hiu`V-ngwY
z=EaPJa@;(x$l3T$DJmt)*v37W-xWEZ-o*%ZXieG*F3S?mm|9g%rS8XoEI)seRLH}v
T2UUsdgA-MONB^zj)?NPq;j*DC

diff --git a/src/cursortojsonobject.prg b/src/cursortojsonobject.prg
index 59f2600..8152fa8 100644
--- a/src/cursortojsonobject.prg
+++ b/src/cursortojsonobject.prg
@@ -31,15 +31,18 @@ define class CursorToJsonObject as session
 	Function MasterDetailToJSON(tcMaster as String, tcDetail as String, tcExpr as String, tcDetailAttribute as String, tnSessionID as Integer) as Object		
 		if !empty(tnSessionID)
 			set datasession to tnSessionID
-		EndIf
-		Local laArray, loRow, lnRecno, lbContinue, laDetail, lcMacro, lcCursor
+		ENDIF
+
+		Local laArray, loRow, lnRecno, lbContinue, laDetail, lcMacro, lcCursor,i
 		laArray = createobject("TParserInternalArray")
 		** Set Detail cursor		
 		this.nSessionID = tnSessionID
 		
 		select (tcMaster)
 		lnRecno = Recno()
-		Scan
+		i = 0
+		scan
+			i = i + 1
 			Scatter memo name loRow
 			laDetail = .null.
 			* Filter detail
@@ -77,7 +80,10 @@ define class CursorToJsonObject as session
 			Go lnRecno in (tcMaster)
 		Catch
 		EndTry
-		
-		return @laArray.getArray()
+		IF i>0
+			return @laArray.getArray()
+		ELSE
+			RETURN .null.
+		ENDIF
 	EndFunc
 enddefine
\ No newline at end of file
diff --git a/src/frmjsonviewer.scx b/src/frmjsonviewer.scx
index 8567f4afb11a2ce85257a1cd3677c3e58483e8cd..8ceac73e2401f506663f3c1505cc9c76a4da8008 100644
GIT binary patch
delta 13
UcmdlXxI>V|K%7TnBg+;J02&Aba{vGU

delta 13
UcmdlXxI>V|K%7TxBg+;J02%%RaR2}S

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index b75e986..e45ac59 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.25"
+	version 		= "9.26"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]

From 0e5ef7a7f69ef4693273e9e69bdbb7f5b7cb6cf3 Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Sat, 10 Feb 2024 13:33:24 +0100
Subject: [PATCH 27/38] version 9.27

---
 JSONFox.PJT       | Bin 115863 -> 115863 bytes
 JSONFox.pjx       | Bin 9383 -> 9383 bytes
 jsonfox.app       | Bin 85930 -> 85930 bytes
 src/jsonclass.prg |   2 +-
 4 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/JSONFox.PJT b/JSONFox.PJT
index 541eb8750ed5d4acb86af19569fadbedd1cb4925..e16fa3dbd43464e6c79eabe26924651d4790af2a 100644
GIT binary patch
delta 30
mcmbQ<$v(Z4y<rREx+yGQv%Mm=Z<@mBp~z^y{r6VJIeY-c_Y8di

delta 30
mcmbQ<$v(Z4y<rREx+yHOX*0sNZ<@mBp~z^q{r6VJIeY-SJPYgq

diff --git a/JSONFox.pjx b/JSONFox.pjx
index cc051ba2954080056f0be7d970653cdd365c0364..88db1dca1e59089579732a63cd558618331b9adb 100644
GIT binary patch
delta 48
zcmZ4Px!jY*K!S;DBg-}x4husgb0cFTgUyFnSeV%%JcG#>IYcKXu(ND_#(q!+05Jd!
AGXMYp

delta 45
wcmZ4Px!jY*K%7TnBg-}x4l_$L15*=2v(1NCSeT(a1JlU?91@$Ku^*HH01X=q7XSbN

diff --git a/jsonfox.app b/jsonfox.app
index a9b5b4a88afc6378ad8f69b4df28079018afe809..9e310204b586eb30c4c341f4691b15d7074438b9 100644
GIT binary patch
delta 30
mcmZ2ApLNxI)(tBaSiWX^MQmQH;GxK9-u%sR`!`3%ExZ8AEDWar

delta 30
mcmZ2ApLNxI)(tBaSY*>?gl}G};GxK9*8I(J`!`3%ExZ7}P7D?R

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index e45ac59..de25a6c 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.26"
+	version 		= "9.27"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]

From 3b9ac8577d808a752ebfe69da22d7e5f43806abf Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Tue, 12 Mar 2024 22:31:23 +0100
Subject: [PATCH 28/38] new JScript lexer (faster)

This lexer works under the JScript ActiveX COM Server scripting language provided by Microsoft. To activate this lexer you must set the JScriptScanner property to .T.
---
 .gitignore             |   1 +
 JSONFox.PJT            | Bin 115863 -> 123849 bytes
 JSONFox.pjx            | Bin 9383 -> 9513 bytes
 jsonfox.app            | Bin 85930 -> 93528 bytes
 src/jscriptscanner.prg | 283 +++++++++++++++++++++++++++++++++++++++++
 src/jsonclass.prg      |  24 +++-
 src/parser.prg         | 229 ++++++++++++++-------------------
 src/testScanner.prg    |  23 ++++
 8 files changed, 420 insertions(+), 140 deletions(-)
 create mode 100644 src/jscriptscanner.prg
 create mode 100644 src/testScanner.prg

diff --git a/.gitignore b/.gitignore
index 610f760..95a0227 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,6 +4,7 @@ src/jsonstringify.ERR
 *.zip
 *.PJT
 *.pjx
+scanner.js
 src/arraytocursor.BAK
 JSONFoxHelper/obj/x86/Release/JSONFoxHelper.pdb
 JSONFoxHelper/obj/x86/Release/JSONFoxHelper.dll
diff --git a/JSONFox.PJT b/JSONFox.PJT
index e16fa3dbd43464e6c79eabe26924651d4790af2a..d6a276ccf52ed25904fabbd014e800def7c09243 100644
GIT binary patch
delta 9583
zcmbta3sjuPb-uGNo)QlUgx){s0SE*v$a;VXT2?EBgg}DDk_rT^mS56JXcu-DJrb*1
z?E01ZQ9`9(X=<O~#+KvSR*5Uq+Kv*rJ#kYfKEZX`x~_XH*KN+RW5;r3Va_kM{bv3L
zESB9QWzT5u%-p%JxpVLA9Vz!G{p6LTWTLs>BclB0e5q-c;fieA@P14EbNemt6j&au
z8Gg1fceplt({P5{{@lZ>UbZ+K-)-nv);_#!)#AItMPuP2re@90{7(Fn|B);VWbVx*
zT8-u#%F0=B@Xs^JLaQ)bnMUNFL-ez`MCZ|e1aRf<u6?&Di|%F*#4>3P)!%eqC%VCC
zDsH8A3)#rKy|K+sx4W9!J^w}-^y~yt(gZ`ZP&|jc=w{w@t9J4n?~9&(zj+FSt8ThK
zW0vbyx?!W#sY&~z6wd-C<CuKZ4(d7dt()#Vtj@zYA9QRKqj@EKv7L`35!U|c|Gidu
zb~js~RBUET*YRb^ppybcKwBu0LUw9uX{q1gz}Ie9V`~yMxp%qTtu2~z%3Yh;+U)f#
zi7sMEJPj%e^^`|z*n->~y62`F1FDsd$){DKMX6Kq0_Emrws0lqW&@Mu<h{;l!mjIg
zJ((s_=<25H4(On4xsR33(-FB9EIO9bSIeZ>e^Y#c!NE=^e7yrQFgTB7T0CiA&Ek2+
zbh0+x;p}>k&(Grq`~b*c{Z0zKKW8d#qh*@r`u3$lbMGw8Zx=hMX`V!5^S;8iGWjB#
zLwVaL?Q>|-{v?afr*v$BC0+M~N&6;(7@BKbw{b<GoP};!p}UToYT}M-CUn3<k_b|I
zCmhfi)5?`PR>CeQAJ(z@n7%CATsEb#Kwsma+9(<xkmp+s7L1v=%UIm>RKD99F=jOp
zwy^kIs<&yroHC7(Vqj$1J6JpkD!s=IT?wtvX0vh&gnVZUTcpIduv2q?LP^5g<14wB
zD?=`}yj}Ng8*F~VB7A$0z#co{=0i5(47gcx$Z%u~!`~<EXKsyXqooRafH{kS=fJ{g
zx#9l&3?@U2CYP(V)wN&u*ZuXZO!?UZ?9s6`HdbLt-USTqy2ICw7PH*phf0<YuMW>u
z=5AxTbH$mqar486rxe#VR=)fh9DN=o927cuRQ5+-)BEu76Md6Rd3YOJ5WB~!A?Z%3
z*o>|(9QK|5fy3w?_eK3jUP;orN#qX&BLm0fQUo;4!cP7pvj13BiZSo&IpGWX<@4r1
zAmWO8f<4w$4I_>EWcgUPug>q6Baw1_G=uuW@`*rbAkys<69@DO8|@y5962j`jFPEA
zj=H#fsbf72Y$Id!$|Kv^iamJ<bVMJMllt+=Vot_b6^+vdx<-509+rjHD*knmi>_LR
zXg%;osTJb|mTQbzv)EPE&jx7_Yh5&?<TtX#buKo@>e(n^h!rp&CVZB9F*Z*1>?&G6
z4bmQ)OOSI}_5hDJ&ctcGs_gzIb2n_}GJ)!lkf;(;p^wjFbb+2EiH(T%F^y2BWrUu=
z*i)FfK;Ok@9k9oN`2<xBk96e3eg&KN!;3SZEp~v006&4Y05EJsZ(&nicB18g`Pd3<
zV*wDIfD6$o01skowgRq1yMRUKV7qp}jcAV}ar^?rPXhL$y$5(N^2}X;JBVT=qcfUC
z^hX%zLHi-#4cSCz0Ut#>0QeQOM*xS=ehoNd9zhidj#dM>3++k35wr&ZkD@&dcmVC?
z`9!;Oi2fSz*U%z>A42;f;5%qB(POZ{Wh~&@4x^pJg7ZMQr1*BSfMs>&aR2S|l+2xM
zA-4f{(FKvPzw>Cs9}e_IBYs~nD2L1X!iR|`SI55(@I0%0xRbTmY=69a-`JKWR=7Ql
zE^~*nH8wYThcovs$joSLcDH(5ZJuV&-loQ8&+y8<PMfu<rD3>x?^<`Vw`HfNxy{>p
z$V#bAEv~I??$*ZLUi9Yf(7-mgtGU_Jx*OXggj!Z_rt;!t(01wYJA3ooo&S;siFqRb
z$2^#35!7A+O`*hJ0KRWW*S=cJ-Lw*-2GPTMR6wYF;wC@*llJ>a`B-9MWo`{iS0?h=
znj{->aW5;$CG5GznMso$Ca=56v(K~3BOy{WI3*-1uNFr{I0wnk7;_}t6Et!Q#$GL9
z=`7ixr~FeXtBI{Zj)5RZ%9HjC9-njG#Wmw5XiVkCD>c$0H>%5NS6iFd4@8q_IMiFF
z?T*oN@>|9tu>x6W!ix0rW)khtmP{e6KRaR5ZVfh(YY~#|6q|~tllQ}=nKv=XVZ>}e
z@1Nr712CZj?RZ+_VR$(odo!6rZJJ9E1lOl|TwWojQ;E-dL&xM`gj*)XK;cOVneW|+
zR0#0yL>ep=W64wT3|(nH0j+IxfhRIEJo9j$u3xzv$lTm(lBh-Vkz{0n=7x4xg9ngX
z8%xEF#&D-3a&6t}ZrSQd;Q+2X9=F#@t?kVYYHMk4t#xCa+qK)}ZuIWQO~}*S;N8B@
z@R3xqd}d|PF}_t8h6wq8j^x0<sggroJ)HlIW%<#t&o7tth7M!T-hWkWJfjr2iMyrQ
z>uL6WU&-ubxnp-%um{<ahbT=XC4N^FTY~H2R{i>;TrOt|3y8WMZ>CdWSE=NS_yd7z
zsl(xRLxv?7XVm4GQkGS+yjI+@us33?+QF}40xWjm>Z5s|9jqY4c2}#*?e(-mqGoq{
zYbzv5;Ws@`TN{j~<xb5(m6s~ntFeQbdVWu#T}5E~8XR2B!X+y#xx1U{LChni)Jo2o
z!>#6UWqcv2^JZf2^msXb)yxTjuTQLt=aQPKuW+}-cI|R;{M!<Tn_8Or==zzX&FxK1
zQVK>l;Too9>m-`nch!4Zg@_e1#}Q~6n;XP<<xDD`mTiKFbAymDrjw~}X=(Df1XJfm
z94mFcL0^kyk|e<ho8k__<u{&9YPy(j>y!PM=!jR5x|V<>m6uCvf1^K5*qFX%?~y=M
zj`YE`s&VSng@RT``Byun&S+=2^H5iLsT3UO?d>YnMfe>U3d8ICn&p#HZy+egs^d#Z
zU0|^541$llTMyv>A7(kEW(cY<$WHn6$xyf_f`FkeHCY|xH``d}LBUbCKRB)=b=fq|
zAzyDq{v3`(>Y`~JZWkSe`^ax4bu4kO5Czq_hS+VVj~@*6M&e6I%{94wU5Kk43~)-A
zJ0s?_(}B5Vq~@9HI;Pj*B$%^&|FO-Te1F~D#zDdKVp4O=#nocg-GXC*shR%KS*lOr
z93h0@@3-@hnfl|pKD}qn1IG`_;YfA7j?_(tAZzP7drFE*JA1xfb*6YtQD+&t#dSp;
zvZt$KZAllOEv^#+X~z=6Y6s>Ey>%x4SzA#+>Jq^i9<((yaIjaF`UgT$xkrjb!-3%8
zYVDYEongTO!B#u<UHCPlTBxf==WfQRZvAT0CJ59Z0>t#_Wz4t-!jVweSSbAU&_K{1
z4TOTybeb!Qga*QXxmfyo+?3LwpwUK9&~R$v9#ZRs9tMWS0~i%GQVh!RjB-qh9+9QK
zP$VE&g$_xw&woVnAMs%_Du;DVs!3fZXq`L~fIW(4k=!g91DX_Ny>jqy^az)84XG=|
zN|;OH(LKr&wiK(Cx)00IX8BZ9WbmTmnrW3dYT%Gmq@mW<iU`DsiTKNBjlY9o*>|i4
znO#jGW9&?P6RA~Z*SJHJxq5muR-9}sSQb6qCzopCl!>4I5Fw3FOW}mh#0yEy7vSd!
zxVsU}OQpg>tVkl2(HY%LB0iY=HcLUszme2RK{F78dWOyPefbJZlHeyZtSAx##1emD
zIXVyy3Zo=QyqVPX#4)&;HDASM&!QRW4fy4v?wHO=;|)Eu^Wr46M36WX3QI+tPC)aQ
zfV5fSNk^BdMhcXa@EuuAsw5T|e8ci#`BWbkaqNyjS4RbogGtuFipIDXc(DUBFr8gB
ze4hWsYe>C~1c-l3x4E5HXt++|cW<kF*mJ5#V_2#yY-(a|A17iulTM&kit*sh6)@wS
z!HnN?1Hl3Lb6%xcC_!P9uBOSfqZX68f((lMTi-L&C4~Om>1VmF#-x<g)#mcqOlqeS
zC0AfAsf8vkXJz_pAn3>Oh{(vfO-Q+%n<<yb{~UX^V0>RVrnrr91paqM`@+5?n3eBK
zFYXUvUoSRAoK|7rns^DRtH@Y%D+OX&#N-Mj;PN%oB)j{3;fSoolrJ=vdA;Ckb#-RM
zM?T8`_;Ih+gv4&e<kGmA%{2t>XK=4-gMU1e)KoI&&LkW)ZJW&FY??fBBy`df4u`@;
z+WCX`mzpQgJZp#<vFV^8HhVf~e6ef8R;FWc(+f<brCMms4_%pjO7`oFv4f_1-2Nu6
z?xQgf`;CH18L36W2u2*yqg6?*!5=yrQDOR8qVI#wRs?~BNEs8CiD|79HX5>-o5~eM
zLaIfyt(m?u3eO9L`jC#f=ix$EGwqsuG7|NLqnJvRdabiYr_BAI<Mjn~(!YC#OUO1t
zRD-FW40$qjMH9n)EQ}pWh&_>$0o3xOBELwR=Kap_KR*t#RM^>BSRFq>YM<B=V~&3d
zMG|?0OPtc?X%pzuXsJ0?EY+FD`4TxnqgbjI#=nEq6Q5(teT%b3lIFrmcibT);ob6t
zUNE5-jwN)X3B7`uy@JAmTLuY3cf;12Tb7i}id+WTnQ7M)Lq`15FA!f~?t;Q<DKW(v
z^m<L_6TcK{W|7y?bm|EQjZgK+u|vLr-e~ogE}NAa%<DI&@Oib(pHqCAZ%e)|BRAjY
zE>5vq-<)RLe;P=25vL{28bZr)k$DquDB5j89JUhY>`1rP2_L_W)N(<l*B~K+WsDd4
zWDx6<-Ns!rQl#Nv)do_Xw^+p&iIR4EFyIgM$lF3;M40JirkZ;A(de0%G#f29-li7n
z1(fM(j*SArK(v&UW$Rd8?AKZ;5VhP{S@cB|{CMFqTdS=n2=akGmrC49;<6d3(JT2@
zLh0tGHf?b-`Si<Z73#s9+#HRZ+lQaxf#_-XM!m$JLS{<&XMHG{M5e`|J+Bx3Q$gF;
z)20>eP(<bgAE)8L7nY>Yp&Y!6Xm!5f{Xh3APaR;X!(%^RG6&Tz2TF^)I_35#i`Fx#
z$gFnFHR^e7TK&yI{((p|bo{x6piH%jZ#|p0*hN*S8sCYE`;hnyatLES>R0aCz)IG9
z6P<CoN(I&t7N#tAg|3i`U1Ls*lYN3B{J0=6LN1$<ypdJL`T^~+a-yR&ghKtefQL|@
z?-vYwDDwNjWDx%ju@UB@eCD(cf}#%veIFYa-+MscWnmUR=3-ayxr)!Ij<ttfv+|jI
z%Lv{ReBd+0S6T8cdtx>pjaWwjf+P)DM^Vi02MV(cLV;1bf`wUDpC!vW3aH-#l9=^b
zhAjO1ie(%SM750KBW74W#9&zIqd{xGz`24EPV1`W3SK9C1koXOzs1K!tX~C7Nb5_w
zk~9iJTyh`KM(}+Nh~v=v8Z6Tf8}(ZUvD`&Ncqiz`Cye$w<{qPqDAqqt-@&`Z7PQCd
zS-e?1f%ghZQL>J++}IWDUlraY((%ok3-If3Q55ef7i|h~A-uE*FyHJAfKjHTQhb%8
ztpwbUH;V0m>(F9=KSApR>_%fK{qMs=w-0a&+P#2xfl(je-vc@7KqrLy{T&$SMmq!e
z_wlfCCtw-vF~Dpo(Ki5pipGhgEmf}eunLFvPB8r1MA@QSJQ+|iP*JSM6T{eBFR_=B
zxcoQ@#Ytv4|0Ae%FWRtgRc`*<Z{%Q_7xX_}P8422^wDa(cVNW>fLHA4QbzxTon)UX
z#b?>h^^5qcC#urCM9oXs{Gr;8S5^mMoWI_N@p}6K;nJ9Xlh?(?^ZAdJN6s>-%0`Rv
z<JPM^QNKC+aPi_cuc?cdP*7OPF_p^~S)SEKOO*dS%Whk=f#D5b)X7ohh6E^J1OKH-
z`+jBJIabTwR>J4l3ieaw+&SiEA1VKOj@{1=DLo2XQCU7ia{f4~SLijVw?XPxr==Ee
zrBUT+g-LaWCMd{H+Mghyfhg&Jxdx!dHLwW{V$eV^#A7sneoqol0ygcx31sm9s(^}e
z1?V#di_XvHPbGMB=1=JvbO|N>Tr8QimoWSuf%<qSNa4x@ORs|4=y|**yjX-P|D?Ui
zv{IU|QaUZw&D71wZ$=?oJd4}tGB5VeQ64<cYLfYW@F$_MADw5x#W5RB0DOQ_NV^sV
z4xPqpxIVO_4aN3Qt9RQ)GxYMI+XM1RIUIoR^OX+r1bKG)mD%4a^Zo^#1wN0QgK)hK
zg_Qr&M^Z_=n|ee0c5QDe!3og>*te_68`=>G1ugtgU}ZXK*Bp$3>mOujquB|gE#g)A
z+u2IT%WM&QP|3W+a$?~H8fu1)3e^Vus3OQmaY#7jH0l{R-lwIk$|Hydd~iNB`65yA
zd&Y}GO}8r&2^<dEa60*HHns6zJE#0|AFmw=w6E!NsnjY*WNqoiWq9r63zDcuj^IV<
z^y_$4;{y%Ki<j7Do3o<Ksi>D&ksU7y6Di8l=h<5<RhfLA1<lP-y2sd(il_3i3X#o8
z<A`=yi19AG!d?>@gCS!Kit%w`i1;qbw<wQ~v303hpCKHNy*<XhZ%O+rym)?(4p>I$
zN6PsZ*q+#Xkfsfh5Kooj<@V12FF?A5oK%9=2zWf1$OD+SR7AWVV4DsC?m@c&_(?pz
z-UIkPwEy5R9$%jU{193n-bB6giCzHA-$k3j=-X(23-}y=xm6H*Z=n4H2EK)sh5dRO
zTk{&=OK3j^{1kTO1HgZe_DjHjDFJ}szr@!s02d>atwKKyZ6n|}3W;_AUV?TV@cnBL
zaRFDM{T*QMTB1{cJ!~J*-RRtj0RI36_MyE3cv}V02;c)~0l+t$5CZT~wDpy+3fkWQ
j?nR3Nu387H0RBTXpi}KSrS2sbw%l99WAgBUH!}Vg8j6^d

delta 3361
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
L-2*51UE6;F^*hV8

diff --git a/JSONFox.pjx b/JSONFox.pjx
index 88db1dca1e59089579732a63cd558618331b9adb..b179954f92877438102cd4afabcb09f6fbf6964e 100644
GIT binary patch
delta 229
zcmZ4PxzdZ(K!QouVI%7{7Iq_3LjyAtv&n~8{%}|rnwguJo0?4y;1Cg1U}Ru$Vq#$6
z=3-z_Ff=wZn0!%Qeli!^9mb23pR+xHXf!ehs+C}CWoKZ>;@$j)osEg>2sco@nW>S5
z<zxeKrO9$!VVpuBA!AE(lgWkb@|)*y{SoA_0NHD7VYYdJ%r16Dy~)uk-ckyjK&t`_
zO)QLzElkY}%s?zt0}D%Ih=aI*vbH=749-BTU;-2eIf%zA*g42EASBq?(a&#kqNK>=
J4eTt8QUFpkG`;`;

delta 161
zcmZ4KwcL}{K!S<Oek1EP7Is4;b0cFTgUN?j{%{x@8k!gx7?@8E;1Cg1U}Ru$Vq#$6
z=VD+`Ff=wZn0!%Qeli!^9mcDZpR+w+18W2da)?e&U}s@#WoKY;<k|d&osEg>1UFEN
znW>S5<zxeKrO9$!VVq(hA!AE(lgWkb@|)*y{Sjn0vox_ZFf#?2uz8EjGIqx5$<Zp_
Gj8Xt`swh7I

diff --git a/jsonfox.app b/jsonfox.app
index 9e310204b586eb30c4c341f4691b15d7074438b9..b1e302f004fdda6a8119841309a385a09fc1b0d8 100644
GIT binary patch
delta 9695
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

delta 3675
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

diff --git a/src/jscriptscanner.prg b/src/jscriptscanner.prg
new file mode 100644
index 0000000..a6afb77
--- /dev/null
+++ b/src/jscriptscanner.prg
@@ -0,0 +1,283 @@
+#include "JSONFox.h"
+* JScriptScanner
+define class JScriptScanner as custom
+	Hidden source
+	hidden line
+	
+	Hidden capacity
+	Hidden length
+	
+	Dimension tokens[1]	
+	oScript = .null.
+
+	function init(tcSource)
+		With this
+			.length = 1
+			.capacity = 0
+			&& IRODG 11/08/2023 Inicio
+			* We remove possible invalid characters from the input source.
+			tcSource = STRTRAN(tcSource, CHR(0))
+			tcSource = STRTRAN(tcSource, CHR(10))
+			tcSource = STRTRAN(tcSource, CHR(13))
+			&& IRODG 11/08/2023 Fin
+			.source = tcSource
+			.line = 1
+		endwith
+	endfunc
+
+	function escapeCharacters(tcLexeme)
+		* Convert all escape sequences
+		tcLexeme = Strtran(tcLexeme, '\\', '\')
+		tcLexeme = Strtran(tcLexeme, '\/', '/')
+		tcLexeme = Strtran(tcLexeme, '\n', Chr(10))
+		tcLexeme = Strtran(tcLexeme, '\r', Chr(13))
+		tcLexeme = Strtran(tcLexeme, '\t', Chr(9))
+		tcLexeme = Strtran(tcLexeme, '\"', '"')
+		tcLexeme = Strtran(tcLexeme, "\'", "'")
+		return tcLexeme
+	endfunc
+	
+	procedure increaseNewLine
+		set step on
+		this.line = this.line + 1
+	endproc
+		
+	function checkUnicodeFormat(tcLexeme)
+		* Look for unicode format
+		** This conversion is better (in performance) than Regular Expressions.
+		&& IRODG 09/10/2023 Inicio
+		local lcUnicode, lcConversion, lbReplace, lnPos
+		lnPos = 1
+		do while .T.
+			lbReplace = .F.
+			lcUnicode = substr(tcLexeme, at('\u', tcLexeme, lnPos), 6)
+			if len(lcUnicode) == 6
+				lbReplace = .T.
+			else
+				lcUnicode = substr(tcLexeme, at('\U', tcLexeme, lnPos), 6)
+				if len(lcUnicode) == 6
+					lbReplace = .T.
+				endif
+			endif
+			if lbReplace
+				tcLexeme = strtran(tcLexeme, lcUnicode, strtran(strconv(lcUnicode,16), chr(0)))
+			else
+				exit
+			endif
+		enddo
+		&& IRODG 09/10/2023 Fin
+		return tcLexeme
+	endfunc
+
+	Function scanTokens
+		With this
+			Dimension .tokens[1]
+			
+			this.oScript = Createobject([MSScriptcontrol.scriptcontrol.1])			
+			this.oScript.Language = "JScript"
+			*this.oScript.AddCode(strconv(filetostr('F:\Desarrollo\GitHub\JSONFox\scanner.js'),11))
+			local lcScript
+			lcScript = this.loadScript()
+			_cliptext = lcScript
+			messagebox(lcScript)
+			this.oScript.AddCode(lcScript)
+			this.oScript.AddObject("oScanner", this)
+			this.oScript.Run("ScanTokens", this.source)			
+			.capacity = .length-1			
+			* Shrink array
+			Dimension .tokens[.capacity]
+		endwith
+		Return @this.tokens
+	endfunc
+
+	function log(tcContent)
+		? tcContent
+		strtofile(tcContent + CRLF, 'f:\desarrollo\github\jsonfox\trace.log', 1)
+	endfunc	
+
+	function addToken(tnTokenType, tcTokenValue)
+		With this
+			.checkCapacity()
+			local loToken
+			loToken = createobject("Empty")
+			=addproperty(loToken, "type", tnTokenType)
+			=addproperty(loToken, "value", tcTokenValue)
+			=AddProperty(loToken, "line", .line)
+			
+			.tokens[.length] = loToken
+			.length = .length + 1
+		EndWith
+	EndFunc
+	
+	Hidden function checkCapacity
+		With this
+			If .capacity < .length + 1
+				If Empty(.capacity)
+					.capacity = 8
+				Else
+					.capacity = .capacity * 2
+				EndIf			
+				Dimension .tokens[.capacity]
+			EndIf
+		endwith
+	endfunc
+
+	procedure showError(tcCharacter, tnCurrent)
+		local lcMessage
+		lcMessage = "Unknown character ['" + transform(tcCharacter) + "'], ascii: [" + TRANSFORM(ASC(tcCharacter)) + "]"
+		error "SYNTAX ERROR: (" + TRANSFORM(this.line) + ":" + TRANSFORM(tnCurrent) + ")" + lcMessage
+	endproc
+
+	function tokenStr(toToken)
+		local lcType, lcValue
+		lcType = _screen.jsonUtils.tokenTypeToStr(toToken.type)
+		lcValue = alltrim(transform(toToken.value))		
+		return "Token(" + lcType + ", '" + lcValue + "') at Line(" + Alltrim(Str(toToken.Line)) + ")"
+	endfunc
+
+	function loadScript
+		local lcScript
+		text to lcScript noshow
+var C_LBRACE 	= 1
+var C_RBRACE 	= 2
+var C_LBRACKET 	= 3
+var C_RBRACKET 	= 4
+var C_COMMA 	= 5
+var C_COLON 	= 6
+var C_NULL 		= 9
+var C_NUMBER 	= 10
+var C_STRING 	= 12
+var C_EOF 		= 17
+var C_BOOLEAN 	= 18
+var C_NEWLINE   = 19
+
+var Spec = [
+    // --------------------------------------
+    // Whitespace:
+    [/^[ \t\r\f]/, null],
+
+    // --------------------------------------
+    // New line:
+    [/^\n/, C_NEWLINE],
+
+    // --------------------------------------
+    // Keywords
+    [/^\btrue\b/, C_BOOLEAN],
+    [/^\bfalse\b/, C_BOOLEAN],
+    [/^\bnull\b/, C_NULL],
+
+    // --------------------------------------
+    // Symbols
+    [/^\{/, C_LBRACE],
+    [/^\}/, C_RBRACE],
+    [/^\[/, C_LBRACKET],
+    [/^\]/, C_RBRACKET],
+    [/^\:/, C_COLON],
+    [/^\,/, C_COMMA],    
+
+    // --------------------------------------
+    // Numbers:
+    [/^-?\d+(,\d{3})*(\.\d+)?([eE][-+]?\d+)?/, C_NUMBER],
+
+    // --------------------------------------
+    // Double quoted string:
+    [/^"/, C_STRING]
+];
+
+var _scannerString;
+var _scannerCursor;
+
+function ScanTokens(source) {
+    _scannerString = source;
+    _scannerCursor = 0; // track the position of each character
+
+    while (_scannerCursor < _scannerString.length) {
+        var token = _getNextToken();
+        if (token == null) {
+            break;
+        }
+        oScanner.AddToken(token.type, token.value);
+    }
+    oScanner.AddToken(C_EOF, '');
+}
+
+function _getNextToken() {
+    if (_scannerCursor >= _scannerString.length) {
+        return null;
+    }
+    var string = _scannerString.slice(_scannerCursor);
+
+    for (var i = 0; i < Spec.length; i++) {
+        var regexp = Spec[i][0];
+        var tokenType = Spec[i][1];        
+        var tokenValue = _matchRegEx(regexp, string);
+
+        if (tokenValue == null) {
+            continue;
+        }
+
+        if (tokenType == null) {
+            return _getNextToken();
+        }
+
+        if (tokenType === C_NEWLINE) {
+            oScanner.increaseNewLine();
+            return _getNextToken();
+        }        
+        var literal = tokenValue;
+        if (tokenType === C_STRING) {
+            literal = _parseString();
+        }
+
+        return {
+            type: tokenType,
+            value: literal
+        };
+    }
+
+    oScanner.showError(string[0], _scannerCursor);
+}
+
+function _matchRegEx(regexp, string) {
+    var matched = regexp.exec(string);
+    if (matched == null) {
+        return null;
+    }
+    _scannerCursor += matched[0].length;
+    return matched[0];
+}
+
+function _parseString() {
+    var ch = '';
+    var looping = true;
+    var start = _scannerCursor-1;
+    var pn = '';
+    while (_scannerCursor < _scannerString.length) {
+        ch = _scannerString.charAt(_scannerCursor);
+        switch (ch) {
+            case '\\':
+                pn = (_scannerCursor+1 <= _scannerString.length) ? _scannerString.charAt(_scannerCursor+1) : '';
+                if (pn === '\\' || pn === '/' || pn === 'n' || pn === 'r' || pn === 't' || pn === '"' || pn === "'") {
+                    _scannerCursor++;
+                }
+                break;
+            case '"': 
+                looping = false;
+                break;
+            default:
+                break;
+        }
+        _scannerCursor++;
+        if (!looping) {
+            break;
+        }
+    }
+    var lexeme = _scannerString.slice(start+1, _scannerCursor-1);
+    lexeme = oScanner.escapeCharacters(lexeme);
+    lexeme = oScanner.checkUnicodeFormat(lexeme);
+    return lexeme;
+}
+		endtext
+		return lcScript
+	endfunc
+enddefine
\ No newline at end of file
diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index de25a6c..4abfbc1 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "9.27"
+	version 		= "10.1"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
@@ -12,6 +12,10 @@ define class JSONClass as session
 	* Set this property to .T. if you want the lexer uses JSONFoxHelper.dll
 	NETScanner = .f.
 	&& <<<<<<< IRODG 07/01/21
+	
+	&& >>>>>>> IRODG 02/27/24
+	JScriptScanner = .f.
+	&& <<<<<<< IRODG 02/27/24
 
 	*Function Init
 	function init
@@ -32,11 +36,14 @@ define class JSONClass as session
 		try
 			this.ResetError()
 			local lexer, parser
-			if this.NETScanner
+			do case
+			case this.NETScanner
 				lexer = createobject("NetScanner", tcJsonStr)
-			else
+			else this.JScriptScanner
+				lexer = createobject("JScriptScanner", tcJsonStr)
+			otherwise
 				lexer = createobject("Tokenizer", tcJsonStr)
-			endif
+			endcase
 			parser = createobject("Parser", lexer)
 			loJSONObj = parser.Parse()
 			
@@ -64,11 +71,14 @@ define class JSONClass as session
 		try
 			this.ResetError()
 			local lexer
-			if this.NETScanner
+			do case
+			case this.NETScanner
 				lexer = createobject("NetScanner", tcJsonStr)
-			else
+			case this.JScriptScanner
+				lexer = createobject("JScriptScanner", tcJsonStr)
+			otherwise
 				lexer = createobject("Tokenizer", tcJsonStr)
-			endif
+			endcase
 			Local laTokens
 			laTokens = lexer.scanTokens()
 			IF FILE(tcOutput)
diff --git a/src/parser.prg b/src/parser.prg
index f03e640..0820f19 100644
--- a/src/parser.prg
+++ b/src/parser.prg
@@ -14,18 +14,14 @@ define class Parser as custom
 	Hidden peek
 	
 	function init(toScanner)
-		With this
-			Local laTokens
-			laTokens = toScanner.scanTokens()
-			=Acopy(laTokens, .tokens)		
-			.current = 1
-		endwith
+		Local laTokens
+		laTokens = toScanner.scanTokens()
+		=Acopy(laTokens, this.tokens)
+		this.current = 1
 	endfunc
 
 	function Parse	
-		With this
-			Return .value()
-		endwith
+		Return this.value()
 	endfunc
 	&& ======================================================================== &&
 	&& Function Object
@@ -33,51 +29,41 @@ define class Parser as custom
 	&& 			kvp    = KEY ':' value
 	&& ======================================================================== &&
 	hidden function object as object
-		With this
-			local loObj, loPair, lcMacro
-			loObj = createobject('Empty')
+		local loObj, loPair, lcMacro
+		loObj = createobject('Empty')
+		if !this.check(T_RBRACE)
+			loPair = this.kvp()
+			this.addKeyValuePair(@loObj, @loPair)
 			
-			if !.check(T_RBRACE)
-				loPair = .kvp()
-				.addKeyValuePair(@loObj, @loPair)
-				
-				do while .match(T_COMMA)
-					loPair = .kvp()
-					.addKeyValuePair(@loObj, @loPair)
-				enddo
-			endif
-			.consume(T_RBRACE, "Expect '}' after JSON body.")
-
-			return loObj
-		endwith
+			do while this.match(T_COMMA)
+				loPair = this.kvp()
+				this.addKeyValuePair(@loObj, @loPair)
+			enddo
+		endif
+		this.consume(T_RBRACE, "Expect '}' after JSON body.")			
+		return loObj
 	endfunc
 	&& ======================================================================== &&
 	&& Function Kvp
 	&& EBNF -> 	kvp = KEY ':' value
 	&& ======================================================================== &&
 	hidden function kvp(toObj)		
-		With this
-			local loPair, lvValue
-			
-			loPair = CreateObject('Empty')
-			=AddProperty(loPair, 'key', '')		
-			
-			.consume(T_STRING, "Expect key name")
-			
-			loPair.key = _screen.jsonUtils.CheckProp(.previous.value)
-
-			.consume(T_COLON, "Expect ':' after key element.")
-			
-			lvValue = .value()
-			If Type('lvValue', 1) != 'A'
-				=AddProperty(loPair, 'value', lvValue)
-			Else
-				=AddProperty(loPair, 'value[1]', .Null.)			
-				Acopy(lvValue, loPair.value)			
-			endif
-
-			Return loPair
-		EndWith
+		local loPair, lvValue
+		
+		loPair = CreateObject('Empty')
+		=AddProperty(loPair, 'key', '')
+	
+		this.consume(T_STRING, "Expect key name")
+		loPair.key = _screen.jsonUtils.CheckProp(this.previous.value)
+		this.consume(T_COLON, "Expect ':' after key element.")
+		lvValue = this.value()
+		If Type('lvValue', 1) != 'A'
+			=AddProperty(loPair, 'value', lvValue)
+		Else
+			=AddProperty(loPair, 'value[1]', .Null.)
+			Acopy(lvValue, loPair.value)
+		endif
+		Return loPair
 	EndFunc
 
 	Hidden function addKeyValuePair(toObject, toPair)
@@ -97,113 +83,94 @@ define class Parser as custom
 	&& EBNF -> 	value = STRING | NUMBER | BOOLEAN | array | object | NULL
 	&& ======================================================================== &&
 	hidden function value
-		With this
-			do case
-			case .match(T_STRING)
-				return _screen.jsonUtils.CheckString(.previous.value)
-				
-			case .match(T_NUMBER)
-				Local lcValue, lcPoint
-				lcValue = .previous.value
-				lcPoint = Set("Point")
-				
-				If lcPoint != '.'
-					lcValue = Strtran(lcValue, '.', lcPoint)
-				EndIf
-				return iif(at(lcPoint, lcValue) > 0, Val(lcValue), int(Val(lcValue)))
-				
-			case .match(T_BOOLEAN)
-				return (.previous.value == 'true')
+		do case
+		case this.match(T_STRING)
+			return _screen.jsonUtils.CheckString(this.previous.value)
+			
+		case this.match(T_NUMBER)
+			Local lcValue, lcPoint
+			lcValue = this.previous.value
+			lcPoint = Set("Point")
+			
+			If lcPoint != '.'
+				lcValue = Strtran(lcValue, '.', lcPoint)
+			EndIf
+			return iif(at(lcPoint, lcValue) > 0, Val(lcValue), int(Val(lcValue)))
+			
+		case this.match(T_BOOLEAN)
+			return (this.previous.value == 'true')
 
-			case .match(T_LBRACE)
-				return .object()
+		case this.match(T_LBRACE)
+			return this.object()
 
-			case .match(T_LBRACKET)
-				return @.array()
-				
-			case .match(T_NULL)
-				return .null.
-			otherwise
-				error "Parser Error: Unknown token value: '" + _screen.jsonUtils.tokenTypeToStr(.peek.type) + "'"
-			EndCase
-		EndWith
+		case this.match(T_LBRACKET)
+			return @this.array()
+			
+		case this.match(T_NULL)
+			return .null.
+		otherwise
+			error "Parser Error: Unknown token value: '" + _screen.jsonUtils.tokenTypeToStr(this.peek.type) + "'"
+		EndCase
 	endfunc
 	&& ======================================================================== &&
 	&& Function Array
 	&& EBNF -> 	array = '[' value | { ',' value }  ']'
 	&& ======================================================================== &&
 	hidden function array
-		With this
-			local laArray
-			laArray = createobject("TParserInternalArray")
-			If !.check(T_RBRACKET)
-				laArray.Push(.value())
-				do while .match(T_COMMA)
-					laArray.Push(.value())
-				enddo
-			endif
-			.consume(T_RBRACKET, "Expect ']' after array elements.")
-
-			return @laArray.getArray()
-		endwith
+		local laArray
+		laArray = createobject("TParserInternalArray")
+		If !this.check(T_RBRACKET)
+			laArray.Push(this.value())
+			do while this.match(T_COMMA)
+				laArray.Push(this.value())
+			enddo
+		endif
+		this.consume(T_RBRACKET, "Expect ']' after array elements.")
+		return @laArray.getArray()
 	endfunc
 	
 	Function match(tnTokenType)
-		With this
-			If .check(tnTokenType)
-				.advance()
-				Return .t.
-			EndIf
-			Return .f.
-		endwith
+		If this.check(tnTokenType)
+			this.advance()
+			Return .t.
+		EndIf
+		Return .f.
 	EndFunc
 
 	Hidden Function consume(tnTokenType, tcMessage)
-		With this
-			If .check(tnTokenType)
-				Return .advance()
-			EndIf
-			if empty(tcMessage)
-				tcMessage = "Parser Error: expected token '" + _screen.jsonUtils.tokenTypeToStr(tnTokenType) + "' got = '" + _screen.jsonUtils.tokenTypeToStr(.peek.type) + "'"
-			endif
-			error tcMessage
-		EndWith
+		If this.check(tnTokenType)
+			Return this.advance()
+		EndIf
+		if empty(tcMessage)
+			tcMessage = "Parser Error: expected token '" + _screen.jsonUtils.tokenTypeToStr(tnTokenType) + "' got = '" + _screen.jsonUtils.tokenTypeToStr(this.peek.type) + "'"
+		endif
+		error tcMessage
 	endfunc
 
 	Hidden Function check(tnTokenType)
-		With this
-			If .isAtEnd()
-				Return .f.
-			EndIf
-			Return .peek.type == tnTokenType
-		endwith
+		If this.isAtEnd()
+			Return .f.
+		EndIf
+		Return this.peek.type == tnTokenType
 	EndFunc 
 
 	Hidden Function advance
-		With this
-			If !.isAtEnd()
-				.current = .current + 1
-			EndIf
-			Return .tokens[.current-1]
-		endwith
+		If !this.isAtEnd()
+			this.current = this.current + 1
+		EndIf
+		Return this.tokens[this.current-1]
 	endfunc
 
 	Hidden Function isAtEnd
-		With this.peek
-			Return .type == T_EOF
-		endwith
+		Return this.peek.type == T_EOF
 	endfunc
 
 	Hidden Function peek_access
-		With this
-			Return .tokens[.current]
-		endwith
+		Return this.tokens[this.current]
 	endfunc
 
 	Hidden Function previous_access
-		With this
-			Return .tokens[.current-1]
-		endwith
+		Return this.tokens[this.current-1]
 	EndFunc
 	
 EndDefine
@@ -216,16 +183,12 @@ Define Class TParserInternalArray As Custom
 	nIndex = 0
 	
 	Function Push(tvItem)
-		With this
-			.nIndex = .nIndex + 1
-			Dimension .aCustomArray[.nIndex]
-			.aCustomArray[.nIndex] = tvItem
-		EndWith
+		this.nIndex = this.nIndex + 1
+		Dimension this.aCustomArray[this.nIndex]
+		this.aCustomArray[this.nIndex] = tvItem
 	Endfunc
 	
 	Function GetArray
-		With this
-			Return @.aCustomArray
-		endwith
+		Return @this.aCustomArray
 	EndFunc
 Enddefine
\ No newline at end of file
diff --git a/src/testScanner.prg b/src/testScanner.prg
new file mode 100644
index 0000000..a17e9d1
--- /dev/null
+++ b/src/testScanner.prg
@@ -0,0 +1,23 @@
+clear
+cd f:\desarrollo\github\jsonfox\src\
+delete file "F:\Desarrollo\GitHub\JSONFox\trace.log"
+Do loader
+
+lbUserJScriptTokenizer = .F.
+lcClass = "JScriptScanner"
+set procedure to "JScriptScanner" additive
+
+local lnStart
+lnStart = seconds()
+local loScanner
+*lcFile 		= "F:\Desarrollo\GitHub\JSONFox\test.json"
+lcFile 		= "c:\a1\registro-gastos\node_modules\.cache\babel-loader\38c18daa8cb0956e273a42f3cabeb7a3ca3c829d7c9614a3fabaecc14d68db02.json"
+loScanner 	= createobject(lcClass, strconv(filetostr(lcFile),11))
+loResult 	= loScanner.ScanTokens()
+? seconds() - lnStart
+return
+
+for each loToken in loResult
+	lcOutput = loScanner.TokenStr(loToken)
+	loScanner.log(lcOutput)
+endfor
\ No newline at end of file

From 93da735815a1eb8d28c71cb4b595c17e363cdee6 Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Sun, 17 Mar 2024 22:40:57 +0100
Subject: [PATCH 29/38] Version 10.2 - JSONToCursor() number data type support

---
 JSONFox.PJT           | Bin 123849 -> 124509 bytes
 JSONFox.pjx           | Bin 9513 -> 9513 bytes
 jsonfox.app           | Bin 93528 -> 94207 bytes
 src/arraytocursor.prg |  51 +++++++++++++++++++++++++++++++++++-------
 src/jsonclass.prg     |   4 ++--
 src/jsonfox.h         |   3 ++-
 6 files changed, 47 insertions(+), 11 deletions(-)

diff --git a/JSONFox.PJT b/JSONFox.PJT
index d6a276ccf52ed25904fabbd014e800def7c09243..6280b8cd98df0d9397354c6807a0f79d55f0c534 100644
GIT binary patch
delta 2357
zcmbVOdu&r>6hG(Q_O|O|ZMU&82HQH>gNNuKjw~qJb`>XMum@wz=(uzj25e(nyG2Y)
z#RoC*FRbQD1PMk#`C~F>sM+EJLuQPIfH4G&K$!l+Bfy|pH`m^IzI)p_hbG3{ob)`t
z@0{Ox-P`ZKGhF`BU<6405&)b7qRGsK9!=AQHgoQQ&D_fc!Uxv06J3p=+`=58&z@vM
zR|;*R;=(kcOjQj$S=i1AWx1;Pm}6}yUc5rMlA1g%oV6s`P<P22dNY#-VkO^Z3#V+1
zf9;Gre8!E3jR_y&TPN|1LH;d-!{KLN#{;%-v<2((!k@l_YjfojgSdu2{&`pUk3syw
ziOa*ozano4-SG&HoH6CzR6d84%jFz^j-1f?opYTz2ONM<NXp+c01jmV%$W!9Fr6AA
z{t$T@T8l>g(u158j>e(@@d^FAoRSB9Q3OMjBjSm4M0z5D$ROX`fW?_ch${}Lr(^cm
zNF)WKCQ>Yu9Zz7fb7YKJZDiGx)iaLRsEHgCN5)KYXAKrCsV9H-*f`QzE6janLVq15
z^bSr*151p;P9jui5S{=kE9Db4m=zo~13|iOnwpvlI?VSB>XG|8_ET9Fr+bAn?{%UI
zP{(3==w9>cxROJdSWu6q8Ap!pF1vA?OghM&5!u5c6P9%H$u6%R=ao_i>5ie2N=|rk
zLRZ(t6(i(K=r5p>MOrmKhVfc?#0+B=xwsaKI4dWwuf<g*q_M(N48(z$2dFkcZh(pl
zglS|fmFh5uoEYT3TFfjrz$HCw+aa~J(8+nGI0e{8P*ioV*w!Oa7^Y4EcZ{?wfny2}
z8*OsD79Y2mpsKpU>#1Dls;Uc@*WrBLx@1O^7s}^0-~u_=fSq_%zT1GW;-Ku`gzb+E
zqOvSerAr7U9#2FEQ7bgPFOaxY(B#yFyhxBEo6x=7$SG#PB4169)V;@KfuWM9jhdOy
zDHix77O_Fpt|I&@iP9mrHsXsxD?DB4t*S@@)j`#IZ=(U$dF$$2YrLg=I($Y$X_zsL
zG%7TxIyR__d781lzXlVOOaiWs9MG+ih!Mt8D6E6cg&t_oSOX7o>M?Z+f~*VbIX1o8
z5bhz|?{U-#ODrNl)Xb)<kxjz|Q0!2z>FhCr6i><)8V2eHo4`b8Ri9SUWNI3LdYnL{
zwOMl>RK2USwhEODhLZyp!J<N4iT^tSo94fzpsv!LSwVuVAi)QtnAsRoQlhpNDllFJ
zW>bNkoW5dXsq>WRtSeTQ3r*#O{wDr=S%S0b!caSB7QQm$F1=b%dl#gTH|osnCOlBK
zis>`cjbV--$fAvtlFp{n(B1<7t&2LCuWf%3uP&}SQj>b{ws!{h+^9}0dQ_0Bns8pD
z0F!2IpR1&f?Sa<B`sT3#q5Yq<YQ_r5x1(Kb^HWjTcK`GIFqDaPx66l{FrU`FetO;I
zubVL2WP~dB#tjv&dar!330<~Xs}|0F4&UOJ`sf45z8NN{?C?w7feJAoj;3fj3wXLE
zF(7$*y8XMm7n|jCFJNZtZL4P0L%SI8wVrlpq5*unJN!NE(u%aC-PbDlc6rm2cCn>b
z?C?q9X~hn|E8y*DSwvqZ2Eh!SlC-N?^!X&eza>MiZpJL`!;J9uW;}}AoJ`p!;+xJ<
ze4BIN2zL)g0r5Pr$BA8h0XncBT~HwRiI|1`^00_K3$Af4a1c3hFZ9D{dR+9BK`GrF
zl^eHWUU@CL5V4;b62Ir607Y`;;83+`7IIBmH|&L43UnSv<yW@i{xsl^z!p3L`9xc|
zBk&C`Kjfn~8`=T<l$AuZfNGRWX@5j~FHr;Wrzq<o;`b5VC;sYOfV0GZOf;MgkX8T?
zA^sv!0rAI)N~uiONdAKOtc3upNWMjKA@Ti0Ye;5yepv_}sHCrc4Jjr`(M9}Gq9&53
vNdAd<eGw3F0G{YE;&&2lBi=w%O=o(G<mX%PC64|{bTy=hw)~vFKi~K#W(xc-

delta 1739
zcmZ`)du&r>6#t#u_IB;suI<Lyggvz|L|!5w5`nG^n2c@Ek&GDKnsN;Y8>|mxMy!lz
z2ucDr;f6n8%$T9^xnR;5hzYt#RDzVmApuc}XhI|+ER==z>iK#%g+$Vv+~4_q=k=X)
z?(I*f%-@_e=K+rQ0aP6gSo5X$Ot&$<R;oR^R@z=IFMMLzv*l~z<(>)h{^S^pU-A^h
zCwtuTp#_3Ey2#TZ$y!tH_=syoJUe-|+&?sCEz9qY!FZ_Vb<^)TpG?h{rSj?P0`DBG
zO$^pjZ(hZvsL;6-fPm6%+ReW!B}Ql~1#XnYn_eubn!3ithaM&myMeXi0ChazWUH4L
z8}~LR;@?u9$v#iAqd$`dvLmLM>IXki8BK|A&sG<uZkv(STxdxXoSD>c9@3WmXJ{Ik
z)#+#0%Az)$q3T%4@)6UI7%_cHnj5xE+JL)+#v+bZNZJ(kHn6wP$K-ThT0+|=cL=VV
z=A6|nqj=QM&EDhc6RsSr5T1;1Sa`>vxtLl?nqxE?`>f1rd6+O_iWZYLo@q%W0Y5I!
zAGYFlzS^FoNz#X;?n=^v7&A63&a&kJVPyiiDx{4_-L~@`$8i8z1UPR(UB{M4_q9f0
z`v&Ki!Q2ZQluhf{>mloX^wz+psKO})Z9#2@jkB5&M>GT0IABD}@_N6F24Azf^eoLx
z^qi%M2D|f~c3VWd_t2m^e~5ahS3N#N9Yww3>UurrWz@`i^07Hn)YfxU`}lRz@<Ee=
ztD;J%+iJtHnzVx(Z;~_{-pdR-kS@p-@WogWPW99|+U7E%p{cIbjFokMzjs;PM-*=!
zE{*kzXdiPA%zQJgm{S_{9s;Rh8KcAZWSABc;|a{8oS8{C<K_voJWgqcSb{FDWj1j$
zZJA*c?}`|0s~F~KXil`~oHN7Qlx01ZBdi>YJ1FL#o6Km?d}fOOo7HGVHfHaOo?8`8
zS;VWtQA7r7uF@GamhpiJ+8&g_h;r`VM18&95%+1~2Jv#-y=OTlh~k*OYtfgZrF)CQ
z7ZaOMrXQ(`E>Lmx|6f8+k=qlyy8i-Img>u5LF3Z;x`rk7OImqvnwq`!tJSL)$eWmR
zk=``K_@xoAJFKYh3@f3?l0YQznnmYq@P(8>MDayK;mx7Xtvc&~Z@m)S=#PY=!ALZu
z`0YAxLPsDHT)(|QSIr1+?hHpels`ua6N18zTw~{fbz1{dJA+F2UuHwt8>#DDcXgD=
z#}-A|*cJ$~O}Nsn9%`fU((~@b&R?jXq-3EwHATB-4A9$>i&D}}`~{*UlBlA6QWedj
z%h-V~BJwihlDzO@A9bmJq$pZ8i%CIM(GCpY1pmbGTn>@Mfcokcs<3$3do>MEQXRTN
z``mk_KD1LGDp}eYLsGkcrERfm4j{}8Y-f?3fSEsx2N`#<EMnYS2z<tP2g^mqukZ)+
zB;&&@!4lx*iNJNn$5?hVc9-!#0#9U+^-9LEa-f9u?^)l&xU>Rzg!OZ**H&O52AG)6
z#3d%qGj>!0^H@)@{uJX5mZw?&jrD_!&$9Sfzs7o_nw(E_)GJr%8R<redZLHQ6K@5{
wUy-=wrvnA*G(UZv__>Exlqb4Y&~dZ+Xdf*zJiO|;M5K?t;~pm#e?<oKKRk6HXaE2J

diff --git a/JSONFox.pjx b/JSONFox.pjx
index b179954f92877438102cd4afabcb09f6fbf6964e..a5e602759ed7a8bc337acab3b352f6e0f9d96803 100644
GIT binary patch
delta 162
zcmZ4KwbF~lK!RCtBg=Lcc4G?@GYb>b$%k0}vVqx#lNm)t1r-<>7@U|G7#{O7Fen%r
zn;A^LC@(*mi|r2MvB}Tb9ze7inN1GhkYH<NXJA;uv-u4>8xxl=7f`*KsgZ@{WCL-f
z$#Ps_ob22{A!AE(lgWkb@|)*yl?iZI0BtfgGd0*OCGEh;#LYE1Mx}<$9jJ9D_vCvj
F-T;(JCd&W-

delta 163
zcmZ4KwbF~lK!QnjBg=Lcb|X_m12Yq|$%k0}vKyM2o0yxLO%C7?5maDgU~pn$VBqFr
zU{EkLHZz!fQC@yB7uy}ii<6(TJ%H#lG6$-aU~6S(V94U#{Dz&4iR%bAP`#O{k%i@C
z197Fva$I4YLLebyOLLRSh3xX1=Wvw?a2Qz_0F@Y+Z<dmF;AGO{ogAZ5!)D9Fz~Ia?
I`JRe50E56LP5=M^

diff --git a/jsonfox.app b/jsonfox.app
index b1e302f004fdda6a8119841309a385a09fc1b0d8..4cb6089f2aeedaaadceb661047d0e57c9e45fefd 100644
GIT binary patch
delta 2811
zcmbVOZA?>F7=F*ay)E>EQb52DCZH0(H~e-+V`(dP1Ex|J=8s`huLA@GT9}wEjaz0+
zw*A1HeVFMF=Z3~Cn}|`P$u_sd{n%WhaYoG&0@<?Y79Gf_M7ZoZ_Y`u)Em;OR>H9v<
zdB5LNxOrO{>rveLz*xSNO9~xtV05gm!<}2O>$Ha$%^{*+vWSl45KWmzw1^R1gnZ;o
zbJxZcCH=7EqRx>7(de-9o}|yzwkuPuwuFuJd7ArNVOHNz3XSR>3MCk&kMs?uQo^ov
zDT`Q&)}!PxyEdv6E(j&8ARjW^bW!fcVdV}DD;`PDAm>Ozrbmn_vfw|)^p)CLYfil1
zK?#ZO*vH1k;vUC<&A9Qv!ass5MqxI`Y}Uk#_!fll`CwPQZd9L+gm_G!Kprv)wu|rH
z17)G7Oo4qoFjC2cPj0;Kp{y5sfE{Og8l1>*0@LzQJ%y$ZD>s;)161O!d5*oS2OTuz
z)XrFoB$uT9Y+VzF?xOWPg+u&~LIfw2u;5s!Zzv5-m;x6z?&6k0frh47``wCB_}z~T
zYy@m)ty;eWmecHy!ENFCRuw@xoJu7lxXjBruFJI5O%@7m3|3mTgSKT(JC#-V1HNFn
zx2&@JvTcU!T40*vZ0)}NUDl($?s$V;IOuG6`U2AzCmVK)(OjQz&_W3pZTrXyb)i-0
zX-R#aRomw*S&|~@4q`=-&8=!nyWL3_=O)~kYQCg9>BPvOn-b|pc3+NX=+XXi?uol-
zLoiV0A5YFgWiJG(Y*Zeotn`)!iselD0?TH@HrY_A4Xwk<U;!<B0q4uQn?6TlY-pvi
zgxN@25yK$r8%&|0R7Cag1yKkK$0vDM()l%G9pZc-#yvakiDhg@+8;_7igRSpN(l#F
zvnsw8H%L#XkigPMkkaV5?nFqW$5$~qWW%QmNVY(%7<V!wF>&D>+X3&!(yd{77SB^6
z9>Hm(x|03x2z;#{E5UeD_a_C3^M=HqjN(XcWLUfpBQe=X%xxrgdcwrbOP5jTBoh~}
z1q(T>{LcQpE%8Zx;aL}$8z0R26JH_Bc=1`O@P^4u9>NoC^H1EF7z}s(L>2W?eB9YY
z8RF~UzfI9XGsM?Gk!-wSW2GLM-mvlJv1yM|#TyQ_H>oIwKiE9J7l|rx4#AbFjjzON
zlFxaj!Gd%N(yvBp8^ZNbbebFg^HTBDlg~e0Tj<Wmvky%?d#%hp)t*9SC0jT7y`g}n
zy1nj6kFUGa{k9yBq!9iN5ZNi%7*$(h{%|bZpDHjX`C8O)O!c+4M0dB$cL+3%d^Kuh
zS7ofFH4<xWQSZ3~u24fb7OA=95vq+MyBnje4eHX2aX!NB0-57{ct=~<-xyKPO(3;V
zZ!FNbV;=q@@thpgq^i5B!;y#@jqXT-Zfa^#+iG{WMw7(HS>1z~olKgNtsS0nV0Aw`
zD0x_)G(i2t*j3`c1*};vWFFSVyi~}FSugFQX2zfuFpuOVFLkgktunhcuNN9e3fMmC
zqD%PY><TJ|r+)3%?3t^#FfU`Qi{r`9t5nFs@a2)<5tv|jq%bQ%q%DYhmGx_`oQ@2V
zkJ5H_l=5-5OGoKzSv!@pC(hD|qNrHK$wLF5LQ6h@+=lZa<g+OLBINxz4<PsC68#AI
zQ=H3Fi82a_1|i?XDTI6yrx-2lg?=7#&TOJJ(Eorw2XYrqDRgdgdp7wfi2npO19$|W
z8FDAiHt1u}uR&Id2ze99ILjf|;p~KL!>PcXwxaI4xnJ4jlV_T{Kg<8VfGz3XQ*y0i
zp36SVukNgERP%!sp+IS1OLe)os@mt><n;wZFQqOiUbb@Cs--KIt?Yj8`o;I-jnj#;
z;ch+7#197@vjkByfkNP5?el_o$4qc=`8GkEG7}tZY7)eCGr_^Jrnq44o0%~%!Pf-g
zLbc;RsT^c)VO9WVnFyJKnP-s!z-LW_0se4VxO&+{SULF36`~L1dgh69={&Nl$CbV2
zYaHyqLG&iT117=%SM><TC(Q&0m!lls(<^3zgS`WS_{~i84xkBXPG*=`r15I;$-!6C
z1Tn`<aPYf)L6n*a4xU&mh&mHt<={{28SMoaHxUN7;h7D><dB)+U{<*xzBLmZJXR-&
HeiQLGnokP3

delta 2117
zcmZ{kZ){U#6vm(Twzpl^c3U^-HejOzreJW01_ncrt}AQ^6WEONgSe*D4Pk}-Lq^m(
zNDP7)=8Z0x5SSm(7&R<4F@{7#B=H0B&laO#2+9&QnIbTkm4)`=^WM9`^#iwgbI<ub
zr|)^sId6OCSM}mAYOX$ZC!iET1$GLgTl#W~%KA%u5GV(5Dj#@uCeU99<O$#<+V*3c
z2WzubZ>8eJ>2wOnOsbD)&F&KIRkhsjL`L_aF(r_f9vRO<%0*D24PJe)Y-B=;xfE53
zp<6;UnXV$;kqMV39P>(xYA4l;m{iXQJs+NQ%7)tl^)r~HK<JCKdPiaNnA2eY+U2Wm
zdBzeLl7akc0m{>%l!7(4Y`TwVozQcb*v3r!&Zdl>h1rv8x6lhojr`#2>dNtKOt^WD
z0&StQK>1i`tDUPBka@5+!`S2L5O{iUBc$vYneeirncTvmopSnDI&ewF3p--Fwlio}
zw*1EHJcfbyMs{__m_uS0s?($y-Hs1*8=lV5t~(!3R%XqydGjn?b+M~Q#d+-?_W^NI
zYxlIxI4LV*HkNV8frU#~EMB%q^Lncvy(V-w!~@YS-La0IY!A*ZOy#hNs-k=FVR}3V
zsazx7m(wZpv|jH%pB)>Y3O6~iDcsNyTp#{K^k1nK#fj5$w@+E1lXd8RX0*!@fx{jd
zcfgpVj~ynyB_R7-DU2{<utsNOSQb-yAqU#dvpgo)DNlM_m3M+eXp*D)4tgFMO_rDD
zt;x_&7$BP|*)KU=qwQ?B+|*6tzc+}f6M0Dgx4Ur>m~w_ZrUIEE+c@bGF`e<g2@?0q
zU`HwYH^;m@@5_3o?(%IF;kG?pJ)`v*eYQLt`*z!9UWLY<Juwz0=Uy@`xlL(fEZ)-9
zI&~@T6;(9dXIYh*)3_#H?MYvt*p9~9x&{~O*VTnL*3{KBIXJ}4!Md&5d%j?D)OW<T
zm_HEyfPrk(#XDmiT{V%e$ZIZ>c@XM|MY>|4?vBpg9baT?12g@t4PH}J(H7~7w!V^U
zx=uuQ$2+^*V%MjDifC&rx>NY3^~m<Uk$5!Lc^B;H40eU%+kc+|ZtRK0c0M18GNv<-
zug&!rD%<jtEBvR0GE|`bR(NR1pm<yHi4kQCHzC9jhEOK@lrphYTtzS1g%Cj!pAtk6
zeWG0(DC!O`C6lB~^kNX__>t;z?l43@B77nuhOtG+XCCdXA~<EqxL#}(gJMWKQrwq+
zOc_A47(jrlnKl%yV%EOIXb#ZH4mNW+@&G6Q2v5*%=X!$n$pYXr+Pz$tX}`=r$Zu$$
z;))gl`{w}HXrJXeOgp~>$l*xN(+|*2lmbQczo&nccJW+b0sWupSI<QVg9H@>R|qcA
z&ItgO^hfAd(Qe~fP5%%2Cuk3Ih3JpcujjfFNVd-Y%4wUw<+<cT^DnTS$%&fbzU0lH
z&c2(t!4vu!w3h4cBjM42DYV|DG$j11))d~f3KD+)j47P43KEXBnZl1&LBig6!c?wX
zmEJgTp~n=wtYi9dNqF!8P)a!8BG@E+CkZSgtg;9OtY@QTh1)EGL&BO1K;bUZ-Bv}?
zs^R`~aZ!+{8U{A-)CU=G$P#40zRTvmA6W$n-}>7WzO@PxR^2d#Kdpj<EiPdk(XLF_
z%6E$^A@GCSRLZT2gaI}|R<+(LNGMjB!iyHcAz{TDf&GLDi(tSvcv<9D$E|{d54UYF
Qm9MRegy|MjxM>mo16_U+(EtDd

diff --git a/src/arraytocursor.prg b/src/arraytocursor.prg
index 1b89124..f4721bd 100644
--- a/src/arraytocursor.prg
+++ b/src/arraytocursor.prg
@@ -114,7 +114,7 @@ Define Class ArrayToCursor As Session
 	&& ======================================================================== &&
 	Hidden Function kvp
 		With this
-			Local lcProp, lxValue, lcType, lnFieldLength, lcFieldName, loPair
+			Local lcProp, lxValue, lcType, lnFieldLength, lcFieldName, lnDecimals, loPair
 
 			.consume(T_STRING, "Expect right key element")
 			lcProp = .previous.value
@@ -125,9 +125,16 @@ Define Class ArrayToCursor As Session
 			lxValue = .Value()
 			lcType  = Vartype(lxValue)
 			lnFieldLength = 0
+			lnDecimals = 0
 			Do Case
 			Case lcType == 'N'
-				lcType = Iif(Occurs('.', Transform(lxValue)) > 0, 'N', 'I')
+				lcType = Iif(Occurs('.', Transform(lxValue)) > 0 or lxValue > INTEGER_MAX_CAPACITY, 'N', 'I')
+				&& >>>>>>> IRODG 03/17/24
+				If lcType == 'N'
+					lnFieldLength = Len(Transform(lxValue))
+					lnDecimals = len(GetWordNum(Transform(lxValue),2,'.'))
+				EndIf
+				&& <<<<<<< IRODG 03/17/24
 			Case lcType == 'C'
 				If Len(lxValue) > STRING_MAX_SIZE
 					lcType = 'M'
@@ -140,7 +147,7 @@ Define Class ArrayToCursor As Session
 				Endif
 			Endcase
 			lcFieldName = Lower(_Screen.JSONUtils.CheckProp(lcProp))
-			.CheckStructure(lcFieldName, lcType, lnFieldLength)
+			.CheckStructure(lcFieldName, lcType, lnFieldLength, lnDecimals)
 
 			* Set Key-Value pair object
 			loPair = CreateObject("Empty")
@@ -218,8 +225,8 @@ Define Class ArrayToCursor As Session
 					loPair.FieldType = 'L'
 				Case loPair.FieldType == 'C'
 					lcFlags = '(' + Alltrim(Str(loPair.FieldLength)) + ')'
-				Case loPair.FieldType == 'N'
-					lcFlags = "(18,5)" && Integer part 18 and Decimal part 5
+				Case loPair.FieldType == 'N'					
+					lcFlags = "("+Alltrim(Str(loPair.FieldLength))+","+Alltrim(Str(loPair.FieldDecimals))+")" && Integer part 18 and Decimal part 5
 				EndCase
 				cQuery = cQuery + loPair.FieldType + lcFlags + " NULL"			
 			EndFor
@@ -235,9 +242,9 @@ Define Class ArrayToCursor As Session
 	* CheckStructure
 	* Adds or Updates an entry key in the oTableStruct dictionary
 	* ============================================================= *
-	Function CheckStructure(tcFieldName, tcType, tnLength)
+	Function CheckStructure(tcFieldName, tcType, tnLength, tnDecimals)
 		With this
-			Local nFieldIdx, loPair
+			Local nFieldIdx, loPair, lbUpdate
 			nFieldIdx = .oTableStruct.GetKey(tcFieldName)
 			If nFieldIdx > 0
 				loPair = .oTableStruct.Item(nFieldIdx)
@@ -256,13 +263,41 @@ Define Class ArrayToCursor As Session
 						* Remove the key and registry a new one
 						.oTableStruct.Remove(nFieldIdx)
 						.oTableStruct.Add(loPair, tcFieldName)
-					Endif
+					EndIf
+				&& >>>>>>> IRODG 03/17/24
+				case loPair.fieldType == 'N' && Check integer and decimal part length (always saves the longest)
+					If tnLength > loPair.fieldLength
+						loPair.fieldLength = tnLength
+						lbUpdate = .T.
+					EndIf
+					If tnDecimals > loPair.fieldDecimals
+						loPair.fieldDecimals = tnDecimals
+						lbUpdate = .T.
+					EndIf
+					If lbUpdate
+						* Remove the key and registry a new one
+						.oTableStruct.Remove(nFieldIdx)
+						.oTableStruct.Add(loPair, tcFieldName)
+					EndIf
+				Case loPair.fieldType == 'I' and tcType == 'N' && Check string length (always saves the longest)
+					loPair.fieldType = tcType
+					If tnLength > loPair.fieldLength
+						loPair.fieldLength = tnLength
+					EndIf
+					If tnDecimals > loPair.fieldDecimals
+						loPair.fieldDecimals = tnDecimals
+					EndIf
+					* Remove the key and registry a new one
+					.oTableStruct.Remove(nFieldIdx)
+					.oTableStruct.Add(loPair, tcFieldName)
+				&& <<<<<<< IRODG 03/17/24
 				EndCase
 			Else
 				* Insert new field.
 				loPair = CreateObject('Empty')
 				AddProperty(loPair, 'fieldType', tcType)
 				AddProperty(loPair, 'fieldLength', tnLength)
+				AddProperty(loPair, 'fieldDecimals', tnDecimals)
 				.oTableStruct.Add(loPair, tcFieldName)
 			EndIf
 		EndWith
diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 4abfbc1..0db2077 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "10.1"
+	version 		= "10.2"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
@@ -350,7 +350,7 @@ define class JSONClass as session
 	
 	* JSONToCursor
 	function jsonToCursor(tcJsonStr as memo, tcCursor as string, tnDataSession as integer) as Void
-		try
+		Try
 			local lexer, parser
 			this.ResetError()
 			if !empty(tcCursor)
diff --git a/src/jsonfox.h b/src/jsonfox.h
index bd34f50..9175648 100644
--- a/src/jsonfox.h
+++ b/src/jsonfox.h
@@ -23,4 +23,5 @@
 #Define CR	Chr(13)
 #Define LF	Chr(10)
 #Define CRLF	CR + LF
-#Define T_TAB	Chr(9)
\ No newline at end of file
+#Define T_TAB	Chr(9)
+#Define INTEGER_MAX_CAPACITY	2147483647
\ No newline at end of file

From c1a3b29631b29192f137251ad6560140fa273cda Mon Sep 17 00:00:00 2001
From: Daniel Carlos <89362488+DanielCarlos231@users.noreply.github.com>
Date: Fri, 3 May 2024 09:24:27 -0300
Subject: [PATCH 30/38] update - case error structure

---
 src/jsonclass.prg | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 0db2077..8542abb 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "10.2"
+	version 		= "10.3"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
@@ -39,7 +39,8 @@ define class JSONClass as session
 			do case
 			case this.NETScanner
 				lexer = createobject("NetScanner", tcJsonStr)
-			else this.JScriptScanner
+		*	else this.JScriptScanner
+			case this.JScriptScanner && (DCA) - 03/05/2024 - Se estaba usando un else en lugar de un case
 				lexer = createobject("JScriptScanner", tcJsonStr)
 			otherwise
 				lexer = createobject("Tokenizer", tcJsonStr)

From 3fb53287b3df09cc6fb18e8d786f40f6cb72207b Mon Sep 17 00:00:00 2001
From: Daniel Carlos <89362488+DanielCarlos231@users.noreply.github.com>
Date: Fri, 3 May 2024 21:33:29 -0300
Subject: [PATCH 31/38] Adding jscriptscanner to loader.prg

---
 JSONFox.PJT            | Bin 124509 -> 124344 bytes
 JSONFox.pjx            | Bin 9513 -> 9513 bytes
 jsonfox.app            | Bin 94207 -> 94241 bytes
 src/jscriptscanner.prg |   6 ++++--
 src/jsonclass.prg      |   2 +-
 src/loader.prg         |   1 +
 6 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/JSONFox.PJT b/JSONFox.PJT
index 6280b8cd98df0d9397354c6807a0f79d55f0c534..21c384d5c0ac80efda35dccdd0d3d337f97958ba 100644
GIT binary patch
delta 3936
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
I;lc*~2M_T&@c;k-

delta 3762
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

diff --git a/JSONFox.pjx b/JSONFox.pjx
index a5e602759ed7a8bc337acab3b352f6e0f9d96803..265eda9191851cee1506f39bbe35cf9bb92e2cd5 100644
GIT binary patch
delta 724
zcmZ9KPiWLY7{xPglFc6~xTd?=?sl^#iyqBnl1ZYT^dQzEJ$Wi(kD?yD2rXDPg+dQK
z^}G6~AP7BpSb`{`P`xP%7Q85EMGs09^eR>H8xNa}ha6_+_r1LLW;Uiarexn%Dg*hx
ztj08;)Q2bXpK9!<oUsIEG;3d%NYe2=lC(W0NnOgg4_l4{hWbED3d~kE5qk=s)erxM
zLl)z(t<+^nx&>dW8QBY$wT$HOUE3ZVv}zq3JcjzG4AkdQkfh)@T<91<iGxdqrdLd4
zSQ>|LrRu<SgBQqKW1(1xUz@0T0_M$(JkNK{Yg%#Iw@Rp`Pof2i_*HPm-|OKpms+16
zS*_G>5-&g0SSI8(+_f_j!Qo~`F2bOh>9;HBEQn(UgN6gEY7Z7CxPAvkyEMT_qO&uN
z-dbz_u-u7O$%d`2ppD;Ec-ZQbvv9P1Zb+`T+vEZ~Zj0t<;HOC>Zl)F^KZXS#6wQT<
z(FlI1o&3w>BT|G#5H=lIxq(*J^JmUSG7?Gj^bJ*(Ve7zbY2T{t;QlB4UMeCP<2-`%
zo(qfafA{jj)$}=4I7ng+nd!hUHyY78;+0}r@XFK3NqFN;H~Z*mhK4*1(v$@OEt*GT
p>Jpyr=rG$m-P}bV2qpnbBJOhm;$y`}Dtgd=;^_jy_uyS``Y+tUu}%O0

delta 712
zcmYk4ziSjx5XbkK%kJAf1TWs@a=A-3xjPUm-;aIs-lCO_5TgVOs~|zJQ_(U9hO7{h
z!Yb2>q!1y6MYzHrs3aDGpkOLd)QBk*75oDfadxk<crZKfv)}p7o7tS%oGFR1p~_b2
zLCM!H0hi!T>F*$vSZUNMQ_S;D9`L;VgPu1fH3-~|V~qTV91JJ}AaRb54Q~_n0>Ap7
zgF;3@kzENq?=JobGFHJWJY&!C7vBrON}DE-%a2Ube<w)(OhocvluJ?6+c+7i9CIRZ
zxXWvJIpSeZCPb$;!RtYcw<F+MfD{Q>d>{3Afg2-=!ex?Nz{PULUiW{OZ*UGN2$M*I
z%hg_>l~G!|+(0-%1|-qz7}q|98k`fUk{bQd#s9w6M(;4yKT=;|>@D6O%b3Gsjf`Ez
ztwt8!8zN)MT8&%v7;pJqTpEXPlSHSaqlWSaJ6rFrHxK8JV}Lx4H+x(I#YtKi_SeY9
zILF7$Wp)XVw=M+ANTD6zMythE@o8(1S|AvVr3R}NOMH(i94h5i1f;mrjQigvp0EIt
zB(YW@tJQEjE)8!G_N@Oh{=!1-gfULil=GSWB#l+vot_`$t(AGcI`W<J`*c1G=Y44a
zgA1KDF16LbvvIlSD!yv-@S0Cd;w)fRj`2_1;L+)6JlDC%wN4FHQw92_!`XR!*O_gs
zkefM~K&sMIE0st2WJIw>{!O|qM>yX--3VzT2y{w212kxgjBu&WH>(;(bbE@<BmCH%
F{Rg@ItZD!N

diff --git a/jsonfox.app b/jsonfox.app
index 4cb6089f2aeedaaadceb661047d0e57c9e45fefd..dbe376d093b2520b4f1db74d009a5a328e3accd6 100644
GIT binary patch
delta 2473
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

delta 2509
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
TuhWb@dV`DnpEQ0~XLZJZ3}-kg

diff --git a/src/jscriptscanner.prg b/src/jscriptscanner.prg
index a6afb77..75fb59c 100644
--- a/src/jscriptscanner.prg
+++ b/src/jscriptscanner.prg
@@ -78,8 +78,10 @@ define class JScriptScanner as custom
 			*this.oScript.AddCode(strconv(filetostr('F:\Desarrollo\GitHub\JSONFox\scanner.js'),11))
 			local lcScript
 			lcScript = this.loadScript()
-			_cliptext = lcScript
-			messagebox(lcScript)
+		
+		*	_cliptext = lcScript
+		*	messagebox(lcScript)
+		
 			this.oScript.AddCode(lcScript)
 			this.oScript.AddObject("oScanner", this)
 			this.oScript.Run("ScanTokens", this.source)			
diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 8542abb..b726a31 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "10.3"
+	version 		= "10.4"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
diff --git a/src/loader.prg b/src/loader.prg
index 166061f..443b54b 100644
--- a/src/loader.prg
+++ b/src/loader.prg
@@ -4,6 +4,7 @@
 Set Procedure To "src\JSONClass" 		Additive
 Set Procedure To "src\Tokenizer" 		Additive
 Set Procedure To "src\NetScanner" 		Additive
+Set Procedure To "src\jscriptscanner"	Additive 
 Set Procedure To "src\Parser" 			Additive
 Set Procedure To "src\JSONUtils" 		Additive
 Set Procedure To "src\ArrayToCursor" 	Additive

From 68631209f27cc572c6c5052b6661ac69ea25305c Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Wed, 8 May 2024 10:24:45 +0200
Subject: [PATCH 32/38] Stringify fix

---
 JSONFox.PJT            | Bin 124509 -> 124575 bytes
 JSONFox.pjx            | Bin 9513 -> 9513 bytes
 jsonfox.app            | Bin 94207 -> 94260 bytes
 src/jscriptscanner.prg |   1 -
 src/jsonclass.prg      |   3 +--
 src/jsonstringify.prg  |   3 ++-
 src/jsonutils.prg      |   9 +++++----
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/JSONFox.PJT b/JSONFox.PJT
index 6280b8cd98df0d9397354c6807a0f79d55f0c534..7ee903c8eb7613860388c38108117f4c3877e311 100644
GIT binary patch
delta 1886
zcmZXUe@s(X6vxkbl$I7PSbhldBb3p=bUJ<-m52(W8=y>JiZKGUbfQ4Z3KNMjrOKwu
zh&o@k7o6gch}MA)?dD_XH0X4S!$jw@WIxo+xh-zd!ARUxaNkFfe{A^B&$;j2^Lp<&
z@BZ|)W^bRyk4S%(h>RYy&R-A{4JvWDkm*@2Y>ZXkTx95avsjEaMW~m~e5T?}Q-Bz6
zGN^3jhAy!)K3JS>m?;Ki`FggSq6F2_wvo|Bb;+e?Gt>*ddZwZyp-FXSx}nSSC?P6D
zWjnMp&l8bh;t><)&*|c|o}oECf@=B&+;cATpFlq9Ia%mV##iY(x#`^QY3~UN;#SYu
z8*Nc+_E-l_X?T~%_-M-nZk3Ptvr4OaBi~&t9}nh;aojEU#qb~Ds^XQ!Y0{h`ZkDst
zIXY0)I>pc>t<L2Fw#nVOJj*Yzet6(%jKJ85k^rIydNF@(SnR<SdSWtRutP`m(Kw=u
z<B7H)?t-Tl;5ivZ+$D$=L&1`68E?}?Q09||OpgVU-OIRI<Lvh#q#*Jov%_I-_`=s4
z`cY2d0=uKyT-Ty`b^`)S#nsVJLl(QO_N{7b3M%AHV5zWLDs!~nP($YOb!MBz`pMY9
zn%a4F*|zdY_^HYSf2y%swUwo2i^W=7yFl7g%3)kDpDg7V<`(I@GR_rFuoP$J4n8Jb
zGqc&LOr49V%8KLsiN42b7r|$Memzmu1OU$kD-A>kz-IVj&<TGb$h$kQBTj-h2NP|F
zmw;VxLkLj|yd0#%4}ksfHJ~?yQs^EA+z2W`Xeb^GI^fly0^STd;dbx~7TFRiCdLJe
zJNhG~U<>C65A>3;mrY_#>UgQy!mseB^0yWa^P3PoYplM;Xyk|zZ!Zfo{yN`(w7z{|
z_~ny`<VYed61TzIUvtYZZsy%AOd`3jiLDdU?&1>uNJq66v#rQpX|>g+jaJx)s_d&T
zs=PP&p*-ay*QfeQ&RZOkm8|w&(Nb-Ny*}IFusg1e4*5}?lBuxHv2(QgI^;5!7g`)^
zYU);wHb5JRuI@<bhuwUGk4l|;I7z;<hp#dpluqpBd}kOQoq*qll~4k_AK9nCr-2aU
zU4=$j2+sgD@H=1yJQEDSUq!*o;7T#q!!yw0%04d#dGInc!v?rgOdH&ehH$}^Vv2eS
zr2*{Sy9fqBK6rxIM_N+JQ>F9!I8W$|Qi>BT#qZ}FpOZ`6a@~HuV&oKg?s?7^*d_0{
zzzqV&NV-exa-PB?S0Rg%eh_{rkmzmrR`4^t3BA|>-v(^xwF30l=Wr3^DSZac!9N5a
zplt@hWw_FR0TYQn4kzk^e+IsUyCaD1!7qWk5#*#}F+@)h{0_c>$K$PtL-GB=boljn
z>=`@~48XTc#@@hFz&UuqRHAx#HrNbre3|GycrmyDpPxvy4_*dV!v~Xyj=<M~)Z{o6
zD;ehuf-2yEC#4ddhBpD+PwA=B;z~{wojbJBZ<o29Ps=-d`AUTNAWI!IF@CJ!^;qp;
ztX?#mLSsu7YDQZ=4x1K&O}mecx{Y+x;6~->oKeM_bi%MobRCV6eq6_v$uE)VNmkZF
z9D)Bb&wk7l8~k@5jg1tHjA)1c^X-+a^_<1+@{xKz<CF9JynyHC1t|0GtA>Mcaw>W7
z6t(iL9vW6r^srVrQ1M=_-@x~M!cPTwUn0HtjVWrVu@>3!-n2_jCpU4sq-x|_x*p*;
z&m$LKC#k=Y=jwa72XT*(g#Yi8l;*;%`=o9co74WpVQ>(O-vu~^sKH2d6Mh(Mg}0&(
df5EST$H0wP?d|D}n>aIE*;nO*dXIfZ{C|P~!U_NY

delta 1827
zcmX|>3s6*L6vxlGEV~P<%Tt6_a3MFav5AM`YY+u70~JRour#>tu8PPm?4retNHB_z
zv2?sMd^R;|mX8z-UFDLc4r!X9G8Rsbjaq5yj8i^J&1d~DyEwDIxxe$>@1F1O`Mz^E
zoi<!NWiS$%4-rwKPYyLnN@}D|nJMM?W=i!*`i=b~+iFUc1e-;_C%jLUOSUj2*%qnG
z#E{aK9Ia$Uj#k2QgMDjl@schxp?CCs{UvkX6Z$j#`c(0xEYr1{BHMhAQsM{b%wyJ1
z^jXH)Shp>H{X}JAb_dV#J<aZvbnRi7^KH)G;k?z?UbG_}m$K%9vHY2DS7%fdxA>0q
zY>nrcKIh%94ZPl$_-I80x2Rv3SQnzx&-Iq5d!yOXkN2skt$ZU+H+^>L2$5aPYt+24
zoDkmomSSE3&)~W0!2%v*46lE7_dlz|sDvYo=$=_ATo9Wy&tfJf8wU4<5`Ef_=v05A
z6^IYRPsmtjTrqb@(lHW=%r6Q{3D<`wQqGgdOi2%z^pArmN!?PyRfdKKL4;&P!6bV;
za^2Bje`uuqqDgK~m0Y{Y&^G~reSS|MG?3lx@-C`!j>ca36WHfF?UmC*{Gowl$70!K
zcOG~?P~n|Wo9A*^@zUA@CaQKilPb$(yWQ#aP6>>LQMJdpxWc{28@N%gww1A!d6PI>
z&IMA0Bobt9<=vu7X1U=SvX4hHts1wHVjC(k1wINKGUFOSR0%HtLnDb?pb0(=EP>ww
z&G0wCQ+R1K(TDJNz+CtxumSD>h5>jUY=&2WmI0JO?HJgOKwIQ@xGsih7rY7#hnIpc
z;co3d{<bqlNgWccth+NvnC+Y|VNYw`j1tqkIYz9qa{;%i=j<G743D|`eDAxE!yy{G
zIW8$W#}L^2>v-GqQCJL%UPSUc@RLsL{Wsm*6e@M<l*ZjwQGS8#FQt&}N$vxpf0?ti
zBM^PtOo4btZyfUUVeoPB=LOE??P}UDd^ji~s_(cEjtidAtD`UTUqNw8aSpZJGgGa*
z(&;L$t9BN<i)uYCG5!iKW0&~u3SSOwlJ@chYUCeDv|Z&KeJ7%H7Ei8X$~w{b2g@Vs
z5{N!WA_3M8Ms*YY|3e##fe#x(bQ69CJO-JF_2RcVoF*n;<8hKBMk}0B-eZi$`y}K%
zuhvi`?ub`@Es0H>b>0-H)=#lSAG|<xWDrp(=I?^9%%81}T*#lW(Mo!HEzSB&Jy*rf
zfx~ZN0)7-qUc2ln*8Zn=Y@knqXrX)FDV=|U5r^E-dp|?CmUGOQQF{N45c1A<znkar
zxII4yhK&A#p;Q|JEfk7WvZKiEsi>~Ci^I$Lp}`l2WhqO@nH(j~Hghb?>WyaZX5K0~
zR&rrOGFDE(6m8x}I3d?CTwVo3;5F!n$?$B@0KW@n!E*tlKT1tRGQ1G1fKSC2qZ<Ae
zcpL6U|15!*fqM8-^pMssPO!yHQN-~?s}bA-S`t&d=sd%z;^ZoxBBAWsVNPGoQ-gNy
zuTh&;b5|m#tJ7M!P~s+a;~uV)FgbQFH#Qu?a&wTu0q(<hg!@}@CE_cZqjh(~wRWt=
z;Vwoi9)v4k8V>!(;3&KW2z1DO@B{oK5HXOb6*bZh&jD~8zSH7AP~RiIZlMNhv%;{?
z*Ks)qABvBN4Y3J~g7+j7<--Sof8eWLMqS_;;26C46{7dxd0;ub37fD6UJ6dYC#B-+
z3@-;2@cU_a3HSn#nT~|7rxSgJU?Hf5XAH+j3%(3sK4l@6{73%QK5pav>SiBzS^fv_
CJg!dw

diff --git a/JSONFox.pjx b/JSONFox.pjx
index a5e602759ed7a8bc337acab3b352f6e0f9d96803..6858d52632a9ff6df90cc5667f3af202bb470a35 100644
GIT binary patch
delta 376
zcmX}oze@u#6bJCczFw|Z6ok7{Y~`x$A8^U#$F-wlad2`Lgbu|;a1tyof|JWz9fVFD
z%LzI-6z2}Q3N8gfR8ag2OipooFX8*i%bWBkeMstMe+oCij1-!4Grk83S*AJe_~B}c
z60)^K2wx_o#Z#T&V;p1P-Ia{7wIAUg16+77F0Q&p+Em>;V}yKH^AEP5epa|i;y8S(
z446AmDMuPbco6uN>WZaP7d>P#UIsl7iYt5yj*F~HGvUzusOne1NS)$oI07Xt;mBI_
zUgq46j$ZBLx603J7XU_gGhAzoAhU!M@VfB|LZ)(j)ubRyq8yOlu76SJ8l#JD7Jt&R
zPDENfit~+uz0<A<vA;QlObdsFIJb?GQedw=0-^st_|P7fjFkVI+3oBXn=y&OS*J-E
IK6kc%09a*W1poj5

delta 372
zcmX|-ze~eF6vyw(wU?$k6p~VHCH*zaC3p97ada#W;@~U@9g2(KBv@PoCzrQ62zBWw
z5may}&K>M3xKspDLH`7k2yXB5-ur$Yym4>bW1?nNuGuZ)(kL)Wj~*Gdzyw%X_9{(E
z$i@O8uS<k90|^3WzK>4v!O{RoJr8#|!+G)TFC7AI*|p*+C**1|`QmfRAqt{cL1x2`
zQa@uOl);(p;l5*+csVu8I8u1PeY|kinNSenvvXwUt6Gc9nH-kw64NTsc;XH%DNSyy
zdY=Umhk?Xm_4uz!&Z_5(X-IP`^&tZl=K{Q`zcV2Xj4m6L3D8lhb(6c*AIhRAG&xQD
zZ(7hMFe<x=(^fy71sS;5YY!M`lgV71wg<S@YT$OK&xF=t-hAo|EUm=<TXwp8Jk-L(
O5^&OO(0hF8ZvF!Q4q<Ts

diff --git a/jsonfox.app b/jsonfox.app
index 4cb6089f2aeedaaadceb661047d0e57c9e45fefd..870edb33ab5b52a412a4a7b75b1d7bef12e8716f 100644
GIT binary patch
delta 2035
zcmZXV4NR1E9LImZdx1N|Ly&g}55;NbO9$ATrt^iD2?`3jkfwRw9dO{?a~_z|%Ptj5
zr&;#QZm2nRRwQE9W1eq0HPf=;X0_>BhSivx6$WDJROtKX0rqS@<GcI(zu*7=|NLJc
zdfSXgZyGH<UA<OaA{psd57YJSmL%Pc3)`Q4hEIQypOeBzm8~he!u7`%HYwvq{gBRC
z%6~b<I$o#b<=5-jDxaOZE^sQ6Xax~Dp>FUe!-zJ5H$lIH8={F0fww{4;Y1~|L?^&9
zG%t>*5jqe45ZV!sKA`WxjZjnq(ZM95R`6HQ1#nXe(QWW|P<sjm=&+Tj7lm8UPv9}5
zi87dI2=oH@$1y~6!KqLe_?>Y?%fMOCd2q=DqBY=LXao4INkm(~Wze_aoac%5f|o;;
z;BFhyXW(imJF|c&Ka=P<3M(N$*p^Ln8r%S(K21YehhGaZVLWswf@l|3>f%rg2Ib@6
z?2@K3Wpm+ioxJu$tUPmJv|Lg2W<(0jete(lk&cwRMV|0Lr=HLUVY}>pzrFrzqgpgk
zL1~`k_t@(i!v`v$;HbLNUkoRQ<gH!pab=kXaz~ZRQBz=6i{WH<zH0Y6T%Qjb?%G*(
zxn5^7#wy-8gnTYnM9nL9hr?A{n-?LEh)>`(3cqA!Zj?us73#iZSt>ikhvn2I_JC+M
z6V1eQGlmfTf~n32Pk}luSSlQfmEb~XX$;YRXal$iIszVrgCdq@F=PX8#i4l*ybRh2
zju8h3EDqf?@P23?*bQBdqa}13MiUA(P&`i56iA#x4^#!-3LODU&>xs!Bgz;vh4=4K
z23{J67j>YYoA4)s(~Gf3i_6zX=z9!Sd0S?h{J`lPH=ag6o-^k@w)6q>^hZo1WB(mS
zgHB1GV}A0`cv)WWn#0Y?Mb{a9!PBjxo@x~(T6GwDhT{~7Uhs}E@f-G}$3SU4W^p)(
zlpXF4ebT8Yb)PI$C)K#Ti|T!@MN(;<zggbxY2ao#-P^|JWR{9e=X5rnMcYX(ks3^U
z_50{By{`*ib#uJjE#=t$N+UXe3Gam1N>rat^c(n7XcKr(2GQT(tI#8;Np|}(xLV%k
zd)H7Q7HGt(=v>~Z*pA(>@*XAXTAs;RwzTXF%UcS!DD7>YC~i?o?=<WAq|)0pK8agG
z<0H9B$IYP~7A}tAJ)w3h54EyAbay6~8`&Ew%Hu0x39X4Z63IlNR3bBW>|=2Af~HW`
zeBRBR9JCDM#85{O7bRr3BgP*#wANwwE)ok;JGuYr=xL=?dC{O&FyY)g`|=4vUj@fc
z%?wimGu2i}YjXX5$$z!qGN~(zHT|IfRz;vIyR+2ccl+v=2G3UTLv9J4tYlm0pGv;M
zd?0w*&BcL4ylgB+gYnZ?a3?x^4m=TxLsu(s=kmcbARqWo=w<M1s0%z7_h&g++>N#1
z8Ted?W4i>J2VRc5^*UJG4KG;2{aOchLb8R1Qx{fjGYZ{MG4wb!^iegJ>ysyy<8r_d
z7h&)bW=k;I%dvqLAJL1e)H-(tD*%M~_8V$2RIGIWV;1I&jYMfMM`;4RFc%ynnhbNQ
zCg?NGm(;GrS9#zGGhf26dt24ds-#VXc`tZYjPTyiSjTJlb|BxRsnch!Zd1EGs11ba
z$7IC3TeX2O)9$LlEo~so!bt9GVG!T(fu}Gsz;x82CZn~9Fb(NykgpAd**;wjsx?8F
pFk@yhy#_O&3HnS=p4y^O8whj4!ue|QjW!YHb^Lb{Q|#0P{{uS|lIQ>c

delta 1976
zcmYk6dr(wm7{=dsm%RYGiXcd!E+}~!n*hb=!lZFaP}Y)aB`>YJ2U&5?uDg`ss9S`o
zdGE}yIyPfwC?i_tQP-NmE;w3A)+lEGm{v3Shf@lb*5IY*<1EZMv(KF0`@G-z_Pe~_
zckG(!!Bvy(e(wXjVHBC@fRAb44qLjR{^*WLqxsk;<s}(>NZp*V+hRO;Y=t^`+_@~y
zS8ta%4BVual{XqVSNUSro8gWjL`#Us1KkF<4JUdVyaD=6a1zmB@Kz|0OjMmh^ch%z
zszws+hC0D5P$U(7K;MFQK}l&uhti48gO5XJzy~vkZh*gru4hn~j@Utr0Iy5nNjXG0
zh!degaQ6hF3UDU$H+bV@qQ&5;&}ne>BSf!*OQCh(rbmf3gPqV>a9J+VUhpfB7koPp
zg8(msrsr1>&B`bG6v1++0X%gYQ3tpgLVGGgY{1)wQDQuFGyxrArMiX^tw($ceAX3u
zN!?g^(qK4Eirg_ysjXTwJd2*W+sBlBhsoS$q-^z%DxW2M$Jjqz?3pVVbTxLGw9rZw
z^UC}|pQ~YyWuO59cU^ZZw2<2`hhFtbk6Q=w?mEd`KQ~?rE#&gN=91mg@j=5In%Ph)
zd+Zo6=0b@SkfenA#V)s73Wa7TC}UI8c#YckqMdn<lIg58BpDR1^AI0aQs=wEzoVZS
z_)N_C7P{Dv`OXFxLLD}|Q5p5%N@&suA{lA|S3#@6Hz83;FF^OePE?MlqD4?G_-AM*
zSX7<`RU||2gS}A8NSaS4U>rao{^VD197?Ml?1QF(ozTZ%zsO^P5@L*#EU}Hcjz9eg
zCEJc~ufXpCe<NX|95qb|#xLXS%GUfbO0UQB@I=bFTYQJ;U*;mQV=1?66pNqlkK^zC
zXF8+2Ar<oh^|W-#n3O!Qw}idL7iP7~`=>E|?J#YrZPehem*nckfK=_D*ASGIi@s)-
z6{mcao0LMo!;sI)Hh;5qyKyglMB5F@4@#<%7bwYV97FUW1{;C4jm2cLw80B66+C6U
zc7DW}>Vu{$`vc>7iE=KmCC*%n$t_rsRLbwF@`)>UZc%4nF0-2EE_9w^WmDxQHT#-x
z7`Lk1Z?+rxsQT1jQ_{IL>K(#$2HqFFU}MJ!Zi!}R@lZR@kLJ$g8WYz>H<j^ubK1pG
zL|Yyr`aBb>jMZ)jZ>U%p4b0*9*lH&;mFL;-M{N$4(h6>%0e;wyklQ6!i?s+n87q7v
zE%z_&iqjfcQMI1_{8UrqRtb+RE;MVIcna0|SC$5Y{@~@9Wz|*{>$x*_C=$?@%QMd%
z^adK-v2)Q%k>@O&8OdDA-K<7>mU14uqFHtPJ#%ZM$IFiJ1pNC%3=j7aJqAX}&=kCI
zUC?;&3Y7k{;HRN5xEERgE`}H-=1e4VfgR9#@ElwL0dNiUGT4u!vKqV?S_58-<06iR
z1btwmWa808?;!XG5}hQDj$T;CHAblbU7(EV2sHQzGl2d@qI=K<2=hTKaZ{fV<}8dr
zd@)pPMC^$dCP#M2oD$}BM9C+J3Xp$7*QVd>I-`BONS81R^Q-T)o6@gO2=gRHCa%y`
z`h+lhek6Je<_28?W+rZstJ<H4>v-@HW<g|zA0sTloPO!m+FaMS5vFYj_fIcQ+|2`z
zFjv~NM2<co%(HeaQLax2v#m%=EYl^-ZADc~mu4`nf*aOl`pw)j?UP;lgfLU)Xo*gJ
MLYVs^SpiP|A13U4t^fc4

diff --git a/src/jscriptscanner.prg b/src/jscriptscanner.prg
index a6afb77..341cccf 100644
--- a/src/jscriptscanner.prg
+++ b/src/jscriptscanner.prg
@@ -38,7 +38,6 @@ define class JScriptScanner as custom
 	endfunc
 	
 	procedure increaseNewLine
-		set step on
 		this.line = this.line + 1
 	endproc
 		
diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 0db2077..7b51e4d 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "10.2"
+	version 		= "10.3"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
@@ -115,7 +115,6 @@ define class JSONClass as session
 				release objToJson
 			endtry
 		endif
-
 		try
 			local lexer, parser
 			lexer = createobject("Tokenizer", tvNewVal)
diff --git a/src/jsonstringify.prg b/src/jsonstringify.prg
index 6697b04..15cda23 100644
--- a/src/jsonstringify.prg
+++ b/src/jsonstringify.prg
@@ -68,7 +68,8 @@ define class JSONStringify as custom
 *!*			lcProp = this.previous.value
 		lcProp = _screen.JSONUtils.GetString(this.previous.value, this.ParseUtf8)
 		this.consume(T_COLON, "Expect ':' after key element.")		
-		return '"' + lcProp + '": ' + this.value(tnSpaceIdent)
+		*return '"' + lcProp + '": ' + this.value(tnSpaceIdent)
+		return lcProp + ': ' + this.value(tnSpaceIdent)
 	endfunc
 	&& ======================================================================== &&
 	&& Function Value
diff --git a/src/jsonutils.prg b/src/jsonutils.prg
index 580395f..4c0396b 100644
--- a/src/jsonutils.prg
+++ b/src/jsonutils.prg
@@ -170,8 +170,7 @@ define class jsonutils as custom
 		tcString = strtran(tcString, chr(9),  '\t' )
 		tcString = strtran(tcString, chr(10), '\n' )
 		tcString = strtran(tcString, chr(13), '\r' )
-		
-		If Left(tcString, 1) == '"' and Right(tcString,1) == '"'
+		If Left(Alltrim(tcString), 1) == '"' and Right(Alltrim(tcString),1) == '"'
 			tcString = Substr(tcString, 2, Len(tcString)-2)
 		EndIf
 		tcString = strtran(tcString, '"', '\"' )
@@ -212,8 +211,10 @@ define class jsonutils as custom
 			tcString = StrTran(tcString,'ç','\u00e7')
 			tcString = StrTran(tcString,'º','\u00ba')
 		EndIf
-		
-		return '"' +tcString + '"'
+		If Left(Alltrim(tcString), 1) != '"' and Right(Alltrim(tcString),1) != '"'
+			return '"'+tcString+'"'
+		EndIf
+		Return tcString
 	endfunc
 	&& ======================================================================== &&
 	&& Function CheckProp

From 62d7cea8798a4a77c26e7824db76fc7b74b4e3d7 Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Wed, 8 May 2024 10:26:57 +0200
Subject: [PATCH 33/38] fix

---
 JSONFox.PJT | Bin 124575 -> 124608 bytes
 JSONFox.pjx | Bin 9513 -> 9513 bytes
 jsonfox.app | Bin 94260 -> 94264 bytes
 3 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/JSONFox.PJT b/JSONFox.PJT
index 7ee903c8eb7613860388c38108117f4c3877e311..45be2e6941eb34f5017f489c7749298c9d9d4278 100644
GIT binary patch
delta 655
zcmX|;Ur19?9LImZySY1E8?`ZKYc4A$Qz4AV2PukTSWUBeWt+5MYZKGV>+aoX2@(Bq
zZHpe_DEA?vo+1b$xYR8W8AK00C<H-&o{FHC@Wn72&FXhub>Mq`pL2eH4t&qOMZUbq
zn*nTP0N9}>8Y~>^v>VwFcUT?b-ug_f%l7B#DD(QZsUiPlo3dNLSFF|NFh5iE1c1^O
zM8CQ)(6`rsRy%tc>fmk1g(CyUPO{IT4@?faRR51BsOC!QdG%c-64KH^oa41`0{(Pu
z_WoM=-NGR~UgrgvX=WcIO)c)I1rU66`Lqc@bOYS+0Ps|Gi`XM*UE}C7*eqy;2h}xz
z^-A3uD5pe}wJ#!OosP#wpaB48NTgDO;<@1or!p~(joofjEm05hS@A+Zl0@mn-zzg@
z^g<ycP4Ts&1{fC;DIqD1PG$ni{4`eh*{w7c4k(E(bSSU$IEVqQ{RT3`xH4bB(aYoY
z06kQ)pEO0hOgc?`h*TvOEC6SSdr4P`k8T1;6Gup4;xQ}0CE^$<M|{x+aE(~+xl3Fn
zBW@C}korlcW&i`lWOpnp4@=6@67EtKirCvYLm7Rw*TTjwjVPTZ?C16f+LaP|W8|jp
zlTrNt3t@6@l?EnmZ*lt9uj^g<Km1#Bl-fy$97T`tFuISpdXSCe`<!0r>F`(I+d-C+
xu`zkWHCcU>ml40R?S(9+*lZz=W%j)g=3EALqA1`ecE6}{s|J=1J6QaU<qtG2r``Yn

delta 641
zcmX|;Ur1A76u{59Zf<LTnk$=GPM3@f3BsrcA1qxZg*B(*S}oh$R=TNM+f1W}nB+8i
zsxSHwA}OdIVh~>F_Ll2GA{bF2y_#)3M1_n>hEqF3>4V>QfA<^?_ndQQ(~9Y|LJ6RI
z4FG1*vqdei0|ps$3N4~j_-rZdd24ue<t#H<c8T`7@IGOsjO|R+v+l%u{iU!g5T!CC
z+GPMtKWP**9SsM!%WP}8^%|j=I82H85&+MgvhupCy%YgU@!C8OC}k!;N6#<G`;J58
z1v9_5h^M9XMGPROc_4$sc!Dov(2b9Ia~8XWyuhcj*vWroaR%r4qi<NvmaKB|$D}wY
z9+^m@IQ`dQXU{tJu)P+8@?m{(2mooR72hb>tbI<JvEhnQ-}t{zvkBlu6<csr)MSpS
zX{KVA=?Z{}N~+rpprUD>kUwvi{#-_5iLMs4@U*ZDu$q@|MP3=i=nf5Z{jAa#mSwQI
zrh%z~mF)YdbUTP6<+eFmMR6rc@c4XPp`d?gzkDO21#h3<8?<`D9&dl_T0`kZSOw9(
z(8%#fBoz6u8B#*5SlAhh+~xK-Zo>=QAICf<`Nc6Dl&2sC%~E;{8RAjyxrzNZdQ||e
z^wlOJO#YQPPu@c0$WN*P+~jA7QSv4YK#1H)w2`~D0N2TTh#~Tj4j@kMBN%y(c5{pT
tH(?_R^iDq$yp68ms6WC7-eD~t7{@k&)|>ih;-ALxl<?9nRVUEo`Ui>=vOoX;

diff --git a/JSONFox.pjx b/JSONFox.pjx
index 6858d52632a9ff6df90cc5667f3af202bb470a35..9953552d50fe0811664ec62aefe170e2469b7658 100644
GIT binary patch
delta 285
zcmZ4KwbE<Deimk93**g)SQHpJ`FR-_6by~c3?^Tcm!HhVc8784<mYUUnazw%CkskS
zvP!ZrFkIODnw^=Eaogti9L$VdI$S^<W~N3KmXi&{l_tw^g>k+F8DeZ{ZZf%$U4HT$
zt~-qGn=84OaxzwKmKSAbVpQ9#E<TZkk#X`)=|;xL$<{KBjCqsy%G~F$FgGzWGd4Dw
z9KazWWX{OIAON&(E+5b|6JujT)5#y$<Tk&MeZa`Lbn{91PA0AktUxIvV>2_;$qC9z
zlk1eiI8)d_sx8dTCO2}+PyVBHhtX^DP31<W51f-@RJ<h{nHU%X3{5PIj4e#f49tKm
TBrCZZfU;FU{ETbzJr!>N2zX2g

delta 285
zcmWlTze~eF9L4XOr1^0{QBbP3dL=EmCYRh@f`5R}B6P~+(8XOx9fS-bj{03)9l8lO
zIjGn{aC8)c3JwYmg0q8{;lbm5c)T|qPKVd`j-4b*&zv3v$s8fQB$Y8fGltZy;SoRG
z4@VR#!?C~8I`Ihk)!&{CFw;N24RnW^iWEFAFm6Y<LCYYVH&NPD4m^gJw1$a346g#X
z&}`YWfa}fnxdUr>)2Uz&x4IRa;%)cMmqk`^6$>-9w5WiPBa4s)r}-4i0v|d|f33d*
z-03HFX3@H32v4OHIO#`t9F@VoYoaVy604BmUsOYhFa632DeewNtARN?PO_Y*xsb6m
VPGwxEST&238oF)dh4?xc{R41EN)Z46

diff --git a/jsonfox.app b/jsonfox.app
index 870edb33ab5b52a412a4a7b75b1d7bef12e8716f..56fbb20d63ca9dad20209771ebffc0f232fa4ee5 100644
GIT binary patch
delta 640
zcmYk2K}Zx~7>3_(c4v1@okO;($yjMcNvAr86}hd5OUi_m7`X0+?&>x=yOJ)%LR|#$
z5TlF|9g9wZY_SC$1i_P+z(ax1=A}b~?sQm!$@=~#VFq6Qhv)tNf8cvlk>6Eh<-q=P
zN@{_ON|vzmR5>mM<h9O&4(Xy+>O6gSEAqhybO4y;Q`KJG`9y$o#a!8ohfW}N;k@(t
zsI``*rqb?Smgu|LU!9?pxmg{db@QA(C^h@cqOH-_(nouKDDt)i&|86LDiGwC7MWG8
ztjDR@r_@s;UOF}4_b<5yYpI`d<&y(66F&CZ5AZZXNTgD?^ojcq!m_pBP2uaU0k^3`
zZd`vDH4NQ&|6hfW7n54vC<NW1Bbd|^DJ^NFr}EK|>t4Vb2$E{4W3)}nR&|WB6fGym
z$s`)FYH3OrC+mP1|NSzj!2E-AkNGOcVb<z_QRY6*W9FU)V4C?hXOKD52s~mQ=FBqB
zDZmqEapyU+!^>D;wmCOBfi{4*jhvAjP8de{ONQqB#jc+~gzY!6h{I3Fi3a*t_@zV3
zr;yu<Tb%V4LY`@Ni<q|%Qton#jHd_)dFfg&p}@B2Y1k4LZ@5=hy@im|aktp;7DDb=
I?NikB7fA7caR2}S

delta 651
zcmYk2Pe>GD7{;G>cE;RVClTE&D%!+@hb|q3M2l6zHeFT}EoC>ibhma#W;e7tES;oN
z<Uo^<7r`#!A$DoJO43OW-u6&nSOh`TPJt|qYwy=2%)rC<`<~zThxyial+uo(*6f3G
zQY#dE$PmiU)RWT3jW->&^U~XBv7>EtGx*X6gaC~3_-Xa|NSOd9WW4whDf)h<iMEVv
z<v#TqpDS@%Hp2F>RF#Y+J65#q`LW<uD=>cwuucPh-nqj3deC|rp%Xr}jT-RE*#q{g
z%5gGFgOm#fF!cRQqq8StzZSrvbA{>KoYfws*_P(_GQfwR9*JafNV|JGdqFW9!_?Aw
zvCcJq<fgURu&!(R_W!CLd9gB<*B6esi;m)+mPp1X_0&v$+&s8LRa!NxQ<PEGv5p>V
zYMKn9Zu3uyQiWT7ppWnD;><Aba&9nR=Ge?vj{$M!>zp~}t^lAhk8-Xt#~Xl0%oCg}
zv!()%nUfrY+2)sd!u*>vz;SraPmP>Dc{8Ew)^3^}$c3}NfFQSD#qS?}qU;aQKOswp
zEsvrssjg`E3Q@`-SM+&>D8F2CMcO0kMA_6cPI$;|!DF~3WP05#i(VnhXv7uoyh4=a
Jv@0qe@fR*Yh=>3H


From 617f3498f2319296143a03cd6110ed3d1e8350df Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Tue, 9 Jul 2024 17:52:10 +0200
Subject: [PATCH 34/38] v10.3

---
 jsonfox.app       | Bin 94264 -> 94292 bytes
 src/jsonclass.prg |   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/jsonfox.app b/jsonfox.app
index 56fbb20d63ca9dad20209771ebffc0f232fa4ee5..6e698bcab16ea35fb99de19c3568ceee575f9534 100644
GIT binary patch
delta 1117
zcmY+BUr19?7{I@C=XHOaYnFdzYh!DhT0Ir`5+vE?73NgXTgV;)bGMkeUAvozBJ3fp
zh#c4jMd%^wC3_HLP(eY2&>ut}!l<{59>N68jHa>OI>+PWbl`H&_xpX{ckXxYvlV`M
zg|}!w|GGFE@Q{lk*q*RdbE(O>W8aTfmAL@Y9spA<z#Ia2g!f8%RXy$*<PfJm^aN3j
zy6*AXvY=VPocqN=RuB0d{yu0<5VO46SL4<j2zd{x;H^VhRrUsJjgZ&O@VqW-f*szE
zv@)2^`2k0`!S50*4e(-zm(&&Snb0cI^e~$>gXVxy{Ice@5z5!){A*eKu?Q{V=ARHg
zzJe6%Acu4Em6{zyHnx)fW;N<NQvL^NMmU$l)p@N5oSF{Km#Wjg4mBoNGi$yEN6MuG
zz|(>eI+IE?ekFQ&sERM3U}t-qD0hg$f}SE15Og6b4NA(GiLzp7iucG7$xu>=0}_en
z_hJKt<nD+N?UOijp-ZEpbPtJgS8H>qc@G+)t2HFb!Gs)lT4<gb`~yltRxrh<-aA0)
z!T)IcrCzBg`BdHT+pA_O3U$4>izw6TwCWDnDsNO%R|1iNSidM=mEwt0qiTD=fm~`V
zV6T~U&;%27NC_#~q$sko;G|3s5h;;W<e~M<Y~U+GuhqN42@avmOW|$3&ZakJZjX#_
z9v*7}sKj@92S59Zz?P|#aa5ja2?M<Ar#Z{}33x+b*EK3OSV7=}5h_Z_Z`xZ%0>fhf
zP7FPa&=J`81fU+n(~Q6n59oVCdtGEqF@g4_sV{MKC}m#)DEok0;Dli|iNN4Tfa@6E
zV#F?-_)ObAW(9$1JPo;#MOF|P-lF0gE5ciC05{EOx1@+G42$0c{;*KtV+Da{-BdKQ
tf<X7wD;bsdxEm0(H6j?sKE>t`I3v*FX;u(8-b%$hD+t`~rDBs2{{UJy^K$?I

delta 1133
zcmYk3Ur19?9LK+B+jVYEG0cCh*`H0bgd$0T$boJySUN*jSPzltt>&Lyy;DRJ7L-w-
z4{;wvdJIa0v>HTEZ$U-mO9&Ae2|<C1(jQ%;?b<mzD(ArEob&m7&-tBm?%aa(d_l_5
ze{JkF6hXp5H^KbfoMJ<U^yJ{;{=&6Afa(NR%77;X7^UN*&6C<8=YV02X!o6dvP)ZW
zx{fVD&xI}d$AGvQsf6?zdI^GY3AstnCo2MSUvpb)I4rA(1B-!_Zh~EFa+Q-M?V8Jf
zAQLIwh8N{=3lh?CqVK>&(gQl98?IZa%*4xtbY5F_RY$)N-HhpY7IX)0(k?gomylF>
z(z6sNpu<^O{ym|`$!Cj=NYYHIK(`|(&gr>8#X6yzn=qnhqt=u@zA;_Ro{(0EZb5C5
zZpsoRx)En>ut1wEZH$@A+>WTp2+%j7thrAOg|CDz5B@W4A%AmYAgDA2eKTf`tYGL|
zNFI>Ykd?Cx)P>uWc6oVw?v>g6VHWq9s8?FseW5P-`zEoXMpat}gGx(7MSX>Bt6ED#
zeNgd7l&~R(BO5&ZYD7^frB$zMs~$VKr)7EVg=6_!i4K|%Dm<rZ)!w3lj$-bz(B9wO
z6I43oaHR68*6DQ+lXk~zFB@|3fE7)0MDD9oRYjdC;mnM7Int*pgCAn=yx$0!(x!bC
zh8n~^``%U=3vETQ2g74OqoLD40e!Vm`fWD`k6hs5@iwIc1|RisF((QJPxf-LDhdW~
z4Revre$QsJFz6l`e;OuvQTGUN<{3~$11E$~8d~1))fWYk!QjR$&_$sl3I^Bc(U=$#
z1%rn_0yikUEeHyC1N~olktxwIsE%J!$j+!rFXjHtGe5)(gPk^#enXRC>vptfa4v_7
zQc*DI+Q-EyQ7|aEx#$o?hU5+qRMrp-Q5qFY8jkt+k_k~T*xSIxD^V~wKVH*A^8N#w
CdHbaR

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 7b51e4d..a199ae2 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -39,7 +39,7 @@ define class JSONClass as session
 			do case
 			case this.NETScanner
 				lexer = createobject("NetScanner", tcJsonStr)
-			else this.JScriptScanner
+			case this.JScriptScanner
 				lexer = createobject("JScriptScanner", tcJsonStr)
 			otherwise
 				lexer = createobject("Tokenizer", tcJsonStr)

From 03eab475817d4c9aea76c31dda9e9222244ad275 Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Fri, 6 Dec 2024 16:57:54 +0100
Subject: [PATCH 35/38] v10.4 enhancement of the XMLToJson() method.

---
 jsonfox.app       | Bin 94292 -> 96342 bytes
 src/jsonclass.prg |   8 +++++---
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/jsonfox.app b/jsonfox.app
index 6e698bcab16ea35fb99de19c3568ceee575f9534..c67b36598b76bd35877c9179c4aed0f359d19879 100644
GIT binary patch
delta 24920
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%0Dram@QZ+0}=_P$fPnLRlH)d$%L4jj@NrFj8k7R
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
BXSM(U

delta 22741
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

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index a199ae2..ccfa478 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "10.3"
+	version 		= "10.4"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
@@ -238,9 +238,11 @@ define class JSONClass as session
 		try
 			this.ResetError()
 			=xmltocursor(tcXML, 'qXML')
-			loParser = createobject("CursorToArray")
-			loParser.CurName 	 = "qXML"
+			loParser = createobject("CursorToArray")			
+			loParser.CurName 	= "qXML"
 			loParser.nSessionID = set("Datasession")
+			loParser.ParseUTF8  = .T.
+			loParser.TrimChars  = .T.
 			lcJsonXML = loParser.CursorToArray()
 		catch to loEx
 			this.ShowExceptionError(loEx)

From d28e814340203677b6d9b3dc8ce51726e9bd0a4f Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Sat, 14 Dec 2024 19:32:36 +0100
Subject: [PATCH 36/38] jsonfox.app compiled with vfp9

---
 JSONFox.PJT           | Bin 124608 -> 124674 bytes
 JSONFox.pjx           | Bin 9513 -> 9513 bytes
 jsonfox.app           | Bin 96342 -> 94346 bytes
 src/frmjsonviewer.scx | Bin 2232 -> 2232 bytes
 4 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/JSONFox.PJT b/JSONFox.PJT
index 45be2e6941eb34f5017f489c7749298c9d9d4278..1393fe151ee1b916c46438f6efe0ed30a007b988 100644
GIT binary patch
delta 1328
zcmY*Ye@q)?7=GX5N?YjY4+>*+Wxy<SBgST9nVM}l%8!M?M5qS*hjnmcO-K)~WgCAi
zn+q$r%*=3%&&6nT3nJOV8c(^!nFVG{bYvK3qM}j5V$5($W{jg_X;0r$P`u>HJ<s$0
z`rf;IlehFIXY>YutQ!DOr1&#3IoV_5<yNjzY2}U;r)xR3=qoL9fy<Geo3}#cpIv6T
z)Mev`4YsHpEw#%#ZO_PNuTDAZa&r7|>5_Y5b@6|FWXavf@5{DDmB(&p4nI*cSfx02
zxsbo^8myA5Dz4%IB~dZO@yU70jmq!L{IHwY+f8|hBg#bcp)S0rY?#c>#$jdaHzQ7L
zRc8OlO2<Lv?n1v6ht+Na>Wo;c9=4*>gdeIyPQ1Gg8`Wdmams=R)rviMP0!bT(6WP_
z*p6q^(~W2}<7IWI4fh*xulleP=bX%Y2ltRTa|g?L`GGf`nWxF9Ra>U<UM_n$PU0hV
z*A@KQVcpcK{rPtxhx84f+XOJ{mZJ-K#ZP~g0|+iMy@ddi8!1={pitHi#AhOrR#p_j
z!yIz#d<5&Tg#8-9C#*5hEMSWN#X(FDiACMJY+XMVnpZqS(z^|8M?bm^l<NdvOvkRg
zhk2~8AInOOkkCwU%^k~tMV%KlE1ZveffO}d$fTeFK3&ua?Aw0aSwD}O9>!y)WSc&E
zS>lfn6YjY8UJQZgEt>T`(s^={)oBo?oJ6kX0N-kDNe(cvwgFske~g+DD&th1(0C}&
z(%{84?CbzGv9Z%=QRfD*I1@KBeh9bWZT9RCcE6Cd)Qy(4#Qh0vSs7BwO4}h(Z*t!M
zR(k-eR!dv8T0XL0hOit>%zh55So51$p}u+!-?1DoOauBM07hsIOMzf#;9&1s-HKJ$
z{QN$j*yO93)~BotNLnuigd>7<DkJ5kLv^rS><|o@E4oTZ>d%(70qRA6M@^th;7luB
zc1x1K*C)0#l-1WRn?`79sP~C=Au(8xmC7@Lw?_(z61g;WhJE=yI=Fco>u$h&{E^`(
z=HySVP34-Gb7_m7_Hd6RTxFh7wEHI<skj~L{h@HRBvCuzXt-^6C=}=nHaSyK8#Esh
zk5nIR7rMg%F}RfW#d0hInuL&$Doqrm^7YUmgu;^8TeyLZjA9LztM^CoEyPD`U<}JR
zMD^n_^dUb7bD$b8;Ur=syLlOZI{q6S=y&?yHwhcp1Kg*3fb<9ENn48m1iBn0q}LF_
z#4T=sy~GO$9^#*G2G~!08v)7y-gpwAmv}8<ium=X0A45lG9k?aaFTF=_yNL*2e!hN
wEdZBDbP*)trwE@A4-%rp#d2ywJVKya=q;Bm3m*2`I9A$c=>W-x&hYQ^4@GK)Y5)KL

delta 1281
zcmY+EZA@Eb6vxjgx9<&o8BACyAg*gC8euTV;wIr$M3AMeq<nEhxIz(Iye(sxED$%v
z;EaiP$rD{9o5>u$Z8KN7#37VrQxjoPSZ4gdCQ&EZ+@b_%P$-^KYV^ZD`JMkc&pGEl
zx4kc4Rfnh48i3?50NgJ%>GTRQ&%%j~iZZEDaU@4|qs}t&qF2ncTU8Bv5-8rV8%2lR
z!ueY)BjN=|in!0RM>Lizr8n(11=nz9!|hY;xSKeks``2pGsK|tC^uGQ8Ik^S+EO|H
z`)}1s*2nC)L1IP82)0XWB@+s+=nB<bD*M664NFAty3!Cok%rxE9r%%y72dK12c?3U
zGd66Je*7a@h3`o7%l&2?lsh%3)MCAS$c#1vej%T*;e0xJ<s-#7VM4!LQjHhYoNLIt
zm-Q9nad}`rYK{1reBuBe)Sz2lYQ;I5d8azMu%4|zx|n-TfPSZVVL2^l_F5_+*vVYV
z0uUac<PLyOsp>d!zI({a7QVzoiX~+2V_1XR*ym%o-Fye4CNQinDj=eUwH4)8?DiOD
zCvjk9>Er0sP~HZfh?4EUjA^WC9CIBSSc@9qqBEj}6=g9-&G7bWIZ#ARmUWcW!03vy
zkxApY&p3-wHJpp+V{MK_^lW_`Q=OAYLsMhrNw7+}wXIPrc>WukVjcBtZx}OD?qO65
zWvdaS)*NI;li+Cs>j<Muz8c0HJtnh1zs21+%p8;0x!X+JBGCC*J9?z}sv25#1`?}k
zU@-}nwTV@uz~(2h5OvHpg%#|z?{KGlY6=HUy<8H|r2=Td9TI&0R^M|ye{%_|#$ErE
zC*bl_oma;#9mK2#AK%RjK3&{XL8ZSr(8B-zZ(PC0;<NgAUIVp(rj{yS2Y+kR(Lt#o
zH1&7_-n#1ATti}-x31O`s0jxAisZOufbuRO7!b&%seQ({Yx$pB|7<(o96D)Xoprbk
z-(cA{F|}8?FJ5ZgETu>5Y7TV?e0zF4p@){P7dkzG=Xrl{SDQ6%ra)~|FjOfBG?70X
zI#3!6`da;*Eiu;J7U-@#+{|}|d;$MP*-M)_9k}=)A3u6N6HFU7s)iOm7!m?K)0yn@
zO{~HKS^pEBMEsDQox@y3DahC6(1Y?rKVuj%kKO$RXM2ZencMU}z9Iced@dVco%lD>
z46%cL|J&(>=}ASz(++?qh%-nF#QhHfJVRVSx<u@H7@(WDl5~`~?-794iM^yN#1(k}
zr-%=dTJxX)7V`l<prD;pxC`KM(g<+}Ng&QI1Q;bgMxwLuXrX9Y&SM|n!ZHQ@Q75MD
mY~VCLiKFuM)A+rWH4b1keGuLoz&l&n^;alx%UQ2tA@>jEaeq|+

diff --git a/JSONFox.pjx b/JSONFox.pjx
index 9953552d50fe0811664ec62aefe170e2469b7658..fc7757b221648d1ad426330e18c96e19235c66c2 100644
GIT binary patch
delta 385
zcmX|-zfZzI6vwajQD{LUrX?U~5tz+g??<nWj!eeE*@?u)#l%&jo0H319ZVPuqp5BV
z#F+tCM@<Y-6HWXFY{9U-doS<vKHnR5hh3o6(#jn?fGuetStz1t@C1gbG{bVuD>n^7
zc9#gbEfLaWTv2@XeRQlxQ!0gq=iy-<@YQ-t_gSR1lp6O6RjUSsTr4MF`F8^Zl|kBc
z@xzXR2TIN!$4<fiEv8f+g#u6VK3+RJK!pnN#pwg*Tx6u=v}oE3IgRIT-{f3pa#-;`
zb2JJVN2_u+uae8k6@XNd;(EOgN<=iH;C+1xlxsD(X{17d&e-l+n5J7zO(&U$;G9YP
zu{M+G#>jv$46-P0GV;HToYZW#Q^oOCFP*U&0K2Uil+@V`7sss_x3?O&-|hjG|CuN4
S*pz}UzUrXUo8KRGj{X2*1!4{W

delta 385
zcmX|-J5R$v41h1hNt0AOiju0OK!ElKBzKp)OGm~oFflV#qGCZ}rD9}a@d^@Br;aGF
zF;vVQ%E|~5Dh~;M0(UK9vt|49XAe8W4kR_lyM=r3xssd;rr6*SEKo|MxbKCPEsK!d
z1wxh=3E4`SNbo6+F>oJjDRt~ccvu2_abIySaBRUctkmmn9SE6}i?7m~1tLungTfEL
zXJ;%$D~j+q@ceg!WVz&cQi|~^XamjC44;EOWK2;#Q!7r(w(oP1i$rq4@I2Htt{H|`
zjXs?;rCQXjp3S4;qIwA+MXqqI(FdhD27`BvDNxS%;AUM5F=pW5s?@iwXw&N@Ey5Yo
z%YWR>V!AQ1AeT~@reYL-TaHNRY^H|e?XIqg82~#wJy3$09U+c&l5tM4-RuJue@9Q6
SJzH}A|EYskcP=n$9sL5oEn=ep

diff --git a/jsonfox.app b/jsonfox.app
index c67b36598b76bd35877c9179c4aed0f359d19879..803f98952c5ea739169726a7c125c30c8edd1f40 100644
GIT binary patch
delta 22489
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
M1zR<wI|TAS0Ixyj+W-In

delta 24653
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

diff --git a/src/frmjsonviewer.scx b/src/frmjsonviewer.scx
index 8ceac73e2401f506663f3c1505cc9c76a4da8008..bd108d15e8bcbd7f29a41dc97d5559973dbb3927 100644
GIT binary patch
delta 13
UcmdlXxI>V|K!S&FBg+;J02$o_Y5)KL

delta 13
UcmdlXxI>V|K%7TnBg+;J02&Aba{vGU


From dc32273b6d25fa2a983dfb5195dcdd86132b29d1 Mon Sep 17 00:00:00 2001
From: Irwin <rodriguez.irwin@gmail.com>
Date: Tue, 7 Jan 2025 12:20:51 +0100
Subject: [PATCH 37/38] Version 10.5
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Se puede enviar de forma opcional el siguiente formato en el parámetro tcDetail para especificar los campos: "detalle<campo1,campo2,campoN,..."
---
 JSONFox.PJT                | Bin 124674 -> 124839 bytes
 JSONFox.pjx                | Bin 9513 -> 9513 bytes
 jsonfox.app                | Bin 94346 -> 94496 bytes
 src/cursortojsonobject.prg |  12 +++++++++---
 src/frmjsonviewer.scx      | Bin 2232 -> 2232 bytes
 src/jsonclass.prg          |   4 ++--
 6 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/JSONFox.PJT b/JSONFox.PJT
index 1393fe151ee1b916c46438f6efe0ed30a007b988..e2cdb545e80966778bd6ef50b1985611d857fbfe 100644
GIT binary patch
delta 1265
zcmYLHZERCz6h7y@y|=Yx>j!Jcs2gS4t&AWOHVr{$+HPRGvH`8eZAPi(3X7xNZo3Q;
zbu!{ih=wdT=Em$7BY}vz;2Ld&xHyR#NrWiI*qNvchJ=wAAkwa8y?Aa{^v9Dt?|IJW
zd(PMu{n@K}13=}s0I)tCHJX^*Y}3g-%$M$Auh$DX-gbWIdAZK*6dd0_pz?2Sv)t&m
zvFGl|(~S;!hi#i|_VekJ?pnsi7sxgyT=_rnGhI3GVL9nJ&So*a<XLBDFD|5O+8U9K
z|C07S{Tj#OLi$Tz)=UY~ll%JaWqy7OkLxls-T3GenVu8az17mI-o5W)NUeG|0L**j
z^SL$kAI#VR!A-_?7r@*jBsK!1$?I3*xWBPCbN36pXy?2bRQ8@kd*<tF$fI>FMDlvD
zEc@5w1;_$KGxI-TpK)}qnxZJ18T`XiG9iUi(r_#_EQz1jtOzDJFnoA0l6X~&C%0sr
zE5<4aMU$xxNlHi&@kr_=Z!+0`FdnX5QEd=Dlo;ta5)%hg{fT(V?YpvOgneRCTnSa{
zsH|384+q3#N=h7EuUz^acVTPB^aoBN7BXiSa67}(nd{fFnvL2$0G$+2M`$H}xd~vu
z#tHmJfcG{593{Ss@D1@xn*rV>-b*kv1H4U`BK|Vr9PuZ&0DMS%fG|S*1mOblIN?*`
zsTP1);^PEz=irSN*^+BkKDvQEHt$jH=y9w3W-DK1X!&nfPP(rtJ@qkRwb$Rg%*xyP
ziU$}J0Jf17rjcdh<5Aj{_Zh4~?qhCcTMBKfML83|b=*dnmiyjuqfxmLz@~$hkT=u*
z@;WH0m9)$XdSnrrifT2um;FSa$|KY+Ay|tA-i4~Ram~r^C%YyS+7@q57S$S3@PV>~
zsELbzk)VS*#Tmp6Y!9dG4C40DJE#W9*{IdhLs%RTV<{J96|w@jUXc=qT>@niNOO%G
z5+#wIjGh(X>W`-qu2|`$$Y=tgsICHR7>MnT#-xPNOj!+D3nZN@ss^}N;B`zjmCc*9
zUS?J0RuD}+YZ*Nr)0$IPYok&~S9#2vOtnDdZ~7YxB_pAzS}DatT4u85tYoNw>6{Ig
zY0jcUwZZ$#{#)d*Sd+IY-JLkbnmOfKC%#}_O};u9rCu%+_yJC73!!62iYql@rMmf5
zP_C+Qv;m)vO7M`YqA&wE3;Y>Q)q`*O&(b%l96W1RCPFx7sf3Wfy(8icgmwlxLhWJY
z{%N!;p50i)f0TwUe7s?Xc^Sh67{XIHfnJz`IrssNffXm<6JU4@PU+@A8S274cw63E
jU9Duhu*!CoF0GDEDM$zqvWC)eZtlhio6^g3KRW&e4TgcG

delta 1121
zcmYjQZD?C%6h7xoZjz<8Np72@u{OQ!Op{c$)mn$6)OE>9@oUbuqS^f6%<fpRYr30T
z)`DX!)BaFo8yEU2L&V`2DwN8F-myVx6;V((_G^ns=eDlHk6(TyEhcxK+f?0!=f2N9
z?|Gl+aL#+rUvcIxJ6!-ZUjRU}zRz97w06<1rC35wv7;>x(=W~(epw4g8XST8f2p<@
z@o3SA$fjJ{bTpuKi`z6$QqWIE8X234QY?4>!T&WhCH5xURjaSWn*40GRS!KGMK%}F
z6Wiagu|T~(pU8XIR7^k9zxS^?=ZEI+_auf?*`yPonlN$N=Wo%13=kp|-X;LtC4B4v
zc#gi^w1y76_mXkp28PhqX?vQVd>j4z=bvx@H}dYA*z7PLhQXr1@7=&Aj~532tcGF@
zcuPe)lzHJM#@RK-n{Q#)o^dpH01n8*a$1$zqytLkkQ7tXJ7sm>&~RKja!^)esZ~w)
zj*lwR(1@Cm(ql?Cqe!vgbaIWw-5&CCk$SRN1)r8p7hGBu-a-EDEo?}Agr*%f6T)UK
zMAlMvtswZytHLNV*GuzQrBy-M^pVmAONk0Dcqvc~(*+-tRuIbpQ-t?R$zLhqmr&8i
zx8KGbGZ_E!HooE!Dc26i$ot}|@CW0YmoU)%H>21biAGAr2VmVbY%^;hVJ8a#3bl01
z1r4jhCY$MmL}|%V37a-}v5p^K!kkfi2Svogymc8LeXxV=U<}W~0$hdT;KS4KIWQz<
z=SP=uH=fd72nP9`WvmmwrZI+TRyzq#5w1G<!XmcwuDduGw`OcTZIxy1Et~+VV44PG
zK15BhTTRFt*=MnBt5N8~6L#Z+96tY;H}&6b>4^j6W7<rizU7H4{`I?(lmO;80`x=y
zbh=YN5WhS*nKHJ{;w8VW2P=2Q*zg?+=navR({idWIv@{VG<}bI-CO2^Kym;cs7!c3
zRmRflm?B>YRW_<%|Jb3?!OZLONVa2^e{u~Q6a9^qJrM>DW{&iZr{z&~C^OQlC>iCO
z^*uNA%UM}ni<PN8mWdPg%UM;)Oi0{y9s97;*nJ((Ag&m{<*|#QX2gEPAUo!b0X#zo
z!i09>Us3m7CH}Z2@(94GP4wds?;|V_pW6cPF7Z7CTRT9GaF+OMgmc6@IsiT+K1@)E
jzeTu6e1tGVJkv=U#3u=q&R~MiFJiVXPu|vZ|M30+?gd0e

diff --git a/JSONFox.pjx b/JSONFox.pjx
index fc7757b221648d1ad426330e18c96e19235c66c2..728ac59079554961dc55c5b53e0872fbd987b7ef 100644
GIT binary patch
delta 178
zcmZ4KwbF~lK$4MtBg-}x4nreTV*_JDv(1NC6c{<Pc^DWJ42{hUCSR17pUlN}hp}h!
zbGG{+RYsPUMuw9EI3!plSr`~xH@{|QXW|m(0;)GNHL|drY#^>QS&l1=b2~Rs$k@`{
zWO5<9{N_1acQ_GtG>ABGa(&<gDljoNHZ-05flY4n3t3+_PE)8e3_upJH8C+TwDV1l
NQE6a2JNd4P4**cOEY<)3

delta 178
zcmZ4KwbF~lK!S&FBg-}x4g(`oLvs^L%gu*a6c{;|^Dr<d7#f=yOui^DKbec|4&&0v
z&)M#C7#LbwSeTkxOb+0XV3lNHU})U@nw_1AONR@n-ptg<!g8{KxYA@ft}xEe+(02?
zOLLRSh3xX1=WyNOgxO)Sxk1E%lj{OVfr+uPq3PrgY;v1l$ojHznwVLd8JL<F7=kQd
VYhq$x_`o?iMx}xA+2p$_J^<HZE@uD$

diff --git a/jsonfox.app b/jsonfox.app
index 803f98952c5ea739169726a7c125c30c8edd1f40..5bb27ab3977dac7b006bca401085239d9e173c60 100644
GIT binary patch
delta 1485
zcmYk64QN|c6vzMP<#S1sHtE_Woh_+ljcb|PibLjPkR@&N(bl<Euyx3~E`DrXv!xkj
zV;EcQl%Yrn?lFeoRuQZpIHML<E!6o@2Py?cg2GlAh!u2GX%<P|JU1^L@4+Ge`~RJL
z?zuPjz0*sE*MBwGmA`L$Bo_==7$JO-vb&|=!xuL$-|Y%`fcYlC=LIqZ{LGs6c?UAB
zO|vzUkL0=_h0|@@7aeuz%b8GB@VjzGWP!m<^#hMtXg(baxN1Lf^E3cf95{CPNMGzw
zbY!$`CjDBVo_f=>f%VPb)T;>=?1_#>6YcSMEUq-Do(Tt{qltLzcw@Q{=%j6#K>InO
zeCArm4vD5RcZJqT$(nnB2(Qq<v5obW7GR&y9EMil)lI;0)}0(*vA(<+c$xJ8hj|O|
z0>=f``#Gjr-`@tj&3c$)jP+@bORV{L@Dc08eZU;+QyiQw;hD^bkqujQZZc(lIcdG(
z`rH5<F#_97Krin+&HB`!cVOmr2f2yfmEA!)NUieoL25LaayFQ97Ws`JwLED@u9D9&
zr$<q-^P$>!kR`Mfm37!q@Uwg{N2tF=a1`?f4=Lj0MUvmozQ7zimv5XaDsCpUN^TJe
zxcnyrJsRX}kTy!Yb+SH0JCZj^33IYVtYt!PbT~Sc@NiXQ)(FoN@z`OHkt-RQdB&cK
z#-luxcxZ#?>5)XtGjuFI8jG`Og|VnqfSQMgx(A2iF-s*^HH#J)O&1k2X7dKUq*%-L
zCeh2BBEJ<PYk!@@gL_4DO10Q3Pw6Rd^LI(9Lf^l9HdS1VK~ZsVi8Z1!yDJVhY<O?Q
zi30DlSgSa3w&4GR6PDdMr)&$;gtSE`r^2*%e>Laok>p-3<qg9+F5FaG$N{=yfp2iR
z$Aqrbn1lPsRiNC3tmA)Vm!6k2U}bG7b$#COrcN<oSK)f;SQQ-}sgWOw&_tCTUH(9O
zpD)za5o+%W^v*0s$Vv2{e7%ddHh&=bB#D-Al+II%e7JylEMgoEO5q|T8pnD4Jmk&Y
zw3}|o&vsL*^LsO2aK1}nju1!IJo8yMz2ixK8UbqAc!}fABg}~b6}*4PWg$!)RlyHh
zAk0_F;4du@X7;2y!^Ss$^;sj#)TB#&@0v73mzo5o&ctYKa_VDX@7L<&$2BQNVea`(
zeaB*2Ak5&8DmbA9!W{nzc#h2%HK1fJTvgYY)`EqrJ;0Z|8F4({YKbsY|ES<MEfD5h
z1(jy#rPZzSuQ0vxlGu~Ck}%e&=5%Uvg!$-B6&%z6qcA6ZgcEEgHK1f(>riK$)dFGm
U_o(2q7WDVj@<;lRN^WY%|GX$;)Bpeg

delta 1340
zcmYk4e`p(J7{|ZQC26*#O_Q3&#M$g-Xl*)MyHKHaP}((J`eUuSRfe1RW7!Ssx+c43
zbCp8ev{e)(<6!3y#EtpSl(7-)WOZX>j*8%5piBiB6=6{S5S=tFCO4lqw~agaa$i2*
z=Y8+F_kBM5-SPf{!(;q&SC)csAT~~DIqC^XTFbfU;$y)c8Mqt)x*iAe1pLbW`pnD=
z`Sp>xT3Z(lXwSS{n>X4W<PBk@;Doo>6D(BV7cTdA>~zs(EgcUAz77Gr8gA@9urEE5
z+N+FD#AdZm<8`!E`zF4o;k!Dsz=f^Kgp%o1)s$Kao6L#b%0xy@P0Cs+o}jjTZ|^5W
z%lU=P8zs{6b^Q-ZS#KjS$X^JvTG?M~0$ySNl=$j;AlD2`vQMzCu)p*q@FDvhEL$sZ
zgmserF4pJlV=>?h_G2uS{WR+Wdp;hVWuI!}J=o8%xLm?y{;R?I4YpvVC;!`&`}^S2
z4&XNHR0S}^J-GNC+Vk=D*#w2i)@CaooMyDQ=}I51rHDS=N9*)6eH3+9q2S?jEZ9-f
zJNqdr-IVmve%hElL`FAgn=+;(Gjfx>M@{XM8#Bqcl6iG>EGob8nxZOlLnhgKD6Pt)
z<C&D4JfKdbRJn01*;95=S2f?#Dsf8%H%^y~RhV0Gd_ac#9&Rofc3d(%s4sGvtF+=c
zK}=d$VZD8Te4S~@@M7d&Zn9c5=|;)$@#58DPo_&=230t-<U?_ps1z`2aJ<;_Cl@S+
z3O@ba0Xia`mvr|ay|}A}YwgH#7Z+9>cf`h#K(W9#QY!K&-Rtf@soauJv{Z>@f{(ij
z+qlO~cK)OTOAnPx*Q_|2ZH5z@ihqb*!-fsd`?aQyE`2dU0e$TjdO}M}wR(CBm1w^{
zK13THiAmj(L?>|tH*gp}I*N0Uh@D-(Hbl=#Ih)q11@z`&^4H8edA#^0<E(zx4d?l7
z!}O(0bH`HT&&~}3hj#!0j?S_kJObWLo57C{C>sGk+HVGbSpxxoo-%_f9<ck*Y5{Z8
z=9EV)fh{*Z%=0^I&U=R?DZ`!f=3XyZf(ikjyKYW+${Glm&=<r%C4K_lx(U3^`Foa{
zGMv9<?t0o92>31kj5viKtbu^JJ7#d(8VGo?lFBRW(*0lM_r=Ob2@Ta|Qg2NJJgDc=
z<exgYj<CJcta;s1Qz76x-Gnz8W-UP(-r8)gIBpFDygFnCSFM47Eql%2Z%gn$3g$J*

diff --git a/src/cursortojsonobject.prg b/src/cursortojsonobject.prg
index 8152fa8..bfb86d8 100644
--- a/src/cursortojsonobject.prg
+++ b/src/cursortojsonobject.prg
@@ -32,11 +32,16 @@ define class CursorToJsonObject as session
 		if !empty(tnSessionID)
 			set datasession to tnSessionID
 		ENDIF
-
-		Local laArray, loRow, lnRecno, lbContinue, laDetail, lcMacro, lcCursor,i
+				
+		Local laArray, loRow, lnRecno, lbContinue, laDetail, lcMacro, lcCursor,i, lcDetailFields, lcMacro
 		laArray = createobject("TParserInternalArray")
 		** Set Detail cursor		
 		this.nSessionID = tnSessionID
+		lcDetailFields = "*"
+		If At("<", tcDetail) > 0
+			lcDetailFields = Alltrim(strextract(tcDetail,"<",">"))
+			tcDetail = Alltrim(GetWordNum(tcDetail,1,"<"))			
+		EndIf
 		
 		select (tcMaster)
 		lnRecno = Recno()
@@ -48,7 +53,8 @@ define class CursorToJsonObject as session
 			* Filter detail
 			lcCursor = Sys(2015)
 			try
-				Select * from (tcDetail) where &tcExpr into cursor (lcCursor)
+				lcMacro = "Select " + lcDetailFields + " from " + tcDetail + " where " + tcExpr + " into cursor " + lcCursor
+				&lcMacro
 				lbContinue = Used(lcCursor)
 			Catch
 				lbContinue = .f.
diff --git a/src/frmjsonviewer.scx b/src/frmjsonviewer.scx
index bd108d15e8bcbd7f29a41dc97d5559973dbb3927..0bdc70bd4ec339ef384f0efedc95da3a6556fa8d 100644
GIT binary patch
delta 13
UcmdlXxI>V|K$4MtBg+;J02zM+SpWb4

delta 13
UcmdlXxI>V|K!S&FBg+;J02$o_Y5)KL

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index ccfa478..0de3e43 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "10.4"
+	version 		= "10.5"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
@@ -345,7 +345,7 @@ define class JSONClass as session
 		EndTry
 
 		*lcResult = this.stringify(@loResult)
-		lcResult = this.Encode(@loResult, "", .t.)
+		lcResult = this.Encode(@loResult, "", .T., .T.)
 		Return lcResult
 	EndFunc
 	

From b0fc4835a78911ab018667ada052e8943cb2a11b Mon Sep 17 00:00:00 2001
From: irwin <rodriguez.irwin@gmail.com>
Date: Sat, 17 May 2025 19:09:52 +0200
Subject: [PATCH 38/38] v10.6

escape characters fixed issue
---
 jsonfox.app          | Bin 94496 -> 95063 bytes
 src/jsonclass.prg    |   2 +-
 src/objecttojson.prg |   5 ++++
 src/tokenizer.prg    |  60 +++++++++++++++++++++++++++++++++++--------
 4 files changed, 55 insertions(+), 12 deletions(-)

diff --git a/jsonfox.app b/jsonfox.app
index 5bb27ab3977dac7b006bca401085239d9e173c60..c845ccc0e877eaec77290f2255b802116786d87b 100644
GIT binary patch
delta 2430
zcmZ8jdr(wW82`@QC(CnLSXU6_Av&5PtSE|ExUP#JD#$}Olp0?7irv@+3sD(GZ5nNq
zx!RIbCYq+Hm|knGbQ<kBjx|2VY|_+{CjZDsO=`m0@9YJ=c$gpOJHOxeedocs-(lNz
z&BZQ_DRB2ul3*bXJ$jW<cO4^@O1#z*BjgWn8=k<99-KNQUVV7(oLSO__;#J9r~P1g
zlQc5blEShihhvjgUA)`*j&!-;M1;C<xAVBPqkO4Zy~t5^O-!zLC2NRL8WD{MA+i~W
z=7kcqVEiKNHyhWM-;+MBKh8#($wUY45$WzRKmb$}P*Ith^i*0{?8q&gJPnq;#GdDv
zVH0yk#7XtuL|sl4Ib7B5n%Z2CyRM{qL2X^-bw-$yD1>aTrc(DbuiG_3kSQJ2)Os5{
z?xtgUnOH6!URp11a~Q<5=GknmxU4x-Wo2W<&gO4)J1I)rLE}WL7%RTDENPNiMN|b0
zLGFRTyRc_QU}LZs15L1h0oKE=2eN=Jj4?N54AdB<%gfR=!jWhkZJg+C4HL(#GLHB!
z8Y)_ti6{}s044*x?Ll8LjA-N_qA^1eHk5~@J2T41<xX~5GqbWYGRBV{o&5tQ;cZP6
zQ6o?dEE+0vJwwIQs|pjHk@BzreJv1&l-GO1mPCrrwHBsmK=F1vo@fg)?83^<_J(Z)
zcOz7^wN4aownmya_bz%h`Uap15aO}G30Po+IA?WaN?ET<9{LHuV4xsQp5eNYC^VQY
ztsra4*lcU&*zC*<YnFA)1t`3IkN$Juec)VFFmdV{tMF0Kls2w8A0h7OFpG_y3&i=I
z5#oZ*a6?FGohR4rsjF-d|JYwGR_t#Ro%^E2dF^_!XrEsEpd&U!Z+F+#Rk~_2rKxYn
z3eqd>hfLz4eRrjrO@A`!a_4V4^_Hr#0_p2de@;?w-CEWrZNF&OYn&C%V@$kKuuf{c
zS{JD<+3mb2b={Iw1IuHGECYyk;4)<6!dYRTz_)QnI`sEAgJ2eXlZsfP?`kGfw_GCX
z34~KAE_PJ+ea3nMF=TnB8$&zp{PPh#4>W=hh=qd+4xEDozj-}@!Iahw_7bCcF}Dqz
z4~B$?Am%&^3`C5&UyN3c3nxq71I>1Np!t%u1fnUd8-Bqo2>h17l;Ts1>c%h5YI_tu
z=`rxR`Ls`ZKOYzOiDUuOlRWnOf+4A&lZQKvVHr<(h4=Sr;9f5%Q~By+n5AVoQ?BwM
zqm+Khhw-qEem>aAF!<<cG~af>{A6vxJ>mqQs%cQb2!;PGg2yZbL*gH30xT%>9!mv|
z9ZEk}7K~3sj)dUfljIZZ;iXE$OO<`P!|9me(9?8#v7@AHdMTrPEe7^HTd@KCOoy|S
z+Y$bpA{NG^&mJ}Fo_#M&E=LCPR#&=8-HU5o-rvLf%GhJ>D!y1=+4NLdQxo*E8GUXY
ziyfbf&r7a(-UaU093GF`bEB8i(L%4S!QrZziE<)GH}DBc8ax|J{-Zj!f(cTre_{x;
zuqipHTvm35&d_8wi``*uu#;Kej}=xQWNsx@F&i1#O27!qMrX<QvVnE$NYz0_LWggD
zDEp#iJ=U_>Omq^9-w*7BJsS1qHter}*|1#+L<v~mX^h)pf09I$j`1z-13Nhdei%Q*
zxCpj66{QSgEieT3UZ5U!2yhCvfI7Vdb~vK}6or8iuTV1x6W~CS_%z><FqW#`pI>bB
z{~E?>1@+$i;!J;DB%2=13qYB_J((Gj)RnK7t?}=&u{j#`!eQkf`q@<0sN;p;l7Hz;
z=1S16u#WOpdHuH*vo0Yn2dN)77Yb)67K8oLeBUh>v&5}?EW$WiK(wk{)(`lS-MIAU
zlsbP%HUK>SFQvfAxyxlC3>)feA)GX=m5(w-A*eW+=Eq9{GFu@8$t&N<sVW$MntPj;
zv*&-r>jrn1B1Fr{lNV&6Nhxqr^%M34@(qO$B&S`KC)uMEI5`#ffbZ}WgeUWJ*7T38
zbSXnP`ELXZhN$@K+SfSwl2I0hC<RU)NR@?LrNGIJlVo9GP*@}<({lEholz6m70M7!
cTJq(PcBR0{wjx<Lp%ggD|EuC#ysZ%a2ex%Z>;M1&

delta 1712
zcmYk73rv$&6vxjkU+DwNqsV)_MQ~eKtB8V$N}#;A0pn58;fmluN1L`d6&Nppk!%T+
z3skpd8zWnYvWR@sW|<Kuu$g5p#Nj{^(XmbUh+D^8ToyBTZoeYmZT_5de*b&#>HT_3
z=kG}0UzP^^xAG`j5&}}VVk9tqhydq74Q=ZrIYqXO5#*Dz*_q+o*q-uYzBl}YOiEr#
zsA%M$jthw;TX>yrz>~`x)xX8x%)jizWsmAF^CK0FL0pxtbeYDOjWHY$hzEdWIly%V
zz^_VxW~^5*KY;W9;m6IN6aG_cq%2+m>BeIvraY_3xJ&>S0?44c#@b*p9XpKc8L-lz
zCNs4)m67%I=cdgxs(D)K=Q#{p>Dm53`lvZtv%>?xsRCEmI$RO%1JHtc9di>Z1=WMK
z1fwRD$oPG)JtLLOsqxHVbhceZ9UXofg96aSk%%!3Re-8=vl)z6af6&E01BzIBQv&p
zgE0GTjN_<FsB3OklK`-&!p)P|=1JNtO=e!6c5_OqMzd|xrqroKVd*T!2~-MhdehCy
z66xge=VN0KvEhwzT8-0CGq@`oW8nZldAWD@rUyIy1BcOOqYq;n%7}`jeVzJPgWD;=
zn1y-@^>Uan`*(i;ueFUbyZnQ`N5sY)#xGE(QMdf4t#dp5s7oU`?}u&Ecy;%j5C7`N
zzYu<E$X7yphvf9aket7EVj_SlKX_6h&oI^38;sRjsy!J>JI7Y&Z-f1`Z*Z?tQBrTo
zGFj>k4YYDFhCUpq<@cTWLB{o0l@{<>j>Twh=-twOe*Hp*Tw3^|{vx4E`ET$KZrA&A
z`J?&;zShZmgf8G2h5`ZZ1p`Fk1v!Jcb0W8Vg-^b}RY}g-+lvVA>j9+%<WQ1PpwsJ~
z)twtBJ@W10Uc!}9f_1;aSYkR<W3*Oz3rw-bD)BC{n<ocDb+v2Oq_2Ipjs$L-_Io_J
z)^tQ?v6w9T@fivCw$7T~pfgr~?FMpaU=3bqu&C6IOA69LB-(Y3U0x)FsFT4A9i*Mu
zT(5S_?C*G!htfjHFr2o(ry`%V&SR@GJnAIAkpa{J%>TwCe}(xeRA>l*HWc6i<_^>z
z%#Y%IQQ({T4(o2re~iEjkM%Ov0g(VVP&=`{hxJ{|jZpykSUa)q#e4=;i1mGdVE7h`
zxoBX|5&p#qI@D6M-RVQ(xDRuS)sA3aQX}C;a*LB4ZT_S{%|5&`$7~!?MsvH5mUcUq
zGDx|UGbB`uI#P4VVHx`n7abFY#26v7wrG<y8jWLvk=&7xU3Qh3goM>%i^sz&4&XvQ
zKoF8Q?K_!2{@BE%qXPe!1%J+NM!)qBvEPf{jb_1D;Tcwkf<apsenk+*i3|@0N6rIm
zL6{~oTyXD~!d8_c!;`_{Zvb9FXd<nvEdV?j&ABc(jp8K?w$B3`N7y4WT=2>*p~)$+
z!Qc!YjXj8~VuL~3UxINLjkW%aUi2oeB^>*=w>lV1@D+@BvBBVx7{SOE8w~1q2*yE?
r;mKfEI)O%ntuCX;-G$NHS;CT&q9rc4`#Hgw5*rM%-ywFyKSjp>x3zLt

diff --git a/src/jsonclass.prg b/src/jsonclass.prg
index 0de3e43..cbc08ff 100644
--- a/src/jsonclass.prg
+++ b/src/jsonclass.prg
@@ -4,7 +4,7 @@ define class JSONClass as session
 	LastErrorText 	= ""
 	lError 			= .f.
 	lShowErrors 	= .t.
-	version 		= "10.5"
+	version 		= "10.6"
 	hidden lInternal
 	hidden lTablePrompt
 	Dimension aCustomArray[1]
diff --git a/src/objecttojson.prg b/src/objecttojson.prg
index a88c9d3..4d6a032 100644
--- a/src/objecttojson.prg
+++ b/src/objecttojson.prg
@@ -33,6 +33,11 @@ define class ObjectToJSON as session
 			return this.AnyToJson(toRefObj)
 		endif
 	endfunc
+	
+	function EncodeFromSchema(toRefObj, tcSchema, tlParseUTF8, tlTrimChars)
+		
+	endfunc
+	
 	* AnyToJson
 	function AnyToJson as memo
 		lparameters tValue as Variant
diff --git a/src/tokenizer.prg b/src/tokenizer.prg
index af03a63..7fe12ad 100644
--- a/src/tokenizer.prg
+++ b/src/tokenizer.prg
@@ -189,18 +189,56 @@ define class Tokenizer as custom
 	endfunc
 
 
-	Procedure escapeCharacters(tcLexeme)
-		* Convert all escape sequences
-		tcLexeme = Strtran(tcLexeme, '\\', '\')
-		tcLexeme = Strtran(tcLexeme, '\/', '/')
-		tcLexeme = Strtran(tcLexeme, '\n', Chr(10))
-		tcLexeme = Strtran(tcLexeme, '\r', Chr(13))
-		tcLexeme = Strtran(tcLexeme, '\t', Chr(9))
-		tcLexeme = Strtran(tcLexeme, '\"', '"')
-		tcLexeme = Strtran(tcLexeme, "\'", "'")
-	EndProc
+*!*		Procedure escapeCharacters(tcLexeme)
+*!*			* Convert all escape sequences
+*!*			tcLexeme = Strtran(tcLexeme, '\\', '\')
+*!*			tcLexeme = Strtran(tcLexeme, '\/', '/')
+*!*			tcLexeme = Strtran(tcLexeme, '\n', Chr(10))
+*!*			tcLexeme = Strtran(tcLexeme, '\r', Chr(13))
+*!*			tcLexeme = Strtran(tcLexeme, '\t', Chr(9))
+*!*			tcLexeme = Strtran(tcLexeme, '\"', '"')
+*!*			tcLexeme = Strtran(tcLexeme, "\'", "'")
+*!*		EndProc
+
+	procedure escapeCharacters(tcLexeme)
+		local lcResult, i, lcChar, lcNextChar
+		lcResult = ""
+		i = 1
+		
+		do while i <= len(tcLexeme)
+			lcChar = substr(tcLexeme, i, 1)
+			if lcChar == "\" and i < len(tcLexeme)
+				lcNextChar = substr(tcLexeme, i + 1, 1)
+				do case
+				case lcNextChar == "\"
+					lcResult = lcResult + "\"
+				case lcNextChar == "/"
+					lcResult = lcResult + "/"
+				case lcNextChar == "n"
+					lcResult = lcResult + chr(10)
+				case lcNextChar == "r"
+					lcResult = lcResult + chr(13)
+				case lcNextChar == "t"
+					lcResult = lcResult + chr(9)
+				case lcNextChar == '"'
+					lcResult = lcResult + '"'					
+				case lcNextChar == "'"
+					lcResult = lcResult + "'"
+				otherwise
+					* Si no es una secuencia de escape conocida, mantener ambos caracteres
+					lcResult = lcResult + "\" + lcNextChar					
+				endcase
+				i = i + 2 && Avanzar 2 caracteres
+			else
+				lcResult = lcResult + lcChar
+				i = i + 1 && avanzar un carácter
+			endif
+		enddo
+		
+		tcLexeme = lcResult
+	endproc
 		
-	procedure checkUnicodeFormat(tcLexeme)		
+	procedure checkUnicodeFormat(tcLexeme)
 		* Look for unicode format
 		** This conversion is better (in performance) than Regular Expressions.
 		&& IRODG 09/10/2023 Inicio