velocious 1.0.103 → 1.0.104

package/package.json

@@ -3,7 +3,7 @@
     "velocious": "bin/velocious.js"
   },
   "name": "velocious",
-  "version": "1.0.103",
+  "version": "1.0.104",
   "main": "index.js",
   "scripts": {
     "lint": "eslint",

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

@@ -14,6 +14,13 @@ describe("Record - create", () => {
 
       project.buildProjectDetail({note: "Test note"})
 
+      expect(task.hasName()).toBeTrue()
+      expect(task.hasCreatedAt()).toBeFalse()
+      expect(project.hasName()).toBeTrue()
+      expect(project.hasNameEn()).toBeTrue()
+      expect(project.hasNameDe()).toBeTrue()
+      expect(project.hasUpdatedAt()).toBeFalse()
+
       await task.save()
 
       expect(task.id()).not.toBeUndefined()

package/spec/dummy/src/model-bases/project.js

@@ -70,16 +70,34 @@ export default class ProjectBase extends Record {
    */
   name() { return this._getTranslatedAttributeWithFallback("name", this._getConfiguration().getLocale()) }
 
+  /**
+   * @abstract
+   * @returns {boolean}
+   */
+  hasName() { throw new Error("hasName not implemented") }
+
   /**
    * @returns {string | null}
    */
   nameDe() { return this._getTranslatedAttributeWithFallback("name", "de") }
 
+  /**
+   * @abstract
+   * @returns {boolean}
+   */
+  hasNameDe() { throw new Error("hasNameDe not implemented") }
+
   /**
    * @returns {string | null}
    */
   nameEn() { return this._getTranslatedAttributeWithFallback("name", "en") }
 
+  /**
+   * @abstract
+   * @returns {boolean}
+   */
+  hasNameEn() { throw new Error("hasNameEn not implemented") }
+
   /**
    * @returns {import("../models/user.js").default}
    */

package/src/database/record/index.js

@@ -468,9 +468,6 @@ class VelociousDatabaseRecord {
     const columnNameToAttributeName = this.getColumnNameToAttributeNameMap()
     const attributeNameToColumnName = this.getAttributeNameToColumnNameMap()
 
-    /** @type {Record<string, (this: VelociousDatabaseRecord) => unknown>} */
-    const proto = /** @type {any} */ (this.prototype);
-
     for (const column of this._columns) {
       this._columnsAsHash[column.getName()] = column
 
@@ -480,17 +477,18 @@ class VelociousDatabaseRecord {
       attributeNameToColumnName[camelizedColumnName] = column.getName()
       columnNameToAttributeName[column.getName()] = camelizedColumnName
 
-      proto[camelizedColumnName] = function() {
+      // @ts-expect-error
+      this.prototype[camelizedColumnName] = function() {
         return this.readAttribute(camelizedColumnName)
       }
 
       // @ts-expect-error
-      proto[`set${camelizedColumnNameBigFirst}`] = function(newValue) {
-        // @ts-expect-error
+      this.prototype[`set${camelizedColumnNameBigFirst}`] = function(newValue) {
         return this._setColumnAttribute(camelizedColumnName, newValue)
       }
 
-      proto[`has${camelizedColumnNameBigFirst}`] = function() {
+      // @ts-expect-error
+      this.prototype[`has${camelizedColumnNameBigFirst}`] = function() {
         // @ts-expect-error
         let value = this[camelizedColumnName]()
 
@@ -539,24 +537,20 @@ class VelociousDatabaseRecord {
         const nameCamelized = inflection.camelize(name)
         const setterMethodName = `set${nameCamelized}`
 
-        /** @type {Record<string, unknown>} */
         // @ts-expect-error
-        const self = this
-
-        /** @type {Record<string, (this: VelociousDatabaseRecord) => unknown>} */
-        const proto = /** @type {any} */ (this.prototype);
-
-        proto[name] = function getTranslatedAttribute() {
+        this.prototype[name] = function getTranslatedAttribute() {
           const locale = this._getConfiguration().getLocale()
 
           return this._getTranslatedAttributeWithFallback(name, locale)
         }
 
-        proto[`has${nameCamelized}`] = function hasTranslatedAttribute() {
-          const candidate = self[name]
+        // @ts-expect-error
+        this.prototype[`has${nameCamelized}`] = function hasTranslatedAttribute() {
+          // @ts-expect-error
+          const candidate = this[name]
 
           if (typeof candidate == "function") {
-            const value = candidate()
+            const value = candidate.bind(this)()
 
             return this._hasAttribute(value)
           } else {
@@ -565,11 +559,9 @@ class VelociousDatabaseRecord {
         }
 
         // @ts-expect-error
-        proto[setterMethodName] = function setTranslatedAttribute(newValue) {
-          // @ts-expect-error
+        this.prototype[setterMethodName] = function setTranslatedAttribute(newValue) {
           const locale = this._getConfiguration().getLocale()
 
-          // @ts-expect-error
           return this._setTranslatedAttribute(name, locale, newValue)
         }
 
@@ -577,6 +569,7 @@ class VelociousDatabaseRecord {
           const localeCamelized = inflection.camelize(locale)
           const getterMethodNameLocalized = `${name}${localeCamelized}`
           const setterMethodNameLocalized = `${setterMethodName}${localeCamelized}`
+          const hasMethodNameLocalized = `has${inflection.camelize(name)}${localeCamelized}`
 
           // @ts-expect-error
           this.prototype[getterMethodNameLocalized] = function getTranslatedAttributeWithLocale() {
@@ -587,6 +580,20 @@ class VelociousDatabaseRecord {
           this.prototype[setterMethodNameLocalized] = function setTranslatedAttributeWithLocale(newValue) {
             return this._setTranslatedAttribute(name, locale, newValue)
           }
+
+          // @ts-expect-error
+          this.prototype[hasMethodNameLocalized] = function hasTranslatedAttribute() {
+            // @ts-expect-error
+            const candidate = this[getterMethodNameLocalized]
+
+            if (typeof candidate == "function") {
+              const value = candidate.bind(this)()
+
+              return this._hasAttribute(value)
+            } else {
+              throw new Error(`Expected candidate to be a function but it was: ${typeof candidate}`)
+            }
+          }
         }
       }
     }

package/src/environment-handlers/node/cli/commands/generate/base-models.js

@@ -98,6 +98,16 @@ export default class DbGenerateModel extends BaseCommand {
           fileContent += `  ${name}() { return this._getTranslatedAttributeWithFallback("${name}", this._getConfiguration().getLocale()) }\n`
           methodsCount++
 
+          const hasName = `has${inflection.camelize(name)}`
+
+          fileContent += `\n`
+          fileContent += "  /**\n"
+          fileContent += `   * @abstract\n`
+          fileContent += `   * @returns {boolean}\n`
+          fileContent += "   */\n"
+          fileContent += `  ${hasName}() { throw new Error("${hasName} not implemented") }\n`
+          methodsCount++
+
           for (const locale of this.getConfiguration().getLocales()) {
             const localeMethodName = `${name}${inflection.camelize(locale)}`
 
@@ -109,7 +119,16 @@ export default class DbGenerateModel extends BaseCommand {
             }
 
             fileContent += `  ${localeMethodName}() { return this._getTranslatedAttributeWithFallback("${name}", "${locale}") }\n`
+            methodsCount++
+
+            const localeHasName = `has${inflection.camelize(localeMethodName)}`
 
+            fileContent += `\n`
+            fileContent += "  /**\n"
+            fileContent += `   * @abstract\n`
+            fileContent += `   * @returns {boolean}\n`
+            fileContent += "   */\n"
+            fileContent += `  ${localeHasName}() { throw new Error("${localeHasName} not implemented") }\n`
             methodsCount++
           }
         }