velocious 1.0.5 → 1.0.6

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

@@ -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.mjs

@@ -0,0 +1,12 @@
+import BaseRelationship from "./base.mjs"
+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.mjs

@@ -0,0 +1,12 @@
+import BaseRelationship from "./base.mjs"
+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

@@ -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/worker-handler/worker-thread.mjs

@@ -27,12 +27,15 @@ export default class VelociousHttpServerWorkerHandlerWorkerThread {
     const {debug, directory} = digs(this.workerData, "debug", "directory")
     const configurationPath = `${this.workerData.directory}/src/config/configuration.mjs`
     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/templates/generate-model.mjs

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

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

@@ -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