@remix-run/data-table-postgres 0.3.1 → 0.5.0

package/src/lib/sql-compiler.ts

@@ -1,5 +1,6 @@
 import { getTableName, getTablePrimaryKey } from '@remix-run/data-table'
-import type { DataManipulationOperation, Predicate, SqlStatement } from '@remix-run/data-table'
+import type { Predicate, SqlStatement } from '@remix-run/data-table'
+import type { DataManipulationOperation } from '@remix-run/data-table'
 import {
   collectColumns as collectColumnsHelper,
   normalizeJoinType as normalizeJoinTypeHelper,
@@ -39,8 +40,8 @@ export function compilePostgresOperation(operation: DataManipulationOperation):
       compileGroupByClause(operation.groupBy) +
       compileHavingClause(operation.having, context) +
       compileOrderByClause(operation.orderBy) +
-      compileLimitClause(operation.limit) +
-      compileOffsetClause(operation.offset)
+      compileLimitClause(operation.limit, context) +
+      compileOffsetClause(operation.offset, context)
 
     return {
       text,
@@ -258,19 +259,238 @@ function compileRawOperation(statement: SqlStatement): SqlStatement {
     }
   }
 
-  let index = 1
-  let text = statement.text.replace(/\?/g, function replaceParameter() {
-    let placeholder = '$' + String(index)
-    index += 1
-    return placeholder
-  })
-
   return {
-    text,
+    text: rewriteRawPlaceholders(statement.text),
     values: [...statement.values],
   }
 }
 
+function rewriteRawPlaceholders(text: string): string {
+  let output = ''
+  let index = 0
+  let placeholderIndex = 1
+
+  while (index < text.length) {
+    let char = text[index]
+
+    if (char === '?') {
+      output += '$' + String(placeholderIndex)
+      placeholderIndex += 1
+      index += 1
+      continue
+    }
+
+    if ((char === 'E' || char === 'e') && text[index + 1] === "'") {
+      let end = scanEscapeSingleQuotedString(text, index + 1)
+      output += text.slice(index, end)
+      index = end
+      continue
+    }
+
+    if (char === "'") {
+      let end = scanSingleQuotedString(text, index)
+      output += text.slice(index, end)
+      index = end
+      continue
+    }
+
+    if (char === '"') {
+      let end = scanDoubleQuotedIdentifier(text, index)
+      output += text.slice(index, end)
+      index = end
+      continue
+    }
+
+    if (text.startsWith('--', index)) {
+      let end = scanLineComment(text, index)
+      output += text.slice(index, end)
+      index = end
+      continue
+    }
+
+    if (text.startsWith('/*', index)) {
+      let end = scanBlockComment(text, index)
+      output += text.slice(index, end)
+      index = end
+      continue
+    }
+
+    let dollarQuotedStringEnd = scanDollarQuotedString(text, index)
+
+    if (dollarQuotedStringEnd !== undefined) {
+      output += text.slice(index, dollarQuotedStringEnd)
+      index = dollarQuotedStringEnd
+      continue
+    }
+
+    output += char
+    index += 1
+  }
+
+  return output
+}
+
+function scanSingleQuotedString(text: string, start: number): number {
+  let index = start + 1
+
+  while (index < text.length) {
+    if (text[index] === "'") {
+      if (text[index + 1] === "'") {
+        index += 2
+        continue
+      }
+
+      return index + 1
+    }
+
+    index += 1
+  }
+
+  return text.length
+}
+
+function scanEscapeSingleQuotedString(text: string, start: number): number {
+  let index = start + 1
+
+  while (index < text.length) {
+    if (text[index] === '\\') {
+      index += 2
+      continue
+    }
+
+    if (text[index] === "'") {
+      if (text[index + 1] === "'") {
+        index += 2
+        continue
+      }
+
+      return index + 1
+    }
+
+    index += 1
+  }
+
+  return text.length
+}
+
+function scanDoubleQuotedIdentifier(text: string, start: number): number {
+  let index = start + 1
+
+  while (index < text.length) {
+    if (text[index] === '"') {
+      if (text[index + 1] === '"') {
+        index += 2
+        continue
+      }
+
+      return index + 1
+    }
+
+    index += 1
+  }
+
+  return text.length
+}
+
+function scanLineComment(text: string, start: number): number {
+  let index = start + 2
+
+  while (index < text.length && text[index] !== '\n' && text[index] !== '\r') {
+    index += 1
+  }
+
+  return index
+}
+
+function scanBlockComment(text: string, start: number): number {
+  let index = start + 2
+  let depth = 1
+
+  while (index < text.length && depth > 0) {
+    if (text.startsWith('/*', index)) {
+      depth += 1
+      index += 2
+      continue
+    }
+
+    if (text.startsWith('*/', index)) {
+      depth -= 1
+      index += 2
+      continue
+    }
+
+    index += 1
+  }
+
+  return index
+}
+
+function scanDollarQuotedString(text: string, start: number): number | undefined {
+  let delimiter = getDollarQuoteDelimiter(text, start)
+
+  if (delimiter === undefined) {
+    return undefined
+  }
+
+  let end = text.indexOf(delimiter, start + delimiter.length)
+
+  return end === -1 ? text.length : end + delimiter.length
+}
+
+function getDollarQuoteDelimiter(text: string, start: number): string | undefined {
+  if (text[start] !== '$') {
+    return undefined
+  }
+
+  let index = start + 1
+
+  if (text[index] === '$') {
+    return '$$'
+  }
+
+  if (!isDollarQuoteTagStart(text[index])) {
+    return undefined
+  }
+
+  index += 1
+
+  while (index < text.length && isDollarQuoteTagPart(text[index])) {
+    index += 1
+  }
+
+  if (text[index] !== '$') {
+    return undefined
+  }
+
+  return text.slice(start, index + 1)
+}
+
+function isDollarQuoteTagStart(char: string | undefined): boolean {
+  if (char === undefined) {
+    return false
+  }
+
+  return isAsciiLetter(char) || char === '_'
+}
+
+function isDollarQuoteTagPart(char: string | undefined): boolean {
+  if (char === undefined) {
+    return false
+  }
+
+  return isDollarQuoteTagStart(char) || isAsciiDigit(char)
+}
+
+function isAsciiLetter(char: string): boolean {
+  let code = char.charCodeAt(0)
+  return (code >= 65 && code <= 90) || (code >= 97 && code <= 122)
+}
+
+function isAsciiDigit(char: string): boolean {
+  let code = char.charCodeAt(0)
+  return code >= 48 && code <= 57
+}
+
 function compileFromClause(
   table: OperationTable,
   joins: JoinClause[],
@@ -336,20 +556,20 @@ function compileOrderByClause(orderBy: { column: string; direction: 'asc' | 'des
   )
 }
 
-function compileLimitClause(limit: number | undefined): string {
+function compileLimitClause(limit: number | undefined, context: CompileContext): string {
   if (limit === undefined) {
     return ''
   }
 
-  return ' limit ' + String(limit)
+  return ' limit ' + pushValue(context, limit)
 }
 
-function compileOffsetClause(offset: number | undefined): string {
+function compileOffsetClause(offset: number | undefined, context: CompileContext): string {
   if (offset === undefined) {
     return ''
   }
 
-  return ' offset ' + String(offset)
+  return ' offset ' + pushValue(context, offset)
 }
 
 function compileReturningClause(returning: '*' | string[] | undefined): string {

package/dist/lib/adapter.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"adapter.d.ts","sourceRoot":"","sources":["../../src/lib/adapter.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,oBAAoB,EACpB,uBAAuB,EACvB,mBAAmB,EACnB,sBAAsB,EACtB,sBAAsB,EACtB,yBAAyB,EACzB,eAAe,EAEf,YAAY,EACZ,QAAQ,EACR,kBAAkB,EAClB,gBAAgB,EACjB,MAAM,uBAAuB,CAAA;AAO9B,OAAO,KAAK,EACV,MAAM,IAAI,cAAc,EACxB,IAAI,IAAI,YAAY,EACpB,UAAU,IAAI,kBAAkB,EACjC,MAAM,IAAI,CAAA;AASX,KAAK,iBAAiB,GAAG,cAAc,GAAG,YAAY,GAAG,kBAAkB,CAAA;AAE3E;;GAEG;AACH,qBAAa,uBAAwB,YAAW,eAAe;;IAC7D;;OAEG;IACH,OAAO,SAAa;IAEpB;;OAEG;IACH,YAAY;;;;;;MAAA;IAMZ,YAAY,MAAM,EAAE,iBAAiB,EASpC;IAED;;;;OAIG;IACH,UAAU,CAAC,SAAS,EAAE,yBAAyB,GAAG,sBAAsB,GAAG,YAAY,EAAE,CAOxF;IAED;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,uBAAuB,GAAG,OAAO,CAAC,sBAAsB,CAAC,CAuB/E;IAED;;;;OAIG;IACG,OAAO,CAAC,OAAO,EAAE,oBAAoB,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAWzE;IAED;;;;;OAKG;IACG,QAAQ,CAAC,KAAK,EAAE,QAAQ,EAAE,WAAW,CAAC,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,CAAC,CAMhF;IAED;;;;;;OAMG;IACG,SAAS,CACb,KAAK,EAAE,QAAQ,EACf,MAAM,EAAE,MAAM,EACd,WAAW,CAAC,EAAE,gBAAgB,GAC7B,OAAO,CAAC,OAAO,CAAC,CASlB;IAED;;;;OAIG;IACG,gBAAgB,CAAC,OAAO,CAAC,EAAE,kBAAkB,GAAG,OAAO,CAAC,gBAAgB,CAAC,CA0B9E;IAED;;;;OAIG;IACG,iBAAiB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgB9D;IAED;;;;OAIG;IACG,mBAAmB,CAAC,KAAK,EAAE,gBAAgB,GAAG,OAAO,CAAC,IAAI,CAAC,CAgBhE;IAED;;;;;OAKG;IACG,eAAe,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG1E;IAED;;;;;OAKG;IACG,mBAAmB,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG9E;IAED;;;;;OAKG;IACG,gBAAgB,CAAC,KAAK,EAAE,gBAAgB,EAAE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC,CAG3E;IAED;;;OAGG;IACG,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAE1C;IAED;;;OAGG;IACG,oBAAoB,IAAI,OAAO,CAAC,IAAI,CAAC,CAE1C;CAmBF;AAED;;;;;;;;;;;;;;;GAeG;AACH,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,iBAAiB,GAAG,uBAAuB,CAEhG"}