velocious 1.0.1 → 1.0.3

package/src/{controller.cjs → controller.mjs}

@@ -1,7 +1,7 @@
-const {digg, digs} = require("diggerize")
-const ejs = require("ejs")
+import {digg, digs} from "diggerize"
+import ejs from "ejs"
 
-module.exports = class VelociousController {
+export default class VelociousController {
   constructor({configuration, params, request, response}) {
     if (!configuration) throw new Error("No configuration given")
     if (!params) throw new Error("No params given")
@@ -15,7 +15,24 @@ module.exports = class VelociousController {
     this.viewParams = {}
   }
 
-  render() {
+  params = () => this._params
+
+  render(args = {}) {
+    if (args.json) {
+      return this.renderJsonArg(args)
+    }
+
+    return this.renderView()
+  }
+
+  renderJsonArg(args) {
+    const body = JSON.stringify(args.json)
+
+    this._response.addHeader("Content-Type", "application/json")
+    this._response.setBody(body)
+  }
+
+  renderView() {
     return new Promise((resolve, reject) => {
       const actionName = digg(this, "_params", "action")
       const controllerName = digg(this, "_params", "controller")

package/src/database/drivers/base.mjs

@@ -0,0 +1,17 @@
+export default class VelociousDatabaseDriversBase {
+  constructor(args) {
+    this._args = args
+  }
+
+  getArgs() {
+    return this._args
+  }
+
+  getIdSeq() {
+    return this.idSeq
+  }
+
+  setIdSeq(id) {
+    this.idSeq = id
+  }
+}

package/src/database/drivers/index.mjs

@@ -0,0 +1,5 @@
+import Mysql from "../drivers/mysql/index.mjs"
+
+export default {
+  Mysql
+}

package/src/database/drivers/mysql/connect-connection.mjs

@@ -0,0 +1,12 @@
+// Async function to connect a MySQL connection
+export default function connectConnection(connection) {
+  return new Promise((resolve, reject) => {
+    connection.connect((error) => {
+      if (error) {
+        reject(error)
+      } else {
+        resolve()
+      }
+    })
+  })
+}

package/src/database/drivers/mysql/index.mjs

@@ -0,0 +1,102 @@
+import Base from "../base.mjs"
+import connectConnection from "./connect-connection.mjs"
+import CreateDatabase from "./sql/create-database.mjs"
+import CreateTable from "./sql/create-table.mjs"
+import Delete from "./sql/delete.mjs"
+import {digg} from "diggerize"
+import Insert from "./sql/insert.mjs"
+import Options from "./options.mjs"
+import mysql from "mysql"
+import query from "./query.mjs"
+import QueryParser from "./query-parser.mjs"
+import Update from "./sql/update.mjs"
+
+export default class VelociousDatabaseDriversMysql extends Base{
+  async connect() {
+    const connection = mysql.createConnection(this.connectArgs())
+
+    await connectConnection(connection)
+    this.connection = connection
+  }
+
+  disconnect() {
+    this.connection.end()
+  }
+
+  connectArgs() {
+    const args = this.getArgs()
+    const connectArgs = []
+    const forward = ["database", "host", "password"]
+
+    for (const forwardValue of forward) {
+      if (forwardValue in args) connectArgs[forwardValue] = digg(args, forwardValue)
+    }
+
+    if ("username" in args) connectArgs["user"] = args["username"]
+
+    return connectArgs
+  }
+
+  async close() {
+    await this.connection.end()
+    this.connection = undefined
+  }
+
+  createDatabaseSql(databaseName, args) {
+    const createArgs = Object.assign({databaseName, driver: this}, args)
+    const createDatabase = new CreateDatabase(createArgs)
+
+    return createDatabase.toSql()
+  }
+
+  createTableSql(tableData) {
+    const createArgs = Object.assign({tableData, driver: this})
+    const createTable = new CreateTable(createArgs)
+
+    return createTable.toSql()
+  }
+
+  async query(sql) {
+    return await query(this.connection, sql)
+  }
+
+  queryToSql(query) {
+    return new QueryParser({query}).toSql()
+  }
+
+  quote(string) {
+    if (!this.connection) throw new Error("Can't escape before connected")
+
+    return this.connection.escape(string)
+  }
+
+  quoteColumn(string) {
+    return `\`${string}\``
+  }
+
+  deleteSql({tableName, conditions}) {
+    const deleteInstruction = new Delete({conditions, driver: this, tableName})
+
+    return deleteInstruction.toSql()
+  }
+
+  insertSql({tableName, data}) {
+    const insert = new Insert({driver: this, tableName, data})
+
+    return insert.toSql()
+  }
+
+  options() {
+    if (!this._options) {
+      this._options = new Options({driver: this})
+    }
+
+    return this._options
+  }
+
+  updateSql({conditions, data, tableName}) {
+    const update = new Update({conditions, data, driver: this, tableName})
+
+    return update.toSql()
+  }
+}

package/src/database/drivers/mysql/options.mjs

@@ -0,0 +1,17 @@
+import QueryParserOptions from "../../query-parser/options.mjs"
+
+export default class VelociousDatabaseDriversMysqlOptions extends QueryParserOptions {
+  constructor(options) {
+    options.columnQuote = "`"
+    options.stringQuote = "'"
+    options.tableQuote = "`"
+
+    super(options)
+  }
+
+  quote(string) {
+    if (!this.driver) throw new Error("Driver not set")
+
+    return this.driver.quote(string)
+  }
+}

package/src/database/drivers/mysql/query-parser.mjs

@@ -0,0 +1,25 @@
+import {digs} from "diggerize"
+import FromParser from "../../query-parser/from-parser.mjs"
+import JoinsParser from "../../query-parser/joins-parser.mjs"
+import SelectParser from "../../query-parser/select-parser.mjs"
+
+export default class VelociousDatabaseConnectionDriversMysqlQueryParser {
+  constructor({pretty, query}) {
+    if (!query) throw new Error("No query given")
+
+    this.pretty = pretty
+    this.query = query
+  }
+
+  toSql() {
+    const {pretty, query} = digs(this, "pretty", "query")
+
+    let sql = ""
+
+    sql += new SelectParser({pretty, query}).toSql()
+    sql += new FromParser({pretty, query}).toSql()
+    sql += new JoinsParser({pretty, query}).toSql()
+
+    return sql
+  }
+}

package/src/database/drivers/mysql/query.mjs

@@ -0,0 +1,26 @@
+export default async function query(connection, sql) {
+  return new Promise((resolve, reject) => {
+    connection.query(sql, (error, results, fields) => {
+      if (error) {
+        reject(error)
+      } else {
+        const rows = []
+
+        for (const resultIndex in results) {
+          const result = {}
+
+          for (const fieldKey in fields) {
+            const field = fields[fieldKey].name
+            const value = results[resultIndex][field]
+
+            result[field] = value
+          }
+
+          rows.push(result)
+        }
+
+        resolve(rows)
+      }
+    })
+  })
+}

package/src/database/drivers/mysql/sql/create-database.mjs

@@ -0,0 +1,4 @@
+import CreateDatabaseBase from "../../../query/create-database-base.mjs"
+
+export default class VelociousDatabaseConnectionDriversMysqlSqlCreateDatabase extends CreateDatabaseBase {
+}

package/src/database/drivers/mysql/sql/create-table.mjs

@@ -0,0 +1,4 @@
+import CreateTableBase from "../../../query/create-table-base.mjs"
+
+export default class VelociousDatabaseConnectionDriversMysqlSqlCreateTable extends CreateTableBase {
+}

package/src/database/drivers/mysql/sql/delete.mjs

@@ -0,0 +1,19 @@
+import DeleteBase from "../../../query/delete-base.mjs"
+
+export default class VelociousDatabaseConnectionDriversMysqlSqlDelete extends DeleteBase {
+  toSql() {
+    let sql = `DELETE FROM ${this.getOptions().quoteTableName(this.tableName)} WHERE `
+    let count = 0
+
+    for (let columnName in this.conditions) {
+      if (count > 0) sql += " AND "
+
+      sql += this.getOptions().quoteColumnName(columnName)
+      sql += " = "
+      sql += this.getOptions().quote(this.conditions[columnName])
+      count++
+    }
+
+    return sql
+  }
+}

package/src/database/drivers/mysql/sql/insert.mjs

@@ -0,0 +1,29 @@
+import InsertBase from "../../../query/insert-base.mjs"
+
+export default class VelociousDatabaseConnectionDriversMysqlSqlInsert extends InsertBase {
+  toSql() {
+    let sql = `INSERT INTO ${this.getOptions().quoteTableName(this.tableName)} (`
+    let count = 0
+
+    for (let columnName in this.data) {
+      if (count > 0) sql += ", "
+
+      sql += this.getOptions().quoteColumnName(columnName)
+      count++
+    }
+
+    sql += ") VALUES ("
+    count = 0
+
+    for (let columnName in this.data) {
+      if (count > 0) sql += ", "
+
+      sql += this.getOptions().quote(this.data[columnName])
+      count++
+    }
+
+    sql += ")"
+
+    return sql
+  }
+}

package/src/database/drivers/mysql/sql/update.mjs

@@ -0,0 +1,31 @@
+import UpdateBase from "../../../query/update-base.mjs"
+
+export default class VelociousDatabaseConnectionDriversMysqlSqlUpdate extends UpdateBase {
+  toSql() {
+    let sql = `UPDATE ${this.getOptions().quoteTableName(this.tableName)} SET `
+    let count = 0
+
+    for (let columnName in this.data) {
+      if (count > 0) sql += ", "
+
+      sql += this.getOptions().quoteColumnName(columnName)
+      sql += " = "
+      sql += this.getOptions().quote(this.data[columnName])
+      count++
+    }
+
+    sql += " WHERE "
+    count = 0
+
+    for (let columnName in this.conditions) {
+      if (count > 0) sql += " AND "
+
+      sql += this.getOptions().quoteColumnName(columnName)
+      sql += " = "
+      sql += this.getOptions().quote(this.conditions[columnName])
+      count++
+    }
+
+    return sql
+  }
+}

package/src/database/drivers/sqlite/options.mjs

@@ -0,0 +1,17 @@
+import QueryParserOptions from "../../query-parser/options.mjs"
+
+export default class VelociousDatabaseDriversMysqlOptions extends QueryParserOptions {
+  constructor(options) {
+    options.columnQuote = "`"
+    options.stringQuote = "'"
+    options.tableQuote = "`"
+
+    super(options)
+  }
+
+  quote(string) {
+    if (!this.driver) throw new Error("Driver not set")
+
+    return this.driver.quote(string)
+  }
+}

package/src/database/drivers/sqlite/query-parser.mjs

@@ -0,0 +1,25 @@
+import {digs} from "diggerize"
+import FromParser from "../../query-parser/from-parser.mjs"
+import JoinsParser from "../../query-parser/joins-parser.mjs"
+import SelectParser from "../../query-parser/select-parser.mjs"
+
+export default class VelociousDatabaseConnectionDriversMysqlQueryParser {
+  constructor({pretty, query}) {
+    if (!query) throw new Error("No query given")
+
+    this.pretty = pretty
+    this.query = query
+  }
+
+  toSql() {
+    const {pretty, query} = digs(this, "pretty", "query")
+
+    let sql = ""
+
+    sql += new SelectParser({pretty, query}).toSql()
+    sql += new FromParser({pretty, query}).toSql()
+    sql += new JoinsParser({pretty, query}).toSql()
+
+    return sql
+  }
+}

package/src/database/drivers/sqlite/sql/create-database.mjs

@@ -0,0 +1,4 @@
+import CreateDatabaseBase from "../../../query/create-database-base.mjs"
+
+export default class VelociousDatabaseConnectionDriversMysqlSqlCreateDatabase extends CreateDatabaseBase {
+}

package/src/database/drivers/sqlite/sql/create-table.mjs

@@ -0,0 +1,4 @@
+import CreateTableBase from "../../../query/create-table-base.mjs"
+
+export default class VelociousDatabaseConnectionDriversMysqlSqlCreateTable extends CreateTableBase {
+}

package/src/database/drivers/sqlite/sql/delete.mjs

@@ -0,0 +1,19 @@
+import DeleteBase from "../../../query/delete-base.mjs"
+
+export default class VelociousDatabaseConnectionDriversMysqlSqlDelete extends DeleteBase {
+  toSql() {
+    let sql = `DELETE FROM ${this.getOptions().quoteTableName(this.tableName)} WHERE `
+    let count = 0
+
+    for (let columnName in this.conditions) {
+      if (count > 0) sql += " AND "
+
+      sql += this.getOptions().quoteColumnName(columnName)
+      sql += " = "
+      sql += this.getOptions().quote(this.conditions[columnName])
+      count++
+    }
+
+    return sql
+  }
+}

package/src/database/drivers/sqlite/sql/insert.mjs

@@ -0,0 +1,29 @@
+import InsertBase from "../../../query/insert-base.mjs"
+
+export default class VelociousDatabaseConnectionDriversMysqlSqlInsert extends InsertBase {
+  toSql() {
+    let sql = `INSERT INTO ${this.getOptions().quoteTableName(this.tableName)} (`
+    let count = 0
+
+    for (let columnName in this.data) {
+      if (count > 0) sql += ", "
+
+      sql += this.getOptions().quoteColumnName(columnName)
+      count++
+    }
+
+    sql += ") VALUES ("
+    count = 0
+
+    for (let columnName in this.data) {
+      if (count > 0) sql += ", "
+
+      sql += this.getOptions().quote(this.data[columnName])
+      count++
+    }
+
+    sql += ")"
+
+    return sql
+  }
+}

package/src/database/drivers/sqlite/sql/update.mjs

@@ -0,0 +1,31 @@
+import UpdateBase from "../../../query/update-base.mjs"
+
+export default class VelociousDatabaseConnectionDriversMysqlSqlUpdate extends UpdateBase {
+  toSql() {
+    let sql = `UPDATE ${this.getOptions().quoteTableName(this.tableName)} SET `
+    let count = 0
+
+    for (let columnName in this.data) {
+      if (count > 0) sql += ", "
+
+      sql += this.getOptions().quoteColumnName(columnName)
+      sql += " = "
+      sql += this.getOptions().quote(this.data[columnName])
+      count++
+    }
+
+    sql += " WHERE "
+    count = 0
+
+    for (let columnName in this.conditions) {
+      if (count > 0) sql += " AND "
+
+      sql += this.getOptions().quoteColumnName(columnName)
+      sql += " = "
+      sql += this.getOptions().quote(this.conditions[columnName])
+      count++
+    }
+
+    return sql
+  }
+}

package/src/database/drivers/sqlite-expo/index.mjs

@@ -0,0 +1,100 @@
+import Base from "../base.mjs"
+import CreateDatabase from "../sqlite/sql/create-database.mjs"
+import CreateTable from "../sqlite/sql/create-table.mjs"
+import Delete from "../sqlite/sql/delete.mjs"
+import {digg} from "diggerize"
+import Insert from "../sqlite/sql/insert.mjs"
+import Options from "../sqlite/options.mjs"
+import query from "./query.mjs"
+import QueryParser from "../sqlite/query-parser.mjs"
+import * as SQLite from "expo-sqlite"
+import Update from "../sqlite/sql/update.mjs"
+
+export default class VelociousDatabaseDriversMysql extends Base{
+  async connect() {
+    const connection = await SQLite.openDatabaseAsync(digg(this.connectArgs(), "name"))
+
+    this.connection = connection
+  }
+
+  disconnect() {
+    this.connection.end()
+  }
+
+  connectArgs() {
+    const args = this.getArgs()
+    const connectArgs = []
+    const forward = ["database", "host", "password"]
+
+    for (const forwardValue of forward) {
+      if (forwardValue in args) connectArgs[forwardValue] = digg(args, forwardValue)
+    }
+
+    if ("username" in args) connectArgs["user"] = args["username"]
+
+    return connectArgs
+  }
+
+  async close() {
+    await this.connection.end()
+    this.connection = undefined
+  }
+
+  createDatabaseSql(databaseName, args) {
+    const createArgs = Object.assign({databaseName, driver: this}, args)
+    const createDatabase = new CreateDatabase(createArgs)
+
+    return createDatabase.toSql()
+  }
+
+  createTableSql(tableData) {
+    const createArgs = Object.assign({tableData, driver: this})
+    const createTable = new CreateTable(createArgs)
+
+    return createTable.toSql()
+  }
+
+  async query(sql) {
+    return await query(this.connection, sql)
+  }
+
+  queryToSql(query) {
+    return new QueryParser({query}).toSql()
+  }
+
+  quote(string) {
+    if (!this.connection) throw new Error("Can't escape before connected")
+
+    return this.connection.escape(string)
+  }
+
+  quoteColumn(string) {
+    return `\`${string}\``
+  }
+
+  deleteSql({tableName, conditions}) {
+    const deleteInstruction = new Delete({conditions, driver: this, tableName})
+
+    return deleteInstruction.toSql()
+  }
+
+  insertSql({tableName, data}) {
+    const insert = new Insert({driver: this, tableName, data})
+
+    return insert.toSql()
+  }
+
+  options() {
+    if (!this._options) {
+      this._options = new Options({driver: this})
+    }
+
+    return this._options
+  }
+
+  updateSql({conditions, data, tableName}) {
+    const update = new Update({conditions, data, driver: this, tableName})
+
+    return update.toSql()
+  }
+}

package/src/database/drivers/sqlite-expo/query.mjs

@@ -0,0 +1,9 @@
+export default async function query(connection, sql) {
+  const rows = []
+
+  for await (const entry of connection.getEachAsync(sql)) {
+    rows.push(entry)
+  }
+
+  return rows
+}

package/src/database/handler.mjs

@@ -0,0 +1,7 @@
+export default class VelociousDatabaseHandler {
+  clone() {
+    const newHandler = new VelociousDatabaseHandler()
+
+    return newHandler
+  }
+}

package/src/database/index.mjs

@@ -0,0 +1,15 @@
+import Drivers from "./drivers/index.mjs"
+import Handler from "./handler.mjs"
+import Migration from "./migration/index.mjs"
+import Migrator from "./migrator/index.mjs"
+import Query from "./query/index.mjs"
+import Record from "./record/index.mjs"
+
+export default {
+  Drivers,
+  Handler,
+  Migration,
+  Migrator,
+  Query,
+  Record
+}

package/src/database/migration/index.mjs

@@ -0,0 +1,18 @@
+import TableData from "../table-data/index.mjs"
+
+export default class VelociousDatabaseMigration {
+  constructor({configuration}) {
+    this.configuration = configuration
+  }
+
+  async createTable(tableName, callback) {
+    const tableData = new TableData(tableName)
+
+    callback(tableData)
+
+    const databasePool = this.configuration.databasePool
+    const sql = databasePool.createTableSql(tableData)
+
+    await databasePool.query(sql)
+  }
+}

package/src/database/migrator/index.mjs

@@ -0,0 +1,15 @@
+export default class VelociousDatabaseMigrator {
+  constructor({path}) {
+    if (!path) throw new Error("No 'path' given")
+
+    this.path = path
+  }
+
+  migrateUp() {
+    throw new Error("stub")
+  }
+
+  migrateDown() {
+    throw new Error("stub")
+  }
+}