11import { expect } from "chai" ;
2- import { aql } from "../aql" ;
2+ import { aql , join , literal } from "../aql" ;
33import { Database } from "../database" ;
44
55describe ( "AQL helpers" , function ( ) {
@@ -40,9 +40,9 @@ describe("AQL helpers", function () {
4040 expect ( bindVarNames . map ( ( k ) => query . bindVars [ k ] ) ) . to . eql ( values ) ;
4141 } ) ;
4242 it ( "omits undefined bindvars and empty queries" , ( ) => {
43- const query = aql `A ${ undefined } B ${ aql `` } C ${ aql . join (
44- [ ]
45- ) } D ${ aql . literal ( "" ) } E`;
43+ const query = aql `A ${ undefined } B ${ aql `` } C ${ join ( [ ] ) } D ${ literal (
44+ ""
45+ ) } E`;
4646 expect ( query . query ) . to . equal ( "A B C D E" ) ;
4747 expect ( query . bindVars ) . to . eql ( { } ) ;
4848 } ) ;
@@ -104,9 +104,7 @@ describe("AQL helpers", function () {
104104 expect ( query . bindVars . value0 ) . to . equal ( whatever ) ;
105105 } ) ;
106106 it ( "supports AQL literals" , ( ) => {
107- const query = aql `FOR x IN whatever ${ aql . literal (
108- "FILTER x.blah"
109- ) } RETURN x`;
107+ const query = aql `FOR x IN whatever ${ literal ( "FILTER x.blah" ) } RETURN x` ;
110108 expect ( query . query ) . to . equal ( "FOR x IN whatever FILTER x.blah RETURN x" ) ;
111109 expect ( query . bindVars ) . to . eql ( { } ) ;
112110 } ) ;
@@ -173,7 +171,7 @@ describe("AQL helpers", function () {
173171 expect ( query . bindVars ) . to . eql ( { } ) ;
174172 } ) ;
175173 } ) ;
176- describe ( "aql. literal" , ( ) => {
174+ describe ( "literal" , ( ) => {
177175 const pairs = [
178176 [ 0 , "0" ] ,
179177 [ 42 , "42" ] ,
@@ -189,32 +187,32 @@ describe("AQL helpers", function () {
189187 it ( `returns an AQL literal of "${ result } " for ${ String (
190188 JSON . stringify ( value )
191189 ) } `, ( ) => {
192- expect ( aql . literal ( value ) . toAQL ( ) ) . to . equal ( result ) ;
190+ expect ( literal ( value ) . toAQL ( ) ) . to . equal ( result ) ;
193191 } ) ;
194192 }
195193 it ( 'returns an AQL literal of "aql" for { toAQL: () => "aql" }' , ( ) => {
196- expect ( aql . literal ( { toAQL : ( ) => "aql" } ) . toAQL ( ) ) . to . equal ( "aql" ) ;
194+ expect ( literal ( { toAQL : ( ) => "aql" } ) . toAQL ( ) ) . to . equal ( "aql" ) ;
197195 } ) ;
198196 } ) ;
199- describe ( "aql. join" , ( ) => {
197+ describe ( "join" , ( ) => {
200198 const fragments = [ aql `x ${ 1 } ` , aql `y ${ 2 } ` , aql `z ${ 3 } ` ] ;
201199 it ( "merges fragments with a space by default" , ( ) => {
202- const query = aql . join ( fragments ) ;
200+ const query = join ( fragments ) ;
203201 expect ( query . query ) . to . equal ( "x @value0 y @value1 z @value2" ) ;
204202 expect ( query . bindVars ) . to . eql ( { value0 : 1 , value1 : 2 , value2 : 3 } ) ;
205203 } ) ;
206204 it ( "merges fragments with an empty string" , ( ) => {
207- const query = aql . join ( fragments , "" ) ;
205+ const query = join ( fragments , "" ) ;
208206 expect ( query . query ) . to . equal ( "x @value0y @value1z @value2" ) ;
209207 expect ( query . bindVars ) . to . eql ( { value0 : 1 , value1 : 2 , value2 : 3 } ) ;
210208 } ) ;
211209 it ( "merges fragments with an arbitrary string" , ( ) => {
212- const query = aql . join ( fragments , "abc" ) ;
210+ const query = join ( fragments , "abc" ) ;
213211 expect ( query . query ) . to . equal ( "x @value0abcy @value1abcz @value2" ) ;
214212 expect ( query . bindVars ) . to . eql ( { value0 : 1 , value1 : 2 , value2 : 3 } ) ;
215213 } ) ;
216214 it ( "merges anything" , ( ) => {
217- const query = aql . join ( [ 1 , true , "yes" , aql . literal ( "test" ) ] ) ;
215+ const query = join ( [ 1 , true , "yes" , literal ( "test" ) ] ) ;
218216 expect ( query . query ) . to . equal ( "@value0 @value1 @value2 test" ) ;
219217 expect ( query . bindVars ) . to . eql ( { value0 : 1 , value1 : true , value2 : "yes" } ) ;
220218 } ) ;
0 commit comments