Build cjs + deno

Author: porsager

cjs/src/types.js

@@ -172,7 +172,7 @@ const builders = Object.entries({
     ).join(',') + ')values' +
     valuesBuilder(Array.isArray(first) ? first : [first], parameters, types, columns, options)
   }
-}).map(([x, fn]) => ([new RegExp('(^|[\\s(])' + x + '($|[\\s(])', 'i'), fn]))
+}).map(([x, fn]) => ([new RegExp('((?:^|[\\s(])' + x + '(?:$|[\\s(]))(?![\\s\\S]*\\1)', 'i'), fn]))
 
 function notTagged() {
   throw Errors.generic('NOT_TAGGED_CALL', 'Query not called as a tagged template literal')

cjs/tests/index.js

@@ -2140,3 +2140,16 @@ t('Does not try rollback when commit errors', async() => {
     await sql`drop table test`
   ]
 })
+
+t('Last keyword used even with duplicate keywords', async() => {
+  await sql`create table test (x int);`
+  await sql`insert into test values(1)`
+  const [{ x }] = await sql`
+    select
+      1 in (1) as x
+    from test
+    where x in ${ sql([1, 2]) }
+  `
+
+  return [x, true]
+})

deno/src/types.js

@@ -173,7 +173,7 @@ const builders = Object.entries({
     ).join(',') + ')values' +
     valuesBuilder(Array.isArray(first) ? first : [first], parameters, types, columns, options)
   }
-}).map(([x, fn]) => ([new RegExp('(^|[\\s(])' + x + '($|[\\s(])', 'i'), fn]))
+}).map(([x, fn]) => ([new RegExp('((?:^|[\\s(])' + x + '(?:$|[\\s(]))(?![\\s\\S]*\\1)', 'i'), fn]))
 
 function notTagged() {
   throw Errors.generic('NOT_TAGGED_CALL', 'Query not called as a tagged template literal')

deno/tests/index.js

@@ -2143,4 +2143,17 @@ t('Does not try rollback when commit errors', async() => {
   ]
 })
 
+t('Last keyword used even with duplicate keywords', async() => {
+  await sql`create table test (x int);`
+  await sql`insert into test values(1)`
+  const [{ x }] = await sql`
+    select
+      1 in (1) as x
+    from test
+    where x in ${ sql([1, 2]) }
+  `
+
+  return [x, true]
+})
+
 ;window.addEventListener("unload", () => Deno.exit(process.exitCode))