@@ -156,7 +156,7 @@ describe('woql queries', () => {
156156
157157 // console.log(JSON.stringify(woqlObjectMultiple.json(), null, 4));
158158
159- expect ( woqlObject . json ( ) ) . to . eql ( woqlSelectJson . jsonObj ) ;
159+ expect ( woqlObject . json ( ) ) . to . eql ( woqlSelectJson . jsonObj ) ;
160160 expect ( woqlObjectChain . json ( ) ) . to . eql ( woqlSelectJson . jsonObj ) ;
161161 expect ( woqlObjectMultiple . json ( ) ) . to . eql ( woqlSelectJson . jsonObjMulti ) ;
162162 expect ( woqlObjectChainMultiple . json ( ) ) . to . eql ( woqlSelectJson . jsonObjMulti ) ;
@@ -319,9 +319,9 @@ describe('woql queries', () => {
319319 v . eyes ,
320320 v . label ,
321321 v . group ,
322- WOQL . and ( WOQL . triple ( v . person , "rdf:type" , "@schema:People" ) ,
323- WOQL . triple ( v . person , "label" , v . label ) ,
324- WOQL . triple ( v . person , "eye_color" , v . eyes ) ) )
322+ WOQL . and ( WOQL . triple ( v . person , "rdf:type" , "@schema:People" ) ,
323+ WOQL . triple ( v . person , "label" , v . label ) ,
324+ WOQL . triple ( v . person , "eye_color" , v . eyes ) ) )
325325
326326 expect ( query . json ( ) ) . to . eql ( woqlJson . groupbyJsonWithVars ) ;
327327 } )
@@ -415,7 +415,7 @@ describe('woql queries', () => {
415415 } )
416416 } ) ;
417417
418-
418+
419419 it ( 'check datetime' , ( ) => {
420420 const TypeOf = WOQL . triple ( "v:a" , "datetime" , WOQL . datetime ( "2022-10-19T21:14:20Z" ) ) . json ( )
421421 expect ( TypeOf ) . to . deep . eql ( {
@@ -463,37 +463,36 @@ describe('woql queries', () => {
463463
464464 it ( 'check arithmetic var' , ( ) => {
465465 let v = Vars ( "a" , "res" ) ;
466- const wq = WOQL . eval ( WOQL . times ( v . a , 3 ) , v . res ) . json ( ) ;
466+ const wq = WOQL . eval ( WOQL . times ( v . a , 3 ) , v . res ) . json ( ) ;
467467 expect ( wq ) . to . deep . eql ( {
468468 "@type" : "Eval" ,
469- "expression" : {
470- "@type" : "Times" ,
471- "left" : {
472- "@type" : "ArithmeticValue" ,
473- "variable" : "a"
474- } ,
475- "right" : {
476- "@type" : "ArithmeticValue" ,
477- "data" : {
478- "@type" : "xsd:decimal" ,
479- "@value" : 3
480- }
481- }
469+ "expression" : {
470+ "@type" : "Times" ,
471+ "left" : {
472+ "@type" : "ArithmeticValue" ,
473+ "variable" : "a"
482474 } ,
483- "result " : {
475+ "right " : {
484476 "@type" : "ArithmeticValue" ,
485- "variable" : "res"
477+ "data" : {
478+ "@type" : "xsd:decimal" ,
479+ "@value" : 3
480+ }
486481 }
487- } )
482+ } ,
483+ "result" : {
484+ "@type" : "ArithmeticValue" ,
485+ "variable" : "res"
486+ }
487+ } )
488488 } ) ;
489489 it ( 'check deep arithmetic var' , ( ) => {
490490 let v = Vars ( "a" , "res" ) ;
491- const wq = WOQL . and (
492- WOQL . eval ( WOQL . times ( 3 , 4 ) , v . a ) ,
493- WOQL . eval ( WOQL . times ( v . a , 3 ) , v . res )
494- ) . json ( ) ;
495- console . log ( JSON . stringify ( wq ) ) ;
491+ const wq = WOQL . and (
492+ WOQL . eval ( WOQL . times ( 3 , 4 ) , v . a ) ,
493+ WOQL . eval ( WOQL . times ( v . a , 3 ) , v . res )
494+ ) . json ( ) ;
496495 expect ( wq ) . to . deep . eql (
497- { "@type" :"And" , "and" :[ { "@type" :"Eval" , "expression" :{ "@type" :"Times" , "left" :{ "@type" :"ArithmeticValue" , "data" :{ "@type" :"xsd:decimal" , "@value" :3 } } , "right" :{ "@type" :"ArithmeticValue" , "data" :{ "@type" :"xsd:decimal" , "@value" :4 } } } , "result" :{ "@type" :"ArithmeticValue" , "variable" :"a" } } , { "@type" :"Eval" , "expression" :{ "@type" :"Times" , "left" :{ "@type" :"ArithmeticValue" , "variable" :"a" } , "right" :{ "@type" :"ArithmeticValue" , "data" :{ "@type" :"xsd:decimal" , "@value" :3 } } } , "result" :{ "@type" :"ArithmeticValue" , "variable" :"res" } } ] } )
496+ { "@type" : "And" , "and" : [ { "@type" : "Eval" , "expression" : { "@type" : "Times" , "left" : { "@type" : "ArithmeticValue" , "data" : { "@type" : "xsd:decimal" , "@value" : 3 } } , "right" : { "@type" : "ArithmeticValue" , "data" : { "@type" : "xsd:decimal" , "@value" : 4 } } } , "result" : { "@type" : "ArithmeticValue" , "variable" : "a" } } , { "@type" : "Eval" , "expression" : { "@type" : "Times" , "left" : { "@type" : "ArithmeticValue" , "variable" : "a" } , "right" : { "@type" : "ArithmeticValue" , "data" : { "@type" : "xsd:decimal" , "@value" : 3 } } } , "result" : { "@type" : "ArithmeticValue" , "variable" : "res" } } ] } )
498497 } ) ;
499498} ) ;
0 commit comments