velocious 1.0.0 → 1.0.2

package/src/routes/index.mjs

@@ -0,0 +1,9 @@
+import RootRoute from "./root-route.mjs"
+
+export default class VelociousRoutes {
+  rootRoute = new RootRoute()
+
+  draw(callback) {
+    callback(this.rootRoute)
+  }
+}

package/src/routes/{resolver.cjs → resolver.mjs}

@@ -1,18 +1,18 @@
-const {digg, digs} = require("diggerize")
+import {digg, digs} from "diggerize"
 
-module.exports = class VelociousRoutesResolver {
-  constructor({configuration, request, response, routes}) {
+export default class VelociousRoutesResolver {
+  constructor({configuration, request, response}) {
     if (!configuration) throw new Error("No configuration given")
     if (!request) throw new Error("No request given")
     if (!response) throw new Error("No response given")
 
     this.configuration = configuration
-    this.params = {}
+    this.params = request.params()
     this.request = request
     this.response = response
   }
 
-  resolve() {
+  async resolve() {
     let currentRoute = digg(this, "configuration", "routes", "rootRoute")
     let currentPath = this.request.path()
 
@@ -21,8 +21,9 @@ module.exports = class VelociousRoutesResolver {
     if (!matchResult) throw new Error(`Couldn't match a route with the given path: ${currentPath}`)
 
     if (this.params.action && this.params.controller) {
-      const controllerPath = `${digg(this, "configuration", "directory")}/src/routes/${digg(this, "params", "controller")}/controller.cjs`
-      const controllerClass = require(controllerPath)
+      const controllerPath = `${digg(this, "configuration", "directory")}/src/routes/${digg(this, "params", "controller")}/controller.mjs`
+      const controllerClassImport = await import(controllerPath)
+      const controllerClass = controllerClassImport.default
       const controllerInstance = new controllerClass({
         configuration: this.configuration,
         params: this.params,
@@ -30,7 +31,11 @@ module.exports = class VelociousRoutesResolver {
         response: this.response
       })
 
-      controllerInstance[this.params.action]()
+      if (!(this.params.action in controllerInstance)) {
+        throw new Error(`Missing action on controller: ${this.params.controller}#${this.params.action}`)
+      }
+
+      await controllerInstance[this.params.action]()
 
       return
     }
@@ -44,7 +49,8 @@ module.exports = class VelociousRoutesResolver {
     for (const subRoute of route.routes) {
       const matchResult = subRoute.matchWithPath({
         params: this.params,
-        path: pathWithoutSlash
+        path: pathWithoutSlash,
+        request: this.request
       })
 
       if (!matchResult) continue

package/src/routes/{resource-route.cjs → resource-route.mjs}

@@ -1,14 +1,16 @@
-const BaseRoute = require("./base-route.cjs")
-const escapeStringRegexp = require("escape-string-regexp")
+import BaseRoute, {initBaseRoute} from "./base-route.mjs"
+import escapeStringRegexp from "escape-string-regexp"
 
-module.exports = class VelociousRouteResourceRoute extends BaseRoute {
+initBaseRoute()
+
+export default class VelociousRouteResourceRoute extends BaseRoute {
   constructor({name}) {
     super()
     this.name = name
     this.regExp = new RegExp(`^(${escapeStringRegexp(name)})(.*)$`)
   }
 
-  matchWithPath({params, path}) {
+  matchWithPath({params, path, request}) {
     const match = path.match(this.regExp)
 
     if (match) {
@@ -24,7 +26,9 @@ module.exports = class VelociousRouteResourceRoute extends BaseRoute {
       }
 
       if (!subRoutesMatchesRestPath) {
-        if (restPath.match(/\/(.+)/)) {
+        if (request.httpMethod() == "POST") {
+          action = "create"
+        } else if (restPath.match(/\/(.+)/)) {
           // TODO: This should change the action to "show" and set the "resource_name_id" in params.
           action = "show"
         }

package/src/routes/root-route.mjs

@@ -0,0 +1,6 @@
+import BaseRoute, {initBaseRoute} from "./base-route.mjs"
+
+initBaseRoute()
+
+export default class VelociousRootRoute extends BaseRoute {
+}

package/bin/velocious

@@ -1,14 +0,0 @@
-#!/usr/bin/node
-
-console.log("Hello", process.argv)
-
-const args = process.argv.slice(2)
-
-console.log(args)
-
-if (args[0] == "g" && args[1] == "migration") {
-  const migrationName = args[2]
-  const date = new Date()
-
-  console.log({ migrationName, date })
-}

package/index.cjs

@@ -1,11 +0,0 @@
-const Application = require("./src/application.cjs")
-const Controller = require("./src/controller.cjs")
-const Database = require("./src/database/index.cjs")
-const HttpServer = require("./src/http-server/index.cjs")
-
-module.exports = {
-  Application,
-  Controller,
-  Database,
-  HttpServer
-}

package/spec/dummy/config/databases.example.json

@@ -1,10 +0,0 @@
-{
-  "default": {
-    "master": {
-      "type": "mysql",
-      "host": "mysql",
-      "username": "username",
-      "password": "password"
-    }
-  }
-}

package/spec/dummy/config/databases.peakflow.json

@@ -1,11 +0,0 @@
-{
-  "default": {
-    "master": {
-      "type": "mysql",
-      "host": "mysql",
-      "username": "peakflow",
-      "password": "password",
-      "database": "velocious_test"
-    }
-  }
-}

package/spec/dummy/index.cjs

@@ -1,40 +0,0 @@
-const {Application} = require("../../index.cjs")
-
-module.exports = class Dummy {
-  static async run(callback) {
-    const dummy = new Dummy()
-
-    await dummy.run(callback)
-  }
-
-  async run(callback) {
-    await this.start()
-
-    try {
-      await callback()
-    } finally {
-      this.stop()
-    }
-  }
-
-  async start() {
-    this.application = new Application({
-      databases: {
-        default: {
-          host: "mysql",
-          username: "user",
-          password: ""
-        }
-      },
-      debug: false,
-      directory: __dirname,
-      httpServer: {port: 3006}
-    })
-
-    await this.application.start()
-  }
-
-  stop() {
-    this.application.stop()
-  }
-}

package/spec/dummy/src/models/task.cjs

@@ -1,4 +0,0 @@
-const Record = require("../../../../src/database/record/index.cjs")
-
-module.exports = class Task extends Record {
-}

package/spec/dummy/src/routes/tasks/controller.cjs

@@ -1,18 +0,0 @@
-const Controller = require("../../../../../src/controller.cjs")
-const {digg} = require("diggerize")
-const Task = require("../../models/task.cjs")
-
-module.exports = class TasksController extends Controller {
-  index() {
-    this.viewParams.numbers = [1, 2, 3, 4, 5]
-    this.render()
-  }
-
-  async show() {
-    const taskId = digg(params, "id")
-    const task = await Task.find(taskId)
-
-    this.viewParams.task = task
-    this.render()
-  }
-}

package/src/application.cjs

@@ -1,36 +0,0 @@
-const {digs} = require("diggerize")
-const Configuration = require("./configuration.cjs")
-const logger = require("./logger.cjs")
-const HttpServer = require("./http-server/index.cjs")
-
-module.exports = class VelociousApplication {
-  constructor({debug, directory, httpServer}) {
-    this.configuration = new Configuration({debug, directory})
-    this.httpServerConfiguration = httpServer ?? {}
-  }
-
-  async run(callback) {
-    await this.start()
-
-    try {
-      await callback()
-    } finally {
-      this.stop()
-    }
-  }
-
-  async start() {
-    const {configuration, httpServerConfiguration} = digs(this, "configuration", "httpServerConfiguration")
-    const port = httpServerConfiguration.port || 3006
-
-    logger(this, `Starting server on port ${port}`)
-
-    this.httpServer = new HttpServer({configuration, port})
-
-    await this.httpServer.start()
-  }
-
-  stop() {
-    this.httpServer.stop()
-  }
-}

package/src/configuration.cjs

@@ -1,14 +0,0 @@
-const Routes = require("./routes/index.cjs")
-
-module.exports = class VelociousConfiguration {
-  constructor({debug, directory}) {
-    if (!directory) throw new Error("No directory given")
-
-    // Every client need to make their own routes because they probably can't be shared across different worker threads
-    const {routes} = require(`${directory}/src/routes.cjs`)
-
-    this.debug = debug
-    this.directory = directory
-    this.routes = routes
-  }
-}

package/src/database/connection/drivers/mysql/index.cjs

@@ -1,5 +0,0 @@
-module.exports = class VelociousDatabaseConnectionDriversMysql {
-  constructor(args) {
-    this.args = args
-  }
-}

package/src/database/connection/drivers/mysql/options.cjs

@@ -1,7 +0,0 @@
-const QueryParserOptions = require("../../../query-parser/options.cjs")
-const queryParserOptions = new QueryParserOptions({
-  columnQuote: "`",
-  tableQuote: "`"
-})
-
-module.exports = queryParserOptions

package/src/database/connection/drivers/mysql/query-parser.cjs

@@ -1,26 +0,0 @@
-const {digs} = require("diggerize")
-const FromParser = require("../../../query-parser/from-parser.cjs")
-const JoinsParser = require("../../../query-parser/joins-parser.cjs")
-const queryParserOptions = require("./options.cjs")
-const SelectParser = require("../../../query-parser/select-parser.cjs")
-
-module.exports = 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, queryParserOptions}).toSql()
-    sql += new FromParser({pretty, query, queryParserOptions}).toSql()
-    sql += new JoinsParser({pretty, query, queryParserOptions}).toSql()
-
-    return sql
-  }
-}

package/src/database/connection/index.cjs

@@ -1,2 +0,0 @@
-module.exports = class VelociousDatabaseConnection {
-}

package/src/database/handler.cjs

@@ -1,5 +0,0 @@
-module.exports = class VelociousDatabaseHandler {
-  constructor() {
-    console.log("stub")
-  }
-}

package/src/database/index.cjs

@@ -1,9 +0,0 @@
-const Handler = require("./handler.cjs")
-const Query = require("./query/index.cjs")
-const Record = require("./record/index.cjs")
-
-module.exports = {
-  Handler,
-  Query,
-  Record
-}

package/src/database/pool/index.cjs

@@ -1,2 +0,0 @@
-module.exports = class VelociousDatabasePool {
-}

package/src/database/query/from-base.cjs

@@ -1,15 +0,0 @@
-module.exports = class VelociousDatabaseQueryFromBase {
-  getOptions() {
-    if (!this._options) throw new Error("Options hasn't been set")
-
-    return this._options
-  }
-
-  setOptions(options) {
-    this._options = options
-  }
-
-  toSql() {
-    throw new Error("'toSql' wasn't implemented")
-  }
-}

package/src/database/query/from-plain.cjs

@@ -1,12 +0,0 @@
-const FromBase = require("./from-base.cjs")
-
-module.exports = class VelociousDatabaseQueryFromPlain extends FromBase {
-  constructor({plain}) {
-    super()
-    this.plain = plain
-  }
-
-  toSql() {
-    return this.plain
-  }
-}

package/src/database/query/index.cjs

@@ -1,59 +0,0 @@
-const FromPlain = require("./from-plain.cjs")
-const JoinPlain = require("./join-plain.cjs")
-const SelectPlain = require("./select-plain.cjs")
-
-module.exports = class VelociousDatabaseQuery {
-  constructor({handler}) {
-    if (!handler) throw new Error("No handler given")
-
-    this._froms = []
-    this._joins = []
-    this._orders = []
-    this._selects = []
-  }
-
-  getOptions() {
-    if (!this._options) throw new Error("Options not set")
-    return this._options
-  }
-
-  from(from) {
-    if (typeof from == "string") from = new FromPlain({plain: from})
-
-    this._froms.push(from)
-    return this
-  }
-
-  joins(join) {
-    if (typeof join == "string") join = new JoinPlain({plain: join})
-
-    this._joins.push(join)
-    return this
-  }
-
-  order(order) {
-    if (typeof order == "string") order = new OrderPlain({plain: order})
-
-    this._orders.push(order)
-    return this
-  }
-
-  select(select) {
-    if (Array.isArray(select)) {
-      for (const selectInArray of select) {
-        this.select(selectInArray)
-      }
-
-      return this
-    }
-
-    if (typeof select == "string") select = new SelectPlain({plain: select})
-
-    this._selects.push(select)
-    return this
-  }
-
-  toSql() {
-    throw new Error("stub")
-  }
-}

package/src/database/query/join-base.cjs

@@ -1,15 +0,0 @@
-module.exports = class VelociousDatabaseQueryJoinBase {
-  getOptions() {
-    if (!this._options) throw new Error("Options hasn't been set")
-
-    return this._options
-  }
-
-  setOptions(options) {
-    this._options = options
-  }
-
-  toSql() {
-    throw new Error("'toSql' wasn't implemented")
-  }
-}

package/src/database/query/join-plain.cjs

@@ -1,12 +0,0 @@
-const JoinBase = require("./join-base.cjs")
-
-module.exports = class VelociousDatabaseQueryJoinPlain extends JoinBase {
-  constructor({plain}) {
-    super()
-    this.plain = plain
-  }
-
-  toSql() {
-    return this.plain
-  }
-}

package/src/database/query/select-base.cjs

@@ -1,15 +0,0 @@
-module.exports = class VelociousDatabaseQuerySelectBase {
-  getOptions() {
-    if (!this._options) throw new Error("Options hasn't been set")
-
-    return this._options
-  }
-
-  setOptions(options) {
-    this._options = options
-  }
-
-  toSql() {
-    throw new Error("'toSql' wasn't implemented")
-  }
-}

package/src/database/query/select-plain.cjs

@@ -1,12 +0,0 @@
-const SelectBase = require("./select-base.cjs")
-
-module.exports = class VelociousDatabaseQuerySelectPlain extends SelectBase {
-  constructor({plain}) {
-    super()
-    this.plain = plain
-  }
-
-  toSql() {
-    return this.plain
-  }
-}

package/src/database/record/index.cjs

@@ -1,5 +0,0 @@
-module.exports = class VelociousDatabaseRecord {
-  static find(recordId) {
-    throw new Error("stub")
-  }
-}

package/src/http-server/client/request-parser.cjs

@@ -1,92 +0,0 @@
-const {EventEmitter} = require("events")
-const logger = require("../../logger.cjs")
-
-module.exports = class VelociousHttpServerClientRequestParser {
-  constructor({configuration}) {
-    if (!configuration) throw new Error("No configuration given")
-
-    this.configuration = configuration
-    this.data = []
-    this.events = new EventEmitter()
-    this.headers = []
-    this.headersByName = {}
-    this.state = "status"
-  }
-
-  addHeader(name, value) {
-    logger(this, "addHeader", {name, value})
-
-    this.headers.push({name, value})
-
-    const formattedName = name.toLowerCase().trim()
-
-    this.headersByName[formattedName] = value
-  }
-
-  feed(data) {
-    if (this.state == "status" || this.state == "headers") {
-      for (const char of data) {
-        this.data.push(char)
-
-        if (char == 10) {
-          const line = String.fromCharCode.apply(null, this.data)
-
-          this.data = []
-          this.parse(line)
-        }
-      }
-    }
-  }
-
-  matchAndRemove(regex) {
-    const match = this.data.match(regex)
-
-    if (!match) {
-      return null
-    }
-
-    this.data = this.data.replace(regex, "")
-
-    return match
-  }
-
-  parse(line) {
-    if (this.state == "status") {
-      this.parseStatusLine(line)
-    } else if (this.state == "headers") {
-      this.parseHeader(line)
-    } else {
-      throw new Error(`Unknown state: ${this.state}`)
-    }
-  }
-
-  parseHeader(line) {
-    let match
-
-    if (match = line.match(/^(.+): (.+)\r\n/)) {
-      const name = match[1]
-      const value = match[2]
-
-      this.addHeader(name, value)
-    } else if (line == "\r\n") {
-      if (this.httpMethod.toUpperCase() == "GET") {
-        this.state = "done"
-        this.events.emit("done")
-      } else {
-        throw new Error(`Unknown HTTP method: ${this.httpMethod}`)
-      }
-    }
-  }
-
-  parseStatusLine(line) {
-    const match = line.match(/^(GET|POST) (.+?) HTTP\/1\.1\r\n/)
-
-    if (!match) {
-      throw new Error(`Couldn't match status line from: ${line}`)
-    }
-
-    this.httpMethod = match[1]
-    this.path = match[2]
-    this.state = "headers"
-  }
-}

package/src/http-server/client/request.cjs

@@ -1,25 +0,0 @@
-const {digg} = require("diggerize")
-const RequestParser = require("./request-parser.cjs")
-
-module.exports = class VelociousHttpServerClientRequest {
-  constructor({configuration}) {
-    this.configuration = configuration
-    this.requestParser = new RequestParser({configuration})
-  }
-
-  feed(data) {
-    this.requestParser.feed(data)
-  }
-
-  httpMethod() {
-    return digg(this, "requestParser", "httpMethod")
-  }
-
-  host() {
-    return digg(this, "requestParser", "headersByName", "host")
-  }
-
-  path() {
-    return digg(this, "requestParser", "path")
-  }
-}