velocious 1.0.5 → 1.0.7

package/src/database/record/instance-relationships/belongs-to.js

@@ -0,0 +1,20 @@
+import BaseInstanceRelationship from "./base.js"
+
+export default class VelociousDatabaseRecordBelongsToInstanceRelationship extends BaseInstanceRelationship {
+  constructor(args) {
+    super(args)
+  }
+
+  build(data) {
+    const targetModelClass = this.getTargetModelClass()
+    const newInstance = new targetModelClass(data)
+
+    this._loaded = newInstance
+
+    return newInstance
+  }
+
+  setLoaded(models) {
+    this._loaded = models
+  }
+}

package/src/database/record/instance-relationships/has-many.js

@@ -0,0 +1,47 @@
+import BaseInstanceRelationship from "./base.js"
+
+export default class VelociousDatabaseRecordHasManyInstanceRelationship extends BaseInstanceRelationship {
+  constructor(args) {
+    super(args)
+    this._loaded = []
+  }
+
+  build(data) {
+    const targetModelClass = this.getTargetModelClass()
+    const newInstance = new targetModelClass(data)
+
+    this._loaded.push(newInstance)
+
+    return newInstance
+  }
+
+  loaded() {
+    if (!this._preloaded && this.model.isPersisted()) {
+      throw new Error(`${this.model.constructor.name}#${this.relationship.getRelationshipName()} hasn't been preloaded`)
+    }
+
+    return this._loaded
+  }
+
+  addToLoaded(models) {
+    if (Array.isArray(models)) {
+      for (const model of models) {
+        this._loaded.push(model)
+      }
+    } else {
+      this._loaded.push(models)
+    }
+  }
+
+  setLoaded(models) {
+    if (!Array.isArray(models)) throw new Error(`Argument given to setLoaded wasn't an array: ${typeof models}`)
+
+    this._loaded = models
+  }
+
+  setPreloaded(preloadedValue) {
+    this._preloaded = preloadedValue
+  }
+
+  getTargetModelClass = () => this.relationship.getTargetModelClass()
+}

package/src/database/record/relationships/base.js

@@ -0,0 +1,32 @@
+export default class VelociousDatabaseRecordBaseRelationship {
+  constructor({className, configuration, foreignKey, klass, modelClass, relationshipName, through, type, ...restArgs}) {
+    const restArgsKeys = Object.keys(restArgs)
+
+    if (restArgsKeys.length > 0) throw new Error(`Unknown args given: ${restArgsKeys.join(", ")}`)
+    if (!modelClass) throw new Error(`'modelClass' wasn't given for ${relationshipName}`)
+    if (!className && !klass) throw new Error(`Neither 'className' or 'klass' was given for ${modelClass.name}#${relationshipName}`)
+
+    this.className = className
+    this.configuration = configuration
+    this.foreignKey = foreignKey
+    this.klass = klass
+    this.modelClass = modelClass
+    this.relationshipName = relationshipName
+    this.through = through
+    this.type = type
+  }
+
+  getRelationshipName = () => this.relationshipName
+  getPrimaryKey = () => "id" // TODO: Support custom given primary key
+  getType = () => this.type
+
+  getTargetModelClass() {
+    if (this.className) {
+      return this.modelClass._getConfiguration().getModelClass(this.className)
+    } else if (this.klass) {
+      return this.klass
+    }
+
+    throw new Error("Couldn't figure out the target model class")
+  }
+}

package/src/database/record/relationships/belongs-to.js

@@ -0,0 +1,12 @@
+import BaseRelationship from "./base.js"
+import * as inflection from "inflection"
+
+export default class VelociousDatabaseRecordBelongsToRelationship extends BaseRelationship {
+  getForeignKey() {
+    if (!this.foreignKey) {
+      this.foreignKey = `${inflection.underscore(this.getTargetModelClass().name)}_id`
+    }
+
+    return this.foreignKey
+  }
+}

package/src/database/record/relationships/has-many.js

@@ -0,0 +1,12 @@
+import BaseRelationship from "./base.js"
+import * as inflection from "inflection"
+
+export default class VelociousDatabaseRecordHasManyRelationship extends BaseRelationship {
+  getForeignKey() {
+    if (!this.foreignKey) {
+      this.foreignKey = `${inflection.underscore(this.modelClass.name)}_id`
+    }
+
+    return this.foreignKey
+  }
+}

package/src/database/table-data/{index.mjs → index.js}

@@ -33,18 +33,22 @@ export default class TableData {
     this._name = name
   }
 
+  _defineColumn(name, args = {}) {
+    const column = new TableColumn(name, args)
+
+    this._columns.push(column)
+  }
+
   getColumns = () => this._columns
   getName = () => this._name
   getIfNotExists = () => this.args.ifNotExists
   getIndexes = () => this._indexes
   getReferences = () => this._references
 
-  bigint(name, args = {}) {
-    const columnArgs = Object.assign({type: "bigint"}, args)
-    const column = new TableColumn(name, columnArgs)
-
-    this._columns.push(column)
-  }
+  bigint = (name, args = {}) => this._defineColumn(name, Object.assign({type: "bigint"}, args))
+  boolean = (name, args) => this._defineColumn(name, Object.assign({type: "boolean"}, args))
+  datetime = (name, args) => this._defineColumn(name, Object.assign({type: "datetime"}, args))
+  integer = (name, args = {}) => this._defineColumn(name, Object.assign({type: "integer"}, args))
 
   references(name, args = {}) {
     const columnName = `${name}_id`
@@ -59,25 +63,11 @@ export default class TableData {
     this._references.push(reference)
   }
 
-  string(name, args) {
-    const columnArgs = Object.assign({type: "string"}, args)
-    const column = new TableColumn(name, columnArgs)
-
-    this._columns.push(column)
-  }
-
-  text(name, args) {
-    const columnArgs = Object.assign({type: "text"}, args)
-    const column = new TableColumn(name, columnArgs)
-
-    this._columns.push(column)
-  }
-
-  timestamps() {
-    const createdAtColumn = new TableColumn("created_at", {type: "datetime"})
-    const updatedAtColumn = new TableColumn("updated_at", {type: "datetime"})
+  string = (name, args) => this._defineColumn(name, Object.assign({type: "string"}, args))
+  text = (name, args) => this._defineColumn(name, Object.assign({type: "text"}, args))
 
-    this._columns.push(createdAtColumn)
-    this._columns.push(updatedAtColumn)
+  timestamps(args = {}) {
+    this.datetime("created_at", args)
+    this.datetime("updated_at", args)
   }
 }

package/src/http-server/client/{index.mjs → index.js}

@@ -1,8 +1,8 @@
 import {digg} from "diggerize"
 import {EventEmitter} from "events"
-import logger from "../../logger.mjs"
-import Request from "./request.mjs"
-import RequestRunner from "./request-runner.mjs"
+import logger from "../../logger.js"
+import Request from "./request.js"
+import RequestRunner from "./request-runner.js"
 
 export default class VeoliciousHttpServerClient {
   events = new EventEmitter()

package/src/http-server/client/request-buffer/{index.mjs → index.js}

@@ -1,9 +1,9 @@
 import {EventEmitter} from "events"
-import FormDataPart from "./form-data-part.mjs"
-import Header from "./header.mjs"
+import FormDataPart from "./form-data-part.js"
+import Header from "./header.js"
 import Incorporator from "incorporator"
-import logger from "../../../logger.mjs"
-import ParamsToObject from "../params-to-object.mjs"
+import logger from "../../../logger.js"
+import ParamsToObject from "../params-to-object.js"
 import querystring from "querystring"
 
 export default class RequestBuffer {

package/src/http-server/client/{request-parser.mjs → request-parser.js}

@@ -1,8 +1,8 @@
 import {digg} from "diggerize"
 import {EventEmitter} from "events"
 import Incorporator from "incorporator"
-import ParamsToObject from "./params-to-object.mjs"
-import RequestBuffer from "./request-buffer/index.mjs"
+import ParamsToObject from "./params-to-object.js"
+import RequestBuffer from "./request-buffer/index.js"
 
 export default class VelociousHttpServerClientRequestParser {
   constructor({configuration}) {

package/src/http-server/client/{request-runner.mjs → request-runner.js}

@@ -1,7 +1,7 @@
 import EventEmitter from "events"
-import logger from "../../logger.mjs"
-import Response from "./response.mjs"
-import RoutesResolver from "../../routes/resolver.mjs"
+import logger from "../../logger.js"
+import Response from "./response.js"
+import RoutesResolver from "../../routes/resolver.js"
 
 export default class VelociousHttpServerClientRequestRunner {
   events = new EventEmitter()

package/src/http-server/client/{request.mjs → request.js}

@@ -1,5 +1,5 @@
 import {digg} from "diggerize"
-import RequestParser from "./request-parser.mjs"
+import RequestParser from "./request-parser.js"
 
 export default class VelociousHttpServerClientRequest {
   constructor({configuration}) {

package/src/http-server/{index.mjs → index.js}

@@ -1,8 +1,8 @@
 import {digg} from "diggerize"
-import logger from "../logger.mjs"
+import logger from "../logger.js"
 import Net from "net"
-import ServerClient from "./server-client.mjs"
-import WorkerHandler from "./worker-handler/index.mjs"
+import ServerClient from "./server-client.js"
+import WorkerHandler from "./worker-handler/index.js"
 
 export default class VelociousHttpServer {
   clientCount = 0

package/src/http-server/{server-client.mjs → server-client.js}

@@ -1,5 +1,5 @@
 import EventEmitter from "events"
-import logger from "../logger.mjs"
+import logger from "../logger.js"
 
 export default class ServerClient {
   events = new EventEmitter()

package/src/http-server/worker-handler/{index.mjs → index.js}

@@ -1,7 +1,7 @@
 import {digg, digs} from "diggerize"
 import {dirname} from "path"
 import {fileURLToPath} from "url"
-import logger from "../../logger.mjs"
+import logger from "../../logger.js"
 import {Worker} from "worker_threads"
 
 export default class VelociousHttpServerWorker {
@@ -19,7 +19,7 @@ export default class VelociousHttpServerWorker {
       const __dirname = dirname(__filename)
 
       this.onStartCallback = resolve
-      this.worker = new Worker(`${__dirname}/worker-script.mjs`, {
+      this.worker = new Worker(`${__dirname}/worker-script.js`, {
         workerData: {
           debug,
           directory,

package/src/http-server/worker-handler/{worker-script.mjs → worker-script.js}

@@ -1,4 +1,4 @@
 import {workerData, parentPort} from "worker_threads"
-import WorkerThread from "./worker-thread.mjs"
+import WorkerThread from "./worker-thread.js"
 
 new WorkerThread({parentPort, workerData})

package/src/http-server/worker-handler/{worker-thread.mjs → worker-thread.js}

@@ -1,8 +1,8 @@
-import Application from "../../application.mjs"
-import Client from "../client/index.mjs"
+import Application from "../../application.js"
+import Client from "../client/index.js"
 import {digg, digs} from "diggerize"
-import errorLogger from "../../error-logger.mjs"
-import logger from "../../logger.mjs"
+import errorLogger from "../../error-logger.js"
+import logger from "../../logger.js"
 
 export default class VelociousHttpServerWorkerHandlerWorkerThread {
   constructor({parentPort, workerData}) {
@@ -25,14 +25,17 @@ export default class VelociousHttpServerWorkerHandlerWorkerThread {
 
   async initialize() {
     const {debug, directory} = digs(this.workerData, "debug", "directory")
-    const configurationPath = `${this.workerData.directory}/src/config/configuration.mjs`
+    const configurationPath = `${this.workerData.directory}/src/config/configuration.js`
     const configurationImport = await import(configurationPath)
-    const configuration = configurationImport.default
 
-    this.application = new Application({configuration, debug, directory})
-
-    this.configuration = configuration
+    this.configuration = configurationImport.default
     this.configuration.setCurrent()
+
+    this.application = new Application({configuration: this.configuration, debug, directory})
+
+    if (this.configuration.isInitialized()) {
+      await this.configuration.initialize()
+    }
   }
 
   onCommand = (data) => {

package/src/routes/{app-routes.mjs → app-routes.js}

@@ -3,7 +3,7 @@ import {digg} from "diggerize"
 export default class VelociousRoutesAppRoutes {
   static async getRoutes(configuration) {
     // Every client need to make their own routes because they probably can't be shared across different worker threads
-    const routesImport = await import(`${configuration.getDirectory()}/src/config/routes.mjs`)
+    const routesImport = await import(`${configuration.getDirectory()}/src/config/routes.js`)
 
     return digg(routesImport, "default", "routes")
   }

package/src/routes/{base-route.mjs → base-route.js}

@@ -1,5 +1,5 @@
-import GetRoute from "./get-route.mjs"
-import ResourceRoute from "./resource-route.mjs"
+import GetRoute from "./get-route.js"
+import ResourceRoute from "./resource-route.js"
 
 var VelociousBaseRoute
 

package/src/routes/{get-route.mjs → get-route.js}

@@ -1,4 +1,4 @@
-import BaseRoute, {initBaseRoute} from "./base-route.mjs"
+import BaseRoute, {initBaseRoute} from "./base-route.js"
 import escapeStringRegexp from "escape-string-regexp"
 
 initBaseRoute()

package/src/routes/{index.mjs → index.js}

@@ -1,4 +1,4 @@
-import RootRoute from "./root-route.mjs"
+import RootRoute from "./root-route.js"
 
 export default class VelociousRoutes {
   rootRoute = new RootRoute()

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

@@ -21,7 +21,7 @@ export default 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 = `${this.configuration.getDirectory()}/src/routes/${digg(this, "params", "controller")}/controller.mjs`
+      const controllerPath = `${this.configuration.getDirectory()}/src/routes/${digg(this, "params", "controller")}/controller.js`
       const controllerClassImport = await import(controllerPath)
       const controllerClass = controllerClassImport.default
       const controllerInstance = new controllerClass({

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

@@ -1,4 +1,4 @@
-import BaseRoute, {initBaseRoute} from "./base-route.mjs"
+import BaseRoute, {initBaseRoute} from "./base-route.js"
 import escapeStringRegexp from "escape-string-regexp"
 
 initBaseRoute()

package/src/routes/{root-route.mjs → root-route.js}

@@ -1,4 +1,4 @@
-import BaseRoute, {initBaseRoute} from "./base-route.mjs"
+import BaseRoute, {initBaseRoute} from "./base-route.js"
 
 initBaseRoute()
 

package/src/templates/{configuration.mjs → configuration.js}

@@ -1,6 +1,6 @@
-import AsyncTrackedMultiConnection from "velocious/src/database/pool/async-tracked-multi-connection.mjs"
-import Configuration from "velocious/src/configuration.mjs"
-import MysqlDriver from "velocious/src/database/drivers/mysql/index.mjs"
+import AsyncTrackedMultiConnection from "velocious/src/database/pool/async-tracked-multi-connection.js"
+import Configuration from "velocious/src/configuration.js"
+import MysqlDriver from "velocious/src/database/drivers/mysql/index.js"
 
 export default new Configuration({
   database: {

package/src/templates/{generate-migration.mjs → generate-migration.js}

@@ -1,4 +1,4 @@
-import Migration from "velocious/src/database/migration/index.mjs"
+import Migration from "velocious/src/database/migration/index.js"
 
 export default class __MIGRATION_NAME__ extends Migration {
   async up() {

package/src/templates/generate-model.js

@@ -0,0 +1,6 @@
+import Record from "velocious/src/database/record/index.js"
+
+class __MODEL_NAME__ extends Record {
+}
+
+export default __MODEL_NAME__

package/src/templates/{routes.mjs → routes.js}

@@ -1,4 +1,4 @@
-import Routes from "velocious/src/routes/index.mjs"
+import Routes from "velocious/src/routes/index.js"
 
 const routes = new Routes()
 

package/src/utils/rest-args-error.js

@@ -0,0 +1,9 @@
+const restArgsError = (restArgs) => {
+  const restArgsKeys = Object.keys(restArgs)
+
+  if (restArgsKeys.length > 0) {
+    throw new Error(`Unknown arguments: ${restArgsKeys.join(", ")}`)
+  }
+}
+
+export default restArgsError

package/spec/database/record/create-spec.mjs

@@ -1,14 +0,0 @@
-import Dummy from "../../dummy/index.mjs"
-import Task from "../../dummy/src/models/task.mjs"
-
-describe("Record - create", () => {
-  it("creates a new simple record", async () => {
-    await Dummy.run(async () => {
-      const task = new Task({name: "Test task"})
-
-      await task.save()
-
-      expect(task.id()).not.toBeUndefined()
-    })
-  })
-})

package/spec/dummy/src/config/configuration.example.mjs

@@ -1,21 +0,0 @@
-import AsyncTrackedMultiConnection from "../../../../src/database/pool/async-tracked-multi-connection.mjs"
-import Configuration from "../../../../src/configuration.mjs"
-import dummyDirectory from "../../dummy-directory.mjs"
-import MysqlDriver from "../../../../src/database/drivers/mysql/index.mjs"
-
-export default new Configuration({
-  database: {
-    default: {
-      master: {
-        driver: MysqlDriver,
-        poolType: AsyncTrackedMultiConnection,
-        type: "mysql",
-        host: "mariadb",
-        username: "username",
-        password: "password",
-        database: "velocious_test"
-      }
-    }
-  },
-  directory: dummyDirectory()
-})

package/spec/dummy/src/config/configuration.peakflow.mjs

@@ -1,22 +0,0 @@
-import AsyncTrackedMultiConnection from "../../../../src/database/pool/async-tracked-multi-connection.mjs"
-import Configuration from "../../../../src/configuration.mjs"
-import dummyDirectory from "../../dummy-directory.mjs"
-import MysqlDriver from "../../../../src/database/drivers/mysql/index.mjs"
-
-export default new Configuration({
-  database: {
-    default: {
-      master: {
-        driver: MysqlDriver,
-        poolType: AsyncTrackedMultiConnection,
-        type: "mysql",
-        host: "mariadb",
-        username: "peakflow",
-        password: "password",
-        database: "velocious_test",
-        useDatabase: "velocious_test"
-      }
-    }
-  },
-  directory: dummyDirectory()
-})

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

@@ -1,4 +0,0 @@
-import DatabaseRecord from "../../../../src/database/record/index.mjs"
-
-export default class Task extends DatabaseRecord {
-}

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

@@ -1,25 +0,0 @@
-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/base.mjs

@@ -1,36 +0,0 @@
-import Base from "../base.mjs"
-import CreateTable from "../sqlite/sql/create-table.mjs"
-import Delete from "../sqlite/sql/delete.mjs"
-import Insert from "../sqlite/sql/insert.mjs"
-import QueryParser from "../sqlite/query-parser.mjs"
-import Table from "./table"
-import Update from "../sqlite/sql/update.mjs"
-
-export default class VelociousDatabaseDriversSqliteBase extends Base {
-  createTableSql(tableData) {
-    const createArgs = Object.assign({tableData, driver: this})
-    const createTable = new CreateTable(createArgs)
-
-    return createTable.toSql()
-  }
-
-  deleteSql = ({tableName, conditions}) => new Delete({conditions, driver: this, tableName}).toSql()
-  insertSql = ({tableName, data}) => new Insert({driver: this, tableName, data}).toSql()
-
-  async getTables() {
-    const result = await this.query("SELECT name FROM sqlite_master WHERE type = 'table'")
-    const tables = []
-
-    for (const row of result) {
-      const table = new Table(row)
-
-      tables.push(table)
-    }
-
-    return tables
-  }
-
-  queryToSql = (query) => new QueryParser({query}).toSql()
-  quoteColumn = (string) => `\`${string}\``
-  updateSql = ({conditions, data, tableName}) => new Update({conditions, data, driver: this, tableName}).toSql()
-}

package/src/database/drivers/sqlite/index.web.mjs

@@ -1,45 +0,0 @@
-import Base from "./base.mjs"
-import {digg} from "diggerize"
-import Options from "../sqlite/options.mjs"
-import query from "./query"
-
-import initSqlJs from "sql.js"
-
-export default class VelociousDatabaseDriversSqliteWeb extends Base {
-  async connect() {
-    const SQL = await initSqlJs({
-      // Required to load the wasm binary asynchronously. Of course, you can host it wherever you want you can omit locateFile completely when running in Node.
-      locateFile: (file) => `https://sql.js.org/dist/${file}`
-    })
-
-    const databaseContent = localStorage.getItem(this.localStorageName())
-
-    this.connection = new SQL.Database(databaseContent)
-  }
-
-  localStorageName = () => `VelociousDatabaseDriversSqliteWeb---${digg(this.getArgs(), "name")}`
-  disconnect = () => this.saveDatabase()
-  saveDatabase = () => localStorage.setItem(this.localStorageName(), this.connection.export())
-
-  async close() {
-    this.saveDatabase()
-    await this.connection.end()
-    this.connection = undefined
-  }
-
-  query = async (sql) => await query(this.connection, sql)
-
-  quote(string) {
-    if (!this.connection) throw new Error("Can't escape before connected")
-
-    return this.connection.escape(string)
-  }
-
-  options() {
-    if (!this._options) {
-      this._options = new Options({driver: this})
-    }
-
-    return this._options
-  }
-}

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

@@ -1,25 +0,0 @@
-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/query.native.mjs

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