build

Author: porsager

cjs/src/bytes.js

@@ -47,13 +47,13 @@ const b = Object.assign(reset, messages, {
     return b
   },
   raw(x) {
-    buffer = Buffer.concat([buffer.slice(0, b.i), x])
+    buffer = Buffer.concat([buffer.subarray(0, b.i), x])
     b.i = buffer.length
     return b
   },
   end(at = 1) {
     buffer.writeUInt32BE(b.i - at, at)
-    const out = buffer.slice(0, b.i)
+    const out = buffer.subarray(0, b.i)
     b.i = 0
     buffer = Buffer.allocUnsafe(size)
     return out

cjs/src/connection.js

@@ -309,12 +309,12 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
       }
 
       try {
-        handle(incoming.slice(0, length + 1))
+        handle(incoming.subarray(0, length + 1))
       } catch (e) {
         query && (query.cursorFn || query.describeFirst) && write(Sync)
         errored(e)
       }
-      incoming = incoming.slice(length + 1)
+      incoming = incoming.subarray(length + 1)
       remaining = 0
       incomings = null
     }
@@ -354,7 +354,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
       statementCount = 1
       lifeTimer.start()
       socket.on('data', data)
-      keep_alive && socket.setKeepAlive(true, 1000 * keep_alive)
+      keep_alive && socket.setKeepAlive && socket.setKeepAlive(true, 1000 * keep_alive)
       const s = StartupMessage()
       write(s)
     } catch (err) {
@@ -483,7 +483,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
       value = length === -1
         ? null
         : query.isRaw === true
-          ? x.slice(index, index += length)
+          ? x.subarray(index, index += length)
           : column.parser === undefined
             ? x.toString('utf8', index, index += length)
             : column.parser.array === true
@@ -493,8 +493,8 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
       query.isRaw
         ? (row[i] = query.isRaw === true
           ? value
-          : transform.value.from ? transform.value.from(value) : value)
-        : (row[column.name] = transform.value.from ? transform.value.from(value) : value)
+          : transform.value.from ? transform.value.from(value, column) : value)
+        : (row[column.name] = transform.value.from ? transform.value.from(value, column) : value)
     }
 
     query.forEachFn
@@ -656,7 +656,7 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
 
   async function AuthenticationMD5Password(x) {
     write(
-      b().p().str('md5' + md5(Buffer.concat([Buffer.from(md5((await Pass()) + user)), x.slice(9)]))).z(1).end()
+      b().p().str('md5' + md5(Buffer.concat([Buffer.from(md5((await Pass()) + user)), x.subarray(9)]))).z(1).end()
     )
   }
 
@@ -855,11 +855,11 @@ function Connection(options, queues = {}, { onopen = noop, onend = noop, onclose
   }
 
   function CopyData(x) {
-    stream.push(x.slice(5)) || socket.pause()
+    stream && (stream.push(x.subarray(5)) || socket.pause())
   }
 
   function CopyDone() {
-    stream.push(null)
+    stream && stream.push(null)
     stream = null
   }
 

cjs/src/index.js

@@ -8,8 +8,11 @@ const {
   Identifier,
   Builder,
   toPascal,
+  pascal,
   toCamel,
+  camel,
   toKebab,
+  kebab,
   fromPascal,
   fromCamel,
   fromKebab
@@ -25,8 +28,11 @@ const largeObject = require('./large.js')
 Object.assign(Postgres, {
   PostgresError,
   toPascal,
+  pascal,
   toCamel,
+  camel,
   toKebab,
+  kebab,
   fromPascal,
   fromCamel,
   fromKebab,
@@ -162,25 +168,25 @@ function Postgres(a, b) {
 
     const channels = listen.channels || (listen.channels = {})
         , exists = name in channels
-        , channel = exists ? channels[name] : (channels[name] = { listeners: [listener] })
 
     if (exists) {
-      channel.listeners.push(listener)
+      channels[name].listeners.push(listener)
       listener.onlisten && listener.onlisten()
-      return Promise.resolve({ ...channel.result, unlisten })
+      return Promise.resolve({ ...channels[name].result, unlisten })
     }
 
-    channel.result = await sql`listen ${ sql(name) }`
+    const result = await sql`listen ${ sql(name) }`
+    channels[name] = { result, listeners: [listener] }
     listener.onlisten && listener.onlisten()
-    channel.result.unlisten = unlisten
+    result.unlisten = unlisten
 
-    return channel.result
+    return result
 
     async function unlisten() {
       if (name in channels === false)
         return
 
-      channel.listeners = channel.listeners.filter(x => x !== listener)
+      channels[name].listeners = channels[name].listeners.filter(x => x !== listener)
       if (channels[name].listeners.length)
         return
 

cjs/src/query.js

@@ -54,16 +54,20 @@ const Query = module.exports.Query = class Query extends Promise {
     return this.canceller && (this.canceller(this), this.canceller = null)
   }
 
-  async readable() {
+  simple() {
     this.options.simple = true
     this.options.prepare = false
+    return this
+  }
+
+  async readable() {
+    this.simple()
     this.streaming = true
     return this
   }
 
   async writable() {
-    this.options.simple = true
-    this.options.prepare = false
+    this.simple()
     this.streaming = true
     return this
   }
@@ -108,7 +112,8 @@ const Query = module.exports.Query = class Query extends Promise {
   }
 
   describe() {
-    this.onlyDescribe = true
+    this.options.simple = false
+    this.onlyDescribe = this.options.prepare = true
     return this
   }
 

cjs/src/subscribe.js

@@ -11,6 +11,7 @@ module.exports = Subscribe;function Subscribe(postgres, options) {
 
   const sql = subscribe.sql = postgres({
     ...options,
+    transform: { column: {}, value: {}, row: {} },
     max: 1,
     fetch_types: false,
     idle_timeout: null,
@@ -103,7 +104,7 @@ module.exports = Subscribe;function Subscribe(postgres, options) {
 
     function data(x) {
       if (x[0] === 0x77)
-        parse(x.slice(25), state, sql.options.parsers, handle)
+        parse(x.subarray(25), state, sql.options.parsers, handle, options.transform)
       else if (x[0] === 0x6b && x[17])
         pong()
     }
@@ -136,15 +137,15 @@ function Time(x) {
   return new Date(Date.UTC(2000, 0, 1) + Number(x / BigInt(1000)))
 }
 
-function parse(x, state, parsers, handle) {
+function parse(x, state, parsers, handle, transform) {
   const char = (acc, [k, v]) => (acc[k.charCodeAt(0)] = v, acc)
 
   Object.entries({
     R: x => {  // Relation
       let i = 1
       const r = state[x.readUInt32BE(i)] = {
-        schema: String(x.slice(i += 4, i = x.indexOf(0, i))) || 'pg_catalog',
-        table: String(x.slice(i + 1, i = x.indexOf(0, i + 1))),
+        schema: x.toString('utf8', i += 4, i = x.indexOf(0, i)) || 'pg_catalog',
+        table: x.toString('utf8', i + 1, i = x.indexOf(0, i + 1)),
         columns: Array(x.readUInt16BE(i += 2)),
         keys: []
       }
@@ -156,7 +157,9 @@ function parse(x, state, parsers, handle) {
       while (i < x.length) {
         column = r.columns[columnIndex++] = {
           key: x[i++],
-          name: String(x.slice(i, i = x.indexOf(0, i))),
+          name: transform.column.from
+            ? transform.column.from(x.toString('utf8', i, i = x.indexOf(0, i)))
+            : x.toString('utf8', i, i = x.indexOf(0, i)),
           type: x.readUInt32BE(i += 1),
           parser: parsers[x.readUInt32BE(i)],
           atttypmod: x.readUInt32BE(i += 4)
@@ -170,13 +173,12 @@ function parse(x, state, parsers, handle) {
     O: () => { /* noop */ }, // Origin
     B: x => { // Begin
       state.date = Time(x.readBigInt64BE(9))
-      state.lsn = x.slice(1, 9)
+      state.lsn = x.subarray(1, 9)
     },
     I: x => { // Insert
       let i = 1
       const relation = state[x.readUInt32BE(i)]
-      const row = {}
-      tuples(x, row, relation.columns, i += 7)
+      const { row } = tuples(x, relation.columns, i += 7, transform)
 
       handle(row, {
         command: 'insert',
@@ -188,13 +190,10 @@ function parse(x, state, parsers, handle) {
       const relation = state[x.readUInt32BE(i)]
       i += 4
       const key = x[i] === 75
-      const row = key || x[i] === 79
-        ? {}
+      handle(key || x[i] === 79
+        ? tuples(x, key ? relation.keys : relation.columns, i += 3, transform).row
         : null
-
-      tuples(x, row, key ? relation.keys : relation.columns, i += 3)
-
-      handle(row, {
+      , {
         command: 'delete',
         relation,
         key
@@ -205,35 +204,36 @@ function parse(x, state, parsers, handle) {
       const relation = state[x.readUInt32BE(i)]
       i += 4
       const key = x[i] === 75
-      const old = key || x[i] === 79
-        ? {}
+      const xs = key || x[i] === 79
+        ? tuples(x, key ? relation.keys : relation.columns, i += 3, transform)
         : null
 
-      old && (i = tuples(x, old, key ? relation.keys : relation.columns, i += 3))
+      xs && (i = xs.i)
 
-      const row = {}
-      tuples(x, row, relation.columns, i + 3)
+      const { row } = tuples(x, relation.columns, i + 3, transform)
 
       handle(row, {
         command: 'update',
         relation,
         key,
-        old
+        old: xs && xs.row
       })
     },
     T: () => { /* noop */ }, // Truncate,
     C: () => { /* noop */ }  // Commit
   }).reduce(char, {})[x[0]](x)
 }
 
-function tuples(x, row, columns, xi) {
+function tuples(x, columns, xi, transform) {
   let type
     , column
+    , value
 
+  const row = transform.raw ? new Array(columns.length) : {}
   for (let i = 0; i < columns.length; i++) {
     type = x[xi++]
     column = columns[i]
-    row[column.name] = type === 110 // n
+    value = type === 110 // n
       ? null
       : type === 117 // u
         ? undefined
@@ -242,9 +242,18 @@ function tuples(x, row, columns, xi) {
           : column.parser.array === true
             ? column.parser(x.toString('utf8', xi + 5, xi += 4 + x.readUInt32BE(xi)))
             : column.parser(x.toString('utf8', xi + 4, xi += 4 + x.readUInt32BE(xi)))
+
+    transform.raw
+      ? (row[i] = transform.raw === true
+        ? value
+        : transform.value.from ? transform.value.from(value, column) : value)
+      : (row[column.name] = transform.value.from
+        ? transform.value.from(value, column)
+        : value
+      )
   }
 
-  return xi
+  return { i: xi, row: transform.row.from ? transform.row.from(row) : row }
 }
 
 function parseEvent(x) {

cjs/src/types.js

@@ -153,7 +153,10 @@ function select(first, rest, parameters, types, options) {
 
 const builders = Object.entries({
   values,
-  in: values,
+  in: (...xs) => {
+    const x = values(...xs)
+    return x === '()' ? '(null)' : x
+  },
   select,
   as: select,
   returning: select,
@@ -323,3 +326,34 @@ const toKebab = module.exports.toKebab = x => x.replace(/_/g, '-')
 const fromCamel = module.exports.fromCamel = x => x.replace(/([A-Z])/g, '_$1').toLowerCase()
 const fromPascal = module.exports.fromPascal = x => (x.slice(0, 1) + x.slice(1).replace(/([A-Z])/g, '_$1')).toLowerCase()
 const fromKebab = module.exports.fromKebab = x => x.replace(/-/g, '_')
+
+function createJsonTransform(fn) {
+  return function jsonTransform(x, column) {
+    return column.type === 114 || column.type === 3802
+     ? Array.isArray(x)
+       ? x.map(jsonTransform)
+       : Object.entries(x).reduce((acc, [k, v]) => Object.assign(acc, { [fn(k)]: v }), {})
+     : x
+  }
+}
+
+toCamel.column = { from: toCamel }
+toCamel.value = { from: createJsonTransform(toCamel) }
+fromCamel.column = { to: fromCamel }
+
+const camel = module.exports.camel = { ...toCamel }
+camel.column.to = fromCamel;
+
+toPascal.column = { from: toPascal }
+toPascal.value = { from: createJsonTransform(toPascal) }
+fromPascal.column = { to: fromPascal }
+
+const pascal = module.exports.pascal = { ...toPascal }
+pascal.column.to = fromPascal
+
+toKebab.column = { from: toKebab }
+toKebab.value = { from: createJsonTransform(toKebab) }
+fromKebab.column = { to: fromKebab }
+
+const kebab = module.exports.kebab = { ...toKebab }
+kebab.column.to = fromKebab