@1auth/store-sql 0.0.0-alpha.31 → 0.0.0-alpha.33

package/index.js

@@ -1,9 +1,10 @@
 const options = {
-  log: false,
-  query: (sql, parameters) => {
-    console.log('sql', sql, parameters)
-    return sql.includes('SELECT') ? [] : { id: 'sql' }
-  }
+  log: undefined,
+  query: undefined, // async (sql, parameters) => {}
+  // mode:
+  // ?: use `?` for variables, ie sqlite
+  // $: use `$1` for variables, ie postgres
+  placeholder: '?'
 }
 
 export default (params) => {
@@ -11,30 +12,94 @@ export default (params) => {
 }
 
 export const exists = async (table, filters) => {
-  const item = await select(table, filters)
-  return item?.sub
+  if (options.log) {
+    options.log('@1auth/store-sql exists(', table, filters, ')')
+  }
+  const { select, where, parameters } = makeSqlParts(filters, {}, ['sub'])
+  const sql = `SELECT ${select} FROM ${table} ${where} LIMIT 1`
+  return await options.query(sql, parameters).then((res) => res?.[0]?.sub)
 }
 
-export const selectList = async (table, filters = {}, fields = []) => {
-  const { select, where, parameters } = makeSqlParts(filters, {}, fields)
-  const sql = `SELECT ${select} FROM ${table} ${where}`
-  return await options.query(sql, parameters)
+export const count = async (table, filters = {}) => {
+  if (options.log) {
+    options.log('@1auth/store-sql count(', table, filters, ')')
+  }
+  const { where, parameters } = makeSqlParts(filters, {})
+  const sql = `SELECT COUNT(*) AS count FROM ${table} ${where}`
+  return await options.query(sql, parameters).then((res) => res[0].count)
 }
 
 export const select = async (table, filters = {}, fields = []) => {
+  if (options.log) {
+    options.log('@1auth/store-sql select(', table, filters, fields, ')')
+  }
   const { select, where, parameters } = makeSqlParts(filters, {}, fields)
   const sql = `SELECT ${select} FROM ${table} ${where} LIMIT 1`
-  return await options.query(sql, parameters).then((res) => res[0])
+  return await options
+    .query(sql, parameters)
+    .then((res) => res?.[0])
+    // Workaround because an expire filter doesn't exists yet'
+    .then((row) => {
+      parseValues(row)
+      return row
+    })
+}
+
+export const selectList = async (table, filters = {}, fields = []) => {
+  if (options.log) {
+    options.log('@1auth/store-sql selectList(', table, filters, fields, ')')
+  }
+  const { select, where, parameters } = makeSqlParts(filters, {}, fields)
+  const sql = `SELECT ${select} FROM ${table} ${where}`
+  return await options
+    .query(sql, parameters)
+    // Workaround because an expire filter doesn't exists yet'
+    .then((rows) => {
+      return rows.map((row) => {
+        parseValues(row)
+        return row
+      })
+    })
 }
 
 export const insert = async (table, values = {}) => {
+  if (options.log) {
+    options.log('@1auth/store-sql insert(', table, values, ')')
+  }
   normalizeValues(values)
   const { insert, parameters } = makeSqlParts({}, values)
   const sql = `INSERT INTO ${table} ${insert} RETURNING id`
-  return await options.query(sql, parameters)
+  const res = await options.query(sql, parameters)
+  return res.id
+}
+
+export const insertList = async (table, list = []) => {
+  if (options.log) {
+    options.log('@1auth/store-sql insertList(', table, list, ')')
+  }
+  const insertValues = []
+  let insertParameters = []
+  for (let i = 0, l = list.length; i < l; i++) {
+    const values = list[i]
+    const { insert, parameters } = makeSqlParts({}, values)
+    if (i) {
+      insertValues.push(insert.split('VALUES')[1]) // (?)
+    } else {
+      insertValues.push(insert) // (name) VALUES (?)
+    }
+
+    insertParameters = insertParameters.concat(parameters)
+  }
+
+  const sql = `INSERT INTO ${table} ${insertValues.join(',')} RETURNING id`
+  const res = await options.query(sql, insertParameters)
+  return res
 }
 
 export const update = async (table, filters = {}, values = {}) => {
+  if (options.log) {
+    options.log('@1auth/store-sql update(', table, filters, values, ')')
+  }
   normalizeValues(values)
   const { update, where, parameters } = makeSqlParts(filters, values)
   const sql = `UPDATE ${table} SET ${update} ${where}`
@@ -42,12 +107,16 @@ export const update = async (table, filters = {}, values = {}) => {
 }
 
 export const remove = async (table, filters = {}) => {
+  if (options.log) {
+    options.log('@1auth/store-sql remove(', table, filters, ')')
+  }
   const { where, parameters } = makeSqlParts(filters)
   const sql = `DELETE FROM ${table} ${where}`
   await options.query(sql, parameters)
 }
 
 const normalizeValues = (values) => {
+  if (!values) return
   values.create &&= new Date(values.create * 1000).toISOString()
   values.update &&= new Date(values.update * 1000).toISOString()
   values.verify &&= new Date(values.verify * 1000).toISOString()
@@ -55,39 +124,52 @@ const normalizeValues = (values) => {
   values.expire &&= new Date(values.expire * 1000).toISOString()
 }
 
+const parseValues = (values) => {
+  if (!values) return
+  values.create &&= Date.parse(values.create) / 1000
+  values.update &&= Date.parse(values.update) / 1000
+  values.verify &&= Date.parse(values.verify) / 1000
+  values.lastused &&= Date.parse(values.lastused) / 1000
+  values.expire &&= Date.parse(values.expire) / 1000
+}
+
 // export for testing
+export const getPlaceholder = (idx) => {
+  return options.placeholder === '$' ? '$' + idx : options.placeholder
+}
 export const makeSqlParts = (filters = {}, values = {}, fields = []) => {
   let parameters = []
   let idx = 1
   const keys = Object.keys(values)
 
-  const select = fields.length ? fields.join(', ') : '*'
+  const select = fields.length ? '"' + fields.join('", "') + '"' : '*'
 
   const insertParts = []
   const updateParts = []
   for (const key of keys) {
-    insertParts.push('$' + idx)
-    updateParts.push('"' + key + '" = $' + idx)
+    // insertParts.push("$" + idx);
+    // updateParts.push('"' + key + '" = $' + idx);
+    insertParts.push(getPlaceholder(idx))
+    updateParts.push('"' + key + '" = ' + getPlaceholder(idx))
     idx++
   }
-
   const insert =
     '("' + keys.join('", "') + '") VALUES (' + insertParts.join(', ') + ')'
-
   const update = updateParts.join(', ')
-
   parameters = parameters.concat(Object.values(values))
 
   let where = Object.keys(filters)
   where = where
     .map((key) => {
       if (Array.isArray(filters[key])) {
-        let sql = filters[key].map((v, vidx) => '$' + idx++).join(',')
+        // let sql = filters[key].map((v, vidx) => "$" + idx++).join(",");
+        let sql = filters[key].map((_, idx) => getPlaceholder(idx++)).join(',')
         sql &&= '"' + key + '" IN (' + sql + ')'
         parameters = parameters.concat(filters[key])
         return sql
       }
-      const sql = '"' + key + '" = $' + idx++
+      // const sql = '"' + key + '" = $' + idx++;
+      const sql = '"' + key + '" = ' + getPlaceholder(idx++)
       parameters.push(filters[key])
       return sql
     })
@@ -97,3 +179,14 @@ export const makeSqlParts = (filters = {}, values = {}, fields = []) => {
 
   return { select, insert, update, where, parameters }
 }
+
+export const __table = async (sql) => {
+  await options.query(sql)
+}
+
+export const __clear = async (table) => {
+  if (options.log) {
+    options.log('__clear', { table })
+  }
+  options.query(`DELETE FROM ${table}`)
+}

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@1auth/store-sql",
-  "version": "0.0.0-alpha.31",
+  "version": "0.0.0-alpha.33",
   "description": "",
   "type": "module",
   "engines": {
-    "node": ">=16"
+    "node": ">=20"
   },
   "engineStrict": true,
   "publishConfig": {
@@ -27,7 +27,7 @@
   ],
   "scripts": {
     "test": "npm run test:unit",
-    "test:unit": "ava"
+    "test:unit": "node --test"
   },
   "license": "MIT",
   "funding": {
@@ -48,10 +48,13 @@
     "url": "https://github.com/willfarrell/1auth/issues"
   },
   "homepage": "https://github.com/willfarrell/1auth",
-  "gitHead": "246b0b521e6d136d8f37ee7d9781ffc8ccc987bd",
+  "gitHead": "14b8c5bd83728c460fdcc4c3af5ae5c3c2bb9007",
   "peerDependencies": {
     "@aws-sdk/client-dynamodb": "^3.0.0",
     "@aws-sdk/util-dynamodb": "^3.0.0",
-    "uuid": "9.0.1"
+    "uuid": "^10.0.0"
+  },
+  "devDependencies": {
+    "better-sqlite3": "11.0.0"
   }
 }