@tachybase/database 1.3.54-alpha.5 → 1.3.54-alpha.7

package/lib/fields/belongs-to-field.js

@@ -64,7 +64,7 @@ const _BelongsToField = class _BelongsToField extends import_relation_field.Rela
     );
   }
   checkAssociationKeys() {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
+    var _a, _b;
     let { foreignKey, targetKey } = this.options;
     if (!targetKey) {
       targetKey = this.TargetModel.primaryKeyAttribute;
@@ -74,23 +74,7 @@ const _BelongsToField = class _BelongsToField extends import_relation_field.Rela
     }
     const targetKeyAttribute = (_a = this.TargetModel.rawAttributes) == null ? void 0 : _a[targetKey];
     const foreignKeyAttribute = (_b = this.collection.model.rawAttributes) == null ? void 0 : _b[foreignKey];
-    (_g = this.context.database.logger) == null ? void 0 : _g.error(
-      `[BelongsToField.checkAssociationKeys] Field: ${this.name}, Collection: ${this.collection.name}, Target: ${this.target}, targetKey: ${targetKey}, foreignKey: ${foreignKey}`,
-      {
-        submodule: "BelongsToField",
-        method: "checkAssociationKeys",
-        targetKey,
-        foreignKey,
-        targetKeyAttribute: targetKeyAttribute ? { type: (_d = (_c = targetKeyAttribute.type) == null ? void 0 : _c.constructor) == null ? void 0 : _d.name, field: targetKeyAttribute.field } : null,
-        foreignKeyAttribute: foreignKeyAttribute ? { type: (_f = (_e = foreignKeyAttribute.type) == null ? void 0 : _e.constructor) == null ? void 0 : _f.name, field: foreignKeyAttribute.field } : null,
-        targetModelAttributes: Object.keys(this.TargetModel.rawAttributes || {}),
-        collectionModelAttributes: Object.keys(this.collection.model.rawAttributes || {})
-      }
-    );
     if (!foreignKeyAttribute || !targetKeyAttribute) {
-      (_h = this.context.database.logger) == null ? void 0 : _h.warn(
-        `[BelongsToField.checkAssociationKeys] Skipping check - foreignKeyAttribute: ${!!foreignKeyAttribute}, targetKeyAttribute: ${!!targetKeyAttribute}`
-      );
       return;
     }
     const foreignKeyType = foreignKeyAttribute.type.constructor.toString();
@@ -102,27 +86,9 @@ const _BelongsToField = class _BelongsToField extends import_relation_field.Rela
     }
   }
   bind() {
-    var _a, _b, _c;
     const { database, collection } = this.context;
     const Target = this.TargetModel;
-    (_a = database.logger) == null ? void 0 : _a.error(
-      `[BelongsToField.bind] Field: ${this.name}, Collection: ${collection.name}, Target: ${this.target}, TargetModel: ${(Target == null ? void 0 : Target.name) || "undefined"}`,
-      {
-        submodule: "BelongsToField",
-        method: "bind",
-        fieldName: this.name,
-        collectionName: collection.name,
-        target: this.target,
-        targetModelName: Target == null ? void 0 : Target.name,
-        targetModelPrimaryKey: Target == null ? void 0 : Target.primaryKeyAttribute,
-        targetModelAttributes: Target ? Object.keys(Target.rawAttributes || {}) : [],
-        options: this.options
-      }
-    );
     if (!Target) {
-      (_b = database.logger) == null ? void 0 : _b.warn(
-        `[BelongsToField.bind] Target model not found, adding to pending: ${this.name} in ${collection.name} -> ${this.target}`
-      );
       database.addPendingField(this);
       return false;
     }
@@ -130,20 +96,11 @@ const _BelongsToField = class _BelongsToField extends import_relation_field.Rela
     if (collection.model.associations[this.name]) {
       delete collection.model.associations[this.name];
     }
-    const belongsToOptions = {
+    const association = collection.model.belongsTo(Target, {
       as: this.name,
       constraints: false,
       ...(0, import_lodash.omit)(this.options, ["name", "type", "target", "onDelete"])
-    };
-    (_c = database.logger) == null ? void 0 : _c.error(`[BelongsToField.bind] Calling belongsTo with options:`, {
-      submodule: "BelongsToField",
-      method: "bind",
-      fieldName: this.name,
-      collectionName: collection.name,
-      targetModelName: Target.name,
-      belongsToOptions
     });
-    const association = collection.model.belongsTo(Target, belongsToOptions);
     database.removePendingField(this);
     if (!this.options.foreignKey) {
       this.options.foreignKey = association.foreignKey;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@tachybase/database",
-  "version": "1.3.54-alpha.5",
+  "version": "1.3.54-alpha.7",
   "description": "",
   "license": "Apache-2.0",
   "main": "./lib/index.js",
@@ -22,9 +22,9 @@
     "semver": "7.7.2",
     "sequelize": "^6.37.7",
     "umzug": "^3.8.2",
-    "@tachybase/globals": "1.3.54-alpha.5",
-    "@tachybase/logger": "1.3.54-alpha.5",
-    "@tachybase/utils": "1.3.54-alpha.5"
+    "@tachybase/utils": "1.3.54-alpha.7",
+    "@tachybase/logger": "1.3.54-alpha.7",
+    "@tachybase/globals": "1.3.54-alpha.7"
   },
   "devDependencies": {
     "@types/flat": "^5.0.5",